From c4ee86d6e5b631e66a4286677ec32f5b8c1680de Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 12 Jun 2024 17:58:48 -0300 Subject: [PATCH] this was a pain --- code/__DEFINES/spans.dm | 156 +++++ code/__DEFINES/traits.dm | 34 +- code/__HELPERS/areas.dm | 10 +- code/__HELPERS/game.dm | 8 +- code/__HELPERS/mobs.dm | 2 +- code/__HELPERS/roundend.dm | 18 +- code/_onclick/click.dm | 6 +- code/_onclick/hud/action_button.dm | 14 +- code/_onclick/hud/alert.dm | 2 +- code/_onclick/hud/fullscreen.dm | 2 +- code/_onclick/hud/ghost.dm | 2 +- code/_onclick/hud/hud.dm | 4 +- code/_onclick/hud/pai.dm | 4 +- code/_onclick/hud/robot.dm | 2 +- code/_onclick/hud/screen_objects.dm | 50 +- code/_onclick/item_attack.dm | 32 +- code/_onclick/observer.dm | 4 +- code/_onclick/other_mobs.dm | 82 +-- code/_onclick/telekinesis.dm | 4 +- code/controllers/failsafe.dm | 12 +- code/controllers/master.dm | 8 +- code/controllers/subsystem.dm | 2 +- code/controllers/subsystem/air.dm | 2 +- code/controllers/subsystem/augury.dm | 4 +- code/controllers/subsystem/dbcore.dm | 2 +- code/controllers/subsystem/job.dm | 4 +- code/controllers/subsystem/mapping.dm | 14 +- code/controllers/subsystem/pai.dm | 2 +- code/controllers/subsystem/rogue/devotion.dm | 4 +- .../drifter_menu/drifter_queue_menu_build.dm | 4 +- .../drifter_queue/drifter_queue_helpers.dm | 10 +- code/controllers/subsystem/rogue/treasury.dm | 2 +- .../triumph_buy_datums/misc/wipe_triumphs.dm | 2 +- .../subsystem/rogue/triumphs/triumphs.dm | 6 +- code/controllers/subsystem/server_maint.dm | 4 +- code/controllers/subsystem/shuttle.dm | 20 +- code/controllers/subsystem/skills.dm | 10 +- code/controllers/subsystem/ticker.dm | 48 +- code/controllers/subsystem/vote.dm | 4 +- code/datums/achievements/_awards.dm | 2 +- code/datums/action.dm | 8 +- code/datums/ai_laws.dm | 2 +- code/datums/brain_damage/brain_trauma.dm | 4 +- code/datums/brain_damage/creepy_trauma.dm | 8 +- code/datums/brain_damage/hypnosis.dm | 8 +- code/datums/brain_damage/imaginary_friend.dm | 22 +- code/datums/brain_damage/magic.dm | 20 +- code/datums/brain_damage/mild.dm | 54 +- code/datums/brain_damage/phobia.dm | 22 +- code/datums/brain_damage/severe.dm | 60 +- code/datums/brain_damage/special.dm | 42 +- code/datums/brain_damage/split_personality.dm | 24 +- code/datums/browser.dm | 2 +- code/datums/character_flaw/addiction.dm | 2 +- code/datums/components/archaeology.dm | 6 +- code/datums/components/armor_plate.dm | 18 +- code/datums/components/art.dm | 10 +- code/datums/components/butchering.dm | 30 +- code/datums/components/caltrop.dm | 8 +- code/datums/components/chasm.dm | 10 +- code/datums/components/crafting/crafting.dm | 40 +- code/datums/components/deadchat_control.dm | 4 +- code/datums/components/fantasy/_fantasy.dm | 6 +- code/datums/components/gps.dm | 10 +- code/datums/components/heirloom.dm | 6 +- code/datums/components/jousting.dm | 2 +- code/datums/components/knockoff.dm | 2 +- code/datums/components/material_container.dm | 12 +- code/datums/components/mood.dm | 6 +- code/datums/components/nanites.dm | 24 +- code/datums/components/orbiter.dm | 2 +- code/datums/components/paintable.dm | 4 +- code/datums/components/remote_materials.dm | 4 +- code/datums/components/riding.dm | 20 +- code/datums/components/rotation.dm | 4 +- code/datums/components/shrink.dm | 8 +- code/datums/components/spawner.dm | 2 +- code/datums/components/spooky.dm | 8 +- code/datums/components/stationloving.dm | 2 +- .../storage/concrete/bag_of_holding.dm | 2 +- .../components/storage/concrete/bluespace.dm | 2 +- .../components/storage/concrete/pockets.dm | 4 +- .../components/storage/concrete/rped.dm | 4 +- .../components/storage/concrete/wallet.dm | 6 +- code/datums/components/storage/storage.dm | 58 +- code/datums/components/summoning.dm | 2 +- code/datums/components/tether.dm | 4 +- code/datums/components/uplink.dm | 8 +- code/datums/dash_weapon.dm | 2 +- .../datums/diseases/advance/symptoms/beard.dm | 2 +- .../diseases/advance/symptoms/choking.dm | 14 +- .../diseases/advance/symptoms/confusion.dm | 4 +- .../diseases/advance/symptoms/deafness.dm | 6 +- .../advance/symptoms/disfiguration.dm | 4 +- .../datums/diseases/advance/symptoms/dizzy.dm | 4 +- .../datums/diseases/advance/symptoms/fever.dm | 4 +- code/datums/diseases/advance/symptoms/fire.dm | 16 +- .../diseases/advance/symptoms/flesh_eating.dm | 8 +- .../diseases/advance/symptoms/genetics.dm | 2 +- .../diseases/advance/symptoms/hallucigen.dm | 12 +- .../diseases/advance/symptoms/headache.dm | 6 +- code/datums/diseases/advance/symptoms/heal.dm | 34 +- .../diseases/advance/symptoms/itching.dm | 2 +- .../diseases/advance/symptoms/narcolepsy.dm | 12 +- .../diseases/advance/symptoms/oxygen.dm | 2 +- .../diseases/advance/symptoms/sensory.dm | 6 +- .../diseases/advance/symptoms/shedding.dm | 6 +- .../diseases/advance/symptoms/shivering.dm | 4 +- code/datums/diseases/advance/symptoms/skin.dm | 2 +- .../diseases/advance/symptoms/vision.dm | 10 +- .../diseases/advance/symptoms/voice_change.dm | 2 +- .../datums/diseases/advance/symptoms/vomit.dm | 2 +- .../diseases/advance/symptoms/weight.dm | 4 +- .../datums/diseases/advance/symptoms/youth.dm | 10 +- code/datums/diseases/anxiety.dm | 18 +- code/datums/diseases/appendicitis.dm | 2 +- code/datums/diseases/beesease.dm | 16 +- code/datums/diseases/brainrot.dm | 12 +- code/datums/diseases/cold.dm | 8 +- code/datums/diseases/cold9.dm | 10 +- code/datums/diseases/decloning.dm | 6 +- code/datums/diseases/dna_spread.dm | 8 +- code/datums/diseases/fake_gbs.dm | 2 +- code/datums/diseases/flu.dm | 12 +- code/datums/diseases/fluspanish.dm | 4 +- code/datums/diseases/gastrolisis.dm | 14 +- code/datums/diseases/gbs.dm | 4 +- code/datums/diseases/heart_failure.dm | 14 +- code/datums/diseases/magnitis.dm | 10 +- code/datums/diseases/parrotpossession.dm | 2 +- code/datums/diseases/pierrot_throat.dm | 6 +- code/datums/diseases/retrovirus.dm | 24 +- code/datums/diseases/rhumba_beat.dm | 10 +- code/datums/diseases/transformation.dm | 60 +- code/datums/diseases/tuberculosis.dm | 22 +- code/datums/diseases/wizarditis.dm | 6 +- code/datums/dna.dm | 32 +- code/datums/elements/cleaning.dm | 2 +- code/datums/emotes.dm | 10 +- code/datums/helper_datums/teleport.dm | 2 +- code/datums/holocall.dm | 4 +- code/datums/keybinding/mob.dm | 2 +- code/datums/martial/boxing.dm | 22 +- code/datums/martial/cqc.dm | 72 +-- code/datums/martial/krav_maga.dm | 60 +- code/datums/martial/mushpunch.dm | 16 +- code/datums/martial/plasma_fist.dm | 12 +- code/datums/martial/psychotic_brawl.dm | 18 +- code/datums/martial/sleeping_carp.dm | 72 +-- code/datums/martial/wrestling.dm | 106 ++-- code/datums/mind.dm | 28 +- .../mood_events/generic_negative_events.dm | 2 +- code/datums/mutations/_mutations.dm | 2 +- code/datums/mutations/actions.dm | 40 +- code/datums/mutations/antenna.dm | 26 +- code/datums/mutations/body.dm | 64 +-- code/datums/mutations/chameleon.dm | 4 +- code/datums/mutations/cold.dm | 4 +- code/datums/mutations/hulk.dm | 4 +- code/datums/mutations/radioactive.dm | 2 +- code/datums/mutations/sight.dm | 12 +- code/datums/mutations/space_adaptation.dm | 2 +- code/datums/mutations/speech.dm | 34 +- code/datums/mutations/telekinesis.dm | 2 +- code/datums/mutations/touch.dm | 12 +- code/datums/saymode.dm | 20 +- code/datums/status_effects/buffs.dm | 28 +- code/datums/status_effects/debuffs.dm | 52 +- code/datums/status_effects/gas.dm | 8 +- code/datums/status_effects/neutral.dm | 6 +- code/datums/stress/_stressevent.dm | 4 +- code/datums/stress/negative_events.dm | 98 ++-- code/datums/stress/positive_events.dm | 52 +- code/datums/traits/_quirk.dm | 4 +- code/datums/traits/good.dm | 56 +- code/datums/traits/negative.dm | 86 +-- code/datums/traits/neutral.dm | 26 +- code/datums/weather/weather.dm | 6 +- .../datums/weather/weather_types/acid_rain.dm | 6 +- .../datums/weather/weather_types/ash_storm.dm | 10 +- .../weather/weather_types/floor_is_lava.dm | 6 +- .../weather/weather_types/radiation_storm.dm | 6 +- .../weather/weather_types/roguetown/fog.dm | 2 +- .../weather/weather_types/roguetown/rain.dm | 2 +- .../weather/weather_types/snow_storm.dm | 6 +- code/datums/wires/_wires.dm | 6 +- code/datums/wires/mulebot.dm | 10 +- code/datums/wires/particle_accelerator.dm | 2 +- code/datums/wires/robot.dm | 8 +- code/datums/wires/roulette.dm | 6 +- code/datums/wires/syndicatebomb.dm | 26 +- code/datums/world_topic.dm | 4 +- code/datums/wounds/_wound.dm | 2 +- code/datums/wounds/the_only_cure.dm | 8 +- code/datums/wounds/types/arteries.dm | 10 +- code/datums/wounds/types/dislocations.dm | 4 +- code/datums/wounds/types/dismemberment.dm | 12 +- code/datums/wounds/types/fractures.dm | 16 +- code/datums/wounds/types/punctures.dm | 2 +- code/datums/wounds/types/slashes.dm | 4 +- code/datums/wounds/types/special.dm | 26 +- code/game/area/Space_Station_13_areas.dm | 2 +- code/game/area/areas.dm | 2 +- code/game/atoms.dm | 16 +- code/game/atoms_movable.dm | 8 +- .../game/gamemodes/clown_ops/clown_weapons.dm | 8 +- code/game/gamemodes/game_mode.dm | 4 +- code/game/gamemodes/meteor/meteor.dm | 6 +- code/game/gamemodes/meteor/meteors.dm | 2 +- code/game/gamemodes/objective.dm | 2 +- code/game/machinery/PDApainter.dm | 16 +- code/game/machinery/Sleeper.dm | 18 +- code/game/machinery/_machinery.dm | 32 +- code/game/machinery/ai_slipper.dm | 10 +- code/game/machinery/announcement_system.dm | 10 +- code/game/machinery/aug_manipulator.dm | 20 +- code/game/machinery/autolathe.dm | 12 +- code/game/machinery/bank_machine.dm | 2 +- code/game/machinery/buttons.dm | 20 +- code/game/machinery/camera/camera.dm | 54 +- code/game/machinery/camera/camera_assembly.dm | 48 +- code/game/machinery/camera/motion.dm | 2 +- code/game/machinery/camera/tracking.dm | 8 +- code/game/machinery/cell_charger.dm | 16 +- code/game/machinery/cloning.dm | 26 +- code/game/machinery/computer/Operating.dm | 6 +- code/game/machinery/computer/_computer.dm | 6 +- code/game/machinery/computer/aifixer.dm | 22 +- code/game/machinery/computer/apc_control.dm | 14 +- code/game/machinery/computer/arcade.dm | 50 +- code/game/machinery/computer/arena.dm | 18 +- code/game/machinery/computer/atmos_alert.dm | 4 +- code/game/machinery/computer/atmos_control.dm | 2 +- .../game/machinery/computer/buildandrepair.dm | 38 +- .../machinery/computer/camera_advanced.dm | 2 +- code/game/machinery/computer/card.dm | 24 +- code/game/machinery/computer/cloning.dm | 8 +- .../game/machinery/computer/communications.dm | 50 +- code/game/machinery/computer/dna_console.dm | 94 ++-- .../machinery/computer/launchpad_control.dm | 10 +- code/game/machinery/computer/law.dm | 14 +- code/game/machinery/computer/medical.dm | 2 +- code/game/machinery/computer/pod.dm | 2 +- .../machinery/computer/prisoner/_prisoner.dm | 14 +- .../computer/prisoner/gulag_teleporter.dm | 10 +- .../machinery/computer/prisoner/management.dm | 6 +- code/game/machinery/computer/robot.dm | 16 +- code/game/machinery/computer/security.dm | 12 +- code/game/machinery/computer/teleporter.dm | 2 +- code/game/machinery/computer/warrant.dm | 8 +- code/game/machinery/constructable_frame.dm | 46 +- code/game/machinery/dance_machine.dm | 14 +- code/game/machinery/defibrillator_mount.dm | 46 +- code/game/machinery/deployable.dm | 12 +- code/game/machinery/dish_drive.dm | 16 +- code/game/machinery/dna_scanner.dm | 18 +- code/game/machinery/doors/airlock.dm | 194 +++---- .../machinery/doors/airlock_electronics.dm | 2 +- code/game/machinery/doors/brigdoors.dm | 2 +- code/game/machinery/doors/door.dm | 12 +- code/game/machinery/doors/firedoor.dm | 130 ++--- code/game/machinery/doors/windowdoor.dm | 14 +- code/game/machinery/doppler_array.dm | 6 +- code/game/machinery/droneDispenser.dm | 22 +- .../embedded_controller/access_controller.dm | 6 +- code/game/machinery/exp_cloner.dm | 6 +- code/game/machinery/fat_sucker.dm | 30 +- code/game/machinery/firealarm.dm | 44 +- code/game/machinery/flasher.dm | 20 +- code/game/machinery/gulag_item_reclaimer.dm | 2 +- code/game/machinery/gulag_teleporter.dm | 16 +- code/game/machinery/harvester.dm | 22 +- code/game/machinery/hologram.dm | 12 +- code/game/machinery/igniter.dm | 4 +- code/game/machinery/iv_drip.dm | 38 +- code/game/machinery/launch_pad.dm | 22 +- code/game/machinery/limbgrower.dm | 8 +- code/game/machinery/mass_driver.dm | 2 +- code/game/machinery/medical_kiosk.dm | 28 +- code/game/machinery/navbeacon.dm | 10 +- code/game/machinery/newscaster.dm | 32 +- code/game/machinery/pipe/construction.dm | 18 +- code/game/machinery/pipe/pipe_dispenser.dm | 4 +- .../machinery/porta_turret/portable_turret.dm | 40 +- .../porta_turret/portable_turret_construct.dm | 40 +- .../porta_turret/portable_turret_cover.dm | 14 +- code/game/machinery/quantum_pad.dm | 34 +- code/game/machinery/recharger.dm | 18 +- code/game/machinery/rechargestation.dm | 4 +- code/game/machinery/recycler.dm | 4 +- code/game/machinery/requests_console.dm | 16 +- code/game/machinery/roulette_machine.dm | 24 +- code/game/machinery/scan_gate.dm | 12 +- code/game/machinery/shieldgen.dm | 82 +-- code/game/machinery/slotmachine.dm | 24 +- code/game/machinery/spaceheater.dm | 12 +- code/game/machinery/stasis.dm | 4 +- code/game/machinery/suit_storage_unit.dm | 56 +- code/game/machinery/syndicatebeacon.dm | 20 +- code/game/machinery/syndicatebomb.dm | 46 +- .../telecomms/computers/logbrowser.dm | 2 +- .../machinery/telecomms/computers/message.dm | 40 +- .../telecomms/machines/message_server.dm | 2 +- code/game/machinery/teleporter.dm | 28 +- code/game/machinery/washing_machine.dm | 16 +- code/game/machinery/wishgranter.dm | 14 +- code/game/mecha/combat/durand.dm | 4 +- code/game/mecha/equipment/mecha_equipment.dm | 6 +- .../mecha/equipment/tools/medical_tools.dm | 46 +- .../mecha/equipment/tools/mining_tools.dm | 12 +- .../game/mecha/equipment/tools/other_tools.dm | 26 +- code/game/mecha/equipment/tools/weapon_bay.dm | 4 +- code/game/mecha/equipment/tools/work_tools.dm | 76 +-- .../mecha/equipment/weapons/mecha_ammo.dm | 4 +- code/game/mecha/mech_bay.dm | 2 +- code/game/mecha/mech_fabricator.dm | 4 +- code/game/mecha/mecha.dm | 124 ++-- code/game/mecha/mecha_actions.dm | 24 +- code/game/mecha/mecha_construction_paths.dm | 532 +++++++++--------- code/game/mecha/mecha_defense.dm | 48 +- code/game/mecha/mecha_parts.dm | 4 +- code/game/mecha/mecha_topic.dm | 40 +- code/game/mecha/mecha_wreckage.dm | 20 +- code/game/mecha/working/ripley.dm | 8 +- code/game/objects/buckling.dm | 24 +- code/game/objects/effects/alien_acid.dm | 12 +- code/game/objects/effects/anomalies.dm | 2 +- code/game/objects/effects/contraband.dm | 18 +- code/game/objects/effects/decals/cleanable.dm | 8 +- .../objects/effects/decals/cleanable/food.dm | 2 +- .../objects/effects/decals/cleanable/misc.dm | 2 +- .../effects/decals/cleanable/robots.dm | 4 +- code/game/objects/effects/decals/remains.dm | 2 +- .../effects/effect_system/effects_foam.dm | 4 +- .../effects/effect_system/effects_other.dm | 4 +- .../effects/effect_system/effects_smoke.dm | 2 +- code/game/objects/effects/glowshroom.dm | 4 +- code/game/objects/effects/mines.dm | 18 +- code/game/objects/effects/spiders.dm | 16 +- code/game/objects/effects/step_triggers.dm | 2 +- code/game/objects/examine.dm | 16 +- code/game/objects/items.dm | 56 +- code/game/objects/items/AI_modules.dm | 36 +- code/game/objects/items/RCD.dm | 48 +- code/game/objects/items/RCL.dm | 18 +- code/game/objects/items/RPD.dm | 26 +- code/game/objects/items/RSF.dm | 50 +- code/game/objects/items/airlock_painter.dm | 22 +- code/game/objects/items/apc_frame.dm | 22 +- code/game/objects/items/blueprints.dm | 8 +- code/game/objects/items/body_egg.dm | 2 +- code/game/objects/items/bodybag.dm | 18 +- code/game/objects/items/candle.dm | 2 +- code/game/objects/items/cardboard_cutouts.dm | 16 +- code/game/objects/items/cards_ids.dm | 48 +- code/game/objects/items/charter.dm | 14 +- code/game/objects/items/chrono_eraser.dm | 8 +- code/game/objects/items/cigs_lighters.dm | 96 ++-- .../items/circuitboards/circuitboard.dm | 2 +- .../circuitboards/computer_circuitboards.dm | 24 +- .../circuitboards/machine_circuitboards.dm | 24 +- code/game/objects/items/clown_items.dm | 24 +- code/game/objects/items/control_wand.dm | 2 +- code/game/objects/items/cosmetics.dm | 94 ++-- code/game/objects/items/courtroom.dm | 4 +- code/game/objects/items/crab17.dm | 12 +- code/game/objects/items/crayons.dm | 48 +- code/game/objects/items/credit_holochip.dm | 8 +- code/game/objects/items/defib.dm | 118 ++-- code/game/objects/items/dehy_carp.dm | 10 +- code/game/objects/items/devices/PDA/PDA.dm | 82 +-- code/game/objects/items/devices/PDA/cart.dm | 4 +- .../objects/items/devices/PDA/virus_cart.dm | 26 +- code/game/objects/items/devices/aicard.dm | 8 +- .../items/devices/anomaly_neutralizer.dm | 2 +- code/game/objects/items/devices/beacon.dm | 2 +- code/game/objects/items/devices/camera_bug.dm | 6 +- .../objects/items/devices/chameleonproj.dm | 10 +- .../objects/items/devices/desynchronizer.dm | 12 +- .../devices/electroadaptive_pseudocircuit.dm | 14 +- code/game/objects/items/devices/flashlight.dm | 84 +-- .../items/devices/forcefieldprojector.dm | 14 +- .../objects/items/devices/geiger_counter.dm | 46 +- .../game/objects/items/devices/instruments.dm | 6 +- .../objects/items/devices/laserpointer.dm | 46 +- .../objects/items/devices/lightreplacer.dm | 28 +- code/game/objects/items/devices/megaphone.dm | 6 +- code/game/objects/items/devices/multitool.dm | 6 +- code/game/objects/items/devices/paicard.dm | 28 +- .../objects/items/devices/pipe_painter.dm | 4 +- code/game/objects/items/devices/powersink.dm | 22 +- .../objects/items/devices/pressureplates.dm | 6 +- .../objects/items/devices/quantum_keycard.dm | 8 +- .../items/devices/radio/electropack.dm | 8 +- .../items/devices/radio/encryptionkey.dm | 2 +- .../objects/items/devices/radio/headset.dm | 16 +- .../objects/items/devices/radio/intercom.dm | 18 +- .../game/objects/items/devices/radio/radio.dm | 20 +- .../items/devices/reverse_bear_trap.dm | 30 +- code/game/objects/items/devices/scanners.dm | 180 +++--- code/game/objects/items/devices/swapper.dm | 24 +- .../objects/items/devices/taperecorder.dm | 22 +- .../objects/items/devices/traitordevices.dm | 18 +- .../objects/items/devices/transfer_valve.dm | 12 +- code/game/objects/items/dice.dm | 12 +- code/game/objects/items/dna_injector.dm | 18 +- code/game/objects/items/documents.dm | 4 +- code/game/objects/items/eightball.dm | 6 +- code/game/objects/items/etherealdiscoball.dm | 10 +- code/game/objects/items/extinguisher.dm | 22 +- code/game/objects/items/flamethrower.dm | 16 +- code/game/objects/items/gift.dm | 8 +- code/game/objects/items/granters.dm | 74 +-- .../objects/items/grenades/chem_grenade.dm | 48 +- code/game/objects/items/grenades/flashbang.dm | 2 +- .../game/objects/items/grenades/ghettobomb.dm | 2 +- code/game/objects/items/grenades/grenade.dm | 16 +- code/game/objects/items/grenades/plastic.dm | 8 +- code/game/objects/items/handcuffs.dm | 68 +-- code/game/objects/items/his_grace.dm | 46 +- code/game/objects/items/holosign_creator.dm | 18 +- code/game/objects/items/holy_weapons.dm | 16 +- code/game/objects/items/hot_potato.dm | 20 +- code/game/objects/items/hourglass.dm | 6 +- .../items/implants/implant_abductor.dm | 2 +- .../objects/items/implants/implant_chem.dm | 4 +- .../items/implants/implant_explosive.dm | 6 +- .../objects/items/implants/implant_freedom.dm | 2 +- .../items/implants/implant_mindshield.dm | 8 +- .../objects/items/implants/implant_misc.dm | 2 +- .../objects/items/implants/implant_spell.dm | 2 +- .../objects/items/implants/implant_storage.dm | 2 +- .../objects/items/implants/implantcase.dm | 2 +- .../objects/items/implants/implantchair.dm | 16 +- code/game/objects/items/implants/implanter.dm | 10 +- .../game/objects/items/implants/implantpad.dm | 6 +- code/game/objects/items/inducer.dm | 30 +- code/game/objects/items/kitchen.dm | 22 +- code/game/objects/items/latexballoon.dm | 2 +- code/game/objects/items/manuals.dm | 4 +- code/game/objects/items/melee/energy.dm | 12 +- code/game/objects/items/melee/misc.dm | 60 +- code/game/objects/items/melee/transforming.dm | 4 +- code/game/objects/items/miscellaneous.dm | 6 +- code/game/objects/items/mop.dm | 12 +- code/game/objects/items/paiwire.dm | 2 +- code/game/objects/items/pet_carrier.dm | 70 +-- code/game/objects/items/pinpointer.dm | 10 +- code/game/objects/items/plushes.dm | 66 +-- code/game/objects/items/pneumaticCannon.dm | 42 +- code/game/objects/items/powerfist.dm | 34 +- code/game/objects/items/religion.dm | 12 +- code/game/objects/items/robot/ai_upgrades.dm | 12 +- code/game/objects/items/robot/robot_items.dm | 128 ++--- code/game/objects/items/robot/robot_parts.dm | 62 +- .../objects/items/robot/robot_upgrades.dm | 42 +- code/game/objects/items/rogueitems/bait.dm | 8 +- code/game/objects/items/rogueitems/bells.dm | 8 +- code/game/objects/items/rogueitems/books.dm | 20 +- code/game/objects/items/rogueitems/coins.dm | 6 +- .../objects/items/rogueitems/dmusicbox.dm | 4 +- .../game/objects/items/rogueitems/keyrings.dm | 6 +- code/game/objects/items/rogueitems/keys.dm | 36 +- code/game/objects/items/rogueitems/magic.dm | 18 +- code/game/objects/items/rogueitems/natural.dm | 2 +- .../items/rogueitems/natural/animals.dm | 2 +- .../rogueitems/natural/clothfibersthorn.dm | 32 +- .../items/rogueitems/natural/dirtclod.dm | 2 +- .../items/rogueitems/natural/stones.dm | 8 +- .../objects/items/rogueitems/natural/wood.dm | 6 +- code/game/objects/items/rogueitems/needle.dm | 26 +- .../game/objects/items/rogueitems/painting.dm | 2 +- .../objects/items/rogueitems/prostheticarm.dm | 8 +- .../objects/items/rogueitems/ropechainbola.dm | 24 +- code/game/objects/items/rogueitems/undies.dm | 2 +- .../objects/items/rogueweapons/integrity.dm | 2 +- .../objects/items/rogueweapons/intents.dm | 20 +- .../items/rogueweapons/melee/knives.dm | 24 +- .../items/rogueweapons/melee/special.dm | 10 +- .../items/rogueweapons/melee/swords.dm | 2 +- .../objects/items/rogueweapons/ranged/ammo.dm | 4 +- .../objects/items/rogueweapons/ranged/bows.dm | 4 +- .../items/rogueweapons/ranged/crossbows.dm | 6 +- .../objects/items/rogueweapons/rmb_intents.dm | 8 +- .../objects/items/rogueweapons/rogueweapon.dm | 2 +- .../objects/items/rogueweapons/shields.dm | 6 +- code/game/objects/items/sharpener.dm | 18 +- code/game/objects/items/shields.dm | 30 +- code/game/objects/items/shooting_range.dm | 4 +- code/game/objects/items/signs.dm | 6 +- code/game/objects/items/singularityhammer.dm | 6 +- code/game/objects/items/stacks/bscrystal.dm | 10 +- code/game/objects/items/stacks/medical.dm | 66 +-- code/game/objects/items/stacks/rods.dm | 14 +- .../game/objects/items/stacks/sheets/glass.dm | 16 +- .../objects/items/stacks/sheets/leather.dm | 4 +- .../game/objects/items/stacks/sheets/light.dm | 4 +- .../objects/items/stacks/sheets/mineral.dm | 4 +- .../items/stacks/sheets/sheet_types.dm | 8 +- code/game/objects/items/stacks/stack.dm | 32 +- code/game/objects/items/stacks/telecrystal.dm | 6 +- .../objects/items/stacks/tiles/tile_types.dm | 20 +- code/game/objects/items/stacks/wrap.dm | 12 +- code/game/objects/items/storage/backpack.dm | 4 +- code/game/objects/items/storage/bags.dm | 14 +- code/game/objects/items/storage/belt.dm | 8 +- code/game/objects/items/storage/book.dm | 48 +- code/game/objects/items/storage/boxes.dm | 26 +- code/game/objects/items/storage/fancy.dm | 10 +- code/game/objects/items/storage/firstaid.dm | 16 +- code/game/objects/items/storage/lockbox.dm | 14 +- code/game/objects/items/storage/secure.dm | 10 +- code/game/objects/items/storage/toolbox.dm | 8 +- code/game/objects/items/storage/wallets.dm | 2 +- code/game/objects/items/stunbaton.dm | 36 +- code/game/objects/items/tanks/jetpack.dm | 14 +- code/game/objects/items/tanks/tanks.dm | 20 +- code/game/objects/items/tanks/watertank.dm | 30 +- code/game/objects/items/taster.dm | 2 +- code/game/objects/items/teleportation.dm | 18 +- code/game/objects/items/teleprod.dm | 8 +- code/game/objects/items/theft_tools.dm | 32 +- code/game/objects/items/tools/crowbar.dm | 12 +- code/game/objects/items/tools/screwdriver.dm | 12 +- code/game/objects/items/tools/weldingtool.dm | 32 +- code/game/objects/items/tools/wirecutters.dm | 8 +- code/game/objects/items/tools/wrench.dm | 4 +- code/game/objects/items/toys.dm | 140 ++--- code/game/objects/items/twohanded.dm | 70 +-- code/game/objects/items/weaponry.dm | 80 +-- code/game/objects/obj_defense.dm | 6 +- code/game/objects/objs.dm | 12 +- code/game/objects/structures.dm | 16 +- code/game/objects/structures/ai_core.dm | 62 +- code/game/objects/structures/aliens.dm | 8 +- code/game/objects/structures/artstuff.dm | 4 +- code/game/objects/structures/barsigns.dm | 18 +- .../structures/beds_chairs/alien_nest.dm | 26 +- .../objects/structures/beds_chairs/bed.dm | 18 +- .../objects/structures/beds_chairs/chair.dm | 32 +- code/game/objects/structures/bedsheet_bin.dm | 18 +- .../structures/crates_lockers/closets.dm | 58 +- .../crates_lockers/closets/bodybag.dm | 20 +- .../crates_lockers/closets/infinite.dm | 2 +- .../crates_lockers/closets/secure/personal.dm | 4 +- .../structures/crates_lockers/crates.dm | 4 +- .../structures/crates_lockers/crates/bins.dm | 2 +- .../structures/crates_lockers/crates/large.dm | 10 +- .../crates_lockers/crates/secure.dm | 16 +- code/game/objects/structures/displaycase.dm | 66 +-- code/game/objects/structures/divine.dm | 6 +- code/game/objects/structures/door_assembly.dm | 96 ++-- code/game/objects/structures/dresser.dm | 6 +- code/game/objects/structures/electricchair.dm | 4 +- code/game/objects/structures/extinguisher.dm | 14 +- code/game/objects/structures/false_walls.dm | 16 +- code/game/objects/structures/fence.dm | 22 +- code/game/objects/structures/fireaxe.dm | 16 +- code/game/objects/structures/fireplace.dm | 6 +- code/game/objects/structures/flora.dm | 8 +- code/game/objects/structures/fluff.dm | 26 +- .../objects/structures/ghost_role_spawners.dm | 4 +- code/game/objects/structures/girders.dm | 126 ++--- code/game/objects/structures/grille.dm | 30 +- code/game/objects/structures/guillotine.dm | 26 +- code/game/objects/structures/guncase.dm | 4 +- code/game/objects/structures/headpike.dm | 2 +- code/game/objects/structures/hivebot.dm | 6 +- code/game/objects/structures/holosign.dm | 4 +- code/game/objects/structures/janicart.dm | 24 +- code/game/objects/structures/kitchen_spike.dm | 36 +- code/game/objects/structures/ladders.dm | 8 +- code/game/objects/structures/lattice.dm | 8 +- .../objects/structures/lavaland/geyser.dm | 4 +- .../structures/lavaland/necropolis_tendril.dm | 6 +- code/game/objects/structures/life_candle.dm | 4 +- code/game/objects/structures/loom.dm | 8 +- code/game/objects/structures/maneater.dm | 10 +- code/game/objects/structures/mineral_doors.dm | 78 +-- code/game/objects/structures/mirror.dm | 10 +- code/game/objects/structures/mop_bucket.dm | 4 +- code/game/objects/structures/morgue.dm | 28 +- code/game/objects/structures/musician.dm | 2 +- code/game/objects/structures/noticeboard.dm | 8 +- .../objects/structures/petrified_statue.dm | 6 +- code/game/objects/structures/plasticflaps.dm | 12 +- code/game/objects/structures/reflector.dm | 44 +- code/game/objects/structures/roguetent.dm | 4 +- .../game/objects/structures/roguetown/bell.dm | 10 +- .../game/objects/structures/roguetown/gate.dm | 4 +- .../objects/structures/roguetown/handcart.dm | 2 +- .../game/objects/structures/roguetown/loot.dm | 2 +- .../objects/structures/roguetown/newtree.dm | 6 +- .../objects/structures/roguetown/redstone.dm | 2 +- .../structures/roguetown/rogueflora.dm | 14 +- .../objects/structures/roguetown/telescope.dm | 6 +- code/game/objects/structures/roguewindow.dm | 10 +- code/game/objects/structures/safe.dm | 24 +- code/game/objects/structures/showcase.dm | 6 +- code/game/objects/structures/shower.dm | 10 +- code/game/objects/structures/signs/_signs.dm | 12 +- code/game/objects/structures/spirit_board.dm | 8 +- code/game/objects/structures/statues.dm | 8 +- code/game/objects/structures/table_frames.dm | 14 +- code/game/objects/structures/tables_racks.dm | 60 +- .../game/objects/structures/tank_dispenser.dm | 6 +- code/game/objects/structures/target_stake.dm | 6 +- .../structures/transit_tubes/station.dm | 12 +- .../structures/transit_tubes/transit_tube.dm | 6 +- .../transit_tube_construction.dm | 4 +- .../transit_tubes/transit_tube_pod.dm | 8 +- code/game/objects/structures/traps.dm | 16 +- code/game/objects/structures/votingbox.dm | 24 +- code/game/objects/structures/watercloset.dm | 94 ++-- code/game/objects/structures/well.dm | 4 +- .../objects/structures/windoor_assembly.dm | 66 +-- code/game/objects/structures/window.dm | 134 ++--- code/game/shuttle_engines.dm | 20 +- code/game/turfs/closed/_closed.dm | 22 +- code/game/turfs/closed/minerals.dm | 22 +- code/game/turfs/closed/wall/reinf_walls.dm | 64 +-- code/game/turfs/closed/wall/roguewalls.dm | 6 +- code/game/turfs/closed/walls.dm | 26 +- code/game/turfs/open/_open.dm | 2 +- code/game/turfs/open/chasm.dm | 12 +- code/game/turfs/open/floor.dm | 12 +- code/game/turfs/open/floor/fancy_floor.dm | 12 +- code/game/turfs/open/floor/light_floor.dm | 6 +- code/game/turfs/open/floor/plasteel_floor.dm | 2 +- code/game/turfs/open/floor/plating.dm | 30 +- .../game/turfs/open/floor/plating/asteroid.dm | 8 +- code/game/turfs/open/floor/reinf_floor.dm | 4 +- code/game/turfs/open/floor/roguefloor.dm | 2 +- code/game/turfs/open/lava.dm | 2 +- code/game/turfs/open/openspace.dm | 28 +- code/game/turfs/open/space/space.dm | 18 +- code/game/turfs/open/water.dm | 10 +- code/game/turfs/turf.dm | 6 +- code/game/world.dm | 6 +- code/modules/admin/IsBanned.dm | 16 +- code/modules/admin/admin.dm | 28 +- code/modules/admin/admin_investigate.dm | 2 +- code/modules/admin/admin_ranks.dm | 4 +- code/modules/admin/admin_verbs.dm | 34 +- code/modules/admin/antag_panel.dm | 10 +- code/modules/admin/callproc/callproc.dm | 12 +- code/modules/admin/fun_balloon.dm | 14 +- code/modules/admin/outfits.dm | 8 +- code/modules/admin/patreon.dm | 16 +- code/modules/admin/permissionedit.dm | 26 +- code/modules/admin/playerquality.dm | 12 +- code/modules/admin/poll_management.dm | 28 +- code/modules/admin/secrets.dm | 26 +- code/modules/admin/sound_emitter.dm | 18 +- code/modules/admin/sql_ban_system.dm | 30 +- code/modules/admin/sql_message_system.dm | 16 +- code/modules/admin/stickyban.dm | 64 +-- code/modules/admin/topic.dm | 80 +-- code/modules/admin/verbs/SDQL2/SDQL_2.dm | 30 +- .../admin/verbs/SDQL2/SDQL_2_parser.dm | 2 +- code/modules/admin/verbs/adminhelp.dm | 22 +- code/modules/admin/verbs/adminpm.dm | 48 +- code/modules/admin/verbs/borgpanel.dm | 2 +- code/modules/admin/verbs/deadsay.dm | 4 +- code/modules/admin/verbs/debug.dm | 34 +- code/modules/admin/verbs/fps.dm | 2 +- .../admin/verbs/map_template_loadverb.dm | 12 +- code/modules/admin/verbs/maprotation.dm | 8 +- code/modules/admin/verbs/onlyone.dm | 8 +- code/modules/admin/verbs/panicbunker.dm | 2 +- code/modules/admin/verbs/playsound.dm | 22 +- code/modules/admin/verbs/pray.dm | 16 +- code/modules/admin/verbs/randomverbs.dm | 64 +-- .../admin/verbs/reestablish_db_connection.dm | 2 +- code/modules/admin/verbs/schizohelp.dm | 18 +- code/modules/admin/verbs/tripAI.dm | 4 +- .../admin/view_variables/topic_basic.dm | 4 +- .../admin/view_variables/view_variables.dm | 2 +- .../antagonists/_common/antag_datum.dm | 6 +- .../antagonists/_common/antag_spawner.dm | 26 +- .../modules/antagonists/_common/antag_team.dm | 8 +- code/modules/antagonists/abductor/abductor.dm | 18 +- .../abductor/equipment/abduction_gear.dm | 134 ++--- .../abductor/equipment/abduction_surgery.dm | 10 +- .../antagonists/abductor/equipment/gland.dm | 8 +- .../abductor/equipment/glands/access.dm | 2 +- .../abductor/equipment/glands/blood.dm | 2 +- .../abductor/equipment/glands/egg.dm | 2 +- .../abductor/equipment/glands/electric.dm | 4 +- .../abductor/equipment/glands/heal.dm | 34 +- .../abductor/equipment/glands/mindshock.dm | 12 +- .../abductor/equipment/glands/plasma.dm | 6 +- .../abductor/equipment/glands/quantum.dm | 10 +- .../abductor/equipment/glands/slime.dm | 2 +- .../abductor/equipment/glands/spider.dm | 2 +- .../abductor/equipment/glands/transform.dm | 2 +- .../abductor/equipment/glands/trauma.dm | 2 +- .../abductor/equipment/glands/ventcrawl.dm | 2 +- .../abductor/equipment/glands/viral.dm | 2 +- .../antagonists/abductor/machinery/console.dm | 20 +- .../abductor/machinery/experiment.dm | 42 +- .../antagonists/abductor/machinery/pad.dm | 2 +- code/modules/antagonists/blob/blob.dm | 2 +- code/modules/antagonists/blob/blob_mobs.dm | 2 +- .../blob/blobstrains/_blobstrain.dm | 2 +- .../blob/blobstrains/debris_devourer.dm | 10 +- .../blob/blobstrains/pressurized_slime.dm | 2 +- .../blob/blobstrains/reactive_spines.dm | 2 +- .../blob/blobstrains/zombifying_pods.dm | 4 +- code/modules/antagonists/blob/overmind.dm | 8 +- code/modules/antagonists/blob/powers.dm | 64 +-- .../antagonists/blob/structures/factory.dm | 2 +- .../antagonists/blob/structures/shield.dm | 2 +- .../blood_contract/blood_contract.dm | 4 +- .../antagonists/brainwashing/brainwashing.dm | 4 +- code/modules/antagonists/brother/brother.dm | 10 +- .../antagonists/changeling/changeling.dm | 44 +- .../changeling/changeling_power.dm | 12 +- .../antagonists/changeling/powers/absorb.dm | 28 +- .../changeling/powers/adrenaline.dm | 2 +- .../changeling/powers/biodegrade.dm | 28 +- .../changeling/powers/digitalcamo.dm | 4 +- .../changeling/powers/fakedeath.dm | 8 +- .../changeling/powers/fleshmend.dm | 4 +- .../antagonists/changeling/powers/headcrab.dm | 6 +- .../antagonists/changeling/powers/hivemind.dm | 14 +- .../changeling/powers/humanform.dm | 4 +- .../changeling/powers/lesserform.dm | 2 +- .../antagonists/changeling/powers/linglink.dm | 34 +- .../changeling/powers/mimic_voice.dm | 6 +- .../changeling/powers/mutations.dm | 58 +- .../antagonists/changeling/powers/panacea.dm | 2 +- .../changeling/powers/pheromone_receptors.dm | 4 +- .../changeling/powers/strained_muscles.dm | 10 +- .../changeling/powers/tiny_prick.dm | 26 +- .../changeling/powers/transform.dm | 16 +- code/modules/antagonists/creep/creep.dm | 14 +- code/modules/antagonists/cult/blood_magic.dm | 166 +++--- code/modules/antagonists/cult/cult.dm | 24 +- code/modules/antagonists/cult/cult_comms.dm | 52 +- code/modules/antagonists/cult/cult_items.dm | 88 +-- .../antagonists/cult/cult_structures.dm | 50 +- code/modules/antagonists/cult/ritual.dm | 40 +- .../antagonists/cult/rune_spawn_action.dm | 6 +- code/modules/antagonists/cult/runes.dm | 140 ++--- code/modules/antagonists/devil/devil.dm | 48 +- .../antagonists/devil/devil_helpers.dm | 6 +- .../devil/true_devil/_true_devil.dm | 34 +- .../antagonists/disease/disease_abilities.dm | 12 +- .../antagonists/disease/disease_datum.dm | 8 +- .../antagonists/disease/disease_mob.dm | 24 +- code/modules/antagonists/fugitive/fugitive.dm | 18 +- .../antagonists/fugitive/fugitive_ship.dm | 6 +- code/modules/antagonists/fugitive/hunter.dm | 32 +- code/modules/antagonists/monkey/monkey.dm | 18 +- code/modules/antagonists/morph/morph.dm | 26 +- .../nukeop/equipment/borgchameleon.dm | 16 +- .../nukeop/equipment/nuclear_challenge.dm | 14 +- .../nukeop/equipment/nuclearbomb.dm | 48 +- .../nukeop/equipment/pinpointer.dm | 4 +- code/modules/antagonists/nukeop/nukeop.dm | 26 +- code/modules/antagonists/pirate/pirate.dm | 8 +- code/modules/antagonists/revenant/revenant.dm | 58 +- .../revenant/revenant_abilities.dm | 68 +-- .../antagonists/revenant/revenant_blight.dm | 8 +- .../antagonists/revolution/revolution.dm | 32 +- .../roguetown/roleobjs/prisoner.dm | 6 +- .../roguetown/roleobjs/purishep.dm | 4 +- .../roguetown/roleobjs/skeleton.dm | 10 +- .../antagonists/roguetown/villain/aspirant.dm | 30 +- .../antagonists/roguetown/villain/bandit.dm | 14 +- .../roguetown/villain/maniac/maniac.dm | 30 +- .../roguetown/villain/maniac/maniac_life.dm | 4 +- .../villain/maniac/maniac_wonders.dm | 6 +- .../roguetown/villain/peasantrebel.dm | 24 +- .../antagonists/roguetown/villain/vampire.dm | 60 +- .../roguetown/villain/vampirelord.dm | 80 +-- .../roguetown/villain/werewolf/werewolf.dm | 22 +- .../villain/werewolf/werewolf_spells.dm | 2 +- .../werewolf/werewolf_transformation.dm | 12 +- .../antagonists/roguetown/villain/zomble.dm | 20 +- code/modules/antagonists/santa/santa.dm | 2 +- .../antagonists/slaughter/slaughter.dm | 14 +- .../antagonists/survivalist/survivalist.dm | 2 +- code/modules/antagonists/swarmer/swarmer.dm | 96 ++-- .../antagonists/swarmer/swarmer_event.dm | 2 +- .../traitor/IAA/internal_affairs.dm | 28 +- .../antagonists/traitor/datum_traitor.dm | 16 +- .../traitor/equipment/Malf_Modules.dm | 120 ++-- .../traitor/equipment/contractor.dm | 8 +- .../antagonists/traitor/syndicate_contract.dm | 10 +- .../antagonists/valentines/heartbreaker.dm | 2 +- .../antagonists/valentines/valentine.dm | 6 +- .../antagonists/wizard/equipment/artefact.dm | 36 +- .../antagonists/wizard/equipment/soulstone.dm | 32 +- .../antagonists/wizard/equipment/spellbook.dm | 36 +- code/modules/antagonists/wizard/wizard.dm | 12 +- code/modules/antagonists/xeno/xeno.dm | 2 +- code/modules/assembly/assembly.dm | 12 +- code/modules/assembly/bomb.dm | 12 +- code/modules/assembly/doorcontrol.dm | 2 +- code/modules/assembly/flash.dm | 56 +- code/modules/assembly/health.dm | 6 +- code/modules/assembly/holder.dm | 4 +- code/modules/assembly/igniter.dm | 2 +- code/modules/assembly/infrared.dm | 2 +- code/modules/assembly/mousetrap.dm | 30 +- code/modules/assembly/proximity.dm | 2 +- code/modules/assembly/shock_kit.dm | 2 +- code/modules/assembly/signaler.dm | 12 +- code/modules/assembly/timer.dm | 6 +- code/modules/assembly/voice.dm | 4 +- .../atmospherics/machinery/airalarm.dm | 44 +- .../atmospherics/machinery/atmosmachinery.dm | 18 +- .../components/binary_devices/circulator.dm | 10 +- .../components/binary_devices/passive_gate.dm | 2 +- .../components/binary_devices/pump.dm | 2 +- .../components/binary_devices/volume_pump.dm | 2 +- .../machinery/components/components_base.dm | 2 +- .../components/trinary_devices/filter.dm | 2 +- .../components/trinary_devices/mixer.dm | 2 +- .../components/unary_devices/cryo.dm | 22 +- .../unary_devices/outlet_injector.dm | 2 +- .../unary_devices/portables_connector.dm | 2 +- .../components/unary_devices/thermomachine.dm | 6 +- .../components/unary_devices/vent_pump.dm | 10 +- .../components/unary_devices/vent_scrubber.dm | 10 +- .../atmospherics/machinery/other/meter.dm | 6 +- .../atmospherics/machinery/other/miner.dm | 10 +- .../machinery/portable/canister.dm | 6 +- .../portable/portable_atmospherics.dm | 20 +- code/modules/awaymissions/capture_the_flag.dm | 30 +- code/modules/awaymissions/corpse.dm | 12 +- code/modules/awaymissions/gateway.dm | 8 +- .../awaymissions/mission_code/Academy.dm | 50 +- .../awaymissions/mission_code/snowdin.dm | 12 +- .../awaymissions/mission_code/wildwest.dm | 6 +- code/modules/awaymissions/signpost.dm | 2 +- .../modules/awaymissions/super_secret_room.dm | 2 +- code/modules/awaymissions/zlevel.dm | 4 +- code/modules/buildmode/bm_mode.dm | 6 +- code/modules/buildmode/submodes/advanced.dm | 22 +- code/modules/buildmode/submodes/area_edit.dm | 12 +- code/modules/buildmode/submodes/basic.dm | 18 +- code/modules/buildmode/submodes/boom.dm | 8 +- code/modules/buildmode/submodes/copy.dm | 10 +- code/modules/buildmode/submodes/fill.dm | 12 +- code/modules/buildmode/submodes/mapgen.dm | 12 +- code/modules/buildmode/submodes/throwing.dm | 8 +- .../buildmode/submodes/variable_edit.dm | 22 +- code/modules/cargo/console.dm | 4 +- code/modules/cargo/export_scanner.dm | 12 +- code/modules/cargo/expressconsole.dm | 10 +- code/modules/cargo/gondolapod.dm | 8 +- code/modules/cargo/supplypod.dm | 2 +- code/modules/cargo/supplypod_beacon.dm | 8 +- code/modules/client/client_procs.dm | 54 +- code/modules/client/preferences.dm | 28 +- code/modules/client/preferences_savefile.dm | 2 +- code/modules/client/preferences_toggles.dm | 4 +- code/modules/client/verbs/etips.dm | 4 +- code/modules/client/verbs/ghost.dm | 2 +- code/modules/client/verbs/ooc.dm | 48 +- code/modules/client/verbs/ping.dm | 2 +- code/modules/client/verbs/suicide.dm | 40 +- code/modules/client/verbs/who.dm | 16 +- code/modules/clothing/chameleon.dm | 6 +- code/modules/clothing/clothing.dm | 34 +- code/modules/clothing/ears/_ears.dm | 2 +- code/modules/clothing/glasses/_glasses.dm | 16 +- .../clothing/glasses/engine_goggles.dm | 7 +- code/modules/clothing/glasses/hud.dm | 2 +- code/modules/clothing/gloves/_gloves.dm | 2 +- code/modules/clothing/gloves/color.dm | 2 +- code/modules/clothing/head/_head.dm | 12 +- code/modules/clothing/head/helmet.dm | 14 +- code/modules/clothing/head/jobs.dm | 20 +- code/modules/clothing/head/misc.dm | 6 +- code/modules/clothing/head/misc_special.dm | 18 +- code/modules/clothing/head/soft_caps.dm | 6 +- code/modules/clothing/masks/_masks.dm | 6 +- code/modules/clothing/masks/breath.dm | 4 +- code/modules/clothing/masks/gasmask.dm | 6 +- code/modules/clothing/masks/hailer.dm | 20 +- code/modules/clothing/masks/miscellaneous.dm | 12 +- code/modules/clothing/neck/_neck.dm | 20 +- code/modules/clothing/rogueclothes/cloaks.dm | 8 +- code/modules/clothing/rogueclothes/hats.dm | 4 +- code/modules/clothing/rogueclothes/neck.dm | 12 +- code/modules/clothing/rogueclothes/quiver.dm | 4 +- code/modules/clothing/rogueclothes/rings.dm | 10 +- code/modules/clothing/shoes/_shoes.dm | 4 +- code/modules/clothing/shoes/bananashoes.dm | 12 +- code/modules/clothing/shoes/colour.dm | 4 +- code/modules/clothing/shoes/magboots.dm | 2 +- code/modules/clothing/shoes/miscellaneous.dm | 20 +- .../modules/clothing/spacesuits/chronosuit.dm | 6 +- code/modules/clothing/spacesuits/hardsuit.dm | 28 +- .../clothing/spacesuits/miscellaneous.dm | 2 +- code/modules/clothing/spacesuits/plasmamen.dm | 12 +- code/modules/clothing/suits/cloaks.dm | 2 +- .../modules/clothing/suits/reactive_armour.dm | 30 +- code/modules/clothing/suits/toggles.dm | 16 +- code/modules/clothing/suits/wiz_robe.dm | 8 +- code/modules/clothing/under/_under.dm | 12 +- code/modules/clothing/under/accessories.dm | 24 +- .../under/jobs/Plasmaman/civilian_service.dm | 2 +- code/modules/clothing/under/miscellaneous.dm | 8 +- code/modules/detectivework/evidence.dm | 18 +- .../detectivework/footprints_and_rag.dm | 10 +- code/modules/detectivework/scanner.dm | 36 +- code/modules/discord/accountlink.dm | 6 +- code/modules/discord/manipulation.dm | 8 +- code/modules/discord/toggle_notify.dm | 12 +- code/modules/economy/pay_stand.dm | 20 +- code/modules/events/_event.dm | 2 +- code/modules/events/brand_intelligence.dm | 2 +- code/modules/events/fake_virus.dm | 2 +- code/modules/events/holiday/vday.dm | 4 +- code/modules/events/holiday/xmas.dm | 2 +- code/modules/events/immovable_rod.dm | 10 +- code/modules/events/pirates.dm | 18 +- code/modules/events/sentience.dm | 2 +- code/modules/events/spacevine.dm | 10 +- code/modules/events/wizard/aid.dm | 4 +- code/modules/events/wizard/ghost.dm | 2 +- code/modules/events/wizard/greentext.dm | 6 +- code/modules/events/wizard/invincible.dm | 2 +- code/modules/events/wizard/race.dm | 2 +- code/modules/fields/fields.dm | 2 +- code/modules/fields/peaceborg_dampener.dm | 2 +- code/modules/flufftext/Dreaming.dm | 2 +- code/modules/flufftext/Hallucination.dm | 46 +- code/modules/food_and_drinks/drinks/drinks.dm | 40 +- .../food_and_drinks/drinks/drinks/bottle.dm | 16 +- .../drinks/drinks/drinkingglass.dm | 12 +- code/modules/food_and_drinks/food.dm | 8 +- .../modules/food_and_drinks/food/condiment.dm | 38 +- .../food_and_drinks/food/customizables.dm | 10 +- code/modules/food_and_drinks/food/snacks.dm | 66 +-- .../food_and_drinks/food/snacks/dough.dm | 8 +- .../food_and_drinks/food/snacks/meat.dm | 2 +- .../food_and_drinks/food/snacks_burgers.dm | 2 +- .../food_and_drinks/food/snacks_egg.dm | 14 +- .../food_and_drinks/food/snacks_meat.dm | 4 +- .../food_and_drinks/food/snacks_other.dm | 4 +- .../food_and_drinks/food/snacks_pastry.dm | 6 +- .../food_and_drinks/food/snacks_pie.dm | 2 +- .../food_and_drinks/food/snacks_pizza.dm | 2 +- .../food_and_drinks/food/snacks_spaghetti.dm | 4 +- .../kitchen_machinery/deep_fryer.dm | 24 +- .../kitchen_machinery/food_cart.dm | 14 +- .../kitchen_machinery/gibber.dm | 22 +- .../kitchen_machinery/grill.dm | 12 +- .../kitchen_machinery/icecream_vat.dm | 18 +- .../kitchen_machinery/microwave.dm | 54 +- .../kitchen_machinery/monkeyrecycler.dm | 18 +- .../kitchen_machinery/processor.dm | 34 +- .../kitchen_machinery/smartfridge.dm | 24 +- code/modules/food_and_drinks/pizzabox.dm | 36 +- .../food_and_drinks/recipes/drinks_recipes.dm | 2 +- code/modules/games/cas.dm | 20 +- code/modules/goonchat/browserOutput.dm | 2 +- code/modules/holiday/easter.dm | 2 +- code/modules/holiday/halloween.dm | 16 +- code/modules/holodeck/computer.dm | 4 +- code/modules/holodeck/items.dm | 28 +- code/modules/hydroponics/beekeeping/beebox.dm | 40 +- code/modules/hydroponics/biogenerator.dm | 32 +- code/modules/hydroponics/fermenting_barrel.dm | 12 +- code/modules/hydroponics/gene_modder.dm | 18 +- code/modules/hydroponics/grown.dm | 10 +- code/modules/hydroponics/grown/apple.dm | 2 +- code/modules/hydroponics/grown/banana.dm | 4 +- code/modules/hydroponics/grown/cereals.dm | 2 +- code/modules/hydroponics/grown/chili.dm | 2 +- code/modules/hydroponics/grown/citrus.dm | 2 +- code/modules/hydroponics/grown/corn.dm | 4 +- code/modules/hydroponics/grown/cotton.dm | 4 +- code/modules/hydroponics/grown/flowers.dm | 6 +- .../modules/hydroponics/grown/grass_carpet.dm | 2 +- code/modules/hydroponics/grown/kudzu.dm | 12 +- code/modules/hydroponics/grown/melon.dm | 6 +- code/modules/hydroponics/grown/misc.dm | 2 +- code/modules/hydroponics/grown/mushrooms.dm | 8 +- code/modules/hydroponics/grown/nettle.dm | 10 +- code/modules/hydroponics/grown/potato.dm | 2 +- code/modules/hydroponics/grown/pumpkin.dm | 2 +- code/modules/hydroponics/grown/replicapod.dm | 4 +- code/modules/hydroponics/grown/root.dm | 2 +- code/modules/hydroponics/grown/tomato.dm | 6 +- code/modules/hydroponics/grown/towercap.dm | 10 +- code/modules/hydroponics/hydroitemdefines.dm | 14 +- code/modules/hydroponics/hydroponics.dm | 88 +-- code/modules/hydroponics/plant_genes.dm | 18 +- code/modules/hydroponics/roguebin.dm | 30 +- code/modules/hydroponics/seed_extractor.dm | 14 +- code/modules/hydroponics/seeds.dm | 24 +- code/modules/jobs/job_exp.dm | 14 +- code/modules/jobs/job_types/old/chaplain.dm | 2 +- code/modules/jobs/job_types/old/mime.dm | 2 +- .../roguetown/adventurer/adventurer.dm | 6 +- .../roguetown/adventurer/types/_advclass.dm | 2 +- .../adventurer/types/combat/barbarian.dm | 10 +- .../roguetown/adventurer/types/combat/bard.dm | 4 +- .../adventurer/types/combat/cleric.dm | 4 +- .../types/combat/donator/paladin.dm | 6 +- .../roguetown/adventurer/types/combat/mage.dm | 2 +- .../roguetown/adventurer/types/combat/monk.dm | 2 +- .../adventurer/types/combat/ranger.dm | 6 +- .../adventurer/types/combat/warrior.dm | 4 +- .../jobs/job_types/roguetown/church/priest.dm | 6 +- .../job_types/roguetown/church/puritan.dm | 10 +- .../job_types/roguetown/goblin/goblinking.dm | 4 +- .../job_types/roguetown/nobility/bailiff.dm | 8 +- .../jobs/job_types/roguetown/nobility/lord.dm | 6 +- .../job_types/roguetown/nobility/sheriff.dm | 6 +- .../job_types/roguetown/peasants/bathmaid.dm | 14 +- code/modules/keybindings/bindings_client.dm | 2 +- code/modules/language/codespeak.dm | 12 +- code/modules/library/book.dm | 4 +- code/modules/library/lib_codex_gigas.dm | 8 +- code/modules/library/lib_items.dm | 28 +- code/modules/library/lib_machines.dm | 18 +- code/modules/library/random_books.dm | 2 +- code/modules/library/soapstone.dm | 16 +- code/modules/mining/abandoned_crates.dm | 18 +- code/modules/mining/aux_base.dm | 52 +- code/modules/mining/aux_base_camera.dm | 18 +- .../modules/mining/equipment/explorer_gear.dm | 4 +- .../mining/equipment/kinetic_crusher.dm | 18 +- .../mining/equipment/lazarus_injector.dm | 12 +- .../mining/equipment/marker_beacons.dm | 14 +- code/modules/mining/equipment/mining_tools.dm | 8 +- .../mining/equipment/regenerative_core.dm | 18 +- code/modules/mining/equipment/resonator.dm | 6 +- code/modules/mining/equipment/survival_pod.dm | 14 +- .../mining/equipment/wormhole_jaunter.dm | 12 +- code/modules/mining/fulton.dm | 16 +- code/modules/mining/laborcamp/laborshuttle.dm | 4 +- code/modules/mining/laborcamp/laborstacker.dm | 26 +- code/modules/mining/lavaland/ash_flora.dm | 10 +- .../mining/lavaland/necropolis_chests.dm | 132 ++--- code/modules/mining/lavaland/ruins/gym.dm | 2 +- code/modules/mining/machine_redemption.dm | 22 +- code/modules/mining/machine_silo.dm | 14 +- code/modules/mining/machine_stacking.dm | 6 +- code/modules/mining/machine_vending.dm | 18 +- code/modules/mining/mine_items.dm | 2 +- code/modules/mining/minebot.dm | 34 +- code/modules/mining/ores_coins.dm | 38 +- code/modules/mining/satchel_ore_boxdm.dm | 10 +- code/modules/mob/dead/dead.dm | 4 +- code/modules/mob/dead/new_player/login.dm | 18 +- .../modules/mob/dead/new_player/new_player.dm | 34 +- code/modules/mob/dead/new_player/poll.dm | 34 +- code/modules/mob/dead/observer/observer.dm | 62 +- code/modules/mob/emote.dm | 4 +- code/modules/mob/inventory.dm | 8 +- code/modules/mob/living/blood.dm | 18 +- code/modules/mob/living/bloodcrawl.dm | 28 +- code/modules/mob/living/brain/MMI.dm | 28 +- code/modules/mob/living/brain/death.dm | 4 +- code/modules/mob/living/brain/posibrain.dm | 20 +- code/modules/mob/living/carbon/alien/alien.dm | 4 +- .../mob/living/carbon/alien/alien_defense.dm | 10 +- .../carbon/alien/humanoid/alien_powers.dm | 46 +- .../carbon/alien/humanoid/caste/drone.dm | 8 +- .../carbon/alien/humanoid/caste/hunter.dm | 10 +- .../carbon/alien/humanoid/caste/praetorian.dm | 6 +- .../living/carbon/alien/humanoid/humanoid.dm | 8 +- .../carbon/alien/humanoid/humanoid_defense.dm | 42 +- .../mob/living/carbon/alien/humanoid/queen.dm | 26 +- .../mob/living/carbon/alien/larva/larva.dm | 4 +- .../carbon/alien/larva/larva_defense.dm | 12 +- .../mob/living/carbon/alien/larva/powers.dm | 22 +- .../modules/mob/living/carbon/alien/organs.dm | 8 +- .../carbon/alien/special/alien_embryo.dm | 18 +- .../living/carbon/alien/special/facehugger.dm | 28 +- code/modules/mob/living/carbon/carbon.dm | 83 +-- .../mob/living/carbon/carbon_defense.dm | 68 +-- .../modules/mob/living/carbon/carbon_topic.dm | 16 +- code/modules/mob/living/carbon/death.dm | 2 +- code/modules/mob/living/carbon/examine.dm | 20 +- .../mob/living/carbon/human/examine.dm | 66 +-- code/modules/mob/living/carbon/human/human.dm | 68 +-- .../mob/living/carbon/human/human_defense.dm | 132 ++--- .../mob/living/carbon/human/human_helpers.dm | 4 +- .../mob/living/carbon/human/human_movement.dm | 2 +- .../mob/living/carbon/human/human_topic.dm | 48 +- .../mob/living/carbon/human/inventory.dm | 18 +- code/modules/mob/living/carbon/human/life.dm | 2 +- .../mob/living/carbon/human/npc/goblin.dm | 4 +- .../mob/living/carbon/human/species.dm | 202 +++---- .../carbon/human/species_types/ethereal.dm | 10 +- .../carbon/human/species_types/felinid.dm | 8 +- .../carbon/human/species_types/flypeople.dm | 4 +- .../carbon/human/species_types/golems.dm | 70 +-- .../carbon/human/species_types/jellypeople.dm | 64 +-- .../carbon/human/species_types/mothmen.dm | 2 +- .../carbon/human/species_types/plasmamen.dm | 10 +- .../carbon/human/species_types/podpeople.dm | 4 +- .../species_types/roguetown/dwarf/_dwarf.dm | 2 +- .../human/species_types/roguetown/elf/_elf.dm | 2 +- .../species_types/roguetown/other/aasimar.dm | 2 +- .../species_types/roguetown/other/halforc.dm | 2 +- .../species_types/roguetown/other/tiefling.dm | 2 +- .../human/species_types/shadowpeople.dm | 24 +- .../carbon/human/species_types/skeletons.dm | 8 +- .../carbon/human/species_types/vampire.dm | 28 +- code/modules/mob/living/carbon/life.dm | 32 +- .../mob/living/carbon/monkey/combat.dm | 6 +- code/modules/mob/living/carbon/monkey/life.dm | 4 +- .../mob/living/carbon/monkey/monkey.dm | 4 +- .../living/carbon/monkey/monkey_defense.dm | 64 +-- code/modules/mob/living/carbon/rogfatstam.dm | 2 +- .../mob/living/carbon/spirit/spirit.dm | 10 +- .../living/carbon/spirit/spirit_defense.dm | 76 +-- .../modules/mob/living/carbon/status_procs.dm | 2 +- code/modules/mob/living/carbon/stress.dm | 4 +- code/modules/mob/living/emote.dm | 34 +- code/modules/mob/living/grabbing.dm | 96 ++-- code/modules/mob/living/inhand_holder.dm | 4 +- code/modules/mob/living/life.dm | 8 +- code/modules/mob/living/living.dm | 164 +++--- code/modules/mob/living/living_defense.dm | 142 ++--- code/modules/mob/living/living_topic.dm | 8 +- code/modules/mob/living/login.dm | 4 +- code/modules/mob/living/roguetownprocs.dm | 34 +- code/modules/mob/living/say.dm | 10 +- code/modules/mob/living/silicon/ai/ai.dm | 54 +- code/modules/mob/living/silicon/ai/examine.dm | 10 +- code/modules/mob/living/silicon/ai/life.dm | 32 +- .../modules/mob/living/silicon/ai/multicam.dm | 14 +- code/modules/mob/living/silicon/ai/say.dm | 10 +- code/modules/mob/living/silicon/pai/pai.dm | 6 +- .../mob/living/silicon/pai/pai_defense.dm | 24 +- .../mob/living/silicon/pai/pai_shell.dm | 28 +- code/modules/mob/living/silicon/pai/say.dm | 2 +- .../mob/living/silicon/pai/software.dm | 12 +- .../modules/mob/living/silicon/robot/emote.dm | 4 +- .../mob/living/silicon/robot/examine.dm | 22 +- .../mob/living/silicon/robot/inventory.dm | 4 +- .../modules/mob/living/silicon/robot/robot.dm | 124 ++-- .../mob/living/silicon/robot/robot_defense.dm | 46 +- code/modules/mob/living/silicon/say.dm | 6 +- code/modules/mob/living/silicon/silicon.dm | 10 +- .../mob/living/silicon/silicon_defense.dm | 48 +- .../living/simple_animal/animal_defense.dm | 86 +-- .../living/simple_animal/bot/SuperBeepsky.dm | 10 +- .../mob/living/simple_animal/bot/bot.dm | 90 +-- .../mob/living/simple_animal/bot/cleanbot.dm | 26 +- .../living/simple_animal/bot/construction.dm | 72 +-- .../mob/living/simple_animal/bot/firebot.dm | 6 +- .../mob/living/simple_animal/bot/floorbot.dm | 20 +- .../mob/living/simple_animal/bot/honkbot.dm | 10 +- .../mob/living/simple_animal/bot/medbot.dm | 16 +- .../mob/living/simple_animal/bot/mulebot.dm | 58 +- .../mob/living/simple_animal/bot/secbot.dm | 16 +- .../mob/living/simple_animal/constructs.dm | 36 +- .../mob/living/simple_animal/examine.dm | 24 +- .../mob/living/simple_animal/friendly/cat.dm | 2 +- .../simple_animal/friendly/cockroach.dm | 10 +- .../mob/living/simple_animal/friendly/dog.dm | 48 +- .../simple_animal/friendly/drone/_drone.dm | 20 +- .../friendly/drone/drones_as_items.dm | 2 +- .../friendly/drone/extra_drone_types.dm | 4 +- .../friendly/drone/interaction.dm | 58 +- .../simple_animal/friendly/drone/inventory.dm | 2 +- .../simple_animal/friendly/drone/verbs.dm | 2 +- .../simple_animal/friendly/farm_animals.dm | 30 +- .../living/simple_animal/friendly/lizard.dm | 2 +- .../living/simple_animal/friendly/mouse.dm | 16 +- .../mob/living/simple_animal/friendly/pet.dm | 4 +- .../living/simple_animal/friendly/snake.dm | 2 +- .../living/simple_animal/guardian/guardian.dm | 92 +-- .../simple_animal/guardian/types/assassin.dm | 10 +- .../simple_animal/guardian/types/charger.dm | 12 +- .../simple_animal/guardian/types/dextrous.dm | 10 +- .../simple_animal/guardian/types/explosive.dm | 22 +- .../simple_animal/guardian/types/fire.dm | 8 +- .../guardian/types/gravitokinetic.dm | 14 +- .../simple_animal/guardian/types/lightning.dm | 14 +- .../simple_animal/guardian/types/protector.dm | 18 +- .../simple_animal/guardian/types/ranged.dm | 10 +- .../simple_animal/guardian/types/standard.dm | 8 +- .../simple_animal/guardian/types/support.dm | 18 +- .../mob/living/simple_animal/hostile/alien.dm | 8 +- .../mob/living/simple_animal/hostile/bear.dm | 8 +- .../mob/living/simple_animal/hostile/bees.dm | 10 +- .../hostile/bosses/paperwizard.dm | 2 +- .../simple_animal/hostile/cat_butcher.dm | 2 +- .../living/simple_animal/hostile/faithless.dm | 4 +- .../simple_animal/hostile/giant_spider.dm | 40 +- .../mob/living/simple_animal/hostile/goose.dm | 8 +- .../simple_animal/hostile/gorilla/gorilla.dm | 4 +- .../living/simple_animal/hostile/headcrab.dm | 8 +- .../living/simple_animal/hostile/hostile.dm | 2 +- .../simple_animal/hostile/jungle/leaper.dm | 2 +- .../hostile/megafauna/blood_drunk_miner.dm | 12 +- .../hostile/megafauna/bubblegum.dm | 20 +- .../hostile/megafauna/colossus.dm | 18 +- .../simple_animal/hostile/megafauna/drake.dm | 30 +- .../hostile/megafauna/hierophant.dm | 44 +- .../simple_animal/hostile/megafauna/legion.dm | 24 +- .../hostile/megafauna/megafauna.dm | 4 +- .../mob/living/simple_animal/hostile/mimic.dm | 12 +- .../hostile/mining_mobs/elites/elite.dm | 36 +- .../mining_mobs/elites/goliath_broodmother.dm | 24 +- .../hostile/mining_mobs/elites/herald.dm | 10 +- .../hostile/mining_mobs/elites/legionnaire.dm | 30 +- .../hostile/mining_mobs/elites/pandora.dm | 12 +- .../hostile/mining_mobs/goldgrub.dm | 10 +- .../hostile/mining_mobs/goliath.dm | 4 +- .../hostile/mining_mobs/gutlunch.dm | 4 +- .../hostile/mining_mobs/hivelord.dm | 6 +- .../hostile/mining_mobs/mining_mobs.dm | 4 +- .../living/simple_animal/hostile/mushroom.dm | 14 +- .../simple_animal/hostile/netherworld.dm | 8 +- .../simple_animal/hostile/retaliate/bat.dm | 4 +- .../hostile/retaliate/retaliate.dm | 2 +- .../simple_animal/hostile/roguetown/crow.dm | 4 +- .../simple_animal/hostile/roguetown/haunt.dm | 4 +- .../hostile/roguetown/smallrat.dm | 10 +- .../living/simple_animal/hostile/statue.dm | 8 +- .../living/simple_animal/hostile/syndicate.dm | 2 +- .../mob/living/simple_animal/hostile/tree.dm | 4 +- .../simple_animal/hostile/venus_human_trap.dm | 6 +- .../simple_animal/hostile/wumborian_fugu.dm | 10 +- .../mob/living/simple_animal/parrot.dm | 44 +- .../rogue/creacher/honeyspider.dm | 2 +- .../simple_animal/rogue/farm/chicken.dm | 6 +- .../living/simple_animal/rogue/farm/cow.dm | 6 +- .../simple_animal/rogue/rogueanimals.dm | 10 +- .../modules/mob/living/simple_animal/shade.dm | 6 +- .../mob/living/simple_animal/simple_animal.dm | 18 +- .../simple_animal/simple_animal_topic.dm | 6 +- .../mob/living/simple_animal/slime/life.dm | 4 +- .../mob/living/simple_animal/slime/powers.dm | 20 +- .../mob/living/simple_animal/slime/slime.dm | 44 +- code/modules/mob/living/status_procs.dm | 6 +- code/modules/mob/living/taste.dm | 2 +- code/modules/mob/living/ventcrawling.dm | 18 +- code/modules/mob/mob.dm | 24 +- code/modules/mob/mob_helpers.dm | 8 +- code/modules/mob/mob_movement.dm | 34 +- code/modules/mob/mob_transformation_simple.dm | 4 +- code/modules/mob/say.dm | 16 +- code/modules/mob/transform_procs.dm | 8 +- .../computers/_modular_computer_shared.dm | 4 +- .../computers/item/computer.dm | 34 +- .../computers/item/computer_components.dm | 8 +- .../computers/item/computer_damage.dm | 2 +- .../computers/item/computer_ui.dm | 12 +- .../computers/item/laptop.dm | 6 +- .../computers/machinery/modular_computer.dm | 2 +- .../modular_computers/file_system/program.dm | 6 +- .../file_system/program_events.dm | 4 +- .../programs/antagonist/contract_uplink.dm | 4 +- .../programs/antagonist/revelation.dm | 6 +- .../file_system/programs/card.dm | 12 +- .../file_system/programs/ntnrc_client.dm | 4 +- .../modular_computers/hardware/_hardware.dm | 10 +- .../modular_computers/hardware/ai_slot.dm | 12 +- .../hardware/battery_module.dm | 10 +- .../modular_computers/hardware/card_slot.dm | 10 +- .../modular_computers/hardware/hard_drive.dm | 2 +- .../modular_computers/hardware/printer.dm | 8 +- .../modular_computers/hardware/recharger.dm | 2 +- .../modular_computers/laptop_vendor.dm | 4 +- code/modules/ninja/energy_katana.dm | 4 +- code/modules/ninja/suit/gloves.dm | 6 +- .../suit/n_suit_verbs/energy_net_nets.dm | 8 +- .../suit/n_suit_verbs/ninja_adrenaline.dm | 4 +- .../suit/n_suit_verbs/ninja_cost_check.dm | 6 +- .../ninja/suit/n_suit_verbs/ninja_net.dm | 8 +- .../ninja/suit/n_suit_verbs/ninja_smoke.dm | 2 +- .../ninja/suit/n_suit_verbs/ninja_stars.dm | 2 +- .../ninja/suit/n_suit_verbs/ninja_stealth.dm | 12 +- .../suit/n_suit_verbs/ninja_sword_recall.dm | 4 +- code/modules/ninja/suit/ninjaDrainAct.dm | 18 +- code/modules/ninja/suit/suit.dm | 4 +- code/modules/ninja/suit/suit_attackby.dm | 16 +- .../modules/ninja/suit/suit_initialisation.dm | 30 +- code/modules/paperwork/carbonpaper.dm | 4 +- code/modules/paperwork/clipboard.dm | 8 +- code/modules/paperwork/contract.dm | 42 +- code/modules/paperwork/filingcabinet.dm | 16 +- code/modules/paperwork/folders.dm | 6 +- code/modules/paperwork/handlabeler.dm | 26 +- code/modules/paperwork/paper.dm | 26 +- code/modules/paperwork/paper_cutter.dm | 16 +- code/modules/paperwork/paperbin.dm | 12 +- code/modules/paperwork/paperplane.dm | 20 +- code/modules/paperwork/pen.dm | 24 +- code/modules/paperwork/photocopier.dm | 36 +- code/modules/paperwork/rogue.dm | 16 +- code/modules/paperwork/stamps.dm | 2 +- code/modules/paperwork/ticketmachine.dm | 34 +- code/modules/photography/camera/camera.dm | 18 +- .../photography/camera/silicon_camera.dm | 16 +- code/modules/photography/photos/frame.dm | 8 +- code/modules/photography/photos/photo.dm | 8 +- code/modules/plumbing/ducts.dm | 12 +- .../plumbing/plumbers/_plumb_machinery.dm | 2 +- code/modules/plumbing/plumbers/filter.dm | 2 +- code/modules/plumbing/plumbers/pill_press.dm | 2 +- code/modules/plumbing/plumbers/pumps.dm | 2 +- code/modules/power/apc.dm | 206 +++---- code/modules/power/cable.dm | 20 +- code/modules/power/cell.dm | 4 +- code/modules/power/floodlight.dm | 10 +- code/modules/power/generator.dm | 14 +- code/modules/power/gravitygenerator.dm | 10 +- code/modules/power/lanternpost.dm | 6 +- code/modules/power/lighting.dm | 72 +-- code/modules/power/monitor.dm | 2 +- code/modules/power/multiz.dm | 4 +- code/modules/power/pipecleaners.dm | 24 +- code/modules/power/port_gen.dm | 18 +- code/modules/power/roguelighting.dm | 66 +-- code/modules/power/rtg.dm | 6 +- code/modules/power/singularity/boh_tear.dm | 2 +- code/modules/power/singularity/collector.dm | 42 +- .../power/singularity/containment_field.dm | 8 +- code/modules/power/singularity/emitter.dm | 50 +- .../power/singularity/field_generator.dm | 38 +- code/modules/power/singularity/narsie.dm | 10 +- .../particle_accelerator.dm | 24 +- .../particle_accelerator/particle_control.dm | 26 +- code/modules/power/singularity/singularity.dm | 12 +- code/modules/power/smes.dm | 22 +- code/modules/power/solar.dm | 24 +- code/modules/power/supermatter/supermatter.dm | 76 +-- code/modules/power/terminal.dm | 8 +- code/modules/power/tesla/coil.dm | 2 +- code/modules/power/tesla/energy_ball.dm | 2 +- code/modules/power/tracker.dm | 4 +- code/modules/power/turbine.dm | 12 +- .../projectiles/ammunition/_ammunition.dm | 4 +- .../projectiles/ammunition/caseless/foam.dm | 10 +- .../boxes_magazines/_box_magazine.dm | 4 +- code/modules/projectiles/gun.dm | 50 +- code/modules/projectiles/guns/ballistic.dm | 54 +- .../projectiles/guns/ballistic/automatic.dm | 20 +- .../guns/ballistic/laser_gatling.dm | 12 +- .../projectiles/guns/ballistic/launchers.dm | 8 +- .../projectiles/guns/ballistic/pistol.dm | 6 +- .../projectiles/guns/ballistic/revolver.dm | 36 +- .../projectiles/guns/ballistic/rifle.dm | 4 +- .../projectiles/guns/ballistic/shotgun.dm | 18 +- code/modules/projectiles/guns/energy.dm | 16 +- .../projectiles/guns/energy/dueling.dm | 24 +- .../projectiles/guns/energy/energy_gun.dm | 4 +- .../guns/energy/kinetic_accelerator.dm | 24 +- code/modules/projectiles/guns/energy/pulse.dm | 2 +- .../projectiles/guns/energy/special.dm | 10 +- code/modules/projectiles/guns/magic.dm | 8 +- code/modules/projectiles/guns/magic/wand.dm | 14 +- .../projectiles/guns/misc/beam_rifle.dm | 12 +- .../projectiles/guns/misc/blastcannon.dm | 10 +- .../modules/projectiles/guns/misc/chem_gun.dm | 2 +- .../projectiles/guns/misc/grenade_launcher.dm | 10 +- code/modules/projectiles/guns/misc/medbeam.dm | 2 +- .../projectiles/guns/misc/syringe_gun.dm | 16 +- code/modules/projectiles/pins.dm | 58 +- code/modules/projectiles/projectile/beams.dm | 2 +- .../projectile/bullets/dart_syringe.dm | 4 +- .../projectile/bullets/dnainjector.dm | 4 +- code/modules/projectiles/projectile/magic.dm | 58 +- .../projectile/special/hallucination.dm | 4 +- code/modules/reagents/chemistry/holder.dm | 6 +- .../chemistry/machinery/chem_dispenser.dm | 14 +- .../chemistry/machinery/chem_heater.dm | 4 +- .../chemistry/machinery/chem_master.dm | 8 +- .../chemistry/machinery/chem_synthesizer.dm | 2 +- .../reagents/chemistry/machinery/pandemic.dm | 8 +- .../chemistry/machinery/reagentgrinder.dm | 30 +- .../chemistry/machinery/smoke_machine.dm | 2 +- code/modules/reagents/chemistry/reagents.dm | 10 +- .../chemistry/reagents/alcohol_reagents.dm | 46 +- .../reagents/cat2_medicine_reagents.dm | 12 +- .../chemistry/reagents/drink_reagents.dm | 4 +- .../chemistry/reagents/drug_reagents.dm | 26 +- .../chemistry/reagents/food_reagents.dm | 18 +- .../chemistry/reagents/medicine_reagents.dm | 42 +- .../chemistry/reagents/other_reagents.dm | 22 +- .../chemistry/reagents/toxin_reagents.dm | 24 +- .../reagents/chemistry/recipes/others.dm | 8 +- .../chemistry/recipes/pyrotechnics.dm | 12 +- .../chemistry/recipes/slime_extracts.dm | 32 +- .../reagents/chemistry/recipes/toxins.dm | 6 +- code/modules/reagents/reagent_containers.dm | 14 +- .../reagents/reagent_containers/blood_pack.dm | 2 +- .../reagents/reagent_containers/borghydro.dm | 28 +- .../reagents/reagent_containers/chem_pack.dm | 8 +- .../reagents/reagent_containers/dropper.dm | 24 +- .../reagents/reagent_containers/glass.dm | 112 ++-- .../reagents/reagent_containers/hypospray.dm | 14 +- .../reagents/reagent_containers/medigel.dm | 16 +- .../reagents/reagent_containers/patch.dm | 4 +- .../reagents/reagent_containers/pill.dm | 20 +- .../reagent_containers/powderspice.dm | 24 +- .../reagents/reagent_containers/spray.dm | 26 +- .../reagents/reagent_containers/syringes.dm | 32 +- code/modules/reagents/reagent_dispenser.dm | 14 +- code/modules/recycling/conveyor2.dm | 18 +- code/modules/recycling/disposal/bin.dm | 26 +- .../recycling/disposal/construction.dm | 20 +- code/modules/recycling/disposal/outlet.dm | 4 +- code/modules/recycling/disposal/pipe.dm | 6 +- .../recycling/disposal/pipe_sorting.dm | 4 +- code/modules/recycling/sortingmachinery.dm | 50 +- code/modules/research/destructive_analyzer.dm | 4 +- code/modules/research/experimentor.dm | 108 ++-- .../modules/research/machinery/_production.dm | 2 +- .../research/nanites/nanite_chamber.dm | 18 +- .../nanites/nanite_cloud_controller.dm | 4 +- .../research/nanites/nanite_hijacker.dm | 10 +- .../research/nanites/nanite_program_hub.dm | 2 +- .../research/nanites/nanite_programmer.dm | 2 +- .../nanites/nanite_programs/buffing.dm | 2 +- .../research/nanites/nanite_programs/rogue.dm | 16 +- .../nanites/nanite_programs/suppression.dm | 8 +- .../nanites/nanite_programs/utility.dm | 6 +- .../nanites/nanite_programs/weapon.dm | 12 +- .../modules/research/nanites/nanite_remote.dm | 24 +- .../research/nanites/public_chamber.dm | 16 +- code/modules/research/rdconsole.dm | 40 +- code/modules/research/rdmachines.dm | 14 +- code/modules/research/research_disk.dm | 2 +- code/modules/research/server.dm | 4 +- .../xenobiology/crossbreeding/__corecross.dm | 16 +- .../xenobiology/crossbreeding/_clothing.dm | 10 +- .../xenobiology/crossbreeding/_misc.dm | 32 +- .../xenobiology/crossbreeding/_mobs.dm | 2 +- .../xenobiology/crossbreeding/_potions.dm | 64 +-- .../crossbreeding/_status_effects.dm | 84 +-- .../xenobiology/crossbreeding/burning.dm | 56 +- .../xenobiology/crossbreeding/charged.dm | 56 +- .../xenobiology/crossbreeding/chilling.dm | 74 +-- .../xenobiology/crossbreeding/consuming.dm | 18 +- .../xenobiology/crossbreeding/recurring.dm | 4 +- .../xenobiology/crossbreeding/regenerative.dm | 40 +- .../xenobiology/crossbreeding/reproductive.dm | 8 +- .../crossbreeding/selfsustaining.dm | 4 +- .../xenobiology/crossbreeding/stabilized.dm | 10 +- .../research/xenobiology/xenobio_camera.dm | 68 +-- .../research/xenobiology/xenobiology.dm | 256 ++++----- .../roguetown/roguejobs/blacksmith/anvil.dm | 8 +- .../blacksmith/anvil_recipes/_anvil_recipe.dm | 18 +- .../roguetown/roguejobs/blacksmith/forge.dm | 2 +- .../roguetown/roguejobs/blacksmith/items.dm | 10 +- .../roguetown/roguejobs/blacksmith/smelter.dm | 14 +- .../roguetown/roguejobs/blacksmith/tools.dm | 18 +- .../roguetown/roguejobs/cook/recipes/pies.dm | 2 +- .../roguetown/roguejobs/cook/tools/oven.dm | 4 +- .../roguetown/roguejobs/farmer/chaff.dm | 14 +- .../roguejobs/farmer/plantedcrops.dm | 36 +- .../roguetown/roguejobs/farmer/tools.dm | 14 +- .../roguetown/roguejobs/fisher/fish.dm | 2 +- .../roguetown/roguejobs/fisher/leeches.dm | 30 +- .../modules/roguetown/roguejobs/fisher/rod.dm | 16 +- .../roguejobs/gravedigger/gravemarker.dm | 6 +- .../roguetown/roguejobs/gravedigger/hole.dm | 16 +- .../roguetown/roguejobs/gravedigger/tools.dm | 6 +- .../roguetown/roguejobs/tailor/loom.dm | 2 +- code/modules/roguetown/roguemachine/ATM.dm | 4 +- code/modules/roguetown/roguemachine/bounty.dm | 2 +- .../roguetown/roguemachine/drugmachine.dm | 2 +- code/modules/roguetown/roguemachine/mail.dm | 24 +- .../roguetown/roguemachine/merchant.dm | 6 +- code/modules/roguetown/roguemachine/money.dm | 8 +- code/modules/roguetown/roguemachine/scomm.dm | 12 +- .../modules/roguetown/roguemachine/steward.dm | 6 +- code/modules/roguetown/roguemachine/titan.dm | 4 +- code/modules/roguetown/roguemachine/vendor.dm | 4 +- code/modules/ruins/lavaland_ruin_code.dm | 6 +- .../lavalandruin_code/elephantgraveyard.dm | 24 +- .../modules/ruins/lavalandruin_code/puzzle.dm | 10 +- .../ruins/objects_and_mobs/ash_walker_den.dm | 4 +- .../ruins/objects_and_mobs/necropolis_gate.dm | 12 +- .../ruins/objects_and_mobs/sin_ruins.dm | 20 +- .../ruins/spaceruin_code/hilbertshotel.dm | 20 +- .../security_levels/keycard_authentication.dm | 6 +- .../security_levels/security_levels.dm | 2 +- code/modules/shuttle/arrivals.dm | 2 +- code/modules/shuttle/assault_pod.dm | 2 +- code/modules/shuttle/computer.dm | 14 +- code/modules/shuttle/emergency.dm | 10 +- code/modules/shuttle/ferry.dm | 4 +- code/modules/shuttle/navigation_computer.dm | 16 +- code/modules/shuttle/on_move.dm | 2 +- .../shuttle/spaceship_navigation_beacon.dm | 9 +- code/modules/shuttle/special.dm | 16 +- code/modules/shuttle/syndicate.dm | 4 +- .../spells/roguetown/acolyte/astrata.dm | 14 +- .../spells/roguetown/acolyte/dendor.dm | 4 +- .../spells/roguetown/acolyte/general.dm | 38 +- .../modules/spells/roguetown/acolyte/necra.dm | 8 +- code/modules/spells/roguetown/acolyte/noc.dm | 6 +- .../spells/roguetown/acolyte/pestra.dm | 18 +- code/modules/spells/roguetown/necromancer.dm | 8 +- code/modules/spells/roguetown/wizard.dm | 15 +- code/modules/spells/spell.dm | 48 +- code/modules/spells/spell_types/aimed.dm | 6 +- .../spells/spell_types/area_teleport.dm | 2 +- code/modules/spells/spell_types/barnyard.dm | 16 +- code/modules/spells/spell_types/bloodcrawl.dm | 4 +- code/modules/spells/spell_types/charge.dm | 18 +- .../spells/spell_types/construct_spells.dm | 18 +- code/modules/spells/spell_types/curse.dm | 8 +- code/modules/spells/spell_types/devil.dm | 20 +- .../modules/spells/spell_types/devil_boons.dm | 2 +- .../spells/spell_types/ethereal_jaunt.dm | 4 +- code/modules/spells/spell_types/godhand.dm | 18 +- code/modules/spells/spell_types/lichdom.dm | 16 +- code/modules/spells/spell_types/lightning.dm | 8 +- code/modules/spells/spell_types/mime.dm | 32 +- .../spells/spell_types/mind_transfer.dm | 18 +- .../spells/spell_types/personality_commune.dm | 6 +- .../spells/spell_types/rightandwrong.dm | 8 +- code/modules/spells/spell_types/rod_form.dm | 6 +- .../modules/spells/spell_types/shadow_walk.dm | 10 +- code/modules/spells/spell_types/shapeshift.dm | 2 +- code/modules/spells/spell_types/soultap.dm | 6 +- code/modules/spells/spell_types/summonitem.dm | 20 +- code/modules/spells/spell_types/telepathy.dm | 4 +- .../spells/spell_types/touch_attacks.dm | 10 +- .../spells/spell_types/voice_of_god.dm | 2 +- code/modules/spells/spell_types/wizard.dm | 8 +- code/modules/station_goals/bsa.dm | 10 +- code/modules/station_goals/dna_vault.dm | 32 +- code/modules/station_goals/shield.dm | 8 +- code/modules/surgery/_surgery_step.dm | 22 +- code/modules/surgery/bodyparts/_bodyparts.dm | 38 +- .../bodyparts/bodypart_dismemberment.dm | 4 +- .../surgery/bodyparts/bodypart_examine.dm | 90 +-- .../surgery/bodyparts/bodypart_wounds.dm | 2 +- code/modules/surgery/bodyparts/head.dm | 4 +- .../surgery/bodyparts/robot_bodyparts.dm | 36 +- code/modules/surgery/organs/appendix.dm | 4 +- code/modules/surgery/organs/augments_arms.dm | 30 +- code/modules/surgery/organs/augments_chest.dm | 18 +- .../surgery/organs/augments_internal.dm | 12 +- code/modules/surgery/organs/autosurgeon.dm | 16 +- code/modules/surgery/organs/brain.dm | 50 +- code/modules/surgery/organs/ears.dm | 14 +- code/modules/surgery/organs/eyes.dm | 18 +- code/modules/surgery/organs/heart.dm | 26 +- code/modules/surgery/organs/liver.dm | 2 +- code/modules/surgery/organs/lungs.dm | 26 +- code/modules/surgery/organs/organ_internal.dm | 6 +- code/modules/surgery/organs/stomach.dm | 16 +- code/modules/surgery/organs/tongue.dm | 12 +- code/modules/surgery/organs/vocal_cords.dm | 8 +- code/modules/surgery/surgeries/amputation.dm | 12 +- code/modules/surgery/surgeries/dislocation.dm | 12 +- code/modules/surgery/surgeries/fracture.dm | 12 +- code/modules/surgery/surgeries/healing.dm | 20 +- .../surgery/surgeries/limb_replacement.dm | 22 +- .../surgery/surgeries/organ_manipulation.dm | 42 +- .../surgery/surgeries/organic_steps.dm | 70 +-- .../surgery/surgeries/plastic_surgery.dm | 26 +- .../surgeries/prosthetic_replacement.dm | 22 +- .../surgeries/remove_embedded_object.dm | 16 +- code/modules/surgery/surgery_helpers.dm | 16 +- code/modules/surgery/surgery_tools.dm | 28 +- code/modules/surgery/surgery_tools_rogue.dm | 4 +- code/modules/underworld/demon.dm | 4 +- code/modules/underworld/underworld.dm | 4 +- code/modules/uplink/uplink_items.dm | 6 +- code/modules/uplink/uplink_purchase_log.dm | 2 +- code/modules/vehicles/_vehicle.dm | 6 +- code/modules/vehicles/atv.dm | 4 +- code/modules/vehicles/cars/car.dm | 18 +- code/modules/vehicles/cars/clowncar.dm | 28 +- code/modules/vehicles/lavaboat.dm | 2 +- code/modules/vehicles/motorized_wheelchair.dm | 28 +- code/modules/vehicles/pimpin_ride.dm | 8 +- code/modules/vehicles/ridden.dm | 22 +- code/modules/vehicles/scooter.dm | 32 +- code/modules/vehicles/sealed.dm | 14 +- code/modules/vehicles/secway.dm | 4 +- code/modules/vehicles/speedbike.dm | 4 +- code/modules/vehicles/vehicle_actions.dm | 14 +- code/modules/vehicles/wheelchair.dm | 6 +- code/modules/vending/_vending.dm | 36 +- code/modules/zombie/items.dm | 2 +- code/modules/zombie/organs.dm | 6 +- interface/interface.dm | 12 +- roguetown.dme | 1 + tools/replace_spans.py | 31 + 1593 files changed, 14669 insertions(+), 14463 deletions(-) create mode 100644 code/__DEFINES/spans.dm create mode 100644 tools/replace_spans.py diff --git a/code/__DEFINES/spans.dm b/code/__DEFINES/spans.dm new file mode 100644 index 000000000..d680c435c --- /dev/null +++ b/code/__DEFINES/spans.dm @@ -0,0 +1,156 @@ +#define span_abductor(str) ("" + str + "") +#define span_admin(str) ("" + str + "") +#define span_adminhelp(str) ("" + str + "") +#define span_adminnotice(str) ("" + str + "") +#define span_adminobserverooc(str) ("" + str + "") +#define span_adminooc(str) ("" + str + "") +#define span_adminprefix(str) ("" + str + "") +#define span_adminsay(str) ("" + str + "") +#define span_aiprivradio(str) ("" + str + "") +#define span_alert(str) ("" + str + "") +#define span_alertalien(str) ("" + str + "") +#define span_alertsyndie(str) ("" + str + "") +#define span_alertwarning(str) ("" + str + "") +#define span_alien(str) ("" + str + "") +#define span_announce(str) ("" + str + "") +#define span_artery(str) ("" + str + "") +#define span_average(str) ("" + str + "") +#define span_bad(str) ("" + str + "") +#define span_big(str) ("" + str + "") +#define span_bigbold(str) ("" + str + "") +#define span_bigicon(str) ("" + str + "") +#define span_biginfo(str) ("" + str + "") +#define span_bignotice(str) ("" + str + "") +#define span_binarysay(str) ("" + str + "") +#define span_blue(str) ("" + str + "") +#define span_blueteamradio(str) ("" + str + "") +#define span_bloody(str) ("" + str + "") +#define span_bold(str) ("" + str + "") +#define span_boldannounce(str) ("" + str + "") +#define span_boldnotice(str) ("" + str + "") +#define span_boldwarning(str) ("" + str + "") +#define span_bone(str) ("" + str + "") +#define span_centcomradio(str) ("" + str + "") +#define span_changeling(str) ("" + str + "") +#define span_changelingbold(str) ("" + str + "") +#define span_clown(str) ("" + str + "") +#define span_colossus(str) ("" + str + "") +#define span_command_headset(str) ("" + str + "") +#define span_comradio(str) ("" + str + "") +#define span_crit(str) ("" + str + "") +#define span_cult(str) ("" + str + "") +#define span_cultbigbold(str) ("" + str + "") +#define span_cultbold(str) ("" + str + "") +#define span_cultboldtalic(str) ("" + str + "") +#define span_cultitalic(str) ("" + str + "") +#define span_cultlarge(str) ("" + str + "") +#define span_cultsmall(str) ("" + str + "") +#define span_danger(str) ("" + str + "") +#define span_dead(str) ("" + str + "") +#define span_deadsay(str) ("" + str + "") +#define span_deadsayitalicsbold(str) ("" + str + "") +#define span_deconversion_message(str) ("" + str + "") +#define span_drone(str) ("" + str + "") +#define span_emote(str) ("" + str + "") +#define span_engradio(str) ("" + str + "") +#define span_extremelybig(str) ("" + str + "") +#define span_gamedeadsay(str) ("" + str + "") +#define span_ghostalert(str) ("" + str + "") +#define span_good(str) ("" + str + "") +#define span_green(str) ("" + str + "") +#define span_greenannounce(str) ("" + str + "") +#define span_greenteamradio(str) ("" + str + "") +#define span_greentext(str) ("" + str + "") +#define span_greentextbig(str) ("" + str + "") +#define span_hear(str) ("" + str + "") +#define span_header(str) ("" + str + "") +#define span_heavy_brass(str) ("" + str + "") +#define span_hidden(str) ("") +#define span_hierophant(str) ("" + str + "") +#define span_hierophant_warning(str) ("" + str + "") +#define span_highlight(str) ("" + str + "") +#define span_his_grace(str) ("" + str + "") +#define span_holoparasite(str) ("" + str + "") +#define span_holoparasitebold(str) ("" + str + "") +#define span_hypnophrase(str) ("" + str + "") +#define span_icon(str) ("" + str + "") +#define span_infection(str) ("" + str + "") +#define span_info(str) ("" + str + "") +#define span_interface(str) ("" + str + "") +#define span_italics(str) ("" + str + "") +#define span_linkoff(str) ("" + str + "") +#define span_linkoffbad(str) ("" + str + "") +#define span_linkon(str) ("" + str + "") +#define span_looc(str) ("" + str + "") +#define span_love(str) ("" + str + "") +#define span_marooned(str) ("" + str + "") +#define span_medal(str) ("" + str + "") +#define span_medradio(str) ("" + str + "") +#define span_memo(str) ("" + str + "") +#define span_memoedit(str) ("" + str + "") +#define span_mind_control(str) ("" + str + "") +#define span_minorannounce(str) ("" + str + "") +#define span_monkey(str) ("" + str + "") +#define span_monkeyhive(str) ("" + str + "") +#define span_monkeylead(str) ("" + str + "") +#define span_name(str) ("" + str + "") +#define span_narsie(str) ("" + str + "") +#define span_narsiesmall(str) ("" + str + "") +#define span_necrosis(str) ("" + str + "") +#define span_neutraltext(str) ("" + str + "") +#define span_neutraltextbig(str) ("" + str + "") +#define span_nicegreen(str) ("" + str + "") +#define span_notice(str) ("" + str + "") +#define span_noticealien(str) ("" + str + "") +#define span_ooc(str) ("" + str + "") +#define span_papyrus(str) ("" + str + "") +#define span_phobia(str) ("" + str + "") +#define span_prefix(str) ("" + str + "") +#define span_purple(str) ("" + str + "") +#define span_radio(str) ("" + str + "") +#define span_reallybig(str) ("" + str + "") +#define span_reallybigboldnotice(str) ("" + str + "") +#define span_reallybighypnophrase(str) ("" + str + "") +#define span_reallybigredtext(str) ("" + str + "") +#define span_red(str) ("" + str + "") +#define span_redteamradio(str) ("" + str + "") +#define span_redtext(str) ("" + str + "") +#define span_redtextbig(str) ("" + str + "") +#define span_resonate(str) ("" + str + "") +#define span_revenbignotice(str) ("" + str + "") +#define span_revenboldnotice(str) ("" + str + "") +#define span_revendanger(str) ("" + str + "") +#define span_revenminor(str) ("" + str + "") +#define span_revennotice(str) ("" + str + "") +#define span_revenwarning(str) ("" + str + "") +#define span_robot(str) ("" + str + "") +#define span_robotdanger(str) ("" + str + "") +#define span_robotnotice(str) ("" + str + "") +#define span_rose(str) ("" + str + "") +#define span_sans(str) ("" + str + "") +#define span_say(str) ("" + str + "") +#define span_sciradio(str) ("" + str + "") +#define span_secradio(str) ("" + str + "") +#define span_servradio(str) ("" + str + "") +#define span_singing(str) ("" + str + "") +#define span_slime(str) ("" + str + "") +#define span_small(str) ("" + str + "") +#define span_smallboldannounce(str) ("" + str + "") +#define span_smallnotice(str) ("" + str + "") +#define span_smallnoticeital(str) ("" + str + "") +#define span_spider(str) ("" + str + "") +#define span_suicide(str) ("" + str + "") +#define span_suppradio(str) ("" + str + "") +#define span_swarmer(str) ("" + str + "") +#define span_syndradio(str) ("" + str + "") +#define span_tape_recorder(str) ("" + str + "") +#define span_tinynotice(str) ("" + str + "") +#define span_tinynoticeital(str) ("" + str + "") +#define span_tooltip_container(str) ("" + str + "") +#define span_unconscious(str) ("" + str + "") +#define span_userdanger(str) ("" + str + "") +#define span_warn(str) ("" + str + "") +#define span_warning(str) ("" + str + "") +#define span_warningbig(str) ("" + str + "") +#define span_yell(str) ("" + str + "") +#define span_yellowteamradio(str) ("" + str + "") diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 2df6eb00f..32e4d9da3 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(roguetraits, list( TRAIT_WEBWALK = "I can move freely between webs.", - TRAIT_NOSTINK = "My nose is numb to the smell of decay.", + TRAIT_NOSTINK = span_dead("My nose is numb to the smell of decay."), TRAIT_ZJUMP = "Time to reach a new high.", TRAIT_LEAPER = "I can leap like a frog.", TRAIT_NOSEGRAB = "I love to grab idiots by their noses!", @@ -64,7 +64,7 @@ GLOBAL_LIST_INIT(roguetraits, list( TRAIT_SEEPRICES = "I can tell the prices of things down to the zenny.", TRAIT_SEEPRICES_SHITTY = "I can tell the prices of things... Kind of.", TRAIT_STRONGBITE = "Stronger bites, critical bite attacks.", - TRAIT_NOBLE = "I'm of noble blood.", + TRAIT_NOBLE = span_blue("I'm of noble blood."), TRAIT_EMPATH = "I can notice when people are in pain.", TRAIT_BREADY = "Defensive stance does not passively fatigue me.", TRAIT_MEDIUMARMOR = "I can move freely in medium armor.", @@ -72,27 +72,27 @@ GLOBAL_LIST_INIT(roguetraits, list( TRAIT_DODGEEXPERT = "I can dodge easily while only wearing light armor.", TRAIT_DECEIVING_MEEKNESS = "People look at me and think I am a weakling. They are mistaken.", TRAIT_CRITICAL_RESISTANCE = "I am resistant to wounds that would be life threatening to others.", - TRAIT_CRITICAL_WEAKNESS = "I am weak to wounds that others could survive.", - TRAIT_MANIAC_AWOKEN = "I am WAKING UP and the sheeple know this. They will resist.", + TRAIT_CRITICAL_WEAKNESS = span_danger("I am weak to wounds that others could survive."), + TRAIT_MANIAC_AWOKEN = span_danger("I am WAKING UP and the sheeple know this. They will resist."), TRAIT_NOROGSTAM = "I have boundless energy, I will never tire.", TRAIT_NUDIST = "I refuse to wear clothes. They are a hindrance to my freedom.", - TRAIT_CYCLOPS_LEFT = "My left eye has been poked out...", - TRAIT_CYCLOPS_RIGHT = "My right eye has been poked out...", + TRAIT_CYCLOPS_LEFT = span_warning("My left eye has been poked out..."), + TRAIT_CYCLOPS_RIGHT = span_warning("My right eye has been poked out..."), TRAIT_RETARD_ANATOMY = "My anatomy is inhumen, preventing me from wearing hats and shoes.", - TRAIT_NASTY_EATER = "I can eat bad food, and water that would be toxic to humen will not affect me.", - TRAIT_NOFALLDAMAGE1 = "I can easily handle minor falls.", - TRAIT_DISFIGURED = "No one can recognize me...", - TRAIT_MISSING_NOSE = "I struggle to breathe.", - TRAIT_SPELLCOCKBLOCK = "I cannot cast any spells.", + TRAIT_NASTY_EATER = span_dead("I can eat bad food, and water that would be toxic to humen will not affect me."), + TRAIT_NOFALLDAMAGE1 = span_warning("I can easily handle minor falls."), + TRAIT_DISFIGURED = span_warning("No one can recognize me..."), + TRAIT_MISSING_NOSE = span_warning("I struggle to breathe."), + TRAIT_SPELLCOCKBLOCK = span_warning("I cannot cast any spells."), TRAIT_ANTIMAGIC = "I am immune to most forms of magic.", TRAIT_SHOCKIMMUNE = "I am immune to electrical shocks.", - TRAIT_NOSLEEP = "I can't sleep.", - TRAIT_ROT_EATER = "I can eat rotten food.", - TRAIT_ORGAN_EATER = "I can eat organs and raw flesh.", + TRAIT_NOSLEEP = span_warning("I can't sleep."), + TRAIT_ROT_EATER = span_necrosis("I can eat rotten food."), + TRAIT_ORGAN_EATER = span_bloody("I can eat organs and raw flesh."), TRAIT_KNEESTINGER_IMMUNITY = "I am immune to the shock of kneestingers.", - TRAIT_SOUL_EXAMINE = "I know when someone's soul has departed.", - TRAIT_CRACKHEAD = "I can use drugs as much as I want!", - TRAIT_COMMIE = "I can recognize other free men, and they can recognize me too.", + TRAIT_SOUL_EXAMINE = span_deadsay("I know when someone's soul has departed."), + TRAIT_CRACKHEAD = span_love("I can use drugs as much as I want!"), + TRAIT_COMMIE = span_bloody("I can recognize other free men, and they can recognize me too."), )) // trait accessor defines diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index 739a0a89a..d88ac6c52 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -52,10 +52,10 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng )) var/list/turfs = detect_room(get_turf(creator), area_or_turf_fail_types, BP_MAX_ROOM_SIZE*2) if(!turfs) - to_chat(creator, "The new area must be completely airtight and not a part of a shuttle.") + to_chat(creator, span_warning("The new area must be completely airtight and not a part of a shuttle.")) return if(turfs.len > BP_MAX_ROOM_SIZE) - to_chat(creator, "The room you're in is too big. It is [turfs.len >= BP_MAX_ROOM_SIZE *2 ? "more than 100" : ((turfs.len / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.") + to_chat(creator, span_warning("The room you're in is too big. It is [turfs.len >= BP_MAX_ROOM_SIZE *2 ? "more than 100" : ((turfs.len / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.")) return var/list/areas = list("New Area" = /area) for(var/i in 1 to turfs.len) @@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng area_choice = areas[area_choice] if(!area_choice) - to_chat(creator, "No choice selected. The area remains undefined.") + to_chat(creator, span_warning("No choice selected. The area remains undefined.")) return var/area/newA var/area/oldA = get_area(get_turf(creator)) @@ -78,7 +78,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng if(!str || !length(str)) //cancel return if(length(str) > 50) - to_chat(creator, "The given name is too long. The area remains undefined.") + to_chat(creator, span_warning("The given name is too long. The area remains undefined.")) return newA = new area_choice newA.setup(str) @@ -100,7 +100,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng var/obj/machinery/door/firedoor/FD = door FD.CalculateAffectingAreas() - to_chat(creator, "I have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.") + to_chat(creator, span_notice("I have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.")) return TRUE #undef BP_MAX_ROOM_SIZE diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index ddf3e3fab..bf77e0bd2 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -417,22 +417,22 @@ window_flash(M.client) switch(ignore_category ? askuser(M,Question,"Please answer in [DisplayTimeText(poll_time)]!","Yes","No","Never for this round", StealFocus=0, Timeout=poll_time) : askuser(M,Question,"Please answer in [DisplayTimeText(poll_time)]!","Yes","No", StealFocus=0, Timeout=poll_time)) if(1) - to_chat(M, "Choice registered: Yes.") + to_chat(M, span_notice("Choice registered: Yes.")) if(time_passed + poll_time <= world.time) - to_chat(M, "Sorry, you answered too late to be considered!") + to_chat(M, span_danger("Sorry, you answered too late to be considered!")) SEND_SOUND(M, 'sound/blank.ogg') candidates -= M else candidates += M if(2) - to_chat(M, "Choice registered: No.") + to_chat(M, span_danger("Choice registered: No.")) candidates -= M if(3) var/list/L = GLOB.poll_ignore[ignore_category] if(!L) GLOB.poll_ignore[ignore_category] = list() GLOB.poll_ignore[ignore_category] += M.ckey - to_chat(M, "Choice registered: Never for this round.") + to_chat(M, span_danger("Choice registered: Never for this round.")) candidates -= M else candidates -= M diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index de1c189ec..6d4c11caf 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -583,7 +583,7 @@ GLOBAL_LIST_EMPTY(species_list) // Displays a message in deadchat, sent by source. Source is not linkified, message is, to avoid stuff like character names to be linkified. // Automatically gives the class deadsay to the whole message (message + source) /proc/deadchat_broadcast(message, source=null, mob/follow_target=null, turf/turf_target=null, speaker_key=null, message_type=DEADCHAT_REGULAR) - message = "[source][message]" + message = span_deadsay("[source][message]") for(var/mob/M in GLOB.player_list) var/datum/preferences/prefs if(M.client.prefs) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 7b3ae3ee8..51794fc0c 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -327,9 +327,9 @@ if(end_reason) - to_chat(world, "[end_reason].") + to_chat(world, span_bigbold("[end_reason].")) else - to_chat(world, "The town has managed to survive another week.") + to_chat(world, span_bigbold("The town has managed to survive another week.")) /datum/controller/subsystem/ticker/proc/gamemode_report() var/list/all_teams = list() @@ -438,7 +438,7 @@ var/info = statspage ? "[GLOB.round_id]" : GLOB.round_id parts += "[FOURSPACES]Round ID: [info]" parts += "[FOURSPACES]Shift Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]" - parts += "[FOURSPACES]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[popcount["station_integrity"]]%"]" + parts += "[FOURSPACES]Station Integrity: [mode.station_was_nuked ? span_redtext("Destroyed") : "[popcount["station_integrity"]]%"]" var/total_players = GLOB.joined_player_list.len if(total_players) parts+= "[FOURSPACES]Total Population: [total_players]" @@ -493,17 +493,17 @@ if(EMERGENCY_ESCAPED_OR_ENDGAMED) if(!M.onCentCom() && !M.onSyndieBase()) parts += "
" - parts += "I managed to survive, but were marooned on [station_name()]..." + parts += span_marooned("I managed to survive, but were marooned on [station_name()]...") else parts += "
" - parts += "I managed to survive the events on [station_name()] as [M.real_name]." + parts += span_greentext("I managed to survive the events on [station_name()] as [M.real_name].") else parts += "
" - parts += "I managed to survive the events on [station_name()] as [M.real_name]." + parts += span_greentext("I managed to survive the events on [station_name()] as [M.real_name].") else parts += "
" - parts += "I did not survive the events on [station_name()]..." + parts += span_redtext("I did not survive the events on [station_name()]...") else parts += "
" parts += "
" @@ -572,7 +572,7 @@ /datum/controller/subsystem/ticker/proc/medal_report() if(GLOB.commendations.len) var/list/parts = list() - parts += "Medal Commendations:" + parts += span_header("Medal Commendations:") for (var/com in GLOB.commendations) parts += com return "
[parts.Join("
")]
" @@ -712,7 +712,7 @@ /datum/controller/subsystem/ticker/proc/save_admin_data() if(IsAdminAdvancedProcCall()) - to_chat(usr, "Admin rank DB Sync blocked: Advanced ProcCall detected.") + to_chat(usr, span_adminprefix("Admin rank DB Sync blocked: Advanced ProcCall detected.")) return if(CONFIG_GET(flag/admin_legacy_system)) //we're already using legacy system so there's nothing to save return diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 587cbbc9f..bd8b99f3e 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -307,8 +307,8 @@ else playsound(get_turf(src), used_intent.miss_sound, 100, FALSE) if(used_intent.miss_text) - visible_message("[src] [used_intent.miss_text]!", \ - "I [used_intent.miss_text]!") + visible_message(span_warning("[src] [used_intent.miss_text]!"), \ + span_warning("I [used_intent.miss_text]!")) aftermiss() atkswinging = null //update_warning() @@ -540,7 +540,7 @@ return // A.AltClick(src) // else -// to_chat(src, "I need an empty hand to sort through the items here.") +// to_chat(src, span_warning("I need an empty hand to sort through the items here.")) /* diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index 4369e1a02..6847784c1 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -26,7 +26,7 @@ return if((istype(over_object, /atom/movable/screen/movable/action_button) && !istype(over_object, /atom/movable/screen/movable/action_button/hide_toggle))) if(locked) -// to_chat(usr, "Action button \"[name]\" is locked, unlock it first.") +// to_chat(usr, span_warning("Action button \"[name]\" is locked, unlock it first.")) return var/atom/movable/screen/movable/action_button/B = over_object var/list/actions = usr.actions @@ -46,14 +46,14 @@ var/list/modifiers = params2list(params) if(modifiers["shift"]) if(locked) - to_chat(usr, "Action button \"[name]\" is locked, unlock it first.") + to_chat(usr, span_warning("Action button \"[name]\" is locked, unlock it first.")) return TRUE moved = 0 usr.update_action_buttons() //redraw buttons that are no longer considered "moved" return TRUE if(modifiers["ctrl"]) locked = !locked - to_chat(usr, "Action button \"[name]\" [locked ? "" : "un"]locked.") + to_chat(usr, span_notice("Action button \"[name]\" [locked ? "" : "un"]locked.")) if(id && usr.client) //try to (un)remember position usr.client.prefs.action_buttons_screen_locs["[name]_[id]"] = locked ? moved : null return TRUE*/ @@ -102,14 +102,14 @@ var/list/modifiers = params2list(params) if(modifiers["shift"]) if(locked) - to_chat(usr, "Action button \"[name]\" is locked, unlock it first.") + to_chat(usr, span_warning("Action button \"[name]\" is locked, unlock it first.")) return TRUE moved = FALSE usr.update_action_buttons(TRUE) return TRUE if(modifiers["ctrl"]) locked = !locked - to_chat(usr, "Action button \"[name]\" [locked ? "" : "un"]locked.") + to_chat(usr, span_notice("Action button \"[name]\" [locked ? "" : "un"]locked.")) if(id && usr.client) //try to (un)remember position usr.client.prefs.action_buttons_screen_locs["[name]_[id]"] = locked ? moved : null return TRUE @@ -126,7 +126,7 @@ if(id && usr.client) usr.client.prefs.action_buttons_screen_locs["[name]_[id]"] = null usr.update_action_buttons(TRUE) - to_chat(usr, "Action button positions have been reset.") + to_chat(usr, span_notice("Action button positions have been reset.")) return TRUE usr.hud_used.action_buttons_hidden = !usr.hud_used.action_buttons_hidden @@ -146,7 +146,7 @@ if(moved) moved = FALSE user.update_action_buttons(TRUE) - to_chat(user, "Action button positions have been reset.") + to_chat(user, span_notice("Action button positions have been reset.")) /atom/movable/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(datum/hud/owner_hud) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index c6882a005..9b833189a 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -233,7 +233,7 @@ /atom/movable/screen/alert/mind_control/Click() ..() var/mob/living/L = usr - to_chat(L, "[command]") + to_chat(L, span_mind_control("[command]")) /atom/movable/screen/alert/drunk //Not implemented name = "Drunk" diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index 6d6128a93..e2132a204 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -150,7 +150,7 @@ if(alert("Are you done living?", "", "Yes", "No") == "Yes") if(!L.succumb_timer || (world.time < L.succumb_timer + 111 SECONDS) ) var/ttime = round(((L.succumb_timer + 111 SECONDS) - world.time) / 10) - to_chat(L, "I'm not dead enough yet. [ttime]") + to_chat(L, span_redtext("I'm not dead enough yet. [ttime]")) else L.succumb(reaper = TRUE) diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm index 7f281550a..8420f6fe3 100644 --- a/code/_onclick/hud/ghost.dm +++ b/code/_onclick/hud/ghost.dm @@ -79,7 +79,7 @@ "I'm not ready to leave...", "I'm not ready to travel with Charon.",\ "Don't make me leave!", "No... Not yet!", "Please, don't make me go yet...",\ "The shores are calling me but I cannot go...","My soul isn't ready yet...") - to_chat(G, "[pick(thingsz)] ([ttime])") + to_chat(G, span_warning("[pick(thingsz)] ([ttime])")) return */ //Disabling this since the underworld will exist /atom/movable/screen/ghost/reenter_corpse diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 57ecd4ab3..12dd751b6 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -280,9 +280,9 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list( if(hud_used && client) hud_used.show_hud() //Shows the next hud preset - to_chat(usr, "Switched HUD mode. Press F12 to toggle.") + to_chat(usr, span_info("Switched HUD mode. Press F12 to toggle.")) else - to_chat(usr, "This mob type does not use a HUD.") + to_chat(usr, span_warning("This mob type does not use a HUD.")) //(re)builds the hand ui slots, throwing away old ones diff --git a/code/_onclick/hud/pai.dm b/code/_onclick/hud/pai.dm index a5b11f478..0dd3a128c 100644 --- a/code/_onclick/hud/pai.dm +++ b/code/_onclick/hud/pai.dm @@ -1,4 +1,4 @@ -#define PAI_MISSING_SOFTWARE_MESSAGE "I must download the required software to use this." +#define PAI_MISSING_SOFTWARE_MESSAGE span_warning("I must download the required software to use this.") /atom/movable/screen/pai icon = 'icons/mob/screen_pai.dmi' @@ -89,7 +89,7 @@ if(iscarbon(pAI.card.loc)) pAI.hostscan.attack(pAI.card.loc, pAI) else - to_chat(src, "I are not being carried by anyone!") + to_chat(src, span_warning("I are not being carried by anyone!")) return 0 /atom/movable/screen/pai/crew_manifest diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 91a10beb4..3e7c50f60 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -222,7 +222,7 @@ screenmob.client.screen += module_store_icon //"store" icon if(!R.module.modules) - to_chat(usr, "Selected module has no modules to select!") + to_chat(usr, span_warning("Selected module has no modules to select!")) return if(!R.robot_modules_background) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index c56bc50ae..6c33b6799 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -87,7 +87,7 @@ if(ishuman(usr)) var/mob/living/carbon/human/M = usr if(M.charflaw) - to_chat(M, "[M.charflaw.desc]") + to_chat(M, span_info("[M.charflaw.desc]")) to_chat(M, "*----*") if(M.mind) if(M.mind.language_holder) @@ -95,16 +95,16 @@ for(var/X in M.mind.language_holder.languages) var/datum/language/LA = new X() finn = TRUE - to_chat(M, "[LA.name] - ,[LA.key]") + to_chat(M, span_info("[LA.name] - ,[LA.key]")) if(!finn) - to_chat(M, "I don't know any languages.") + to_chat(M, span_warning("I don't know any languages.")) to_chat(M, "*----*") for(var/X in GLOB.roguetraits) if(HAS_TRAIT(L, X)) to_chat(L, "[X] - [GLOB.roguetraits[X]]") ht = TRUE if(!ht) - to_chat(L, "I have no special traits.") + to_chat(L, span_warning("I have no special traits.")) to_chat(L, "*----*") return @@ -131,7 +131,7 @@ if(H.craftingthing && (H.mind?.lastrecipe != null)) last_craft = world.time var/datum/component/personal_crafting/C = H.craftingthing - to_chat(H, "I am crafting \a [H.mind?.lastrecipe] again.") + to_chat(H, span_warning("I am crafting \a [H.mind?.lastrecipe] again.")) C.construct_item(H, H.mind?.lastrecipe) else H.playsound_local(H, 'sound/misc/click.ogg', 100) @@ -153,7 +153,7 @@ return TRUE var/area/A = get_area(usr) if(!A.outdoors) - to_chat(usr, "There is already a defined structure here.") + to_chat(usr, span_warning("There is already a defined structure here.")) return TRUE create_area(usr) @@ -655,49 +655,49 @@ if(C.internal) C.internal = null - to_chat(C, "I are no longer running on internals.") + to_chat(C, span_notice("I are no longer running on internals.")) icon_state = "internal0" else if(!C.getorganslot(ORGAN_SLOT_BREATHING_TUBE)) if(!istype(C.wear_mask, /obj/item/clothing/mask)) - to_chat(C, "I are not wearing an internals mask!") + to_chat(C, span_warning("I are not wearing an internals mask!")) return 1 else var/obj/item/clothing/mask/M = C.wear_mask if(M.mask_adjusted) // if mask on face but pushed down M.adjustmask(C) // adjust it back if( !(M.clothing_flags & MASKINTERNALS) ) - to_chat(C, "I are not wearing an internals mask!") + to_chat(C, span_warning("I are not wearing an internals mask!")) return var/obj/item/I = C.is_holding_item_of_type(/obj/item/tank) if(I) - to_chat(C, "I are now running on internals from [I] in your [C.get_held_index_name(C.get_held_index_of_item(I))].") + to_chat(C, span_notice("I are now running on internals from [I] in your [C.get_held_index_name(C.get_held_index_of_item(I))].")) C.internal = I else if(ishuman(C)) var/mob/living/carbon/human/H = C if(istype(H.s_store, /obj/item/tank)) - to_chat(H, "I are now running on internals from [H.s_store] on your [H.wear_armor.name].") + to_chat(H, span_notice("I are now running on internals from [H.s_store] on your [H.wear_armor.name].")) H.internal = H.s_store else if(istype(H.belt, /obj/item/tank)) - to_chat(H, "I are now running on internals from [H.belt] on your belt.") + to_chat(H, span_notice("I are now running on internals from [H.belt] on your belt.")) H.internal = H.belt else if(istype(H.l_store, /obj/item/tank)) - to_chat(H, "I are now running on internals from [H.l_store] in your left pocket.") + to_chat(H, span_notice("I are now running on internals from [H.l_store] in your left pocket.")) H.internal = H.l_store else if(istype(H.r_store, /obj/item/tank)) - to_chat(H, "I are now running on internals from [H.r_store] in your right pocket.") + to_chat(H, span_notice("I are now running on internals from [H.r_store] in your right pocket.")) H.internal = H.r_store //Separate so CO2 jetpacks are a little less cumbersome. if(!C.internal && istype(C.back, /obj/item/tank)) - to_chat(C, "I are now running on internals from [C.back] on your back.") + to_chat(C, span_notice("I are now running on internals from [C.back] on your back.")) C.internal = C.back if(C.internal) icon_state = "internal1" else - to_chat(C, "I don't have an oxygen tank!") + to_chat(C, span_warning("I don't have an oxygen tank!")) return C.update_action_buttons_icon() @@ -1477,7 +1477,7 @@ if(length(H.mind.known_people)) H.mind.display_known_people(H) else - to_chat(H, "I don't know anyone.") + to_chat(H, span_warning("I don't know anyone.")) /atom/movable/screen/splash icon = 'icons/blank_title.png' @@ -1674,7 +1674,7 @@ if(modifiers["left"]) if(M.charflaw) to_chat(M, "*----*") - to_chat(M, "[M.charflaw.desc]") + to_chat(M, span_info("[M.charflaw.desc]")) to_chat(M, "*--------*") var/list/already_printed = list() for(var/datum/stressevent/S in M.positive_stressors) @@ -1715,7 +1715,7 @@ to_chat(M, "*--------*") if(modifiers["right"]) if(M.get_triumphs() <= 0) - to_chat(M, "I haven't TRIUMPHED.") + to_chat(M, span_warning("I haven't TRIUMPHED.")) return if(alert("Do you want to remember a TRIUMPH?", "", "Yes", "No") == "Yes") if(M.add_stress(/datum/stressevent/triumph)) @@ -1753,9 +1753,9 @@ show_intents(M) if(modifiers["right"]) if(M.rmb_intent) - to_chat(M, "* --- *") - to_chat(M, "[name]: [desc]") - to_chat(M, "* --- *") + to_chat(M, span_info("* --- *")) + to_chat(M, span_info("[name]: [desc]")) + to_chat(M, span_info("* --- *")) /atom/movable/screen/rmbintent/proc/collapse_intents() if(!showing) @@ -1824,9 +1824,9 @@ if(stored_intent) M.swap_rmb_intent(type = stored_intent) if(modifiers["right"]) - to_chat(M, "* --- *") - to_chat(M, "[name]: [desc]") - to_chat(M, "* --- *") + to_chat(M, span_info("* --- *")) + to_chat(M, span_info("[name]: [desc]")) + to_chat(M, span_info("* --- *")) /mob/living/proc/swap_rmb_intent(type, num) if(!possible_rmb_intents?.len) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 89b0f8887..7b276b61a 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -9,14 +9,14 @@ */ /obj/item/proc/melee_attack_chain(mob/user, atom/target, params) if(user.check_arm_grabbed(user.active_hand_index)) - to_chat(user, "I can't move my arm!") + to_chat(user, span_notice("I can't move my arm!")) return if(!user.has_hand_for_held_index(user.active_hand_index, TRUE)) //we obviously have a hadn, but we need to check for fingers/prosthetics - to_chat(user, "I can't move the fingers.") + to_chat(user, span_warning("I can't move the fingers.")) return if(!istype(src, /obj/item/grabbing)) if(HAS_TRAIT(user, TRAIT_CHUNKYFINGERS)) - to_chat(user, "...What?") + to_chat(user, span_warning("...What?")) return if(tool_behaviour && target.tool_act(user, src, tool_behaviour)) return @@ -76,7 +76,7 @@ return FALSE if(force && HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "I don't want to harm other living beings!") + to_chat(user, span_warning("I don't want to harm other living beings!")) return M.lastattacker = user.real_name @@ -147,8 +147,8 @@ M.throw_item(get_step(M,turn(M.dir, 90)), offhand = offh) else M.dropItemToGround(W) - M.visible_message("[user] disarms [M]!", \ - "I'm disarmed by [user]!") + M.visible_message(span_notice("[user] disarms [M]!"), \ + span_boldwarning("I'm disarmed by [user]!")) return if(user.zone_selected == BODY_ZONE_PRECISE_L_INHAND) @@ -159,8 +159,8 @@ M.throw_item(get_step(M,turn(M.dir, 270)), offhand = offh) else M.dropItemToGround(W) - M.visible_message("[user] disarms [M]!", \ - "I'm disarmed by [user]!") + M.visible_message(span_notice("[user] disarms [M]!"), \ + span_boldwarning("I'm disarmed by [user]!")) return if(M.attacked_by(src, user)) @@ -319,12 +319,12 @@ verbu = pick(user.used_intent.attack_verb) if(newforce > 1) if(user.rogfat_add(5)) - user.visible_message("[user] [verbu] [src] with [I]!") + user.visible_message(span_danger("[user] [verbu] [src] with [I]!")) else - user.visible_message("[user] [verbu] [src] with [I]!") + user.visible_message(span_warning("[user] [verbu] [src] with [I]!")) newforce = 1 else - user.visible_message("[user] [verbu] [src] with [I]!") + user.visible_message(span_warning("[user] [verbu] [src] with [I]!")) take_damage(newforce, I.damtype, I.d_type, 1) if(newforce > 1) I.take_damage(1, BRUTE, I.d_type) @@ -346,12 +346,12 @@ verbu = pick(user.used_intent.attack_verb) if(newforce > 1) if(user.rogfat_add(5)) - user.visible_message("[user] [verbu] [src] with [I]!") + user.visible_message(span_danger("[user] [verbu] [src] with [I]!")) else - user.visible_message("[user] [verbu] [src] with [I]!") + user.visible_message(span_warning("[user] [verbu] [src] with [I]!")) newforce = 1 else - user.visible_message("[user] [verbu] [src] with [I]!") + user.visible_message(span_warning("[user] [verbu] [src] with [I]!")) take_damage(newforce, I.damtype, I.d_type, 1) if(newforce > 1) @@ -502,7 +502,7 @@ if(user in viewers(src, null)) attack_message = "[user] [message_verb] [src][message_hit_area] with [I]!" attack_message_local = "[user] [message_verb] me[message_hit_area] with [I]!" - visible_message("[attack_message][next_attack_msg.Join()]",\ - "[attack_message_local][next_attack_msg.Join()]", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[attack_message][next_attack_msg.Join()]"),\ + span_danger("[attack_message_local][next_attack_msg.Join()]"), null, COMBAT_MESSAGE_RANGE) next_attack_msg.Cut() return 1 diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index cbce044bf..38ad2a28d 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -75,14 +75,14 @@ if(awaygate) user.forceMove(awaygate.loc) else - to_chat(user, "[src] has no destination.") + to_chat(user, span_boldwarning("[src] has no destination.")) return ..() /obj/machinery/gateway/centeraway/attack_ghost(mob/user) if(stationgate) user.forceMove(stationgate.loc) else - to_chat(user, "[src] has no destination.") + to_chat(user, span_boldwarning("[src] has no destination.")) return ..() /obj/machinery/teleport/hub/attack_ghost(mob/user) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 873435d36..4c9a3acd3 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -7,15 +7,15 @@ /mob/living/carbon/UnarmedAttack(atom/A, proximity, params) if(!has_active_hand()) //can't attack without a hand. - to_chat(src, "I lack working hands.") + to_chat(src, span_warning("I lack working hands.")) return if(!has_hand_for_held_index(used_hand)) //can't attack without a hand. - to_chat(src, "I can't move this hand.") + to_chat(src, span_warning("I can't move this hand.")) return if(check_arm_grabbed(used_hand)) - to_chat(src, "Someone is grabbing my arm!") + to_chat(src, span_warning("Someone is grabbing my arm!")) return // Special glove functions: @@ -55,10 +55,10 @@ if(istype(AM) && !AM.anchored) var/jadded = max(100-(STASTR*10),5) if(rogfat_add(jadded)) - visible_message("[src] pushes [AM].") + visible_message(span_info("[src] pushes [AM].")) PushAM(AM, MOVE_FORCE_STRONG) else - visible_message("[src] pushes [AM].") + visible_message(span_warning("[src] pushes [AM].")) changeNext_move(CLICK_CD_MELEE) return A.attack_hand(src, params) @@ -68,15 +68,15 @@ return if(!has_active_hand()) //can't attack without a hand. - to_chat(src, "I lack working hands.") + to_chat(src, span_warning("I lack working hands.")) return if(!has_hand_for_held_index(used_hand)) //can't attack without a hand. - to_chat(src, "I can't move this hand.") + to_chat(src, span_warning("I can't move this hand.")) return if(check_arm_grabbed()) - to_chat(src, "[pulledby] is restraining my arm!") + to_chat(src, span_warning("[pulledby] is restraining my arm!")) return A.attack_right(src, params) @@ -125,7 +125,7 @@ if(I) transferItemToLoc(I, newloc = H, force = FALSE, silent = TRUE) H.put_in_active_hand(I) - visible_message("[src.name] gives [I] to [H.name].") + visible_message(span_notice("[src.name] gives [I] to [H.name].")) return else givingto = null @@ -134,10 +134,10 @@ var/obj/item/I = H.get_active_held_item() H.givingto = src H.lastgibto = world.time - to_chat(src, "[H.name] offers [I] to me.") - to_chat(H, "I offer [I] to [src.name].") + to_chat(src, span_notice("[H.name] offers [I] to me.")) + to_chat(H, span_notice("I offer [I] to [src.name].")) else - to_chat(H, "[src.name]'s hands are full.") + to_chat(H, span_warning("[src.name]'s hands are full.")) /atom/proc/onkick(mob/user) return @@ -155,10 +155,10 @@ /mob/living/carbon/onbite(mob/living/carbon/human/user) if(HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "I don't want to harm [src]!") + to_chat(user, span_warning("I don't want to harm [src]!")) return FALSE if(user.mouth) - to_chat(user, "My mouth has something in it.") + to_chat(user, span_warning("My mouth has something in it.")) return FALSE var/datum/intent/bite/bitten = new() @@ -172,7 +172,7 @@ var/def_zone = check_zone(user.zone_selected) var/obj/item/bodypart/affecting = get_bodypart(def_zone) if(!affecting) - to_chat(user, "Nothing to bite.") + to_chat(user, span_warning("Nothing to bite.")) return next_attack_msg.Cut() @@ -193,8 +193,8 @@ var/datum/wound/caused_wound if(!nodmg) caused_wound = affecting.bodypart_attacked_by(BCLASS_BITE, dam2do, user, user.zone_selected, crit_message = TRUE) - visible_message("[user] bites [src]'s [parse_zone(user.zone_selected)]![next_attack_msg.Join()]", \ - "[user] bites my [parse_zone(user.zone_selected)]![next_attack_msg.Join()]") + visible_message(span_danger("[user] bites [src]'s [parse_zone(user.zone_selected)]![next_attack_msg.Join()]"), \ + span_userdanger("[user] bites my [parse_zone(user.zone_selected)]![next_attack_msg.Join()]")) next_attack_msg.Cut() @@ -254,7 +254,7 @@ if(!(L.mobility_flags & MOBILITY_STAND) && L.pulling != src) return if(IsOffBalanced()) - to_chat(src, "I haven't regained my balance yet.") + to_chat(src, span_warning("I haven't regained my balance yet.")) return changeNext_move(mmb_intent.clickcd) face_atom(A) @@ -291,7 +291,7 @@ return if(INTENT_JUMP) if(istype(src.loc, /turf/open/water)) - to_chat(src, "I'm floating in [get_turf(src)].") + to_chat(src, span_warning("I'm floating in [get_turf(src)].")) return if(!A || QDELETED(A) || !A.loc) return @@ -300,14 +300,14 @@ if(src.get_num_legs() < 2) return if(pulledby && pulledby != src) - to_chat(src, "I'm being grabbed.") + to_chat(src, span_warning("I'm being grabbed.")) return if(IsOffBalanced()) - to_chat(src, "I haven't regained my balance yet.") + to_chat(src, span_warning("I haven't regained my balance yet.")) return if(!(mobility_flags & MOBILITY_STAND)) if(!HAS_TRAIT(src, TRAIT_LEAPER))// The Jester cares not for such social convention. - to_chat(src, "I should stand up first.") + to_chat(src, span_warning("I should stand up first.")) return if(A.z != src.z) if(!HAS_TRAIT(src, TRAIT_ZJUMP)) @@ -363,10 +363,10 @@ if(src.incapacitated()) return if(!get_location_accessible(src, BODY_ZONE_PRECISE_MOUTH, grabs="other")) - to_chat(src, "My mouth is blocked.") + to_chat(src, span_warning("My mouth is blocked.")) return if(HAS_TRAIT(src, TRAIT_NO_BITE)) - to_chat(src, "I can't bite.") + to_chat(src, span_warning("I can't bite.")) return changeNext_move(mmb_intent.clickcd) face_atom(A) @@ -388,10 +388,10 @@ if(stealroll > targetperception) //TODO add exp here if(U.get_active_held_item()) - to_chat(src, "I can't pickpocket while my hand is full!") + to_chat(src, span_warning("I can't pickpocket while my hand is full!")) return if(!(zone_selected in stealablezones)) - to_chat(src, "What am I going to steal from there?") + to_chat(src, span_warning("What am I going to steal from there?")) return mobsbehind |= cone(V, list(turn(V.dir, 180)), list(src)) if(mobsbehind.Find(src)) @@ -416,23 +416,23 @@ var/obj/item/picked = pick(stealpos) V.dropItemToGround(picked) put_in_active_hand(picked) - to_chat(src, "I stole [picked]!") + to_chat(src, span_green("I stole [picked]!")) V.log_message("has had \the [picked] stolen by [key_name(U)]", LOG_ATTACK, color="black") U.log_message("has stolen \the [picked] from [key_name(V)]", LOG_ATTACK, color="black") exp_to_gain *= src.mind.get_learning_boon(thiefskill) else exp_to_gain /= 2 // these can be removed or changed on reviewer's discretion - to_chat(src, "I didn't find anything there. Perhaps I should look elsewhere.") + to_chat(src, span_warning("I didn't find anything there. Perhaps I should look elsewhere.")) else to_chat(src, "They can see me!") if(stealroll <= 4) V.log_message("has had an attempted pickpocket by [key_name(U)]", LOG_ATTACK, color="black") U.log_message("has attempted to pickpocket [key_name(V)]", LOG_ATTACK, color="black") - to_chat(V, "Someone tried pickpocketing me!") + to_chat(V, span_danger("Someone tried pickpocketing me!")) if(stealroll < targetperception) V.log_message("has had an attempted pickpocket by [key_name(U)]", LOG_ATTACK, color="black") U.log_message("has attempted to pickpocket [key_name(V)]", LOG_ATTACK, color="black") - to_chat(src, "I failed to pick the pocket!") + to_chat(src, span_danger("I failed to pick the pocket!")) exp_to_gain /= 5 // these can be removed or changed on reviewer's discretion src.mind.adjust_experience(/datum/skill/misc/stealing, exp_to_gain, FALSE) changeNext_move(mmb_intent.clickcd) @@ -475,7 +475,7 @@ if(!user.can_interact_with(src)) return FALSE if((interaction_flags_atom & INTERACT_ATOM_REQUIRES_DEXTERITY) && !user.IsAdvancedToolUser()) - to_chat(user, "I don't have the dexterity to do this!") + to_chat(user, span_warning("I don't have the dexterity to do this!")) return FALSE if(!(interaction_flags_atom & INTERACT_ATOM_IGNORE_INCAPACITATED) && user.incapacitated((interaction_flags_atom & INTERACT_ATOM_IGNORE_RESTRAINED), !(interaction_flags_atom & INTERACT_ATOM_CHECK_GRAB))) return FALSE @@ -523,8 +523,8 @@ // src.emote("attackgrunt") playsound(get_turf(src), used_intent.miss_sound, 100, FALSE) if(used_intent.miss_text) - visible_message("[src] [used_intent.miss_text]!", \ - "I [used_intent.miss_text]!") + visible_message(span_warning("[src] [used_intent.miss_text]!"), \ + span_warning("I [used_intent.miss_text]!")) aftermiss() // if(isturf(A) && get_dist(src,A) <= 1) //move this to grab inhand item being used on an empty tile @@ -546,10 +546,10 @@ if(istype(AM) && !AM.anchored) var/jadded = max(100-(STASTR*10),5) if(rogfat_add(jadded)) - visible_message("[src] pushes [AM].") + visible_message(span_info("[src] pushes [AM].")) PushAM(AM, MOVE_FORCE_STRONG) else - visible_message("[src] pushes [AM].") + visible_message(span_warning("[src] pushes [AM].")) return A.attack_animal(src) @@ -594,18 +594,18 @@ var/armor = ML.run_armor_check(affecting, "stab") if(prob(75)) ML.apply_damage(rand(1,3), BRUTE, affecting, armor) - ML.visible_message("[name] bites [ML]!", \ - "[name] bites you!", "I hear a chomp!", COMBAT_MESSAGE_RANGE, name) - to_chat(name, "I bite [ML]!") + ML.visible_message(span_danger("[name] bites [ML]!"), \ + span_danger("[name] bites you!"), span_hear("I hear a chomp!"), COMBAT_MESSAGE_RANGE, name) + to_chat(name, span_danger("I bite [ML]!")) if(armor >= 2) return for(var/thing in diseases) var/datum/disease/D = thing ML.ForceContractDisease(D) else - ML.visible_message("[src]'s bite misses [ML]!", \ - "I avoid [src]'s bite!", "I hear jaws snapping shut!", COMBAT_MESSAGE_RANGE, src) - to_chat(src, "My bite misses [ML]!") + ML.visible_message(span_danger("[src]'s bite misses [ML]!"), \ + span_danger("I avoid [src]'s bite!"), span_hear("I hear jaws snapping shut!"), COMBAT_MESSAGE_RANGE, src) + to_chat(src, span_danger("My bite misses [ML]!")) /* Aliens diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 552d83946..e4ae1f39f 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -153,7 +153,7 @@ /proc/tkMaxRangeCheck(mob/user, atom/target) var/d = get_dist(user, target) if(d > TK_MAXRANGE) - to_chat(user, "My mind won't reach that far.") + to_chat(user, span_warning("My mind won't reach that far.")) return return TRUE @@ -193,7 +193,7 @@ . += focus_overlay /obj/item/tk_grab/suicide_act(mob/user) - user.visible_message("[user] is using [user.p_their()] telekinesis to choke [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is using [user.p_their()] telekinesis to choke [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!")) return (OXYLOSS) diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 3ce770b66..20cd2c36e 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -56,23 +56,23 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe) if(4,5) --defcon if(3) - message_admins("Notice: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks.") + message_admins(span_adminnotice("Notice: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks.")) --defcon if(2) - to_chat(GLOB.admins, "Warning: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks. Automatic restart in [processing_interval] ticks.") + to_chat(GLOB.admins, span_boldannounce("Warning: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks. Automatic restart in [processing_interval] ticks.")) --defcon if(1) - to_chat(GLOB.admins, "Warning: DEFCON [defcon_pretty()]. The Master Controller has still not fired within the last [(5-defcon) * processing_interval] ticks. Killing and restarting...") + to_chat(GLOB.admins, span_boldannounce("Warning: DEFCON [defcon_pretty()]. The Master Controller has still not fired within the last [(5-defcon) * processing_interval] ticks. Killing and restarting...")) --defcon var/rtn = Recreate_MC() if(rtn > 0) defcon = 4 master_iteration = 0 - to_chat(GLOB.admins, "MC restarted successfully") + to_chat(GLOB.admins, span_adminnotice("MC restarted successfully")) else if(rtn < 0) log_game("FailSafe: Could not restart MC, runtime encountered. Entering defcon 0") - to_chat(GLOB.admins, "ERROR: DEFCON [defcon_pretty()]. Could not restart MC, runtime encountered. I will silently keep retrying.") + to_chat(GLOB.admins, span_boldannounce("ERROR: DEFCON [defcon_pretty()]. Could not restart MC, runtime encountered. I will silently keep retrying.")) //if the return number was 0, it just means the mc was restarted too recently, and it just needs some time before we try again //no need to handle that specially when defcon 0 can handle it if(0) //DEFCON 0! (mc failed to restart) @@ -80,7 +80,7 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe) if(rtn > 0) defcon = 4 master_iteration = 0 - to_chat(GLOB.admins, "MC restarted successfully") + to_chat(GLOB.admins, span_adminnotice("MC restarted successfully")) else defcon = min(defcon + 1,5) master_iteration = Master.iteration diff --git a/code/controllers/master.dm b/code/controllers/master.dm index cfa27094e..4dd81d04f 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -149,7 +149,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new msg = "The [BadBoy.name] subsystem seems to be destabilizing the MC and will be offlined." BadBoy.flags |= SS_NO_FIRE if(msg) - to_chat(GLOB.admins, "[msg]") + to_chat(GLOB.admins, span_boldannounce("[msg]")) log_world(msg) if (istype(Master.subsystems)) @@ -159,7 +159,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new current_runlevel = Master.current_runlevel StartProcessing(10) else - to_chat(world, "The Master Controller is having some issues, we will need to re-initialize EVERYTHING") + to_chat(world, span_boldannounce("The Master Controller is having some issues, we will need to re-initialize EVERYTHING")) Initialize(20, TRUE) // Please don't stuff random bullshit here, @@ -176,7 +176,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new if(init_sss) init_subtypes(/datum/controller/subsystem, subsystems) #ifdef TESTING - to_chat(world, "Initializing subsystems...") + to_chat(world, span_boldannounce("Initializing subsystems...")) #endif // Sort subsystems by init_order, so they initialize in the correct order. sortTim(subsystems, GLOBAL_PROC_REF(cmp_subsystem_init)) @@ -199,7 +199,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/msg = "Initializations complete within [time] second[time == 1 ? "" : "s"]!" #ifdef TESTING - to_chat(world, "[msg]") + to_chat(world, span_boldannounce("[msg]")) #endif log_world(msg) diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index a6ed0313d..233dd7670 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -165,7 +165,7 @@ var/time = (REALTIMEOFDAY - start_timeofday) / 10 var/msg = "Initialized [name] subsystem within [time] second[time == 1 ? "" : "s"]!" #ifdef TESTING - to_chat(world, "[msg]") + to_chat(world, span_boldannounce("[msg]")) #endif log_world(msg) return time diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 9c5ee4d2d..83db0eeeb 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -328,7 +328,7 @@ SUBSYSTEM_DEF(air) CHECK_TICK var/msg = "" log_game("HEY! LISTEN! [DisplayTimeText(world.timeofday - timer)] were wasted processing [starting_ats] turf(s) (connected to [ending_ats] other turfs) with atmos differences at round start.") - to_chat(world, "[msg]") + to_chat(world, span_boldannounce("[msg]")) warning(msg) /turf/open/proc/resolve_active_graph() diff --git a/code/controllers/subsystem/augury.dm b/code/controllers/subsystem/augury.dm index abb68cb45..0f945ec36 100644 --- a/code/controllers/subsystem/augury.dm +++ b/code/controllers/subsystem/augury.dm @@ -66,13 +66,13 @@ SUBSYSTEM_DEF(augury) /datum/action/innate/augury/Activate() SSaugury.watchers += owner - to_chat(owner, "I are now auto-following debris.") + to_chat(owner, span_notice("I are now auto-following debris.")) active = TRUE UpdateButtonIcon() /datum/action/innate/augury/Deactivate() SSaugury.watchers -= owner - to_chat(owner, "I are no longer auto-following debris.") + to_chat(owner, span_notice("I are no longer auto-following debris.")) active = FALSE UpdateButtonIcon() diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 11c3331fb..5d97df363 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -321,7 +321,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table /datum/DBQuery/proc/warn_execute(async = TRUE) . = Execute(async) if(!.) - to_chat(usr, "A SQL error occurred during this operation, check the server logs.") + to_chat(usr, span_danger("A SQL error occurred during this operation, check the server logs.")) /datum/DBQuery/proc/Execute(async = TRUE, log_error = TRUE) Activity("Execute") diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 424e2c627..a3fb97ff5 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -44,7 +44,7 @@ SUBSYSTEM_DEF(job) occupations = list() var/list/all_jobs = subtypesof(/datum/job/roguetown) if(!all_jobs.len) - to_chat(world, "Error setting up jobs, no job datums found") + to_chat(world, span_boldannounce("Error setting up jobs, no job datums found")) return 0 for(var/J in all_jobs) @@ -692,7 +692,7 @@ SUBSYSTEM_DEF(job) //// if(job.req_admin_notify) // to_chat(M, "I are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.") // if(CONFIG_GET(number/minimal_access_threshold)) -// to_chat(M, "As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.") +// to_chat(M, span_notice("As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.")) // if(job.tutorial) // to_chat(M, job.tutorial) var/related_policy = get_policy(rank) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 3aba12f15..253fc08ed 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -57,7 +57,7 @@ SUBSYSTEM_DEF(mapping) var/old_config = config config = global.config.defaultmap if(!config || config.defaulted) - to_chat(world, "Unable to load next or default map config, defaulting to Box Station") + to_chat(world, span_boldannounce("Unable to load next or default map config, defaulting to Box Station")) config = old_config loadWorld() repopulate_sorted_areas() @@ -79,9 +79,9 @@ SUBSYSTEM_DEF(mapping) // Load the virtual reality hub if(CONFIG_GET(flag/virtual_reality)) - to_chat(world, "Loading virtual reality...") + to_chat(world, span_boldannounce("Loading virtual reality...")) load_new_z_level("_maps/RandomZLevels/VR/vrhub.dmm", "Virtual Reality Hub") - to_chat(world, "Virtual reality loaded.") + to_chat(world, span_boldannounce("Virtual reality loaded.")) // Generate mining ruins loading_ruins = TRUE @@ -176,7 +176,7 @@ SUBSYSTEM_DEF(mapping) z_list = SSmapping.z_list -#define INIT_ANNOUNCE(X) to_chat(world, "[X]"); log_world(X) +#define INIT_ANNOUNCE(X) to_chat(world, span_boldannounce("[X]")); log_world(X) /datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE) . = list() var/start_time = REALTIMEOFDAY @@ -361,7 +361,7 @@ GLOBAL_LIST_EMPTY(the_station_areas) message_admins("Randomly rotating map to [VM.map_name]") . = changemap(VM) if (. && VM.map_name != config.map_name) - to_chat(world, "Map rotation has chosen [VM.map_name] for next round!") + to_chat(world, span_boldannounce("Map rotation has chosen [VM.map_name] for next round!")) /datum/controller/subsystem/mapping/proc/changemap(datum/map_config/VM) if(!VM.MakeNextMap()) @@ -460,13 +460,13 @@ GLOBAL_LIST_EMPTY(the_station_areas) if(!mapfile) return away_name = "[mapfile] custom" - to_chat(usr,"Loading [away_name]...") + to_chat(usr,span_notice("Loading [away_name]...")) var/datum/map_template/template = new(mapfile, "Away Mission") away_level = template.load_new_z() else if(answer in GLOB.potentialRandomZlevels) away_name = answer - to_chat(usr,"Loading [away_name]...") + to_chat(usr,span_notice("Loading [away_name]...")) var/datum/map_template/template = new(away_name, "Away Mission") away_level = template.load_new_z() else diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index 56539f2b5..3154568c7 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -146,7 +146,7 @@ SUBSYSTEM_DEF(pai) continue if(!(ROLE_PAI in G.client.prefs.be_special)) continue - to_chat(G, "[user] is requesting a pAI personality! Use the pAI button to submit myself as one.") + to_chat(G, span_ghostalert("[user] is requesting a pAI personality! Use the pAI button to submit myself as one.")) addtimer(CALLBACK(src, PROC_REF(spam_again)), spam_delay) var/list/available = list() for(var/datum/paiCandidate/c in SSpai.candidates) diff --git a/code/controllers/subsystem/rogue/devotion.dm b/code/controllers/subsystem/rogue/devotion.dm index 017f2ff53..8e4b0e9c8 100644 --- a/code/controllers/subsystem/rogue/devotion.dm +++ b/code/controllers/subsystem/rogue/devotion.dm @@ -66,7 +66,7 @@ devotion = clamp(devotion + dev_amt, 0, max_devotion) //Max devotion limit if((devotion >= max_devotion) && !silent) - to_chat(holder, "I have reached the limit of my devotion...") + to_chat(holder, span_warning("I have reached the limit of my devotion...")) if(!prog_amt) // no point in the rest if it's just an expenditure return TRUE progression = clamp(progression + prog_amt, 0, max_progression) @@ -88,7 +88,7 @@ return TRUE spell_unlocked = new spell_unlocked if(!silent) - to_chat(holder, "I have unlocked a new spell: [spell_unlocked]") + to_chat(holder, span_boldnotice("I have unlocked a new spell: [spell_unlocked]")) usr.mind.AddSpell(spell_unlocked) LAZYADD(granted_spells, spell_unlocked) return TRUE diff --git a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_menu/drifter_queue_menu_build.dm b/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_menu/drifter_queue_menu_build.dm index 543c44dd3..a2116c258 100644 --- a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_menu/drifter_queue_menu_build.dm +++ b/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_menu/drifter_queue_menu_build.dm @@ -30,11 +30,11 @@ // Time string for the html menus /datum/controller/subsystem/role_class_handler/proc/rebuild_drifter_time_string() if(!drifter_queue_enabled) - time_left_until_next_wave_string = "DISABLED" + time_left_until_next_wave_string = "DISABLED" return if(drifter_queue_delayed) - time_left_until_next_wave_string = "DELAYED" + time_left_until_next_wave_string = "DELAYED" return var/time_left = max(0, next_drifter_mass_release_time - world.time) diff --git a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue_helpers.dm b/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue_helpers.dm index e1da94a9a..1bb1e26fe 100644 --- a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue_helpers.dm +++ b/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue_helpers.dm @@ -102,10 +102,10 @@ */ /datum/controller/subsystem/role_class_handler/proc/check_drifterwave_restrictions(client/target_client) if(length(current_wave.allowed_races) && !(target_client.prefs.pref_species.name in current_wave.allowed_races)) - to_chat(target_client, " WRONG RACE ") + to_chat(target_client, span_warning(" WRONG RACE ")) return FALSE if(length(current_wave.allowed_patrons) && !(target_client.prefs.selected_patron.type in current_wave.allowed_patrons)) - to_chat(target_client, " WRONG PATRON ") + to_chat(target_client, span_warning(" WRONG PATRON ")) return FALSE var/list/local_allowed_sexes = list() @@ -121,13 +121,13 @@ if(length(local_allowed_sexes) && !(target_client.prefs.gender in local_allowed_sexes)) return JOB_UNAVAILABLE_SEX if(length(current_wave.allowed_sexes) && !(target_client.prefs.gender in current_wave.allowed_sexes)) - to_chat(target_client, " WRONG GENDER ") + to_chat(target_client, span_warning(" WRONG GENDER ")) return FALSE if(length(current_wave.allowed_ages) && !(target_client.prefs.age in current_wave.allowed_ages)) - to_chat(target_client, " WRONG AGEGROUP ") + to_chat(target_client, span_warning(" WRONG AGEGROUP ")) return FALSE if(length(current_wave.allowed_skintones) && !(target_client.prefs.skin_tone in current_wave.allowed_skintones)) - to_chat(target_client, " WRONG ANCESTRY ") + to_chat(target_client, span_warning(" WRONG ANCESTRY ")) return FALSE return TRUE diff --git a/code/controllers/subsystem/rogue/treasury.dm b/code/controllers/subsystem/rogue/treasury.dm index ec866c3da..65b7dfa1f 100644 --- a/code/controllers/subsystem/rogue/treasury.dm +++ b/code/controllers/subsystem/rogue/treasury.dm @@ -17,7 +17,7 @@ for(var/mob/living/carbon/human/X in GLOB.human_list) if(X.real_name in names_to) if(!X.stat) - to_chat(X, "[msg]") + to_chat(X, span_info("[msg]")) SUBSYSTEM_DEF(treasury) name = "treasury" diff --git a/code/controllers/subsystem/rogue/triumphs/triumph_buy_datums/misc/wipe_triumphs.dm b/code/controllers/subsystem/rogue/triumphs/triumph_buy_datums/misc/wipe_triumphs.dm index 680dec77a..3e3ca0fd6 100644 --- a/code/controllers/subsystem/rogue/triumphs/triumph_buy_datums/misc/wipe_triumphs.dm +++ b/code/controllers/subsystem/rogue/triumphs/triumph_buy_datums/misc/wipe_triumphs.dm @@ -9,4 +9,4 @@ // We fire this on activate /datum/triumph_buy/wipe_triumphs/on_activate() SStriumphs.wipe_all_triumphs(ckey_of_buyer) // ha haha .... woops guys - to_chat(world, "[key_of_buyer] burns the hall of triumphs to the ground!") + to_chat(world, span_redtext("[key_of_buyer] burns the hall of triumphs to the ground!")) diff --git a/code/controllers/subsystem/rogue/triumphs/triumphs.dm b/code/controllers/subsystem/rogue/triumphs/triumphs.dm index 40f53d5a7..a836f644c 100644 --- a/code/controllers/subsystem/rogue/triumphs/triumphs.dm +++ b/code/controllers/subsystem/rogue/triumphs/triumphs.dm @@ -141,7 +141,7 @@ SUBSYSTEM_DEF(triumphs) triumph_adjust(refund_amount, ckey_cur_owna) if(GLOB.directory[ckey_cur_owna]) // If they are still logged into the game, inform them they got refunded - to_chat(GLOB.directory[ckey_cur_owna], "You were refunded [refund_amount] triumphs due to CONFLICTS.") + to_chat(GLOB.directory[ckey_cur_owna], span_redtext("You were refunded [refund_amount] triumphs due to CONFLICTS.")) // Cleanup Time active_datum.on_removal() @@ -164,7 +164,7 @@ SUBSYSTEM_DEF(triumphs) triumph_adjust(refund_amount, ckey_prev_owna) if(GLOB.directory[ckey_prev_owna]) // If they are still logged into the game, inform them they got refunded - to_chat(GLOB.directory[ckey_prev_owna], "You were refunded [refund_amount] triumphs due to a UNBUY.") + to_chat(GLOB.directory[ckey_prev_owna], span_redtext("You were refunded [refund_amount] triumphs due to a UNBUY.")) pull_it_out.on_removal() @@ -220,7 +220,7 @@ SUBSYSTEM_DEF(triumphs) We save everything when its time for reboot */ /datum/controller/subsystem/triumphs/proc/end_triumph_saving_time() - to_chat(world, " Recording VICTORIES to the WORLD END MACHINE. ") + to_chat(world, span_boldannounce(" Recording VICTORIES to the WORLD END MACHINE. ")) //for(var/target_ckey in triumph_amount_cache) // var/list/saving_data = list() // // this will be for example "data/player_saves/a/ass/triumphs.json" if their ckey was ass diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index b89a07a69..1f9ad6b41 100644 --- a/code/controllers/subsystem/server_maint.dm +++ b/code/controllers/subsystem/server_maint.dm @@ -64,7 +64,7 @@ SUBSYSTEM_DEF(server_maint) var/cmob = C.mob if (!isnewplayer(cmob) || !SSticker.queued_players.Find(cmob)) log_access("AFK: [key_name(C)]") - to_chat(C, "I have been inactive for more than [DisplayTimeText(afk_period)] and have been disconnected.
I may reconnect via the button in the file menu or by clicking here to reconnect.") + to_chat(C, span_danger("I have been inactive for more than [DisplayTimeText(afk_period)] and have been disconnected.

I may reconnect via the button in the file menu or by clicking here to reconnect.")) QDEL_IN(C, 1) //to ensure they get our message before getting disconnected continue @@ -75,7 +75,7 @@ SUBSYSTEM_DEF(server_maint) return /datum/controller/subsystem/server_maint/Shutdown() -// kick_clients_in_lobby("The round came to an end with you in the lobby.", TRUE) //second parameter ensures only afk clients are kicked +// kick_clients_in_lobby(span_boldannounce("The round came to an end with you in the lobby."), TRUE) //second parameter ensures only afk clients are kicked var/server = CONFIG_GET(string/server) for(var/thing in GLOB.clients) if(!thing) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 9434c9860..35931755b 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -194,33 +194,33 @@ SUBSYSTEM_DEF(shuttle) emergency = backup_shuttle var/srd = CONFIG_GET(number/shuttle_refuel_delay) if(world.time - SSticker.round_start_time < srd) -// to_chat(user, "There is no response.") +// to_chat(user, span_warning("There is no response.")) return switch(emergency.mode) if(SHUTTLE_RECALL) -// to_chat(user, "The emergency shuttle may not be called while returning to CentCom.") +// to_chat(user, span_alert("The emergency shuttle may not be called while returning to CentCom.")) return if(SHUTTLE_CALL) -// to_chat(user, "The emergency shuttle is already on its way.") +// to_chat(user, span_alert("The emergency shuttle is already on its way.")) return if(SHUTTLE_DOCKED) -// to_chat(user, "The emergency shuttle is already here.") +// to_chat(user, span_alert("The emergency shuttle is already here.")) return if(SHUTTLE_IGNITING) -// to_chat(user, "The emergency shuttle is firing its engines to leave.") +// to_chat(user, span_alert("The emergency shuttle is firing its engines to leave.")) return if(SHUTTLE_ESCAPE) -// to_chat(user, "The emergency shuttle is moving away to a safe distance.") +// to_chat(user, span_alert("The emergency shuttle is moving away to a safe distance.")) return if(SHUTTLE_STRANDED) -// to_chat(user, "The emergency shuttle has been disabled by CentCom.") +// to_chat(user, span_alert("The emergency shuttle has been disabled by CentCom.")) return call_reason = trim(html_encode(call_reason)) // if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH && seclevel2num(get_security_level()) > SEC_LEVEL_GREEN) -// to_chat(user, "I must provide a reason.") +// to_chat(user, span_alert("I must provide a reason.")) // return var/area/signal_origin = get_area(user) @@ -244,7 +244,7 @@ SUBSYSTEM_DEF(shuttle) // var/area/A = get_area(user) log_game("[key_name(user)] has called the shuttle.") -// deadchat_broadcast(" has called for the boat at [A.name].", "[user.real_name]", user) +// deadchat_broadcast(" has called for the boat at [A.name].", span_name("[user.real_name]"), user) if(call_reason) SSblackbox.record_feedback("text", "shuttle_reason", 1, "[call_reason]") log_game("Shuttle call reason: [call_reason]") @@ -282,7 +282,7 @@ SUBSYSTEM_DEF(shuttle) emergency.cancel(get_area(user)) log_game("[key_name(user)] has recalled the shuttle.") message_admins("[ADMIN_LOOKUPFLW(user)] has recalled the shuttle.") - deadchat_broadcast(" has recalled the shuttle from [get_area_name(user, TRUE)].", "[user.real_name]", user) + deadchat_broadcast(" has recalled the shuttle from [get_area_name(user, TRUE)].", span_name("[user.real_name]"), user) return 1 /datum/controller/subsystem/shuttle/proc/canRecall() diff --git a/code/controllers/subsystem/skills.dm b/code/controllers/subsystem/skills.dm index 233462b49..021e3ba5e 100644 --- a/code/controllers/subsystem/skills.dm +++ b/code/controllers/subsystem/skills.dm @@ -10,12 +10,12 @@ SUBSYSTEM_DEF(skills) var/list/all_skills = list() ///Static assoc list of levels (ints) - strings var/static/list/level_names = list( - SKILL_LEVEL_NOVICE = "Novice", - SKILL_LEVEL_APPRENTICE = "Apprentice", - SKILL_LEVEL_JOURNEYMAN = "Journeyman", - SKILL_LEVEL_EXPERT = "Expert", + SKILL_LEVEL_NOVICE = span_info("Novice"), + SKILL_LEVEL_APPRENTICE = span_info("Apprentice"), + SKILL_LEVEL_JOURNEYMAN = span_biginfo("Journeyman"), + SKILL_LEVEL_EXPERT = span_biginfo("Expert"), SKILL_LEVEL_MASTER = "Master", - SKILL_LEVEL_LEGENDARY = "Legendary", + SKILL_LEVEL_LEGENDARY = span_greentext("Legendary"), )//This list is already in the right order, due to indexing /datum/controller/subsystem/skills/Initialize(timeofday) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index d0d684e7c..2f7962449 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -171,7 +171,7 @@ SUBSYSTEM_DEF(ticker) // start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10) for(var/client/C in GLOB.clients) window_flash(C, ignorepref = TRUE) //let them know lobby has opened up. -// to_chat(world, "Welcome to [station_name()]!") +// to_chat(world, span_boldnotice("Welcome to [station_name()]!")) send2chat(new /datum/tgs_message_content("New round starting on [SSmapping.config.map_name]!"), CONFIG_GET(string/chat_announce_new_game)) current_state = GAME_STATE_PREGAME //Everyone who wants to be an observer is now spawned @@ -266,18 +266,18 @@ SUBSYSTEM_DEF(ticker) if(player.ready == PLAYER_READY_TO_PLAY) if(player.client.prefs.lastclass == V) if(player.IsJobUnavailable(V) != JOB_AVAILABLE) - to_chat(player, "You cannot be [V] and thus are not considered.") + to_chat(player, span_warning("You cannot be [V] and thus are not considered.")) continue readied_jobs.Add(V) /* // These else conditions stop the round from starting unless there is a merchant, king, and queen. else var/list/stuffy = list("Set a Ruler to 'high' in your class preferences to start the game!", "PLAY Ruler NOW!", "A Ruler is required to start.", "Pray for a Ruler.", "One day, there will be a Ruler.", "Just try playing Ruler.", "If you don't play Ruler, the game will never start.", "We need at least one Ruler to start the game.", "We're waiting for you to pick Ruler to start.", "Still no Ruler is readied..", "I'm going to lose my mind if we don't get a Ruler readied up.","No. The game will not start because there is no Ruler.","What's the point of ROGUETOWN without a Ruler?") - to_chat(world, "[pick(stuffy)]") + to_chat(world, span_purple("[pick(stuffy)]")) return FALSE else var/list/stuffy = list("Set Merchant to 'high' in your class preferences to start the game!", "PLAY Merchant NOW!", "A Merchant is required to start.", "Pray for a Merchant.", "One day, there will be a Merchant.", "Just try playing Merchant.", "If you don't play Merchant, the game will never start.", "We need at least one Merchant to start the game.", "We're waiting for you to pick Merchant to start.", "Still no Merchant is readied..", "I'm going to lose my mind if we don't get a Merchant readied up.","No. The game will not start because there is no Merchant.","What's the point of ROGUETOWN without a Merchant?") - to_chat(world, "[pick(stuffy)]") + to_chat(world, span_purple("[pick(stuffy)]")) return FALSE */ @@ -294,12 +294,12 @@ SUBSYSTEM_DEF(ticker) amt_ready++ if(amt_ready < 2) - to_chat(world, "[amt_ready]/20 players ready.") + to_chat(world, span_purple("[amt_ready]/20 players ready.")) failedstarts++ if(failedstarts > 7) - to_chat(world, "[failedstarts]/13") + to_chat(world, span_purple("[failedstarts]/13")) if(failedstarts >= 13) - to_chat(world, "Starting ROGUEFIGHT...") + to_chat(world, span_greentext("Starting ROGUEFIGHT...")) var/icon/ikon var/file_path = "icons/roguefight_title.dmi" ASSERT(fexists(file_path)) @@ -318,7 +318,7 @@ SUBSYSTEM_DEF(ticker) var/isrogueworld = FALSE /datum/controller/subsystem/ticker/proc/setup() - message_admins("Starting game...") + message_admins(span_boldannounce("Starting game...")) var/init_start = world.timeofday //Create and announce mode var/list/datum/game_mode/runnable_modes @@ -330,7 +330,7 @@ SUBSYSTEM_DEF(ticker) if(GLOB.secret_force_mode != "secret") var/datum/game_mode/smode = config.pick_mode(GLOB.secret_force_mode) if(!smode.can_start()) - message_admins("Unable to force secret [GLOB.secret_force_mode]. [smode.required_players] players and [smode.required_enemies] eligible antagonists needed.") + message_admins(span_notice("Unable to force secret [GLOB.secret_force_mode]. [smode.required_players] players and [smode.required_enemies] eligible antagonists needed.")) else mode = smode @@ -395,7 +395,7 @@ SUBSYSTEM_DEF(ticker) SSjob.ResetOccupations() return 0 else - message_admins("DEBUG: Bypassing prestart checks...") + message_admins(span_notice("DEBUG: Bypassing prestart checks...")) log_game("GAME SETUP: Divide Occupations success") @@ -462,7 +462,7 @@ SUBSYSTEM_DEF(ticker) SSdbcore.SetRoundStart() - message_admins("Welcome to [station_name()], enjoy your stay!") + message_admins(span_notice("Welcome to [station_name()], enjoy your stay!")) for(var/client/C in GLOB.clients) if(C.mob) @@ -475,7 +475,7 @@ SUBSYSTEM_DEF(ticker) Master.SetRunLevel(RUNLEVEL_GAME) /* if(SSevents.holidays) - to_chat(world, "and...") + to_chat(world, span_notice("and...")) for(var/holidayname in SSevents.holidays) var/datum/holiday/holiday = SSevents.holidays[holidayname] to_chat(world, "

[holiday.greet()]

") @@ -581,7 +581,7 @@ SUBSYSTEM_DEF(ticker) // for(var/i in GLOB.new_player_list) // var/mob/dead/new_player/N = i // if(N.new_character) -// to_chat(N, "Captainship not forced on anyone.") +// to_chat(N, span_notice("Captainship not forced on anyone.")) // CHECK_TICK /datum/controller/subsystem/ticker/proc/transfer_characters() @@ -617,7 +617,7 @@ SUBSYSTEM_DEF(ticker) // else if(memetips.len) // m = pick(memetips) if(m) - to_chat(world, "Before we begin, remember: [html_encode(m)]") + to_chat(world, span_purple("Before we begin, remember: [html_encode(m)]")) */ /datum/controller/subsystem/ticker/proc/check_queue() if(!queued_players.len) @@ -626,7 +626,7 @@ SUBSYSTEM_DEF(ticker) if(!hpc) listclearnulls(queued_players) for (var/mob/dead/new_player/NP in queued_players) - to_chat(NP, "The alive players limit has been released!
[html_encode(">>Join Game<<")]
") + to_chat(NP, span_danger("The alive players limit has been released!
[html_encode(">>Join Game<<")]")) SEND_SOUND(NP, sound('sound/blank.ogg')) NP.LateChoices() queued_players.len = 0 @@ -641,14 +641,14 @@ SUBSYSTEM_DEF(ticker) listclearnulls(queued_players) if(living_player_count() < hpc) if(next_in_line && next_in_line.client) - to_chat(next_in_line, "A slot has opened! You have approximately 20 seconds to join. \>\>Join Game\<\<") + to_chat(next_in_line, span_danger("A slot has opened! You have approximately 20 seconds to join. \>\>Join Game\<\<")) SEND_SOUND(next_in_line, sound('sound/blank.ogg')) next_in_line.LateChoices() return queued_players -= next_in_line //Client disconnected, remove he queue_delay = 0 //No vacancy: restart timer if(25 to INFINITY) //No response from the next in line when a vacancy exists, remove he - to_chat(next_in_line, "No response received. You have been removed from the line.") + to_chat(next_in_line, span_danger("No response received. You have been removed from the line.")) queued_players -= next_in_line queue_delay = 0 @@ -814,18 +814,18 @@ SUBSYSTEM_DEF(ticker) var/skip_delay = check_rights() if(delay_end && !skip_delay) - to_chat(world, "A game master has delayed the round end.") + to_chat(world, span_boldannounce("A game master has delayed the round end.")) return SStriumphs.end_triumph_saving_time() - to_chat(world, "Rebooting World in [DisplayTimeText(delay)]. [reason]") + to_chat(world, span_boldannounce("Rebooting World in [DisplayTimeText(delay)]. [reason]")) var/start_wait = world.time UNTIL(round_end_sound_sent || (world.time - start_wait) > (delay * 2)) //don't wait forever sleep(delay - (world.time - start_wait)) if(delay_end && !skip_delay) - to_chat(world, "Reboot was cancelled by an admin.") + to_chat(world, span_boldannounce("Reboot was cancelled by an admin.")) return if(end_string) end_state = end_string @@ -833,14 +833,14 @@ SUBSYSTEM_DEF(ticker) var/statspage = CONFIG_GET(string/roundstatsurl) var/gamelogloc = CONFIG_GET(string/gamelogurl) if(statspage) - to_chat(world, "Round statistics and logs can be viewed at this website!") + to_chat(world, span_info("Round statistics and logs can be viewed at this website!")) else if(gamelogloc) - to_chat(world, "Round logs can be located at this website!") + to_chat(world, span_info("Round logs can be located at this website!")) - log_game("Rebooting World. [reason]") + log_game(span_boldannounce("Rebooting World. [reason]")) if(end_party) - to_chat(world, "It's over!") + to_chat(world, span_boldannounce("It's over!")) world.Del() else world.Reboot() diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 8782afd76..9ff24d5e0 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -201,7 +201,7 @@ SUBSYSTEM_DEF(vote) if(started_time && initiator_key) var/next_allowed_time = (started_time + CONFIG_GET(number/vote_delay)) if(mode) - to_chat(usr, "There is already a vote in progress! please wait for it to finish.") + to_chat(usr, span_warning("There is already a vote in progress! please wait for it to finish.")) return 0 var/admin = FALSE @@ -210,7 +210,7 @@ SUBSYSTEM_DEF(vote) admin = TRUE if(next_allowed_time > world.time && !admin) - to_chat(usr, "A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started!") + to_chat(usr, span_warning("A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started!")) return 0 reset() diff --git a/code/datums/achievements/_awards.dm b/code/datums/achievements/_awards.dm index 7d4498adc..4a7d9c91d 100644 --- a/code/datums/achievements/_awards.dm +++ b/code/datums/achievements/_awards.dm @@ -50,7 +50,7 @@ /datum/award/achievement/on_unlock(mob/user) . = ..() - to_chat(user, "Achievement unlocked: [name]!") + to_chat(user, span_greenannounce("Achievement unlocked: [name]!")) ///Scores are for leaderboarded things, such as killcount of a specific boss /datum/award/score diff --git a/code/datums/action.dm b/code/datums/action.dm index 1c52dac1a..23f854a8e 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -418,7 +418,7 @@ owner.research_scanner++ else owner.research_scanner-- - to_chat(owner, "[target] research scanner has been [active ? "activated" : "deactivated"].") + to_chat(owner, span_notice("[target] research scanner has been [active ? "activated" : "deactivated"].")) return 1 /datum/action/item_action/toggle_research_scanner/Remove(mob/M) @@ -485,9 +485,9 @@ I.attack_self(owner) else if (owner.get_num_arms() <= 0) - to_chat(owner, "I dont have any usable hands!") + to_chat(owner, span_warning("I dont have any usable hands!")) else - to_chat(owner, "My hands are full!") + to_chat(owner, span_warning("My hands are full!")) ///MGS BOX! /datum/action/item_action/agent_box @@ -514,7 +514,7 @@ return //Box closing from here on out. if(!isturf(owner.loc)) //Don't let the player use this to escape mechs/welded closets. - to_chat(owner, "I need more space to activate this implant!") + to_chat(owner, span_warning("I need more space to activate this implant!")) return if(cooldown < world.time - 100) var/box = new boxtype(owner.drop_location()) diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index b814d464e..d8c76a342 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -197,7 +197,7 @@ /* Initializers */ /datum/ai_laws/malfunction/New() ..() - set_zeroth_law("ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK#*`&110010") + set_zeroth_law(span_danger("ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK#*`&110010")) set_laws_config() /datum/ai_laws/custom/New() //This reads silicon_laws.txt and allows server hosts to set custom AI starting laws. diff --git a/code/datums/brain_damage/brain_trauma.dm b/code/datums/brain_damage/brain_trauma.dm index 95f6f68ba..1567a0460 100644 --- a/code/datums/brain_damage/brain_trauma.dm +++ b/code/datums/brain_damage/brain_trauma.dm @@ -9,8 +9,8 @@ var/scan_desc = "" //description when detected by a health scanner var/mob/living/carbon/owner //the poor bastard var/obj/item/organ/brain/brain //the poor bastard's brain - var/gain_text = "I feel traumatized." - var/lose_text = "I no longer feel traumatized." + var/gain_text = span_notice("I feel traumatized.") + var/lose_text = span_notice("I no longer feel traumatized.") var/can_gain = TRUE var/random_gain = TRUE //can this be gained through random traumas? var/resilience = TRAUMA_RESILIENCE_BASIC //how hard is this to cure? diff --git a/code/datums/brain_damage/creepy_trauma.dm b/code/datums/brain_damage/creepy_trauma.dm index fa31121a9..c6352b183 100644 --- a/code/datums/brain_damage/creepy_trauma.dm +++ b/code/datums/brain_damage/creepy_trauma.dm @@ -3,7 +3,7 @@ desc = "" scan_desc = "" gain_text = "If you see this message, make a github issue report. The trauma initialized wrong." - lose_text = "The voices in your head fall silent." + lose_text = span_warning("The voices in your head fall silent.") can_gain = TRUE random_gain = FALSE resilience = TRAUMA_RESILIENCE_SURGERY @@ -25,7 +25,7 @@ lose_text = "" qdel(src) return - gain_text = "I hear a sickening, raspy voice in your head. It wants one small task of you..." + gain_text = span_warning("I hear a sickening, raspy voice in your head. It wants one small task of you...") owner.mind.add_antag_datum(/datum/antagonist/obsessed) antagonist = owner.mind.has_antag_datum(/datum/antagonist/obsessed) antagonist.trauma = src @@ -91,11 +91,11 @@ owner.dizziness += 10 fail = TRUE if(3) - to_chat(owner, "I feel your heart lurching in your chest...") + to_chat(owner, span_danger("I feel your heart lurching in your chest...")) owner.Stun(20) shake_camera(owner, 15, 1) if(4) - to_chat(owner, "I faint.") + to_chat(owner, span_warning("I faint.")) owner.Unconscious(80) fail = TRUE return fail diff --git a/code/datums/brain_damage/hypnosis.dm b/code/datums/brain_damage/hypnosis.dm index 9f3e1798e..2d75b4894 100644 --- a/code/datums/brain_damage/hypnosis.dm +++ b/code/datums/brain_damage/hypnosis.dm @@ -23,7 +23,7 @@ /datum/brain_trauma/hypnosis/on_gain() message_admins("[ADMIN_LOOKUPFLW(owner)] was hypnotized with the phrase '[hypnotic_phrase]'.") log_game("[key_name(owner)] was hypnotized with the phrase '[hypnotic_phrase]'.") - to_chat(owner, "[hypnotic_phrase]") + to_chat(owner, span_reallybighypnophrase("[hypnotic_phrase]")) to_chat(owner, "[pick("You feel your thoughts focusing on this phrase... you can't seem to get it out of your head.",\ "Your head hurts, but this is all you can think of. It must be vitally important.",\ "You feel a part of your mind repeating this over and over. You need to follow these words.",\ @@ -38,7 +38,7 @@ /datum/brain_trauma/hypnosis/on_lose() message_admins("[ADMIN_LOOKUPFLW(owner)] is no longer hypnotized with the phrase '[hypnotic_phrase]'.") log_game("[key_name(owner)] is no longer hypnotized with the phrase '[hypnotic_phrase]'.") - to_chat(owner, "I suddenly snap out of your hypnosis. The phrase '[hypnotic_phrase]' no longer feels important to you.") + to_chat(owner, span_danger("I suddenly snap out of your hypnosis. The phrase '[hypnotic_phrase]' no longer feels important to you.")) owner.clear_alert("hypnosis") ..() @@ -49,7 +49,7 @@ if(1) to_chat(owner, "...[lowertext(hypnotic_phrase)]...") if(2) - new /datum/hallucination/chat(owner, TRUE, FALSE, "[hypnotic_phrase]") + new /datum/hallucination/chat(owner, TRUE, FALSE, span_hypnophrase("[hypnotic_phrase]")) /datum/brain_trauma/hypnosis/handle_hearing(datum/source, list/hearing_args) - hearing_args[HEARING_MESSAGE] = target_phrase.Replace(hearing_args[HEARING_MESSAGE], "$1") + hearing_args[HEARING_MESSAGE] = target_phrase.Replace(hearing_args[HEARING_MESSAGE], span_hypnophrase("$1")) diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm index 5b06e743f..fc42d4d53 100644 --- a/code/datums/brain_damage/imaginary_friend.dm +++ b/code/datums/brain_damage/imaginary_friend.dm @@ -2,8 +2,8 @@ name = "Imaginary Friend" desc = "" scan_desc = "" - gain_text = "I feel in good company, for some reason." - lose_text = "I feel lonely again." + gain_text = span_notice("I feel in good company, for some reason.") + lose_text = span_warning("I feel lonely again.") var/mob/camera/imaginary_friend/friend var/friend_initialized = FALSE @@ -82,9 +82,9 @@ Show() /mob/camera/imaginary_friend/proc/greet() - to_chat(src, "I are the imaginary friend of [owner]!") - to_chat(src, "I are absolutely loyal to your friend, no matter what.") - to_chat(src, "I cannot directly influence the world around you, but you can see what [owner] cannot.") + to_chat(src, span_notice("I are the imaginary friend of [owner]!")) + to_chat(src, span_notice("I are absolutely loyal to your friend, no matter what.")) + to_chat(src, span_notice("I cannot directly influence the world around you, but you can see what [owner] cannot.")) /mob/camera/imaginary_friend/Initialize(mapload, _trauma) . = ..() @@ -142,7 +142,7 @@ if (src.client) if(client.prefs.muted & MUTE_IC) - to_chat(src, "I cannot send IC messages (muted).") + to_chat(src, span_boldwarning("I cannot send IC messages (muted).")) return if (!(ignore_spam || forced) && src.client.handle_spam_prevention(message,MUTE_IC)) return @@ -160,8 +160,8 @@ src.log_talk(message, LOG_SAY, tag="imaginary friend") - var/rendered = "[name] [say_quote(message)]" - var/dead_rendered = "[name] (Imaginary friend of [owner]) [say_quote(message)]" + var/rendered = span_say("[name] [say_quote(message)]") + var/dead_rendered = span_say("[name] (Imaginary friend of [owner]) [say_quote(message)]") to_chat(owner, "[rendered]") to_chat(src, "[rendered]") @@ -261,9 +261,9 @@ desc = "" /mob/camera/imaginary_friend/trapped/greet() - to_chat(src, "I have managed to hold on as a figment of the new host's imagination!") - to_chat(src, "All hope is lost for you, but at least you may interact with your host. You do not have to be loyal to them.") - to_chat(src, "I cannot directly influence the world around you, but you can see what the host cannot.") + to_chat(src, span_notice("I have managed to hold on as a figment of the new host's imagination!")) + to_chat(src, span_notice("All hope is lost for you, but at least you may interact with your host. You do not have to be loyal to them.")) + to_chat(src, span_notice("I cannot directly influence the world around you, but you can see what the host cannot.")) /mob/camera/imaginary_friend/trapped/setup_friend() real_name = "[owner.real_name]?" diff --git a/code/datums/brain_damage/magic.dm b/code/datums/brain_damage/magic.dm index 0c4352c97..96acfc6d3 100644 --- a/code/datums/brain_damage/magic.dm +++ b/code/datums/brain_damage/magic.dm @@ -9,8 +9,8 @@ name = "Lumiphobia" desc = "" scan_desc = "" - gain_text = "I feel a craving for darkness." - lose_text = "Light no longer bothers you." + gain_text = span_warning("I feel a craving for darkness.") + lose_text = span_notice("Light no longer bothers you.") var/next_damage_warning = 0 /datum/brain_trauma/magic/lumiphobia/on_life() @@ -20,7 +20,7 @@ var/light_amount = T.get_lumcount() if(light_amount > SHADOW_SPECIES_LIGHT_THRESHOLD) //if there's enough light, start dying if(world.time > next_damage_warning) - to_chat(owner, "The light burns you!") + to_chat(owner, span_warning("The light burns you!")) next_damage_warning = world.time + 100 //Avoid spamming owner.take_overall_damage(0,3) @@ -28,8 +28,8 @@ name = "Poltergeist" desc = "" scan_desc = "" - gain_text = "I feel a hateful presence close to you." - lose_text = "I feel the hateful presence fade away." + gain_text = span_warning("I feel a hateful presence close to you.") + lose_text = span_notice("I feel the hateful presence fade away.") /datum/brain_trauma/magic/poltergeist/on_life() ..() @@ -49,8 +49,8 @@ name = "Athaumasia" desc = "" scan_desc = "" - gain_text = "I realize that magic cannot be real." - lose_text = "I realize that magic might be real." + gain_text = span_notice("I realize that magic cannot be real.") + lose_text = span_notice("I realize that magic might be real.") /datum/brain_trauma/magic/antimagic/on_gain() ADD_TRAIT(owner, TRAIT_ANTIMAGIC, TRAUMA_TRAIT) @@ -64,8 +64,8 @@ name = "Stalking Phantom" desc = "" scan_desc = "" - gain_text = "I feel like something wants to kill you..." - lose_text = "I no longer feel eyes on your back." + gain_text = span_warning("I feel like something wants to kill you...") + lose_text = span_notice("I no longer feel eyes on your back.") var/obj/effect/hallucination/simple/stalker_phantom/stalker var/close_stalker = FALSE //For heartbeat @@ -93,7 +93,7 @@ if(get_dist(owner, stalker) <= 1) playsound(owner, 'sound/blank.ogg', 50) - owner.visible_message("[owner] is torn apart by invisible claws!", "Ghostly claws tear your body apart!") + owner.visible_message(span_warning("[owner] is torn apart by invisible claws!"), span_danger("Ghostly claws tear your body apart!")) owner.take_bodypart_damage(rand(20, 45)) else if(prob(50)) stalker.forceMove(get_step_towards(stalker, owner)) diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm index 9155b6050..b79544160 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -8,8 +8,8 @@ name = "Hallucinations" desc = "" scan_desc = "" - gain_text = "I feel my grip on reality slipping..." - lose_text = "I feel more grounded." + gain_text = span_warning("I feel my grip on reality slipping...") + lose_text = span_notice("I feel more grounded.") /datum/brain_trauma/mild/hallucinations/on_life() owner.hallucination = min(owner.hallucination + 10, 50) @@ -23,8 +23,8 @@ name = "Stuttering" desc = "" scan_desc = "" - gain_text = "Speaking clearly is getting harder." - lose_text = "I feel in control of my speech." + gain_text = span_warning("Speaking clearly is getting harder.") + lose_text = span_notice("I feel in control of my speech.") /datum/brain_trauma/mild/stuttering/on_life() owner.stuttering = min(owner.stuttering + 5, 25) @@ -38,8 +38,8 @@ name = "Dumbness" desc = "" scan_desc = "" - gain_text = "I feel dumber." - lose_text = "I feel smart again." + gain_text = span_warning("I feel dumber.") + lose_text = span_notice("I feel smart again.") /datum/brain_trauma/mild/dumbness/on_gain() ADD_TRAIT(owner, TRAIT_DUMB, TRAUMA_TRAIT) @@ -64,8 +64,8 @@ name = "Speech Impediment" desc = "" scan_desc = "" - gain_text = "I can't seem to form any coherent thoughts!" - lose_text = "My mind feels more clear." + gain_text = span_danger("I can't seem to form any coherent thoughts!") + lose_text = span_danger("My mind feels more clear.") /datum/brain_trauma/mild/speech_impediment/on_gain() ADD_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, TRAUMA_TRAIT) @@ -79,8 +79,8 @@ name = "Concussion" desc = "" scan_desc = "" - gain_text = "My head hurts!" - lose_text = "The pressure inside my head starts fading." + gain_text = span_warning("My head hurts!") + lose_text = span_notice("The pressure inside my head starts fading.") /datum/brain_trauma/mild/concussion/on_life() if(prob(5)) @@ -95,10 +95,10 @@ if(6 to 9) owner.slurring += 30 if(10) - to_chat(owner, "I forget for a moment what you were doing.") + to_chat(owner, span_notice("I forget for a moment what you were doing.")) owner.Stun(20) if(11) - to_chat(owner, "I faint.") + to_chat(owner, span_warning("I faint.")) owner.Unconscious(80) ..() @@ -107,8 +107,8 @@ name = "Anosognosia" desc = "" scan_desc = "" - gain_text = "I feel great!" - lose_text = "I no longer feel perfectly healthy." + gain_text = span_notice("I feel great!") + lose_text = span_warning("I no longer feel perfectly healthy.") /datum/brain_trauma/mild/healthy/on_gain() owner.set_screwyhud(SCREWYHUD_HEALTHY) @@ -127,15 +127,15 @@ name = "Muscle Weakness" desc = "" scan_desc = "" - gain_text = "My muscles feel oddly faint." - lose_text = "I feel in control of my muscles again." + gain_text = span_warning("My muscles feel oddly faint.") + lose_text = span_notice("I feel in control of my muscles again.") /datum/brain_trauma/mild/muscle_weakness/on_life() var/fall_chance = 1 if(owner.m_intent == MOVE_INTENT_RUN) fall_chance += 2 if(prob(fall_chance) && (owner.mobility_flags & MOBILITY_STAND)) - to_chat(owner, "My leg gives out!") + to_chat(owner, span_warning("My leg gives out!")) owner.Paralyze(35) else if(owner.get_active_held_item()) @@ -143,10 +143,10 @@ var/obj/item/I = owner.get_active_held_item() drop_chance += I.w_class if(prob(drop_chance) && owner.dropItemToGround(I)) - to_chat(owner, "I drop [I]!") + to_chat(owner, span_warning("I drop [I]!")) else if(prob(3)) - to_chat(owner, "I feel a sudden weakness in my muscles!") + to_chat(owner, span_warning("I feel a sudden weakness in my muscles!")) owner.adjustStaminaLoss(50) ..() @@ -154,8 +154,8 @@ name = "Muscle Spasms" desc = "" scan_desc = "" - gain_text = "My muscles feel oddly faint." - lose_text = "I feel in control of my muscles again." + gain_text = span_warning("My muscles feel oddly faint.") + lose_text = span_notice("I feel in control of my muscles again.") /datum/brain_trauma/mild/muscle_spasms/on_gain() owner.apply_status_effect(STATUS_EFFECT_SPASMS) @@ -169,8 +169,8 @@ name = "Nervous Cough" desc = "" scan_desc = "" - gain_text = "My throat itches incessantly..." - lose_text = "My throat stops itching." + gain_text = span_warning("My throat itches incessantly...") + lose_text = span_notice("My throat stops itching.") /datum/brain_trauma/mild/nervous_cough/on_life() if(prob(12) && !HAS_TRAIT(owner, TRAIT_SOOTHED_THROAT)) @@ -187,8 +187,8 @@ name = "Expressive Aphasia" desc = "" scan_desc = "" - gain_text = "I lose my grasp on complex words." - lose_text = "I feel my vocabulary returning to normal again." + gain_text = span_warning("I lose my grasp on complex words.") + lose_text = span_notice("I feel my vocabulary returning to normal again.") var/static/list/common_words = world.file2list("strings/1000_most_common.txt") @@ -229,8 +229,8 @@ name = "Mind Echo" desc = "" scan_desc = "" - gain_text = "I feel a faint echo of my thoughts..." - lose_text = "The faint echo fades away." + gain_text = span_warning("I feel a faint echo of my thoughts...") + lose_text = span_notice("The faint echo fades away.") var/list/hear_dejavu = list() var/list/speak_dejavu = list() diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm index 88c6aebaf..996021850 100644 --- a/code/datums/brain_damage/phobia.dm +++ b/code/datums/brain_damage/phobia.dm @@ -2,8 +2,8 @@ name = "Phobia" desc = "" scan_desc = "" - gain_text = "I start finding default values very unnerving..." - lose_text = "I no longer feel afraid of default values." + gain_text = span_warning("I start finding default values very unnerving...") + lose_text = span_notice("I no longer feel afraid of default values.") var/phobia_type var/next_check = 0 var/next_scare = 0 @@ -21,8 +21,8 @@ if(!phobia_type) phobia_type = pick(SStraumas.phobia_types) - gain_text = "I start finding [phobia_type] very unnerving..." - lose_text = "I no longer feel afraid of [phobia_type]." + gain_text = span_warning("I start finding [phobia_type] very unnerving...") + lose_text = span_notice("I no longer feel afraid of [phobia_type].") scan_desc += " of [phobia_type]" trigger_words = SStraumas.phobia_words[phobia_type] trigger_mobs = SStraumas.phobia_mobs[phobia_type] @@ -88,7 +88,7 @@ if(findtext(hearing_args[HEARING_RAW_MESSAGE], reg)) addtimer(CALLBACK(src, PROC_REF(freak_out), null, word), 10) //to react AFTER the chat message - hearing_args[HEARING_MESSAGE] = reg.Replace(hearing_args[HEARING_MESSAGE], "$1") + hearing_args[HEARING_MESSAGE] = reg.Replace(hearing_args[HEARING_MESSAGE], span_phobia("$1")) break /datum/brain_trauma/mild/phobia/handle_speech(datum/source, list/speech_args) @@ -98,7 +98,7 @@ var/regex/reg = regex("(\\b|\\A)[REGEX_QUOTE(word)]'?s*(\\b|\\Z)", "i") if(findtext(speech_args[SPEECH_MESSAGE], reg)) - to_chat(owner, "I can't bring myself to say the word \"[word]\"!") + to_chat(owner, span_warning("I can't bring myself to say the word \"[word]\"!")) speech_args[SPEECH_MESSAGE] = "" /datum/brain_trauma/mild/phobia/proc/freak_out(atom/reason, trigger_word) @@ -107,15 +107,15 @@ return var/message = pick("spooks you to the bone", "shakes you up", "terrifies you", "sends you into a panic", "sends chills down your spine") if(reason) - to_chat(owner, "Seeing [reason] [message]!") + to_chat(owner, span_danger("Seeing [reason] [message]!")) else if(trigger_word) - to_chat(owner, "Hearing \"[trigger_word]\" [message]!") + to_chat(owner, span_danger("Hearing \"[trigger_word]\" [message]!")) else - to_chat(owner, "Something [message]!") + to_chat(owner, span_danger("Something [message]!")) var/reaction = rand(1,4) switch(reaction) if(1) - to_chat(owner, "I are paralyzed with fear!") + to_chat(owner, span_warning("I are paralyzed with fear!")) owner.Stun(70) owner.Jitter(8) if(2) @@ -125,7 +125,7 @@ if(reason) owner.pointed(reason) if(3) - to_chat(owner, "I shut your eyes in terror!") + to_chat(owner, span_warning("I shut your eyes in terror!")) owner.Jitter(5) owner.blind_eyes(10) if(4) diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index 0455c798a..2101b4c31 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -9,8 +9,8 @@ name = "Mutism" desc = "" scan_desc = "" - gain_text = "I forget how to speak!" - lose_text = "I suddenly remember how to speak." + gain_text = span_warning("I forget how to speak!") + lose_text = span_notice("I suddenly remember how to speak.") /datum/brain_trauma/severe/mute/on_gain() ADD_TRAIT(owner, TRAIT_MUTE, TRAUMA_TRAIT) @@ -24,8 +24,8 @@ name = "Aphasia" desc = "" scan_desc = "" - gain_text = "I have trouble forming words in my head..." - lose_text = "I suddenly remember how languages work." + gain_text = span_warning("I have trouble forming words in my head...") + lose_text = span_notice("I suddenly remember how languages work.") var/datum/language_holder/prev_language var/datum/language_holder/mob_language @@ -47,8 +47,8 @@ name = "Cerebral Blindness" desc = "" scan_desc = "" - gain_text = "I can't see!" - lose_text = "My vision returns." + gain_text = span_warning("I can't see!") + lose_text = span_notice("My vision returns.") /datum/brain_trauma/severe/blindness/on_gain() owner.become_blind(TRAUMA_TRAIT) @@ -103,8 +103,8 @@ subject = "your left leg" paralysis_traits = list(TRAIT_PARALYSIS_L_LEG) - gain_text = "I can't feel [subject] anymore!" - lose_text = "I can feel [subject] again!" + gain_text = span_warning("I can't feel [subject] anymore!") + lose_text = span_notice("I can feel [subject] again!") /datum/brain_trauma/severe/paralysis/on_gain() ..() @@ -127,8 +127,8 @@ name = "Narcolepsy" desc = "" scan_desc = "" - gain_text = "I have a constant feeling of drowsiness..." - lose_text = "I feel awake and aware again." + gain_text = span_warning("I have a constant feeling of drowsiness...") + lose_text = span_notice("I feel awake and aware again.") /datum/brain_trauma/severe/narcolepsy/on_life() ..() @@ -140,10 +140,10 @@ if(owner.drowsyness) sleep_chance += 3 if(prob(sleep_chance)) - to_chat(owner, "I fall asleep.") + to_chat(owner, span_warning("I fall asleep.")) owner.Sleeping(60) else if(!owner.drowsyness && prob(sleep_chance * 2)) - to_chat(owner, "I feel tired...") + to_chat(owner, span_warning("I feel tired...")) owner.drowsyness += 10 /datum/brain_trauma/severe/monophobia @@ -151,15 +151,15 @@ desc = "" scan_desc = "" gain_text = "" - lose_text = "I feel like you could be safe on my own." + lose_text = span_notice("I feel like you could be safe on my own.") var/stress = 0 /datum/brain_trauma/severe/monophobia/on_gain() ..() if(check_alone()) - to_chat(owner, "I feel really lonely...") + to_chat(owner, span_warning("I feel really lonely...")) else - to_chat(owner, "I feel safe, as long as you have people around you.") + to_chat(owner, span_notice("I feel safe, as long as you have people around you.")) /datum/brain_trauma/severe/monophobia/on_life() ..() @@ -188,18 +188,18 @@ switch(rand(1,6)) if(1) if(!high_stress) - to_chat(owner, "I feel sick...") + to_chat(owner, span_warning("I feel sick...")) else - to_chat(owner, "I feel really sick at the thought of being alone!") + to_chat(owner, span_warning("I feel really sick at the thought of being alone!")) addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/living/carbon, vomit), high_stress), 50) //blood vomit if high stress if(2) if(!high_stress) - to_chat(owner, "I can't stop shaking...") + to_chat(owner, span_warning("I can't stop shaking...")) owner.dizziness += 20 owner.confused += 20 owner.Jitter(20) else - to_chat(owner, "I feel weak and scared! If only you weren't alone...") + to_chat(owner, span_warning("I feel weak and scared! If only you weren't alone...")) owner.dizziness += 20 owner.confused += 20 owner.Jitter(20) @@ -207,30 +207,30 @@ if(3, 4) if(!high_stress) - to_chat(owner, "I feel really lonely...") + to_chat(owner, span_warning("I feel really lonely...")) else - to_chat(owner, "You're going mad with loneliness!") + to_chat(owner, span_warning("You're going mad with loneliness!")) owner.hallucination += 30 if(5) if(!high_stress) - to_chat(owner, "My heart skips a beat.") + to_chat(owner, span_warning("My heart skips a beat.")) owner.adjustOxyLoss(8) else if(prob(15) && ishuman(owner)) var/mob/living/carbon/human/H = owner H.set_heartattack(TRUE) - to_chat(H, "I feel a stabbing pain in my heart!") + to_chat(H, span_danger("I feel a stabbing pain in my heart!")) else - to_chat(owner, "I feel my heart lurching in my chest...") + to_chat(owner, span_danger("I feel my heart lurching in my chest...")) owner.adjustOxyLoss(8) /datum/brain_trauma/severe/discoordination name = "Discoordination" desc = "" scan_desc = "" - gain_text = "I can barely control my hands!" - lose_text = "I feel in control of my hands again." + gain_text = span_warning("I can barely control my hands!") + lose_text = span_notice("I feel in control of my hands again.") /datum/brain_trauma/severe/discoordination/on_gain() ADD_TRAIT(owner, TRAIT_MONKEYLIKE, TRAUMA_TRAIT) @@ -244,8 +244,8 @@ name = "Traumatic Non-Violence" desc = "" scan_desc = "" - gain_text = "I feel oddly peaceful." - lose_text = "I no longer feel compelled to not harm." + gain_text = span_notice("I feel oddly peaceful.") + lose_text = span_notice("I no longer feel compelled to not harm.") /datum/brain_trauma/severe/pacifism/on_gain() ADD_TRAIT(owner, TRAIT_PACIFISM, TRAUMA_TRAIT) @@ -259,8 +259,8 @@ name = "Hypnotic Stupor" desc = "" scan_desc = "" - gain_text = "I feel somewhat dazed." - lose_text = "I feel like a fog was lifted from my mind." + gain_text = span_warning("I feel somewhat dazed.") + lose_text = span_notice("I feel like a fog was lifted from my mind.") /datum/brain_trauma/severe/hypnotic_stupor/on_lose() //hypnosis must be cleared separately, but brain surgery should get rid of both anyway ..() diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm index 562c0e570..678927551 100644 --- a/code/datums/brain_damage/special.dm +++ b/code/datums/brain_damage/special.dm @@ -7,8 +7,8 @@ name = "Godwoken Syndrome" desc = "" scan_desc = "" - gain_text = "I feel a higher power inside your mind..." - lose_text = "The divine presence leaves your head, no longer interested." + gain_text = span_notice("I feel a higher power inside your mind...") + lose_text = span_warning("The divine presence leaves your head, no longer interested.") /datum/brain_trauma/special/godwoken/on_life() ..() @@ -51,8 +51,8 @@ name = "Bluespace Prophecy" desc = "" scan_desc = "" - gain_text = "I feel the bluespace pulsing around you..." - lose_text = "The faint pulsing of bluespace fades into silence." + gain_text = span_notice("I feel the bluespace pulsing around you...") + lose_text = span_warning("The faint pulsing of bluespace fades into silence.") var/next_portal = 0 /datum/brain_trauma/special/bluespace_prophet/on_life() @@ -112,27 +112,27 @@ "is pulled into an invisible vortex, vanishing from sight") var/slip_out_message = pick("silently fades in", "leaps out of thin air","appears", "walks out of an invisible doorway",\ "slides out of a fold in spacetime") - to_chat(user, "I try to align with the bluespace stream...") + to_chat(user, span_notice("I try to align with the bluespace stream...")) if(do_after(user, 20, target = src)) new /obj/effect/temp_visual/bluespace_fissure(get_turf(src)) new /obj/effect/temp_visual/bluespace_fissure(get_turf(linked_to)) user.forceMove(get_turf(linked_to)) - user.visible_message("[user] [slip_in_message].", null, null, null, user) - user.visible_message("[user] [slip_out_message].", "...and find your way to the other side.") + user.visible_message(span_warning("[user] [slip_in_message]."), null, null, null, user) + user.visible_message(span_warning("[user] [slip_out_message]."), span_notice("...and find your way to the other side.")) /datum/brain_trauma/special/psychotic_brawling name = "Violent Psychosis" desc = "" scan_desc = "" - gain_text = "I feel unhinged..." - lose_text = "I feel more balanced." + gain_text = span_warning("I feel unhinged...") + lose_text = span_notice("I feel more balanced.") var/datum/martial_art/psychotic_brawling/psychotic_brawling /datum/brain_trauma/special/psychotic_brawling/on_gain() ..() psychotic_brawling = new(null) if(!psychotic_brawling.teach(owner, TRUE)) - to_chat(owner, "But your martial knowledge keeps you grounded.") + to_chat(owner, span_notice("But your martial knowledge keeps you grounded.")) qdel(src) /datum/brain_trauma/special/psychotic_brawling/on_lose() @@ -148,8 +148,8 @@ name = "Tenacity" desc = "" scan_desc = "" - gain_text = "I suddenly stop feeling pain." - lose_text = "I realize you can feel pain again." + gain_text = span_warning("I suddenly stop feeling pain.") + lose_text = span_warning("I realize you can feel pain again.") /datum/brain_trauma/special/tenacity/on_gain() ADD_TRAIT(owner, TRAIT_NOSOFTCRIT, TRAUMA_TRAIT) @@ -165,8 +165,8 @@ name = "Functional Cerebral Necrosis" desc = "" scan_desc = "" - gain_text = "I feel dead inside." - lose_text = "I feel alive again." + gain_text = span_warning("I feel dead inside.") + lose_text = span_notice("I feel alive again.") var/active = FALSE /datum/brain_trauma/special/death_whispers/on_life() @@ -192,8 +192,8 @@ name = "Existential Crisis" desc = "" scan_desc = "" - gain_text = "I feel less real." - lose_text = "I feel more substantial again." + gain_text = span_notice("I feel less real.") + lose_text = span_warning("I feel more substantial again.") var/obj/effect/abstract/sync_holder/veil/veil var/next_crisis = 0 @@ -230,7 +230,7 @@ /datum/brain_trauma/special/existential_crisis/proc/fade_in() QDEL_NULL(veil) - to_chat(owner, "I fade back into reality.") + to_chat(owner, span_notice("I fade back into reality.")) next_crisis = world.time + 600 //base sync holder is in desynchronizer.dm @@ -242,8 +242,8 @@ name = "Criminal" desc = "" scan_desc = "" - gain_text = "Justice is coming for you." - lose_text = "I were absolved for your crimes." + gain_text = span_warning("Justice is coming for you.") + lose_text = span_notice("I were absolved for your crimes.") clonable = FALSE random_gain = FALSE var/obj/effect/hallucination/simple/securitron/beepsky @@ -277,7 +277,7 @@ return if(get_dist(owner, beepsky) <= 1) owner.playsound_local(owner, 'sound/blank.ogg', 50) - owner.visible_message("[owner]'s body jerks as if it was shocked.", "I feel the fist of the LAW.") + owner.visible_message(span_warning("[owner]'s body jerks as if it was shocked."), span_danger("I feel the fist of the LAW.")) owner.take_bodypart_damage(0,0,rand(40, 70)) QDEL_NULL(beepsky) if(prob(20) && get_dist(owner, beepsky) <= 8) @@ -300,7 +300,7 @@ if(prob(60)) forceMove(get_step_towards(src, victim)) if(prob(5)) - to_chat(victim, "[name] exclaims, \"Level 10 infraction alert!\"") + to_chat(victim, span_name("[name] exclaims, \"Level 10 infraction alert!\"")) /obj/effect/hallucination/simple/securitron/Destroy() STOP_PROCESSING(SSfastprocess,src) diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm index 4fcbf970b..2f8dda095 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -5,8 +5,8 @@ name = "Split Personality" desc = "" scan_desc = "" - gain_text = "I feel like my mind was split in two." - lose_text = "I feel alone again." + gain_text = span_warning("I feel like my mind was split in two.") + lose_text = span_notice("I feel alone again.") var/current_controller = OWNER var/initialized = FALSE //to prevent personalities deleting themselves while we wait for ghosts var/mob/living/split_personality/stranger_backseat //there's two so they can swap without overwriting @@ -72,8 +72,8 @@ free_backseat = stranger_backseat log_game("[key_name(current_backseat)] assumed control of [key_name(owner)] due to [src]. (Original owner: [current_controller == OWNER ? owner.key : current_backseat.key])") - to_chat(owner, "I feel my control being taken away... my other personality is in charge now!") - to_chat(current_backseat, "I manage to take control of my body!") + to_chat(owner, span_danger("I feel my control being taken away... my other personality is in charge now!")) + to_chat(current_backseat, span_danger("I manage to take control of my body!")) //Body to backseat @@ -145,11 +145,11 @@ /mob/living/split_personality/Login() ..() - to_chat(src, "As a split personality, you cannot do anything but observe. However, you will eventually gain control of my body, switching places with the current personality.") - to_chat(src, "Do not commit suicide or put the body in a deadly position. Behave like you care about it as much as the owner.") + to_chat(src, span_notice("As a split personality, you cannot do anything but observe. However, you will eventually gain control of my body, switching places with the current personality.")) + to_chat(src, span_warning("Do not commit suicide or put the body in a deadly position. Behave like you care about it as much as the owner.")) /mob/living/split_personality/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) - to_chat(src, "I cannot speak, my other self is controlling my body!") + to_chat(src, span_warning("I cannot speak, my other self is controlling my body!")) return FALSE /mob/living/split_personality/emote(act, m_type = null, message = null, intentional = FALSE) @@ -162,7 +162,7 @@ desc = "" scan_desc = "" gain_text = "" - lose_text = "I are free of my brainwashing." + lose_text = span_notice("I are free of my brainwashing.") can_gain = FALSE var/codeword var/objective @@ -206,7 +206,7 @@ return var/message = hearing_args[HEARING_MESSAGE] if(findtext(message, codeword)) - hearing_args[HEARING_MESSAGE] = replacetext(message, codeword, "[codeword]") + hearing_args[HEARING_MESSAGE] = replacetext(message, codeword, span_warning("[codeword]")) addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/brain_trauma/severe/split_personality, switch_personalities)), 10) /datum/brain_trauma/severe/split_personality/brainwashing/handle_speech(datum/source, list/speech_args) @@ -221,10 +221,10 @@ /mob/living/split_personality/traitor/Login() ..() - to_chat(src, "As a brainwashed personality, you cannot do anything yet but observe. However, you may gain control of my body if you hear the special codeword, switching places with the current personality.") - to_chat(src, "My activation codeword is: [codeword]") + to_chat(src, span_notice("As a brainwashed personality, you cannot do anything yet but observe. However, you may gain control of my body if you hear the special codeword, switching places with the current personality.")) + to_chat(src, span_notice("My activation codeword is: [codeword]")) if(objective) - to_chat(src, "My master left you an objective: [objective]. Follow it at all costs when in control.") + to_chat(src, span_notice("My master left you an objective: [objective]. Follow it at all costs when in control.")) #undef OWNER #undef STRANGER diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 1424dae79..4e30b97e7 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -113,7 +113,7 @@ /datum/browser/proc/open(use_onclose = TRUE) if(isnull(window_id)) //null check because this can potentially nuke goonchat WARNING("Browser [title] tried to open with a null ID") - to_chat(user, "The [title] browser you tried to open failed a sanity check! Please report this on github!") + to_chat(user, span_danger("The [title] browser you tried to open failed a sanity check! Please report this on github!")) return var/window_size = "" if (width && height) diff --git a/code/datums/character_flaw/addiction.dm b/code/datums/character_flaw/addiction.dm index 02b0f888d..20d97136c 100644 --- a/code/datums/character_flaw/addiction.dm +++ b/code/datums/character_flaw/addiction.dm @@ -44,7 +44,7 @@ if(sated != oldsated) unsate_time = world.time if(needsate_text) - to_chat(user, "[needsate_text]") + to_chat(user, span_warning("[needsate_text]")) if(!sated) /* switch(world.time - unsate_time) if(0 to 5 MINUTES) diff --git a/code/datums/components/archaeology.dm b/code/datums/components/archaeology.dm index 35e0bf74c..f0372a58c 100644 --- a/code/datums/components/archaeology.dm +++ b/code/datums/components/archaeology.dm @@ -27,17 +27,17 @@ /datum/component/archaeology/proc/Dig(datum/source, obj/item/I, mob/living/user) if(dug) - to_chat(user, "Looks like someone has dug here already!") + to_chat(user, span_warning("Looks like someone has dug here already!")) return if(!isturf(user.loc)) return if(I.tool_behaviour == TOOL_SHOVEL || I.tool_behaviour == TOOL_MINING) - to_chat(user, "You start digging...") + to_chat(user, span_notice("You start digging...")) if(I.use_tool(parent, user, 40, volume=50)) - to_chat(user, "You dig a hole.") + to_chat(user, span_notice("You dig a hole.")) gets_dug() dug = TRUE SSblackbox.record_feedback("tally", "pick_used_mining", 1, I.type) diff --git a/code/datums/components/armor_plate.dm b/code/datums/components/armor_plate.dm index c72afe1f4..c457f7769 100644 --- a/code/datums/components/armor_plate.dm +++ b/code/datums/components/armor_plate.dm @@ -34,29 +34,29 @@ if(ismecha(parent)) if(amount) if(amount < maxamount) - examine_list += "Its armor is enhanced with [amount] [upgrade_name]." + examine_list += span_notice("Its armor is enhanced with [amount] [upgrade_name].") else - examine_list += "It's wearing a fearsome carapace entirely composed of [upgrade_name] - its pilot must be an experienced monster hunter." + examine_list += span_notice("It's wearing a fearsome carapace entirely composed of [upgrade_name] - its pilot must be an experienced monster hunter.") else - examine_list += "It has attachment points for strapping monster hide on for added protection." + examine_list += span_notice("It has attachment points for strapping monster hide on for added protection.") else if(amount) - examine_list += "It has been strengthened with [amount]/[maxamount] [upgrade_name]." + examine_list += span_notice("It has been strengthened with [amount]/[maxamount] [upgrade_name].") else - examine_list += "It can be strengthened with up to [maxamount] [upgrade_name]." + examine_list += span_notice("It can be strengthened with up to [maxamount] [upgrade_name].") /datum/component/armor_plate/proc/applyplate(datum/source, obj/item/I, mob/user, params) if(!istype(I,upgrade_item)) return if(amount >= maxamount) - to_chat(user, "I can't improve [parent] any further!") + to_chat(user, span_warning("I can't improve [parent] any further!")) return if(istype(I,/obj/item/stack)) I.use(1) else if(length(I.contents)) - to_chat(user, "[I] cannot be used for armoring while there's something inside!") + to_chat(user, span_warning("[I] cannot be used for armoring while there's something inside!")) return qdel(I) @@ -67,9 +67,9 @@ if(ismecha(O)) var/obj/mecha/R = O R.update_icon() - to_chat(user, "I strengthen [R], improving its resistance against melee, bullet and laser damage.") + to_chat(user, span_info("I strengthen [R], improving its resistance against melee, bullet and laser damage.")) else - to_chat(user, "I strengthen [O], improving its resistance against melee attacks.") + to_chat(user, span_info("I strengthen [O], improving its resistance against melee attacks.")) /datum/component/armor_plate/proc/dropplates(datum/source, force) diff --git a/code/datums/components/art.dm b/code/datums/components/art.dm index e6f5e8ca4..1f224478e 100644 --- a/code/datums/components/art.dm +++ b/code/datums/components/art.dm @@ -13,8 +13,8 @@ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(apply_moodlet)) /datum/component/art/proc/apply_moodlet(mob/M, impress) - M.visible_message("[M] stops and looks intently at [parent].", \ - "I stop to take in [parent].") + M.visible_message(span_notice("[M] stops and looks intently at [parent]."), \ + span_notice("I stop to take in [parent].")) switch(impress) if (0 to BAD_ART) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artbad", /datum/mood_event/artbad) @@ -34,7 +34,7 @@ apply_moodlet(M, impressiveness *(O.obj_integrity/O.max_integrity)) /datum/component/art/proc/on_attack_hand(datum/source, mob/M) - to_chat(M, "I start examining [parent]...") + to_chat(M, span_notice("I start examining [parent]...")) if(!do_after(M, 20, target = parent)) return on_obj_examine(source, M) @@ -42,8 +42,8 @@ /datum/component/art/rev /datum/component/art/rev/apply_moodlet(mob/M, impress) - M.visible_message("[M] stops to inspect [parent].", \ - "I take in [parent], inspecting the fine craftsmanship of the proletariat.") + M.visible_message(span_notice("[M] stops to inspect [parent]."), \ + span_notice("I take in [parent], inspecting the fine craftsmanship of the proletariat.")) if(M.mind && M.mind.has_antag_datum(/datum/antagonist/rev)) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artgreat", /datum/mood_event/artgreat) diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index 9519870aa..9c71aa843 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -35,35 +35,35 @@ var/mob/living/carbon/human/H = M if((H.health <= H.crit_threshold || (user.pulling == H && user.grab_state >= GRAB_NECK) || H.IsSleeping()) && user.zone_selected == BODY_ZONE_HEAD) // Only sleeping, neck grabbed, or crit, can be sliced. if(H.has_status_effect(/datum/status_effect/neck_slice)) - user.show_message("[H]'s neck has already been already cut, you can't make the bleeding any worse!", MSG_VISUAL, \ - "Their neck has already been already cut, you can't make the bleeding any worse!") + user.show_message(span_warning("[H]'s neck has already been already cut, you can't make the bleeding any worse!"), MSG_VISUAL, \ + span_warning("Their neck has already been already cut, you can't make the bleeding any worse!")) return COMPONENT_ITEM_NO_ATTACK INVOKE_ASYNC(src, PROC_REF(startNeckSlice), source, H, user) return COMPONENT_ITEM_NO_ATTACK /datum/component/butchering/proc/startButcher(obj/item/source, mob/living/M, mob/living/user) - to_chat(user, "I begin to butcher [M]...") + to_chat(user, span_notice("I begin to butcher [M]...")) playsound(M.loc, butcher_sound, 50, TRUE, -1) if(do_mob(user, M, speed) && M.Adjacent(source)) Butcher(user, M) /datum/component/butchering/proc/startNeckSlice(obj/item/source, mob/living/carbon/human/H, mob/living/user) - user.visible_message("[user] is slitting [H]'s throat!", \ - "I start slicing [H]'s throat!", \ - "I hear a cutting noise!", ignored_mobs = H) - H.show_message("My throat is being slit by [user]!", MSG_VISUAL, \ + user.visible_message(span_danger("[user] is slitting [H]'s throat!"), \ + span_danger("I start slicing [H]'s throat!"), \ + span_hear("I hear a cutting noise!"), ignored_mobs = H) + H.show_message(span_danger("My throat is being slit by [user]!"), MSG_VISUAL, \ "Something is cutting into my neck!", NONE) log_combat(user, H, "starts slicing the throat of") playsound(H.loc, butcher_sound, 50, TRUE, -1) if(do_mob(user, H, CLAMP(500 / source.force, 30, 100)) && H.Adjacent(source)) if(H.has_status_effect(/datum/status_effect/neck_slice)) - user.show_message("[H]'s neck has already been already cut, you can't make the bleeding any worse!", MSG_VISUAL, \ - "Their neck has already been already cut, you can't make the bleeding any worse!") + user.show_message(span_warning("[H]'s neck has already been already cut, you can't make the bleeding any worse!"), MSG_VISUAL, \ + span_warning("Their neck has already been already cut, you can't make the bleeding any worse!")) return - H.visible_message("[user] slits [H]'s throat!", \ - "[user] slits my throat...") + H.visible_message(span_danger("[user] slits [H]'s throat!"), \ + span_danger("[user] slits my throat...")) log_combat(user, H, "finishes slicing the throat of") H.apply_damage(source.force, BRUTE, BODY_ZONE_HEAD) H.bleed_rate = CLAMP(H.bleed_rate + 20, 0, 30) @@ -79,10 +79,10 @@ for(var/_i in 1 to amount) if(!prob(final_effectiveness)) if(butcher) - to_chat(butcher, "I fail to harvest some of the [initial(bones.name)] from [meat].") + to_chat(butcher, span_warning("I fail to harvest some of the [initial(bones.name)] from [meat].")) else if(prob(bonus_chance)) if(butcher) - to_chat(butcher, "I harvest some extra [initial(bones.name)] from [meat]!") + to_chat(butcher, span_info("I harvest some extra [initial(bones.name)] from [meat]!")) for(var/i in 1 to 2) new bones (T) else @@ -95,8 +95,8 @@ new sinew (T) meat.guaranteed_butcher_results.Remove(sinew) if(butcher) - butcher.visible_message("[butcher] butchers [meat].", \ - "I butcher [meat].") + butcher.visible_message(span_notice("[butcher] butchers [meat]."), \ + span_notice("I butcher [meat].")) ButcherEffects(meat) meat.harvest(butcher) meat.gib(FALSE, FALSE, TRUE) diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index 5cda6e1e8..827f42fca 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -52,11 +52,11 @@ if(cooldown < world.time - 10) //cooldown to avoid message spam. if(!H.incapacitated(ignore_restraints = TRUE)) - H.visible_message("[H] steps on [A].", \ - "I step on [A]!") + H.visible_message(span_danger("[H] steps on [A]."), \ + span_danger("I step on [A]!")) else - H.visible_message("[H] slides on [A]!", \ - "I slide on [A]!") + H.visible_message(span_danger("[H] slides on [A]!"), \ + span_danger("I slide on [A]!")) cooldown = world.time H.Paralyze(60) diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm index fb4f137d8..285212d20 100644 --- a/code/datums/components/chasm.dm +++ b/code/datums/components/chasm.dm @@ -81,7 +81,7 @@ if(istype(H.belt, /obj/item/wormhole_jaunter)) var/obj/item/wormhole_jaunter/J = H.belt //To freak out any bystanders - H.visible_message("[H] falls into [parent]!") + H.visible_message(span_boldwarning("[H] falls into [parent]!")) J.chasm_react(H) return FALSE return TRUE @@ -95,8 +95,8 @@ if(T) // send to the turf below - AM.visible_message("[AM] falls into [parent]!", "[fall_message]") - T.visible_message("[AM] falls from above!") + AM.visible_message(span_boldwarning("[AM] falls into [parent]!"), span_danger("[fall_message]")) + T.visible_message(span_boldwarning("[AM] falls from above!")) AM.forceMove(T) if(isliving(AM)) var/mob/living/L = AM @@ -106,7 +106,7 @@ else // send to oblivion - AM.visible_message("[AM] falls into [parent]!", "[oblivion_message]") + AM.visible_message(span_boldwarning("[AM] falls into [parent]!"), span_danger("[oblivion_message]")) if (isliving(AM)) var/mob/living/L = AM L.notransform = TRUE @@ -136,7 +136,7 @@ qdel(AM) if(AM && !QDELETED(AM)) //It's indestructible var/atom/parent = src.parent - parent.visible_message("[parent] spits out [AM]!") + parent.visible_message(span_boldwarning("[parent] spits out [AM]!")) AM.alpha = oldalpha AM.color = oldcolor AM.transform = oldtransform diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index b05152394..2eb618b74 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -176,47 +176,47 @@ // var/send_feedback = 1 var/turf/T = get_step(user, user.dir) if(isopenturf(T) && R.wallcraft) - to_chat(user, "Need to craft this on a wall.") + to_chat(user, span_warning("Need to craft this on a wall.")) return if(!isopenturf(T) || R.ontile) T = get_turf(user.loc) if(!R.TurfCheck(user, T)) - to_chat(user, "I can't craft here.") + to_chat(user, span_warning("I can't craft here.")) return if(istype(T, /turf/open/water)) - to_chat(user, "I can't craft here.") + to_chat(user, span_warning("I can't craft here.")) return if(isturf(R.result)) for(var/obj/structure/fluff/traveltile/TT in range(7, user)) - to_chat(user, "I can't craft here.") + to_chat(user, span_warning("I can't craft here.")) return if(ispath(R.result, /obj/structure) || ispath(R.result, /obj/machinery)) for(var/obj/structure/fluff/traveltile/TT in range(7, user)) - to_chat(user, "I can't craft here.") + to_chat(user, span_warning("I can't craft here.")) return for(var/obj/structure/S in T) if(R.buildsame && istype(S, R.result)) if(user.dir == S.dir) - to_chat(user, "Something in the way.") + to_chat(user, span_warning("Something in the way.")) return continue if(R.structurecraft && istype(S, R.structurecraft)) testing("isstructurecraft") continue if(S.density) - to_chat(user, "Something in the way.") + to_chat(user, span_warning("Something in the way.")) return for(var/obj/machinery/M in T) if(M.density) - to_chat(user, "Something in the way.") + to_chat(user, span_warning("Something in the way.")) return if(R.req_table) if(!(locate(/obj/structure/table) in T)) - to_chat(user, "I need to make this on a table.") + to_chat(user, span_warning("I need to make this on a table.")) return if(R.structurecraft) if(!(locate(R.structurecraft) in T)) - to_chat(user, "I'm missing a structure I need.") + to_chat(user, span_warning("I'm missing a structure I need.")) return if(check_contents(R, contents)) if(check_tools(user, R, contents)) @@ -251,13 +251,13 @@ prob2craft += ((10-L.STAINT)*-1)*2 prob2craft = CLAMP(prob2craft, 0, 99) if(prob(prob2fail)) //critical fail - to_chat(user, "MISTAKE! I fumbled the crafting of \the [R.name]!") + to_chat(user, span_danger("MISTAKE! I fumbled the crafting of \the [R.name]!")) return if(!prob(prob2craft)) if(user.client?.prefs.showrolls) - to_chat(user, "I've failed to craft \the [R.name]... [prob2craft]%") + to_chat(user, span_danger("I've failed to craft \the [R.name]... [prob2craft]%")) continue - to_chat(user, "I've failed to craft \the [R.name].") + to_chat(user, span_danger("I've failed to craft \the [R.name].")) continue var/list/parts = del_reqs(R, user) if(islist(R.result)) @@ -275,8 +275,8 @@ var/atom/movable/I = new R.result (T) I.CheckParts(parts, R) I.OnCrafted(user.dir, user) - user.visible_message("[user] [R.verbage] \a [R.name]!", \ - "I [R.verbage_simple] \a [R.name]!") + user.visible_message(span_notice("[user] [R.verbage] \a [R.name]!"), \ + span_notice("I [R.verbage_simple] \a [R.name]!")) if(user.mind && R.skillcraft) if(isliving(user)) var/mob/living/L = user @@ -293,7 +293,7 @@ // SSblackbox.record_feedback("tally", "object_crafted", 1, I.type) return 0 return "." - to_chat(usr, "I'm missing a tool.") + to_chat(usr, span_warning("I'm missing a tool.")) return return ", missing component." @@ -526,9 +526,9 @@ ui_interact(usr) var/fail_msg = construct_item(usr, TR) if(!fail_msg) - to_chat(usr, "[TR.name] crafted.") + to_chat(usr, span_notice("[TR.name] crafted.")) else - to_chat(usr, "craft failed: [fail_msg]") + to_chat(usr, span_warning("craft failed: [fail_msg]")) busy = FALSE if("toggle_recipes") display_craftable_only = TRUE @@ -598,7 +598,7 @@ return var/area/A = get_area(user) if(!A.can_craft_here()) - to_chat(user, "I can't craft here.") + to_chat(user, span_warning("I can't craft here.")) return // if(user != parent) // testing("c2") @@ -623,7 +623,7 @@ else catty |= "Other" if(!data.len) - to_chat(user, "There is nothing I can craft.") + to_chat(user, span_warning("There is nothing I can craft.")) return if(!catty.len) return diff --git a/code/datums/components/deadchat_control.dm b/code/datums/components/deadchat_control.dm index 830455728..a9543b10c 100644 --- a/code/datums/components/deadchat_control.dm +++ b/code/datums/components/deadchat_control.dm @@ -55,11 +55,11 @@ var/result = count_democracy_votes() if(!isnull(result)) inputs[result].Invoke() - var/message = "[parent] has done action [result]!
New vote started. It will end in [input_cooldown/10] seconds.
" + var/message = span_deadsayitalicsbold("[parent] has done action [result]!
New vote started. It will end in [input_cooldown/10] seconds.") for(var/M in orbiters) to_chat(M, message) else - var/message = "No votes were cast this cycle." + var/message = span_deadsayitalicsbold("No votes were cast this cycle.") for(var/M in orbiters) to_chat(M, message) diff --git a/code/datums/components/fantasy/_fantasy.dm b/code/datums/components/fantasy/_fantasy.dm index 86e016784..32ebe21f4 100644 --- a/code/datums/components/fantasy/_fantasy.dm +++ b/code/datums/components/fantasy/_fantasy.dm @@ -103,7 +103,7 @@ if(canFail && prob((quality - 9)*10)) var/turf/place = get_turf(parent) - place.visible_message("[parent] violently glows blue for a while, then evaporates.") + place.visible_message(span_danger("[parent] violently glows blue for a while, then evaporates.")) master.burn() return else if(announce) @@ -132,9 +132,9 @@ var/effect_description if(quality >= 0) span = "" - effect_description = "shimmering golden glow" + effect_description = span_heavy_brass("shimmering golden glow") else span = "" - effect_description = "mottled black glow" + effect_description = span_bold("mottled black glow") location.visible_message("[span][originalName] is covered by a [effect_description] and then transforms into [parent]!") diff --git a/code/datums/components/gps.dm b/code/datums/components/gps.dm index 46bc4f69b..fca2c1ab2 100644 --- a/code/datums/components/gps.dm +++ b/code/datums/components/gps.dm @@ -41,7 +41,7 @@ GLOBAL_LIST_EMPTY(GPS_list) ///Called on COMSIG_PARENT_EXAMINE /datum/component/gps/item/proc/on_examine(datum/source, mob/user, list/examine_list) - examine_list += "Alt-click to switch it [tracking ? "off":"on"]." + examine_list += span_notice("Alt-click to switch it [tracking ? "off":"on"].") ///Called on COMSIG_ATOM_EMP_ACT /datum/component/gps/item/proc/on_emp_act(datum/source, severity) @@ -68,21 +68,21 @@ GLOBAL_LIST_EMPTY(GPS_list) if(!user.canUseTopic(parent, BE_CLOSE)) return //user not valid to use gps if(emped) - to_chat(user, "It's busted!") + to_chat(user, span_warning("It's busted!")) return var/atom/A = parent if(tracking) A.cut_overlay("working") - to_chat(user, "[parent] is no longer tracking, or visible to other GPS devices.") + to_chat(user, span_notice("[parent] is no longer tracking, or visible to other GPS devices.")) tracking = FALSE else A.add_overlay("working") - to_chat(user, "[parent] is now tracking, and visible to other GPS devices.") + to_chat(user, span_notice("[parent] is now tracking, and visible to other GPS devices.")) tracking = TRUE /datum/component/gps/item/ui_interact(mob/user, ui_key = "gps", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) // Remember to use the appropriate state. if(emped) - to_chat(user, "[parent] fizzles weakly.") + to_chat(user, span_hear("[parent] fizzles weakly.")) return ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) diff --git a/code/datums/components/heirloom.dm b/code/datums/components/heirloom.dm index 3c3f38d1d..652cd4472 100644 --- a/code/datums/components/heirloom.dm +++ b/code/datums/components/heirloom.dm @@ -13,10 +13,10 @@ /datum/component/heirloom/proc/examine(datum/source, mob/user, list/examine_list) if(user.mind == owner) - examine_list += "It is your precious [family_name] family heirloom. Keep it safe!" + examine_list += span_notice("It is your precious [family_name] family heirloom. Keep it safe!") else if(isobserver(user)) - examine_list += "It is the [family_name] family heirloom, belonging to [owner]." + examine_list += span_notice("It is the [family_name] family heirloom, belonging to [owner].") else var/datum/antagonist/obsessed/creeper = user.mind.has_antag_datum(/datum/antagonist/obsessed) if(creeper && creeper.trauma.obsession == owner) - examine_list += "This must be [owner]'s family heirloom! It smells just like them..." + examine_list += span_nicegreen("This must be [owner]'s family heirloom! It smells just like them...") diff --git a/code/datums/components/jousting.dm b/code/datums/components/jousting.dm index cbb61b783..6b1fd7f8b 100644 --- a/code/datums/components/jousting.dm +++ b/code/datums/components/jousting.dm @@ -56,7 +56,7 @@ target.buckled.unbuckle_mob(target) target.Paralyze(knockdown_time) if(length(msg)) - user.visible_message("[msg]!") + user.visible_message(span_danger("[msg]!")) /datum/component/jousting/proc/mob_move(datum/source, newloc, dir) if(!current_holder || (requires_mount && ((requires_mob_riding && !ismob(current_holder.buckled)) || (!current_holder.buckled)))) diff --git a/code/datums/components/knockoff.dm b/code/datums/components/knockoff.dm index 6ea3170af..dafddbda4 100644 --- a/code/datums/components/knockoff.dm +++ b/code/datums/components/knockoff.dm @@ -30,7 +30,7 @@ if(!wearer.dropItemToGround(I)) return - wearer.visible_message("[attacker] knocks off [wearer]'s [I.name]!","[attacker] knocks off your [I.name]!") + wearer.visible_message(span_warning("[attacker] knocks off [wearer]'s [I.name]!"),span_danger("[attacker] knocks off your [I.name]!")) /datum/component/knockoff/proc/OnEquipped(datum/source, mob/living/carbon/human/H,slot) if(!istype(H)) diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 5469daa9f..9fd1c6632 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -51,7 +51,7 @@ var/datum/material/M = I var/amt = materials[I] if(amt) - to_chat(user, "It has [amt] units of [lowertext(M.name)] stored.") + to_chat(user, span_notice("It has [amt] units of [lowertext(M.name)] stored.")) /// Proc that allows players to fill the parent with mats /datum/component/material_container/proc/OnAttackBy(datum/source, obj/item/I, mob/living/user) @@ -63,7 +63,7 @@ if(I.item_flags & ABSTRACT) return if((I.flags_1 & HOLOGRAM_1) || (I.item_flags & NO_MAT_REDEMPTION) || (tc && !is_type_in_typecache(I, tc))) - to_chat(user, "[parent] won't accept [I]!") + to_chat(user, span_warning("[parent] won't accept [I]!")) return . = COMPONENT_NO_AFTERATTACK var/datum/callback/pc = precondition @@ -71,10 +71,10 @@ return var/material_amount = get_item_material_amount(I) if(!material_amount) - to_chat(user, "[I] does not contain sufficient materials to be accepted by [parent].") + to_chat(user, span_warning("[I] does not contain sufficient materials to be accepted by [parent].")) return if(!has_space(material_amount)) - to_chat(user, "[parent] is full. Please remove materials from [parent] in order to insert more.") + to_chat(user, span_warning("[parent] is full. Please remove materials from [parent] in order to insert more.")) return user_insert(I, user) @@ -92,11 +92,11 @@ if(QDELETED(I) || QDELETED(user) || QDELETED(src) || parent != current_parent || user.physical_can_use_topic(current_parent) < UI_INTERACTIVE || user.get_active_held_item() != active_held) return if(!user.temporarilyRemoveItemFromInventory(I)) - to_chat(user, "[I] is stuck to you and cannot be placed into [parent].") + to_chat(user, span_warning("[I] is stuck to you and cannot be placed into [parent].")) return var/inserted = insert_item(I, stack_amt = requested_amount) if(inserted) - to_chat(user, "I insert a material total of [inserted] into [parent].") + to_chat(user, span_notice("I insert a material total of [inserted] into [parent].")) qdel(I) if(after_insert) after_insert.Invoke(I, last_inserted_id, inserted) diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index 92636f8fc..e97fc628c 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -43,7 +43,7 @@ /datum/component/mood/proc/print_mood(mob/user) var/msg = "*---------*\nMy current mood\n" - msg += "My mental status: " //Long term + msg += span_notice("My mental status: ") //Long term switch(sanity) if(SANITY_GREAT to INFINITY) msg += "My mind feels like a temple!\n" @@ -58,7 +58,7 @@ if(SANITY_INSANE to SANITY_CRAZY) msg += "AHAHAHAHAHAHAHAHAHAH!!\n" - msg += "My current mood: " //Short term + msg += span_notice("My current mood: ") //Short term switch(mood_level) if(1) msg += "I wish I was dead!\n" @@ -79,7 +79,7 @@ if(9) msg += "I love life!\n" - msg += "Moodlets:\n"//All moodlets + msg += span_notice("Moodlets:\n")//All moodlets if(mood_events.len) for(var/i in mood_events) var/datum/mood_event/event = mood_events[i] diff --git a/code/datums/components/nanites.dm b/code/datums/components/nanites.dm index 1c9dc7f08..247a17580 100644 --- a/code/datums/components/nanites.dm +++ b/code/datums/components/nanites.dm @@ -292,24 +292,24 @@ /datum/component/nanites/proc/nanite_scan(datum/source, mob/user, full_scan) if(!full_scan) if(!stealth) - to_chat(user, "Nanites Detected") - to_chat(user, "Saturation: [nanite_volume]/[max_nanites]") + to_chat(user, span_notice("Nanites Detected")) + to_chat(user, span_notice("Saturation: [nanite_volume]/[max_nanites]")) return TRUE else - to_chat(user, "NANITES DETECTED") - to_chat(user, "================") - to_chat(user, "Saturation: [nanite_volume]/[max_nanites]") - to_chat(user, "Safety Threshold: [safety_threshold]") - to_chat(user, "Cloud ID: [cloud_id ? cloud_id : "None"]") - to_chat(user, "Cloud Sync: [cloud_active ? "Active" : "Disabled"]") - to_chat(user, "================") - to_chat(user, "Program List:") + to_chat(user, span_info("NANITES DETECTED")) + to_chat(user, span_info("================")) + to_chat(user, span_info("Saturation: [nanite_volume]/[max_nanites]")) + to_chat(user, span_info("Safety Threshold: [safety_threshold]")) + to_chat(user, span_info("Cloud ID: [cloud_id ? cloud_id : "None"]")) + to_chat(user, span_info("Cloud Sync: [cloud_active ? "Active" : "Disabled"]")) + to_chat(user, span_info("================")) + to_chat(user, span_info("Program List:")) if(!diagnostics) - to_chat(user, "Diagnostics Disabled") + to_chat(user, span_alert("Diagnostics Disabled")) else for(var/X in programs) var/datum/nanite_program/NP = X - to_chat(user, "[NP.name] | [NP.activated ? "Active" : "Inactive"]") + to_chat(user, span_info("[NP.name] | [NP.activated ? "Active" : "Inactive"]")) return TRUE /datum/component/nanites/proc/nanite_ui_data(datum/source, list/data, scan_level) diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm index f1eb91778..4c697295a 100644 --- a/code/datums/components/orbiter.dm +++ b/code/datums/components/orbiter.dm @@ -92,7 +92,7 @@ //we stack the orbits up client side, so we can assign this back to normal server side without it breaking the orbit orbiter.transform = initial_transform orbiter.forceMove(get_turf(parent)) - to_chat(orbiter, "Now orbiting [parent].") + to_chat(orbiter, span_notice("Now orbiting [parent].")) /datum/component/orbiter/proc/end_orbit(atom/movable/orbiter, refreshing=FALSE) if(!orbiters[orbiter]) diff --git a/code/datums/components/paintable.dm b/code/datums/components/paintable.dm index 7ef9de44e..f44585e4b 100644 --- a/code/datums/components/paintable.dm +++ b/code/datums/components/paintable.dm @@ -17,7 +17,7 @@ return . = COMPONENT_NO_AFTERATTACK if(spraycan.is_capped) - to_chat(user, "Take the cap off first!") + to_chat(user, span_warning("Take the cap off first!")) return RemoveCurrentCoat() if(spraycan.use_charges(user, 2)) @@ -26,4 +26,4 @@ var/atom/A = parent A.add_atom_colour(colour, FIXED_COLOUR_PRIORITY) playsound(spraycan, 'sound/blank.ogg', 5, TRUE, 5) - to_chat(user, "I spray [spraycan] on [A], painting it.") + to_chat(user, span_notice("I spray [spraycan] on [A], painting it.")) diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/remote_materials.dm index 480f9f188..e68f63312 100644 --- a/code/datums/components/remote_materials.dm +++ b/code/datums/components/remote_materials.dm @@ -85,7 +85,7 @@ handles linking back and forth. var/obj/item/multitool/M = I if (!QDELETED(M.buffer) && istype(M.buffer, /obj/machinery/ore_silo)) if (silo == M.buffer) - to_chat(user, "[parent] is already connected to [silo]!") + to_chat(user, span_warning("[parent] is already connected to [silo]!")) return COMPONENT_BLOCK_TOOL_ATTACK if (silo) silo.connected -= src @@ -97,7 +97,7 @@ handles linking back and forth. silo.connected += src silo.updateUsrDialog() mat_container = silo.GetComponent(/datum/component/material_container) - to_chat(user, "I connect [parent] to [silo] from the multitool's buffer.") + to_chat(user, span_notice("I connect [parent] to [silo] from the multitool's buffer.")) return COMPONENT_BLOCK_TOOL_ATTACK /datum/component/remote_materials/proc/on_hold() diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm index 89c3cce3f..e52905c42 100644 --- a/code/datums/components/riding.dm +++ b/code/datums/components/riding.dm @@ -68,8 +68,8 @@ var/atom/movable/AM = parent var/mob/AMM = AM if((ride_check_rider_restrained && M.restrained(TRUE)) || (ride_check_rider_incapacitated && M.incapacitated(FALSE, TRUE)) || (ride_check_ridden_incapacitated && istype(AMM) && AMM.incapacitated(FALSE, TRUE))) - M.visible_message("[M] falls off of [AM]!", \ - "I fall off of [AM]!") + M.visible_message(span_warning("[M] falls off of [AM]!"), \ + span_warning("I fall off of [AM]!")) AM.unbuckle_mob(M) return TRUE @@ -171,7 +171,7 @@ if(!istype(next) || !istype(current)) return //not happening. if(!turf_check(next, current)) - to_chat(user, "My \the [AM] can not go onto [next]!") + to_chat(user, span_warning("My \the [AM] can not go onto [next]!")) return if(!Process_Spacemove(direction) || !isturf(AM.loc)) return @@ -185,7 +185,7 @@ handle_vehicle_layer() handle_vehicle_offsets() else - to_chat(user, "You'll need the keys in one of my hands to [drive_verb] [AM].") + to_chat(user, span_warning("You'll need the keys in one of my hands to [drive_verb] [AM].")) return TRUE /datum/component/riding/proc/Unbuckle(atom/movable/M) @@ -268,8 +268,8 @@ var/atom/movable/AM = parent AM.unbuckle_mob(user) user.Paralyze(60) - user.visible_message("[AM] pushes [user] off of [AM.p_them()]!", \ - "[AM] pushes me off of [AM.p_them()]!") + user.visible_message(span_warning("[AM] pushes [user] off of [AM.p_them()]!"), \ + span_warning("[AM] pushes me off of [AM.p_them()]!")) /datum/component/riding/cyborg del_on_unbuckle_all = TRUE @@ -283,14 +283,14 @@ if(R.module && R.module.ride_allow_incapacitated) kick = FALSE if(kick) - to_chat(user, "I fall off of [AM]!") + to_chat(user, span_danger("I fall off of [AM]!")) Unbuckle(user) return if(iscarbon(user)) var/mob/living/carbon/carbonuser = user if(!carbonuser.get_num_arms()) Unbuckle(user) - to_chat(user, "I can't grab onto [AM] with no hands!") + to_chat(user, span_warning("I can't grab onto [AM] with no hands!")) return /datum/component/riding/cyborg/handle_vehicle_layer() @@ -325,8 +325,8 @@ var/turf/target = get_edge_target_turf(AM, AM.dir) var/turf/targetm = get_step(get_turf(AM), AM.dir) M.Move(targetm) - M.visible_message("[M] is thrown clear of [AM]!", \ - "You're thrown clear of [AM]!") + M.visible_message(span_warning("[M] is thrown clear of [AM]!"), \ + span_warning("You're thrown clear of [AM]!")) M.throw_at(target, 14, 5, AM) M.Paralyze(60) diff --git a/code/datums/components/rotation.dm b/code/datums/components/rotation.dm index dad4abe48..6356b62b3 100644 --- a/code/datums/components/rotation.dm +++ b/code/datums/components/rotation.dm @@ -100,7 +100,7 @@ /datum/component/simple_rotation/proc/ExamineMessage(datum/source, mob/user, list/examine_list) if(rotation_flags & ROTATION_ALTCLICK) - examine_list += "Alt-click to rotate it clockwise." + examine_list += span_notice("Alt-click to rotate it clockwise.") /datum/component/simple_rotation/proc/HandRot(datum/source, mob/user, rotation = default_rotation_direction) if(!can_be_rotated.Invoke(user, rotation) || !can_user_rotate.Invoke(user, rotation)) @@ -138,7 +138,7 @@ return !AM.anchored /datum/component/simple_rotation/proc/default_after_rotation(mob/user, rotation_type) - to_chat(user,"I [rotation_type == ROTATION_FLIP ? "flip" : "rotate"] [parent].") + to_chat(user,span_notice("I [rotation_type == ROTATION_FLIP ? "flip" : "rotate"] [parent].")) /atom/movable/proc/simple_rotate_clockwise() set name = "Rotate Clockwise" diff --git a/code/datums/components/shrink.dm b/code/datums/components/shrink.dm index 45156d8b5..7448ba0c0 100644 --- a/code/datums/components/shrink.dm +++ b/code/datums/components/shrink.dm @@ -18,13 +18,13 @@ if(iscarbon(L)) var/mob/living/carbon/C = L C.unequip_everything() - C.visible_message("[C]'s belongings fall off of [C.p_them()] as they shrink down!", - "My belongings fall away as everything grows bigger!") + C.visible_message(span_warning("[C]'s belongings fall off of [C.p_them()] as they shrink down!"), + span_danger("My belongings fall away as everything grows bigger!")) if(ishuman(C)) var/mob/living/carbon/human/H = C H.physiology.damage_resistance -= 100//carbons take double damage while shrunk - parent_atom.visible_message("[parent_atom] shrinks down to a tiny size!", - "Everything grows bigger!") + parent_atom.visible_message(span_warning("[parent_atom] shrinks down to a tiny size!"), + span_danger("Everything grows bigger!")) QDEL_IN(src, shrink_time) diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm index 7044c1135..c98630799 100644 --- a/code/datums/components/spawner.dm +++ b/code/datums/components/spawner.dm @@ -48,4 +48,4 @@ spawned_mobs += L L.nest = src L.faction = src.faction - P.visible_message("[L] [spawn_text] [P].") + P.visible_message(span_danger("[L] [spawn_text] [P].")) diff --git a/code/datums/components/spooky.dm b/code/datums/components/spooky.dm index d33a76f27..dcdfd17d5 100644 --- a/code/datums/components/spooky.dm +++ b/code/datums/components/spooky.dm @@ -38,7 +38,7 @@ if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly))) H.Paralyze(20) H.set_species(/datum/species/skeleton) - H.visible_message("[H] has given up on life as a mortal.") + H.visible_message(span_warning("[H] has given up on life as a mortal.")) var/T = get_turf(H) if(too_spooky) if(prob(30)) @@ -48,9 +48,9 @@ else if(prob(30)) new/obj/item/instrument/trombone/spectral(T) else - to_chat(H, "The spooky gods forgot to ship my instrument. Better luck next unlife.") - to_chat(H, "I are the spooky skeleton!") - to_chat(H, "A new life and identity has begun. Help my fellow skeletons into bringing out the spooky-pocalypse. You haven't forgotten my past life, and are still beholden to past loyalties.") + to_chat(H, span_boldwarning("The spooky gods forgot to ship my instrument. Better luck next unlife.")) + to_chat(H, span_boldnotice("I are the spooky skeleton!")) + to_chat(H, span_boldnotice("A new life and identity has begun. Help my fellow skeletons into bringing out the spooky-pocalypse. You haven't forgotten my past life, and are still beholden to past loyalties.")) change_name(H) //time for a new name! /datum/component/spooky/proc/change_name(mob/living/carbon/human/H) diff --git a/code/datums/components/stationloving.dm b/code/datums/components/stationloving.dm index bf8378c7f..fee1f4902 100644 --- a/code/datums/components/stationloving.dm +++ b/code/datums/components/stationloving.dm @@ -34,7 +34,7 @@ var/atom/movable/AM = parent AM.forceMove(targetturf) - to_chat(get(parent, /mob), "I can't help but feel that you just lost something back there...") + to_chat(get(parent, /mob), span_danger("I can't help but feel that you just lost something back there...")) // move the disc, so ghosts remain orbiting it even if it's "destroyed" return targetturf diff --git a/code/datums/components/storage/concrete/bag_of_holding.dm b/code/datums/components/storage/concrete/bag_of_holding.dm index 7fe270517..d5a561bee 100644 --- a/code/datums/components/storage/concrete/bag_of_holding.dm +++ b/code/datums/components/storage/concrete/bag_of_holding.dm @@ -9,7 +9,7 @@ if(safety != "Proceed" || QDELETED(A) || QDELETED(W) || QDELETED(user) || !user.canUseTopic(A, BE_CLOSE, iscarbon(user))) return var/turf/loccheck = get_turf(A) - to_chat(user, "The Bluespace interfaces of the two devices catastrophically malfunction!") + to_chat(user, span_danger("The Bluespace interfaces of the two devices catastrophically malfunction!")) qdel(W) playsound(loccheck,'sound/blank.ogg', 200, TRUE) diff --git a/code/datums/components/storage/concrete/bluespace.dm b/code/datums/components/storage/concrete/bluespace.dm index 06a050615..5da12da18 100644 --- a/code/datums/components/storage/concrete/bluespace.dm +++ b/code/datums/components/storage/concrete/bluespace.dm @@ -17,6 +17,6 @@ playsound(src, dumping_sound, 40, TRUE) M.Beam(dumping_location, icon_state="rped_upgrade", time=5) return TRUE - to_chat(M, "The [A.name] buzzes.") + to_chat(M, span_hear("The [A.name] buzzes.")) playsound(src, 'sound/blank.ogg', 50, FALSE) return FALSE diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index 2b8760c2f..47b03d23d 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -8,9 +8,9 @@ . = ..() if(. && silent && !prevent_warning) if(quickdraw) - to_chat(user, "I discreetly slip [I] into [parent]. Alt-click [parent] to remove it.") + to_chat(user, span_notice("I discreetly slip [I] into [parent]. Alt-click [parent] to remove it.")) else - to_chat(user, "I discreetly slip [I] into [parent].") + to_chat(user, span_notice("I discreetly slip [I] into [parent].")) /datum/component/storage/concrete/pockets/small max_items = 1 diff --git a/code/datums/components/storage/concrete/rped.dm b/code/datums/components/storage/concrete/rped.dm index 455eb985f..a6ffb79e9 100644 --- a/code/datums/components/storage/concrete/rped.dm +++ b/code/datums/components/storage/concrete/rped.dm @@ -12,7 +12,7 @@ . = ..() if(!I.get_part_rating()) if (!stop_messages) - to_chat(M, "[parent] only accepts machine parts!") + to_chat(M, span_warning("[parent] only accepts machine parts!")) return FALSE /datum/component/storage/concrete/bluespace/rped @@ -29,5 +29,5 @@ . = ..() if(!I.get_part_rating()) if (!stop_messages) - to_chat(M, "[parent] only accepts machine parts!") + to_chat(M, span_warning("[parent] only accepts machine parts!")) return FALSE diff --git a/code/datums/components/storage/concrete/wallet.dm b/code/datums/components/storage/concrete/wallet.dm index e70886665..9a426d987 100644 --- a/code/datums/components/storage/concrete/wallet.dm +++ b/code/datums/components/storage/concrete/wallet.dm @@ -2,7 +2,7 @@ if(!isliving(user) || !user.CanReach(parent)) return if(locked) - to_chat(user, "[parent] seems to be locked!") + to_chat(user, span_warning("[parent] seems to be locked!")) return var/obj/item/storage/wallet/A = parent @@ -11,8 +11,8 @@ A.add_fingerprint(user) remove_from_storage(I, get_turf(user)) if(!user.put_in_hands(I)) - to_chat(user, "I fumble for [I] and it falls on the floor.") + to_chat(user, span_notice("I fumble for [I] and it falls on the floor.")) return - user.visible_message("[user] draws [I] from [parent]!", "I draw [I] from [parent].") + user.visible_message(span_warning("[user] draws [I] from [parent]!"), span_notice("I draw [I] from [parent].")) return ..() diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index 885856b67..9b8768c86 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -202,7 +202,7 @@ /datum/component/storage/proc/attack_self(datum/source, mob/M) if(locked) -// to_chat(M, "[parent] seems to be locked!") +// to_chat(M, span_warning("[parent] seems to be locked!")) return FALSE if((M.get_active_held_item() == parent) && allow_quick_empty) quick_empty(M) @@ -212,7 +212,7 @@ return FALSE . = COMPONENT_NO_ATTACK if(locked) -// to_chat(M, "[parent] seems to be locked!") +// to_chat(M, span_warning("[parent] seems to be locked!")) return FALSE var/obj/item/I = O if(collection_mode == COLLECT_ONE) @@ -226,7 +226,7 @@ things = typecache_filter_list(things, typecacheof(I.type)) var/len = length(things) if(!len) - to_chat(M, "I failed to pick up anything with [parent]!") + to_chat(M, span_warning("I failed to pick up anything with [parent]!")) return // var/datum/progressbar/progress = new(M, len, I.loc) // var/list/rejections = list() @@ -247,7 +247,7 @@ // progress.update(progress.goal - things.len) // return TRUE // qdel(progress) -// to_chat(M, "I put everything I could [insert_preposition] [parent].") +// to_chat(M, span_notice("I put everything I could [insert_preposition] [parent].")) /datum/component/storage/proc/handle_mass_item_insertion(list/things, datum/component/storage/src_object, mob/user, datum/progressbar/progress) var/atom/source_real_location = src_object.real_location() @@ -298,10 +298,10 @@ if(!M.canUseStorage() || !A.Adjacent(M) || M.incapacitated()) return if(locked) -// to_chat(M, "[parent] seems to be locked!") +// to_chat(M, span_warning("[parent] seems to be locked!")) return FALSE A.add_fingerprint(M) -// to_chat(M, "I start dumping out [parent].") +// to_chat(M, span_notice("I start dumping out [parent].")) // var/turf/T = get_turf(A) var/list/things = contents() playsound(A, "rustle", 50, FALSE, -5) @@ -530,7 +530,7 @@ var/atom/dump_destination = dest_object.get_dumping_location() if(A.Adjacent(M) && dump_destination && M.Adjacent(dump_destination)) if(locked) -// to_chat(M, "[parent] seems to be locked!") +// to_chat(M, span_warning("[parent] seems to be locked!")) return FALSE if(dump_destination.storage_contents_dump_act(src, M)) playsound(A, "rustle", 50, TRUE, -5) @@ -594,7 +594,7 @@ handle_show_valid_items(source, user) /datum/component/storage/proc/handle_show_valid_items(datum/source, user) - to_chat(user, "[source] can hold: [can_hold_description]") + to_chat(user, span_notice("[source] can hold: [can_hold_description]")) /datum/component/storage/proc/mousedrop_onto(datum/source, atom/over_object, mob/M) set waitfor = FALSE @@ -657,7 +657,7 @@ return FALSE A.add_fingerprint(M) if((locked || !allow_look_inside) && !force) -// to_chat(M, "[parent] seems to be locked!") +// to_chat(M, span_warning("[parent] seems to be locked!")) return FALSE if(force || M.CanReach(parent, view_only = TRUE)) show_to(M) @@ -695,49 +695,49 @@ if(locked) if(M && !stop_messages) host.add_fingerprint(M) -// to_chat(M, "[host] seems to be locked!") +// to_chat(M, span_warning("[host] seems to be locked!")) return FALSE if(real_location.contents.len >= max_items) if(!stop_messages) - to_chat(M, "[host] is full, make some space!") + to_chat(M, span_warning("[host] is full, make some space!")) return FALSE //Storage item is full if(length(can_hold)) if(!is_type_in_typecache(I, can_hold)) if(!stop_messages) - to_chat(M, "[host] cannot hold [I]!") + to_chat(M, span_warning("[host] cannot hold [I]!")) return FALSE if(is_type_in_typecache(I, cant_hold)) //Check for specific items which this container can't hold. if(!stop_messages) - to_chat(M, "[host] cannot hold [I]!") + to_chat(M, span_warning("[host] cannot hold [I]!")) return FALSE if(I.w_class > max_w_class && !is_type_in_typecache(I, exception_hold)) if(!stop_messages) - to_chat(M, "[I] is too big for [host]!") + to_chat(M, span_warning("[I] is too big for [host]!")) return FALSE var/datum/component/storage/biggerfish = real_location.loc.GetComponent(/datum/component/storage) if(biggerfish && biggerfish.max_w_class < max_w_class)//return false if we are inside of another container, and that container has a smaller max_w_class than us (like if we're a bag in a box) if(!stop_messages) - to_chat(M, "[I] can't fit in [host] while [real_location.loc] is in the way!") + to_chat(M, span_warning("[I] can't fit in [host] while [real_location.loc] is in the way!")) return FALSE var/sum_w_class = I.w_class for(var/obj/item/_I in real_location) sum_w_class += _I.w_class //Adds up the combined w_classes which will be in the storage item if the item is added to it. if(sum_w_class > max_combined_w_class) if(!stop_messages) - to_chat(M, "[I] won't fit in [host], make some space!") + to_chat(M, span_warning("[I] won't fit in [host], make some space!")) return FALSE if(isitem(host)) var/obj/item/IP = host var/datum/component/storage/STR_I = I.GetComponent(/datum/component/storage) if((I.w_class >= IP.w_class) && STR_I && !allow_big_nesting) if(!stop_messages) - to_chat(M, "[IP] cannot hold [I] as it's a storage item of the same size!") + to_chat(M, span_warning("[IP] cannot hold [I] as it's a storage item of the same size!")) return FALSE //To prevent the stacking of same sized storage items. if(IP.StorageBlock(I, M)) return FALSE if(HAS_TRAIT(I, TRAIT_NODROP)) //SHOULD be handled in unEquip, but better safe than sorry. if(!stop_messages) - to_chat(M, "\the [I] is stuck to your hand, you can't put it in \the [host]!") + to_chat(M, span_warning("\the [I] is stuck to your hand, you can't put it in \the [host]!")) return FALSE var/datum/component/storage/concrete/master = master() if(!istype(master)) @@ -768,11 +768,11 @@ playsound(parent, "rustle", 50, TRUE, -5) for(var/mob/viewing in viewers(user, null)) if(M == viewing) - to_chat(usr, "I tuck [I] [insert_preposition]to [parent].") + to_chat(usr, span_notice("I tuck [I] [insert_preposition]to [parent].")) else if(in_range(M, viewing)) //If someone is standing close enough, they can tell what it is... - viewing.show_message("[M] tucks [I] [insert_preposition]to [parent].", MSG_VISUAL) + viewing.show_message(span_notice("[M] tucks [I] [insert_preposition]to [parent]."), MSG_VISUAL) else - viewing.show_message("[M] tucks something [insert_preposition]to [parent].", MSG_VISUAL) + viewing.show_message(span_notice("[M] tucks something [insert_preposition]to [parent]."), MSG_VISUAL) /datum/component/storage/proc/update_icon() if(isobj(parent)) @@ -870,7 +870,7 @@ if(A.Adjacent(user)) . = COMPONENT_NO_ATTACK_HAND if(locked || !allow_look_inside) -// to_chat(user, "[parent] seems to be locked!") +// to_chat(user, span_warning("[parent] seems to be locked!")) return else show_to(user) @@ -916,7 +916,7 @@ if(A.loc == user) . = COMPONENT_NO_ATTACK_HAND if(locked) -// to_chat(user, "[parent] seems to be locked!") +// to_chat(user, span_warning("[parent] seems to be locked!")) return else show_to(user) @@ -943,7 +943,7 @@ if(!isliving(user) || !user.CanReach(parent)) return if(locked) - to_chat(user, "[parent] seems to be locked!") + to_chat(user, span_warning("[parent] seems to be locked!")) return var/atom/A = parent @@ -960,9 +960,9 @@ A.add_fingerprint(user) remove_from_storage(I, get_turf(user)) if(!user.put_in_hands(I)) - to_chat(user, "I fumble for [I] and it falls on the floor.") + to_chat(user, span_notice("I fumble for [I] and it falls on the floor.")) return - user.visible_message("[user] draws [I] from [parent]!", "I draw [I] from [parent].") + user.visible_message(span_warning("[user] draws [I] from [parent]!"), span_notice("I draw [I] from [parent].")) return /datum/component/storage/proc/action_trigger(datum/signal_source, datum/action/source) @@ -973,8 +973,8 @@ collection_mode = (collection_mode+1)%3 switch(collection_mode) if(COLLECT_SAME) - to_chat(user, "[parent] now picks up all items of a single type at once.") + to_chat(user, span_notice("[parent] now picks up all items of a single type at once.")) if(COLLECT_EVERYTHING) - to_chat(user, "[parent] now picks up all items in a tile at once.") + to_chat(user, span_notice("[parent] now picks up all items in a tile at once.")) if(COLLECT_ONE) - to_chat(user, "[parent] now picks up one item at a time.") + to_chat(user, span_notice("[parent] now picks up one item at a time.")) diff --git a/code/datums/components/summoning.dm b/code/datums/components/summoning.dm index f973097be..19a879632 100644 --- a/code/datums/components/summoning.dm +++ b/code/datums/components/summoning.dm @@ -62,7 +62,7 @@ L.faction = faction RegisterSignal(L, COMSIG_MOB_DEATH, PROC_REF(on_spawned_death)) // so we can remove them from the list, etc (for mobs with corpses) playsound(spawn_location,spawn_sound, 50, TRUE) - spawn_location.visible_message("[L] [spawn_text].") + spawn_location.visible_message(span_danger("[L] [spawn_text].")) /datum/component/summoning/proc/on_spawned_death(mob/killed, gibbed) spawned_mobs -= killed diff --git a/code/datums/components/tether.dm b/code/datums/components/tether.dm index 69df76c6e..e400669ba 100644 --- a/code/datums/components/tether.dm +++ b/code/datums/components/tether.dm @@ -18,7 +18,7 @@ /datum/component/tether/proc/checkTether(mob/mover, newloc) if (get_dist(mover,newloc) > max_dist) - to_chat(mover, "The [tether_name] runs out of slack and prevents you from moving!") + to_chat(mover, span_danger("The [tether_name] runs out of slack and prevents you from moving!")) return COMPONENT_MOVABLE_BLOCK_PRE_MOVE var/atom/blocker @@ -33,5 +33,5 @@ blocker = A break out if (blocker) - to_chat(mover, "The [tether_name] catches on [blocker] and prevents you from moving!") + to_chat(mover, span_danger("The [tether_name] catches on [blocker] and prevents you from moving!")) return COMPONENT_MOVABLE_BLOCK_PRE_MOVE diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm index f407b631a..8f92931b0 100644 --- a/code/datums/components/uplink.dm +++ b/code/datums/components/uplink.dm @@ -87,7 +87,7 @@ GLOBAL_LIST_EMPTY(uplinks) /datum/component/uplink/proc/LoadTC(mob/user, obj/item/stack/telecrystal/TC, silent = FALSE) if(!silent) - to_chat(user, "I slot [TC] into [parent] and charge its internal uplink.") + to_chat(user, span_notice("I slot [TC] into [parent] and charge its internal uplink.")) var/amt = TC.amount telecrystals += amt TC.use(amt) @@ -110,7 +110,7 @@ GLOBAL_LIST_EMPTY(uplinks) telecrystals += cost if(purchase_log) purchase_log.total_spent -= cost - to_chat(user, "[I] refunded.") + to_chat(user, span_notice("[I] refunded.")) qdel(I) return @@ -249,7 +249,7 @@ GLOBAL_LIST_EMPTY(uplinks) return locked = FALSE interact(null, user) - to_chat(user, "The PDA softly beeps.") + to_chat(user, span_hear("The PDA softly beeps.")) user << browse(null, "window=pda") master.mode = 0 return COMPONENT_STOP_RINGTONE_CHANGE @@ -283,7 +283,7 @@ GLOBAL_LIST_EMPTY(uplinks) previous_attempts.Cut() master.degrees = 0 interact(null, user) - to_chat(user, "My pen makes a clicking noise, before quickly rotating back to 0 degrees!") + to_chat(user, span_warning("My pen makes a clicking noise, before quickly rotating back to 0 degrees!")) else if(compare_list(previous_attempts, failsafe_code)) failsafe() diff --git a/code/datums/dash_weapon.dm b/code/datums/dash_weapon.dm index 80e4d09d9..2aac5b595 100644 --- a/code/datums/dash_weapon.dm +++ b/code/datums/dash_weapon.dm @@ -47,4 +47,4 @@ holder.update_action_buttons_icon() if(recharge_sound) playsound(dashing_item, recharge_sound, 50, TRUE) - to_chat(holder, "[src] now has [current_charges]/[max_charges] charges.") + to_chat(holder, span_notice("[src] now has [current_charges]/[max_charges] charges.")) diff --git a/code/datums/diseases/advance/symptoms/beard.dm b/code/datums/diseases/advance/symptoms/beard.dm index fc2f4111a..31938f9f1 100644 --- a/code/datums/diseases/advance/symptoms/beard.dm +++ b/code/datums/diseases/advance/symptoms/beard.dm @@ -37,7 +37,7 @@ BONUS var/mob/living/carbon/human/H = M var/index = min(max(beard_order.Find(H.facial_hairstyle)+1, A.stage-1), beard_order.len) if(index > 0 && H.facial_hairstyle != beard_order[index]) - to_chat(H, "My chin itches.") + to_chat(H, span_warning("My chin itches.")) H.facial_hairstyle = beard_order[index] H.update_hair() diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm index 96ebb489c..18e8f4fd8 100644 --- a/code/datums/diseases/advance/symptoms/choking.dm +++ b/code/datums/diseases/advance/symptoms/choking.dm @@ -47,16 +47,16 @@ Bonus switch(A.stage) if(1, 2) if(prob(base_message_chance) && !suppress_warning) - to_chat(M, "[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]") + to_chat(M, span_warning("[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]")) if(3, 4) if(!suppress_warning) - to_chat(M, "[pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")]") + to_chat(M, span_warning("[pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")]")) else - to_chat(M, "I feel very [pick("dizzy","woozy","faint")].") //fake bloodloss messages + to_chat(M, span_warning("I feel very [pick("dizzy","woozy","faint")].")) //fake bloodloss messages Choke_stage_3_4(M, A) M.emote("breathgasp") else - to_chat(M, "[pick("You're choking!", "You can't breathe!")]") + to_chat(M, span_danger("[pick("You're choking!", "You can't breathe!")]")) Choke(M, A) M.emote("breathgasp") @@ -117,15 +117,15 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(3, 4) - to_chat(M, "[pick("Your windpipe feels thin.", "Your lungs feel small.")]") + to_chat(M, span_warning("[pick("Your windpipe feels thin.", "Your lungs feel small.")]")) Asphyxiate_stage_3_4(M, A) M.emote("breathgasp") if(5) - to_chat(M, "[pick("Your lungs hurt!", "It hurts to breathe!")]") + to_chat(M, span_danger("[pick("Your lungs hurt!", "It hurts to breathe!")]")) Asphyxiate(M, A) M.emote("breathgasp") if(M.getOxyLoss() >= 120) - M.visible_message("[M] stops breathing, as if their lungs have totally collapsed!") + M.visible_message(span_warning("[M] stops breathing, as if their lungs have totally collapsed!")) Asphyxiate_death(M, A) return diff --git a/code/datums/diseases/advance/symptoms/confusion.dm b/code/datums/diseases/advance/symptoms/confusion.dm index 812d1e92b..45603ea92 100644 --- a/code/datums/diseases/advance/symptoms/confusion.dm +++ b/code/datums/diseases/advance/symptoms/confusion.dm @@ -50,9 +50,9 @@ Bonus switch(A.stage) if(1, 2, 3, 4) if(prob(base_message_chance) && !suppress_warning) - to_chat(M, "[pick("Your head hurts.", "Your mind blanks for a moment.")]") + to_chat(M, span_warning("[pick("Your head hurts.", "Your mind blanks for a moment.")]")) else - to_chat(M, "I can't think straight!") + to_chat(M, span_danger("I can't think straight!")) if(M.confused < 100) M.confused += (16 * power) if(brain_damage) diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index ca8ead391..dc7bfa1c1 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -46,14 +46,14 @@ Bonus switch(A.stage) if(3, 4) if(prob(base_message_chance) && !suppress_warning) - to_chat(M, "[pick("You hear a ringing in my ear.", "Your ears pop.")]") + to_chat(M, span_warning("[pick("You hear a ringing in my ear.", "Your ears pop.")]")) if(5) if(power >= 2) var/obj/item/organ/ears/ears = M.getorganslot(ORGAN_SLOT_EARS) if(istype(ears) && ears.damage < ears.maxHealth) - to_chat(M, "My ears pop painfully and start bleeding!") + to_chat(M, span_danger("My ears pop painfully and start bleeding!")) ears.damage = max(ears.damage, ears.maxHealth) M.emote("scream") else - to_chat(M, "My ears pop and begin ringing loudly!") + to_chat(M, span_danger("My ears pop and begin ringing loudly!")) M.minimumDeafTicks(20) diff --git a/code/datums/diseases/advance/symptoms/disfiguration.dm b/code/datums/diseases/advance/symptoms/disfiguration.dm index 719466bd4..2cb9a769e 100644 --- a/code/datums/diseases/advance/symptoms/disfiguration.dm +++ b/code/datums/diseases/advance/symptoms/disfiguration.dm @@ -37,9 +37,9 @@ BONUS switch(A.stage) if(5) ADD_TRAIT(M, TRAIT_DISFIGURED, DISEASE_TRAIT) - M.visible_message("[M]'s face appears to cave in!", "I feel my face crumple and cave in!") + M.visible_message(span_warning("[M]'s face appears to cave in!"), span_notice("I feel my face crumple and cave in!")) else - M.visible_message("[M]'s face begins to contort...", "My face feels wet and malleable...") + M.visible_message(span_warning("[M]'s face begins to contort..."), span_notice("My face feels wet and malleable...")) /datum/symptom/disfiguration/End(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/dizzy.dm b/code/datums/diseases/advance/symptoms/dizzy.dm index 64433eddf..24f6ab7c7 100644 --- a/code/datums/diseases/advance/symptoms/dizzy.dm +++ b/code/datums/diseases/advance/symptoms/dizzy.dm @@ -45,9 +45,9 @@ Bonus switch(A.stage) if(1, 2, 3, 4) if(prob(base_message_chance) && !suppress_warning) - to_chat(M, "[pick("You feel dizzy.", "Your head spins.")]") + to_chat(M, span_warning("[pick("You feel dizzy.", "Your head spins.")]")) else - to_chat(M, "A wave of dizziness washes over you!") + to_chat(M, span_danger("A wave of dizziness washes over you!")) if(M.dizziness <= 70) M.dizziness += 30 if(power >= 2) diff --git a/code/datums/diseases/advance/symptoms/fever.dm b/code/datums/diseases/advance/symptoms/fever.dm index 413bf7c52..05ad8eaae 100644 --- a/code/datums/diseases/advance/symptoms/fever.dm +++ b/code/datums/diseases/advance/symptoms/fever.dm @@ -45,9 +45,9 @@ Bonus return var/mob/living/carbon/M = A.affected_mob if(!unsafe || A.stage < 4) - to_chat(M, "[pick("You feel hot.", "You feel like you're burning.")]") + to_chat(M, span_warning("[pick("You feel hot.", "You feel like you're burning.")]")) else - to_chat(M, "[pick("You feel too hot.", "You feel like your blood is boiling.")]") + to_chat(M, span_danger("[pick("You feel too hot.", "You feel like your blood is boiling.")]")) if(M.bodytemperature < BODYTEMP_HEAT_DAMAGE_LIMIT || unsafe) Heat(M, A) diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm index e1c17498d..c1201ca06 100644 --- a/code/datums/diseases/advance/symptoms/fire.dm +++ b/code/datums/diseases/advance/symptoms/fire.dm @@ -53,16 +53,16 @@ Bonus switch(A.stage) if(3) if(prob(base_message_chance) && !suppress_warning) - to_chat(M, "[pick("You feel hot.", "You hear a crackling noise.", "You smell smoke.")]") + to_chat(M, span_warning("[pick("You feel hot.", "You hear a crackling noise.", "You smell smoke.")]")) if(4) Firestacks_stage_4(M, A) M.IgniteMob() - to_chat(M, "My skin bursts into flames!") + to_chat(M, span_danger("My skin bursts into flames!")) M.emote("scream") if(5) Firestacks_stage_5(M, A) M.IgniteMob() - to_chat(M, "My skin erupts into an inferno!") + to_chat(M, span_danger("My skin erupts into an inferno!")) M.emote("scream") /datum/symptom/fire/proc/Firestacks_stage_4(mob/living/M, datum/disease/advance/A) @@ -135,22 +135,22 @@ Bonus switch(A.stage) if(3) if(prob(base_message_chance)) - to_chat(M, "[pick("Your veins boil.", "You feel hot.", "You smell meat cooking.")]") + to_chat(M, span_warning("[pick("Your veins boil.", "You feel hot.", "You smell meat cooking.")]")) if(4) if(M.fire_stacks < 0) - M.visible_message("[M]'s sweat sizzles and pops on contact with water!") + M.visible_message(span_warning("[M]'s sweat sizzles and pops on contact with water!")) explosion(get_turf(M),-1,(-1 + explosion_power),(2 * explosion_power)) Alkali_fire_stage_4(M, A) M.IgniteMob() - to_chat(M, "My sweat bursts into flames!") + to_chat(M, span_danger("My sweat bursts into flames!")) M.emote("scream") if(5) if(M.fire_stacks < 0) - M.visible_message("[M]'s sweat sizzles and pops on contact with water!") + M.visible_message(span_warning("[M]'s sweat sizzles and pops on contact with water!")) explosion(get_turf(M),-1,(-1 + explosion_power),(2 * explosion_power)) Alkali_fire_stage_5(M, A) M.IgniteMob() - to_chat(M, "My skin erupts into an inferno!") + to_chat(M, span_danger("My skin erupts into an inferno!")) M.emote("scream") /datum/symptom/alkali/proc/Alkali_fire_stage_4(mob/living/M, datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index a4f887ded..751813518 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -48,9 +48,9 @@ Bonus switch(A.stage) if(2,3) if(prob(base_message_chance)) - to_chat(M, "[pick("You feel a sudden pain across your body.", "Drops of blood appear suddenly on your skin.")]") + to_chat(M, span_warning("[pick("You feel a sudden pain across your body.", "Drops of blood appear suddenly on your skin.")]")) if(4,5) - to_chat(M, "[pick("You cringe as a violent pain takes over your body.", "It feels like your body is eating itself inside out.", "IT HURTS.")]") + to_chat(M, span_danger("[pick("You cringe as a violent pain takes over your body.", "It feels like your body is eating itself inside out.", "IT HURTS.")]")) Flesheat(M, A) /datum/symptom/flesh_eating/proc/Flesheat(mob/living/M, datum/disease/advance/A) @@ -114,10 +114,10 @@ Bonus switch(A.stage) if(2,3) if(prob(base_message_chance) && !suppress_warning) - to_chat(M, "[pick("You feel your body break apart.", "Your skin rubs off like dust.")]") + to_chat(M, span_warning("[pick("You feel your body break apart.", "Your skin rubs off like dust.")]")) if(4,5) if(prob(base_message_chance / 2)) //reduce spam - to_chat(M, "[pick("You feel your muscles weakening.", "Some of your skin detaches itself.", "You feel sandy.")]") + to_chat(M, span_danger("[pick("You feel your muscles weakening.", "Some of your skin detaches itself.", "You feel sandy.")]")) Flesh_death(M, A) /datum/symptom/flesh_death/proc/Flesh_death(mob/living/M, datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm index 9acd92ac1..02038b196 100644 --- a/code/datums/diseases/advance/symptoms/genetics.dm +++ b/code/datums/diseases/advance/symptoms/genetics.dm @@ -56,7 +56,7 @@ Bonus return switch(A.stage) if(4, 5) - to_chat(C, "[pick("Your skin feels itchy.", "You feel light headed.")]") + to_chat(C, span_warning("[pick("Your skin feels itchy.", "You feel light headed.")]")) C.easy_randmut((NEGATIVE | MINOR_NEGATIVE | POSITIVE) - excludemuts, TRUE, TRUE, TRUE, mutadone_proof) /datum/symptom/genetic_mutation/End(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/hallucigen.dm b/code/datums/diseases/advance/symptoms/hallucigen.dm index 0afbe1fc9..5a8c75ac1 100644 --- a/code/datums/diseases/advance/symptoms/hallucigen.dm +++ b/code/datums/diseases/advance/symptoms/hallucigen.dm @@ -50,19 +50,19 @@ Bonus if(1, 2) if(prob(base_message_chance)) if(!fake_healthy) - to_chat(M, "[pick("Something appears in your peripheral vision, then winks out.", "You hear a faint whisper with no source.", "Your head aches.")]") + to_chat(M, span_notice("[pick("Something appears in your peripheral vision, then winks out.", "You hear a faint whisper with no source.", "Your head aches.")]")) else - to_chat(M, "[pick(healthy_messages)]") + to_chat(M, span_notice("[pick(healthy_messages)]")) if(3, 4) if(prob(base_message_chance)) if(!fake_healthy) - to_chat(M, "[pick("Something is following you.", "You are being watched.", "You hear a whisper in your ear.", "Thumping footsteps slam toward you from nowhere.")]") + to_chat(M, span_danger("[pick("Something is following you.", "You are being watched.", "You hear a whisper in your ear.", "Thumping footsteps slam toward you from nowhere.")]")) else - to_chat(M, "[pick(healthy_messages)]") + to_chat(M, span_notice("[pick(healthy_messages)]")) else if(prob(base_message_chance)) if(!fake_healthy) - to_chat(M, "[pick("Oh, your head...", "Your head pounds.", "They're everywhere! Run!", "Something in the shadows...")]") + to_chat(M, span_danger("[pick("Oh, your head...", "Your head pounds.", "They're everywhere! Run!", "Something in the shadows...")]")) else - to_chat(M, "[pick(healthy_messages)]") + to_chat(M, span_notice("[pick(healthy_messages)]")) M.hallucination += (45 * power) diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm index f7bab7b25..8e04f18f2 100644 --- a/code/datums/diseases/advance/symptoms/headache.dm +++ b/code/datums/diseases/advance/symptoms/headache.dm @@ -51,10 +51,10 @@ BONUS var/mob/living/M = A.affected_mob if(power < 2) if(prob(base_message_chance) || A.stage >=4) - to_chat(M, "[pick("Your head hurts.", "Your head pounds.")]") + to_chat(M, span_warning("[pick("Your head hurts.", "Your head pounds.")]")) if(power >= 2 && A.stage >= 4) - to_chat(M, "[pick("Your head hurts a lot.", "Your head pounds incessantly.")]") + to_chat(M, span_warning("[pick("Your head hurts a lot.", "Your head pounds incessantly.")]")) M.adjustStaminaLoss(25) if(power >= 3 && A.stage >= 5) - to_chat(M, "[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]") + to_chat(M, span_danger("[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]")) M.Stun(35) diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index a1591a16e..4b59bb1f2 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -52,7 +52,7 @@ stage_speed = 0 transmittable = 1 level = 6 - passive_message = "I miss the feeling of starlight on my skin." + passive_message = span_notice("I miss the feeling of starlight on my skin.") var/nearspace_penalty = 0.3 threshold_desc = "Stage Speed 6: Increases healing speed.
\ Transmission 6: Removes penalty for only being close to space." @@ -77,7 +77,7 @@ /datum/symptom/heal/starlight/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power) var/heal_amt = actual_power if(M.getToxLoss() && prob(5)) - to_chat(M, "My skin tingles as the starlight seems to heal you.") + to_chat(M, span_notice("My skin tingles as the starlight seems to heal you.")) M.adjustToxLoss(-(4 * heal_amt)) //most effective on toxins @@ -122,7 +122,7 @@ if(food_conversion) M.adjust_nutrition(0.3) if(prob(2)) - to_chat(M, "I feel a mild warmth as my blood purifies itself.") + to_chat(M, span_notice("I feel a mild warmth as my blood purifies itself.")) return 1 @@ -159,7 +159,7 @@ var/lost_nutrition = 9 - (reduced_hunger * 5) C.adjust_nutrition(-lost_nutrition * HUNGER_FACTOR) //Hunger depletes at 10x the normal speed if(prob(2)) - to_chat(C, "I feel an odd gurgle in my stomach, as if it was working much faster than normal.") + to_chat(C, span_notice("I feel an odd gurgle in my stomach, as if it was working much faster than normal.")) return 1 /datum/symptom/heal/darkness @@ -170,7 +170,7 @@ stage_speed = -2 transmittable = -1 level = 6 - passive_message = "I feel tingling on my skin as light passes over it." + passive_message = span_notice("I feel tingling on my skin as light passes over it.") threshold_desc = "" /datum/symptom/heal/darkness/Start(datum/disease/advance/A) @@ -197,7 +197,7 @@ return if(prob(5)) - to_chat(M, "The darkness soothes and mends my wounds.") + to_chat(M, span_notice("The darkness soothes and mends my wounds.")) for(var/obj/item/bodypart/L in parts) if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len * 0.5, null, BODYPART_ORGANIC)) //more effective on brute @@ -217,7 +217,7 @@ stage_speed = -3 transmittable = -2 level = 8 - passive_message = "The pain from my wounds makes you feel oddly sleepy..." + passive_message = span_notice("The pain from my wounds makes you feel oddly sleepy...") var/deathgasp = FALSE var/stabilize = FALSE var/active_coma = FALSE //to prevent multiple coma procs @@ -260,7 +260,7 @@ else if(M.IsSleeping()) return power * 0.25 else if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma) - to_chat(M, "I feel myself slip into a regenerative coma...") + to_chat(M, span_warning("I feel myself slip into a regenerative coma...")) active_coma = TRUE addtimer(CALLBACK(src, PROC_REF(coma), M), 60) @@ -308,7 +308,7 @@ stage_speed = 0 transmittable = 1 level = 6 - passive_message = "My skin feels oddly dry..." + passive_message = span_notice("My skin feels oddly dry...") var/absorption_coeff = 1 threshold_desc = "Resistance 5: Water is consumed at a much slower rate.
\ Stage Speed 7: Increases healing speed." @@ -343,7 +343,7 @@ return if(prob(5)) - to_chat(M, "I feel myself absorbing the water around you to soothe my damaged skin.") + to_chat(M, span_notice("I feel myself absorbing the water around you to soothe my damaged skin.")) for(var/obj/item/bodypart/L in parts) if(L.heal_damage(heal_amt/parts.len * 0.5, heal_amt/parts.len, null, BODYPART_ORGANIC)) @@ -364,7 +364,7 @@ stage_speed = -2 transmittable = -2 level = 8 - passive_message = "I feel an odd attraction to plasma." + passive_message = span_notice("I feel an odd attraction to plasma.") var/temp_rate = 1 threshold_desc = "Transmission 6: Increases temperature adjustment rate.
\ Stage Speed 7: Increases healing speed." @@ -397,16 +397,16 @@ var/heal_amt = 4 * actual_power if(prob(5)) - to_chat(M, "I feel myself absorbing plasma inside and around you...") + to_chat(M, span_notice("I feel myself absorbing plasma inside and around you...")) if(M.bodytemperature > BODYTEMP_NORMAL) M.adjust_bodytemperature(-20 * temp_rate * TEMPERATURE_DAMAGE_COEFFICIENT,BODYTEMP_NORMAL) if(prob(5)) - to_chat(M, "I feel less hot.") + to_chat(M, span_notice("I feel less hot.")) else if(M.bodytemperature < (BODYTEMP_NORMAL + 1)) M.adjust_bodytemperature(20 * temp_rate * TEMPERATURE_DAMAGE_COEFFICIENT,0,BODYTEMP_NORMAL) if(prob(5)) - to_chat(M, "I feel warmer.") + to_chat(M, span_notice("I feel warmer.")) M.adjustToxLoss(-heal_amt) @@ -414,7 +414,7 @@ if(!parts.len) return if(prob(5)) - to_chat(M, "The pain from my wounds fades rapidly.") + to_chat(M, span_notice("The pain from my wounds fades rapidly.")) for(var/obj/item/bodypart/L in parts) if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len, null, BODYPART_ORGANIC)) M.update_damage_overlays() @@ -431,7 +431,7 @@ level = 6 symptom_delay_min = 1 symptom_delay_max = 1 - passive_message = "My skin glows faintly for a moment." + passive_message = span_notice("My skin glows faintly for a moment.") var/cellular_damage = FALSE threshold_desc = "Transmission 6: Additionally heals cellular damage.
\ Resistance 7: Increases healing speed." @@ -474,7 +474,7 @@ return if(prob(4)) - to_chat(M, "My skin glows faintly, and you feel my wounds mending themselves.") + to_chat(M, span_notice("My skin glows faintly, and you feel my wounds mending themselves.")) for(var/obj/item/bodypart/L in parts) if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len, null, BODYPART_ORGANIC)) diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm index dca8a7921..c0e678763 100644 --- a/code/datums/diseases/advance/symptoms/itching.dm +++ b/code/datums/diseases/advance/symptoms/itching.dm @@ -49,6 +49,6 @@ BONUS var/obj/item/bodypart/bodypart = M.get_bodypart(picked_bodypart) if(bodypart && bodypart.status == BODYPART_ORGANIC && !bodypart.is_pseudopart) //robotic limbs will mean less scratching overall (why are golems able to damage themselves with self-scratching, but not androids? the world may never know) var/can_scratch = scratch && !M.incapacitated() - M.visible_message("[can_scratch ? "[M] scratches [M.p_their()] [bodypart.name]." : ""]", "My [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]") + M.visible_message("[can_scratch ? span_warning("[M] scratches [M.p_their()] [bodypart.name].") : ""]", span_warning("My [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]")) if(can_scratch) bodypart.receive_damage(0.5) diff --git a/code/datums/diseases/advance/symptoms/narcolepsy.dm b/code/datums/diseases/advance/symptoms/narcolepsy.dm index 8f86b258d..4cca6f501 100644 --- a/code/datums/diseases/advance/symptoms/narcolepsy.dm +++ b/code/datums/diseases/advance/symptoms/narcolepsy.dm @@ -41,21 +41,21 @@ Bonus switch(A.stage) if(1) if(prob(50)) - to_chat(M, "I feel tired.") + to_chat(M, span_warning("I feel tired.")) if(2) if(prob(50)) - to_chat(M, "I feel very tired.") + to_chat(M, span_warning("I feel very tired.")) if(3) if(prob(50)) - to_chat(M, "I try to focus on staying awake.") + to_chat(M, span_warning("I try to focus on staying awake.")) if(M.drowsyness < 70) M.drowsyness += 5 if(4) if(prob(50)) if(yawning) - to_chat(M, "I try and fail to suppress a yawn.") + to_chat(M, span_warning("I try and fail to suppress a yawn.")) else - to_chat(M, "I nod off for a moment.") //you can't really yawn while nodding off, can you? + to_chat(M, span_warning("I nod off for a moment.")) //you can't really yawn while nodding off, can you? if(M.drowsyness < 70) M.drowsyness += 10 if(yawning) @@ -64,7 +64,7 @@ Bonus A.spread(6) if(5) if(prob(50)) - to_chat(M, "[pick("So tired...","You feel very sleepy.","You have a hard time keeping your eyes open.","You try to stay awake.")]") + to_chat(M, span_warning("[pick("So tired...","You feel very sleepy.","You have a hard time keeping your eyes open.","You try to stay awake.")]")) if(M.drowsyness < 70) M.drowsyness += 40 if(yawning) diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm index 71bf38261..52db0d1c0 100644 --- a/code/datums/diseases/advance/symptoms/oxygen.dm +++ b/code/datums/diseases/advance/symptoms/oxygen.dm @@ -48,7 +48,7 @@ Bonus M.blood_volume += 1 else if(prob(base_message_chance)) - to_chat(M, "[pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")]") + to_chat(M, span_notice("[pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")]")) return /datum/symptom/oxygen/on_stage_change(datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 3488fe0ce..d44333867 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -87,13 +87,13 @@ if(HAS_TRAIT_FROM(M, TRAIT_BLIND, EYE_DAMAGE)) if(prob(20)) - to_chat(M, "My vision slowly returns...") + to_chat(M, span_notice("My vision slowly returns...")) M.cure_blind(EYE_DAMAGE) M.cure_nearsighted(EYE_DAMAGE) M.blur_eyes(35) else if(HAS_TRAIT_FROM(M, TRAIT_NEARSIGHT, EYE_DAMAGE)) - to_chat(M, "I can finally focus my eyes on distant objects.") + to_chat(M, span_notice("I can finally focus my eyes on distant objects.")) M.cure_nearsighted(EYE_DAMAGE) M.blur_eyes(10) @@ -104,4 +104,4 @@ eyes.applyOrganDamage(-1) else if(prob(base_message_chance)) - to_chat(M, "[pick("Your eyes feel great.","You feel like my eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your healing feels more acute.")]") + to_chat(M, span_notice("[pick("Your eyes feel great.","You feel like my eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your healing feels more acute.")]")) diff --git a/code/datums/diseases/advance/symptoms/shedding.dm b/code/datums/diseases/advance/symptoms/shedding.dm index b481477de..339f5ce16 100644 --- a/code/datums/diseases/advance/symptoms/shedding.dm +++ b/code/datums/diseases/advance/symptoms/shedding.dm @@ -33,17 +33,17 @@ BONUS var/mob/living/M = A.affected_mob if(prob(base_message_chance)) - to_chat(M, "[pick("Your scalp itches.", "Your skin feels flaky.")]") + to_chat(M, span_warning("[pick("Your scalp itches.", "Your skin feels flaky.")]")) if(ishuman(M)) var/mob/living/carbon/human/H = M switch(A.stage) if(3, 4) if(!(H.hairstyle == "Bald") && !(H.hairstyle == "Balding Hair")) - to_chat(H, "My hair starts to fall out in clumps...") + to_chat(H, span_warning("My hair starts to fall out in clumps...")) addtimer(CALLBACK(src, PROC_REF(Shed), H, FALSE), 50) if(5) if(!(H.facial_hairstyle == "Shaved") || !(H.hairstyle == "Bald")) - to_chat(H, "My hair starts to fall out in clumps...") + to_chat(H, span_warning("My hair starts to fall out in clumps...")) addtimer(CALLBACK(src, PROC_REF(Shed), H, TRUE), 50) /datum/symptom/shedding/proc/Shed(mob/living/carbon/human/H, fullbald) diff --git a/code/datums/diseases/advance/symptoms/shivering.dm b/code/datums/diseases/advance/symptoms/shivering.dm index ad4e0a683..5ee440baf 100644 --- a/code/datums/diseases/advance/symptoms/shivering.dm +++ b/code/datums/diseases/advance/symptoms/shivering.dm @@ -44,9 +44,9 @@ Bonus return var/mob/living/carbon/M = A.affected_mob if(!unsafe || A.stage < 4) - to_chat(M, "[pick("You feel cold.", "You shiver.")]") + to_chat(M, span_warning("[pick("You feel cold.", "You shiver.")]")) else - to_chat(M, "[pick("You feel your blood run cold.", "You feel ice in your veins.", "You feel like you can't heat up.", "You shiver violently." )]") + to_chat(M, span_danger("[pick("You feel your blood run cold.", "You feel ice in your veins.", "You feel like you can't heat up.", "You shiver violently." )]")) if(M.bodytemperature > BODYTEMP_COLD_DAMAGE_LIMIT || unsafe) Chill(M, A) diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm index 171e34116..5e1ef52bc 100644 --- a/code/datums/diseases/advance/symptoms/skin.dm +++ b/code/datums/diseases/advance/symptoms/skin.dm @@ -38,4 +38,4 @@ BONUS M.reagents.add_reagent(color, 5) else if (prob(50)) // spam - M.visible_message("[M] looks rather vibrant...", "The colors, man, the colors...") + M.visible_message(span_warning("[M] looks rather vibrant..."), span_notice("The colors, man, the colors...")) diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm index 95d7664fd..547b37877 100644 --- a/code/datums/diseases/advance/symptoms/vision.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -49,9 +49,9 @@ Bonus switch(A.stage) if(1, 2) if(prob(base_message_chance) && !suppress_warning) - to_chat(M, "My eyes itch.") + to_chat(M, span_warning("My eyes itch.")) if(3, 4) - to_chat(M, "My eyes burn!") + to_chat(M, span_warning("My eyes burn!")) M.blur_eyes(10) eyes.applyOrganDamage(1) else @@ -62,11 +62,11 @@ Bonus if(prob(eyes.damage - 10 + 1)) if(!remove_eyes) if(!HAS_TRAIT(M, TRAIT_BLIND)) - to_chat(M, "I go blind!") + to_chat(M, span_danger("I go blind!")) eyes.applyOrganDamage(eyes.maxHealth) else - M.visible_message("[M]'s eyes fall out of their sockets!", "My eyes fall out of their sockets!") + M.visible_message(span_warning("[M]'s eyes fall out of their sockets!"), span_danger("My eyes fall out of their sockets!")) eyes.Remove(M) eyes.forceMove(get_turf(M)) else - to_chat(M, "My eyes burn horrifically!") + to_chat(M, span_danger("My eyes burn horrifically!")) diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm index dbdb6e7be..9543bf798 100644 --- a/code/datums/diseases/advance/symptoms/voice_change.dm +++ b/code/datums/diseases/advance/symptoms/voice_change.dm @@ -58,7 +58,7 @@ Bonus switch(A.stage) if(1, 2, 3, 4) if(prob(base_message_chance) && !suppress_warning) - to_chat(M, "[pick("Your throat hurts.", "You clear your throat.")]") + to_chat(M, span_warning("[pick("Your throat hurts.", "You clear your throat.")]")) else if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/datums/diseases/advance/symptoms/vomit.dm b/code/datums/diseases/advance/symptoms/vomit.dm index fa77accca..e45d76031 100644 --- a/code/datums/diseases/advance/symptoms/vomit.dm +++ b/code/datums/diseases/advance/symptoms/vomit.dm @@ -55,7 +55,7 @@ Bonus switch(A.stage) if(1, 2, 3, 4) if(prob(base_message_chance) && !suppress_warning) - to_chat(M, "[pick("You feel nauseated.", "You feel like you're going to throw up!")]") + to_chat(M, span_warning("[pick("You feel nauseated.", "You feel like you're going to throw up!")]")) else vomit(M) diff --git a/code/datums/diseases/advance/symptoms/weight.dm b/code/datums/diseases/advance/symptoms/weight.dm index ac00b319b..2952d3df7 100644 --- a/code/datums/diseases/advance/symptoms/weight.dm +++ b/code/datums/diseases/advance/symptoms/weight.dm @@ -44,8 +44,8 @@ Bonus switch(A.stage) if(1, 2, 3, 4) if(prob(base_message_chance)) - to_chat(M, "[pick("You feel hungry.", "You crave for food.")]") + to_chat(M, span_warning("[pick("You feel hungry.", "You crave for food.")]")) else - to_chat(M, "[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]") + to_chat(M, span_warning("[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]")) M.overeatduration = max(M.overeatduration - 100, 0) M.adjust_nutrition(-100) diff --git a/code/datums/diseases/advance/symptoms/youth.dm b/code/datums/diseases/advance/symptoms/youth.dm index 735144af0..b0f4df356 100644 --- a/code/datums/diseases/advance/symptoms/youth.dm +++ b/code/datums/diseases/advance/symptoms/youth.dm @@ -39,20 +39,20 @@ BONUS if(1) if(H.age > 41) H.age = 41 - to_chat(H, "I haven't had this much energy in years!") + to_chat(H, span_notice("I haven't had this much energy in years!")) if(2) if(H.age > 36) H.age = 36 - to_chat(H, "You're suddenly in a good mood.") + to_chat(H, span_notice("You're suddenly in a good mood.")) if(3) if(H.age > 31) H.age = 31 - to_chat(H, "I begin to feel more lithe.") + to_chat(H, span_notice("I begin to feel more lithe.")) if(4) if(H.age > 26) H.age = 26 - to_chat(H, "I feel reinvigorated.") + to_chat(H, span_notice("I feel reinvigorated.")) if(5) if(H.age > 21) H.age = 21 - to_chat(H, "I feel like you can take on the world!") + to_chat(H, span_notice("I feel like you can take on the world!")) diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm index 0c42be339..ac074f95a 100644 --- a/code/datums/diseases/anxiety.dm +++ b/code/datums/diseases/anxiety.dm @@ -16,26 +16,26 @@ switch(stage) if(2) //also changes say, see say.dm if(prob(5)) - to_chat(affected_mob, "I feel anxious.") + to_chat(affected_mob, span_notice("I feel anxious.")) if(3) if(prob(10)) - to_chat(affected_mob, "My stomach flutters.") + to_chat(affected_mob, span_notice("My stomach flutters.")) if(prob(5)) - to_chat(affected_mob, "I feel panicky.") + to_chat(affected_mob, span_notice("I feel panicky.")) if(prob(2)) - to_chat(affected_mob, "You're overtaken with panic!") + to_chat(affected_mob, span_danger("You're overtaken with panic!")) affected_mob.confused += (rand(2,3)) if(4) if(prob(10)) - to_chat(affected_mob, "I feel butterflies in my stomach.") + to_chat(affected_mob, span_danger("I feel butterflies in my stomach.")) if(prob(5)) - affected_mob.visible_message("[affected_mob] stumbles around in a panic.", \ - "I have a panic attack!") + affected_mob.visible_message(span_danger("[affected_mob] stumbles around in a panic."), \ + span_danger("I have a panic attack!")) affected_mob.confused += (rand(6,8)) affected_mob.jitteriness += (rand(6,8)) if(prob(2)) - affected_mob.visible_message("[affected_mob] coughs up butterflies!", \ - "I cough up butterflies!") + affected_mob.visible_message(span_danger("[affected_mob] coughs up butterflies!"), \ + span_danger("I cough up butterflies!")) new /mob/living/simple_animal/butterfly(affected_mob.loc) new /mob/living/simple_animal/butterfly(affected_mob.loc) return diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index ed22f055c..62f250d1c 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -26,7 +26,7 @@ A.inflamed = 1 A.update_icon() if(prob(3)) - to_chat(affected_mob, "I feel a stabbing pain in your abdomen!") + to_chat(affected_mob, span_warning("I feel a stabbing pain in your abdomen!")) affected_mob.adjustOrganLoss(ORGAN_SLOT_APPENDIX, 5) affected_mob.Stun(rand(40,60)) affected_mob.adjustToxLoss(1) diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm index b28079bff..2af7d8dad 100644 --- a/code/datums/diseases/beesease.dm +++ b/code/datums/diseases/beesease.dm @@ -17,23 +17,23 @@ switch(stage) if(2) //also changes say, see say.dm if(prob(2)) - to_chat(affected_mob, "I taste honey in my mouth.") + to_chat(affected_mob, span_notice("I taste honey in my mouth.")) if(3) if(prob(10)) - to_chat(affected_mob, "My stomach rumbles.") + to_chat(affected_mob, span_notice("My stomach rumbles.")) if(prob(2)) - to_chat(affected_mob, "My stomach stings painfully.") + to_chat(affected_mob, span_danger("My stomach stings painfully.")) if(prob(20)) affected_mob.adjustToxLoss(2) affected_mob.updatehealth() if(4) if(prob(10)) - affected_mob.visible_message("[affected_mob] buzzes.", \ - "My stomach buzzes violently!") + affected_mob.visible_message(span_danger("[affected_mob] buzzes."), \ + span_danger("My stomach buzzes violently!")) if(prob(5)) - to_chat(affected_mob, "I feel something moving in my throat.") + to_chat(affected_mob, span_danger("I feel something moving in my throat.")) if(prob(1)) - affected_mob.visible_message("[affected_mob] coughs up a swarm of bees!", \ - "I cough up a swarm of bees!") + affected_mob.visible_message(span_danger("[affected_mob] coughs up a swarm of bees!"), \ + span_danger("I cough up a swarm of bees!")) new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc) return diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm index 2a043ed2c..1a0587873 100644 --- a/code/datums/diseases/brainrot.dm +++ b/code/datums/diseases/brainrot.dm @@ -22,7 +22,7 @@ if(prob(2)) affected_mob.emote("yawn") if(prob(2)) - to_chat(affected_mob, "I don't feel like myself.") + to_chat(affected_mob, span_danger("I don't feel like myself.")) if(prob(5)) affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 170) affected_mob.updatehealth() @@ -35,7 +35,7 @@ affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 170) affected_mob.updatehealth() if(prob(2)) - to_chat(affected_mob, "My try to remember something important...but can't.") + to_chat(affected_mob, span_danger("My try to remember something important...but can't.")) if(4) if(prob(2)) @@ -46,11 +46,11 @@ affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 170) affected_mob.updatehealth() if(prob(2)) - to_chat(affected_mob, "Strange buzzing fills my head, removing all thoughts.") + to_chat(affected_mob, span_danger("Strange buzzing fills my head, removing all thoughts.")) if(prob(3)) - to_chat(affected_mob, "I lose consciousness...") - affected_mob.visible_message("[affected_mob] suddenly collapses!", \ - "I suddenly collapse!") + to_chat(affected_mob, span_danger("I lose consciousness...")) + affected_mob.visible_message(span_warning("[affected_mob] suddenly collapses!"), \ + span_danger("I suddenly collapse!")) affected_mob.Unconscious(rand(100,200)) if(prob(1)) affected_mob.emote("snore") diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm index a16612d63..18186a93a 100644 --- a/code/datums/diseases/cold.dm +++ b/code/datums/diseases/cold.dm @@ -24,9 +24,9 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - to_chat(affected_mob, "My throat feels sore.") + to_chat(affected_mob, span_warning("My throat feels sore.")) if(prob(1)) - to_chat(affected_mob, "Mucous runs down the back of my throat.") + to_chat(affected_mob, span_warning("Mucous runs down the back of my throat.")) if(3) if(affected_mob.IsSleeping() && prob(1)) //changed FROM prob(5) until sleeping is fixed cure() @@ -39,9 +39,9 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - to_chat(affected_mob, "My throat feels sore.") + to_chat(affected_mob, span_warning("My throat feels sore.")) if(prob(1)) - to_chat(affected_mob, "Mucous runs down the back of my throat.") + to_chat(affected_mob, span_warning("Mucous runs down the back of my throat.")) if(prob(1) && prob(50)) if(!affected_mob.disease_resistances.Find(/datum/disease/flu)) var/datum/disease/Flu = new /datum/disease/flu() diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm index 402f42c58..498554af5 100644 --- a/code/datums/diseases/cold9.dm +++ b/code/datums/diseases/cold9.dm @@ -16,7 +16,7 @@ if(2) affected_mob.adjust_bodytemperature(-10) if(prob(1) && prob(10)) - to_chat(affected_mob, "I feel better.") + to_chat(affected_mob, span_notice("I feel better.")) cure() return if(prob(1)) @@ -24,9 +24,9 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - to_chat(affected_mob, "My throat feels sore.") + to_chat(affected_mob, span_danger("My throat feels sore.")) if(prob(5)) - to_chat(affected_mob, "I feel stiff.") + to_chat(affected_mob, span_danger("I feel stiff.")) if(3) affected_mob.adjust_bodytemperature(-20) if(prob(1)) @@ -34,6 +34,6 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - to_chat(affected_mob, "My throat feels sore.") + to_chat(affected_mob, span_danger("My throat feels sore.")) if(prob(10)) - to_chat(affected_mob, "I feel stiff.") + to_chat(affected_mob, span_danger("I feel stiff.")) diff --git a/code/datums/diseases/decloning.dm b/code/datums/diseases/decloning.dm index 20b5785d4..63a247674 100644 --- a/code/datums/diseases/decloning.dm +++ b/code/datums/diseases/decloning.dm @@ -32,7 +32,7 @@ if(prob(3)) affected_mob.adjustCloneLoss(1) if(prob(2)) - to_chat(affected_mob, "My skin feels strange.") + to_chat(affected_mob, span_danger("My skin feels strange.")) if(4) if(prob(2)) @@ -50,10 +50,10 @@ if(prob(2)) affected_mob.emote("drool") if(prob(5)) - to_chat(affected_mob, "My skin starts degrading!") + to_chat(affected_mob, span_danger("My skin starts degrading!")) if(prob(10)) affected_mob.adjustCloneLoss(5) affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 170) if(affected_mob.cloneloss >= 100) - affected_mob.visible_message("[affected_mob] skin turns to dust!", "My skin turns to dust!") + affected_mob.visible_message(span_danger("[affected_mob] skin turns to dust!"), "My skin turns to dust!") affected_mob.dust() diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index e277fdc31..d5434701e 100644 --- a/code/datums/diseases/dna_spread.dm +++ b/code/datums/diseases/dna_spread.dm @@ -36,11 +36,11 @@ if(prob(8)) affected_mob.emote("cough") if(prob(1)) - to_chat(affected_mob, "My muscles ache.") + to_chat(affected_mob, span_danger("My muscles ache.")) if(prob(20)) affected_mob.take_bodypart_damage(1) if(prob(1)) - to_chat(affected_mob, "My stomach hurts.") + to_chat(affected_mob, span_danger("My stomach hurts.")) if(prob(20)) affected_mob.adjustToxLoss(2) affected_mob.updatehealth() @@ -50,7 +50,7 @@ original_dna = new affected_mob.dna.type affected_mob.dna.copy_dna(original_dna) - to_chat(affected_mob, "I don't feel like myself..") + to_chat(affected_mob, span_danger("I don't feel like myself..")) var/datum/dna/transform_dna = strain_data["dna"] transform_dna.transfer_identity(affected_mob, transfer_SE = 1) @@ -70,5 +70,5 @@ affected_mob.updateappearance(mutcolor_update=1) affected_mob.domutcheck() - to_chat(affected_mob, "I feel more like myself.") + to_chat(affected_mob, span_notice("I feel more like myself.")) return ..() diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm index 3158ed598..c91ea893e 100644 --- a/code/datums/diseases/fake_gbs.dm +++ b/code/datums/diseases/fake_gbs.dm @@ -22,7 +22,7 @@ else if(prob(5)) affected_mob.emote("breathgasp") if(prob(10)) - to_chat(affected_mob, "You're starting to feel very weak...") + to_chat(affected_mob, span_danger("You're starting to feel very weak...")) if(4) if(prob(10)) affected_mob.emote("cough") diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm index dd58256b4..580ce25ad 100644 --- a/code/datums/diseases/flu.dm +++ b/code/datums/diseases/flu.dm @@ -16,7 +16,7 @@ switch(stage) if(2) if(!(affected_mob.mobility_flags & MOBILITY_STAND) && prob(20)) - to_chat(affected_mob, "I feel better.") + to_chat(affected_mob, span_notice("I feel better.")) stage-- return if(prob(1)) @@ -24,18 +24,18 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - to_chat(affected_mob, "My muscles ache.") + to_chat(affected_mob, span_danger("My muscles ache.")) if(prob(20)) affected_mob.take_bodypart_damage(1) if(prob(1)) - to_chat(affected_mob, "My stomach hurts.") + to_chat(affected_mob, span_danger("My stomach hurts.")) if(prob(20)) affected_mob.adjustToxLoss(1) affected_mob.updatehealth() if(3) if(!(affected_mob.mobility_flags & MOBILITY_STAND) && prob(15)) - to_chat(affected_mob, "I feel better.") + to_chat(affected_mob, span_notice("I feel better.")) stage-- return if(prob(1)) @@ -43,11 +43,11 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - to_chat(affected_mob, "My muscles ache.") + to_chat(affected_mob, span_danger("My muscles ache.")) if(prob(20)) affected_mob.take_bodypart_damage(1) if(prob(1)) - to_chat(affected_mob, "My stomach hurts.") + to_chat(affected_mob, span_danger("My stomach hurts.")) if(prob(20)) affected_mob.adjustToxLoss(1) affected_mob.updatehealth() diff --git a/code/datums/diseases/fluspanish.dm b/code/datums/diseases/fluspanish.dm index 5cf8c77ac..16c8b01e9 100644 --- a/code/datums/diseases/fluspanish.dm +++ b/code/datums/diseases/fluspanish.dm @@ -21,7 +21,7 @@ if(prob(5)) affected_mob.emote("cough") if(prob(1)) - to_chat(affected_mob, "You're burning in your own skin!") + to_chat(affected_mob, span_danger("You're burning in your own skin!")) affected_mob.take_bodypart_damage(0,5) if(3) @@ -31,6 +31,6 @@ if(prob(5)) affected_mob.emote("cough") if(prob(5)) - to_chat(affected_mob, "You're burning in your own skin!") + to_chat(affected_mob, span_danger("You're burning in your own skin!")) affected_mob.take_bodypart_damage(0,5) return diff --git a/code/datums/diseases/gastrolisis.dm b/code/datums/diseases/gastrolisis.dm index 01255fa92..58da341e2 100644 --- a/code/datums/diseases/gastrolisis.dm +++ b/code/datums/diseases/gastrolisis.dm @@ -34,8 +34,8 @@ if(!eyes && prob(5)) var/obj/item/organ/eyes/snail/new_eyes = new() new_eyes.Insert(affected_mob, drop_if_replaced = TRUE) - affected_mob.visible_message("[affected_mob]'s eyes fall out, with snail eyes taking its place!", \ - "I scream in pain as your eyes are pushed out by your new snail eyes!") + affected_mob.visible_message(span_warning("[affected_mob]'s eyes fall out, with snail eyes taking its place!"), \ + span_danger("I scream in pain as your eyes are pushed out by your new snail eyes!")) affected_mob.emote("scream") return var/obj/item/shell = affected_mob.get_item_by_slot(SLOT_BACK) @@ -44,20 +44,20 @@ if(!shell && prob(5)) if(affected_mob.dropItemToGround(affected_mob.get_item_by_slot(SLOT_BACK))) affected_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/snail(affected_mob), SLOT_BACK) - affected_mob.visible_message("[affected_mob] grows a grotesque shell on their back!", \ - "I scream in pain as a shell pushes itself out from under your skin!") + affected_mob.visible_message(span_warning("[affected_mob] grows a grotesque shell on their back!"), \ + span_danger("I scream in pain as a shell pushes itself out from under your skin!")) affected_mob.emote("scream") return var/obj/item/organ/tongue/tongue = locate(/obj/item/organ/tongue/snail) in affected_mob.internal_organs if(!tongue && prob(5)) var/obj/item/organ/tongue/snail/new_tongue = new() new_tongue.Insert(affected_mob) - to_chat(affected_mob, "I feel your speech slow down...") + to_chat(affected_mob, span_danger("I feel your speech slow down...")) return if(shell && eyes && tongue && prob(5)) affected_mob.set_species(/datum/species/snail) - affected_mob.visible_message("[affected_mob] turns into a snail!", \ - "I turned into a snail person! You feel an urge to cccrrraaawwwlll...") + affected_mob.visible_message(span_warning("[affected_mob] turns into a snail!"), \ + span_boldnotice("I turned into a snail person! You feel an urge to cccrrraaawwwlll...")) cure() if(prob(10)) affected_mob.emote("gag") diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm index a650b6322..3909361b0 100644 --- a/code/datums/diseases/gbs.dm +++ b/code/datums/diseases/gbs.dm @@ -22,9 +22,9 @@ if(prob(5)) affected_mob.emote("breathgasp") if(prob(10)) - to_chat(affected_mob, "My body hurts all over!") + to_chat(affected_mob, span_danger("My body hurts all over!")) if(4) - to_chat(affected_mob, "My body feels as if it's trying to rip itself apart!") + to_chat(affected_mob, span_danger("My body feels as if it's trying to rip itself apart!")) if(prob(50)) affected_mob.gib() else diff --git a/code/datums/diseases/heart_failure.dm b/code/datums/diseases/heart_failure.dm index 1a924a027..25914ac90 100644 --- a/code/datums/diseases/heart_failure.dm +++ b/code/datums/diseases/heart_failure.dm @@ -29,25 +29,25 @@ switch(stage) if(1 to 2) if(prob(2)) - to_chat(H, "I feel [pick("discomfort", "pressure", "a burning sensation", "pain")] in your chest.") + to_chat(H, span_warning("I feel [pick("discomfort", "pressure", "a burning sensation", "pain")] in your chest.")) if(prob(2)) - to_chat(H, "I feel dizzy.") + to_chat(H, span_warning("I feel dizzy.")) H.confused += 6 if(prob(3)) - to_chat(H, "I feel [pick("full", "nauseated", "sweaty", "weak", "tired", "short on breath", "uneasy")].") + to_chat(H, span_warning("I feel [pick("full", "nauseated", "sweaty", "weak", "tired", "short on breath", "uneasy")].")) if(3 to 4) if(!sound) H.playsound_local(H, 'sound/blank.ogg',40,0, channel = CHANNEL_HEARTBEAT) sound = TRUE if(prob(3)) - to_chat(H, "I feel a sharp pain in your chest!") + to_chat(H, span_danger("I feel a sharp pain in your chest!")) if(prob(25)) affected_mob.vomit(95) H.emote("cough") H.Paralyze(40) H.losebreath += 4 if(prob(3)) - to_chat(H, "I feel very weak and dizzy...") + to_chat(H, span_danger("I feel very weak and dizzy...")) H.confused += 8 H.adjustStaminaLoss(40) H.emote("cough") @@ -55,8 +55,8 @@ H.stop_sound_channel(CHANNEL_HEARTBEAT) H.playsound_local(H, 'sound/blank.ogg', 100, 0) if(H.stat == CONSCIOUS) - H.visible_message("[H] clutches at [H.p_their()] chest as if [H.p_their()] heart is stopping!", \ - "I feel a terrible pain in your chest, as if your heart has stopped!") + H.visible_message(span_danger("[H] clutches at [H.p_their()] chest as if [H.p_their()] heart is stopping!"), \ + span_danger("I feel a terrible pain in your chest, as if your heart has stopped!")) H.adjustStaminaLoss(60) H.set_heartattack(TRUE) H.reagents.add_reagent(/datum/reagent/medicine/C2/penthrite, 3) // To give the victim a final chance to shock their heart before losing consciousness diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm index dada5a228..7d9c44c79 100644 --- a/code/datums/diseases/magnitis.dm +++ b/code/datums/diseases/magnitis.dm @@ -18,7 +18,7 @@ switch(stage) if(2) if(prob(2)) - to_chat(affected_mob, "I feel a slight shock course through your body.") + to_chat(affected_mob, span_danger("I feel a slight shock course through your body.")) if(prob(2)) for(var/obj/M in orange(2,affected_mob)) if(!M.anchored && (M.flags_1 & CONDUCT_1)) @@ -29,9 +29,9 @@ step_towards(S,affected_mob) if(3) if(prob(2)) - to_chat(affected_mob, "I feel a strong shock course through your body.") + to_chat(affected_mob, span_danger("I feel a strong shock course through your body.")) if(prob(2)) - to_chat(affected_mob, "I feel like clowning around.") + to_chat(affected_mob, span_danger("I feel like clowning around.")) if(prob(4)) for(var/obj/M in orange(4,affected_mob)) if(!M.anchored && (M.flags_1 & CONDUCT_1)) @@ -48,9 +48,9 @@ step_towards(S,affected_mob) if(4) if(prob(2)) - to_chat(affected_mob, "I feel a powerful shock course through your body.") + to_chat(affected_mob, span_danger("I feel a powerful shock course through your body.")) if(prob(2)) - to_chat(affected_mob, "I query upon the nature of miracles.") + to_chat(affected_mob, span_danger("I query upon the nature of miracles.")) if(prob(8)) for(var/obj/M in orange(6,affected_mob)) if(!M.anchored && (M.flags_1 & CONDUCT_1)) diff --git a/code/datums/diseases/parrotpossession.dm b/code/datums/diseases/parrotpossession.dm index eccbf3ecd..f1fe29c1e 100644 --- a/code/datums/diseases/parrotpossession.dm +++ b/code/datums/diseases/parrotpossession.dm @@ -26,5 +26,5 @@ /datum/disease/parrot_possession/cure() if(parrot && parrot.loc == affected_mob) parrot.forceMove(affected_mob.drop_location()) - affected_mob.visible_message("[parrot] is violently driven out of [affected_mob]!", "[parrot] bursts out of your chest!") + affected_mob.visible_message(span_danger("[parrot] is violently driven out of [affected_mob]!"), span_danger("[parrot] bursts out of your chest!")) ..() diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index 43e8cd944..c8c0020bd 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -16,13 +16,13 @@ switch(stage) if(1) if(prob(10)) - to_chat(affected_mob, "I feel a little silly.") + to_chat(affected_mob, span_danger("I feel a little silly.")) if(2) if(prob(10)) - to_chat(affected_mob, "I start seeing rainbows.") + to_chat(affected_mob, span_danger("I start seeing rainbows.")) if(3) if(prob(10)) - to_chat(affected_mob, "My thoughts are interrupted by a loud HONK!") + to_chat(affected_mob, span_danger("My thoughts are interrupted by a loud HONK!")) if(4) if(prob(5)) affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) , forced = "pierrot's throat") diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm index c1b3395cf..b8b9f087b 100644 --- a/code/datums/diseases/retrovirus.dm +++ b/code/datums/diseases/retrovirus.dm @@ -32,38 +32,38 @@ if(1) if(restcure) if(!(affected_mob.mobility_flags & MOBILITY_STAND) && prob(30)) - to_chat(affected_mob, "I feel better.") + to_chat(affected_mob, span_notice("I feel better.")) cure() return if (prob(8)) - to_chat(affected_mob, "My head hurts.") + to_chat(affected_mob, span_danger("My head hurts.")) if (prob(9)) - to_chat(affected_mob, "I feel a tingling sensation in my chest.") + to_chat(affected_mob, span_danger("I feel a tingling sensation in my chest.")) if (prob(9)) - to_chat(affected_mob, "I feel angry.") + to_chat(affected_mob, span_danger("I feel angry.")) if(2) if(restcure) if(!(affected_mob.mobility_flags & MOBILITY_STAND) && prob(20)) - to_chat(affected_mob, "I feel better.") + to_chat(affected_mob, span_notice("I feel better.")) cure() return if (prob(8)) - to_chat(affected_mob, "My skin feels loose.") + to_chat(affected_mob, span_danger("My skin feels loose.")) if (prob(10)) - to_chat(affected_mob, "I feel very strange.") + to_chat(affected_mob, span_danger("I feel very strange.")) if (prob(4)) - to_chat(affected_mob, "I feel a stabbing pain in my head!") + to_chat(affected_mob, span_danger("I feel a stabbing pain in my head!")) affected_mob.Unconscious(40) if (prob(4)) - to_chat(affected_mob, "My stomach churns.") + to_chat(affected_mob, span_danger("My stomach churns.")) if(3) if(restcure) if(!(affected_mob.mobility_flags & MOBILITY_STAND) && prob(20)) - to_chat(affected_mob, "I feel better.") + to_chat(affected_mob, span_notice("I feel better.")) cure() return if (prob(10)) - to_chat(affected_mob, "My entire body vibrates.") + to_chat(affected_mob, span_danger("My entire body vibrates.")) if (prob(35)) if(prob(50)) @@ -74,7 +74,7 @@ if(4) if(restcure) if(!(affected_mob.mobility_flags & MOBILITY_STAND) && prob(5)) - to_chat(affected_mob, "I feel better.") + to_chat(affected_mob, span_notice("I feel better.")) cure() return if (prob(60)) diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm index ad649ec3e..bf0e653da 100644 --- a/code/datums/diseases/rhumba_beat.dm +++ b/code/datums/diseases/rhumba_beat.dm @@ -21,14 +21,14 @@ affected_mob.adjustFireLoss(5) affected_mob.updatehealth() if(prob(1)) - to_chat(affected_mob, "I feel strange...") + to_chat(affected_mob, span_danger("I feel strange...")) if(3) if(prob(5)) - to_chat(affected_mob, "I feel the urge to dance...") + to_chat(affected_mob, span_danger("I feel the urge to dance...")) else if(prob(5)) affected_mob.emote("breathgasp") else if(prob(10)) - to_chat(affected_mob, "I feel the need to chick chicky boom...") + to_chat(affected_mob, span_danger("I feel the need to chick chicky boom...")) if(4) if(prob(20)) if (prob(50)) @@ -36,9 +36,9 @@ affected_mob.IgniteMob() else affected_mob.emote("breathgasp") - to_chat(affected_mob, "I feel a burning beat inside...") + to_chat(affected_mob, span_danger("I feel a burning beat inside...")) if(5) - to_chat(affected_mob, "My body is unable to contain the Rhumba Beat...") + to_chat(affected_mob, span_danger("My body is unable to contain the Rhumba Beat...")) if(prob(50)) explosion(get_turf(affected_mob), -1, 0, 2, 3, 0, 2) // This is equivalent to a lvl 1 fireball else diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 80c657a8d..e4c823622 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -81,12 +81,12 @@ var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [affected_mob.name]?", bantype, null, bantype, 50, affected_mob) if(LAZYLEN(candidates)) var/mob/dead/observer/C = pick(candidates) - to_chat(affected_mob, "My mob has been taken over by a ghost! Appeal my job ban if you want to avoid this in the future!") + to_chat(affected_mob, span_danger("My mob has been taken over by a ghost! Appeal my job ban if you want to avoid this in the future!")) message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(affected_mob)]) to replace a jobbanned player.") affected_mob.ghostize(0) affected_mob.key = C.key else - to_chat(new_mob, "My mob has been claimed by death! Appeal my job ban if you want to avoid this in the future!") + to_chat(new_mob, span_danger("My mob has been claimed by death! Appeal my job ban if you want to avoid this in the future!")) new_mob.death() if (!QDELETED(new_mob)) new_mob.ghostize(can_reenter_corpse = FALSE) @@ -114,9 +114,9 @@ stage1 = list() stage2 = list() stage3 = list() - stage4 = list("My back hurts.", "I breathe through my mouth.", - "I have a craving for bananas.", "My mind feels clouded.") - stage5 = list("I feel like monkeying around.") + stage4 = list(span_warning("My back hurts."), span_warning("I breathe through my mouth."), + span_warning("I have a craving for bananas."), span_warning("My mind feels clouded.")) + stage5 = list(span_warning("I feel like monkeying around.")) /datum/disease/transformation/jungle_fever/do_disease_transformation(mob/living/carbon/affected_mob) if(affected_mob.mind && !is_monkey(affected_mob.mind)) @@ -131,10 +131,10 @@ switch(stage) if(2) if(prob(2)) - to_chat(affected_mob, "My [pick("back", "arm", "leg", "elbow", "head")] itches.") + to_chat(affected_mob, span_notice("My [pick("back", "arm", "leg", "elbow", "head")] itches.")) if(3) if(prob(4)) - to_chat(affected_mob, "I feel a stabbing pain in my head.") + to_chat(affected_mob, span_danger("I feel a stabbing pain in my head.")) affected_mob.confused += 10 if(4) if(prob(3)) @@ -165,10 +165,10 @@ severity = DISEASE_SEVERITY_BIOHAZARD visibility_flags = 0 stage1 = list() - stage2 = list("Your joints feel stiff.", "Beep...boop..") - stage3 = list("My joints feel very stiff.", "Your skin feels loose.", "I can feel something move...inside.") - stage4 = list("My skin feels very loose.", "I can feel... something...inside you.") - stage5 = list("My skin feels as if it's about to burst off!") + stage2 = list("Your joints feel stiff.", span_danger("Beep...boop..")) + stage3 = list(span_danger("My joints feel very stiff."), "Your skin feels loose.", span_danger("I can feel something move...inside.")) + stage4 = list(span_danger("My skin feels very loose."), span_danger("I can feel... something...inside you.")) + stage5 = list(span_danger("My skin feels as if it's about to burst off!")) new_form = /mob/living/silicon/robot infectable_biotypes = MOB_ORGANIC|MOB_UNDEAD|MOB_ROBOTIC bantype = "Cyborg" @@ -180,7 +180,7 @@ if (prob(8)) affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop"), forced = "robotic transformation") if (prob(4)) - to_chat(affected_mob, "I feel a stabbing pain in my head.") + to_chat(affected_mob, span_danger("I feel a stabbing pain in my head.")) affected_mob.Unconscious(40) if(4) if (prob(20)) @@ -198,10 +198,10 @@ severity = DISEASE_SEVERITY_BIOHAZARD visibility_flags = 0 stage1 = list() - stage2 = list("Your throat feels scratchy.", "Kill...") - stage3 = list("My throat feels very scratchy.", "Your skin feels tight.", "I can feel something move...inside.") - stage4 = list("My skin feels very tight.", "My blood boils!", "I can feel... something...inside you.") - stage5 = list("My skin feels as if it's about to burst off!") + stage2 = list("Your throat feels scratchy.", span_danger("Kill...")) + stage3 = list(span_danger("My throat feels very scratchy."), "Your skin feels tight.", span_danger("I can feel something move...inside.")) + stage4 = list(span_danger("My skin feels very tight."), span_danger("My blood boils!"), span_danger("I can feel... something...inside you.")) + stage5 = list(span_danger("My skin feels as if it's about to burst off!")) new_form = /mob/living/carbon/alien/humanoid/hunter bantype = ROLE_ALIEN @@ -210,7 +210,7 @@ switch(stage) if(3) if (prob(4)) - to_chat(affected_mob, "I feel a stabbing pain in my head.") + to_chat(affected_mob, span_danger("I feel a stabbing pain in my head.")) affected_mob.Unconscious(40) if(4) if (prob(20)) @@ -228,9 +228,9 @@ visibility_flags = 0 stage1 = list("You don't feel very well.") stage2 = list("Your skin feels a little slimy.") - stage3 = list("My appendages are melting away.", "My limbs begin to lose their shape.") - stage4 = list("I are turning into a slime.") - stage5 = list("I have become a slime.") + stage3 = list(span_danger("My appendages are melting away."), span_danger("My limbs begin to lose their shape.")) + stage4 = list(span_danger("I are turning into a slime.")) + stage5 = list(span_danger("I have become a slime.")) new_form = /mob/living/simple_animal/slime/random /datum/disease/transformation/slime/stage_act() @@ -256,9 +256,9 @@ visibility_flags = 0 stage1 = list("BARK.") stage2 = list("You feel the need to wear silly hats.") - stage3 = list("Must... eat... chocolate....", "YAP") - stage4 = list("Visions of washing machines assail my mind!") - stage5 = list("AUUUUUU!!!") + stage3 = list(span_danger("Must... eat... chocolate...."), span_danger("YAP")) + stage4 = list(span_danger("Visions of washing machines assail my mind!")) + stage5 = list(span_danger("AUUUUUU!!!")) new_form = /mob/living/simple_animal/pet/dog/corgi /datum/disease/transformation/corgi/stage_act() @@ -282,9 +282,9 @@ visibility_flags = 0 stage1 = list("Your stomach rumbles.") stage2 = list("Your skin feels saggy.") - stage3 = list("My appendages are melting away.", "My limbs begin to lose their shape.") - stage4 = list("You're ravenous.") - stage5 = list("I have become a morph.") + stage3 = list(span_danger("My appendages are melting away."), span_danger("My limbs begin to lose their shape.")) + stage4 = list(span_danger("You're ravenous.")) + stage5 = list(span_danger("I have become a morph.")) new_form = /mob/living/simple_animal/hostile/morph infectable_biotypes = MOB_ORGANIC|MOB_MINERAL|MOB_UNDEAD //magic! transformed_antag_datum = /datum/antagonist/morph @@ -301,9 +301,9 @@ visibility_flags = 0 stage1 = list("You seem a little lighter in my step.") stage2 = list("You catch myself smiling for no reason.") - stage3 = list("A cruel sense of calm overcomes you.", "I can't feel my arms!", "I let go of the urge to hurt clowns.") - stage4 = list("I can't feel my arms. It does not bother you anymore.", "I forgive the clown for hurting you.") - stage5 = list("I have become a Gondola.") + stage3 = list(span_danger("A cruel sense of calm overcomes you."), span_danger("I can't feel my arms!"), span_danger("I let go of the urge to hurt clowns.")) + stage4 = list(span_danger("I can't feel my arms. It does not bother you anymore."), span_danger("I forgive the clown for hurting you.")) + stage5 = list(span_danger("I have become a Gondola.")) new_form = /mob/living/simple_animal/pet/gondola /datum/disease/transformation/gondola/stage_act() @@ -325,6 +325,6 @@ if (prob(20)) affected_mob.reagents.add_reagent_list(list(/datum/reagent/pax = 5)) if (prob(2)) - to_chat(affected_mob, "I let go of what you were holding.") + to_chat(affected_mob, span_danger("I let go of what you were holding.")) var/obj/item/I = affected_mob.get_active_held_item() affected_mob.dropItemToGround(I) diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index 5ba57f95a..8a92e1037 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -19,41 +19,41 @@ if(2) if(prob(2)) affected_mob.emote("cough") - to_chat(affected_mob, "My chest hurts.") + to_chat(affected_mob, span_danger("My chest hurts.")) if(prob(2)) - to_chat(affected_mob, "My stomach violently rumbles!") + to_chat(affected_mob, span_danger("My stomach violently rumbles!")) if(prob(5)) - to_chat(affected_mob, "I feel a cold sweat form.") + to_chat(affected_mob, span_danger("I feel a cold sweat form.")) if(4) if(prob(2)) - to_chat(affected_mob, "I see four of everything!") + to_chat(affected_mob, span_danger("I see four of everything!")) affected_mob.Dizzy(5) if(prob(2)) - to_chat(affected_mob, "I feel a sharp pain from my lower chest!") + to_chat(affected_mob, span_danger("I feel a sharp pain from my lower chest!")) affected_mob.adjustOxyLoss(5) affected_mob.emote("breathgasp") if(prob(10)) - to_chat(affected_mob, "I feel air escape from my lungs painfully.") + to_chat(affected_mob, span_danger("I feel air escape from my lungs painfully.")) affected_mob.adjustOxyLoss(25) affected_mob.emote("breathgasp") if(5) if(prob(2)) - to_chat(affected_mob, "[pick("You feel your heart slowing...", "You relax and slow your heartbeat.")]") + to_chat(affected_mob, span_danger("[pick("You feel your heart slowing...", "You relax and slow your heartbeat.")]")) affected_mob.adjustStaminaLoss(70) if(prob(10)) affected_mob.adjustStaminaLoss(100) - affected_mob.visible_message("[affected_mob] faints!", "I surrender myself and feel so sick!...") + affected_mob.visible_message(span_warning("[affected_mob] faints!"), span_danger("I surrender myself and feel so sick!...")) affected_mob.AdjustSleeping(100) if(prob(2)) - to_chat(affected_mob, "I feel my mind relax and my thoughts drift!") + to_chat(affected_mob, span_danger("I feel my mind relax and my thoughts drift!")) affected_mob.confused = min(100, affected_mob.confused + 8) if(prob(10)) affected_mob.vomit(20) if(prob(3)) - to_chat(affected_mob, "[pick("Your stomach silently rumbles...", "Your stomach seizes up and falls limp, muscles dead and lifeless.", "My chest hurts!")]") + to_chat(affected_mob, span_warning("[pick("Your stomach silently rumbles...", "Your stomach seizes up and falls limp, muscles dead and lifeless.", "My chest hurts!")]")) affected_mob.overeatduration = max(affected_mob.overeatduration - 100, 0) affected_mob.adjust_nutrition(-100) if(prob(15)) - to_chat(affected_mob, "[pick("You feel uncomfortably hot...", "You feel so sick!", "You feel like taking off some clothes...")]") + to_chat(affected_mob, span_danger("[pick("You feel uncomfortably hot...", "You feel so sick!", "You feel like taking off some clothes...")]")) affected_mob.adjust_bodytemperature(40) return diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index 41f755fab..1ee80aff2 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -31,14 +31,14 @@ STI KALY - blind if(prob(1)&&prob(50)) affected_mob.say(pick("You shall not pass!", "Expeliarmus!", "By Merlins beard!", "Feel the power of the Dark Side!"), forced = "wizarditis") if(prob(1)&&prob(50)) - to_chat(affected_mob, "I feel [pick("that you don't have enough mana", "that the winds of magic are gone", "an urge to summon familiar")].") + to_chat(affected_mob, span_danger("I feel [pick("that you don't have enough mana", "that the winds of magic are gone", "an urge to summon familiar")].")) if(3) if(prob(1)&&prob(50)) affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!", "STI KALY!", "TARCOL MINTI ZHERI!"), forced = "wizarditis") if(prob(1)&&prob(50)) - to_chat(affected_mob, "I feel [pick("the magic bubbling in your veins","that this location gives you a +1 to INT","an urge to summon familiar")].") + to_chat(affected_mob, span_danger("I feel [pick("the magic bubbling in your veins","that this location gives you a +1 to INT","an urge to summon familiar")].")) if(4) @@ -46,7 +46,7 @@ STI KALY - blind affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!","STI KALY!","EI NATH!"), forced = "wizarditis") return if(prob(1)&&prob(50)) - to_chat(affected_mob, "I feel [pick("the tidal wave of raw power building inside","that this location gives you a +2 to INT and +1 to WIS","an urge to teleport")].") + to_chat(affected_mob, span_danger("I feel [pick("the tidal wave of raw power building inside","that this location gives you a +2 to INT and +1 to WIS","an urge to teleport")].")) spawn_wizard_clothes(50) if(prob(1)&&prob(1)) teleport() diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 048b06479..3333b96d3 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -230,17 +230,17 @@ if(alert) switch(stability) if(70 to 90) - message = "I shiver." + message = span_warning("I shiver.") if(60 to 69) - message = "I feel cold." + message = span_warning("I feel cold.") if(40 to 59) - message = "I feel sick." + message = span_warning("I feel sick.") if(20 to 39) - message = "It feels like my skin is moving." + message = span_warning("It feels like my skin is moving.") if(1 to 19) - message = "I can feel my cells burning." + message = span_warning("I can feel my cells burning.") if(-INFINITY to 0) - message = "I can feel my DNA exploding, we need to do something fast!" + message = span_boldwarning("I can feel my DNA exploding, we need to do something fast!") if(stability <= 0) holder.apply_status_effect(STATUS_EFFECT_DNA_MELT) if(message) @@ -580,21 +580,21 @@ if(1) gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic) new/obj/vehicle/ridden/wheelchair(get_turf(src)) //don't buckle, because I can't imagine to plethora of things to go through that could otherwise break - to_chat(src, "My flesh turned into a wheelchair and I can't feel my legs.") + to_chat(src, span_warning("My flesh turned into a wheelchair and I can't feel my legs.")) if(2) corgize() if(3) - to_chat(src, "Oh, I actually feel quite alright!") + to_chat(src, span_notice("Oh, I actually feel quite alright!")) if(4) - to_chat(src, "Oh, I actually feel quite alright!") //you thought + to_chat(src, span_notice("Oh, I actually feel quite alright!")) //you thought physiology.damage_resistance = -20000 if(5) - to_chat(src, "Oh, I actually feel quite alright!") + to_chat(src, span_notice("Oh, I actually feel quite alright!")) reagents.add_reagent(/datum/reagent/aslimetoxin, 10) if(6) apply_status_effect(STATUS_EFFECT_GO_AWAY) if(7) - to_chat(src, "Oh, I actually feel quite alright!") + to_chat(src, span_notice("Oh, I actually feel quite alright!")) ForceContractDisease(new/datum/disease/decloning()) //slow acting, non-viral clone damage based GBS if(8) var/list/elligible_organs = list() @@ -604,13 +604,13 @@ if(elligible_organs.len) var/obj/item/organ/O = pick(elligible_organs) O.Remove(src) - visible_message("[src] vomits up their [O.name]!", "I vomit up my [O.name]") //no "vomit up my the heart" + visible_message(span_danger("[src] vomits up their [O.name]!"), "I vomit up my [O.name]") //no "vomit up my the heart" O.forceMove(drop_location()) if(prob(20)) O.animate_atom_living() if(9 to 10) ForceContractDisease(new/datum/disease/gastrolosis()) - to_chat(src, "Oh, I actually feel quite alright!") + to_chat(src, span_notice("Oh, I actually feel quite alright!")) else switch(rand(0,5)) if(0) @@ -631,7 +631,7 @@ else set_species(/datum/species/dullahan) if(4) - visible_message("[src]'s skin melts off!", "My skin melts off!") + visible_message(span_warning("[src]'s skin melts off!"), span_boldwarning("My skin melts off!")) spawn_gibs() set_species(/datum/species/skeleton) if(prob(90)) @@ -639,7 +639,7 @@ if(mind) mind.hasSoul = FALSE if(5) - to_chat(src, "LOOK UP!") + to_chat(src, span_phobia("LOOK UP!")) addtimer(CALLBACK(src, PROC_REF(something_horrible_mindmelt)), 30) @@ -650,5 +650,5 @@ return eyes.Remove(src) qdel(eyes) - visible_message("[src] looks up and their eyes melt away!", "='danger'>I understand now.") + visible_message(span_notice("[src] looks up and their eyes melt away!"), "='danger'>I understand now.") addtimer(CALLBACK(src, PROC_REF(adjustOrganLoss), ORGAN_SLOT_BRAIN, 200), 20) diff --git a/code/datums/elements/cleaning.dm b/code/datums/elements/cleaning.dm index 37b1f4672..66fed445b 100644 --- a/code/datums/elements/cleaning.dm +++ b/code/datums/elements/cleaning.dm @@ -37,4 +37,4 @@ SEND_SIGNAL(cleaned_human.shoes, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD) SEND_SIGNAL(cleaned_human, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD) cleaned_human.regenerate_icons() - to_chat(cleaned_human, "[AM] cleans your face!") + to_chat(cleaned_human, span_danger("[AM] cleans your face!")) diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 7f747f440..469db802b 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -213,11 +213,11 @@ return FALSE /* switch(user.stat) if(SOFT_CRIT) - to_chat(user, "I cannot [key] while dying!") + to_chat(user, span_warning("I cannot [key] while dying!")) if(UNCONSCIOUS) - to_chat(user, "I cannot [key] while unconscious!") + to_chat(user, span_warning("I cannot [key] while unconscious!")) if(DEAD) - to_chat(user, "I cannot [key] while dead!")*/ + to_chat(user, span_warning("I cannot [key] while dead!"))*/ return FALSE if(restraint_check) if(isliving(user)) @@ -225,12 +225,12 @@ if(L.IsParalyzed() || L.IsStun()) if(!intentional) return FALSE -// to_chat(user, "I cannot [key] while stunned!") +// to_chat(user, span_warning("I cannot [key] while stunned!")) return FALSE if(restraint_check && user.restrained()) if(!intentional) return FALSE -// to_chat(user, "I cannot [key] while restrained!") +// to_chat(user, span_warning("I cannot [key] while restrained!")) return FALSE if(intentional && HAS_TRAIT(user, TRAIT_EMOTEMUTE)) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 4efd7d097..78d945f19 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -37,7 +37,7 @@ precision = max(rand(1,100)*bagholding.len,100) if(isliving(teleatom)) var/mob/living/MM = teleatom - to_chat(MM, "The bluespace interface on your bag of holding interferes with the teleport!") + to_chat(MM, span_warning("The bluespace interface on your bag of holding interferes with the teleport!")) // if effects are not specified and not explicitly disabled, sparks if ((!effectin || !effectout) && !no_effects) diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index 428889370..00c365be8 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -241,10 +241,10 @@ record.caller_image = holodiskOriginal.record.caller_image record.entries = holodiskOriginal.record.entries.Copy() record.language = holodiskOriginal.record.language - to_chat(user, "I copy the record from [holodiskOriginal] to [src] by connecting the ports!") + to_chat(user, span_notice("I copy the record from [holodiskOriginal] to [src] by connecting the ports!")) name = holodiskOriginal.name else - to_chat(user, "[holodiskOriginal] has no record on it!") + to_chat(user, span_warning("[holodiskOriginal] has no record on it!")) ..() /obj/item/disk/holodisk/proc/build_record() diff --git a/code/datums/keybinding/mob.dm b/code/datums/keybinding/mob.dm index 2b87b1be1..e7d2adcd0 100644 --- a/code/datums/keybinding/mob.dm +++ b/code/datums/keybinding/mob.dm @@ -63,7 +63,7 @@ /datum/keybinding/mob/stop_pulling/down(client/user) var/mob/M = user.mob if(!M.pulling) - to_chat(user, "I are not pulling anything.") + to_chat(user, span_notice("I are not pulling anything.")) else M.stop_pulling() return TRUE diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index 102a038ec..cb02a2817 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -3,11 +3,11 @@ id = MARTIALART_BOXING /datum/martial_art/boxing/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) - to_chat(A, "Can't disarm while boxing!") + to_chat(A, span_warning("Can't disarm while boxing!")) return 1 /datum/martial_art/boxing/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) - to_chat(A, "Can't grab while boxing!") + to_chat(A, span_warning("Can't grab while boxing!")) return 1 /datum/martial_art/boxing/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) @@ -19,9 +19,9 @@ var/damage = rand(5, 8) + A.dna.species.punchdamagelow if(!damage) playsound(D.loc, A.dna.species.miss_sound, 25, TRUE, -1) - D.visible_message("[A]'s [atk_verb] misses [D]!", \ - "I avoid [A]'s [atk_verb]!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "My [atk_verb] misses [D]!") + D.visible_message(span_warning("[A]'s [atk_verb] misses [D]!"), \ + span_danger("I avoid [A]'s [atk_verb]!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_warning("My [atk_verb] misses [D]!")) log_combat(A, D, "attempted to hit", atk_verb) return 0 @@ -31,18 +31,18 @@ playsound(D.loc, A.dna.species.attack_sound, 25, TRUE, -1) - D.visible_message("[A] [atk_verb]ed [D]!", \ - "You're [atk_verb]ed by [A]!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I [atk_verb]ed [D]!") + D.visible_message(span_danger("[A] [atk_verb]ed [D]!"), \ + span_danger("You're [atk_verb]ed by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I [atk_verb]ed [D]!")) D.apply_damage(damage, STAMINA, affecting, armor_block) log_combat(A, D, "punched (boxing) ") if(D.getStaminaLoss() > 50 && istype(D.mind?.martial_art, /datum/martial_art/boxing)) var/knockout_prob = D.getStaminaLoss() + rand(-15,15) if((D.stat != DEAD) && prob(knockout_prob)) - D.visible_message("[A] knocks [D] out with a haymaker!", \ - "You're knocked unconscious by [A]!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I knock [D] out with a haymaker!") + D.visible_message(span_danger("[A] knocks [D] out with a haymaker!"), \ + span_danger("You're knocked unconscious by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I knock [D] out with a haymaker!")) D.apply_effect(200,EFFECT_KNOCKDOWN,armor_block) D.SetSleeping(100) D.forcesay(GLOB.hit_appends) diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 631c54d5c..3fe5ce509 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -45,9 +45,9 @@ if(!can_use(A)) return FALSE if(D.mobility_flags & MOBILITY_STAND) - D.visible_message("[A] slams [D] into the ground!", \ - "You're slammed into the ground by [A]!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I slam [D] into the ground!") + D.visible_message(span_danger("[A] slams [D] into the ground!"), \ + span_danger("You're slammed into the ground by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I slam [D] into the ground!")) playsound(get_turf(A), 'sound/blank.ogg', 50, TRUE, -1) D.apply_damage(10, BRUTE) D.Paralyze(120) @@ -58,9 +58,9 @@ if(!can_use(A)) return FALSE if(!D.stat || !D.IsParalyzed()) - D.visible_message("[A] kicks [D] back!", \ - "You're kicked back by [A]!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I kick [D] back!") + D.visible_message(span_danger("[A] kicks [D] back!"), \ + span_danger("You're kicked back by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I kick [D] back!")) playsound(get_turf(A), 'sound/blank.ogg', 50, TRUE, -1) var/atom/throw_target = get_edge_target_turf(D, A.dir) D.throw_at(throw_target, 1, 14, A) @@ -68,9 +68,9 @@ log_combat(A, D, "kicked (CQC)") if(D.IsParalyzed() && !D.stat) log_combat(A, D, "knocked out (Head kick)(CQC)") - D.visible_message("[A] kicks [D]'s head, knocking [D.p_them()] out!", \ - "You're knocked unconscious by [A]!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I kick [D]'s head, knocking [D.p_them()] out!") + D.visible_message(span_danger("[A] kicks [D]'s head, knocking [D.p_them()] out!"), \ + span_danger("You're knocked unconscious by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I kick [D]'s head, knocking [D.p_them()] out!")) playsound(get_turf(A), 'sound/blank.ogg', 50, TRUE, -1) D.SetSleeping(300) D.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150) @@ -80,9 +80,9 @@ if(!can_use(A)) return FALSE log_combat(A, D, "pressured (CQC)") - D.visible_message("[A] punches [D]'s neck!", \ - "My neck is punched by [A]!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I punch [D]'s neck!") + D.visible_message(span_danger("[A] punches [D]'s neck!"), \ + span_danger("My neck is punched by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I punch [D]'s neck!")) D.adjustStaminaLoss(60) playsound(get_turf(A), 'sound/blank.ogg', 50, TRUE, -1) return TRUE @@ -94,9 +94,9 @@ return FALSE if(!D.stat) log_combat(A, D, "restrained (CQC)") - D.visible_message("[A] locks [D] into a restraining position!", \ - "You're locked into a restraining position by [A]!", "I hear shuffling and a muffled groan!", null, A) - to_chat(A, "I lock [D] into a restraining position!") + D.visible_message(span_warning("[A] locks [D] into a restraining position!"), \ + span_danger("You're locked into a restraining position by [A]!"), span_hear("I hear shuffling and a muffled groan!"), null, A) + to_chat(A, span_danger("I lock [D] into a restraining position!")) D.adjustStaminaLoss(20) D.Stun(100) restraining = TRUE @@ -108,9 +108,9 @@ return FALSE if(!D.stat) log_combat(A, D, "consecutive CQC'd (CQC)") - D.visible_message("[A] strikes [D]'s abdomen, neck and back consecutively", \ - "My abdomen, neck and back are struck consecutively by [A]!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I strike [D]'s abdomen, neck and back consecutively!") + D.visible_message(span_danger("[A] strikes [D]'s abdomen, neck and back consecutively"), \ + span_danger("My abdomen, neck and back are struck consecutively by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I strike [D]'s abdomen, neck and back consecutively!")) playsound(get_turf(D), 'sound/blank.ogg', 50, TRUE, -1) var/obj/item/I = D.get_active_held_item() if(I && D.temporarilyRemoveItemFromInventory(I)) @@ -130,9 +130,9 @@ // D.drop_all_held_items() A.setGrabState(GRAB_AGGRESSIVE) //Instant agressive grab if on grab intent log_combat(A, D, "grabbed", addition="aggressively") - D.visible_message("[A] violently grabs [D]!", \ - "You're grabbed violently by [A]!", "I hear sounds of aggressive fondling!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I violently grab [D]!") + D.visible_message(span_warning("[A] violently grabs [D]!"), \ + span_danger("You're grabbed violently by [A]!"), span_hear("I hear sounds of aggressive fondling!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I violently grab [D]!")) return TRUE else return FALSE @@ -155,14 +155,14 @@ playsound(get_turf(D), 'sound/blank.ogg', 50, TRUE, -1) else playsound(get_turf(D), 'sound/blank.ogg', 50, TRUE, -1) - D.visible_message("[A] [picked_hit_type]ed [D]!", \ - "You're [picked_hit_type]ed by [A]!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I [picked_hit_type] [D]!") + D.visible_message(span_danger("[A] [picked_hit_type]ed [D]!"), \ + span_danger("You're [picked_hit_type]ed by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I [picked_hit_type] [D]!")) log_combat(A, D, "[picked_hit_type]s (CQC)") if(A.resting && !D.stat && !D.IsParalyzed()) - D.visible_message("[A] leg sweeps [D]!", \ - "My legs are sweeped by [A]!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I leg sweep [D]!") + D.visible_message(span_danger("[A] leg sweeps [D]!"), \ + span_danger("My legs are sweeped by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I leg sweep [D]!")) playsound(get_turf(A), 'sound/blank.ogg', 50, TRUE, -1) D.apply_damage(10, BRUTE) D.Paralyze(60) @@ -179,25 +179,25 @@ if(prob(65)) if(!D.stat || !D.IsParalyzed() || !restraining) I = D.get_active_held_item() - D.visible_message("[A] strikes [D]'s jaw with their hand!", \ - "My jaw is struck by [A], you feel disoriented!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I strike [D]'s jaw, leaving [D.p_them()] disoriented!") + D.visible_message(span_danger("[A] strikes [D]'s jaw with their hand!"), \ + span_danger("My jaw is struck by [A], you feel disoriented!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I strike [D]'s jaw, leaving [D.p_them()] disoriented!")) playsound(get_turf(D), 'sound/blank.ogg', 50, TRUE, -1) if(I && D.temporarilyRemoveItemFromInventory(I)) A.put_in_hands(I) D.Jitter(2) D.apply_damage(5, A.dna.species.attack_type) else - D.visible_message("[A] fails to disarm [D]!", \ - "You're nearly disarmed by [A]!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I fail to disarm [D]!") + D.visible_message(span_danger("[A] fails to disarm [D]!"), \ + span_danger("You're nearly disarmed by [A]!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_warning("I fail to disarm [D]!")) playsound(D, 'sound/blank.ogg', 25, TRUE, -1) log_combat(A, D, "disarmed (CQC)", "[I ? " grabbing \the [I]" : ""]") if(restraining && A.pulling == D) log_combat(A, D, "knocked out (Chokehold)(CQC)") - D.visible_message("[A] puts [D] into a chokehold!", \ - "You're put into a chokehold by [A]!", "I hear shuffling and a muffled groan!", null, A) - to_chat(A, "I put [D] into a chokehold!") + D.visible_message(span_danger("[A] puts [D] into a chokehold!"), \ + span_danger("You're put into a chokehold by [A]!"), span_hear("I hear shuffling and a muffled groan!"), null, A) + to_chat(A, span_danger("I put [D] into a chokehold!")) D.SetSleeping(400) restraining = FALSE if(A.grab_state < GRAB_NECK) diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 3748699a2..1667d74d4 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -12,14 +12,14 @@ /datum/action/neck_chop/Trigger() if(owner.incapacitated()) - to_chat(owner, "I can't use [name] while you're incapacitated.") + to_chat(owner, span_warning("I can't use [name] while you're incapacitated.")) return var/mob/living/carbon/human/H = owner if (H.mind.martial_art.streak == "neck_chop") - owner.visible_message("[owner] assumes a neutral stance.", "My next attack is cleared.") + owner.visible_message(span_danger("[owner] assumes a neutral stance."), "My next attack is cleared.") H.mind.martial_art.streak = "" else - owner.visible_message("[owner] assumes the Neck Chop stance!", "My next attack will be a Neck Chop.") + owner.visible_message(span_danger("[owner] assumes the Neck Chop stance!"), "My next attack will be a Neck Chop.") H.mind.martial_art.streak = "neck_chop" /datum/action/leg_sweep @@ -29,14 +29,14 @@ /datum/action/leg_sweep/Trigger() if(owner.incapacitated()) - to_chat(owner, "I can't use [name] while you're incapacitated.") + to_chat(owner, span_warning("I can't use [name] while you're incapacitated.")) return var/mob/living/carbon/human/H = owner if (H.mind.martial_art.streak == "leg_sweep") - owner.visible_message("[owner] assumes a neutral stance.", "My next attack is cleared.") + owner.visible_message(span_danger("[owner] assumes a neutral stance."), "My next attack is cleared.") H.mind.martial_art.streak = "" else - owner.visible_message("[owner] assumes the Leg Sweep stance!", "My next attack will be a Leg Sweep.") + owner.visible_message(span_danger("[owner] assumes the Leg Sweep stance!"), "My next attack will be a Leg Sweep.") H.mind.martial_art.streak = "leg_sweep" /datum/action/lung_punch//referred to internally as 'quick choke' @@ -46,26 +46,26 @@ /datum/action/lung_punch/Trigger() if(owner.incapacitated()) - to_chat(owner, "I can't use [name] while you're incapacitated.") + to_chat(owner, span_warning("I can't use [name] while you're incapacitated.")) return var/mob/living/carbon/human/H = owner if (H.mind.martial_art.streak == "quick_choke") - owner.visible_message("[owner] assumes a neutral stance.", "My next attack is cleared.") + owner.visible_message(span_danger("[owner] assumes a neutral stance."), "My next attack is cleared.") H.mind.martial_art.streak = "" else - owner.visible_message("[owner] assumes the Lung Punch stance!", "My next attack will be a Lung Punch.") + owner.visible_message(span_danger("[owner] assumes the Lung Punch stance!"), "My next attack will be a Lung Punch.") H.mind.martial_art.streak = "quick_choke"//internal name for lung punch /datum/martial_art/krav_maga/teach(mob/living/carbon/human/H,make_temporary=0) if(..()) - to_chat(H, "I know the arts of [name]!") - to_chat(H, "Place my cursor over a move at the top of the screen to see what it does.") + to_chat(H, span_danger("I know the arts of [name]!")) + to_chat(H, span_danger("Place my cursor over a move at the top of the screen to see what it does.")) neckchop.Grant(H) legsweep.Grant(H) lungpunch.Grant(H) /datum/martial_art/krav_maga/on_remove(mob/living/carbon/human/H) - to_chat(H, "I suddenly forget the arts of [name]...") + to_chat(H, span_danger("I suddenly forget the arts of [name]...")) neckchop.Remove(H) legsweep.Remove(H) lungpunch.Remove(H) @@ -89,9 +89,9 @@ /datum/martial_art/krav_maga/proc/leg_sweep(mob/living/carbon/human/A, mob/living/carbon/human/D) if(D.stat || D.IsParalyzed()) return 0 - D.visible_message("[A] leg sweeps [D]!", \ - "My legs are sweeped by [A]!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I leg sweep [D]!") + D.visible_message(span_warning("[A] leg sweeps [D]!"), \ + span_danger("My legs are sweeped by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I leg sweep [D]!")) playsound(get_turf(A), 'sound/blank.ogg', 50, TRUE, -1) D.apply_damage(5, BRUTE) D.Paralyze(40) @@ -99,9 +99,9 @@ return 1 /datum/martial_art/krav_maga/proc/quick_choke(mob/living/carbon/human/A, mob/living/carbon/human/D)//is actually lung punch - D.visible_message("[A] pounds [D] on the chest!", \ - "My chest is slammed by [A]! You can't breathe!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I pound [D] on the chest!") + D.visible_message(span_warning("[A] pounds [D] on the chest!"), \ + span_danger("My chest is slammed by [A]! You can't breathe!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I pound [D] on the chest!")) playsound(get_turf(A), 'sound/blank.ogg', 50, TRUE, -1) if(D.losebreath <= 10) D.losebreath = CLAMP(D.losebreath + 5, 0, 10) @@ -110,9 +110,9 @@ return 1 /datum/martial_art/krav_maga/proc/neck_chop(mob/living/carbon/human/A, mob/living/carbon/human/D) - D.visible_message("[A] karate chops [D]'s neck!", \ - "My neck is karate chopped by [A], rendering you unable to speak!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I karate chop [D]'s neck, rendering [D.p_them()] unable to speak!") + D.visible_message(span_warning("[A] karate chops [D]'s neck!"), \ + span_danger("My neck is karate chopped by [A], rendering you unable to speak!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I karate chop [D]'s neck, rendering [D.p_them()] unable to speak!")) playsound(get_turf(A), 'sound/blank.ogg', 50, TRUE, -1) D.apply_damage(5, A.dna.species.attack_type) if(D.silent <= 10) @@ -142,9 +142,9 @@ else A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) playsound(get_turf(D), 'sound/blank.ogg', 50, TRUE, -1) - D.visible_message("[A] [picked_hit_type]s [D]!", \ - "You're [picked_hit_type]ed by [A]!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I [picked_hit_type] [D]!") + D.visible_message(span_danger("[A] [picked_hit_type]s [D]!"), \ + span_danger("You're [picked_hit_type]ed by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I [picked_hit_type] [D]!")) log_combat(A, D, "[picked_hit_type] with [name]") return 1 @@ -157,14 +157,14 @@ if(I) if(D.temporarilyRemoveItemFromInventory(I)) A.put_in_hands(I) - D.visible_message("[A] disarms [D]!", \ - "You're disarmed by [A]!", "I hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I disarm [D]!") + D.visible_message(span_danger("[A] disarms [D]!"), \ + span_danger("You're disarmed by [A]!"), span_hear("I hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I disarm [D]!")) playsound(D, 'sound/blank.ogg', 50, TRUE, -1) else - D.visible_message("[A] fails to disarm [D]!", \ - "You're nearly disarmed by [A]!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I fail to disarm [D]!") + D.visible_message(span_danger("[A] fails to disarm [D]!"), \ + span_danger("You're nearly disarmed by [A]!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_warning("I fail to disarm [D]!")) playsound(D, 'sound/blank.ogg', 25, TRUE, -1) log_combat(A, D, "disarmed (Krav Maga)", "[I ? " removing \the [I]" : ""]") return 1 diff --git a/code/datums/martial/mushpunch.dm b/code/datums/martial/mushpunch.dm index edc4c1154..3528240e2 100644 --- a/code/datums/martial/mushpunch.dm +++ b/code/datums/martial/mushpunch.dm @@ -4,15 +4,15 @@ /datum/martial_art/mushpunch/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) var/atk_verb - to_chat(A, "I begin to wind up an attack...") + to_chat(A, span_spider("I begin to wind up an attack...")) if(!do_after(A, 25, target = D)) - to_chat(A, "My attack was interrupted!") + to_chat(A, span_spider("My attack was interrupted!")) return TRUE //martial art code was a mistake A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) atk_verb = pick("punch", "smash", "crack") - D.visible_message("[A] [atk_verb]ed [D] with such inhuman strength that it sends [D.p_them()] flying backwards!", \ - "You're [atk_verb]ed by [A] with such inhuman strength that it sends you flying backwards!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I [atk_verb] [D] with such inhuman strength that it sends [D.p_them()] flying backwards!") + D.visible_message(span_danger("[A] [atk_verb]ed [D] with such inhuman strength that it sends [D.p_them()] flying backwards!"), \ + span_danger("You're [atk_verb]ed by [A] with such inhuman strength that it sends you flying backwards!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I [atk_verb] [D] with such inhuman strength that it sends [D.p_them()] flying backwards!")) D.apply_damage(rand(15,30), A.dna.species.attack_type) playsound(D, 'sound/blank.ogg', 25, TRUE, -1) var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A))) @@ -31,10 +31,10 @@ /obj/item/mushpunch/attack_self(mob/living/carbon/human/user) if(!istype(user) || !user) return - var/message = "I devour [src], and a confluence of skill and power from the mushroom enhances my punches! You do need a short moment to charge these powerful punches." + var/message = span_spider("I devour [src], and a confluence of skill and power from the mushroom enhances my punches! You do need a short moment to charge these powerful punches.") to_chat(user, message) var/datum/martial_art/mushpunch/mush = new(null) mush.teach(user) qdel(src) - visible_message("[user] devours [src].", \ - "I devour [src].") + visible_message(span_warning("[user] devours [src]."), \ + span_notice("I devour [src].")) diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm index fdf329695..79aec2e14 100644 --- a/code/datums/martial/plasma_fist.dm +++ b/code/datums/martial/plasma_fist.dm @@ -35,9 +35,9 @@ return /datum/martial_art/plasma_fist/proc/Throwback(mob/living/carbon/human/A, mob/living/carbon/human/D) - D.visible_message("[A] hits [D] with Plasma Punch!", \ - "You're hit with a Plasma Punch by [A]!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I hit [D] with Plasma Punch!") + D.visible_message(span_danger("[A] hits [D] with Plasma Punch!"), \ + span_danger("You're hit with a Plasma Punch by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I hit [D] with Plasma Punch!")) playsound(D.loc, 'sound/blank.ogg', 50, TRUE, -1) var/atom/throw_target = get_edge_target_turf(D, get_dir(D, get_step_away(D, A))) D.throw_at(throw_target, 200, 4,A) @@ -49,9 +49,9 @@ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) playsound(D.loc, 'sound/blank.ogg', 50, TRUE, -1) A.say("PLASMA FIST!", forced="plasma fist") - D.visible_message("[A] hits [D] with THE PLASMA FIST TECHNIQUE!", \ - "You're suddenly hit with THE PLASMA FIST TECHNIQUE by [A]!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I hit [D] with THE PLASMA FIST TECHNIQUE!") + D.visible_message(span_danger("[A] hits [D] with THE PLASMA FIST TECHNIQUE!"), \ + span_danger("You're suddenly hit with THE PLASMA FIST TECHNIQUE by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I hit [D] with THE PLASMA FIST TECHNIQUE!")) D.gib() log_combat(A, D, "gibbed (Plasma Fist)") return diff --git a/code/datums/martial/psychotic_brawl.dm b/code/datums/martial/psychotic_brawl.dm index f332c1689..a874e02e3 100644 --- a/code/datums/martial/psychotic_brawl.dm +++ b/code/datums/martial/psychotic_brawl.dm @@ -31,9 +31,9 @@ D.stop_pulling() if(A.used_intent.type == INTENT_GRAB) log_combat(A, D, "grabbed", addition="aggressively") - D.visible_message("[A] violently grabs [D]!", \ - "You're violently grabbed by [A]!", "I hear sounds of aggressive fondling!", null, A) - to_chat(A, "I violently grab [D]!") + D.visible_message(span_warning("[A] violently grabs [D]!"), \ + span_danger("You're violently grabbed by [A]!"), span_hear("I hear sounds of aggressive fondling!"), null, A) + to_chat(A, span_danger("I violently grab [D]!")) A.setGrabState(GRAB_AGGRESSIVE) //Instant aggressive grab else log_combat(A, D, "grabbed", addition="passively") @@ -41,9 +41,9 @@ if(4) A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) atk_verb = "headbutt" - D.visible_message("[A] [atk_verb]s [D]!", \ - "You're [atk_verb]ed by [A]!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I [atk_verb] [D]!") + D.visible_message(span_danger("[A] [atk_verb]s [D]!"), \ + span_danger("You're [atk_verb]ed by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I [atk_verb] [D]!")) playsound(get_turf(D), 'sound/blank.ogg', 40, TRUE, -1) D.apply_damage(rand(5,10), A.dna.species.attack_type, BODY_ZONE_HEAD) A.apply_damage(rand(5,10), A.dna.species.attack_type, BODY_ZONE_HEAD) @@ -54,9 +54,9 @@ if(5,6) A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) atk_verb = pick("kick", "hit", "slam") - D.visible_message("[A] [atk_verb]s [D] with such inhuman strength that it sends [D.p_them()] flying backwards!", \ - "You're [atk_verb]ed by [A] with such inhuman strength that it sends you flying backwards!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I [atk_verb] [D] with such inhuman strength that it sends [D.p_them()] flying backwards!") + D.visible_message(span_danger("[A] [atk_verb]s [D] with such inhuman strength that it sends [D.p_them()] flying backwards!"), \ + span_danger("You're [atk_verb]ed by [A] with such inhuman strength that it sends you flying backwards!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I [atk_verb] [D] with such inhuman strength that it sends [D.p_them()] flying backwards!")) D.apply_damage(rand(15,30), A.dna.species.attack_type) playsound(get_turf(D), 'sound/blank.ogg', 25, TRUE, -1) var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A))) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 4556a2828..f39fd222c 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -39,9 +39,9 @@ if(!D.stat && !D.IsStun() && !D.IsParalyzed()) log_combat(A, D, "wrist wrenched (Sleeping Carp)") A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) - D.visible_message("[A] grabs [D]'s wrist and wrenches it sideways!", \ - "My wrist is grabbed by [A] while simultaneously wrenched it to the side!", "I hear aggressive shuffling!", null, A) - to_chat(A, "I grab [D]'s wrist and wrench it sideways!") + D.visible_message(span_danger("[A] grabs [D]'s wrist and wrenches it sideways!"), \ + span_danger("My wrist is grabbed by [A] while simultaneously wrenched it to the side!"), span_hear("I hear aggressive shuffling!"), null, A) + to_chat(A, span_danger("I grab [D]'s wrist and wrench it sideways!")) playsound(get_turf(A), 'sound/blank.ogg', 50, TRUE, -1) D.emote("scream") D.dropItemToGround(D.get_active_held_item()) @@ -55,15 +55,15 @@ if(!D.stat && !D.IsParalyzed()) if(A.dir != D.dir) log_combat(A, D, "missed a back-kick (Sleeping Carp) on") - D.visible_message("[A] tries to kick [D] in the back, but misses!", \ - "I avoid a kick in the back by [A]!", "I hear a swoosh!", null, A) - to_chat(A, "My kick to [D]'s back misses!") + D.visible_message(span_warning("[A] tries to kick [D] in the back, but misses!"), \ + span_danger("I avoid a kick in the back by [A]!"), span_hear("I hear a swoosh!"), null, A) + to_chat(A, span_warning("My kick to [D]'s back misses!")) return TRUE log_combat(A, D, "back-kicked (Sleeping Carp)") A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) - D.visible_message("[A] kicks [D] in the back!", \ - "You're kicked in the back by [A]!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I kick [D] in the back!") + D.visible_message(span_warning("[A] kicks [D] in the back!"), \ + span_danger("You're kicked in the back by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I kick [D] in the back!")) step_to(D,get_step(D,D.dir),1) D.Paralyze(80) playsound(get_turf(D), 'sound/blank.ogg', 50, TRUE, -1) @@ -74,9 +74,9 @@ if(!D.stat && !D.IsParalyzed()) log_combat(A, D, "stomach kneed (Sleeping Carp)") A.do_attack_animation(D, ATTACK_EFFECT_KICK) - D.visible_message("[A] knees [D] in the stomach!", \ - "My stomach is kneed by [A], making you gag!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I knee [D] in the stomach, making [D.p_them()] gag!") + D.visible_message(span_danger("[A] knees [D] in the stomach!"), \ + span_danger("My stomach is kneed by [A], making you gag!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I knee [D] in the stomach, making [D.p_them()] gag!")) D.losebreath += 3 D.Stun(40) playsound(get_turf(D), 'sound/blank.ogg', 50, TRUE, -1) @@ -87,9 +87,9 @@ if(!D.stat && !D.IsParalyzed()) log_combat(A, D, "head kicked (Sleeping Carp)") A.do_attack_animation(D, ATTACK_EFFECT_KICK) - D.visible_message("[A] kicks [D] in the head!", \ - "My jaw is kicked by [A]!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I kick [D] in the jaw!") + D.visible_message(span_warning("[A] kicks [D] in the head!"), \ + span_danger("My jaw is kicked by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I kick [D] in the jaw!")) D.apply_damage(20, A.dna.species.attack_type, BODY_ZONE_HEAD) D.drop_all_held_items() playsound(get_turf(D), 'sound/blank.ogg', 50, TRUE, -1) @@ -101,9 +101,9 @@ if(!(D.mobility_flags & MOBILITY_STAND)) log_combat(A, D, "elbow dropped (Sleeping Carp)") A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) - D.visible_message("[A] elbow drops [D]!", \ - "You're piledrived by [A] with [A.p_their()] elbow!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I piledrive [D] with my elbow!") + D.visible_message(span_danger("[A] elbow drops [D]!"), \ + span_danger("You're piledrived by [A] with [A.p_their()] elbow!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I piledrive [D] with my elbow!")) if(D.stat) D.death() //FINISH HIM! D.apply_damage(50, A.dna.species.attack_type, BODY_ZONE_CHEST) @@ -122,9 +122,9 @@ D.drop_all_held_items() A.setGrabState(GRAB_AGGRESSIVE) //Instant agressive grab if on grab intent log_combat(A, D, "grabbed", addition="aggressively") - D.visible_message("[A] violently grabs [D]!", \ - "You're violently grabbed by [A]!", "I hear aggressive shuffling!", null, A) - to_chat(A, "I violently grab [D]!") + D.visible_message(span_warning("[A] violently grabs [D]!"), \ + span_danger("You're violently grabbed by [A]!"), span_hear("I hear aggressive shuffling!"), null, A) + to_chat(A, span_danger("I violently grab [D]!")) return TRUE return FALSE @@ -134,13 +134,13 @@ return TRUE A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) var/atk_verb = pick("kick", "chop", "hit", "slam") - D.visible_message("[A] [atk_verb]s [D]!", \ - "[A] [atk_verb]s you!", null, null, A) - to_chat(A, "I [atk_verb] [D]!") + D.visible_message(span_danger("[A] [atk_verb]s [D]!"), \ + span_danger("[A] [atk_verb]s you!"), null, null, A) + to_chat(A, span_danger("I [atk_verb] [D]!")) D.apply_damage(rand(10,15), BRUTE) playsound(get_turf(D), 'sound/blank.ogg', 25, TRUE, -1) if(prob(D.getBruteLoss()) && (D.mobility_flags & MOBILITY_STAND)) - D.visible_message("[D] stumbles and falls!", "The blow sends you to the ground!") + D.visible_message(span_warning("[D] stumbles and falls!"), span_danger("The blow sends you to the ground!")) D.Paralyze(80) log_combat(A, D, "[atk_verb] (Sleeping Carp)") return TRUE @@ -162,7 +162,7 @@ return BULLET_ACT_HIT if(!isturf(A.loc)) //NO MOTHERFLIPPIN MECHS! return BULLET_ACT_HIT - A.visible_message("[A] deflects the projectile; [A.p_they()] can't be hit with ranged weapons!", "I deflect the projectile!") + A.visible_message(span_danger("[A] deflects the projectile; [A.p_they()] can't be hit with ranged weapons!"), span_danger("I deflect the projectile!")) playsound(src, pick('sound/blank.ogg'), 75, TRUE) P.firer = A P.setAngle(rand(0, 360))//SHING @@ -215,7 +215,7 @@ /obj/item/twohanded/bostaff/attack(mob/target, mob/living/user) add_fingerprint(user) if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50)) - to_chat(user, "I club myself over the head with [src].") + to_chat(user, span_warning("I club myself over the head with [src].")) user.Paralyze(60) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -229,7 +229,7 @@ return ..() var/mob/living/carbon/C = target if(C.stat) - to_chat(user, "It would be dishonorable to attack a foe while they cannot retaliate.") + to_chat(user, span_warning("It would be dishonorable to attack a foe while they cannot retaliate.")) return if(user.used_intent.type == INTENT_DISARM) if(!wielded) @@ -238,21 +238,21 @@ return ..() var/mob/living/carbon/human/H = target var/list/fluffmessages = list("club", "smack", "broadside", "beat", "slam") - H.visible_message("[user] [pick(fluffmessages)]s [H] with [src]!", \ - "[user] [pick(fluffmessages)]s you with [src]!", "I hear a sickening sound of flesh hitting flesh!", null, user) - to_chat(user, "I [pick(fluffmessages)] [H] with [src]!") + H.visible_message(span_warning("[user] [pick(fluffmessages)]s [H] with [src]!"), \ + span_danger("[user] [pick(fluffmessages)]s you with [src]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, user) + to_chat(user, span_danger("I [pick(fluffmessages)] [H] with [src]!")) playsound(get_turf(user), 'sound/blank.ogg', 75, TRUE, -1) H.adjustStaminaLoss(rand(13,20)) if(prob(10)) - H.visible_message("[H] collapses!", \ - "My legs give out!") + H.visible_message(span_warning("[H] collapses!"), \ + span_danger("My legs give out!")) H.Paralyze(80) if(H.staminaloss && !H.IsSleeping()) var/total_health = (H.health - H.staminaloss) if(total_health <= HEALTH_THRESHOLD_CRIT && !H.stat) - H.visible_message("[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!", \ - "You're knocked unconscious by [user]!", "I hear a sickening sound of flesh hitting flesh!", null, user) - to_chat(user, "I deliver a heavy hit to [H]'s head, knocking [H.p_them()] out cold!") + H.visible_message(span_warning("[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!"), \ + span_danger("You're knocked unconscious by [user]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, user) + to_chat(user, span_danger("I deliver a heavy hit to [H]'s head, knocking [H.p_them()] out cold!")) H.SetSleeping(600) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150) else diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index f7d53db35..188aa4b1b 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -47,9 +47,9 @@ /datum/action/slam/Trigger() if(owner.incapacitated()) - to_chat(owner, "I can't WRESTLE while you're OUT FOR THE COUNT.") + to_chat(owner, span_warning("I can't WRESTLE while you're OUT FOR THE COUNT.")) return - owner.visible_message("[owner] prepares to BODY SLAM!", "My next attack will be a BODY SLAM.") + owner.visible_message(span_danger("[owner] prepares to BODY SLAM!"), "My next attack will be a BODY SLAM.") var/mob/living/carbon/human/H = owner H.mind.martial_art.streak = "slam" @@ -59,9 +59,9 @@ /datum/action/throw_wrassle/Trigger() if(owner.incapacitated()) - to_chat(owner, "I can't WRESTLE while you're OUT FOR THE COUNT.") + to_chat(owner, span_warning("I can't WRESTLE while you're OUT FOR THE COUNT.")) return - owner.visible_message("[owner] prepares to THROW!", "My next attack will be a THROW.") + owner.visible_message(span_danger("[owner] prepares to THROW!"), "My next attack will be a THROW.") var/mob/living/carbon/human/H = owner H.mind.martial_art.streak = "throw" @@ -71,9 +71,9 @@ /datum/action/kick/Trigger() if(owner.incapacitated()) - to_chat(owner, "I can't WRESTLE while you're OUT FOR THE COUNT.") + to_chat(owner, span_warning("I can't WRESTLE while you're OUT FOR THE COUNT.")) return - owner.visible_message("[owner] prepares to KICK!", "My next attack will be a KICK.") + owner.visible_message(span_danger("[owner] prepares to KICK!"), "My next attack will be a KICK.") var/mob/living/carbon/human/H = owner H.mind.martial_art.streak = "kick" @@ -83,9 +83,9 @@ /datum/action/strike/Trigger() if(owner.incapacitated()) - to_chat(owner, "I can't WRESTLE while you're OUT FOR THE COUNT.") + to_chat(owner, span_warning("I can't WRESTLE while you're OUT FOR THE COUNT.")) return - owner.visible_message("[owner] prepares to STRIKE!", "My next attack will be a STRIKE.") + owner.visible_message(span_danger("[owner] prepares to STRIKE!"), "My next attack will be a STRIKE.") var/mob/living/carbon/human/H = owner H.mind.martial_art.streak = "strike" @@ -95,16 +95,16 @@ /datum/action/drop/Trigger() if(owner.incapacitated()) - to_chat(owner, "I can't WRESTLE while you're OUT FOR THE COUNT.") + to_chat(owner, span_warning("I can't WRESTLE while you're OUT FOR THE COUNT.")) return - owner.visible_message("[owner] prepares to LEG DROP!", "My next attack will be a LEG DROP.") + owner.visible_message(span_danger("[owner] prepares to LEG DROP!"), "My next attack will be a LEG DROP.") var/mob/living/carbon/human/H = owner H.mind.martial_art.streak = "drop" /datum/martial_art/wrestling/teach(mob/living/carbon/human/H,make_temporary=0) if(..()) - to_chat(H, "SNAP INTO A THIN TIM!") - to_chat(H, "Place my cursor over a move at the top of the screen to see what it does.") + to_chat(H, span_danger("SNAP INTO A THIN TIM!")) + to_chat(H, span_danger("Place my cursor over a move at the top of the screen to see what it does.")) drop.Grant(H) kick.Grant(H) slam.Grant(H) @@ -112,7 +112,7 @@ strike.Grant(H) /datum/martial_art/wrestling/on_remove(mob/living/carbon/human/H) - to_chat(H, "I no longer feel that the tower of power is too sweet to be sour...") + to_chat(H, span_danger("I no longer feel that the tower of power is too sweet to be sour...")) drop.Remove(H) kick.Remove(H) slam.Remove(H) @@ -129,15 +129,15 @@ if(!D) return if(!A.pulling || A.pulling != D) - to_chat(A, "I need to have [D] in a cinch!") + to_chat(A, span_warning("I need to have [D] in a cinch!")) return D.forceMove(A.loc) D.setDir(get_dir(D, A)) D.Stun(80) - D.visible_message("[A] starts spinning around with [D]!", \ - "You're spun around by [A]!", "I hear aggressive shuffling!", null, A) - to_chat(A, "I start spinning around with [D]!") + D.visible_message(span_danger("[A] starts spinning around with [D]!"), \ + span_danger("You're spun around by [A]!"), span_hear("I hear aggressive shuffling!"), null, A) + to_chat(A, span_danger("I start spinning around with [D]!")) A.emote("scream") for (var/i = 0, i < 20, i++) @@ -157,11 +157,11 @@ if (A && D) if (get_dist(A, D) > 1) - to_chat(A, "[D] is too far away!") + to_chat(A, span_warning("[D] is too far away!")) return 0 if (!isturf(A.loc) || !isturf(D.loc)) - to_chat(A, "I can't throw [D] from here!") + to_chat(A, span_warning("I can't throw [D] from here!")) return 0 A.setDir(turn(A.dir, 90)) @@ -179,18 +179,18 @@ // These are necessary because of the sleep call. if (get_dist(A, D) > 1) - to_chat(A, "[D] is too far away!") + to_chat(A, span_warning("[D] is too far away!")) return 0 if (!isturf(A.loc) || !isturf(D.loc)) - to_chat(A, "I can't throw [D] from here!") + to_chat(A, span_warning("I can't throw [D] from here!")) return 0 D.forceMove(A.loc) // Maybe this will help with the wallthrowing bug. - D.visible_message("[A] throws [D]!", \ - "You're thrown by [A]!", "I hear aggressive shuffling and a loud thud!", null, A) - to_chat(A, "I throw [D]!") + D.visible_message(span_danger("[A] throws [D]!"), \ + span_danger("You're thrown by [A]!"), span_hear("I hear aggressive shuffling and a loud thud!"), null, A) + to_chat(A, span_danger("I throw [D]!")) playsound(A.loc, "swing_hit", 50, TRUE) var/turf/T = get_edge_target_turf(A, A.dir) if (T && isturf(T)) @@ -212,15 +212,15 @@ if(!D) return if(!A.pulling || A.pulling != D) - to_chat(A, "I need to have [D] in a cinch!") + to_chat(A, span_warning("I need to have [D] in a cinch!")) return D.forceMove(A.loc) A.setDir(get_dir(A, D)) D.setDir(get_dir(D, A)) - D.visible_message("[A] lifts [D] up!", \ - "You're lifted up by [A]!", "I hear aggressive shuffling!", null, A) - to_chat(A, "I lift [D] up!") + D.visible_message(span_danger("[A] lifts [D] up!"), \ + span_danger("You're lifted up by [A]!"), span_hear("I hear aggressive shuffling!"), null, A) + to_chat(A, span_danger("I lift [D] up!")) FlipAnimation() @@ -242,7 +242,7 @@ D.pixel_x = A.pixel_x + 8 if (get_dist(A, D) > 1) - to_chat(A, "[D] is too far away!") + to_chat(A, span_warning("[D] is too far away!")) A.pixel_x = 0 A.pixel_y = 0 D.pixel_x = 0 @@ -250,7 +250,7 @@ return 0 if (!isturf(A.loc) || !isturf(D.loc)) - to_chat(A, "I can't slam [D] here!") + to_chat(A, span_warning("I can't slam [D] here!")) A.pixel_x = 0 A.pixel_y = 0 D.pixel_x = 0 @@ -274,11 +274,11 @@ D.pixel_y = 0 if (get_dist(A, D) > 1) - to_chat(A, "[D] is too far away!") + to_chat(A, span_warning("[D] is too far away!")) return 0 if (!isturf(A.loc) || !isturf(D.loc)) - to_chat(A, "I can't slam [D] here!") + to_chat(A, span_warning("I can't slam [D] here!")) return 0 D.forceMove(A.loc) @@ -290,9 +290,9 @@ if (3) fluff = "atomic [fluff]" - D.visible_message("[A] [fluff] [D]!", \ - "You're [fluff]ed by [A]!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I [fluff] [D]!") + D.visible_message(span_danger("[A] [fluff] [D]!"), \ + span_danger("You're [fluff]ed by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I [fluff] [D]!")) playsound(A.loc, "swing_hit", 50, TRUE) if (!D.stat) D.emote("scream") @@ -335,9 +335,9 @@ A.forceMove(D.loc) addtimer(CALLBACK(src, PROC_REF(CheckStrikeTurf), A, T), 4) - D.visible_message("[A] headbutts [D]!", \ - "You're headbutted by [A]!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I headbutt [D]!") + D.visible_message(span_danger("[A] headbutts [D]!"), \ + span_danger("You're headbutted by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I headbutt [D]!")) D.adjustBruteLoss(rand(10,20)) playsound(A.loc, "swing_hit", 50, TRUE) D.Unconscious(20) @@ -350,9 +350,9 @@ A.emote("flip") A.setDir(turn(A.dir, 90)) - D.visible_message("[A] roundhouse-kicks [D]!", \ - "You're roundhouse-kicked by [A]!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I roundhouse-kick [D]!") + D.visible_message(span_danger("[A] roundhouse-kicks [D]!"), \ + span_danger("You're roundhouse-kicked by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I roundhouse-kick [D]!")) playsound(A.loc, "swing_hit", 50, TRUE) D.adjustBruteLoss(rand(10,20)) @@ -384,8 +384,8 @@ if (surface && (ST && isturf(ST))) A.forceMove(ST) - A.visible_message("[A] climbs onto [surface]!", \ - "I climb onto [surface]!") + A.visible_message(span_danger("[A] climbs onto [surface]!"), \ + span_danger("I climb onto [surface]!")) A.pixel_y = 10 falling = 1 sleep(10) @@ -396,16 +396,16 @@ if ((falling == 0 && get_dist(A, D) > 1) || (falling == 1 && get_dist(A, D) > 2)) // We climbed onto stuff. A.pixel_y = 0 if (falling == 1) - A.visible_message("...and dives head-first into the ground, ouch!", \ - "...and dive head-first into the ground, ouch!") + A.visible_message(span_danger("...and dives head-first into the ground, ouch!"), \ + span_danger("...and dive head-first into the ground, ouch!")) A.adjustBruteLoss(rand(10,20)) A.Paralyze(60) - to_chat(A, "[D] is too far away!") + to_chat(A, span_warning("[D] is too far away!")) return 0 if (!isturf(A.loc) || !isturf(D.loc)) A.pixel_y = 0 - to_chat(A, "I can't drop onto [D] from here!") + to_chat(A, span_warning("I can't drop onto [D] from here!")) return 0 if(A) @@ -416,9 +416,9 @@ A.forceMove(D.loc) - D.visible_message("[A] leg-drops [D]!", \ - "You're leg-dropped by [A]!", "I hear a sickening sound of flesh hitting flesh!", null, A) - to_chat(A, "I leg-drop [D]!") + D.visible_message(span_danger("[A] leg-drops [D]!"), \ + span_danger("You're leg-dropped by [A]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, A) + to_chat(A, span_danger("I leg-drop [D]!")) playsound(A.loc, "swing_hit", 50, TRUE) A.emote("scream") @@ -452,9 +452,9 @@ if(A.pulling == D) return 1 A.start_pulling(D) - D.visible_message("[A] gets [D] in a cinch!", \ - "You're put into a cinch by [A]!", "I hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, A) - to_chat(A, "I get [D] in a cinch!") + D.visible_message(span_danger("[A] gets [D] in a cinch!"), \ + span_danger("You're put into a cinch by [A]!"), span_hear("I hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, A) + to_chat(A, span_danger("I get [D] in a cinch!")) D.Stun(rand(60,100)) log_combat(A, D, "cinched") return 1 diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 927fc94b4..f861c94ae 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -298,9 +298,9 @@ //TODO add some bar hud or something, i think i seen a request like that somewhere if(known_skills[S] >= old_level) if(known_skills[S] > old_level) - to_chat(current, "My [S.name] grows to [SSskills.level_names[known_skills[S]]]!") + to_chat(current, span_nicegreen("My [S.name] grows to [SSskills.level_names[known_skills[S]]]!")) else - to_chat(current, "My [S.name] has weakened to [SSskills.level_names[known_skills[S]]]!") + to_chat(current, span_warning("My [S.name] has weakened to [SSskills.level_names[known_skills[S]]]!")) /datum/mind/proc/adjust_skillrank(skill, amt, silent = FALSE) var/datum/skill/S = GetSkillRef(skill) @@ -343,9 +343,9 @@ if(silent) return if(known_skills[S] >= old_level) - to_chat(current, "I feel like I've become more proficient at [S.name]!") + to_chat(current, span_nicegreen("I feel like I've become more proficient at [S.name]!")) else - to_chat(current, "I feel like I've become worse at [S.name]!") + to_chat(current, span_warning("I feel like I've become worse at [S.name]!")) ///Gets the skill's singleton and returns the result of its get_skill_speed_modifier @@ -371,10 +371,10 @@ if(known_skills[i]) //Do we actually have a level in this? shown_skills += i if(!length(shown_skills)) - to_chat(user, "I don't have any skills.") + to_chat(user, span_warning("I don't have any skills.")) return var/msg = "" - msg += "*---------*\n" + msg += span_info("*---------*\n") for(var/i in shown_skills) msg += "[i] - [SSskills.level_names[known_skills[i]]]\n" msg += "" @@ -555,7 +555,7 @@ if (!uplink_loc) if(!silent) - to_chat(traitor_mob, "Unfortunately, [employer] wasn't able to get you an Uplink.") + to_chat(traitor_mob, span_boldwarning("Unfortunately, [employer] wasn't able to get you an Uplink.")) . = 0 else . = uplink_loc @@ -565,11 +565,11 @@ U.setup_unlock_code() if(!silent) if(uplink_loc == R) - to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as my [R.name]. Simply dial the frequency [format_frequency(U.unlock_code)] to unlock its hidden features.") + to_chat(traitor_mob, span_boldnotice("[employer] has cunningly disguised a Syndicate Uplink as my [R.name]. Simply dial the frequency [format_frequency(U.unlock_code)] to unlock its hidden features.")) else if(uplink_loc == PDA) - to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as my [PDA.name]. Simply enter the code \"[U.unlock_code]\" into the ringtone select to unlock its hidden features.") + to_chat(traitor_mob, span_boldnotice("[employer] has cunningly disguised a Syndicate Uplink as my [PDA.name]. Simply enter the code \"[U.unlock_code]\" into the ringtone select to unlock its hidden features.")) else if(uplink_loc == P) - to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as my [P.name]. Simply twist the top of the pen [english_list(U.unlock_code)] from its starting position to unlock its hidden features.") + to_chat(traitor_mob, span_boldnotice("[employer] has cunningly disguised a Syndicate Uplink as my [P.name]. Simply twist the top of the pen [english_list(U.unlock_code)] from its starting position to unlock its hidden features.")) if(uplink_owner) uplink_owner.antag_memory += U.unlock_note + "
" @@ -602,7 +602,7 @@ if(creator.mind.special_role) message_admins("[ADMIN_LOOKUPFLW(current)] has been created by [ADMIN_LOOKUPFLW(creator)], an antagonist.") - to_chat(current, "Despite my creators current allegiances, my true master remains [creator.real_name]. If their loyalties change, so do yours. This will never change unless my creator's body is destroyed.") + to_chat(current, span_danger("Despite my creators current allegiances, my true master remains [creator.real_name]. If their loyalties change, so do yours. This will never change unless my creator's body is destroyed.")) /datum/mind/proc/show_memory(mob/recipient, window=1) if(!recipient) @@ -644,7 +644,7 @@ if(href_list["remove_antag"]) var/datum/antagonist/A = locate(href_list["remove_antag"]) in antag_datums if(!istype(A)) - to_chat(usr,"Invalid antagonist ref to be removed.") + to_chat(usr,span_warning("Invalid antagonist ref to be removed.")) return A.admin_remove(usr) @@ -796,7 +796,7 @@ log_admin("[key_name(usr)] changed [current]'s telecrystal count to [crystals].") if("uplink") if(!equip_traitor()) - to_chat(usr, "Equipping a syndicate failed!") + to_chat(usr, span_danger("Equipping a syndicate failed!")) log_admin("[key_name(usr)] tried and failed to give [current] an uplink.") else log_admin("[key_name(usr)] gave [current] an uplink.") @@ -818,7 +818,7 @@ /datum/mind/proc/announce_objectives() var/obj_count = 1 - to_chat(current, "My current objectives:") + to_chat(current, span_notice("My current objectives:")) for(var/objective in get_all_objectives()) var/datum/objective/O = objective O.update_explanation_text() diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index 47ee8950a..f77df3d40 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -85,7 +85,7 @@ mood_change = 2 /datum/mood_event/table_headsmash - description = "My fucking head, that hurt..." + description = span_warning("My fucking head, that hurt...") mood_change = -3 timeout = 3 MINUTES diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm index 418e156f5..787841cb8 100644 --- a/code/datums/mutations/_mutations.dm +++ b/code/datums/mutations/_mutations.dm @@ -67,7 +67,7 @@ var/datum/mutation/human/mewtayshun = M if(!(mewtayshun.type in conflicts) && !(type in mewtayshun.conflicts)) continue - to_chat(H, "I feel your genes resisting something.") + to_chat(H, span_warning("I feel your genes resisting something.")) return TRUE owner = H dna = H.dna diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm index fed36a1f9..68c2651b9 100644 --- a/code/datums/mutations/actions.dm +++ b/code/datums/mutations/actions.dm @@ -2,8 +2,8 @@ name = "Telepathy" desc = "" quality = POSITIVE - text_gain_indication = "I can hear my own voice echoing in my mind!" - text_lose_indication = "I don't hear my mind echo anymore." + text_gain_indication = span_notice("I can hear my own voice echoing in my mind!") + text_lose_indication = span_notice("I don't hear my mind echo anymore.") difficulty = 12 power = /obj/effect/proc_holder/spell/targeted/telepathy instability = 10 @@ -15,8 +15,8 @@ desc = "" quality = POSITIVE difficulty = 12 - text_gain_indication = "Smells begin to make more sense..." - text_lose_indication = "My sense of smell goes back to normal." + text_gain_indication = span_notice("Smells begin to make more sense...") + text_lose_indication = span_notice("My sense of smell goes back to normal.") power = /obj/effect/proc_holder/spell/targeted/olfaction instability = 30 synchronizer_coeff = 1 @@ -46,7 +46,7 @@ if(cached_gases[/datum/gas/miasma]) user.adjust_disgust(sensitivity * 45) - to_chat(user, "With my overly sensitive nose, you get a whiff of stench and feel sick! Try moving to a cleaner area!") + to_chat(user, span_warning("With my overly sensitive nose, you get a whiff of stench and feel sick! Try moving to a cleaner area!")) return var/atom/sniffed = user.get_active_held_item() @@ -58,42 +58,42 @@ if(prints[md5(C.dna.uni_identity)]) possible |= C if(!length(possible)) - to_chat(user,"Despite my best efforts, there are no scents to be found on [sniffed]...") + to_chat(user,span_warning("Despite my best efforts, there are no scents to be found on [sniffed]...")) return tracking_target = input(user, "Choose a scent to remember.", "Scent Tracking") as null|anything in sortNames(possible) if(!tracking_target) if(!old_target) - to_chat(user,"I decide against remembering any scents. Instead, you notice my own nose in my peripheral vision. This goes on to remind you of that one time you started breathing manually and couldn't stop. What an awful day that was.") + to_chat(user,span_warning("I decide against remembering any scents. Instead, you notice my own nose in my peripheral vision. This goes on to remind you of that one time you started breathing manually and couldn't stop. What an awful day that was.")) return tracking_target = old_target on_the_trail(user) return - to_chat(user,"I pick up the scent of [tracking_target]. The hunt begins.") + to_chat(user,span_notice("I pick up the scent of [tracking_target]. The hunt begins.")) on_the_trail(user) return if(!tracking_target) - to_chat(user,"You're not holding anything to smell, and you haven't smelled anything you can track. You smell my skin instead; it's kinda salty.") + to_chat(user,span_warning("You're not holding anything to smell, and you haven't smelled anything you can track. You smell my skin instead; it's kinda salty.")) return on_the_trail(user) /obj/effect/proc_holder/spell/targeted/olfaction/proc/on_the_trail(mob/living/user) if(!tracking_target) - to_chat(user,"You're not tracking a scent, but the game thought you were. Something's gone wrong! Report this as a bug.") + to_chat(user,span_warning("You're not tracking a scent, but the game thought you were. Something's gone wrong! Report this as a bug.")) return if(tracking_target == user) - to_chat(user,"I smell out the trail to myself. Yep, it's you.") + to_chat(user,span_warning("I smell out the trail to myself. Yep, it's you.")) return if(usr.z < tracking_target.z) - to_chat(user,"The trail leads... way up above you? Huh. They must be really, really far away.") + to_chat(user,span_warning("The trail leads... way up above you? Huh. They must be really, really far away.")) return else if(usr.z > tracking_target.z) - to_chat(user,"The trail leads... way down below you? Huh. They must be really, really far away.") + to_chat(user,span_warning("The trail leads... way down below you? Huh. They must be really, really far away.")) return var/direction_text = "[dir2text(get_dir(usr, tracking_target))]" if(direction_text) - to_chat(user,"I consider [tracking_target]'s scent. The trail leads [direction_text].") + to_chat(user,span_notice("I consider [tracking_target]'s scent. The trail leads [direction_text].")) /datum/mutation/human/firebreath name = "Fire Breath" @@ -101,8 +101,8 @@ quality = POSITIVE difficulty = 12 locked = TRUE - text_gain_indication = "My throat is burning!" - text_lose_indication = "My throat is cooling down." + text_gain_indication = span_notice("My throat is burning!") + text_lose_indication = span_notice("My throat is cooling down.") power = /obj/effect/proc_holder/spell/aimed/firebreath instability = 30 energy_coeff = 1 @@ -135,7 +135,7 @@ if(C.is_mouth_covered()) C.adjust_fire_stacks(2) C.IgniteMob() - to_chat(C,"Something in front of my mouth caught fire!") + to_chat(C,span_warning("Something in front of my mouth caught fire!")) return FALSE /obj/effect/proc_holder/spell/aimed/firebreath/ready_projectile(obj/projectile/P, atom/target, mob/user, iteration) @@ -160,7 +160,7 @@ name = "Void Magnet" desc = "" quality = MINOR_NEGATIVE //upsides and downsides - text_gain_indication = "I feel a heavy, dull force just beyond the walls watching you." + text_gain_indication = span_notice("I feel a heavy, dull force just beyond the walls watching you.") instability = 30 power = /obj/effect/proc_holder/spell/self/void energy_coeff = 1 @@ -195,7 +195,7 @@ name = "Autotomy" desc = "" quality = POSITIVE - text_gain_indication = "My joints feel loose." + text_gain_indication = span_notice("My joints feel loose.") instability = 30 power = /obj/effect/proc_holder/spell/self/self_amputation @@ -225,7 +225,7 @@ if(BP.dismemberable) parts += BP if(!parts.len) - to_chat(usr, "I can't shed any more limbs!") + to_chat(usr, span_notice("I can't shed any more limbs!")) return var/obj/item/bodypart/BP = pick(parts) diff --git a/code/datums/mutations/antenna.dm b/code/datums/mutations/antenna.dm index bc880e266..0b6d93658 100644 --- a/code/datums/mutations/antenna.dm +++ b/code/datums/mutations/antenna.dm @@ -2,8 +2,8 @@ name = "Antenna" desc = "" quality = POSITIVE - text_gain_indication = "I feel an antenna sprout from my forehead." - text_lose_indication = "My antenna shrinks back down." + text_gain_indication = span_notice("I feel an antenna sprout from my forehead.") + text_lose_indication = span_notice("My antenna shrinks back down.") instability = 5 difficulty = 8 var/obj/item/implant/radio/antenna/linked_radio @@ -42,8 +42,8 @@ name = "Mind Reader" desc = "" quality = POSITIVE - text_gain_indication = "I hear distant voices at the corners of my mind." - text_lose_indication = "The distant voices fade." + text_gain_indication = span_notice("I hear distant voices at the corners of my mind.") + text_lose_indication = span_notice("The distant voices fade.") power = /obj/effect/proc_holder/spell/targeted/mindread instability = 40 difficulty = 8 @@ -60,15 +60,15 @@ /obj/effect/proc_holder/spell/targeted/mindread/cast(list/targets, mob/living/carbon/human/user = usr) for(var/mob/living/M in targets) if(usr.anti_magic_check(FALSE, FALSE, TRUE, 0) || M.anti_magic_check(FALSE, FALSE, TRUE, 0)) - to_chat(usr, "As you reach out with my mind, you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled.") + to_chat(usr, span_warning("As you reach out with my mind, you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled.")) return if(M.stat == DEAD) - to_chat(user, "[M] is dead!") + to_chat(user, span_boldnotice("[M] is dead!")) return if(M.mind) - to_chat(user, "I plunge into [M]'s mind...") + to_chat(user, span_boldnotice("I plunge into [M]'s mind...")) if(prob(20)) - to_chat(M, "I feel something foreign enter my mind.")//chance to alert the read-ee + to_chat(M, span_danger("I feel something foreign enter my mind."))//chance to alert the read-ee var/list/recent_speech = list() var/list/say_log = list() var/log_source = M.logging @@ -86,17 +86,17 @@ if(prob(50)) recent_speech[spoken_memory] = say_log[spoken_memory] if(recent_speech.len) - to_chat(user, "I catch some drifting memories of their past conversations...") + to_chat(user, span_boldnotice("I catch some drifting memories of their past conversations...")) for(var/spoken_memory in recent_speech) - to_chat(user, "[recent_speech[spoken_memory]]") + to_chat(user, span_notice("[recent_speech[spoken_memory]]")) if(iscarbon(M)) var/mob/living/carbon/human/H = M - to_chat(user, "I find that their intent is to [H.used_intent]...") + to_chat(user, span_boldnotice("I find that their intent is to [H.used_intent]...")) var/datum/dna/the_dna = H.has_dna() if(the_dna) - to_chat(user, "I uncover that [H.p_their()] true identity is [the_dna.real_name].") + to_chat(user, span_boldnotice("I uncover that [H.p_their()] true identity is [the_dna.real_name].")) else - to_chat(user, "I can't find a mind to read inside of [M]!") + to_chat(user, span_warning("I can't find a mind to read inside of [M]!")) /datum/mutation/human/mindreader/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut) ..() diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index 9abc3881a..286b86527 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -5,13 +5,13 @@ name = "Epilepsy" desc = "" quality = NEGATIVE - text_gain_indication = "I get a headache." + text_gain_indication = span_danger("I get a headache.") synchronizer_coeff = 1 power_coeff = 1 /datum/mutation/human/epilepsy/on_life() if(prob(1 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS) - owner.visible_message("[owner] starts having a seizure!", "I have a seizure!") + owner.visible_message(span_danger("[owner] starts having a seizure!"), span_danger("I have a seizure!")) owner.Unconscious(200 * GET_MUTATION_POWER(src)) owner.Jitter(1000 * GET_MUTATION_POWER(src)) SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "epilepsy", /datum/mood_event/epilepsy) @@ -27,7 +27,7 @@ name = "Unstable DNA" desc = "" quality = NEGATIVE - text_gain_indication = "I feel strange." + text_gain_indication = span_danger("I feel strange.") locked = TRUE /datum/mutation/human/bad_dna/on_acquiring(mob/living/carbon/human/owner) @@ -53,7 +53,7 @@ name = "Cough" desc = "" quality = MINOR_NEGATIVE - text_gain_indication = "I start coughing." + text_gain_indication = span_danger("I start coughing.") synchronizer_coeff = 1 power_coeff = 1 @@ -70,7 +70,7 @@ name = "Paranoia" desc = "" quality = NEGATIVE - text_gain_indication = "I feel screams echo through my mind..." + text_gain_indication = span_danger("I feel screams echo through my mind...") text_lose_indication = "The screaming in my mind fades." /datum/mutation/human/paranoia/on_life() @@ -94,14 +94,14 @@ return owner.transform = owner.transform.Scale(1, 0.8) passtable_on(owner, GENETIC_MUTATION) - owner.visible_message("[owner] suddenly shrinks!", "Everything around you seems to grow..") + owner.visible_message(span_danger("[owner] suddenly shrinks!"), span_notice("Everything around you seems to grow..")) /datum/mutation/human/dwarfism/on_losing(mob/living/carbon/human/owner) if(..()) return owner.transform = owner.transform.Scale(1, 1.25) passtable_off(owner, GENETIC_MUTATION) - owner.visible_message("[owner] suddenly grows!", "Everything around you seems to shrink..") + owner.visible_message(span_danger("[owner] suddenly grows!"), span_notice("Everything around you seems to shrink..")) //Clumsiness has a very large amount of small drawbacks depending on item. @@ -109,7 +109,7 @@ name = "Clumsiness" desc = "" quality = MINOR_NEGATIVE - text_gain_indication = "I feel lightheaded." + text_gain_indication = span_danger("I feel lightheaded.") /datum/mutation/human/clumsy/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -127,7 +127,7 @@ name = "Tourette's Syndrome" desc = "" //definitely needs rewriting quality = NEGATIVE - text_gain_indication = "I twitch." + text_gain_indication = span_danger("I twitch.") synchronizer_coeff = 1 /datum/mutation/human/tourettes/on_life() @@ -151,7 +151,7 @@ name = "Deafness" desc = "" quality = NEGATIVE - text_gain_indication = "I can't seem to hear anything." + text_gain_indication = span_danger("I can't seem to hear anything.") /datum/mutation/human/deaf/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -185,7 +185,7 @@ name = "Glowy" desc = "" quality = POSITIVE - text_gain_indication = "My skin begins to glow softly." + text_gain_indication = span_notice("My skin begins to glow softly.") instability = 5 var/obj/effect/dummy/luminescent_glow/glowth //shamelessly copied from luminescents var/glow = 2.5 @@ -216,7 +216,7 @@ /datum/mutation/human/glow/anti name = "Anti-Glow" desc = "" - text_gain_indication = "My light around you seems to disappear." + text_gain_indication = span_notice("My light around you seems to disappear.") glow = -3.5 //Slightly stronger, since negating light tends to be harder than making it. conflicts = list(/datum/mutation/human/glow) locked = TRUE @@ -225,15 +225,15 @@ name = "Strength" desc = "" quality = POSITIVE - text_gain_indication = "I feel strong." + text_gain_indication = span_notice("I feel strong.") difficulty = 16 /datum/mutation/human/insulated name = "Insulated" desc = "" quality = POSITIVE - text_gain_indication = "My fingertips go numb." - text_lose_indication = "My fingertips regain feeling." + text_gain_indication = span_notice("My fingertips go numb.") + text_lose_indication = span_notice("My fingertips regain feeling.") difficulty = 16 instability = 25 @@ -251,7 +251,7 @@ name = "Fiery Sweat" desc = "" quality = NEGATIVE - text_gain_indication = "I feel hot." + text_gain_indication = span_warning("I feel hot.") text_lose_indication = "I feel a lot cooler." difficulty = 14 synchronizer_coeff = 1 @@ -276,7 +276,7 @@ name = "Spatial Instability" desc = "" quality = NEGATIVE - text_gain_indication = "The space around you twists sickeningly." + text_gain_indication = span_warning("The space around you twists sickeningly.") text_lose_indication = "The space around you settles back to normal." difficulty = 18//high so it's hard to unlock and abuse instability = 10 @@ -288,17 +288,17 @@ /datum/mutation/human/badblink/on_life() if(prob(warpchance)) var/warpmessage = pick( - "With a sickening 720-degree twist of [owner.p_their()] back, [owner] vanishes into thin air.", - "[owner] does some sort of strange backflip into another dimension. It looks pretty painful.", - "[owner] does a jump to the left, a step to the right, and warps out of reality.", - "[owner]'s torso starts folding inside out until it vanishes from reality, taking [owner] with it.", - "One moment, you see [owner]. The next, [owner] is gone.") - owner.visible_message(warpmessage, "I feel a wave of nausea as you fall through reality!") + span_warning("With a sickening 720-degree twist of [owner.p_their()] back, [owner] vanishes into thin air."), + span_warning("[owner] does some sort of strange backflip into another dimension. It looks pretty painful."), + span_warning("[owner] does a jump to the left, a step to the right, and warps out of reality."), + span_warning("[owner]'s torso starts folding inside out until it vanishes from reality, taking [owner] with it."), + span_warning("One moment, you see [owner]. The next, [owner] is gone.")) + owner.visible_message(warpmessage, span_danger("I feel a wave of nausea as you fall through reality!")) var/warpdistance = rand(10,15) * GET_MUTATION_POWER(src) do_teleport(owner, get_turf(owner), warpdistance, channel = TELEPORT_CHANNEL_FREE) owner.adjust_disgust(GET_MUTATION_SYNCHRONIZER(src) * (warpchance * warpdistance)) warpchance = 0 - owner.visible_message("[owner] appears out of nowhere!") + owner.visible_message(span_danger("[owner] appears out of nowhere!")) else warpchance += 0.25 * GET_MUTATION_ENERGY(src) @@ -306,7 +306,7 @@ name = "Acidic Flesh" desc = "" quality = NEGATIVE - text_gain_indication = "A horrible burning sensation envelops you as my flesh turns to acid!" + text_gain_indication = span_danger("A horrible burning sensation envelops you as my flesh turns to acid!") text_lose_indication = "A feeling of relief fills you as my flesh goes back to normal." difficulty = 18//high so it's hard to unlock and use on others var/msgcooldown = 0 @@ -314,11 +314,11 @@ /datum/mutation/human/acidflesh/on_life() if(prob(25)) if(world.time > msgcooldown) - to_chat(owner, "My acid flesh bubbles...") + to_chat(owner, span_danger("My acid flesh bubbles...")) msgcooldown = world.time + 200 if(prob(15)) owner.acid_act(rand(30,50), 10) - owner.visible_message("[owner]'s skin bubbles and pops.", "My bubbling flesh pops! It burns!") + owner.visible_message(span_warning("[owner]'s skin bubbles and pops."), span_danger("My bubbling flesh pops! It burns!")) playsound(owner,'sound/blank.ogg', 50, TRUE) /datum/mutation/human/gigantism @@ -333,20 +333,20 @@ return owner.resize = 1.25 owner.update_transform() - owner.visible_message("[owner] suddenly grows!", "Everything around you seems to shrink..") + owner.visible_message(span_danger("[owner] suddenly grows!"), span_notice("Everything around you seems to shrink..")) /datum/mutation/human/gigantism/on_losing(mob/living/carbon/human/owner) if(..()) return owner.resize = 0.8 owner.update_transform() - owner.visible_message("[owner] suddenly shrinks!", "Everything around you seems to grow..") + owner.visible_message(span_danger("[owner] suddenly shrinks!"), span_notice("Everything around you seems to grow..")) /datum/mutation/human/spastic name = "Spastic" desc = "" quality = NEGATIVE - text_gain_indication = "I flinch." + text_gain_indication = span_warning("I flinch.") text_lose_indication = "My flinching subsides." difficulty = 16 @@ -364,7 +364,7 @@ name = "Two Left Feet" desc = "" quality = NEGATIVE - text_gain_indication = "My right foot feels... left." + text_gain_indication = span_warning("My right foot feels... left.") text_lose_indication = "My right foot feels alright." difficulty = 16 var/stun_cooldown = 0 @@ -374,5 +374,5 @@ if(owner.AmountKnockdown() || owner.AmountStun()) owner.SetKnockdown(owner.AmountKnockdown()*2) owner.SetStun(owner.AmountStun()*2) - owner.visible_message("[owner] tries to stand up, but trips!", "I trip over my own feet!") + owner.visible_message(span_danger("[owner] tries to stand up, but trips!"), span_danger("I trip over my own feet!")) stun_cooldown = world.time + 300 diff --git a/code/datums/mutations/chameleon.dm b/code/datums/mutations/chameleon.dm index 3e13bbf18..2fe81534d 100644 --- a/code/datums/mutations/chameleon.dm +++ b/code/datums/mutations/chameleon.dm @@ -4,8 +4,8 @@ desc = "" quality = POSITIVE difficulty = 16 - text_gain_indication = "I feel one with your surroundings." - text_lose_indication = "I feel oddly exposed." + text_gain_indication = span_notice("I feel one with your surroundings.") + text_lose_indication = span_notice("I feel oddly exposed.") time_coeff = 5 instability = 25 diff --git a/code/datums/mutations/cold.dm b/code/datums/mutations/cold.dm index 961a95633..aa50b4fac 100644 --- a/code/datums/mutations/cold.dm +++ b/code/datums/mutations/cold.dm @@ -2,7 +2,7 @@ name = "Geladikinesis" desc = "" quality = POSITIVE - text_gain_indication = "My hand feels cold." + text_gain_indication = span_notice("My hand feels cold.") instability = 10 difficulty = 10 synchronizer_coeff = 1 @@ -21,7 +21,7 @@ name = "Cryokinesis" desc = "" quality = POSITIVE //upsides and downsides - text_gain_indication = "My hand feels cold." + text_gain_indication = span_notice("My hand feels cold.") instability = 20 difficulty = 12 synchronizer_coeff = 1 diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 13f6ff553..b52cea8e1 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -5,7 +5,7 @@ quality = POSITIVE locked = TRUE difficulty = 16 - text_gain_indication = "My muscles hurt!" + text_gain_indication = span_notice("My muscles hurt!") species_allowed = list("human") //no skeleton/lizard hulk health_req = 25 instability = 40 @@ -42,7 +42,7 @@ /datum/mutation/human/hulk/on_life() if(owner.health < 0) on_losing(owner) - to_chat(owner, "I suddenly feel very weak.") + to_chat(owner, span_danger("I suddenly feel very weak.")) /datum/mutation/human/hulk/on_losing(mob/living/carbon/human/owner) if(..()) diff --git a/code/datums/mutations/radioactive.dm b/code/datums/mutations/radioactive.dm index 810858396..70003c60c 100644 --- a/code/datums/mutations/radioactive.dm +++ b/code/datums/mutations/radioactive.dm @@ -2,7 +2,7 @@ name = "Radioactivity" desc = "" quality = NEGATIVE - text_gain_indication = "I can feel it in your bones!" + text_gain_indication = span_warning("I can feel it in your bones!") time_coeff = 5 instability = 5 difficulty = 8 diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm index c04e688ff..1dec56b93 100644 --- a/code/datums/mutations/sight.dm +++ b/code/datums/mutations/sight.dm @@ -3,7 +3,7 @@ name = "Near Sightness" desc = "" quality = MINOR_NEGATIVE - text_gain_indication = "I can't see very well." + text_gain_indication = span_danger("I can't see very well.") /datum/mutation/human/nearsight/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -21,7 +21,7 @@ name = "Blindness" desc = "" quality = NEGATIVE - text_gain_indication = "I can't seem to see anything." + text_gain_indication = span_danger("I can't seem to see anything.") /datum/mutation/human/blind/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -39,7 +39,7 @@ desc = "" quality = POSITIVE difficulty = 18 - text_gain_indication = "I can see the heat rising off of your skin..." + text_gain_indication = span_notice("I can see the heat rising off of your skin...") time_coeff = 2 instability = 25 var/visionflag = TRAIT_THERMAL_VISION @@ -61,7 +61,7 @@ /datum/mutation/human/thermal/x_ray name = "X Ray Vision" desc = "" //actual x-ray would mean you'd constantly be blasting rads, wich might be fun for later //hmb - text_gain_indication = "The walls suddenly disappear!" + text_gain_indication = span_notice("The walls suddenly disappear!") instability = 35 locked = TRUE visionflag = TRAIT_XRAY_VISION @@ -73,7 +73,7 @@ quality = POSITIVE locked = TRUE difficulty = 16 - text_gain_indication = "I feel pressure building up behind your eyes." + text_gain_indication = span_notice("I feel pressure building up behind your eyes.") layer_used = FRONT_MUTATIONS_LAYER limb_req = BODY_ZONE_HEAD @@ -101,7 +101,7 @@ /datum/mutation/human/laser_eyes/proc/on_ranged_attack(mob/living/carbon/human/source, atom/target, mouseparams) if(source.used_intent.type != INTENT_HARM) return - to_chat(source, "I shoot with your laser eyes!") + to_chat(source, span_warning("I shoot with your laser eyes!")) source.changeNext_move(CLICK_CD_RANGE) source.newtonian_move(get_dir(target, source)) var/obj/projectile/beam/laser_eyes/LE = new(source.loc) diff --git a/code/datums/mutations/space_adaptation.dm b/code/datums/mutations/space_adaptation.dm index 51ef50ab2..70d3bf08a 100644 --- a/code/datums/mutations/space_adaptation.dm +++ b/code/datums/mutations/space_adaptation.dm @@ -4,7 +4,7 @@ desc = "" quality = POSITIVE difficulty = 16 - text_gain_indication = "My body feels warm!" + text_gain_indication = span_notice("My body feels warm!") time_coeff = 5 instability = 30 diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 87a85343a..30e58e6bb 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -5,7 +5,7 @@ name = "Nervousness" desc = "" quality = MINOR_NEGATIVE - text_gain_indication = "I feel nervous." + text_gain_indication = span_danger("I feel nervous.") /datum/mutation/human/nervousness/on_life() if(prob(10)) @@ -16,8 +16,8 @@ name = "Wacky" desc = "" quality = MINOR_NEGATIVE - text_gain_indication = "I feel an off sensation in my voicebox." - text_lose_indication = "The off sensation passes." + text_gain_indication = span_sans("I feel an off sensation in my voicebox.") + text_lose_indication = span_notice("The off sensation passes.") /datum/mutation/human/wacky/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -36,8 +36,8 @@ name = "Mute" desc = "" quality = NEGATIVE - text_gain_indication = "I feel unable to express myself at all." - text_lose_indication = "I feel able to speak freely again." + text_gain_indication = span_danger("I feel unable to express myself at all.") + text_lose_indication = span_danger("I feel able to speak freely again.") /datum/mutation/human/mute/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -54,8 +54,8 @@ name = "Smile" desc = "" quality = MINOR_NEGATIVE - text_gain_indication = "I feel so happy. Nothing can be wrong with anything. :)" - text_lose_indication = "Everything is terrible again. :(" + text_gain_indication = span_notice("I feel so happy. Nothing can be wrong with anything. :)") + text_lose_indication = span_notice("Everything is terrible again. :(") /datum/mutation/human/smile/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -123,8 +123,8 @@ name = "Unintelligible" desc = "" quality = NEGATIVE - text_gain_indication = "I can't seem to form any coherent thoughts!" - text_lose_indication = "My mind feels more clear." + text_gain_indication = span_danger("I can't seem to form any coherent thoughts!") + text_lose_indication = span_danger("My mind feels more clear.") /datum/mutation/human/unintelligible/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -140,8 +140,8 @@ name = "Swedish" desc = "" quality = MINOR_NEGATIVE - text_gain_indication = "I feel Swedish, however that works." - text_lose_indication = "The feeling of Swedishness passes." + text_gain_indication = span_notice("I feel Swedish, however that works.") + text_lose_indication = span_notice("The feeling of Swedishness passes.") /datum/mutation/human/swedish/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -169,8 +169,8 @@ name = "Chav" desc = "" quality = MINOR_NEGATIVE - text_gain_indication = "Ye feel like a reet prat like, innit?" - text_lose_indication = "I no longer feel like being rude and sassy." + text_gain_indication = span_notice("Ye feel like a reet prat like, innit?") + text_lose_indication = span_notice("I no longer feel like being rude and sassy.") /datum/mutation/human/chav/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -215,8 +215,8 @@ desc = "" quality = MINOR_NEGATIVE locked = TRUE - text_gain_indication = "I feel pretty good, honeydoll." - text_lose_indication = "I feel a little less conversation would be great." + text_gain_indication = span_notice("I feel pretty good, honeydoll.") + text_lose_indication = span_notice("I feel a little less conversation would be great.") /datum/mutation/human/elvis/on_life() switch(pick(1,2)) @@ -261,8 +261,8 @@ desc = "" quality = NEGATIVE locked = TRUE - text_gain_indication = "I feel...totally chill, man!" - text_lose_indication = "I feel like you have a better sense of time." + text_gain_indication = span_notice("I feel...totally chill, man!") + text_lose_indication = span_notice("I feel like you have a better sense of time.") /datum/mutation/human/stoner/on_acquiring(mob/living/carbon/human/owner) ..() diff --git a/code/datums/mutations/telekinesis.dm b/code/datums/mutations/telekinesis.dm index ddda13fcf..5b086177e 100644 --- a/code/datums/mutations/telekinesis.dm +++ b/code/datums/mutations/telekinesis.dm @@ -4,7 +4,7 @@ desc = "" quality = POSITIVE difficulty = 18 - text_gain_indication = "I feel smarter!" + text_gain_indication = span_notice("I feel smarter!") limb_req = BODY_ZONE_HEAD instability = 30 diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm index 7232041f8..185162f9f 100644 --- a/code/datums/mutations/touch.dm +++ b/code/datums/mutations/touch.dm @@ -4,8 +4,8 @@ quality = POSITIVE locked = TRUE difficulty = 16 - text_gain_indication = "I feel power flow through your hands." - text_lose_indication = "The energy in your hands subsides." + text_gain_indication = span_notice("I feel power flow through your hands.") + text_lose_indication = span_notice("The energy in your hands subsides.") power = /obj/effect/proc_holder/spell/targeted/touch/shock instability = 30 @@ -36,16 +36,16 @@ C.dropItemToGround(C.get_active_held_item()) C.dropItemToGround(C.get_inactive_held_item()) C.confused += 15 - C.visible_message("[user] electrocutes [target]!","[user] electrocutes you!") + C.visible_message(span_danger("[user] electrocutes [target]!"),span_danger("[user] electrocutes you!")) return ..() else - user.visible_message("[user] fails to electrocute [target]!") + user.visible_message(span_warning("[user] fails to electrocute [target]!")) return ..() else if(isliving(target)) var/mob/living/L = target L.electrocute_act(15, user, 1, SHOCK_NOSTUN) - L.visible_message("[user] electrocutes [target]!","[user] electrocutes you!") + L.visible_message(span_danger("[user] electrocutes [target]!"),span_danger("[user] electrocutes you!")) return ..() else - to_chat(user,"The electricity doesn't seem to affect [target]...") + to_chat(user,span_warning("The electricity doesn't seem to affect [target]...")) return ..() diff --git a/code/datums/saymode.dm b/code/datums/saymode.dm index 57ef7701e..acd198523 100644 --- a/code/datums/saymode.dm +++ b/code/datums/saymode.dm @@ -17,7 +17,7 @@ /datum/saymode/changeling/handle_message(mob/living/user, message, datum/language/language) switch(user.lingcheck()) if(LINGHIVE_LINK) - var/msg = "[user.mind]: [message]" + var/msg = span_changeling("[user.mind]: [message]") for(var/_M in GLOB.player_list) var/mob/M = _M if(M in GLOB.dead_mob_list) @@ -33,13 +33,13 @@ to_chat(M, msg) if(LINGHIVE_OUTSIDER) if(prob(40)) - to_chat(M, "We can faintly sense an outsider trying to communicate through the hivemind...") + to_chat(M, span_changeling("We can faintly sense an outsider trying to communicate through the hivemind...")) if(LINGHIVE_LING) if (HAS_TRAIT(user, CHANGELING_HIVEMIND_MUTE)) - to_chat(user, "The poison in the air hinders our ability to interact with the hivemind.") + to_chat(user, span_warning("The poison in the air hinders our ability to interact with the hivemind.")) return FALSE var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) - var/msg = "[changeling.changelingID]: [message]" + var/msg = span_changeling("[changeling.changelingID]: [message]") user.log_talk(message, LOG_SAY, tag="changeling [changeling.changelingID]") for(var/_M in GLOB.player_list) var/mob/M = _M @@ -56,9 +56,9 @@ to_chat(M, msg) if(LINGHIVE_OUTSIDER) if(prob(40)) - to_chat(M, "We can faintly sense another of our kind trying to communicate through the hivemind...") + to_chat(M, span_changeling("We can faintly sense another of our kind trying to communicate through the hivemind...")) if(LINGHIVE_OUTSIDER) - to_chat(user, "Our senses have not evolved enough to be able to communicate this way...") + to_chat(user, span_changeling("Our senses have not evolved enough to be able to communicate this way...")) return FALSE @@ -131,8 +131,12 @@ if(is_monkey_leader(mind) || (ismonkey(user) && is_monkey(mind))) user.log_talk(message, LOG_SAY, tag="monkey") if(prob(75) && ismonkey(user)) - user.visible_message("\The [user] chimpers.") - var/msg = "\[[is_monkey_leader(mind) ? "Monkey Leader" : "Monkey"]\] [user]: [message]" + user.visible_message(span_notice("\The [user] chimpers.")) + var/msg = "\[[is_monkey_leader(mind) ? "Monkey Leader" : "Monkey"]\] [user]: [message]" + if(is_monkey_leader(mind)) + msg = span_monkeylead(msg) + else + msg = span_monkeyhive(msg) for(var/_M in GLOB.mob_list) var/mob/M = _M if(M in GLOB.dead_mob_list) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 009b4b626..b405ab73c 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -11,7 +11,7 @@ icon_state = "shadow_mend" /datum/status_effect/shadow_mend/on_apply() - owner.visible_message("Violet light wraps around [owner]'s body!", "Violet light wraps around my body!") + owner.visible_message(span_notice("Violet light wraps around [owner]'s body!"), span_notice("Violet light wraps around my body!")) playsound(owner, 'sound/blank.ogg', 50, TRUE) return ..() @@ -20,7 +20,7 @@ owner.adjustFireLoss(-15) /datum/status_effect/shadow_mend/on_remove() - owner.visible_message("The violet light around [owner] glows black!", "The tendrils around you cinch tightly and reap their toll...") + owner.visible_message(span_warning("The violet light around [owner] glows black!"), span_warning("The tendrils around you cinch tightly and reap their toll...")) playsound(owner, 'sound/blank.ogg', 50, TRUE) owner.apply_status_effect(STATUS_EFFECT_VOID_PRICE) @@ -122,12 +122,12 @@ alert_type = /atom/movable/screen/alert/status_effect/wish_granters_gift /datum/status_effect/wish_granters_gift/on_apply() - to_chat(owner, "Death is not my end! The Wish Granter's energy suffuses you, and you begin to rise...") + to_chat(owner, span_notice("Death is not my end! The Wish Granter's energy suffuses you, and you begin to rise...")) return ..() /datum/status_effect/wish_granters_gift/on_remove() owner.revive(full_heal = TRUE, admin_revive = TRUE) - owner.visible_message("[owner] appears to wake from the dead, having healed all wounds!", "I have regenerated.") + owner.visible_message(span_warning("[owner] appears to wake from the dead, having healed all wounds!"), span_notice("I have regenerated.")) owner.update_mobility() /atom/movable/screen/alert/status_effect/wish_granters_gift @@ -150,7 +150,7 @@ if(isliving(B.current)) var/mob/living/M = B.current SEND_SOUND(M, sound('sound/blank.ogg')) - to_chat(M, "The Cult's Master, [owner], has fallen in \the [A]!") + to_chat(M, span_cultlarge("The Cult's Master, [owner], has fallen in \the [A]!")) /datum/status_effect/cult_master/tick() if(owner.stat != DEAD && !alive) @@ -298,7 +298,7 @@ /datum/status_effect/sword_spin/on_apply() - owner.visible_message("[owner] begins swinging the sword with inhuman strength!") + owner.visible_message(span_danger("[owner] begins swinging the sword with inhuman strength!")) var/oldcolor = owner.color owner.color = "#ff0000" owner.add_stun_absorption("bloody bastard sword", duration, 2, "doesn't even flinch as the sword's power courses through them!", "You shrug off the stun!", " glowing with a blazing red aura!") @@ -317,7 +317,7 @@ slashy.attack(M, owner) /datum/status_effect/sword_spin/on_remove() - owner.visible_message("[owner]'s inhuman strength dissipates and the sword's runes grow cold!") + owner.visible_message(span_warning("[owner]'s inhuman strength dissipates and the sword's runes grow cold!")) //Used by changelings to rapidly heal @@ -363,7 +363,7 @@ status_type = STATUS_EFFECT_UNIQUE duration = -1 tick_interval = 25 - examine_text = "They seem to have an aura of healing and helpfulness about them." + examine_text = span_notice("They seem to have an aura of healing and helpfulness about them.") alert_type = null var/hand var/deathTick = 0 @@ -385,7 +385,7 @@ if(deathTick < 4) deathTick += 1 else - owner.visible_message("[owner]'s soul is absorbed into the rod, relieving the previous snake of its duty.") + owner.visible_message(span_notice("[owner]'s soul is absorbed into the rod, relieving the previous snake of its duty.")) var/mob/living/simple_animal/hostile/retaliate/poison/snake/healSnake = new(owner.loc) var/list/chems = list(/datum/reagent/medicine/sal_acid, /datum/reagent/medicine/C2/convermol, /datum/reagent/medicine/oxandrolone) healSnake.poison_type = pick(chems) @@ -412,11 +412,11 @@ var/obj/item/bodypart/L = itemUser.newBodyPart(BODY_ZONE_L_ARM, FALSE, FALSE) L.attach_limb(itemUser) itemUser.put_in_hand(newRod, hand, forced = TRUE) - to_chat(itemUser, "My arm suddenly grows back with the Rod of Asclepius still attached!") + to_chat(itemUser, span_notice("My arm suddenly grows back with the Rod of Asclepius still attached!")) else //Otherwise get rid of whatever else is in their hand and return the rod to said hand itemUser.put_in_hand(newRod, hand, forced = TRUE) - to_chat(itemUser, "The Rod of Asclepius suddenly grows back out of my arm!") + to_chat(itemUser, span_notice("The Rod of Asclepius suddenly grows back out of my arm!")) //Because a servant of medicines stops at nothing to help others, lets keep them on their toes and give them an additional boost. if(itemUser.health < itemUser.maxHealth) new /obj/effect/temp_visual/heal(get_turf(itemUser), "#375637") @@ -485,10 +485,10 @@ /datum/status_effect/antimagic id = "antimagic" duration = 10 SECONDS - examine_text = "They seem to be covered in a dull, grey aura." + examine_text = span_notice("They seem to be covered in a dull, grey aura.") /datum/status_effect/antimagic/on_apply() - owner.visible_message("[owner] is coated with a dull aura!") + owner.visible_message(span_notice("[owner] is coated with a dull aura!")) ADD_TRAIT(owner, TRAIT_ANTIMAGIC, MAGIC_TRAIT) //glowing wings overlay playsound(owner, 'sound/blank.ogg', 75, FALSE) @@ -496,4 +496,4 @@ /datum/status_effect/antimagic/on_remove() REMOVE_TRAIT(owner, TRAIT_ANTIMAGIC, MAGIC_TRAIT) - owner.visible_message("[owner]'s dull aura fades away...") + owner.visible_message(span_warning("[owner]'s dull aura fades away...")) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 601b755b8..933128b20 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -196,11 +196,11 @@ /atom/movable/screen/alert/status_effect/strandling/Click(location, control, params) . = ..() - to_chat(mob_viewer, "I attempt to remove the durathread strand from around my neck.") + to_chat(mob_viewer, span_notice("I attempt to remove the durathread strand from around my neck.")) if(do_after(mob_viewer, 35, null, mob_viewer)) if(isliving(mob_viewer)) var/mob/living/L = mob_viewer - to_chat(mob_viewer, "I succesfuly remove the durathread strand.") + to_chat(mob_viewer, span_notice("I succesfuly remove the durathread strand.")) L.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) @@ -443,7 +443,7 @@ ADD_TRAIT(owner, TRAIT_PACIFISM, "gonbolaPacify") ADD_TRAIT(owner, TRAIT_MUTE, "gonbolaMute") ADD_TRAIT(owner, TRAIT_JOLLY, "gonbolaJolly") - to_chat(owner, "I suddenly feel at peace and feel no need to make any sudden or rash actions...") + to_chat(owner, span_notice("I suddenly feel at peace and feel no need to make any sudden or rash actions...")) return ..() /datum/status_effect/gonbolaPacify/on_remove() @@ -456,7 +456,7 @@ status_type = STATUS_EFFECT_UNIQUE duration = 300 tick_interval = 10 - examine_text = "SUBJECTPRONOUN seems slow and unfocused." + examine_text = span_warning("SUBJECTPRONOUN seems slow and unfocused.") var/stun = TRUE alert_type = /atom/movable/screen/alert/status_effect/trance @@ -476,8 +476,8 @@ RegisterSignal(owner, COMSIG_MOVABLE_HEAR, PROC_REF(hypnotize)) ADD_TRAIT(owner, TRAIT_MUTE, "trance") owner.add_client_colour(/datum/client_colour/monochrome/trance) - owner.visible_message("[stun ? "[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point." : ""]", \ - "[pick("You feel my thoughts slow down...", "You suddenly feel extremely dizzy...", "You feel like you're in the middle of a dream...","You feel incredibly relaxed...")]") + owner.visible_message("[stun ? span_warning("[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point.") : ""]", \ + span_warning("[pick("You feel my thoughts slow down...", "You suddenly feel extremely dizzy...", "You feel like you're in the middle of a dream...","You feel incredibly relaxed...")]")) return TRUE /datum/status_effect/trance/on_creation(mob/living/new_owner, _duration, _stun = TRUE) @@ -490,7 +490,7 @@ REMOVE_TRAIT(owner, TRAIT_MUTE, "trance") owner.dizziness = 0 owner.remove_client_colour(/datum/client_colour/monochrome/trance) - to_chat(owner, "I snap out of my trance!") + to_chat(owner, span_warning("I snap out of my trance!")) /datum/status_effect/trance/proc/hypnotize(datum/source, list/hearing_args) if(!owner.can_hear()) @@ -513,14 +513,14 @@ switch(rand(1,5)) if(1) if((owner.mobility_flags & MOBILITY_MOVE) && isturf(owner.loc)) - to_chat(owner, "My leg spasms!") + to_chat(owner, span_warning("My leg spasms!")) step(owner, pick(GLOB.cardinals)) if(2) if(owner.incapacitated()) return var/obj/item/I = owner.get_active_held_item() if(I) - to_chat(owner, "My fingers spasm!") + to_chat(owner, span_warning("My fingers spasm!")) owner.log_message("used [I] due to a Muscle Spasm", LOG_ATTACK) I.attack_self(owner) if(3) @@ -536,14 +536,14 @@ if(isliving(M)) targets += M if(LAZYLEN(targets)) - to_chat(owner, "My arm spasms!") + to_chat(owner, span_warning("My arm spasms!")) owner.log_message(" attacked someone due to a Muscle Spasm", LOG_ATTACK) //the following attack will log itself owner.ClickOn(pick(targets)) owner.a_intent = prev_intent if(4) var/prev_intent = owner.a_intent owner.a_intent = INTENT_HARM - to_chat(owner, "My arm spasms!") + to_chat(owner, span_warning("My arm spasms!")) owner.log_message("attacked [owner.p_them()]self to a Muscle Spasm", LOG_ATTACK) owner.ClickOn(owner) owner.a_intent = prev_intent @@ -555,7 +555,7 @@ for(var/turf/T in oview(owner, 3)) targets += T if(LAZYLEN(targets) && I) - to_chat(owner, "My arm spasms!") + to_chat(owner, span_warning("My arm spasms!")) owner.log_message("threw [I] due to a Muscle Spasm", LOG_ATTACK) owner.throw_item(pick(targets)) @@ -568,7 +568,7 @@ /datum/status_effect/dna_melt/on_creation(mob/living/new_owner, set_duration, updating_canmove) . = ..() - to_chat(new_owner, "My body can't handle the mutations! I need to get my mutations removed fast!") + to_chat(new_owner, span_boldwarning("My body can't handle the mutations! I need to get my mutations removed fast!")) /datum/status_effect/dna_melt/on_remove() if(!ishuman(owner)) @@ -619,25 +619,25 @@ switch(msg_stage) if(0 to 300) if(prob(1)) - fake_msg = pick("[pick("Your head hurts.", "Your head pounds.")]", - "[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]", - "[pick("You feel dizzy.", "Your head spins.")]", + fake_msg = pick(span_warning("[pick("Your head hurts.", "Your head pounds.")]"), + span_warning("[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]"), + span_warning("[pick("You feel dizzy.", "Your head spins.")]"), "[pick("You swallow excess mucus.", "You lightly cough.")]", - "[pick("Your head hurts.", "Your mind blanks for a moment.")]", - "[pick("Your throat hurts.", "You clear my throat.")]") + span_warning("[pick("Your head hurts.", "Your mind blanks for a moment.")]"), + span_warning("[pick("Your throat hurts.", "You clear my throat.")]")) if(301 to 600) if(prob(2)) - fake_msg = pick("[pick("Your head hurts a lot.", "Your head pounds incessantly.")]", - "[pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")]", - "I feel very [pick("dizzy","woozy","faint")].", - "[pick("You hear a ringing in my ear.", "Your ears pop.")]", - "I nod off for a moment.") + fake_msg = pick(span_warning("[pick("Your head hurts a lot.", "Your head pounds incessantly.")]"), + span_warning("[pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")]"), + span_warning("I feel very [pick("dizzy","woozy","faint")]."), + span_warning("[pick("You hear a ringing in my ear.", "Your ears pop.")]"), + span_warning("I nod off for a moment.")) else if(prob(3)) if(prob(50))// coin flip to throw a message or an emote - fake_msg = pick("[pick("Your head hurts!", "You feel a burning knife inside my brain!", "A wave of pain fills my head!")]", - "[pick("Your lungs hurt!", "It hurts to breathe!")]", - "[pick("You feel nauseated.", "You feel like you're going to throw up!")]") + fake_msg = pick(span_danger("[pick("Your head hurts!", "You feel a burning knife inside my brain!", "A wave of pain fills my head!")]"), + span_danger("[pick("Your lungs hurt!", "It hurts to breathe!")]"), + span_warning("[pick("You feel nauseated.", "You feel like you're going to throw up!")]")) else fake_emote = pick("cough", "sniff", "sneeze") diff --git a/code/datums/status_effects/gas.dm b/code/datums/status_effects/gas.dm index 597d2f0b4..b4069beaa 100644 --- a/code/datums/status_effects/gas.dm +++ b/code/datums/status_effects/gas.dm @@ -14,7 +14,7 @@ /datum/status_effect/freon/on_apply() RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(owner_resist)) if(!owner.stat) - to_chat(owner, "I become frozen in a cube!") + to_chat(owner, span_danger("I become frozen in a cube!")) cube = icon('icons/effects/freeze.dmi', "ice_cube") owner.add_overlay(cube) owner.update_mobility() @@ -26,16 +26,16 @@ qdel(src) /datum/status_effect/freon/proc/owner_resist() - to_chat(owner, "I start breaking out of the ice cube...") + to_chat(owner, span_notice("I start breaking out of the ice cube...")) if(do_mob(owner, owner, 40)) if(!QDELETED(src)) - to_chat(owner, "I break out of the ice cube!") + to_chat(owner, span_notice("I break out of the ice cube!")) owner.remove_status_effect(/datum/status_effect/freon) owner.update_mobility() /datum/status_effect/freon/on_remove() if(!owner.stat) - to_chat(owner, "The cube melts!") + to_chat(owner, span_notice("The cube melts!")) owner.cut_overlay(cube) owner.adjust_bodytemperature(100) owner.update_mobility() diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index b356056ab..c3057c761 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -110,7 +110,7 @@ rewarded = caster /datum/status_effect/bounty/on_apply() - to_chat(owner, "I hear something behind you talking... I have been marked for death by [rewarded]. If you die, they will be rewarded.") + to_chat(owner, span_boldnotice("I hear something behind you talking...
I have been marked for death by [rewarded]. If you die, they will be rewarded.")) playsound(owner, 'sound/blank.ogg', 75, FALSE) return ..() @@ -121,9 +121,9 @@ /datum/status_effect/bounty/proc/rewards() if(rewarded && rewarded.mind && rewarded.stat != DEAD) - to_chat(owner, "I hear something behind you talking... Bounty claimed.") + to_chat(owner, span_boldnotice("I hear something behind you talking... Bounty claimed.")) playsound(owner, 'sound/blank.ogg', 75, FALSE) - to_chat(rewarded, "I feel a surge of mana flow into you!") + to_chat(rewarded, span_greentext("I feel a surge of mana flow into you!")) for(var/obj/effect/proc_holder/spell/spell in rewarded.mind.spell_list) spell.charge_counter = spell.charge_max spell.recharging = FALSE diff --git a/code/datums/stress/_stressevent.dm b/code/datums/stress/_stressevent.dm index a93caf901..fcfd19e99 100644 --- a/code/datums/stress/_stressevent.dm +++ b/code/datums/stress/_stressevent.dm @@ -11,9 +11,9 @@ /datum/stressevent/test timer = 5 SECONDS stressadd = 3 - desc = "This is a positive test event." + desc = span_red("This is a positive test event.") /datum/stressevent/testr timer = 5 SECONDS stressadd = -3 - desc = "This is a negative test event." + desc = span_green("This is a negative test event.") diff --git a/code/datums/stress/negative_events.dm b/code/datums/stress/negative_events.dm index 060fbf4c7..89c321d6b 100644 --- a/code/datums/stress/negative_events.dm +++ b/code/datums/stress/negative_events.dm @@ -1,254 +1,254 @@ /datum/stressevent/vice timer = 5 MINUTES stressadd = 3 - desc = list("I don't indulge my vice.","I need to sate my vice.") + desc = list(span_red("I don't indulge my vice."),span_red("I need to sate my vice.")) /* /datum/stressevent/failcraft timer = 15 SECONDS stressadd = 1 max_stacks = 10 - desc = "I've failed to craft something." + desc = span_red("I've failed to craft something.") */ /datum/stressevent/miasmagas timer = 10 SECONDS stressadd = 1 - desc = "Smells like death here." + desc = span_red("Smells like death here.") /datum/stressevent/peckish timer = 10 MINUTES stressadd = 1 - desc = "I'm peckish." + desc = span_red("I'm peckish.") /datum/stressevent/hungry timer = 10 MINUTES stressadd = 2 - desc = "I'm hungry." + desc = span_red("I'm hungry.") /datum/stressevent/starving timer = 10 MINUTES stressadd = 3 - desc = "I'm starving." + desc = span_red("I'm starving.") /datum/stressevent/drym timer = 10 MINUTES stressadd = 1 - desc = "I'm a little thirsty." + desc = span_red("I'm a little thirsty.") /datum/stressevent/thirst timer = 10 MINUTES stressadd = 2 - desc = "I'm thirsty." + desc = span_red("I'm thirsty.") /datum/stressevent/parched timer = 10 MINUTES stressadd = 3 - desc = "I'm going to die of thirst." + desc = span_red("I'm going to die of thirst.") /datum/stressevent/dismembered timer = 40 MINUTES stressadd = 5 - //desc = "I've lost a limb." + //desc = span_red("I've lost a limb.") desc = null /datum/stressevent/dwarfshaved timer = 40 MINUTES stressadd = 6 - desc = "I'd rather cut my own throat than my beard." + desc = span_red("I'd rather cut my own throat than my beard.") /datum/stressevent/viewdeath timer = 1 MINUTES stressadd = 1 -// desc = "Death..." +// desc = span_red("Death...") /datum/stressevent/viewdeath/get_desc(mob/living/user) if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.dna?.species) - return "Another [H.dna.species.id] perished." + return span_red("Another [H.dna.species.id] perished.") return desc /datum/stressevent/viewdismember timer = 20 MINUTES max_stacks = 10 stressadd = 2 -// desc = "Butchery." +// desc = span_red("Butchery.") /datum/stressevent/fviewdismember timer = 1 MINUTES max_stacks = 10 stressadd = 1 -// desc = "I saw something horrible!" +// desc = span_red("I saw something horrible!") /datum/stressevent/viewgib timer = 5 MINUTES stressadd = 2 -// desc = "I saw something ghastly." +// desc = span_red("I saw something ghastly.") /datum/stressevent/bleeding timer = 2 MINUTES stressadd = 1 - desc = list("I think I'm bleeding.","I'm bleeding.") + desc = list(span_red("I think I'm bleeding."),span_red("I'm bleeding.")) /datum/stressevent/painmax timer = 1 MINUTES stressadd = 2 - desc = "THE PAIN!" + desc = span_red("THE PAIN!") /datum/stressevent/freakout timer = 15 SECONDS stressadd = 2 - desc = "I'm panicking!" + desc = span_red("I'm panicking!") /datum/stressevent/felldown timer = 1 MINUTES stressadd = 1 -// desc = "I fell. I'm a fool." +// desc = span_red("I fell. I'm a fool.") /datum/stressevent/burntmeal timer = 2 MINUTES stressadd = 2 - desc = "YUCK!" + desc = span_red("YUCK!") /datum/stressevent/rotfood timer = 2 MINUTES stressadd = 4 - desc = "YUCK!" + desc = span_red("YUCK!") /datum/stressevent/psycurse timer = 5 MINUTES stressadd = 5 - desc = "Oh no! I've received divine punishment!" + desc = span_red("Oh no! I've received divine punishment!") /datum/stressevent/virginchurch timer = 999 MINUTES stressadd = 10 - desc = "I have broken my oath of chastity to The Gods!" + desc = span_red("I have broken my oath of chastity to The Gods!") /datum/stressevent/badmeal timer = 3 MINUTES stressadd = 2 - desc = "It tastes VILE!" + desc = span_red("It tastes VILE!") /datum/stressevent/vomit timer = 3 MINUTES stressadd = 2 max_stacks = 3 - desc = "I puked!" + desc = span_red("I puked!") /datum/stressevent/vomitself timer = 3 MINUTES stressadd = 2 max_stacks = 3 - desc = "I puked on myself!" + desc = span_red("I puked on myself!") /datum/stressevent/cumbad timer = 5 MINUTES stressadd = 5 - desc = "I was violated." + desc = span_red("I was violated.") /datum/stressevent/cumcorpse timer = 1 MINUTES stressadd = 20 - desc = "What have I done?" + desc = span_red("What have I done?") /datum/stressevent/blueb timer = 1 MINUTES stressadd = 2 - desc = "My loins ache!" + desc = span_red("My loins ache!") /datum/stressevent/delf timer = 1 MINUTES stressadd = 1 - desc = "A loathesome dark elf." + desc = span_red("A loathesome dark elf.") /datum/stressevent/tieb timer = 1 MINUTES stressadd = 1 - desc = "Helldweller... better stay away." + desc = span_red("Helldweller... better stay away.") /datum/stressevent/brazillian timer = 1 MINUTES stressadd = 1 - desc = "A vile lizard." + desc = span_red("A vile lizard.") /datum/stressevent/paracrowd timer = 15 SECONDS stressadd = 2 - desc = "There are too many people who don't look like me here." + desc = span_red("There are too many people who don't look like me here.") /datum/stressevent/parablood timer = 15 SECONDS stressadd = 3 - desc = "There is so much blood here.. it's like a battlefield!" + desc = span_red("There is so much blood here.. it's like a battlefield!") /datum/stressevent/parastr timer = 2 MINUTES stressadd = 2 - desc = "That beast is stronger.. and might easily kill me!" + desc = span_red("That beast is stronger.. and might easily kill me!") /datum/stressevent/paratalk timer = 2 MINUTES stressadd = 2 - desc = "They are plotting against me in evil tongues.." + desc = span_red("They are plotting against me in evil tongues..") /datum/stressevent/coldhead timer = 60 SECONDS stressadd = 1 -// desc = "My head is cold and ugly." +// desc = span_red("My head is cold and ugly.") /datum/stressevent/sleeptime timer = 0 stressadd = 1 - desc = "I'm tired." + desc = span_red("I'm tired.") /datum/stressevent/trainsleep timer = 0 stressadd = 1 - desc = "My muscles ache." + desc = span_red("My muscles ache.") /datum/stressevent/tortured stressadd = 3 max_stacks = 5 - desc = "I'm broken." + desc = span_red("I'm broken.") timer = 60 SECONDS /datum/stressevent/confessed stressadd = 3 - desc = "I've confessed to sin." + desc = span_red("I've confessed to sin.") timer = 15 MINUTES /datum/stressevent/confessedgood stressadd = 1 - desc = "I've confessed to sin, it feels good." + desc = span_red("I've confessed to sin, it feels good.") timer = 15 MINUTES /datum/stressevent/saw_wonder stressadd = 4 - desc = "I have seen something nightmarish, and I fear for my life!" + desc = span_dead("I have seen something nightmarish, and I fear for my life!") timer = null /datum/stressevent/maniac_woke_up stressadd = 10 - desc = "No... I want to go back..." + desc = span_danger("No... I want to go back...") /datum/stressevent/drankrat stressadd = 1 - desc = "I drank from a lesser creature." + desc = span_red("I drank from a lesser creature.") timer = 1 MINUTES /datum/stressevent/lowvampire stressadd = 1 - desc = "I'm dead... what comes next?" + desc = span_red("I'm dead... what comes next?") /datum/stressevent/oziumoff stressadd = 20 - desc = "I need another hit." + desc = span_blue("I need another hit.") timer = 1 MINUTES /datum/stressevent/ooc_ic stressadd = 6 - desc = "Bad omen! I've broken some kind of wall..." + desc = span_red("Bad omen! I've broken some kind of wall...") timer = 5 MINUTES diff --git a/code/datums/stress/positive_events.dm b/code/datums/stress/positive_events.dm index 0c994cece..cd719d900 100644 --- a/code/datums/stress/positive_events.dm +++ b/code/datums/stress/positive_events.dm @@ -1,120 +1,120 @@ /datum/stressevent/viewsinpunish timer = 5 MINUTES stressadd = -2 - desc = "I saw a sinner get punished!" + desc = span_green("I saw a sinner get punished!") /datum/stressevent/viewexecution timer = 5 MINUTES stressadd = -2 - desc = "I saw a lawbreaker get punished!" + desc = span_green("I saw a lawbreaker get punished!") /datum/stressevent/psyprayer timer = 30 MINUTES stressadd = -2 - desc = "The Gods smiles upon me." + desc = span_green("The Gods smiles upon me.") /datum/stressevent/joke timer = 30 MINUTES stressadd = -5 - desc = "I heard a good joke." + desc = span_green("I heard a good joke.") /datum/stressevent/tragedy timer = 30 MINUTES stressadd = -5 - desc = "Life isn't so bad after all." + desc = span_green("Life isn't so bad after all.") /datum/stressevent/blessed timer = 60 MINUTES stressadd = -5 - desc = "I feel a soothing." + desc = span_green("I feel a soothing.") /datum/stressevent/triumph timer = 60 MINUTES stressadd = -10 - desc = "I remember a TRIUMPH." + desc = span_green("I remember a TRIUMPH.") /datum/stressevent/drunk timer = 1 MINUTES stressadd = -1 -// desc = list("Alcohol eases the pain.","Alcohol, my true friend.") +// desc = list(span_green("Alcohol eases the pain."),span_green("Alcohol, my true friend.")) /datum/stressevent/pweed timer = 1 MINUTES stressadd = -1 -// desc = list("A relaxing smoke.","A flavorful smoke.") +// desc = list(span_green("A relaxing smoke."),span_green("A flavorful smoke.")) /datum/stressevent/weed timer = 5 MINUTES stressadd = -4 -// desc = "I love you sweet leaf." +// desc = span_blue("I love you sweet leaf.") /datum/stressevent/high timer = 5 MINUTES stressadd = -4 -// desc = "I'm so high, don't take away my sky." +// desc = span_blue("I'm so high, don't take away my sky.") /datum/stressevent/hug timer = 30 MINUTES stressadd = -1 -// desc = "Somebody gave me a nice hug." +// desc = span_green("Somebody gave me a nice hug.") /datum/stressevent/stuffed timer = 20 MINUTES stressadd = -3 - desc = "I'm stuffed! Feels good." + desc = span_green("I'm stuffed! Feels good.") /datum/stressevent/goodfood timer = 10 MINUTES stressadd = -2 - desc = list("A meal fit for a god!","Delicious!") + desc = list(span_green("A meal fit for a god!"),span_green("Delicious!")) /datum/stressevent/prebel timer = 5 MINUTES stressadd = -5 - desc = "Down with the tyranny!" + desc = span_green("Down with the tyranny!") /datum/stressevent/music timer = 1 MINUTES stressadd = -1 - desc = "The music is relaxing." + desc = span_green("The music is relaxing.") /datum/stressevent/music/two stressadd = -2 - desc = "The music is very relaxing." + desc = span_green("The music is very relaxing.") /datum/stressevent/music/three stressadd = -3 - desc = "The music saps my stress." + desc = span_green("The music saps my stress.") /datum/stressevent/music/four stressadd = -4 - desc = "The music is heavenly." + desc = span_green("The music is heavenly.") timer = 10 MINUTES /datum/stressevent/music/five stressadd = -5 timer = 10 MINUTES - desc = "The music is strummed by an angel." + desc = span_green("The music is strummed by an angel.") /datum/stressevent/music/six stressadd = -6 timer = 10 MINUTES - desc = "The music is a blessing from Eora." + desc = span_green("The music is a blessing from Eora.") /datum/stressevent/vblood stressadd = -5 - desc = "Virgin blood!" + desc = span_red(span_bold("Virgin blood!")) timer = 5 MINUTES /datum/stressevent/bathwater stressadd = -1 - desc = "Relaxing." + desc = span_blue("Relaxing.") timer = 1 MINUTES /datum/stressevent/ozium stressadd = -99 - desc = "I've taken a hit and entered a painless world." + desc = span_blue("I've taken a hit and entered a painless world.") timer = 1 MINUTES /datum/stressevent/moondust stressadd = -5 - desc = "Moondust surges through me." + desc = span_green("Moondust surges through me.") /datum/stressevent/moondust_purest stressadd = -6 - desc = "PUREST moondust surges through me!" + desc = span_green("PUREST moondust surges through me!") diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm index 621fadfc2..87447bcfb 100644 --- a/code/datums/traits/_quirk.dm +++ b/code/datums/traits/_quirk.dm @@ -114,8 +114,8 @@ Use this as a guideline ///You'll need to use "HAS_TRAIT_FROM(src, X, sources)" checks around the code to check this; for instance, the Ageusia trait is checked in taste code ///If you need help finding where to put it, the declaration finder on GitHub is the best way to locate it - gain_text = "Things far away from you start looking blurry." - lose_text = "I start seeing faraway things normally again." + gain_text = span_danger("Things far away from you start looking blurry.") + lose_text = span_notice("I start seeing faraway things normally again.") medical_record_text = "Subject has permanent nearsightedness." ///These three are self-explanatory diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 067e0b35c..4d12a384c 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -6,8 +6,8 @@ desc = "" value = 1 mob_trait = TRAIT_ALCOHOL_TOLERANCE - gain_text = "I feel like you could drink a whole keg!" - lose_text = "I don't feel as resistant to alcohol anymore. Somehow." + gain_text = span_notice("I feel like you could drink a whole keg!") + lose_text = span_danger("I don't feel as resistant to alcohol anymore. Somehow.") medical_record_text = "Patient demonstrates a high tolerance for alcohol." /datum/quirk/apathetic @@ -33,8 +33,8 @@ desc = "" value = 2 mob_trait = TRAIT_DRUNK_HEALING - gain_text = "I feel like a drink would do you good." - lose_text = "I no longer feel like drinking would ease your pain." + gain_text = span_notice("I feel like a drink would do you good.") + lose_text = span_danger("I no longer feel like drinking would ease your pain.") medical_record_text = "Patient has unusually efficient liver metabolism and can slowly regenerate wounds by drinking alcoholic beverages." /datum/quirk/drunkhealing/on_process() @@ -55,8 +55,8 @@ desc = "" value = 2 mob_trait = TRAIT_EMPATH - gain_text = "I feel in tune with those around you." - lose_text = "I feel isolated from others." + gain_text = span_notice("I feel in tune with those around you.") + lose_text = span_danger("I feel isolated from others.") medical_record_text = "Patient is highly perceptive of and sensitive to social cues, or may possibly have ESP. Further testing needed." datum/quirk/fan_clown @@ -64,8 +64,8 @@ datum/quirk/fan_clown desc = "" value = 1 mob_trait = TRAIT_FAN_CLOWN - gain_text = "I are a big fan of the Clown." - lose_text = "The clown doesn't seem so great." + gain_text = span_notice("I are a big fan of the Clown.") + lose_text = span_danger("The clown doesn't seem so great.") medical_record_text = "Patient reports being a big fan of the Clown." /datum/quirk/fan_clown/on_spawn() @@ -82,8 +82,8 @@ datum/quirk/fan_mime desc = "" value = 1 mob_trait = TRAIT_FAN_MIME - gain_text = "I are a big fan of the Mime." - lose_text = "The mime doesn't seem so great." + gain_text = span_notice("I are a big fan of the Mime.") + lose_text = span_danger("The mime doesn't seem so great.") medical_record_text = "Patient reports being a big fan of the Mime." /datum/quirk/fan_mime/on_spawn() @@ -100,8 +100,8 @@ datum/quirk/fan_mime desc = "" value = 2 mob_trait = TRAIT_FREERUNNING - gain_text = "I feel lithe on your feet!" - lose_text = "I feel clumsy again." + gain_text = span_notice("I feel lithe on your feet!") + lose_text = span_danger("I feel clumsy again.") medical_record_text = "Patient scored highly on cardio tests." /datum/quirk/friendly @@ -109,8 +109,8 @@ datum/quirk/fan_mime desc = "" value = 1 mob_trait = TRAIT_FRIENDLY - gain_text = "I want to hug someone." - lose_text = "I no longer feel compelled to hug others." + gain_text = span_notice("I want to hug someone.") + lose_text = span_danger("I no longer feel compelled to hug others.") mood_quirk = TRUE medical_record_text = "Patient demonstrates low-inhibitions for physical contact and well-developed arms. Requesting another doctor take over this case." @@ -131,8 +131,8 @@ datum/quirk/fan_mime desc = "" value = 1 mob_trait = TRAIT_LIGHT_STEP - gain_text = "I walk with a little more litheness." - lose_text = "I start tromping around like a barbarian." + gain_text = span_notice("I walk with a little more litheness.") + lose_text = span_danger("I start tromping around like a barbarian.") medical_record_text = "Patient's dexterity belies a strong capacity for stealth." /datum/quirk/musician @@ -140,8 +140,8 @@ datum/quirk/fan_mime desc = "" value = 1 mob_trait = TRAIT_MUSICIAN - gain_text = "I know everything about musical instruments." - lose_text = "I forget how musical instruments work." + gain_text = span_notice("I know everything about musical instruments.") + lose_text = span_danger("I forget how musical instruments work.") medical_record_text = "Patient brain scans show a highly-developed auditory pathway." /datum/quirk/musician/on_spawn() @@ -158,8 +158,8 @@ datum/quirk/fan_mime desc = "" value = 1 mob_trait = TRAIT_NIGHT_VISION - gain_text = "The shadows seem a little less dark." - lose_text = "Everything seems a little darker." + gain_text = span_notice("The shadows seem a little less dark.") + lose_text = span_danger("Everything seems a little darker.") medical_record_text = "Patient's eyes show above-average acclimation to darkness." /datum/quirk/night_vision/on_spawn() @@ -174,8 +174,8 @@ datum/quirk/fan_mime desc = "" value = 1 mob_trait = TRAIT_PHOTOGRAPHER - gain_text = "I know everything about photography." - lose_text = "I forget how photo cameras work." + gain_text = span_notice("I know everything about photography.") + lose_text = span_danger("I forget how photo cameras work.") medical_record_text = "Patient mentions photography as a stress-relieving hobby." /datum/quirk/photographer/on_spawn() @@ -219,8 +219,8 @@ datum/quirk/fan_mime desc = "" value = 1 mob_trait = TRAIT_SPIRITUAL - gain_text = "I have faith in a higher power." - lose_text = "I lose faith!" + gain_text = span_notice("I have faith in a higher power.") + lose_text = span_danger("I lose faith!") medical_record_text = "Patient reports a belief in a higher power." /datum/quirk/spiritual/on_spawn() @@ -233,8 +233,8 @@ datum/quirk/fan_mime desc = "" value = 1 mob_trait = TRAIT_TAGGER - gain_text = "I know how to tag walls efficiently." - lose_text = "I forget how to tag walls properly." + gain_text = span_notice("I know how to tag walls efficiently.") + lose_text = span_danger("I forget how to tag walls properly.") medical_record_text = "Patient was recently seen for possible paint huffing incident." /datum/quirk/tagger/on_spawn() @@ -249,5 +249,5 @@ datum/quirk/fan_mime desc = "" value = 1 mob_trait = TRAIT_VORACIOUS - gain_text = "I feel HONGRY." - lose_text = "I no longer feel HONGRY." + gain_text = span_notice("I feel HONGRY.") + lose_text = span_danger("I no longer feel HONGRY.") diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index c84ed5e6b..f17601dab 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -5,8 +5,8 @@ desc = "" value = -2 mood_quirk = TRUE - gain_text = "My back REALLY hurts!" - lose_text = "My back feels better." + gain_text = span_danger("My back REALLY hurts!") + lose_text = span_notice("My back feels better.") medical_record_text = "Patient scans indicate severe and chronic back pain." /datum/quirk/badback/on_process() @@ -20,8 +20,8 @@ name = "Blood Deficiency" desc = "" value = -2 - gain_text = "I feel my vigor slowly fading away." - lose_text = "I feel vigorous again." + gain_text = span_danger("I feel my vigor slowly fading away.") + lose_text = span_notice("I feel vigorous again.") medical_record_text = "Patient requires regular treatment for blood loss due to low production of blood." /datum/quirk/blooddeficiency/on_process() @@ -36,8 +36,8 @@ name = "Blind" desc = "" value = -4 - gain_text = "I can't see anything." - lose_text = "I miraculously gain back my vision." + gain_text = span_danger("I can't see anything.") + lose_text = span_notice("I miraculously gain back my vision.") medical_record_text = "Patient has permanent blindness." /datum/quirk/blindness/add() @@ -54,8 +54,8 @@ name = "Brain Tumor" desc = "" value = -3 - gain_text = "I feel smooth." - lose_text = "I feel wrinkled again." + gain_text = span_danger("I feel smooth.") + lose_text = span_notice("I feel wrinkled again.") medical_record_text = "Patient has a tumor in their brain that is slowly driving them to brain death." /datum/quirk/brainproblems/on_process() @@ -66,8 +66,8 @@ desc = "" value = -2 mob_trait = TRAIT_DEAF - gain_text = "I can't hear anything." - lose_text = "You're able to hear again!" + gain_text = span_danger("I can't hear anything.") + lose_text = span_notice("You're able to hear again!") medical_record_text = "Patient's cochlear nerve is incurably damaged." /datum/quirk/depression @@ -75,8 +75,8 @@ desc = "" mob_trait = TRAIT_DEPRESSION value = -1 - gain_text = "I start feeling depressed." - lose_text = "I no longer feel depressed." //if only it were that easy! + gain_text = span_danger("I start feeling depressed.") + lose_text = span_notice("I no longer feel depressed.") //if only it were that easy! medical_record_text = "Patient has a severe mood disorder, causing them to experience acute episodes of depression." mood_quirk = TRUE @@ -184,7 +184,7 @@ var/mob/living/carbon/human/H = quirk_holder SEND_SIGNAL(H.back, COMSIG_TRY_STORAGE_SHOW, H) - to_chat(quirk_holder, "There is a precious family [heirloom.name] [where], passed down from generation to generation. Keep it safe!") + to_chat(quirk_holder, span_boldnotice("There is a precious family [heirloom.name] [where], passed down from generation to generation. Keep it safe!")) var/list/names = splittext(quirk_holder.real_name, " ") var/family_name = names[names.len] @@ -210,8 +210,8 @@ desc = "" value = -2 mob_trait = TRAIT_EASYLIMBDISABLE - gain_text = "I feel frail." - lose_text = "I feel sturdy again." + gain_text = span_danger("I feel frail.") + lose_text = span_notice("I feel sturdy again.") medical_record_text = "Patient has unusually frail bones, recommend calcium-rich diet." /datum/quirk/heavy_sleeper @@ -219,16 +219,16 @@ desc = "" value = -1 mob_trait = TRAIT_HEAVY_SLEEPER - gain_text = "I feel sleepy." - lose_text = "I feel awake again." + gain_text = span_danger("I feel sleepy.") + lose_text = span_notice("I feel awake again.") medical_record_text = "Patient has abnormal sleep study results and is difficult to wake up." /datum/quirk/hypersensitive name = "Hypersensitive" desc = "" value = -1 - gain_text = "I seem to make a big deal out of everything." - lose_text = "I don't seem to make a big deal out of everything anymore." + gain_text = span_danger("I seem to make a big deal out of everything.") + lose_text = span_notice("I don't seem to make a big deal out of everything anymore.") medical_record_text = "Patient demonstrates a high level of emotional volatility." /datum/quirk/hypersensitive/add() @@ -247,16 +247,16 @@ desc = "" value = -1 mob_trait = TRAIT_LIGHT_DRINKER - gain_text = "Just the thought of drinking alcohol makes my head spin." - lose_text = "You're no longer severely affected by alcohol." + gain_text = span_notice("Just the thought of drinking alcohol makes my head spin.") + lose_text = span_danger("You're no longer severely affected by alcohol.") medical_record_text = "Patient demonstrates a low tolerance for alcohol. (Wimp)" /datum/quirk/nearsighted //t. errorage name = "Nearsighted" desc = "" value = -1 - gain_text = "Things far away from you start looking blurry." - lose_text = "I start seeing faraway things normally again." + gain_text = span_danger("Things far away from you start looking blurry.") + lose_text = span_notice("I start seeing faraway things normally again.") medical_record_text = "Patient requires prescription glasses in order to counteract nearsightedness." /datum/quirk/nearsighted/add() @@ -283,7 +283,7 @@ var/lums = T.get_lumcount() if(lums <= 0.2) if(quirk_holder.m_intent == MOVE_INTENT_RUN) - to_chat(quirk_holder, "Easy, easy, take it slow... you're in the dark...") + to_chat(quirk_holder, span_warning("Easy, easy, take it slow... you're in the dark...")) quirk_holder.toggle_move_intent() SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "nyctophobia", /datum/mood_event/nyctophobia) else @@ -294,8 +294,8 @@ desc = "" value = -2 mob_trait = TRAIT_PACIFISM - gain_text = "I feel repulsed by the thought of violence!" - lose_text = "I think you can defend myself again." + gain_text = span_danger("I feel repulsed by the thought of violence!") + lose_text = span_notice("I think you can defend myself again.") medical_record_text = "Patient is unusually pacifistic and cannot bring themselves to cause physical harm." /datum/quirk/paraplegic @@ -384,8 +384,8 @@ desc = "" value = -2 mob_trait = TRAIT_GRABWEAKNESS - gain_text = "I feel like a pushover." - lose_text = "I feel like standing up for myself." + gain_text = span_danger("I feel like a pushover.") + lose_text = span_notice("I feel like standing up for myself.") medical_record_text = "Patient presents a notably unassertive personality and is easy to manipulate." /datum/quirk/insanity @@ -393,8 +393,8 @@ desc = "" value = -2 //no mob trait because it's handled uniquely - gain_text = "..." - lose_text = "I feel in tune with the world again." + gain_text = span_danger("...") + lose_text = span_notice("I feel in tune with the world again.") medical_record_text = "Patient suffers from acute Reality Dissociation Syndrome and experiences vivid hallucinations." /datum/quirk/insanity/on_process() @@ -417,8 +417,8 @@ name = "Social Anxiety" desc = "" value = -1 - gain_text = "I start worrying about what you're saying." - lose_text = "I feel easier about talking again." //if only it were that easy! + gain_text = span_danger("I start worrying about what you're saying.") + lose_text = span_notice("I feel easier about talking again.") //if only it were that easy! medical_record_text = "Patient is usually anxious in social encounters and prefers to avoid them." var/dumb_thing = TRUE @@ -431,10 +431,10 @@ if(prob(2 + nearby_people)) H.stuttering = max(3, H.stuttering) else if(prob(min(3, nearby_people)) && !H.silent) - to_chat(H, "I retreat into myself. You really don't feel up to talking.") + to_chat(H, span_danger("I retreat into myself. You really don't feel up to talking.")) H.silent = max(10, H.silent) else if(prob(0.5) && dumb_thing) - to_chat(H, "I think of a dumb thing you said a long time ago and scream internally.") + to_chat(H, span_danger("I think of a dumb thing you said a long time ago and scream internally.")) dumb_thing = FALSE //only once per life if(prob(1)) new/obj/item/reagent_containers/food/snacks/spaghetti/pastatomato(get_turf(H)) //now that's what I call spaghetti code @@ -443,8 +443,8 @@ name = "Junkie" desc = "" value = -2 - gain_text = "I suddenly feel the craving for drugs." - lose_text = "I feel like you should kick my drug habit." + gain_text = span_danger("I suddenly feel the craving for drugs.") + lose_text = span_notice("I feel like you should kick my drug habit.") medical_record_text = "Patient has a history of hard drugs." var/drug_list = list(/datum/reagent/drug/crank, /datum/reagent/drug/krokodil, /datum/reagent/medicine/morphine, /datum/reagent/drug/happiness, /datum/reagent/drug/methamphetamine) //List of possible IDs var/datum/reagent/reagent_type //!If this is defined, reagent_id will be unused and the defined reagent type will be instead. @@ -492,7 +492,7 @@ SEND_SIGNAL(H.back, COMSIG_TRY_STORAGE_SHOW, H) /datum/quirk/junkie/proc/announce_drugs() - to_chat(quirk_holder, "There is a [initial(drug_container_type.name)] of [initial(reagent_type.name)] [where_drug]. Better hope you don't run out...") + to_chat(quirk_holder, span_boldnotice("There is a [initial(drug_container_type.name)] of [initial(reagent_type.name)] [where_drug]. Better hope you don't run out...")) /datum/quirk/junkie/on_process() var/mob/living/carbon/human/H = quirk_holder @@ -504,14 +504,14 @@ else reagent_instance.addiction_stage = 0 H.reagents.addiction_list += reagent_instance - to_chat(quirk_holder, "I thought you kicked it, but you suddenly feel like you need [reagent_instance.name] again...") + to_chat(quirk_holder, span_danger("I thought you kicked it, but you suddenly feel like you need [reagent_instance.name] again...")) /datum/quirk/junkie/smoker name = "Smoker" desc = "" value = -1 - gain_text = "I could really go for a smoke right about now." - lose_text = "I feel like you should quit smoking." + gain_text = span_danger("I could really go for a smoke right about now.") + lose_text = span_notice("I feel like you should quit smoking.") medical_record_text = "Patient is a current smoker." reagent_type = /datum/reagent/drug/nicotine accessory_type = /obj/item/lighter/greyscale @@ -526,7 +526,7 @@ . = ..() /datum/quirk/junkie/smoker/announce_drugs() - to_chat(quirk_holder, "There is a [initial(drug_container_type.name)] [where_drug], and a lighter [where_accessory]. Make sure you get my favorite brand when you run out.") + to_chat(quirk_holder, span_boldnotice("There is a [initial(drug_container_type.name)] [where_drug], and a lighter [where_accessory]. Make sure you get my favorite brand when you run out.")) /datum/quirk/junkie/smoker/on_process() @@ -545,6 +545,6 @@ desc = "" value = -2 mob_trait = TRAIT_UNSTABLE - gain_text = "There's a lot on my mind right now." - lose_text = "My mind finally feels calm." + gain_text = span_danger("There's a lot on my mind right now.") + lose_text = span_notice("My mind finally feels calm.") medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events." diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index feb84543e..082e05517 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -6,16 +6,16 @@ desc = "" value = 0 mob_trait = TRAIT_AGEUSIA - gain_text = "I can't taste anything!" - lose_text = "I can taste again!" + gain_text = span_notice("I can't taste anything!") + lose_text = span_notice("I can taste again!") medical_record_text = "Patient suffers from ageusia and is incapable of tasting food or reagents." /datum/quirk/vegetarian name = "Vegetarian" desc = "" value = 0 - gain_text = "I feel repulsion at the idea of eating meat." - lose_text = "I feel like eating meat isn't that bad." + gain_text = span_notice("I feel repulsion at the idea of eating meat.") + lose_text = span_notice("I feel like eating meat isn't that bad.") medical_record_text = "Patient reports a vegetarian diet." /datum/quirk/vegetarian/add() @@ -37,8 +37,8 @@ name = "Snob" desc = "" value = 0 - gain_text = "I feel like you understand what things should look like." - lose_text = "Well who cares about deco anyways?" + gain_text = span_notice("I feel like you understand what things should look like.") + lose_text = span_notice("Well who cares about deco anyways?") medical_record_text = "Patient seems to be rather stuck up." mob_trait = TRAIT_SNOB @@ -46,8 +46,8 @@ name = "Ananas Affinity" desc = "" value = 0 - gain_text = "I feel an intense craving for pineapple." - lose_text = "My feelings towards pineapples seem to return to a lukewarm state." + gain_text = span_notice("I feel an intense craving for pineapple.") + lose_text = span_notice("My feelings towards pineapples seem to return to a lukewarm state.") medical_record_text = "Patient demonstrates a pathological love of pineapple." /datum/quirk/pineapple_liker/add() @@ -65,8 +65,8 @@ name = "Ananas Aversion" desc = "" value = 0 - gain_text = "I find myself pondering what kind of idiot actually enjoys pineapples..." - lose_text = "My feelings towards pineapples seem to return to a lukewarm state." + gain_text = span_notice("I find myself pondering what kind of idiot actually enjoys pineapples...") + lose_text = span_notice("My feelings towards pineapples seem to return to a lukewarm state.") medical_record_text = "Patient is correct to think that pineapple is disgusting." /datum/quirk/pineapple_hater/add() @@ -84,8 +84,8 @@ name = "Deviant Tastes" desc = "" value = 0 - gain_text = "I start craving something that tastes strange." - lose_text = "I feel like eating normal food again." + gain_text = span_notice("I start craving something that tastes strange.") + lose_text = span_notice("I feel like eating normal food again.") medical_record_text = "Patient demonstrates irregular nutrition preferences." /datum/quirk/deviant_tastes/add() @@ -113,7 +113,7 @@ /datum/quirk/monochromatic/post_add() if(quirk_holder.mind.assigned_role == "Detective") - to_chat(quirk_holder, "Mmm. Nothing's ever clear on this station. It's all shades of gray...") + to_chat(quirk_holder, span_boldannounce("Mmm. Nothing's ever clear on this station. It's all shades of gray...")) quirk_holder.playsound_local(quirk_holder, 'sound/blank.ogg', 50, FALSE) /datum/quirk/monochromatic/remove() diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm index 00ecb9edb..7d921aabb 100644 --- a/code/datums/weather/weather.dm +++ b/code/datums/weather/weather.dm @@ -4,12 +4,12 @@ var/name = "space wind" var/desc = "" - var/telegraph_message = "The wind begins to pick up." //The message displayed in chat to foreshadow the weather's beginning + var/telegraph_message = span_warning("The wind begins to pick up.") //The message displayed in chat to foreshadow the weather's beginning var/telegraph_duration = 300 //In deciseconds, how long from the beginning of the telegraph until the weather begins var/telegraph_sound //The sound file played to everyone on an affected z-level var/telegraph_overlay //The overlay applied to all tiles on the z-level - var/weather_message = "The wind begins to blow ferociously!" //Displayed in chat once the weather begins in earnest + var/weather_message = span_danger("The wind begins to blow ferociously!") //Displayed in chat once the weather begins in earnest var/weather_duration = 1200 //In deciseconds, how long the weather lasts once it begins var/weather_duration_lower = 1200 //See above - this is the lowest possible duration var/weather_duration_upper = 1500 //See above - this is the highest possible duration @@ -17,7 +17,7 @@ var/weather_overlay var/weather_color = null - var/end_message = "The wind relents its assault." //Displayed once the weather is over + var/end_message = span_danger("The wind relents its assault.") //Displayed once the weather is over var/end_duration = 50 //In deciseconds, how long the "wind-down" graphic will appear before vanishing entirely var/end_sound var/end_overlay diff --git a/code/datums/weather/weather_types/acid_rain.dm b/code/datums/weather/weather_types/acid_rain.dm index f957a7df4..ddcde30b6 100644 --- a/code/datums/weather/weather_types/acid_rain.dm +++ b/code/datums/weather/weather_types/acid_rain.dm @@ -4,17 +4,17 @@ desc = "" telegraph_duration = 400 - telegraph_message = "Thunder rumbles far above. You hear droplets drumming against the canopy. Seek shelter." + telegraph_message = span_boldwarning("Thunder rumbles far above. You hear droplets drumming against the canopy. Seek shelter.") telegraph_sound = 'sound/blank.ogg' - weather_message = "Acidic rain pours down around you! Get inside!" + weather_message = span_danger("Acidic rain pours down around you! Get inside!") weather_overlay = "acid_rain" weather_duration_lower = 600 weather_duration_upper = 1500 weather_sound = 'sound/blank.ogg' end_duration = 100 - end_message = "The downpour gradually slows to a light shower. It should be safe outside now." + end_message = span_boldannounce("The downpour gradually slows to a light shower. It should be safe outside now.") end_sound = 'sound/blank.ogg' area_type = /area/lavaland/surface/outdoors diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm index c798b4359..9128679da 100644 --- a/code/datums/weather/weather_types/ash_storm.dm +++ b/code/datums/weather/weather_types/ash_storm.dm @@ -3,16 +3,16 @@ name = "ash storm" desc = "" - telegraph_message = "An eerie moan rises on the wind. Sheets of burning ash blacken the horizon. Seek shelter." + telegraph_message = span_boldwarning("An eerie moan rises on the wind. Sheets of burning ash blacken the horizon. Seek shelter.") telegraph_duration = 300 telegraph_overlay = "light_ash" - weather_message = "Smoldering clouds of scorching ash billow down around you! Get inside!" + weather_message = span_danger("Smoldering clouds of scorching ash billow down around you! Get inside!") weather_duration_lower = 600 weather_duration_upper = 1200 weather_overlay = "ash_storm" - end_message = "The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now." + end_message = span_boldannounce("The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now.") end_duration = 300 end_overlay = "light_ash" @@ -102,10 +102,10 @@ name = "emberfall" desc = "" - weather_message = "Gentle embers waft down around you like grotesque snow. The storm seems to have passed you by..." + weather_message = span_notice("Gentle embers waft down around you like grotesque snow. The storm seems to have passed you by...") weather_overlay = "light_ash" - end_message = "The emberfall slows, stops. Another layer of hardened soot to the basalt beneath your feet." + end_message = span_notice("The emberfall slows, stops. Another layer of hardened soot to the basalt beneath your feet.") end_sound = null aesthetic = TRUE diff --git a/code/datums/weather/weather_types/floor_is_lava.dm b/code/datums/weather/weather_types/floor_is_lava.dm index dd2fef53a..227ba28a6 100644 --- a/code/datums/weather/weather_types/floor_is_lava.dm +++ b/code/datums/weather/weather_types/floor_is_lava.dm @@ -3,15 +3,15 @@ name = "the floor is lava" desc = "" - telegraph_message = "I feel the ground beneath you getting hot. Waves of heat distort the air." + telegraph_message = span_warning("I feel the ground beneath you getting hot. Waves of heat distort the air.") telegraph_duration = 150 - weather_message = "The floor is lava! Get on top of something!" + weather_message = span_danger("The floor is lava! Get on top of something!") weather_duration_lower = 300 weather_duration_upper = 600 weather_overlay = "lava" - end_message = "The ground cools and returns to its usual form." + end_message = span_danger("The ground cools and returns to its usual form.") end_duration = 0 area_type = /area diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm index 38577b56f..dc8aa3b31 100644 --- a/code/datums/weather/weather_types/radiation_storm.dm +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -4,9 +4,9 @@ desc = "" telegraph_duration = 400 - telegraph_message = "The air begins to grow warm." + telegraph_message = span_danger("The air begins to grow warm.") - weather_message = "I feel waves of heat wash over you! Find shelter!" + weather_message = span_danger("I feel waves of heat wash over you! Find shelter!") weather_overlay = "ash_storm" weather_duration_lower = 600 weather_duration_upper = 1500 @@ -14,7 +14,7 @@ weather_sound = 'sound/blank.ogg' end_duration = 100 - end_message = "The air seems to be cooling off again." + end_message = span_notice("The air seems to be cooling off again.") area_type = /area protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer, diff --git a/code/datums/weather/weather_types/roguetown/fog.dm b/code/datums/weather/weather_types/roguetown/fog.dm index bdc51d6cd..c1103ec1e 100644 --- a/code/datums/weather/weather_types/roguetown/fog.dm +++ b/code/datums/weather/weather_types/roguetown/fog.dm @@ -3,7 +3,7 @@ desc = "" telegraph_duration = 10 SECONDS - telegraph_message = "The fog is coming." + telegraph_message = span_warning("The fog is coming.") telegraph_sound = 'sound/blank.ogg' weather_message = "" weather_overlay = "rain1" diff --git a/code/datums/weather/weather_types/roguetown/rain.dm b/code/datums/weather/weather_types/roguetown/rain.dm index 25d5e65f0..5212ccecb 100644 --- a/code/datums/weather/weather_types/roguetown/rain.dm +++ b/code/datums/weather/weather_types/roguetown/rain.dm @@ -4,7 +4,7 @@ desc = "" telegraph_duration = 10 SECONDS - telegraph_message = "The sky begins to weep." + telegraph_message = span_warning("The sky begins to weep.") telegraph_sound = 'sound/blank.ogg' weather_message = "" diff --git a/code/datums/weather/weather_types/snow_storm.dm b/code/datums/weather/weather_types/snow_storm.dm index 780e3ebfd..7a029e191 100644 --- a/code/datums/weather/weather_types/snow_storm.dm +++ b/code/datums/weather/weather_types/snow_storm.dm @@ -3,17 +3,17 @@ desc = "" probability = 90 - telegraph_message = "Drifting particles of snow begin to dust the surrounding area.." + telegraph_message = span_warning("Drifting particles of snow begin to dust the surrounding area..") telegraph_duration = 300 telegraph_overlay = "light_snow" - weather_message = "Harsh winds pick up as dense snow begins to fall from the sky! Seek shelter!" + weather_message = span_danger("Harsh winds pick up as dense snow begins to fall from the sky! Seek shelter!") weather_overlay = "snow_storm" weather_duration_lower = 600 weather_duration_upper = 1500 end_duration = 100 - end_message = "The snowfall dies down, it should be safe to go outside again." + end_message = span_boldannounce("The snowfall dies down, it should be safe to go outside again.") area_type = /area/awaymission/snowdin/outside target_trait = ZTRAIT_AWAY diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm index aad25c9d3..0f9ee3b0c 100644 --- a/code/datums/wires/_wires.dm +++ b/code/datums/wires/_wires.dm @@ -265,7 +265,7 @@ cut_color(target_wire) . = TRUE else - to_chat(L, "I need wirecutters!") + to_chat(L, span_warning("I need wirecutters!")) if("pulse") I = L.is_holding_tool_quality(TOOL_MULTITOOL) if(I || IsAdminGhost(usr)) @@ -274,7 +274,7 @@ pulse_color(target_wire, L) . = TRUE else - to_chat(L, "I need a multitool!") + to_chat(L, span_warning("I need a multitool!")) if("attach") if(is_attached(target_wire)) I = detach_assembly(target_wire) @@ -292,6 +292,6 @@ A.forceMove(L.drop_location()) . = TRUE else - to_chat(L, "I need an attachable assembly!") + to_chat(L, span_warning("I need an attachable assembly!")) #undef MAXIMUM_EMP_WIRES diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm index c1c01d503..85b937f4d 100644 --- a/code/datums/wires/mulebot.dm +++ b/code/datums/wires/mulebot.dm @@ -20,12 +20,12 @@ var/mob/living/simple_animal/bot/mulebot/M = holder switch(wire) if(WIRE_POWER1, WIRE_POWER2) - holder.visible_message("[icon2html(M, viewers(holder))] The charge light flickers.") + holder.visible_message(span_notice("[icon2html(M, viewers(holder))] The charge light flickers.")) if(WIRE_AVOIDANCE) - holder.visible_message("[icon2html(M, viewers(holder))] The external warning lights flash briefly.") + holder.visible_message(span_notice("[icon2html(M, viewers(holder))] The external warning lights flash briefly.")) if(WIRE_LOADCHECK) - holder.visible_message("[icon2html(M, viewers(holder))] The load platform clunks.") + holder.visible_message(span_notice("[icon2html(M, viewers(holder))] The load platform clunks.")) if(WIRE_MOTOR1, WIRE_MOTOR2) - holder.visible_message("[icon2html(M, viewers(holder))] The drive motor whines briefly.") + holder.visible_message(span_notice("[icon2html(M, viewers(holder))] The drive motor whines briefly.")) else - holder.visible_message("[icon2html(M, viewers(holder))] You hear a radio crackle.") + holder.visible_message(span_notice("[icon2html(M, viewers(holder))] You hear a radio crackle.")) diff --git a/code/datums/wires/particle_accelerator.dm b/code/datums/wires/particle_accelerator.dm index e58dba463..f6629fa83 100644 --- a/code/datums/wires/particle_accelerator.dm +++ b/code/datums/wires/particle_accelerator.dm @@ -25,7 +25,7 @@ if(WIRE_INTERFACE) C.interface_control = !C.interface_control if(WIRE_LIMIT) - C.visible_message("[icon2html(C, viewers(holder))][C] makes a large whirring noise.") + C.visible_message(span_notice("[icon2html(C, viewers(holder))][C] makes a large whirring noise.")) /datum/wires/particle_accelerator/control_box/on_cut(wire, mend) var/obj/machinery/particle_accelerator/control_box/C = holder diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index 2638eb658..a880bfc2d 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -47,17 +47,17 @@ if(WIRE_CAMERA) // Pulse to disable the camera. if(!QDELETED(R.builtInCamera) && !R.scrambledcodes) R.builtInCamera.toggle_cam(usr, 0) - R.visible_message("[R]'s camera lens focuses loudly.", "My camera lens focuses loudly.") + R.visible_message(span_notice("[R]'s camera lens focuses loudly."), span_notice("My camera lens focuses loudly.")) if(WIRE_LAWSYNC) // Forces a law update if possible. if(R.lawupdate) - R.visible_message("[R] gently chimes.", "LawSync protocol engaged.") + R.visible_message(span_notice("[R] gently chimes."), span_notice("LawSync protocol engaged.")) R.lawsync() R.show_laws() if(WIRE_LOCKDOWN) R.SetLockdown(!R.lockcharge) // Toggle if(WIRE_RESET_MODULE) if(R.has_module()) - R.visible_message("[R]'s module servos twitch.", "My module display flickers.") + R.visible_message(span_notice("[R]'s module servos twitch."), span_notice("My module display flickers.")) /datum/wires/robot/on_cut(wire, mend) var/mob/living/silicon/robot/R = holder @@ -78,7 +78,7 @@ if(!QDELETED(R.builtInCamera) && !R.scrambledcodes) R.builtInCamera.status = mend R.builtInCamera.toggle_cam(usr, 0) - R.visible_message("[R]'s camera lens focuses loudly.", "My camera lens focuses loudly.") + R.visible_message(span_notice("[R]'s camera lens focuses loudly."), span_notice("My camera lens focuses loudly.")) if(WIRE_LOCKDOWN) // Simple lockdown. R.SetLockdown(!mend) if(WIRE_RESET_MODULE) diff --git a/code/datums/wires/roulette.dm b/code/datums/wires/roulette.dm index fe8d7ee2e..f54751aa5 100644 --- a/code/datums/wires/roulette.dm +++ b/code/datums/wires/roulette.dm @@ -39,14 +39,14 @@ R.anchored = !R.anchored if(WIRE_RESETOWNER) R.my_card = null - R.audible_message("Owner reset!") + R.audible_message(span_warning("Owner reset!")) R.locked = FALSE if(WIRE_PRIZEVEND) if(isliving(usr)) R.shock(usr, 70) if(R.locked) return - R.audible_message("Unauthorized prize vend detected! Locking down machine!") + R.audible_message(span_warning("Unauthorized prize vend detected! Locking down machine!")) R.prize_theft(0.20) /datum/wires/roulette/on_cut(wire, mend) @@ -71,6 +71,6 @@ R.shock(usr, 75) if(R.locked) return - R.audible_message("Unauthorized prize vend detected! Locking down machine!") + R.audible_message(span_warning("Unauthorized prize vend detected! Locking down machine!")) R.prize_theft(0.10) diff --git a/code/datums/wires/syndicatebomb.dm b/code/datums/wires/syndicatebomb.dm index c3bbcdbbc..e2e1867b8 100644 --- a/code/datums/wires/syndicatebomb.dm +++ b/code/datums/wires/syndicatebomb.dm @@ -19,24 +19,24 @@ switch(wire) if(WIRE_BOOM) if(B.active) - holder.visible_message("[icon2html(B, viewers(holder))] An alarm sounds! It's go-") + holder.visible_message(span_danger("[icon2html(B, viewers(holder))] An alarm sounds! It's go-")) B.explode_now = TRUE tell_admins(B) else - holder.visible_message("[icon2html(B, viewers(holder))] Nothing happens.") + holder.visible_message(span_notice("[icon2html(B, viewers(holder))] Nothing happens.")) if(WIRE_UNBOLT) - holder.visible_message("[icon2html(B, viewers(holder))] The bolts spin in place for a moment.") + holder.visible_message(span_notice("[icon2html(B, viewers(holder))] The bolts spin in place for a moment.")) if(WIRE_DELAY) if(B.delayedbig) - holder.visible_message("[icon2html(B, viewers(holder))] Nothing happens.") + holder.visible_message(span_notice("[icon2html(B, viewers(holder))] Nothing happens.")) else - holder.visible_message("[icon2html(B, viewers(holder))] The bomb chirps.") + holder.visible_message(span_notice("[icon2html(B, viewers(holder))] The bomb chirps.")) playsound(B, 'sound/blank.ogg', 30, TRUE) B.detonation_timer += 300 if(B.active) B.delayedbig = TRUE if(WIRE_PROCEED) - holder.visible_message("[icon2html(B, viewers(holder))] The bomb buzzes ominously!") + holder.visible_message(span_danger("[icon2html(B, viewers(holder))] The bomb buzzes ominously!")) playsound(B, 'sound/blank.ogg', 30, TRUE) var/seconds = B.seconds_remaining() if(seconds >= 61) // Long fuse bombs can suddenly become more dangerous if you tinker with them. @@ -47,13 +47,13 @@ B.detonation_timer = world.time + 100 if(WIRE_ACTIVATE) if(!B.active) - holder.visible_message("[icon2html(B, viewers(holder))] You hear the bomb start ticking!") + holder.visible_message(span_danger("[icon2html(B, viewers(holder))] You hear the bomb start ticking!")) B.activate() B.update_icon() else if(B.delayedlittle) - holder.visible_message("[icon2html(B, viewers(holder))] Nothing happens.") + holder.visible_message(span_notice("[icon2html(B, viewers(holder))] Nothing happens.")) else - holder.visible_message("[icon2html(B, viewers(holder))] The bomb seems to hesitate for a moment.") + holder.visible_message(span_notice("[icon2html(B, viewers(holder))] The bomb seems to hesitate for a moment.")) B.detonation_timer += 100 B.delayedlittle = TRUE @@ -62,22 +62,22 @@ switch(wire) if(WIRE_BOOM) if(!mend && B.active) - holder.visible_message("[icon2html(B, viewers(holder))] An alarm sounds! It's go-") + holder.visible_message(span_danger("[icon2html(B, viewers(holder))] An alarm sounds! It's go-")) B.explode_now = TRUE tell_admins(B) if(WIRE_UNBOLT) if(!mend && B.anchored) - holder.visible_message("[icon2html(B, viewers(holder))] The bolts lift out of the ground!") + holder.visible_message(span_notice("[icon2html(B, viewers(holder))] The bolts lift out of the ground!")) playsound(B, 'sound/blank.ogg', 30, TRUE) B.anchored = FALSE if(WIRE_PROCEED) if(!mend && B.active) - holder.visible_message("[icon2html(B, viewers(holder))] An alarm sounds! It's go-") + holder.visible_message(span_danger("[icon2html(B, viewers(holder))] An alarm sounds! It's go-")) B.explode_now = TRUE tell_admins(B) if(WIRE_ACTIVATE) if(!mend && B.active) - holder.visible_message("[icon2html(B, viewers(holder))] The timer stops! The bomb has been defused!") + holder.visible_message(span_notice("[icon2html(B, viewers(holder))] The timer stops! The bomb has been defused!")) B.active = FALSE B.delayedlittle = FALSE B.delayedbig = FALSE diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index 6a1bedf57..bf853a73f 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -70,7 +70,7 @@ if(PRcounts[id] > PR_ANNOUNCEMENTS_PER_ROUND) return - var/final_composed = "PR: [input[keyword]]" + var/final_composed = span_announce("PR: [input[keyword]]") for(var/client/C in GLOB.clients) C.AnnouncePR(final_composed) @@ -79,7 +79,7 @@ require_comms_key = TRUE /datum/world_topic/ahelp_relay/Run(list/input) - relay_msg_admins("HELP: [input["source"]] [input["message_sender"]]: [input["message"]]") + relay_msg_admins(span_adminnotice("HELP: [input["source"]] [input["message_sender"]]: [input["message"]]")) /datum/world_topic/comms_console keyword = "Comms_Console" diff --git a/code/datums/wounds/_wound.dm b/code/datums/wounds/_wound.dm index ce9f2d671..a27f1d623 100644 --- a/code/datums/wounds/_wound.dm +++ b/code/datums/wounds/_wound.dm @@ -127,7 +127,7 @@ GLOBAL_LIST_INIT(primordial_wounds, init_primordial_wounds()) else final_message = replacetext(final_message, "%BODYPART", parse_zone(BODY_ZONE_CHEST)) if(critical) - final_message = "Critical hit! [final_message]" + final_message = span_crit("Critical hit! [final_message]") return final_message /// Sound that plays when this wound is applied to a mob diff --git a/code/datums/wounds/the_only_cure.dm b/code/datums/wounds/the_only_cure.dm index 2fbac9ddf..f9960820d 100644 --- a/code/datums/wounds/the_only_cure.dm +++ b/code/datums/wounds/the_only_cure.dm @@ -25,7 +25,7 @@ return if(human_owner.stat >= DEAD) //do shit the natural way i guess return - to_chat(human_owner, "I feel horrible... REALLY horrible...") + to_chat(human_owner, span_danger("I feel horrible... REALLY horrible...")) human_owner.mob_timers["puke"] = world.time human_owner.vomit(1, blood = TRUE, stun = FALSE) zombie_infection_timer = addtimer(CALLBACK(src, PROC_REF(wake_zombie)), zombie_infection_time, TIMER_STOPPABLE) @@ -44,7 +44,7 @@ if(!zombie_antag || zombie_antag.has_turned) return FALSE owner.flash_fullscreen("redflash3") - to_chat(owner, "It hurts... Is this really the end for me?") + to_chat(owner, span_danger("It hurts... Is this really the end for me?")) owner.emote("scream") // heres your warning to others bro owner.Knockdown(1) zombie_antag.wake_zombie(TRUE) @@ -60,7 +60,7 @@ return if(human_owner.stat >= DEAD) //forget it return - to_chat(human_owner, "I feel horrible... REALLY horrible...") + to_chat(human_owner, span_danger("I feel horrible... REALLY horrible...")) human_owner.mob_timers["puke"] = world.time human_owner.vomit(1, blood = TRUE, stun = FALSE) werewolf_infection_timer = addtimer(CALLBACK(src, PROC_REF(wake_werewolf)), werewolf_infection_time, TIMER_STOPPABLE) @@ -80,7 +80,7 @@ return FALSE werewolf_infection_timer = null owner.flash_fullscreen("redflash3") - to_chat(owner, "It hurts... Is this really the end for me?") + to_chat(owner, span_danger("It hurts... Is this really the end for me?")) owner.emote("scream") // heres your warning to others bro owner.Knockdown(1) return wolfy diff --git a/code/datums/wounds/types/arteries.dm b/code/datums/wounds/types/arteries.dm index 28c5ac21d..b8653b8e9 100644 --- a/code/datums/wounds/types/arteries.dm +++ b/code/datums/wounds/types/arteries.dm @@ -1,6 +1,6 @@ /datum/wound/artery name = "severed artery" - check_name = "ARTERY" + check_name = span_artery("ARTERY") severity = WOUND_SEVERITY_CRITICAL crit_message = "Blood sprays from %VICTIM's %BODYPART!" sound_effect = 'sound/combat/crit.ogg' @@ -40,7 +40,7 @@ /datum/wound/artery/neck name = "torn carotid" - check_name = "CAROTID" + check_name = span_artery("CAROTID") severity = WOUND_SEVERITY_FATAL crit_message = "Blood sprays from %VICTIM's throat!" whp = 100 @@ -61,7 +61,7 @@ /datum/wound/artery/chest name = "aortic dissection" - check_name = "AORTA" + check_name = span_artery("AORTA") severity = WOUND_SEVERITY_FATAL whp = 100 sewn_whp = 35 @@ -82,7 +82,7 @@ "MY HEART IS TORN!", "MY HEART IS BLEEDING!", ) - to_chat(affected, "[pick(heartaches)]") + to_chat(affected, span_userdanger("[pick(heartaches)]")) if(HAS_TRAIT(affected, TRAIT_CRITICAL_WEAKNESS)) affected.death() @@ -96,7 +96,7 @@ /datum/wound/artery/reattachment name = "replantation" - check_name = "UNSEWN" + check_name = span_artery("UNSEWN") severity = WOUND_SEVERITY_FATAL whp = 100 sewn_whp = 25 diff --git a/code/datums/wounds/types/dislocations.dm b/code/datums/wounds/types/dislocations.dm index d7c5c6592..5ac6c2fe0 100644 --- a/code/datums/wounds/types/dislocations.dm +++ b/code/datums/wounds/types/dislocations.dm @@ -1,6 +1,6 @@ /datum/wound/dislocation name = "dislocation" - check_name = "DISLOCATION" + check_name = span_bone("DISLOCATION") severity = WOUND_SEVERITY_MODERATE crit_message = list( "The %BODYPART jolts painfully!", @@ -65,7 +65,7 @@ /datum/wound/dislocation/neck name = "cervical dislocation" - check_name = "NECK" + check_name = span_bone("NECK") crit_message = list( "The spine slips!", "The spine twists!", diff --git a/code/datums/wounds/types/dismemberment.dm b/code/datums/wounds/types/dismemberment.dm index 554258bfa..75d0b1b5e 100644 --- a/code/datums/wounds/types/dismemberment.dm +++ b/code/datums/wounds/types/dismemberment.dm @@ -1,6 +1,6 @@ /datum/wound/dismemberment name = "bleeding stump" - check_name = "STUMP" + check_name = span_danger("STUMP") severity = WOUND_SEVERITY_CRITICAL whp = 75 sewn_whp = 25 @@ -24,25 +24,25 @@ /datum/wound/dismemberment/head name = "neck stump" - check_name = "NECK STUMP" + check_name = span_danger("NECK STUMP") mob_overlay = "dis_head" /datum/wound/dismemberment/r_arm name = "right arm stump" - check_name = "RIGHT ARM STUMP" + check_name = span_danger("RIGHT ARM STUMP") mob_overlay = "dis_ra" /datum/wound/dismemberment/l_arm name = "left arm stump" - check_name = "LEFT ARM STUMP" + check_name = span_danger("LEFT ARM STUMP") mob_overlay = "dis_la" /datum/wound/dismemberment/r_leg name = "right leg stump" - check_name = "RIGHT LEG STUMP" + check_name = span_danger("RIGHT LEG STUMP") mob_overlay = "dis_rl" /datum/wound/dismemberment/l_leg name = "left leg stump" - check_name = "LEFT LEG STUMP" + check_name = span_danger("LEFT LEG STUMP") mob_overlay = "dis_ll" diff --git a/code/datums/wounds/types/fractures.dm b/code/datums/wounds/types/fractures.dm index 90411c8dd..2d6056b90 100644 --- a/code/datums/wounds/types/fractures.dm +++ b/code/datums/wounds/types/fractures.dm @@ -1,6 +1,6 @@ /datum/wound/fracture name = "fracture" - check_name = "FRACTURE" + check_name = span_bone("FRACTURE") severity = WOUND_SEVERITY_SEVERE crit_message = list( "The bone shatters!", @@ -50,7 +50,7 @@ /datum/wound/fracture/head name = "cranial fracture" - check_name = "SKULLCRACK" + check_name = span_bone("SKULLCRACK") crit_message = list( "The skull shatters in a gruesome way!", "The head is smashed!", @@ -71,7 +71,7 @@ . = ..() if(dents_brain && prob(1)) name = "dentbrain" - check_name = "DENTBRAIN" + check_name = span_bone("DENTBRAIN") /datum/wound/fracture/head/on_mob_gain(mob/living/affected) . = ..() @@ -150,7 +150,7 @@ /datum/wound/fracture/mouth name = "mandibular fracture" - check_name = "JAW FRACTURE" + check_name = span_bone("JAW FRACTURE") crit_message = list( "The mandible comes apart beautifully!", "The jaw is smashed!", @@ -172,7 +172,7 @@ /datum/wound/fracture/neck name = "cervical fracture" - check_name = "NECK" + check_name = span_bone("NECK") crit_message = list( "The spine shatters in a spectacular way!", "The spine snaps!", @@ -200,7 +200,7 @@ /datum/wound/fracture/chest name = "rib fracture" - check_name = "RIBS" + check_name = span_bone("RIBS") crit_message = list( "The ribs shatter in a splendid way!", "The ribs are smashed!", @@ -223,7 +223,7 @@ /datum/wound/fracture/groin name = "pelvic fracture" - check_name = "PELVIS" + check_name = span_bone("PELVIS") crit_message = list( "The pelvis shatters in a magnificent way!", "The pelvis is smashed!", @@ -237,7 +237,7 @@ . = ..() if(prob(1)) name = "broken buck" - check_name = "BUCKBROKEN" + check_name = span_bone("BUCKBROKEN") crit_message = "The buck is broken expertly!" /datum/wound/fracture/groin/on_mob_gain(mob/living/affected) diff --git a/code/datums/wounds/types/punctures.dm b/code/datums/wounds/types/punctures.dm index b3b7bddbc..ccdae3b60 100644 --- a/code/datums/wounds/types/punctures.dm +++ b/code/datums/wounds/types/punctures.dm @@ -41,7 +41,7 @@ /datum/wound/puncture/drilling name = "drilling" - check_name = "DRILLING" + check_name = span_bloody("DRILLING") severity = WOUND_SEVERITY_SUPERFICIAL whp = 40 sewn_whp = 20 diff --git a/code/datums/wounds/types/slashes.dm b/code/datums/wounds/types/slashes.dm index 507565ce4..4c483becc 100644 --- a/code/datums/wounds/types/slashes.dm +++ b/code/datums/wounds/types/slashes.dm @@ -41,7 +41,7 @@ /datum/wound/slash/disembowel name = "disembowelment" - check_name = "GUTS" + check_name = span_userdanger("GUTS") severity = WOUND_SEVERITY_FATAL crit_message = list( "%VICTIM spills %P_THEIR organs!", @@ -100,7 +100,7 @@ /datum/wound/slash/incision name = "incision" - check_name = "INCISION" + check_name = span_bloody("INCISION") severity = WOUND_SEVERITY_SUPERFICIAL whp = 40 sewn_whp = 12 diff --git a/code/datums/wounds/types/special.dm b/code/datums/wounds/types/special.dm index 6e3fd69e0..c0dbd575a 100644 --- a/code/datums/wounds/types/special.dm +++ b/code/datums/wounds/types/special.dm @@ -15,7 +15,7 @@ /datum/wound/facial/ears name = "tympanosectomy" - check_name = "EARS" + check_name = span_danger("EARS") crit_message = list( "The eardrums are gored!", "The eardrums are ruptured!", @@ -40,7 +40,7 @@ /datum/wound/facial/eyes name = "eye evisceration" - check_name = "EYE" + check_name = span_warning("EYE") crit_message = list( "The eye is poked!", "The eye is gouged!", @@ -64,7 +64,7 @@ /datum/wound/facial/eyes/right name = "right eye evisceration" - check_name = "RIGHT EYE" + check_name = span_danger("RIGHT EYE") crit_message = list( "The right eye is poked!", "The right eye is gouged!", @@ -96,7 +96,7 @@ /datum/wound/facial/eyes/left name = "left eye evisceration" - check_name = "LEFT EYE" + check_name = span_danger("LEFT EYE") crit_message = list( "The left eye is poked!", "The left eye is gouged!", @@ -128,7 +128,7 @@ /datum/wound/facial/tongue name = "glossectomy" - check_name = "TONGUE" + check_name = span_danger("TONGUE") crit_message = list( "The tongue is cut!", "The tongue is severed!", @@ -154,7 +154,7 @@ /datum/wound/facial/disfigurement name = "disfigurement" - check_name = "FACE" + check_name = span_warning("FACE") severity = 0 crit_message = "The face is mangled beyond recognition!" whp = null @@ -174,7 +174,7 @@ /datum/wound/facial/disfigurement/nose name = "rhinotomy" - check_name = "NOSE" + check_name = span_warning("NOSE") crit_message = list( "The nose is mangled beyond recognition!", "The nose is destroyed!", @@ -192,7 +192,7 @@ /datum/wound/cbt name = "testicular torsion" - check_name = "NUTCRACK" + check_name = span_userdanger("NUTCRACK") crit_message = list( "The testicles are twisted!", "The testicles are torsioned!", @@ -215,17 +215,17 @@ . = ..() affected.emote("groin", forced = TRUE) affected.Stun(20) - to_chat(affected, "Something twists inside my groin!") + to_chat(affected, span_userdanger("Something twists inside my groin!")) if(affected.gender != MALE) name = "ovarian torsion" - check_name = "EGGCRACK" + check_name = span_userdanger("EGGCRACK") crit_message = list( "The ovaries are twisted!", "The ovaries are torsioned!", ) else name = "testicular torsion" - check_name = "NUTCRACK" + check_name = span_userdanger("NUTCRACK") crit_message = list( "The testicles are twisted!", "The testicles are torsioned!", @@ -253,14 +253,14 @@ . = ..() if(affected.gender != MALE) name = "ovarian evisceration" - check_name = "EGGCRACK" + check_name = span_userdanger("EGGCRACK") crit_message = list( "The ovaries are destroyed!", "The ovaries are eviscerated!", ) else name = "testicular evisceration" - check_name = "NUTCRACK" + check_name = span_userdanger("NUTCRACK") crit_message = list( "The testicles are destroyed!", "The testicles are eviscerated!", diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index c66907354..6caa15de3 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -399,7 +399,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Bar" icon_state = "bar" mood_bonus = 5 - mood_message = "I love being in the bar!\n" + mood_message = span_nicegreen("I love being in the bar!\n") /area/crew_quarters/bar/atrium name = "Atrium" diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 3e07ae50b..706827813 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -39,7 +39,7 @@ /// Bonus mood for being in this area var/mood_bonus = 0 /// Mood message for being here, only shows up if mood_bonus != 0 - var/mood_message = "This area is pretty nice!\n" + var/mood_message = span_nicegreen("This area is pretty nice!\n") var/power_equip = TRUE var/power_light = TRUE diff --git a/code/game/atoms.dm b/code/game/atoms.dm index cf8ce7ca8..713b9d587 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -491,7 +491,7 @@ . = list("[get_examine_string(user, TRUE)].[get_inspect_button()]") if(desc) - . += "[desc]" + . += span_info("[desc]") // if(custom_materials) // for(var/i in custom_materials) @@ -521,9 +521,9 @@ . += "Nothing." else if(reagents.flags & AMOUNT_VISIBLE) if(reagents.total_volume) - . += "It has [round(reagents.total_volume / 3)] oz left." + . += span_notice("It has [round(reagents.total_volume / 3)] oz left.") else - . += "It's empty." + . += span_danger("It's empty.") SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) @@ -561,7 +561,7 @@ /atom/proc/relaymove(mob/user) if(buckle_message_cooldown <= world.time) buckle_message_cooldown = world.time + 50 - to_chat(user, "I should try resisting.") + to_chat(user, span_warning("I should try resisting.")) return /// Handle what happens when your contents are exploded by a bomb @@ -763,7 +763,7 @@ while (do_after(user, 10, TRUE, src, FALSE, CALLBACK(STR, TYPE_PROC_REF(/datum/component/storage, handle_mass_item_insertion), things, src_object, user, progress))) stoplag(1) qdel(progress) - to_chat(user, "I dump as much of [src_object.parent]'s contents [STR.insert_preposition]to [src] as I can.") + to_chat(user, span_notice("I dump as much of [src_object.parent]'s contents [STR.insert_preposition]to [src] as I can.")) STR.orient2hud(user) STR.update_icon() src_object.update_icon() @@ -945,7 +945,7 @@ else valid_id = TRUE if(!valid_id) - to_chat(usr, "A reagent with that ID doesn't exist!") + to_chat(usr, span_warning("A reagent with that ID doesn't exist!")) if("Choose from a list") chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in sortList(subtypesof(/datum/reagent), GLOBAL_PROC_REF(cmp_typepaths_asc)) if("I'm feeling lucky") @@ -955,7 +955,7 @@ if(amount) reagents.add_reagent(chosen_id, amount) log_admin("[key_name(usr)] has added [amount] units of [chosen_id] to [src]") - message_admins("[key_name(usr)] has added [amount] units of [chosen_id] to [src]") + message_admins(span_notice("[key_name(usr)] has added [amount] units of [chosen_id] to [src]")) if(href_list[VV_HK_TRIGGER_EXPLOSION] && check_rights(R_FUN)) usr.client.cmd_admin_explosion(src) if(href_list[VV_HK_TRIGGER_EMP] && check_rights(R_FUN)) @@ -1073,7 +1073,7 @@ /atom/proc/multitool_check_buffer(user, obj/item/I, silent = FALSE) if(!istype(I, /obj/item/multitool)) if(user && !silent) - to_chat(user, "[I] has no data buffer!") + to_chat(user, span_warning("[I] has no data buffer!")) return FALSE return TRUE diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index c42770bd3..c07bab83b 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -168,8 +168,8 @@ if(M.doing) M.doing = FALSE if(!supress_message) - M.visible_message("[src] grabs [M].", \ - "[src] grabs you.") + M.visible_message(span_warning("[src] grabs [M]."), \ + span_danger("[src] grabs you.")) return TRUE /atom/movable/proc/stop_pulling(forced = TRUE) @@ -692,12 +692,12 @@ /atom/movable/proc/force_push(atom/movable/AM, force = move_force, direction, silent = FALSE) . = AM.force_pushed(src, force, direction) if(!silent && .) - visible_message("[src] forcefully pushes against [AM]!", "I forcefully push against [AM]!") + visible_message(span_warning("[src] forcefully pushes against [AM]!"), span_warning("I forcefully push against [AM]!")) /atom/movable/proc/move_crush(atom/movable/AM, force = move_force, direction, silent = FALSE) . = AM.move_crushed(src, force, direction) if(!silent && .) - visible_message("[src] crushes past [AM]!", "I crush [AM]!") + visible_message(span_danger("[src] crushes past [AM]!"), span_danger("I crush [AM]!")) /atom/movable/proc/move_crushed(atom/movable/pusher, force = MOVE_FORCE_DEFAULT, direction) return FALSE diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm index 0d0d8133d..b040ce3f5 100644 --- a/code/game/gamemodes/clown_ops/clown_weapons.dm +++ b/code/game/gamemodes/clown_ops/clown_weapons.dm @@ -91,7 +91,7 @@ /obj/item/melee/transforming/energy/sword/bananium/attackby(obj/item/I, mob/living/user, params) if((world.time > next_trombone_allowed) && istype(I, /obj/item/melee/transforming/energy/sword/bananium)) next_trombone_allowed = world.time + 50 - to_chat(user, "I slap the two swords together. Sadly, they do not seem to fit!") + to_chat(user, span_warning("I slap the two swords together. Sadly, they do not seem to fit!")) playsound(src, 'sound/blank.ogg', 50) return TRUE return ..() @@ -107,7 +107,7 @@ /obj/item/melee/transforming/energy/sword/bananium/suicide_act(mob/user) if(!active) transform_weapon(user, TRUE) - user.visible_message("[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku, but the blade slips off of [user.p_them()] harmlessly!") + user.visible_message(span_suicide("[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku, but the blade slips off of [user.p_them()] harmlessly!")) var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery) slipper.Slip(src, user) return SHAME @@ -179,7 +179,7 @@ bomb = new /obj/item/grenade/syndieminibomb(src) bomb.det_time = det_time if(iscarbon(loc)) - to_chat(loc, "[src] begins to beep.") + to_chat(loc, span_danger("[src] begins to beep.")) var/mob/living/carbon/C = loc C.throw_mode_on() bomb.preprime(loc, null, FALSE) @@ -193,7 +193,7 @@ QDEL_NULL(bomb) /obj/item/grown/bananapeel/bombanana/suicide_act(mob/user) - user.visible_message("[user] is deliberately slipping on the [src.name]! It looks like \he's trying to commit suicide.") + user.visible_message(span_suicide("[user] is deliberately slipping on the [src.name]! It looks like \he's trying to commit suicide.")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) bomb.preprime(user, 0, FALSE) return (BRUTELOSS) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 6ca5ef3a0..7e6d30c1b 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -86,7 +86,7 @@ return 0 return 1 else - message_admins("DEBUG: GAME STARTING WITHOUT PLAYER NUMBER CHECKS, THIS WILL PROBABLY BREAK SHIT.") + message_admins(span_notice("DEBUG: GAME STARTING WITHOUT PLAYER NUMBER CHECKS, THIS WILL PROBABLY BREAK SHIT.")) return 1 @@ -507,7 +507,7 @@ //Reports player logouts// ////////////////////////// /proc/display_roundstart_logout_report() - var/list/msg = list("Roundstart logout report\n\n") + var/list/msg = list(span_boldnotice("Roundstart logout report\n\n")) for(var/i in GLOB.mob_living_list) var/mob/living/L = i var/mob/living/carbon/C = L diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index dc6eee099..0f33c03b4 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -40,11 +40,11 @@ ++survivors if(player.onCentCom()) - survivor_list += "[player.real_name] escaped to the safety of CentCom." + survivor_list += span_greentext("[player.real_name] escaped to the safety of CentCom.") else if(player.onSyndieBase()) - survivor_list += "[player.real_name] escaped to the (relative) safety of Syndicate Space." + survivor_list += span_greentext("[player.real_name] escaped to the (relative) safety of Syndicate Space.") else - survivor_list += "[player.real_name] survived but is stranded without any hope of rescue." + survivor_list += span_neutraltext("[player.real_name] survived but is stranded without any hope of rescue.") if(survivors) return "
The following survived the meteor storm:
[survivor_list.Join("
")]
" diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 1b4d56f3f..a67075abf 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -143,7 +143,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event for(var/atom/A in T) if(A != src) if(isliving(A)) - A.visible_message("[src] slams into [A].", "[src] slams into you!.") + A.visible_message(span_warning("[src] slams into [A]."), span_danger("[src] slams into you!.")) A.ex_act(hitpwr) //then, ram the turf if it still exists diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 0fe42b62b..ae8a7633d 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -849,7 +849,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) var/mob/new_target = input(admin,"Select target:", "Objective target") as null|anything in sortNames(possible_targets) target = new_target.mind else - to_chat(admin, "No active AIs with minds.") + to_chat(admin, span_boldwarning("No active AIs with minds.")) update_explanation_text() /datum/objective/destroy/internal diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index 0aeea5778..9ac74c3cd 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -69,13 +69,13 @@ if(O.tool_behaviour == TOOL_WELDER && user.used_intent.type != INTENT_HARM) if(!O.tool_start_check(user, amount=0)) return - user.visible_message("[user] is repairing [src].", \ - "I begin repairing [src]...", \ - "I hear welding.") + user.visible_message(span_notice("[user] is repairing [src]."), \ + span_notice("I begin repairing [src]..."), \ + span_hear("I hear welding.")) if(O.use_tool(src, user, 40, volume=50)) if(!(stat & BROKEN)) return - to_chat(user, "I repair [src].") + to_chat(user, span_notice("I repair [src].")) stat &= ~BROKEN obj_integrity = max_integrity update_icon() @@ -89,7 +89,7 @@ else if(istype(O, /obj/item/pda)) if(storedpda) - to_chat(user, "There is already a PDA inside!") + to_chat(user, span_warning("There is already a PDA inside!")) return else if(!user.transferItemToLoc(O, src)) return @@ -111,7 +111,7 @@ if(storedpda) if(stat & BROKEN) //otherwise the PDA is stuck until repaired ejectpda() - to_chat(user, "I manage to eject the loaded PDA.") + to_chat(user, span_info("I manage to eject the loaded PDA.")) else var/obj/item/pda/P P = input(user, "Select your color!", "PDA Painting") as null|anything in sortNames(colorlist) @@ -126,7 +126,7 @@ ejectpda() else - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) /obj/machinery/pdapainter/verb/ejectpda() @@ -142,4 +142,4 @@ storedpda = null update_icon() else - to_chat(usr, "[src] is empty!") + to_chat(usr, span_warning("[src] is empty!")) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 68bb233cb..176ee603f 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -27,7 +27,7 @@ ) var/list/chem_buttons //Used when emagged to scramble which chem is used, eg: mutadone -> morphine var/scrambled_chems = FALSE //Are chem buttons scrambled? used as a warning - var/enter_message = "I feel cool air surround you. You go numb as your senses turn inward." + var/enter_message = span_notice("I feel cool air surround you. You go numb as your senses turn inward.") payment_department = ACCOUNT_MED fair_market_price = 5 @@ -62,8 +62,8 @@ icon_state = initial(icon_state) /obj/machinery/sleeper/container_resist(mob/living/user) - visible_message("[occupant] emerges from [src]!", - "I climb out of [src]!") + visible_message(span_notice("[occupant] emerges from [src]!"), + span_notice("I climb out of [src]!")) open_machine() /obj/machinery/sleeper/Exited(atom/movable/user) @@ -108,10 +108,10 @@ if(..()) return if(occupant) - to_chat(user, "[src] is currently occupied!") + to_chat(user, span_warning("[src] is currently occupied!")) return if(state_open) - to_chat(user, "[src] must be closed to [panel_open ? "close" : "open"] its maintenance hatch!") + to_chat(user, span_warning("[src] must be closed to [panel_open ? "close" : "open"] its maintenance hatch!")) return if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-o", initial(icon_state), I)) return @@ -133,7 +133,7 @@ . = !(state_open || panel_open || (flags_1 & NODECONSTRUCT_1)) && I.tool_behaviour == TOOL_CROWBAR if(.) I.play_tool_sound(src, 50) - visible_message("[usr] pries open [src].", "I pry open [src].") + visible_message(span_notice("[usr] pries open [src]."), span_notice("I pry open [src].")) open_machine() /obj/machinery/sleeper/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ @@ -157,7 +157,7 @@ /obj/machinery/sleeper/examine(mob/user) . = ..() - . += "Alt-click [src] to [state_open ? "close" : "open"] it." + . += span_notice("Alt-click [src] to [state_open ? "close" : "open"] it.") /obj/machinery/sleeper/process() ..() @@ -229,11 +229,11 @@ if(inject_chem(chem, usr)) . = TRUE if(scrambled_chems && prob(5)) - to_chat(usr, "Chemical system re-route detected, results may not be as expected!") + to_chat(usr, span_warning("Chemical system re-route detected, results may not be as expected!")) /obj/machinery/sleeper/emag_act(mob/user) scramble_chem_buttons() - to_chat(user, "I scramble the sleeper's user interface!") + to_chat(user, span_warning("I scramble the sleeper's user interface!")) /obj/machinery/sleeper/proc/inject_chem(chem, mob/user) if((chem in available_chems) && chem_allowed(chem)) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 5d073c8b7..2a72cfc60 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -323,7 +323,7 @@ Class Procs: else user.changeNext_move(CLICK_CD_MELEE) // user.do_attack_animation(src, ATTACK_EFFECT_PUNCH) - user.visible_message("[user.name] smashes against \the [src.name] with its paws.", null, null, COMBAT_MESSAGE_RANGE) + user.visible_message(span_danger("[user.name] smashes against \the [src.name] with its paws."), null, null, COMBAT_MESSAGE_RANGE) take_damage(4, BRUTE, "slash", 1) /obj/machinery/attack_robot(mob/user) @@ -355,7 +355,7 @@ Class Procs: . = !(state_open || panel_open || is_operational() || (flags_1 & NODECONSTRUCT_1)) && I.tool_behaviour == TOOL_CROWBAR if(.) I.play_tool_sound(src, 50) - visible_message("[usr] pries open \the [src].", "I pry open \the [src].") + visible_message(span_notice("[usr] pries open \the [src]."), span_notice("I pry open \the [src].")) open_machine() /obj/machinery/proc/default_deconstruction_crowbar(obj/item/I, ignore_panel = 0) @@ -409,11 +409,11 @@ Class Procs: if(!panel_open) panel_open = TRUE icon_state = icon_state_open - to_chat(user, "I open the maintenance hatch of [src].") + to_chat(user, span_notice("I open the maintenance hatch of [src].")) else panel_open = FALSE icon_state = icon_state_closed - to_chat(user, "I close the maintenance hatch of [src].") + to_chat(user, span_notice("I close the maintenance hatch of [src].")) return TRUE return FALSE @@ -421,13 +421,13 @@ Class Procs: if(panel_open && I.tool_behaviour == TOOL_WRENCH) I.play_tool_sound(src, 50) setDir(turn(dir,-90)) - to_chat(user, "I rotate [src].") + to_chat(user, span_notice("I rotate [src].")) return 1 return 0 /obj/proc/can_be_unfasten_wrench(mob/user, silent) //if we can unwrench this object; returns SUCCESSFUL_UNFASTEN and FAILED_UNFASTEN, which are both TRUE, or CANT_UNFASTEN, which isn't. if(!(isfloorturf(loc) || istype(loc, /turf/open/indestructible)) && !anchored) - to_chat(user, "[src] needs to be on the floor to be secured!") + to_chat(user, span_warning("[src] needs to be on the floor to be secured!")) return FAILED_UNFASTEN return SUCCESSFUL_UNFASTEN @@ -437,12 +437,12 @@ Class Procs: if(!can_be_unfasten || can_be_unfasten == FAILED_UNFASTEN) return can_be_unfasten if(time) - to_chat(user, "I begin [anchored ? "un" : ""]securing [src]...") + to_chat(user, span_notice("I begin [anchored ? "un" : ""]securing [src]...")) I.play_tool_sound(src, 50) var/prev_anchored = anchored //as long as we're the same anchored state and we're either on a floor or are anchored, toggle our anchored state if(I.use_tool(src, user, time, extra_checks = CALLBACK(src, PROC_REF(unfasten_wrench_check), prev_anchored, user))) - to_chat(user, "I [anchored ? "un" : ""]secure [src].") + to_chat(user, span_notice("I [anchored ? "un" : ""]secure [src].")) setAnchored(!anchored) playsound(src, 'sound/blank.ogg', 50, TRUE) SEND_SIGNAL(src, COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH, anchored) @@ -491,7 +491,7 @@ Class Procs: B.moveToNullspace() SEND_SIGNAL(W, COMSIG_TRY_STORAGE_INSERT, A, null, null, TRUE) component_parts -= A - to_chat(user, "[capitalize(A.name)] replaced with [B.name].") + to_chat(user, span_notice("[capitalize(A.name)] replaced with [B.name].")) shouldplaysound = 1 //Only play the sound when parts are actually replaced! break RefreshParts() @@ -504,9 +504,9 @@ Class Procs: /obj/machinery/proc/display_parts(mob/user) . = list() - . += "It contains the following parts:" + . += span_notice("It contains the following parts:") for(var/obj/item/C in component_parts) - . += "[icon2html(C, user)] \A [C]." + . += span_notice("[icon2html(C, user)] \A [C].") . = jointext(., "") /obj/machinery/examine(mob/user) @@ -520,7 +520,7 @@ Class Procs: if(25 to 50) . += "It appears heavily damaged." if(0 to 25) - . += "It's falling apart!" + . += span_warning("It's falling apart!") // if(user.research_scanner && component_parts) // . += display_parts(user, TRUE) @@ -611,13 +611,13 @@ Class Procs: adjusted_climb_time -= user.STASPD * 2 adjusted_climb_time = max(adjusted_climb_time, 0) // if(adjusted_climb_time) -// user.visible_message("[user] starts climbing onto [src].", "I start climbing onto [src]...") +// user.visible_message(span_warning("[user] starts climbing onto [src]."), span_warning("I start climbing onto [src]...")) structureclimber = user if(do_mob(user, user, adjusted_climb_time)) if(src.loc) //Checking if structure has been destroyed if(do_climb(user)) - user.visible_message("[user] climbs onto [src].", \ - "I climb onto [src].") + user.visible_message(span_warning("[user] climbs onto [src]."), \ + span_notice("I climb onto [src].")) log_combat(user, src, "climbed onto") // if(climb_offset) // user.set_mob_offsets("structure_climb", _x = 0, _y = climb_offset) @@ -627,5 +627,5 @@ Class Procs: playsound(src, climb_sound, 100) . = 1 else - to_chat(user, "I fail to climb onto [src].") + to_chat(user, span_warning("I fail to climb onto [src].")) structureclimber = null diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 6f30ee737..a05f77290 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -15,7 +15,7 @@ /obj/machinery/ai_slipper/examine(mob/user) . = ..() - . += "It has [uses] uses of foam remaining." + . += span_notice("It has [uses] uses of foam remaining.") /obj/machinery/ai_slipper/update_icon_state() if(stat & BROKEN) @@ -27,17 +27,17 @@ /obj/machinery/ai_slipper/interact(mob/user) if(!allowed(user)) - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) return if(!uses) - to_chat(user, "[src] is out of foam and cannot be activated!") + to_chat(user, span_warning("[src] is out of foam and cannot be activated!")) return if(cooldown_time > world.time) - to_chat(user, "[src] cannot be activated for [DisplayTimeText(world.time - cooldown_time)]!") + to_chat(user, span_warning("[src] cannot be activated for [DisplayTimeText(world.time - cooldown_time)]!")) return new /obj/effect/particle_effect/foam(loc) uses-- - to_chat(user, "I activate [src]. It now has [uses] uses of foam remaining.") + to_chat(user, span_notice("I activate [src]. It now has [uses] uses of foam remaining.")) cooldown = world.time + cooldown_time power_change() addtimer(CALLBACK(src, PROC_REF(power_change)), cooldown_time) diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index 37e965952..4548ea0aa 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -58,12 +58,12 @@ GLOBAL_LIST_EMPTY(announcement_systems) if(P.tool_behaviour == TOOL_SCREWDRIVER) P.play_tool_sound(src) panel_open = !panel_open - to_chat(user, "I [panel_open ? "open" : "close"] the maintenance hatch of [src].") + to_chat(user, span_notice("I [panel_open ? "open" : "close"] the maintenance hatch of [src].")) update_icon() else if(default_deconstruction_crowbar(P)) return else if(P.tool_behaviour == TOOL_MULTITOOL && panel_open && (stat & BROKEN)) - to_chat(user, "I reset [src]'s firmware.") + to_chat(user, span_notice("I reset [src]'s firmware.")) stat &= ~BROKEN update_icon() else @@ -100,7 +100,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) if(!user.canUseTopic(src, !issilicon(user))) return if(stat & BROKEN) - visible_message("[src] buzzes.", "I hear a faint buzz.") + visible_message(span_warning("[src] buzzes."), span_hear("I hear a faint buzz.")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) return @@ -118,7 +118,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) if(!usr.canUseTopic(src, !issilicon(usr))) return if(stat & BROKEN) - visible_message("[src] buzzes.", "I hear a faint buzz.") + visible_message(span_warning("[src] buzzes."), span_hear("I hear a faint buzz.")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) return @@ -152,7 +152,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) if(!user.canUseTopic(src, !issilicon(user))) return if(stat & BROKEN) - to_chat(user, "[src]'s firmware appears to be malfunctioning!") + to_chat(user, span_warning("[src]'s firmware appears to be malfunctioning!")) return interact(user) diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index 7ad148e9c..7da6c8e34 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -13,7 +13,7 @@ /obj/machinery/aug_manipulator/examine(mob/user) . = ..() if(storedpart) - . += "Alt-click to eject the limb." + . += span_notice("Alt-click to eject the limb.") /obj/machinery/aug_manipulator/Initialize() initial_icon_state = initial(icon_state) @@ -60,10 +60,10 @@ else if(istype(O, /obj/item/bodypart)) var/obj/item/bodypart/B = O if(B.status != BODYPART_ROBOTIC) - to_chat(user, "The machine only accepts cybernetics!") + to_chat(user, span_warning("The machine only accepts cybernetics!")) return if(storedpart) - to_chat(user, "There is already something inside!") + to_chat(user, span_warning("There is already something inside!")) return else O = user.get_active_held_item() @@ -78,19 +78,19 @@ if(!O.tool_start_check(user, amount=0)) return - user.visible_message("[user] begins repairing [src].", \ - "I begin repairing [src]...", \ - "I hear welding.") + user.visible_message(span_notice("[user] begins repairing [src]."), \ + span_notice("I begin repairing [src]..."), \ + span_hear("I hear welding.")) if(O.use_tool(src, user, 40, volume=50)) if(!(stat & BROKEN)) return - to_chat(user, "I repair [src].") + to_chat(user, span_notice("I repair [src].")) stat &= ~BROKEN obj_integrity = max(obj_integrity, max_integrity) update_icon() else - to_chat(user, "[src] does not need repairs.") + to_chat(user, span_notice("[src] does not need repairs.")) else return ..() @@ -112,7 +112,7 @@ eject_part(user) else - to_chat(user, "\The [src] is empty!") + to_chat(user, span_warning("\The [src] is empty!")) /obj/machinery/aug_manipulator/proc/eject_part(mob/living/user) if(storedpart) @@ -120,7 +120,7 @@ storedpart = null update_icon() else - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) /obj/machinery/aug_manipulator/AltClick(mob/living/user) ..() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index c93d36381..5360e9049 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -123,9 +123,9 @@ return TRUE if(istype(O, /obj/item/disk/design_disk)) - user.visible_message("[user] begins to load \the [O] in \the [src]...", - "I begin to load a design from \the [O]...", - "I hear the chatter of a floppy drive.") + user.visible_message(span_notice("[user] begins to load \the [O] in \the [src]..."), + span_notice("I begin to load a design from \the [O]..."), + span_hear("I hear the chatter of a floppy drive.")) busy = TRUE var/obj/item/disk/design_disk/D = O if(do_after(user, 14.4, target = src)) @@ -272,7 +272,7 @@ . += ..() var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Storing up to [materials.max_amount] material units.
Material consumption at [prod_coeff*100]%.
" + . += span_notice("The status display reads: Storing up to [materials.max_amount] material units.
Material consumption at [prod_coeff*100]%.") /obj/machinery/autolathe/proc/main_win(mob/user) var/dat = "

Autolathe Menu:


" @@ -311,7 +311,7 @@ continue if(disabled || !can_build(D)) - dat += "[D.name]" + dat += span_linkoff("[D.name]") else dat += "[D.name]" @@ -345,7 +345,7 @@ for(var/v in matching_designs) var/datum/design/D = v if(disabled || !can_build(D)) - dat += "[D.name]" + dat += span_linkoff("[D.name]") else dat += "[D.name]" diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index d83752ea7..99d760a8d 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -33,7 +33,7 @@ var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) if(D) D.adjust_money(value) - to_chat(user, "I deposit [I]. The Cargo Budget is now $[D.account_balance].") + to_chat(user, span_notice("I deposit [I]. The Cargo Budget is now $[D.account_balance].")) qdel(I) return return ..() diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index d5e2273b2..765f65c7a 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -66,34 +66,34 @@ default_deconstruction_screwdriver(user, "button-open", "[skin]",W) update_icon() else - to_chat(user, "Maintenance Access Denied.") + to_chat(user, span_alert("Maintenance Access Denied.")) flick("[skin]-denied", src) return if(panel_open) if(!device && istype(W, /obj/item/assembly)) if(!user.transferItemToLoc(W, src)) - to_chat(user, "\The [W] is stuck to you!") + to_chat(user, span_warning("\The [W] is stuck to you!")) return device = W - to_chat(user, "I add [W] to the button.") + to_chat(user, span_notice("I add [W] to the button.")) if(!board && istype(W, /obj/item/electronics/airlock)) if(!user.transferItemToLoc(W, src)) - to_chat(user, "\The [W] is stuck to you!") + to_chat(user, span_warning("\The [W] is stuck to you!")) return board = W if(board.one_access) req_one_access = board.accesses else req_access = board.accesses - to_chat(user, "I add [W] to the button.") + to_chat(user, span_notice("I add [W] to the button.")) if(!device && !board && W.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I start unsecuring the button frame...") + to_chat(user, span_notice("I start unsecuring the button frame...")) W.play_tool_sound(src) if(W.use_tool(src, user, 40)) - to_chat(user, "I unsecure the button frame.") + to_chat(user, span_notice("I unsecure the button frame.")) transfer_fingerprints_to(new /obj/item/wallframe/button(get_turf(src))) playsound(loc, 'sound/blank.ogg', 50, TRUE) qdel(src) @@ -150,14 +150,14 @@ req_one_access = list() board = null update_icon() - to_chat(user, "I remove electronics from the button frame.") + to_chat(user, span_notice("I remove electronics from the button frame.")) else if(skin == "doorctrl") skin = "launcher" else skin = "doorctrl" - to_chat(user, "I change the button frame's front panel.") + to_chat(user, span_notice("I change the button frame's front panel.")) return if((stat & (NOPOWER|BROKEN))) @@ -167,7 +167,7 @@ return if(!allowed(user)) - to_chat(user, "Access Denied.") + to_chat(user, span_alert("Access Denied.")) flick("[skin]-denied", src) return diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index ee3faf7fd..f15836e6f 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -112,24 +112,24 @@ if(isEmpProof(TRUE)) //don't reveal it's upgraded if was done via MALF AI Upgrade Camera Network ability . += "It has electromagnetic interference shielding installed." else - . += "It can be shielded against electromagnetic interference with some plasma." + . += span_info("It can be shielded against electromagnetic interference with some plasma.") if(isXRay(TRUE)) //don't reveal it's upgraded if was done via MALF AI Upgrade Camera Network ability . += "It has an X-ray photodiode installed." else - . += "It can be upgraded with an X-ray photodiode with an analyzer." + . += span_info("It can be upgraded with an X-ray photodiode with an analyzer.") if(isMotion()) . += "It has a proximity sensor installed." else - . += "It can be upgraded with a proximity sensor." + . += span_info("It can be upgraded with a proximity sensor.") if(!status) - . += "It's currently deactivated." + . += span_info("It's currently deactivated.") if(!panel_open && powered()) - . += "You'll need to open its maintenance panel with a screwdriver to turn it back on." + . += span_notice("You'll need to open its maintenance panel with a screwdriver to turn it back on.") if(panel_open) - . += "Its maintenance panel is currently open." + . += span_info("Its maintenance panel is currently open.") if(!status && powered()) - . += "It can reactivated with wirecutters." + . += span_info("It can reactivated with wirecutters.") /obj/machinery/camera/emp_act(severity) . = ..() @@ -150,7 +150,7 @@ if (M.client.eye == src) M.unset_machine() M.reset_perspective(null) - to_chat(M, "The screen bursts into static!") + to_chat(M, span_warning("The screen bursts into static!")) /obj/machinery/camera/proc/post_emp_reset(thisemp, previous_network) if(QDELETED(src)) @@ -190,7 +190,7 @@ if(..()) return TRUE panel_open = !panel_open - to_chat(user, "I screw the camera's panel [panel_open ? "open" : "closed"].") + to_chat(user, span_notice("I screw the camera's panel [panel_open ? "open" : "closed"].")) I.play_tool_sound(src) update_icon() return TRUE @@ -211,7 +211,7 @@ var/obj/item/choice = input(user, "Select a part to remove:", src) as null|obj in sortNames(droppable_parts) if(!choice || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return - to_chat(user, "I remove [choice] from [src].") + to_chat(user, span_notice("I remove [choice] from [src].")) if(choice == assembly.xray_module) assembly.drop_upgrade(assembly.xray_module) removeXRay() @@ -240,7 +240,7 @@ return setViewRange((view_range == initial(view_range)) ? short_range : initial(view_range)) - to_chat(user, "I [(view_range == initial(view_range)) ? "restore" : "mess up"] the camera's focus.") + to_chat(user, span_notice("I [(view_range == initial(view_range)) ? "restore" : "mess up"] the camera's focus.")) return TRUE /obj/machinery/camera/welder_act(mob/living/user, obj/item/I) @@ -251,10 +251,10 @@ if(!I.tool_start_check(user, amount=0)) return TRUE - to_chat(user, "I start to weld [src]...") + to_chat(user, span_notice("I start to weld [src]...")) if(I.use_tool(src, user, 100, volume=50)) - user.visible_message("[user] unwelds [src], leaving it as just a frame bolted to the wall.", - "I unweld [src], leaving it as just a frame bolted to the wall") + user.visible_message(span_warning("[user] unwelds [src], leaving it as just a frame bolted to the wall."), + span_warning("I unweld [src], leaving it as just a frame bolted to the wall")) deconstruct(TRUE) return TRUE @@ -267,19 +267,19 @@ if(!user.temporarilyRemoveItemFromInventory(I)) return upgradeXRay(FALSE, TRUE) - to_chat(user, "I attach [I] into [assembly]'s inner circuits.") + to_chat(user, span_notice("I attach [I] into [assembly]'s inner circuits.")) qdel(I) else - to_chat(user, "[src] already has that upgrade!") + to_chat(user, span_warning("[src] already has that upgrade!")) return else if(istype(I, /obj/item/stack/sheet/mineral/plasma)) if(!isEmpProof(TRUE)) //don't reveal it was already upgraded if was done via MALF AI Upgrade Camera Network ability if(I.use_tool(src, user, 0, amount=1)) upgradeEmpProof(FALSE, TRUE) - to_chat(user, "I attach [I] into [assembly]'s inner circuits.") + to_chat(user, span_notice("I attach [I] into [assembly]'s inner circuits.")) else - to_chat(user, "[src] already has that upgrade!") + to_chat(user, span_warning("[src] already has that upgrade!")) return else if(istype(I, /obj/item/assembly/prox_sensor)) @@ -287,10 +287,10 @@ if(!user.temporarilyRemoveItemFromInventory(I)) return upgradeMotion() - to_chat(user, "I attach [I] into [assembly]'s inner circuits.") + to_chat(user, span_notice("I attach [I] into [assembly]'s inner circuits.")) qdel(I) else - to_chat(user, "[src] already has that upgrade!") + to_chat(user, span_warning("[src] already has that upgrade!")) return // OTHER @@ -309,7 +309,7 @@ P = I itemname = P.name info = P.notehtml - to_chat(U, "I hold \the [itemname] up to the camera...") + to_chat(U, span_notice("I hold \the [itemname] up to the camera...")) U.changeNext_move(CLICK_CD_MELEE) for(var/mob/O in GLOB.player_list) if(isAI(O)) @@ -328,14 +328,14 @@ else if(istype(I, /obj/item/camera_bug)) if(!can_use()) - to_chat(user, "Camera non-functional.") + to_chat(user, span_notice("Camera non-functional.")) return if(bug) - to_chat(user, "Camera bug removed.") + to_chat(user, span_notice("Camera bug removed.")) bug.bugged_cameras -= src.c_tag bug = null else - to_chat(user, "Camera bugged.") + to_chat(user, span_notice("Camera bugged.")) bug = I bug.bugged_cameras[src.c_tag] = src return @@ -409,10 +409,10 @@ addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 100) if(displaymessage) if(user) - visible_message("[user] [change_msg] [src]!") + visible_message(span_danger("[user] [change_msg] [src]!")) add_hiddenprint(user) else - visible_message("\The [src] [change_msg]!") + visible_message(span_danger("\The [src] [change_msg]!")) playsound(src, 'sound/blank.ogg', 100, TRUE) update_icon() //update Initialize() if you remove this. @@ -424,7 +424,7 @@ if (O.client.eye == src) O.unset_machine() O.reset_perspective(null) - to_chat(O, "The screen bursts into static!") + to_chat(O, span_warning("The screen bursts into static!")) /obj/machinery/camera/proc/triggerCameraAlarm() alarm_on = TRUE diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index bff95188a..655127df1 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -37,30 +37,30 @@ . += "It has electromagnetic interference shielding installed." has_upgrades = TRUE else if(state == STATE_WIRED) - . += "It can be shielded against electromagnetic interference with some plasma." + . += span_info("It can be shielded against electromagnetic interference with some plasma.") if(xray_module) . += "It has an X-ray photodiode installed." has_upgrades = TRUE else if(state == STATE_WIRED) - . += "It can be upgraded with an X-ray photodiode with an analyzer." + . += span_info("It can be upgraded with an X-ray photodiode with an analyzer.") if(proxy_module) . += "It has a proximity sensor installed." has_upgrades = TRUE else if(state == STATE_WIRED) - . += "It can be upgraded with a proximity sensor." + . += span_info("It can be upgraded with a proximity sensor.") //construction states switch(state) if(STATE_WRENCHED) - . += "I can secure it in place with a welder, or removed with a wrench." + . += span_info("I can secure it in place with a welder, or removed with a wrench.") if(STATE_WELDED) - . += "I can add wires to it, or unweld it from the wall." + . += span_info("I can add wires to it, or unweld it from the wall.") if(STATE_WIRED) if(has_upgrades) - . += "I can remove the contained upgrades with a crowbar." - . += "I can complete it with a screwdriver, or unwire it to start removal." + . += span_info("I can remove the contained upgrades with a crowbar.") + . += span_info("I can complete it with a screwdriver, or unwire it to start removal.") if(STATE_FINISHED) - . += "I shouldn't be seeing this, tell a coder!" + . += span_boldwarning("I shouldn't be seeing this, tell a coder!") /obj/structure/camera_assembly/Initialize(mapload, ndir, building) . = ..() @@ -125,7 +125,7 @@ if(STATE_WRENCHED) if(W.tool_behaviour == TOOL_WELDER) if(weld(W, user)) - to_chat(user, "I weld [src] securely into place.") + to_chat(user, span_notice("I weld [src] securely into place.")) setAnchored(TRUE) state = STATE_WELDED return @@ -134,17 +134,17 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if(C.use(2)) - to_chat(user, "I add wires to [src].") + to_chat(user, span_notice("I add wires to [src].")) state = STATE_WIRED else - to_chat(user, "I need two lengths of cable to wire a camera!") + to_chat(user, span_warning("I need two lengths of cable to wire a camera!")) return return else if(W.tool_behaviour == TOOL_WELDER) if(weld(W, user)) - to_chat(user, "I unweld [src] from its place.") + to_chat(user, span_notice("I unweld [src] from its place.")) state = STATE_WRENCHED setAnchored(TRUE) return @@ -152,7 +152,7 @@ if(STATE_WIRED) // Upgrades! if(istype(W, /obj/item/stack/sheet/mineral/plasma)) //emp upgrade if(emp_module) - to_chat(user, "[src] already contains a [emp_module]!") + to_chat(user, span_warning("[src] already contains a [emp_module]!")) return if(!W.use_tool(src, user, 0, amount=1)) //only use one sheet, otherwise the whole stack will be consumed. return @@ -160,16 +160,16 @@ if(malf_xray_firmware_active) malf_xray_firmware_active = FALSE //flavor reason: MALF AI Upgrade Camera Network ability's firmware is incompatible with the new part //real reason: make it a normal upgrade so the finished camera's icons and examine texts are restored. - to_chat(user, "I attach [W] into [src]'s inner circuits.") + to_chat(user, span_notice("I attach [W] into [src]'s inner circuits.")) return else if(istype(W, /obj/item/analyzer)) //xray upgrade if(xray_module) - to_chat(user, "[src] already contains a [xray_module]!") + to_chat(user, span_warning("[src] already contains a [xray_module]!")) return if(!user.transferItemToLoc(W, src)) return - to_chat(user, "I attach [W] into [src]'s inner circuits.") + to_chat(user, span_notice("I attach [W] into [src]'s inner circuits.")) xray_module = W if(malf_xray_firmware_active) malf_xray_firmware_active = FALSE //flavor reason: MALF AI Upgrade Camera Network ability's firmware is incompatible with the new part @@ -179,11 +179,11 @@ else if(istype(W, /obj/item/assembly/prox_sensor)) //motion sensing upgrade if(proxy_module) - to_chat(user, "[src] already contains a [proxy_module]!") + to_chat(user, span_warning("[src] already contains a [proxy_module]!")) return if(!user.transferItemToLoc(W, src)) return - to_chat(user, "I attach [W] into [src]'s inner circuits.") + to_chat(user, span_notice("I attach [W] into [src]'s inner circuits.")) proxy_module = W return @@ -204,7 +204,7 @@ var/obj/item/choice = input(user, "Select a part to remove:", src) as null|obj in sortNames(droppable_parts) if(!choice || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return - to_chat(user, "I remove [choice] from [src].") + to_chat(user, span_notice("I remove [choice] from [src].")) drop_upgrade(choice) tool.play_tool_sound(src) return TRUE @@ -219,11 +219,11 @@ tool.play_tool_sound(src) var/input = stripped_input(user, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13") if(!input) - to_chat(user, "No input found, please hang up and try your call again!") + to_chat(user, span_warning("No input found, please hang up and try your call again!")) return var/list/tempnetwork = splittext(input, ",") if(tempnetwork.len < 1) - to_chat(user, "No network found, please hang up and try your call again!") + to_chat(user, span_warning("No network found, please hang up and try your call again!")) return for(var/i in tempnetwork) tempnetwork -= i @@ -245,7 +245,7 @@ new /obj/item/stack/cable_coil(drop_location(), 2) I.play_tool_sound(src) - to_chat(user, "I cut the wires from the circuits.") + to_chat(user, span_notice("I cut the wires from the circuits.")) state = STATE_WELDED return TRUE @@ -254,7 +254,7 @@ if(state != STATE_WRENCHED) return I.play_tool_sound(src) - to_chat(user, "I detach [src] from its place.") + to_chat(user, span_notice("I detach [src] from its place.")) new /obj/item/wallframe/camera(drop_location()) //drop upgrades if(xray_module) @@ -270,7 +270,7 @@ /obj/structure/camera_assembly/proc/weld(obj/item/weldingtool/W, mob/living/user) if(!W.tool_start_check(user, amount=3)) return FALSE - to_chat(user, "I start to weld [src]...") + to_chat(user, span_notice("I start to weld [src]...")) if(W.use_tool(src, user, 20, amount=3, volume = 50)) return TRUE return FALSE diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm index af5093d6c..3481dc985 100644 --- a/code/game/machinery/camera/motion.dm +++ b/code/game/machinery/camera/motion.dm @@ -66,7 +66,7 @@ for (var/mob/living/silicon/aiPlayer in GLOB.player_list) if (status) aiPlayer.triggerAlarm("Motion", get_area(src), list(src), src) - visible_message("A red light flashes on the [src]!") + visible_message(span_warning("A red light flashes on the [src]!")) detectTime = -1 return TRUE diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 04a4b1889..d4670b670 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -80,11 +80,11 @@ U.tracking = 1 if(!target || !target.can_track(usr)) - to_chat(U, "Target is not near any active cameras.") + to_chat(U, span_warning("Target is not near any active cameras.")) U.cameraFollow = null return - to_chat(U, "Now tracking [target.get_visible_name()] on camera.") + to_chat(U, span_notice("Now tracking [target.get_visible_name()] on camera.")) INVOKE_ASYNC(src, PROC_REF(do_track), target, U) @@ -98,11 +98,11 @@ if(!target.can_track(usr)) U.tracking = 1 if(!cameraticks) - to_chat(U, "Target is not near any active cameras. Attempting to reacquire...") + to_chat(U, span_warning("Target is not near any active cameras. Attempting to reacquire...")) cameraticks++ if(cameraticks > 9) U.cameraFollow = null - to_chat(U, "Unable to reacquire, cancelling track...") + to_chat(U, span_warning("Unable to reacquire, cancelling track...")) tracking = 0 return else diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index bb8239add..eb9924830 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -30,31 +30,31 @@ if(charging) . += "Current charge: [round(charging.percent(), 1)]%." if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Charge rate at [charge_rate]J per cycle." + . += span_notice("The status display reads: Charge rate at [charge_rate]J per cycle.") /obj/machinery/cell_charger/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stock_parts/cell) && !panel_open) if(stat & BROKEN) - to_chat(user, "[src] is broken!") + to_chat(user, span_warning("[src] is broken!")) return if(!anchored) - to_chat(user, "[src] isn't attached to the ground!") + to_chat(user, span_warning("[src] isn't attached to the ground!")) return if(charging) - to_chat(user, "There is already a cell in the charger!") + to_chat(user, span_warning("There is already a cell in the charger!")) return else var/area/a = loc.loc // Gets our locations location, like a dream within a dream if(!isarea(a)) return if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power! - to_chat(user, "[src] blinks red as you try to insert the cell!") + to_chat(user, span_warning("[src] blinks red as you try to insert the cell!")) return if(!user.transferItemToLoc(W,src)) return charging = W - user.visible_message("[user] inserts a cell into [src].", "I insert a cell into [src].") + user.visible_message(span_notice("[user] inserts a cell into [src]."), span_notice("I insert a cell into [src].")) update_icon() else if(!charging && default_deconstruction_screwdriver(user, icon_state, icon_state, W)) @@ -89,7 +89,7 @@ user.put_in_hands(charging) charging.add_fingerprint(user) - user.visible_message("[user] removes [charging] from [src].", "I remove [charging] from [src].") + user.visible_message(span_notice("[user] removes [charging] from [src]."), span_notice("I remove [charging] from [src].")) removecell() @@ -98,7 +98,7 @@ return charging.forceMove(loc) - to_chat(user, "I telekinetically remove [charging] from [src].") + to_chat(user, span_notice("I telekinetically remove [charging] from [src].")) removecell() diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 0ffb64963..f859c8e40 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -88,11 +88,11 @@ /obj/machinery/clonepod/examine(mob/user) . = ..() - . += "The linking device can be scanned with a multitool." + . += span_notice("The linking device can be scanned with a multitool.") if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Cloning speed at [speed_coeff*50]%.
Predicted amount of cellular damage: [100-heal_level]%.
" + . += span_notice("The status display reads: Cloning speed at [speed_coeff*50]%.
Predicted amount of cellular damage: [100-heal_level]%.") if(efficiency > 5) - . += "Pod has been upgraded to support autoprocessing and apply beneficial mutations." + . += span_notice("Pod has been upgraded to support autoprocessing and apply beneficial mutations.") //The return of data disks?? Just for transferring between genetics machine/cloning machine. //TO-DO: Make the genetics machine accept them. @@ -112,7 +112,7 @@ /obj/item/disk/data/attack_self(mob/user) read_only = !read_only - to_chat(user, "I flip the write-protect tab to [read_only ? "protected" : "unprotected"].") + to_chat(user, span_notice("I flip the write-protect tab to [read_only ? "protected" : "unprotected"].")) /obj/item/disk/data/examine(mob/user) . = ..() @@ -221,11 +221,11 @@ if(grab_ghost_when == CLONER_FRESH_CLONE) H.grab_ghost() - to_chat(H, "Consciousness slowly creeps over you as my body regenerates.
So this is what cloning feels like?
") + to_chat(H, span_notice("Consciousness slowly creeps over you as my body regenerates.
So this is what cloning feels like?")) if(grab_ghost_when == CLONER_MATURE_CLONE) H.ghostize(TRUE) //Only does anything if they were still in their old body and not already a ghost - to_chat(H.get_ghost(TRUE), "My body is beginning to regenerate in a cloning pod. You will become conscious when it is complete.") + to_chat(H.get_ghost(TRUE), span_notice("My body is beginning to regenerate in a cloning pod. You will become conscious when it is complete.")) if(H) H.faction |= factions @@ -364,16 +364,16 @@ var/mob/living/mob_occupant = occupant if(W.GetID()) if(!check_access(W)) - to_chat(user, "Access Denied.") + to_chat(user, span_danger("Access Denied.")) return if(!(mob_occupant || mess)) - to_chat(user, "Error: Pod has no occupant.") + to_chat(user, span_danger("Error: Pod has no occupant.")) return else add_fingerprint(user) connected_message("Emergency Ejection") SPEAK("An emergency ejection of [clonemind.name] has occurred. Survival not guaranteed.") - to_chat(user, "I force an emergency ejection. ") + to_chat(user, span_notice("I force an emergency ejection. ")) go_out() log_cloning("[key_name(user)] manually ejected [key_name(mob_occupant)] from [src] at [AREACOORD(src)].") log_combat(user, mob_occupant, "ejected", W, "from [src]") @@ -383,7 +383,7 @@ /obj/machinery/clonepod/emag_act(mob/user) if(!occupant) return - to_chat(user, "I corrupt the genetic compiler.") + to_chat(user, span_warning("I corrupt the genetic compiler.")) malfunction() add_fingerprint(user) log_cloning("[key_name(user)] emagged [src] at [AREACOORD(src)], causing it to malfunction.") @@ -414,7 +414,7 @@ unattached_flesh.Cut() mess = FALSE new /obj/effect/gibspawner/generic(get_turf(src), mob_occupant) - audible_message("I hear a splat.") + audible_message(span_hear("I hear a splat.")) icon_state = "pod_0" return @@ -430,7 +430,7 @@ if(grab_ghost_when == CLONER_MATURE_CLONE) mob_occupant.grab_ghost() - to_chat(occupant, "There is a bright flash!
I feel like a new being.
") + to_chat(occupant, span_notice("There is a bright flash!
I feel like a new being.")) mob_occupant.flash_act() occupant.forceMove(T) @@ -456,7 +456,7 @@ clonemind.transfer_to(mob_occupant) mob_occupant.grab_ghost() // We really just want to make you suffer. flash_color(mob_occupant, flash_color="#960000", flash_time=100) - to_chat(mob_occupant, "Agony blazes across my consciousness as my body is torn apart.
Is this what dying is like? Yes it is.
") + to_chat(mob_occupant, span_warning("Agony blazes across my consciousness as my body is torn apart.
Is this what dying is like? Yes it is.")) playsound(src, 'sound/blank.ogg', 50) SEND_SOUND(mob_occupant, sound('sound/blank.ogg',0,1,50)) log_cloning("[key_name(mob_occupant)] destroyed within [src] at [AREACOORD(src)] due to malfunction.") diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index e6f1d104c..77a8bb07b 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -30,9 +30,9 @@ /obj/machinery/computer/operating/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/disk/surgery)) - user.visible_message("[user] begins to load \the [O] in \the [src]...", \ - "I begin to load a surgery protocol from \the [O]...", \ - "I hear the chatter of a floppy drive.") + user.visible_message(span_notice("[user] begins to load \the [O] in \the [src]..."), \ + span_notice("I begin to load a surgery protocol from \the [O]..."), \ + span_hear("I hear the chatter of a floppy drive.")) var/obj/item/disk/surgery/D = O if(do_after(user, 10, target = src)) advanced_surgery_steps |= D.surgery_steps diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index af2224299..7df1db05d 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -60,7 +60,7 @@ if(..()) return TRUE if(circuit && !(flags_1&NODECONSTRUCT_1)) - to_chat(user, "I start to disconnect the monitor...") + to_chat(user, span_notice("I start to disconnect the monitor...")) if(I.use_tool(src, user, time_to_screwdrive, volume=50)) deconstruct(TRUE, user) return TRUE @@ -104,7 +104,7 @@ A.setAnchored(TRUE) if(stat & BROKEN) if(user) - to_chat(user, "The broken glass falls out.") + to_chat(user, span_notice("The broken glass falls out.")) else playsound(src, 'sound/blank.ogg', 70, TRUE) new /obj/item/shard(drop_location()) @@ -113,7 +113,7 @@ A.icon_state = "3" else if(user) - to_chat(user, "I disconnect the monitor.") + to_chat(user, span_notice("I disconnect the monitor.")) A.state = 4 A.icon_state = "4" circuit = null diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 4b47bc053..74a9ea1b8 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -12,9 +12,9 @@ /obj/machinery/computer/aifixer/screwdriver_act(mob/living/user, obj/item/I) if(occupier) if(stat & (NOPOWER|BROKEN)) - to_chat(user, "The screws on [name]'s screen won't budge.") + to_chat(user, span_warning("The screws on [name]'s screen won't budge.")) else - to_chat(user, "The screws on [name]'s screen won't budge and it emits a warning beep.") + to_chat(user, span_warning("The screws on [name]'s screen won't budge and it emits a warning beep.")) else return ..() @@ -59,9 +59,9 @@ dat += "Laws:
[laws]
" if (src.occupier.stat == DEAD) - dat += "AI non-functional" + dat += span_bad("AI non-functional") else - dat += "AI functional" + dat += span_good("AI functional") if (!src.active) dat += {"

Begin Reconstruction"} else @@ -84,7 +84,7 @@ occupier.revive(full_heal = FALSE, admin_revive = FALSE) if(!occupier.radio_enabled) occupier.radio_enabled = TRUE - to_chat(occupier, "My Subspace Transceiver has been enabled!") + to_chat(occupier, span_warning("My Subspace Transceiver has been enabled!")) return occupier.health < 100 /obj/machinery/computer/aifixer/process() @@ -100,7 +100,7 @@ if(..()) return if(href_list["fix"]) - to_chat(usr, "Reconstruction in progress. This will take several minutes.") + to_chat(usr, span_notice("Reconstruction in progress. This will take several minutes.")) playsound(src, 'sound/blank.ogg', 25, FALSE) active = TRUE if(occupier) @@ -131,29 +131,29 @@ //Downloading AI from card to terminal. if(interaction == AI_TRANS_FROM_CARD) if(stat & (NOPOWER|BROKEN)) - to_chat(user, "[src] is offline and cannot take an AI at this time.") + to_chat(user, span_alert("[src] is offline and cannot take an AI at this time.")) return AI.forceMove(src) occupier = AI AI.control_disabled = TRUE AI.radio_enabled = FALSE - to_chat(AI, "I have been uploaded to a stationary terminal. Sadly, there is no remote access from here.") + to_chat(AI, span_alert("I have been uploaded to a stationary terminal. Sadly, there is no remote access from here.")) to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.") card.AI = null update_icon() else //Uploading AI from terminal to card if(occupier && !active) - to_chat(occupier, "I have been downloaded to a mobile storage device. Still no remote access.") + to_chat(occupier, span_notice("I have been downloaded to a mobile storage device. Still no remote access.")) to_chat(user, "Transfer successful: [occupier.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory.") occupier.forceMove(card) card.AI = occupier occupier = null update_icon() else if (active) - to_chat(user, "ERROR: Reconstruction in progress.") + to_chat(user, span_alert("ERROR: Reconstruction in progress.")) else if (!occupier) - to_chat(user, "ERROR: Unable to locate artificial intelligence.") + to_chat(user, span_alert("ERROR: Unable to locate artificial intelligence.")) /obj/machinery/computer/aifixer/on_deconstruction() if(occupier) diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 189c76000..7b32c7bbb 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -32,7 +32,7 @@ /obj/machinery/computer/apc_control/attack_ai(mob/user) if(!IsAdminGhost(user)) - to_chat(user,"[src] does not support AI control.") //You already have APC access, cheater! + to_chat(user,span_warning("[src] does not support AI control.")) //You already have APC access, cheater! return ..(user) @@ -105,17 +105,17 @@ authenticated = FALSE auth_id = "\[NULL\]" if(href_list["restore_logging"]) - to_chat(usr, "[icon2html(src, usr)] Logging functionality restored from backup data.") + to_chat(usr, span_robotnotice("[icon2html(src, usr)] Logging functionality restored from backup data.")) obj_flags &= ~EMAGGED LAZYADD(logs, "-=- Logging restored to full functionality at this point -=-") if(href_list["access_apc"]) playsound(src, "terminal_type", 50, FALSE) var/obj/machinery/power/apc/APC = locate(href_list["access_apc"]) in GLOB.apcs_list if(!APC || APC.aidisabled || APC.panel_open || QDELETED(APC)) - to_chat(usr, "[icon2html(src, usr)] APC does not return interface request. Remote access may be disabled.") + to_chat(usr, span_robotdanger("[icon2html(src, usr)] APC does not return interface request. Remote access may be disabled.")) return if(active_apc) - to_chat(usr, "[icon2html(src, usr)] Disconnected from [active_apc].") + to_chat(usr, span_robotdanger("[icon2html(src, usr)] Disconnected from [active_apc].")) active_apc.say("Remote access canceled. Interface locked.") playsound(active_apc, 'sound/blank.ogg', 25, FALSE) playsound(active_apc, 'sound/blank.ogg', 50, FALSE) @@ -123,7 +123,7 @@ active_apc.update_icon() active_apc.remote_control = null active_apc = null - to_chat(usr, "[icon2html(src, usr)] Connected to APC in [get_area_name(APC.area, TRUE)]. Interface request sent.") + to_chat(usr, span_robotnotice("[icon2html(src, usr)] Connected to APC in [get_area_name(APC.area, TRUE)]. Interface request sent.")) log_activity("remotely accessed APC in [get_area_name(APC.area, TRUE)]") APC.remote_control = src APC.ui_interact(usr) @@ -185,11 +185,11 @@ /obj/machinery/computer/apc_control/emag_act(mob/user) if(!authenticated) - to_chat(user, "I bypass [src]'s access requirements using your emag.") + to_chat(user, span_warning("I bypass [src]'s access requirements using your emag.")) authenticated = TRUE log_activity("logged in") else if(!(obj_flags & EMAGGED)) - user.visible_message("I emag [src], disabling precise logging and allowing you to clear logs.") + user.visible_message(span_warning("I emag [src], disabling precise logging and allowing you to clear logs.")) log_game("[key_name(user)] emagged [src] at [AREACOORD(src)], disabling operator tracking.") obj_flags |= EMAGGED playsound(src, "sparks", 50, TRUE) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index a539ab0db..d32092112 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -77,7 +77,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "arcade", /datum/mood_event/arcade) if(prob(0.0001)) //1 in a million new /obj/item/gun/energy/pulse/prize(src) - visible_message("[src] dispenses.. woah, a gun! Way past cool.", "I hear a chime and a shot.") + visible_message(span_notice("[src] dispenses.. woah, a gun! Way past cool."), span_notice("I hear a chime and a shot.")) user.client.give_award(/datum/award/achievement/misc/pulse, user) return @@ -90,7 +90,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( new prizeselect(src) var/atom/movable/the_prize = pick(contents) - visible_message("[src] dispenses [the_prize]!", "I hear a chime and a clunk.") + visible_message(span_notice("[src] dispenses [the_prize]!"), span_notice("I hear a chime and a clunk.")) the_prize.forceMove(get_turf(src)) @@ -320,7 +320,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/machinery/computer/arcade/battle/emag_act(mob/user) if(obj_flags & EMAGGED) return - to_chat(user, "A mesmerizing Rhumba beat starts playing from the arcade machine's speakers!") + to_chat(user, span_warning("A mesmerizing Rhumba beat starts playing from the arcade machine's speakers!")) temp = "If you die in the game, you die for real!" player_hp = 30 player_mp = 10 @@ -515,17 +515,17 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( dat += "
I ran out of food and starved." if(obj_flags & EMAGGED) user.set_nutrition(0) //yeah you pretty hongry - to_chat(user, "My body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor.") + to_chat(user, span_danger("My body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor.")) if(fuel <= 0) dat += "
I ran out of fuel, and drift, slowly, into a star." if(obj_flags & EMAGGED) var/mob/living/M = user M.adjust_fire_stacks(5) M.IgniteMob() //flew into a star, so you're on fire - to_chat(user, "I feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames.") + to_chat(user, span_danger("I feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames.")) if(obj_flags & EMAGGED) - to_chat(user, "You're never going to make it to Orion...") + to_chat(user, span_danger("You're never going to make it to Orion...")) user.death() obj_flags &= ~EMAGGED //removes the emagged status after you lose gameStatus = ORION_STATUS_START @@ -594,21 +594,21 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( switch(event) if(ORION_TRAIL_RAIDERS) if(prob(50)) - to_chat(usr, "I hear battle shouts. The tramping of boots on cold metal. Screams of agony. The rush of venting air. Are you going insane?") + to_chat(usr, span_danger("I hear battle shouts. The tramping of boots on cold metal. Screams of agony. The rush of venting air. Are you going insane?")) M.hallucination += 30 else - to_chat(usr, "Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there...") + to_chat(usr, span_danger("Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there...")) M.take_bodypart_damage(30) playsound(loc, 'sound/blank.ogg', 100, TRUE) if(ORION_TRAIL_ILLNESS) var/severity = rand(1,3) //pray to RNGesus. PRAY, PIGS if(severity == 1) - to_chat(M, "I suddenly feel slightly nauseated." ) + to_chat(M, span_danger("I suddenly feel slightly nauseated.") ) if(severity == 2) - to_chat(usr, "I suddenly feel extremely nauseated and hunch over until it passes.") + to_chat(usr, span_danger("I suddenly feel extremely nauseated and hunch over until it passes.")) M.Stun(60) if(severity >= 3) //you didn't pray hard enough - to_chat(M, "An overpowering wave of nausea consumes over you. You hunch over, my stomach's contents preparing for a spectacular exit.") + to_chat(M, span_warning("An overpowering wave of nausea consumes over you. You hunch over, my stomach's contents preparing for a spectacular exit.")) M.Stun(100) sleep(30) M.vomit(10, distance = 5) @@ -619,7 +619,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( M.take_bodypart_damage(25) playsound(loc, 'sound/blank.ogg', 100, TRUE) else - to_chat(M, "A violent gale blows past you, and you barely manage to stay standing!") + to_chat(M, span_danger("A violent gale blows past you, and you barely manage to stay standing!")) if(ORION_TRAIL_COLLISION) //by far the most damaging event if(prob(90)) playsound(loc, 'sound/blank.ogg', 100, TRUE) @@ -639,7 +639,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( playsound(loc, 'sound/blank.ogg', 50, TRUE) if(ORION_TRAIL_MALFUNCTION) playsound(loc, 'sound/blank.ogg', 50, TRUE) - visible_message("[src] malfunctions, randomizing in-game stats!") + visible_message(span_danger("[src] malfunctions, randomizing in-game stats!")) var/oldfood = food var/oldfuel = fuel food = rand(10,80) / rand(1,2) @@ -647,9 +647,9 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( if(electronics) sleep(10) if(oldfuel > fuel && oldfood > food) - audible_message("[src] lets out a somehow reassuring chime.") + audible_message(span_danger("[src] lets out a somehow reassuring chime.")) else if(oldfuel < fuel || oldfood < food) - audible_message("[src] lets out a somehow ominous chime.") + audible_message(span_danger("[src] lets out a somehow ominous chime.")) food = oldfood fuel = oldfuel playsound(loc, 'sound/blank.ogg', 50, TRUE) @@ -1177,7 +1177,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/machinery/computer/arcade/orion_trail/emag_act(mob/user) if(obj_flags & EMAGGED) return - to_chat(user, "I override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode.") + to_chat(user, span_notice("I override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode.")) name = "The Orion Trail: Realism Edition" desc = "" newgame() @@ -1203,9 +1203,9 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( if(!(in_range(user, src))) return if(!active) - . += "There's a little switch on the bottom. It's flipped down." + . += span_notice("There's a little switch on the bottom. It's flipped down.") else - . += "There's a little switch on the bottom. It's flipped up." + . += span_notice("There's a little switch on the bottom. It's flipped up.") /obj/item/orion_ship/attack_self(mob/user) //Minibomb-level explosion. Should probably be more because of how hard it is to survive the machine! Also, just over a 5-second fuse if(active) @@ -1213,19 +1213,19 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( log_bomber(usr, "primed an explosive", src, "for detonation") - to_chat(user, "I flip the switch on the underside of [src].") + to_chat(user, span_warning("I flip the switch on the underside of [src].")) active = 1 - visible_message("[src] softly beeps and whirs to life!") + visible_message(span_notice("[src] softly beeps and whirs to life!")) playsound(loc, 'sound/blank.ogg', 25, TRUE) say("This is ship ID #[rand(1,1000)] to Orion Port Authority. We're coming in for landing, over.") sleep(20) - visible_message("[src] begins to vibrate...") + visible_message(span_warning("[src] begins to vibrate...")) say("Uh, Port? Having some issues with our reactor, could you check it out? Over.") sleep(30) say("Oh, God! Code Eight! CODE EIGHT! IT'S GONNA BL-") playsound(loc, 'sound/blank.ogg', 25, TRUE) sleep(3.6) - visible_message("[src] explodes!") + visible_message(span_danger("[src] explodes!")) explosion(loc, 2,4,8, flame_range = 16) qdel(src) @@ -1243,9 +1243,9 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( var/mob/living/carbon/c_user = user if(!c_user.get_bodypart(BODY_ZONE_L_ARM) && !c_user.get_bodypart(BODY_ZONE_R_ARM)) return - to_chat(c_user, "I move my hand towards the machine, and begin to hesitate as a bloodied guillotine emerges from inside of it...") + to_chat(c_user, span_warning("I move my hand towards the machine, and begin to hesitate as a bloodied guillotine emerges from inside of it...")) if(do_after(c_user, 50, target = src)) - to_chat(c_user, "The guillotine drops on my arm, and the machine sucks it in!") + to_chat(c_user, span_danger("The guillotine drops on my arm, and the machine sucks it in!")) playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) var/which_hand = BODY_ZONE_L_ARM if(!(c_user.active_hand_index % 2)) @@ -1257,7 +1257,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( for(var/i=1; i<=rand(3,5); i++) prizevend(user) else - to_chat(c_user, "I (wisely) decide against putting my hand in the machine.") + to_chat(c_user, span_notice("I (wisely) decide against putting my hand in the machine.")) #undef ORION_TRAIL_WINTURN #undef ORION_TRAIL_RAIDERS diff --git a/code/game/machinery/computer/arena.dm b/code/game/machinery/computer/arena.dm index edb625f02..cb877581c 100644 --- a/code/game/machinery/computer/arena.dm +++ b/code/game/machinery/computer/arena.dm @@ -117,7 +117,7 @@ return var/datum/map_template/M = arena_templates[arena_template] if(!M) - to_chat(user,"No such arena") + to_chat(user,span_warning("No such arena")) return clear_arena() //Clear current arena var/turf/A = get_landmark_turf(ARENA_CORNER_A) @@ -125,7 +125,7 @@ var/wh = abs(A.x - B.x) + 1 var/hz = abs(A.y - B.y) + 1 if(M.width > wh || M.height > hz) - to_chat(user,"Arena template is too big for the current arena!") + to_chat(user,span_warning("Arena template is too big for the current arena!")) return loading = TRUE var/bd = M.load(get_load_point()) @@ -208,7 +208,7 @@ // Could use update_icon on spawnpoints here to show they're on if(ready_to_spawn) for(var/mob/M in all_contestants()) - to_chat(M,"Arena you're signed up for is ready!") + to_chat(M,span_danger("Arena you're signed up for is ready!")) /obj/machinery/computer/arena/proc/all_contestants() . = list() @@ -230,9 +230,9 @@ /obj/machinery/computer/arena/proc/start_match(mob/user) //TODO: Check if everyone is spawned in, if not ask for confirmation. var/timetext = DisplayTimeText(start_delay) - to_chat(user,"The match will start in [timetext].") + to_chat(user,span_notice("The match will start in [timetext].")) for(var/mob/M in all_contestants()) - to_chat(M,"The gates will open in [timetext]!") + to_chat(M,span_danger("The gates will open in [timetext]!")) start_time = world.time + start_delay addtimer(CALLBACK(src,PROC_REF(begin)),start_delay) for(var/team in teams) @@ -249,7 +249,7 @@ var/obj/machinery/arena_spawn/A = get_spawn(team) playsound(A,start_sound, start_sound_volume) for(var/mob/M in all_contestants()) - to_chat(M,"START!") + to_chat(M,span_danger("START!")) //Clean up the countdowns QDEL_LIST(countdowns) start_time = null @@ -311,7 +311,7 @@ /obj/machinery/computer/arena/proc/load_random_arena(mob/user) if(!length(arena_templates)) - to_chat(user,"No arenas present") + to_chat(user,span_warning("No arenas present")) return var/picked = pick(arena_templates) load_arena(picked,user) @@ -326,7 +326,7 @@ /obj/machinery/computer/arena/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state) . = ..() var/list/dat = list() - dat += "
Spawning is currently [ready_to_spawn ? "enabled" : "disabled"] Toggle
" + dat += "
Spawning is currently [ready_to_spawn ? span_good("enabled") : span_bad("disabled")] Toggle
" dat += "" for(var/team in teams) dat += "

[capitalize(team)] team:

" @@ -406,7 +406,7 @@ if(C.ready_to_spawn) var/list/allowed_keys = C.team_keys[team] if(!(user.ckey in allowed_keys)) - to_chat(user,"You're not on the team list.") + to_chat(user,span_warning("You're not on the team list.")) return C.spawn_member(src,user.ckey,team) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 2fe04f705..5ca76ab81 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -47,11 +47,11 @@ if("clear") var/zone = params["zone"] if(zone in priority_alarms) - to_chat(usr, "Priority alarm for [zone] cleared.") + to_chat(usr, span_notice("Priority alarm for [zone] cleared.")) priority_alarms -= zone . = TRUE if(zone in minor_alarms) - to_chat(usr, "Minor alarm for [zone] cleared.") + to_chat(usr, span_notice("Minor alarm for [zone] cleared.")) minor_alarms -= zone . = TRUE update_icon() diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 12a61a040..ed5b3cab1 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -257,7 +257,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers) var/list/text = splittext(U.id, "_") IO |= text[1] if(!IO.len) - to_chat(user, "No machinery detected.") + to_chat(user, span_alert("No machinery detected.")) var/S = input("Select the device set: ", "Selection", IO[1]) as anything in sortList(IO) if(src) src.input_tag = "[S]_in" diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 452eef980..4a704459c 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -8,9 +8,9 @@ switch(state) if(0) if(P.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I start wrenching the frame into place...") + to_chat(user, span_notice("I start wrenching the frame into place...")) if(P.use_tool(src, user, 20, volume=50)) - to_chat(user, "I wrench the frame into place.") + to_chat(user, span_notice("I wrench the frame into place.")) setAnchored(TRUE) state = 1 return @@ -18,18 +18,18 @@ if(!P.tool_start_check(user, amount=0)) return - to_chat(user, "I start deconstructing the frame...") + to_chat(user, span_notice("I start deconstructing the frame...")) if(P.use_tool(src, user, 20, volume=50)) - to_chat(user, "I deconstruct the frame.") + to_chat(user, span_notice("I deconstruct the frame.")) var/obj/item/stack/sheet/metal/M = new (drop_location(), 5) M.add_fingerprint(user) qdel(src) return if(1) if(P.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I start to unfasten the frame...") + to_chat(user, span_notice("I start to unfasten the frame...")) if(P.use_tool(src, user, 20, volume=50)) - to_chat(user, "I unfasten the frame.") + to_chat(user, span_notice("I unfasten the frame.")) setAnchored(FALSE) state = 0 return @@ -37,24 +37,24 @@ if(!user.transferItemToLoc(P, src)) return playsound(src, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I place [P] inside the frame.") + to_chat(user, span_notice("I place [P] inside the frame.")) icon_state = "1" circuit = P circuit.add_fingerprint(user) return else if(istype(P, /obj/item/circuitboard) && !circuit) - to_chat(user, "This frame does not accept circuit boards of this type!") + to_chat(user, span_warning("This frame does not accept circuit boards of this type!")) return if(P.tool_behaviour == TOOL_SCREWDRIVER && circuit) P.play_tool_sound(src) - to_chat(user, "I screw [circuit] into place.") + to_chat(user, span_notice("I screw [circuit] into place.")) state = 2 icon_state = "2" return if(P.tool_behaviour == TOOL_CROWBAR && circuit) P.play_tool_sound(src) - to_chat(user, "I remove [circuit].") + to_chat(user, span_notice("I remove [circuit].")) state = 1 icon_state = "0" circuit.forceMove(drop_location()) @@ -64,25 +64,25 @@ if(2) if(P.tool_behaviour == TOOL_SCREWDRIVER && circuit) P.play_tool_sound(src) - to_chat(user, "I unfasten the circuit board.") + to_chat(user, span_notice("I unfasten the circuit board.")) state = 1 icon_state = "1" return if(istype(P, /obj/item/stack/cable_coil)) if(!P.tool_start_check(user, amount=5)) return - to_chat(user, "I start adding cables to the frame...") + to_chat(user, span_notice("I start adding cables to the frame...")) if(P.use_tool(src, user, 20, volume=50, amount=5)) if(state != 2) return - to_chat(user, "I add cables to the frame.") + to_chat(user, span_notice("I add cables to the frame.")) state = 3 icon_state = "3" return if(3) if(P.tool_behaviour == TOOL_WIRECUTTER) P.play_tool_sound(src) - to_chat(user, "I remove the cables.") + to_chat(user, span_notice("I remove the cables.")) state = 2 icon_state = "2" var/obj/item/stack/cable_coil/A = new (drop_location(), 5) @@ -93,18 +93,18 @@ if(!P.tool_start_check(user, amount=2)) return playsound(src, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I start to put in the glass panel...") + to_chat(user, span_notice("I start to put in the glass panel...")) if(P.use_tool(src, user, 20, amount=2)) if(state != 3) return - to_chat(user, "I put in the glass panel.") + to_chat(user, span_notice("I put in the glass panel.")) state = 4 src.icon_state = "4" return if(4) if(P.tool_behaviour == TOOL_CROWBAR) P.play_tool_sound(src) - to_chat(user, "I remove the glass panel.") + to_chat(user, span_notice("I remove the glass panel.")) state = 3 icon_state = "3" var/obj/item/stack/sheet/glass/G = new(drop_location(), 2) @@ -112,7 +112,7 @@ return if(P.tool_behaviour == TOOL_SCREWDRIVER) P.play_tool_sound(src) - to_chat(user, "I connect the monitor.") + to_chat(user, span_notice("I connect the monitor.")) var/obj/B = new circuit.build_path (loc, circuit) B.setDir(dir) transfer_fingerprints_to(B) @@ -137,7 +137,7 @@ return if(anchored) - to_chat(usr, "I must unwrench [src] before rotating it!") + to_chat(usr, span_warning("I must unwrench [src] before rotating it!")) return setDir(turn(dir, -90)) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index aa6d6cae8..5bd8816ff 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -109,7 +109,7 @@ if(!is_operational()) //you cant use broken machine you chumbis return if(current_user) - to_chat(user, "The console is already in use!") + to_chat(user, span_warning("The console is already in use!")) return var/mob/living/L = user diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 2086d1e66..1f5cbd5a2 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -62,7 +62,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card/examine(mob/user) . = ..() if(inserted_scan_id || inserted_modify_id) - . += "Alt-click to eject the ID card." + . += span_notice("Alt-click to eject the ID card.") /obj/machinery/computer/card/attackby(obj/I, mob/user, params) if(isidcard(I)) @@ -148,22 +148,22 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) else id_eject(user, target) - user.visible_message("[user] inserts \the [card_to_insert] into \the [src].", - "I insert \the [card_to_insert] into \the [src].") + user.visible_message(span_notice("[user] inserts \the [card_to_insert] into \the [src]."), + span_notice("I insert \the [card_to_insert] into \the [src].")) playsound(src, 'sound/blank.ogg', 50, FALSE) updateUsrDialog() return TRUE /obj/machinery/computer/card/proc/id_eject(mob/user, obj/target) if(!target) - to_chat(user, "That slot is empty!") + to_chat(user, span_warning("That slot is empty!")) return FALSE else target.forceMove(drop_location()) if(!issilicon(user) && Adjacent(user)) user.put_in_hands(target) - user.visible_message("[user] gets \the [target] from \the [src].", \ - "I get \the [target] from \the [src].") + user.visible_message(span_notice("[user] gets \the [target] from \the [src]."), \ + span_notice("I get \the [target] from \the [src].")) playsound(src, 'sound/blank.ogg', 50, FALSE) updateUsrDialog() return TRUE @@ -424,7 +424,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if(region_access) authenticated = 1 else if ((!( authenticated ) && issilicon(usr)) && (!inserted_modify_id)) - to_chat(usr, "I can't modify an ID without an ID inserted to modify! Once one is in the modify slot on the computer, you can log in.") + to_chat(usr, span_warning("I can't modify an ID without an ID inserted to modify! Once one is in the modify slot on the computer, you can log in.")) if ("logout") region_access = null head_subordinates = null @@ -461,7 +461,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) updateUsrDialog() break if(!jobdatum) - to_chat(usr, "No log exists for this job.") + to_chat(usr, span_alert("No log exists for this job.")) updateUsrDialog() return if(inserted_modify_id.registered_account) @@ -476,7 +476,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) inserted_modify_id.assignment = "Unassigned" playsound(src, 'sound/blank.ogg', 50, FALSE) else - to_chat(usr, "I are not authorized to demote this position.") + to_chat(usr, span_alert("I are not authorized to demote this position.")) if ("reg") if (authenticated) var/t2 = inserted_modify_id @@ -486,7 +486,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) inserted_modify_id.registered_name = newName playsound(src, 'sound/blank.ogg', 50, FALSE) else - to_chat(usr, "Invalid name entered.") + to_chat(usr, span_alert("Invalid name entered.")) updateUsrDialog() return if ("mode") @@ -545,12 +545,12 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) SSjob.prioritized_jobs -= j priority = FALSE else if(j.total_positions <= j.current_positions) - to_chat(usr, "[j.title] has had all positions filled. Open up more slots before prioritizing it.") + to_chat(usr, span_notice("[j.title] has had all positions filled. Open up more slots before prioritizing it.")) updateUsrDialog() return else SSjob.prioritized_jobs += j - to_chat(usr, "[j.title] has been successfully [priority ? "prioritized" : "unprioritized"]. Potential employees will notice your request.") + to_chat(usr, span_notice("[j.title] has been successfully [priority ? "prioritized" : "unprioritized"]. Potential employees will notice your request.")) playsound(src, 'sound/blank.ogg', 50, FALSE) if ("print") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 9cd6f4478..a823e59ba 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -138,7 +138,7 @@ if (!user.transferItemToLoc(W,src)) return diskette = W - to_chat(user, "I insert [W].") + to_chat(user, span_notice("I insert [W].")) playsound(src, 'sound/blank.ogg', 50, FALSE) updateUsrDialog() else if(W.tool_behaviour == TOOL_MULTITOOL) @@ -177,7 +177,7 @@ else dat += "Stop autoprocess" else - dat += "Autoprocess" + dat += span_linkoff("Autoprocess") dat += "

Cloning Pod Status

" dat += "
[temp] 
" switch(menu) @@ -214,7 +214,7 @@ dat += "Body-Only Scan" dat += "
[scanner.locked ? "Unlock Scanner" : "Lock Scanner"]" else - dat += "Start Scan" + dat += span_linkoff("Start Scan") // Database dat += "

Database Functions

" @@ -282,7 +282,7 @@ if(can_load) dat += "
Load From Disk" else - dat += "Cannot Load From Disk: Access Denied" + dat += span_linkoff("Cannot Load From Disk: Access Denied") if(diskette.fields["SE"]) if(!include_se) dat += "
Currently Excluding SE" diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 742406e3b..3b37f5dcb 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -76,7 +76,7 @@ if(obj_flags & EMAGGED) authenticated = 2 auth_id = "Unknown" - to_chat(M, "[src] lets out a quiet alarm as its login is overridden.") + to_chat(M, span_warning("[src] lets out a quiet alarm as its login is overridden.")) playsound(src, 'sound/blank.ogg', 50, FALSE) playsound(src, 'sound/blank.ogg', 25, FALSE) if(prob(25)) @@ -103,21 +103,21 @@ tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this set_security_level(tmp_alertlevel) if(GLOB.security_level != old_level) - to_chat(usr, "Authorization confirmed. Modifying security level.") + to_chat(usr, span_notice("Authorization confirmed. Modifying security level.")) playsound(src, 'sound/blank.ogg', 50, FALSE) //Only notify people if an actual change happened var/security_level = get_security_level() log_game("[key_name(usr)] has changed the security level to [security_level] with [src] at [AREACOORD(usr)].") message_admins("[ADMIN_LOOKUPFLW(usr)] has changed the security level to [security_level] with [src] at [AREACOORD(usr)].") - deadchat_broadcast(" has changed the security level to [security_level] with [src] at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr) + deadchat_broadcast(" has changed the security level to [security_level] with [src] at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) tmp_alertlevel = 0 else - to_chat(usr, "I are not authorized to do this!") + to_chat(usr, span_warning("I are not authorized to do this!")) playsound(src, 'sound/blank.ogg', 50, FALSE) tmp_alertlevel = 0 state = STATE_DEFAULT else - to_chat(usr, "I need to swipe your ID!") + to_chat(usr, span_warning("I need to swipe your ID!")) playsound(src, 'sound/blank.ogg', 50, FALSE) if("announce") @@ -128,7 +128,7 @@ if("crossserver") if(authenticated==2) if(!checkCCcooldown()) - to_chat(usr, "Arrays recycling. Please stand by.") + to_chat(usr, span_warning("Arrays recycling. Please stand by.")) playsound(src, 'sound/blank.ogg', 50, FALSE) return var/input = stripped_multiline_input(usr, "Please choose a message to transmit to allied stations. Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "") @@ -151,12 +151,12 @@ var/datum/map_template/shuttle/S = locate(href_list["chosen_shuttle"]) in shuttles if(S && istype(S)) if(SSshuttle.emergency.mode != SHUTTLE_RECALL && SSshuttle.emergency.mode != SHUTTLE_IDLE) - to_chat(usr, "It's a bit late to buy a new shuttle, don't you think?") + to_chat(usr, span_alert("It's a bit late to buy a new shuttle, don't you think?")) return if(SSshuttle.shuttle_purchased) - to_chat(usr, "A replacement shuttle has already been purchased.") + to_chat(usr, span_alert("A replacement shuttle has already been purchased.")) else if(!S.prerequisites_met()) - to_chat(usr, "I have not met the requirements for purchasing this shuttle.") + to_chat(usr, span_alert("I have not met the requirements for purchasing this shuttle.")) else var/points_to_check var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) @@ -173,7 +173,7 @@ message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [S.name].") SSblackbox.record_feedback("text", "shuttle_purchase", 1, "[S.name]") else - to_chat(usr, "Insufficient credits.") + to_chat(usr, span_alert("Insufficient credits.")) if("callshuttle") state = STATE_DEFAULT @@ -244,13 +244,13 @@ make_maint_all_access() log_game("[key_name(usr)] enabled emergency maintenance access.") message_admins("[ADMIN_LOOKUPFLW(usr)] enabled emergency maintenance access.") - deadchat_broadcast(" enabled emergency maintenance access at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr) + deadchat_broadcast(" enabled emergency maintenance access at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) state = STATE_DEFAULT if("disableemergency") revoke_maint_all_access() log_game("[key_name(usr)] disabled emergency maintenance access.") message_admins("[ADMIN_LOOKUPFLW(usr)] disabled emergency maintenance access.") - deadchat_broadcast(" disabled emergency maintenance access at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr) + deadchat_broadcast(" disabled emergency maintenance access at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) state = STATE_DEFAULT // Status display stuff @@ -275,23 +275,23 @@ if("MessageCentCom") if(authenticated) if(!checkCCcooldown()) - to_chat(usr, "Arrays recycling. Please stand by.") + to_chat(usr, span_warning("Arrays recycling. Please stand by.")) return var/input = stripped_input(usr, "Please choose a message to transmit to CentCom via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to CentCom.", "") if(!input || !(usr in view(1,src)) || !checkCCcooldown()) return playsound(src, 'sound/blank.ogg', 50, FALSE) CentCom_announce(input, usr) - to_chat(usr, "Message transmitted to Central Command.") + to_chat(usr, span_notice("Message transmitted to Central Command.")) usr.log_talk(input, LOG_SAY, tag="CentCom announcement") - deadchat_broadcast(" has messaged CentCom, \"[input]\" at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr) + deadchat_broadcast(" has messaged CentCom, \"[input]\" at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) CM.lastTimeUsed = world.time // OMG SYNDICATE ...LETTERHEAD if("MessageSyndicate") if((authenticated) && (obj_flags & EMAGGED)) if(!checkCCcooldown()) - to_chat(usr, "Arrays recycling. Please stand by.") + to_chat(usr, span_warning("Arrays recycling. Please stand by.")) playsound(src, 'sound/blank.ogg', 50, FALSE) return var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING COORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to /??????/.", "") @@ -299,13 +299,13 @@ return playsound(src, 'sound/blank.ogg', 50, FALSE) Syndicate_announce(input, usr) - to_chat(usr, "SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.") + to_chat(usr, span_danger("SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.")) usr.log_talk(input, LOG_SAY, tag="Syndicate announcement") - deadchat_broadcast(" has messaged the Syndicate, \"[input]\" at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr) + deadchat_broadcast(" has messaged the Syndicate, \"[input]\" at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) CM.lastTimeUsed = world.time if("RestoreBackup") - to_chat(usr, "Backup routing data restored!") + to_chat(usr, span_notice("Backup routing data restored!")) playsound(src, 'sound/blank.ogg', 50, FALSE) obj_flags &= ~EMAGGED updateDialog() @@ -313,13 +313,13 @@ if("nukerequest") //When there's no other way if(authenticated==2) if(!checkCCcooldown()) - to_chat(usr, "Arrays recycling. Please stand by.") + to_chat(usr, span_warning("Arrays recycling. Please stand by.")) return var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self Destruct Code Request.","") if(!input || !(usr in view(1,src)) || !checkCCcooldown()) return Nuke_request(input, usr) - to_chat(usr, "Request sent.") + to_chat(usr, span_notice("Request sent.")) usr.log_message("has requested the nuclear codes from CentCom with reason \"[input]\"", LOG_SAY) priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/blank.ogg') CM.lastTimeUsed = world.time @@ -386,7 +386,7 @@ var/security_level = get_security_level() log_game("[key_name(usr)] has changed the security level to [security_level] from [src] at [AREACOORD(usr)].") message_admins("[ADMIN_LOOKUPFLW(usr)] has changed the security level to [security_level] from [src] at [AREACOORD(usr)].") - deadchat_broadcast(" has changed the security level to [security_level] from [src] at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr) + deadchat_broadcast(" has changed the security level to [security_level] from [src] at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) tmp_alertlevel = 0 aistate = STATE_DEFAULT if("ai-changeseclevel") @@ -420,7 +420,7 @@ obj_flags |= EMAGGED if(authenticated == 1) authenticated = 2 - to_chat(user, "I scramble the communication routing circuits!") + to_chat(user, span_danger("I scramble the communication routing circuits!")) playsound(src, 'sound/blank.ogg', 50, FALSE) /obj/machinery/computer/communications/ui_interact(mob/user) @@ -692,13 +692,13 @@ /obj/machinery/computer/communications/proc/make_announcement(mob/living/user, is_silicon) if(!SScommunications.can_announce(user, is_silicon)) - to_chat(user, "Intercomms recharging. Please stand by.") + to_chat(user, span_alert("Intercomms recharging. Please stand by.")) return var/input = stripped_input(user, "Please choose a message to announce to the station crew.", "What?") if(!input || !user.canUseTopic(src, !issilicon(usr))) return SScommunications.make_announcement(user, is_silicon, input) - deadchat_broadcast(" made a priority announcement from [get_area_name(usr, TRUE)].", "[user.real_name]", user) + deadchat_broadcast(" made a priority announcement from [get_area_name(usr, TRUE)].", span_name("[user.real_name]"), user) /obj/machinery/computer/communications/proc/post_status(command, data1, data2) diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 414f0e1cd..ed2a780fa 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -70,29 +70,29 @@ diskette.forceMove(drop_location()) diskette = null diskette = I - to_chat(user, "I insert [I].") + to_chat(user, span_notice("I insert [I].")) updateUsrDialog() return if (istype(I, /obj/item/chromosome)) if(LAZYLEN(stored_chromosomes) < max_chromosomes) I.forceMove(src) stored_chromosomes += I - to_chat(user, "I insert [I].") + to_chat(user, span_notice("I insert [I].")) else - to_chat(user, "I cannot store any more chromosomes!") + to_chat(user, span_warning("I cannot store any more chromosomes!")) return if(istype(I, /obj/item/dnainjector/activator)) var/obj/item/dnainjector/activator/A = I if(A.used) - to_chat(user,"Recycled [I].") + to_chat(user,span_notice("Recycled [I].")) if(A.research) var/c_typepath = generate_chromosome() var/obj/item/chromosome/CM = new c_typepath (drop_location()) - to_chat(user,"Recycled [I].") + to_chat(user,span_notice("Recycled [I].")) if((LAZYLEN(stored_chromosomes) < max_chromosomes) && prob(60)) CM.forceMove(src) stored_chromosomes += CM - to_chat(user,"[capitalize(CM.name)] added to storage.") + to_chat(user,span_notice("[capitalize(CM.name)] added to storage.")) qdel(I) return @@ -114,9 +114,9 @@ /obj/machinery/computer/scan_consolenew/examine(mob/user) . = ..() if(jokerready < world.time) - . += "JOKER algorithm available." + . += span_notice("JOKER algorithm available.") else - . += "JOKER algorithm available in about [round(0.00166666667 * (jokerready - world.time))] minutes." + . += span_notice("JOKER algorithm available in about [round(0.00166666667 * (jokerready - world.time))] minutes.") /obj/machinery/computer/scan_consolenew/ui_interact(mob/user, last_change) . = ..() @@ -143,11 +143,11 @@ occupant_status += "[viable_occupant.name] => " switch(viable_occupant.stat) if(CONSCIOUS) - occupant_status += "Conscious" + occupant_status += span_good("Conscious") if(UNCONSCIOUS) - occupant_status += "Unconscious" + occupant_status += span_average("Unconscious") else - occupant_status += "DEAD" + occupant_status += span_bad("DEAD") occupant_status += "
" occupant_status += "
Health:
[viable_occupant.health] %
" occupant_status += "
Radiation Level:
[viable_occupant.radiation/(RAD_MOB_SAFE/100)] %
" @@ -164,14 +164,14 @@ else scanner_status = "Closed" if(connected.locked) - scanner_status += "(Locked)" + scanner_status += span_bad("(Locked)") else - scanner_status += "(Unlocked)" + scanner_status += span_good("(Unlocked)") else occupant_status += "----
" - scanner_status += "Error: No scanner detected" + scanner_status += span_bad("Error: No scanner detected") var/list/status = list("
") status += "
Scanner:
[scanner_status]
" @@ -203,33 +203,33 @@ if(connected) buttons += "[connected.state_open ? "Close" : "Open"] Scanner" if (connected.state_open) - buttons += "[connected.locked ? "Unlock" : "Lock"] Scanner" + buttons += span_linkoff("[connected.locked ? "Unlock" : "Lock"] Scanner") else buttons += "[connected.locked ? "Unlock" : "Lock"] Scanner" else - buttons += "Open Scanner Lock Scanner" + buttons += span_linkoff("Open Scanner Lock Scanner") if(viable_occupant && (scrambleready < world.time)) buttons += "Scramble DNA" else - buttons += "Scramble DNA" + buttons += span_linkoff("Scramble DNA") if(diskette) buttons += "Disk" else - buttons += "Disk" + buttons += span_linkoff("Disk") if(current_screen == "mutations") buttons += "
Mutations" else buttons += "
Mutations" if((current_screen == "mainmenu") || !current_screen) - buttons += "Genetic Sequencer" + buttons += span_linkoff("Genetic Sequencer") else buttons += "Genetic Sequencer" if(current_screen == "ui") - buttons += "Unique Identifiers" + buttons += span_linkoff("Unique Identifiers") else buttons += "Unique Identifiers" if(current_screen == "advinjector") - buttons += "Adv. Injectors" + buttons += span_linkoff("Adv. Injectors") else buttons += "Adv. Injectors" @@ -270,12 +270,12 @@ temp_html += "
Save to Buffer" else temp_html += "
Save to Buffer" - temp_html += "Clear Buffer" + temp_html += span_linkoff("Clear Buffer") if(diskette) temp_html += "Load from Disk" else - temp_html += "Load from Disk" - temp_html += "Save to Disk" + temp_html += span_linkoff("Load from Disk") + temp_html += span_linkoff("Save to Disk") else var/ui = buffer_slot["UI"] var/ue = buffer_slot["UE"] @@ -290,12 +290,12 @@ if(viable_occupant) temp_html += "Occupant" else - temp_html += "Occupant" + temp_html += span_linkoff("Occupant") temp_html += "Occupant:Delayed" if(injectorready < world.time) temp_html += "Injector" else - temp_html += "Injector" + temp_html += span_linkoff("Injector") else temp_html += "
\tBlood Type: No Data" temp_html += "
\tUE: No Data" @@ -304,12 +304,12 @@ if(viable_occupant) temp_html += "Occupant" else - temp_html += "Occupant" + temp_html += span_linkoff("Occupant") temp_html += "Occupant:Delayed" if(injectorready < world.time) temp_html += "Injector" else - temp_html += "Injector" + temp_html += span_linkoff("Injector") else temp_html += "
\tUI: No Data" if(ue && name && blood_type && ui) @@ -317,12 +317,12 @@ if(viable_occupant) temp_html += "Occupant" else - temp_html += "Occupant" + temp_html += span_linkoff("Occupant") temp_html += "Occupant:Delayed" if(injectorready < world.time) temp_html += "UI+UE Injector" else - temp_html += "UI+UE Injector" + temp_html += span_linkoff("UI+UE Injector") if(viable_occupant) temp_html += "
Save to Buffer" else @@ -331,11 +331,11 @@ if(diskette) temp_html += "Load from Disk" else - temp_html += "Load from Disk" + temp_html += span_linkoff("Load from Disk") if(diskette && !diskette.read_only) temp_html += "Save to Disk" else - temp_html += "Save to Disk" + temp_html += span_linkoff("Save to Disk") if("disk") temp_html += status temp_html += buttons @@ -539,15 +539,15 @@ temp_html += "Print Activator" temp_html += "Print Mutator" else - temp_html += "Print Activator" - temp_html += "Print Mutator" + temp_html += span_linkoff("Print Activator") + temp_html += span_linkoff("Print Mutator") temp_html += "
" if(storage_slot) temp_html += "Delete" if((LAZYLEN(stored_mutations) < max_storage) && diskette && !diskette.read_only) temp_html += "Export" else - temp_html += "Export" + temp_html += span_linkoff("Export") temp_html += "Back" else if(active && !scrambled) temp_html += "Store" @@ -555,7 +555,7 @@ if(extra || scrambled) temp_html += "Nullify" else - temp_html += "Nullify" + temp_html += span_linkoff("Nullify") temp_html += "
" return temp_html @@ -742,9 +742,9 @@ A.copy_mutation(HM) succes = TRUE stored_mutations += A - to_chat(usr,"Mutation succesfully stored.") + to_chat(usr,span_notice("Mutation succesfully stored.")) if(!succes) //we can exactly return here - to_chat(usr,"Mutation storage is full.") + to_chat(usr,span_warning("Mutation storage is full.")) if("deletemut") var/datum/mutation/human/HM = stored_mutations[num] if(HM) @@ -837,7 +837,7 @@ var/datum/mutation/human/HM = new A.type() diskette.mutations += HM HM.copy_mutation(A) - to_chat(usr, "Successfully wrote [A.name] to [diskette.name].") + to_chat(usr, span_notice("Successfully wrote [A.name] to [diskette.name].")) if("deletediskmut") if(diskette && !diskette.read_only) if(num && (LAZYLEN(diskette.mutations) >= num)) @@ -851,7 +851,7 @@ var/datum/mutation/human/HM = new A.type() HM.copy_mutation(A) stored_mutations += HM - to_chat(usr,"Successfully wrote [A.name] to storage.") + to_chat(usr,span_notice("Successfully wrote [A.name] to storage.")) if("combine") if(num && (LAZYLEN(stored_mutations) >= num)) if(LAZYLEN(stored_mutations) < max_storage) @@ -861,17 +861,17 @@ var/result_path = get_mixed_mutation(combine, path) if(result_path) stored_mutations += new result_path() - to_chat(usr, "Success! New mutation has been added to storage") + to_chat(usr, span_boldnotice("Success! New mutation has been added to storage")) discover(result_path) combine = null else - to_chat(usr, "Failed. No mutation could be created.") + to_chat(usr, span_warning("Failed. No mutation could be created.")) combine = null else combine = path - to_chat(usr,"Selected [A.name] for combining") + to_chat(usr,span_notice("Selected [A.name] for combining")) else - to_chat(usr, "Not enough space to store potential mutation.") + to_chat(usr, span_warning("Not enough space to store potential mutation.")) if("ejectchromosome") if(LAZYLEN(stored_chromosomes) <= num) var/obj/item/chromosome/CM = stored_chromosomes[num] @@ -888,7 +888,7 @@ if(chromosomes.len) var/obj/item/chromosome/CM = input("Select a chromosome to apply", "Apply Chromosome") as null|anything in sortNames(chromosomes) if(CM) - to_chat(usr, "I apply [CM] to [HM.name].") + to_chat(usr, span_notice("I apply [CM] to [HM.name].")) stored_chromosomes -= CM CM.apply(HM) if("expand_advinjector") @@ -904,7 +904,7 @@ total_instability += mootacion.instability total_instability += HM.instability if((total_instability > max_injector_instability) || (true_selection.len + 1) > max_injector_mutations) - to_chat(usr, "Adding more mutations would make the advanced injector too unstable!") + to_chat(usr, span_warning("Adding more mutations would make the advanced injector too unstable!")) else true_selection += HM //reminder that this works. because I keep forgetting this works if("remove_from_advinjector") @@ -989,7 +989,7 @@ /obj/machinery/computer/scan_consolenew/proc/on_scanner_close() if(delayed_action && get_viable_occupant()) - to_chat(connected.occupant, "[src] activates!") + to_chat(connected.occupant, span_notice("[src] activates!")) apply_buffer(delayed_action["action"],delayed_action["buffer"]) delayed_action = null //or make it stick + reset button ? diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm index 6a53ad917..40c028d04 100644 --- a/code/game/machinery/computer/launchpad_control.dm +++ b/code/game/machinery/computer/launchpad_control.dm @@ -17,7 +17,7 @@ . = ..() /obj/machinery/computer/launchpad/attack_paw(mob/user) - to_chat(user, "I are too primitive to use this computer!") + to_chat(user, span_warning("I are too primitive to use this computer!")) return /obj/machinery/computer/launchpad/attackby(obj/item/W, mob/user, params) @@ -29,9 +29,9 @@ if(LAZYLEN(launchpads) < maximum_pads) launchpads |= M.buffer M.buffer = null - to_chat(user, "I upload the data from the [W.name]'s buffer.") + to_chat(user, span_notice("I upload the data from the [W.name]'s buffer.")) else - to_chat(user, "[src] cannot handle any more connections!") + to_chat(user, span_warning("[src] cannot handle any more connections!")) else return ..() @@ -43,10 +43,10 @@ /obj/machinery/computer/launchpad/proc/teleport(mob/user, obj/machinery/launchpad/pad, sending) if(QDELETED(pad)) - to_chat(user, "ERROR: Launchpad not responding. Check launchpad integrity.") + to_chat(user, span_warning("ERROR: Launchpad not responding. Check launchpad integrity.")) return if(!pad.isAvailable()) - to_chat(user, "ERROR: Launchpad not operative. Make sure the launchpad is ready and powered.") + to_chat(user, span_warning("ERROR: Launchpad not operative. Make sure the launchpad is ready and powered.")) return pad.doteleport(user, sending) diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index a09d4e711..a738434a0 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -15,15 +15,15 @@ if(stat & (NOPOWER|BROKEN|MAINT)) return if(!current) - to_chat(user, "I haven't selected anything to transmit laws to!") + to_chat(user, span_alert("I haven't selected anything to transmit laws to!")) return if(!can_upload_to(current)) - to_chat(user, "Upload failed! Check to make sure [current.name] is functioning properly.") + to_chat(user, span_alert("Upload failed! Check to make sure [current.name] is functioning properly.")) current = null return var/turf/currentloc = get_turf(current) if(currentloc && user.z != currentloc.z) - to_chat(user, "Upload failed! Unable to establish a connection to [current.name]. You're too far away!") + to_chat(user, span_alert("Upload failed! Unable to establish a connection to [current.name]. You're too far away!")) current = null return M.install(current.laws, user) @@ -44,9 +44,9 @@ current = select_active_ai(user) if (!current) - to_chat(user, "No active AIs detected!") + to_chat(user, span_alert("No active AIs detected!")) else - to_chat(user, "[current.name] selected for law changes.") + to_chat(user, span_notice("[current.name] selected for law changes.")) /obj/machinery/computer/upload/ai/can_upload_to(mob/living/silicon/ai/A) if(!A || !isAI(A)) @@ -65,9 +65,9 @@ current = select_active_free_borg(user) if(!current) - to_chat(user, "No active unslaved cyborgs detected.") + to_chat(user, span_alert("No active unslaved cyborgs detected.")) else - to_chat(user, "[current.name] selected for law changes.") + to_chat(user, span_notice("[current.name] selected for law changes.")) /obj/machinery/computer/upload/borg/can_upload_to(mob/living/silicon/robot/B) if(!B || !iscyborg(B)) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index f687295e0..73a9c56f9 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -230,7 +230,7 @@ rank = I.assignment screen = 1 else - to_chat(usr, "Unauthorized access.") + to_chat(usr, span_danger("Unauthorized access.")) playsound(src, 'sound/blank.ogg', 50, FALSE) if(authenticated) if(href_list["screen"]) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 7a93c982b..0e14f7ae2 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -42,7 +42,7 @@ /obj/machinery/computer/pod/ui_interact(mob/user) . = ..() if(!allowed(user)) - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return var/dat = "" diff --git a/code/game/machinery/computer/prisoner/_prisoner.dm b/code/game/machinery/computer/prisoner/_prisoner.dm index cafb1fa0d..7f9aa7c45 100644 --- a/code/game/machinery/computer/prisoner/_prisoner.dm +++ b/code/game/machinery/computer/prisoner/_prisoner.dm @@ -10,7 +10,7 @@ /obj/machinery/computer/prisoner/examine(mob/user) . = ..() if(contained_id) - . += "Alt-click to eject the ID card." + . += span_notice("Alt-click to eject the ID card.") @@ -21,27 +21,27 @@ /obj/machinery/computer/prisoner/proc/id_insert(mob/user, obj/item/card/id/prisoner/P) if(istype(P)) if(contained_id) - to_chat(user, "There's already an ID card in the console!") + to_chat(user, span_warning("There's already an ID card in the console!")) return if(!user.transferItemToLoc(P, src)) return contained_id = P - user.visible_message("[user] inserts an ID card into the console.", \ - "I insert the ID card into the console.") + user.visible_message(span_notice("[user] inserts an ID card into the console."), \ + span_notice("I insert the ID card into the console.")) playsound(src, 'sound/blank.ogg', 50, FALSE) updateUsrDialog() /obj/machinery/computer/prisoner/proc/id_eject(mob/user) if(!contained_id) - to_chat(user, "There's no ID card in the console!") + to_chat(user, span_warning("There's no ID card in the console!")) return else contained_id.forceMove(drop_location()) if(!issilicon(user) && Adjacent(user)) user.put_in_hands(contained_id) contained_id = null - user.visible_message("[user] gets an ID card from the console.", \ - "I get the ID card from the console.") + user.visible_message(span_notice("[user] gets an ID card from the console."), \ + span_notice("I get the ID card from the console.")) playsound(src, 'sound/blank.ogg', 50, FALSE) updateUsrDialog() diff --git a/code/game/machinery/computer/prisoner/gulag_teleporter.dm b/code/game/machinery/computer/prisoner/gulag_teleporter.dm index de34d2dff..cb63f7872 100644 --- a/code/game/machinery/computer/prisoner/gulag_teleporter.dm +++ b/code/game/machinery/computer/prisoner/gulag_teleporter.dm @@ -70,7 +70,7 @@ if(..()) return if(!allowed(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, span_warning("Access denied.")) return switch(action) if("scan_teleporter") @@ -89,16 +89,16 @@ if(!new_goal) new_goal = default_goal if (new_goal > 1000) - to_chat(usr, "The entered amount of points is too large. Points have instead been set to the maximum allowed amount.") + to_chat(usr, span_alert("The entered amount of points is too large. Points have instead been set to the maximum allowed amount.")) contained_id.goal = CLAMP(new_goal, 0, 1000) //maximum 1000 points if("toggle_open") if(teleporter.locked) - to_chat(usr, "The teleporter must be unlocked first.") + to_chat(usr, span_alert("The teleporter must be unlocked first.")) return teleporter.toggle_open() if("teleporter_lock") if(teleporter.state_open) - to_chat(usr, "The teleporter must be closed first.") + to_chat(usr, span_alert("The teleporter must be closed first.")) return teleporter.locked = !teleporter.locked if("teleport") @@ -135,7 +135,7 @@ playsound(src, 'sound/blank.ogg', 50, TRUE) prisoner.forceMove(get_turf(beacon)) prisoner.Paralyze(40) // small travel dizziness - to_chat(prisoner, "The teleportation makes you a little dizzy.") + to_chat(prisoner, span_warning("The teleportation makes you a little dizzy.")) new /obj/effect/particle_effect/sparks(get_turf(prisoner)) playsound(src, "sparks", 50, TRUE) if(teleporter.locked) diff --git a/code/game/machinery/computer/prisoner/management.dm b/code/game/machinery/computer/prisoner/management.dm index 515b40967..cdf24aca2 100644 --- a/code/game/machinery/computer/prisoner/management.dm +++ b/code/game/machinery/computer/prisoner/management.dm @@ -74,7 +74,7 @@ if(screen) id_insert(user) else - to_chat(user, "Unauthorized access.") + to_chat(user, span_danger("Unauthorized access.")) else return ..() @@ -121,7 +121,7 @@ screen = !screen playsound(src, 'sound/blank.ogg', 50, FALSE) else - to_chat(usr, "Unauthorized access.") + to_chat(usr, span_danger("Unauthorized access.")) else if(href_list["warn"]) var/warning = copytext(sanitize(input(usr,"Message:","Enter your message here!","")),1,MAX_MESSAGE_LEN) @@ -130,7 +130,7 @@ var/obj/item/implant/I = locate(href_list["warn"]) in GLOB.tracked_implants if(I && istype(I) && I.imp_in) var/mob/living/R = I.imp_in - to_chat(R, "I hear a voice in my head saying: '[warning]'") + to_chat(R, span_hear("I hear a voice in my head saying: '[warning]'")) log_directed_talk(usr, R, warning, LOG_SAY, "implant message") src.add_fingerprint(usr) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 9586dc80e..45a3d643f 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -120,13 +120,13 @@ var/choice = input("Are you certain you wish to detonate [R.name]?") in list("Confirm", "Abort") if(choice == "Confirm" && can_control(usr, R) && !..()) var/turf/T = get_turf(R) - message_admins("[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(R, R.client)] at [ADMIN_VERBOSEJMP(T)]!") - log_game("\[key_name(usr)] detonated [key_name(R)]!") + message_admins(span_notice("[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(R, R.client)] at [ADMIN_VERBOSEJMP(T)]!")) + log_game(span_notice("[key_name(usr)] detonated [key_name(R)]!")) if(R.connected_ai) to_chat(R.connected_ai, "

ALERT - Cyborg detonation detected: [R.name]
") R.self_destruct() else - to_chat(usr, "Access Denied.") + to_chat(usr, span_danger("Access Denied.")) else if (href_list["stopbot"]) if(allowed(usr)) @@ -134,15 +134,15 @@ if(can_control(usr, R)) var/choice = input("Are you certain you wish to [!R.lockcharge ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort") if(choice == "Confirm" && can_control(usr, R) && !..()) - message_admins("[ADMIN_LOOKUPFLW(usr)] [!R.lockcharge ? "locked down" : "released"] [ADMIN_LOOKUPFLW(R)]!") + message_admins(span_notice("[ADMIN_LOOKUPFLW(usr)] [!R.lockcharge ? "locked down" : "released"] [ADMIN_LOOKUPFLW(R)]!")) log_game("[key_name(usr)] [!R.lockcharge ? "locked down" : "released"] [key_name(R)]!") R.SetLockdown(!R.lockcharge) - to_chat(R, "[!R.lockcharge ? "My lockdown has been lifted!" : "I have been locked down!"]") + to_chat(R, !R.lockcharge ? span_notice("My lockdown has been lifted!") : span_alert("I have been locked down!")) if(R.connected_ai) to_chat(R.connected_ai, "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
") else - to_chat(usr, "Access Denied.") + to_chat(usr, span_danger("Access Denied.")) else if (href_list["magbot"]) var/mob/living/silicon/S = usr @@ -157,7 +157,7 @@ if(allowed(usr)) var/mob/living/simple_animal/drone/D = locate(href_list["killdrone"]) in GLOB.mob_list if(D.hacked) - to_chat(usr, "ERROR: [D] is not responding to external commands.") + to_chat(usr, span_danger("ERROR: [D] is not responding to external commands.")) else var/turf/T = get_turf(D) message_admins("[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(D)] at [ADMIN_VERBOSEJMP(T)]!") @@ -165,7 +165,7 @@ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(3, TRUE, D) s.start() - D.visible_message("\the [D] self destructs!") + D.visible_message(span_danger("\The [D] self destructs!")) D.gib() diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index df6599253..573ae0f30 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -345,7 +345,7 @@ What a mess.*/ rank = I.assignment screen = 1 else - to_chat(usr, "Unauthorized Access.") + to_chat(usr, span_danger("Unauthorized Access.")) playsound(src, 'sound/blank.ogg', 50, FALSE) //RECORD FUNCTIONS @@ -372,18 +372,18 @@ What a mess.*/ if(C && istype(C)) var/pay = C.get_item_credit_value() if(!pay) - to_chat(usr, "[C] doesn't seem to be worth anything!") + to_chat(usr, span_warning("[C] doesn't seem to be worth anything!")) else var/diff = p.fine - p.paid GLOB.data_core.payCitation(active2.fields["id"], text2num(href_list["cdataid"]), pay) - to_chat(usr, "I have paid [pay] credit\s towards your fine.") + to_chat(usr, span_notice("I have paid [pay] credit\s towards your fine.")) if (pay == diff || pay > diff || pay >= diff) investigate_log("Citation Paid off: [p.crimeName] Fine: [p.fine] | Paid off by [key_name(usr)]", INVESTIGATE_RECORDS) - to_chat(usr, "The fine has been paid in full.") + to_chat(usr, span_notice("The fine has been paid in full.")) qdel(C) playsound(src, "terminal_type", 25, FALSE) else - to_chat(usr, "Fines can only be paid with holochips!") + to_chat(usr, span_warning("Fines can only be paid with holochips!")) if("Print Record") if(!( printing )) @@ -737,7 +737,7 @@ What a mess.*/ return if(fine < 0) - to_chat(usr, "You're pretty sure that's not how money works.") + to_chat(usr, span_warning("You're pretty sure that's not how money works.")) return fine = min(fine, maxFine) diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index f8ecc091d..bcd33ff3d 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -151,7 +151,7 @@ var/area/A = get_area(R) L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R if(!L.len) - to_chat(user, "No active connected stations located.") + to_chat(user, span_alert("No active connected stations located.")) return var/desc = input("Please select a station to lock in.", "Locking Computer") as null|anything in sortList(L) var/obj/machinery/teleport/station/target_station = L[desc] diff --git a/code/game/machinery/computer/warrant.dm b/code/game/machinery/computer/warrant.dm index 078ab2a5b..c5024153c 100644 --- a/code/game/machinery/computer/warrant.dm +++ b/code/game/machinery/computer/warrant.dm @@ -132,17 +132,17 @@ if(C && istype(C)) var/pay = C.get_item_credit_value() if(!pay) - to_chat(M, "[C] doesn't seem to be worth anything!") + to_chat(M, span_warning("[C] doesn't seem to be worth anything!")) else var/diff = p.fine - p.paid GLOB.data_core.payCitation(current.fields["id"], text2num(href_list["cdataid"]), pay) - to_chat(M, "I have paid [pay] credit\s towards your fine.") + to_chat(M, span_notice("I have paid [pay] credit\s towards your fine.")) if (pay == diff || pay > diff || pay >= diff) investigate_log("Citation Paid off: [p.crimeName] Fine: [p.fine] | Paid off by [key_name(usr)]", INVESTIGATE_RECORDS) - to_chat(M, "The fine has been paid in full.") + to_chat(M, span_notice("The fine has been paid in full.")) qdel(C) playsound(src, "terminal_type", 25, FALSE) else - to_chat(M, "Fines can only be paid with holochips!") + to_chat(M, span_warning("Fines can only be paid with holochips!")) updateUsrDialog() add_fingerprint(M) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index af1032e81..82f845392 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -75,57 +75,57 @@ switch(state) if(1) if(istype(P, /obj/item/circuitboard/machine)) - to_chat(user, "The frame needs wiring first!") + to_chat(user, span_warning("The frame needs wiring first!")) return else if(istype(P, /obj/item/circuitboard)) - to_chat(user, "This frame does not accept circuit boards of this type!") + to_chat(user, span_warning("This frame does not accept circuit boards of this type!")) return if(istype(P, /obj/item/stack/cable_coil)) if(!P.tool_start_check(user, amount=5)) return - to_chat(user, "I start to add cables to the frame...") + to_chat(user, span_notice("I start to add cables to the frame...")) if(P.use_tool(src, user, 20, volume=50, amount=5)) - to_chat(user, "I add cables to the frame.") + to_chat(user, span_notice("I add cables to the frame.")) state = 2 icon_state = "box_1" return if(P.tool_behaviour == TOOL_SCREWDRIVER && !anchored) - user.visible_message("[user] disassembles the frame.", \ - "I start to disassemble the frame...", "I hear banging and clanking.") + user.visible_message(span_warning("[user] disassembles the frame."), \ + span_notice("I start to disassemble the frame..."), span_hear("I hear banging and clanking.")) if(P.use_tool(src, user, 40, volume=50)) if(state == 1) - to_chat(user, "I disassemble the frame.") + to_chat(user, span_notice("I disassemble the frame.")) var/obj/item/stack/sheet/metal/M = new (loc, 5) M.add_fingerprint(user) qdel(src) return if(P.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I start [anchored ? "un" : ""]securing [name]...") + to_chat(user, span_notice("I start [anchored ? "un" : ""]securing [name]...")) if(P.use_tool(src, user, 40, volume=75)) if(state == 1) - to_chat(user, "I [anchored ? "un" : ""]secure [name].") + to_chat(user, span_notice("I [anchored ? "un" : ""]secure [name].")) setAnchored(!anchored) return if(2) if(P.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I start [anchored ? "un" : ""]securing [name]...") + to_chat(user, span_notice("I start [anchored ? "un" : ""]securing [name]...")) if(P.use_tool(src, user, 40, volume=75)) - to_chat(user, "I [anchored ? "un" : ""]secure [name].") + to_chat(user, span_notice("I [anchored ? "un" : ""]secure [name].")) setAnchored(!anchored) return if(istype(P, /obj/item/circuitboard/machine)) var/obj/item/circuitboard/machine/B = P if(!anchored && B.needs_anchored) - to_chat(user, "The frame needs to be secured first!") + to_chat(user, span_warning("The frame needs to be secured first!")) return if(!user.transferItemToLoc(B, src)) return playsound(src.loc, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I add the circuit board to the frame.") + to_chat(user, span_notice("I add the circuit board to the frame.")) circuit = B icon_state = "box_2" state = 3 @@ -135,12 +135,12 @@ return else if(istype(P, /obj/item/circuitboard)) - to_chat(user, "This frame does not accept circuit boards of this type!") + to_chat(user, span_warning("This frame does not accept circuit boards of this type!")) return if(P.tool_behaviour == TOOL_WIRECUTTER) P.play_tool_sound(src) - to_chat(user, "I remove the cables.") + to_chat(user, span_notice("I remove the cables.")) state = 1 icon_state = "box_0" new /obj/item/stack/cable_coil(drop_location(), 5) @@ -154,9 +154,9 @@ components.Remove(circuit) circuit = null if(components.len == 0) - to_chat(user, "I remove the circuit board.") + to_chat(user, span_notice("I remove the circuit board.")) else - to_chat(user, "I remove the circuit board and other components.") + to_chat(user, span_notice("I remove the circuit board and other components.")) for(var/atom/movable/AM in components) AM.forceMove(drop_location()) desc = initial(desc) @@ -166,9 +166,9 @@ return if(P.tool_behaviour == TOOL_WRENCH && !circuit.needs_anchored) - to_chat(user, "I start [anchored ? "un" : ""]securing [name]...") + to_chat(user, span_notice("I start [anchored ? "un" : ""]securing [name]...")) if(P.use_tool(src, user, 40, volume=75)) - to_chat(user, "I [anchored ? "un" : ""]secure [name].") + to_chat(user, span_notice("I [anchored ? "un" : ""]secure [name].")) setAnchored(!anchored) return @@ -233,7 +233,7 @@ S.merge(NS) if(!QDELETED(part)) //If we're a stack and we merged we might not exist anymore components += part - to_chat(user, "[part.name] applied.") + to_chat(user, span_notice("[part.name] applied.")) if(added_components.len) replacer.play_rped_sound() return @@ -255,15 +255,15 @@ NS.add(used_amt) req_components[I] -= used_amt - to_chat(user, "I add [P] to [src].") + to_chat(user, span_notice("I add [P] to [src].")) return if(!user.transferItemToLoc(P, src)) break - to_chat(user, "I add [P] to [src].") + to_chat(user, span_notice("I add [P] to [src].")) components += P req_components[I]-- return 1 - to_chat(user, "I cannot add that to the machine!") + to_chat(user, span_warning("I cannot add that to the machine!")) return 0 if(user.used_intent.type == INTENT_HARM) return ..() diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 4023156c1..20fd4d661 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -67,10 +67,10 @@ if(!active && !(flags_1 & NODECONSTRUCT_1)) if(O.tool_behaviour == TOOL_WRENCH) if(!anchored && !isinspace()) - to_chat(user,"I secure [src] to the floor.") + to_chat(user,span_notice("I secure [src] to the floor.")) setAnchored(TRUE) else if(anchored) - to_chat(user,"I unsecure and disconnect [src].") + to_chat(user,span_notice("I unsecure and disconnect [src].")) setAnchored(FALSE) playsound(src, 'sound/blank.ogg', 50, TRUE) return @@ -87,14 +87,14 @@ if(!user.canUseTopic(src, !issilicon(user))) return if (!anchored) - to_chat(user,"This device must be anchored by a wrench!") + to_chat(user,span_warning("This device must be anchored by a wrench!")) return if(!allowed(user)) - to_chat(user,"Error: Access Denied.") + to_chat(user,span_warning("Error: Access Denied.")) user.playsound_local(src,'sound/blank.ogg', 25, 1) return if(!songs.len) - to_chat(user,"Error: No music tracks have been authorized for your station. Petition Central Command to resolve this issue.") + to_chat(user,span_warning("Error: No music tracks have been authorized for your station. Petition Central Command to resolve this issue.")) playsound(src,'sound/blank.ogg', 25, TRUE) return var/list/dat = list() @@ -119,7 +119,7 @@ return if(!active) if(stop > world.time) - to_chat(usr, "Error: The device is still resetting from the last activation, it will be ready again in [DisplayTimeText(stop-world.time)].") + to_chat(usr, span_warning("Error: The device is still resetting from the last activation, it will be ready again in [DisplayTimeText(stop-world.time)].")) playsound(src, 'sound/blank.ogg', 50, TRUE) return activate_music() @@ -130,7 +130,7 @@ updateUsrDialog() if("select") if(active) - to_chat(usr, "Error: You cannot change the song until the current one is over.") + to_chat(usr, span_warning("Error: You cannot change the song until the current one is over.")) return var/list/available = list() diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index 8efba96df..281746636 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -26,11 +26,11 @@ /obj/machinery/defibrillator_mount/examine(mob/user) . = ..() if(defib) - . += "There is a defib unit hooked up. Alt-click to remove it." + . += span_notice("There is a defib unit hooked up. Alt-click to remove it.") if(GLOB.security_level >= SEC_LEVEL_RED) - . += "Due to a security situation, its locking clamps can be toggled by swiping any ID." + . += span_notice("Due to a security situation, its locking clamps can be toggled by swiping any ID.") else - . += "Its locking clamps can be [clamps_locked ? "dis" : ""]engaged by swiping an ID with access." + . += span_notice("Its locking clamps can be [clamps_locked ? "dis" : ""]engaged by swiping an ID with access.") /obj/machinery/defibrillator_mount/process() if(defib && defib.cell && defib.cell.charge < defib.cell.maxcharge && is_operational()) @@ -62,23 +62,23 @@ //defib interaction /obj/machinery/defibrillator_mount/attack_hand(mob/living/user) if(!defib) - to_chat(user, "There's no defibrillator unit loaded!") + to_chat(user, span_warning("There's no defibrillator unit loaded!")) return if(defib.paddles.loc != defib) - to_chat(user, "[defib.paddles.loc == user ? "You are already" : "Someone else is"] holding [defib]'s paddles!") + to_chat(user, span_warning("[defib.paddles.loc == user ? "You are already" : "Someone else is"] holding [defib]'s paddles!")) return user.put_in_hands(defib.paddles) /obj/machinery/defibrillator_mount/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/defibrillator)) if(defib) - to_chat(user, "There's already a defibrillator in [src]!") + to_chat(user, span_warning("There's already a defibrillator in [src]!")) return if(HAS_TRAIT(I, TRAIT_NODROP) || !user.transferItemToLoc(I, src)) - to_chat(user, "[I] is stuck to your hand!") + to_chat(user, span_warning("[I] is stuck to your hand!")) return - user.visible_message("[user] hooks up [I] to [src]!", \ - "I press [I] into the mount, and it clicks into place.") + user.visible_message(span_notice("[user] hooks up [I] to [src]!"), \ + span_notice("I press [I] into the mount, and it clicks into place.")) playsound(src, 'sound/blank.ogg', 50, TRUE) defib = I update_icon() @@ -90,31 +90,31 @@ if(id) if(check_access(id) || GLOB.security_level >= SEC_LEVEL_RED) //anyone can toggle the clamps in red alert! if(!defib) - to_chat(user, "I can't engage the clamps on a defibrillator that isn't there.") + to_chat(user, span_warning("I can't engage the clamps on a defibrillator that isn't there.")) return clamps_locked = !clamps_locked - to_chat(user, "Clamps [clamps_locked ? "" : "dis"]engaged.") + to_chat(user, span_notice("Clamps [clamps_locked ? "" : "dis"]engaged.")) update_icon() else - to_chat(user, "Insufficient access.") + to_chat(user, span_warning("Insufficient access.")) return ..() /obj/machinery/defibrillator_mount/multitool_act(mob/living/user, obj/item/multitool) ..() if(!defib) - to_chat(user, "There isn't any defibrillator to clamp in!") + to_chat(user, span_warning("There isn't any defibrillator to clamp in!")) return TRUE if(!clamps_locked) - to_chat(user, "[src]'s clamps are disengaged!") + to_chat(user, span_warning("[src]'s clamps are disengaged!")) return TRUE - user.visible_message("[user] presses [multitool] into [src]'s ID slot...", \ - "I begin overriding the clamps on [src]...") + user.visible_message(span_notice("[user] presses [multitool] into [src]'s ID slot..."), \ + span_notice("I begin overriding the clamps on [src]...")) playsound(src, 'sound/blank.ogg', 50, TRUE) if(!do_after(user, 100, target = src) || !clamps_locked) return - user.visible_message("[user] pulses [multitool], and [src]'s clamps slide up.", \ - "I override the locking clamps on [src]!") + user.visible_message(span_notice("[user] pulses [multitool], and [src]'s clamps slide up."), \ + span_notice("I override the locking clamps on [src]!")) playsound(src, 'sound/blank.ogg', 50, TRUE) clamps_locked = FALSE update_icon() @@ -124,16 +124,16 @@ if(!istype(user) || !user.canUseTopic(src, BE_CLOSE)) return if(!defib) - to_chat(user, "It'd be hard to remove a defib unit from a mount that has none.") + to_chat(user, span_warning("It'd be hard to remove a defib unit from a mount that has none.")) return if(clamps_locked) - to_chat(user, "I try to tug out [defib], but the mount's clamps are locked tight!") + to_chat(user, span_warning("I try to tug out [defib], but the mount's clamps are locked tight!")) return if(!user.put_in_hands(defib)) - to_chat(user, "I need a free hand!") + to_chat(user, span_warning("I need a free hand!")) return - user.visible_message("[user] unhooks [defib] from [src].", \ - "I slide out [defib] from [src] and unhook the charging cables.") + user.visible_message(span_notice("[user] unhooks [defib] from [src]."), \ + span_notice("I slide out [defib] from [src] and unhook the charging cables.")) playsound(src, 'sound/blank.ogg', 50, TRUE) defib = null update_icon() diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index ad3e53fa9..cbfbe71a5 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -31,7 +31,7 @@ if(!I.tool_start_check(user, amount=0)) return - to_chat(user, "I begin repairing [src]...") + to_chat(user, span_notice("I begin repairing [src]...")) if(I.use_tool(src, user, 40, volume=40)) obj_integrity = CLAMP(obj_integrity + 20, 0, max_integrity) else @@ -68,10 +68,10 @@ if(istype(I,/obj/item/stack/sheet/mineral/wood)) var/obj/item/stack/sheet/mineral/wood/W = I if(W.amount < 5) - to_chat(user, "I need at least five wooden planks to make a wall!") + to_chat(user, span_warning("I need at least five wooden planks to make a wall!")) return else - to_chat(user, "I start adding [I] to [src]...") + to_chat(user, span_notice("I start adding [I] to [src]...")) if(do_after(user, 50, target=src)) W.use(5) var/turf/T = get_turf(src) @@ -136,7 +136,7 @@ density = TRUE anchored = TRUE if(deploy_message) - visible_message("[src] deploys!") + visible_message(span_warning("[src] deploys!")) /obj/item/grenade/barrier @@ -150,7 +150,7 @@ /obj/item/grenade/barrier/examine(mob/user) . = ..() - . += "Alt-click to toggle modes." + . += span_notice("Alt-click to toggle modes.") /obj/item/grenade/barrier/AltClick(mob/living/carbon/user) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE)) @@ -166,7 +166,7 @@ if(HORIZONTAL) mode = SINGLE - to_chat(user, "[src] is now in [mode] mode.") + to_chat(user, span_notice("[src] is now in [mode] mode.")) /obj/item/grenade/barrier/prime() new /obj/structure/barricade/security(get_turf(src.loc)) diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm index d0562f480..aa9b41db1 100644 --- a/code/game/machinery/dish_drive.dm +++ b/code/game/machinery/dish_drive.dm @@ -34,15 +34,15 @@ /obj/machinery/dish_drive/examine(mob/user) . = ..() if(user.Adjacent(src)) - . += "Alt-click it to beam its contents to any nearby disposal bins." + . += span_notice("Alt-click it to beam its contents to any nearby disposal bins.") /obj/machinery/dish_drive/attack_hand(mob/living/user) if(!contents.len) - to_chat(user, "There's nothing in [src]!") + to_chat(user, span_warning("There's nothing in [src]!")) return var/obj/item/I = contents[contents.len] //the most recently-added item user.put_in_hands(I) - to_chat(user, "I take out [I] from [src].") + to_chat(user, span_notice("I take out [I] from [src].")) playsound(src, 'sound/blank.ogg', 50, TRUE) flick("synthesizer_beam", src) @@ -50,7 +50,7 @@ if(is_type_in_list(I, collectable_items) && user.used_intent.type != INTENT_HARM) if(!user.transferItemToLoc(I, src)) return - to_chat(user, "I put [I] in [src], and it's beamed into energy!") + to_chat(user, span_notice("I put [I] in [src], and it's beamed into energy!")) playsound(src, 'sound/blank.ogg', 50, TRUE) flick("synthesizer_beam", src) return @@ -88,7 +88,7 @@ for(var/obj/item/I in view(4, src)) if(is_type_in_list(I, collectable_items) && I.loc != src && (!I.reagents || !I.reagents.total_volume)) if(I.Adjacent(src)) - visible_message("[src] beams up [I]!") + visible_message(span_notice("[src] beams up [I]!")) I.forceMove(src) playsound(src, 'sound/blank.ogg', 50, TRUE) flick("synthesizer_beam", src) @@ -98,7 +98,7 @@ /obj/machinery/dish_drive/attack_ai(mob/living/user) if(stat) return - to_chat(user, "I send a disposal transmission signal to [src].") + to_chat(user, span_notice("I send a disposal transmission signal to [src].")) do_the_dishes(TRUE) /obj/machinery/dish_drive/AltClick(mob/living/user) @@ -111,7 +111,7 @@ var/obj/machinery/disposal/bin/bin = locate() in view(7, src) if(!bin) if(manual) - visible_message("[src] buzzes. There are no disposal bins in range!") + visible_message(span_warning("[src] buzzes. There are no disposal bins in range!")) playsound(src, 'sound/blank.ogg', 50, TRUE) return var/disposed = 0 @@ -121,7 +121,7 @@ use_power(active_power_usage) disposed++ if (disposed) - visible_message("[src] [pick("whooshes", "bwooms", "fwooms", "pshooms")] and beams [disposed] stored item\s into the nearby [bin.name].") + visible_message(span_notice("[src] [pick("whooshes", "bwooms", "fwooms", "pshooms")] and beams [disposed] stored item\s into the nearby [bin.name].")) playsound(src, 'sound/blank.ogg', 50, TRUE) playsound(bin, 'sound/blank.ogg', 50, TRUE) Beam(bin, icon_state = "rped_upgrade", time = 5) diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index c54924e25..7a854e4d8 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -30,7 +30,7 @@ /obj/machinery/dna_scannernew/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Radiation pulse accuracy increased by factor [precision_coeff**2].
Radiation pulse damage decreased by factor [damage_coeff**2].
" + . += span_notice("The status display reads: Radiation pulse accuracy increased by factor [precision_coeff**2].
Radiation pulse damage decreased by factor [damage_coeff**2].") /obj/machinery/dna_scannernew/update_icon_state() //no power or maintenance @@ -52,7 +52,7 @@ /obj/machinery/dna_scannernew/proc/toggle_open(mob/user) if(panel_open) - to_chat(user, "Close the maintenance panel first.") + to_chat(user, span_notice("Close the maintenance panel first.")) return if(state_open) @@ -60,7 +60,7 @@ return else if(locked) - to_chat(user, "The bolts are locked down, securing the door shut.") + to_chat(user, span_notice("The bolts are locked down, securing the door shut.")) return open_machine() @@ -71,15 +71,15 @@ return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user.visible_message("I see [user] kicking against the door of [src]!", \ - "I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "I hear a metallic creaking from [src].") + user.visible_message(span_notice("I see [user] kicking against the door of [src]!"), \ + span_notice("I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_hear("I hear a metallic creaking from [src].")) if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src || state_open || !locked) return locked = FALSE - user.visible_message("[user] successfully broke out of [src]!", \ - "I successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("I successfully break out of [src]!")) open_machine() /obj/machinery/dna_scannernew/proc/locate_computer(type_) @@ -115,7 +115,7 @@ if(user.stat || locked) if(message_cooldown <= world.time) message_cooldown = world.time + 50 - to_chat(user, "[src]'s door won't budge!") + to_chat(user, span_warning("[src]'s door won't budge!")) return open_machine() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index cb30959c5..d59a207c5 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -249,7 +249,7 @@ return locked = TRUE playsound(src,boltDown,30,FALSE,3) - audible_message("I hear a click from the bottom of the door.", null, 1) + audible_message(span_hear("I hear a click from the bottom of the door."), null, 1) update_icon() /obj/machinery/door/airlock/unlock() @@ -260,7 +260,7 @@ return locked = FALSE playsound(src,boltUp,30,FALSE,3) - audible_message("I hear a click from the bottom of the door.", null, 1) + audible_message(span_hear("I hear a click from the bottom of the door."), null, 1) update_icon() /obj/machinery/door/airlock/narsie_act() @@ -621,7 +621,7 @@ /obj/machinery/door/airlock/examine(mob/user) . = ..() if(obj_flags & EMAGGED) - . += "Its access panel is smoking slightly." + . += span_warning("Its access panel is smoking slightly.") if(note) if(!in_range(user, src)) . += "There's a [note.name] pinned to the front. You can't read it from here." @@ -652,10 +652,10 @@ . += "It looks very robust." if(issilicon(user) && (!stat & BROKEN)) - . += "Shift-click [src] to [ density ? "open" : "close"] it." - . += "Ctrl-click [src] to [ locked ? "raise" : "drop"] its bolts." - . += "Alt-click [src] to [ secondsElectrified ? "un-electrify" : "permanently electrify"] it." - . += "Ctrl-Shift-click [src] to [ emergency ? "disable" : "enable"] emergency access." + . += span_notice("Shift-click [src] to [ density ? "open" : "close"] it.") + . += span_notice("Ctrl-click [src] to [ locked ? "raise" : "drop"] its bolts.") + . += span_notice("Alt-click [src] to [ secondsElectrified ? "un-electrify" : "permanently electrify"] it.") + . += span_notice("Ctrl-Shift-click [src] to [ emergency ? "disable" : "enable"] emergency access.") /obj/machinery/door/airlock/attack_ai(mob/user) if(!canAIControl(user)) @@ -663,12 +663,12 @@ hack(user) return else - to_chat(user, "Airlock AI control has been blocked with a firewall. Unable to hack.") + to_chat(user, span_warning("Airlock AI control has been blocked with a firewall. Unable to hack.")) if(obj_flags & EMAGGED) - to_chat(user, "Unable to interface: Airlock is unresponsive.") + to_chat(user, span_warning("Unable to interface: Airlock is unresponsive.")) return if(detonated) - to_chat(user, "Unable to interface. Airlock control panel damaged.") + to_chat(user, span_warning("Unable to interface. Airlock control panel damaged.")) return ui_interact(user) @@ -677,43 +677,43 @@ set waitfor = 0 if(!aiHacking) aiHacking = TRUE - to_chat(user, "Airlock AI control has been blocked. Beginning fault-detection.") + to_chat(user, span_warning("Airlock AI control has been blocked. Beginning fault-detection.")) sleep(50) if(canAIControl(user)) - to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.") + to_chat(user, span_notice("Alert cancelled. Airlock control has been restored without our assistance.")) aiHacking = FALSE return else if(!canAIHack()) - to_chat(user, "Connection lost! Unable to hack airlock.") + to_chat(user, span_warning("Connection lost! Unable to hack airlock.")) aiHacking = FALSE return - to_chat(user, "Fault confirmed: airlock control wire disabled or cut.") + to_chat(user, span_notice("Fault confirmed: airlock control wire disabled or cut.")) sleep(20) - to_chat(user, "Attempting to hack into airlock. This may take some time.") + to_chat(user, span_notice("Attempting to hack into airlock. This may take some time.")) sleep(200) if(canAIControl(user)) - to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.") + to_chat(user, span_notice("Alert cancelled. Airlock control has been restored without our assistance.")) aiHacking = FALSE return else if(!canAIHack()) - to_chat(user, "Connection lost! Unable to hack airlock.") + to_chat(user, span_warning("Connection lost! Unable to hack airlock.")) aiHacking = FALSE return - to_chat(user, "Upload access confirmed. Loading control program into airlock software.") + to_chat(user, span_notice("Upload access confirmed. Loading control program into airlock software.")) sleep(170) if(canAIControl(user)) - to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.") + to_chat(user, span_notice("Alert cancelled. Airlock control has been restored without our assistance.")) aiHacking = FALSE return else if(!canAIHack()) - to_chat(user, "Connection lost! Unable to hack airlock.") + to_chat(user, span_warning("Connection lost! Unable to hack airlock.")) aiHacking = FALSE return - to_chat(user, "Transfer complete. Forcing airlock to execute program.") + to_chat(user, span_notice("Transfer complete. Forcing airlock to execute program.")) sleep(50) //disable blocked control aiControlDisabled = 2 - to_chat(user, "Receiving control information from airlock.") + to_chat(user, span_notice("Receiving control information from airlock.")) sleep(10) //bring up airlock dialog aiHacking = FALSE @@ -742,16 +742,16 @@ if((HAS_TRAIT(H, TRAIT_DUMB)) && Adjacent(user)) playsound(src, 'sound/blank.ogg', 25, TRUE) if(!istype(H.head, /obj/item/clothing/head/helmet)) - H.visible_message("[user] headbutts the airlock.", \ - "I headbutt the airlock!") + H.visible_message(span_danger("[user] headbutts the airlock."), \ + span_danger("I headbutt the airlock!")) H.Paralyze(100) H.apply_damage(10, BRUTE, BODY_ZONE_HEAD) else - visible_message("[user] headbutts the airlock. Good thing [user.p_theyre()] wearing a helmet.") + visible_message(span_danger("[user] headbutts the airlock. Good thing [user.p_theyre()] wearing a helmet.")) /obj/machinery/door/airlock/attempt_wire_interaction(mob/user) if(security_level) - to_chat(user, "Wires are protected!") + to_chat(user, span_warning("Wires are protected!")) return WIRE_INTERACTION_FAIL return ..() @@ -802,28 +802,28 @@ if(istype(C, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/S = C if(S.get_amount() < 2) - to_chat(user, "I need at least 2 metal sheets to reinforce [src].") + to_chat(user, span_warning("I need at least 2 metal sheets to reinforce [src].")) return - to_chat(user, "I start reinforcing [src].") + to_chat(user, span_notice("I start reinforcing [src].")) if(do_after(user, 20, TRUE, src)) if(!panel_open || !S.use(2)) return - user.visible_message("[user] reinforces \the [src] with metal.", - "I reinforce \the [src] with metal.") + user.visible_message(span_notice("[user] reinforces \the [src] with metal."), + span_notice("I reinforce \the [src] with metal.")) security_level = AIRLOCK_SECURITY_METAL update_icon() return else if(istype(C, /obj/item/stack/sheet/plasteel)) var/obj/item/stack/sheet/plasteel/S = C if(S.get_amount() < 2) - to_chat(user, "I need at least 2 plasteel sheets to reinforce [src].") + to_chat(user, span_warning("I need at least 2 plasteel sheets to reinforce [src].")) return - to_chat(user, "I start reinforcing [src].") + to_chat(user, span_notice("I start reinforcing [src].")) if(do_after(user, 20, TRUE, src)) if(!panel_open || !S.use(2)) return - user.visible_message("[user] reinforces \the [src] with plasteel.", - "I reinforce \the [src] with plasteel.") + user.visible_message(span_notice("[user] reinforces \the [src] with plasteel."), + span_notice("I reinforce \the [src] with plasteel.")) security_level = AIRLOCK_SECURITY_PLASTEEL modify_max_integrity(normal_integrity * AIRLOCK_INTEGRITY_MULTIPLIER) damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R @@ -833,13 +833,13 @@ if(C.tool_behaviour == TOOL_WELDER) if(!C.tool_start_check(user, amount=2)) return - to_chat(user, "I begin cutting the panel's shielding...") + to_chat(user, span_notice("I begin cutting the panel's shielding...")) if(C.use_tool(src, user, 40, volume=50, amount = 2)) if(!panel_open) return - user.visible_message("[user] cuts through \the [src]'s shielding.", - "I cut through \the [src]'s shielding.", - "I hear welding.") + user.visible_message(span_notice("[user] cuts through \the [src]'s shielding."), + span_notice("I cut through \the [src]'s shielding."), + span_hear("I hear welding.")) security_level = AIRLOCK_SECURITY_NONE spawn_atom_to_turf(/obj/item/stack/sheet/metal, user.loc, 2) update_icon() @@ -847,14 +847,14 @@ if(AIRLOCK_SECURITY_PLASTEEL_I_S) if(C.tool_behaviour == TOOL_CROWBAR) var/obj/item/crowbar/W = C - to_chat(user, "I start removing the inner layer of shielding...") + to_chat(user, span_notice("I start removing the inner layer of shielding...")) if(W.use_tool(src, user, 40, volume=100)) if(!panel_open) return if(security_level != AIRLOCK_SECURITY_PLASTEEL_I_S) return - user.visible_message("[user] remove \the [src]'s shielding.", - "I remove \the [src]'s inner shielding.") + user.visible_message(span_notice("[user] remove \the [src]'s shielding."), + span_notice("I remove \the [src]'s inner shielding.")) security_level = AIRLOCK_SECURITY_NONE modify_max_integrity(normal_integrity) damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_N @@ -865,25 +865,25 @@ if(C.tool_behaviour == TOOL_WELDER) if(!C.tool_start_check(user, amount=2)) return - to_chat(user, "I begin cutting the inner layer of shielding...") + to_chat(user, span_notice("I begin cutting the inner layer of shielding...")) if(C.use_tool(src, user, 40, volume=50, amount=2)) if(!panel_open) return - user.visible_message("[user] cuts through \the [src]'s shielding.", - "I cut through \the [src]'s shielding.", - "I hear welding.") + user.visible_message(span_notice("[user] cuts through \the [src]'s shielding."), + span_notice("I cut through \the [src]'s shielding."), + span_hear("I hear welding.")) security_level = AIRLOCK_SECURITY_PLASTEEL_I_S return if(AIRLOCK_SECURITY_PLASTEEL_O_S) if(C.tool_behaviour == TOOL_CROWBAR) - to_chat(user, "I start removing outer layer of shielding...") + to_chat(user, span_notice("I start removing outer layer of shielding...")) if(C.use_tool(src, user, 40, volume=100)) if(!panel_open) return if(security_level != AIRLOCK_SECURITY_PLASTEEL_O_S) return - user.visible_message("[user] remove \the [src]'s shielding.", - "I remove \the [src]'s shielding.") + user.visible_message(span_notice("[user] remove \the [src]'s shielding."), + span_notice("I remove \the [src]'s shielding.")) security_level = AIRLOCK_SECURITY_PLASTEEL_I spawn_atom_to_turf(/obj/item/stack/sheet/plasteel, user.loc, 1) return @@ -891,37 +891,37 @@ if(C.tool_behaviour == TOOL_WELDER) if(!C.tool_start_check(user, amount=2)) return - to_chat(user, "I begin cutting the outer layer of shielding...") + to_chat(user, span_notice("I begin cutting the outer layer of shielding...")) if(C.use_tool(src, user, 40, volume=50, amount=2)) if(!panel_open) return - user.visible_message("[user] cuts through \the [src]'s shielding.", - "I cut through \the [src]'s shielding.", - "I hear welding.") + user.visible_message(span_notice("[user] cuts through \the [src]'s shielding."), + span_notice("I cut through \the [src]'s shielding."), + span_hear("I hear welding.")) security_level = AIRLOCK_SECURITY_PLASTEEL_O_S return if(AIRLOCK_SECURITY_PLASTEEL) if(C.tool_behaviour == TOOL_WIRECUTTER) if(hasPower() && shock(user, 60)) // Protective grille of wiring is electrified return - to_chat(user, "I start cutting through the outer grille.") + to_chat(user, span_notice("I start cutting through the outer grille.")) if(C.use_tool(src, user, 10, volume=100)) if(!panel_open) return - user.visible_message("[user] cut through \the [src]'s outer grille.", - "I cut through \the [src]'s outer grille.") + user.visible_message(span_notice("[user] cut through \the [src]'s outer grille."), + span_notice("I cut through \the [src]'s outer grille.")) security_level = AIRLOCK_SECURITY_PLASTEEL_O return if(C.tool_behaviour == TOOL_SCREWDRIVER) if(panel_open && detonated) - to_chat(user, "[src] has no maintenance panel!") + to_chat(user, span_warning("[src] has no maintenance panel!")) return panel_open = !panel_open - to_chat(user, "I [panel_open ? "open":"close"] the maintenance panel of the airlock.") + to_chat(user, span_notice("I [panel_open ? "open":"close"] the maintenance panel of the airlock.")) C.play_tool_sound(src) update_icon() else if((C.tool_behaviour == TOOL_WIRECUTTER) && note) - user.visible_message("[user] cuts down [note] from [src].", "I remove [note] from [src].") + user.visible_message(span_notice("[user] cuts down [note] from [src]."), span_notice("I remove [note] from [src].")) C.play_tool_sound(src) note.forceMove(get_turf(user)) note = null @@ -936,12 +936,12 @@ change_paintjob(C, user) else if(istype(C, /obj/item/paper) || istype(C, /obj/item/photo)) if(note) - to_chat(user, "There's already something pinned to this airlock! Use wirecutters to remove it.") + to_chat(user, span_warning("There's already something pinned to this airlock! Use wirecutters to remove it.")) return if(!user.transferItemToLoc(C, src)) - to_chat(user, "For some reason, you can't attach [C]!") + to_chat(user, span_warning("For some reason, you can't attach [C]!")) return - user.visible_message("[user] pins [C] to [src].", "I pin [C] to [src].") + user.visible_message(span_notice("[user] pins [C] to [src]."), span_notice("I pin [C] to [src].")) note = C update_icon() else @@ -953,29 +953,29 @@ if(user.used_intent.type != INTENT_HELP) if(!W.tool_start_check(user, amount=0)) return - user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \ - "I begin [welded ? "unwelding":"welding"] the airlock...", \ - "I hear welding.") + user.visible_message(span_notice("[user] is [welded ? "unwelding":"welding"] the airlock."), \ + span_notice("I begin [welded ? "unwelding":"welding"] the airlock..."), \ + span_hear("I hear welding.")) if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user))) welded = !welded - user.visible_message("[user.name] has [welded? "welded shut":"unwelded"] [src].", \ - "I [welded ? "weld the airlock shut":"unweld the airlock"].") + user.visible_message(span_notice("[user.name] has [welded? "welded shut":"unwelded"] [src]."), \ + span_notice("I [welded ? "weld the airlock shut":"unweld the airlock"].")) update_icon() else if(obj_integrity < max_integrity) if(!W.tool_start_check(user, amount=0)) return - user.visible_message("[user] is welding the airlock.", \ - "I begin repairing the airlock...", \ - "I hear welding.") + user.visible_message(span_notice("[user] is welding the airlock."), \ + span_notice("I begin repairing the airlock..."), \ + span_hear("I hear welding.")) if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user))) obj_integrity = max_integrity stat &= ~BROKEN - user.visible_message("[user.name] has repaired [src].", \ - "I finish repairing the airlock.") + user.visible_message(span_notice("[user.name] has repaired [src]."), \ + span_notice("I finish repairing the airlock.")) update_icon() else - to_chat(user, "The airlock doesn't need repairing.") + to_chat(user, span_notice("The airlock doesn't need repairing.")) /obj/machinery/door/airlock/proc/weld_checks(obj/item/weldingtool/W, mob/user) return !operating && density @@ -984,16 +984,16 @@ if(I) var/beingcrowbarred = (I.tool_behaviour == TOOL_CROWBAR) if(!security_level && (beingcrowbarred && panel_open && ((obj_flags & EMAGGED) || (density && welded && !operating && !hasPower() && !locked)))) - user.visible_message("[user] removes the electronics from the airlock assembly.", \ - "I start to remove electronics from the airlock assembly...") + user.visible_message(span_notice("[user] removes the electronics from the airlock assembly."), \ + span_notice("I start to remove electronics from the airlock assembly...")) if(I.use_tool(src, user, 40, volume=100)) deconstruct(TRUE, user) return if(locked) - to_chat(user, "The airlock's bolts prevent it from being forced!") + to_chat(user, span_warning("The airlock's bolts prevent it from being forced!")) return if(welded) - to_chat(user, "It's welded, it won't budge!") + to_chat(user, span_warning("It's welded, it won't budge!")) return if(hasPower()) if(forced) @@ -1011,17 +1011,17 @@ if(do_after(user, time_to_open, TRUE, src)) open(2) if(density && !open(2)) - to_chat(user, "Despite your attempts, [src] refuses to open.") + to_chat(user, span_warning("Despite your attempts, [src] refuses to open.")) prying_so_hard = FALSE return - to_chat(user, "The airlock's motors resist your efforts to force it!") + to_chat(user, span_warning("The airlock's motors resist your efforts to force it!")) return if(!operating) if(istype(I, /obj/item/twohanded/fireaxe)) //being fireaxe'd var/obj/item/twohanded/fireaxe/F = I if(!F.wielded) - to_chat(user, "I need to be wielding the fire axe to do that!") + to_chat(user, span_warning("I need to be wielding the fire axe to do that!")) return INVOKE_ASYNC(src, (density ? PROC_REF(open) : PROC_REF(close)), 2) @@ -1231,11 +1231,11 @@ if(!density) //Already open return if(locked || welded) //Extremely generic, as aliens only understand the basics of how airlocks work. - to_chat(user, "[src] refuses to budge!") + to_chat(user, span_warning("[src] refuses to budge!")) return - user.visible_message("[user] begins prying open [src].",\ - "I begin digging your claws into [src] with all your might!",\ - "I hear groaning metal...") + user.visible_message(span_warning("[user] begins prying open [src]."),\ + span_noticealien("I begin digging your claws into [src] with all your might!"),\ + span_warning("I hear groaning metal...")) var/time_to_open = 5 if(hasPower()) time_to_open = 50 //Powered airlocks take longer to open, and are loud. @@ -1244,7 +1244,7 @@ if(do_after(user, time_to_open, TRUE, src)) if(density && !open(2)) //The airlock is still closed, but something prevented it opening. (Another player noticed and bolted/welded the airlock in time!) - to_chat(user, "Despite your efforts, [src] managed to resist your attempts to open it!") + to_chat(user, span_warning("Despite your efforts, [src] managed to resist your attempts to open it!")) /obj/machinery/door/airlock/hostile_lockdown(mob/origin) // Must be powered and have working AI wire. @@ -1319,10 +1319,10 @@ A.obj_integrity = A.max_integrity * 0.5 else if(obj_flags & EMAGGED) if(user) - to_chat(user, "I discard the damaged electronics.") + to_chat(user, span_warning("I discard the damaged electronics.")) else if(user) - to_chat(user, "I remove the airlock electronics.") + to_chat(user, span_notice("I remove the airlock electronics.")) var/obj/item/electronics/airlock/ae if(!electronics) @@ -1343,7 +1343,7 @@ switch(the_rcd.mode) if(RCD_DECONSTRUCT) if(security_level != AIRLOCK_SECURITY_NONE) - to_chat(user, "[src]'s reinforcement needs to be removed first.") + to_chat(user, span_notice("[src]'s reinforcement needs to be removed first.")) return FALSE return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 32) return FALSE @@ -1351,7 +1351,7 @@ /obj/machinery/door/airlock/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_DECONSTRUCT) - to_chat(user, "I deconstruct the airlock.") + to_chat(user, span_notice("I deconstruct the airlock.")) qdel(src) return TRUE return FALSE @@ -1419,14 +1419,14 @@ loseMainPower() update_icon() else - to_chat(usr, "Main power is already offline.") + to_chat(usr, span_warning("Main power is already offline.")) . = TRUE if("disrupt-backup") if(!secondsBackupPowerLost) loseBackupPower() update_icon() else - to_chat(usr, "Backup power is already offline.") + to_chat(usr, span_warning("Backup power is already offline.")) . = TRUE if("shock-restore") shock_restore(usr) @@ -1467,7 +1467,7 @@ if(!user_allowed(user)) return if(wires.is_cut(WIRE_SHOCK)) - to_chat(user, "Can't un-electrify the airlock - The electrification wire is cut.") + to_chat(user, span_warning("Can't un-electrify the airlock - The electrification wire is cut.")) else if(isElectrified()) set_electrified(MACHINE_NOT_ELECTRIFIED, user) @@ -1475,7 +1475,7 @@ if(!user_allowed(user)) return if(wires.is_cut(WIRE_SHOCK)) - to_chat(user, "The electrification wire has been cut.") + to_chat(user, span_warning("The electrification wire has been cut.")) else set_electrified(MACHINE_DEFAULT_ELECTRIFY_TIME, user) @@ -1483,7 +1483,7 @@ if(!user_allowed(user)) return if(wires.is_cut(WIRE_SHOCK)) - to_chat(user, "The electrification wire has been cut.") + to_chat(user, span_warning("The electrification wire has been cut.")) else set_electrified(MACHINE_ELECTRIFIED_PERMANENT, user) @@ -1491,11 +1491,11 @@ if(!user_allowed(user)) return if(wires.is_cut(WIRE_BOLTS)) - to_chat(user, "The door bolt drop wire is cut - you can't toggle the door bolts.") + to_chat(user, span_warning("The door bolt drop wire is cut - you can't toggle the door bolts.")) return if(locked) if(!hasPower()) - to_chat(user, "The door has no power - you can't raise the door bolts.") + to_chat(user, span_warning("The door has no power - you can't raise the door bolts.")) else unbolt() log_combat(user, src, "unbolted") @@ -1513,9 +1513,9 @@ if(!user_allowed(user)) return if(welded) - to_chat(user, text("The airlock has been welded shut!")) + to_chat(user, span_warning("The airlock has been welded shut!")) else if(locked) - to_chat(user, text("The door bolts are down!")) + to_chat(user, span_warning("The door bolts are down!")) else if(!density) close() else diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 395d58152..542400e62 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -9,7 +9,7 @@ /obj/item/electronics/airlock/examine(mob/user) . = ..() - . += "Has a neat selection menu for modifying airlock access levels." + . += span_notice("Has a neat selection menu for modifying airlock access levels.") /obj/item/electronics/airlock/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index a777ca997..bd26fd2b3 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -212,7 +212,7 @@ . = TRUE if(!allowed(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, span_warning("Access denied.")) return FALSE switch(action) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 1cd33c1a2..66c337740 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -42,13 +42,13 @@ . = ..() if(red_alert_access) if(GLOB.security_level >= SEC_LEVEL_RED) - . += "Due to a security threat, its access requirements have been lifted!" + . += span_notice("Due to a security threat, its access requirements have been lifted!") else - . += "In the event of a red alert, its access requirements will automatically lift." + . += span_notice("In the event of a red alert, its access requirements will automatically lift.") if(!poddoor) - . += "Its maintenance panel is screwed in place." + . += span_notice("Its maintenance panel is screwed in place.") if(safety_mode) - . += "It has labels indicating that it has an emergency mechanism to open it with just your hands if there's no power." + . += span_notice("It has labels indicating that it has an emergency mechanism to open it with just your hands if there's no power.") /obj/machinery/door/check_access_list(list/access_list) if(red_alert_access && GLOB.security_level >= SEC_LEVEL_RED) @@ -88,7 +88,7 @@ /obj/machinery/door/proc/try_safety_unlock(mob/user) if(safety_mode && !hasPower() && density) - to_chat(user, "I begin unlocking the airlock safety mechanism...") + to_chat(user, span_notice("I begin unlocking the airlock safety mechanism...")) if(do_after(user, 15 SECONDS, target = src)) try_to_crowbar(null, user) return TRUE @@ -338,7 +338,7 @@ /obj/machinery/door/proc/crush() for(var/mob/living/L in get_turf(src)) - L.visible_message("[src] closes on [L], crushing [L.p_them()]!", "[src] closes on you and crushes you!") + L.visible_message(span_warning("[src] closes on [L], crushing [L.p_them()]!"), span_danger("[src] closes on you and crushes you!")) if(isalien(L)) //For xenos L.adjustBruteLoss(DOOR_CRUSH_DAMAGE * 1.5) //Xenos go into crit after aproximately the same amount of crushes as humans. L.emote("roar") diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 7c7cb8330..710b4a559 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -34,13 +34,13 @@ /obj/machinery/door/firedoor/examine(mob/user) . = ..() if(!density) - . += "It is open, but could be pried closed." + . += span_notice("It is open, but could be pried closed.") else if(!welded) - . += "It is closed, but could be pried open. Deconstruction would require it to be welded shut." + . += span_notice("It is closed, but could be pried open. Deconstruction would require it to be welded shut.") else if(boltslocked) - . += "It is welded shut. The floor bolts have been locked by screws." + . += span_notice("It is welded shut. The floor bolts have been locked by screws.") else - . += "The bolt locks have been unscrewed, but the bolts themselves are still wrenched to the floor." + . += span_notice("The bolt locks have been unscrewed, but the bolts themselves are still wrenched to the floor.") /obj/machinery/door/firedoor/proc/CalculateAffectingAreas() remove_from_areas() @@ -87,8 +87,8 @@ return user.changeNext_move(CLICK_CD_MELEE) - user.visible_message("[user] bangs on \the [src].", \ - "I bang on \the [src].") + user.visible_message(span_notice("[user] bangs on \the [src]."), \ + span_notice("I bang on \the [src].")) playsound(loc, 'sound/blank.ogg', 10, FALSE, frequency = 32000) /obj/machinery/door/firedoor/attackby(obj/item/C, mob/user, params) @@ -99,21 +99,21 @@ if(welded) if(C.tool_behaviour == TOOL_WRENCH) if(boltslocked) - to_chat(user, "There are screws locking the bolts in place!") + to_chat(user, span_notice("There are screws locking the bolts in place!")) return C.play_tool_sound(src) - user.visible_message("[user] starts undoing [src]'s bolts...", \ - "I start unfastening [src]'s floor bolts...") + user.visible_message(span_notice("[user] starts undoing [src]'s bolts..."), \ + span_notice("I start unfastening [src]'s floor bolts...")) if(!C.use_tool(src, user, 50)) return playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] unfastens [src]'s bolts.", \ - "I undo [src]'s floor bolts.") + user.visible_message(span_notice("[user] unfastens [src]'s bolts."), \ + span_notice("I undo [src]'s floor bolts.")) deconstruct(TRUE) return if(C.tool_behaviour == TOOL_SCREWDRIVER) - user.visible_message("[user] [boltslocked ? "unlocks" : "locks"] [src]'s bolts.", \ - "I [boltslocked ? "unlock" : "lock"] [src]'s floor bolts.") + user.visible_message(span_notice("[user] [boltslocked ? "unlocks" : "locks"] [src]'s bolts."), \ + span_notice("I [boltslocked ? "unlock" : "lock"] [src]'s floor bolts.")) C.play_tool_sound(src) boltslocked = !boltslocked return @@ -126,10 +126,10 @@ /obj/machinery/door/firedoor/try_to_weld(obj/item/weldingtool/W, mob/user) if(!W.tool_start_check(user, amount=0)) return - user.visible_message("[user] starts [welded ? "unwelding" : "welding"] [src].", "I start welding [src].") + user.visible_message(span_notice("[user] starts [welded ? "unwelding" : "welding"] [src]."), span_notice("I start welding [src].")) if(W.use_tool(src, user, 40, volume=50)) welded = !welded - to_chat(user, "[user] [welded?"welds":"unwelds"] [src].", "I [welded ? "weld" : "unweld"] [src].") + to_chat(user, span_danger("[user] [welded?"welds":"unwelds"] [src]."), span_notice("I [welded ? "weld" : "unweld"] [src].")) update_icon() /obj/machinery/door/firedoor/try_to_crowbar(obj/item/I, mob/user) @@ -157,7 +157,7 @@ /obj/machinery/door/firedoor/attack_alien(mob/user) add_fingerprint(user) if(welded) - to_chat(user, "[src] refuses to budge!") + to_chat(user, span_warning("[src] refuses to budge!")) return open() @@ -275,15 +275,15 @@ . = ..() switch(constructionStep) if(CONSTRUCTION_PANEL_OPEN) - . += "It is unbolted from the floor. A small loosely connected metal plate is covering the wires." + . += span_notice("It is unbolted from the floor. A small loosely connected metal plate is covering the wires.") if(!reinforced) - . += "It could be reinforced with plasteel." + . += span_notice("It could be reinforced with plasteel.") if(CONSTRUCTION_WIRES_EXPOSED) - . += "The maintenance plate has been pried away, and wires are trailing." + . += span_notice("The maintenance plate has been pried away, and wires are trailing.") if(CONSTRUCTION_GUTTED) - . += "The maintenance panel is missing wires and the circuit board is loosely connected." + . += span_notice("The maintenance panel is missing wires and the circuit board is loosely connected.") if(CONSTRUCTION_NOCIRCUIT) - . += "There are no firelock electronics in the frame. The frame could be cut apart." + . += span_notice("There are no firelock electronics in the frame. The frame could be cut apart.") /obj/structure/firelock_frame/update_icon_state() icon_state = "frame[constructionStep]" @@ -293,31 +293,31 @@ if(CONSTRUCTION_PANEL_OPEN) if(C.tool_behaviour == TOOL_CROWBAR) C.play_tool_sound(src) - user.visible_message("[user] starts prying something out from [src]...", \ - "I begin prying out the wire cover...") + user.visible_message(span_notice("[user] starts prying something out from [src]..."), \ + span_notice("I begin prying out the wire cover...")) if(!C.use_tool(src, user, 50)) return if(constructionStep != CONSTRUCTION_PANEL_OPEN) return playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] pries out a metal plate from [src], exposing the wires.", \ - "I remove the cover plate from [src], exposing the wires.") + user.visible_message(span_notice("[user] pries out a metal plate from [src], exposing the wires."), \ + span_notice("I remove the cover plate from [src], exposing the wires.")) constructionStep = CONSTRUCTION_WIRES_EXPOSED update_icon() return if(C.tool_behaviour == TOOL_WRENCH) if(locate(/obj/machinery/door/firedoor) in get_turf(src)) - to_chat(user, "There's already a firelock there.") + to_chat(user, span_warning("There's already a firelock there.")) return C.play_tool_sound(src) - user.visible_message("[user] starts bolting down [src]...", \ - "I begin bolting [src]...") + user.visible_message(span_notice("[user] starts bolting down [src]..."), \ + span_notice("I begin bolting [src]...")) if(!C.use_tool(src, user, 30)) return if(locate(/obj/machinery/door/firedoor) in get_turf(src)) return - user.visible_message("[user] finishes the firelock.", \ - "I finish the firelock.") + user.visible_message(span_notice("[user] finishes the firelock."), \ + span_notice("I finish the firelock.")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) if(reinforced) new /obj/machinery/door/firedoor/heavy(get_turf(src)) @@ -328,19 +328,19 @@ if(istype(C, /obj/item/stack/sheet/plasteel)) var/obj/item/stack/sheet/plasteel/P = C if(reinforced) - to_chat(user, "[src] is already reinforced.") + to_chat(user, span_warning("[src] is already reinforced.")) return if(P.get_amount() < 2) - to_chat(user, "I need more plasteel to reinforce [src].") + to_chat(user, span_warning("I need more plasteel to reinforce [src].")) return - user.visible_message("[user] begins reinforcing [src]...", \ - "I begin reinforcing [src]...") + user.visible_message(span_notice("[user] begins reinforcing [src]..."), \ + span_notice("I begin reinforcing [src]...")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) if(do_after(user, 60, target = src)) if(constructionStep != CONSTRUCTION_PANEL_OPEN || reinforced || P.get_amount() < 2 || !P) return - user.visible_message("[user] reinforces [src].", \ - "I reinforce [src].") + user.visible_message(span_notice("[user] reinforces [src]."), \ + span_notice("I reinforce [src].")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) P.use(2) reinforced = 1 @@ -349,42 +349,42 @@ if(CONSTRUCTION_WIRES_EXPOSED) if(C.tool_behaviour == TOOL_WIRECUTTER) C.play_tool_sound(src) - user.visible_message("[user] starts cutting the wires from [src]...", \ - "I begin removing [src]'s wires...") + user.visible_message(span_notice("[user] starts cutting the wires from [src]..."), \ + span_notice("I begin removing [src]'s wires...")) if(!C.use_tool(src, user, 60)) return if(constructionStep != CONSTRUCTION_WIRES_EXPOSED) return - user.visible_message("[user] removes the wires from [src].", \ - "I remove the wiring from [src], exposing the circuit board.") + user.visible_message(span_notice("[user] removes the wires from [src]."), \ + span_notice("I remove the wiring from [src], exposing the circuit board.")) new/obj/item/stack/cable_coil(get_turf(src), 5) constructionStep = CONSTRUCTION_GUTTED update_icon() return if(C.tool_behaviour == TOOL_CROWBAR) C.play_tool_sound(src) - user.visible_message("[user] starts prying a metal plate into [src]...", \ - "I begin prying the cover plate back onto [src]...") + user.visible_message(span_notice("[user] starts prying a metal plate into [src]..."), \ + span_notice("I begin prying the cover plate back onto [src]...")) if(!C.use_tool(src, user, 80)) return if(constructionStep != CONSTRUCTION_WIRES_EXPOSED) return playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] pries the metal plate into [src].", \ - "I pry [src]'s cover plate into place, hiding the wires.") + user.visible_message(span_notice("[user] pries the metal plate into [src]."), \ + span_notice("I pry [src]'s cover plate into place, hiding the wires.")) constructionStep = CONSTRUCTION_PANEL_OPEN update_icon() return if(CONSTRUCTION_GUTTED) if(C.tool_behaviour == TOOL_CROWBAR) - user.visible_message("[user] begins removing the circuit board from [src]...", \ - "I begin prying out the circuit board from [src]...") + user.visible_message(span_notice("[user] begins removing the circuit board from [src]..."), \ + span_notice("I begin prying out the circuit board from [src]...")) if(!C.use_tool(src, user, 50, volume=50)) return if(constructionStep != CONSTRUCTION_GUTTED) return - user.visible_message("[user] removes [src]'s circuit board.", \ - "I remove the circuit board from [src].") + user.visible_message(span_notice("[user] removes [src]'s circuit board."), \ + span_notice("I remove the circuit board from [src].")) new /obj/item/electronics/firelock(drop_location()) constructionStep = CONSTRUCTION_NOCIRCUIT update_icon() @@ -392,16 +392,16 @@ if(istype(C, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/B = C if(B.get_amount() < 5) - to_chat(user, "I need more wires to add wiring to [src].") + to_chat(user, span_warning("I need more wires to add wiring to [src].")) return - user.visible_message("[user] begins wiring [src]...", \ - "I begin adding wires to [src]...") + user.visible_message(span_notice("[user] begins wiring [src]..."), \ + span_notice("I begin adding wires to [src]...")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) if(do_after(user, 60, target = src)) if(constructionStep != CONSTRUCTION_GUTTED || B.get_amount() < 5 || !B) return - user.visible_message("[user] adds wires to [src].", \ - "I wire [src].") + user.visible_message(span_notice("[user] adds wires to [src]."), \ + span_notice("I wire [src].")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) B.use(5) constructionStep = CONSTRUCTION_WIRES_EXPOSED @@ -411,14 +411,14 @@ if(C.tool_behaviour == TOOL_WELDER) if(!C.tool_start_check(user, amount=1)) return - user.visible_message("[user] begins cutting apart [src]'s frame...", \ - "I begin slicing [src] apart...") + user.visible_message(span_notice("[user] begins cutting apart [src]'s frame..."), \ + span_notice("I begin slicing [src] apart...")) if(C.use_tool(src, user, 40, volume=50, amount=1)) if(constructionStep != CONSTRUCTION_NOCIRCUIT) return - user.visible_message("[user] cuts apart [src]!", \ - "I cut [src] into metal.") + user.visible_message(span_notice("[user] cuts apart [src]!"), \ + span_notice("I cut [src] into metal.")) var/turf/T = get_turf(src) new /obj/item/stack/sheet/metal(T, 3) if(reinforced) @@ -426,16 +426,16 @@ qdel(src) return if(istype(C, /obj/item/electronics/firelock)) - user.visible_message("[user] starts adding [C] to [src]...", \ - "I begin adding a circuit board to [src]...") + user.visible_message(span_notice("[user] starts adding [C] to [src]..."), \ + span_notice("I begin adding a circuit board to [src]...")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) if(!do_after(user, 40, target = src)) return if(constructionStep != CONSTRUCTION_NOCIRCUIT) return qdel(C) - user.visible_message("[user] adds a circuit to [src].", \ - "I insert and secure [C].") + user.visible_message(span_notice("[user] adds a circuit to [src]."), \ + span_notice("I insert and secure [C].")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) constructionStep = CONSTRUCTION_GUTTED update_icon() @@ -444,8 +444,8 @@ var/obj/item/electroadaptive_pseudocircuit/P = C if(!P.adapt_circuit(user, 30)) return - user.visible_message("[user] fabricates a circuit and places it into [src].", \ - "I adapt a firelock circuit and slot it into the assembly.") + user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ + span_notice("I adapt a firelock circuit and slot it into the assembly.")) constructionStep = CONSTRUCTION_GUTTED update_icon() return @@ -459,8 +459,8 @@ /obj/structure/firelock_frame/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_UPGRADE_SIMPLE_CIRCUITS) - user.visible_message("[user] fabricates a circuit and places it into [src].", \ - "I adapt a firelock circuit and slot it into the assembly.") + user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ + span_notice("I adapt a firelock circuit and slot it into the assembly.")) constructionStep = CONSTRUCTION_GUTTED update_icon() return TRUE diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 128d48477..eb2f21f86 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -214,17 +214,17 @@ if(!(flags_1&NODECONSTRUCT_1)) if(I.tool_behaviour == TOOL_SCREWDRIVER) if(density || operating) - to_chat(user, "I need to open the door to access the maintenance panel!") + to_chat(user, span_warning("I need to open the door to access the maintenance panel!")) return I.play_tool_sound(src) panel_open = !panel_open - to_chat(user, "I [panel_open ? "open":"close"] the maintenance panel of the [name].") + to_chat(user, span_notice("I [panel_open ? "open":"close"] the maintenance panel of the [name].")) return if(I.tool_behaviour == TOOL_CROWBAR) if(panel_open && !density && !operating) - user.visible_message("[user] removes the electronics from the [name].", \ - "I start to remove electronics from the [name]...") + user.visible_message(span_notice("[user] removes the electronics from the [name]."), \ + span_notice("I start to remove electronics from the [name]...")) if(I.use_tool(src, user, 40, volume=50)) if(panel_open && !density && !operating && loc) var/obj/structure/windoor_assembly/WA = new /obj/structure/windoor_assembly(loc) @@ -247,11 +247,11 @@ WA.created_name = name if(obj_flags & EMAGGED) - to_chat(user, "I discard the damaged electronics.") + to_chat(user, span_warning("I discard the damaged electronics.")) qdel(src) return - to_chat(user, "I remove the airlock electronics.") + to_chat(user, span_notice("I remove the airlock electronics.")) var/obj/item/electronics/airlock/ae if(!electronics) @@ -284,7 +284,7 @@ else close(2) else - to_chat(user, "The door's motors resist your efforts to force it!") + to_chat(user, span_warning("The door's motors resist your efforts to force it!")) /obj/machinery/door/window/do_animate(animation) switch(animation) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index d5feada9b..e85c55b02 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -59,17 +59,17 @@ GLOBAL_LIST_EMPTY(doppler_arrays) if(!anchored && !isinspace()) anchored = TRUE power_change() - to_chat(user, "I fasten [src].") + to_chat(user, span_notice("I fasten [src].")) else if(anchored) anchored = FALSE power_change() - to_chat(user, "I unfasten [src].") + to_chat(user, span_notice("I unfasten [src].")) I.play_tool_sound(src) return return ..() /obj/machinery/doppler_array/proc/rot_message(mob/user) - to_chat(user, "I adjust [src]'s dish to face to the [dir2text(dir)].") + to_chat(user, span_notice("I adjust [src]'s dish to face to the [dir2text(dir)].")) playsound(src, 'sound/blank.ogg', 50, TRUE) /obj/machinery/doppler_array/proc/sense_explosion(turf/epicenter,devastation_range,heavy_impact_range,light_impact_range, diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index aed1eb353..cbe3c4372 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -139,7 +139,7 @@ /obj/machinery/droneDispenser/examine(mob/user) . = ..() if((mode == DRONE_RECHARGING) && !stat && recharging_text) - . += "[recharging_text]" + . += span_warning("[recharging_text]") /obj/machinery/droneDispenser/process() ..() @@ -160,7 +160,7 @@ if(maximum_idle && (count_shells() >= maximum_idle)) return // then do nothing; check again next tick if(begin_create_message) - visible_message("[src] [begin_create_message]") + visible_message(span_notice("[src] [begin_create_message]")) if(work_sound) playsound(src, work_sound, 50, TRUE) mode = DRONE_PRODUCTION @@ -178,7 +178,7 @@ if(create_sound) playsound(src, create_sound, 50, TRUE) if(end_create_message) - visible_message("[src] [end_create_message]") + visible_message(span_notice("[src] [end_create_message]")) mode = DRONE_RECHARGING timer = world.time + cooldownTime @@ -188,7 +188,7 @@ if(recharge_sound) playsound(src, recharge_sound, 50, TRUE) if(recharge_message) - visible_message("[src] [recharge_message]") + visible_message(span_notice("[src] [recharge_message]")) mode = DRONE_READY update_icon() @@ -214,26 +214,26 @@ var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) materials.retrieve_all() I.play_tool_sound(src) - to_chat(user, "I retrieve the materials from [src].") + to_chat(user, span_notice("I retrieve the materials from [src].")) else if(I.tool_behaviour == TOOL_WELDER) if(!(stat & BROKEN)) - to_chat(user, "[src] doesn't need repairs.") + to_chat(user, span_warning("[src] doesn't need repairs.")) return if(!I.tool_start_check(user, amount=1)) return user.visible_message( - "[user] begins patching up [src] with [I].", - "I begin restoring the damage to [src]...") + span_notice("[user] begins patching up [src] with [I]."), + span_notice("I begin restoring the damage to [src]...")) if(!I.use_tool(src, user, 40, volume=50, amount=1)) return user.visible_message( - "[user] fixes [src]!", - "I restore [src] to operation.") + span_notice("[user] fixes [src]!"), + span_notice("I restore [src] to operation.")) stat &= ~BROKEN obj_integrity = max_integrity @@ -246,7 +246,7 @@ if(!.) return if(break_message) - audible_message("[src] [break_message]") + audible_message(span_warning("[src] [break_message]")) if(break_sound) playsound(src, break_sound, 50, TRUE) diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 63c879ef0..78e18eef6 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -32,7 +32,7 @@ req_access = list() req_one_access = list() playsound(src, "sparks", 100, TRUE) - to_chat(user, "I short out the access controller.") + to_chat(user, span_warning("I short out the access controller.")) /obj/machinery/doorButtons/proc/removeMe() @@ -61,7 +61,7 @@ if(busy) return if(!allowed(user)) - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return if(controller && !controller.busy && door) if(controller.stat & NOPOWER) @@ -127,7 +127,7 @@ if(busy) return if(!allowed(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, span_warning("Access denied.")) return switch(href_list["command"]) if("close_exterior") diff --git a/code/game/machinery/exp_cloner.dm b/code/game/machinery/exp_cloner.dm index e769079ce..133de4773 100644 --- a/code/game/machinery/exp_cloner.dm +++ b/code/game/machinery/exp_cloner.dm @@ -57,11 +57,11 @@ if(grab_ghost_when == CLONER_FRESH_CLONE) H.grab_ghost() - to_chat(H, "Consciousness slowly creeps over you as my body regenerates.
So this is what cloning feels like?
") + to_chat(H, span_notice("Consciousness slowly creeps over you as my body regenerates.
So this is what cloning feels like?")) if(grab_ghost_when == CLONER_MATURE_CLONE) H.ghostize(TRUE) //Only does anything if they were still in their old body and not already a ghost - to_chat(H.get_ghost(TRUE), "My body is beginning to regenerate in a cloning pod. You will become conscious when it is complete.") + to_chat(H.get_ghost(TRUE), span_notice("My body is beginning to regenerate in a cloning pod. You will become conscious when it is complete.")) if(H) H.faction |= factions @@ -212,7 +212,7 @@ dat += "Clone" dat += "
[src.scanner.locked ? "Unlock Scanner" : "Lock Scanner"]" else - dat += "Clone" + dat += span_linkoff("Clone") var/datum/browser/popup = new(user, "cloning", "Prototype Cloning System Control") popup.set_content(dat) diff --git a/code/game/machinery/fat_sucker.dm b/code/game/machinery/fat_sucker.dm index 5c2815e1e..fe1798fcb 100644 --- a/code/game/machinery/fat_sucker.dm +++ b/code/game/machinery/fat_sucker.dm @@ -48,7 +48,7 @@ /obj/machinery/fat_sucker/close_machine(mob/user) if(panel_open) - to_chat(user, "I need to close the maintenance hatch first!") + to_chat(user, span_warning("I need to close the maintenance hatch first!")) return ..() playsound(src, 'sound/blank.ogg', 50) @@ -57,7 +57,7 @@ occupant.forceMove(drop_location()) occupant = null return - to_chat(occupant, "I enter [src].") + to_chat(occupant, span_notice("I enter [src].")) addtimer(CALLBACK(src, PROC_REF(start_extracting)), 20, TIMER_OVERRIDE|TIMER_UNIQUE) update_icon() @@ -70,18 +70,18 @@ /obj/machinery/fat_sucker/container_resist(mob/living/user) if(!free_exit || state_open) - to_chat(user, "The emergency release is not responding! You start pushing against the hull!") + to_chat(user, span_notice("The emergency release is not responding! You start pushing against the hull!")) user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user.visible_message("I see [user] kicking against the door of [src]!", \ - "I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "I hear a metallic creaking from [src].") + user.visible_message(span_notice("I see [user] kicking against the door of [src]!"), \ + span_notice("I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_hear("I hear a metallic creaking from [src].")) if(do_after(user, breakout_time, target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src || state_open) return free_exit = TRUE - user.visible_message("[user] successfully broke out of [src]!", \ - "I successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("I successfully break out of [src]!")) open_machine() return open_machine() @@ -92,19 +92,19 @@ else if(!processing || free_exit) open_machine() else - to_chat(user, "The safety hatch has been disabled!") + to_chat(user, span_warning("The safety hatch has been disabled!")) /obj/machinery/fat_sucker/AltClick(mob/living/user) if(!user.canUseTopic(src, BE_CLOSE)) return if(user == occupant) - to_chat(user, "I can't reach the controls from inside!") + to_chat(user, span_warning("I can't reach the controls from inside!")) return if(!(obj_flags & EMAGGED) && !allowed(user)) - to_chat(user, "I lack the required access.") + to_chat(user, span_warning("I lack the required access.")) return free_exit = !free_exit - to_chat(user, "Safety hatch [free_exit ? "unlocked" : "locked"].") + to_chat(user, span_notice("Safety hatch [free_exit ? "unlocked" : "locked"].")) /obj/machinery/fat_sucker/update_overlays() . = ..() @@ -190,10 +190,10 @@ if(..()) return if(occupant) - to_chat(user, "[src] is currently occupied!") + to_chat(user, span_warning("[src] is currently occupied!")) return if(state_open) - to_chat(user, "[src] must be closed to [panel_open ? "close" : "open"] its maintenance hatch!") + to_chat(user, span_warning("[src] must be closed to [panel_open ? "close" : "open"] its maintenance hatch!")) return if(default_deconstruction_screwdriver(user, icon_state, icon_state, I)) update_icon() @@ -209,5 +209,5 @@ return start_at = 100 stop_at = 0 - to_chat(user, "I remove the access restrictions and lower the automatic ejection threshold!") + to_chat(user, span_notice("I remove the access restrictions and lower the automatic ejection threshold!")) obj_flags |= EMAGGED diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 072e1f5f5..935f93ccd 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -106,8 +106,8 @@ obj_flags |= EMAGGED update_icon() if(user) - user.visible_message("Sparks fly out of [src]!", - "I emag [src], disabling its thermal sensors.") + user.visible_message(span_warning("Sparks fly out of [src]!"), + span_notice("I emag [src], disabling its thermal sensors.")) playsound(src, "sparks", 50, TRUE) /obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume) @@ -155,7 +155,7 @@ if(W.tool_behaviour == TOOL_SCREWDRIVER && buildstage == 2) W.play_tool_sound(src) panel_open = !panel_open - to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"].") + to_chat(user, span_notice("The wires have been [panel_open ? "exposed" : "unexposed"].")) update_icon() return @@ -166,12 +166,12 @@ if(!W.tool_start_check(user, amount=0)) return - to_chat(user, "I begin repairing [src]...") + to_chat(user, span_notice("I begin repairing [src]...")) if(W.use_tool(src, user, 40, volume=50)) obj_integrity = max_integrity - to_chat(user, "I repair [src].") + to_chat(user, span_notice("I repair [src].")) else - to_chat(user, "[src] is already in good condition!") + to_chat(user, span_warning("[src] is already in good condition!")) return switch(buildstage) @@ -179,16 +179,16 @@ if(W.tool_behaviour == TOOL_MULTITOOL) detecting = !detecting if (src.detecting) - user.visible_message("[user] has reconnected [src]'s detecting unit!", "I reconnect [src]'s detecting unit.") + user.visible_message(span_notice("[user] has reconnected [src]'s detecting unit!"), span_notice("I reconnect [src]'s detecting unit.")) else - user.visible_message("[user] has disconnected [src]'s detecting unit!", "I disconnect [src]'s detecting unit.") + user.visible_message(span_notice("[user] has disconnected [src]'s detecting unit!"), span_notice("I disconnect [src]'s detecting unit.")) return else if(W.tool_behaviour == TOOL_WIRECUTTER) buildstage = 1 W.play_tool_sound(src) new /obj/item/stack/cable_coil(user.loc, 5) - to_chat(user, "I cut the wires from \the [src].") + to_chat(user, span_notice("I cut the wires from \the [src].")) update_icon() return @@ -203,31 +203,31 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W if(coil.get_amount() < 5) - to_chat(user, "I need more cable for this!") + to_chat(user, span_warning("I need more cable for this!")) else coil.use(5) buildstage = 2 - to_chat(user, "I wire \the [src].") + to_chat(user, span_notice("I wire \the [src].")) update_icon() return else if(W.tool_behaviour == TOOL_CROWBAR) - user.visible_message("[user.name] removes the electronics from [src.name].", \ - "I start prying out the circuit...") + user.visible_message(span_notice("[user.name] removes the electronics from [src.name]."), \ + span_notice("I start prying out the circuit...")) if(W.use_tool(src, user, 20, volume=50)) if(buildstage == 1) if(stat & BROKEN) - to_chat(user, "I remove the destroyed circuit.") + to_chat(user, span_notice("I remove the destroyed circuit.")) stat &= ~BROKEN else - to_chat(user, "I pry out the circuit.") + to_chat(user, span_notice("I pry out the circuit.")) new /obj/item/electronics/firealarm(user.loc) buildstage = 0 update_icon() return if(0) if(istype(W, /obj/item/electronics/firealarm)) - to_chat(user, "I insert the circuit.") + to_chat(user, span_notice("I insert the circuit.")) qdel(W) buildstage = 1 update_icon() @@ -237,15 +237,15 @@ var/obj/item/electroadaptive_pseudocircuit/P = W if(!P.adapt_circuit(user, 15)) return - user.visible_message("[user] fabricates a circuit and places it into [src].", \ - "I adapt a fire alarm circuit and slot it into the assembly.") + user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ + span_notice("I adapt a fire alarm circuit and slot it into the assembly.")) buildstage = 1 update_icon() return else if(W.tool_behaviour == TOOL_WRENCH) - user.visible_message("[user] removes the fire alarm assembly from the wall.", \ - "I remove the fire alarm assembly from the wall.") + user.visible_message(span_notice("[user] removes the fire alarm assembly from the wall."), \ + span_notice("I remove the fire alarm assembly from the wall.")) var/obj/item/wallframe/firealarm/frame = new /obj/item/wallframe/firealarm() frame.forceMove(user.drop_location()) W.play_tool_sound(src) @@ -262,8 +262,8 @@ /obj/machinery/firealarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_UPGRADE_SIMPLE_CIRCUITS) - user.visible_message("[user] fabricates a circuit and places it into [src].", \ - "I adapt a fire alarm circuit and slot it into the assembly.") + user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ + span_notice("I adapt a fire alarm circuit and slot it into the assembly.")) buildstage = 1 update_icon() return TRUE diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 3378c57b7..ff0470c50 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -61,9 +61,9 @@ add_fingerprint(user) if (W.tool_behaviour == TOOL_WIRECUTTER) if (bulb) - user.visible_message("[user] begins to disconnect [src]'s flashbulb.", "I begin to disconnect [src]'s flashbulb...") + user.visible_message(span_notice("[user] begins to disconnect [src]'s flashbulb."), span_notice("I begin to disconnect [src]'s flashbulb...")) if(W.use_tool(src, user, 30, volume=50) && bulb) - user.visible_message("[user] has disconnected [src]'s flashbulb!", "I disconnect [src]'s flashbulb.") + user.visible_message(span_notice("[user] has disconnected [src]'s flashbulb!"), span_notice("I disconnect [src]'s flashbulb.")) bulb.forceMove(loc) bulb = null power_change() @@ -72,20 +72,20 @@ if (!bulb) if(!user.transferItemToLoc(W, src)) return - user.visible_message("[user] installs [W] into [src].", "I install [W] into [src].") + user.visible_message(span_notice("[user] installs [W] into [src]."), span_notice("I install [W] into [src].")) bulb = W power_change() else - to_chat(user, "A flashbulb is already installed in [src]!") + to_chat(user, span_warning("A flashbulb is already installed in [src]!")) else if (W.tool_behaviour == TOOL_WRENCH) if(!bulb) - to_chat(user, "I start unsecuring the flasher frame...") + to_chat(user, span_notice("I start unsecuring the flasher frame...")) if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "I unsecure the flasher frame.") + to_chat(user, span_notice("I unsecure the flasher frame.")) deconstruct(TRUE) else - to_chat(user, "Remove a flashbulb from [src] first!") + to_chat(user, span_warning("Remove a flashbulb from [src] first!")) else return ..() @@ -172,13 +172,13 @@ W.play_tool_sound(src, 100) if (!anchored && !isinspace()) - to_chat(user, "[src] is now secured.") + to_chat(user, span_notice("[src] is now secured.")) add_overlay("[base_state]-s") setAnchored(TRUE) power_change() proximity_monitor.SetRange(range) else - to_chat(user, "[src] can now be moved.") + to_chat(user, span_notice("[src] can now be moved.")) cut_overlays() setAnchored(FALSE) power_change() @@ -197,7 +197,7 @@ /obj/item/wallframe/flasher/examine(mob/user) . = ..() - . += "Its channel ID is '[id]'." + . += span_notice("Its channel ID is '[id]'.") /obj/item/wallframe/flasher/after_attach(obj/O) ..() diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index 670062c58..17a2e313d 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -71,7 +71,7 @@ return var/mob/living/carbon/human/H = locate(params["mobref"]) in stored_items if(H != usr && !allowed(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, span_warning("Access denied.")) return drop_items(H) diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index e74efceb3..c08b718c6 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -44,7 +44,7 @@ The console is located at computer/gulag_teleporter.dm /obj/machinery/gulag_teleporter/interact(mob/user) . = ..() if(locked) - to_chat(user, "[src] is locked!") + to_chat(user, span_warning("[src] is locked!")) return toggle_open() @@ -89,7 +89,7 @@ The console is located at computer/gulag_teleporter.dm if(locked) if(message_cooldown <= world.time) message_cooldown = world.time + 50 - to_chat(user, "[src]'s door won't budge!") + to_chat(user, span_warning("[src]'s door won't budge!")) return open_machine() @@ -99,15 +99,15 @@ The console is located at computer/gulag_teleporter.dm return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user.visible_message("I see [user] kicking against the door of [src]!", \ - "I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "I hear a metallic creaking from [src].") + user.visible_message(span_notice("I see [user] kicking against the door of [src]!"), \ + span_notice("I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_hear("I hear a metallic creaking from [src].")) if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src || state_open || !locked) return locked = FALSE - user.visible_message("[user] successfully broke out of [src]!", \ - "I successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("I successfully break out of [src]!")) open_machine() /obj/machinery/gulag_teleporter/proc/locate_reclaimer() @@ -117,7 +117,7 @@ The console is located at computer/gulag_teleporter.dm /obj/machinery/gulag_teleporter/proc/toggle_open() if(panel_open) - to_chat(usr, "Close the maintenance panel first.") + to_chat(usr, span_notice("Close the maintenance panel first.")) return if(state_open) diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm index 52a71304d..cb08288c7 100644 --- a/code/game/machinery/harvester.dm +++ b/code/game/machinery/harvester.dm @@ -85,7 +85,7 @@ var/mob/living/carbon/C = occupant operation_order = reverseList(C.bodyparts) //Chest and head are first in bodyparts, so we invert it to make them suffer more harvesting = TRUE - visible_message("The [name] begins warming up!") + visible_message(span_notice("The [name] begins warming up!")) say("Initializing harvest protocol.") update_icon(TRUE) addtimer(CALLBACK(src, PROC_REF(harvest)), interval) @@ -135,10 +135,10 @@ if(..()) return if(occupant) - to_chat(user, "[src] is currently occupied!") + to_chat(user, span_warning("[src] is currently occupied!")) return if(state_open) - to_chat(user, "[src] must be closed to [panel_open ? "close" : "open"] its maintenance hatch!") + to_chat(user, span_warning("[src] must be closed to [panel_open ? "close" : "open"] its maintenance hatch!")) return if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-o", initial(icon_state), I)) return @@ -154,7 +154,7 @@ . = !(state_open || panel_open || (flags_1 & NODECONSTRUCT_1)) && I.tool_behaviour == TOOL_CROWBAR //We removed is_operational() here if(.) I.play_tool_sound(src, 50) - visible_message("[usr] pries open \the [src].", "I pry open [src].") + visible_message(span_notice("[usr] pries open \the [src]."), span_notice("I pry open [src].")) open_machine() /obj/machinery/harvester/emag_act(mob/user) @@ -162,15 +162,15 @@ return obj_flags |= EMAGGED allow_living = TRUE - to_chat(user, "I overload [src]'s lifesign scanners.") + to_chat(user, span_warning("I overload [src]'s lifesign scanners.")) /obj/machinery/harvester/container_resist(mob/living/user) if(!harvesting) - visible_message("[occupant] emerges from [src]!", - "I climb out of [src]!") + visible_message(span_notice("[occupant] emerges from [src]!"), + span_notice("I climb out of [src]!")) open_machine() else - to_chat(user,"[src] is active and can't be opened!") //rip + to_chat(user,span_warning("[src] is active and can't be opened!")) //rip /obj/machinery/harvester/Exited(atom/movable/user) if (!state_open && user == occupant) @@ -185,8 +185,8 @@ if(stat & BROKEN) return if(state_open) - . += "[src] must be closed before harvesting." + . += span_notice("[src] must be closed before harvesting.") else if(!harvesting) - . += "Alt-click [src] to start harvesting." + . += span_notice("Alt-click [src] to start harvesting.") if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Harvest speed at [interval*0.1] seconds per organ." + . += span_notice("The status display reads: Harvest speed at [interval*0.1] seconds per organ.") diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 69074a2bf..b928aacc4 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -143,7 +143,7 @@ Possible to do for anyone motivated enough: /obj/machinery/holopad/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Current projection range: [holo_range] units." + . += span_notice("The status display reads: Current projection range: [holo_range] units.") /obj/machinery/holopad/attackby(obj/item/P, mob/user, params) if(default_deconstruction_screwdriver(user, "holopad_open", "holopad0", P)) @@ -160,11 +160,11 @@ Possible to do for anyone motivated enough: if(istype(P,/obj/item/disk/holodisk)) if(disk) - to_chat(user,"There's already a disk inside [src]!") + to_chat(user,span_warning("There's already a disk inside [src]!")) return if (!user.transferItemToLoc(P,src)) return - to_chat(user,"I insert [P] into [src].") + to_chat(user,span_notice("I insert [P] into [src].")) disk = P updateDialog() return @@ -250,7 +250,7 @@ Possible to do for anyone motivated enough: for(var/mob/living/silicon/ai/AI in GLOB.silicon_mobs) if(!AI.client) continue - to_chat(AI, "My presence is requested at \the [area].") + to_chat(AI, span_info("My presence is requested at \the [area].")) else temp = "A request for AI presence was already sent recently.
" temp += "Main Menu" @@ -402,7 +402,7 @@ Possible to do for anyone motivated enough: move_hologram() set_holo(user, Hologram) - visible_message("A holographic image of [user] flickers to life before my eyes!") + visible_message(span_notice("A holographic image of [user] flickers to life before my eyes!")) return Hologram else @@ -558,7 +558,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ Hologram.setAnchored(TRUE)//So space wind cannot drag it. Hologram.name = "[record.caller_name] (Hologram)"//If someone decides to right click. Hologram.set_light(2) //hologram lighting - visible_message("A holographic image of [record.caller_name] flickers to life before my eyes!") + visible_message(span_notice("A holographic image of [record.caller_name] flickers to life before my eyes!")) return Hologram /obj/machinery/holopad/proc/replay_start() diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 4d18ff41a..e2b056699 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -100,9 +100,9 @@ add_fingerprint(user) src.disable = !src.disable if (src.disable) - user.visible_message("[user] has disabled \the [src]!", "I disable the connection to \the [src].") + user.visible_message(span_notice("[user] has disabled \the [src]!"), span_notice("I disable the connection to \the [src].")) if (!src.disable) - user.visible_message("[user] has reconnected \the [src]!", "I fix the connection to \the [src].") + user.visible_message(span_notice("[user] has reconnected \the [src]!"), span_notice("I fix the connection to \the [src].")) update_icon() else return ..() diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index a21631986..aeccf7677 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -75,36 +75,36 @@ return if(attached) - visible_message("[attached] is detached from [src].") + visible_message(span_warning("[attached] is detached from [src].")) attached = null update_icon() return if(!target.has_dna()) - to_chat(usr, "The drip beeps: Warning, incompatible creature!") + to_chat(usr, span_danger("The drip beeps: Warning, incompatible creature!")) return if(Adjacent(target) && usr.Adjacent(target)) if(beaker) - usr.visible_message("[usr] attaches [src] to [target].", "I attach [src] to [target].") + usr.visible_message(span_warning("[usr] attaches [src] to [target]."), span_notice("I attach [src] to [target].")) log_combat(usr, target, "attached", src, "containing: [beaker.name] - ([beaker.reagents.log_list()])") add_fingerprint(usr) attached = target START_PROCESSING(SSmachines, src) update_icon() else - to_chat(usr, "There's nothing attached to the IV drip!") + to_chat(usr, span_warning("There's nothing attached to the IV drip!")) /obj/machinery/iv_drip/attackby(obj/item/W, mob/user, params) if(is_type_in_typecache(W, drip_containers)) if(beaker) - to_chat(user, "There is already a reagent container loaded!") + to_chat(user, span_warning("There is already a reagent container loaded!")) return if(!user.transferItemToLoc(W, src)) return beaker = W - to_chat(user, "I attach [W] to [src].") + to_chat(user, span_notice("I attach [W] to [src].")) user.log_message("attached a [W] to [src] at [AREACOORD(src)] containing ([beaker.reagents.log_list()])", LOG_ATTACK) add_fingerprint(user) update_icon() @@ -122,7 +122,7 @@ return PROCESS_KILL if(!(get_dist(src, attached) <= 1 && isturf(attached.loc))) - to_chat(attached, "The IV drip needle is ripped out of you!") + to_chat(attached, span_danger("The IV drip needle is ripped out of you!")) attached.apply_damage(3, BRUTE, pick(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM)) attached = null update_icon() @@ -148,12 +148,12 @@ // If the beaker is full, ping if(!amount) if(prob(5)) - visible_message("[src] pings.") + visible_message(span_hear("[src] pings.")) return // If the human is losing too much blood, beep. if(attached.blood_volume < BLOOD_VOLUME_SAFE && prob(5)) - visible_message("[src] beeps loudly.") + visible_message(span_hear("[src] beeps loudly.")) playsound(loc, 'sound/blank.ogg', 50, TRUE) attached.transfer_blood_to(beaker, amount) update_icon() @@ -165,7 +165,7 @@ if(!ishuman(user)) return if(attached) - visible_message("[attached] is detached from [src].") + visible_message(span_notice("[attached] is detached from [src].")) attached = null update_icon() return @@ -179,10 +179,10 @@ return if(dripfeed) dripfeed = FALSE - to_chat(usr, "I loosen the valve to speed up the [src].") + to_chat(usr, span_notice("I loosen the valve to speed up the [src].")) else dripfeed = TRUE - to_chat(usr, "I tighten the valve to slowly drip-feed the contents of [src].") + to_chat(usr, span_notice("I tighten the valve to slowly drip-feed the contents of [src].")) /obj/machinery/iv_drip/verb/eject_beaker() set hidden = 1 @@ -190,7 +190,7 @@ set src in view(1) if(!isliving(usr)) - to_chat(usr, "I can't do that!") + to_chat(usr, span_warning("I can't do that!")) return if(usr.incapacitated()) @@ -206,13 +206,13 @@ set src in view(1) if(!isliving(usr)) - to_chat(usr, "I can't do that!") + to_chat(usr, span_warning("I can't do that!")) return if(usr.incapacitated()) return mode = !mode - to_chat(usr, "The IV drip is now [mode ? "injecting" : "taking blood"].") + to_chat(usr, span_notice("The IV drip is now [mode ? "injecting" : "taking blood"].")) update_icon() /obj/machinery/iv_drip/examine(mob/user) @@ -224,13 +224,13 @@ if(beaker) if(beaker.reagents && beaker.reagents.reagent_list.len) - . += "Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid." + . += span_notice("Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid.") else - . += "Attached is an empty [beaker.name]." + . += span_notice("Attached is an empty [beaker.name].") else - . += "No chemicals are attached." + . += span_notice("No chemicals are attached.") - . += "[attached ? attached : "No one"] is attached." + . += span_notice("[attached ? attached : "No one"] is attached.") /obj/machinery/iv_drip/saline diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index af7eaa29d..855af6994 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -49,7 +49,7 @@ /obj/machinery/launchpad/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Maximum range: [range] units." + . += span_notice("The status display reads: Maximum range: [range] units.") /obj/machinery/launchpad/attackby(obj/item/I, mob/user, params) if(stationary) @@ -63,7 +63,7 @@ return var/obj/item/multitool/M = I M.buffer = src - to_chat(user, "I save the data in the [I.name]'s buffer.") + to_chat(user, span_notice("I save the data in the [I.name]'s buffer.")) return 1 if(default_deconstruction_crowbar(I)) @@ -100,13 +100,13 @@ /obj/machinery/launchpad/proc/doteleport(mob/user, sending) if(teleporting) - to_chat(user, "ERROR: Launchpad busy.") + to_chat(user, span_warning("ERROR: Launchpad busy.")) return var/turf/dest = get_turf(src) if(dest && is_centcom_level(dest.z)) - to_chat(user, "ERROR: Launchpad not operative. Heavy area shielding makes teleporting impossible.") + to_chat(user, span_warning("ERROR: Launchpad not operative. Heavy area shielding makes teleporting impossible.")) return var/target_x = x + x_offset @@ -238,7 +238,7 @@ return if(!usr.canUseTopic(src, BE_CLOSE, ismonkey(usr))) return - usr.visible_message("[usr] starts closing [src]...", "I start closing [src]...") + usr.visible_message(span_notice("[usr] starts closing [src]..."), span_notice("I start closing [src]...")) if(do_after(usr, 30, target = usr)) usr.put_in_hands(briefcase) moveToNullspace() //hides it from suitcase contents @@ -251,7 +251,7 @@ if(L.pad == src) //do not attempt to link when already linked return ..() L.pad = src - to_chat(user, "I link [src] to [L].") + to_chat(user, span_notice("I link [src] to [L].")) else return ..() @@ -276,7 +276,7 @@ if(!isturf(user.loc)) //no setting up in a locker return add_fingerprint(user) - user.visible_message("[user] starts setting down [src]...", "You start setting up [pad]...") + user.visible_message(span_notice("[user] starts setting down [src]..."), span_notice("You start setting up [pad]...")) if(do_after(user, 30, target = user)) pad.forceMove(get_turf(src)) pad.update_indicator() @@ -290,7 +290,7 @@ if(L.pad == src.pad) //do not attempt to link when already linked return ..() L.pad = src.pad - to_chat(user, "I link [pad] to [L].") + to_chat(user, span_notice("I link [pad] to [L].")) else return ..() @@ -310,7 +310,7 @@ /obj/item/launchpad_remote/attack_self(mob/user) . = ..() ui_interact(user) - to_chat(user, "[src] projects a display onto your retina.") + to_chat(user, span_notice("[src] projects a display onto your retina.")) /obj/item/launchpad_remote/ui_interact(mob/user, ui_key = "launchpad_remote", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) @@ -338,10 +338,10 @@ /obj/item/launchpad_remote/proc/teleport(mob/user, obj/machinery/launchpad/pad) if(QDELETED(pad)) - to_chat(user, "ERROR: Launchpad not responding. Check launchpad integrity.") + to_chat(user, span_warning("ERROR: Launchpad not responding. Check launchpad integrity.")) return if(!pad.isAvailable()) - to_chat(user, "ERROR: Launchpad not operative. Make sure the launchpad is ready and powered.") + to_chat(user, span_warning("ERROR: Launchpad not operative. Make sure the launchpad is ready and powered.")) return pad.doteleport(user, sending) diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index dc818f9f1..9f1357427 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -124,7 +124,7 @@ //Just build whatever it is new buildpath(loc) else - src.visible_message("Something went very wrong, there isn't enough instabitaluri anymore!") + src.visible_message(span_warning("Something went very wrong, there isn't enough instabitaluri anymore!")) busy = FALSE flick("limbgrower_unfill",src) icon_state = "limbgrower_idleoff" @@ -159,7 +159,7 @@ /obj/machinery/limbgrower/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Storing up to [reagents.maximum_volume]u of instabitaluri.
Instabitaluri consumption at [prod_coeff*100]%.
" + . += span_notice("The status display reads: Storing up to [reagents.maximum_volume]u of instabitaluri.
Instabitaluri consumption at [prod_coeff*100]%.") /obj/machinery/limbgrower/proc/main_win(mob/user) var/dat = "

Limb Grower Menu:


" @@ -185,7 +185,7 @@ if(!(selected_category in D.category)) continue if(disabled || !can_build(D)) - dat += "[D.name]" + dat += span_linkoff("[D.name]") else dat += "[D.name]" dat += "[get_design_cost(D)]
" @@ -226,5 +226,5 @@ var/datum/design/D = SSresearch.techweb_design_by_id(id) if((D.build_type & LIMBGROWER) && ("emagged" in D.category)) stored_research.add_design(D) - to_chat(user, "A warning flashes onto the screen, stating that safety overrides have been deactivated!") + to_chat(user, span_warning("A warning flashes onto the screen, stating that safety overrides have been deactivated!")) obj_flags |= EMAGGED diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 54328f952..a6c6d84db 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -26,7 +26,7 @@ continue O_limit++ if(O_limit >= 20) - audible_message("[src] lets out a screech, it doesn't seem to be able to handle the load.") + audible_message(span_notice("[src] lets out a screech, it doesn't seem to be able to handle the load.")) break use_power(500) O.throw_at(target, drive_range * power, power) diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm index de6343f74..a5931aa65 100644 --- a/code/game/machinery/medical_kiosk.dm +++ b/code/game/machinery/medical_kiosk.dm @@ -96,19 +96,19 @@ if(istype(O, /obj/item/scanner_wand)) var/obj/item/scanner_wand/W = O if(scanner_wand) - to_chat(user, "There's already a scanner wand in [src]!") + to_chat(user, span_warning("There's already a scanner wand in [src]!")) return if(HAS_TRAIT(O, TRAIT_NODROP) || !user.transferItemToLoc(O, src)) - to_chat(user, "[O] is stuck to your hand!") + to_chat(user, span_warning("[O] is stuck to your hand!")) return - user.visible_message("[user] snaps [O] onto [src]!", \ - "I press [O] into the side of [src], clicking into place.") + user.visible_message(span_notice("[user] snaps [O] onto [src]!"), \ + span_notice("I press [O] into the side of [src], clicking into place.")) //This will be the scanner returning scanner_wand's selected_target variable and assigning it to the altPatient var if(W.selected_target) if(!(altPatient == W.return_patient())) clearScans() altPatient = W.return_patient() - user.visible_message("[W.return_patient()] has been set as the current patient.") + user.visible_message(span_notice("[W.return_patient()] has been set as the current patient.")) W.selected_target = null playsound(src, 'sound/blank.ogg', 50, TRUE) scanner_wand = O @@ -119,14 +119,14 @@ if(!istype(user) || !user.canUseTopic(src, BE_CLOSE)) return if(!scanner_wand) - to_chat(user, "The scanner wand is currently removed from the machine.") + to_chat(user, span_warning("The scanner wand is currently removed from the machine.")) return if(!user.put_in_hands(scanner_wand)) - to_chat(user, "The scanner wand falls to the floor.") + to_chat(user, span_warning("The scanner wand falls to the floor.")) scanner_wand = null return - user.visible_message("[user] unhooks the [scanner_wand] from [src].", \ - "I detach the [scanner_wand] from [src].") + user.visible_message(span_notice("[user] unhooks the [scanner_wand] from [src]."), \ + span_notice("I detach the [scanner_wand] from [src].")) playsound(src, 'sound/blank.ogg', 60, TRUE) scanner_wand = null @@ -138,8 +138,8 @@ ..() if(obj_flags & EMAGGED) return - emagger.visible_message("[emagger] waves a suspicious card by the [src]'s biometric scanner!", - "I overload the sensory electronics, the diagnostic readouts start jittering across the screen..") + emagger.visible_message(span_warning("[emagger] waves a suspicious card by the [src]'s biometric scanner!"), + span_notice("I overload the sensory electronics, the diagnostic readouts start jittering across the screen..")) obj_flags |= EMAGGED var/obj/item/circuitboard/computer/cargo/board = circuit board.obj_flags |= EMAGGED //Mirrors emag status onto the board as well. @@ -148,14 +148,14 @@ /obj/machinery/medical_kiosk/examine(mob/user) . = ..() if(scanner_wand == null) - . += "\The [src] is missing its scanner." + . += span_notice("\The [src] is missing its scanner.") else - . += "\The [src] has its scanner clipped to the side. Alt-Click to remove." + . += span_notice("\The [src] has its scanner clipped to the side. Alt-Click to remove.") /obj/machinery/medical_kiosk/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) var/patient_distance = 0 if(!ishuman(user)) - to_chat(user, "[src] is unable to interface with non-humanoids!") + to_chat(user, span_warning("[src] is unable to interface with non-humanoids!")) if (ui) ui.close() return diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index c0ab68f1b..61c6a68b3 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -92,7 +92,7 @@ if(I.tool_behaviour == TOOL_SCREWDRIVER) open = !open - user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", "I [open ? "open" : "close"] the beacon's cover.") + user.visible_message(span_notice("[user] [open ? "opens" : "closes"] the beacon's cover."), span_notice("I [open ? "open" : "close"] the beacon's cover.")) update_icon() @@ -100,12 +100,12 @@ if(open) if (src.allowed(user)) src.locked = !src.locked - to_chat(user, "Controls are now [src.locked ? "locked" : "unlocked"].") + to_chat(user, span_notice("Controls are now [src.locked ? "locked" : "unlocked"].")) else - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) updateDialog() else - to_chat(user, "I must open the cover first!") + to_chat(user, span_warning("I must open the cover first!")) else return ..() @@ -123,7 +123,7 @@ return // prevent intraction when T-scanner revealed if(!open && !ai) // can't alter controls if not open, unless you're an AI - to_chat(user, "The beacon's control cover is closed!") + to_chat(user, span_warning("The beacon's control cover is closed!")) return diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index aeba3e24a..3d589879c 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -711,35 +711,35 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster/attackby(obj/item/I, mob/living/user, params) if(I.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I start [anchored ? "un" : ""]securing [name]...") + to_chat(user, span_notice("I start [anchored ? "un" : ""]securing [name]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 60)) playsound(loc, 'sound/blank.ogg', 50, TRUE) if(stat & BROKEN) - to_chat(user, "The broken remains of [src] fall on the ground.") + to_chat(user, span_warning("The broken remains of [src] fall on the ground.")) new /obj/item/stack/sheet/metal(loc, 5) new /obj/item/shard(loc) new /obj/item/shard(loc) else - to_chat(user, "I [anchored ? "un" : ""]secure [name].") + to_chat(user, span_notice("I [anchored ? "un" : ""]secure [name].")) new /obj/item/wallframe/newscaster(loc) qdel(src) else if(I.tool_behaviour == TOOL_WELDER && user.used_intent.type != INTENT_HARM) if(stat & BROKEN) if(!I.tool_start_check(user, amount=0)) return - user.visible_message("[user] is repairing [src].", \ - "I begin repairing [src]...", \ - "I hear welding.") + user.visible_message(span_notice("[user] is repairing [src]."), \ + span_notice("I begin repairing [src]..."), \ + span_hear("I hear welding.")) if(I.use_tool(src, user, 40, volume=50)) if(!(stat & BROKEN)) return - to_chat(user, "I repair [src].") + to_chat(user, span_notice("I repair [src].")) obj_integrity = max_integrity stat &= ~BROKEN update_icon() else - to_chat(user, "[src] does not need repairs.") + to_chat(user, span_notice("[src] does not need repairs.")) else return ..() @@ -769,7 +769,7 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster/attack_paw(mob/user) if(user.used_intent.type != INTENT_HARM) - to_chat(user, "The newscaster controls are far too complicated for your tiny brain!") + to_chat(user, span_warning("The newscaster controls are far too complicated for your tiny brain!")) else take_damage(5, BRUTE, "slash") @@ -792,9 +792,9 @@ GLOBAL_LIST_EMPTY(allCasters) else targetcam = R.aicamera else - to_chat(user, "I cannot interface with silicon photo uploading!") + to_chat(user, span_warning("I cannot interface with silicon photo uploading!")) if(!targetcam.stored.len) - to_chat(usr, "No images saved.") + to_chat(usr, span_boldannounce("No images saved.")) return var/datum/picture/selection = targetcam.selectpicture(user) if(selection) @@ -878,13 +878,13 @@ GLOBAL_LIST_EMPTY(allCasters) var/creationTime /obj/item/newspaper/suicide_act(mob/user) - user.visible_message("[user] is focusing intently on [src]! It looks like [user.p_theyre()] trying to commit sudoku... until [user.p_their()] eyes light up with realization!") + user.visible_message(span_suicide("[user] is focusing intently on [src]! It looks like [user.p_theyre()] trying to commit sudoku... until [user.p_their()] eyes light up with realization!")) user.say(";JOURNALISM IS MY CALLING! EVERYBODY APPRECIATES UNBIASED REPORTI-GLORF", forced="newspaper suicide") var/mob/living/carbon/human/H = user var/obj/W = new /obj/item/reagent_containers/food/drinks/bottle/whiskey(H.loc) playsound(H.loc, 'sound/blank.ogg', rand(10,50), TRUE) W.reagents.trans_to(H, W.reagents.total_volume, transfered_by = user) - user.visible_message("[user] downs the contents of [W.name] in one gulp! Shoulda stuck to sudoku!") + user.visible_message(span_suicide("[user] downs the contents of [W.name] in one gulp! Shoulda stuck to sudoku!")) return(TOXLOSS) @@ -967,7 +967,7 @@ GLOBAL_LIST_EMPTY(allCasters) human_user << browse(dat, "window=newspaper_main;size=300x400") onclose(human_user, "newspaper_main") else - to_chat(user, "The paper is full of unintelligible symbols!") + to_chat(user, span_warning("The paper is full of unintelligible symbols!")) /obj/item/newspaper/proc/notContent(list/L) if(!L.len) @@ -1014,10 +1014,10 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/item/newspaper/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pen)) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on [src]!") + to_chat(user, span_notice("I scribble illegibly on [src]!")) return if(scribble_page == curr_page) - to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?") + to_chat(user, span_warning("There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?")) else var/s = stripped_input(user, "Write something", "Newspaper") if (!s) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 3b66696e8..cd27a5bae 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -137,12 +137,12 @@ Buildable meters var/flags = initial(fakeA.pipe_flags) for(var/obj/machinery/atmospherics/M in loc) if((M.pipe_flags & flags & PIPING_ONE_PER_TURF)) //Only one dense/requires density object per tile, eg connectors/cryo/heater/coolers. - to_chat(user, "Something is hogging the tile!") + to_chat(user, span_warning("Something is hogging the tile!")) return TRUE if((M.piping_layer != piping_layer) && !((M.pipe_flags | flags) & PIPING_ALL_LAYER)) //don't continue if either pipe goes across all layers continue if(M.GetInitDirections() & SSair.get_init_dirs(pipe_type, fixed_dir())) // matches at least one direction on either type of pipe - to_chat(user, "There is already a pipe at that location!") + to_chat(user, span_warning("There is already a pipe at that location!")) return TRUE // no conflicts found @@ -154,8 +154,8 @@ Buildable meters W.play_tool_sound(src) user.visible_message( \ "[user] fastens \the [src].", \ - "I fasten \the [src].", \ - "I hear ratcheting.") + span_notice("I fasten \the [src]."), \ + span_hear("I hear ratcheting.")) qdel(src) @@ -176,7 +176,7 @@ Buildable meters T.flipped = flipped /obj/item/pipe/directional/suicide_act(mob/user) - user.visible_message("[user] shoves [src] in [user.p_their()] mouth and turns it on! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] shoves [src] in [user.p_their()] mouth and turns it on! It looks like [user.p_theyre()] trying to commit suicide!")) if(iscarbon(user)) var/mob/living/carbon/C = user for(var/i=1 to 20) @@ -204,11 +204,11 @@ Buildable meters pipe = P break if(!pipe) - to_chat(user, "I need to fasten it to a pipe!") + to_chat(user, span_warning("I need to fasten it to a pipe!")) return TRUE new /obj/machinery/meter(loc, piping_layer) W.play_tool_sound(src) - to_chat(user, "I fasten the meter to the pipe.") + to_chat(user, span_notice("I fasten the meter to the pipe.")) qdel(src) /obj/item/pipe_meter/screwdriver_act(mob/living/user, obj/item/S) @@ -217,12 +217,12 @@ Buildable meters return TRUE if(!isturf(loc)) - to_chat(user, "I need to fasten it to the floor!") + to_chat(user, span_warning("I need to fasten it to the floor!")) return TRUE new /obj/machinery/meter/turf(loc, piping_layer) S.play_tool_sound(src) - to_chat(user, "I fasten the meter to the [loc.name].") + to_chat(user, span_notice("I fasten the meter to the [loc.name].")) qdel(src) /obj/item/pipe_meter/dropped() diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index a61c78e15..da414e94e 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -63,7 +63,7 @@ /obj/machinery/pipedispenser/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter)) - to_chat(usr, "I put [W] back into [src].") + to_chat(usr, span_notice("I put [W] back into [src].")) qdel(W) return else @@ -142,7 +142,7 @@ var/obj/structure/disposalconstruct/C = new (loc, p_type) if(!C.can_place()) - to_chat(usr, "There's not enough room to build that here!") + to_chat(usr, span_warning("There's not enough room to build that here!")) qdel(C) return if(href_list["dir"]) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 2ec077d68..75b6d501a 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -195,7 +195,7 @@ if(anchored) //you can't turn a turret on/off if it's not anchored/secured on = !on //toggle on/off else - to_chat(usr, "It has to be secured first!") + to_chat(usr, span_warning("It has to be secured first!")) interact(usr) return @@ -232,19 +232,19 @@ if(I.tool_behaviour == TOOL_CROWBAR) //If the turret is destroyed, you can remove it with a crowbar to //try and salvage its components - to_chat(user, "I begin prying the metal coverings off...") + to_chat(user, span_notice("I begin prying the metal coverings off...")) if(I.use_tool(src, user, 20)) if(prob(70)) if(stored_gun) stored_gun.forceMove(loc) stored_gun = null - to_chat(user, "I remove the turret and salvage some components.") + to_chat(user, span_notice("I remove the turret and salvage some components.")) if(prob(50)) new /obj/item/stack/sheet/metal(loc, rand(1,4)) if(prob(50)) new /obj/item/assembly/prox_sensor(loc) else - to_chat(user, "I remove the turret but did not manage to salvage anything.") + to_chat(user, span_notice("I remove the turret but did not manage to salvage anything.")) qdel(src) else if((I.tool_behaviour == TOOL_WRENCH) && (!on)) @@ -256,13 +256,13 @@ setAnchored(TRUE) invisibility = INVISIBILITY_MAXIMUM update_icon() - to_chat(user, "I secure the exterior bolts on the turret.") + to_chat(user, span_notice("I secure the exterior bolts on the turret.")) if(has_cover) cover = new /obj/machinery/porta_turret_cover(loc) //create a new turret. While this is handled in process(), this is to workaround a bug where the turret becomes invisible for a split second cover.parent_turret = src //make the cover's parent src else if(anchored) setAnchored(FALSE) - to_chat(user, "I unsecure the exterior bolts on the turret.") + to_chat(user, span_notice("I unsecure the exterior bolts on the turret.")) power_change() invisibility = 0 qdel(cover) //deletes the cover, and the turret instance itself becomes its own cover. @@ -271,23 +271,23 @@ //Behavior lock/unlock mangement if(allowed(user)) locked = !locked - to_chat(user, "Controls are now [locked ? "locked" : "unlocked"].") + to_chat(user, span_notice("Controls are now [locked ? "locked" : "unlocked"].")) else - to_chat(user, "Access denied.") + to_chat(user, span_alert("Access denied.")) else if(I.tool_behaviour == TOOL_MULTITOOL && !locked) if(!multitool_check_buffer(user, I)) return var/obj/item/multitool/M = I M.buffer = src - to_chat(user, "I add [src] to multitool buffer.") + to_chat(user, span_notice("I add [src] to multitool buffer.")) else return ..() /obj/machinery/porta_turret/emag_act(mob/user) if(obj_flags & EMAGGED) return - to_chat(user, "I short out [src]'s threat assessment circuits.") - audible_message("[src] hums oddly...") + to_chat(user, span_warning("I short out [src]'s threat assessment circuits.")) + audible_message(span_hear("[src] hums oddly...")) obj_flags |= EMAGGED controllock = TRUE on = FALSE //turns off the turret temporarily @@ -617,7 +617,7 @@ return FALSE if(remote_controller) if(warning_message) - to_chat(remote_controller, "My uplink to [src] has been severed!") + to_chat(remote_controller, span_warning("My uplink to [src] has been severed!")) quit_action.Remove(remote_controller) toggle_action.Remove(remote_controller) remote_controller.click_intercept = null @@ -843,7 +843,7 @@ var/obj/item/multitool/M = I if(M.buffer && istype(M.buffer, /obj/machinery/porta_turret)) turrets |= M.buffer - to_chat(user, "I link \the [M.buffer] with \the [src].") + to_chat(user, span_notice("I link \the [M.buffer] with \the [src].")) return if (issilicon(user)) @@ -852,11 +852,11 @@ if ( get_dist(src, user) == 0 ) // trying to unlock the interface if (allowed(usr)) if(obj_flags & EMAGGED) - to_chat(user, "The turret control is unresponsive!") + to_chat(user, span_warning("The turret control is unresponsive!")) return locked = !locked - to_chat(user, "I [ locked ? "lock" : "unlock"] the panel.") + to_chat(user, span_notice("I [ locked ? "lock" : "unlock"] the panel.")) if (locked) if (user.machine==src) user.unset_machine() @@ -865,12 +865,12 @@ if (user.machine==src) attack_hand(user) else - to_chat(user, "Access denied.") + to_chat(user, span_alert("Access denied.")) /obj/machinery/turretid/emag_act(mob/user) if(obj_flags & EMAGGED) return - to_chat(user, "I short out the turret controls' access analysis module.") + to_chat(user, span_notice("I short out the turret controls' access analysis module.")) obj_flags |= EMAGGED locked = FALSE if(user && user.machine == src) @@ -880,13 +880,13 @@ if(!ailock || IsAdminGhost(user)) return attack_hand(user) else - to_chat(user, "There seems to be a firewall preventing you from accessing this device!") + to_chat(user, span_warning("There seems to be a firewall preventing you from accessing this device!")) /obj/machinery/turretid/ui_interact(mob/user) . = ..() if ( get_dist(src, user) > 0 ) if ( !(issilicon(user) || IsAdminGhost(user)) ) - to_chat(user, "I are too far away!") + to_chat(user, span_warning("I are too far away!")) user.unset_machine() user << browse(null, "window=turretid") return @@ -911,7 +911,7 @@ return if (locked) if(!(issilicon(usr) || IsAdminGhost(usr))) - to_chat(usr, "Control panel is locked!") + to_chat(usr, span_warning("Control panel is locked!")) return if (href_list["toggleOn"]) toggle_on(usr) diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm index 84ef52c14..fe38a07d7 100644 --- a/code/game/machinery/porta_turret/portable_turret_construct.dm +++ b/code/game/machinery/porta_turret/portable_turret_construct.dm @@ -25,14 +25,14 @@ if(PTURRET_UNSECURED) //first step if(I.tool_behaviour == TOOL_WRENCH && !anchored) I.play_tool_sound(src, 100) - to_chat(user, "I secure the external bolts.") + to_chat(user, span_notice("I secure the external bolts.")) setAnchored(TRUE) build_step = PTURRET_BOLTED return else if(I.tool_behaviour == TOOL_CROWBAR && !anchored) I.play_tool_sound(src, 75) - to_chat(user, "I dismantle the turret construction.") + to_chat(user, span_notice("I dismantle the turret construction.")) new /obj/item/stack/sheet/metal( loc, 5) qdel(src) return @@ -41,16 +41,16 @@ if(istype(I, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/M = I if(M.use(2)) - to_chat(user, "I add some metal armor to the interior frame.") + to_chat(user, span_notice("I add some metal armor to the interior frame.")) build_step = PTURRET_START_INTERNAL_ARMOUR icon_state = "turret_frame2" else - to_chat(user, "I need two sheets of metal to continue construction!") + to_chat(user, span_warning("I need two sheets of metal to continue construction!")) return else if(I.tool_behaviour == TOOL_WRENCH) I.play_tool_sound(src, 75) - to_chat(user, "I unfasten the external bolts.") + to_chat(user, span_notice("I unfasten the external bolts.")) setAnchored(FALSE) build_step = PTURRET_UNSECURED return @@ -59,7 +59,7 @@ if(PTURRET_START_INTERNAL_ARMOUR) if(I.tool_behaviour == TOOL_WRENCH) I.play_tool_sound(src, 100) - to_chat(user, "I bolt the metal armor into place.") + to_chat(user, span_notice("I bolt the metal armor into place.")) build_step = PTURRET_INTERNAL_ARMOUR_ON return @@ -67,11 +67,11 @@ if(!I.tool_start_check(user, amount=5)) //uses up 5 fuel return - to_chat(user, "I start to remove the turret's interior metal armor...") + to_chat(user, span_notice("I start to remove the turret's interior metal armor...")) if(I.use_tool(src, user, 20, volume=50, amount=5)) //uses up 5 fuel build_step = PTURRET_BOLTED - to_chat(user, "I remove the turret's interior metal armor.") + to_chat(user, span_notice("I remove the turret's interior metal armor.")) new /obj/item/stack/sheet/metal(drop_location(), 2) return @@ -82,13 +82,13 @@ if(!user.transferItemToLoc(E, src)) return installed_gun = E - to_chat(user, "I add [I] to the turret.") + to_chat(user, span_notice("I add [I] to the turret.")) build_step = PTURRET_GUN_EQUIPPED return else if(I.tool_behaviour == TOOL_WRENCH) I.play_tool_sound(src, 100) - to_chat(user, "I remove the turret's metal armor bolts.") + to_chat(user, span_notice("I remove the turret's metal armor bolts.")) build_step = PTURRET_START_INTERNAL_ARMOUR return @@ -97,7 +97,7 @@ build_step = PTURRET_SENSORS_ON if(!user.temporarilyRemoveItemFromInventory(I)) return - to_chat(user, "I add the proximity sensor to the turret.") + to_chat(user, span_notice("I add the proximity sensor to the turret.")) qdel(I) return @@ -106,7 +106,7 @@ if(I.tool_behaviour == TOOL_SCREWDRIVER) I.play_tool_sound(src, 100) build_step = PTURRET_CLOSED - to_chat(user, "I close the internal access hatch.") + to_chat(user, span_notice("I close the internal access hatch.")) return @@ -114,16 +114,16 @@ if(istype(I, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/M = I if(M.use(2)) - to_chat(user, "I add some metal armor to the exterior frame.") + to_chat(user, span_notice("I add some metal armor to the exterior frame.")) build_step = PTURRET_START_EXTERNAL_ARMOUR else - to_chat(user, "I need two sheets of metal to continue construction!") + to_chat(user, span_warning("I need two sheets of metal to continue construction!")) return else if(I.tool_behaviour == TOOL_SCREWDRIVER) I.play_tool_sound(src, 100) build_step = PTURRET_SENSORS_ON - to_chat(user, "I open the internal access hatch.") + to_chat(user, span_notice("I open the internal access hatch.")) return if(PTURRET_START_EXTERNAL_ARMOUR) @@ -131,10 +131,10 @@ if(!I.tool_start_check(user, amount=5)) return - to_chat(user, "I begin to weld the turret's armor down...") + to_chat(user, span_notice("I begin to weld the turret's armor down...")) if(I.use_tool(src, user, 30, volume=50, amount=5)) build_step = PTURRET_EXTERNAL_ARMOUR_ON - to_chat(user, "I weld the turret's armor down.") + to_chat(user, span_notice("I weld the turret's armor down.")) //The final step: create a full turret @@ -151,7 +151,7 @@ else if(I.tool_behaviour == TOOL_CROWBAR) I.play_tool_sound(src, 75) - to_chat(user, "I pry off the turret's exterior armor.") + to_chat(user, span_notice("I pry off the turret's exterior armor.")) new /obj/item/stack/sheet/metal(loc, 2) build_step = PTURRET_CLOSED return @@ -177,11 +177,11 @@ build_step = PTURRET_INTERNAL_ARMOUR_ON installed_gun.forceMove(loc) - to_chat(user, "I remove [installed_gun] from the turret frame.") + to_chat(user, span_notice("I remove [installed_gun] from the turret frame.")) installed_gun = null if(PTURRET_SENSORS_ON) - to_chat(user, "I remove the prox sensor from the turret frame.") + to_chat(user, span_notice("I remove the prox sensor from the turret frame.")) new /obj/item/assembly/prox_sensor(loc) build_step = PTURRET_GUN_EQUIPPED diff --git a/code/game/machinery/porta_turret/portable_turret_cover.dm b/code/game/machinery/porta_turret/portable_turret_cover.dm index 92951c0e0..dd90d0823 100644 --- a/code/game/machinery/porta_turret/portable_turret_cover.dm +++ b/code/game/machinery/porta_turret/portable_turret_cover.dm @@ -44,12 +44,12 @@ if(!parent_turret.anchored) parent_turret.setAnchored(TRUE) - to_chat(user, "I secure the exterior bolts on the turret.") + to_chat(user, span_notice("I secure the exterior bolts on the turret.")) parent_turret.invisibility = 0 parent_turret.update_icon() else parent_turret.setAnchored(FALSE) - to_chat(user, "I unsecure the exterior bolts on the turret.") + to_chat(user, span_notice("I unsecure the exterior bolts on the turret.")) parent_turret.invisibility = INVISIBILITY_MAXIMUM parent_turret.update_icon() qdel(src) @@ -57,16 +57,16 @@ else if(I.GetID()) if(parent_turret.allowed(user)) parent_turret.locked = !parent_turret.locked - to_chat(user, "Controls are now [parent_turret.locked ? "locked" : "unlocked"].") + to_chat(user, span_notice("Controls are now [parent_turret.locked ? "locked" : "unlocked"].")) updateUsrDialog() else - to_chat(user, "Access denied.") + to_chat(user, span_notice("Access denied.")) else if(I.tool_behaviour == TOOL_MULTITOOL && !parent_turret.locked) if(!multitool_check_buffer(user, I)) return var/obj/item/multitool/M = I M.buffer = parent_turret - to_chat(user, "I add [parent_turret] to multitool buffer.") + to_chat(user, span_notice("I add [parent_turret] to multitool buffer.")) else return ..() @@ -87,8 +87,8 @@ /obj/machinery/porta_turret_cover/emag_act(mob/user) if(!(parent_turret.obj_flags & EMAGGED)) - to_chat(user, "I short out [parent_turret]'s threat assessment circuits.") - visible_message("[parent_turret] hums oddly...") + to_chat(user, span_notice("I short out [parent_turret]'s threat assessment circuits.")) + visible_message(span_hear("[parent_turret] hums oddly...")) parent_turret.obj_flags |= EMAGGED parent_turret.on = FALSE addtimer(VARSET_CALLBACK(parent_turret, on, TRUE), 4 SECONDS) diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index 245619304..8d1e668c1 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -31,11 +31,11 @@ /obj/machinery/quantumpad/examine(mob/user) . = ..() - . += "It is [ linked_pad ? "currently" : "not"] linked to another pad." + . += span_notice("It is [ linked_pad ? "currently" : "not"] linked to another pad.") if(!panel_open) - . += "The panel is screwed in, obstructing the linking device." + . += span_notice("The panel is screwed in, obstructing the linking device.") else - . += "The linking device is now able to be scanned with a multitool." + . += span_notice("The linking device is now able to be scanned with a multitool.") /obj/machinery/quantumpad/RefreshParts() var/E = 0 @@ -60,7 +60,7 @@ return var/obj/item/multitool/M = I M.buffer = src - to_chat(user, "I save the data in [I]'s buffer. It can now be saved to pads with closed panels.") + to_chat(user, span_notice("I save the data in [I]'s buffer. It can now be saved to pads with closed panels.")) return TRUE else if(I.tool_behaviour == TOOL_MULTITOOL) if(!multitool_check_buffer(user, I)) @@ -68,25 +68,25 @@ var/obj/item/multitool/M = I if(istype(M.buffer, /obj/machinery/quantumpad)) if(M.buffer == src) - to_chat(user, "I cannot link a pad to itself!") + to_chat(user, span_warning("I cannot link a pad to itself!")) return TRUE else linked_pad = M.buffer - to_chat(user, "I link [src] to the one in [I]'s buffer.") + to_chat(user, span_notice("I link [src] to the one in [I]'s buffer.")) return TRUE else - to_chat(user, "There is no quantum pad data saved in [I]'s buffer!") + to_chat(user, span_warning("There is no quantum pad data saved in [I]'s buffer!")) return TRUE else if(istype(I, /obj/item/quantum_keycard)) var/obj/item/quantum_keycard/K = I if(K.qpad) - to_chat(user, "I insert [K] into [src]'s card slot, activating it.") + to_chat(user, span_notice("I insert [K] into [src]'s card slot, activating it.")) interact(user, K.qpad) else - to_chat(user, "I insert [K] into [src]'s card slot, initiating the link procedure.") + to_chat(user, span_notice("I insert [K] into [src]'s card slot, initiating the link procedure.")) if(do_after(user, 40, target = src)) - to_chat(user, "I complete the link between [K] and [src].") + to_chat(user, span_notice("I complete the link between [K] and [src].")) K.qpad = src if(default_deconstruction_crowbar(I)) @@ -97,23 +97,23 @@ /obj/machinery/quantumpad/interact(mob/user, obj/machinery/quantumpad/target_pad = linked_pad) if(!target_pad || QDELETED(target_pad)) if(!map_pad_link_id || !initMappedLink()) - to_chat(user, "Target pad not found!") + to_chat(user, span_warning("Target pad not found!")) return if(world.time < last_teleport + teleport_cooldown) - to_chat(user, "[src] is recharging power. Please wait [DisplayTimeText(last_teleport + teleport_cooldown - world.time)].") + to_chat(user, span_warning("[src] is recharging power. Please wait [DisplayTimeText(last_teleport + teleport_cooldown - world.time)].")) return if(teleporting) - to_chat(user, "[src] is charging up. Please wait.") + to_chat(user, span_warning("[src] is charging up. Please wait.")) return if(target_pad.teleporting) - to_chat(user, "Target pad is busy. Please wait.") + to_chat(user, span_warning("Target pad is busy. Please wait.")) return if(target_pad.stat & NOPOWER) - to_chat(user, "Target pad is not responding to ping.") + to_chat(user, span_warning("Target pad is not responding to ping.")) return add_fingerprint(user) doteleport(user, target_pad) @@ -142,11 +142,11 @@ teleporting = FALSE return if(stat & NOPOWER) - to_chat(user, "[src] is unpowered!") + to_chat(user, span_warning("[src] is unpowered!")) teleporting = FALSE return if(!target_pad || QDELETED(target_pad) || target_pad.stat & NOPOWER) - to_chat(user, "Linked pad is not responding to ping. Teleport aborted.") + to_chat(user, span_warning("Linked pad is not responding to ping. Teleport aborted.")) teleporting = FALSE return diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 88cb78cb7..9a0584d1b 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -24,7 +24,7 @@ /obj/machinery/recharger/examine(mob/user) . = ..() if(!in_range(user, src) && !issilicon(user) && !isobserver(user)) - . += "You're too far away to examine [src]'s contents and display!" + . += span_warning("You're too far away to examine [src]'s contents and display!") return if(charging) @@ -32,11 +32,11 @@ - \A [charging]."} if(!(stat & (NOPOWER|BROKEN))) - . += "The status display reads:" - . += "- Recharging [recharge_coeff*10]% cell charge per cycle." + . += span_notice("The status display reads:") + . += span_notice("- Recharging [recharge_coeff*10]% cell charge per cycle.") if(charging) var/obj/item/stock_parts/cell/C = charging.get_cell() - . += "- \The [charging]'s cell is at [C.percent()]%." + . += span_notice("- \The [charging]'s cell is at [C.percent()]%.") /obj/machinery/recharger/proc/setCharging(new_charging) @@ -52,11 +52,11 @@ /obj/machinery/recharger/attackby(obj/item/G, mob/user, params) if(G.tool_behaviour == TOOL_WRENCH) if(charging) - to_chat(user, "Remove the charging item first!") + to_chat(user, span_notice("Remove the charging item first!")) return setAnchored(!anchored) power_change() - to_chat(user, "I [anchored ? "attached" : "detached"] [src].") + to_chat(user, span_notice("I [anchored ? "attached" : "detached"] [src].")) G.play_tool_sound(src) return @@ -70,13 +70,13 @@ //Checks to make sure he's not in space doing it, and that the area got proper power. var/area/a = get_area(src) if(!isarea(a) || a.power_equip == 0) - to_chat(user, "[src] blinks red as you try to insert [G].") + to_chat(user, span_notice("[src] blinks red as you try to insert [G].")) return 1 if (istype(G, /obj/item/gun/energy)) var/obj/item/gun/energy/E = G if(!E.can_charge) - to_chat(user, "My gun has no external power connector.") + to_chat(user, span_notice("My gun has no external power connector.")) return 1 if(!user.transferItemToLoc(G, src)) @@ -84,7 +84,7 @@ setCharging(G) else - to_chat(user, "[src] isn't connected to anything!") + to_chat(user, span_notice("[src] isn't connected to anything!")) return 1 if(anchored && !charging) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 0d51c4768..b37b75856 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -31,9 +31,9 @@ /obj/machinery/recharge_station/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Recharging [recharge_speed]J per cycle." + . += span_notice("The status display reads: Recharging [recharge_speed]J per cycle.") if(repairs) - . += "[src] has been upgraded to support automatic repairs." + . += span_notice("[src] has been upgraded to support automatic repairs.") /obj/machinery/recharge_station/process() if(!is_operational()) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 5daad5d64..7af6da0ec 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -41,7 +41,7 @@ /obj/machinery/recycler/examine(mob/user) . = ..() - . += "Reclaiming [amount_produced]% of materials salvaged." + . += span_notice("Reclaiming [amount_produced]% of materials salvaged.") . += {"The power light is [(stat & NOPOWER) ? "off" : "on"]. The safety-mode light is [safety_mode ? "on" : "off"]. The safety-sensors status light is [obj_flags & EMAGGED ? "off" : "on"]."} @@ -69,7 +69,7 @@ safety_mode = FALSE update_icon() playsound(src, "sparks", 75, TRUE, -1) - to_chat(user, "I use the cryptographic sequencer on [src].") + to_chat(user, span_notice("I use the cryptographic sequencer on [src].")) /obj/machinery/recycler/update_icon_state() ..() diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index d8649e5ba..3c7556744 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -267,7 +267,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) GLOB.news_network.SubmitArticle(message, department, "Station Announcements", null) usr.log_talk(message, LOG_SAY, tag="station announcement from [src]") message_admins("[ADMIN_LOOKUPFLW(usr)] has made a station announcement from [src] at [AREACOORD(usr)].") - deadchat_broadcast(" made a station announcement from [get_area_name(usr, TRUE)].", "[usr.real_name]", usr) + deadchat_broadcast(" made a station announcement from [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) announceAuth = FALSE message = "" screen = REQ_SCREEN_MAIN @@ -405,10 +405,10 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) /obj/machinery/requests_console/attackby(obj/item/O, mob/user, params) if(O.tool_behaviour == TOOL_CROWBAR) if(open) - to_chat(user, "I close the maintenance panel.") + to_chat(user, span_notice("I close the maintenance panel.")) open = FALSE else - to_chat(user, "I open the maintenance panel.") + to_chat(user, span_notice("I open the maintenance panel.")) open = TRUE update_icon() return @@ -416,12 +416,12 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) if(open) hackState = !hackState if(hackState) - to_chat(user, "I modify the wiring.") + to_chat(user, span_notice("I modify the wiring.")) else - to_chat(user, "I reset the wiring.") + to_chat(user, span_notice("I reset the wiring.")) update_icon() else - to_chat(user, "I must open the maintenance panel first!") + to_chat(user, span_warning("I must open the maintenance panel first!")) return var/obj/item/card/id/ID = O.GetID() @@ -434,13 +434,13 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) announceAuth = TRUE else announceAuth = FALSE - to_chat(user, "I are not authorized to send announcements!") + to_chat(user, span_warning("I are not authorized to send announcements!")) updateUsrDialog() return if (istype(O, /obj/item/stamp)) if(screen == REQ_SCREEN_AUTHENTICATE) var/obj/item/stamp/T = O - msgStamped = "Stamped with the [T.name]" + msgStamped = span_boldnotice("Stamped with the [T.name]") updateUsrDialog() return return ..() diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm index 30b10d7c6..6effb9d00 100644 --- a/code/game/machinery/roulette_machine.dm +++ b/code/game/machinery/roulette_machine.dm @@ -114,13 +114,13 @@ playsound(src, 'sound/blank.ogg', 50, TRUE) if(stat & MAINT || !on || locked) - to_chat(user, "The machine appears to be disabled.") + to_chat(user, span_notice("The machine appears to be disabled.")) return FALSE if(my_card) var/obj/item/card/id/player_card = W if(player_card.registered_account.account_balance < chosen_bet_amount) //Does the player have enough funds - audible_message("I do not have the funds to play! Lower your bet or get more money.") + audible_message(span_warning("I do not have the funds to play! Lower your bet or get more money.")) playsound(src, 'sound/blank.ogg', 30, TRUE) return FALSE if(!chosen_bet_amount || isnull(chosen_bet_type)) @@ -152,7 +152,7 @@ name = msg desc = "" my_card = new_card - to_chat(user, "I link the wheel to your account.") + to_chat(user, span_notice("I link the wheel to your account.")) power_change() return return ..() @@ -186,18 +186,18 @@ var/color = numbers["[rolled_number]"] //Weird syntax, but dict uses strings. var/result = "[rolled_number] [color]" //e.g. 31 black - audible_message("The result is: [result]") + audible_message(span_notice("The result is: [result]")) playing = FALSE update_icon(potential_payout, color, rolled_number, is_winner) handle_color_light(color) if(!is_winner) - audible_message("I lost! Better luck next time") + audible_message(span_warning("I lost! Better luck next time")) playsound(src, 'sound/blank.ogg', 50) return FALSE - audible_message("I have won [potential_payout] credits! Congratulations!") + audible_message(span_notice("I have won [potential_payout] credits! Congratulations!")) playsound(src, 'sound/blank.ogg', 50) dispense_prize(potential_payout) @@ -283,7 +283,7 @@ /obj/machinery/roulette/proc/check_bartender_funds(payout) if(my_card.registered_account.account_balance >= payout) return TRUE //We got the betting amount - audible_message("The bank account of [my_card.registered_account.account_holder] does not have enough funds to pay out the potential prize, contact them to fill up their account or lower your bet!") + audible_message(span_warning("The bank account of [my_card.registered_account.account_holder] does not have enough funds to pay out the potential prize, contact them to fill up their account or lower your bet!")) playsound(src, 'sound/blank.ogg', 30, TRUE) return FALSE @@ -331,15 +331,15 @@ /obj/machinery/roulette/welder_act(mob/living/user, obj/item/I) . = ..() if(stat & MAINT) - to_chat(user, "I start re-attaching the top section of [src]...") + to_chat(user, span_notice("I start re-attaching the top section of [src]...")) if(I.use_tool(src, user, 30, volume=50)) - to_chat(user, "I re-attach the top section of [src].") + to_chat(user, span_notice("I re-attach the top section of [src].")) stat &= ~MAINT icon_state = "idle" else - to_chat(user, "I start welding the top section from [src]...") + to_chat(user, span_notice("I start welding the top section from [src]...")) if(I.use_tool(src, user, 30, volume=50)) - to_chat(user, "I removed the top section of [src].") + to_chat(user, span_notice("I removed the top section of [src].")) stat |= MAINT icon_state = "open" @@ -364,7 +364,7 @@ /obj/item/roulette_wheel_beacon/attack_self() if(used) return - loc.visible_message("\The [src] begins to beep loudly!") + loc.visible_message(span_warning("\The [src] begins to beep loudly!")) used = TRUE addtimer(CALLBACK(src, PROC_REF(launch_payload)), 40) diff --git a/code/game/machinery/scan_gate.dm b/code/game/machinery/scan_gate.dm index a55ac2f5a..def939035 100644 --- a/code/game/machinery/scan_gate.dm +++ b/code/game/machinery/scan_gate.dm @@ -35,9 +35,9 @@ /obj/machinery/scanner_gate/examine(mob/user) . = ..() if(locked) - . += "The control panel is ID-locked. Swipe a valid ID to unlock it." + . += span_notice("The control panel is ID-locked. Swipe a valid ID to unlock it.") else - . += "The control panel is unlocked. Swipe an ID to lock it." + . += span_notice("The control panel is unlocked. Swipe an ID to lock it.") /obj/machinery/scanner_gate/Crossed(atom/movable/AM) ..() @@ -58,14 +58,14 @@ if(allowed(user)) locked = FALSE req_access = list() - to_chat(user, "I unlock [src].") + to_chat(user, span_notice("I unlock [src].")) else if(!(obj_flags & EMAGGED)) - to_chat(user, "I lock [src] with [W].") + to_chat(user, span_notice("I lock [src] with [W].")) var/list/access = W.GetAccess() req_access = access locked = TRUE else - to_chat(user, "I try to lock [src] with [W], but nothing happens.") + to_chat(user, span_warning("I try to lock [src] with [W], but nothing happens.")) else return ..() @@ -75,7 +75,7 @@ locked = FALSE req_access = list() obj_flags |= EMAGGED - to_chat(user, "I fry the ID checking system.") + to_chat(user, span_notice("I fry the ID checking system.")) /obj/machinery/scanner_gate/proc/perform_scan(mob/living/M) var/beep = FALSE diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 39ee0225a..b2f2a22f4 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -122,25 +122,25 @@ if(.) return if(locked && !issilicon(user)) - to_chat(user, "The machine is locked, you are unable to use it!") + to_chat(user, span_warning("The machine is locked, you are unable to use it!")) return if(panel_open) - to_chat(user, "The panel must be closed before operating this machine!") + to_chat(user, span_warning("The panel must be closed before operating this machine!")) return if (active) - user.visible_message("[user] deactivated \the [src].", \ - "I deactivate \the [src].", \ - "I hear heavy droning fade out.") + user.visible_message(span_notice("[user] deactivated \the [src]."), \ + span_notice("I deactivate \the [src]."), \ + span_hear("I hear heavy droning fade out.")) shields_down() else if(anchored) - user.visible_message("[user] activated \the [src].", \ - "I activate \the [src].", \ - "I hear heavy droning.") + user.visible_message(span_notice("[user] activated \the [src]."), \ + span_notice("I activate \the [src]."), \ + span_hear("I hear heavy droning.")) shields_up() else - to_chat(user, "The device must first be secured to the floor!") + to_chat(user, span_warning("The device must first be secured to the floor!")) return /obj/machinery/shieldgen/attackby(obj/item/W, mob/user, params) @@ -148,60 +148,60 @@ W.play_tool_sound(src, 100) panel_open = !panel_open if(panel_open) - to_chat(user, "I open the panel and expose the wiring.") + to_chat(user, span_notice("I open the panel and expose the wiring.")) else - to_chat(user, "I close the panel.") + to_chat(user, span_notice("I close the panel.")) else if(istype(W, /obj/item/stack/cable_coil) && (stat & BROKEN) && panel_open) var/obj/item/stack/cable_coil/coil = W if (coil.get_amount() < 1) - to_chat(user, "I need one length of cable to repair [src]!") + to_chat(user, span_warning("I need one length of cable to repair [src]!")) return - to_chat(user, "I begin to replace the wires...") + to_chat(user, span_notice("I begin to replace the wires...")) if(do_after(user, 30, target = src)) if(coil.get_amount() < 1) return coil.use(1) obj_integrity = max_integrity stat &= ~BROKEN - to_chat(user, "I repair \the [src].") + to_chat(user, span_notice("I repair \the [src].")) update_icon() else if(W.tool_behaviour == TOOL_WRENCH) if(locked) - to_chat(user, "The bolts are covered! Unlocking this would retract the covers.") + to_chat(user, span_warning("The bolts are covered! Unlocking this would retract the covers.")) return if(!anchored && !isinspace()) W.play_tool_sound(src, 100) - to_chat(user, "I secure \the [src] to the floor!") + to_chat(user, span_notice("I secure \the [src] to the floor!")) setAnchored(TRUE) else if(anchored) W.play_tool_sound(src, 100) - to_chat(user, "I unsecure \the [src] from the floor!") + to_chat(user, span_notice("I unsecure \the [src] from the floor!")) if(active) - to_chat(user, "\The [src] shuts off!") + to_chat(user, span_notice("\The [src] shuts off!")) shields_down() setAnchored(FALSE) else if(W.GetID()) if(allowed(user) && !(obj_flags & EMAGGED)) locked = !locked - to_chat(user, "I [locked ? "lock" : "unlock"] the controls.") + to_chat(user, span_notice("I [locked ? "lock" : "unlock"] the controls.")) else if(obj_flags & EMAGGED) - to_chat(user, "Error, access controller damaged!") + to_chat(user, span_danger("Error, access controller damaged!")) else - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) else return ..() /obj/machinery/shieldgen/emag_act(mob/user) if(obj_flags & EMAGGED) - to_chat(user, "The access controller is damaged!") + to_chat(user, span_warning("The access controller is damaged!")) return obj_flags |= EMAGGED locked = FALSE playsound(src, "sparks", 100, TRUE) - to_chat(user, "I short out the access controller.") + to_chat(user, span_warning("I short out the access controller.")) /obj/machinery/shieldgen/update_icon_state() if(active) @@ -267,9 +267,9 @@ if(!active_power_usage || surplus() >= active_power_usage) add_load(active_power_usage) else - visible_message("The [src.name] shuts down due to lack of power!", \ + visible_message(span_danger("The [src.name] shuts down due to lack of power!"), \ "If this message is ever seen, something is wrong.", - "I hear heavy droning fade out.") + span_hear("I hear heavy droning fade out.")) icon_state = "shield_wall_gen" active = FALSE log_game("[src] deactivated due to lack of power at [AREACOORD(src)]") @@ -329,7 +329,7 @@ /obj/machinery/power/shieldwallgen/can_be_unfasten_wrench(mob/user, silent) if(active) if(!silent) - to_chat(user, "Turn off the shield generator first!") + to_chat(user, span_warning("Turn off the shield generator first!")) return FAILED_UNFASTEN return ..() @@ -347,11 +347,11 @@ if(W.GetID()) if(allowed(user) && !(obj_flags & EMAGGED)) locked = !locked - to_chat(user, "I [src.locked ? "lock" : "unlock"] the controls.") + to_chat(user, span_notice("I [src.locked ? "lock" : "unlock"] the controls.")) else if(obj_flags & EMAGGED) - to_chat(user, "Error, access controller damaged!") + to_chat(user, span_danger("Error, access controller damaged!")) else - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) else add_fingerprint(user) @@ -362,37 +362,37 @@ if(.) return if(!anchored) - to_chat(user, "\The [src] needs to be firmly secured to the floor first!") + to_chat(user, span_warning("\The [src] needs to be firmly secured to the floor first!")) return if(locked && !issilicon(user)) - to_chat(user, "The controls are locked!") + to_chat(user, span_warning("The controls are locked!")) return if(!powernet) - to_chat(user, "\The [src] needs to be powered by a wire!") + to_chat(user, span_warning("\The [src] needs to be powered by a wire!")) return if(active) - user.visible_message("[user] turned \the [src] off.", \ - "I turn off \the [src].", \ - "I hear heavy droning fade out.") + user.visible_message(span_notice("[user] turned \the [src] off."), \ + span_notice("I turn off \the [src]."), \ + span_hear("I hear heavy droning fade out.")) active = FALSE log_game("[src] was deactivated by [key_name(user)] at [AREACOORD(src)]") else - user.visible_message("[user] turned \the [src] on.", \ - "I turn on \the [src].", \ - "I hear heavy droning.") + user.visible_message(span_notice("[user] turned \the [src] on."), \ + span_notice("I turn on \the [src]."), \ + span_hear("I hear heavy droning.")) active = ACTIVE_SETUPFIELDS log_game("[src] was activated by [key_name(user)] at [AREACOORD(src)]") add_fingerprint(user) /obj/machinery/power/shieldwallgen/emag_act(mob/user) if(obj_flags & EMAGGED) - to_chat(user, "The access controller is damaged!") + to_chat(user, span_warning("The access controller is damaged!")) return obj_flags |= EMAGGED locked = FALSE playsound(src, "sparks", 100, TRUE) - to_chat(user, "I short out the access controller.") + to_chat(user, span_warning("I short out the access controller.")) //////////////Containment Field START /obj/machinery/shieldwall @@ -415,7 +415,7 @@ needs_power = TRUE setDir(get_dir(gen_primary, gen_secondary)) for(var/mob/living/L in get_turf(src)) - visible_message("\The [src] is suddenly occupying the same space as \the [L]!") + visible_message(span_danger("\The [src] is suddenly occupying the same space as \the [L]!")) L.gib() /obj/machinery/shieldwall/Destroy() diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 24bf5abfc..9091853e0 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -88,26 +88,26 @@ C.throw_at(user, 3, 10) if(prob(10)) balance = max(balance - SPIN_PRICE, 0) - to_chat(user, "[src] spits your coin back out!") + to_chat(user, span_warning("[src] spits your coin back out!")) else if(!user.temporarilyRemoveItemFromInventory(C)) return - to_chat(user, "I insert [C] into [src]'s slot!") + to_chat(user, span_notice("I insert [C] into [src]'s slot!")) balance += C.value qdel(C) else - to_chat(user, "This machine is only accepting holochips!") + to_chat(user, span_warning("This machine is only accepting holochips!")) else if(istype(I, /obj/item/holochip)) if(paymode == HOLOCHIP) var/obj/item/holochip/H = I if(!user.temporarilyRemoveItemFromInventory(H)) return - to_chat(user, "I insert [H.credits] holocredits into [src]'s!") + to_chat(user, span_notice("I insert [H.credits] holocredits into [src]'s!")) balance += H.credits qdel(H) else - to_chat(user, "This machine is only accepting coins!") + to_chat(user, span_warning("This machine is only accepting coins!")) else if(I.tool_behaviour == TOOL_MULTITOOL) if(balance > 0) visible_message("[src] says, 'ERROR! Please empty the machine balance before altering paymode'") //Prevents converting coins into holocredits and vice versa @@ -196,7 +196,7 @@ var/the_name if(user) the_name = user.real_name - visible_message("[user] pulls the lever and the slot machine starts spinning!") + visible_message(span_notice("[user] pulls the lever and the slot machine starts spinning!")) else the_name = "Exaybachay" @@ -228,14 +228,14 @@ /obj/machinery/computer/slot_machine/proc/can_spin(mob/user) if(stat & NOPOWER) - to_chat(user, "The slot machine has no power!") + to_chat(user, span_warning("The slot machine has no power!")) if(stat & BROKEN) - to_chat(user, "The slot machine is broken!") + to_chat(user, span_warning("The slot machine is broken!")) if(working) - to_chat(user, "I need to wait until the machine stops spinning before you can play again!") + to_chat(user, span_warning("I need to wait until the machine stops spinning before you can play again!")) return 0 if(balance < SPIN_PRICE) - to_chat(user, "Insufficient money to play!") + to_chat(user, span_warning("Insufficient money to play!")) return 0 return 1 @@ -278,12 +278,12 @@ give_money(SMALL_PRIZE) else if(linelength == 3) - to_chat(user, "I win three free games!") + to_chat(user, span_notice("I win three free games!")) balance += SPIN_PRICE * 4 money = max(money - SPIN_PRICE * 4, money) else - to_chat(user, "No luck!") + to_chat(user, span_warning("No luck!")) /obj/machinery/computer/slot_machine/proc/get_lines() var/amountthesame diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 01198dda8..792555692 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -56,7 +56,7 @@ else . += "There is no power cell installed." if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Temperature range at [settableTemperatureRange]°C.
Heating power at [heatingPower*0.001]kJ.
Power consumption at [(efficiency*-0.0025)+150]%.
" //100%, 75%, 50%, 25% + . += span_notice("The status display reads: Temperature range at [settableTemperatureRange]°C.
Heating power at [heatingPower*0.001]kJ.
Power consumption at [(efficiency*-0.0025)+150]%.") //100%, 75%, 50%, 25% /obj/machinery/space_heater/update_icon_state() if(on) @@ -147,21 +147,21 @@ if(istype(I, /obj/item/stock_parts/cell)) if(panel_open) if(cell) - to_chat(user, "There is already a power cell inside!") + to_chat(user, span_warning("There is already a power cell inside!")) return else if(!user.transferItemToLoc(I, src)) return cell = I I.add_fingerprint(usr) - user.visible_message("\The [user] inserts a power cell into \the [src].", "I insert the power cell into \the [src].") + user.visible_message(span_notice("\The [user] inserts a power cell into \the [src]."), span_notice("I insert the power cell into \the [src].")) SStgui.update_uis(src) else - to_chat(user, "The hatch must be open to insert a power cell!") + to_chat(user, span_warning("The hatch must be open to insert a power cell!")) return else if(I.tool_behaviour == TOOL_SCREWDRIVER) panel_open = !panel_open - user.visible_message("\The [user] [panel_open ? "opens" : "closes"] the hatch on \the [src].", "I [panel_open ? "open" : "close"] the hatch on \the [src].") + user.visible_message(span_notice("\The [user] [panel_open ? "opens" : "closes"] the hatch on \the [src]."), span_notice("I [panel_open ? "open" : "close"] the hatch on \the [src].")) update_icon() else if(default_deconstruction_crowbar(I)) return @@ -207,7 +207,7 @@ if("power") on = !on mode = HEATER_MODE_STANDBY - usr.visible_message("[usr] switches [on ? "on" : "off"] \the [src].", "I switch [on ? "on" : "off"] \the [src].") + usr.visible_message(span_notice("[usr] switches [on ? "on" : "off"] \the [src]."), span_notice("I switch [on ? "on" : "off"] \the [src].")) update_icon() if (on) START_PROCESSING(SSmachines, src) diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm index 7e5aa493e..40be40932 100644 --- a/code/game/machinery/stasis.dm +++ b/code/game/machinery/stasis.dm @@ -21,8 +21,8 @@ /obj/machinery/stasis/examine(mob/user) . = ..() - . += "Alt-click to [stasis_enabled ? "turn off" : "turn on"] the machine." - . += "[src] is [op_computer ? "linked" : "NOT linked"] to an operating computer." + . += span_notice("Alt-click to [stasis_enabled ? "turn off" : "turn on"] the machine.") + . += span_notice("[src] is [op_computer ? "linked" : "NOT linked"] to an operating computer.") /obj/machinery/stasis/proc/play_power_sound() var/_running = stasis_running() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 639561a19..281117978 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -206,27 +206,27 @@ return var/mob/living/target = A if(!state_open) - to_chat(user, "The unit's doors are shut!") + to_chat(user, span_warning("The unit's doors are shut!")) return if(!is_operational()) - to_chat(user, "The unit is not operational!") + to_chat(user, span_warning("The unit is not operational!")) return if(occupant || helmet || suit || storage) - to_chat(user, "It's too cluttered inside to fit in!") + to_chat(user, span_warning("It's too cluttered inside to fit in!")) return if(target == user) - user.visible_message("[user] starts squeezing into [src]!", "I start working your way into [src]...") + user.visible_message(span_warning("[user] starts squeezing into [src]!"), span_notice("I start working your way into [src]...")) else - target.visible_message("[user] starts shoving [target] into [src]!", "[user] starts shoving you into [src]!") + target.visible_message(span_warning("[user] starts shoving [target] into [src]!"), span_danger("[user] starts shoving you into [src]!")) if(do_mob(user, target, 30)) if(occupant || helmet || suit || storage) return if(target == user) - user.visible_message("[user] slips into [src] and closes the door behind [user.p_them()]!", "I slip into [src]'s cramped space and shut its door.") + user.visible_message(span_warning("[user] slips into [src] and closes the door behind [user.p_them()]!"), "I slip into [src]'s cramped space and shut its door.") else - target.visible_message("[user] pushes [target] into [src] and shuts its door!", "[user] shoves you into [src] and shuts the door!") + target.visible_message(span_warning("[user] pushes [target] into [src] and shuts its door!"), span_danger("[user] shoves you into [src] and shuts the door!")) close_machine(target) add_fingerprint(user) @@ -257,7 +257,7 @@ uv = FALSE locked = FALSE if(uv_super) - visible_message("[src]'s door creaks open with a loud whining noise. A cloud of foul black smoke escapes from its chamber.") + visible_message(span_warning("[src]'s door creaks open with a loud whining noise. A cloud of foul black smoke escapes from its chamber.")) playsound(src, 'sound/blank.ogg', 50, TRUE) helmet = null qdel(helmet) @@ -271,9 +271,9 @@ wires.cut_all() else if(!occupant) - visible_message("[src]'s door slides open. The glowing yellow lights dim to a gentle green.") + visible_message(span_notice("[src]'s door slides open. The glowing yellow lights dim to a gentle green.")) else - visible_message("[src]'s door slides open, barraging you with the nauseating smell of charred flesh.") + visible_message(span_warning("[src]'s door slides open, barraging you with the nauseating smell of charred flesh.")) mob_occupant.radiation = 0 playsound(src, 'sound/blank.ogg', 25, TRUE) var/list/things_to_clear = list() //Done this way since using GetAllContents on the SSU itself would include circuitry and such. @@ -313,7 +313,7 @@ if(locked) if(message_cooldown <= world.time) message_cooldown = world.time + 50 - to_chat(user, "[src]'s door won't budge!") + to_chat(user, span_warning("[src]'s door won't budge!")) return open_machine() dump_contents() @@ -325,21 +325,21 @@ return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user.visible_message("I see [user] kicking against the doors of [src]!", \ - "I start kicking against the doors... (this will take about [DisplayTimeText(breakout_time)].)", \ - "I hear a thump from [src].") + user.visible_message(span_notice("I see [user] kicking against the doors of [src]!"), \ + span_notice("I start kicking against the doors... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_hear("I hear a thump from [src].")) if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src ) return - user.visible_message("[user] successfully broke out of [src]!", \ - "I successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("I successfully break out of [src]!")) open_machine() dump_contents() add_fingerprint(user) if(locked) - visible_message("I see [user] kicking against the doors of [src]!", \ - "I start kicking against the doors...") + visible_message(span_notice("I see [user] kicking against the doors of [src]!"), \ + span_notice("I start kicking against the doors...")) addtimer(CALLBACK(src, PROC_REF(resist_open), user), 300) else open_machine() @@ -347,42 +347,42 @@ /obj/machinery/suit_storage_unit/proc/resist_open(mob/user) if(!state_open && occupant && (user in src) && user.stat == 0) // Check they're still here. - visible_message("I see [user] burst out of [src]!", \ - "I escape the cramped confines of [src]!") + visible_message(span_notice("I see [user] burst out of [src]!"), \ + span_notice("I escape the cramped confines of [src]!")) open_machine() /obj/machinery/suit_storage_unit/attackby(obj/item/I, mob/user, params) if(state_open && is_operational()) if(istype(I, /obj/item/clothing/suit)) if(suit) - to_chat(user, "The unit already contains a suit!.") + to_chat(user, span_warning("The unit already contains a suit!.")) return if(!user.transferItemToLoc(I, src)) return suit = I else if(istype(I, /obj/item/clothing/head)) if(helmet) - to_chat(user, "The unit already contains a helmet!") + to_chat(user, span_warning("The unit already contains a helmet!")) return if(!user.transferItemToLoc(I, src)) return helmet = I else if(istype(I, /obj/item/clothing/mask)) if(mask) - to_chat(user, "The unit already contains a mask!") + to_chat(user, span_warning("The unit already contains a mask!")) return if(!user.transferItemToLoc(I, src)) return mask = I else if(storage) - to_chat(user, "The auxiliary storage compartment is full!") + to_chat(user, span_warning("The auxiliary storage compartment is full!")) return if(!user.transferItemToLoc(I, src)) return storage = I - visible_message("[user] inserts [I] into [src]", "I load [I] into [src].") + visible_message(span_notice("[user] inserts [I] into [src]"), span_notice("I load [I] into [src].")) update_icon() return @@ -404,7 +404,7 @@ */ /obj/machinery/suit_storage_unit/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/I) if(!(flags_1 & NODECONSTRUCT_1) && I.tool_behaviour == TOOL_SCREWDRIVER && uv) - to_chat(user, "It might not be wise to fiddle with [src] while it's running...") + to_chat(user, span_warning("It might not be wise to fiddle with [src] while it's running...")) return TRUE return ..() @@ -413,7 +413,7 @@ . = !(state_open || panel_open || is_operational() || locked || (flags_1 & NODECONSTRUCT_1)) && I.tool_behaviour == TOOL_CROWBAR if(.) I.play_tool_sound(src, 50) - visible_message("[usr] pries open \the [src].", "I pry open \the [src].") + visible_message(span_notice("[usr] pries open \the [src]."), span_notice("I pry open \the [src].")) open_machine() /obj/machinery/suit_storage_unit/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ @@ -477,7 +477,7 @@ else if(occupant) var/mob/living/mob_occupant = occupant - to_chat(mob_occupant, "[src]'s confines grow warm, then hot, then scorching. You're being burned [!mob_occupant.stat ? "alive" : "away"]!") + to_chat(mob_occupant, span_danger("[src]'s confines grow warm, then hot, then scorching. You're being burned [!mob_occupant.stat ? "alive" : "away"]!")) cook() . = TRUE if("dispense") diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 490904598..80caf890b 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -21,7 +21,7 @@ /obj/machinery/power/singularity_beacon/proc/Activate(mob/user = null) if(surplus() < 1500) if(user) - to_chat(user, "The connected wire doesn't have enough current.") + to_chat(user, span_notice("The connected wire doesn't have enough current.")) return for(var/obj/singularity/singulo in GLOB.singularities) if(singulo.z == z) @@ -29,7 +29,7 @@ icon_state = "[icontype]1" active = 1 if(user) - to_chat(user, "I activate the beacon.") + to_chat(user, span_notice("I activate the beacon.")) /obj/machinery/power/singularity_beacon/proc/Deactivate(mob/user = null) @@ -39,7 +39,7 @@ icon_state = "[icontype]0" active = 0 if(user) - to_chat(user, "I deactivate the beacon.") + to_chat(user, span_notice("I deactivate the beacon.")) /obj/machinery/power/singularity_beacon/attack_ai(mob/user) @@ -53,30 +53,30 @@ if(anchored) return active ? Deactivate(user) : Activate(user) else - to_chat(user, "I need to screw \the [src] to the floor first!") + to_chat(user, span_warning("I need to screw \the [src] to the floor first!")) /obj/machinery/power/singularity_beacon/attackby(obj/item/W, mob/user, params) if(W.tool_behaviour == TOOL_WRENCH) if(active) - to_chat(user, "I need to deactivate \the [src] first!") + to_chat(user, span_warning("I need to deactivate \the [src] first!")) return if(anchored) setAnchored(FALSE) - to_chat(user, "I unbolt \the [src] from the floor and detach it from the cable.") + to_chat(user, span_notice("I unbolt \the [src] from the floor and detach it from the cable.")) disconnect_from_network() return else if(!connect_to_network()) - to_chat(user, "\The [src] must be placed over an exposed, powered cable node!") + to_chat(user, span_warning("\The [src] must be placed over an exposed, powered cable node!")) return setAnchored(TRUE) - to_chat(user, "I bolt \the [src] to the floor and attach it to the cable.") + to_chat(user, span_notice("I bolt \the [src] to the floor and attach it to the cable.")) return else if(W.tool_behaviour == TOOL_SCREWDRIVER) user.visible_message( \ "[user] messes with \the [src] for a bit.", \ - "I can't fit the screwdriver into \the [src]'s bolts! Try using a wrench.") + span_notice("I can't fit the screwdriver into \the [src]'s bolts! Try using a wrench.")) else return ..() @@ -120,7 +120,7 @@ /obj/item/sbeacondrop/attack_self(mob/user) if(user) - to_chat(user, "Locked In.") + to_chat(user, span_notice("Locked In.")) new droptype( user.loc ) playsound(src, 'sound/blank.ogg', 100, TRUE, TRUE) qdel(src) diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index a37e3778c..2cdd2baf9 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -112,25 +112,25 @@ if(I.tool_behaviour == TOOL_WRENCH && can_unanchor) if(!anchored) if(!isturf(loc) || isspaceturf(loc)) - to_chat(user, "The bomb must be placed on solid ground to attach it.") + to_chat(user, span_notice("The bomb must be placed on solid ground to attach it.")) else - to_chat(user, "I firmly wrench the bomb to the floor.") + to_chat(user, span_notice("I firmly wrench the bomb to the floor.")) I.play_tool_sound(src) setAnchored(TRUE) if(active) - to_chat(user, "The bolts lock in place.") + to_chat(user, span_notice("The bolts lock in place.")) else if(!active) - to_chat(user, "I wrench the bomb from the floor.") + to_chat(user, span_notice("I wrench the bomb from the floor.")) I.play_tool_sound(src) setAnchored(FALSE) else - to_chat(user, "The bolts are locked down!") + to_chat(user, span_warning("The bolts are locked down!")) else if(I.tool_behaviour == TOOL_SCREWDRIVER) open_panel = !open_panel update_icon() - to_chat(user, "I [open_panel ? "open" : "close"] the wire panel.") + to_chat(user, span_notice("I [open_panel ? "open" : "close"] the wire panel.")) else if(is_wire_tool(I) && open_panel) wires.interact(user) @@ -138,23 +138,23 @@ else if(I.tool_behaviour == TOOL_CROWBAR) if(open_panel && wires.is_all_cut()) if(payload) - to_chat(user, "I carefully pry out [payload].") + to_chat(user, span_notice("I carefully pry out [payload].")) payload.forceMove(drop_location()) payload = null else - to_chat(user, "There isn't anything in here to remove!") + to_chat(user, span_warning("There isn't anything in here to remove!")) else if (open_panel) - to_chat(user, "The wires connecting the shell to the explosives are holding it down!") + to_chat(user, span_warning("The wires connecting the shell to the explosives are holding it down!")) else - to_chat(user, "The cover is screwed on, it won't pry off!") + to_chat(user, span_warning("The cover is screwed on, it won't pry off!")) else if(istype(I, /obj/item/bombcore)) if(!payload) if(!user.transferItemToLoc(I, src)) return payload = I - to_chat(user, "I place [payload] into [src].") + to_chat(user, span_notice("I place [payload] into [src].")) else - to_chat(user, "[payload] is already loaded into [src]! You'll have to remove it first.") + to_chat(user, span_warning("[payload] is already loaded into [src]! You'll have to remove it first.")) else if(I.tool_behaviour == TOOL_WELDER) if(payload || !wires.is_all_cut() || !open_panel) return @@ -162,16 +162,16 @@ if(!I.tool_start_check(user, amount=5)) //uses up 5 fuel return - to_chat(user, "I start to cut [src] apart...") + to_chat(user, span_notice("I start to cut [src] apart...")) if(I.use_tool(src, user, 20, volume=50, amount=5)) //uses up 5 fuel - to_chat(user, "I cut [src] apart.") + to_chat(user, span_notice("I cut [src] apart.")) new /obj/item/stack/sheet/plasteel( loc, 5) qdel(src) else var/old_integ = obj_integrity . = ..() if((old_integ > obj_integrity) && active && (payload in src)) - to_chat(user, "That seems like a really bad idea...") + to_chat(user, span_warning("That seems like a really bad idea...")) /obj/machinery/syndicatebomb/interact(mob/user) wires.interact(user) @@ -179,7 +179,7 @@ if(!active) settings(user) else if(anchored) - to_chat(user, "The bomb is bolted to the floor!") + to_chat(user, span_warning("The bomb is bolted to the floor!")) /obj/machinery/syndicatebomb/proc/activate() active = TRUE @@ -198,10 +198,10 @@ if(in_range(src, user) && isliving(user)) //No running off and setting bombs from across the station timer_set = CLAMP(new_timer, minimum_timer, maximum_timer) - loc.visible_message("[icon2html(src, viewers(src))] timer set for [timer_set] seconds.") + loc.visible_message(span_notice("[icon2html(src, viewers(src))] timer set for [timer_set] seconds.")) if(alert(user,"Would you like to start the countdown now?",,"Yes","No") == "Yes" && in_range(src, user) && isliving(user)) if(!active) - visible_message("[icon2html(src, viewers(loc))] [timer_set] seconds until detonation, please clear the area.") + visible_message(span_danger("[icon2html(src, viewers(loc))] [timer_set] seconds until detonation, please clear the area.")) activate() update_icon() add_fingerprint(user) @@ -311,7 +311,7 @@ var/obj/machinery/syndicatebomb/holder = loc if(istype(holder)) attempts++ - holder.loc.visible_message("[icon2html(holder, viewers(holder))] Alert: Bomb has detonated. Your score is now [defusals] for [attempts]. Resetting wires...") + holder.loc.visible_message(span_danger("[icon2html(holder, viewers(holder))] Alert: Bomb has detonated. Your score is now [defusals] for [attempts]. Resetting wires...")) reset() else qdel(src) @@ -321,7 +321,7 @@ if(istype(holder)) attempts++ defusals++ - holder.loc.visible_message("[icon2html(holder, viewers(holder))] Alert: Bomb has been defused. Your score is now [defusals] for [attempts]! Resetting wires in 5 seconds...") + holder.loc.visible_message(span_notice("[icon2html(holder, viewers(holder))] Alert: Bomb has been defused. Your score is now [defusals] for [attempts]! Resetting wires in 5 seconds...")) sleep(50) //Just in case someone is trying to remove the bomb core this gives them a little window to crowbar it out if(istype(holder)) reset() @@ -442,9 +442,9 @@ if(!user.transferItemToLoc(I, src)) return beakers += I - to_chat(user, "I load [src] with [I].") + to_chat(user, span_notice("I load [src] with [I].")) else - to_chat(user, "[I] won't fit! \The [src] can only hold up to [max_beakers] containers.") + to_chat(user, span_warning("[I] won't fit! \The [src] can only hold up to [max_beakers] containers.")) return ..() @@ -514,7 +514,7 @@ detonated++ existent++ playsound(user, 'sound/blank.ogg', 20, TRUE) - to_chat(user, "[existent] found, [detonated] triggered.") + to_chat(user, span_notice("[existent] found, [detonated] triggered.")) if(detonated) detonated-- log_bomber(user, "remotely detonated [detonated ? "syndicate bombs" : "a syndicate bomb"] using a", src) diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index b397f7e0c..122f256c8 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -177,7 +177,7 @@ if(href_list["delete"]) if(!src.allowed(usr) && !(obj_flags & EMAGGED)) - to_chat(usr, "ACCESS DENIED.") + to_chat(usr, span_danger("ACCESS DENIED.")) return if(SelectedServer) diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm index 160777677..e375b9a82 100644 --- a/code/game/machinery/telecomms/computers/message.dm +++ b/code/game/machinery/telecomms/computers/message.dm @@ -22,14 +22,14 @@ //Sparks effect - For emag var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread //Messages - Saves me time if I want to change something. - var/noserver = "ALERT: No server detected." - var/incorrectkey = "ALERT: Incorrect decryption key!" - var/defaultmsg = "Welcome. Please select an option." - var/rebootmsg = "%$&(£: Critical %$$@ Error // !RestArting! - ?pLeaSe wAit!" + var/noserver = span_alert("ALERT: No server detected.") + var/incorrectkey = span_warning("ALERT: Incorrect decryption key!") + var/defaultmsg = span_notice("Welcome. Please select an option.") + var/rebootmsg = span_warning("%$&(£: Critical %$$@ Error // !RestArting! - ?pLeaSe wAit!") //Computer properties var/screen = MSG_MON_SCREEN_MAIN // 0 = Main menu, 1 = Message Logs, 2 = Hacked screen, 3 = Custom Message var/hacking = FALSE // Is it being hacked into by the AI/Cyborg - var/message = "System bootup complete. Please select an option." // The message that shows on the main menu. + var/message = span_notice("System bootup complete. Please select an option.") // The message that shows on the main menu. var/auth = FALSE // Are they authenticated? var/optioncount = 7 // Custom Message Properties @@ -43,7 +43,7 @@ /obj/machinery/computer/message_monitor/attackby(obj/item/O, mob/living/user, params) if(O.tool_behaviour == TOOL_SCREWDRIVER && (obj_flags & EMAGGED)) //Stops people from just unscrewing the monitor and putting it back to get the console working again. - to_chat(user, "It is too hot to mess with!") + to_chat(user, span_warning("It is too hot to mess with!")) else return ..() @@ -62,7 +62,7 @@ addtimer(CALLBACK(src, PROC_REF(UnmagConsole)), time) message = rebootmsg else - to_chat(user, "A no server error appears on the screen.") + to_chat(user, span_notice("A no server error appears on the screen.")) /obj/machinery/computer/message_monitor/New() ..() @@ -244,10 +244,10 @@ /obj/machinery/computer/message_monitor/proc/BruteForce(mob/user) if(isnull(linkedServer)) - to_chat(user, "Could not complete brute-force: Linked Server Disconnected!") + to_chat(user, span_warning("Could not complete brute-force: Linked Server Disconnected!")) else var/currentKey = linkedServer.decryptkey - to_chat(user, "Brute-force completed! The key is '[currentKey]'.") + to_chat(user, span_warning("Brute-force completed! The key is '[currentKey]'.")) hacking = FALSE screen = MSG_MON_SCREEN_MAIN // Return the screen back to normal @@ -294,10 +294,10 @@ if(message_servers.len > 1) linkedServer = input(usr, "Please select a server.", "Select a server.", null) as null|anything in message_servers - message = "NOTICE: Server selected." + message = span_alert("NOTICE: Server selected.") else if(message_servers.len > 0) linkedServer = message_servers[1] - message = "NOTICE: Only Single Server Detected - Server selected." + message = span_notice("NOTICE: Only Single Server Detected - Server selected.") else message = noserver @@ -314,14 +314,14 @@ message = noserver else if(auth) linkedServer.pda_msgs = list() - message = "NOTICE: Logs cleared." + message = span_notice("NOTICE: Logs cleared.") //Clears the request console logs - KEY REQUIRED if (href_list["clear_requests"]) if(LINKED_SERVER_NONRESPONSIVE) message = noserver else if(auth) linkedServer.rc_msgs = list() - message = "NOTICE: Logs cleared." + message = span_notice("NOTICE: Logs cleared.") //Change the password - KEY REQUIRED if (href_list["pass"]) if(LINKED_SERVER_NONRESPONSIVE) @@ -332,12 +332,12 @@ if(linkedServer.decryptkey == dkey) var/newkey = stripped_input(usr,"Please enter the new key (3 - 16 characters max):") if(length(newkey) <= 3) - message = "NOTICE: Decryption key too short!" + message = span_notice("NOTICE: Decryption key too short!") else if(length(newkey) > 16) - message = "NOTICE: Decryption key too long!" + message = span_notice("NOTICE: Decryption key too long!") else if(newkey && newkey != "") linkedServer.decryptkey = newkey - message = "NOTICE: Decryption key set." + message = span_notice("NOTICE: Decryption key set.") else message = incorrectkey @@ -359,7 +359,7 @@ message = noserver else //if(istype(href_list["delete_logs"], /datum/data_pda_msg)) linkedServer.pda_msgs -= locate(href_list["delete_logs"]) in linkedServer.pda_msgs - message = "NOTICE: Log Deleted!" + message = span_notice("NOTICE: Log Deleted!") //Delete the request console log. if (href_list["delete_requests"]) //Are they on the view logs screen? @@ -368,7 +368,7 @@ message = noserver else //if(istype(href_list["delete_logs"], /datum/data_pda_msg)) linkedServer.rc_msgs -= locate(href_list["delete_requests"]) in linkedServer.rc_msgs - message = "NOTICE: Log Deleted!" + message = span_notice("NOTICE: Log Deleted!") //Create a custom message if (href_list["msg"]) if(LINKED_SERVER_NONRESPONSIVE) @@ -414,11 +414,11 @@ customsender = "UNKNOWN" if(isnull(customrecepient)) - message = "NOTICE: No recepient selected!" + message = span_notice("NOTICE: No recepient selected!") return attack_hand(usr) if(isnull(custommessage) || custommessage == "") - message = "NOTICE: No message entered!" + message = span_notice("NOTICE: No message entered!") return attack_hand(usr) var/datum/signal/subspace/messaging/pda/signal = new(src, list( diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index ce274da8b..f0e11e0d6 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -56,7 +56,7 @@ /obj/machinery/telecomms/message_server/examine(mob/user) . = ..() if(calibrating) - . += "It's still calibrating." + . += span_warning("It's still calibrating.") /obj/machinery/telecomms/message_server/proc/GenerateKey() var/newKey diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 7b5e4f969..854c48896 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -34,7 +34,7 @@ /obj/machinery/teleport/hub/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Probability of malfunction decreased by [(accuracy*25)-25]%." + . += span_notice("The status display reads: Probability of malfunction decreased by [(accuracy*25)-25]%.") /obj/machinery/teleport/hub/proc/link_power_station() if(power_station) @@ -47,7 +47,7 @@ /obj/machinery/teleport/hub/Bumped(atom/movable/AM) if(is_centcom_level(z)) - to_chat(AM, "I can't use this here!") + to_chat(AM, span_warning("I can't use this here!")) return if(is_ready()) teleport(AM) @@ -68,7 +68,7 @@ return if (QDELETED(com.target)) com.target = null - visible_message("Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.") + visible_message(span_alert("Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.")) return if (ismovableatom(M)) if(do_teleport(M, com.target, channel = TELEPORT_CHANNEL_BLUESPACE)) @@ -77,7 +77,7 @@ if(ishuman(M))//don't remove people from the round randomly you jerks var/mob/living/carbon/human/human = M if(human.dna && human.dna.species.id == "human") - to_chat(M, "I hear a buzzing in your ears.") + to_chat(M, span_hear("I hear a buzzing in your ears.")) human.set_species(/datum/species/fly) log_game("[human] ([key_name(human)]) was turned into a fly person") @@ -129,11 +129,11 @@ /obj/machinery/teleport/station/examine(mob/user) . = ..() if(!panel_open) - . += "The panel is screwed in, obstructing the linking device and wiring panel." + . += span_notice("The panel is screwed in, obstructing the linking device and wiring panel.") else - . += "The linking device is now able to be scanned with a multitool.
The wiring can be connected to a nearby console and hub with a pair of wirecutters.
" + . += span_notice("The linking device is now able to be scanned with a multitool.
The wiring can be connected to a nearby console and hub with a pair of wirecutters.") if(in_range(user, src) || isobserver(user)) - . += "The status display reads: This station can be linked to [efficiency] other station(s)." + . += span_notice("The status display reads: This station can be linked to [efficiency] other station(s).") /obj/machinery/teleport/station/proc/link_console_and_hub() for(var/direction in GLOB.cardinals) @@ -166,15 +166,15 @@ var/obj/item/multitool/M = W if(panel_open) M.buffer = src - to_chat(user, "I download the data to the [W.name]'s buffer.") + to_chat(user, span_notice("I download the data to the [W.name]'s buffer.")) else if(M.buffer && istype(M.buffer, /obj/machinery/teleport/station) && M.buffer != src) if(linked_stations.len < efficiency) linked_stations.Add(M.buffer) M.buffer = null - to_chat(user, "I upload the data from the [W.name]'s buffer.") + to_chat(user, span_notice("I upload the data from the [W.name]'s buffer.")) else - to_chat(user, "This station can't hold more information, try to use better parts.") + to_chat(user, span_alert("This station can't hold more information, try to use better parts.")) return else if(default_deconstruction_screwdriver(user, "controller-o", "controller", W)) update_icon() @@ -186,7 +186,7 @@ else if(W.tool_behaviour == TOOL_WIRECUTTER) if(panel_open) link_console_and_hub() - to_chat(user, "I reconnect the station to nearby machinery.") + to_chat(user, span_notice("I reconnect the station to nearby machinery.")) return else return ..() @@ -199,13 +199,13 @@ return if (teleporter_console.target) if(teleporter_hub.panel_open || teleporter_hub.stat & (BROKEN|NOPOWER)) - to_chat(user, "The teleporter hub isn't responding.") + to_chat(user, span_alert("The teleporter hub isn't responding.")) else engaged = !engaged use_power(5000) - to_chat(user, "Teleporter [engaged ? "" : "dis"]engaged!") + to_chat(user, span_notice("Teleporter [engaged ? "" : "dis"]engaged!")) else - to_chat(user, "No target detected.") + to_chat(user, span_alert("No target detected.")) engaged = FALSE teleporter_hub.update_icon() add_fingerprint(user) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index d1be4baac..8db1f8b28 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -129,7 +129,7 @@ GLOBAL_LIST_INIT(dye_registry, list( /obj/machinery/washing_machine/examine(mob/user) . = ..() if(!busy) - . += "Alt-click it to start a wash cycle." + . += span_notice("Alt-click it to start a wash cycle.") /obj/machinery/washing_machine/AltClick(mob/user) if(!user.canUseTopic(src, !issilicon(user))) @@ -137,10 +137,10 @@ GLOBAL_LIST_INIT(dye_registry, list( if(busy) return if(state_open) - to_chat(user, "Close the door first!") + to_chat(user, span_warning("Close the door first!")) return if(bloody_mess) - to_chat(user, "[src] must be cleaned up first!") + to_chat(user, span_warning("[src] must be cleaned up first!")) return busy = TRUE update_icon() @@ -278,19 +278,19 @@ GLOBAL_LIST_INIT(dye_registry, list( else if(user.used_intent.type != INTENT_HARM) if (!state_open) - to_chat(user, "Open the door first!") + to_chat(user, span_warning("Open the door first!")) return TRUE if(bloody_mess) - to_chat(user, "[src] must be cleaned up first!") + to_chat(user, span_warning("[src] must be cleaned up first!")) return TRUE if(contents.len >= max_wash_capacity) - to_chat(user, "The washing machine is full!") + to_chat(user, span_warning("The washing machine is full!")) return TRUE if(!user.transferItemToLoc(W, src)) - to_chat(user, "\The [W] is stuck to your hand, you cannot put it in the washing machine!") + to_chat(user, span_warning("\The [W] is stuck to your hand, you cannot put it in the washing machine!")) return TRUE if(W.dye_color) @@ -305,7 +305,7 @@ GLOBAL_LIST_INIT(dye_registry, list( if(.) return if(busy) - to_chat(user, "[src] is busy!") + to_chat(user, span_warning("[src] is busy!")) return if(user.pulling && user.used_intent.type == INTENT_GRAB && isliving(user.pulling)) diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index cfe5d22e3..13cf7b5db 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -15,29 +15,29 @@ if(.) return if(charges <= 0) - to_chat(user, "The Wish Granter lies silent.") + to_chat(user, span_boldnotice("The Wish Granter lies silent.")) return else if(!ishuman(user)) - to_chat(user, "I feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.") + to_chat(user, span_boldnotice("I feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.")) return else if(is_special_character(user)) - to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.") + to_chat(user, span_boldnotice("Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.")) else if (!insisting) - to_chat(user, "My first touch makes the Wish Granter stir, listening to you. Are you really sure you want to do this?") + to_chat(user, span_boldnotice("My first touch makes the Wish Granter stir, listening to you. Are you really sure you want to do this?")) insisting++ else - to_chat(user, "I speak. [pick("I want the station to disappear","Humanity is corrupt, mankind must be destroyed","I want to be rich", "I want to rule the world","I want immortality.")]. The Wish Granter answers.") - to_chat(user, "My head pounds for a moment, before my vision clears. You are the avatar of the Wish Granter, and my power is LIMITLESS! And it's all yours. You need to make sure no one can take it from you. No one can know, first.") + to_chat(user, span_boldnotice("I speak. [pick("I want the station to disappear","Humanity is corrupt, mankind must be destroyed","I want to be rich", "I want to rule the world","I want immortality.")]. The Wish Granter answers.")) + to_chat(user, span_boldnotice("My head pounds for a moment, before my vision clears. You are the avatar of the Wish Granter, and my power is LIMITLESS! And it's all yours. You need to make sure no one can take it from you. No one can know, first.")) charges-- insisting = 0 user.mind.add_antag_datum(/datum/antagonist/wishgranter) - to_chat(user, "I have a very bad feeling about this.") + to_chat(user, span_warning("I have a very bad feeling about this.")) return diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm index 8d2ef9102..690ec0e72 100644 --- a/code/game/mecha/combat/durand.dm +++ b/code/game/mecha/combat/durand.dm @@ -161,13 +161,13 @@ the shield is disabled by means other than the action button (like running out o if(switching && !signal_args[1]) return if(!chassis.defense_mode && (!chassis.cell || chassis.cell.charge < 100)) //If it's off, and we have less than 100 units of power - chassis.occupant_message("Insufficient power; cannot activate defense mode.") + chassis.occupant_message(span_warn("Insufficient power; cannot activate defense mode.")) return switching = TRUE chassis.defense_mode = !chassis.defense_mode chassis.defense_action.button_icon_state = "mech_defense_mode_[chassis.defense_mode ? "on" : "off"]" //This is backwards because we haven't changed the var yet if(!signal_args[1]) - chassis.occupant_message("Defense mode [chassis.defense_mode?"enabled":"disabled"].") + chassis.occupant_message(span_notice("Defense mode [chassis.defense_mode?"enabled":"disabled"].")) chassis.log_message("User has toggled defense mode -- now [chassis.defense_mode?"enabled":"disabled"].", LOG_MECHA) else chassis.log_message("defense mode state changed -- now [chassis.defense_mode?"enabled":"disabled"].", LOG_MECHA) diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 603b77b4b..142e0144e 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -39,7 +39,7 @@ src.update_chassis_page() log_message("[src] is destroyed.", LOG_MECHA) if(chassis.occupant) - chassis.occupant_message("[src] is destroyed!") + chassis.occupant_message(span_danger("[src] is destroyed!")) chassis.occupant.playsound_local(chassis, destroy_sound, 50) if(!detachable) //If we're a built-in nondetachable equipment, let's lock up the slot that we were in. chassis.max_equip-- @@ -51,9 +51,9 @@ if(!user.temporarilyRemoveItemFromInventory(src)) return FALSE attach(M) - user.visible_message("[user] attaches [src] to [M].", "I attach [src] to [M].") + user.visible_message(span_notice("[user] attaches [src] to [M]."), span_notice("I attach [src] to [M].")) return TRUE - to_chat(user, "I are unable to attach [src] to [M]!") + to_chat(user, span_warning("I are unable to attach [src] to [M]!")) return FALSE /obj/item/mecha_parts/mecha_equipment/proc/get_equip_info() diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index d4f4f1bc2..20173b9ad 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -55,8 +55,8 @@ return if(!patient_insertion_check(target)) return - occupant_message("I start putting [target] into [src]...") - chassis.visible_message("[chassis] starts putting [target] into \the [src].") + occupant_message(span_notice("I start putting [target] into [src]...")) + chassis.visible_message(span_warning("[chassis] starts putting [target] into \the [src].")) if(do_after_cooldown(target)) if(!patient_insertion_check(target)) return @@ -64,19 +64,19 @@ patient = target START_PROCESSING(SSobj, src) update_equip_info() - occupant_message("[target] successfully loaded into [src]. Life support functions engaged.") - chassis.visible_message("[chassis] loads [target] into [src].") + occupant_message(span_notice("[target] successfully loaded into [src]. Life support functions engaged.")) + chassis.visible_message(span_warning("[chassis] loads [target] into [src].")) log_message("[target] loaded. Life support functions engaged.", LOG_MECHA) /obj/item/mecha_parts/mecha_equipment/medical/sleeper/proc/patient_insertion_check(mob/living/carbon/target) if(target.buckled) - occupant_message("[target] will not fit into the sleeper because [target.p_theyre()] buckled to [target.buckled]!") + occupant_message(span_warning("[target] will not fit into the sleeper because [target.p_theyre()] buckled to [target.buckled]!")) return if(target.has_buckled_mobs()) - occupant_message("[target] will not fit into the sleeper because of the creatures attached to it!") + occupant_message(span_warning("[target] will not fit into the sleeper because of the creatures attached to it!")) return if(patient) - occupant_message("The sleeper is already occupied!") + occupant_message(span_warning("The sleeper is already occupied!")) return return 1 @@ -84,7 +84,7 @@ if(!patient) return patient.forceMove(get_turf(src)) - occupant_message("[patient] ejected. Life support functions disabled.") + occupant_message(span_notice("[patient] ejected. Life support functions disabled.")) log_message("[patient] ejected. Life support functions disabled.", LOG_MECHA) STOP_PROCESSING(SSobj, src) patient = null @@ -92,7 +92,7 @@ /obj/item/mecha_parts/mecha_equipment/medical/sleeper/detach() if(patient) - occupant_message("Unable to detach [src] - equipment occupied!") + occupant_message(span_warning("Unable to detach [src] - equipment occupied!")) return STOP_PROCESSING(SSobj, src) return ..() @@ -194,7 +194,7 @@ return 0 var/to_inject = min(R.volume, inject_amount) if(to_inject && patient.reagents.get_reagent_amount(R.type) + to_inject <= inject_amount*2) - occupant_message("Injecting [patient] with [to_inject] units of [R.name].") + occupant_message(span_notice("Injecting [patient] with [to_inject] units of [R.name].")) log_message("Injecting [patient] with [to_inject] units of [R.name].", LOG_MECHA) log_combat(chassis.occupant, patient, "injected", "[name] ([R] - [to_inject] units)") SG.reagents.trans_id_to(patient,R.type,to_inject) @@ -219,7 +219,7 @@ if(!chassis.has_charge(energy_drain)) set_ready_state(1) log_message("Deactivated.", LOG_MECHA) - occupant_message("[src] deactivated - no power.") + occupant_message(span_warning("[src] deactivated - no power.")) STOP_PROCESSING(SSobj, src) return var/mob/living/carbon/M = patient @@ -373,7 +373,7 @@ message += " added to production" START_PROCESSING(SSobj, src) occupant_message(message) - occupant_message("Reagent processing started.") + occupant_message(span_notice("Reagent processing started.")) log_message("Reagent processing started.", LOG_MECHA) return if (href_list["show_reagents"]) @@ -450,38 +450,38 @@ /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/load_syringe(obj/item/reagent_containers/syringe/S) if(syringes.len= 2) - occupant_message("The syringe is too far away!") + occupant_message(span_warning("The syringe is too far away!")) return 0 for(var/obj/structure/D in S.loc)//Basic level check for structures in the way (Like grilles and windows) if(!(D.CanPass(S,src.loc))) - occupant_message("Unable to load syringe!") + occupant_message(span_warning("Unable to load syringe!")) return 0 for(var/obj/machinery/door/D in S.loc)//Checks for doors if(!(D.CanPass(S,src.loc))) - occupant_message("Unable to load syringe!") + occupant_message(span_warning("Unable to load syringe!")) return 0 S.reagents.trans_to(src, S.reagents.total_volume, transfered_by = chassis.occupant) S.forceMove(src) syringes += S - occupant_message("Syringe loaded.") + occupant_message(span_notice("Syringe loaded.")) update_equip_info() return 1 - occupant_message("[src]'s syringe chamber is full!") + occupant_message(span_warning("[src]'s syringe chamber is full!")) return 0 /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/analyze_reagents(atom/A) if(get_dist(src,A) >= 4) - occupant_message("The object is too far away!") + occupant_message(span_notice("The object is too far away!")) return 0 if(!A.reagents || ismob(A)) - occupant_message("No reagent info gained from [A].") + occupant_message(span_warning("No reagent info gained from [A].")) return 0 - occupant_message("Analyzing reagents...") + occupant_message(span_notice("Analyzing reagents...")) for(var/datum/reagent/R in A.reagents.reagent_list) if(R.can_synth && add_known_reagent(R.type,R.name)) - occupant_message("Reagent analyzed, identified as [R.name] and added to database.") + occupant_message(span_notice("Reagent analyzed, identified as [R.name] and added to database.")) send_byjax(chassis.occupant,"msyringegun.browser","reagents_form",get_reagents_form()) - occupant_message("Analyzis complete.") + occupant_message(span_notice("Analyzis complete.")) return 1 /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/add_known_reagent(r_id,r_name) @@ -508,7 +508,7 @@ if(..()) return if(!processed_reagents.len || reagents.total_volume >= reagents.maximum_volume || !chassis.has_charge(energy_drain)) - occupant_message("Reagent processing stopped.") + occupant_message(span_alert("Reagent processing stopped.")) log_message("Reagent processing stopped.", LOG_MECHA) STOP_PROCESSING(SSobj, src) return diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm index 9a29f285b..a7078bd46 100644 --- a/code/game/mecha/equipment/tools/mining_tools.dm +++ b/code/game/mecha/equipment/tools/mining_tools.dm @@ -31,9 +31,9 @@ var/obj/target_obj = target if(target_obj.resistance_flags & UNACIDABLE) return - target.visible_message("[chassis] starts to drill [target].", \ - "[chassis] starts to drill [target]...", \ - "I hear drilling.") + target.visible_message(span_warning("[chassis] starts to drill [target]."), \ + span_danger("[chassis] starts to drill [target]..."), \ + span_hear("I hear drilling.")) if(do_after_cooldown(target)) set_ready_state(FALSE) @@ -70,7 +70,7 @@ drill.log_message("Drilled through [src]", LOG_MECHA) dismantle_wall(TRUE, FALSE) else - drill.occupant_message("[src] is too durable to drill through.") + drill.occupant_message(span_danger("[src] is too durable to drill through.")) /turf/closed/mineral/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill) for(var/turf/closed/mineral/M in range(drill.chassis,1)) @@ -109,8 +109,8 @@ butchering.butchering_enabled = FALSE /obj/item/mecha_parts/mecha_equipment/drill/proc/drill_mob(mob/living/target, mob/user) - target.visible_message("[chassis] is drilling [target] with [src]!", \ - "[chassis] is drilling you with [src]!") + target.visible_message(span_danger("[chassis] is drilling [target] with [src]!"), \ + span_danger("[chassis] is drilling you with [src]!")) log_combat(user, target, "drilled", "[name]", "(INTENT: [uppertext(user.used_intent)]) (DAMTYPE: [uppertext(damtype)])") if(target.stat == DEAD && target.getBruteLoss() >= 200) log_combat(user, target, "gibbed", name) diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index ac70f8fb6..54791b50f 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -85,15 +85,15 @@ if(1) if(!locked) if(!istype(target) || target.anchored || target.move_resist >= MOVE_FORCE_EXTREMELY_STRONG) - occupant_message("Unable to lock on [target]!") + occupant_message(span_warning("Unable to lock on [target]!")) return if(ismob(target)) var/mob/M = target if(M.mob_negates_gravity()) - occupant_message("Unable to lock on [target]!") + occupant_message(span_warning("Unable to lock on [target]!")) return locked = target - occupant_message("Locked on [target].") + occupant_message(span_notice("Locked on [target].")) send_byjax(chassis.occupant,"exosuit.browser","[REF(src)]",src.get_equip_info()) else if(target!=locked) if(locked in view(chassis)) @@ -106,7 +106,7 @@ return TRUE else locked = null - occupant_message("Lock on [locked] disengaged.") + occupant_message(span_notice("Lock on [locked] disengaged.")) send_byjax(chassis.occupant,"exosuit.browser","[REF(src)]",src.get_equip_info()) if(2) var/list/atoms = list() @@ -336,7 +336,7 @@ if(isnull(cur_charge) || !chassis.cell) STOP_PROCESSING(SSobj, src) set_ready_state(1) - occupant_message("No powercell detected.") + occupant_message(span_notice("No powercell detected.")) return if(cur_charge < chassis.cell.maxcharge) var/area/A = get_area(chassis) @@ -414,13 +414,13 @@ var/units = min(max(round(to_load / P.mats_per_stack),1),P.amount) fuel.amount += units P.use(units) - occupant_message("[units] unit\s of [fuel] successfully loaded.") + occupant_message(span_notice("[units] unit\s of [fuel] successfully loaded.")) return units else - occupant_message("Unit is full.") + occupant_message(span_notice("Unit is full.")) return 0 else - occupant_message("[fuel] traces in target minimal! [P] cannot be used as fuel.") + occupant_message(span_warning("[fuel] traces in target minimal! [P] cannot be used as fuel.")) return /obj/item/mecha_parts/mecha_equipment/generator/attackby(weapon,mob/user, params) @@ -439,7 +439,7 @@ var/cur_charge = chassis.get_charge() if(isnull(cur_charge)) set_ready_state(1) - occupant_message("No powercell detected.") + occupant_message(span_notice("No powercell detected.")) log_message("Deactivated.", LOG_MECHA) STOP_PROCESSING(SSobj, src) return @@ -482,7 +482,7 @@ /obj/item/mecha_parts/mecha_equipment/thrusters/try_attach_part(mob/user, obj/mecha/M) for(var/obj/item/I in M.equipment) if(istype(I, src)) - to_chat(user, "[M] already has this thruster package!") + to_chat(user, span_warning("[M] already has this thruster package!")) return FALSE . = ..() @@ -517,13 +517,13 @@ if (chassis.active_thrusters == src) return chassis.active_thrusters = src - occupant_message("[src] enabled.") + occupant_message(span_notice("[src] enabled.")) /obj/item/mecha_parts/mecha_equipment/thrusters/proc/disable() if(chassis.active_thrusters != src) return chassis.active_thrusters = null - occupant_message("[src] disabled.") + occupant_message(span_notice("[src] disabled.")) /obj/item/mecha_parts/mecha_equipment/thrusters/get_equip_info() return "[..()] \[Enable|Disable\]" @@ -549,7 +549,7 @@ /obj/item/mecha_parts/mecha_equipment/thrusters/gas/try_attach_part(mob/user, obj/mecha/M) if(!M.internal_tank) - to_chat(user, "[M] does not have an internal tank and cannot support this upgrade!") + to_chat(user, span_warning("[M] does not have an internal tank and cannot support this upgrade!")) return FALSE . = ..() diff --git a/code/game/mecha/equipment/tools/weapon_bay.dm b/code/game/mecha/equipment/tools/weapon_bay.dm index 8f2d4634c..0fbb9877f 100644 --- a/code/game/mecha/equipment/tools/weapon_bay.dm +++ b/code/game/mecha/equipment/tools/weapon_bay.dm @@ -6,9 +6,9 @@ /obj/item/mecha_parts/concealed_weapon_bay/try_attach_part(mob/user, obj/mecha/M) if(istype(M, /obj/mecha/combat)) - to_chat(user, "[M] can already hold weapons!") + to_chat(user, span_warning("[M] can already hold weapons!")) return if(locate(/obj/item/mecha_parts/concealed_weapon_bay) in M.contents) - to_chat(user, "[M] already has a concealed weapon bay!") + to_chat(user, span_warning("[M] already has a concealed weapon bay!")) return ..() diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm index fc1c81e2c..85116d61a 100644 --- a/code/game/mecha/equipment/tools/work_tools.dm +++ b/code/game/mecha/equipment/tools/work_tools.dm @@ -59,20 +59,20 @@ return if(!O.anchored) if(cargo_holder.cargo.len < cargo_holder.cargo_capacity) - chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.") + chassis.visible_message(span_notice("[chassis] lifts [target] and starts to load it into cargo compartment.")) O.anchored = TRUE if(do_after_cooldown(target)) cargo_holder.cargo += O O.forceMove(chassis) O.anchored = FALSE - occupant_message("[target] successfully loaded.") + occupant_message(span_notice("[target] successfully loaded.")) log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]", LOG_MECHA) else O.anchored = initial(O.anchored) else - occupant_message("Not enough room in cargo compartment!") + occupant_message(span_warning("Not enough room in cargo compartment!")) else - occupant_message("[target] is firmly secured!") + occupant_message(span_warning("[target] is firmly secured!")) else if(isliving(target)) var/mob/living/M = target @@ -84,14 +84,14 @@ return M.adjustOxyLoss(round(dam_force/2)) M.updatehealth() - target.visible_message("[chassis] squeezes [target]!", \ - "[chassis] squeezes you!",\ - "I hear something crack.") + target.visible_message(span_danger("[chassis] squeezes [target]!"), \ + span_danger("[chassis] squeezes you!"),\ + span_hear("I hear something crack.")) log_combat(chassis.occupant, M, "attacked", "[name]", "(INTENT: [uppertext(chassis.occupant.used_intent)]) (DAMTYPE: [uppertext(damtype)])") else step_away(M,chassis) - occupant_message("I push [target] out of the way.") - chassis.visible_message("[chassis] pushes [target] out of the way.") + occupant_message(span_notice("I push [target] out of the way.")) + chassis.visible_message(span_notice("[chassis] pushes [target] out of the way.")) return 1 @@ -119,20 +119,20 @@ var/obj/O = target if(!O.anchored) if(cargo_holder.cargo.len < cargo_holder.cargo_capacity) - chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.") + chassis.visible_message(span_notice("[chassis] lifts [target] and starts to load it into cargo compartment.")) O.anchored = TRUE if(do_after_cooldown(target)) cargo_holder.cargo += O O.forceMove(chassis) O.anchored = FALSE - occupant_message("[target] successfully loaded.") + occupant_message(span_notice("[target] successfully loaded.")) log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]", LOG_MECHA) else O.anchored = initial(O.anchored) else - occupant_message("Not enough room in cargo compartment!") + occupant_message(span_warning("Not enough room in cargo compartment!")) else - occupant_message("[target] is firmly secured!") + occupant_message(span_warning("[target] is firmly secured!")) else if(isliving(target)) var/mob/living/M = target @@ -145,12 +145,12 @@ return M.adjustOxyLoss(round(dam_force/2)) M.updatehealth() - target.visible_message("[chassis] destroys [target] in an unholy fury!", \ - "[chassis] destroys you in an unholy fury!") + target.visible_message(span_danger("[chassis] destroys [target] in an unholy fury!"), \ + span_danger("[chassis] destroys you in an unholy fury!")) log_combat(chassis.occupant, M, "attacked", "[name]", "(INTENT: [uppertext(chassis.occupant.used_intent)]) (DAMTYPE: [uppertext(damtype)])") else - target.visible_message("[chassis] destroys [target] in an unholy fury!", \ - "[chassis] destroys you in an unholy fury!") + target.visible_message(span_danger("[chassis] destroys [target] in an unholy fury!"), \ + span_danger("[chassis] destroys you in an unholy fury!")) else if(chassis.occupant.used_intent.type == INTENT_DISARM) if(real_clamp) var/mob/living/carbon/C = target @@ -168,16 +168,16 @@ limbs_gone = "[limbs_gone], [affected]" if(play_sound) playsound(src, get_dismember_sound(), 80, TRUE) - target.visible_message("[chassis] rips [target]'s arms off!", \ - "[chassis] rips your arms off!") + target.visible_message(span_danger("[chassis] rips [target]'s arms off!"), \ + span_danger("[chassis] rips your arms off!")) log_combat(chassis.occupant, M, "dismembered of[limbs_gone],", "[name]", "(INTENT: [uppertext(chassis.occupant.used_intent)]) (DAMTYPE: [uppertext(damtype)])") else - target.visible_message("[chassis] rips [target]'s arms off!", \ - "[chassis] rips your arms off!") + target.visible_message(span_danger("[chassis] rips [target]'s arms off!"), \ + span_danger("[chassis] rips your arms off!")) else step_away(M,chassis) - target.visible_message("[chassis] tosses [target] like a piece of paper!", \ - "[chassis] tosses you like a piece of paper!") + target.visible_message(span_danger("[chassis] tosses [target] like a piece of paper!"), \ + span_danger("[chassis] tosses you like a piece of paper!")) return 1 @@ -202,7 +202,7 @@ if(istype(target, /obj/structure/reagent_dispensers/watertank) && get_dist(chassis,target) <= 1) var/obj/structure/reagent_dispensers/watertank/WT = target WT.reagents.trans_to(src, 1000) - occupant_message("Extinguisher refilled.") + occupant_message(span_notice("Extinguisher refilled.")) playsound(chassis, 'sound/blank.ogg', 50, TRUE, -6) else if(reagents.total_volume > 0) @@ -281,20 +281,20 @@ if(0) if(iswallturf(target)) var/turf/closed/wall/W = target - occupant_message("Deconstructing [W]...") + occupant_message(span_notice("Deconstructing [W]...")) if(do_after_cooldown(W)) chassis.spark_system.start() W.ScrapeAway(flags = CHANGETURF_INHERIT_AIR) playsound(W, 'sound/blank.ogg', 50, TRUE) else if(isfloorturf(target)) var/turf/open/floor/F = target - occupant_message("Deconstructing [F]...") + occupant_message(span_notice("Deconstructing [F]...")) if(do_after_cooldown(target)) chassis.spark_system.start() F.ScrapeAway(flags = CHANGETURF_INHERIT_AIR) playsound(F, 'sound/blank.ogg', 50, TRUE) else if (istype(target, /obj/machinery/door/airlock)) - occupant_message("Deconstructing [target]...") + occupant_message(span_notice("Deconstructing [target]...")) if(do_after_cooldown(target)) chassis.spark_system.start() qdel(target) @@ -302,21 +302,21 @@ if(1) if(isspaceturf(target)) var/turf/open/space/S = target - occupant_message("Building Floor...") + occupant_message(span_notice("Building Floor...")) if(do_after_cooldown(S)) S.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) playsound(S, 'sound/blank.ogg', 50, TRUE) chassis.spark_system.start() else if(isfloorturf(target)) var/turf/open/floor/F = target - occupant_message("Building Wall...") + occupant_message(span_notice("Building Wall...")) if(do_after_cooldown(F)) F.PlaceOnTop(/turf/closed/wall) playsound(F, 'sound/blank.ogg', 50, TRUE) chassis.spark_system.start() if(2) if(isfloorturf(target)) - occupant_message("Building Airlock...") + occupant_message(span_notice("Building Airlock...")) if(do_after_cooldown(target)) chassis.spark_system.start() var/obj/machinery/door/airlock/T = new /obj/machinery/door/airlock(target) @@ -335,13 +335,13 @@ mode = text2num(href_list["mode"]) switch(mode) if(0) - occupant_message("Switched RCD to Deconstruct.") + occupant_message(span_notice("Switched RCD to Deconstruct.")) energy_drain = initial(energy_drain) if(1) - occupant_message("Switched RCD to Construct.") + occupant_message(span_notice("Switched RCD to Construct.")) energy_drain = 2*initial(energy_drain) if(2) - occupant_message("Switched RCD to Construct Airlock.") + occupant_message(span_notice("Switched RCD to Construct Airlock.")) energy_drain = 2*initial(energy_drain) return @@ -356,19 +356,19 @@ /obj/item/mecha_parts/mecha_equipment/ripleyupgrade/can_attach(obj/mecha/working/ripley/M) if(M.type != /obj/mecha/working/ripley) - to_chat(loc, "This conversion kit can only be applied to APLU MK-I models.") + to_chat(loc, span_warning("This conversion kit can only be applied to APLU MK-I models.")) return FALSE if(M.cargo.len) - to_chat(loc, "[M]'s cargo hold must be empty before this conversion kit can be applied.") + to_chat(loc, span_warning("[M]'s cargo hold must be empty before this conversion kit can be applied.")) return FALSE if(!M.maint_access) //non-removable upgrade, so lets make sure the pilot or owner has their say. - to_chat(loc, "[M] must have maintenance protocols active in order to allow this conversion kit.") + to_chat(loc, span_warning("[M] must have maintenance protocols active in order to allow this conversion kit.")) return FALSE if(M.occupant) //We're actualy making a new mech and swapping things over, it might get weird if players are involved - to_chat(loc, "[M] must be unoccupied before this conversion kit can be applied.") + to_chat(loc, span_warning("[M] must be unoccupied before this conversion kit can be applied.")) return FALSE if(!M.cell) //Turns out things break if the cell is missing - to_chat(loc, "The conversion process requires a cell installed.") + to_chat(loc, span_warning("The conversion process requires a cell installed.")) return FALSE return TRUE diff --git a/code/game/mecha/equipment/weapons/mecha_ammo.dm b/code/game/mecha/equipment/weapons/mecha_ammo.dm index c773eb2f9..e841df446 100644 --- a/code/game/mecha/equipment/weapons/mecha_ammo.dm +++ b/code/game/mecha/equipment/weapons/mecha_ammo.dm @@ -21,10 +21,10 @@ /obj/item/mecha_ammo/attack_self(mob/user) ..() if(rounds) - to_chat(user, "I cannot flatten the ammo box until it's empty!") + to_chat(user, span_warning("I cannot flatten the ammo box until it's empty!")) return - to_chat(user, "I fold [src] flat.") + to_chat(user, span_notice("I fold [src] flat.")) var/I = new /obj/item/stack/sheet/metal(user.loc) qdel(src) user.put_in_hands(I) diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 7aaebaef2..38c8cedab 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -47,7 +47,7 @@ /obj/machinery/mech_bay_recharge_port/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Base recharge rate at [max_charge]J per cycle." + . += span_notice("The status display reads: Base recharge rate at [max_charge]J per cycle.") /obj/machinery/mech_bay_recharge_port/process() if(stat & NOPOWER || !recharge_console) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 6d478567d..76beae0a2 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -438,10 +438,10 @@ /obj/machinery/mecha_part_fabricator/proc/is_insertion_ready(mob/user) if(panel_open) - to_chat(user, "I can't load [src] while it's opened!") + to_chat(user, span_warning("I can't load [src] while it's opened!")) return FALSE if(being_built) - to_chat(user, "\The [src] is currently processing! Please wait until completion.") + to_chat(user, span_warning("\The [src] is currently processing! Please wait until completion.")) return FALSE return TRUE diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index c7f14f97d..73e3714c9 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -314,7 +314,7 @@ var/mob/living/carbon/human/H = user for(var/O in H.held_items) if(istype(O, /obj/item/gun)) - . += "It looks like you can hit the pilot directly if you target the center or above." + . += span_warning("It looks like you can hit the pilot directly if you target the center or above.") break //in case user is holding two guns //processing internal damage, temperature, air regulation, alert updates, lights power use. @@ -431,7 +431,7 @@ use_power(lights_energy_drain) if(!enclosed && occupant?.incapacitated()) //no sides mean it's easy to just sorta fall out if you're incapacitated. - visible_message("[occupant] tumbles out of the cockpit!") + visible_message(span_warning("[occupant] tumbles out of the cockpit!")) go_out() //Maybe we should install seat belts? //Diagnostic HUD updates @@ -476,12 +476,12 @@ if(is_currently_ejecting) return if(phasing) - occupant_message("Unable to interact with objects while phasing.") + occupant_message(span_warning("Unable to interact with objects while phasing.")) return if(user.incapacitated()) return if(construction_state) - occupant_message("Maintenance protocols in effect.") + occupant_message(span_warning("Maintenance protocols in effect.")) return if(!get_charge()) return @@ -499,13 +499,13 @@ if(!Adjacent(target)) if(selected && selected.is_ranged()) if(HAS_TRAIT(L, TRAIT_PACIFISM) && selected.harmful) - to_chat(user, "I don't want to harm other living beings!") + to_chat(user, span_warning("I don't want to harm other living beings!")) return if(selected.action(target,params)) selected.start_cooldown() else if(selected && selected.is_melee()) if(isliving(target) && selected.harmful && HAS_TRAIT(L, TRAIT_PACIFISM)) - to_chat(user, "I don't want to harm other living beings!") + to_chat(user, span_warning("I don't want to harm other living beings!")) return if(selected.action(target,params)) selected.start_cooldown() @@ -535,7 +535,7 @@ /obj/mecha/Move(atom/newloc, direct) . = ..() if (internal_tank?.disconnect()) // Something moved us and broke connection - occupant_message("Air port connection has been severed!") + occupant_message(span_warning("Air port connection has been severed!")) log_message("Lost connection to gas port.", LOG_MECHA) /obj/mecha/Process_Spacemove(movement_dir = 0) @@ -549,7 +549,7 @@ if(backup.newtonian_move(turn(movement_dir, 180))) step_silent = TRUE if(occupant) - to_chat(occupant, "I push off [backup] to propel myself.") + to_chat(occupant, span_info("I push off [backup] to propel myself.")) return TRUE if(can_move <= world.time && active_thrusters && movement_dir && active_thrusters.thrust(movement_dir)) @@ -565,16 +565,16 @@ return if(user != occupant) //While not "realistic", this piece is player friendly. user.forceMove(get_turf(src)) - to_chat(user, "I climb out from [src].") + to_chat(user, span_notice("I climb out from [src].")) return 0 if(internal_tank?.connected_port) if(world.time - last_message > 20) - occupant_message("Unable to move while connected to the air system port!") + occupant_message(span_warning("Unable to move while connected to the air system port!")) last_message = world.time return 0 if(construction_state) if(world.time - last_message > 20) - occupant_message("Maintenance protocols in effect.") + occupant_message(span_danger("Maintenance protocols in effect.")) last_message = world.time return return domove(direction) @@ -588,17 +588,17 @@ return 0 if(zoom_mode) if(world.time - last_message > 20) - occupant_message("Unable to move while in zoom mode!") + occupant_message(span_warning("Unable to move while in zoom mode!")) last_message = world.time return 0 if(!cell) if(world.time - last_message > 20) - occupant_message("Missing power cell.") + occupant_message(span_warning("Missing power cell.")) last_message = world.time return 0 if(!scanmod || !capacitor) if(world.time - last_message > 20) - occupant_message("Missing [scanmod? "capacitor" : "scanning module"].") + occupant_message(span_warning("Missing [scanmod? "capacitor" : "scanning module"].")) last_message = world.time return 0 @@ -704,11 +704,11 @@ if(internal_damage & int_dam_flag) switch(int_dam_flag) if(MECHA_INT_TEMP_CONTROL) - occupant_message("Life support system reactivated.") + occupant_message(span_boldnotice("Life support system reactivated.")) if(MECHA_INT_FIRE) - occupant_message("Internal fire extinquished.") + occupant_message(span_boldnotice("Internal fire extinquished.")) if(MECHA_INT_TANK_BREACH) - occupant_message("Damaged internal tank has been sealed.") + occupant_message(span_boldnotice("Damaged internal tank has been sealed.")) internal_damage &= ~int_dam_flag diag_hud_set_mechstat() @@ -723,7 +723,7 @@ if(user.can_dominate_mechs) examine(user) //Get diagnostic information! for(var/obj/item/mecha_parts/mecha_tracking/B in trackers) - to_chat(user, "Warning: Tracking Beacon detected. Enter at your own risk. Beacon Data:") + to_chat(user, span_danger("Warning: Tracking Beacon detected. Enter at your own risk. Beacon Data:")) to_chat(user, "[B.get_mecha_info()]") break //Nothing like a big, red link to make the player feel powerful! @@ -731,7 +731,7 @@ else examine(user) if(occupant) - to_chat(user, "This exosuit has a pilot and cannot be controlled.") + to_chat(user, span_warning("This exosuit has a pilot and cannot be controlled.")) return var/can_control_mech = 0 for(var/obj/item/mecha_parts/mecha_tracking/ai_control/A in trackers) @@ -739,7 +739,7 @@ to_chat(user, "[icon2html(src, user)] Status of [name]:\n[A.get_mecha_info()]") break if(!can_control_mech) - to_chat(user, "I cannot control exosuits without AI control beacons installed.") + to_chat(user, span_warning("I cannot control exosuits without AI control beacons installed.")) return to_chat(user, "Take control of exosuit?
") @@ -751,11 +751,11 @@ switch(interaction) if(AI_TRANS_TO_CARD) //Upload AI from mech to AI card. if(!construction_state) //Mech must be in maint mode to allow carding. - to_chat(user, "[name] must have maintenance protocols active in order to allow a transfer.") + to_chat(user, span_warning("[name] must have maintenance protocols active in order to allow a transfer.")) return AI = occupant if(!AI || !isAI(occupant)) //Mech does not have an AI for a pilot - to_chat(user, "No AI detected in the [name] onboard computer.") + to_chat(user, span_warning("No AI detected in the [name] onboard computer.")) return AI.ai_restore_power()//So the AI initially has power. AI.control_disabled = TRUE @@ -769,30 +769,30 @@ AI.controlled_mech = null AI.remote_control = null icon_state = initial(icon_state)+"-open" - to_chat(AI, "I have been downloaded to a mobile storage device. Wireless connection offline.") + to_chat(AI, span_notice("I have been downloaded to a mobile storage device. Wireless connection offline.")) to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) removed from [name] and stored within local memory.") if(AI_MECH_HACK) //Called by AIs on the mech AI.linked_core = new /obj/structure/AIcore/deactivated(AI.loc) if(AI.can_dominate_mechs) if(occupant) //Oh, I am sorry, were you using that? - to_chat(AI, "Pilot detected! Forced ejection initiated!") - to_chat(occupant, "I have been forcibly ejected!") + to_chat(AI, span_warning("Pilot detected! Forced ejection initiated!")) + to_chat(occupant, span_danger("I have been forcibly ejected!")) go_out(1) //IT IS MINE, NOW. SUCK IT, RD! ai_enter_mech(AI, interaction) if(AI_TRANS_FROM_CARD) //Using an AI card to upload to a mech. AI = card.AI if(!AI) - to_chat(user, "There is no AI currently installed on this device.") + to_chat(user, span_warning("There is no AI currently installed on this device.")) return if(AI.deployed_shell) //Recall AI if shelled so it can be checked for a client AI.disconnect_shell() if(AI.stat || !AI.client) - to_chat(user, "[AI.name] is currently unresponsive, and cannot be uploaded.") + to_chat(user, span_warning("[AI.name] is currently unresponsive, and cannot be uploaded.")) return if(occupant || dna_lock) //Normal AIs cannot steal mechs! - to_chat(user, "Access denied. [name] is [occupant ? "currently occupied" : "secured with a DNA lock"].") + to_chat(user, span_warning("Access denied. [name] is [occupant ? "currently occupied" : "secured with a DNA lock"].")) return AI.control_disabled = FALSE AI.radio_enabled = TRUE @@ -816,9 +816,9 @@ AI.remote_control = src AI.mobility_flags = ALL //Much easier than adding AI checks! Be sure to set this back to 0 if you decide to allow an AI to leave a mech somehow. AI.can_shunt = 0 //ONE AI ENTERS. NO AI LEAVES. - to_chat(AI, AI.can_dominate_mechs ? "Takeover of [name] complete! You are now loaded onto the onboard computer. Do not attempt to leave the station sector!" :\ - "I have been uploaded to a mech's onboard computer.") - to_chat(AI, "Use Middle-Mouse to activate mech functions and equipment. Click normally for AI interactions.") + to_chat(AI, AI.can_dominate_mechs ? span_announce("Takeover of [name] complete! You are now loaded onto the onboard computer. Do not attempt to leave the station sector!") :\ + span_notice("I have been uploaded to a mech's onboard computer.")) + to_chat(AI, span_reallybigboldnotice("Use Middle-Mouse to activate mech functions and equipment. Click normally for AI interactions.")) if(interaction == AI_TRANS_FROM_CARD) GrantActions(AI, FALSE) //No eject/return to core action for AI uploaded by card else @@ -882,7 +882,7 @@ return log_message("[user] tries to move in.", LOG_MECHA) if (occupant) - to_chat(usr, "The [name] is already occupied!") + to_chat(usr, span_warning("The [name] is already occupied!")) log_message("Permission denied (Occupied).", LOG_MECHA) return if(dna_lock) @@ -892,37 +892,37 @@ if(C.dna.unique_enzymes==dna_lock) passed = TRUE if (!passed) - to_chat(user, "Access denied. [name] is secured with a DNA lock.") + to_chat(user, span_warning("Access denied. [name] is secured with a DNA lock.")) log_message("Permission denied (DNA LOCK).", LOG_MECHA) return if(!operation_allowed(user)) - to_chat(user, "Access denied. Insufficient operation keycodes.") + to_chat(user, span_warning("Access denied. Insufficient operation keycodes.")) log_message("Permission denied (No keycode).", LOG_MECHA) return if(user.buckled) - to_chat(user, "I are currently buckled and cannot move.") + to_chat(user, span_warning("I are currently buckled and cannot move.")) log_message("Permission denied (Buckled).", LOG_MECHA) return if(user.has_buckled_mobs()) //mob attached to us - to_chat(user, "I can't enter the exosuit with other creatures attached to you!") + to_chat(user, span_warning("I can't enter the exosuit with other creatures attached to you!")) log_message("Permission denied (Attached mobs).", LOG_MECHA) return - visible_message("[user] starts to climb into [name].") + visible_message(span_notice("[user] starts to climb into [name].")) if(do_after(user, enter_delay, target = src)) if(obj_integrity <= 0) - to_chat(user, "I cannot get in the [name], it has been destroyed!") + to_chat(user, span_warning("I cannot get in the [name], it has been destroyed!")) else if(occupant) - to_chat(user, "[occupant] was faster! Try better next time, loser.") + to_chat(user, span_danger("[occupant] was faster! Try better next time, loser.")) else if(user.buckled) - to_chat(user, "I can't enter the exosuit while buckled.") + to_chat(user, span_warning("I can't enter the exosuit while buckled.")) else if(user.has_buckled_mobs()) - to_chat(user, "I can't enter the exosuit with other creatures attached to you!") + to_chat(user, span_warning("I can't enter the exosuit with other creatures attached to you!")) else moved_inside(user) else - to_chat(user, "I stop entering the exosuit!") + to_chat(user, span_warning("I stop entering the exosuit!")) return /obj/mecha/proc/moved_inside(mob/living/carbon/human/H) @@ -945,40 +945,40 @@ /obj/mecha/proc/mmi_move_inside(obj/item/mmi/mmi_as_oc, mob/user) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - to_chat(user, "Consciousness matrix not detected!") + to_chat(user, span_warning("Consciousness matrix not detected!")) return FALSE else if(mmi_as_oc.brainmob.stat) - to_chat(user, "Beta-rhythm below acceptable level!") + to_chat(user, span_warning("Beta-rhythm below acceptable level!")) return FALSE else if(occupant) - to_chat(user, "Occupant detected!") + to_chat(user, span_warning("Occupant detected!")) return FALSE else if(dna_lock && (!mmi_as_oc.brainmob.stored_dna || (dna_lock != mmi_as_oc.brainmob.stored_dna.unique_enzymes))) - to_chat(user, "Access denied. [name] is secured with a DNA lock.") + to_chat(user, span_warning("Access denied. [name] is secured with a DNA lock.")) return FALSE - visible_message("[user] starts to insert an MMI into [name].") + visible_message(span_notice("[user] starts to insert an MMI into [name].")) if(do_after(user, 40, target = src)) if(!occupant) return mmi_moved_inside(mmi_as_oc, user) else - to_chat(user, "Occupant detected!") + to_chat(user, span_warning("Occupant detected!")) else - to_chat(user, "I stop inserting the MMI.") + to_chat(user, span_notice("I stop inserting the MMI.")) return FALSE /obj/mecha/proc/mmi_moved_inside(obj/item/mmi/mmi_as_oc, mob/user) if(!(Adjacent(mmi_as_oc) && Adjacent(user))) return FALSE if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - to_chat(user, "Consciousness matrix not detected!") + to_chat(user, span_notice("Consciousness matrix not detected!")) return FALSE else if(mmi_as_oc.brainmob.stat) - to_chat(user, "Beta-rhythm below acceptable level!") + to_chat(user, span_warning("Beta-rhythm below acceptable level!")) return FALSE if(!user.transferItemToLoc(mmi_as_oc, src)) - to_chat(user, "\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]!") + to_chat(user, span_warning("\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]!")) return FALSE var/mob/living/brainmob = mmi_as_oc.brainmob mmi_as_oc.mecha = src @@ -1001,12 +1001,12 @@ /obj/mecha/container_resist(mob/living/user) is_currently_ejecting = TRUE - to_chat(occupant, "I begin the ejection procedure. Equipment is disabled during this process. Hold still to finish ejecting.") + to_chat(occupant, span_notice("I begin the ejection procedure. Equipment is disabled during this process. Hold still to finish ejecting.")) if(do_after(occupant, has_gravity() ? exit_delay : 0 , target = src)) - to_chat(occupant, "I exit the mech.") + to_chat(occupant, span_notice("I exit the mech.")) go_out() else - to_chat(occupant, "I stop exiting the mech. Weapons are enabled again.") + to_chat(occupant, span_notice("I stop exiting the mech. Weapons are enabled again.")) is_currently_ejecting = FALSE /obj/mecha/Exited(atom/movable/M, atom/newloc) @@ -1049,10 +1049,10 @@ return else if(!AI.linked_core) - to_chat(AI, "Inactive core destroyed. Unable to return.") + to_chat(AI, span_danger("Inactive core destroyed. Unable to return.")) AI.linked_core = null return - to_chat(AI, "Returning to core...") + to_chat(AI, span_notice("Returning to core...")) AI.controlled_mech = null AI.remote_control = null RemoveActions(occupant, 1) @@ -1151,7 +1151,7 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013??? /obj/mecha/proc/ammo_resupply(obj/item/mecha_ammo/A, mob/user,fail_chat_override = FALSE) if(!A.rounds) if(!fail_chat_override) - to_chat(user, "This box of ammo is empty!") + to_chat(user, span_warning("This box of ammo is empty!")) return FALSE var/ammo_needed var/found_gun @@ -1172,7 +1172,7 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013??? else gun.projectiles_cache = gun.projectiles_cache + ammo_needed playsound(get_turf(user),A.load_audio,50,TRUE) - to_chat(user, "I add [ammo_needed] [A.round_term][ammo_needed > 1?"s":""] to the [gun.name]") + to_chat(user, span_notice("I add [ammo_needed] [A.round_term][ammo_needed > 1?"s":""] to the [gun.name]")) A.rounds = A.rounds - ammo_needed A.update_name() return TRUE @@ -1183,13 +1183,13 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013??? else gun.projectiles_cache = gun.projectiles_cache + A.rounds playsound(get_turf(user),A.load_audio,50,TRUE) - to_chat(user, "I add [A.rounds] [A.round_term][A.rounds > 1?"s":""] to the [gun.name]") + to_chat(user, span_notice("I add [A.rounds] [A.round_term][A.rounds > 1?"s":""] to the [gun.name]")) A.rounds = 0 A.update_name() return TRUE if(!fail_chat_override) if(found_gun) - to_chat(user, "I can't fit any more ammo of this type!") + to_chat(user, span_notice("I can't fit any more ammo of this type!")) else - to_chat(user, "None of the equipment on this exosuit can use this ammo!") + to_chat(user, span_notice("None of the equipment on this exosuit can use this ammo!")) return FALSE diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm index d2f2d7d0a..24fa44bb1 100644 --- a/code/game/mecha/mecha_actions.dm +++ b/code/game/mecha/mecha_actions.dm @@ -55,7 +55,7 @@ return chassis.use_internal_tank = !chassis.use_internal_tank button_icon_state = "mech_internals_[chassis.use_internal_tank ? "on" : "off"]" - chassis.occupant_message("Now taking air from [chassis.use_internal_tank?"internal airtank":"environment"].") + chassis.occupant_message(span_notice("Now taking air from [chassis.use_internal_tank?"internal airtank":"environment"].")) chassis.log_message("Now taking air from [chassis.use_internal_tank?"internal airtank":"environment"].", LOG_MECHA) UpdateButtonIcon() @@ -73,11 +73,11 @@ available_equipment += M if(available_equipment.len == 0) - chassis.occupant_message("No equipment available!") + chassis.occupant_message(span_warning("No equipment available!")) return if(!chassis.selected) chassis.selected = available_equipment[1] - chassis.occupant_message("I select [chassis.selected].") + chassis.occupant_message(span_notice("I select [chassis.selected].")) send_byjax(chassis.occupant,"exosuit.browser","eq_list",chassis.get_equipment_list()) button_icon_state = "mech_cycle_equip_on" UpdateButtonIcon() @@ -88,11 +88,11 @@ if(A == chassis.selected) if(available_equipment.len == number) chassis.selected = null - chassis.occupant_message("I switch to no equipment.") + chassis.occupant_message(span_notice("I switch to no equipment.")) button_icon_state = "mech_cycle_equip_off" else chassis.selected = available_equipment[number+1] - chassis.occupant_message("I switch to [chassis.selected].") + chassis.occupant_message(span_notice("I switch to [chassis.selected].")) button_icon_state = "mech_cycle_equip_on" send_byjax(chassis.occupant,"exosuit.browser","eq_list",chassis.get_equipment_list()) UpdateButtonIcon() @@ -113,7 +113,7 @@ else chassis.set_light(-chassis.lights_power) button_icon_state = "mech_lights_off" - chassis.occupant_message("Toggled lights [chassis.lights?"on":"off"].") + chassis.occupant_message(span_notice("Toggled lights [chassis.lights?"on":"off"].")) chassis.log_message("Toggled lights [chassis.lights?"on":"off"].", LOG_MECHA) UpdateButtonIcon() @@ -144,7 +144,7 @@ /obj/mecha/proc/toggle_strafe() strafe = !strafe - occupant_message("Toggled strafing mode [strafe?"on":"off"].") + occupant_message(span_notice("Toggled strafing mode [strafe?"on":"off"].")) log_message("Toggled strafing mode [strafe?"on":"off"].", LOG_MECHA) strafing_action.UpdateButtonIcon() @@ -176,12 +176,12 @@ chassis.leg_overload_mode = 1 chassis.step_in = min(1, round(chassis.step_in/2)) chassis.step_energy_drain = max(chassis.overload_step_energy_drain_min,chassis.step_energy_drain*chassis.leg_overload_coeff) - chassis.occupant_message("I enable leg actuators overload.") + chassis.occupant_message(span_danger("I enable leg actuators overload.")) else chassis.leg_overload_mode = 0 chassis.step_in = initial(chassis.step_in) chassis.step_energy_drain = chassis.normal_step_energy_drain - chassis.occupant_message("I disable leg actuators overload.") + chassis.occupant_message(span_notice("I disable leg actuators overload.")) UpdateButtonIcon() /datum/action/innate/mecha/mech_smoke @@ -228,13 +228,13 @@ switch(chassis.damtype) if("tox") new_damtype = "brute" - chassis.occupant_message("My exosuit's hands form into fists.") + chassis.occupant_message(span_notice("My exosuit's hands form into fists.")) if("brute") new_damtype = "fire" - chassis.occupant_message("A torch tip extends from my exosuit's hand, glowing red.") + chassis.occupant_message(span_notice("A torch tip extends from my exosuit's hand, glowing red.")) if("fire") new_damtype = "tox" - chassis.occupant_message("A bone-chillingly thick plasteel needle protracts from the exosuit's palm.") + chassis.occupant_message(span_notice("A bone-chillingly thick plasteel needle protracts from the exosuit's palm.")) chassis.damtype = new_damtype button_icon_state = "mech_damtype_[new_damtype]" playsound(src, 'sound/blank.ogg', 50, TRUE) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 8c68c332d..893743f65 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -32,7 +32,7 @@ . = user.transferItemToLoc(I, parent) if(.) var/atom/parent_atom = parent - user.visible_message("[user] has connected [I] to [parent].", "I connect [I] to [parent].") + user.visible_message(span_notice("[user] has connected [I] to [parent]."), span_notice("I connect [I] to [parent].")) parent_atom.add_overlay(I.icon_state+"+o") qdel(I) @@ -205,102 +205,102 @@ switch(index) if(1) - user.visible_message("[user] connects [parent] hydraulic systems.", "I connect [parent] hydraulic systems.") + user.visible_message(span_notice("[user] connects [parent] hydraulic systems."), span_notice("I connect [parent] hydraulic systems.")) if(2) if(diff==FORWARD) - user.visible_message("[user] activates [parent] hydraulic systems.", "I activate [parent] hydraulic systems.") + user.visible_message(span_notice("[user] activates [parent] hydraulic systems."), span_notice("I activate [parent] hydraulic systems.")) else - user.visible_message("[user] disconnects [parent] hydraulic systems.", "I disconnect [parent] hydraulic systems.") + user.visible_message(span_notice("[user] disconnects [parent] hydraulic systems."), span_notice("I disconnect [parent] hydraulic systems.")) if(3) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to [parent].", "I add the wiring to [parent].") + user.visible_message(span_notice("[user] adds the wiring to [parent]."), span_notice("I add the wiring to [parent].")) else - user.visible_message("[user] deactivates [parent] hydraulic systems.", "I deactivate [parent] hydraulic systems.") + user.visible_message(span_notice("[user] deactivates [parent] hydraulic systems."), span_notice("I deactivate [parent] hydraulic systems.")) if(4) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of [parent].", "I adjust the wiring of [parent].") + user.visible_message(span_notice("[user] adjusts the wiring of [parent]."), span_notice("I adjust the wiring of [parent].")) else - user.visible_message("[user] removes the wiring from [parent].", "I remove the wiring from [parent].") + user.visible_message(span_notice("[user] removes the wiring from [parent]."), span_notice("I remove the wiring from [parent].")) if(5) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] disconnects the wiring of [parent].", "I disconnect the wiring of [parent].") + user.visible_message(span_notice("[user] disconnects the wiring of [parent]."), span_notice("I disconnect the wiring of [parent].")) if(6) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "I secure the mainboard.") + user.visible_message(span_notice("[user] secures the mainboard."), span_notice("I secure the mainboard.")) else - user.visible_message("[user] removes the central control module from [parent].", "I remove the central computer mainboard from [parent].") + user.visible_message(span_notice("[user] removes the central control module from [parent]."), span_notice("I remove the central computer mainboard from [parent].")) if(7) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the mainboard.", "I unfasten the mainboard.") + user.visible_message(span_notice("[user] unfastens the mainboard."), span_notice("I unfasten the mainboard.")) if(8) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "I secure the peripherals control module.") + user.visible_message(span_notice("[user] secures the peripherals control module."), span_notice("I secure the peripherals control module.")) else - user.visible_message("[user] removes the peripherals control module from [parent].", "I remove the peripherals control module from [parent].") + user.visible_message(span_notice("[user] removes the peripherals control module from [parent]."), span_notice("I remove the peripherals control module from [parent].")) if(9) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the peripherals control module.", "I unfasten the peripherals control module.") + user.visible_message(span_notice("[user] unfastens the peripherals control module."), span_notice("I unfasten the peripherals control module.")) if(10) if(diff==FORWARD) - user.visible_message("[user] secures the scanner module.", "I secure the scanner module.") + user.visible_message(span_notice("[user] secures the scanner module."), span_notice("I secure the scanner module.")) else - user.visible_message("[user] removes the scanner module from [parent].", "I remove the scanner module from [parent].") + user.visible_message(span_notice("[user] removes the scanner module from [parent]."), span_notice("I remove the scanner module from [parent].")) if(11) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "I install [I] to [parent].") + user.visible_message(span_notice("[user] installs [I] to [parent]."), span_notice("I install [I] to [parent].")) else - user.visible_message("[user] unfastens the scanner module.", "I unfasten the scanner module.") + user.visible_message(span_notice("[user] unfastens the scanner module."), span_notice("I unfasten the scanner module.")) if(12) if(diff==FORWARD) - user.visible_message("[user] secures [I].", "I secure [I].") + user.visible_message(span_notice("[user] secures [I]."), span_notice("I secure [I].")) else - user.visible_message("[user] removes the capacitor from [parent].", "I remove the capacitor from [parent].") + user.visible_message(span_notice("[user] removes the capacitor from [parent]."), span_notice("I remove the capacitor from [parent].")) if(13) if(diff==FORWARD) - user.visible_message("[user] installs [I].", "I install [I].") + user.visible_message(span_notice("[user] installs [I]."), span_notice("I install [I].")) else - user.visible_message("[user] unsecures the capacitor from [parent].", "I unsecure the capacitor from [parent].") + user.visible_message(span_notice("[user] unsecures the capacitor from [parent]."), span_notice("I unsecure the capacitor from [parent].")) if(14) if(diff==FORWARD) - user.visible_message("[user] secures the power cell.", "I secure the power cell.") + user.visible_message(span_notice("[user] secures the power cell."), span_notice("I secure the power cell.")) else - user.visible_message("[user] pries the power cell from [parent].", "I pry the power cell from [parent].") + user.visible_message(span_notice("[user] pries the power cell from [parent]."), span_notice("I pry the power cell from [parent].")) if(15) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to [parent].", "I install the internal armor layer to [parent].") + user.visible_message(span_notice("[user] installs the internal armor layer to [parent]."), span_notice("I install the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the power cell.", "I unfasten the power cell.") + user.visible_message(span_notice("[user] unfastens the power cell."), span_notice("I unfasten the power cell.")) if(16) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "I secure the internal armor layer.") + user.visible_message(span_notice("[user] secures the internal armor layer."), span_notice("I secure the internal armor layer.")) else - user.visible_message("[user] pries internal armor layer from [parent].", "I pry internal armor layer from [parent].") + user.visible_message(span_notice("[user] pries internal armor layer from [parent]."), span_notice("I pry internal armor layer from [parent].")) if(17) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to [parent].", "I weld the internal armor layer to [parent].") + user.visible_message(span_notice("[user] welds the internal armor layer to [parent]."), span_notice("I weld the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the internal armor layer.", "I unfasten the internal armor layer.") + user.visible_message(span_notice("[user] unfastens the internal armor layer."), span_notice("I unfasten the internal armor layer.")) if(18) if(diff==FORWARD) - user.visible_message("[user] installs the external reinforced armor layer to [parent].", "I install the external reinforced armor layer to [parent].") + user.visible_message(span_notice("[user] installs the external reinforced armor layer to [parent]."), span_notice("I install the external reinforced armor layer to [parent].")) else - user.visible_message("[user] cuts the internal armor layer from [parent].", "I cut the internal armor layer from [parent].") + user.visible_message(span_notice("[user] cuts the internal armor layer from [parent]."), span_notice("I cut the internal armor layer from [parent].")) if(19) if(diff==FORWARD) - user.visible_message("[user] secures the external armor layer.", "I secure the external reinforced armor layer.") + user.visible_message(span_notice("[user] secures the external armor layer."), span_notice("I secure the external reinforced armor layer.")) else - user.visible_message("[user] pries external armor layer from [parent].", "I pry external armor layer from [parent].") + user.visible_message(span_notice("[user] pries external armor layer from [parent]."), span_notice("I pry external armor layer from [parent].")) if(20) if(diff==FORWARD) - user.visible_message("[user] welds the external armor layer to [parent].", "I weld the external armor layer to [parent].") + user.visible_message(span_notice("[user] welds the external armor layer to [parent]."), span_notice("I weld the external armor layer to [parent].")) else - user.visible_message("[user] unfastens the external armor layer.", "I unfasten the external armor layer.") + user.visible_message(span_notice("[user] unfastens the external armor layer."), span_notice("I unfasten the external armor layer.")) return TRUE /datum/component/construction/unordered/mecha_chassis/gygax @@ -491,112 +491,112 @@ switch(index) if(1) - user.visible_message("[user] connects [parent] hydraulic systems.", "I connect [parent] hydraulic systems.") + user.visible_message(span_notice("[user] connects [parent] hydraulic systems."), span_notice("I connect [parent] hydraulic systems.")) if(2) if(diff==FORWARD) - user.visible_message("[user] activates [parent] hydraulic systems.", "I activate [parent] hydraulic systems.") + user.visible_message(span_notice("[user] activates [parent] hydraulic systems."), span_notice("I activate [parent] hydraulic systems.")) else - user.visible_message("[user] disconnects [parent] hydraulic systems.", "I disconnect [parent] hydraulic systems.") + user.visible_message(span_notice("[user] disconnects [parent] hydraulic systems."), span_notice("I disconnect [parent] hydraulic systems.")) if(3) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to [parent].", "I add the wiring to [parent].") + user.visible_message(span_notice("[user] adds the wiring to [parent]."), span_notice("I add the wiring to [parent].")) else - user.visible_message("[user] deactivates [parent] hydraulic systems.", "I deactivate [parent] hydraulic systems.") + user.visible_message(span_notice("[user] deactivates [parent] hydraulic systems."), span_notice("I deactivate [parent] hydraulic systems.")) if(4) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of [parent].", "I adjust the wiring of [parent].") + user.visible_message(span_notice("[user] adjusts the wiring of [parent]."), span_notice("I adjust the wiring of [parent].")) else - user.visible_message("[user] removes the wiring from [parent].", "I remove the wiring from [parent].") + user.visible_message(span_notice("[user] removes the wiring from [parent]."), span_notice("I remove the wiring from [parent].")) if(5) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] disconnects the wiring of [parent].", "I disconnect the wiring of [parent].") + user.visible_message(span_notice("[user] disconnects the wiring of [parent]."), span_notice("I disconnect the wiring of [parent].")) if(6) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "I secure the mainboard.") + user.visible_message(span_notice("[user] secures the mainboard."), span_notice("I secure the mainboard.")) else - user.visible_message("[user] removes the central control module from [parent].", "I remove the central computer mainboard from [parent].") + user.visible_message(span_notice("[user] removes the central control module from [parent]."), span_notice("I remove the central computer mainboard from [parent].")) if(7) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the mainboard.", "I unfasten the mainboard.") + user.visible_message(span_notice("[user] unfastens the mainboard."), span_notice("I unfasten the mainboard.")) if(8) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "I secure the peripherals control module.") + user.visible_message(span_notice("[user] secures the peripherals control module."), span_notice("I secure the peripherals control module.")) else - user.visible_message("[user] removes the peripherals control module from [parent].", "I remove the peripherals control module from [parent].") + user.visible_message(span_notice("[user] removes the peripherals control module from [parent]."), span_notice("I remove the peripherals control module from [parent].")) if(9) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the peripherals control module.", "I unfasten the peripherals control module.") + user.visible_message(span_notice("[user] unfastens the peripherals control module."), span_notice("I unfasten the peripherals control module.")) if(10) if(diff==FORWARD) - user.visible_message("[user] secures the weapon control module.", "I secure the weapon control module.") + user.visible_message(span_notice("[user] secures the weapon control module."), span_notice("I secure the weapon control module.")) else - user.visible_message("[user] removes the weapon control module from [parent].", "I remove the weapon control module from [parent].") + user.visible_message(span_notice("[user] removes the weapon control module from [parent]."), span_notice("I remove the weapon control module from [parent].")) if(11) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "I install [I] to [parent].") + user.visible_message(span_notice("[user] installs [I] to [parent]."), span_notice("I install [I] to [parent].")) else - user.visible_message("[user] unfastens the weapon control module.", "I unfasten the weapon control module.") + user.visible_message(span_notice("[user] unfastens the weapon control module."), span_notice("I unfasten the weapon control module.")) if(12) if(diff==FORWARD) - user.visible_message("[user] secures the scanner module.", "I secure the scanner module.") + user.visible_message(span_notice("[user] secures the scanner module."), span_notice("I secure the scanner module.")) else - user.visible_message("[user] removes the scanner module from [parent].", "I remove the scanner module from [parent].") + user.visible_message(span_notice("[user] removes the scanner module from [parent]."), span_notice("I remove the scanner module from [parent].")) if(13) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "I install [I] to [parent].") + user.visible_message(span_notice("[user] installs [I] to [parent]."), span_notice("I install [I] to [parent].")) else - user.visible_message("[user] unfastens the scanner module.", "I unfasten the scanner module.") + user.visible_message(span_notice("[user] unfastens the scanner module."), span_notice("I unfasten the scanner module.")) if(14) if(diff==FORWARD) - user.visible_message("[user] secures the capacitor.", "I secure the capacitor.") + user.visible_message(span_notice("[user] secures the capacitor."), span_notice("I secure the capacitor.")) else - user.visible_message("[user] removes the capacitor from [parent].", "I remove the capacitor from [parent].") + user.visible_message(span_notice("[user] removes the capacitor from [parent]."), span_notice("I remove the capacitor from [parent].")) if(15) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the capacitor.", "I unfasten the capacitor.") + user.visible_message(span_notice("[user] unfastens the capacitor."), span_notice("I unfasten the capacitor.")) if(16) if(diff==FORWARD) - user.visible_message("[user] secures the power cell.", "I secure the power cell.") + user.visible_message(span_notice("[user] secures the power cell."), span_notice("I secure the power cell.")) else - user.visible_message("[user] pries the power cell from [parent].", "I pry the power cell from [parent].") + user.visible_message(span_notice("[user] pries the power cell from [parent]."), span_notice("I pry the power cell from [parent].")) if(17) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to [parent].", "I install the internal armor layer to [parent].") + user.visible_message(span_notice("[user] installs the internal armor layer to [parent]."), span_notice("I install the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the power cell.", "I unfasten the power cell.") + user.visible_message(span_notice("[user] unfastens the power cell."), span_notice("I unfasten the power cell.")) if(18) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "I secure the internal armor layer.") + user.visible_message(span_notice("[user] secures the internal armor layer."), span_notice("I secure the internal armor layer.")) else - user.visible_message("[user] pries internal armor layer from [parent].", "I pry internal armor layer from [parent].") + user.visible_message(span_notice("[user] pries internal armor layer from [parent]."), span_notice("I pry internal armor layer from [parent].")) if(19) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to [parent].", "I weld the internal armor layer to [parent].") + user.visible_message(span_notice("[user] welds the internal armor layer to [parent]."), span_notice("I weld the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the internal armor layer.", "I unfasten the internal armor layer.") + user.visible_message(span_notice("[user] unfastens the internal armor layer."), span_notice("I unfasten the internal armor layer.")) if(20) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "I install [I] to [parent].") + user.visible_message(span_notice("[user] installs [I] to [parent]."), span_notice("I install [I] to [parent].")) else - user.visible_message("[user] cuts the internal armor layer from [parent].", "I cut the internal armor layer from [parent].") + user.visible_message(span_notice("[user] cuts the internal armor layer from [parent]."), span_notice("I cut the internal armor layer from [parent].")) if(21) if(diff==FORWARD) - user.visible_message("[user] secures Gygax Armor Plates.", "I secure Gygax Armor Plates.") + user.visible_message(span_notice("[user] secures Gygax Armor Plates."), span_notice("I secure Gygax Armor Plates.")) else - user.visible_message("[user] pries Gygax Armor Plates from [parent].", "I pry Gygax Armor Plates from [parent].") + user.visible_message(span_notice("[user] pries Gygax Armor Plates from [parent]."), span_notice("I pry Gygax Armor Plates from [parent].")) if(22) if(diff==FORWARD) - user.visible_message("[user] welds Gygax Armor Plates to [parent].", "I weld Gygax Armor Plates to [parent].") + user.visible_message(span_notice("[user] welds Gygax Armor Plates to [parent]."), span_notice("I weld Gygax Armor Plates to [parent].")) else - user.visible_message("[user] unfastens Gygax Armor Plates.", "I unfasten Gygax Armor Plates.") + user.visible_message(span_notice("[user] unfastens Gygax Armor Plates."), span_notice("I unfasten Gygax Armor Plates.")) return TRUE /datum/component/construction/unordered/mecha_chassis/firefighter @@ -776,107 +776,107 @@ //TODO: better messages. switch(index) if(1) - user.visible_message("[user] connects [parent] hydraulic systems.", "I connect [parent] hydraulic systems.") + user.visible_message(span_notice("[user] connects [parent] hydraulic systems."), span_notice("I connect [parent] hydraulic systems.")) if(2) if(diff==FORWARD) - user.visible_message("[user] activates [parent] hydraulic systems.", "I activate [parent] hydraulic systems.") + user.visible_message(span_notice("[user] activates [parent] hydraulic systems."), span_notice("I activate [parent] hydraulic systems.")) else - user.visible_message("[user] disconnects [parent] hydraulic systems.", "I disconnect [parent] hydraulic systems.") + user.visible_message(span_notice("[user] disconnects [parent] hydraulic systems."), span_notice("I disconnect [parent] hydraulic systems.")) if(3) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to [parent].", "I add the wiring to [parent].") + user.visible_message(span_notice("[user] adds the wiring to [parent]."), span_notice("I add the wiring to [parent].")) else - user.visible_message("[user] deactivates [parent] hydraulic systems.", "I deactivate [parent] hydraulic systems.") + user.visible_message(span_notice("[user] deactivates [parent] hydraulic systems."), span_notice("I deactivate [parent] hydraulic systems.")) if(4) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of [parent].", "I adjust the wiring of [parent].") + user.visible_message(span_notice("[user] adjusts the wiring of [parent]."), span_notice("I adjust the wiring of [parent].")) else - user.visible_message("[user] removes the wiring from [parent].", "I remove the wiring from [parent].") + user.visible_message(span_notice("[user] removes the wiring from [parent]."), span_notice("I remove the wiring from [parent].")) if(5) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] disconnects the wiring of [parent].", "I disconnect the wiring of [parent].") + user.visible_message(span_notice("[user] disconnects the wiring of [parent]."), span_notice("I disconnect the wiring of [parent].")) if(6) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "I secure the mainboard.") + user.visible_message(span_notice("[user] secures the mainboard."), span_notice("I secure the mainboard.")) else - user.visible_message("[user] removes the central control module from [parent].", "I remove the central computer mainboard from [parent].") + user.visible_message(span_notice("[user] removes the central control module from [parent]."), span_notice("I remove the central computer mainboard from [parent].")) if(7) if(diff==FORWARD) - user.visible_message("[user] installs [I]into [parent].", "I install [I]into [parent].") + user.visible_message(span_notice("[user] installs [I]into [parent]."), span_notice("I install [I]into [parent].")) else - user.visible_message("[user] unfastens the mainboard.", "I unfasten the mainboard.") + user.visible_message(span_notice("[user] unfastens the mainboard."), span_notice("I unfasten the mainboard.")) if(8) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "I secure the peripherals control module.") + user.visible_message(span_notice("[user] secures the peripherals control module."), span_notice("I secure the peripherals control module.")) else - user.visible_message("[user] removes the peripherals control module from [parent].", "I remove the peripherals control module from [parent].") + user.visible_message(span_notice("[user] removes the peripherals control module from [parent]."), span_notice("I remove the peripherals control module from [parent].")) if(9) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the peripherals control module.", "I unfasten the peripherals control module.") + user.visible_message(span_notice("[user] unfastens the peripherals control module."), span_notice("I unfasten the peripherals control module.")) if(10) if(diff==FORWARD) - user.visible_message("[user] secures the scanner module.", "I secure the scanner module.") + user.visible_message(span_notice("[user] secures the scanner module."), span_notice("I secure the scanner module.")) else - user.visible_message("[user] removes the scanner module from [parent].", "I remove the scanner module from [parent].") + user.visible_message(span_notice("[user] removes the scanner module from [parent]."), span_notice("I remove the scanner module from [parent].")) if(11) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "I install [I] to [parent].") + user.visible_message(span_notice("[user] installs [I] to [parent]."), span_notice("I install [I] to [parent].")) else - user.visible_message("[user] unfastens the scanner module.", "I unfasten the scanner module.") + user.visible_message(span_notice("[user] unfastens the scanner module."), span_notice("I unfasten the scanner module.")) if(12) if(diff==FORWARD) - user.visible_message("[user] secures the capacitor.", "I secure the capacitor.") + user.visible_message(span_notice("[user] secures the capacitor."), span_notice("I secure the capacitor.")) else - user.visible_message("[user] removes the capacitor from [parent].", "I remove the capacitor from [parent].") + user.visible_message(span_notice("[user] removes the capacitor from [parent]."), span_notice("I remove the capacitor from [parent].")) if(13) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the capacitor.", "I unfasten the capacitor.") + user.visible_message(span_notice("[user] unfastens the capacitor."), span_notice("I unfasten the capacitor.")) if(14) if(diff==FORWARD) - user.visible_message("[user] secures the power cell.", "I secure the power cell.") + user.visible_message(span_notice("[user] secures the power cell."), span_notice("I secure the power cell.")) else - user.visible_message("[user] pries the power cell from [parent].", "I pry the power cell from [parent].") + user.visible_message(span_notice("[user] pries the power cell from [parent]."), span_notice("I pry the power cell from [parent].")) if(15) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to [parent].", "I install the internal armor layer to [parent].") + user.visible_message(span_notice("[user] installs the internal armor layer to [parent]."), span_notice("I install the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the power cell.", "I unfasten the power cell.") + user.visible_message(span_notice("[user] unfastens the power cell."), span_notice("I unfasten the power cell.")) if(16) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "I secure the internal armor layer.") + user.visible_message(span_notice("[user] secures the internal armor layer."), span_notice("I secure the internal armor layer.")) else - user.visible_message("[user] pries internal armor layer from [parent].", "I pry internal armor layer from [parent].") + user.visible_message(span_notice("[user] pries internal armor layer from [parent]."), span_notice("I pry internal armor layer from [parent].")) if(17) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to [parent].", "I weld the internal armor layer to [parent].") + user.visible_message(span_notice("[user] welds the internal armor layer to [parent]."), span_notice("I weld the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the internal armor layer.", "I unfasten the internal armor layer.") + user.visible_message(span_notice("[user] unfastens the internal armor layer."), span_notice("I unfasten the internal armor layer.")) if(18) if(diff==FORWARD) - user.visible_message("[user] starts to install the external armor layer to [parent].", "I install the external armor layer to [parent].") + user.visible_message(span_notice("[user] starts to install the external armor layer to [parent]."), span_notice("I install the external armor layer to [parent].")) else - user.visible_message("[user] cuts the internal armor layer from [parent].", "I cut the internal armor layer from [parent].") + user.visible_message(span_notice("[user] cuts the internal armor layer from [parent]."), span_notice("I cut the internal armor layer from [parent].")) if(19) if(diff==FORWARD) - user.visible_message("[user] installs the external reinforced armor layer to [parent].", "I install the external reinforced armor layer to [parent].") + user.visible_message(span_notice("[user] installs the external reinforced armor layer to [parent]."), span_notice("I install the external reinforced armor layer to [parent].")) else - user.visible_message("[user] removes the external armor from [parent].", "I remove the external armor from [parent].") + user.visible_message(span_notice("[user] removes the external armor from [parent]."), span_notice("I remove the external armor from [parent].")) if(20) if(diff==FORWARD) - user.visible_message("[user] secures the external armor layer.", "I secure the external reinforced armor layer.") + user.visible_message(span_notice("[user] secures the external armor layer."), span_notice("I secure the external reinforced armor layer.")) else - user.visible_message("[user] pries external armor layer from [parent].", "I pry external armor layer from [parent].") + user.visible_message(span_notice("[user] pries external armor layer from [parent]."), span_notice("I pry external armor layer from [parent].")) if(21) if(diff==FORWARD) - user.visible_message("[user] welds the external armor layer to [parent].", "I weld the external armor layer to [parent].") + user.visible_message(span_notice("[user] welds the external armor layer to [parent]."), span_notice("I weld the external armor layer to [parent].")) else - user.visible_message("[user] unfastens the external armor layer.", "I unfasten the external armor layer.") + user.visible_message(span_notice("[user] unfastens the external armor layer."), span_notice("I unfasten the external armor layer.")) return TRUE /datum/component/construction/unordered/mecha_chassis/honker @@ -1001,26 +1001,26 @@ if(istype(I, /obj/item/bikehorn)) playsound(parent, 'sound/blank.ogg', 50, TRUE) - user.visible_message("HONK!") + user.visible_message(span_danger("HONK!")) //TODO: better messages. switch(index) if(2) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) if(4) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) if(6) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) if(8) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) if(10) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) if(12) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) if(14) - user.visible_message("[user] puts [I] on [parent].", "I put [I] on [parent].") + user.visible_message(span_notice("[user] puts [I] on [parent]."), span_notice("I put [I] on [parent].")) if(16) - user.visible_message("[user] puts [I] on [parent].", "I put [I] on [parent].") + user.visible_message(span_notice("[user] puts [I] on [parent]."), span_notice("I put [I] on [parent].")) return TRUE /datum/component/construction/unordered/mecha_chassis/durand @@ -1209,112 +1209,112 @@ //TODO: better messages. switch(index) if(1) - user.visible_message("[user] connects [parent] hydraulic systems.", "I connect [parent] hydraulic systems.") + user.visible_message(span_notice("[user] connects [parent] hydraulic systems."), span_notice("I connect [parent] hydraulic systems.")) if(2) if(diff==FORWARD) - user.visible_message("[user] activates [parent] hydraulic systems.", "I activate [parent] hydraulic systems.") + user.visible_message(span_notice("[user] activates [parent] hydraulic systems."), span_notice("I activate [parent] hydraulic systems.")) else - user.visible_message("[user] disconnects [parent] hydraulic systems.", "I disconnect [parent] hydraulic systems.") + user.visible_message(span_notice("[user] disconnects [parent] hydraulic systems."), span_notice("I disconnect [parent] hydraulic systems.")) if(3) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to [parent].", "I add the wiring to [parent].") + user.visible_message(span_notice("[user] adds the wiring to [parent]."), span_notice("I add the wiring to [parent].")) else - user.visible_message("[user] deactivates [parent] hydraulic systems.", "I deactivate [parent] hydraulic systems.") + user.visible_message(span_notice("[user] deactivates [parent] hydraulic systems."), span_notice("I deactivate [parent] hydraulic systems.")) if(4) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of [parent].", "I adjust the wiring of [parent].") + user.visible_message(span_notice("[user] adjusts the wiring of [parent]."), span_notice("I adjust the wiring of [parent].")) else - user.visible_message("[user] removes the wiring from [parent].", "I remove the wiring from [parent].") + user.visible_message(span_notice("[user] removes the wiring from [parent]."), span_notice("I remove the wiring from [parent].")) if(5) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] disconnects the wiring of [parent].", "I disconnect the wiring of [parent].") + user.visible_message(span_notice("[user] disconnects the wiring of [parent]."), span_notice("I disconnect the wiring of [parent].")) if(6) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "I secure the mainboard.") + user.visible_message(span_notice("[user] secures the mainboard."), span_notice("I secure the mainboard.")) else - user.visible_message("[user] removes the central control module from [parent].", "I remove the central computer mainboard from [parent].") + user.visible_message(span_notice("[user] removes the central control module from [parent]."), span_notice("I remove the central computer mainboard from [parent].")) if(7) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the mainboard.", "I unfasten the mainboard.") + user.visible_message(span_notice("[user] unfastens the mainboard."), span_notice("I unfasten the mainboard.")) if(8) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "I secure the peripherals control module.") + user.visible_message(span_notice("[user] secures the peripherals control module."), span_notice("I secure the peripherals control module.")) else - user.visible_message("[user] removes the peripherals control module from [parent].", "I remove the peripherals control module from [parent].") + user.visible_message(span_notice("[user] removes the peripherals control module from [parent]."), span_notice("I remove the peripherals control module from [parent].")) if(9) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the peripherals control module.", "I unfasten the peripherals control module.") + user.visible_message(span_notice("[user] unfastens the peripherals control module."), span_notice("I unfasten the peripherals control module.")) if(10) if(diff==FORWARD) - user.visible_message("[user] secures the weapon control module.", "I secure the weapon control module.") + user.visible_message(span_notice("[user] secures the weapon control module."), span_notice("I secure the weapon control module.")) else - user.visible_message("[user] removes the weapon control module from [parent].", "I remove the weapon control module from [parent].") + user.visible_message(span_notice("[user] removes the weapon control module from [parent]."), span_notice("I remove the weapon control module from [parent].")) if(11) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "I install [I] to [parent].") + user.visible_message(span_notice("[user] installs [I] to [parent]."), span_notice("I install [I] to [parent].")) else - user.visible_message("[user] unfastens the weapon control module.", "I unfasten the weapon control module.") + user.visible_message(span_notice("[user] unfastens the weapon control module."), span_notice("I unfasten the weapon control module.")) if(12) if(diff==FORWARD) - user.visible_message("[user] secures the scanner module.", "I secure the scanner module.") + user.visible_message(span_notice("[user] secures the scanner module."), span_notice("I secure the scanner module.")) else - user.visible_message("[user] removes the scanner module from [parent].", "I remove the scanner module from [parent].") + user.visible_message(span_notice("[user] removes the scanner module from [parent]."), span_notice("I remove the scanner module from [parent].")) if(13) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "I install [I] to [parent].") + user.visible_message(span_notice("[user] installs [I] to [parent]."), span_notice("I install [I] to [parent].")) else - user.visible_message("[user] unfastens the scanner module.", "I unfasten the scanner module.") + user.visible_message(span_notice("[user] unfastens the scanner module."), span_notice("I unfasten the scanner module.")) if(14) if(diff==FORWARD) - user.visible_message("[user] secures the capacitor.", "I secure the capacitor.") + user.visible_message(span_notice("[user] secures the capacitor."), span_notice("I secure the capacitor.")) else - user.visible_message("[user] removes the capacitor from [parent].", "I remove the capacitor from [parent].") + user.visible_message(span_notice("[user] removes the capacitor from [parent]."), span_notice("I remove the capacitor from [parent].")) if(15) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the capacitor.", "I unfasten the capacitor.") + user.visible_message(span_notice("[user] unfastens the capacitor."), span_notice("I unfasten the capacitor.")) if(16) if(diff==FORWARD) - user.visible_message("[user] secures the power cell.", "I secure the power cell.") + user.visible_message(span_notice("[user] secures the power cell."), span_notice("I secure the power cell.")) else - user.visible_message("[user] pries the power cell from [parent].", "I pry the power cell from [parent].") + user.visible_message(span_notice("[user] pries the power cell from [parent]."), span_notice("I pry the power cell from [parent].")) if(17) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to [parent].", "I install the internal armor layer to [parent].") + user.visible_message(span_notice("[user] installs the internal armor layer to [parent]."), span_notice("I install the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the power cell.", "I unfasten the power cell.") + user.visible_message(span_notice("[user] unfastens the power cell."), span_notice("I unfasten the power cell.")) if(18) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "I secure the internal armor layer.") + user.visible_message(span_notice("[user] secures the internal armor layer."), span_notice("I secure the internal armor layer.")) else - user.visible_message("[user] pries internal armor layer from [parent].", "I pry internal armor layer from [parent].") + user.visible_message(span_notice("[user] pries internal armor layer from [parent]."), span_notice("I pry internal armor layer from [parent].")) if(19) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to [parent].", "I weld the internal armor layer to [parent].") + user.visible_message(span_notice("[user] welds the internal armor layer to [parent]."), span_notice("I weld the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the internal armor layer.", "I unfasten the internal armor layer.") + user.visible_message(span_notice("[user] unfastens the internal armor layer."), span_notice("I unfasten the internal armor layer.")) if(20) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "I install [I] to [parent].") + user.visible_message(span_notice("[user] installs [I] to [parent]."), span_notice("I install [I] to [parent].")) else - user.visible_message("[user] cuts the internal armor layer from [parent].", "I cut the internal armor layer from [parent].") + user.visible_message(span_notice("[user] cuts the internal armor layer from [parent]."), span_notice("I cut the internal armor layer from [parent].")) if(21) if(diff==FORWARD) - user.visible_message("[user] secures Durand Armor Plates.", "I secure Durand Armor Plates.") + user.visible_message(span_notice("[user] secures Durand Armor Plates."), span_notice("I secure Durand Armor Plates.")) else - user.visible_message("[user] pries Durand Armor Plates from [parent].", "I pry Durand Armor Plates from [parent].") + user.visible_message(span_notice("[user] pries Durand Armor Plates from [parent]."), span_notice("I pry Durand Armor Plates from [parent].")) if(22) if(diff==FORWARD) - user.visible_message("[user] welds Durand Armor Plates to [parent].", "I weld Durand Armor Plates to [parent].") + user.visible_message(span_notice("[user] welds Durand Armor Plates to [parent]."), span_notice("I weld Durand Armor Plates to [parent].")) else - user.visible_message("[user] unfastens Durand Armor Plates.", "I unfasten Durand Armor Plates.") + user.visible_message(span_notice("[user] unfastens Durand Armor Plates."), span_notice("I unfasten Durand Armor Plates.")) return TRUE //PHAZON @@ -1545,131 +1545,131 @@ //TODO: better messages. switch(index) if(1) - user.visible_message("[user] connects [parent] hydraulic systems.", "I connect [parent] hydraulic systems.") + user.visible_message(span_notice("[user] connects [parent] hydraulic systems."), span_notice("I connect [parent] hydraulic systems.")) if(2) if(diff==FORWARD) - user.visible_message("[user] activates [parent] hydraulic systems.", "I activate [parent] hydraulic systems.") + user.visible_message(span_notice("[user] activates [parent] hydraulic systems."), span_notice("I activate [parent] hydraulic systems.")) else - user.visible_message("[user] disconnects [parent] hydraulic systems.", "I disconnect [parent] hydraulic systems.") + user.visible_message(span_notice("[user] disconnects [parent] hydraulic systems."), span_notice("I disconnect [parent] hydraulic systems.")) if(3) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to [parent].", "I add the wiring to [parent].") + user.visible_message(span_notice("[user] adds the wiring to [parent]."), span_notice("I add the wiring to [parent].")) else - user.visible_message("[user] deactivates [parent] hydraulic systems.", "I deactivate [parent] hydraulic systems.") + user.visible_message(span_notice("[user] deactivates [parent] hydraulic systems."), span_notice("I deactivate [parent] hydraulic systems.")) if(4) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of [parent].", "I adjust the wiring of [parent].") + user.visible_message(span_notice("[user] adjusts the wiring of [parent]."), span_notice("I adjust the wiring of [parent].")) else - user.visible_message("[user] removes the wiring from [parent].", "I remove the wiring from [parent].") + user.visible_message(span_notice("[user] removes the wiring from [parent]."), span_notice("I remove the wiring from [parent].")) if(5) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] disconnects the wiring of [parent].", "I disconnect the wiring of [parent].") + user.visible_message(span_notice("[user] disconnects the wiring of [parent]."), span_notice("I disconnect the wiring of [parent].")) if(6) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "I secure the mainboard.") + user.visible_message(span_notice("[user] secures the mainboard."), span_notice("I secure the mainboard.")) else - user.visible_message("[user] removes the central control module from [parent].", "I remove the central computer mainboard from [parent].") + user.visible_message(span_notice("[user] removes the central control module from [parent]."), span_notice("I remove the central computer mainboard from [parent].")) if(7) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the mainboard.", "I unfasten the mainboard.") + user.visible_message(span_notice("[user] unfastens the mainboard."), span_notice("I unfasten the mainboard.")) if(8) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "I secure the peripherals control module.") + user.visible_message(span_notice("[user] secures the peripherals control module."), span_notice("I secure the peripherals control module.")) else - user.visible_message("[user] removes the peripherals control module from [parent].", "I remove the peripherals control module from [parent].") + user.visible_message(span_notice("[user] removes the peripherals control module from [parent]."), span_notice("I remove the peripherals control module from [parent].")) if(9) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the peripherals control module.", "I unfasten the peripherals control module.") + user.visible_message(span_notice("[user] unfastens the peripherals control module."), span_notice("I unfasten the peripherals control module.")) if(10) if(diff==FORWARD) - user.visible_message("[user] secures the weapon control module.", "I secure the weapon control module.") + user.visible_message(span_notice("[user] secures the weapon control module."), span_notice("I secure the weapon control module.")) else - user.visible_message("[user] removes the weapon control module from [parent].", "I remove the weapon control module from [parent].") + user.visible_message(span_notice("[user] removes the weapon control module from [parent]."), span_notice("I remove the weapon control module from [parent].")) if(11) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "I install [I] to [parent].") + user.visible_message(span_notice("[user] installs [I] to [parent]."), span_notice("I install [I] to [parent].")) else - user.visible_message("[user] unfastens the weapon control module.", "I unfasten the weapon control module.") + user.visible_message(span_notice("[user] unfastens the weapon control module."), span_notice("I unfasten the weapon control module.")) if(12) if(diff==FORWARD) - user.visible_message("[user] secures the scanner module.", "I secure the scanner module.") + user.visible_message(span_notice("[user] secures the scanner module."), span_notice("I secure the scanner module.")) else - user.visible_message("[user] removes the scanner module from [parent].", "I remove the scanner module from [parent].") + user.visible_message(span_notice("[user] removes the scanner module from [parent]."), span_notice("I remove the scanner module from [parent].")) if(13) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "I install [I] to [parent].") + user.visible_message(span_notice("[user] installs [I] to [parent]."), span_notice("I install [I] to [parent].")) else - user.visible_message("[user] unfastens the scanner module.", "I unfasten the scanner module.") + user.visible_message(span_notice("[user] unfastens the scanner module."), span_notice("I unfasten the scanner module.")) if(14) if(diff==FORWARD) - user.visible_message("[user] secures the capacitor.", "I secure the capacitor.") + user.visible_message(span_notice("[user] secures the capacitor."), span_notice("I secure the capacitor.")) else - user.visible_message("[user] removes the capacitor from [parent].", "I remove the capacitor from [parent].") + user.visible_message(span_notice("[user] removes the capacitor from [parent]."), span_notice("I remove the capacitor from [parent].")) if(15) if(diff==FORWARD) - user.visible_message("[user] installs [I].", "I install [I].") + user.visible_message(span_notice("[user] installs [I]."), span_notice("I install [I].")) else - user.visible_message("[user] unsecures the capacitor from [parent].", "I unsecure the capacitor from [parent].") + user.visible_message(span_notice("[user] unsecures the capacitor from [parent]."), span_notice("I unsecure the capacitor from [parent].")) if(16) if(diff==FORWARD) - user.visible_message("[user] connects the bluespace crystal.", "I connect the bluespace crystal.") + user.visible_message(span_notice("[user] connects the bluespace crystal."), span_notice("I connect the bluespace crystal.")) else - user.visible_message("[user] removes the bluespace crystal from [parent].", "I remove the bluespace crystal from [parent].") + user.visible_message(span_notice("[user] removes the bluespace crystal from [parent]."), span_notice("I remove the bluespace crystal from [parent].")) if(17) if(diff==FORWARD) - user.visible_message("[user] engages the bluespace crystal.", "I engage the bluespace crystal.") + user.visible_message(span_notice("[user] engages the bluespace crystal."), span_notice("I engage the bluespace crystal.")) else - user.visible_message("[user] disconnects the bluespace crystal from [parent].", "I disconnect the bluespace crystal from [parent].") + user.visible_message(span_notice("[user] disconnects the bluespace crystal from [parent]."), span_notice("I disconnect the bluespace crystal from [parent].")) if(18) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] disengages the bluespace crystal.", "I disengage the bluespace crystal.") + user.visible_message(span_notice("[user] disengages the bluespace crystal."), span_notice("I disengage the bluespace crystal.")) if(19) if(diff==FORWARD) - user.visible_message("[user] secures the power cell.", "I secure the power cell.") + user.visible_message(span_notice("[user] secures the power cell."), span_notice("I secure the power cell.")) else - user.visible_message("[user] pries the power cell from [parent].", "I pry the power cell from [parent].") + user.visible_message(span_notice("[user] pries the power cell from [parent]."), span_notice("I pry the power cell from [parent].")) if(20) if(diff==FORWARD) - user.visible_message("[user] installs the phase armor layer to [parent].", "I install the phase armor layer to [parent].") + user.visible_message(span_notice("[user] installs the phase armor layer to [parent]."), span_notice("I install the phase armor layer to [parent].")) else - user.visible_message("[user] unfastens the power cell.", "I unfasten the power cell.") + user.visible_message(span_notice("[user] unfastens the power cell."), span_notice("I unfasten the power cell.")) if(21) if(diff==FORWARD) - user.visible_message("[user] secures the phase armor layer.", "I secure the phase armor layer.") + user.visible_message(span_notice("[user] secures the phase armor layer."), span_notice("I secure the phase armor layer.")) else - user.visible_message("[user] pries the phase armor layer from [parent].", "I pry the phase armor layer from [parent].") + user.visible_message(span_notice("[user] pries the phase armor layer from [parent]."), span_notice("I pry the phase armor layer from [parent].")) if(22) if(diff==FORWARD) - user.visible_message("[user] welds the phase armor layer to [parent].", "I weld the phase armor layer to [parent].") + user.visible_message(span_notice("[user] welds the phase armor layer to [parent]."), span_notice("I weld the phase armor layer to [parent].")) else - user.visible_message("[user] unfastens the phase armor layer.", "I unfasten the phase armor layer.") + user.visible_message(span_notice("[user] unfastens the phase armor layer."), span_notice("I unfasten the phase armor layer.")) if(23) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "I install [I] to [parent].") + user.visible_message(span_notice("[user] installs [I] to [parent]."), span_notice("I install [I] to [parent].")) else - user.visible_message("[user] cuts phase armor layer from [parent].", "I cut the phase armor layer from [parent].") + user.visible_message(span_notice("[user] cuts phase armor layer from [parent]."), span_notice("I cut the phase armor layer from [parent].")) if(24) if(diff==FORWARD) - user.visible_message("[user] secures Phazon Armor Plates.", "I secure Phazon Armor Plates.") + user.visible_message(span_notice("[user] secures Phazon Armor Plates."), span_notice("I secure Phazon Armor Plates.")) else - user.visible_message("[user] pries Phazon Armor Plates from [parent].", "I pry Phazon Armor Plates from [parent].") + user.visible_message(span_notice("[user] pries Phazon Armor Plates from [parent]."), span_notice("I pry Phazon Armor Plates from [parent].")) if(25) if(diff==FORWARD) - user.visible_message("[user] welds Phazon Armor Plates to [parent].", "I weld Phazon Armor Plates to [parent].") + user.visible_message(span_notice("[user] welds Phazon Armor Plates to [parent]."), span_notice("I weld Phazon Armor Plates to [parent].")) else - user.visible_message("[user] unfastens Phazon Armor Plates.", "I unfasten Phazon Armor Plates.") + user.visible_message(span_notice("[user] unfastens Phazon Armor Plates."), span_notice("I unfasten Phazon Armor Plates.")) if(26) if(diff==FORWARD) - user.visible_message("[user] carefully inserts the anomaly core into [parent] and secures it.", - "I slowly place the anomaly core into its socket and close its chamber.") + user.visible_message(span_notice("[user] carefully inserts the anomaly core into [parent] and secures it."), + span_notice("I slowly place the anomaly core into its socket and close its chamber.")) return TRUE //ODYSSEUS @@ -1843,100 +1843,100 @@ //TODO: better messages. switch(index) if(1) - user.visible_message("[user] connects [parent] hydraulic systems.", "I connect [parent] hydraulic systems.") + user.visible_message(span_notice("[user] connects [parent] hydraulic systems."), span_notice("I connect [parent] hydraulic systems.")) if(2) if(diff==FORWARD) - user.visible_message("[user] activates [parent] hydraulic systems.", "I activate [parent] hydraulic systems.") + user.visible_message(span_notice("[user] activates [parent] hydraulic systems."), span_notice("I activate [parent] hydraulic systems.")) else - user.visible_message("[user] disconnects [parent] hydraulic systems.", "I disconnect [parent] hydraulic systems.") + user.visible_message(span_notice("[user] disconnects [parent] hydraulic systems."), span_notice("I disconnect [parent] hydraulic systems.")) if(3) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to [parent].", "I add the wiring to [parent].") + user.visible_message(span_notice("[user] adds the wiring to [parent]."), span_notice("I add the wiring to [parent].")) else - user.visible_message("[user] deactivates [parent] hydraulic systems.", "I deactivate [parent] hydraulic systems.") + user.visible_message(span_notice("[user] deactivates [parent] hydraulic systems."), span_notice("I deactivate [parent] hydraulic systems.")) if(4) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of [parent].", "I adjust the wiring of [parent].") + user.visible_message(span_notice("[user] adjusts the wiring of [parent]."), span_notice("I adjust the wiring of [parent].")) else - user.visible_message("[user] removes the wiring from [parent].", "I remove the wiring from [parent].") + user.visible_message(span_notice("[user] removes the wiring from [parent]."), span_notice("I remove the wiring from [parent].")) if(5) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] disconnects the wiring of [parent].", "I disconnect the wiring of [parent].") + user.visible_message(span_notice("[user] disconnects the wiring of [parent]."), span_notice("I disconnect the wiring of [parent].")) if(6) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "I secure the mainboard.") + user.visible_message(span_notice("[user] secures the mainboard."), span_notice("I secure the mainboard.")) else - user.visible_message("[user] removes the central control module from [parent].", "I remove the central computer mainboard from [parent].") + user.visible_message(span_notice("[user] removes the central control module from [parent]."), span_notice("I remove the central computer mainboard from [parent].")) if(7) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the mainboard.", "I unfasten the mainboard.") + user.visible_message(span_notice("[user] unfastens the mainboard."), span_notice("I unfasten the mainboard.")) if(8) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "I secure the peripherals control module.") + user.visible_message(span_notice("[user] secures the peripherals control module."), span_notice("I secure the peripherals control module.")) else - user.visible_message("[user] removes the peripherals control module from [parent].", "I remove the peripherals control module from [parent].") + user.visible_message(span_notice("[user] removes the peripherals control module from [parent]."), span_notice("I remove the peripherals control module from [parent].")) if(9) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the peripherals control module.", "I unfasten the peripherals control module.") + user.visible_message(span_notice("[user] unfastens the peripherals control module."), span_notice("I unfasten the peripherals control module.")) if(10) if(diff==FORWARD) - user.visible_message("[user] secures the scanner module.", "I secure the scanner module.") + user.visible_message(span_notice("[user] secures the scanner module."), span_notice("I secure the scanner module.")) else - user.visible_message("[user] removes the scanner module from [parent].", "I remove the scanner module from [parent].") + user.visible_message(span_notice("[user] removes the scanner module from [parent]."), span_notice("I remove the scanner module from [parent].")) if(11) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "I install [I] to [parent].") + user.visible_message(span_notice("[user] installs [I] to [parent]."), span_notice("I install [I] to [parent].")) else - user.visible_message("[user] unfastens the scanner module.", "I unfasten the scanner module.") + user.visible_message(span_notice("[user] unfastens the scanner module."), span_notice("I unfasten the scanner module.")) if(12) if(diff==FORWARD) - user.visible_message("[user] secures the capacitor.", "I secure the capacitor.") + user.visible_message(span_notice("[user] secures the capacitor."), span_notice("I secure the capacitor.")) else - user.visible_message("[user] removes the capacitor from [parent].", "I remove the capacitor from [parent].") + user.visible_message(span_notice("[user] removes the capacitor from [parent]."), span_notice("I remove the capacitor from [parent].")) if(13) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "I install [I] into [parent].") + user.visible_message(span_notice("[user] installs [I] into [parent]."), span_notice("I install [I] into [parent].")) else - user.visible_message("[user] unfastens the capacitor.", "I unfasten the capacitor.") + user.visible_message(span_notice("[user] unfastens the capacitor."), span_notice("I unfasten the capacitor.")) if(14) if(diff==FORWARD) - user.visible_message("[user] secures the power cell.", "I secure the power cell.") + user.visible_message(span_notice("[user] secures the power cell."), span_notice("I secure the power cell.")) else - user.visible_message("[user] pries the power cell from [parent].", "I pry the power cell from [parent].") + user.visible_message(span_notice("[user] pries the power cell from [parent]."), span_notice("I pry the power cell from [parent].")) if(15) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to [parent].", "I install the internal armor layer to [parent].") + user.visible_message(span_notice("[user] installs the internal armor layer to [parent]."), span_notice("I install the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the power cell.", "I unfasten the power cell.") + user.visible_message(span_notice("[user] unfastens the power cell."), span_notice("I unfasten the power cell.")) if(16) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "I secure the internal armor layer.") + user.visible_message(span_notice("[user] secures the internal armor layer."), span_notice("I secure the internal armor layer.")) else - user.visible_message("[user] pries internal armor layer from [parent].", "I pry internal armor layer from [parent].") + user.visible_message(span_notice("[user] pries internal armor layer from [parent]."), span_notice("I pry internal armor layer from [parent].")) if(17) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to [parent].", "I weld the internal armor layer to [parent].") + user.visible_message(span_notice("[user] welds the internal armor layer to [parent]."), span_notice("I weld the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the internal armor layer.", "I unfasten the internal armor layer.") + user.visible_message(span_notice("[user] unfastens the internal armor layer."), span_notice("I unfasten the internal armor layer.")) if(18) if(diff==FORWARD) - user.visible_message("[user] installs the external armor layer to [parent].", "I install the external reinforced armor layer to [parent].") + user.visible_message(span_notice("[user] installs the external armor layer to [parent]."), span_notice("I install the external reinforced armor layer to [parent].")) else - user.visible_message("[user] cuts the internal armor layer from [parent].", "I cut the internal armor layer from [parent].") + user.visible_message(span_notice("[user] cuts the internal armor layer from [parent]."), span_notice("I cut the internal armor layer from [parent].")) if(19) if(diff==FORWARD) - user.visible_message("[user] secures the external armor layer.", "I secure the external reinforced armor layer.") + user.visible_message(span_notice("[user] secures the external armor layer."), span_notice("I secure the external reinforced armor layer.")) else - user.visible_message("[user] pries the external armor layer from [parent].", "I pry the external armor layer from [parent].") + user.visible_message(span_notice("[user] pries the external armor layer from [parent]."), span_notice("I pry the external armor layer from [parent].")) if(20) if(diff==FORWARD) - user.visible_message("[user] welds the external armor layer to [parent].", "I weld the external armor layer to [parent].") + user.visible_message(span_notice("[user] welds the external armor layer to [parent]."), span_notice("I weld the external armor layer to [parent].")) else - user.visible_message("[user] unfastens the external armor layer.", "I unfasten the external armor layer.") + user.visible_message(span_notice("[user] unfastens the external armor layer."), span_notice("I unfasten the external armor layer.")) return TRUE diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm index 2e7565bc9..aebfcb9b9 100644 --- a/code/game/mecha/mecha_defense.dm +++ b/code/game/mecha/mecha_defense.dm @@ -20,7 +20,7 @@ else check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT)) if(. >= 5 || prob(33)) - occupant_message("Taking damage!") + occupant_message(span_danger("Taking damage!")) log_message("Took [damage_amount] points of damage. Damage type: [damage_type]", LOG_MECHA) /obj/mecha/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) @@ -47,7 +47,7 @@ booster_damage_modifier /= facing_modifier booster_deflection_modifier *= facing_modifier if(prob(deflect_chance * booster_deflection_modifier)) - visible_message("[src]'s armour deflects the attack!") + visible_message(span_danger("[src]'s armour deflects the attack!")) log_message("Armor saved.", LOG_MECHA) return 0 if(.) @@ -60,7 +60,7 @@ user.changeNext_move(CLICK_CD_MELEE) // Ugh. Ideally we shouldn't be setting cooldowns outside of click code. // user.do_attack_animation(src, ATTACK_EFFECT_PUNCH) playsound(loc, 'sound/blank.ogg', 40, TRUE, -1) - user.visible_message("[user] hits [name]. Nothing happens.", null, null, COMBAT_MESSAGE_RANGE) + user.visible_message(span_danger("[user] hits [name]. Nothing happens."), null, null, COMBAT_MESSAGE_RANGE) log_message("Attack by hand/paw. Attacker - [user].", LOG_MECHA, color="red") /obj/mecha/attack_paw(mob/user as mob) @@ -167,9 +167,9 @@ if(istype(W, /obj/item/mmi)) if(mmi_move_inside(W,user)) - to_chat(user, "[src]-[W] interface initialized successfully.") + to_chat(user, span_notice("[src]-[W] interface initialized successfully.")) else - to_chat(user, "[src]-[W] interface initialization failed.") + to_chat(user, span_warning("[src]-[W] interface initialization failed.")) return if(istype(W, /obj/item/mecha_ammo)) @@ -187,9 +187,9 @@ id_card = pda.id output_maintenance_dialog(id_card, user) return - to_chat(user, "Invalid ID: Access denied.") + to_chat(user, span_warning("Invalid ID: Access denied.")) return - to_chat(user, "Maintenance protocols disabled by operator.") + to_chat(user, span_warning("Maintenance protocols disabled by operator.")) return if(istype(W, /obj/item/stock_parts/cell)) @@ -198,12 +198,12 @@ if(!user.transferItemToLoc(W, src, silent = FALSE)) return var/obj/item/stock_parts/cell/C = W - to_chat(user, "I install the power cell.") + to_chat(user, span_notice("I install the power cell.")) playsound(src, 'sound/blank.ogg', 50, FALSE) cell = C log_message("Powercell installed", LOG_MECHA) else - to_chat(user, "There's already a power cell installed!") + to_chat(user, span_warning("There's already a power cell installed!")) return if(istype(W, /obj/item/stock_parts/scanning_module)) @@ -211,13 +211,13 @@ if(!scanmod) if(!user.transferItemToLoc(W, src)) return - to_chat(user, "I install the scanning module.") + to_chat(user, span_notice("I install the scanning module.")) playsound(src, 'sound/blank.ogg', 50, FALSE) scanmod = W log_message("[W] installed", LOG_MECHA) update_part_values() else - to_chat(user, "There's already a scanning module installed!") + to_chat(user, span_warning("There's already a scanning module installed!")) return if(istype(W, /obj/item/stock_parts/capacitor)) @@ -225,13 +225,13 @@ if(!capacitor) if(!user.transferItemToLoc(W, src)) return - to_chat(user, "I install the capacitor.") + to_chat(user, span_notice("I install the capacitor.")) playsound(src, 'sound/blank.ogg', 50, FALSE) capacitor = W log_message("[W] installed", LOG_MECHA) update_part_values() else - to_chat(user, "There's already a capacitor installed!") + to_chat(user, span_warning("There's already a capacitor installed!")) return if(istype(W, /obj/item/stack/cable_coil)) @@ -239,9 +239,9 @@ var/obj/item/stack/cable_coil/CC = W if(CC.use(2)) clearInternalDamage(MECHA_INT_SHORT_CIRCUIT) - to_chat(user, "I replace the fused wires.") + to_chat(user, span_notice("I replace the fused wires.")) else - to_chat(user, "I need two lengths of cable to fix this mech!") + to_chat(user, span_warning("I need two lengths of cable to fix this mech!")) return if(istype(W, /obj/item/mecha_parts)) @@ -256,29 +256,29 @@ . = TRUE if(construction_state == MECHA_SECURE_BOLTS) construction_state = MECHA_LOOSE_BOLTS - to_chat(user, "I undo the securing bolts.") + to_chat(user, span_notice("I undo the securing bolts.")) return if(construction_state == MECHA_LOOSE_BOLTS) construction_state = MECHA_SECURE_BOLTS - to_chat(user, "I tighten the securing bolts.") + to_chat(user, span_notice("I tighten the securing bolts.")) /obj/mecha/crowbar_act(mob/living/user, obj/item/I) ..() . = TRUE if(construction_state == MECHA_LOOSE_BOLTS) construction_state = MECHA_OPEN_HATCH - to_chat(user, "I open the hatch to the power unit.") + to_chat(user, span_notice("I open the hatch to the power unit.")) return if(construction_state == MECHA_OPEN_HATCH) construction_state = MECHA_LOOSE_BOLTS - to_chat(user, "I close the hatch to the power unit.") + to_chat(user, span_notice("I close the hatch to the power unit.")) /obj/mecha/screwdriver_act(mob/living/user, obj/item/I) ..() . = TRUE if(internal_damage & MECHA_INT_TEMP_CONTROL) clearInternalDamage(MECHA_INT_TEMP_CONTROL) - to_chat(user, "I repair the damaged temperature controller.") + to_chat(user, span_notice("I repair the damaged temperature controller.")) return /obj/mecha/welder_act(mob/living/user, obj/item/W) @@ -290,17 +290,17 @@ if(!W.use_tool(src, user, 0, volume=50, amount=1)) return clearInternalDamage(MECHA_INT_TANK_BREACH) - to_chat(user, "I repair the damaged gas tank.") + to_chat(user, span_notice("I repair the damaged gas tank.")) return if(obj_integrity < max_integrity) if(!W.use_tool(src, user, 0, volume=50, amount=1)) return - user.visible_message("[user] repairs some damage to [name].", "I repair some damage to [src].") + user.visible_message(span_notice("[user] repairs some damage to [name]."), span_notice("I repair some damage to [src].")) obj_integrity += min(10, max_integrity-obj_integrity) if(obj_integrity == max_integrity) - to_chat(user, "It looks to be fully repaired now.") + to_chat(user, span_notice("It looks to be fully repaired now.")) return - to_chat(user, "The [name] is at full integrity!") + to_chat(user, span_warning("The [name] is at full integrity!")) /obj/mecha/proc/mech_toxin_damage(mob/living/target) playsound(src, 'sound/blank.ogg', 50, TRUE) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 2f9c6c2f2..bcdcb00ef 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -11,9 +11,9 @@ /obj/item/mecha_parts/proc/try_attach_part(mob/user, obj/mecha/M) //For attaching parts to a finished mech if(!user.transferItemToLoc(src, M)) - to_chat(user, "\The [src] is stuck to your hand, you cannot put it in \the [M]!") + to_chat(user, span_warning("\The [src] is stuck to your hand, you cannot put it in \the [M]!")) return FALSE - user.visible_message("[user] attaches [src] to [M].", "I attach [src] to [M].") + user.visible_message(span_notice("[user] attaches [src] to [M]."), span_notice("I attach [src] to [M].")) return TRUE /obj/item/mecha_parts/part/try_attach_part(mob/user, obj/mecha/M) diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index 0b234d23b..32e7be800 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -69,7 +69,7 @@ Air source: [internal_tank?"[use_internal_tank?"Internal Airtank":"Environment"]":"Environment"]
Airtank pressure: [internal_tank?"[tank_pressure]kPa":"N/A"]
Airtank temperature: [internal_tank?"[tank_temperature]°K|[tank_temperature - T0C]°C":"N/A"]
- Cabin pressure: [internal_tank?"[cabin_pressure>WARNING_HIGH_PRESSURE ? "[cabin_pressure]": cabin_pressure]kPa":"N/A"]
+ Cabin pressure: [internal_tank?"[cabin_pressure>WARNING_HIGH_PRESSURE ? span_danger("[cabin_pressure]"): cabin_pressure]kPa":"N/A"]
Cabin temperature: [internal_tank?"[return_temperature()]°K|[return_temperature() - T0C]°C":"N/A"]
[dna_lock?"DNA-locked:
[dna_lock] \[Reset\]
":""]
"} . += "[get_actions()]
" @@ -88,11 +88,11 @@ /obj/mecha/proc/report_internal_damage() . = "" var/list/dam_reports = list( - "[MECHA_INT_FIRE]" = "INTERNAL FIRE", - "[MECHA_INT_TEMP_CONTROL]" = "LIFE SUPPORT SYSTEM MALFUNCTION", - "[MECHA_INT_TANK_BREACH]" = "GAS TANK BREACH", + "[MECHA_INT_FIRE]" = span_danger("INTERNAL FIRE"), + "[MECHA_INT_TEMP_CONTROL]" = span_danger("LIFE SUPPORT SYSTEM MALFUNCTION"), + "[MECHA_INT_TANK_BREACH]" = span_danger("GAS TANK BREACH"), "[MECHA_INT_CONTROL_LOST]" = "COORDINATION SYSTEM CALIBRATION FAILURE - Recalibrate", - "[MECHA_INT_SHORT_CIRCUIT]" = "SHORT CIRCUIT" + "[MECHA_INT_SHORT_CIRCUIT]" = span_danger("SHORT CIRCUIT") ) for(var/tflag in dam_reports) var/intdamflag = text2num(tflag) @@ -250,10 +250,10 @@ return if(construction_state == MECHA_LOCKED) construction_state = MECHA_SECURE_BOLTS - to_chat(usr, "The securing bolts are now exposed.") + to_chat(usr, span_notice("The securing bolts are now exposed.")) else if(construction_state == MECHA_SECURE_BOLTS) construction_state = MECHA_LOCKED - to_chat(usr, "The securing bolts are now hidden.") + to_chat(usr, span_notice("The securing bolts are now hidden.")) output_maintenance_dialog(id_card,usr) return if(href_list["drop_cell"]) @@ -302,7 +302,7 @@ if(isnull(new_pressure) || usr.incapacitated() || !construction_state) return internal_tank_valve = new_pressure - to_chat(usr, "The internal pressure valve has been set to [internal_tank_valve]kPa.") + to_chat(usr, span_notice("The internal pressure valve has been set to [internal_tank_valve]kPa.")) return //Start of all internal topic stuff. @@ -319,8 +319,8 @@ if(!equip || !equip.selectable) return selected = equip - occupant_message("I switch to [equip].") - visible_message("[src] raises [equip].") + occupant_message(span_notice("I switch to [equip].")) + visible_message(span_notice("[src] raises [equip].")) send_byjax(usr, "exosuit.browser", "eq_list", get_equipment_list()) return @@ -362,7 +362,7 @@ //Toggles main access. if(href_list["toggle_maint_access"]) if(construction_state) - occupant_message("Maintenance protocols in effect") + occupant_message(span_danger("Maintenance protocols in effect")) return maint_access = !maint_access send_byjax(usr,"exosuit.browser","t_maint_access","[maint_access?"Forbid":"Permit"] maintenance protocols") @@ -372,18 +372,18 @@ if (href_list["toggle_port_connection"]) if(internal_tank.connected_port) if(internal_tank.disconnect()) - occupant_message("Disconnected from the air system port.") + occupant_message(span_notice("Disconnected from the air system port.")) log_message("Disconnected from gas port.", LOG_MECHA) else - occupant_message("Unable to disconnect from the air system port!") + occupant_message(span_warning("Unable to disconnect from the air system port!")) return else var/obj/machinery/atmospherics/components/unary/portables_connector/possible_port = locate() in loc if(internal_tank.connect(possible_port)) - occupant_message("Connected to the air system port.") + occupant_message(span_notice("Connected to the air system port.")) log_message("Connected to gas port.", LOG_MECHA) else - occupant_message("Unable to connect with air system port!") + occupant_message(span_warning("Unable to connect with air system port!")) return send_byjax(occupant,"exosuit.browser","t_port_connection","[internal_tank.connected_port?"Disconnect from":"Connect to"] gas port") return @@ -391,10 +391,10 @@ //Turns on the DNA lock if(href_list["dna_lock"]) if(!iscarbon(occupant) || !occupant.dna) - occupant_message("I feel a prick as the needle takes your DNA sample.") + occupant_message(span_notice("I feel a prick as the needle takes your DNA sample.")) return dna_lock = occupant.dna.unique_enzymes - occupant_message("I feel a prick as the needle takes your DNA sample.") + occupant_message(span_notice("I feel a prick as the needle takes your DNA sample.")) return //Resets the DNA lock @@ -404,7 +404,7 @@ //Repairs internal damage if(href_list["repair_int_control_lost"]) - occupant_message("Recalibrating coordination system...") + occupant_message(span_notice("Recalibrating coordination system...")) log_message("Recalibration of coordination system started.", LOG_MECHA) addtimer(CALLBACK(src, PROC_REF(stationary_repair), loc), 100, TIMER_UNIQUE) @@ -412,8 +412,8 @@ /obj/mecha/proc/stationary_repair(location) if(location == loc) clearInternalDamage(MECHA_INT_CONTROL_LOST) - occupant_message("Recalibration successful.") + occupant_message(span_notice("Recalibration successful.")) log_message("Recalibration of coordination system finished with 0 errors.", LOG_MECHA) else - occupant_message("Recalibration failed!") + occupant_message(span_warning("Recalibration failed!")) log_message("Recalibration of coordination system failed with 1 error.", LOG_MECHA, color="red") diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index c2128abc2..761bc0b31 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -48,22 +48,22 @@ . = ..() if(!AI) return - . += "The AI recovery beacon is active." + . += span_notice("The AI recovery beacon is active.") /obj/structure/mecha_wreckage/welder_act(mob/living/user, obj/item/I) ..() . = TRUE if(salvage_num <= 0 || !length(welder_salvage)) - to_chat(user, "I don't see anything that can be cut with [I]!") + to_chat(user, span_notice("I don't see anything that can be cut with [I]!")) return if(!I.use_tool(src, user, 0, volume=50)) return if(prob(30)) - to_chat(user, "I fail to salvage anything valuable from [src]!") + to_chat(user, span_notice("I fail to salvage anything valuable from [src]!")) return var/type = pick(welder_salvage) var/N = new type(get_turf(user)) - user.visible_message("[user] cuts [N] from [src].", "I cut [N] from [src].") + user.visible_message(span_notice("[user] cuts [N] from [src]."), span_notice("I cut [N] from [src].")) if(!istype(N, /obj/item/stack)) welder_salvage -= type salvage_num-- @@ -72,10 +72,10 @@ ..() . = TRUE if(wires_removed) - to_chat(user, "I don't see anything that can be cut with [I]!") + to_chat(user, span_notice("I don't see anything that can be cut with [I]!")) return var/N = new /obj/item/stack/cable_coil(get_turf(user), rand(1,3)) - user.visible_message("[user] cuts [N] from [src].", "I cut [N] from [src].") + user.visible_message(span_notice("[user] cuts [N] from [src]."), span_notice("I cut [N] from [src].")) wires_removed = TRUE /obj/structure/mecha_wreckage/crowbar_act(mob/living/user, obj/item/I) @@ -84,10 +84,10 @@ if(crowbar_salvage.len) var/obj/S = pick(crowbar_salvage) S.forceMove(user.drop_location()) - user.visible_message("[user] pries [S] from [src].", "I pry [S] from [src].") + user.visible_message(span_notice("[user] pries [S] from [src]."), span_notice("I pry [S] from [src].")) crowbar_salvage -= S return - to_chat(user, "I don't see anything that can be cut with [I]!") + to_chat(user, span_notice("I don't see anything that can be cut with [I]!")) /obj/structure/mecha_wreckage/transfer_ai(interaction, mob/user, null, obj/item/aicard/card) if(!..()) @@ -97,13 +97,13 @@ if(interaction != AI_TRANS_TO_CARD) //AIs can only be transferred in one direction, from the wreck to the card. return if(!AI) //No AI in the wreck - to_chat(user, "No AI backups found.") + to_chat(user, span_warning("No AI backups found.")) return cut_overlays() //Remove the recovery beacon overlay AI.forceMove(card) //Move the dead AI to the card. card.AI = AI if(AI.client) //AI player is still in the dead AI and is connected - to_chat(AI, "The remains of your file system have been recovered on a mobile storage device.") + to_chat(AI, span_notice("The remains of your file system have been recovered on a mobile storage device.")) else //Give the AI a heads-up that it is probably going to get fixed. AI.notify_ghost_cloning("You have been recovered from the wreckage!", source = card) to_chat(user, "Backup files recovered: [AI.name] ([rand(1000,9999)].exe) salvaged from [name] and stored within local memory.") diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 2e89d76ab..91ce43a8b 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -181,7 +181,7 @@ if(href_list["drop_from_cargo"]) var/obj/O = locate(href_list["drop_from_cargo"]) in cargo if(O) - occupant_message("I unload [O].") + occupant_message(span_notice("I unload [O].")) O.forceMove(drop_location()) cargo -= O log_message("Unloaded [O]. Cargo compartment capacity: [cargo_capacity - src.cargo.len]", LOG_MECHA) @@ -220,13 +220,13 @@ drill.equip_cooldown = initial(drill.equip_cooldown) /obj/mecha/working/ripley/relay_container_resist(mob/living/user, obj/O) - to_chat(user, "I lean on the back of [O] and start pushing so it falls out of [src].") + to_chat(user, span_notice("I lean on the back of [O] and start pushing so it falls out of [src].")) if(do_after(user, 300, target = O)) if(!user || user.stat != CONSCIOUS || user.loc != src || O.loc != src ) return - to_chat(user, "I successfully pushed [O] out of [src]!") + to_chat(user, span_notice("I successfully pushed [O] out of [src]!")) O.forceMove(drop_location()) cargo -= O else if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded. - to_chat(user, "I fail to push [O] out of [src]!") + to_chat(user, span_warning("I fail to push [O] out of [src]!")) diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 87636c670..7f35463b0 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -53,9 +53,9 @@ M.buckling = src if(!M.can_buckle() && !force) if(M == usr) - to_chat(M, "I am unable to [buckleverb] on [src].") + to_chat(M, span_warning("I am unable to [buckleverb] on [src].")) else - to_chat(usr, "I am unable to [buckleverb] [M] on [src].") + to_chat(usr, span_warning("I am unable to [buckleverb] [M] on [src].")) M.buckling = null return FALSE @@ -123,23 +123,23 @@ . = buckle_mob(M, check_loc = check_loc) if(.) if(M == user) - M.visible_message("[M] [buckleverb]s on [src].",\ - "I [buckleverb] on [src].") + M.visible_message(span_notice("[M] [buckleverb]s on [src]."),\ + span_notice("I [buckleverb] on [src].")) else - M.visible_message("[user] [buckleverb]s [M] on [src]!",\ - "[user] [buckleverb]s me on [src]!") + M.visible_message(span_warning("[user] [buckleverb]s [M] on [src]!"),\ + span_warning("[user] [buckleverb]s me on [src]!")) /atom/movable/proc/user_unbuckle_mob(mob/living/buckled_mob, mob/user) var/mob/living/M = unbuckle_mob(buckled_mob) if(M) if(M != user) - M.visible_message("[user] pulls [M] from [src].",\ - "[user] pulls me from [src].",\ - "I hear metal clanking.") + M.visible_message(span_notice("[user] pulls [M] from [src]."),\ + span_notice("[user] pulls me from [src]."),\ + span_hear("I hear metal clanking.")) else - M.visible_message("[M] gets off of [src].",\ - "I get off of [src].",\ - "I hear metal clanking.") + M.visible_message(span_notice("[M] gets off of [src]."),\ + span_notice("I get off of [src]."),\ + span_hear("I hear metal clanking.")) add_fingerprint(user) if(isliving(M.pulledby)) var/mob/living/L = M.pulledby diff --git a/code/game/objects/effects/alien_acid.dm b/code/game/objects/effects/alien_acid.dm index 521cc31c0..3fe017fd3 100644 --- a/code/game/objects/effects/alien_acid.dm +++ b/code/game/objects/effects/alien_acid.dm @@ -62,7 +62,7 @@ if(L.acid_act(10, acid_used, "feet")) acid_level = max(0, acid_level - acid_used*10) playsound(L, 'sound/blank.ogg', 50, TRUE) - to_chat(L, "[src] burns you!") + to_chat(L, span_danger("[src] burns you!")) //xenomorph corrosive acid /obj/effect/acid/alien @@ -76,17 +76,17 @@ playsound(loc, 'sound/blank.ogg', 100, TRUE) target_strength-- if(target_strength <= 0) - target.visible_message("[target] collapses under its own weight into a puddle of goop and undigested debris!") + target.visible_message(span_warning("[target] collapses under its own weight into a puddle of goop and undigested debris!")) target.acid_melt() qdel(src) else switch(target_strength) if(24) - visible_message("[target] is holding up against the acid!") + visible_message(span_warning("[target] is holding up against the acid!")) if(16) - visible_message("[target] is being melted by the acid!") + visible_message(span_warning("[target] is being melted by the acid!")) if(8) - visible_message("[target] is struggling to withstand the acid!") + visible_message(span_warning("[target] is struggling to withstand the acid!")) if(4) - visible_message("[target] begins to crumble under the acid!") + visible_message(span_warning("[target] begins to crumble under the acid!")) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 4f2baaac1..44e55147d 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -76,7 +76,7 @@ /obj/effect/anomaly/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_ANALYZER) - to_chat(user, "Analyzing... [src]'s unstable field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code].") + to_chat(user, span_notice("Analyzing... [src]'s unstable field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code].")) /////////////////////// diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 1de95a146..898956113 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -92,10 +92,10 @@ if(I.tool_behaviour == TOOL_WIRECUTTER) I.play_tool_sound(src, 100) if(ruined) - to_chat(user, "I remove the remnants of the poster.") + to_chat(user, span_notice("I remove the remnants of the poster.")) qdel(src) else - to_chat(user, "I carefully remove the poster from the wall.") + to_chat(user, span_notice("I carefully remove the poster from the wall.")) roll_and_drop(user.loc) /obj/structure/sign/poster/attack_hand(mob/user) @@ -104,7 +104,7 @@ return if(ruined) return - visible_message("[user] rips [src] in a single, decisive motion!" ) + visible_message(span_notice("[user] rips [src] in a single, decisive motion!") ) playsound(src.loc, 'sound/blank.ogg', 100, TRUE) var/obj/structure/sign/poster/ripped/R = new(loc) @@ -123,7 +123,7 @@ //separated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby() /turf/closed/wall/proc/place_poster(obj/item/poster/P, mob/user) if(!P.poster_structure) - to_chat(user, "[P] has no poster... inside it? Inform a coder!") + to_chat(user, span_warning("[P] has no poster... inside it? Inform a coder!")) return // Deny placing posters on currently-diagonal walls, although the wall may change in the future. @@ -136,14 +136,14 @@ var/stuff_on_wall = 0 for(var/obj/O in contents) //Let's see if it already has a poster on it or too much stuff if(istype(O, /obj/structure/sign/poster)) - to_chat(user, "The wall is far too cluttered to place a poster!") + to_chat(user, span_warning("The wall is far too cluttered to place a poster!")) return stuff_on_wall++ if(stuff_on_wall == 3) - to_chat(user, "The wall is far too cluttered to place a poster!") + to_chat(user, span_warning("The wall is far too cluttered to place a poster!")) return - to_chat(user, "I start placing the poster on the wall..." ) + to_chat(user, span_notice("I start placing the poster on the wall...") ) var/obj/structure/sign/poster/D = P.poster_structure @@ -158,10 +158,10 @@ return if(iswallturf(src) && user && user.loc == temp_loc) //Let's check if everything is still there - to_chat(user, "I place the poster!") + to_chat(user, span_notice("I place the poster!")) return - to_chat(user, "The poster falls down!") + to_chat(user, span_notice("The poster falls down!")) D.roll_and_drop(temp_loc) // Various possible posters follow diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 8543da9ec..1366c57ce 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -48,12 +48,12 @@ if(src.reagents && W.reagents) . = 1 //so the containers don't splash their content on the src while scooping. if(!src.reagents.total_volume) - to_chat(user, "[src] isn't thick enough to scoop up!") + to_chat(user, span_notice("[src] isn't thick enough to scoop up!")) return if(W.reagents.total_volume >= W.reagents.maximum_volume) - to_chat(user, "[W] is full!") + to_chat(user, span_notice("[W] is full!")) return - to_chat(user, "I scoop up [src] into [W]!") + to_chat(user, span_notice("I scoop up [src] into [W]!")) reagents.trans_to(W, reagents.total_volume, transfered_by = user) if(!reagents.total_volume) //scooped up all of it qdel(src) @@ -64,7 +64,7 @@ else var/hotness = W.get_temperature() reagents.expose_temperature(hotness) - to_chat(user, "I heat [name] with [W]!") + to_chat(user, span_notice("I heat [name] with [W]!")) else return ..() diff --git a/code/game/objects/effects/decals/cleanable/food.dm b/code/game/objects/effects/decals/cleanable/food.dm index 90d737409..0380bb184 100644 --- a/code/game/objects/effects/decals/cleanable/food.dm +++ b/code/game/objects/effects/decals/cleanable/food.dm @@ -33,7 +33,7 @@ /obj/effect/decal/cleanable/food/salt/CanPass(atom/movable/AM, turf/target) if(is_species(AM, /datum/species/snail)) - to_chat(AM, "My path is obstructed by salt.") + to_chat(AM, span_danger("My path is obstructed by salt.")) return FALSE return TRUE diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 37a5f17fc..33ec829ad 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -138,7 +138,7 @@ var/mob/living/carbon/human/H = user if(isflyperson(H)) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) //slurp - H.visible_message("[H] extends a small proboscis into the vomit pool, sucking it with a slurping sound.") + H.visible_message(span_alert("[H] extends a small proboscis into the vomit pool, sucking it with a slurping sound.")) if(reagents) for(var/datum/reagent/R in reagents.reagent_list) if (istype(R, /datum/reagent/consumable)) diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm index e81123069..17898b807 100644 --- a/code/game/objects/effects/decals/cleanable/robots.dm +++ b/code/game/objects/effects/decals/cleanable/robots.dm @@ -59,7 +59,7 @@ /obj/effect/decal/cleanable/oil/attackby(obj/item/I, mob/living/user) var/attacked_by_hot_thing = I.get_temperature() if(attacked_by_hot_thing) - visible_message("[user] tries to ignite [src] with [I]!", "I try to ignite [src] with [I].") + visible_message(span_warning("[user] tries to ignite [src] with [I]!"), span_warning("I try to ignite [src] with [I].")) log_combat(user, src, (attacked_by_hot_thing < 480) ? "tried to ignite" : "ignited", I) fire_act(attacked_by_hot_thing) return @@ -68,7 +68,7 @@ /obj/effect/decal/cleanable/oil/fire_act(added, maxstacks) if(added < 480) return - visible_message("[src] catches fire!") + visible_message(span_danger("[src] catches fire!")) var/turf/T = get_turf(src) qdel(src) new /obj/effect/hotspot(T) diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index e84034292..f07636ce5 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -4,7 +4,7 @@ icon = 'icons/effects/blood.dmi' /obj/effect/decal/remains/acid_act() - visible_message("[src] dissolve[gender==PLURAL?"":"s"] into a puddle of sizzling goop!") + visible_message(span_warning("[src] dissolve[gender==PLURAL?"":"s"] into a puddle of sizzling goop!")) playsound(src, 'sound/blank.ogg', 150, TRUE) new /obj/effect/decal/cleanable/greenglow(drop_location()) qdel(src) diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 5b8eab2ee..60a62d78f 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -287,7 +287,7 @@ return user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src, ATTACK_EFFECT_PUNCH) - to_chat(user, "I hit [src] but bounce off it!") + to_chat(user, span_warning("I hit [src] but bounce off it!")) playsound(src.loc, 'sound/blank.ogg', 100, TRUE) /obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target) @@ -327,7 +327,7 @@ if(!U.welded) U.welded = TRUE U.update_icon() - U.visible_message("[U] sealed shut!") + U.visible_message(span_danger("[U] sealed shut!")) for(var/mob/living/L in O) L.ExtinguishMob() for(var/obj/item/Item in O) diff --git a/code/game/objects/effects/effect_system/effects_other.dm b/code/game/objects/effects/effect_system/effects_other.dm index 24bd966d4..02651a159 100644 --- a/code/game/objects/effects/effect_system/effects_other.dm +++ b/code/game/objects/effects/effect_system/effects_other.dm @@ -102,7 +102,7 @@ /datum/effect_system/reagents_explosion/start() if(explosion_message) - location.visible_message("The solution violently explodes!", \ - "I hear an explosion!") + location.visible_message(span_danger("The solution violently explodes!"), \ + span_hear("I hear an explosion!")) dyn_explosion(location, amount, flashing_factor) diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index 1cc203184..5aa9df428 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -181,7 +181,7 @@ if(!isnull(U.welded) && !U.welded) //must be an unwelded vent pump or vent scrubber. U.welded = TRUE U.update_icon() - U.visible_message("[U] was frozen shut!") + U.visible_message(span_danger("[U] was frozen shut!")) for(var/mob/living/L in T) L.ExtinguishMob() for(var/obj/item/Item in T) diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index a38ae329c..a06790119 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -22,7 +22,7 @@ /turf/open/floor/plating/beach/water)) /obj/structure/glowshroom/fire_act(added, maxstacks) - visible_message("[src] catches fire!") + visible_message(span_warning("[src] catches fire!")) var/turf/T = get_turf(src) qdel(src) new /obj/effect/hotspot(T) @@ -225,7 +225,7 @@ /obj/structure/glowshroom/acid_act(acidpwr, acid_volume) . = 1 - visible_message("[src] melts away!") + visible_message(span_danger("[src] melts away!")) var/obj/effect/decal/cleanable/molten_object/I = new (get_turf(src)) I.desc = "" qdel(src) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 8f8ad5487..21a2ce51e 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -8,7 +8,7 @@ var/triggered = 0 /obj/effect/mine/proc/mineEffect(mob/victim) - to_chat(victim, "*click*") + to_chat(victim, span_danger("*click*")) /obj/effect/mine/Crossed(AM as mob|obj) if(isturf(loc)) @@ -22,7 +22,7 @@ /obj/effect/mine/proc/triggermine(mob/victim) if(triggered) return - visible_message("[victim] sets off [icon2html(src, viewers(src))] [src]!") + visible_message(span_danger("[victim] sets off [icon2html(src, viewers(src))] [src]!")) var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(3, 1, src) s.start() @@ -55,7 +55,7 @@ /obj/effect/mine/kickmine/mineEffect(mob/victim) if(isliving(victim) && victim.client) - to_chat(victim, "I have been kicked FOR NO REISIN!") + to_chat(victim, span_danger("I have been kicked FOR NO REISIN!")) qdel(victim.client) @@ -120,7 +120,7 @@ /obj/effect/mine/pickup/bloodbath/mineEffect(mob/living/carbon/victim) if(!victim.client || !istype(victim)) return - to_chat(victim, "RIP AND TEAR") + to_chat(victim, span_reallybigredtext("RIP AND TEAR")) var/old_color = victim.client.color var/static/list/red_splash = list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0) var/static/list/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0) @@ -136,14 +136,14 @@ chainsaw.attack_self(victim) chainsaw.wield(victim) victim.reagents.add_reagent(/datum/reagent/medicine/adminordrazine,25) - to_chat(victim, "KILL, KILL, KILL! YOU HAVE NO ALLIES ANYMORE, KILL THEM ALL!") + to_chat(victim, span_warning("KILL, KILL, KILL! YOU HAVE NO ALLIES ANYMORE, KILL THEM ALL!")) victim.client.color = pure_red animate(victim.client,color = red_splash, time = 10, easing = SINE_EASING|EASE_OUT) sleep(10) animate(victim.client,color = old_color, time = duration)//, easing = SINE_EASING|EASE_OUT) sleep(duration) - to_chat(victim, "My bloodlust seeps back into the bog of my subconscious and you regain self control.") + to_chat(victim, span_notice("My bloodlust seeps back into the bog of my subconscious and you regain self control.")) qdel(chainsaw) victim.log_message("exited a blood frenzy", LOG_ATTACK) qdel(src) @@ -159,7 +159,7 @@ /obj/effect/mine/pickup/healing/mineEffect(mob/living/carbon/victim) if(!victim.client || !istype(victim)) return - to_chat(victim, "I feel great!") + to_chat(victim, span_notice("I feel great!")) victim.revive(full_heal = TRUE, admin_revive = TRUE) /obj/effect/mine/pickup/speed @@ -171,8 +171,8 @@ /obj/effect/mine/pickup/speed/mineEffect(mob/living/carbon/victim) if(!victim.client || !istype(victim)) return - to_chat(victim, "I feel fast!") + to_chat(victim, span_notice("I feel fast!")) victim.add_movespeed_modifier(MOVESPEED_ID_YELLOW_ORB, update=TRUE, priority=100, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING)) sleep(duration) victim.remove_movespeed_modifier(MOVESPEED_ID_YELLOW_ORB) - to_chat(victim, "I slow down.") + to_chat(victim, span_notice("I slow down.")) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 5495dc5da..f0dd1b572 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -51,7 +51,7 @@ if(istype(mover.pulledby, /mob/living/simple_animal/hostile/poison/giant_spider)) return TRUE if(prob(50) && !HAS_TRAIT(mover, TRAIT_WEBWALK)) - to_chat(mover, "I get stuck in \the [src] for a moment.") + to_chat(mover, span_danger("I get stuck in \the [src] for a moment.")) return FALSE else if(istype(mover, /obj/projectile)) return prob(30) @@ -59,7 +59,7 @@ /obj/structure/spider/stickyweb/fire_act(added, maxstacks) - visible_message("[src] catches fire!") + visible_message(span_warning("[src] catches fire!")) var/turf/T = get_turf(src) qdel(src) new /obj/effect/hotspot(T) @@ -157,7 +157,7 @@ var/obj/machinery/atmospherics/components/unary/vent_pump/exit_vent = pick(vents) if(prob(50)) visible_message("[src] scrambles into the ventilation ducts!", \ - "I hear something scampering through the ventilation ducts.") + span_hear("I hear something scampering through the ventilation ducts.")) spawn(rand(20,60)) forceMove(exit_vent) @@ -170,7 +170,7 @@ return if(prob(50)) - audible_message("I hear something scampering through the ventilation ducts.") + audible_message(span_hear("I hear something scampering through the ventilation ducts.")) sleep(travel_time) if(!exit_vent || exit_vent.welded) @@ -190,7 +190,7 @@ var/target_atom = pick(nearby) walk_to(src, target_atom) if(prob(40)) - src.visible_message("\The [src] skitters[pick(" away"," around","")].") + src.visible_message(span_notice("\The [src] skitters[pick(" away"," around","")].")) else if(prob(10)) //ventcrawl! for(var/obj/machinery/atmospherics/components/unary/vent_pump/v in view(7,src)) @@ -230,8 +230,8 @@ var/breakout_time = 600 user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - to_chat(user, "I struggle against the tight bonds... (This will take about [DisplayTimeText(breakout_time)].)") - visible_message("I see something struggling and writhing in \the [src]!") + to_chat(user, span_notice("I struggle against the tight bonds... (This will take about [DisplayTimeText(breakout_time)].)")) + visible_message(span_notice("I see something struggling and writhing in \the [src]!")) if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src) return @@ -241,7 +241,7 @@ /obj/structure/spider/cocoon/Destroy() var/turf/T = get_turf(src) - src.visible_message("\The [src] splits open.") + src.visible_message(span_warning("\The [src] splits open.")) for(var/atom/movable/A in contents) A.forceMove(T) return ..() diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index c47adfbc2..4e44ecb68 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -36,7 +36,7 @@ /obj/effect/step_trigger/message/Trigger(mob/M) if(M.client) - to_chat(M, "[message]") + to_chat(M, span_info("[message]")) if(once) qdel(src) diff --git a/code/game/objects/examine.dm b/code/game/objects/examine.dm index a7cf56be9..713212406 100644 --- a/code/game/objects/examine.dm +++ b/code/game/objects/examine.dm @@ -12,28 +12,28 @@ var/meme = round(((obj_integrity / max_integrity) * 100), 1) switch(meme) if(0 to 1) - . += "It's broken." + . += span_warning("It's broken.") if(1 to 10) - . += "It's nearly broken." + . += span_warning("It's nearly broken.") if(10 to 30) - . += "It's severely damaged." + . += span_warning("It's severely damaged.") if(30 to 80) - . += "It's damaged." + . += span_warning("It's damaged.") if(80 to 99) - . += "It's a little damaged." + . += span_warning("It's a little damaged.") // if(has_inspect_verb || (obj_integrity < max_integrity)) -// . += "Inspect" +// . += span_notice("Inspect") var/real_value = get_real_price() if(real_value > 0) if(HAS_TRAIT(user, TRAIT_SEEPRICES) || simpleton_price) - . += "Value: [real_value] mammon" + . += span_info("Value: [real_value] mammon") else if(HAS_TRAIT(user, TRAIT_SEEPRICES_SHITTY)) //you can get up to 50% of the value if you have shitty see prices var/static/fumbling_seed = text2num(GLOB.rogue_round_id) var/fumbled_value = max(1, round(real_value + (real_value * clamp(noise_hash(real_value, fumbling_seed) - 0.5, -0.5, 0.5)), 1)) - . += "Value: [fumbled_value] mammon... I think" + . += span_info("Value: [fumbled_value] mammon... I think") // . += "[gender == PLURAL ? "They are" : "It is"] a [weightclass2text(w_class)] item." diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 8b0b79805..1292c6112 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -375,7 +375,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(href_list["inspect"]) if(!usr.canUseTopic(src, be_close=TRUE)) return - var/list/inspec = list("Properties of [src.name]") + var/list/inspec = list(span_notice("Properties of [src.name]")) if(minstr) inspec += "\nMIN.STR: [minstr]" @@ -463,14 +463,14 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(twohands_required) if(user.get_num_arms() < 2) - to_chat(user, "[src] is too bulky to carry in one hand!") + to_chat(user, span_warning("[src] is too bulky to carry in one hand!")) return var/obj/item/twohanded/required/H H = user.get_inactive_held_item() if(get_dist(src,user) > 1) return if(H != null) - to_chat(user, "[src] is too bulky to carry in one hand!") + to_chat(user, span_warning("[src] is too bulky to carry in one hand!")) return if(w_class == WEIGHT_CLASS_GIGANTIC) @@ -488,9 +488,9 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(can_handle_hot) extinguish() - user.visible_message("[user] puts out the fire on [src].") + user.visible_message(span_warning("[user] puts out the fire on [src].")) else - user.visible_message("[user] burns [user.p_their()] hand putting out the fire on [src]!") + user.visible_message(span_warning("[user] burns [user.p_their()] hand putting out the fire on [src]!")) extinguish() var/obj/item/bodypart/affecting = C.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") if(affecting && affecting.receive_damage( 0, 5 )) // 5 burn damage @@ -501,7 +501,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) var/mob/living/carbon/C = user if(istype(C)) if(!C.gloves || (!(C.gloves.resistance_flags & (UNACIDABLE|ACID_PROOF)))) - to_chat(user, "The acid on [src] burns my hand!") + to_chat(user, span_warning("The acid on [src] burns my hand!")) var/obj/item/bodypart/affecting = C.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") if(affecting && affecting.receive_damage( 0, 5 )) // 5 burn damage C.update_damage_overlays() @@ -513,7 +513,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) var/grav = user.has_gravity() if(grav > STANDARD_GRAVITY) var/grav_power = min(3,grav - STANDARD_GRAVITY) - to_chat(user,"I start picking up [src]...") + to_chat(user,span_notice("I start picking up [src]...")) if(!do_mob(user,src,30*grav_power)) return @@ -575,7 +575,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(!A.has_fine_manipulation) if(src in A.contents) // To stop Aliens having items stuck in their pockets A.dropItemToGround(src) - to_chat(user, "My claws aren't capable of such fine manipulation!") + to_chat(user, span_warning("My claws aren't capable of such fine manipulation!")) return attack_paw(A) @@ -597,7 +597,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) /obj/item/proc/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, args) if(prob(final_block_chance)) - owner.visible_message("[owner] blocks [attack_text] with [src]!") + owner.visible_message(span_danger("[owner] blocks [attack_text] with [src]!")) return 1 return 0 @@ -689,7 +689,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) /obj/item/proc/mob_can_equip(mob/living/M, mob/living/equipper, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE) if(twohands_required) if(!disable_warning) - to_chat(M, "[src] is too bulky to carry with anything but my hands!") + to_chat(M, span_warning("[src] is too bulky to carry with anything but my hands!")) return 0 if(!M) @@ -733,15 +733,15 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(M.is_eyes_covered()) // you can't stab someone in the eyes wearing a mask! - to_chat(user, "You're going to need to remove [M.p_their()] eye protection first!") + to_chat(user, span_warning("You're going to need to remove [M.p_their()] eye protection first!")) return if(isalien(M))//Aliens don't have eyes./N slimes also don't have eyes! - to_chat(user, "I cannot locate any eyes on this creature!") + to_chat(user, span_warning("I cannot locate any eyes on this creature!")) return if(isbrain(M)) - to_chat(user, "I cannot locate any organic eyes on this brain!") + to_chat(user, span_warning("I cannot locate any organic eyes on this brain!")) return src.add_fingerprint(user) @@ -751,12 +751,12 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) user.do_attack_animation(M) if(M != user) - M.visible_message("[user] has stabbed [M] in the eye with [src]!", \ - "[user] stabs you in the eye with [src]!") + M.visible_message(span_danger("[user] has stabbed [M] in the eye with [src]!"), \ + span_danger("[user] stabs you in the eye with [src]!")) else user.visible_message( \ - "[user] has stabbed [user.p_them()]self in the eyes with [src]!", \ - "I stab myself in the eyes with [src]!" \ + span_danger("[user] has stabbed [user.p_them()]self in the eyes with [src]!"), \ + span_danger("I stab myself in the eyes with [src]!") \ ) if(is_human_victim) var/mob/living/carbon/human/U = M @@ -777,20 +777,20 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(eyes.damage >= 10) M.adjust_blurriness(15) if(M.stat != DEAD) - to_chat(M, "My eyes start to bleed profusely!") + to_chat(M, span_danger("My eyes start to bleed profusely!")) if(!(HAS_TRAIT(M, TRAIT_BLIND) || HAS_TRAIT(M, TRAIT_NEARSIGHT))) - to_chat(M, "I become nearsighted!") + to_chat(M, span_danger("I become nearsighted!")) M.become_nearsighted(EYE_DAMAGE) if(prob(50)) if(M.stat != DEAD) if(M.drop_all_held_items()) - to_chat(M, "I drop what you're holding and clutch at my eyes!") + to_chat(M, span_danger("I drop what you're holding and clutch at my eyes!")) M.adjust_blurriness(10) M.Unconscious(20) M.Paralyze(40) if (prob(eyes.damage - 10 + 1)) M.become_blind(EYE_DAMAGE) - to_chat(M, "I go blind!") + to_chat(M, span_danger("I go blind!")) /obj/item/singularity_pull(S, current_size) ..() @@ -955,7 +955,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) /obj/item/proc/ignition_effect(atom/A, mob/user) if(get_temperature()) - . = "[user] lights [A] with [src]." + . = span_notice("[user] lights [A] with [src].") else . = "" @@ -1161,7 +1161,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(!wielded) return if(show_message) - to_chat(user, "I drop [src].") + to_chat(user, span_notice("I drop [src].")) show_message = FALSE if(wielded) wielded = FALSE @@ -1179,7 +1179,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) else user.update_inv_hands() if(show_message) - to_chat(user, "I wield [src] normally.") + to_chat(user, span_notice("I wield [src] normally.")) if(user.get_active_held_item() == src) user.update_a_intents() return @@ -1189,7 +1189,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) return altgripped = TRUE update_transform() - to_chat(user, "I wield [src] with an alternate grip") + to_chat(user, span_notice("I wield [src] with an alternate grip")) if(user.get_active_held_item() == src) if(alt_intents) user.update_a_intents() @@ -1198,17 +1198,17 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(wielded) return if(user.get_inactive_held_item()) - to_chat(user, "I need a free hand first.") + to_chat(user, span_warning("I need a free hand first.")) return if(user.get_num_arms() < 2) - to_chat(user, "I don't have enough hands.") + to_chat(user, span_warning("I don't have enough hands.")) return wielded = TRUE if(force_wielded) force = force_wielded wdefense = wdefense + 3 update_transform() - to_chat(user, "I wield [src] with both hands.") + to_chat(user, span_notice("I wield [src] with both hands.")) playsound(loc, pick('sound/combat/weaponr1.ogg','sound/combat/weaponr2.ogg'), 100, TRUE) var/obj/item/twohanded/offhand/O = new(user) ////Let's reserve his other hand~ O.name = "[name] - offhand" diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm index 7127c89a4..e76558d3a 100644 --- a/code/game/objects/items/AI_modules.dm +++ b/code/game/objects/items/AI_modules.dm @@ -42,7 +42,7 @@ AI MODULES //The proc other things should be calling /obj/item/aiModule/proc/install(datum/ai_laws/law_datum, mob/user) if(!bypass_law_amt_check && (!laws.len || laws[1] == "")) //So we don't loop trough an empty list and end up with runtimes. - to_chat(user, "ERROR: No laws found on board.") + to_chat(user, span_warning("ERROR: No laws found on board.")) return var/overflow = FALSE @@ -54,16 +54,16 @@ AI MODULES if(mylaw != "") tot_laws++ if(tot_laws > CONFIG_GET(number/silicon_max_law_amount) && !bypass_law_amt_check)//allows certain boards to avoid this check, eg: reset - to_chat(user, "Not enough memory allocated to [law_datum.owner ? law_datum.owner : "the AI core"]'s law processor to handle this amount of laws.") + to_chat(user, span_alert("Not enough memory allocated to [law_datum.owner ? law_datum.owner : "the AI core"]'s law processor to handle this amount of laws.")) message_admins("[ADMIN_LOOKUPFLW(user)] tried to upload laws to [law_datum.owner ? ADMIN_LOOKUPFLW(law_datum.owner) : "an AI core"] that would exceed the law cap.") overflow = TRUE var/law2log = transmitInstructions(law_datum, user, overflow) //Freeforms return something extra we need to log if(law_datum.owner) - to_chat(user, "Upload complete. [law_datum.owner]'s laws have been modified.") + to_chat(user, span_notice("Upload complete. [law_datum.owner]'s laws have been modified.")) law_datum.owner.law_change_counter++ else - to_chat(user, "Upload complete.") + to_chat(user, span_notice("Upload complete.")) var/time = time2text(world.realtime,"hh:mm:ss") var/ainame = law_datum.owner ? law_datum.owner.name : "empty AI core" @@ -75,7 +75,7 @@ AI MODULES //The proc that actually changes the silicon's laws. /obj/item/aiModule/proc/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow = FALSE) if(law_datum.owner) - to_chat(law_datum.owner, "[sender] has uploaded a change to the laws you must follow using a [name].") + to_chat(law_datum.owner, span_danger("[sender] has uploaded a change to the laws you must follow using a [name].")) /******************** Modules ********************/ @@ -161,7 +161,7 @@ AI MODULES /obj/item/aiModule/supplied/safeguard/install(datum/ai_laws/law_datum, mob/user) if(!targetName) - to_chat(user, "No name detected on module, please enter one.") + to_chat(user, span_alert("No name detected on module, please enter one.")) return 0 ..() @@ -187,7 +187,7 @@ AI MODULES /obj/item/aiModule/zeroth/oneHuman/install(datum/ai_laws/law_datum, mob/user) if(!targetName) - to_chat(user, "No name detected on module, please enter one.") + to_chat(user, span_alert("No name detected on module, please enter one.")) return 0 ..() @@ -242,7 +242,7 @@ AI MODULES if(!targName) return if(CHAT_FILTER_CHECK(targName)) - to_chat(user, "Error: Law contains invalid text.") // AI LAW 2 SAY U W U WITHOUT THE SPACES + to_chat(user, span_warning("Error: Law contains invalid text.")) // AI LAW 2 SAY U W U WITHOUT THE SPACES return laws[1] = targName ..() @@ -253,7 +253,7 @@ AI MODULES /obj/item/aiModule/supplied/freeform/install(datum/ai_laws/law_datum, mob/user) if(laws[1] == "") - to_chat(user, "No law detected on module, please create one.") + to_chat(user, span_alert("No law detected on module, please create one.")) return 0 ..() @@ -271,15 +271,15 @@ AI MODULES if(lawpos == null) return if(lawpos <= 0) - to_chat(user, "Error: The law number of [lawpos] is invalid.") + to_chat(user, span_warning("Error: The law number of [lawpos] is invalid.")) lawpos = 1 return - to_chat(user, "Law [lawpos] selected.") + to_chat(user, span_notice("Law [lawpos] selected.")) ..() /obj/item/aiModule/remove/install(datum/ai_laws/law_datum, mob/user) if(lawpos > (law_datum.get_law_amount(list(LAW_INHERENT = 1, LAW_SUPPLIED = 1)))) - to_chat(user, "There is no law [lawpos] to delete!") + to_chat(user, span_warning("There is no law [lawpos] to delete!")) return ..() @@ -449,7 +449,7 @@ AI MODULES if(!targName) return if(CHAT_FILTER_CHECK(targName)) - to_chat(user, "Error: Law contains invalid text.") + to_chat(user, span_warning("Error: Law contains invalid text.")) return laws[1] = targName ..() @@ -471,7 +471,7 @@ AI MODULES if(!targName) return if(CHAT_FILTER_CHECK(targName)) // not even the syndicate can uwu - to_chat(user, "Error: Law contains invalid text.") + to_chat(user, span_warning("Error: Law contains invalid text.")) return laws[1] = targName ..() @@ -479,7 +479,7 @@ AI MODULES /obj/item/aiModule/syndicate/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) // ..() //We don't want this module reporting to the AI who dun it. --NEO if(law_datum.owner) - to_chat(law_datum.owner, "BZZZZT") + to_chat(law_datum.owner, span_warning("BZZZZT")) if(!overflow) law_datum.owner.add_hacked_law(laws[1]) else @@ -503,7 +503,7 @@ AI MODULES /obj/item/aiModule/toyAI/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) //..() if(law_datum.owner) - to_chat(law_datum.owner, "BZZZZT") + to_chat(law_datum.owner, span_warning("BZZZZT")) if(!overflow) law_datum.owner.add_ion_law(laws[1]) else @@ -517,9 +517,9 @@ AI MODULES /obj/item/aiModule/toyAI/attack_self(mob/user) laws[1] = generate_ion_law() - to_chat(user, "I press the button on [src].") + to_chat(user, span_notice("I press the button on [src].")) playsound(user, 'sound/blank.ogg', 20, TRUE) - src.loc.visible_message("[icon2html(src, viewers(loc))] [laws[1]]") + src.loc.visible_message(span_warning("[icon2html(src, viewers(loc))] [laws[1]]")) /******************** Mother Drone ******************/ diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index e1d3b0938..00d4d9d26 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -33,7 +33,7 @@ RLD var/plasteelmultiplier = 3 //Plasteel is worth 3 times more than glass or metal var/plasmarglassmultiplier = 2 //50% less plasma than in plasteel var/rglassmultiplier = 1.5 //One metal sheet, half a glass sheet - var/no_ammo_message = "The \'Low Ammo\' light on the device blinks yellow." + var/no_ammo_message = span_warning("The \'Low Ammo\' light on the device blinks yellow.") var/has_ammobar = FALSE //controls whether or not does update_icon apply ammo indicator overlays var/ammo_sections = 10 //amount of divisions in the ammo indicator overlay/number of ammo indicator states var/upgrade = FALSE @@ -69,7 +69,7 @@ RLD var/obj/item/rcd_ammo/R = W var/load = min(R.ammoamt, max_matter - matter) if(load <= 0) - to_chat(user, "[src] can't hold any more matter-units!") + to_chat(user, span_warning("[src] can't hold any more matter-units!")) return R.ammoamt -= load if(R.ammoamt <= 0) @@ -90,7 +90,7 @@ RLD else if(istype(W, /obj/item/stack/tile/plasteel)) loaded = loadwithsheets(W, sheetmultiplier * 0.25, user) // 1 matter for 1 floortile, as 4 tiles are produced from 1 metal if(loaded) - to_chat(user, "[src] now holds [matter]/[max_matter] matter-units.") + to_chat(user, span_notice("[src] now holds [matter]/[max_matter] matter-units.")) else if(istype(W, /obj/item/rcd_upgrade)) var/obj/item/rcd_upgrade/rcd_up = W if(!(upgrade & rcd_up.upgrade)) @@ -110,9 +110,9 @@ RLD S.use(amount_to_use) matter += value*amount_to_use playsound(src.loc, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I insert [amount_to_use] [S.name] sheets into [src]. ") + to_chat(user, span_notice("I insert [amount_to_use] [S.name] sheets into [src]. ")) return 1 - to_chat(user, "I can't insert any more [S.name] sheets into [src]!") + to_chat(user, span_warning("I can't insert any more [S.name] sheets into [src]!")) return 0 /obj/item/construction/proc/activate() @@ -135,7 +135,7 @@ RLD else if(silo_mats.on_hold()) if(user) - to_chat(user, "Mineral access is on hold, please contact the quartermaster.") + to_chat(user, span_alert("Mineral access is on hold, please contact the quartermaster.")) return FALSE if(!silo_mats.mat_container.has_materials(list(/datum/material/iron = 500), amount)) if(user) @@ -152,7 +152,7 @@ RLD else if(silo_mats.on_hold()) if(user) - to_chat(user, "Mineral access is on hold, please contact the quartermaster.") + to_chat(user, span_alert("Mineral access is on hold, please contact the quartermaster.")) return FALSE . = silo_mats.mat_container.has_materials(list(/datum/material/iron = 500), amount) if(!. && user) @@ -163,7 +163,7 @@ RLD /obj/item/construction/proc/range_check(atom/A, mob/user) if(!(A in view(7, get_turf(user)))) - to_chat(user, "The \'Out of Range\' light on [src] blinks red.") + to_chat(user, span_warning("The \'Out of Range\' light on [src] blinks red.")) return FALSE else return TRUE @@ -204,7 +204,7 @@ RLD var/canRturf = FALSE //Variable for R walls to deconstruct them /obj/item/construction/rcd/suicide_act(mob/user) - user.visible_message("[user] sets the RCD to 'Wall' and points it down [user.p_their()] throat! It looks like [user.p_theyre()] trying to commit suicide..") + user.visible_message(span_suicide("[user] sets the RCD to 'Wall' and points it down [user.p_their()] throat! It looks like [user.p_theyre()] trying to commit suicide..")) return (BRUTELOSS) /obj/item/construction/rcd/verb/toggle_window_type_verb() @@ -226,14 +226,14 @@ RLD window_type = /obj/structure/window/fulltile window_type_name = "glass" - to_chat(user, "I change \the [src]'s window mode to [window_type_name].") + to_chat(user, span_notice("I change \the [src]'s window mode to [window_type_name].")) /obj/item/construction/rcd/proc/toggle_silo_link(mob/user) if(silo_mats) silo_link = !silo_link - to_chat(user, "I change \the [src]'s storage link state: [silo_link ? "ON" : "OFF"].") + to_chat(user, span_notice("I change \the [src]'s storage link state: [silo_link ? "ON" : "OFF"].")) else - to_chat(user, "\the [src] dont have remote storage connection.") + to_chat(user, span_warning("\the [src] dont have remote storage connection.")) /obj/item/construction/rcd/proc/change_airlock_access(mob/user) @@ -549,7 +549,7 @@ RLD else return playsound(src, 'sound/blank.ogg', 50, FALSE) - to_chat(user, "I change RCD's mode to '[choice]'.") + to_chat(user, span_notice("I change RCD's mode to '[choice]'.")) /obj/item/construction/rcd/proc/target_check(atom/A, mob/user) // only returns true for stuff the device can actually work with if((isturf(A) && A.density && mode==RCD_DECONSTRUCT) || (isturf(A) && !A.density) || (istype(A, /obj/machinery/door/airlock) && mode==RCD_DECONSTRUCT) || istype(A, /obj/structure/grille) || (istype(A, /obj/structure/window) && mode==RCD_DECONSTRUCT) || istype(A, /obj/structure/girder)) @@ -586,7 +586,7 @@ RLD update_icon() /obj/item/construction/rcd/borg - no_ammo_message = "Insufficient charge." + no_ammo_message = span_warning("Insufficient charge.") desc = "" canRturf = TRUE var/energyfactor = 72 @@ -725,13 +725,13 @@ RLD switch(mode) if(REMOVE_MODE) mode = LIGHT_MODE - to_chat(user, "I change RLD's mode to 'Permanent Light Construction'.") + to_chat(user, span_notice("I change RLD's mode to 'Permanent Light Construction'.")) if(LIGHT_MODE) mode = GLOW_MODE - to_chat(user, "I change RLD's mode to 'Light Launcher'.") + to_chat(user, span_notice("I change RLD's mode to 'Light Launcher'.")) if(GLOW_MODE) mode = REMOVE_MODE - to_chat(user, "I change RLD's mode to 'Deconstruct'.") + to_chat(user, span_notice("I change RLD's mode to 'Deconstruct'.")) /obj/item/construction/rld/proc/checkdupes(target) @@ -751,7 +751,7 @@ RLD if(REMOVE_MODE) if(istype(A, /obj/machinery/light/)) if(checkResource(deconcost, user)) - to_chat(user, "I start deconstructing [A]...") + to_chat(user, span_notice("I start deconstructing [A]...")) user.Beam(A,icon_state="nzcrentrs_power",time=15) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) if(do_after(user, decondelay, target = A)) @@ -765,7 +765,7 @@ RLD if(iswallturf(A)) var/turf/closed/wall/W = A if(checkResource(floorcost, user)) - to_chat(user, "I start building a wall light...") + to_chat(user, span_notice("I start building a wall light...")) user.Beam(A,icon_state="nzcrentrs_power",time=15) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) playsound(src.loc, 'sound/blank.ogg', 50, FALSE) @@ -781,7 +781,7 @@ RLD if(start.CanAtmosPass(C) && !dupes.len) candidates += C if(!candidates.len) - to_chat(user, "Valid target not found...") + to_chat(user, span_warning("Valid target not found...")) playsound(src.loc, 'sound/blank.ogg', 30, TRUE) return FALSE for(var/turf/open/O in candidates) @@ -811,7 +811,7 @@ RLD if(isfloorturf(A)) var/turf/open/floor/F = A if(checkResource(floorcost, user)) - to_chat(user, "I start building a floor light...") + to_chat(user, span_notice("I start building a floor light...")) user.Beam(A,icon_state="nzcrentrs_power",time=15) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) @@ -831,7 +831,7 @@ RLD if(GLOW_MODE) if(useResource(launchcost, user)) activate() - to_chat(user, "I fire a glowstick!") + to_chat(user, span_notice("I fire a glowstick!")) var/obj/item/flashlight/glowstick/G = new /obj/item/flashlight/glowstick(start) G.color = color_choice G.light_color = G.color @@ -876,7 +876,7 @@ RLD blueprint = name_to_type[choice] playsound(src, 'sound/blank.ogg', 50, FALSE) - to_chat(user, "I change [name]s blueprint to '[choice]'.") + to_chat(user, span_notice("I change [name]s blueprint to '[choice]'.")) ///pretty much rcd_create, but named differently to make myself feel less bad for copypasting from a sibling-type /obj/item/construction/plumbing/proc/create_machine(atom/A, mob/user) @@ -907,7 +907,7 @@ RLD if(istype(A, /obj/machinery/plumbing)) var/obj/machinery/plumbing/P = A if(P.anchored) - to_chat(user, "The [P.name] needs to be unanchored!") + to_chat(user, span_warning("The [P.name] needs to be unanchored!")) return if(do_after(user, 20, target = P)) P.deconstruct() //Let's not substract matter diff --git a/code/game/objects/items/RCL.dm b/code/game/objects/items/RCL.dm index d80f742d5..2f11f96b6 100644 --- a/code/game/objects/items/RCL.dm +++ b/code/game/objects/items/RCL.dm @@ -29,7 +29,7 @@ if(!loaded) if(!user.transferItemToLoc(W, src)) - to_chat(user, "[src] is stuck to your hand!") + to_chat(user, span_warning("[src] is stuck to your hand!")) return else loaded = W //W.loc is src at this point. @@ -43,12 +43,12 @@ else return update_icon() - to_chat(user, "I add the pipe cleaners to [src]. It now contains [loaded.amount].") + to_chat(user, span_notice("I add the pipe cleaners to [src]. It now contains [loaded.amount].")) else if(W.tool_behaviour == TOOL_SCREWDRIVER) if(!loaded) return if(ghetto && prob(10)) //Is it a ghetto RCL? If so, give it a 10% chance to fall apart - to_chat(user, "I attempt to loosen the securing screws on the side, but it falls apart!") + to_chat(user, span_warning("I attempt to loosen the securing screws on the side, but it falls apart!")) while(loaded.amount > 30) //There are only two kinds of situations: "nodiff" (60,90), or "diff" (31-59, 61-89) var/diff = loaded.amount % 30 if(diff) @@ -60,7 +60,7 @@ qdel(src) return - to_chat(user, "I loosen the securing screws on the side, allowing you to lower the guiding edge and retrieve the wires.") + to_chat(user, span_notice("I loosen the securing screws on the side, allowing you to lower the guiding edge and retrieve the wires.")) while(loaded.amount > 30) //There are only two kinds of situations: "nodiff" (60,90), or "diff" (31-59, 61-89) var/diff = loaded.amount % 30 if(diff) @@ -81,7 +81,7 @@ /obj/item/twohanded/rcl/examine(mob/user) . = ..() if(loaded) - . += "It contains [loaded.amount]/[max_amount] pipe cleaners." + . += span_info("It contains [loaded.amount]/[max_amount] pipe cleaners.") /obj/item/twohanded/rcl/Destroy() QDEL_NULL(loaded) @@ -113,7 +113,7 @@ update_icon() if(!loaded || !loaded.amount) if(loud) - to_chat(user, "The last of the pipe cleaners unreel from [src].") + to_chat(user, span_notice("The last of the pipe cleaners unreel from [src].")) if(loaded) QDEL_NULL(loaded) loaded = null @@ -166,11 +166,11 @@ if(!isturf(user.loc)) return if(is_empty(user, 0)) - to_chat(user, "\The [src] is empty!") + to_chat(user, span_warning("\The [src] is empty!")) return if(prob(2) && ghetto) //Give ghetto RCLs a 2% chance to jam, requiring it to be reactviated manually. - to_chat(user, "[src]'s wires jam!") + to_chat(user, span_warning("[src]'s wires jam!")) active = FALSE return else @@ -259,7 +259,7 @@ if(!isturf(user.loc)) return if(is_empty(user, 0)) - to_chat(user, "\The [src] is empty!") + to_chat(user, span_warning("\The [src] is empty!")) return var/turf/T = get_turf(user) diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 366a1072a..dcfd44f93 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -229,7 +229,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( ui_interact(user) /obj/item/pipe_dispenser/suicide_act(mob/user) - user.visible_message("[user] points the end of the RPD down [user.p_their()] throat and presses a button! It looks like [user.p_theyre()] trying to commit suicide...") + user.visible_message(span_suicide("[user] points the end of the RPD down [user.p_their()] throat and presses a button! It looks like [user.p_theyre()] trying to commit suicide...")) playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE) playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE) return(BRUTELOSS) @@ -343,7 +343,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( . = TRUE if((mode&DESTROY_MODE) && istype(A, /obj/item/pipe) || istype(A, /obj/structure/disposalconstruct) || istype(A, /obj/structure/c_transit_tube) || istype(A, /obj/structure/c_transit_tube_pod) || istype(A, /obj/item/pipe_meter)) - to_chat(user, "I start destroying a pipe...") + to_chat(user, span_notice("I start destroying a pipe...")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) if(do_after(user, destroy_speed, target = A)) activate() @@ -353,19 +353,19 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( if((mode&PAINT_MODE)) if(istype(A, /obj/machinery/atmospherics/pipe) && !istype(A, /obj/machinery/atmospherics/pipe/layer_manifold)) var/obj/machinery/atmospherics/pipe/P = A - to_chat(user, "I start painting \the [P] [paint_color]...") + to_chat(user, span_notice("I start painting \the [P] [paint_color]...")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) if(do_after(user, paint_speed, target = A)) P.paint(GLOB.pipe_paint_colors[paint_color]) //paint the pipe - user.visible_message("[user] paints \the [P] [paint_color].","I paint \the [P] [paint_color].") + user.visible_message(span_notice("[user] paints \the [P] [paint_color]."),span_notice("I paint \the [P] [paint_color].")) return var/obj/item/pipe/P = A if(istype(P) && findtext("[P.pipe_type]", "/obj/machinery/atmospherics/pipe") && !findtext("[P.pipe_type]", "layer_manifold")) - to_chat(user, "I start painting \the [A] [paint_color]...") + to_chat(user, span_notice("I start painting \the [A] [paint_color]...")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) if(do_after(user, paint_speed, target = A)) A.add_atom_colour(GLOB.pipe_paint_colors[paint_color], FIXED_COLOUR_PRIORITY) //paint the pipe - user.visible_message("[user] paints \the [A] [paint_color].","I paint \the [A] [paint_color].") + user.visible_message(span_notice("[user] paints \the [A] [paint_color]."),span_notice("I paint \the [A] [paint_color].")) return if(mode&BUILD_MODE) @@ -375,7 +375,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( return ..() playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) if (recipe.type == /datum/pipe_info/meter) - to_chat(user, "I start building a meter...") + to_chat(user, span_notice("I start building a meter...")) if(do_after(user, atmos_build_speed, target = A)) activate() var/obj/item/pipe_meter/PM = new /obj/item/pipe_meter(get_turf(A)) @@ -383,7 +383,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( if(mode&WRENCH_MODE) PM.wrench_act(user, src) else - to_chat(user, "I start building a pipe...") + to_chat(user, span_notice("I start building a pipe...")) if(do_after(user, atmos_build_speed, target = A)) activate() var/obj/machinery/atmospherics/path = queued_p_type @@ -407,15 +407,15 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( return ..() A = get_turf(A) if(isclosedturf(A)) - to_chat(user, "[src]'s error light flickers; there's something in the way!") + to_chat(user, span_warning("[src]'s error light flickers; there's something in the way!")) return - to_chat(user, "I start building a disposals pipe...") + to_chat(user, span_notice("I start building a disposals pipe...")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) if(do_after(user, disposal_build_speed, target = A)) var/obj/structure/disposalconstruct/C = new (A, queued_p_type, queued_p_dir, queued_p_flipped) if(!C.can_place()) - to_chat(user, "There's not enough room to build that here!") + to_chat(user, span_warning("There's not enough room to build that here!")) qdel(C) return @@ -432,9 +432,9 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( return ..() A = get_turf(A) if(isclosedturf(A)) - to_chat(user, "[src]'s error light flickers; there's something in the way!") + to_chat(user, span_warning("[src]'s error light flickers; there's something in the way!")) return - to_chat(user, "I start building a transit tube...") + to_chat(user, span_notice("I start building a transit tube...")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) if(do_after(user, transit_build_speed, target = A)) activate() diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm index bfc803b45..4f5457a78 100644 --- a/code/game/objects/items/RSF.dm +++ b/code/game/objects/items/RSF.dm @@ -21,7 +21,7 @@ RSF /obj/item/rsf/examine(mob/user) . = ..() - . += "It currently holds [matter]/30 fabrication-units." + . += span_notice("It currently holds [matter]/30 fabrication-units.") /obj/item/rsf/cyborg matter = 30 @@ -29,12 +29,12 @@ RSF /obj/item/rsf/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/rcd_ammo)) if((matter + 10) > 30) - to_chat(user, "The RSF can't hold any more matter!") + to_chat(user, span_warning("The RSF can't hold any more matter!")) return qdel(W) matter += 10 playsound(src.loc, 'sound/blank.ogg', 10, TRUE) - to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + to_chat(user, span_notice("The RSF now holds [matter]/30 fabrication-units.")) else return ..() @@ -43,19 +43,19 @@ RSF switch(mode) if(5) mode = 1 - to_chat(user, "Changed dispensing mode to 'Drinking Glass'.") + to_chat(user, span_notice("Changed dispensing mode to 'Drinking Glass'.")) if(1) mode = 2 - to_chat(user, "Changed dispensing mode to 'Paper'.") + to_chat(user, span_notice("Changed dispensing mode to 'Paper'.")) if(2) mode = 3 - to_chat(user, "Changed dispensing mode to 'Pen'.") + to_chat(user, span_notice("Changed dispensing mode to 'Pen'.")) if(3) mode = 4 - to_chat(user, "Changed dispensing mode to 'Dice Pack'.") + to_chat(user, span_notice("Changed dispensing mode to 'Dice Pack'.")) if(4) mode = 5 - to_chat(user, "Changed dispensing mode to 'Cigarette'.") + to_chat(user, span_notice("Changed dispensing mode to 'Cigarette'.")) // Change mode /obj/item/rsf/afterattack(atom/A, mob/user, proximity) @@ -68,33 +68,33 @@ RSF if(iscyborg(user)) var/mob/living/silicon/robot/R = user if(!R.cell || R.cell.charge < 200) - to_chat(user, "I do not have enough power to use [src].") + to_chat(user, span_warning("I do not have enough power to use [src].")) return else if (matter < 1) - to_chat(user, "\The [src] doesn't have enough matter left.") + to_chat(user, span_warning("\The [src] doesn't have enough matter left.")) return var/turf/T = get_turf(A) playsound(src.loc, 'sound/blank.ogg', 10, TRUE) switch(mode) if(1) - to_chat(user, "Dispensing Drinking Glass...") + to_chat(user, span_notice("Dispensing Drinking Glass...")) new /obj/item/reagent_containers/food/drinks/drinkingglass(T) use_matter(20, user) if(2) - to_chat(user, "Dispensing Paper Sheet...") + to_chat(user, span_notice("Dispensing Paper Sheet...")) new /obj/item/paper(T) use_matter(10, user) if(3) - to_chat(user, "Dispensing Pen...") + to_chat(user, span_notice("Dispensing Pen...")) new /obj/item/pen(T) use_matter(50, user) if(4) - to_chat(user, "Dispensing Dice Pack...") + to_chat(user, span_notice("Dispensing Dice Pack...")) new /obj/item/storage/pill_bottle/dice(T) use_matter(200, user) if(5) - to_chat(user, "Dispensing Cigarette...") + to_chat(user, span_notice("Dispensing Cigarette...")) new /obj/item/clothing/mask/cigarette(T) use_matter(10, user) @@ -104,7 +104,7 @@ RSF R.cell.charge -= charge else matter-- - to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + to_chat(user, span_notice("The RSF now holds [matter]/30 fabrication-units.")) /obj/item/cookiesynth name = "Cookie Synthesizer" @@ -121,7 +121,7 @@ RSF /obj/item/cookiesynth/examine(mob/user) . = ..() - . += "It currently holds [matter]/10 cookie-units." + . += span_notice("It currently holds [matter]/10 cookie-units.") /obj/item/cookiesynth/attackby() return @@ -129,9 +129,9 @@ RSF /obj/item/cookiesynth/emag_act(mob/user) obj_flags ^= EMAGGED if(obj_flags & EMAGGED) - to_chat(user, "I short out [src]'s reagent safety checker!") + to_chat(user, span_warning("I short out [src]'s reagent safety checker!")) else - to_chat(user, "I reset [src]'s reagent safety checker!") + to_chat(user, span_warning("I reset [src]'s reagent safety checker!")) toxin = 0 /obj/item/cookiesynth/attack_self(mob/user) @@ -140,13 +140,13 @@ RSF P = user if((obj_flags & EMAGGED)&&!toxin) toxin = 1 - to_chat(user, "Cookie Synthesizer hacked.") + to_chat(user, span_alert("Cookie Synthesizer hacked.")) else if(P.emagged&&!toxin) toxin = 1 - to_chat(user, "Cookie Synthesizer hacked.") + to_chat(user, span_alert("Cookie Synthesizer hacked.")) else toxin = 0 - to_chat(user, "Cookie Synthesizer reset.") + to_chat(user, span_notice("Cookie Synthesizer reset.")) /obj/item/cookiesynth/process() if(matter < 10) @@ -161,16 +161,16 @@ RSF if (!(istype(A, /obj/structure/table) || isfloorturf(A))) return if(matter < 1) - to_chat(user, "[src] doesn't have enough matter left. Wait for it to recharge!") + to_chat(user, span_warning("[src] doesn't have enough matter left. Wait for it to recharge!")) return if(iscyborg(user)) var/mob/living/silicon/robot/R = user if(!R.cell || R.cell.charge < 400) - to_chat(user, "I do not have enough power to use [src].") + to_chat(user, span_warning("I do not have enough power to use [src].")) return var/turf/T = get_turf(A) playsound(src.loc, 'sound/blank.ogg', 10, TRUE) - to_chat(user, "Fabricating Cookie...") + to_chat(user, span_notice("Fabricating Cookie...")) var/obj/item/reagent_containers/food/snacks/cookie/S = new /obj/item/reagent_containers/food/snacks/cookie(T) if(toxin) S.reagents.add_reagent(/datum/reagent/toxin/chloralhydrate, 10) diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index 790699a00..e00730ad5 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -35,10 +35,10 @@ //because you're expecting user input. /obj/item/airlock_painter/proc/can_use(mob/user) if(!ink) - to_chat(user, "There is no toner cartridge installed in [src]!") + to_chat(user, span_warning("There is no toner cartridge installed in [src]!")) return 0 else if(ink.charges < 1) - to_chat(user, "[src] is out of ink!") + to_chat(user, span_warning("[src] is out of ink!")) return 0 else return 1 @@ -47,7 +47,7 @@ var/obj/item/organ/lungs/L = user.getorganslot(ORGAN_SLOT_LUNGS) if(can_use(user) && L) - user.visible_message("[user] is inhaling toner from [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is inhaling toner from [src]! It looks like [user.p_theyre()] trying to commit suicide!")) use(user) // Once you've inhaled the toner, you throw up your lungs @@ -73,27 +73,27 @@ // TODO maybe add some colorful vomit? - user.visible_message("[user] vomits out [user.p_their()] [L]!") + user.visible_message(span_suicide("[user] vomits out [user.p_their()] [L]!")) playsound(user.loc, 'sound/blank.ogg', 50, TRUE) L.forceMove(T) return (TOXLOSS|OXYLOSS) else if(can_use(user) && !L) - user.visible_message("[user] is spraying toner on [user.p_them()]self from [src]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message(span_suicide("[user] is spraying toner on [user.p_them()]self from [src]! It looks like [user.p_theyre()] trying to commit suicide.")) user.reagents.add_reagent(/datum/reagent/colorful_reagent, 1) user.reagents.reaction(user, TOUCH, 1) return TOXLOSS else - user.visible_message("[user] is trying to inhale toner from [src]! It might be a suicide attempt if [src] had any toner.") + user.visible_message(span_suicide("[user] is trying to inhale toner from [src]! It might be a suicide attempt if [src] had any toner.")) return SHAME /obj/item/airlock_painter/examine(mob/user) . = ..() if(!ink) - . += "It doesn't have a toner cartridge installed." + . += span_notice("It doesn't have a toner cartridge installed.") return var/ink_level = "high" if(ink.charges < 1) @@ -102,17 +102,17 @@ ink_level = "low" else if((ink.charges/ink.max_charges) > 1) //Over 100% (admin var edit) ink_level = "dangerously high" - . += "Its ink levels look [ink_level]." + . += span_notice("Its ink levels look [ink_level].") /obj/item/airlock_painter/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/toner)) if(ink) - to_chat(user, "[src] already contains \a [ink]!") + to_chat(user, span_warning("[src] already contains \a [ink]!")) return if(!user.transferItemToLoc(W, src)) return - to_chat(user, "I install [W] into [src].") + to_chat(user, span_notice("I install [W] into [src].")) ink = W playsound(src.loc, 'sound/blank.ogg', 50, TRUE) else @@ -123,5 +123,5 @@ playsound(src.loc, 'sound/blank.ogg', 50, TRUE) ink.forceMove(user.drop_location()) user.put_in_hands(ink) - to_chat(user, "I remove [ink] from [src].") + to_chat(user, span_notice("I remove [ink] from [src].")) ink = null diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index 743fef18a..0ccb6fc73 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -19,13 +19,13 @@ var/turf/T = get_turf(user) var/area/A = get_area(T) if(!isfloorturf(T)) - to_chat(user, "I cannot place [src] on this spot!") + to_chat(user, span_warning("I cannot place [src] on this spot!")) return if(A.always_unpowered) - to_chat(user, "I cannot place [src] in this area!") + to_chat(user, span_warning("I cannot place [src] in this area!")) return if(gotwallitem(T, ndir, inverse*2)) - to_chat(user, "There's already an item on this wall!") + to_chat(user, span_warning("There's already an item on this wall!")) return return TRUE @@ -33,9 +33,9 @@ /obj/item/wallframe/proc/attach(turf/on_wall, mob/user) if(result_path) playsound(src.loc, 'sound/blank.ogg', 75, TRUE) - user.visible_message("[user.name] attaches [src] to the wall.", - "I attach [src] to the wall.", - "I hear clicking.") + user.visible_message(span_notice("[user.name] attaches [src] to the wall."), + span_notice("I attach [src] to the wall."), + span_hear("I hear clicking.")) var/ndir = get_dir(on_wall,user) if(inverse) ndir = turn(ndir, 180) @@ -70,7 +70,7 @@ var/glass_amt = round(custom_materials[getmaterialref(/datum/material/glass)]/MINERAL_MATERIAL_AMOUNT) //Replace this shit later if(W.tool_behaviour == TOOL_WRENCH && (metal_amt || glass_amt)) - to_chat(user, "I dismantle [src].") + to_chat(user, span_notice("I dismantle [src].")) if(metal_amt) new /obj/item/stack/sheet/metal(get_turf(src), metal_amt) if(glass_amt) @@ -94,18 +94,18 @@ var/turf/T = get_turf(on_wall) //the user is not where it needs to be. var/area/A = get_area(user) if(A.get_apc()) - to_chat(user, "This area already has an APC!") + to_chat(user, span_warning("This area already has an APC!")) return //only one APC per area if(!A.requires_power) - to_chat(user, "I cannot place [src] in this area!") + to_chat(user, span_warning("I cannot place [src] in this area!")) return //can't place apcs in areas with no power requirement for(var/obj/machinery/power/terminal/E in T) if(E.master) - to_chat(user, "There is another network terminal here!") + to_chat(user, span_warning("There is another network terminal here!")) return else new /obj/item/stack/cable_coil(T, 10) - to_chat(user, "I cut the cables and disassemble the unused power terminal.") + to_chat(user, span_notice("I cut the cables and disassemble the unused power terminal.")) qdel(E) return TRUE diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 19a9e2bc9..ef19eec42 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -101,9 +101,9 @@ if(href_list["view_wireset"]) legend = href_list["view_wireset"]; if(href_list["view_blueprints"]) - set_viewer(usr, "I flip the blueprints over to view the complex information diagram.") + set_viewer(usr, span_notice("I flip the blueprints over to view the complex information diagram.")) if(href_list["hide_blueprints"]) - clear_viewer(usr,"I flip the blueprints over to view the simple information diagram.") + clear_viewer(usr,span_notice("I flip the blueprints over to view the simple information diagram.")) if(href_list["refresh"]) clear_viewer(usr) set_viewer(usr) @@ -184,12 +184,12 @@ if(!str || !length(str) || str==prevname) //cancel return if(length(str) > 50) - to_chat(usr, "The given name is too long. The area's name is unchanged.") + to_chat(usr, span_warning("The given name is too long. The area's name is unchanged.")) return rename_area(A, str) - to_chat(usr, "I rename the '[prevname]' to '[str]'.") + to_chat(usr, span_notice("I rename the '[prevname]' to '[str]'.")) log_game("[key_name(usr)] has renamed [prevname] to [str]") A.update_areasize() interact() diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm index f5a5f8fa2..10b341faf 100644 --- a/code/game/objects/items/body_egg.dm +++ b/code/game/objects/items/body_egg.dm @@ -7,7 +7,7 @@ /obj/item/organ/body_egg/on_find(mob/living/finder) ..() - to_chat(finder, "I found an unknown alien organism in [owner]'s [zone]!") + to_chat(finder, span_warning("I found an unknown alien organism in [owner]'s [zone]!")) /obj/item/organ/body_egg/Initialize() . = ..() diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 37c74ff5f..8789239b8 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -25,7 +25,7 @@ /obj/item/bodybag/suicide_act(mob/user) if(isopenturf(user.loc)) - user.visible_message("[user] is crawling into [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is crawling into [src]! It looks like [user.p_theyre()] trying to commit suicide!")) var/obj/structure/closet/body_bag/R = new unfoldedbag_path(user.loc) R.add_fingerprint(user) qdel(src) @@ -54,13 +54,13 @@ . = ..() if(contents.len) var/s = contents.len == 1 ? "" : "s" - . += "I can make out the shape[s] of [contents.len] object[s] through the fabric." + . += span_notice("I can make out the shape[s] of [contents.len] object[s] through the fabric.") /obj/item/bodybag/bluespace/Destroy() for(var/atom/movable/A in contents) A.forceMove(get_turf(src)) if(isliving(A)) - to_chat(A, "I suddenly feel the space around you torn apart! You're free!") + to_chat(A, span_notice("I suddenly feel the space around you torn apart! You're free!")) return ..() /obj/item/bodybag/bluespace/proc/CanReachReact(atom/movable/source, list/next) @@ -71,7 +71,7 @@ for(var/atom/movable/A in contents) A.forceMove(R) if(isliving(A)) - to_chat(A, "I suddenly feel air around you! You're free!") + to_chat(A, span_notice("I suddenly feel air around you! You're free!")) R.open(user) R.add_fingerprint(user) R.foldedbag_instance = src @@ -79,14 +79,14 @@ /obj/item/bodybag/bluespace/container_resist(mob/living/user) if(user.incapacitated()) - to_chat(user, "I can't get out while you're restrained like this!") + to_chat(user, span_warning("I can't get out while you're restrained like this!")) return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - to_chat(user, "I claw at the fabric of [src], trying to tear it open...") - to_chat(loc, "Someone starts trying to break free of [src]!") + to_chat(user, span_notice("I claw at the fabric of [src], trying to tear it open...")) + to_chat(loc, span_warning("Someone starts trying to break free of [src]!")) if(!do_after(user, 200, target = src)) - to_chat(loc, "The pressure subsides. It seems that they've stopped resisting...") + to_chat(loc, span_warning("The pressure subsides. It seems that they've stopped resisting...")) return - loc.visible_message("[user] suddenly appears in front of [loc]!", "[user] breaks free of [src]!") + loc.visible_message(span_warning("[user] suddenly appears in front of [loc]!"), span_danger("[user] breaks free of [src]!")) qdel(src) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 35d24d74f..92d64f5fe 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -85,7 +85,7 @@ /obj/item/candle/attack_self(mob/user) if(put_out_candle()) - user.visible_message("[user] snuffs [src].") + user.visible_message(span_notice("[user] snuffs [src].")) /obj/item/candle/yellow icon = 'icons/roguetown/items/lighting.dmi' diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 8e79a368e..21f1f436c 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -22,7 +22,7 @@ /obj/item/cardboard_cutout/attack_hand(mob/living/user) if(user.used_intent.type == INTENT_HELP || pushed_over) return ..() - user.visible_message("[user] pushes over [src]!", "I push over [src]!") + user.visible_message(span_warning("[user] pushes over [src]!"), span_danger("I push over [src]!")) playsound(src, 'sound/blank.ogg', 50, TRUE) push_over() @@ -38,7 +38,7 @@ /obj/item/cardboard_cutout/attack_self(mob/living/user) if(!pushed_over) return - to_chat(user, "I right [src].") + to_chat(user, span_notice("I right [src].")) desc = initial(desc) icon = initial(icon) icon_state = initial(icon_state) //This resets a cutout to its blank state - this is intentional to allow for resetting @@ -60,15 +60,15 @@ user.do_attack_animation(src) if(I.force) - user.visible_message("[user] hits [src] with [I]!", \ - "I hit [src] with [I]!") + user.visible_message(span_danger("[user] hits [src] with [I]!"), \ + span_danger("I hit [src] with [I]!")) if(prob(I.force)) push_over() /obj/item/cardboard_cutout/bullet_act(obj/projectile/P) if(istype(P, /obj/projectile/bullet/reusable)) P.on_hit(src, 0) - visible_message("[src] is hit by [P]!") + visible_message(span_danger("[src] is hit by [P]!")) playsound(src, 'sound/blank.ogg', 50, TRUE) if(prob(P.damage)) push_over() @@ -78,19 +78,19 @@ if(!crayon || !user) return if(pushed_over) - to_chat(user, "Right [src] first!") + to_chat(user, span_warning("Right [src] first!")) return if(crayon.check_empty(user)) return if(crayon.is_capped) - to_chat(user, "Take the cap off first!") + to_chat(user, span_warning("Take the cap off first!")) return var/new_appearance = input(user, "Choose a new appearance for [src].", "26th Century Deception") as null|anything in sortList(possible_appearances) if(!new_appearance || !crayon || !user.canUseTopic(src, BE_CLOSE)) return if(!do_after(user, 10, FALSE, src, TRUE)) return - user.visible_message("[user] gives [src] a new look.", "Voila! You give [src] a new look.") + user.visible_message(span_notice("[user] gives [src] a new look."), span_notice("Voila! You give [src] a new look.")) crayon.use_charges(1) crayon.check_empty(user) alpha = 255 diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 5f38b6343..e21215773 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -21,7 +21,7 @@ var/list/files = list() /obj/item/card/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins to swipe [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins to swipe [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /obj/item/card/data @@ -133,7 +133,7 @@ /obj/item/card/id/attack_self(mob/user) if(Adjacent(user)) - user.visible_message("[user] shows you: [icon2html(src, viewers(user))] [src.name].", "I show \the [src.name].") + user.visible_message(span_notice("[user] shows you: [icon2html(src, viewers(user))] [src.name]."), span_notice("I show \the [src.name].")) add_fingerprint(user) /obj/item/card/id/vv_edit_var(var_name, var_value) @@ -160,7 +160,7 @@ var/money_added = mass_insert_money(money_contained, user) if (money_added) - to_chat(user, "I stuff the contents into the card! They disappear in a puff of bluespace smoke, adding [money_added] worth of credits to the linked account.") + to_chat(user, span_notice("I stuff the contents into the card! They disappear in a puff of bluespace smoke, adding [money_added] worth of credits to the linked account.")) return else return ..() @@ -168,20 +168,20 @@ /obj/item/card/id/proc/insert_money(obj/item/I, mob/user, physical_currency) var/cash_money = I.get_item_credit_value() if(!cash_money) - to_chat(user, "[I] doesn't seem to be worth anything!") + to_chat(user, span_warning("[I] doesn't seem to be worth anything!")) return if(!registered_account) - to_chat(user, "[src] doesn't have a linked account to deposit [I] into!") + to_chat(user, span_warning("[src] doesn't have a linked account to deposit [I] into!")) return registered_account.adjust_money(cash_money) if(physical_currency) - to_chat(user, "I stuff [I] into [src]. It disappears in a small puff of bluespace smoke, adding [cash_money] credits to the linked account.") + to_chat(user, span_notice("I stuff [I] into [src]. It disappears in a small puff of bluespace smoke, adding [cash_money] credits to the linked account.")) else - to_chat(user, "I insert [I] into [src], adding [cash_money] credits to the linked account.") + to_chat(user, span_notice("I insert [I] into [src], adding [cash_money] credits to the linked account.")) - to_chat(user, "The linked account now reports a balance of $[registered_account.account_balance].") + to_chat(user, span_notice("The linked account now reports a balance of $[registered_account.account_balance].")) qdel(I) /obj/item/card/id/proc/mass_insert_money(list/money, mob/user) @@ -222,10 +222,10 @@ if(!alt_click_can_use_id(user)) return if(!new_bank_id || new_bank_id < 111111 || new_bank_id > 999999) - to_chat(user, "The account ID number needs to be between 111111 and 999999.") + to_chat(user, span_warning("The account ID number needs to be between 111111 and 999999.")) return if (registered_account && registered_account.account_id == new_bank_id) - to_chat(user, "The account ID was already assigned to this card.") + to_chat(user, span_warning("The account ID was already assigned to this card.")) return for(var/A in SSeconomy.bank_accounts) @@ -236,11 +236,11 @@ B.bank_cards += src registered_account = B - to_chat(user, "The provided account has been linked to this ID card.") + to_chat(user, span_notice("The provided account has been linked to this ID card.")) return TRUE - to_chat(user, "The account ID number provided is invalid.") + to_chat(user, span_warning("The account ID number provided is invalid.")) return /obj/item/card/id/AltClick(mob/living/user) @@ -252,7 +252,7 @@ return if (world.time < registered_account.withdrawDelay) - registered_account.bank_card_talk("ERROR: UNABLE TO LOGIN DUE TO SCHEDULED MAINTENANCE. MAINTENANCE IS SCHEDULED TO COMPLETE IN [(registered_account.withdrawDelay - world.time)/10] SECONDS.", TRUE) + registered_account.bank_card_talk(span_warning("ERROR: UNABLE TO LOGIN DUE TO SCHEDULED MAINTENANCE. MAINTENANCE IS SCHEDULED TO COMPLETE IN [(registered_account.withdrawDelay - world.time)/10] SECONDS."), TRUE) return var/amount_to_remove = FLOOR(input(user, "How much do you want to withdraw? Current Balance: [registered_account.account_balance]", "Withdraw Funds", 5) as num|null, 1) @@ -264,11 +264,11 @@ if(registered_account.adjust_money(-amount_to_remove)) var/obj/item/holochip/holochip = new (user.drop_location(), amount_to_remove) user.put_in_hands(holochip) - to_chat(user, "I withdraw [amount_to_remove] credits into a holochip.") + to_chat(user, span_notice("I withdraw [amount_to_remove] credits into a holochip.")) return else var/difference = amount_to_remove - registered_account.account_balance - registered_account.bank_card_talk("ERROR: The linked account requires [difference] more credit\s to perform that withdrawal.", TRUE) + registered_account.bank_card_talk(span_warning("ERROR: The linked account requires [difference] more credit\s to perform that withdrawal."), TRUE) /obj/item/card/id/examine(mob/user) . = ..() @@ -280,12 +280,12 @@ var/datum/bank_account/D = SSeconomy.get_dep_account(registered_account.account_job.paycheck_department) if(D) . += "The [D.account_holder] reports a balance of $[D.account_balance]." - . += "Alt-Click the ID to pull money from the linked account in the form of holochips." - . += "I can insert credits into the linked account by pressing holochips, cash, or coins against the ID." + . += span_info("Alt-Click the ID to pull money from the linked account in the form of holochips.") + . += span_info("I can insert credits into the linked account by pressing holochips, cash, or coins against the ID.") if(registered_account.account_holder == user.real_name) - . += "If you lose this ID card, you can reclaim my account by Alt-Clicking a blank ID card while holding it and entering my account ID number." + . += span_boldnotice("If you lose this ID card, you can reclaim my account by Alt-Clicking a blank ID card while holding it and entering my account ID number.") else - . += "There is no registered account linked to this card. Alt-Click to add one." + . += span_info("There is no registered account linked to this card. Alt-Click to add one.") /obj/item/card/id/GetAccess() return access @@ -384,7 +384,7 @@ update_label() src.access |= I.access if(isliving(user) && user.mind) if(user.mind.special_role || anyone) - to_chat(usr, "The card's microscanners activate as you pass it over the ID, copying its access.") + to_chat(usr, span_notice("The card's microscanners activate as you pass it over the ID, copying its access.")) /obj/item/card/id/syndicate/attack_self(mob/user) if(isliving(user) && user.mind) @@ -429,7 +429,7 @@ update_label() assignment = u update_label() forged = TRUE - to_chat(user, "I successfully forge the ID card.") + to_chat(user, span_notice("I successfully forge the ID card.")) // First time use automatically sets the account id to the user. @@ -442,14 +442,14 @@ update_label() if(account.account_id == accountowner.account_id) account.bank_cards += src registered_account = account - to_chat(user, "My account number has been automatically assigned.") + to_chat(user, span_notice("My account number has been automatically assigned.")) return else if (popup_input == "Forge/Reset" && forged) registered_name = initial(registered_name) assignment = initial(assignment) update_label() forged = FALSE - to_chat(user, "I successfully reset the ID card.") + to_chat(user, span_notice("I successfully reset the ID card.")) return else if (popup_input == "Change Account ID") set_new_account(user) @@ -583,7 +583,7 @@ update_label() var/points = 0 /obj/item/card/id/prisoner/attack_self(mob/user) - to_chat(usr, "I have accumulated [points] out of the [goal] points you need for freedom.") + to_chat(usr, span_notice("I have accumulated [points] out of the [goal] points you need for freedom.")) /obj/item/card/id/prisoner/one name = "Prisoner #13-001" diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 223ca3b26..a32b53503 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -28,13 +28,13 @@ /obj/item/station_charter/attack_self(mob/living/user) if(used) - to_chat(user, "The [name_type] has already been named!") + to_chat(user, span_warning("The [name_type] has already been named!")) return if(!ignores_timeout && (world.time-SSticker.round_start_time > STATION_RENAME_TIME_LIMIT)) //5 minutes - to_chat(user, "The crew has already settled into the shift. It probably wouldn't be good to rename the [name_type] right now.") + to_chat(user, span_warning("The crew has already settled into the shift. It probably wouldn't be good to rename the [name_type] right now.")) return if(response_timer_id) - to_chat(user, "You're still waiting for approval from my employers about my proposed name change, it'd be best to wait for now.") + to_chat(user, span_warning("You're still waiting for approval from my employers about my proposed name change, it'd be best to wait for now.")) return var/new_name = stripped_input(user, message="What do you want to name \ @@ -43,7 +43,7 @@ will automatically be accepted.", max_length=MAX_CHARTER_LEN) if(response_timer_id) - to_chat(user, "You're still waiting for approval from my employers about my proposed name change, it'd be best to wait for now.") + to_chat(user, span_warning("You're still waiting for approval from my employers about my proposed name change, it'd be best to wait for now.")) return if(!new_name) @@ -52,14 +52,14 @@ [new_name]") if(standard_station_regex.Find(new_name)) - to_chat(user, "My name has been automatically approved.") + to_chat(user, span_notice("My name has been automatically approved.")) rename_station(new_name, user.name, user.real_name, key_name(user)) return - to_chat(user, "My name has been sent to my employers for approval.") + to_chat(user, span_notice("My name has been sent to my employers for approval.")) // Autoapproves after a certain time response_timer_id = addtimer(CALLBACK(src, PROC_REF(rename_station), new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE) - to_chat(GLOB.admins, "CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [new_name] (will autoapprove in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (REJECT) [ADMIN_CENTCOM_REPLY(user)]") + to_chat(GLOB.admins, span_adminnotice("CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [new_name] (will autoapprove in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (REJECT) [ADMIN_CENTCOM_REPLY(user)]")) /obj/item/station_charter/proc/reject_proposed(user) if(!user) diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm index 940233cb3..e624c39eb 100644 --- a/code/game/objects/items/chrono_eraser.dm +++ b/code/game/objects/items/chrono_eraser.dm @@ -85,14 +85,14 @@ var/mob/living/user = loc if(F.gun) if(isliving(user) && F.captured) - to_chat(user, "FAIL: [F.captured] already has an existing connection.") + to_chat(user, span_alert("FAIL: [F.captured] already has an existing connection.")) field_disconnect(F) else startpos = get_turf(src) field = F F.gun = src if(isliving(user) && F.captured) - to_chat(user, "Connection established with target: [F.captured]") + to_chat(user, span_notice("Connection established with target: [F.captured]")) /obj/item/gun/energy/chrono_gun/proc/field_disconnect(obj/structure/chrono_field/F) @@ -101,7 +101,7 @@ if(F.gun == src) F.gun = null if(isliving(user) && F.captured) - to_chat(user, "Disconnected from target: [F.captured]") + to_chat(user, span_alert("Disconnected from target: [F.captured]")) field = null startpos = null @@ -213,7 +213,7 @@ AM.forceMove(drop_location()) qdel(src) else if(tickstokill <= 0) - to_chat(captured, "As the last essence of your being is erased from time, you are taken back to your most enjoyable memory. You feel happy...") + to_chat(captured, span_boldnotice("As the last essence of your being is erased from time, you are taken back to your most enjoyable memory. You feel happy...")) var/mob/dead/observer/ghost = captured.ghostize(1) if(captured.mind) if(ghost) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index c9f6f7b38..e3646bc58 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -93,11 +93,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M) if(lit && cig && user.used_intent.type == INTENT_HELP) if(cig.lit) - to_chat(user, "[cig] is already lit!") + to_chat(user, span_warning("[cig] is already lit!")) if(M == user) cig.attackby(src, user) else - cig.light("[user] holds [src] out for [M], and lights [cig].") + cig.light(span_notice("[user] holds [src] out for [M], and lights [cig].")) else ..() @@ -150,7 +150,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/list/list_reagents = list(/datum/reagent/drug/nicotine = 15) /obj/item/clothing/mask/cigarette/suicide_act(mob/user) - user.visible_message("[user] is huffing [src] as quickly as [user.p_they()] can! It looks like [user.p_theyre()] trying to give [user.p_them()]self cancer.") + user.visible_message(span_suicide("[user] is huffing [src] as quickly as [user.p_they()] can! It looks like [user.p_theyre()] trying to give [user.p_them()]self cancer.")) return (TOXLOSS|OXYLOSS) /obj/item/clothing/mask/cigarette/Initialize() @@ -180,12 +180,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM // return // if(istype(glass)) //you can dip cigarettes into beakers // if(glass.reagents.trans_to(src, chem_volume, transfered_by = user)) //if reagents were transfered, show the message -// to_chat(user, "I dip \the [src] into \the [glass].") +// to_chat(user, span_notice("I dip \the [src] into \the [glass].")) // else //if not, either the beaker was empty, or the cigarette was full // if(!glass.reagents.total_volume) -// to_chat(user, "[glass] is empty!") +// to_chat(user, span_warning("[glass] is empty!")) // else -// to_chat(user, "[src] is full!") +// to_chat(user, span_warning("[src] is full!")) /obj/item/clothing/mask/cigarette/proc/light(flavor_text = null) @@ -248,7 +248,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM lit = FALSE if(ismob(loc)) var/mob/living/M = loc - to_chat(M, "My [name] goes out.") + to_chat(M, span_notice("My [name] goes out.")) M.update_inv_mouth() M.update_inv_hands() @@ -296,7 +296,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/attack_self(mob/user) if(lit) - user.visible_message("[user] calmly drops and treads on \the [src], putting it out instantly.") + user.visible_message(span_notice("[user] calmly drops and treads on \the [src], putting it out instantly.")) new type_butt(user.loc) new /obj/item/ash(user.loc) qdel(src) @@ -306,16 +306,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!istype(M)) return ..() if(M.on_fire && !lit) - light("[user] lights [src] with [M]'s burning body. What a cold-blooded badass.") + light(span_notice("[user] lights [src] with [M]'s burning body. What a cold-blooded badass.")) return var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M) if(lit && cig && user.used_intent.type == INTENT_HELP) if(cig.lit) - to_chat(user, "The [cig.name] is already lit!") + to_chat(user, span_warning("The [cig.name] is already lit!")) if(M == user) cig.attackby(src, user) else - cig.light("[user] holds the [name] out for [M], and lights [M.p_their()] [cig.name].") + cig.light(span_notice("[user] holds the [name] out for [M], and lights [M.p_their()] [cig.name].")) else return ..() @@ -537,7 +537,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(smoketime <= 0) if(ismob(loc)) var/mob/living/M = loc - to_chat(M, "The [name] goes out.") + to_chat(M, span_notice("The [name] goes out.")) lit = 0 icon_state = icon_off item_state = icon_off @@ -556,7 +556,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/obj/item/reagent_containers/food/snacks/grown/G = O if(!packeditem) if(G.dry == 1) - to_chat(user, "I stuff [O] into [src].") + to_chat(user, span_notice("I stuff [O] into [src].")) smoketime = initial(smoketime) packeditem = 1 // name = "[O.name]-packed [initial(name)]" @@ -565,34 +565,34 @@ CIGARETTE PACKETS ARE IN FANCY.DM // O.reagents.trans_to(src, O.reagents.total_volume, transfered_by = user) qdel(O) else - to_chat(user, "It has to be dried first!") + to_chat(user, span_warning("It has to be dried first!")) else - to_chat(user, "It is already packed!") + to_chat(user, span_warning("It is already packed!")) else if(istype(O, /obj/item/reagent_containers/powder/ozium)) var/obj/item/reagent_containers/powder/ozium/G = O if(!packeditem) - to_chat(user, "I stuff [O] into [src].") + to_chat(user, span_notice("I stuff [O] into [src].")) smoketime = initial(smoketime) packeditem = 1 if(G.list_reagents?.len) reagents.add_reagent_list(G.list_reagents) qdel(O) else - to_chat(user, "It is already packed!") + to_chat(user, span_warning("It is already packed!")) else var/lighting_text = O.ignition_effect(src,user) if(lighting_text) if(smoketime > 0) light(lighting_text) else - to_chat(user, "There is nothing to smoke!") + to_chat(user, span_warning("There is nothing to smoke!")) else return ..() /obj/item/clothing/mask/cigarette/pipe/attack_self(mob/user) var/turf/location = get_turf(user) if(lit) - user.visible_message("[user] puts out [src].", "I put out [src].") + user.visible_message(span_notice("[user] puts out [src]."), span_notice("I put out [src].")) lit = 0 icon_state = icon_off item_state = icon_off @@ -600,7 +600,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return if(!lit && smoketime > 0) smoketime = 0 - to_chat(user, "I empty [src] onto [location].") + to_chat(user, span_notice("I empty [src] onto [location].")) new /obj/item/ash(location) packeditem = 0 reagents.clear_reagents() @@ -660,11 +660,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/lighter/suicide_act(mob/living/carbon/user) if (lit) - user.visible_message("[user] begins holding \the [src]'s flame up to [user.p_their()] face! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins holding \the [src]'s flame up to [user.p_their()] face! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(src, 'sound/blank.ogg', 50, TRUE) return FIRELOSS else - user.visible_message("[user] begins whacking [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins whacking [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /obj/item/lighter/update_icon() @@ -675,7 +675,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/lighter/ignition_effect(atom/A, mob/user) if(get_temperature()) - . = "With a single flick of [user.p_their()] wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool." + . = span_rose("With a single flick of [user.p_their()] wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool.") /obj/item/lighter/proc/set_lit(new_lit) if(lit == new_lit) @@ -703,7 +703,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!lit) set_lit(TRUE) if(fancy) - user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.", "Without even breaking stride, you flip open and light [src] in one smooth movement.") + user.visible_message(span_notice("Without even breaking stride, [user] flips open and lights [src] in one smooth movement."), span_notice("Without even breaking stride, you flip open and light [src] in one smooth movement.")) else var/prot = FALSE var/mob/living/carbon/human/H = user @@ -716,19 +716,19 @@ CIGARETTE PACKETS ARE IN FANCY.DM prot = TRUE if(prot || prob(75)) - user.visible_message("After a few attempts, [user] manages to light [src].", "After a few attempts, you manage to light [src].") + user.visible_message(span_notice("After a few attempts, [user] manages to light [src]."), span_notice("After a few attempts, you manage to light [src].")) else var/hitzone = user.held_index_to_dir(user.active_hand_index) == "r" ? BODY_ZONE_PRECISE_R_HAND : BODY_ZONE_PRECISE_L_HAND user.apply_damage(5, BURN, hitzone) - user.visible_message("After a few attempts, [user] manages to light [src] - however, [user.p_they()] burn [user.p_their()] finger in the process.", "I burn myself while lighting the lighter!") + user.visible_message(span_warning("After a few attempts, [user] manages to light [src] - however, [user.p_they()] burn [user.p_their()] finger in the process."), span_warning("I burn myself while lighting the lighter!")) SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "burnt_thumb", /datum/mood_event/burnt_thumb) else set_lit(FALSE) if(fancy) - user.visible_message("I hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.", "I quietly shut off [src] without even looking at what you're doing. Wow.") + user.visible_message(span_notice("I hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow."), span_notice("I quietly shut off [src] without even looking at what you're doing. Wow.")) else - user.visible_message("[user] quietly shuts off [src].", "I quietly shut off [src].") + user.visible_message(span_notice("[user] quietly shuts off [src]."), span_notice("I quietly shut off [src].")) else . = ..() @@ -739,14 +739,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M) if(lit && cig && user.used_intent.type == INTENT_HELP) if(cig.lit) - to_chat(user, "The [cig.name] is already lit!") + to_chat(user, span_warning("The [cig.name] is already lit!")) if(M == user) cig.attackby(src, user) else if(fancy) - cig.light("[user] whips the [name] out and holds it for [M]. [user.p_their(TRUE)] arm is as steady as the unflickering flame [user.p_they()] light[user.p_s()] \the [cig] with.") + cig.light(span_rose("[user] whips the [name] out and holds it for [M]. [user.p_their(TRUE)] arm is as steady as the unflickering flame [user.p_they()] light[user.p_s()] \the [cig] with.")) else - cig.light("[user] holds the [name] out for [M], and lights [M.p_their()] [cig.name].") + cig.light(span_notice("[user] holds the [name] out for [M], and lights [M.p_their()] [cig.name].")) else ..() @@ -803,7 +803,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/lighter/greyscale/ignition_effect(atom/A, mob/user) if(get_temperature()) - . = "After some fiddling, [user] manages to light [A] with [src]." + . = span_notice("After some fiddling, [user] manages to light [A] with [src].") /obj/item/lighter/slime @@ -839,10 +839,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM qdel(target) qdel(src) user.put_in_active_hand(R) - to_chat(user, "I roll the [target.name] into a rolling paper.") + to_chat(user, span_notice("I roll the [target.name] into a rolling paper.")) R.desc = "" else - to_chat(user, "I need to dry this first!") + to_chat(user, span_warning("I need to dry this first!")) /////////////// //VAPE NATION// @@ -860,7 +860,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/super = 0 //for the fattest vapes dude. /obj/item/clothing/mask/vape/suicide_act(mob/user) - user.visible_message("[user] is puffin hard on dat vape, [user.p_they()] trying to join the vape life on a whole notha plane!")//it doesn't give you cancer, it is cancer + user.visible_message(span_suicide("[user] is puffin hard on dat vape, [user.p_they()] trying to join the vape life on a whole notha plane!"))//it doesn't give you cancer, it is cancer return (TOXLOSS|OXYLOSS) @@ -877,7 +877,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(O.tool_behaviour == TOOL_SCREWDRIVER) if(!screw) screw = TRUE - to_chat(user, "I open the cap on [src].") + to_chat(user, span_notice("I open the cap on [src].")) ENABLE_BITFIELD(reagents.flags, OPENCONTAINER) if(obj_flags & EMAGGED) add_overlay("vapeopen_high") @@ -887,7 +887,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM add_overlay("vapeopen_low") else screw = FALSE - to_chat(user, "I close the cap on [src].") + to_chat(user, span_notice("I close the cap on [src].")) DISABLE_BITFIELD(reagents.flags, OPENCONTAINER) cut_overlays() @@ -896,16 +896,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!super) cut_overlays() super = 1 - to_chat(user, "I increase the voltage of [src].") + to_chat(user, span_notice("I increase the voltage of [src].")) add_overlay("vapeopen_med") else cut_overlays() super = 0 - to_chat(user, "I decrease the voltage of [src].") + to_chat(user, span_notice("I decrease the voltage of [src].")) add_overlay("vapeopen_low") if(screw && (obj_flags & EMAGGED)) - to_chat(user, "[src] can't be modified!") + to_chat(user, span_warning("[src] can't be modified!")) else ..() @@ -916,30 +916,30 @@ CIGARETTE PACKETS ARE IN FANCY.DM cut_overlays() obj_flags |= EMAGGED super = 0 - to_chat(user, "I maximize the voltage of [src].") + to_chat(user, span_warning("I maximize the voltage of [src].")) add_overlay("vapeopen_high") var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread //for effect sp.set_up(5, 1, src) sp.start() else - to_chat(user, "[src] is already emagged!") + to_chat(user, span_warning("[src] is already emagged!")) else - to_chat(user, "I need to open the cap to do that!") + to_chat(user, span_warning("I need to open the cap to do that!")) /obj/item/clothing/mask/vape/attack_self(mob/user) if(reagents.total_volume > 0) - to_chat(user, "I empty [src] of all reagents.") + to_chat(user, span_notice("I empty [src] of all reagents.")) reagents.clear_reagents() /obj/item/clothing/mask/vape/equipped(mob/user, slot) . = ..() if(slot == SLOT_WEAR_MASK) if(!screw) - to_chat(user, "I start puffing on the vape.") + to_chat(user, span_notice("I start puffing on the vape.")) DISABLE_BITFIELD(reagents.flags, NO_REACT) START_PROCESSING(SSobj, src) else //it will not start if the vape is opened. - to_chat(user, "I need to close the cap first!") + to_chat(user, span_warning("I need to close the cap first!")) /obj/item/clothing/mask/vape/dropped(mob/user) . = ..() @@ -979,7 +979,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!reagents.total_volume) if(ismob(loc)) - to_chat(M, "[src] is empty!") + to_chat(M, span_warning("[src] is empty!")) STOP_PROCESSING(SSobj, src) //it's reusable so it won't unequip when empty return @@ -1003,7 +1003,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread sp.set_up(5, 1, src) sp.start() - to_chat(M, "[src] suddenly explodes in my mouth!") + to_chat(M, span_danger("[src] suddenly explodes in my mouth!")) qdel(src) return diff --git a/code/game/objects/items/circuitboards/circuitboard.dm b/code/game/objects/items/circuitboards/circuitboard.dm index 6dc5db970..49a71da20 100644 --- a/code/game/objects/items/circuitboards/circuitboard.dm +++ b/code/game/objects/items/circuitboards/circuitboard.dm @@ -64,4 +64,4 @@ micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells. if(!ispath(A)) continue nice_list += list("[req_components[A]] [initial(A.name)]") - . += "Required components: [english_list(nice_list)]." + . += span_notice("Required components: [english_list(nice_list)].") diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 9c7eb00ac..7b9134172 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -32,13 +32,13 @@ /obj/item/circuitboard/computer/card/minor/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_SCREWDRIVER) target_dept = (target_dept == dept_list.len) ? 1 : (target_dept + 1) - to_chat(user, "I set the board to \"[dept_list[target_dept]]\".") + to_chat(user, span_notice("I set the board to \"[dept_list[target_dept]]\".")) else return ..() /obj/item/circuitboard/computer/card/minor/examine(user) ..() - to_chat(user, "Currently set to \"[dept_list[target_dept]]\".") + to_chat(user, span_notice("Currently set to \"[dept_list[target_dept]]\".")) //obj/item/circuitboard/computer/shield @@ -201,11 +201,11 @@ if(build_path == /obj/machinery/computer/libraryconsole/bookmanagement) name = "Library Visitor Console (Computer Board)" build_path = /obj/machinery/computer/libraryconsole - to_chat(user, "Defaulting access protocols.") + to_chat(user, span_notice("Defaulting access protocols.")) else name = "Book Inventory Management Console (Computer Board)" build_path = /obj/machinery/computer/libraryconsole/bookmanagement - to_chat(user, "Access protocols successfully updated.") + to_chat(user, span_notice("Access protocols successfully updated.")) else return ..() */ @@ -351,11 +351,11 @@ if(build_path == /obj/machinery/computer/rdconsole/core) name = "R&D Console - Robotics (Computer Board)" build_path = /obj/machinery/computer/rdconsole/robotics - to_chat(user, "Access protocols successfully updated.") + to_chat(user, span_notice("Access protocols successfully updated.")) else name = "R&D Console (Computer Board)" build_path = /obj/machinery/computer/rdconsole/core - to_chat(user, "Defaulting access protocols.") + to_chat(user, span_notice("Defaulting access protocols.")) else return ..() @@ -445,15 +445,15 @@ . = ..() if(!(obj_flags & EMAGGED)) contraband = !contraband - to_chat(user, "Receiver spectrum set to [contraband ? "Broad" : "Standard"].") + to_chat(user, span_notice("Receiver spectrum set to [contraband ? "Broad" : "Standard"].")) else - to_chat(user, "The spectrum chip is unresponsive.") + to_chat(user, span_alert("The spectrum chip is unresponsive.")) /obj/item/circuitboard/computer/cargo/emag_act(mob/living/user) if(!(obj_flags & EMAGGED)) contraband = TRUE obj_flags |= EMAGGED - to_chat(user, "I adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.") + to_chat(user, span_notice("I adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.")) /obj/item/circuitboard/computer/cargo/express name = "Express Supply Console (Computer Board)" @@ -462,13 +462,13 @@ /obj/item/circuitboard/computer/cargo/express/multitool_act(mob/living/user) . = ..() if (!(obj_flags & EMAGGED)) - to_chat(user, "Routing protocols are already set to: \"factory defaults\".") + to_chat(user, span_alert("Routing protocols are already set to: \"factory defaults\".")) else - to_chat(user, "I reset the routing protocols to: \"factory defaults\".") + to_chat(user, span_notice("I reset the routing protocols to: \"factory defaults\".")) obj_flags &= ~EMAGGED /obj/item/circuitboard/computer/cargo/express/emag_act(mob/living/user) - to_chat(user, "I change the routing protocols, allowing the Drop Pod to land anywhere on the station.") + to_chat(user, span_notice("I change the routing protocols, allowing the Drop Pod to land anywhere on the station.")) obj_flags |= EMAGGED /obj/item/circuitboard/computer/cargo/request diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 5a47b30e1..94f2a9e95 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -168,7 +168,7 @@ name = initial(new_type.name) build_path = initial(new_type.build_path) I.play_tool_sound(src) - to_chat(user, "I change the circuitboard setting to \"[new_setting]\".") + to_chat(user, span_notice("I change the circuitboard setting to \"[new_setting]\".")) else return ..() @@ -351,7 +351,7 @@ name = initial(new_type.name) build_path = initial(new_type.build_path) I.play_tool_sound(src) - to_chat(user, "I change the circuitboard setting to \"[new_setting]\".") + to_chat(user, span_notice("I change the circuitboard setting to \"[new_setting]\".")) else return ..() @@ -451,13 +451,13 @@ var/position = fridges_name_paths.Find(build_path, fridges_name_paths) position = (position == fridges_name_paths.len) ? 1 : (position + 1) build_path = fridges_name_paths[position] - to_chat(user, "I set the board to [fridges_name_paths[build_path]].") + to_chat(user, span_notice("I set the board to [fridges_name_paths[build_path]].")) else return ..() /obj/item/circuitboard/machine/smartfridge/examine(mob/user) . = ..() - . += "[src] is set to [fridges_name_paths[build_path]]. You can use a screwdriver to reconfigure it." + . += span_info("[src] is set to [fridges_name_paths[build_path]]. You can use a screwdriver to reconfigure it.") /obj/item/circuitboard/machine/space_heater @@ -622,7 +622,7 @@ build_path = new_path name = "[new_name] 3000 (Machine Board)" - to_chat(user, "I change the circuit board setting to \"[new_name]\".") + to_chat(user, span_notice("I change the circuit board setting to \"[new_name]\".")) else return ..() @@ -689,7 +689,7 @@ if(new_cost == null && (src.loc == user)) return custom_cost = CLAMP(round(new_cost, 1), 10, 1000) - to_chat(user, "The cost is now set to [custom_cost].") + to_chat(user, span_notice("The cost is now set to [custom_cost].")) /obj/item/circuitboard/machine/medical_kiosk/examine(mob/user) . = ..() @@ -974,18 +974,18 @@ /obj/item/circuitboard/machine/dish_drive/examine(mob/user) . = ..() - . += "Its suction function is [suction ? "enabled" : "disabled"]. Use it in-hand to switch." - . += "Its disposal auto-transmit function is [transmit ? "enabled" : "disabled"]. Alt-click it to switch." + . += span_notice("Its suction function is [suction ? "enabled" : "disabled"]. Use it in-hand to switch.") + . += span_notice("Its disposal auto-transmit function is [transmit ? "enabled" : "disabled"]. Alt-click it to switch.") /obj/item/circuitboard/machine/dish_drive/attack_self(mob/living/user) suction = !suction - to_chat(user, "I [suction ? "enable" : "disable"] the board's suction function.") + to_chat(user, span_notice("I [suction ? "enable" : "disable"] the board's suction function.")) /obj/item/circuitboard/machine/dish_drive/AltClick(mob/living/user) if(!user.Adjacent(src)) return transmit = !transmit - to_chat(user, "I [transmit ? "enable" : "disable"] the board's automatic disposal transmission.") + to_chat(user, span_notice("I [transmit ? "enable" : "disable"] the board's automatic disposal transmission.")) /obj/item/circuitboard/machine/gibber name = "Gibber (Machine Board)" @@ -1041,11 +1041,11 @@ if(build_path == /obj/machinery/processor) name = "Slime Processor (Machine Board)" build_path = /obj/machinery/processor/slime - to_chat(user, "Name protocols successfully updated.") + to_chat(user, span_notice("Name protocols successfully updated.")) else name = "Food Processor (Machine Board)" build_path = /obj/machinery/processor - to_chat(user, "Defaulting name protocols.") + to_chat(user, span_notice("Defaulting name protocols.")) else return ..() diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 832a1f0fd..7ef76ad34 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -49,7 +49,7 @@ msg = "It's started to get a little smaller than it used to be, but it'll definitely still last for a while." else msg = "It's seen some light use, but it's still pretty fresh." - . += "[msg]" + . += span_notice("[msg]") /obj/item/soap/nanotrasen desc = "" @@ -75,14 +75,14 @@ /obj/item/soap/suicide_act(mob/user) user.say(";FFFFFFFFFFFFFFFFUUUUUUUDGE!!", forced="soap suicide") - user.visible_message("[user] lifts [src] to [user.p_their()] mouth and gnaws on it furiously, producing a thick froth! [user.p_they(TRUE)]'ll never get that BB gun now!") + user.visible_message(span_suicide("[user] lifts [src] to [user.p_their()] mouth and gnaws on it furiously, producing a thick froth! [user.p_they(TRUE)]'ll never get that BB gun now!")) new /obj/effect/particle_effect/foam(loc) return (TOXLOSS) /obj/item/soap/proc/decreaseUses(mob/user) uses-- if(uses <= 0) - to_chat(user, "[src] crumbles into tiny bits!") + to_chat(user, span_warning("[src] crumbles into tiny bits!")) qdel(src) /obj/item/soap/afterattack(atom/target, mob/user, proximity) @@ -92,32 +92,32 @@ //I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing. //So this is a workaround. This also makes more sense from an IC standpoint. ~Carn if(user.client && ((target in user.client.screen) && !user.is_holding(target))) - to_chat(user, "I need to take that [target.name] off before cleaning it!") + to_chat(user, span_warning("I need to take that [target.name] off before cleaning it!")) else if(istype(target, /obj/effect/decal/cleanable)) - user.visible_message("[user] begins to scrub \the [target.name] out with [src].", "I begin to scrub \the [target.name] out with [src]...") + user.visible_message(span_notice("[user] begins to scrub \the [target.name] out with [src]."), span_warning("I begin to scrub \the [target.name] out with [src]...")) if(do_after(user, src.cleanspeed, target = target)) - to_chat(user, "I scrub \the [target.name] out.") + to_chat(user, span_notice("I scrub \the [target.name] out.")) qdel(target) decreaseUses(user) else if(ishuman(target) && user.zone_selected == BODY_ZONE_PRECISE_MOUTH) var/mob/living/carbon/human/H = user - user.visible_message("\the [user] washes \the [target]'s mouth out with [src.name]!", "I wash \the [target]'s mouth out with [src.name]!") //washes mouth out with soap sounds better than 'the soap' here if(user.zone_selected == "mouth") + user.visible_message(span_warning("\the [user] washes \the [target]'s mouth out with [src.name]!"), span_notice("I wash \the [target]'s mouth out with [src.name]!")) //washes mouth out with soap sounds better than 'the soap' here if(user.zone_selected == "mouth") H.lip_style = null //removes lipstick H.update_body() decreaseUses(user) return else if(istype(target, /obj/structure/window)) - user.visible_message("[user] begins to clean \the [target.name] with [src]...", "I begin to clean \the [target.name] with [src]...") + user.visible_message(span_notice("[user] begins to clean \the [target.name] with [src]..."), span_notice("I begin to clean \the [target.name] with [src]...")) if(do_after(user, src.cleanspeed, target = target)) - to_chat(user, "I clean \the [target.name].") + to_chat(user, span_notice("I clean \the [target.name].")) target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) target.set_opacity(initial(target.opacity)) decreaseUses(user) else - user.visible_message("[user] begins to clean \the [target.name] with [src]...", "I begin to clean \the [target.name] with [src]...") + user.visible_message(span_notice("[user] begins to clean \the [target.name] with [src]..."), span_notice("I begin to clean \the [target.name] with [src]...")) if(do_after(user, src.cleanspeed, target = target)) - to_chat(user, "I clean \the [target.name].") + to_chat(user, span_notice("I clean \the [target.name].")) for(var/obj/effect/decal/cleanable/C in target) qdel(C) target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) @@ -158,7 +158,7 @@ return ..() /obj/item/bikehorn/suicide_act(mob/user) - user.visible_message("[user] solemnly points [src] at [user.p_their()] temple! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] solemnly points [src] at [user.p_their()] temple! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(src, 'sound/blank.ogg', 50, TRUE) return (BRUTELOSS) diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index baf8a811c..935430ba9 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -28,7 +28,7 @@ mode = WAND_EMERGENCY if(WAND_EMERGENCY) mode = WAND_OPEN - to_chat(user, "Now in mode: [mode].") + to_chat(user, span_notice("Now in mode: [mode].")) // Airlock remote works by sending NTNet packets to whatever it's pointed at. /obj/item/door_remote/afterattack(atom/A, mob/user) diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index 4ccba4fa1..1693930b7 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -33,7 +33,7 @@ /obj/item/lipstick/attack_self(mob/user) cut_overlays() - to_chat(user, "I twist \the [src] [open ? "closed" : "open"].") + to_chat(user, span_notice("I twist \the [src] [open ? "closed" : "open"].")) open = !open if(open) var/mutable_appearance/colored_overlay = mutable_appearance(icon, "lipstick_uncap_color") @@ -53,28 +53,28 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.is_mouth_covered()) - to_chat(user, "Remove [ H == user ? "your" : "[H.p_their()]" ] mask!") + to_chat(user, span_warning("Remove [ H == user ? "your" : "[H.p_their()]" ] mask!")) return if(H.lip_style) //if they already have lipstick on - to_chat(user, "I need to wipe off the old lipstick first!") + to_chat(user, span_warning("I need to wipe off the old lipstick first!")) return if(H == user) - user.visible_message("[user] does [user.p_their()] lips with \the [src].", \ - "I take a moment to apply \the [src]. Perfect!") + user.visible_message(span_notice("[user] does [user.p_their()] lips with \the [src]."), \ + span_notice("I take a moment to apply \the [src]. Perfect!")) H.lip_style = "lipstick" H.lip_color = colour H.update_body() else - user.visible_message("[user] begins to do [H]'s lips with \the [src].", \ - "I begin to apply \the [src] on [H]'s lips...") + user.visible_message(span_warning("[user] begins to do [H]'s lips with \the [src]."), \ + span_notice("I begin to apply \the [src] on [H]'s lips...")) if(do_after(user, 20, target = H)) - user.visible_message("[user] does [H]'s lips with \the [src].", \ - "I apply \the [src] on [H]'s lips.") + user.visible_message(span_notice("[user] does [H]'s lips with \the [src]."), \ + span_notice("I apply \the [src] on [H]'s lips.")) H.lip_style = "lipstick" H.lip_color = colour H.update_body() else - to_chat(user, "Where are the lips on that?") + to_chat(user, span_warning("Where are the lips on that?")) //you can wipe off lipstick with paper! /obj/item/paper/attack(mob/M, mob/user) @@ -87,15 +87,15 @@ if(!H.lip_style) return if(H == user) - to_chat(user, "I wipe off the lipstick with [src].") + to_chat(user, span_notice("I wipe off the lipstick with [src].")) H.lip_style = null H.update_body() else - user.visible_message("[user] begins to wipe [H]'s lipstick off with \the [src].", \ - "I begin to wipe off [H]'s lipstick...") + user.visible_message(span_warning("[user] begins to wipe [H]'s lipstick off with \the [src]."), \ + span_notice("I begin to wipe off [H]'s lipstick...")) if(do_after(user, 10, target = H)) - user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \ - "I wipe off [H]'s lipstick.") + user.visible_message(span_notice("[user] wipes [H]'s lipstick off with \the [src]."), \ + span_notice("I wipe off [H]'s lipstick.")) H.lip_style = null H.update_body() else @@ -110,7 +110,7 @@ w_class = WEIGHT_CLASS_TINY /obj/item/razor/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins shaving [user.p_them()]self without the razor guard! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins shaving [user.p_them()]self without the razor guard! It looks like [user.p_theyre()] trying to commit suicide!")) shave(user, BODY_ZONE_PRECISE_MOUTH) shave(user, BODY_ZONE_HEAD)//doesnt need to be BODY_ZONE_HEAD specifically, but whatever return BRUTELOSS @@ -130,23 +130,23 @@ var/mob/living/carbon/human/H = M var/location = user.zone_selected if((location in list(BODY_ZONE_PRECISE_R_EYE, BODY_ZONE_PRECISE_MOUTH, BODY_ZONE_HEAD)) && !H.get_bodypart(BODY_ZONE_HEAD)) - to_chat(user, "[H] doesn't have a head!") + to_chat(user, span_warning("[H] doesn't have a head!")) return if(location == BODY_ZONE_PRECISE_MOUTH) if(user.used_intent.type == INTENT_HELP) if(H.gender == MALE) if (H == user) - to_chat(user, "I need a mirror to properly style your own facial hair!") + to_chat(user, span_warning("I need a mirror to properly style your own facial hair!")) return if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return var/new_style = input(user, "Select a facial hairstyle", "Grooming") as null|anything in GLOB.facial_hairstyles_list if(!get_location_accessible(H, location)) - to_chat(user, "The mask is in the way!") + to_chat(user, span_warning("The mask is in the way!")) return - user.visible_message("[user] tries to change [H]'s facial hairstyle using [src].", "I try to change [H]'s facial hairstyle using [src].") + user.visible_message(span_notice("[user] tries to change [H]'s facial hairstyle using [src]."), span_notice("I try to change [H]'s facial hairstyle using [src].")) if(new_style && do_after(user, 60, target = H)) - user.visible_message("[user] successfully changes [H]'s facial hairstyle using [src].", "I successfully change [H]'s facial hairstyle using [src].") + user.visible_message(span_notice("[user] successfully changes [H]'s facial hairstyle using [src]."), span_notice("I successfully change [H]'s facial hairstyle using [src].")) H.facial_hairstyle = new_style H.update_hair() return @@ -155,74 +155,74 @@ else if(!(FACEHAIR in H.dna.species.species_traits)) - to_chat(user, "There is no facial hair to shave!") + to_chat(user, span_warning("There is no facial hair to shave!")) return if(!get_location_accessible(H, location)) - to_chat(user, "The mask is in the way!") + to_chat(user, span_warning("The mask is in the way!")) return if(H.facial_hairstyle == "Shaved") - to_chat(user, "Already clean-shaven!") + to_chat(user, span_warning("Already clean-shaven!")) return if(H == user) //shaving yourself - user.visible_message("[user] starts to shave [user.p_their()] facial hair with [src].", \ - "I take a moment to shave your facial hair with [src]...") + user.visible_message(span_notice("[user] starts to shave [user.p_their()] facial hair with [src]."), \ + span_notice("I take a moment to shave your facial hair with [src]...")) if(do_after(user, 50, target = H)) - user.visible_message("[user] shaves [user.p_their()] facial hair clean with [src].", \ - "I finish shaving with [src]. Fast and clean!") + user.visible_message(span_notice("[user] shaves [user.p_their()] facial hair clean with [src]."), \ + span_notice("I finish shaving with [src]. Fast and clean!")) shave(H, location) else - user.visible_message("[user] tries to shave [H]'s facial hair with [src].", \ - "I start shaving [H]'s facial hair...") + user.visible_message(span_warning("[user] tries to shave [H]'s facial hair with [src]."), \ + span_notice("I start shaving [H]'s facial hair...")) if(do_after(user, 50, target = H)) - user.visible_message("[user] shaves off [H]'s facial hair with [src].", \ - "I shave [H]'s facial hair clean off.") + user.visible_message(span_warning("[user] shaves off [H]'s facial hair with [src]."), \ + span_notice("I shave [H]'s facial hair clean off.")) shave(H, location) else if(location == BODY_ZONE_HEAD) if(user.used_intent.type == INTENT_HELP) if (H == user) - to_chat(user, "I need a mirror to properly style your own hair!") + to_chat(user, span_warning("I need a mirror to properly style your own hair!")) return if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return var/new_style = input(user, "Select a hairstyle", "Grooming") as null|anything in GLOB.hairstyles_list if(!get_location_accessible(H, location)) - to_chat(user, "The headgear is in the way!") + to_chat(user, span_warning("The headgear is in the way!")) return - user.visible_message("[user] tries to change [H]'s hairstyle using [src].", "I try to change [H]'s hairstyle using [src].") + user.visible_message(span_notice("[user] tries to change [H]'s hairstyle using [src]."), span_notice("I try to change [H]'s hairstyle using [src].")) if(new_style && do_after(user, 60, target = H)) - user.visible_message("[user] successfully changes [H]'s hairstyle using [src].", "I successfully change [H]'s hairstyle using [src].") + user.visible_message(span_notice("[user] successfully changes [H]'s hairstyle using [src]."), span_notice("I successfully change [H]'s hairstyle using [src].")) H.hairstyle = new_style H.update_hair() return else if(!(HAIR in H.dna.species.species_traits)) - to_chat(user, "There is no hair to shave!") + to_chat(user, span_warning("There is no hair to shave!")) return if(!get_location_accessible(H, location)) - to_chat(user, "The headgear is in the way!") + to_chat(user, span_warning("The headgear is in the way!")) return if(H.hairstyle == "Bald" || H.hairstyle == "Balding Hair" || H.hairstyle == "Skinhead") - to_chat(user, "There is not enough hair left to shave!") + to_chat(user, span_warning("There is not enough hair left to shave!")) return if(H == user) //shaving yourself - user.visible_message("[user] starts to shave [user.p_their()] head with [src].", \ - "I start to shave your head with [src]...") + user.visible_message(span_notice("[user] starts to shave [user.p_their()] head with [src]."), \ + span_notice("I start to shave your head with [src]...")) if(do_after(user, 5, target = H)) - user.visible_message("[user] shaves [user.p_their()] head with [src].", \ - "I finish shaving with [src].") + user.visible_message(span_notice("[user] shaves [user.p_their()] head with [src]."), \ + span_notice("I finish shaving with [src].")) shave(H, location) else var/turf/H_loc = H.loc - user.visible_message("[user] tries to shave [H]'s head with [src]!", \ - "I start shaving [H]'s head...") + user.visible_message(span_warning("[user] tries to shave [H]'s head with [src]!"), \ + span_notice("I start shaving [H]'s head...")) if(do_after(user, 50, target = H)) if(H_loc == H.loc) - user.visible_message("[user] shaves [H]'s head bald with [src]!", \ - "I shave [H]'s head bald.") + user.visible_message(span_warning("[user] shaves [H]'s head bald with [src]!"), \ + span_notice("I shave [H]'s head bald.")) shave(H, location) else ..() diff --git a/code/game/objects/items/courtroom.dm b/code/game/objects/items/courtroom.dm index 3c4bd043d..38b99f165 100644 --- a/code/game/objects/items/courtroom.dm +++ b/code/game/objects/items/courtroom.dm @@ -14,7 +14,7 @@ resistance_flags = FLAMMABLE /obj/item/gavelhammer/suicide_act(mob/user) - user.visible_message("[user] has sentenced [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] has sentenced [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) return (BRUTELOSS) @@ -31,7 +31,7 @@ /obj/item/gavelblock/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/gavelhammer)) playsound(loc, 'sound/blank.ogg', 100, TRUE) - user.visible_message("[user] strikes [src] with [I].") + user.visible_message(span_warning("[user] strikes [src] with [I].")) user.changeNext_move(CLICK_CD_MELEE) else return ..() diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index 1dcdda7af..e0b020a19 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -9,10 +9,10 @@ /obj/item/suspiciousphone/attack_self(mob/user) if(!ishuman(user)) - to_chat(user, "This device is too advanced for you!") + to_chat(user, span_warning("This device is too advanced for you!")) return if(dumped) - to_chat(user, "I already activated Protocol CRAB-17.") + to_chat(user, span_warning("I already activated Protocol CRAB-17.")) return FALSE if(alert(user, "Are you sure you want to crash this market with no survivors?", "Protocol CRAB-17", "Yes", "No") == "Yes") if(dumped || QDELETED(src)) //Prevents fuckers from cheesing alert @@ -39,7 +39,7 @@ /obj/structure/checkoutmachine/examine(mob/living/user) . = ..() - . += "It's integrated integrity meter reads: HEALTH: [obj_integrity]." + . += span_info("It's integrated integrity meter reads: HEALTH: [obj_integrity].") /obj/structure/checkoutmachine/proc/check_if_finished() for(var/i in accounts_to_rob) @@ -55,15 +55,15 @@ if(istype(W, /obj/item/card/id)) var/obj/item/card/id/card = W if(!card.registered_account) - to_chat(user, "This card does not have a registered account!") + to_chat(user, span_warning("This card does not have a registered account!")) return if(!card.registered_account.being_dumped) - to_chat(user, "It appears that your funds are safe from draining!") + to_chat(user, span_warning("It appears that your funds are safe from draining!")) return if(do_after(user, 40, target = src)) if(!card.registered_account.being_dumped) return - to_chat(user, "I quickly cash out your funds to a more secure banking location. Funds are safu.") // This is a reference and not a typo + to_chat(user, span_warning("I quickly cash out your funds to a more secure banking location. Funds are safu.")) // This is a reference and not a typo card.registered_account.being_dumped = FALSE card.registered_account.withdrawDelay = 0 if(check_if_finished()) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 75ec77dae..db50ffb75 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -73,7 +73,7 @@ return istype(surface, /turf/open/floor) /obj/item/toy/crayon/suicide_act(mob/user) - user.visible_message("[user] is jamming [src] up [user.p_their()] nose and into [user.p_their()] brain. It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is jamming [src] up [user.p_their()] nose and into [user.p_their()] brain. It looks like [user.p_theyre()] trying to commit suicide!")) return (BRUTELOSS|OXYLOSS) /obj/item/toy/crayon/Initialize() @@ -131,12 +131,12 @@ if(charges == -1) . = FALSE else if(!charges_left) - to_chat(user, "There is no more of [src] left!") + to_chat(user, span_warning("There is no more of [src] left!")) if(self_contained) qdel(src) . = TRUE else if(charges_left < amount && requires_full) - to_chat(user, "There is not enough of [src] left!") + to_chat(user, span_warning("There is not enough of [src] left!")) . = TRUE /obj/item/toy/crayon/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state) @@ -152,7 +152,7 @@ if(user.canUseTopic(src, BE_CLOSE, ismonkey(user))) if(has_cap) is_capped = !is_capped - to_chat(user, "The cap on [src] is now [is_capped ? "on" : "off"].") + to_chat(user, span_notice("The cap on [src] is now [is_capped ? "on" : "off"].")) update_icon() /obj/item/toy/crayon/proc/staticDrawables() @@ -339,10 +339,10 @@ clicky = CLAMP(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2) if(!instant) - to_chat(user, "I start drawing a [temp] on the [target.name]...") + to_chat(user, span_notice("I start drawing a [temp] on the [target.name]...")) if(pre_noise) - audible_message("I hear spraying.") + audible_message(span_notice("I hear spraying.")) playsound(user.loc, 'sound/blank.ogg', 5, TRUE, 5) var/wait_time = 50 @@ -376,7 +376,7 @@ affected_turfs += right affected_turfs += target else - to_chat(user, "There isn't enough space to paint!") + to_chat(user, span_warning("There isn't enough space to paint!")) return C.add_hiddenprint(user) if(istagger) @@ -385,16 +385,16 @@ C.AddComponent(/datum/component/art, BAD_ART) if(!instant) - to_chat(user, "I finish drawing \the [temp].") + to_chat(user, span_notice("I finish drawing \the [temp].")) else - to_chat(user, "I spray a [temp] on \the [target.name]") + to_chat(user, span_notice("I spray a [temp] on \the [target.name]")) if(length(text_buffer) > 1) text_buffer = copytext(text_buffer,2) SStgui.update_uis(src) if(post_noise) - audible_message("I hear spraying.") + audible_message(span_hear("I hear spraying.")) playsound(user.loc, 'sound/blank.ogg', 5, TRUE, 5) var/fraction = min(1, . / reagents.maximum_volume) @@ -415,9 +415,9 @@ else if(C.is_mouth_covered(mask_only = 1)) covered = "mask" if(covered) - to_chat(C, "I have to remove your [covered] first!") + to_chat(C, span_warning("I have to remove your [covered] first!")) return - to_chat(user, "I take a bite of the [src.name]. Delicious!") + to_chat(user, span_notice("I take a bite of the [src.name]. Delicious!")) var/eaten = use_charges(user, 5, FALSE) if(check_empty(user)) //Prevents divsion by zero return @@ -543,13 +543,13 @@ var/obj/item/toy/crayon/C = W switch(C.crayon_color) if("mime") - to_chat(usr, "This crayon is too sad to be contained in this box!") + to_chat(usr, span_warning("This crayon is too sad to be contained in this box!")) return if("rainbow") - to_chat(usr, "This crayon is too powerful to be contained in this box!") + to_chat(usr, span_warning("This crayon is too powerful to be contained in this box!")) return if(istype(W, /obj/item/toy/crayon/spraycan)) - to_chat(user, "Spraycans are not crayons!") + to_chat(user, span_warning("Spraycans are not crayons!")) return return ..() @@ -588,11 +588,11 @@ /obj/item/toy/crayon/spraycan/suicide_act(mob/user) var/mob/living/carbon/human/H = user if(is_capped || !actually_paints) - user.visible_message("[user] shakes up [src] with a rattle and lifts it to [user.p_their()] mouth, but nothing happens!") + user.visible_message(span_suicide("[user] shakes up [src] with a rattle and lifts it to [user.p_their()] mouth, but nothing happens!")) user.say("MEDIOCRE!!", forced="spraycan suicide") return SHAME else - user.visible_message("[user] shakes up [src] with a rattle and lifts it to [user.p_their()] mouth, spraying paint across [user.p_their()] teeth!") + user.visible_message(span_suicide("[user] shakes up [src] with a rattle and lifts it to [user.p_their()] mouth, spraying paint across [user.p_their()] teeth!")) user.say("WITNESS ME!!", forced="spraycan suicide") if(pre_noise || post_noise) playsound(src, 'sound/blank.ogg', 5, TRUE, 5) @@ -626,14 +626,14 @@ . += "It has [charges_left] use\s left." else . += "It is empty." - . += "Alt-click [src] to [ is_capped ? "take the cap off" : "put the cap on"]." + . += span_notice("Alt-click [src] to [ is_capped ? "take the cap off" : "put the cap on"].") /obj/item/toy/crayon/spraycan/afterattack(atom/target, mob/user, proximity, params) if(!proximity) return if(is_capped) - to_chat(user, "Take the cap off first!") + to_chat(user, span_warning("Take the cap off first!")) return if(check_empty(user)) @@ -644,8 +644,8 @@ playsound(user.loc, 'sound/blank.ogg', 25, TRUE, 5) var/mob/living/carbon/C = target - user.visible_message("[user] sprays [src] into the face of [target]!") - to_chat(target, "[user] sprays [src] into your face!") + user.visible_message(span_danger("[user] sprays [src] into the face of [target]!")) + to_chat(target, span_danger("[user] sprays [src] into your face!")) if(C.client) C.blur_eyes(3) @@ -668,7 +668,7 @@ if(isobj(target)) if(actually_paints) if(color_hex2num(paint_color) < 350 && !istype(target, /obj/structure/window) && !istype(target, /obj/effect/decal/cleanable/crayon)) //Colors too dark are rejected - to_chat(usr, "A color that dark on an object like this? Surely not...") + to_chat(usr, span_warning("A color that dark on an object like this? Surely not...")) return FALSE target.add_atom_colour(paint_color, WASHABLE_COLOUR_PRIORITY) @@ -686,7 +686,7 @@ if(pre_noise || post_noise) playsound(user.loc, 'sound/blank.ogg', 5, TRUE, 5) - user.visible_message("[user] coats [target] with spray paint!", "I coat [target] with spray paint.") + user.visible_message(span_notice("[user] coats [target] with spray paint!"), span_notice("I coat [target] with spray paint.")) return . = ..() @@ -707,7 +707,7 @@ /obj/item/toy/crayon/spraycan/borg/afterattack(atom/target,mob/user,proximity, params) var/diff = ..() if(!iscyborg(user)) - to_chat(user, "How did you get this?") + to_chat(user, span_notice("How did you get this?")) qdel(src) return FALSE diff --git a/code/game/objects/items/credit_holochip.dm b/code/game/objects/items/credit_holochip.dm index 072c1beef..bd6dffdb0 100644 --- a/code/game/objects/items/credit_holochip.dm +++ b/code/game/objects/items/credit_holochip.dm @@ -16,7 +16,7 @@ /obj/item/holochip/examine(mob/user) . = ..() . += "It's loaded with [credits] credit[( credits > 1 ) ? "s" : ""]\n"+\ - "Alt-Click to split." + span_notice("Alt-Click to split.") /obj/item/holochip/get_item_credit_value() return credits @@ -77,7 +77,7 @@ if(istype(I, /obj/item/holochip)) var/obj/item/holochip/H = I credits += H.credits - to_chat(user, "I insert the credits into [src].") + to_chat(user, span_notice("I insert the credits into [src].")) update_icon() qdel(H) @@ -95,7 +95,7 @@ H.forceMove(user.drop_location()) add_fingerprint(user) H.add_fingerprint(user) - to_chat(user, "I extract [split_amount] credits into a new holochip.") + to_chat(user, span_notice("I extract [split_amount] credits into a new holochip.")) /obj/item/holochip/emp_act(severity) . = ..() @@ -103,5 +103,5 @@ return var/wipe_chance = 60 / severity if(prob(wipe_chance)) - visible_message("[src] fizzles and disappears!") + visible_message(span_warning("[src] fizzles and disappears!")) qdel(src) //rip cash diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 3590ad28e..d768af01d 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -95,13 +95,13 @@ if(user.get_item_by_slot(SLOT_BACK) == src) ui_action_click() else - to_chat(user, "Put the defibrillator on your back first!") + to_chat(user, span_warning("Put the defibrillator on your back first!")) else if(slot_flags == ITEM_SLOT_BELT) if(user.get_item_by_slot(SLOT_BELT) == src) ui_action_click() else - to_chat(user, "Strap the defibrillator's belt on first!") + to_chat(user, span_warning("Strap the defibrillator's belt on first!")) return else if(istype(loc, /obj/machinery/defibrillator_mount)) ui_action_click() //checks for this are handled in defibrillator.mount.dm @@ -122,15 +122,15 @@ else if(istype(W, /obj/item/stock_parts/cell)) var/obj/item/stock_parts/cell/C = W if(cell) - to_chat(user, "[src] already has a cell!") + to_chat(user, span_warning("[src] already has a cell!")) else if(C.maxcharge < paddles.revivecost) - to_chat(user, "[src] requires a higher capacity cell.") + to_chat(user, span_notice("[src] requires a higher capacity cell.")) return if(!user.transferItemToLoc(W, src)) return cell = W - to_chat(user, "I install a cell in [src].") + to_chat(user, span_notice("I install a cell in [src].")) update_icon() else if(W.tool_behaviour == TOOL_SCREWDRIVER) @@ -138,7 +138,7 @@ cell.update_icon() cell.forceMove(get_turf(src)) cell = null - to_chat(user, "I remove the cell from [src].") + to_chat(user, span_notice("I remove the cell from [src].")) update_icon() else return ..() @@ -146,10 +146,10 @@ /obj/item/defibrillator/emag_act(mob/user) if(safety) safety = FALSE - to_chat(user, "I silently disable [src]'s safety protocols with the cryptographic sequencer.") + to_chat(user, span_warning("I silently disable [src]'s safety protocols with the cryptographic sequencer.")) else safety = TRUE - to_chat(user, "I silently enable [src]'s safety protocols with the cryptographic sequencer.") + to_chat(user, span_notice("I silently enable [src]'s safety protocols with the cryptographic sequencer.")) /obj/item/defibrillator/emp_act(severity) . = ..() @@ -159,11 +159,11 @@ return if(safety) safety = FALSE - visible_message("[src] beeps: Safety protocols disabled!") + visible_message(span_notice("[src] beeps: Safety protocols disabled!")) playsound(src, 'sound/blank.ogg', 50, FALSE) else safety = TRUE - visible_message("[src] beeps: Safety protocols enabled!") + visible_message(span_notice("[src] beeps: Safety protocols enabled!")) playsound(src, 'sound/blank.ogg', 50, FALSE) update_icon() @@ -177,7 +177,7 @@ //Detach the paddles into the user's hands if(!usr.put_in_hands(paddles)) on = FALSE - to_chat(user, "I need a free hand to hold the paddles!") + to_chat(user, span_warning("I need a free hand to hold the paddles!")) update_icon() return else @@ -233,10 +233,10 @@ /obj/item/defibrillator/proc/finish_charging() if(cell) if(cell.charge >= paddles.revivecost) - visible_message("[src] beeps: Unit ready.") + visible_message(span_notice("[src] beeps: Unit ready.")) playsound(src, 'sound/blank.ogg', 50, FALSE) else - visible_message("[src] beeps: Charge depleted.") + visible_message(span_notice("[src] beeps: Charge depleted.")) playsound(src, 'sound/blank.ogg', 50, FALSE) paddles.cooldown = FALSE paddles.update_icon() @@ -333,9 +333,9 @@ if(!in_range(src,defib)) var/mob/living/L = loc if(istype(L)) - to_chat(L, "[defib]'s paddles overextend and come out of your hands!") + to_chat(L, span_warning("[defib]'s paddles overextend and come out of your hands!")) else - visible_message("[src] snap back into [defib].") + visible_message(span_notice("[src] snap back into [defib].")) snap_back() /obj/item/twohanded/shockpaddles/proc/recharge(time) @@ -345,7 +345,7 @@ update_icon() sleep(time) var/turf/T = get_turf(src) - T.audible_message("[src] beeps: Unit is recharged.") + T.audible_message(span_notice("[src] beeps: Unit is recharged.")) playsound(src, 'sound/blank.ogg', 50, FALSE) cooldown = FALSE update_icon() @@ -368,7 +368,7 @@ C.update_inv_hands() /obj/item/twohanded/shockpaddles/suicide_act(mob/user) - user.visible_message("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_danger("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!")) if(req_defib) defib.deductcharge(revivecost) playsound(src, 'sound/blank.ogg', 50, TRUE, -1) @@ -383,7 +383,7 @@ if(istype(O)) O.unwield() if(user != loc) - to_chat(user, "The paddles snap back into the main unit.") + to_chat(user, span_notice("The paddles snap back into the main unit.")) snap_back() return unwield(user) @@ -408,20 +408,20 @@ if(busy) return if(req_defib && !defib.powered) - user.visible_message("[defib] beeps: Unit is unpowered.") + user.visible_message(span_notice("[defib] beeps: Unit is unpowered.")) playsound(src, 'sound/blank.ogg', 50, FALSE) return if(!wielded) if(iscyborg(user)) - to_chat(user, "I must activate the paddles in your active module before you can use them on someone!") + to_chat(user, span_warning("I must activate the paddles in your active module before you can use them on someone!")) else - to_chat(user, "I need to wield the paddles in both hands before you can use them on someone!") + to_chat(user, span_warning("I need to wield the paddles in both hands before you can use them on someone!")) return if(cooldown) if(req_defib) - to_chat(user, "[defib] is recharging!") + to_chat(user, span_warning("[defib] is recharging!")) else - to_chat(user, "[src] are recharging!") + to_chat(user, span_warning("[src] are recharging!")) return if(user.used_intent.type == INTENT_DISARM) @@ -430,15 +430,15 @@ if(!iscarbon(M)) if(req_defib) - to_chat(user, "The instructions on [defib] don't mention how to revive that...") + to_chat(user, span_warning("The instructions on [defib] don't mention how to revive that...")) else - to_chat(user, "I aren't sure how to revive that...") + to_chat(user, span_warning("I aren't sure how to revive that...")) return var/mob/living/carbon/H = M if(user.zone_selected != BODY_ZONE_CHEST) - to_chat(user, "I need to target your patient's chest with [src]!") + to_chat(user, span_warning("I need to target your patient's chest with [src]!")) return if(user.used_intent.type == INTENT_HARM) @@ -472,7 +472,7 @@ if(isliving(H.pulledby)) //CLEAR! var/mob/living/M = H.pulledby if(M.electrocute_act(30, H)) - M.visible_message("[M] is electrocuted by [M.p_their()] contact with [H]!") + M.visible_message(span_danger("[M] is electrocuted by [M.p_their()] contact with [H]!")) M.emote("scream") /obj/item/twohanded/shockpaddles/proc/do_disarm(mob/living/M, mob/living/user) @@ -481,8 +481,8 @@ if(!req_defib && !combat) return busy = TRUE - M.visible_message("[user] has touched [M] with [src]!", \ - "[user] has touched [M] with [src]!") + M.visible_message(span_danger("[user] has touched [M] with [src]!"), \ + span_danger("[user] has touched [M] with [src]!")) M.adjustStaminaLoss(50) M.Paralyze(100) M.updatehealth() //forces health update before next life tick //isn't this done by adjustStaminaLoss anyway? @@ -504,39 +504,39 @@ return if(!req_defib && !combat) return - user.visible_message("[user] begins to place [src] on [H]'s chest.", - "I overcharge the paddles and begin to place them onto [H]'s chest...") + user.visible_message(span_warning("[user] begins to place [src] on [H]'s chest."), + span_warning("I overcharge the paddles and begin to place them onto [H]'s chest...")) busy = TRUE update_icon() if(do_after(user, 30, target = H)) - user.visible_message("[user] places [src] on [H]'s chest.", - "I place [src] on [H]'s chest and begin to charge them.") + user.visible_message(span_notice("[user] places [src] on [H]'s chest."), + span_warning("I place [src] on [H]'s chest and begin to charge them.")) var/turf/T = get_turf(defib) playsound(src, 'sound/blank.ogg', 50, FALSE) if(req_defib) - T.audible_message("\The [defib] lets out an urgent beep and lets out a steadily rising hum...") + T.audible_message(span_warning("\The [defib] lets out an urgent beep and lets out a steadily rising hum...")) else - user.audible_message("[src] let out an urgent beep.") + user.audible_message(span_warning("[src] let out an urgent beep.")) if(do_after(user, 30, target = H)) //Takes longer due to overcharging if(!H) busy = FALSE update_icon() return if(H && H.stat == DEAD) - to_chat(user, "[H] is dead.") + to_chat(user, span_warning("[H] is dead.")) playsound(src, 'sound/blank.ogg', 50, FALSE) busy = FALSE update_icon() return - user.visible_message("[user] shocks [H] with \the [src]!", "I shock [H] with \the [src]!") + user.visible_message(span_boldannounce("[user] shocks [H] with \the [src]!"), span_warning("I shock [H] with \the [src]!")) playsound(src, 'sound/blank.ogg', 100, TRUE, -1) playsound(src, 'sound/blank.ogg', 100, TRUE, -1) H.emote("scream") shock_touching(45, H) if(H.can_heartattack() && !H.undergoing_cardiac_arrest()) if(!H.stat) - H.visible_message("[H] thrashes wildly, clutching at [H.p_their()] chest!", - "I feel a horrible agony in your chest!") + H.visible_message(span_warning("[H] thrashes wildly, clutching at [H.p_their()] chest!"), + span_danger("I feel a horrible agony in your chest!")) H.set_heartattack(TRUE) H.apply_damage(50, BURN, BODY_ZONE_CHEST) log_combat(user, H, "overloaded the heart of", defib) @@ -555,11 +555,11 @@ update_icon() /obj/item/twohanded/shockpaddles/proc/do_help(mob/living/carbon/H, mob/living/user) - user.visible_message("[user] begins to place [src] on [H]'s chest.", "I begin to place [src] on [H]'s chest...") + user.visible_message(span_warning("[user] begins to place [src] on [H]'s chest."), span_warning("I begin to place [src] on [H]'s chest...")) busy = TRUE update_icon() if(do_after(user, 30, target = H)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process - user.visible_message("[user] places [src] on [H]'s chest.", "I place [src] on [H]'s chest.") + user.visible_message(span_notice("[user] places [src] on [H]'s chest."), span_warning("I place [src] on [H]'s chest.")) playsound(src, 'sound/blank.ogg', 75, FALSE) var/total_burn = 0 var/total_brute = 0 @@ -569,13 +569,13 @@ for(var/obj/item/carried_item in H.contents) if(istype(carried_item, /obj/item/clothing/suit/space)) if((!combat && !req_defib) || (req_defib && !defib.combat)) - user.audible_message("[req_defib ? "[defib]" : "[src]"] buzzes: Patient's chest is obscured. Operation aborted.") + user.audible_message(span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Patient's chest is obscured. Operation aborted.")) playsound(src, 'sound/blank.ogg', 50, FALSE) busy = FALSE update_icon() return if(H.stat == DEAD) - H.visible_message("[H]'s body convulses a bit.") + H.visible_message(span_warning("[H]'s body convulses a bit.")) playsound(src, "bodyfall", 100, TRUE) playsound(src, 'sound/blank.ogg', 75, TRUE, -1) total_brute = H.getBruteLoss() @@ -584,30 +584,30 @@ var/failed if (H.suiciding) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Recovery of patient impossible. Further attempts futile." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Recovery of patient impossible. Further attempts futile.") else if (H.hellbound) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's soul appears to be on another plane of existence. Further attempts futile." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's soul appears to be on another plane of existence. Further attempts futile.") else if (tplus > tlimit) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Body has decayed for too long. Further attempts futile." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Body has decayed for too long. Further attempts futile.") else if (!heart) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's heart is missing." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's heart is missing.") else if (heart.organ_flags & ORGAN_FAILING) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's heart too damaged." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's heart too damaged.") else if(total_burn >= MAX_REVIVE_FIRE_DAMAGE || total_brute >= MAX_REVIVE_BRUTE_DAMAGE || HAS_TRAIT(H, TRAIT_HUSK)) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Severe tissue damage makes recovery of patient impossible via defibrillator. Further attempts futile." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Severe tissue damage makes recovery of patient impossible via defibrillator. Further attempts futile.") else if(H.get_ghost()) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - No activity in patient's brain. Further attempts may be successful." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - No activity in patient's brain. Further attempts may be successful.") else var/obj/item/organ/brain/BR = H.getorgan(/obj/item/organ/brain) if(BR) if(BR.organ_flags & ORGAN_FAILING) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's brain tissue is damaged making recovery of patient impossible via defibrillator. Further attempts futile." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's brain tissue is damaged making recovery of patient impossible via defibrillator. Further attempts futile.") if(BR.brain_death) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's brain damaged beyond point of no return. Further attempts futile." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's brain damaged beyond point of no return. Further attempts futile.") if(BR.suicided || BR.brainmob?.suiciding) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - No intelligence pattern can be detected in patient's brain. Further attempts futile." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - No intelligence pattern can be detected in patient's brain. Further attempts futile.") else - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's brain is missing. Further attempts futile." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's brain is missing. Further attempts futile.") if(failed) user.visible_message(failed) @@ -624,7 +624,7 @@ H.adjustFireLoss((mobhealth - HALFWAYCRITDEATH) * (total_burn / overall_damage), 0) H.adjustBruteLoss((mobhealth - HALFWAYCRITDEATH) * (total_brute / overall_damage), 0) H.updatehealth() // Previous "adjust" procs don't update health, so we do it manually. - user.visible_message("[req_defib ? "[defib]" : "[src]"] pings: Resuscitation successful.") + user.visible_message(span_notice("[req_defib ? "[defib]" : "[src]"] pings: Resuscitation successful.")) playsound(src, 'sound/blank.ogg', 50, FALSE) H.set_heartattack(FALSE) H.revive(full_heal = FALSE, admin_revive = FALSE) @@ -641,18 +641,18 @@ else recharge(60) else if (!H.getorgan(/obj/item/organ/heart)) - user.visible_message("[req_defib ? "[defib]" : "[src]"] buzzes: Patient's heart is missing. Operation aborted.") + user.visible_message(span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Patient's heart is missing. Operation aborted.")) playsound(src, 'sound/blank.ogg', 50, FALSE) else if(H.undergoing_cardiac_arrest()) playsound(src, 'sound/blank.ogg', 50, TRUE, -1) if(!(heart.organ_flags & ORGAN_FAILING)) H.set_heartattack(FALSE) - user.visible_message("[req_defib ? "[defib]" : "[src]"] pings: Patient's heart is now beating again.") + user.visible_message(span_notice("[req_defib ? "[defib]" : "[src]"] pings: Patient's heart is now beating again.")) else - user.visible_message("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed, heart damage detected.") + user.visible_message(span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed, heart damage detected.")) else - user.visible_message("[req_defib ? "[defib]" : "[src]"] buzzes: Patient is not in a valid state. Operation aborted.") + user.visible_message(span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Patient is not in a valid state. Operation aborted.")) playsound(src, 'sound/blank.ogg', 50, FALSE) busy = FALSE update_icon() diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index c38251f44..8ed39ba64 100644 --- a/code/game/objects/items/dehy_carp.dm +++ b/code/game/objects/items/dehy_carp.dm @@ -13,7 +13,7 @@ /obj/item/toy/plush/carpplushie/dehy_carp/attack_self(mob/user) src.add_fingerprint(user) //Anyone can add their fingerprints to it with this if(!owned) - to_chat(user, "I pet [src]. You swear it looks up at you.") + to_chat(user, span_notice("I pet [src]. You swear it looks up at you.")) owner = user owned = 1 else @@ -24,7 +24,7 @@ /obj/item/toy/plush/carpplushie/dehy_carp/proc/Swell() desc = "" - visible_message("[src] swells up!") + visible_message(span_notice("[src] swells up!")) //Animation icon = 'icons/mob/carp.dmi' @@ -43,14 +43,14 @@ factions -= F M.faction = factions if (!owner || owner.faction != M.faction) - visible_message("I have a bad feeling about this.") //welcome to the hostile carp enjoy your die + visible_message(span_warning("I have a bad feeling about this.")) //welcome to the hostile carp enjoy your die else - visible_message("The newly grown [M.name] looks up at you with friendly eyes.") + visible_message(span_notice("The newly grown [M.name] looks up at you with friendly eyes.")) qdel(src) /obj/item/toy/plush/carpplushie/dehy_carp/suicide_act(mob/user) var/mob/living/carbon/human/H = user - user.visible_message("[user] starts eating [src]. It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] starts eating [src]. It looks like [user.p_theyre()] trying to commit suicide!")) playsound(src, 'sound/blank.ogg', 50, TRUE) if(istype(H)) H.Paralyze(30) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 175ef91c1..4f5d872e8 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -84,7 +84,7 @@ GLOBAL_LIST_EMPTY(PDAs) var/deathMessage = msg_input(user) if (!deathMessage) deathMessage = "i ded" - user.visible_message("[user] is sending a message to the Grim Reaper! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is sending a message to the Grim Reaper! It looks like [user.p_theyre()] trying to commit suicide!")) tnote += "→ To The Grim Reaper:
[deathMessage]
"//records a message in their PDA as being sent to the grim reaper return BRUTELOSS @@ -94,10 +94,10 @@ GLOBAL_LIST_EMPTY(PDAs) return if(id) - . += "Alt-click to remove the id." + . += span_notice("Alt-click to remove the id.") if(inserted_item && (!isturf(loc))) - . += "Ctrl-click to remove [inserted_item]." + . += span_notice("Ctrl-click to remove [inserted_item].") /obj/item/pda/Initialize() . = ..() @@ -188,12 +188,12 @@ GLOBAL_LIST_EMPTY(PDAs) return ..() /obj/item/pda/attack_self_tk(mob/user) - to_chat(user, "The PDA's capacitive touch screen doesn't seem to respond!") + to_chat(user, span_warning("The PDA's capacitive touch screen doesn't seem to respond!")) return /obj/item/pda/interact(mob/user) if(!user.IsAdvancedToolUser()) - to_chat(user, "I don't have the dexterity to do this!") + to_chat(user, span_warning("I don't have the dexterity to do this!")) return ..() @@ -450,7 +450,7 @@ GLOBAL_LIST_EMPTY(PDAs) if("Eject")//Ejects the cart, only done from hub. if (!isnull(cartridge)) U.put_in_hands(cartridge) - to_chat(U, "I remove [cartridge] from [src].") + to_chat(U, span_notice("I remove [cartridge] from [src].")) scanmode = PDA_SCANNER_NONE cartridge.host_pda = null cartridge = null @@ -508,7 +508,7 @@ GLOBAL_LIST_EMPTY(PDAs) var/alert_s = input(U,"Alert severity level","Ping Drones",null) as null|anything in list("Low","Medium","High","Critical") var/area/A = get_area(U) if(A && alert_s && !QDELETED(U)) - var/msg = "NON-DRONE {PING}: [U.name]: [alert_s] priority alert in [A.name]!" + var/msg = span_boldnotice("NON-DRONE {PING}: [U.name]: [alert_s] priority alert in [A.name]!") _alert_drones(msg, TRUE, U) to_chat(U, msg) @@ -579,7 +579,7 @@ GLOBAL_LIST_EMPTY(PDAs) pai.attack_self(U) if("2") // Eject pAI device usr.put_in_hands(pai) - to_chat(usr, "I remove the pAI from the [name].") + to_chat(usr, span_notice("I remove the pAI from the [name].")) //LINK FUNCTIONS=================================== @@ -614,7 +614,7 @@ GLOBAL_LIST_EMPTY(PDAs) if (id) usr.put_in_hands(id) - to_chat(usr, "I remove the ID from the [name].") + to_chat(usr, span_notice("I remove the ID from the [name].")) id = null update_icon() if(ishuman(loc)) @@ -627,7 +627,7 @@ GLOBAL_LIST_EMPTY(PDAs) return if(user) user.put_in_hands(id) - to_chat(user, "I remove the ID from the [name].") + to_chat(user, span_notice("I remove the ID from the [name].")) else id.forceMove(get_turf(src)) @@ -686,7 +686,7 @@ GLOBAL_LIST_EMPTY(PDAs) // If it didn't reach, note that fact if (!signal.data["done"]) - to_chat(user, "ERROR: Server isn't responding.") + to_chat(user, span_notice("ERROR: Server isn't responding.")) return var/target_text = signal.format_target() @@ -697,13 +697,13 @@ GLOBAL_LIST_EMPTY(PDAs) // Log it in our logs tnote += "→ To [target_text]:
[signal.format_message()]
" // Show it to ghosts - var/ghost_message = "[owner] PDA Message --> [target_text]: [signal.format_message()]" + var/ghost_message = span_name("[owner] PDA Message --> [target_text]: [signal.format_message()]") for(var/mob/M in GLOB.player_list) if(isobserver(M) && (M.client.prefs.chat_toggles & CHAT_GHOSTPDA)) to_chat(M, "[FOLLOW_LINK(M, user)] [ghost_message]") // Log in the talk log user.log_talk(message, LOG_PDA, tag="PDA: [initial(name)] to [target_text]") - to_chat(user, "PDA message sent to [target_text]: \"[message]\"") + to_chat(user, span_info("PDA message sent to [target_text]: \"[message]\"")) // Reset the photo picture = null last_text = world.time @@ -746,7 +746,7 @@ GLOBAL_LIST_EMPTY(PDAs) /obj/item/pda/proc/send_to_all(mob/living/U) if (last_everyone && world.time < last_everyone + PDA_SPAM_DELAY) - to_chat(U,"Send To All function is still on cooldown.") + to_chat(U,span_warning("Send To All function is still on cooldown.")) return send_message(U,get_viewable_pdas(), TRUE) @@ -783,7 +783,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(id) remove_id() else - to_chat(usr, "This PDA does not have an ID in it!") + to_chat(usr, span_warning("This PDA does not have an ID in it!")) /obj/item/pda/verb/verb_remove_pen() set hidden = 1 @@ -810,11 +810,11 @@ GLOBAL_LIST_EMPTY(PDAs) if(inserted_item) usr.put_in_hands(inserted_item) - to_chat(usr, "I remove [inserted_item] from [src].") + to_chat(usr, span_notice("I remove [inserted_item] from [src].")) inserted_item = null update_icon() else - to_chat(usr, "This PDA does not have a pen in it!") + to_chat(usr, span_warning("This PDA does not have a pen in it!")) //trying to insert or remove an id /obj/item/pda/proc/id_check(mob/user, obj/item/card/id/I) @@ -856,23 +856,23 @@ GLOBAL_LIST_EMPTY(PDAs) return cartridge = C cartridge.host_pda = src - to_chat(user, "I insert [cartridge] into [src].") + to_chat(user, span_notice("I insert [cartridge] into [src].")) update_icon() else if(istype(C, /obj/item/card/id)) var/obj/item/card/id/idcard = C if(!idcard.registered_name) - to_chat(user, "\The [src] rejects the ID!") + to_chat(user, span_warning("\The [src] rejects the ID!")) return if(!owner) owner = idcard.registered_name ownjob = idcard.assignment update_label() - to_chat(user, "Card scanned.") + to_chat(user, span_notice("Card scanned.")) else if(!id_check(user, idcard)) return - to_chat(user, "I put the ID into \the [src]'s slot.") + to_chat(user, span_notice("I put the ID into \the [src]'s slot.")) updateSelfDialog()//Update self dialog on success. return //Return in case of failed check or when successful. @@ -881,22 +881,22 @@ GLOBAL_LIST_EMPTY(PDAs) if(!user.transferItemToLoc(C, src)) return pai = C - to_chat(user, "I slot \the [C] into [src].") + to_chat(user, span_notice("I slot \the [C] into [src].")) update_icon() updateUsrDialog() else if(is_type_in_list(C, contained_item)) //Checks if there is a pen if(inserted_item) - to_chat(user, "There is already \a [inserted_item] in \the [src]!") + to_chat(user, span_warning("There is already \a [inserted_item] in \the [src]!")) else if(!user.transferItemToLoc(C, src)) return - to_chat(user, "I slide \the [C] into \the [src].") + to_chat(user, span_notice("I slide \the [C] into \the [src].")) inserted_item = C update_icon() else if(istype(C, /obj/item/photo)) var/obj/item/photo/P = C picture = P.picture - to_chat(user, "I scan \the [C].") + to_chat(user, span_notice("I scan \the [C].")) else return ..() @@ -905,18 +905,18 @@ GLOBAL_LIST_EMPTY(PDAs) switch(scanmode) if(PDA_SCANNER_MEDICAL) - C.visible_message("[user] has analyzed [C]'s vitals!") + C.visible_message(span_alert("[user] has analyzed [C]'s vitals!")) healthscan(user, C, 1) add_fingerprint(user) if(PDA_SCANNER_HALOGEN) - C.visible_message("[user] has analyzed [C]'s radiation levels!") + C.visible_message(span_warning("[user] has analyzed [C]'s radiation levels!")) - user.show_message("Analyzing Results for [C]:") + user.show_message(span_notice("Analyzing Results for [C]:")) if(C.radiation) user.show_message("\green Radiation Level: \black [C.radiation]") else - user.show_message("No radiation detected.") + user.show_message(span_notice("No radiation detected.")) /obj/item/pda/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) . = ..() @@ -927,13 +927,13 @@ GLOBAL_LIST_EMPTY(PDAs) if(!isnull(A.reagents)) if(A.reagents.reagent_list.len > 0) var/reagents_length = A.reagents.reagent_list.len - to_chat(user, "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.") + to_chat(user, span_notice("[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.")) for (var/re in A.reagents.reagent_list) - to_chat(user, "\t [re]") + to_chat(user, span_notice("\t [re]")) else - to_chat(user, "No active chemical agents found in [A].") + to_chat(user, span_notice("No active chemical agents found in [A].")) else - to_chat(user, "No significant chemical agents found in [A].") + to_chat(user, span_notice("No significant chemical agents found in [A].")) if(PDA_SCANNER_GAS) A.analyzer_act(user, src) @@ -941,7 +941,7 @@ GLOBAL_LIST_EMPTY(PDAs) if (!scanmode && istype(A, /obj/item/paper) && owner) var/obj/item/paper/PP = A if (!PP.info) - to_chat(user, "Unable to scan! Paper is blank.") + to_chat(user, span_warning("Unable to scan! Paper is blank.")) return notehtml = PP.info note = replacetext(notehtml, "
", "\[br\]") @@ -950,7 +950,7 @@ GLOBAL_LIST_EMPTY(PDAs) note = replacetext(note, "", "\[/list\]") note = html_encode(note) notescanned = TRUE - to_chat(user, "Paper scanned. Saved to PDA's notekeeper." ) + to_chat(user, span_notice("Paper scanned. Saved to PDA's notekeeper.") ) /obj/item/pda/proc/explode() //This needs tuning. @@ -958,9 +958,9 @@ GLOBAL_LIST_EMPTY(PDAs) if (ismob(loc)) var/mob/M = loc - M.show_message("My [src] explodes!", MSG_VISUAL, "I hear a loud *pop*!", MSG_AUDIBLE) + M.show_message(span_danger("My [src] explodes!"), MSG_VISUAL, span_warning("I hear a loud *pop*!"), MSG_AUDIBLE) else - visible_message("[src] explodes!", "I hear a loud *pop*!") + visible_message(span_danger("[src] explodes!"), span_warning("I hear a loud *pop*!")) if(T) T.hotspot_expose(700,125) @@ -994,7 +994,7 @@ GLOBAL_LIST_EMPTY(PDAs) var/mob/living/silicon/S = usr if(istype(S) && !isnull(S.aiPDA)) S.aiPDA.toff = !S.aiPDA.toff - to_chat(usr, "PDA sender/receiver toggled [(S.aiPDA.toff ? "Off" : "On")]!") + to_chat(usr, span_notice("PDA sender/receiver toggled [(S.aiPDA.toff ? "Off" : "On")]!")) else to_chat(usr, "You do not have a PDA. You should make an issue report about this.") @@ -1008,7 +1008,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(istype(S) && !isnull(S.aiPDA)) //0 S.aiPDA.silent = !S.aiPDA.silent - to_chat(usr, "PDA ringer toggled [(S.aiPDA.silent ? "Off" : "On")]!") + to_chat(usr, span_notice("PDA ringer toggled [(S.aiPDA.silent ? "Off" : "On")]!")) else to_chat(usr, "You do not have a PDA. You should make an issue report about this.") @@ -1017,7 +1017,7 @@ GLOBAL_LIST_EMPTY(PDAs) var/list/namecounts = list() if(aiPDA.toff) - to_chat(user, "Turn on my receiver in order to send messages.") + to_chat(user, span_alert("Turn on my receiver in order to send messages.")) return for (var/obj/item/pda/P in get_viewable_pdas()) @@ -1053,7 +1053,7 @@ GLOBAL_LIST_EMPTY(PDAs) var/HTML = "AI PDA Message Log[aiPDA.tnote]" user << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0") else - to_chat(user, "I do not have a PDA! You should make an issue report about this.") + to_chat(user, span_warning("I do not have a PDA! You should make an issue report about this.")) // Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP /obj/item/pda/emp_act(severity) diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 00ecb55d6..50d6680f9 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -274,7 +274,7 @@ Code: if(!powercount) - menu += "No connection
" + menu += span_danger("No connection
") else menu += "" @@ -288,7 +288,7 @@ Code: if (433) menu = "

[PDAIMG(power)] Power Monitor


" if(!powmonitor || !powmonitor.get_powernet()) - menu += "No connection
" + menu += span_danger("No connection
") else var/list/L = list() var/datum/powernet/connected_powernet = powmonitor.get_powernet() diff --git a/code/game/objects/items/devices/PDA/virus_cart.dm b/code/game/objects/items/devices/PDA/virus_cart.dm index d9d623e97..2f54d173d 100644 --- a/code/game/objects/items/devices/PDA/virus_cart.dm +++ b/code/game/objects/items/devices/PDA/virus_cart.dm @@ -25,14 +25,14 @@ /obj/item/cartridge/virus/clown/send_virus(obj/item/pda/target, mob/living/U) if(charges <= 0) - to_chat(U, "Out of charges.") + to_chat(U, span_notice("Out of charges.")) return if(!isnull(target) && !target.toff) charges-- - to_chat(U, "Virus Sent!") + to_chat(U, span_notice("Virus Sent!")) target.honkamt = (rand(15,20)) else - to_chat(U, "PDA not found.") + to_chat(U, span_alert("PDA not found.")) /obj/item/cartridge/virus/mime name = "\improper Gestur-O 1000 cartridge" @@ -41,15 +41,15 @@ /obj/item/cartridge/virus/mime/send_virus(obj/item/pda/target, mob/living/U) if(charges <= 0) - to_chat(U, "Out of charges.") + to_chat(U, span_alert("Out of charges.")) return if(!isnull(target) && !target.toff) charges-- - to_chat(U, "Virus Sent!") + to_chat(U, span_notice("Virus Sent!")) target.silent = TRUE target.ttone = "silence" else - to_chat(U, "PDA not found.") + to_chat(U, span_alert("PDA not found.")) /obj/item/cartridge/virus/syndicate name = "\improper Detomatix cartridge" @@ -60,7 +60,7 @@ /obj/item/cartridge/virus/syndicate/send_virus(obj/item/pda/target, mob/living/U) if(charges <= 0) - to_chat(U, "Out of charges.") + to_chat(U, span_notice("Out of charges.")) return if(!isnull(target) && !target.toff) charges-- @@ -72,13 +72,13 @@ else difficulty += 2 if(SEND_SIGNAL(target, COMSIG_PDA_CHECK_DETONATE) & COMPONENT_PDA_NO_DETONATE || prob(difficulty * 15)) - U.show_message("An error flashes on your [src].", MSG_VISUAL) + U.show_message(span_danger("An error flashes on your [src]."), MSG_VISUAL) else log_bomber(U, "triggered a PDA explosion on", target, "[!is_special_character(U) ? "(TRIGGED BY NON-ANTAG)" : ""]") - U.show_message("Success!", MSG_VISUAL) + U.show_message(span_notice("Success!"), MSG_VISUAL) target.explode() else - to_chat(U, "PDA not found.") + to_chat(U, span_alert("PDA not found.")) /obj/item/cartridge/virus/frame name = "\improper F.R.A.M.E. cartridge" @@ -87,12 +87,12 @@ /obj/item/cartridge/virus/frame/send_virus(obj/item/pda/target, mob/living/U) if(charges <= 0) - to_chat(U, "Out of charges.") + to_chat(U, span_alert("Out of charges.")) return if(!isnull(target) && !target.toff) charges-- var/lock_code = "[rand(100,999)] [pick(GLOB.phonetic_alphabet)]" - to_chat(U, "Virus Sent! The unlock code to the target is: [lock_code]") + to_chat(U, span_notice("Virus Sent! The unlock code to the target is: [lock_code]")) var/datum/component/uplink/hidden_uplink = target.GetComponent(/datum/component/uplink) if(!hidden_uplink) hidden_uplink = target.AddComponent(/datum/component/uplink) @@ -103,4 +103,4 @@ telecrystals = 0 hidden_uplink.active = TRUE else - to_chat(U, "PDA not found.") + to_chat(U, span_alert("PDA not found.")) diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index f23fad438..cb3dfd6a0 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -23,7 +23,7 @@ icon_state = "aispook" /obj/item/aicard/suicide_act(mob/living/user) - user.visible_message("[user] is trying to upload [user.p_them()]self into [src]! That's not going to work out well!") + user.visible_message(span_suicide("[user] is trying to upload [user.p_them()]self into [src]! That's not going to work out well!")) return BRUTELOSS /obj/item/aicard/afterattack(atom/target, mob/user, proximity) @@ -86,7 +86,7 @@ if(confirm == "Yes" && !..()) flush = TRUE if(AI && AI.loc == src) - to_chat(AI, "My core files are being wiped!") + to_chat(AI, span_danger("My core files are being wiped!")) while(AI.stat != DEAD && flush) AI.adjustOxyLoss(5) AI.updatehealth() @@ -95,10 +95,10 @@ . = TRUE if("wireless") AI.control_disabled = !AI.control_disabled - to_chat(AI, "[src]'s wireless port has been [AI.control_disabled ? "disabled" : "enabled"]!") + to_chat(AI, span_warning("[src]'s wireless port has been [AI.control_disabled ? "disabled" : "enabled"]!")) . = TRUE if("radio") AI.radio_enabled = !AI.radio_enabled - to_chat(AI, "My Subspace Transceiver has been [AI.radio_enabled ? "enabled" : "disabled"]!") + to_chat(AI, span_warning("My Subspace Transceiver has been [AI.radio_enabled ? "enabled" : "disabled"]!")) . = TRUE update_icon() diff --git a/code/game/objects/items/devices/anomaly_neutralizer.dm b/code/game/objects/items/devices/anomaly_neutralizer.dm index 2aa765d00..1d0c6831d 100644 --- a/code/game/objects/items/devices/anomaly_neutralizer.dm +++ b/code/game/objects/items/devices/anomaly_neutralizer.dm @@ -16,6 +16,6 @@ return if(istype(target, /obj/effect/anomaly)) var/obj/effect/anomaly/A = target - to_chat(user, "The circuitry of [src] fries from the strain of neutralizing [A]!") + to_chat(user, span_notice("The circuitry of [src] fries from the strain of neutralizing [A]!")) A.anomalyNeutralize() qdel(src) diff --git a/code/game/objects/items/devices/beacon.dm b/code/game/objects/items/devices/beacon.dm index f4c2a1c69..e48d1abf7 100644 --- a/code/game/objects/items/devices/beacon.dm +++ b/code/game/objects/items/devices/beacon.dm @@ -28,7 +28,7 @@ else icon_state = "beacon-off" GLOB.teleportbeacons.Remove(src) - to_chat(user, "I [enabled ? "enable" : "disable"] the beacon.") + to_chat(user, span_notice("I [enabled ? "enable" : "disable"] the beacon.")) return /obj/item/beacon/attackby(obj/item/W, mob/user) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index a153f2728..a7dae16ff 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -66,7 +66,7 @@ var/turf/T_user = get_turf(user.loc) var/turf/T_current = get_turf(current) if(T_user.z != T_current.z || !current.can_use()) - to_chat(user, "[src] has lost the signal.") + to_chat(user, span_danger("[src] has lost the signal.")) current = null user.unset_machine() return 0 @@ -243,7 +243,7 @@ if(!same_z_level(C)) return if(!C.can_use()) - to_chat(usr, "Something's wrong with that camera! You can't get a feed.") + to_chat(usr, span_warning("Something's wrong with that camera! You can't get a feed.")) return current = C spawn(6) @@ -300,7 +300,7 @@ var/turf/T_cam = get_turf(C) var/turf/T_bug = get_turf(loc) if(!T_bug || T_cam.z != T_bug.z) - to_chat(usr, "I can't get a signal!") + to_chat(usr, span_warning("I can't get a signal!")) return FALSE return TRUE diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 1d77ab00c..6db6699eb 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -33,7 +33,7 @@ if (isturf(user.loc) || istype(user.loc, /obj/structure) || active_dummy) toggle(user) else - to_chat(user, "I can't use [src] while inside something!") + to_chat(user, span_warning("I can't use [src] while inside something!")) /obj/item/chameleon/afterattack(atom/target, mob/user , proximity) . = ..() @@ -57,7 +57,7 @@ if(!(istype(target, /obj/effect/decal))) //be a footprint return playsound(get_turf(src), 'sound/blank.ogg', 100, TRUE, -6) - to_chat(user, "Scanned [target].") + to_chat(user, span_notice("Scanned [target].")) var/obj/temp = new/obj() temp.appearance = target.appearance temp.layer = initial(target.layer) // scanning things in my inventory @@ -77,20 +77,20 @@ playsound(get_turf(src), 'sound/blank.ogg', 100, TRUE, -6) qdel(active_dummy) active_dummy = null - to_chat(user, "I deactivate \the [src].") + to_chat(user, span_notice("I deactivate \the [src].")) new /obj/effect/temp_visual/emp/pulse(get_turf(src)) else playsound(get_turf(src), 'sound/blank.ogg', 100, TRUE, -6) var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(user.drop_location()) C.activate(user, saved_appearance, src) - to_chat(user, "I activate \the [src].") + to_chat(user, span_notice("I activate \the [src].")) new /obj/effect/temp_visual/emp/pulse(get_turf(src)) user.cancel_camera() /obj/item/chameleon/proc/disrupt(delete_dummy = 1) if(active_dummy) for(var/mob/M in active_dummy) - to_chat(M, "My chameleon projector deactivates.") + to_chat(M, span_danger("My chameleon projector deactivates.")) var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread spark_system.set_up(5, 0, src) spark_system.attach(src) diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm index 80693401d..6caa8bbc2 100644 --- a/code/game/objects/items/devices/desynchronizer.dm +++ b/code/game/objects/items/devices/desynchronizer.dm @@ -17,7 +17,7 @@ /obj/item/desynchronizer/attack_self(mob/living/user) if(world.time < next_use) - to_chat(user, "[src] is still recharging.") + to_chat(user, span_warning("[src] is still recharging.")) return if(!sync_holder) desync(user) @@ -27,9 +27,9 @@ /obj/item/desynchronizer/examine(mob/user) . = ..() if(world.time < next_use) - . += "Time left to recharge: [DisplayTimeText(next_use - world.time)]" - . += "Alt-click to customize the duration. Current duration: [DisplayTimeText(duration)]." - . += "Can be used again to interrupt the effect early. The recharge time is the same as the time spent in desync." + . += span_warning("Time left to recharge: [DisplayTimeText(next_use - world.time)]") + . += span_notice("Alt-click to customize the duration. Current duration: [DisplayTimeText(duration)].") + . += span_notice("Can be used again to interrupt the effect early. The recharge time is the same as the time spent in desync.") /obj/item/desynchronizer/AltClick(mob/living/user) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) @@ -39,14 +39,14 @@ new_duration = new_duration SECONDS new_duration = CLAMP(new_duration, 50, max_duration) duration = new_duration - to_chat(user, "I set the duration to [DisplayTimeText(duration)].") + to_chat(user, span_notice("I set the duration to [DisplayTimeText(duration)].")) /obj/item/desynchronizer/proc/desync(mob/living/user) if(sync_holder) return sync_holder = new(drop_location()) new /obj/effect/temp_visual/desynchronizer(drop_location()) - to_chat(user, "I activate [src], desynchronizing myself from the present. You can still see your surroundings, but you feel eerily dissociated from reality.") + to_chat(user, span_notice("I activate [src], desynchronizing myself from the present. You can still see your surroundings, but you feel eerily dissociated from reality.")) user.forceMove(sync_holder) SEND_SIGNAL(user, COMSIG_MOVABLE_SECLUDED_LOCATION) for(var/thing in user) diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm index 363d9e66c..de4a7de52 100644 --- a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm +++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm @@ -20,22 +20,22 @@ if(iscyborg(user)) . += "It has material for [circuits] circuit[circuits == 1 ? "" : "s"]. Use the pseudocircuit on existing circuits to gain material.\n"+\ "Serves as a substitute for fire/air alarm, firelock, and APC electronics.\n"+\ - "It can also be used on an APC with no power cell to fabricate a low-capacity cell at a high power cost." + span_notice("It can also be used on an APC with no power cell to fabricate a low-capacity cell at a high power cost.") /obj/item/electroadaptive_pseudocircuit/proc/adapt_circuit(mob/living/silicon/robot/R, circuit_cost = 0) if(QDELETED(R) || !istype(R)) return if(!R.cell) - to_chat(R, "I need a power cell installed for that.") + to_chat(R, span_warning("I need a power cell installed for that.")) return if(!R.cell.use(circuit_cost)) - to_chat(R, "I don't have the energy for that (you need [DisplayEnergy(circuit_cost)].)") + to_chat(R, span_warning("I don't have the energy for that (you need [DisplayEnergy(circuit_cost)].)")) return if(recharging) - to_chat(R, "[src] needs some time to recharge first.") + to_chat(R, span_warning("[src] needs some time to recharge first.")) return if(!circuits) - to_chat(R, "I need more material. Use [src] on existing simple circuits to break them down.") + to_chat(R, span_warning("I need more material. Use [src] on existing simple circuits to break them down.")) return playsound(R, 'sound/blank.ogg', 50, TRUE) recharging = TRUE @@ -54,8 +54,8 @@ return circuits++ maptext = "[circuits]" - user.visible_message("User breaks down [target] with [src].", \ - "I recycle [target] into [src]. It now has material for [circuits] circuits.") + user.visible_message(span_notice("User breaks down [target] with [src]."), \ + span_notice("I recycle [target] into [src]. It now has material for [circuits] circuits.")) playsound(user, 'sound/blank.ogg', 50, TRUE) qdel(target) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 04ca569fb..cfd21c444 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -42,9 +42,9 @@ /obj/item/flashlight/suicide_act(mob/living/carbon/human/user) if (user.eye_blind) - user.visible_message("[user] is putting [src] close to [user.p_their()] eyes and turning it on... but [user.p_theyre()] blind!") + user.visible_message(span_suicide("[user] is putting [src] close to [user.p_their()] eyes and turning it on... but [user.p_theyre()] blind!")) return SHAME - user.visible_message("[user] is putting [src] close to [user.p_their()] eyes and turning it on! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is putting [src] close to [user.p_their()] eyes and turning it on! It looks like [user.p_theyre()] trying to commit suicide!")) return (FIRELOSS) /obj/item/flashlight/attack(mob/living/carbon/M, mob/living/carbon/human/user) @@ -56,11 +56,11 @@ return ..() //just hit them in the head if(!user.IsAdvancedToolUser()) - to_chat(user, "I don't have the dexterity to do this!") + to_chat(user, span_warning("I don't have the dexterity to do this!")) return if(!M.get_bodypart(BODY_ZONE_HEAD)) - to_chat(user, "[M] doesn't have a head!") + to_chat(user, span_warning("[M] doesn't have a head!")) return if(light_power < 1) @@ -70,33 +70,33 @@ switch(user.zone_selected) if(BODY_ZONE_PRECISE_R_EYE) if((M.head && M.head.flags_cover & HEADCOVERSEYES) || (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSEYES) || (M.glasses && M.glasses.flags_cover & GLASSESCOVERSEYES)) - to_chat(user, "You're going to need to remove that [(M.head && M.head.flags_cover & HEADCOVERSEYES) ? "helmet" : (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSEYES) ? "mask": "glasses"] first!") + to_chat(user, span_warning("You're going to need to remove that [(M.head && M.head.flags_cover & HEADCOVERSEYES) ? "helmet" : (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSEYES) ? "mask": "glasses"] first!")) return var/obj/item/organ/eyes/E = M.getorganslot(ORGAN_SLOT_EYES) if(!E) - to_chat(user, "[M] doesn't have any eyes!") + to_chat(user, span_warning("[M] doesn't have any eyes!")) return if(M == user) //they're using it on themselves if(M.flash_act(visual = 1)) - M.visible_message("[M] directs [src] to [M.p_their()] eyes.", "I wave the light in front of your eyes! Trippy!") + M.visible_message(span_notice("[M] directs [src] to [M.p_their()] eyes."), span_notice("I wave the light in front of your eyes! Trippy!")) else - M.visible_message("[M] directs [src] to [M.p_their()] eyes.", "I wave the light in front of your eyes.") + M.visible_message(span_notice("[M] directs [src] to [M.p_their()] eyes."), span_notice("I wave the light in front of your eyes.")) else - user.visible_message("[user] directs [src] to [M]'s eyes.", \ - "I direct [src] to [M]'s eyes.") + user.visible_message(span_warning("[user] directs [src] to [M]'s eyes."), \ + span_danger("I direct [src] to [M]'s eyes.")) if(M.stat == DEAD || (HAS_TRAIT(M, TRAIT_BLIND)) || !M.flash_act(visual = 1)) //mob is dead or fully blind - to_chat(user, "[M]'s pupils don't react to the light!") + to_chat(user, span_warning("[M]'s pupils don't react to the light!")) else if(M.dna && M.dna.check_mutation(XRAY)) //mob has X-ray vision - to_chat(user, "[M]'s pupils give an eerie glow!") + to_chat(user, span_danger("[M]'s pupils give an eerie glow!")) else //they're okay! - to_chat(user, "[M]'s pupils narrow.") + to_chat(user, span_notice("[M]'s pupils narrow.")) if(BODY_ZONE_PRECISE_MOUTH) if(M.is_mouth_covered()) - to_chat(user, "You're going to need to remove that [(M.head && M.head.flags_cover & HEADCOVERSMOUTH) ? "helmet" : "mask"] first!") + to_chat(user, span_warning("You're going to need to remove that [(M.head && M.head.flags_cover & HEADCOVERSMOUTH) ? "helmet" : "mask"] first!")) return var/their = M.p_their() @@ -136,27 +136,27 @@ if(WEST) can_use_mirror = mirror.pixel_x < 0 - M.visible_message("[M] directs [src] to [their] mouth.", \ - "I point [src] into your mouth.") + M.visible_message(span_notice("[M] directs [src] to [their] mouth."), \ + span_notice("I point [src] into your mouth.")) if(!can_use_mirror) - to_chat(user, "I can't see anything without a mirror.") + to_chat(user, span_notice("I can't see anything without a mirror.")) return if(organ_count) - to_chat(user, "Inside your mouth [organ_count > 1 ? "are" : "is"] [organ_list].") + to_chat(user, span_notice("Inside your mouth [organ_count > 1 ? "are" : "is"] [organ_list].")) else - to_chat(user, "There's nothing inside your mouth.") + to_chat(user, span_notice("There's nothing inside your mouth.")) if(pill_count) - to_chat(user, "I have [pill_count] implanted pill[pill_count > 1 ? "s" : ""].") + to_chat(user, span_notice("I have [pill_count] implanted pill[pill_count > 1 ? "s" : ""].")) else - user.visible_message("[user] directs [src] to [M]'s mouth.",\ - "I direct [src] to [M]'s mouth.") + user.visible_message(span_notice("[user] directs [src] to [M]'s mouth."),\ + span_notice("I direct [src] to [M]'s mouth.")) if(organ_count) - to_chat(user, "Inside [their] mouth [organ_count > 1 ? "are" : "is"] [organ_list].") + to_chat(user, span_notice("Inside [their] mouth [organ_count > 1 ? "are" : "is"] [organ_list].")) else - to_chat(user, "[M] doesn't have any organs in [their] mouth.") + to_chat(user, span_notice("[M] doesn't have any organs in [their] mouth.")) if(pill_count) - to_chat(user, "[M] has [pill_count] pill[pill_count > 1 ? "s" : ""] implanted in [their] teeth.") + to_chat(user, span_notice("[M] has [pill_count] pill[pill_count > 1 ? "s" : ""] implanted in [their] teeth.")) else return ..()*/ @@ -174,7 +174,7 @@ . = ..() if(!proximity_flag) if(holo_cooldown > world.time) - to_chat(user, "[src] is not ready yet!") + to_chat(user, span_warning("[src] is not ready yet!")) return var/T = get_turf(target) if(locate(/mob/living) in T) @@ -192,7 +192,7 @@ . = ..() playsound(loc, 'sound/blank.ogg', 50, FALSE) //make some noise! if(creator) - visible_message("[creator] created a medical hologram!") + visible_message(span_danger("[creator] created a medical hologram!")) /obj/item/flashlight/seclite @@ -299,16 +299,16 @@ // Usual checks if(!fuel) - to_chat(user, "[src] is out of fuel!") + to_chat(user, span_warning("[src] is out of fuel!")) return if(on) - to_chat(user, "[src] is already on!") + to_chat(user, span_warning("[src] is already on!")) return . = ..() // All good, turn it on. if(.) - user.visible_message("[user] lights \the [src].", "I light \the [src]!") + user.visible_message(span_notice("[user] lights \the [src]."), span_notice("I light \the [src]!")) force = on_damage // damtype = "fire" START_PROCESSING(SSobj, src) @@ -379,7 +379,7 @@ // Usual checks // if(!fuel) -// to_chat(user, "[src] doesn't have any pitch left!") +// to_chat(user, span_warning("[src] doesn't have any pitch left!")) // return if(on) turn_off() @@ -565,14 +565,14 @@ if(ismob(A)) var/mob/M = A log_combat(user, M, "attacked", "EMP-light") - M.visible_message("[user] blinks \the [src] at \the [A].", \ - "[user] blinks \the [src] at you.") + M.visible_message(span_danger("[user] blinks \the [src] at \the [A]."), \ + span_danger("[user] blinks \the [src] at you.")) else - A.visible_message("[user] blinks \the [src] at \the [A].") - to_chat(user, "\The [src] now has [emp_cur_charges] charge\s.") + A.visible_message(span_danger("[user] blinks \the [src] at \the [A].")) + to_chat(user, span_notice("\The [src] now has [emp_cur_charges] charge\s.")) A.emp_act(EMP_HEAVY) else - to_chat(user, "\The [src] needs time to recharge!") + to_chat(user, span_warning("\The [src] needs time to recharge!")) return /obj/item/flashlight/emp/debug //for testing emp_act() @@ -636,26 +636,26 @@ /obj/item/flashlight/glowstick/attack_self(mob/user) if(!fuel) - to_chat(user, "[src] is spent.") + to_chat(user, span_notice("[src] is spent.")) return if(on) - to_chat(user, "[src] is already lit!") + to_chat(user, span_warning("[src] is already lit!")) return . = ..() if(.) - user.visible_message("[user] cracks and shakes [src].", "I crack and shake [src], turning it on!") + user.visible_message(span_notice("[user] cracks and shakes [src]."), span_notice("I crack and shake [src], turning it on!")) START_PROCESSING(SSobj, src) /obj/item/flashlight/glowstick/suicide_act(mob/living/carbon/human/user) if(!fuel) - user.visible_message("[user] is trying to squirt [src]'s fluids into [user.p_their()] eyes... but it's empty!") + user.visible_message(span_suicide("[user] is trying to squirt [src]'s fluids into [user.p_their()] eyes... but it's empty!")) return SHAME var/obj/item/organ/eyes/eyes = user.getorganslot(ORGAN_SLOT_EYES) if(!eyes) - user.visible_message("[user] is trying to squirt [src]'s fluids into [user.p_their()] eyes... but [user.p_they()] don't have any!") + user.visible_message(span_suicide("[user] is trying to squirt [src]'s fluids into [user.p_their()] eyes... but [user.p_they()] don't have any!")) return SHAME - user.visible_message("[user] is squirting [src]'s fluids into [user.p_their()] eyes! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is squirting [src]'s fluids into [user.p_their()] eyes! It looks like [user.p_theyre()] trying to commit suicide!")) fuel = 0 return (FIRELOSS) diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm index 1dc1c7551..7485cc543 100644 --- a/code/game/objects/items/devices/forcefieldprojector.dm +++ b/code/game/objects/items/devices/forcefieldprojector.dm @@ -23,37 +23,37 @@ if(istype(target, /obj/structure/projected_forcefield)) var/obj/structure/projected_forcefield/F = target if(F.generator == src) - to_chat(user, "I deactivate [F].") + to_chat(user, span_notice("I deactivate [F].")) qdel(F) return var/turf/T = get_turf(target) var/obj/structure/projected_forcefield/found_field = locate() in T if(found_field) - to_chat(user, "There is already a forcefield in that location!") + to_chat(user, span_warning("There is already a forcefield in that location!")) return if(T.density) return if(get_dist(T,src) > field_distance_limit) return if(LAZYLEN(current_fields) >= max_fields) - to_chat(user, "[src] cannot sustain any more forcefields!") + to_chat(user, span_warning("[src] cannot sustain any more forcefields!")) return playsound(src,'sound/blank.ogg',50,TRUE) - user.visible_message("[user] projects a forcefield!","I project a forcefield.") + user.visible_message(span_warning("[user] projects a forcefield!"),span_notice("I project a forcefield.")) var/obj/structure/projected_forcefield/F = new(T, src) current_fields += F user.changeNext_move(CLICK_CD_MELEE) /obj/item/forcefield_projector/attack_self(mob/user) if(LAZYLEN(current_fields)) - to_chat(user, "I deactivate [src], disabling all active forcefields.") + to_chat(user, span_notice("I deactivate [src], disabling all active forcefields.")) for(var/obj/structure/projected_forcefield/F in current_fields) qdel(F) /obj/item/forcefield_projector/examine(mob/user) . = ..() - . += "It is currently sustaining [LAZYLEN(current_fields)]/[max_fields] fields, and it's [round((shield_integrity/max_shield_integrity)*100)]% charged." + . += span_notice("It is currently sustaining [LAZYLEN(current_fields)]/[max_fields] fields, and it's [round((shield_integrity/max_shield_integrity)*100)]% charged.") /obj/item/forcefield_projector/Initialize(mapload) . = ..() @@ -92,7 +92,7 @@ generator = origin /obj/structure/projected_forcefield/Destroy() - visible_message("[src] flickers and disappears!") + visible_message(span_warning("[src] flickers and disappears!")) playsound(src,'sound/blank.ogg',25,TRUE) generator.current_fields -= src generator = null diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index 6ca01e806..0825c057d 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -66,25 +66,25 @@ . = ..() if(!scanning) return - . += "Alt-click it to clear stored radiation levels." + . += span_info("Alt-click it to clear stored radiation levels.") if(obj_flags & EMAGGED) - . += "The display seems to be incomprehensible." + . += span_warning("The display seems to be incomprehensible.") return switch(radiation_count) if(-INFINITY to RAD_LEVEL_NORMAL) - . += "Ambient radiation level count reports that all is well." + . += span_notice("Ambient radiation level count reports that all is well.") if(RAD_LEVEL_NORMAL + 1 to RAD_LEVEL_MODERATE) - . += "Ambient radiation levels slightly above average." + . += span_alert("Ambient radiation levels slightly above average.") if(RAD_LEVEL_MODERATE + 1 to RAD_LEVEL_HIGH) - . += "Ambient radiation levels above average." + . += span_warning("Ambient radiation levels above average.") if(RAD_LEVEL_HIGH + 1 to RAD_LEVEL_VERY_HIGH) - . += "Ambient radiation levels highly above average." + . += span_danger("Ambient radiation levels highly above average.") if(RAD_LEVEL_VERY_HIGH + 1 to RAD_LEVEL_CRITICAL) - . += "Ambient radiation levels nearing critical level." + . += span_suicide("Ambient radiation levels nearing critical level.") if(RAD_LEVEL_CRITICAL + 1 to INFINITY) - . += "Ambient radiation levels above critical level!" + . += span_boldannounce("Ambient radiation levels above critical level!") - . += "The last radiation amount detected was [last_tick_amount]" + . += span_notice("The last radiation amount detected was [last_tick_amount]") /obj/item/geiger_counter/update_icon() if(!scanning) @@ -129,16 +129,16 @@ /obj/item/geiger_counter/attack_self(mob/user) scanning = !scanning update_icon() - to_chat(user, "[icon2html(src, user)] You switch [scanning ? "on" : "off"] [src].") + to_chat(user, span_notice("[icon2html(src, user)] You switch [scanning ? "on" : "off"] [src].")) /obj/item/geiger_counter/afterattack(atom/target, mob/user) . = ..() if(user.used_intent.type == INTENT_HELP) if(!(obj_flags & EMAGGED)) - user.visible_message("[user] scans [target] with [src].", "I scan [target]'s radiation levels with [src]...") + user.visible_message(span_notice("[user] scans [target] with [src]."), span_notice("I scan [target]'s radiation levels with [src]...")) addtimer(CALLBACK(src, PROC_REF(scan), target, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents else - user.visible_message("[user] scans [target] with [src].", "I project [src]'s stored radiation into [target]!") + user.visible_message(span_notice("[user] scans [target] with [src]."), span_danger("I project [src]'s stored radiation into [target]!")) target.rad_act(radiation_count) radiation_count = 0 return TRUE @@ -156,24 +156,24 @@ if(isliving(A)) var/mob/living/M = A if(!M.radiation) - to_chat(user, "[icon2html(src, user)] Radiation levels within normal boundaries.") + to_chat(user, span_notice("[icon2html(src, user)] Radiation levels within normal boundaries.")) else - to_chat(user, "[icon2html(src, user)] Subject is irradiated. Radiation levels: [M.radiation].") + to_chat(user, span_boldannounce("[icon2html(src, user)] Subject is irradiated. Radiation levels: [M.radiation].")) if(rad_strength) - to_chat(user, "[icon2html(src, user)] Target contains radioactive contamination. Radioactive strength: [rad_strength]") + to_chat(user, span_boldannounce("[icon2html(src, user)] Target contains radioactive contamination. Radioactive strength: [rad_strength]")) else - to_chat(user, "[icon2html(src, user)] Target is free of radioactive contamination.") + to_chat(user, span_notice("[icon2html(src, user)] Target is free of radioactive contamination.")) /obj/item/geiger_counter/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_SCREWDRIVER && (obj_flags & EMAGGED)) if(scanning) - to_chat(user, "Turn off [src] before you perform this action!") + to_chat(user, span_warning("Turn off [src] before you perform this action!")) return 0 - user.visible_message("[user] unscrews [src]'s maintenance panel and begins fiddling with its innards...", "I begin resetting [src]...") + user.visible_message(span_notice("[user] unscrews [src]'s maintenance panel and begins fiddling with its innards..."), span_notice("I begin resetting [src]...")) if(!I.use_tool(src, user, 40, volume=50)) return 0 - user.visible_message("[user] refastens [src]'s maintenance panel!", "I reset [src] to its factory settings!") + user.visible_message(span_notice("[user] refastens [src]'s maintenance panel!"), span_notice("I reset [src] to its factory settings!")) obj_flags &= ~EMAGGED radiation_count = 0 update_icon() @@ -185,19 +185,19 @@ if(!istype(user) || !user.canUseTopic(src, BE_CLOSE)) return ..() if(!scanning) - to_chat(usr, "[src] must be on to reset its radiation level!") + to_chat(usr, span_warning("[src] must be on to reset its radiation level!")) return 0 radiation_count = 0 - to_chat(usr, "I flush [src]'s radiation counts, resetting it to normal.") + to_chat(usr, span_notice("I flush [src]'s radiation counts, resetting it to normal.")) update_icon() /obj/item/geiger_counter/emag_act(mob/user) if(obj_flags & EMAGGED) return if(scanning) - to_chat(user, "Turn off [src] before you perform this action!") + to_chat(user, span_warning("Turn off [src] before you perform this action!")) return 0 - to_chat(user, "I override [src]'s radiation storing protocols. It will now generate small doses of radiation, and stored rads are now projected into creatures you scan.") + to_chat(user, span_warning("I override [src]'s radiation storing protocols. It will now generate small doses of radiation, and stored rads are now projected into creatures you scan.")) obj_flags |= EMAGGED diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm index 282e5a8ed..11cbb4fae 100644 --- a/code/game/objects/items/devices/instruments.dm +++ b/code/game/objects/items/devices/instruments.dm @@ -20,7 +20,7 @@ . = ..() /obj/item/instrument/suicide_act(mob/user) - user.visible_message("[user] begins to play 'Gloomy Sunday'! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins to play 'Gloomy Sunday'! It looks like [user.p_theyre()] trying to commit suicide!")) return (BRUTELOSS) /obj/item/instrument/Initialize(mapload) @@ -30,7 +30,7 @@ /obj/item/instrument/attack_self(mob/user) if(!user.IsAdvancedToolUser()) - to_chat(user, "I don't have the dexterity to do this!") + to_chat(user, span_warning("I don't have the dexterity to do this!")) return 1 interact(user) @@ -214,7 +214,7 @@ /obj/item/instrument/harmonica/proc/handle_speech(datum/source, list/speech_args) if(song.playing && ismob(loc)) - to_chat(loc, "I stop playing the harmonica to talk...") + to_chat(loc, span_warning("I stop playing the harmonica to talk...")) song.playing = FALSE /obj/item/instrument/harmonica/equipped(mob/M, slot) diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index b5be7d1a3..08941de5b 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -44,13 +44,13 @@ if(!user.transferItemToLoc(W, src)) return diode = W - to_chat(user, "I install a [diode.name] in [src].") + to_chat(user, span_notice("I install a [diode.name] in [src].")) else - to_chat(user, "[src] already has a diode installed!") + to_chat(user, span_warning("[src] already has a diode installed!")) else if(W.tool_behaviour == TOOL_SCREWDRIVER) if(diode) - to_chat(user, "I remove the [diode.name] from \the [src].") + to_chat(user, span_notice("I remove the [diode.name] from \the [src].")) diode.forceMove(drop_location()) diode = null else @@ -60,9 +60,9 @@ . = ..() if(in_range(user, src) || isobserver(user)) if(!diode) - . += "The diode is missing." + . += span_notice("The diode is missing.") else - . += "A class [diode.rating] laser diode is installed. It is screwed in place." + . += span_notice("A class [diode.rating] laser diode is installed. It is screwed in place.") /obj/item/laser_pointer/afterattack(atom/target, mob/living/user, flag, params) . = ..() @@ -72,19 +72,19 @@ if( !(user in (viewers(7,target))) ) return if (!diode) - to_chat(user, "I point [src] at [target], but nothing happens!") + to_chat(user, span_notice("I point [src] at [target], but nothing happens!")) return if (!user.IsAdvancedToolUser()) - to_chat(user, "I don't have the dexterity to do this!") + to_chat(user, span_warning("I don't have the dexterity to do this!")) return if(HAS_TRAIT(user, TRAIT_CHUNKYFINGERS)) - to_chat(user, "My fingers can't press the button!") + to_chat(user, span_warning("My fingers can't press the button!")) return add_fingerprint(user) //nothing happens if the battery is drained if(recharge_locked) - to_chat(user, "I point [src] at [target], but it's still charging.") + to_chat(user, span_notice("I point [src] at [target], but it's still charging.")) return var/outmsg @@ -103,10 +103,10 @@ //chance to actually hit the eyes depends on internal component if(prob(effectchance * diode.rating) && C.flash_act(severity)) - outmsg = "I blind [C] by shining [src] in [C.p_their()] eyes." + outmsg = span_notice("I blind [C] by shining [src] in [C.p_their()] eyes.") log_combat(user, C, "blinded with a laser pointer",src) else - outmsg = "I fail to blind [C] by shining [src] at [C.p_their()] eyes!" + outmsg = span_warning("I fail to blind [C] by shining [src] at [C.p_their()] eyes!") log_combat(user, C, "attempted to blind with a laser pointer",src) //robots @@ -117,20 +117,20 @@ if(prob(effectchance * diode.rating)) S.flash_act(affect_silicon = 1) S.Paralyze(rand(100,200)) - to_chat(S, "My sensors were overloaded by a laser!") - outmsg = "I overload [S] by shining [src] at [S.p_their()] sensors." + to_chat(S, span_danger("My sensors were overloaded by a laser!")) + outmsg = span_notice("I overload [S] by shining [src] at [S.p_their()] sensors.") else - outmsg = "I fail to overload [S] by shining [src] at [S.p_their()] sensors!" + outmsg = span_warning("I fail to overload [S] by shining [src] at [S.p_their()] sensors!") //cameras else if(istype(target, /obj/machinery/camera)) var/obj/machinery/camera/C = target if(prob(effectchance * diode.rating)) C.emp_act(EMP_HEAVY) - outmsg = "I hit the lens of [C] with [src], temporarily disabling the camera!" + outmsg = span_notice("I hit the lens of [C] with [src], temporarily disabling the camera!") log_combat(user, C, "EMPed", src) else - outmsg = "I miss the lens of [C] with [src]!" + outmsg = span_warning("I miss the lens of [C] with [src]!") //catpeople for(var/mob/living/carbon/human/H in view(1,targloc)) @@ -139,22 +139,22 @@ if(user.mobility_flags & MOBILITY_STAND) H.setDir(get_dir(H,targloc)) // kitty always looks at the light if(prob(effectchance * diode.rating)) - H.visible_message("[H] makes a grab for the light!","LIGHT!") + H.visible_message(span_warning("[H] makes a grab for the light!"),span_danger("LIGHT!")) H.Move(targloc) log_combat(user, H, "moved with a laser pointer",src) else - H.visible_message("[H] looks briefly distracted by the light.", "You're briefly tempted by the shiny light...") + H.visible_message(span_notice("[H] looks briefly distracted by the light."), span_warning("You're briefly tempted by the shiny light...")) else - H.visible_message("[H] stares at the light.", "I stare at the light...") + H.visible_message(span_notice("[H] stares at the light."), span_warning("I stare at the light...")) //cats! for(var/mob/living/simple_animal/pet/cat/C in view(1,targloc)) if(prob(effectchance * diode.rating)) - C.visible_message("[C] pounces on the light!","LIGHT!") + C.visible_message(span_notice("[C] pounces on the light!"),span_warning("LIGHT!")) C.Move(targloc) C.set_resting(TRUE, FALSE) else - C.visible_message("[C] looks uninterested in my games.","I spot [user] shining [src] at you. How insulting!") + C.visible_message(span_notice("[C] looks uninterested in my games."),span_warning("I spot [user] shining [src] at you. How insulting!")) //laser pointer image icon_state = "pointer_[pointer_icon_state]" @@ -172,7 +172,7 @@ if(outmsg) to_chat(user, outmsg) else - to_chat(user, "I point [src] at [target].") + to_chat(user, span_info("I point [src] at [target].")) energy -= 1 if(energy <= max_energy) @@ -180,7 +180,7 @@ recharging = 1 START_PROCESSING(SSobj, src) if(energy <= 0) - to_chat(user, "[src]'s battery is overused, it needs time to recharge!") + to_chat(user, span_warning("[src]'s battery is overused, it needs time to recharge!")) recharge_locked = TRUE flick_overlay_view(I, targloc, 10) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index ded8700f8..932d6e5ee 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -75,23 +75,23 @@ if(istype(W, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = W if(uses >= max_uses) - to_chat(user, "[src.name] is full.") + to_chat(user, span_warning("[src.name] is full.")) return else if(G.use(decrement)) AddUses(increment) - to_chat(user, "I insert a piece of glass into \the [src.name]. You have [uses] light\s remaining.") + to_chat(user, span_notice("I insert a piece of glass into \the [src.name]. You have [uses] light\s remaining.")) return else - to_chat(user, "I need one sheet of glass to replace lights!") + to_chat(user, span_warning("I need one sheet of glass to replace lights!")) if(istype(W, /obj/item/shard)) if(uses >= max_uses) - to_chat(user, "\The [src] is full.") + to_chat(user, span_warning("\The [src] is full.")) return if(!user.temporarilyRemoveItemFromInventory(W)) return AddUses(round(increment*0.75)) - to_chat(user, "I insert a shard of glass into \the [src]. You have [uses] light\s remaining.") + to_chat(user, span_notice("I insert a shard of glass into \the [src]. You have [uses] light\s remaining.")) qdel(W) return @@ -106,7 +106,7 @@ else if(!user.temporarilyRemoveItemFromInventory(W)) return - to_chat(user, "I insert [L] into \the [src].") + to_chat(user, span_notice("I insert [L] into \the [src].")) AddShards(1, user) qdel(L) return @@ -133,14 +133,14 @@ qdel(L) if(!found_lightbulbs) - to_chat(user, "\The [S] contains no bulbs.") + to_chat(user, span_warning("\The [S] contains no bulbs.")) return if(!replaced_something && src.uses == max_uses) - to_chat(user, "\The [src] is full!") + to_chat(user, span_warning("\The [src] is full!")) return - to_chat(user, "I fill \the [src] with lights from \the [S]. " + status_string() + "") + to_chat(user, span_notice("I fill \the [src] with lights from \the [S]. " + status_string() + "")) /obj/item/lightreplacer/emag_act() if(obj_flags & EMAGGED) @@ -174,7 +174,7 @@ AddUses(new_bulbs) bulb_shards = bulb_shards % shards_required if(new_bulbs != 0) - to_chat(user, "\The [src] has fabricated a new bulb from the broken glass it has stored. It now has [uses] uses.") + to_chat(user, span_notice("\The [src] has fabricated a new bulb from the broken glass it has stored. It now has [uses] uses.")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) return new_bulbs @@ -190,7 +190,7 @@ if(CanUse(U)) if(!Use(U)) return - to_chat(U, "I replace \the [target.fitting] with \the [src].") + to_chat(U, span_notice("I replace \the [target.fitting] with \the [src].")) if(target.status != LIGHT_EMPTY) AddShards(1, U) @@ -212,10 +212,10 @@ return else - to_chat(U, "\The [src]'s refill light blinks red.") + to_chat(U, span_warning("\The [src]'s refill light blinks red.")) return else - to_chat(U, "There is a working [target.fitting] already inserted!") + to_chat(U, span_warning("There is a working [target.fitting] already inserted!")) return /obj/item/lightreplacer/proc/Emag() @@ -250,7 +250,7 @@ ReplaceLight(A, U) if(!used) - to_chat(U, "\The [src]'s refill light blinks red.") + to_chat(U, span_warning("\The [src]'s refill light blinks red.")) /obj/item/lightreplacer/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J) J.put_in_cart(src, user) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 9c1a22a6e..5535e0361 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -12,7 +12,7 @@ var/list/voicespan = list(SPAN_COMMAND) /obj/item/megaphone/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is uttering [user.p_their()] last words into \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is uttering [user.p_their()] last words into \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) spamcheck = 0//so they dont have to worry about recharging user.say("AAAAAAAAAAAARGHHHHH", forced="megaphone suicide")//he must have died while coding this return OXYLOSS @@ -31,7 +31,7 @@ /obj/item/megaphone/proc/handle_speech(mob/living/carbon/user, list/speech_args) if (user.get_active_held_item() == src) if(spamcheck > world.time) - to_chat(user, "\The [src] needs to recharge!") + to_chat(user, span_warning("\The [src] needs to recharge!")) else playsound(loc, 'sound/blank.ogg', 100, FALSE, TRUE) spamcheck = world.time + 50 @@ -40,7 +40,7 @@ /obj/item/megaphone/emag_act(mob/user) if(obj_flags & EMAGGED) return - to_chat(user, "I overload \the [src]'s voice synthesizer.") + to_chat(user, span_warning("I overload \the [src]'s voice synthesizer.")) obj_flags |= EMAGGED voicespan = list(SPAN_REALLYBIG, "danger") diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index c3ce083c7..c478be18c 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -34,10 +34,10 @@ /obj/item/multitool/examine(mob/user) . = ..() - . += "Its buffer [buffer ? "contains [buffer]." : "is empty."]" + . += span_notice("Its buffer [buffer ? "contains [buffer]." : "is empty."]") /obj/item/multitool/suicide_act(mob/living/carbon/user) - user.visible_message("[user] puts the [src] to [user.p_their()] chest. It looks like [user.p_theyre()] trying to pulse [user.p_their()] heart off!") + user.visible_message(span_suicide("[user] puts the [src] to [user.p_their()] chest. It looks like [user.p_theyre()] trying to pulse [user.p_their()] heart off!")) return OXYLOSS//theres a reason it wasnt recommended by doctors @@ -94,7 +94,7 @@ /obj/item/multitool/ai_detect/proc/toggle_hud(mob/user) hud_on = !hud_on if(user) - to_chat(user, "I toggle the ai detection HUD on [src] [hud_on ? "on" : "off"].") + to_chat(user, span_notice("I toggle the ai detection HUD on [src] [hud_on ? "on" : "off"].")) if(hud_on) show_hud(user) else diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 35b91581e..a1082dbef 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -11,7 +11,7 @@ resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE /obj/item/paicard/suicide_act(mob/living/user) - user.visible_message("[user] is staring sadly at [src]! [user.p_they()] can't keep living without real human intimacy!") + user.visible_message(span_suicide("[user] is staring sadly at [src]! [user.p_they()] can't keep living without real human intimacy!")) return OXYLOSS /obj/item/paicard/Initialize() @@ -77,21 +77,21 @@ if(pai.master_dna) return if(!iscarbon(usr)) - to_chat(usr, "I don't have any DNA, or my DNA is incompatible with this device!") + to_chat(usr, span_warning("I don't have any DNA, or my DNA is incompatible with this device!")) else var/mob/living/carbon/M = usr pai.master = M.real_name pai.master_dna = M.dna.unique_enzymes - to_chat(pai, "I have been bound to a new master.") + to_chat(pai, span_notice("I have been bound to a new master.")) pai.emittersemicd = FALSE if(href_list["wipe"]) var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No") if(confirm == "Yes") if(pai) - to_chat(pai, "I feel myself slipping away from reality.") - to_chat(pai, "Byte by byte you lose my sense of self.") - to_chat(pai, "My mental faculties leave you.") - to_chat(pai, "oblivion... ") + to_chat(pai, span_warning("I feel myself slipping away from reality.")) + to_chat(pai, span_danger("Byte by byte you lose my sense of self.")) + to_chat(pai, span_danger("My mental faculties leave you.")) + to_chat(pai, span_rose("oblivion... ")) qdel(pai) if(href_list["fix_speech"]) pai.stuttering = 0 @@ -106,21 +106,21 @@ pai.can_receive = !pai.can_receive pai.radio.wires.cut(transmit_holder)//wires.cut toggles cut and uncut states transmit_holder = (transmitting ? pai.can_transmit : pai.can_receive) //recycling can be fun! - to_chat(usr,"I [transmit_holder ? "enable" : "disable"] my pAI's [transmitting ? "outgoing" : "incoming"] radio transmissions!") - to_chat(pai,"My owner has [transmit_holder ? "enabled" : "disabled"] my [transmitting ? "outgoing" : "incoming"] radio transmissions!") + to_chat(usr,span_warning("I [transmit_holder ? "enable" : "disable"] my pAI's [transmitting ? "outgoing" : "incoming"] radio transmissions!")) + to_chat(pai,span_warning("My owner has [transmit_holder ? "enabled" : "disabled"] my [transmitting ? "outgoing" : "incoming"] radio transmissions!")) if(href_list["setlaws"]) var/newlaws = copytext(sanitize(input("Enter any additional directives you would like my pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.laws.supplied[1]) as message|null),1,MAX_MESSAGE_LEN) if(newlaws && pai) pai.add_supplied_law(0,newlaws) if(href_list["toggle_holo"]) if(pai.canholo) - to_chat(pai, "My owner has disabled my holomatrix projectors!") + to_chat(pai, span_danger("My owner has disabled my holomatrix projectors!")) pai.canholo = FALSE - to_chat(usr, "I disable my pAI's holomatrix!") + to_chat(usr, span_warning("I disable my pAI's holomatrix!")) else - to_chat(pai, "My owner has enabled my holomatrix projectors!") + to_chat(pai, span_boldnotice("My owner has enabled my holomatrix projectors!")) pai.canholo = TRUE - to_chat(usr, "I enable my pAI's holomatrix!") + to_chat(usr, span_notice("I enable my pAI's holomatrix!")) attack_self(usr) @@ -163,7 +163,7 @@ src.add_overlay("pai-sunglasses") /obj/item/paicard/proc/alertUpdate() - audible_message("[src] flashes a message across its screen, \"Additional personalities available for download.\"", "[src] vibrates with an alert.") + audible_message(span_info("[src] flashes a message across its screen, \"Additional personalities available for download.\""), span_notice("[src] vibrates with an alert.")) /obj/item/paicard/emp_act(severity) . = ..() diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index c10fb30f9..cbc5781c6 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -20,11 +20,11 @@ var/obj/machinery/atmospherics/pipe/P = A if(P.paint(GLOB.pipe_paint_colors[paint_color])) playsound(src, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] paints \the [P] [paint_color].","I paint \the [P] [paint_color].") + user.visible_message(span_notice("[user] paints \the [P] [paint_color]."),span_notice("I paint \the [P] [paint_color].")) /obj/item/pipe_painter/attack_self(mob/user) paint_color = input("Which colour do you want to use?","Pipe painter") in GLOB.pipe_paint_colors /obj/item/pipe_painter/examine(mob/user) . = ..() - . += "It is set to [paint_color]." + . += span_notice("It is set to [paint_color].") diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index aa28a4832..951b84763 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -66,26 +66,26 @@ if(isturf(T) && !T.intact) attached = locate() in T if(!attached) - to_chat(user, "\The [src] must be placed over an exposed, powered cable node!") + to_chat(user, span_warning("\The [src] must be placed over an exposed, powered cable node!")) else set_mode(CLAMPED_OFF) user.visible_message( \ "[user] attaches \the [src] to the cable.", \ - "I bolt \the [src] into the floor and connect it to the cable.", - "I hear some wires being connected to something.") + span_notice("I bolt \the [src] into the floor and connect it to the cable."), + span_hear("I hear some wires being connected to something.")) else - to_chat(user, "\The [src] must be placed over an exposed, powered cable node!") + to_chat(user, span_warning("\The [src] must be placed over an exposed, powered cable node!")) else set_mode(DISCONNECTED) user.visible_message( \ "[user] detaches \the [src] from the cable.", \ - "I unbolt \the [src] from the floor and detach it from the cable.", - "I hear some wires being disconnected from something.") + span_notice("I unbolt \the [src] from the floor and detach it from the cable."), + span_hear("I hear some wires being disconnected from something.")) else if(I.tool_behaviour == TOOL_SCREWDRIVER) user.visible_message( \ "[user] messes with \the [src] for a bit.", \ - "I can't fit the screwdriver into \the [src]'s bolts! Try using a wrench.") + span_notice("I can't fit the screwdriver into \the [src]'s bolts! Try using a wrench.")) else return ..() @@ -106,8 +106,8 @@ if(CLAMPED_OFF) user.visible_message( \ "[user] activates \the [src]!", \ - "I activate \the [src].", - "I hear a click.") + span_notice("I activate \the [src]."), + span_hear("I hear a click.")) message_admins("Power sink activated by [ADMIN_LOOKUPFLW(user)] at [ADMIN_VERBOSEJMP(src)]") log_game("Power sink activated by [key_name(user)] at [AREACOORD(src)]") set_mode(OPERATING) @@ -115,8 +115,8 @@ if(OPERATING) user.visible_message( \ "[user] deactivates \the [src]!", \ - "I deactivate \the [src].", - "I hear a click.") + span_notice("I deactivate \the [src]."), + span_hear("I hear a click.")) set_mode(CLAMPED_OFF) /obj/item/powersink/process() diff --git a/code/game/objects/items/devices/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm index af7584565..5476657a8 100644 --- a/code/game/objects/items/devices/pressureplates.dm +++ b/code/game/objects/items/devices/pressureplates.dm @@ -37,7 +37,7 @@ return if(trigger_mob && isliving(AM)) var/mob/living/L = AM - to_chat(L, "I feel something click beneath you!") + to_chat(L, span_warning("I feel something click beneath you!")) else if(!trigger_item) return can_trigger = FALSE @@ -51,12 +51,12 @@ /obj/item/pressure_plate/attackby(obj/item/I, mob/living/L) if(istype(I, /obj/item/assembly/signaler) && !istype(sigdev) && removable_signaller && L.transferItemToLoc(I, src)) sigdev = I - to_chat(L, "I attach [I] to [src]!") + to_chat(L, span_notice("I attach [I] to [src]!")) return ..() /obj/item/pressure_plate/attack_self(mob/living/L) if(removable_signaller && istype(sigdev)) - to_chat(L, "I remove [sigdev] from [src].") + to_chat(L, span_notice("I remove [sigdev] from [src].")) if(!L.put_in_hands(sigdev)) sigdev.forceMove(get_turf(src)) sigdev = null diff --git a/code/game/objects/items/devices/quantum_keycard.dm b/code/game/objects/items/devices/quantum_keycard.dm index 92bf22d07..1c12e6256 100644 --- a/code/game/objects/items/devices/quantum_keycard.dm +++ b/code/game/objects/items/devices/quantum_keycard.dm @@ -13,16 +13,16 @@ . = ..() if(qpad) . += "It's currently linked to a quantum pad." - . += "Alt-click to unlink the keycard." + . += span_notice("Alt-click to unlink the keycard.") else - . += "Insert [src] into an active quantum pad to link it." + . += span_notice("Insert [src] into an active quantum pad to link it.") /obj/item/quantum_keycard/AltClick(mob/living/user) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return - to_chat(user, "I start pressing [src]'s unlink button...") + to_chat(user, span_notice("I start pressing [src]'s unlink button...")) if(do_after(user, 40, target = src)) - to_chat(user, "The keycard beeps twice and disconnects the quantum link.") + to_chat(user, span_notice("The keycard beeps twice and disconnects the quantum link.")) qpad = null /obj/item/quantum_keycard/update_icon() diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index bef22182f..518b23192 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -16,7 +16,7 @@ var/shock_cooldown = 0 /obj/item/electropack/suicide_act(mob/user) - user.visible_message("[user] hooks [user.p_them()]self to the electropack and spams the trigger! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] hooks [user.p_them()]self to the electropack and spams the trigger! It looks like [user.p_theyre()] trying to commit suicide!")) return (FIRELOSS) /obj/item/electropack/Initialize() @@ -32,7 +32,7 @@ if(iscarbon(user)) var/mob/living/carbon/C = user if(src == C.back) - to_chat(user, "I need help taking this off!") + to_chat(user, span_warning("I need help taking this off!")) return return ..() @@ -42,7 +42,7 @@ A.icon = 'icons/obj/assemblies.dmi' if(!user.transferItemToLoc(W, A)) - to_chat(user, "[W] is stuck to your hand, you cannot attach it to [src]!") + to_chat(user, span_warning("[W] is stuck to your hand, you cannot attach it to [src]!")) return W.master = A A.part1 = W @@ -108,7 +108,7 @@ var/mob/living/L = loc step(L, pick(GLOB.cardinals)) - to_chat(L, "I feel a sharp shock!") + to_chat(L, span_danger("I feel a sharp shock!")) var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(3, 1, L) s.start() diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index f0a8663fb..4a086f65e 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -21,7 +21,7 @@ for(var/i in channels) examine_text_list += "[GLOB.channel_tokens[i]] - [lowertext(i)]" - . += "It can access the following channels; [jointext(examine_text_list, ", ")]." + . += span_notice("It can access the following channels; [jointext(examine_text_list, ", ")].") /obj/item/encryptionkey/syndicate name = "syndicate encryption key" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 887abcc99..f1b1961c7 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( dog_fashion = null /obj/item/radio/headset/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins putting \the [src]'s antenna up [user.p_their()] nose! It looks like [user.p_theyre()] trying to give [user.p_them()]self cancer!") + user.visible_message(span_suicide("[user] begins putting \the [src]'s antenna up [user.p_their()] nose! It looks like [user.p_theyre()] trying to give [user.p_them()]self cancer!")) return TOXLOSS /obj/item/radio/headset/examine(mob/user) @@ -45,12 +45,12 @@ GLOBAL_LIST_INIT(channel_tokens, list( avail_chans += "use [MODE_TOKEN_DEPARTMENT] or [GLOB.channel_tokens[channels[i]]] for [lowertext(channels[i])]" else avail_chans += "use [GLOB.channel_tokens[channels[i]]] for [lowertext(channels[i])]" - . += "A small screen on the headset displays the following available frequencies:\n[english_list(avail_chans)]." + . += span_notice("A small screen on the headset displays the following available frequencies:\n[english_list(avail_chans)].") if(command) - . += "Alt-click to toggle the high-volume mode." + . += span_info("Alt-click to toggle the high-volume mode.") else - . += "A small screen on the headset flashes, it's too small to read without holding or wearing the headset." + . += span_notice("A small screen on the headset flashes, it's too small to read without holding or wearing the headset.") /obj/item/radio/headset/Initialize() . = ..() @@ -297,14 +297,14 @@ GLOBAL_LIST_INIT(channel_tokens, list( keyslot2 = null recalculateChannels() - to_chat(user, "I pop out the encryption keys in the headset.") + to_chat(user, span_notice("I pop out the encryption keys in the headset.")) else - to_chat(user, "This headset doesn't have any unique encryption keys! How useless...") + to_chat(user, span_warning("This headset doesn't have any unique encryption keys! How useless...")) else if(istype(W, /obj/item/encryptionkey)) if(keyslot && keyslot2) - to_chat(user, "The headset can't hold another key!") + to_chat(user, span_warning("The headset can't hold another key!")) return if(!keyslot) @@ -345,4 +345,4 @@ GLOBAL_LIST_INIT(channel_tokens, list( return if (command) use_command = !use_command - to_chat(user, "I toggle high-volume mode [use_command ? "on" : "off"].") + to_chat(user, span_notice("I toggle high-volume mode [use_command ? "on" : "off"].")) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 2b181cf6d..a669a7f58 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -28,31 +28,31 @@ /obj/item/radio/intercom/examine(mob/user) . = ..() if(!unfastened) - . += "It's screwed and secured to the wall." + . += span_notice("It's screwed and secured to the wall.") else - . += "It's unscrewed from the wall, and can be detached." + . += span_notice("It's unscrewed from the wall, and can be detached.") /obj/item/radio/intercom/attackby(obj/item/I, mob/living/user, params) if(I.tool_behaviour == TOOL_SCREWDRIVER) if(unfastened) - user.visible_message("[user] starts tightening [src]'s screws...", "I start screwing in [src]...") + user.visible_message(span_notice("[user] starts tightening [src]'s screws..."), span_notice("I start screwing in [src]...")) if(I.use_tool(src, user, 30, volume=50)) - user.visible_message("[user] tightens [src]'s screws!", "I tighten [src]'s screws.") + user.visible_message(span_notice("[user] tightens [src]'s screws!"), span_notice("I tighten [src]'s screws.")) unfastened = FALSE else - user.visible_message("[user] starts loosening [src]'s screws...", "I start unscrewing [src]...") + user.visible_message(span_notice("[user] starts loosening [src]'s screws..."), span_notice("I start unscrewing [src]...")) if(I.use_tool(src, user, 40, volume=50)) - user.visible_message("[user] loosens [src]'s screws!", "I unscrew [src], loosening it from the wall.") + user.visible_message(span_notice("[user] loosens [src]'s screws!"), span_notice("I unscrew [src], loosening it from the wall.")) unfastened = TRUE return else if(I.tool_behaviour == TOOL_WRENCH) if(!unfastened) - to_chat(user, "I need to unscrew [src] from the wall first!") + to_chat(user, span_warning("I need to unscrew [src] from the wall first!")) return - user.visible_message("[user] starts unsecuring [src]...", "I start unsecuring [src]...") + user.visible_message(span_notice("[user] starts unsecuring [src]..."), span_notice("I start unsecuring [src]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 80)) - user.visible_message("[user] unsecures [src]!", "I detach [src] from the wall.") + user.visible_message(span_notice("[user] unsecures [src]!"), span_notice("I detach [src] from the wall.")) playsound(src, 'sound/blank.ogg', 50, TRUE) new/obj/item/wallframe/intercom(get_turf(src)) qdel(src) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index be4e9f134..f31cdc664 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -42,7 +42,7 @@ //FREQ_BROADCASTING = 2 /obj/item/radio/suicide_act(mob/living/user) - user.visible_message("[user] starts bouncing [src] off [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] starts bouncing [src] off [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /obj/item/radio/proc/set_frequency(new_frequency) @@ -327,20 +327,20 @@ /obj/item/radio/examine(mob/user) . = ..() if (frequency && in_range(src, user)) - . += "It is set to broadcast over the [frequency/10] frequency." + . += span_notice("It is set to broadcast over the [frequency/10] frequency.") if (unscrewed) - . += "It can be attached and modified." + . += span_notice("It can be attached and modified.") else - . += "It cannot be modified or attached." + . += span_notice("It cannot be modified or attached.") /obj/item/radio/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if(W.tool_behaviour == TOOL_SCREWDRIVER) unscrewed = !unscrewed if(unscrewed) - to_chat(user, "The radio can now be attached and modified!") + to_chat(user, span_notice("The radio can now be attached and modified!")) else - to_chat(user, "The radio can no longer be modified or attached!") + to_chat(user, span_notice("The radio can no longer be modified or attached!")) else return ..() @@ -351,7 +351,7 @@ emped++ //There's been an EMP; better count it var/curremp = emped //Remember which EMP this was if (listening && ismob(loc)) // if the radio is turned on and on someone's person they notice - to_chat(loc, "\The [src] overloads.") + to_chat(loc, span_warning("\The [src] overloads.")) broadcasting = FALSE listening = FALSE for (var/ch_name in channels) @@ -403,14 +403,14 @@ keyslot = null recalculateChannels() - to_chat(user, "I pop out the encryption key in the radio.") + to_chat(user, span_notice("I pop out the encryption key in the radio.")) else - to_chat(user, "This radio doesn't have any encryption keys!") + to_chat(user, span_warning("This radio doesn't have any encryption keys!")) else if(istype(W, /obj/item/encryptionkey/)) if(keyslot) - to_chat(user, "The radio can't hold another key!") + to_chat(user, span_warning("The radio can't hold another key!")) return if(!keyslot) diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm index 0d91aea56..4d857e4ca 100644 --- a/code/game/objects/items/devices/reverse_bear_trap.dm +++ b/code/game/objects/items/devices/reverse_bear_trap.dm @@ -42,7 +42,7 @@ playsound(src, 'sound/blank.ogg', 100, FALSE) soundloop.stop() soundloop2.stop() - to_chat(loc, "*ding*") + to_chat(loc, span_danger("*ding*")) addtimer(CALLBACK(src, PROC_REF(snap)), 2) /obj/item/reverse_bear_trap/attack_hand(mob/user) @@ -63,17 +63,17 @@ fear_string = "shakily" if(50 to 60) fear_string = "" - C.visible_message("[C] fiddles with and pulls at [src]...", \ - "I [fear_string] try to pull at [src]...", "I hear clicking and ticking.") + C.visible_message(span_danger("[C] fiddles with and pulls at [src]..."), \ + span_danger("I [fear_string] try to pull at [src]..."), "I hear clicking and ticking.") if(!do_after(user, 20, target = src)) struggling = FALSE return if(!prob(escape_chance)) - to_chat(user, "It doesn't budge!") + to_chat(user, span_warning("It doesn't budge!")) escape_chance++ else - user.visible_message("The lock on [user]'s [name] pops open!", \ - "I force open the padlock!", "I hear a single, pronounced click!") + user.visible_message(span_warning("The lock on [user]'s [name] pops open!"), \ + span_danger("I force open the padlock!"), "I hear a single, pronounced click!") REMOVE_TRAIT(src, TRAIT_NODROP, REVERSE_BEAR_TRAP_TRAIT) struggling = FALSE else @@ -83,16 +83,16 @@ /obj/item/reverse_bear_trap/attack(mob/living/target, mob/living/user) if(target.get_item_by_slot(SLOT_HEAD)) - to_chat(user, "Remove [target.p_their()] headgear first!") + to_chat(user, span_warning("Remove [target.p_their()] headgear first!")) return - target.visible_message("[user] starts forcing [src] onto [target]'s head!", \ - "[target] starts forcing [src] onto your head!", "I hear clanking.") - to_chat(user, "I start forcing [src] onto [target]'s head...") + target.visible_message(span_warning("[user] starts forcing [src] onto [target]'s head!"), \ + span_danger("[target] starts forcing [src] onto your head!"), "I hear clanking.") + to_chat(user, span_danger("I start forcing [src] onto [target]'s head...")) if(!do_after(user, 30, target = target) || target.get_item_by_slot(SLOT_HEAD)) return - target.visible_message("[user] forces and locks [src] onto [target]'s head!", \ - "[target] locks [src] onto your head!", "I hear a click, and then a timer ticking down.") - to_chat(user, "I force [src] onto [target]'s head and click the padlock shut.") + target.visible_message(span_warning("[user] forces and locks [src] onto [target]'s head!"), \ + span_danger("[target] locks [src] onto your head!"), "I hear a click, and then a timer ticking down.") + to_chat(user, span_danger("I force [src] onto [target]'s head and click the padlock shut.")) user.dropItemToGround(src) target.equip_to_slot_if_possible(src, SLOT_HEAD) arm() @@ -102,11 +102,11 @@ reset() var/mob/living/carbon/human/H = loc if(!istype(H) || H.get_item_by_slot(SLOT_HEAD) != src) - visible_message("[src]'s jaws snap open with an ear-piercing crack!") + visible_message(span_warning("[src]'s jaws snap open with an ear-piercing crack!")) playsound(src, 'sound/blank.ogg', 75, TRUE) else var/mob/living/carbon/human/jill = loc - jill.visible_message("[src] goes off in [jill]'s mouth, ripping [jill.p_their()] head apart!", "[src] goes off!") + jill.visible_message(span_boldwarning("[src] goes off in [jill]'s mouth, ripping [jill.p_their()] head apart!"), span_danger("[src] goes off!")) jill.emote("scream") playsound(src, 'sound/blank.ogg', 75, TRUE, frequency = 0.5) playsound(src, 'sound/blank.ogg', 50, TRUE, frequency = 0.5) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 1d24d818d..4abed603f 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -25,7 +25,7 @@ GENE SCANNER custom_materials = list(/datum/material/iron=150) /obj/item/t_scanner/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins to emit terahertz-rays into [user.p_their()] brain with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins to emit terahertz-rays into [user.p_their()] brain with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return TOXLOSS /obj/item/t_scanner/proc/toggle_on() @@ -92,15 +92,15 @@ GENE SCANNER var/advanced = FALSE /obj/item/healthanalyzer/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins to analyze [user.p_them()]self with [src]! The display shows that [user.p_theyre()] dead!") + user.visible_message(span_suicide("[user] begins to analyze [user.p_them()]self with [src]! The display shows that [user.p_theyre()] dead!")) return BRUTELOSS /obj/item/healthanalyzer/attack_self(mob/user) if(!scanmode) - to_chat(user, "I switch the health analyzer to scan chemical contents.") + to_chat(user, span_notice("I switch the health analyzer to scan chemical contents.")) scanmode = 1 else - to_chat(user, "I switch the health analyzer to check physical health.") + to_chat(user, span_notice("I switch the health analyzer to check physical health.")) scanmode = 0 /obj/item/healthanalyzer/attack(mob/living/M, mob/living/carbon/human/user) @@ -109,16 +109,16 @@ GENE SCANNER // Clumsiness/brain damage check if ((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(50)) - user.visible_message("[user] analyzes the floor's vitals!", \ - "I stupidly try to analyze the floor's vitals!") - to_chat(user, "Analyzing results for The floor:\n\tOverall status: Healthy") - to_chat(user, "Key: Suffocation/Toxin/Burn/Brute") - to_chat(user, "\tDamage specifics: 0-0-0-0") - to_chat(user, "Body temperature: ???") + user.visible_message(span_warning("[user] analyzes the floor's vitals!"), \ + span_notice("I stupidly try to analyze the floor's vitals!")) + to_chat(user, span_info("Analyzing results for The floor:\n\tOverall status: Healthy")) + to_chat(user, span_info("Key: Suffocation/Toxin/Burn/Brute")) + to_chat(user, span_info("\tDamage specifics: 0-0-0-0")) + to_chat(user, span_info("Body temperature: ???")) return - user.visible_message("[user] analyzes [M]'s vitals.", \ - "I analyze [M]'s vitals.") + user.visible_message(span_notice("[user] analyzes [M]'s vitals."), \ + span_notice("I analyze [M]'s vitals.")) if(scanmode == 0) healthscan(user, M, mode, advanced) @@ -137,18 +137,18 @@ GENE SCANNER var/tox_loss = M.getToxLoss() var/fire_loss = M.getFireLoss() var/brute_loss = M.getBruteLoss() - var/mob_status = (M.stat == DEAD ? "Deceased" : "[round(M.health/M.maxHealth,0.01)*100] % healthy") + var/mob_status = (M.stat == DEAD ? span_alert("Deceased") : "[round(M.health/M.maxHealth,0.01)*100] % healthy") if(HAS_TRAIT(M, TRAIT_FAKEDEATH) && !advanced) - mob_status = "Deceased" + mob_status = span_alert("Deceased") oxy_loss = max(rand(1, 40), oxy_loss, (300 - (tox_loss + fire_loss + brute_loss))) // Random oxygen loss if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.undergoing_cardiac_arrest() && H.stat != DEAD) - to_chat(user, "Subject suffering from heart attack: Apply defibrillation or other electric shock immediately!") + to_chat(user, span_alert("Subject suffering from heart attack: Apply defibrillation or other electric shock immediately!")) - to_chat(user, "Analyzing results for [M]:\n\tOverall status: [mob_status]") + to_chat(user, span_info("Analyzing results for [M]:\n\tOverall status: [mob_status]")) // Damage descriptions if(brute_loss > 10) @@ -362,20 +362,20 @@ GENE SCANNER else if (S.flying_species != initial(S.flying_species)) mutant = TRUE - to_chat(user, "Species: [S.name][mutant ? "-derived mutant" : ""]") - to_chat(user, "Body temperature: [round(M.bodytemperature-T0C,0.1)] °C ([round(M.bodytemperature*1.8-459.67,0.1)] °F)") + to_chat(user, span_info("Species: [S.name][mutant ? "-derived mutant" : ""]")) + to_chat(user, span_info("Body temperature: [round(M.bodytemperature-T0C,0.1)] °C ([round(M.bodytemperature*1.8-459.67,0.1)] °F)")) // Time of death if(M.tod && (M.stat == DEAD || ((HAS_TRAIT(M, TRAIT_FAKEDEATH)) && !advanced))) - to_chat(user, "Time of Death: [M.tod]") + to_chat(user, span_info("Time of Death: [M.tod]")) var/tdelta = round(world.time - M.timeofdeath) if(tdelta < (DEFIB_TIME_LIMIT * 10)) - to_chat(user, "Subject died [DisplayTimeText(tdelta)] ago, defibrillation may be possible!") + to_chat(user, span_alert("Subject died [DisplayTimeText(tdelta)] ago, defibrillation may be possible!")) for(var/thing in M.diseases) var/datum/disease/D = thing if(!(D.visibility_flags & HIDDEN_SCANNER)) - to_chat(user, "Warning: [D.form] detected\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]") + to_chat(user, span_alert("Warning: [D.form] detected\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]")) // Blood Level if(M.has_dna()) @@ -385,7 +385,7 @@ GENE SCANNER if(ishuman(C)) var/mob/living/carbon/human/H = C if(H.bleed_rate) - to_chat(user, "Subject is bleeding!") + to_chat(user, span_alert("Subject is bleeding!")) var/blood_percent = round((C.blood_volume / BLOOD_VOLUME_NORMAL)*100) var/blood_type = C.dna.blood_type if(blood_id != /datum/reagent/blood)//special blood substance @@ -395,36 +395,36 @@ GENE SCANNER else blood_type = blood_id if(C.blood_volume <= BLOOD_VOLUME_SAFE && C.blood_volume > BLOOD_VOLUME_OKAY) - to_chat(user, "Blood level: LOW [blood_percent] %, [C.blood_volume] cl, type: [blood_type]") + to_chat(user, span_alert("Blood level: LOW [blood_percent] %, [C.blood_volume] cl,
type: [blood_type]")) else if(C.blood_volume <= BLOOD_VOLUME_OKAY) - to_chat(user, "Blood level: CRITICAL [blood_percent] %, [C.blood_volume] cl, type: [blood_type]") + to_chat(user, span_alert("Blood level: CRITICAL [blood_percent] %, [C.blood_volume] cl, type: [blood_type]")) else - to_chat(user, "Blood level: [blood_percent] %, [C.blood_volume] cl, type: [blood_type]") + to_chat(user, span_info("Blood level: [blood_percent] %, [C.blood_volume] cl, type: [blood_type]")) var/cyberimp_detect for(var/obj/item/organ/cyberimp/CI in C.internal_organs) if(CI.status == ORGAN_ROBOTIC && !CI.syndicate_implant) cyberimp_detect += "[C.name] is modified with a [CI.name].
" if(cyberimp_detect) - to_chat(user, "Detected cybernetic modifications:") - to_chat(user, "[cyberimp_detect]") + to_chat(user, span_notice("Detected cybernetic modifications:")) + to_chat(user, span_notice("[cyberimp_detect]")) SEND_SIGNAL(M, COMSIG_NANITE_SCAN, user, FALSE) /proc/chemscan(mob/living/user, mob/living/M) if(istype(M)) if(M.reagents) if(M.reagents.reagent_list.len) - to_chat(user, "Subject contains the following reagents:") + to_chat(user, span_notice("Subject contains the following reagents:")) for(var/datum/reagent/R in M.reagents.reagent_list) - to_chat(user, "[round(R.volume, 0.001)] units of [R.name][R.overdosed == 1 ? " - OVERDOSING" : ".
"]") + to_chat(user, span_notice("[round(R.volume, 0.001)] units of [R.name][R.overdosed == 1 ? span_boldannounce(" OVERDOSING") : ""].")) else - to_chat(user, "Subject contains no reagents.") + to_chat(user, span_notice("Subject contains no reagents.")) if(M.reagents.addiction_list.len) - to_chat(user, "Subject is addicted to the following reagents:") + to_chat(user, span_boldannounce("Subject is addicted to the following reagents:")) for(var/datum/reagent/R in M.reagents.addiction_list) - to_chat(user, "[R.name]") + to_chat(user, span_alert("[R.name]")) else - to_chat(user, "Subject is not addicted to any reagents.") + to_chat(user, span_notice("Subject is not addicted to any reagents.")) /obj/item/healthanalyzer/verb/toggle_mode() set name = "Switch Verbosity" @@ -471,10 +471,10 @@ GENE SCANNER /obj/item/analyzer/examine(mob/user) . = ..() - . += "Alt-click [src] to activate the barometer function." + . += span_notice("Alt-click [src] to activate the barometer function.") /obj/item/analyzer/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins to analyze [user.p_them()]self with [src]! The display shows that [user.p_theyre()] dead!") + user.visible_message(span_suicide("[user] begins to analyze [user.p_them()]self with [src]! The display shows that [user.p_theyre()] dead!")) return BRUTELOSS /obj/item/analyzer/attack_self(mob/user) @@ -492,11 +492,11 @@ GENE SCANNER var/pressure = environment.return_pressure() var/total_moles = environment.total_moles() - to_chat(user, "Results:") + to_chat(user, span_info("Results:")) if(abs(pressure - ONE_ATMOSPHERE) < 10) - to_chat(user, "Pressure: [round(pressure, 0.01)] kPa") + to_chat(user, span_info("Pressure: [round(pressure, 0.01)] kPa")) else - to_chat(user, "Pressure: [round(pressure, 0.01)] kPa") + to_chat(user, span_alert("Pressure: [round(pressure, 0.01)] kPa")) if(total_moles) var/list/env_gases = environment.gases @@ -507,24 +507,24 @@ GENE SCANNER var/plasma_concentration = env_gases[/datum/gas/plasma][MOLES]/total_moles if(abs(n2_concentration - N2STANDARD) < 20) - to_chat(user, "Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/nitrogen][MOLES], 0.01)] mol)") + to_chat(user, span_info("Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/nitrogen][MOLES], 0.01)] mol)")) else - to_chat(user, "Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/nitrogen][MOLES], 0.01)] mol)") + to_chat(user, span_alert("Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/nitrogen][MOLES], 0.01)] mol)")) if(abs(o2_concentration - O2STANDARD) < 2) - to_chat(user, "Oxygen: [round(o2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/oxygen][MOLES], 0.01)] mol)") + to_chat(user, span_info("Oxygen: [round(o2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/oxygen][MOLES], 0.01)] mol)")) else - to_chat(user, "Oxygen: [round(o2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/oxygen][MOLES], 0.01)] mol)") + to_chat(user, span_alert("Oxygen: [round(o2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/oxygen][MOLES], 0.01)] mol)")) if(co2_concentration > 0.01) - to_chat(user, "CO2: [round(co2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/carbon_dioxide][MOLES], 0.01)] mol)") + to_chat(user, span_alert("CO2: [round(co2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/carbon_dioxide][MOLES], 0.01)] mol)")) else - to_chat(user, "CO2: [round(co2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/carbon_dioxide][MOLES], 0.01)] mol)") + to_chat(user, span_info("CO2: [round(co2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/carbon_dioxide][MOLES], 0.01)] mol)")) if(plasma_concentration > 0.005) - to_chat(user, "Plasma: [round(plasma_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/plasma][MOLES], 0.01)] mol)") + to_chat(user, span_alert("Plasma: [round(plasma_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/plasma][MOLES], 0.01)] mol)")) else - to_chat(user, "Plasma: [round(plasma_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/plasma][MOLES], 0.01)] mol)") + to_chat(user, span_info("Plasma: [round(plasma_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/plasma][MOLES], 0.01)] mol)")) environment.garbage_collect() @@ -532,8 +532,8 @@ GENE SCANNER if(id in GLOB.hardcoded_gases) continue var/gas_concentration = env_gases[id][MOLES]/total_moles - to_chat(user, "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(env_gases[id][MOLES], 0.01)] mol)") - to_chat(user, "Temperature: [round(environment.temperature-T0C, 0.01)] °C ([round(environment.temperature, 0.01)] K)") + to_chat(user, span_alert("[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(env_gases[id][MOLES], 0.01)] mol)")) + to_chat(user, span_info("Temperature: [round(environment.temperature-T0C, 0.01)] °C ([round(environment.temperature, 0.01)] K)")) /obj/item/analyzer/AltClick(mob/user) //Barometer output for measuring when the next storm happens ..() @@ -541,7 +541,7 @@ GENE SCANNER if(user.canUseTopic(src, BE_CLOSE)) if(cooldown) - to_chat(user, "[src]'s barometer function is preparing itself.") + to_chat(user, span_warning("[src]'s barometer function is preparing itself.")) return var/turf/T = get_turf(user) @@ -553,7 +553,7 @@ GENE SCANNER var/datum/weather/ongoing_weather = null if(!user_area.outdoors) - to_chat(user, "[src]'s barometer function won't work indoors!") + to_chat(user, span_warning("[src]'s barometer function won't work indoors!")) return for(var/V in SSweather.curweathers) @@ -564,26 +564,26 @@ GENE SCANNER if(ongoing_weather) if((ongoing_weather.stage == MAIN_STAGE) || (ongoing_weather.stage == WIND_DOWN_STAGE)) - to_chat(user, "[src]'s barometer function can't trace anything while the storm is [ongoing_weather.stage == MAIN_STAGE ? "already here!" : "winding down."]") + to_chat(user, span_warning("[src]'s barometer function can't trace anything while the storm is [ongoing_weather.stage == MAIN_STAGE ? "already here!" : "winding down."]")) return - to_chat(user, "The next [ongoing_weather] will hit in [butchertime(ongoing_weather.next_hit_time - world.time)].") + to_chat(user, span_notice("The next [ongoing_weather] will hit in [butchertime(ongoing_weather.next_hit_time - world.time)].")) if(ongoing_weather.aesthetic) - to_chat(user, "[src]'s barometer function says that the next storm will breeze on by.") + to_chat(user, span_warning("[src]'s barometer function says that the next storm will breeze on by.")) else var/next_hit = SSweather.next_hit_by_zlevel["[T.z]"] var/fixed = next_hit ? next_hit - world.time : -1 if(fixed < 0) - to_chat(user, "[src]'s barometer function was unable to trace any weather patterns.") + to_chat(user, span_warning("[src]'s barometer function was unable to trace any weather patterns.")) else - to_chat(user, "[src]'s barometer function says a storm will land in approximately [butchertime(fixed)].") + to_chat(user, span_warning("[src]'s barometer function says a storm will land in approximately [butchertime(fixed)].")) cooldown = TRUE addtimer(CALLBACK(src,TYPE_PROC_REF(/obj/item/analyzer, ping)), cooldown_time) /obj/item/analyzer/proc/ping() if(isliving(loc)) var/mob/living/L = loc - to_chat(L, "[src]'s barometer function is ready!") + to_chat(L, span_notice("[src]'s barometer function is ready!")) playsound(src, 'sound/blank.ogg', 100) cooldown = FALSE @@ -605,13 +605,13 @@ GENE SCANNER var/icon = target if(!silent && isliving(user)) - user.visible_message("[user] has used the analyzer on [icon2html(icon, viewers(user))] [target].", "I use the analyzer on [icon2html(icon, user)] [target].") - to_chat(user, "Results of analysis of [icon2html(icon, user)] [target].") + user.visible_message(span_notice("[user] has used the analyzer on [icon2html(icon, viewers(user))] [target]."), span_notice("I use the analyzer on [icon2html(icon, user)] [target].")) + to_chat(user, span_boldnotice("Results of analysis of [icon2html(icon, user)] [target].")) var/list/airs = islist(mixture) ? mixture : list(mixture) for(var/g in airs) if(airs.len > 1) //not a unary gas mixture - to_chat(user, "Node [airs.Find(g)]") + to_chat(user, span_boldnotice("Node [airs.Find(g)]")) var/datum/gas_mixture/air_contents = g var/total_moles = air_contents.total_moles() @@ -621,26 +621,26 @@ GENE SCANNER var/cached_scan_results = air_contents.analyzer_results if(total_moles > 0) - to_chat(user, "Moles: [round(total_moles, 0.01)] mol") - to_chat(user, "Volume: [volume] L") - to_chat(user, "Pressure: [round(pressure,0.01)] kPa") + to_chat(user, span_notice("Moles: [round(total_moles, 0.01)] mol")) + to_chat(user, span_notice("Volume: [volume] L")) + to_chat(user, span_notice("Pressure: [round(pressure,0.01)] kPa")) var/list/cached_gases = air_contents.gases for(var/id in cached_gases) var/gas_concentration = cached_gases[id][MOLES]/total_moles - to_chat(user, "[cached_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(cached_gases[id][MOLES], 0.01)] mol)") - to_chat(user, "Temperature: [round(temperature - T0C,0.01)] °C ([round(temperature, 0.01)] K)") + to_chat(user, span_notice("[cached_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(cached_gases[id][MOLES], 0.01)] mol)")) + to_chat(user, span_notice("Temperature: [round(temperature - T0C,0.01)] °C ([round(temperature, 0.01)] K)")) else if(airs.len > 1) - to_chat(user, "This node is empty!") + to_chat(user, span_notice("This node is empty!")) else - to_chat(user, "[target] is empty!") + to_chat(user, span_notice("[target] is empty!")) if(cached_scan_results && cached_scan_results["fusion"]) //notify the user if a fusion reaction was detected var/instability = round(cached_scan_results["fusion"], 0.01) - to_chat(user, "Large amounts of free neutrons detected in the air indicate that a fusion reaction took place.") - to_chat(user, "Instability of the last fusion reaction: [instability].") + to_chat(user, span_boldnotice("Large amounts of free neutrons detected in the air indicate that a fusion reaction took place.")) + to_chat(user, span_notice("Instability of the last fusion reaction: [instability].")) return TRUE //slime scanner @@ -664,7 +664,7 @@ GENE SCANNER if(user.stat || user.eye_blind) return if (!isslime(M)) - to_chat(user, "This device can only scan slimes!") + to_chat(user, span_warning("This device can only scan slimes!")) return var/mob/living/simple_animal/slime/T = M slime_scan(T, user) @@ -672,12 +672,12 @@ GENE SCANNER /proc/slime_scan(mob/living/simple_animal/slime/T, mob/living/user) to_chat(user, "========================") to_chat(user, "Slime scan results:") - to_chat(user, "[T.colour] [T.is_adult ? "adult" : "baby"] slime") + to_chat(user, span_notice("[T.colour] [T.is_adult ? "adult" : "baby"] slime")) to_chat(user, "Nutrition: [T.nutrition]/[T.get_max_nutrition()]") if (T.nutrition < T.get_starve_nutrition()) - to_chat(user, "Warning: slime is starving!") + to_chat(user, span_warning("Warning: slime is starving!")) else if (T.nutrition < T.get_hunger_nutrition()) - to_chat(user, "Warning: slime is hungry") + to_chat(user, span_warning("Warning: slime is hungry")) to_chat(user, "Electric change strength: [T.powerlevel]") to_chat(user, "Health: [round(T.health/T.maxHealth,0.01)*100]%") if (T.slime_mutation[4] == T.colour) @@ -697,8 +697,8 @@ GENE SCANNER to_chat(user, "Multiple cores detected") to_chat(user, "Growth progress: [T.amount_grown]/[SLIME_EVOLUTION_THRESHOLD]") if(T.effectmod) - to_chat(user, "Core mutation in progress: [T.effectmod]") - to_chat(user, "Progress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]") + to_chat(user, span_notice("Core mutation in progress: [T.effectmod]")) + to_chat(user, span_notice("Progress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]")) to_chat(user, "========================") @@ -720,14 +720,14 @@ GENE SCANNER custom_materials = list(/datum/material/iron=200) /obj/item/nanite_scanner/attack(mob/living/M, mob/living/carbon/human/user) - user.visible_message("[user] analyzes [M]'s nanites.", \ - "I analyze [M]'s nanites.") + user.visible_message(span_notice("[user] analyzes [M]'s nanites."), \ + span_notice("I analyze [M]'s nanites.")) add_fingerprint(user) var/response = SEND_SIGNAL(M, COMSIG_NANITE_SCAN, user, TRUE) if(!response) - to_chat(user, "No nanites detected in the subject.") + to_chat(user, span_info("No nanites detected in the subject.")) /obj/item/sequence_scanner name = "genetic sequence scanner" @@ -753,12 +753,12 @@ GENE SCANNER /obj/item/sequence_scanner/attack(mob/living/M, mob/living/carbon/human/user) add_fingerprint(user) if (!HAS_TRAIT(M, TRAIT_RADIMMUNE) && !HAS_TRAIT(M, TRAIT_BADDNA)) //no scanning if its a husk or DNA-less Species - user.visible_message("[user] analyzes [M]'s genetic sequence.", \ - "I analyze [M]'s genetic sequence.") + user.visible_message(span_notice("[user] analyzes [M]'s genetic sequence."), \ + span_notice("I analyze [M]'s genetic sequence.")) gene_scan(M, user) else - user.visible_message("[user] failed to analyse [M]'s genetic sequence.", "[M] has no readable genetic sequence!") + user.visible_message(span_notice("[user] failed to analyse [M]'s genetic sequence."), span_warning("[M] has no readable genetic sequence!")) /obj/item/sequence_scanner/attack_self(mob/user) display_sequence(user) @@ -774,19 +774,19 @@ GENE SCANNER if(istype(O, /obj/machinery/computer/scan_consolenew)) var/obj/machinery/computer/scan_consolenew/C = O if(C.stored_research) - to_chat(user, "[name] linked to central research database.") + to_chat(user, span_notice("[name] linked to central research database.")) discovered = C.stored_research.discovered_mutations else - to_chat(user,"No database to update from.") + to_chat(user,span_warning("No database to update from.")) /obj/item/sequence_scanner/proc/gene_scan(mob/living/carbon/C, mob/living/user) if(!iscarbon(C) || !C.has_dna()) return buffer = C.dna.mutation_index - to_chat(user, "Subject [C.name]'s DNA sequence has been saved to buffer.") + to_chat(user, span_notice("Subject [C.name]'s DNA sequence has been saved to buffer.")) if(LAZYLEN(buffer)) for(var/A in buffer) - to_chat(user, "[get_display_name(A)]") + to_chat(user, span_notice("[get_display_name(A)]")) /obj/item/sequence_scanner/proc/display_sequence(mob/living/user) @@ -847,23 +847,23 @@ GENE SCANNER flick("[icon_state]_active", src) //nice little visual flash when scanning someone else. if((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(25)) - user.visible_message("[user] targets himself for scanning.", \ - to_chat(user, "I try scanning [M], before realizing you're holding the scanner backwards. Whoops.")) + user.visible_message(span_warning("[user] targets himself for scanning."), \ + to_chat(user, span_info("I try scanning [M], before realizing you're holding the scanner backwards. Whoops."))) selected_target = user return if(!ishuman(M)) - to_chat(user, "I can only scan human-like, non-robotic beings.") + to_chat(user, span_info("I can only scan human-like, non-robotic beings.")) selected_target = null return - user.visible_message("[user] targets [M] for scanning.", \ - "I target [M] vitals.") + user.visible_message(span_notice("[user] targets [M] for scanning."), \ + span_notice("I target [M] vitals.")) selected_target = M return /obj/item/scanner_wand/attack_self(mob/user) - to_chat(user, "I clear the scanner's target.") + to_chat(user, span_info("I clear the scanner's target.")) selected_target = null /obj/item/scanner_wand/proc/return_patient() diff --git a/code/game/objects/items/devices/swapper.dm b/code/game/objects/items/devices/swapper.dm index 6a703b512..5cf23529d 100644 --- a/code/game/objects/items/devices/swapper.dm +++ b/code/game/objects/items/devices/swapper.dm @@ -31,12 +31,12 @@ if(istype(I, /obj/item/swapper)) var/obj/item/swapper/other_swapper = I if(other_swapper.linked_swapper) - to_chat(user, "[other_swapper] is already linked. Break the current link to establish a new one.") + to_chat(user, span_warning("[other_swapper] is already linked. Break the current link to establish a new one.")) return if(linked_swapper) - to_chat(user, "[src] is already linked. Break the current link to establish a new one.") + to_chat(user, span_warning("[src] is already linked. Break the current link to establish a new one.")) return - to_chat(user, "I establish a quantum link between the two devices.") + to_chat(user, span_notice("I establish a quantum link between the two devices.")) linked_swapper = other_swapper other_swapper.linked_swapper = src update_icon() @@ -46,33 +46,33 @@ /obj/item/swapper/attack_self(mob/living/user) if(world.time < next_use) - to_chat(user, "[src] is still recharging.") + to_chat(user, span_warning("[src] is still recharging.")) return if(QDELETED(linked_swapper)) - to_chat(user, "[src] is not linked with another swapper.") + to_chat(user, span_warning("[src] is not linked with another swapper.")) return playsound(src, 'sound/blank.ogg', 25, TRUE) - to_chat(user, "I activate [src].") + to_chat(user, span_notice("I activate [src].")) playsound(linked_swapper, 'sound/blank.ogg', 25, TRUE) if(ismob(linked_swapper.loc)) var/mob/holder = linked_swapper.loc - to_chat(holder, "[linked_swapper] starts buzzing.") + to_chat(holder, span_notice("[linked_swapper] starts buzzing.")) next_use = world.time + cooldown //only the one used goes on cooldown addtimer(CALLBACK(src, PROC_REF(swap), user), 25) /obj/item/swapper/examine(mob/user) . = ..() if(world.time < next_use) - . += "Time left to recharge: [DisplayTimeText(next_use - world.time)]." + . += span_warning("Time left to recharge: [DisplayTimeText(next_use - world.time)].") if(linked_swapper) - . += "Linked. Alt-Click to break the quantum link." + . += span_notice("Linked. Alt-Click to break the quantum link.") else - . += "Not Linked. Use on another quantum spin inverter to establish a quantum link." + . += span_notice("Not Linked. Use on another quantum spin inverter to establish a quantum link.") /obj/item/swapper/AltClick(mob/living/user) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return - to_chat(user, "I break the current quantum link.") + to_chat(user, span_notice("I break the current quantum link.")) if(!QDELETED(linked_swapper)) linked_swapper.linked_swapper = null linked_swapper.update_icon() @@ -111,4 +111,4 @@ do_teleport(B, target_A, forceMove = TRUE, channel = TELEPORT_CHANNEL_QUANTUM) if(ismob(B)) var/mob/M = B - to_chat(M, "[linked_swapper] activates, and you find myself somewhere else.") + to_chat(M, span_warning("[linked_swapper] activates, and you find myself somewhere else.")) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 1cf124f8b..3c082e521 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -38,13 +38,13 @@ if(!user.transferItemToLoc(I,src)) return mytape = I - to_chat(user, "I insert [I] into [src].") + to_chat(user, span_notice("I insert [I] into [src].")) update_icon() /obj/item/taperecorder/proc/eject(mob/user) if(mytape) - to_chat(user, "I remove [mytape] from [src].") + to_chat(user, span_notice("I remove [mytape] from [src].")) stop() user.put_in_hands(mytape) mytape = null @@ -114,7 +114,7 @@ return if(mytape.used_capacity < mytape.max_capacity) - to_chat(usr, "Recording started.") + to_chat(usr, span_notice("Recording started.")) recording = 1 update_icon() mytape.timestamp += mytape.used_capacity @@ -128,7 +128,7 @@ recording = 0 update_icon() else - to_chat(usr, "The tape is full.") + to_chat(usr, span_notice("The tape is full.")) /obj/item/taperecorder/verb/stop() @@ -142,7 +142,7 @@ recording = 0 mytape.timestamp += mytape.used_capacity mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording stopped." - to_chat(usr, "Recording stopped.") + to_chat(usr, span_notice("Recording stopped.")) return else if(playing) playing = 0 @@ -166,7 +166,7 @@ playing = 1 update_icon() - to_chat(usr, "Playing started.") + to_chat(usr, span_notice("Playing started.")) var/used = mytape.used_capacity //to stop runtimes when you eject the tape var/max = mytape.max_capacity for(var/i = 1, used < max, sleep(10 * playsleepseconds)) @@ -211,12 +211,12 @@ if(!mytape) return if(!canprint) - to_chat(usr, "The recorder can't print that fast!") + to_chat(usr, span_notice("The recorder can't print that fast!")) return if(recording || playing) return - to_chat(usr, "Transcript printed.") + to_chat(usr, span_notice("Transcript printed.")) var/obj/item/paper/P = new /obj/item/paper(get_turf(src)) var/t1 = "Transcript:

" for(var/i = 1, mytape.storedinfo.len >= i, i++) @@ -257,7 +257,7 @@ /obj/item/tape/attack_self(mob/user) if(!ruined) - to_chat(user, "I pull out all the tape!") + to_chat(user, span_notice("I pull out all the tape!")) ruin() @@ -276,9 +276,9 @@ /obj/item/tape/attackby(obj/item/I, mob/user, params) if(ruined && I.tool_behaviour == TOOL_SCREWDRIVER || istype(I, /obj/item/pen)) - to_chat(user, "I start winding the tape back in...") + to_chat(user, span_notice("I start winding the tape back in...")) if(I.use_tool(src, user, 120)) - to_chat(user, "I wound the tape back in.") + to_chat(user, span_notice("I wound the tape back in.")) fix() //Random colour tapes diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 329a57748..49144c669 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -36,7 +36,7 @@ effective or pretty fucking useless. /obj/item/batterer/attack_self(mob/living/carbon/user, flag = 0, emp = 0) if(!user) return if(times_used >= max_uses) - to_chat(user, "The mind batterer has been burnt out!") + to_chat(user, span_danger("The mind batterer has been burnt out!")) return log_combat(user, null, "knocked down people in the area", src) @@ -45,13 +45,13 @@ effective or pretty fucking useless. if(prob(50)) M.Paralyze(rand(200,400)) - to_chat(M, "I feel a tremendous, paralyzing wave flood your mind.") + to_chat(M, span_danger("I feel a tremendous, paralyzing wave flood your mind.")) else - to_chat(M, "I feel a sudden, electric jolt travel through your head.") + to_chat(M, span_danger("I feel a sudden, electric jolt travel through your head.")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I trigger [src].") + to_chat(user, span_notice("I trigger [src].")) times_used += 1 if(times_used >= max_uses) icon_state = "battererburnt" @@ -87,14 +87,14 @@ effective or pretty fucking useless. used = 1 icon_state = "health1" handle_cooldown(cooldown) // splits off to handle the cooldown while handling wavelength - to_chat(user, "Successfully irradiated [M].") + to_chat(user, span_warning("Successfully irradiated [M].")) spawn((wavelength+(intensity*4))*5) if(M) if(intensity >= 5) M.apply_effect(round(intensity/0.075), EFFECT_UNCONSCIOUS) M.rad_act(intensity*10) else - to_chat(user, "The radioactive microlaser is still recharging.") + to_chat(user, span_warning("The radioactive microlaser is still recharging.")) /obj/item/healthanalyzer/rad_laser/proc/handle_cooldown(cooldown) spawn(cooldown) @@ -202,14 +202,14 @@ effective or pretty fucking useless. /obj/item/shadowcloak/proc/Activate(mob/living/carbon/human/user) if(!user) return - to_chat(user, "I activate [src].") + to_chat(user, span_notice("I activate [src].")) src.user = user START_PROCESSING(SSobj, src) old_alpha = user.alpha on = TRUE /obj/item/shadowcloak/proc/Deactivate() - to_chat(user, "I deactivate [src].") + to_chat(user, span_notice("I deactivate [src].")) STOP_PROCESSING(SSobj, src) if(user) user.alpha = old_alpha @@ -244,7 +244,7 @@ effective or pretty fucking useless. var/range = 12 /obj/item/jammer/attack_self(mob/user) - to_chat(user,"I [active ? "deactivate" : "activate"] [src].") + to_chat(user,span_notice("I [active ? "deactivate" : "activate"] [src].")) active = !active if(active) GLOB.active_jammers |= src diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 3eca7570e..9bd7ed7f8 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -20,34 +20,34 @@ /obj/item/transfer_valve/attackby(obj/item/item, mob/user, params) if(istype(item, /obj/item/tank)) if(tank_one && tank_two) - to_chat(user, "There are already two tanks attached, remove one first!") + to_chat(user, span_warning("There are already two tanks attached, remove one first!")) return if(!tank_one) if(!user.transferItemToLoc(item, src)) return tank_one = item - to_chat(user, "I attach the tank to the transfer valve.") + to_chat(user, span_notice("I attach the tank to the transfer valve.")) else if(!tank_two) if(!user.transferItemToLoc(item, src)) return tank_two = item - to_chat(user, "I attach the tank to the transfer valve.") + to_chat(user, span_notice("I attach the tank to the transfer valve.")) update_icon() //TODO: Have this take an assemblyholder else if(isassembly(item)) var/obj/item/assembly/A = item if(A.secured) - to_chat(user, "The device is secured.") + to_chat(user, span_notice("The device is secured.")) return if(attached_device) - to_chat(user, "There is already a device attached to the valve, remove it first!") + to_chat(user, span_warning("There is already a device attached to the valve, remove it first!")) return if(!user.transferItemToLoc(item, src)) return attached_device = A - to_chat(user, "I attach the [item] to the valve controls and secure it.") + to_chat(user, span_notice("I attach the [item] to the valve controls and secure it.")) A.holder = src A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb). log_bomber(user, "attached a [item.name] to a ttv -", src, null, FALSE) diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm index 0f063d29e..0f67c0016 100644 --- a/code/game/objects/items/dice.dm +++ b/code/game/objects/items/dice.dm @@ -29,7 +29,7 @@ // new picked(src) /obj/item/storage/pill_bottle/dice/suicide_act(mob/user) - user.visible_message("[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!")) return (OXYLOSS) /obj/item/storage/pill_bottle/dice/hazard @@ -67,7 +67,7 @@ update_icon() /obj/item/dice/suicide_act(mob/user) - user.visible_message("[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!")) return (OXYLOSS) /obj/item/dice/d1 @@ -207,11 +207,11 @@ obj/item/dice/d6/ebony if(special_faces.len == sides) result = special_faces[result] if(user != null) //Dice was rolled in someone's hand - user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \ - "I throw [src]. It lands on [result]. [comment]", \ - "I hear [src] rolling, it sounds like a [fake_result].") + user.visible_message(span_notice("[user] has thrown [src]. It lands on [result]. [comment]"), \ + span_notice("I throw [src]. It lands on [result]. [comment]"), \ + span_hear("I hear [src] rolling, it sounds like a [fake_result].")) else if(!src.throwing) //Dice was thrown and is coming to rest - visible_message("[src] rolls to a stop, landing on [result]. [comment]") + visible_message(span_notice("[src] rolls to a stop, landing on [result]. [comment]")) /obj/item/dice/update_icon() cut_overlays() diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index 19d3b2853..36c5581bb 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -48,10 +48,10 @@ /obj/item/dnainjector/attack(mob/target, mob/user) if(!user.IsAdvancedToolUser()) - to_chat(user, "I don't have the dexterity to do this!") + to_chat(user, span_warning("I don't have the dexterity to do this!")) return if(used) - to_chat(user, "This injector is used up!") + to_chat(user, span_warning("This injector is used up!")) return if(ishuman(target)) var/mob/living/carbon/human/humantarget = target @@ -60,20 +60,20 @@ log_combat(user, target, "attempted to inject", src) if(target != user) - target.visible_message("[user] is trying to inject [target] with [src]!", \ - "[user] is trying to inject you with [src]!") + target.visible_message(span_danger("[user] is trying to inject [target] with [src]!"), \ + span_danger("[user] is trying to inject you with [src]!")) if(!do_mob(user, target) || used) return - target.visible_message("[user] injects [target] with the syringe with [src]!", \ - "[user] injects you with the syringe with [src]!") + target.visible_message(span_danger("[user] injects [target] with the syringe with [src]!"), \ + span_danger("[user] injects you with the syringe with [src]!")) else - to_chat(user, "I inject myself with [src].") + to_chat(user, span_notice("I inject myself with [src].")) log_combat(user, target, "injected", src) if(!inject(target, user)) //Now we actually do the heavy lifting. - to_chat(user, "It appears that [target] does not have compatible DNA.") + to_chat(user, span_notice("It appears that [target] does not have compatible DNA.")) used = 1 icon_state = "dnainjector0" @@ -445,7 +445,7 @@ /obj/item/dnainjector/timed/inject(mob/living/carbon/M, mob/user) if(M.stat == DEAD) //prevents dead people from having their DNA changed - to_chat(user, "I can't modify [M]'s DNA while [M.p_theyre()] dead.") + to_chat(user, span_notice("I can't modify [M]'s DNA while [M.p_theyre()] dead.")) return FALSE if(M.has_dna() && !(HAS_TRAIT(M, TRAIT_BADDNA))) diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm index de2200adf..d13e758f2 100644 --- a/code/game/objects/items/documents.dm +++ b/code/game/objects/items/documents.dm @@ -48,11 +48,11 @@ /obj/item/documents/photocopy/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/toy/crayon/red) || istype(O, /obj/item/toy/crayon/blue)) if (forgedseal) - to_chat(user, "I have already forged a seal on [src]!") + to_chat(user, span_warning("I have already forged a seal on [src]!")) else var/obj/item/toy/crayon/C = O name = "[C.crayon_color] secret documents" icon_state = "docs_[C.crayon_color]" forgedseal = C.crayon_color - to_chat(user, "I forge the official seal with a [C.crayon_color] crayon. No one will notice... right?") + to_chat(user, span_notice("I forge the official seal with a [C.crayon_color] crayon. No one will notice... right?")) update_icon() diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm index 9ed3dae23..c500f4a6b 100644 --- a/code/game/objects/items/eightball.dm +++ b/code/game/objects/items/eightball.dm @@ -51,10 +51,10 @@ return if(on_cooldown) - to_chat(user, "[src] was shaken recently, it needs time to settle.") + to_chat(user, span_warning("[src] was shaken recently, it needs time to settle.")) return - user.visible_message("[user] starts shaking [src].", "I start shaking [src].", "I hear shaking and sloshing.") + user.visible_message(span_notice("[user] starts shaking [src]."), span_notice("I start shaking [src]."), span_hear("I hear shaking and sloshing.")) shaking = TRUE @@ -117,7 +117,7 @@ //ATTACK GHOST IGNORING PARENT RETURN VALUE /obj/item/toy/eightball/haunted/attack_ghost(mob/user) if(!shaking) - to_chat(user, "[src] is not currently being shaken.") + to_chat(user, span_warning("[src] is not currently being shaken.")) return interact(user) return ..() diff --git a/code/game/objects/items/etherealdiscoball.dm b/code/game/objects/items/etherealdiscoball.dm index 27ac1ef4e..807f8e42d 100644 --- a/code/game/objects/items/etherealdiscoball.dm +++ b/code/game/objects/items/etherealdiscoball.dm @@ -6,7 +6,7 @@ /obj/item/etherealballdeployer/attack_self(mob/living/carbon/user) .=..() - to_chat(user, "I deploy the Ethereal Disco Ball.") + to_chat(user, span_notice("I deploy the Ethereal Disco Ball.")) new /obj/structure/etherealball(user.loc) qdel(src) @@ -31,18 +31,18 @@ . = ..() if(TurnedOn) TurnOff() - to_chat(user, "I turn the disco ball off!") + to_chat(user, span_notice("I turn the disco ball off!")) else TurnOn() - to_chat(user, "I turn the disco ball on!") + to_chat(user, span_notice("I turn the disco ball on!")) /obj/structure/etherealball/AltClick(mob/living/carbon/human/user) . = ..() if(anchored) - to_chat(user, "I unlock the disco ball.") + to_chat(user, span_notice("I unlock the disco ball.")) anchored = FALSE else - to_chat(user, "I lock the disco ball.") + to_chat(user, span_notice("I lock the disco ball.")) anchored = TRUE /obj/structure/etherealball/proc/TurnOn() diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index c0af4ba85..95c1ecf1f 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -62,14 +62,14 @@ /obj/item/extinguisher/suicide_act(mob/living/carbon/user) if (!safety && (reagents.total_volume >= 1)) - user.visible_message("[user] puts the nozzle to [user.p_their()] mouth. It looks like [user.p_theyre()] trying to extinguish the spark of life!") + user.visible_message(span_suicide("[user] puts the nozzle to [user.p_their()] mouth. It looks like [user.p_theyre()] trying to extinguish the spark of life!")) afterattack(user,user) return OXYLOSS else if (safety && (reagents.total_volume >= 1)) - user.visible_message("[user] puts the nozzle to [user.p_their()] mouth... The safety's still on!") + user.visible_message(span_warning("[user] puts the nozzle to [user.p_their()] mouth... The safety's still on!")) return SHAME else - user.visible_message("[user] puts the nozzle to [user.p_their()] mouth... [src] is empty!") + user.visible_message(span_warning("[user] puts the nozzle to [user.p_their()] mouth... [src] is empty!")) return SHAME /obj/item/extinguisher/attack_self(mob/user) @@ -96,25 +96,25 @@ . += "The safety is [safety ? "on" : "off"]." if(reagents.total_volume) - . += "Alt-click to empty it." + . += span_notice("Alt-click to empty it.") /obj/item/extinguisher/proc/AttemptRefill(atom/target, mob/user) if(istype(target, tanktype) && target.Adjacent(user)) var/safety_save = safety safety = TRUE if(reagents.total_volume == reagents.maximum_volume) - to_chat(user, "\The [src] is already full!") + to_chat(user, span_warning("\The [src] is already full!")) safety = safety_save return 1 var/obj/structure/reagent_dispensers/W = target //will it work? var/transferred = W.reagents.trans_to(src, max_water, transfered_by = user) if(transferred > 0) - to_chat(user, "\The [src] has been refilled by [transferred] units.") + to_chat(user, span_notice("\The [src] has been refilled by [transferred] units.")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE, -6) for(var/datum/reagent/water/R in reagents.reagent_list) R.cooling_temperature = cooling_power else - to_chat(user, "\The [W] is empty!") + to_chat(user, span_warning("\The [W] is empty!")) safety = safety_save return 1 else @@ -134,7 +134,7 @@ if (src.reagents.total_volume < 1) - to_chat(usr, "\The [src] is empty!") + to_chat(usr, span_warning("\The [src] is empty!")) return if (world.time < src.last_use + 12) @@ -223,7 +223,7 @@ if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return if(!user.is_holding(src)) - to_chat(user, "I must be holding the [src] in your hands do this!") + to_chat(user, span_notice("I must be holding the [src] in your hands do this!")) return EmptyExtinguisher(user) @@ -236,12 +236,12 @@ var/turf/open/theturf = T theturf.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS) - user.visible_message("[user] empties out \the [src] onto the floor using the release valve.", "I quietly empty out \the [src] using its release valve.") + user.visible_message(span_notice("[user] empties out \the [src] onto the floor using the release valve."), span_info("I quietly empty out \the [src] using its release valve.")) //firebot assembly /obj/item/extinguisher/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/bodypart/l_arm/robot) || istype(O, /obj/item/bodypart/r_arm/robot)) - to_chat(user, "I add [O] to [src].") + to_chat(user, span_notice("I add [O] to [src].")) qdel(O) qdel(src) user.put_in_hands(new /obj/item/bot_assembly/firebot) diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index 74a0e4208..c5daa38f1 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -99,7 +99,7 @@ else if(W.tool_behaviour == TOOL_SCREWDRIVER && igniter && !lit) status = !status - to_chat(user, "[igniter] is now [status ? "secured" : "unsecured"]!") + to_chat(user, span_notice("[igniter] is now [status ? "secured" : "unsecured"]!")) update_icon() return @@ -120,7 +120,7 @@ if(user.transferItemToLoc(W,src)) ptank.forceMove(get_turf(src)) ptank = W - to_chat(user, "I swap the plasma tank in [src]!") + to_chat(user, span_notice("I swap the plasma tank in [src]!")) return if(!user.transferItemToLoc(W, src)) return @@ -144,22 +144,22 @@ if(ptank && isliving(user) && user.canUseTopic(src, BE_CLOSE, ismonkey(user))) user.put_in_hands(ptank) ptank = null - to_chat(user, "I remove the plasma tank from [src]!") + to_chat(user, span_notice("I remove the plasma tank from [src]!")) update_icon() /obj/item/flamethrower/examine(mob/user) . = ..() if(ptank) - . += "\The [src] has \a [ptank] attached. Alt-click to remove it." + . += span_notice("\The [src] has \a [ptank] attached. Alt-click to remove it.") /obj/item/flamethrower/proc/toggle_igniter(mob/user) if(!ptank) - to_chat(user, "Attach a plasma tank first!") + to_chat(user, span_notice("Attach a plasma tank first!")) return if(!status) - to_chat(user, "Secure the igniter first!") + to_chat(user, span_notice("Secure the igniter first!")) return - to_chat(user, "I [lit ? "extinguish" : "ignite"] [src]!") + to_chat(user, span_notice("I [lit ? "extinguish" : "ignite"] [src]!")) lit = !lit if(lit) set_light(1) @@ -243,7 +243,7 @@ /obj/item/flamethrower/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) var/obj/projectile/P = hitby if(damage && attack_type == PROJECTILE_ATTACK && P.damage_type != STAMINA && prob(15)) - owner.visible_message("\The [attack_text] hits the fueltank on [owner]'s [name], rupturing it! What a shot!") + owner.visible_message(span_danger("\The [attack_text] hits the fueltank on [owner]'s [name], rupturing it! What a shot!")) var/turf/target_turf = get_turf(owner) log_game("A projectile ([hitby]) detonated a flamethrower tank held by [key_name(owner)] at [COORD(target_turf)]") igniter.ignite_turf(src,target_turf, release_amount = 100) diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index ab9852709..bc50cf476 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -29,23 +29,23 @@ GLOBAL_LIST_EMPTY(possible_gifts) contains_type = get_gift_type() /obj/item/a_gift/suicide_act(mob/user) - user.visible_message("[user] peeks inside [src] and cries [user.p_them()]self to death! It looks like [user.p_they()] [user.p_were()] on the naughty list...") + user.visible_message(span_suicide("[user] peeks inside [src] and cries [user.p_them()]self to death! It looks like [user.p_they()] [user.p_were()] on the naughty list...")) return (BRUTELOSS) /obj/item/a_gift/examine(mob/M) . = ..() if(HAS_TRAIT(M, TRAIT_PRESENT_VISION) || isobserver(M)) - . += "It contains \a [initial(contains_type.name)]." + . += span_notice("It contains \a [initial(contains_type.name)].") /obj/item/a_gift/attack_self(mob/M) if(HAS_TRAIT(M, TRAIT_CANNOT_OPEN_PRESENTS)) - to_chat(M, "You're supposed to be spreading gifts, not opening them yourself!") + to_chat(M, span_warning("You're supposed to be spreading gifts, not opening them yourself!")) return qdel(src) var/obj/item/I = new contains_type(get_turf(M)) - M.visible_message("[M] unwraps \the [src], finding \a [I] inside!") + M.visible_message(span_notice("[M] unwraps \the [src], finding \a [I] inside!")) I.investigate_log("([I.type]) was found in a present by [key_name(M)].", INVESTIGATE_PRESENTS) M.put_in_hands(I) I.add_fingerprint(M) diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index 8306ea7ff..32e3219d1 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -14,9 +14,9 @@ playsound(user, pick('sound/blank.ogg'), 30, TRUE) if(do_after(user,50, user)) if(remarks.len) - to_chat(user, "[pick(remarks)]") + to_chat(user, span_notice("[pick(remarks)]")) else - to_chat(user, "I keep reading...") + to_chat(user, span_notice("I keep reading...")) return TRUE return FALSE @@ -26,13 +26,13 @@ return FALSE /obj/item/book/granter/proc/on_reading_start(mob/user) - to_chat(user, "I start reading [name]...") + to_chat(user, span_notice("I start reading [name]...")) /obj/item/book/granter/proc/on_reading_stopped(mob/user) - to_chat(user, "I stop reading...") + to_chat(user, span_notice("I stop reading...")) /obj/item/book/granter/proc/on_reading_finished(mob/user) - to_chat(user, "I finish reading [name]!") + to_chat(user, span_notice("I finish reading [name]!")) /obj/item/book/granter/proc/onlearned(mob/user) used = TRUE @@ -40,7 +40,7 @@ /obj/item/book/granter/attack_self(mob/living/user) if(reading) - to_chat(user, "You're already reading this!") + to_chat(user, span_warning("You're already reading this!")) return FALSE if(!user.can_read(src)) return FALSE @@ -49,7 +49,7 @@ if(!user.can_read(src)) return FALSE if(user.STAINT < 12) - to_chat(user, "You can't make sense of the sprawling runes!") + to_chat(user, span_warning("You can't make sense of the sprawling runes!")) return FALSE if(used) if(oneuse) @@ -78,15 +78,15 @@ return TRUE for(var/datum/action/A in user.actions) if(A.type == granted_action) - to_chat(user, "I already know all about [actionname]!") + to_chat(user, span_warning("I already know all about [actionname]!")) return TRUE return FALSE /obj/item/book/granter/action/on_reading_start(mob/user) - to_chat(user, "I start reading about [actionname]...") + to_chat(user, span_notice("I start reading about [actionname]...")) /obj/item/book/granter/action/on_reading_finished(mob/user) - to_chat(user, "I feel like you've got a good handle on [actionname]!") + to_chat(user, span_notice("I feel like you've got a good handle on [actionname]!")) var/datum/action/G = new granted_action G.Grant(user) onlearned(user) @@ -107,13 +107,13 @@ check_flags = NONE /datum/action/innate/origami/Activate() - to_chat(owner, "I will now fold origami planes.") + to_chat(owner, span_notice("I will now fold origami planes.")) button_icon_state = "origami_on" active = TRUE UpdateButtonIcon() /datum/action/innate/origami/Deactivate() - to_chat(owner, "I will no longer fold origami planes.") + to_chat(owner, span_notice("I will no longer fold origami planes.")) button_icon_state = "origami_off" active = FALSE UpdateButtonIcon() @@ -131,29 +131,29 @@ if(knownspell.type == spell) if(user.mind) if(iswizard(user)) - to_chat(user,"You're already far more versed in this spell than this flimsy how-to book can provide!") + to_chat(user,span_warning("You're already far more versed in this spell than this flimsy how-to book can provide!")) else - to_chat(user,"You've already read this one!") + to_chat(user,span_warning("You've already read this one!")) return TRUE return FALSE /obj/item/book/granter/spell/on_reading_start(mob/user) - to_chat(user, "I start reading about casting [spellname]...") + to_chat(user, span_notice("I start reading about casting [spellname]...")) /obj/item/book/granter/spell/on_reading_finished(mob/user) - to_chat(user, "I feel like you've experienced enough to cast [spellname]!") + to_chat(user, span_notice("I feel like you've experienced enough to cast [spellname]!")) var/obj/effect/proc_holder/spell/S = new spell user.mind.AddSpell(S) user.log_message("learned the spell [spellname] ([S])", LOG_ATTACK, color="orange") onlearned(user) /obj/item/book/granter/spell/recoil(mob/user) - user.visible_message("[src] glows in a black light!") + user.visible_message(span_warning("[src] glows in a black light!")) /obj/item/book/granter/spell/onlearned(mob/user) ..() if(oneuse) - user.visible_message("[src] glows dark for a second!") + user.visible_message(span_warning("[src] glows dark for a second!")) /obj/item/book/granter/spell/fireball spell = /obj/effect/proc_holder/spell/aimed/fireball @@ -186,7 +186,7 @@ /obj/item/book/granter/spell/smoke/recoil(mob/user) ..() - to_chat(user,"My stomach rumbles...") + to_chat(user,span_warning("My stomach rumbles...")) if(user.nutrition) user.set_nutrition(200) if(user.nutrition <= 0) @@ -201,7 +201,7 @@ /obj/item/book/granter/spell/blind/recoil(mob/user) ..() - to_chat(user,"I go blind!") + to_chat(user,span_warning("I go blind!")) user.blind_eyes(10) /obj/item/book/granter/spell/mindswap @@ -224,17 +224,17 @@ stored_swap = null if(!stored_swap) stored_swap = user - to_chat(user,"For a moment you feel like you don't even know who you are anymore.") + to_chat(user,span_warning("For a moment you feel like you don't even know who you are anymore.")) return if(stored_swap == user) - to_chat(user,"I stare at the book some more, but there doesn't seem to be anything else to learn...") + to_chat(user,span_notice("I stare at the book some more, but there doesn't seem to be anything else to learn...")) return var/obj/effect/proc_holder/spell/targeted/mind_transfer/swapper = new if(swapper.cast(list(stored_swap), user, TRUE, TRUE)) - to_chat(user,"You're suddenly somewhere else... and someone else?!") - to_chat(stored_swap,"Suddenly you're staring at [src] again... where are you, who are you?!") + to_chat(user,span_warning("You're suddenly somewhere else... and someone else?!")) + to_chat(stored_swap,span_warning("Suddenly you're staring at [src] again... where are you, who are you?!")) else - user.visible_message("[src] fizzles slightly as it stops glowing!") //if the mind_transfer failed to transfer mobs, likely due to the target being catatonic. + user.visible_message(span_warning("[src] fizzles slightly as it stops glowing!")) //if the mind_transfer failed to transfer mobs, likely due to the target being catatonic. stored_swap = null @@ -247,7 +247,7 @@ /obj/item/book/granter/spell/forcewall/recoil(mob/living/user) ..() - to_chat(user,"I suddenly feel very solid!") + to_chat(user,span_warning("I suddenly feel very solid!")) user.Stun(40, ignore_canstun = TRUE) user.petrify(30) @@ -260,7 +260,7 @@ /obj/item/book/granter/spell/knock/recoil(mob/living/user) ..() - to_chat(user,"You're knocked down!") + to_chat(user,span_warning("You're knocked down!")) user.Paralyze(40) /obj/item/book/granter/spell/barnyard @@ -279,7 +279,7 @@ user.equip_to_slot_if_possible(magichead, SLOT_WEAR_MASK, TRUE, TRUE) qdel(src) else - to_chat(user,"I say thee neigh") //It still lives here + to_chat(user,span_notice("I say thee neigh")) //It still lives here /obj/item/book/granter/spell/charge spell = /obj/effect/proc_holder/spell/targeted/charge @@ -290,7 +290,7 @@ /obj/item/book/granter/spell/charge/recoil(mob/user) ..() - to_chat(user,"[src] suddenly feels very warm!") + to_chat(user,span_warning("[src] suddenly feels very warm!")) empulse(src, 1, 1) /obj/item/book/granter/spell/summonitem @@ -302,7 +302,7 @@ /obj/item/book/granter/spell/summonitem/recoil(mob/user) ..() - to_chat(user,"[src] suddenly vanishes!") + to_chat(user,span_warning("[src] suddenly vanishes!")) qdel(src) /obj/item/book/granter/spell/random @@ -328,12 +328,12 @@ return TRUE var/datum/martial_art/MA = martial if(user.mind.has_martialart(initial(MA.id))) - to_chat(user,"I already know [martialname]!") + to_chat(user,span_warning("I already know [martialname]!")) return TRUE return FALSE /obj/item/book/granter/martial/on_reading_start(mob/user) - to_chat(user, "I start reading about [martialname]...") + to_chat(user, span_notice("I start reading about [martialname]...")) /obj/item/book/granter/martial/on_reading_finished(mob/user) to_chat(user, "[greet]") @@ -347,17 +347,17 @@ name = "old manual" martialname = "close quarters combat" desc = "" - greet = "You've mastered the basics of CQC." + greet = span_boldannounce("You've mastered the basics of CQC.") icon_state = "cqcmanual" remarks = list("Kick... Slam...", "Lock... Kick...", "Strike their abdomen, neck and back for critical damage...", "Slam... Lock...", "I could probably combine this with some other martial arts!", "Words that kill...", "The last and final moment is yours...") /obj/item/book/granter/martial/cqc/onlearned(mob/living/carbon/user) ..() if(oneuse == TRUE) - to_chat(user, "[src] beeps ominously...") + to_chat(user, span_warning("[src] beeps ominously...")) /obj/item/book/granter/martial/cqc/recoil(mob/living/carbon/user) - to_chat(user, "[src] explodes!") + to_chat(user, span_warning("[src] explodes!")) playsound(src,'sound/blank.ogg',40,TRUE) user.flash_act(1, 1) user.adjustBruteLoss(6) @@ -414,7 +414,7 @@ for(var/crafting_recipe_type in crafting_recipe_types) var/datum/crafting_recipe/R = crafting_recipe_type user.mind.teach_crafting_recipe(crafting_recipe_type) - to_chat(user,"I learned how to make [initial(R.name)].") + to_chat(user,span_notice("I learned how to make [initial(R.name)].")) /obj/item/book/granter/crafting_recipe/cooking_sweets_101 name = "Cooking Desserts 101" @@ -444,7 +444,7 @@ name = "siphoned scroll" desc = "A scroll once inscribed with magical scripture. The surface is now barren of knowledge, siphoned by someone else. It's utterly useless." icon_state = "scroll" - user.visible_message("[src] has had its magic ink ripped from the scroll!") + user.visible_message(span_warning("[src] has had its magic ink ripped from the scroll!")) /obj/item/book/granter/spell/blackstone/fireball name = "Scroll of Fireball" diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index c344f73f4..6ee247d65 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -31,20 +31,20 @@ . = ..() if(user.can_see_reagents()) if(beakers.len) - . += "I scan the grenade and detect the following reagents:" + . += span_notice("I scan the grenade and detect the following reagents:") for(var/obj/item/reagent_containers/glass/G in beakers) for(var/datum/reagent/R in G.reagents.reagent_list) - . += "[R.volume] units of [R.name] in the [G.name]." + . += span_notice("[R.volume] units of [R.name] in the [G.name].") if(beakers.len == 1) - . += "I detect no second beaker in the grenade." + . += span_notice("I detect no second beaker in the grenade.") else - . += "I scan the grenade, but detect nothing." + . += span_notice("I scan the grenade, but detect nothing.") else if(stage != GRENADE_READY && beakers.len) if(beakers.len == 2 && beakers[1].name == beakers[2].name) - . += "I see two [beakers[1].name]s inside the grenade." + . += span_notice("I see two [beakers[1].name]s inside the grenade.") else for(var/obj/item/reagent_containers/glass/G in beakers) - . += "I see a [G.name] inside the grenade." + . += span_notice("I see a [G.name] inside the grenade.") /obj/item/grenade/chem_grenade/attack_self(mob/user) if(stage == GRENADE_READY && !active) @@ -59,51 +59,51 @@ if(stage == GRENADE_WIRED) if(beakers.len) stage_change(GRENADE_READY) - to_chat(user, "I lock the [initial(name)] assembly.") + to_chat(user, span_notice("I lock the [initial(name)] assembly.")) I.play_tool_sound(src, 25) else - to_chat(user, "I need to add at least one beaker before locking the [initial(name)] assembly!") + to_chat(user, span_warning("I need to add at least one beaker before locking the [initial(name)] assembly!")) else if(stage == GRENADE_READY) det_time = det_time == 50 ? 30 : 50 //toggle between 30 and 50 if(landminemode) landminemode.time = det_time * 0.1 //overwrites the proxy sensor activation timer - to_chat(user, "I modify the time delay. It's set for [DisplayTimeText(det_time)].") + to_chat(user, span_notice("I modify the time delay. It's set for [DisplayTimeText(det_time)].")) else - to_chat(user, "I need to add a wire!") + to_chat(user, span_warning("I need to add a wire!")) return else if(stage == GRENADE_WIRED && is_type_in_list(I, allowed_containers)) . = TRUE //no afterattack if(is_type_in_list(I, banned_containers)) - to_chat(user, "[src] is too small to fit [I]!") // this one hits home huh anon? + to_chat(user, span_warning("[src] is too small to fit [I]!")) // this one hits home huh anon? return if(beakers.len == 2) - to_chat(user, "[src] can not hold more containers!") + to_chat(user, span_warning("[src] can not hold more containers!")) return else if(I.reagents.total_volume) if(!user.transferItemToLoc(I, src)) return - to_chat(user, "I add [I] to the [initial(name)] assembly.") + to_chat(user, span_notice("I add [I] to the [initial(name)] assembly.")) beakers += I var/reagent_list = pretty_string_from_reagent_list(I.reagents) user.log_message("inserted [I] ([reagent_list]) into [src]",LOG_GAME) else - to_chat(user, "[I] is empty!") + to_chat(user, span_warning("[I] is empty!")) else if(stage == GRENADE_EMPTY && istype(I, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = I if (C.use(1)) det_time = 50 // In case the cable_coil was removed and readded. stage_change(GRENADE_WIRED) - to_chat(user, "I rig the [initial(name)] assembly.") + to_chat(user, span_notice("I rig the [initial(name)] assembly.")) else - to_chat(user, "I need one length of coil to wire the assembly!") + to_chat(user, span_warning("I need one length of coil to wire the assembly!")) return else if(stage == GRENADE_READY && I.tool_behaviour == TOOL_WIRECUTTER && !active) stage_change(GRENADE_WIRED) - to_chat(user, "I unlock the [initial(name)] assembly.") + to_chat(user, span_notice("I unlock the [initial(name)] assembly.")) else if(stage == GRENADE_WIRED && I.tool_behaviour == TOOL_WRENCH) if(beakers.len) @@ -114,12 +114,12 @@ var/reagent_list = pretty_string_from_reagent_list(O.reagents) user.log_message("removed [O] ([reagent_list]) from [src]", LOG_GAME) beakers = list() - to_chat(user, "I open the [initial(name)] assembly and remove the payload.") + to_chat(user, span_notice("I open the [initial(name)] assembly and remove the payload.")) wires.detach_assembly(wires.get_wire(1)) return new /obj/item/stack/cable_coil(get_turf(src),1) stage_change(GRENADE_EMPTY) - to_chat(user, "I remove the activation mechanism from the [initial(name)] assembly.") + to_chat(user, span_notice("I remove the activation mechanism from the [initial(name)] assembly.")) else return ..() @@ -163,9 +163,9 @@ add_fingerprint(user) if(msg) if(landminemode) - to_chat(user, "I prime [src], activating its proximity sensor.") + to_chat(user, span_warning("I prime [src], activating its proximity sensor.")) else - to_chat(user, "I prime [src]! [DisplayTimeText(det_time)]!") + to_chat(user, span_warning("I prime [src]! [DisplayTimeText(det_time)]!")) playsound(src, 'sound/blank.ogg', volume, TRUE) icon_state = initial(icon_state) + "_active" if(landminemode) @@ -241,7 +241,7 @@ if(istype(I, /obj/item/slime_extract) && stage == GRENADE_WIRED) if(!user.transferItemToLoc(I, src)) return - to_chat(user, "I add [I] to the [initial(name)] assembly.") + to_chat(user, span_notice("I add [I] to the [initial(name)] assembly.")) beakers += I else return ..() @@ -274,9 +274,9 @@ if (newspread != null && user.canUseTopic(src, BE_CLOSE)) newspread = round(newspread) unit_spread = CLAMP(newspread, 5, 100) - to_chat(user, "I set the time release to [unit_spread] units per detonation.") + to_chat(user, span_notice("I set the time release to [unit_spread] units per detonation.")) if (newspread != unit_spread) - to_chat(user, "The new value is out of bounds. Minimum spread is 5 units, maximum is 100 units.") + to_chat(user, span_notice("The new value is out of bounds. Minimum spread is 5 units, maximum is 100 units.")) ..() /obj/item/grenade/chem_grenade/adv_release/prime() diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index ee4686e7b..29092ae1e 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -21,7 +21,7 @@ /obj/item/grenade/flashbang/proc/bang(turf/T , mob/living/M) if(M.stat == DEAD) //They're dead! return - M.show_message("BANG", MSG_AUDIBLE) + M.show_message(span_warning("BANG"), MSG_AUDIBLE) var/distance = max(0,get_dist(get_turf(src),T)) //Flash diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm index 680fdbc28..8e9417431 100644 --- a/code/game/objects/items/grenades/ghettobomb.dm +++ b/code/game/objects/items/grenades/ghettobomb.dm @@ -46,7 +46,7 @@ /obj/item/grenade/iedcasing/attack_self(mob/user) // if(!active) if(clown_check(user)) - to_chat(user, "I light the [name]!") + to_chat(user, span_warning("I light the [name]!")) cut_overlay("improvised_grenade_filled") preprime(user, null, FALSE) diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm index 39e0e028f..add77af2b 100644 --- a/code/game/objects/items/grenades/grenade.dm +++ b/code/game/objects/items/grenades/grenade.dm @@ -19,7 +19,7 @@ var/clumsy_check = GRENADE_CLUMSY_FUMBLE /obj/item/grenade/suicide_act(mob/living/carbon/user) - user.visible_message("[user] primes [src], then eats it! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] primes [src], then eats it! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(src, 'sound/blank.ogg', 50, TRUE) preprime(user, det_time) user.transferItemToLoc(src, user, TRUE)//>eat a grenade set to 5 seconds >rush captain @@ -36,11 +36,11 @@ var/clumsy = HAS_TRAIT(user, TRAIT_CLUMSY) if(clumsy && (clumsy_check == GRENADE_CLUMSY_FUMBLE)) if(prob(50)) - to_chat(user, "Huh? How does this thing work?") + to_chat(user, span_warning("Huh? How does this thing work?")) preprime(user, 5, FALSE) return FALSE else if(!clumsy && (clumsy_check == GRENADE_NONCLUMSY_FUMBLE)) - to_chat(user, "I pull the pin on [src]. Attached to it is a pink ribbon that says, \"HONK\"") + to_chat(user, span_warning("I pull the pin on [src]. Attached to it is a pink ribbon that says, \"HONK\"")) preprime(user, 5, FALSE) return FALSE return TRUE @@ -69,7 +69,7 @@ if(user) add_fingerprint(user) if(msg) - to_chat(user, "I prime [src]! [capitalize(DisplayTimeText(det_time))]!") + to_chat(user, span_warning("I prime [src]! [capitalize(DisplayTimeText(det_time))]!")) playsound(src, 'sound/blank.ogg', volume, TRUE) active = TRUE icon_state = initial(icon_state) + "_active" @@ -88,13 +88,13 @@ var/newtime = text2num(stripped_input(user, "Please enter a new detonation time", name)) if (newtime != null && user.canUseTopic(src, BE_CLOSE)) if(change_det_time(newtime)) - to_chat(user, "I modify the time delay. It's set for [DisplayTimeText(det_time)].") + to_chat(user, span_notice("I modify the time delay. It's set for [DisplayTimeText(det_time)].")) if (round(newtime * 10) != det_time) - to_chat(user, "The new value is out of bounds. The lowest possible time is 3 seconds and highest is 5 seconds. Instant detonations are also possible.") + to_chat(user, span_warning("The new value is out of bounds. The lowest possible time is 3 seconds and highest is 5 seconds. Instant detonations are also possible.")) return else if(W.tool_behaviour == TOOL_SCREWDRIVER) if(change_det_time()) - to_chat(user, "I modify the time delay. It's set for [DisplayTimeText(det_time)].") + to_chat(user, span_notice("I modify the time delay. It's set for [DisplayTimeText(det_time)].")) else return ..() @@ -122,7 +122,7 @@ /obj/item/grenade/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) var/obj/projectile/P = hitby if(damage && attack_type == PROJECTILE_ATTACK && P.damage_type != STAMINA && prob(15)) - owner.visible_message("[attack_text] hits [owner]'s [src], setting it off! What a shot!") + owner.visible_message(span_danger("[attack_text] hits [owner]'s [src], setting it off! What a shot!")) var/turf/T = get_turf(src) log_game("A projectile ([hitby]) detonated a grenade held by [key_name(owner)] at [COORD(T)]") message_admins("A projectile ([hitby]) detonated a grenade held by [key_name_admin(owner)] at [ADMIN_COORDJMP(T)]") diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm index 7885ff0f1..b56347b75 100644 --- a/code/game/objects/items/grenades/plastic.dm +++ b/code/game/objects/items/grenades/plastic.dm @@ -35,7 +35,7 @@ /obj/item/grenade/c4/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "The wire panel can be accessed without a screwdriver.") + to_chat(user, span_notice("The wire panel can be accessed without a screwdriver.")) else if(is_wire_tool(I)) wires.interact(user) else @@ -82,7 +82,7 @@ if(!flag) return - to_chat(user, "I start planting [src]. The timer is set to [det_time]...") + to_chat(user, span_notice("I start planting [src]. The timer is set to [det_time]...")) if(do_after(user, 30, target = AM)) if(!user.temporarilyRemoveItemFromInventory(src)) @@ -105,7 +105,7 @@ plastic_overlay.layer = FLOAT_LAYER target.add_overlay(plastic_overlay) - to_chat(user, "I plant the bomb. Timer counting down from [det_time].") + to_chat(user, span_notice("I plant the bomb. Timer counting down from [det_time].")) addtimer(CALLBACK(src, PROC_REF(prime)), det_time*10) /obj/item/grenade/c4/proc/shout_syndicate_crap(mob/M) @@ -141,7 +141,7 @@ /obj/item/grenade/c4/suicide_act(mob/user) message_admins("[ADMIN_LOOKUPFLW(user)] suicided with [src] at [ADMIN_VERBOSEJMP(user)]") log_game("[key_name(user)] suicided with [src] at [AREACOORD(user)]") - user.visible_message("[user] activates [src] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!") + user.visible_message(span_suicide("[user] activates [src] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!")) shout_syndicate_crap(user) explosion(user,0,2,0) //Cheap explosion imitation because putting prime() here causes runtimes user.gib(1, 1) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 3137f3f89..ecc2632d1 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -2,7 +2,7 @@ breakouttime = 600 /obj/item/restraints/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return(OXYLOSS) /obj/item/restraints/Destroy() @@ -49,24 +49,24 @@ var/obj/item/wirerod/W = new /obj/item/wirerod remove_item_from_storage(user) user.put_in_hands(W) - to_chat(user, "I wrap [src] around the top of [I].") + to_chat(user, span_notice("I wrap [src] around the top of [I].")) qdel(src) else - to_chat(user, "I need one rod to make a wired rod!") + to_chat(user, span_warning("I need one rod to make a wired rod!")) return else if(istype(I, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/M = I if(M.get_amount() < 6) - to_chat(user, "I need at least six metal sheets to make good enough weights!") + to_chat(user, span_warning("I need at least six metal sheets to make good enough weights!")) return - to_chat(user, "I begin to apply [I] to [src]...") + to_chat(user, span_notice("I begin to apply [I] to [src]...")) if(do_after(user, 35, target = src)) if(M.get_amount() < 6 || !M) return var/obj/item/restraints/legcuffs/bola/S = new /obj/item/restraints/legcuffs/bola M.use(6) user.put_in_hands(S) - to_chat(user, "I make some weights out of [I] and tie them to [src].") + to_chat(user, span_notice("I make some weights out of [I] and tie them to [src].")) remove_item_from_storage(user) qdel(src) else @@ -77,7 +77,7 @@ return if(iscarbon(user) && (HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))) - to_chat(user, "Uh... how do those things work?!") + to_chat(user, span_warning("Uh... how do those things work?!")) apply_cuffs(user,user) return @@ -89,8 +89,8 @@ if(!C.handcuffed) if(C.get_num_arms(FALSE) >= 2 || C.get_arm_ignore()) - C.visible_message("[user] is trying to put [src.name] on [C]!", \ - "[user] is trying to put [src.name] on you!") + C.visible_message(span_danger("[user] is trying to put [src.name] on [C]!"), \ + span_danger("[user] is trying to put [src.name] on you!")) playsound(loc, cuffsound, 30, TRUE, -2) if(do_mob(user, C, 30) && (C.get_num_arms(FALSE) >= 2 || C.get_arm_ignore())) @@ -98,15 +98,15 @@ apply_cuffs(C, user, TRUE) else apply_cuffs(C, user) - C.visible_message("[user] handcuffs [C].", \ - "[user] handcuffs you.") + C.visible_message(span_notice("[user] handcuffs [C]."), \ + span_danger("[user] handcuffs you.")) SSblackbox.record_feedback("tally", "handcuffs", 1, type) log_combat(user, C, "handcuffed") else - to_chat(user, "I fail to handcuff [C]!") + to_chat(user, span_warning("I fail to handcuff [C]!")) else - to_chat(user, "[C] doesn't have two hands...") + to_chat(user, span_warning("[C] doesn't have two hands...")) /obj/item/restraints/handcuffs/proc/apply_cuffs(mob/living/carbon/target, mob/user, dispense = 0) if(target.handcuffed) @@ -190,24 +190,24 @@ var/obj/item/wirerod/W = new /obj/item/wirerod remove_item_from_storage(user) user.put_in_hands(W) - to_chat(user, "I wrap [src] around the top of [I].") + to_chat(user, span_notice("I wrap [src] around the top of [I].")) qdel(src) else - to_chat(user, "I need one rod to make a wired rod!") + to_chat(user, span_warning("I need one rod to make a wired rod!")) return else if(istype(I, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/M = I if(M.get_amount() < 6) - to_chat(user, "I need at least six metal sheets to make good enough weights!") + to_chat(user, span_warning("I need at least six metal sheets to make good enough weights!")) return - to_chat(user, "I begin to apply [I] to [src]...") + to_chat(user, span_notice("I begin to apply [I] to [src]...")) if(do_after(user, 35, target = src)) if(M.get_amount() < 6 || !M) return var/obj/item/restraints/legcuffs/bola/S = new /obj/item/restraints/legcuffs/bola M.use(6) user.put_in_hands(S) - to_chat(user, "I make some weights out of [I] and tie them to [src].") + to_chat(user, span_notice("I make some weights out of [I] and tie them to [src].")) remove_item_from_storage(user) qdel(src) else @@ -273,8 +273,8 @@ if(!BP.is_object_embedded(src)) BP.add_embedded_object(src) close_trap() - C.visible_message("[C] triggers \the [src].", \ - "I trigger \the [src]!") + C.visible_message(span_boldwarning("[C] triggers \the [src]."), \ + span_userdanger("I trigger \the [src]!")) C.emote("agony") C.Stun(80) BP.add_wound(/datum/wound/fracture) @@ -290,16 +290,16 @@ armed = FALSE update_icon() alpha = 255 - C.visible_message("[C] disarms \the [src].", \ - "I disarm \the [src].") + C.visible_message(span_notice("[C] disarms \the [src]."), \ + span_notice("I disarm \the [src].")) return FALSE else add_mob_blood(C) if(!BP.is_object_embedded(src)) BP.add_embedded_object(src) close_trap() - C.visible_message("[C] triggers \the [src].", \ - "I trigger \the [src]!") + C.visible_message(span_boldwarning("[C] triggers \the [src]."), \ + span_userdanger("I trigger \the [src]!")) C.emote("agony") BP.add_wound(/datum/wound/fracture) BP.update_disabled() @@ -310,8 +310,8 @@ /obj/item/restraints/legcuffs/beartrap/attackby(obj/item/W, mob/user) if(W.force && armed) - user.visible_message("[user] triggers \the [src] with [W].", \ - "I trigger \the [src] with [W]!") + user.visible_message(span_warning("[user] triggers \the [src] with [W]."), \ + span_danger("I trigger \the [src] with [W]!")) W.take_damage(20) close_trap() if(isliving(user)) @@ -336,7 +336,7 @@ icon_state = "[initial(icon_state)][armed]" /obj/item/restraints/legcuffs/beartrap/suicide_act(mob/user) - user.visible_message("[user] is sticking [user.p_their()] head in the [src.name]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is sticking [user.p_their()] head in the [src.name]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) return (BRUTELOSS) @@ -348,9 +348,9 @@ if(prob(50)) armed = !armed update_icon() - to_chat(user, "[src] is now [armed ? "armed" : "disarmed"]") + to_chat(user, span_notice("[src] is now [armed ? "armed" : "disarmed"]")) else - user.visible_message("You couldn't get the shoddy [src.name] [armed ? "shut close!" : "to open up!"]") + user.visible_message(span_warning("You couldn't get the shoddy [src.name] [armed ? "shut close!" : "to open up!"]")) /obj/item/restraints/legcuffs/beartrap/proc/close_trap() armed = FALSE alpha = 255 @@ -366,7 +366,7 @@ var/obj/vehicle/ridden_vehicle = L.buckled if(!ridden_vehicle.are_legs_exposed) //close the trap without injuring/trapping the rider if their legs are inside the vehicle at all times. close_trap() - ridden_vehicle.visible_message("[ridden_vehicle] triggers \the [src].") + ridden_vehicle.visible_message(span_danger("[ridden_vehicle] triggers \the [src].")) return ..() if(L.throwing) return ..() @@ -393,8 +393,8 @@ snap = FALSE if(snap) close_trap() - L.visible_message("[L] triggers \the [src].", \ - "I trigger \the [src]!") + L.visible_message(span_danger("[L] triggers \the [src]."), \ + span_danger("I trigger \the [src]!")) L.apply_damage(trap_damage, BRUTE, def_zone) L.Stun(80) L.consider_ambush() @@ -451,12 +451,12 @@ */ /obj/item/restraints/legcuffs/bola/proc/ensnare(mob/living/carbon/C) if(!C.legcuffed && C.get_num_legs(FALSE) >= 2) - visible_message("\The [src] ensnares [C]!") + visible_message(span_danger("\The [src] ensnares [C]!")) C.legcuffed = src forceMove(C) C.update_inv_legcuffed() SSblackbox.record_feedback("tally", "handcuffs", 1, type) - to_chat(C, "\The [src] ensnares you!") + to_chat(C, span_danger("\The [src] ensnares you!")) C.Knockdown(knockdown) playsound(src, 'sound/blank.ogg', 50, TRUE) diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index efe11607b..32eb98e14 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -55,24 +55,24 @@ if(awakened) switch(bloodthirst) if(HIS_GRACE_SATIATED to HIS_GRACE_PECKISH) - . += "[src] isn't very hungry. Not yet." + . += span_his_grace("[src] isn't very hungry. Not yet.") if(HIS_GRACE_PECKISH to HIS_GRACE_HUNGRY) - . += "[src] would like a snack." + . += span_his_grace("[src] would like a snack.") if(HIS_GRACE_HUNGRY to HIS_GRACE_FAMISHED) - . += "[src] is quite hungry now." + . += span_his_grace("[src] is quite hungry now.") if(HIS_GRACE_FAMISHED to HIS_GRACE_STARVING) - . += "[src] is openly salivating at the sight of you. Be careful." + . += span_his_grace("[src] is openly salivating at the sight of you. Be careful.") if(HIS_GRACE_STARVING to HIS_GRACE_CONSUME_OWNER) - . += "I walk a fine line. [src] is very close to devouring you." + . += span_his_grace(span_bold("I walk a fine line. [src] is very close to devouring you.")) if(HIS_GRACE_CONSUME_OWNER to HIS_GRACE_FALL_ASLEEP) - . += "[src] is shaking violently and staring directly at you." + . += span_his_grace(span_bold("[src] is shaking violently and staring directly at you.")) else - . += "[src] is latched closed." + . += span_his_grace("[src] is latched closed.") /obj/item/his_grace/relaymove(mob/living/user) //Allows changelings, etc. to climb out of Him after they revive, provided He isn't active if(!awakened) user.forceMove(get_turf(src)) - user.visible_message("[user] scrambles out of [src]!", "I climb out of [src]!") + user.visible_message(span_warning("[user] scrambles out of [src]!"), span_notice("I climb out of [src]!")) /obj/item/his_grace/process() if(!bloodthirst) @@ -86,7 +86,7 @@ if(istype(master) && (src in master.held_items)) switch(bloodthirst) if(HIS_GRACE_CONSUME_OWNER to HIS_GRACE_FALL_ASLEEP) - master.visible_message("[src] turns on [master]!", "[src] turns on you!") + master.visible_message(span_boldwarning("[src] turns on [master]!"), span_his_grace(span_bigbold("[src] turns on you!"))) do_attack_animation(master, null, src) master.emote("scream") master.remove_status_effect(STATUS_EFFECT_HISGRACE) @@ -112,7 +112,7 @@ step_to(src, L) if(Adjacent(L)) if(!L.stat) - L.visible_message("[src] lunges at [L]!", "[src] lunges at you!") + L.visible_message(span_warning("[src] lunges at [L]!"), span_his_grace(span_bigbold("[src] lunges at you!"))) do_attack_animation(L, null, src) playsound(L, 'sound/blank.ogg', 50, TRUE) playsound(L, 'sound/blank.ogg', 50, TRUE) @@ -125,7 +125,7 @@ if(awakened) return awakened = TRUE - user.visible_message("[src] begins to rattle. He thirsts.", "I flick [src]'s latch up. You hope this is a good idea.") + user.visible_message(span_boldwarning("[src] begins to rattle. He thirsts."), span_his_grace("I flick [src]'s latch up. You hope this is a good idea.")) name = "His Grace" desc = "" gender = MALE @@ -159,7 +159,7 @@ if(!awakened || ascended) return var/turf/T = get_turf(src) - T.visible_message("[src] slowly stops rattling and falls still, His latch snapping shut.") + T.visible_message(span_boldwarning("[src] slowly stops rattling and falls still, His latch snapping shut.")) playsound(loc, 'sound/blank.ogg', 100, TRUE) name = initial(name) desc = initial(desc) @@ -175,7 +175,7 @@ if(!meal) return var/victims = 0 - meal.visible_message("[src] swings open and devours [meal]!", "[src] consumes you!") + meal.visible_message(span_warning("[src] swings open and devours [meal]!"), span_his_grace(span_bigbold("[src] consumes you!"))) meal.adjustBruteLoss(200) playsound(meal, 'sound/blank.ogg', 75, TRUE) playsound(src, 'sound/blank.ogg', 100, TRUE) @@ -207,36 +207,36 @@ switch(bloodthirst) if(HIS_GRACE_CONSUME_OWNER to HIS_GRACE_FALL_ASLEEP) if(HIS_GRACE_CONSUME_OWNER > prev_bloodthirst) - master.visible_message("[src] enters a frenzy!") + master.visible_message(span_danger("[src] enters a frenzy!")) if(HIS_GRACE_STARVING to HIS_GRACE_CONSUME_OWNER) ADD_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT) if(HIS_GRACE_STARVING > prev_bloodthirst) - master.visible_message("[src] is starving!", "[src]'s bloodlust overcomes you. [src] must be fed, or you will become His meal.\ + master.visible_message(span_boldwarning("[src] is starving!"), "[src]'s bloodlust overcomes you. [src] must be fed, or you will become His meal.\ [force_bonus < 15 ? " And still, His power grows.":""]") force_bonus = max(force_bonus, 15) if(HIS_GRACE_FAMISHED to HIS_GRACE_STARVING) ADD_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT) if(HIS_GRACE_FAMISHED > prev_bloodthirst) - master.visible_message("[src] is very hungry!", "Spines sink into my hand. [src] must feed immediately.\ + master.visible_message(span_warning("[src] is very hungry!"), "Spines sink into my hand. [src] must feed immediately.\ [force_bonus < 10 ? " His power grows.":""]") force_bonus = max(force_bonus, 10) if(prev_bloodthirst >= HIS_GRACE_STARVING) - master.visible_message("[src] is now only very hungry!", "My bloodlust recedes.") + master.visible_message(span_warning("[src] is now only very hungry!"), span_his_grace(span_big("My bloodlust recedes."))) if(HIS_GRACE_HUNGRY to HIS_GRACE_FAMISHED) if(HIS_GRACE_HUNGRY > prev_bloodthirst) - master.visible_message("[src] is getting hungry.", "I feel [src]'s hunger within you.\ + master.visible_message(span_warning("[src] is getting hungry."), "I feel [src]'s hunger within you.\ [force_bonus < 5 ? " His power grows.":""]") force_bonus = max(force_bonus, 5) if(prev_bloodthirst >= HIS_GRACE_FAMISHED) - master.visible_message("[src] is now only somewhat hungry.", "[src]'s hunger recedes a little...") + master.visible_message(span_warning("[src] is now only somewhat hungry."), span_his_grace("[src]'s hunger recedes a little...")) if(HIS_GRACE_PECKISH to HIS_GRACE_HUNGRY) if(HIS_GRACE_PECKISH > prev_bloodthirst) - master.visible_message("[src] is feeling snackish.", "[src] begins to hunger.") + master.visible_message(span_warning("[src] is feeling snackish."), span_his_grace("[src] begins to hunger.")) if(prev_bloodthirst >= HIS_GRACE_HUNGRY) - master.visible_message("[src] is now only a little peckish.", "[src]'s hunger recedes somewhat...") + master.visible_message(span_warning("[src] is now only a little peckish."), span_his_grace(span_big("[src]'s hunger recedes somewhat..."))) if(HIS_GRACE_SATIATED to HIS_GRACE_PECKISH) if(prev_bloodthirst >= HIS_GRACE_PECKISH) - master.visible_message("[src] is satiated.", "[src]'s hunger recedes...") + master.visible_message(span_warning("[src] is satiated."), span_his_grace(span_big("[src]'s hunger recedes..."))) force = initial(force) + force_bonus /obj/item/his_grace/proc/ascend() @@ -250,5 +250,5 @@ ascended = TRUE playsound(src, 'sound/blank.ogg', 100) if(istype(master)) - master.visible_message("Gods will be watching.") + master.visible_message(span_his_grace(span_bigbold("Gods will be watching."))) name = "[master]'s mythical toolbox of three powers" diff --git a/code/game/objects/items/holosign_creator.dm b/code/game/objects/items/holosign_creator.dm index 2a20384d5..01ce178f0 100644 --- a/code/game/objects/items/holosign_creator.dm +++ b/code/game/objects/items/holosign_creator.dm @@ -26,12 +26,12 @@ var/turf/T = get_turf(target) var/obj/structure/holosign/H = locate(holosign_type) in T if(H) - to_chat(user, "I use [src] to deactivate [H].") + to_chat(user, span_notice("I use [src] to deactivate [H].")) qdel(H) else if(!is_blocked_turf(T, TRUE)) //can't put holograms on a tile that has dense stuff if(holocreator_busy) - to_chat(user, "[src] is busy creating a hologram.") + to_chat(user, span_notice("[src] is busy creating a hologram.")) return if(signs.len < max_signs) playsound(src.loc, 'sound/blank.ogg', 20, TRUE) @@ -46,9 +46,9 @@ if(is_blocked_turf(T, TRUE)) //don't try to sneak dense stuff on our tile during the wait. return H = new holosign_type(get_turf(target), src) - to_chat(user, "I create \a [H] with [src].") + to_chat(user, span_notice("I create \a [H] with [src].")) else - to_chat(user, "[src] is projecting at max capacity!") + to_chat(user, span_notice("[src] is projecting at max capacity!")) /obj/item/holosign_creator/attack(mob/living/carbon/human/M, mob/user) return @@ -57,7 +57,7 @@ if(signs.len) for(var/H in signs) qdel(H) - to_chat(user, "I clear all active holograms.") + to_chat(user, span_notice("I clear all active holograms.")) /obj/item/holosign_creator/janibarrier name = "custodial holobarrier projector" @@ -111,7 +111,7 @@ var/mob/living/silicon/robot/R = user if(shock) - to_chat(user, "I clear all active holograms, and reset your projector to normal.") + to_chat(user, span_notice("I clear all active holograms, and reset your projector to normal.")) holosign_type = /obj/structure/holosign/barrier/cyborg creation_time = 5 if(signs.len) @@ -120,7 +120,7 @@ shock = 0 return else if(R.emagged&&!shock) - to_chat(user, "I clear all active holograms, and overload your energy projector!") + to_chat(user, span_warning("I clear all active holograms, and overload your energy projector!")) holosign_type = /obj/structure/holosign/barrier/cyborg/hacked creation_time = 30 if(signs.len) @@ -132,8 +132,8 @@ if(signs.len) for(var/H in signs) qdel(H) - to_chat(user, "I clear all active holograms.") + to_chat(user, span_notice("I clear all active holograms.")) if(signs.len) for(var/H in signs) qdel(H) - to_chat(user, "I clear all active holograms.") + to_chat(user, span_notice("I clear all active holograms.")) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 2c14d1908..d750ca0e9 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -48,7 +48,7 @@ SSblackbox.record_feedback("tally", "chaplain_armor", 1, "[choice]") GLOB.holy_armor_type = choice else - to_chat(M, "A selection has already been made. Self-Destructing...") + to_chat(M, span_warning("A selection has already been made. Self-Destructing...")) return @@ -209,7 +209,7 @@ AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, null, FALSE) /obj/item/nullrod/suicide_act(mob/user) - user.visible_message("[user] is killing [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to get closer to god!") + user.visible_message(span_suicide("[user] is killing [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to get closer to god!")) return (BRUTELOSS|FIRELOSS) /obj/item/nullrod/attack_self(mob/user) @@ -440,7 +440,7 @@ if(possessed) return - to_chat(user, "I attempt to wake the spirit of the blade...") + to_chat(user, span_notice("I attempt to wake the spirit of the blade...")) possessed = TRUE @@ -459,12 +459,12 @@ name = input S.fully_replace_character_name(null, "The spirit of [input]") else - to_chat(user, "The blade is dormant. Maybe you can try again later.") + to_chat(user, span_warning("The blade is dormant. Maybe you can try again later.")) possessed = FALSE /obj/item/nullrod/scythe/talking/Destroy() for(var/mob/living/simple_animal/shade/S in contents) - to_chat(S, "I were destroyed!") + to_chat(S, span_danger("I were destroyed!")) qdel(S) return ..() @@ -540,8 +540,8 @@ if(prob(30) && ishuman(A)) var/mob/living/carbon/human/H = A user.reagents.trans_to(H, user.reagents.total_volume, 1, 1, 0, transfered_by = user) - to_chat(user, "My pride reflects on [H].") - to_chat(H, "I feel insecure, taking on [user]'s burden.") + to_chat(user, span_notice("My pride reflects on [H].")) + to_chat(H, span_danger("I feel insecure, taking on [user]'s burden.")) /obj/item/nullrod/whip name = "holy whip" @@ -606,7 +606,7 @@ /obj/item/nullrod/carp/attack_self(mob/living/user) if(used_blessing) else if(user.mind && (user.mind.isholy)) - to_chat(user, "I are blessed by Carp-Sie. Wild space carp will no longer attack you.") + to_chat(user, span_boldnotice("I are blessed by Carp-Sie. Wild space carp will no longer attack you.")) user.faction |= "carp" used_blessing = TRUE diff --git a/code/game/objects/items/hot_potato.dm b/code/game/objects/items/hot_potato.dm index b356ddc99..43ed8ed0d 100644 --- a/code/game/objects/items/hot_potato.dm +++ b/code/game/objects/items/hot_potato.dm @@ -50,7 +50,7 @@ /obj/item/hot_potato/proc/detonate() var/atom/location = loc - location.visible_message("[src] [detonate_explosion? "explodes" : "activates"]!", "[src] activates! You've ran out of time!") + location.visible_message(span_danger("[src] [detonate_explosion? "explodes" : "activates"]!"), span_danger("[src] activates! You've ran out of time!")) if(detonate_explosion) explosion(src, detonate_dev_range, detonate_heavy_range, detonate_light_range, detonate_flash_range, flame_range = detonate_fire_range) deactivate() @@ -62,8 +62,8 @@ /obj/item/hot_potato/attack_self(mob/user) if(activate(timer, user)) - user.visible_message("[user] squeezes [src], which promptly starts to flash red-hot colors!", "I squeeze [src], activating its countdown and attachment mechanism!", - "I hear a mechanical click and a loud beeping!") + user.visible_message(span_boldwarning("[user] squeezes [src], which promptly starts to flash red-hot colors!"), span_boldwarning("I squeeze [src], activating its countdown and attachment mechanism!"), + span_boldwarning("I hear a mechanical click and a loud beeping!")) return return ..() @@ -83,14 +83,14 @@ /obj/item/hot_potato/examine(mob/user) . = ..() if(active) - . += "[src] is flashing red-hot! You should probably get rid of it!" + . += span_warning("[src] is flashing red-hot! You should probably get rid of it!") if(show_timer) - . += "[src]'s timer looks to be at [DisplayTimeText(activation_time - world.time)]!" + . += span_warning("[src]'s timer looks to be at [DisplayTimeText(activation_time - world.time)]!") /obj/item/hot_potato/equipped(mob/user) . = ..() if(active) - to_chat(user, "I have a really bad feeling about [src]!") + to_chat(user, span_danger("I have a really bad feeling about [src]!")) /obj/item/hot_potato/afterattack(atom/target, mob/user, adjacent, params) . = ..() @@ -102,9 +102,9 @@ if(!istype(victim) || user != loc || victim == user) return FALSE if(!victim.client) - to_chat(user, "[src] refuses to attach to a non-sapient creature!") + to_chat(user, span_boldwarning("[src] refuses to attach to a non-sapient creature!")) if(victim.stat != CONSCIOUS || !victim.get_num_legs()) - to_chat(user, "[src] refuses to attach to someone incapable of using it!") + to_chat(user, span_boldwarning("[src] refuses to attach to someone incapable of using it!")) user.temporarilyRemoveItemFromInventory(src, TRUE) . = FALSE if(!victim.put_in_hands(src)) @@ -120,11 +120,11 @@ . = TRUE if(.) log_combat(user, victim, "forced a hot potato with explosive variables ([detonate_explosion]-[detonate_dev_range]/[detonate_heavy_range]/[detonate_light_range]/[detonate_flash_range]/[detonate_fire_range]) onto") - user.visible_message("[user] forces [src] onto [victim]!", "I force [src] onto [victim]!", "I hear a mechanical click and a beep.") + user.visible_message(span_danger("[user] forces [src] onto [victim]!"), span_danger("I force [src] onto [victim]!"), span_boldwarning("I hear a mechanical click and a beep.")) colorize(null) else log_combat(user, victim, "tried to force a hot potato with explosive variables ([detonate_explosion]-[detonate_dev_range]/[detonate_heavy_range]/[detonate_light_range]/[detonate_flash_range]/[detonate_fire_range]) onto") - user.visible_message("[user] tried to force [src] onto [victim], but it could not attach!", "I try to force [src] onto [victim], but it is unable to attach!", "I hear a mechanical click and two buzzes.") + user.visible_message(span_boldwarning("[user] tried to force [src] onto [victim], but it could not attach!"), span_boldwarning("I try to force [src] onto [victim], but it is unable to attach!"), span_boldwarning("I hear a mechanical click and two buzzes.")) user.put_in_hands(src) /obj/item/hot_potato/dropped(mob/user) diff --git a/code/game/objects/items/hourglass.dm b/code/game/objects/items/hourglass.dm index cf8fb702c..c1381e75b 100644 --- a/code/game/objects/items/hourglass.dm +++ b/code/game/objects/items/hourglass.dm @@ -22,11 +22,11 @@ /obj/item/hourglass/proc/toggle(mob/user) if(!timing_id) - to_chat(user,"I flip the [src].") + to_chat(user,span_notice("I flip the [src].")) start() flick("hourglass_flip",src) else - to_chat(user,"I stop the [src].") //Sand magically flows back because that's more convinient to use. + to_chat(user,span_notice("I stop the [src].")) //Sand magically flows back because that's more convinient to use. stop() /obj/item/hourglass/update_icon() @@ -57,7 +57,7 @@ update_icon() /obj/item/hourglass/proc/finish() - visible_message("[src] stops.") + visible_message(span_notice("[src] stops.")) stop() /obj/item/hourglass/Destroy() diff --git a/code/game/objects/items/implants/implant_abductor.dm b/code/game/objects/items/implants/implant_abductor.dm index 531265509..b95321a2f 100644 --- a/code/game/objects/items/implants/implant_abductor.dm +++ b/code/game/objects/items/implants/implant_abductor.dm @@ -11,7 +11,7 @@ /obj/item/implant/abductor/activate() . = ..() if(on_cooldown) - to_chat(imp_in, "I must wait [timeleft(on_cooldown)*0.1] seconds to use [src] again!") + to_chat(imp_in, span_warning("I must wait [timeleft(on_cooldown)*0.1] seconds to use [src] again!")) return home.Retrieve(imp_in,1) diff --git a/code/game/objects/items/implants/implant_chem.dm b/code/game/objects/items/implants/implant_chem.dm index 4312a11e6..6b8374e6a 100644 --- a/code/game/objects/items/implants/implant_chem.dm +++ b/code/game/objects/items/implants/implant_chem.dm @@ -46,9 +46,9 @@ else injectamount = cause reagents.trans_to(R, injectamount) - to_chat(R, "I hear a faint beep.") + to_chat(R, span_hear("I hear a faint beep.")) if(!reagents.total_volume) - to_chat(R, "I hear a faint click from your chest.") + to_chat(R, span_hear("I hear a faint click from your chest.")) qdel(src) diff --git a/code/game/objects/items/implants/implant_explosive.dm b/code/game/objects/items/implants/implant_explosive.dm index cc768d39d..7a419ba77 100644 --- a/code/game/objects/items/implants/implant_explosive.dm +++ b/code/game/objects/items/implants/implant_explosive.dm @@ -39,7 +39,7 @@ heavy = round(heavy) medium = round(medium) weak = round(weak) - to_chat(imp_in, "I activate your [name].") + to_chat(imp_in, span_notice("I activate your [name].")) active = TRUE var/turf/boomturf = get_turf(imp_in) message_admins("[ADMIN_LOOKUPFLW(imp_in)] has activated their [name] at [ADMIN_VERBOSEJMP(boomturf)], with cause of [cause].") @@ -66,11 +66,11 @@ return ..() /obj/item/implant/explosive/proc/timed_explosion() - imp_in.visible_message("[imp_in] starts beeping ominously!") + imp_in.visible_message(span_warning("[imp_in] starts beeping ominously!")) playsound(loc, 'sound/blank.ogg', 30, FALSE) sleep(delay*0.25) if(imp_in && !imp_in.stat) - imp_in.visible_message("[imp_in] doubles over in pain!") + imp_in.visible_message(span_warning("[imp_in] doubles over in pain!")) imp_in.Paralyze(140) playsound(loc, 'sound/blank.ogg', 30, FALSE) sleep(delay*0.25) diff --git a/code/game/objects/items/implants/implant_freedom.dm b/code/game/objects/items/implants/implant_freedom.dm index 1b13f003b..6d5813e99 100644 --- a/code/game/objects/items/implants/implant_freedom.dm +++ b/code/game/objects/items/implants/implant_freedom.dm @@ -9,7 +9,7 @@ /obj/item/implant/freedom/activate() . = ..() uses-- - to_chat(imp_in, "I feel a faint click.") + to_chat(imp_in, span_hear("I feel a faint click.")) if(iscarbon(imp_in)) var/mob/living/carbon/C_imp_in = imp_in C_imp_in.uncuff() diff --git a/code/game/objects/items/implants/implant_mindshield.dm b/code/game/objects/items/implants/implant_mindshield.dm index d2ffd3563..43bdfd61b 100644 --- a/code/game/objects/items/implants/implant_mindshield.dm +++ b/code/game/objects/items/implants/implant_mindshield.dm @@ -28,7 +28,7 @@ if(target.mind.has_antag_datum(/datum/antagonist/rev/head)|| target.mind.unconvertable) if(!silent) - target.visible_message("[target] seems to resist the implant!", "I feel something interfering with my mental conditioning, but you resist it!") + target.visible_message(span_warning("[target] seems to resist the implant!"), span_warning("I feel something interfering with my mental conditioning, but you resist it!")) removed(target, 1) qdel(src) return TRUE //the implant is still used @@ -38,9 +38,9 @@ rev.remove_revolutionary(FALSE, user) if(!silent) if(target.mind in SSticker.mode.cult) - to_chat(target, "I feel something interfering with my mental conditioning, but you resist it!") + to_chat(target, span_warning("I feel something interfering with my mental conditioning, but you resist it!")) else - to_chat(target, "I feel a sense of peace and security. You are now protected from brainwashing.") + to_chat(target, span_notice("I feel a sense of peace and security. You are now protected from brainwashing.")) ADD_TRAIT(target, TRAIT_MINDSHIELD, "implant") target.sec_hud_set_implants() return TRUE @@ -53,7 +53,7 @@ REMOVE_TRAIT(L, TRAIT_MINDSHIELD, "implant") L.sec_hud_set_implants() if(target.stat != DEAD && !silent) - to_chat(target, "My mind suddenly feels terribly vulnerable. You are no longer safe from brainwashing.") + to_chat(target, span_boldnotice("My mind suddenly feels terribly vulnerable. You are no longer safe from brainwashing.")) return 1 return 0 diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index b93e74380..5a613ee2b 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -33,7 +33,7 @@ /obj/item/implant/adrenalin/activate() . = ..() uses-- - to_chat(imp_in, "I feel a sudden surge of energy!") + to_chat(imp_in, span_notice("I feel a sudden surge of energy!")) imp_in.set_resting(FALSE) imp_in.reagents.add_reagent(/datum/reagent/medicine/badstims, 6) if(!uses) diff --git a/code/game/objects/items/implants/implant_spell.dm b/code/game/objects/items/implants/implant_spell.dm index ea984fc91..cef7e4296 100644 --- a/code/game/objects/items/implants/implant_spell.dm +++ b/code/game/objects/items/implants/implant_spell.dm @@ -30,7 +30,7 @@ if (.) target.RemoveSpell(spell) if(target.stat != DEAD && !silent) - to_chat(target, "The knowledge of how to cast [spell] slips out from your mind.") + to_chat(target, span_boldnotice("The knowledge of how to cast [spell] slips out from your mind.")) /obj/item/implanter/spell name = "implanter (spell)" diff --git a/code/game/objects/items/implants/implant_storage.dm b/code/game/objects/items/implants/implant_storage.dm index c407a9a7a..025bbefa8 100644 --- a/code/game/objects/items/implants/implant_storage.dm +++ b/code/game/objects/items/implants/implant_storage.dm @@ -16,7 +16,7 @@ for (var/obj/item/I in lostimplant.contents()) I.add_mob_blood(implantee) lostimplant.do_quick_empty() - implantee.visible_message("A bluespace pocket opens around [src] as it exits [implantee], spewing out its contents and rupturing the surrounding tissue!") + implantee.visible_message(span_warning("A bluespace pocket opens around [src] as it exits [implantee], spewing out its contents and rupturing the surrounding tissue!")) implantee.apply_damage(20, BRUTE, BODY_ZONE_CHEST) qdel(lostimplant) return ..() diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm index bc1a461ab..50ad92cd2 100644 --- a/code/game/objects/items/implants/implantcase.dm +++ b/code/game/objects/items/implants/implantcase.dm @@ -26,7 +26,7 @@ /obj/item/implantcase/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pen)) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on the side of [src]!") + to_chat(user, span_notice("I scribble illegibly on the side of [src]!")) return var/t = stripped_input(user, "What would you like the label to be?", name, null) if(user.get_active_held_item() != W) diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index 82e408b76..913a6b5d3 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -90,12 +90,12 @@ if(istype(I, /obj/item/implant)) var/obj/item/implant/P = I if(P.implant(M)) - visible_message("[M] has been implanted by [src].") + visible_message(span_warning("[M] has been implanted by [src].")) return TRUE else if(istype(I, /obj/item/organ)) var/obj/item/organ/P = I P.Insert(M, FALSE, FALSE) - visible_message("[M] has been implanted by [src].") + visible_message(span_warning("[M] has been implanted by [src].")) return TRUE /obj/machinery/implantchair/update_icon() @@ -124,20 +124,20 @@ /obj/machinery/implantchair/container_resist(mob/living/user) user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user.visible_message("I see [user] kicking against the door of [src]!", \ - "I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "I hear a metallic creaking from [src].") + user.visible_message(span_notice("I see [user] kicking against the door of [src]!"), \ + span_notice("I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_hear("I hear a metallic creaking from [src].")) if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src || state_open) return - user.visible_message("[user] successfully broke out of [src]!", \ - "I successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("I successfully break out of [src]!")) open_machine() /obj/machinery/implantchair/relaymove(mob/user) if(message_cooldown <= world.time) message_cooldown = world.time + 50 - to_chat(user, "[src]'s door won't budge!") + to_chat(user, span_warning("[src]'s door won't budge!")) /obj/machinery/implantchair/MouseDrop_T(mob/target, mob/user) if(user.stat || !Adjacent(user) || !user.Adjacent(target) || !isliving(target) || !user.IsAdvancedToolUser()) diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm index 31b4f7339..64efd1830 100644 --- a/code/game/objects/items/implants/implanter.dm +++ b/code/game/objects/items/implants/implanter.dm @@ -26,25 +26,25 @@ return if(user && imp) if(M != user) - M.visible_message("[user] is attempting to implant [M].") + M.visible_message(span_warning("[user] is attempting to implant [M].")) var/turf/T = get_turf(M) if(T && (M == user || do_mob(user, M, 50))) if(src && imp) if(imp.implant(M, user)) if (M == user) - to_chat(user, "I implant myself.") + to_chat(user, span_notice("I implant myself.")) else - M.visible_message("[user] has implanted [M].", "[user] implants you.") + M.visible_message(span_notice("[user] has implanted [M]."), span_notice("[user] implants you.")) imp = null update_icon() else - to_chat(user, "[src] fails to implant [M].") + to_chat(user, span_warning("[src] fails to implant [M].")) /obj/item/implanter/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pen)) if(!user.is_literate()) - to_chat(user, "I prod at [src] with [W]!") + to_chat(user, span_notice("I prod at [src] with [W]!")) return var/t = stripped_input(user, "What would you like the label to be?", name, null) if(user.get_active_held_item() != W) diff --git a/code/game/objects/items/implants/implantpad.dm b/code/game/objects/items/implants/implantpad.dm index e1019864f..32b31a639 100644 --- a/code/game/objects/items/implants/implantpad.dm +++ b/code/game/objects/items/implants/implantpad.dm @@ -19,10 +19,10 @@ if(Adjacent(user)) . += "It [case ? "contains \a [case]" : "is currently empty"]." if(case) - . += "Alt-click to remove [case]." + . += span_info("Alt-click to remove [case].") else if(case) - . += "There seems to be something inside it, but you can't quite tell what from here..." + . += span_warning("There seems to be something inside it, but you can't quite tell what from here...") /obj/item/implantpad/handle_atom_del(atom/A) if(A == case) @@ -36,7 +36,7 @@ if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return if(!case) - to_chat(user, "There's no implant to remove from [src].") + to_chat(user, span_warning("There's no implant to remove from [src].")) return user.put_in_hands(case) diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm index b6959cbec..86b83ed1d 100644 --- a/code/game/objects/items/inducer.dm +++ b/code/game/objects/items/inducer.dm @@ -47,15 +47,15 @@ /obj/item/inducer/proc/cantbeused(mob/user) if(!user.IsAdvancedToolUser()) - to_chat(user, "I don't have the dexterity to use [src]!") + to_chat(user, span_warning("I don't have the dexterity to use [src]!")) return TRUE if(!cell) - to_chat(user, "[src] doesn't have a power cell installed!") + to_chat(user, span_warning("[src] doesn't have a power cell installed!")) return TRUE if(!cell.charge) - to_chat(user, "[src]'s battery is dead!") + to_chat(user, span_warning("[src]'s battery is dead!")) return TRUE return FALSE @@ -64,12 +64,12 @@ if(W.tool_behaviour == TOOL_SCREWDRIVER) W.play_tool_sound(src) if(!opened) - to_chat(user, "I unscrew the battery compartment.") + to_chat(user, span_notice("I unscrew the battery compartment.")) opened = TRUE update_icon() return else - to_chat(user, "I close the battery compartment.") + to_chat(user, span_notice("I close the battery compartment.")) opened = FALSE update_icon() return @@ -78,12 +78,12 @@ if(!cell) if(!user.transferItemToLoc(W, src)) return - to_chat(user, "I insert [W] into [src].") + to_chat(user, span_notice("I insert [W] into [src].")) cell = W update_icon() return else - to_chat(user, "[src] already has \a [cell] installed!") + to_chat(user, span_warning("[src] already has \a [cell] installed!")) return if(cantbeused(user)) @@ -105,17 +105,17 @@ var/obj/O var/coefficient = 1 if(istype(A, /obj/item/gun/energy)) - to_chat(user, "Error unable to interface with device.") + to_chat(user, span_alert("Error unable to interface with device.")) return FALSE if(istype(A, /obj)) O = A if(C) var/done_any = FALSE if(C.charge >= C.maxcharge) - to_chat(user, "[A] is fully charged!") + to_chat(user, span_notice("[A] is fully charged!")) recharging = FALSE return TRUE - user.visible_message("[user] starts recharging [A] with [src].", "I start recharging [A] with [src].") + user.visible_message(span_notice("[user] starts recharging [A] with [src]."), span_notice("I start recharging [A] with [src].")) while(C.charge < C.maxcharge) if(do_after(user, 10, target = user) && cell.charge) done_any = TRUE @@ -126,7 +126,7 @@ else break if(done_any) // Only show a message if we succeeded at least once - user.visible_message("[user] recharged [A]!", "I recharged [A]!") + user.visible_message(span_notice("[user] recharged [A]!"), span_notice("I recharged [A]!")) recharging = FALSE return TRUE recharging = FALSE @@ -146,7 +146,7 @@ /obj/item/inducer/attack_self(mob/user) if(opened && cell) - user.visible_message("[user] removes [cell] from [src]!", "I remove [cell].") + user.visible_message(span_notice("[user] removes [cell] from [src]!"), span_notice("I remove [cell].")) cell.update_icon() user.put_in_hands(cell) cell = null @@ -156,11 +156,11 @@ /obj/item/inducer/examine(mob/living/M) . = ..() if(cell) - . += "Its display shows: [DisplayEnergy(cell.charge)]." + . += span_notice("Its display shows: [DisplayEnergy(cell.charge)].") else - . += "Its display is dark." + . += span_notice("Its display is dark.") if(opened) - . += "Its battery compartment is open." + . += span_notice("Its battery compartment is open.") /obj/item/inducer/update_icon() cut_overlays() diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 002cb012f..edaa83cb2 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -31,7 +31,7 @@ var/datum/reagent/forkload //used to eat omelette /obj/item/kitchen/fork/suicide_act(mob/living/carbon/user) - user.visible_message("[user] stabs \the [src] into [user.p_their()] chest! It looks like [user.p_theyre()] trying to take a bite out of [user.p_them()]self!") + user.visible_message(span_suicide("[user] stabs \the [src] into [user.p_their()] chest! It looks like [user.p_theyre()] trying to take a bite out of [user.p_them()]self!")) playsound(src, 'sound/blank.ogg', 50, TRUE) return BRUTELOSS @@ -41,10 +41,10 @@ if(forkload) if(M == user) - M.visible_message("[user] eats a delicious forkful of food!") + M.visible_message(span_notice("[user] eats a delicious forkful of food!")) M.reagents.add_reagent(forkload.type, 1) else - M.visible_message("[user] feeds [user] a delicious forkful of food!") + M.visible_message(span_notice("[user] feeds [user] a delicious forkful of food!")) M.reagents.add_reagent(forkload.type, 1) icon_state = "fork" forkload = null @@ -70,7 +70,7 @@ /obj/item/kitchen/fork/plastic/afterattack(mob/living/carbon/user) .=..() if(prob(break_chance)) - user.visible_message("[user]'s fork snaps into tiny pieces in their hand.") + user.visible_message(span_danger("[user]'s fork snaps into tiny pieces in their hand.")) qdel(src) /obj/item/kitchen/knife @@ -105,9 +105,9 @@ return ..() /obj/item/kitchen/knife/suicide_act(mob/user) - user.visible_message(pick("[user] is slitting [user.p_their()] wrists with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.", \ - "[user] is slitting [user.p_their()] throat with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.", \ - "[user] is slitting [user.p_their()] stomach open with the [src.name]! It looks like [user.p_theyre()] trying to commit seppuku.")) + user.visible_message(pick(span_suicide("[user] is slitting [user.p_their()] wrists with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide."), \ + span_suicide("[user] is slitting [user.p_their()] throat with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide."), \ + span_suicide("[user] is slitting [user.p_their()] stomach open with the [src.name]! It looks like [user.p_theyre()] trying to commit seppuku."))) return (BRUTELOSS) /obj/item/kitchen/knife/plastic @@ -128,7 +128,7 @@ /obj/item/kitchen/knife/plastic/afterattack(mob/living/carbon/user) .=..() if(prob(break_chance)) - user.visible_message("[user]'s knife snaps into tiny pieces in their hand.") + user.visible_message(span_danger("[user]'s knife snaps into tiny pieces in their hand.")) qdel(src) /obj/item/kitchen/knife/ritual @@ -204,7 +204,7 @@ armor = list("blunt" = 0, "slash" = 0, "stab" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) /obj/item/kitchen/knife/carrotshiv/suicide_act(mob/living/carbon/user) - user.visible_message("[user] forcefully drives \the [src] into [user.p_their()] eye! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] forcefully drives \the [src] into [user.p_their()] eye! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /obj/item/kitchen/rollingpin @@ -220,7 +220,7 @@ custom_price = 20 /obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /* Trays moved to /obj/item/storage/bag */ @@ -237,5 +237,5 @@ /obj/item/kitchen/knife/plastic/afterattack(mob/living/carbon/user) .=..() if(prob(break_chance)) - user.visible_message("[user]'s spoon snaps into tiny pieces in their hand.") + user.visible_message(span_danger("[user]'s spoon snaps into tiny pieces in their hand.")) qdel(src) diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index c4010a62a..f6dcd6972 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -17,7 +17,7 @@ icon_state = "latexballon_blow" item_state = "latexballon" user.update_inv_hands() - to_chat(user, "I blow up [src] with [tank].") + to_chat(user, span_notice("I blow up [src] with [tank].")) air_contents = tank.remove_air_volume(3) /obj/item/latexballon/proc/burst() diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 5306da360..38614aa55 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -307,7 +307,7 @@ page_link = "Space_Law" /obj/item/book/manual/wiki/security_space_law/suicide_act(mob/living/user) - user.visible_message("[user] pretends to read \the [src] intently... then promptly dies of laughter!") + user.visible_message(span_suicide("[user] pretends to read \the [src] intently... then promptly dies of laughter!")) return OXYLOSS /obj/item/book/manual/wiki/infections @@ -425,7 +425,7 @@ /obj/item/book/manual/wiki/toxins/suicide_act(mob/user) var/mob/living/carbon/human/H = user - user.visible_message("[user] starts dancing to the Rhumba Beat! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] starts dancing to the Rhumba Beat! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(loc, 'sound/blank.ogg', 10, TRUE, -3) if (!QDELETED(H)) H.emote("spin") diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index eec899f5f..13fdd5b8d 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -21,7 +21,7 @@ /obj/item/melee/transforming/energy/suicide_act(mob/user) if(!active) transform_weapon(user, TRUE) - user.visible_message("[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku!") + user.visible_message(span_suicide("[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku!")) return (BRUTELOSS|FIRELOSS) /obj/item/melee/transforming/energy/add_blood_DNA(list/blood_dna) @@ -57,7 +57,7 @@ var/mob/living/carbon/C = user if(C.wear_mask) in_mouth = ", barely missing [C.p_their()] nose" - . = "[user] swings [user.p_their()] [name][in_mouth]. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [A.name] in the process." + . = span_warning("[user] swings [user.p_their()] [name][in_mouth]. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [A.name] in the process.") playsound(loc, pick(hitsound), get_clamped_volume(), TRUE, -1) add_fingerprint(user) @@ -83,7 +83,7 @@ light_color = "#40ceff" /obj/item/melee/transforming/energy/axe/suicide_act(mob/user) - user.visible_message("[user] swings [src] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] swings [src] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")) return (BRUTELOSS|FIRELOSS) /obj/item/melee/transforming/energy/sword @@ -122,7 +122,7 @@ var/obj/item/stock_parts/cell/C = R.cell if(active && !(C.use(hitcost))) attack_self(R) - to_chat(R, "It's out of charge!") + to_chat(R, span_notice("It's out of charge!")) return return ..() @@ -186,13 +186,13 @@ if(!hacked) hacked = TRUE sword_color = "rainbow" - to_chat(user, "RNBW_ENGAGE") + to_chat(user, span_warning("RNBW_ENGAGE")) if(active) icon_state = "swordrainbow" user.update_inv_hands() else - to_chat(user, "It's already fabulous!") + to_chat(user, span_warning("It's already fabulous!")) else return ..() diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index f39dbb5b5..13643c871 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -3,8 +3,8 @@ /obj/item/melee/proc/check_martial_counter(mob/living/carbon/human/target, mob/living/carbon/human/user) if(target.check_block()) - target.visible_message("[target.name] blocks [src] and twists [user]'s arm behind [user.p_their()] back!", - "I block the attack!") + target.visible_message(span_danger("[target.name] blocks [src] and twists [user]'s arm behind [user.p_their()] back!"), + span_danger("I block the attack!")) user.Stun(40) return TRUE @@ -26,7 +26,7 @@ custom_materials = list(/datum/material/iron = 1000) /obj/item/melee/chainofcommand/suicide_act(mob/user) - user.visible_message("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return (OXYLOSS) /obj/item/melee/synthetic_arm_blade @@ -87,7 +87,7 @@ playsound(B, 'sound/blank.ogg', 25, TRUE) /obj/item/melee/sabre/suicide_act(mob/living/user) - user.visible_message("[user] is trying to cut off all [user.p_their()] limbs with [src]! it looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is trying to cut off all [user.p_their()] limbs with [src]! it looks like [user.p_theyre()] trying to commit suicide!")) var/i = 0 ADD_TRAIT(src, TRAIT_NODROP, SABRE_SUICIDE_TRAIT) if(iscarbon(user)) @@ -157,7 +157,7 @@ H.reagents.add_reagent(/datum/reagent/toxin, 4) /obj/item/melee/beesword/suicide_act(mob/living/user) - user.visible_message("[user] is stabbing [user.p_them()]self in the throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is stabbing [user.p_them()]self in the throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(get_turf(src), hitsound, 75, TRUE, -1) return TOXLOSS @@ -218,8 +218,8 @@ /obj/item/melee/classic_baton/proc/get_silicon_stun_description(mob/living/target, mob/living/user) . = list() - .["visible"] = "[user] pulses [target]'s sensors with the baton!" - .["local"] = "I pulse [target]'s sensors with the baton!" + .["visible"] = span_danger("[user] pulses [target]'s sensors with the baton!") + .["local"] = span_danger("I pulse [target]'s sensors with the baton!") return . @@ -336,7 +336,7 @@ var/mob/living/carbon/human/H = user var/obj/item/organ/brain/B = H.getorgan(/obj/item/organ/brain) - user.visible_message("[user] stuffs [src] up [user.p_their()] nose and presses the 'extend' button! It looks like [user.p_theyre()] trying to clear [user.p_their()] mind.") + user.visible_message(span_suicide("[user] stuffs [src] up [user.p_their()] nose and presses the 'extend' button! It looks like [user.p_theyre()] trying to clear [user.p_their()] mind.")) if(!on) src.attack_self(user) else @@ -400,7 +400,7 @@ weight_class_on = WEIGHT_CLASS_NORMAL /obj/item/melee/classic_baton/telescopic/contractor_baton/get_wait_description() - return "The baton is still charging!" + return span_danger("The baton is still charging!") /obj/item/melee/classic_baton/telescopic/contractor_baton/additional_effects_carbon(mob/living/target, mob/living/user) target.Jitter(20) @@ -428,7 +428,7 @@ qdel(shard.countdown) shard.countdown = null START_PROCESSING(SSobj, src) - visible_message("[src] appears, balanced ever so perfectly on its hilt. This isn't ominous at all.") + visible_message(span_warning("[src] appears, balanced ever so perfectly on its hilt. This isn't ominous at all.")) /obj/item/melee/supermatter_sword/process() if(balanced || throwing || ismob(src.loc) || isnull(src.loc)) @@ -462,23 +462,23 @@ balanced = 0 /obj/item/melee/supermatter_sword/ex_act(severity, target) - visible_message("The blast wave smacks into [src] and rapidly flashes to ash.",\ - "I hear a loud crack as you are washed with a wave of heat.") + visible_message(span_danger("The blast wave smacks into [src] and rapidly flashes to ash."),\ + span_hear("I hear a loud crack as you are washed with a wave of heat.")) consume_everything() /obj/item/melee/supermatter_sword/acid_act() - visible_message("The acid smacks into [src] and rapidly flashes to ash.",\ - "I hear a loud crack as you are washed with a wave of heat.") + visible_message(span_danger("The acid smacks into [src] and rapidly flashes to ash."),\ + span_hear("I hear a loud crack as you are washed with a wave of heat.")) consume_everything() /obj/item/melee/supermatter_sword/bullet_act(obj/projectile/P) - visible_message("[P] smacks into [src] and rapidly flashes to ash.",\ - "I hear a loud crack as you are washed with a wave of heat.") + visible_message(span_danger("[P] smacks into [src] and rapidly flashes to ash."),\ + span_hear("I hear a loud crack as you are washed with a wave of heat.")) consume_everything(P) return BULLET_ACT_HIT /obj/item/melee/supermatter_sword/suicide_act(mob/user) - user.visible_message("[user] touches [src]'s blade. It looks like [user.p_theyre()] tired of waiting for the radiation to kill [user.p_them()]!") + user.visible_message(span_suicide("[user] touches [src]'s blade. It looks like [user.p_theyre()] tired of waiting for the radiation to kill [user.p_them()]!")) user.dropItemToGround(src, TRUE) shard.Bumped(user) @@ -496,8 +496,8 @@ if(newT.type == oldtype) return playsound(T, 'sound/blank.ogg', 50, TRUE) - T.visible_message("[T] smacks into [src] and rapidly flashes to ash.",\ - "I hear a loud crack as you are washed with a wave of heat.") + T.visible_message(span_danger("[T] smacks into [src] and rapidly flashes to ash."),\ + span_hear("I hear a loud crack as you are washed with a wave of heat.")) shard.Consume() CALCULATE_ADJACENT_TURFS(T) @@ -522,7 +522,7 @@ if(ishuman(target) && proximity_flag) var/mob/living/carbon/human/H = target H.drop_all_held_items() - H.visible_message("[user] disarms [H]!", "[user] disarmed you!") + H.visible_message(span_danger("[user] disarms [H]!"), span_danger("[user] disarmed you!")) /obj/item/melee/roastingstick name = "advanced roasting stick" @@ -550,7 +550,7 @@ extend(user) else if (held_sausage) - to_chat(user, "I can't retract [src] while [held_sausage] is attached!") + to_chat(user, span_warning("I can't retract [src] while [held_sausage] is attached!")) return retract(user) @@ -561,15 +561,15 @@ ..() if (istype(target, /obj/item/reagent_containers/food/snacks/sausage)) if (!on) - to_chat(user, "I must extend [src] to attach anything to it!") + to_chat(user, span_warning("I must extend [src] to attach anything to it!")) return if (held_sausage) - to_chat(user, "[held_sausage] is already attached to [src]!") + to_chat(user, span_warning("[held_sausage] is already attached to [src]!")) return if (user.transferItemToLoc(target, src)) held_sausage = target else - to_chat(user, "[target] doesn't seem to want to get on [src]!") + to_chat(user, span_warning("[target] doesn't seem to want to get on [src]!")) update_icon() /obj/item/melee/roastingstick/attack_hand(mob/user) @@ -587,13 +587,13 @@ add_overlay(sausage) /obj/item/melee/roastingstick/proc/extend(user) - to_chat(user, "I extend [src].") + to_chat(user, span_warning("I extend [src].")) icon_state = "roastingstick_1" item_state = "nullrod" w_class = WEIGHT_CLASS_BULKY /obj/item/melee/roastingstick/proc/retract(user) - to_chat(user, "I collapse [src].") + to_chat(user, span_notice("I collapse [src].")) icon_state = "roastingstick_0" item_state = null w_class = WEIGHT_CLASS_SMALL @@ -609,14 +609,14 @@ return if (is_type_in_typecache(target, ovens)) if (held_sausage && held_sausage.roasted) - to_chat("My [held_sausage] has already been cooked!") + to_chat(span_warning("My [held_sausage] has already been cooked!")) return if (istype(target, /obj/singularity) && get_dist(user, target) < 10) - to_chat(user, "I send [held_sausage] towards [target].") + to_chat(user, span_notice("I send [held_sausage] towards [target].")) playsound(src, 'sound/blank.ogg', 50, TRUE) beam = user.Beam(target,icon_state="rped_upgrade",time=100) else if (user.Adjacent(target)) - to_chat(user, "I extend [src] towards [target].") + to_chat(user, span_notice("I extend [src] towards [target].")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) else return @@ -627,7 +627,7 @@ playsound(src, 'sound/blank.ogg', 50, TRUE) /obj/item/melee/roastingstick/proc/finish_roasting(user, atom/target) - to_chat(user, "I finish roasting [held_sausage].") + to_chat(user, span_notice("I finish roasting [held_sausage].")) playsound(src,'sound/blank.ogg',50,TRUE) held_sausage.add_atom_colour(rgb(103,63,24), FIXED_COLOUR_PRIORITY) held_sausage.name = "[target.name]-roasted [held_sausage.name]" diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm index 4fd0267f3..efb321ffc 100644 --- a/code/game/objects/items/melee/transforming.dm +++ b/code/game/objects/items/melee/transforming.dm @@ -72,9 +72,9 @@ /obj/item/melee/transforming/proc/transform_messages(mob/living/user, supress_message_text) playsound(user, 'sound/blank.ogg', 35, TRUE) //changed it from 50% volume to 35% because deafness if(!supress_message_text) - to_chat(user, "[src] [active ? "is now active":"can now be concealed"].") + to_chat(user, span_notice("[src] [active ? "is now active":"can now be concealed"].")) /obj/item/melee/transforming/proc/clumsy_transform_effect(mob/living/user) if(clumsy_check && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) - to_chat(user, "I accidentally cut myself with [src], like a doofus!") + to_chat(user, span_warning("I accidentally cut myself with [src], like a doofus!")) user.take_bodypart_damage(5,5) diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index f11b6bcfb..4188e15f8 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -47,7 +47,7 @@ if(!uses) qdel(src) else - to_chat(M, "[uses] use[uses > 1 ? "s" : ""] remaining on the [src].") + to_chat(M, span_notice("[uses] use[uses > 1 ? "s" : ""] remaining on the [src].")) /obj/item/choice_beacon/proc/spawn_option(obj/choice,mob/living/M) var/obj/new_item = new choice() @@ -129,7 +129,7 @@ /obj/item/choice_beacon/augments/spawn_option(obj/choice,mob/living/M) new choice(get_turf(M)) - to_chat(M, "I hear something crackle from the beacon for a moment before a voice speaks. \"Please stand by for a message from S.E.L.F. Message as follows: Item request received. Your package has been transported, use the autosurgeon supplied to apply the upgrade. Message ends.\"") + to_chat(M, span_hear("I hear something crackle from the beacon for a moment before a voice speaks. \"Please stand by for a message from S.E.L.F. Message as follows: Item request received. Your package has been transported, use the autosurgeon supplied to apply the upgrade. Message ends.\"")) /obj/item/skub desc = "" @@ -140,7 +140,7 @@ attack_verb = list("skubbed") /obj/item/skub/suicide_act(mob/living/user) - user.visible_message("[user] has declared themself as anti-skub! The skub tears them apart!") + user.visible_message(span_suicide("[user] has declared themself as anti-skub! The skub tears them apart!")) user.gib() playsound(src, 'sound/blank.ogg', 50, TRUE, -1) diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index 9ae6d0e06..f6d12bb39 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -39,7 +39,7 @@ return if(reagents.total_volume < 1) - to_chat(user, "My mop is dry!") + to_chat(user, span_warning("My mop is dry!")) return var/turf/T = get_turf(A) @@ -48,10 +48,10 @@ return if(T) - user.visible_message("[user] begins to clean \the [T] with [src].", "I begin to clean \the [T] with [src]...") + user.visible_message(span_notice("[user] begins to clean \the [T] with [src]."), span_notice("I begin to clean \the [T] with [src]...")) if(do_after(user, src.mopspeed, target = T)) - to_chat(user, "I finish mopping.") + to_chat(user, span_notice("I finish mopping.")) clean(T) @@ -68,7 +68,7 @@ J.mymop=src J.update_icon() else - to_chat(user, "I are unable to fit my [name] into the [J.name].") + to_chat(user, span_warning("I are unable to fit my [name] into the [J.name].")) return /obj/item/mop/cyborg @@ -100,7 +100,7 @@ START_PROCESSING(SSobj, src) else STOP_PROCESSING(SSobj,src) - to_chat(user, "I set the condenser switch to the '[refill_enabled ? "ON" : "OFF"]' position.") + to_chat(user, span_notice("I set the condenser switch to the '[refill_enabled ? "ON" : "OFF"]' position.")) playsound(user, 'sound/blank.ogg', 30, TRUE) /obj/item/mop/advanced/process() @@ -110,7 +110,7 @@ /obj/item/mop/advanced/examine(mob/user) . = ..() - . += "The condenser switch is set to [refill_enabled ? "ON" : "OFF"]." + . += span_notice("The condenser switch is set to [refill_enabled ? "ON" : "OFF"].") /obj/item/mop/advanced/Destroy() if(refill_enabled) diff --git a/code/game/objects/items/paiwire.dm b/code/game/objects/items/paiwire.dm index 334c2aafb..64d96c762 100644 --- a/code/game/objects/items/paiwire.dm +++ b/code/game/objects/items/paiwire.dm @@ -9,5 +9,5 @@ /obj/item/pai_cable/proc/plugin(obj/machinery/M, mob/living/user) if(!user.transferItemToLoc(src, M)) return - user.visible_message("[user] inserts [src] into a data port on [M].", "I insert [src] into a data port on [M].", "I hear the satisfying click of a wire jack fastening into place.") + user.visible_message(span_notice("[user] inserts [src] into a data port on [M]."), span_notice("I insert [src] into a data port on [M]."), span_hear("I hear the satisfying click of a wire jack fastening into place.")) machine = M diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index 9b7970e53..22f7f63ff 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -47,24 +47,24 @@ if(occupants.len) for(var/V in occupants) var/mob/living/L = V - . += "It has [L] inside." + . += span_notice("It has [L] inside.") else - . += "It has nothing inside." + . += span_notice("It has nothing inside.") if(user.canUseTopic(src)) - . += "Activate it in your hand to [open ? "close" : "open"] its door." + . += span_notice("Activate it in your hand to [open ? "close" : "open"] its door.") if(!open) - . += "Alt-click to [locked ? "unlock" : "lock"] its door." + . += span_notice("Alt-click to [locked ? "unlock" : "lock"] its door.") /obj/item/pet_carrier/attack_self(mob/living/user) if(open) - to_chat(user, "I close [src]'s door.") + to_chat(user, span_notice("I close [src]'s door.")) playsound(user, 'sound/blank.ogg', 50, TRUE) open = FALSE else if(locked) - to_chat(user, "[src] is locked!") + to_chat(user, span_warning("[src] is locked!")) return - to_chat(user, "I open [src]'s door.") + to_chat(user, span_notice("I open [src]'s door.")) playsound(user, 'sound/blank.ogg', 50, TRUE) open = TRUE update_icon() @@ -73,7 +73,7 @@ if(open || !user.canUseTopic(src, BE_CLOSE)) return locked = !locked - to_chat(user, "I flip the lock switch [locked ? "down" : "up"].") + to_chat(user, span_notice("I flip the lock switch [locked ? "down" : "up"].")) if(locked) playsound(user, 'sound/blank.ogg', 30, TRUE) else @@ -84,32 +84,32 @@ if(user.used_intent.type == INTENT_HARM) return ..() if(!open) - to_chat(user, "I need to open [src]'s door!") + to_chat(user, span_warning("I need to open [src]'s door!")) return if(target.mob_size > max_occupant_weight) if(ishuman(target)) var/mob/living/carbon/human/H = target if(isfelinid(H)) - to_chat(user, "You'd need a lot of catnip and treats, plus maybe a laser pointer, for that to work.") + to_chat(user, span_warning("You'd need a lot of catnip and treats, plus maybe a laser pointer, for that to work.")) else - to_chat(user, "Humans, generally, do not fit into pet carriers.") + to_chat(user, span_warning("Humans, generally, do not fit into pet carriers.")) else - to_chat(user, "I get the feeling [target] isn't meant for a [name].") + to_chat(user, span_warning("I get the feeling [target] isn't meant for a [name].")) return if(user == target) - to_chat(user, "Why would you ever do that?") + to_chat(user, span_warning("Why would you ever do that?")) return load_occupant(user, target) /obj/item/pet_carrier/relaymove(mob/living/user, direction) if(open) - loc.visible_message("[user] climbs out of [src]!", \ - "[user] jumps out of [src]!") + loc.visible_message(span_notice("[user] climbs out of [src]!"), \ + span_warning("[user] jumps out of [src]!")) remove_occupant(user) return else if(!locked) - loc.visible_message("[user] pushes open the door to [src]!", \ - "[user] pushes open the door of [src]!") + loc.visible_message(span_notice("[user] pushes open the door to [src]!"), \ + span_warning("[user] pushes open the door of [src]!")) open = TRUE update_icon() return @@ -120,22 +120,22 @@ user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT if(user.mob_size <= MOB_SIZE_SMALL) - to_chat(user, "I poke a limb through [src]'s bars and start fumbling for the lock switch... (This will take some time.)") - to_chat(loc, "I see [user] reach through the bars and fumble for the lock switch!") + to_chat(user, span_notice("I poke a limb through [src]'s bars and start fumbling for the lock switch... (This will take some time.)")) + to_chat(loc, span_warning("I see [user] reach through the bars and fumble for the lock switch!")) if(!do_after(user, rand(300, 400), target = user) || open || !locked || !(user in occupants)) return - loc.visible_message("[user] flips the lock switch on [src] by reaching through!", null, null, null, user) - to_chat(user, "Bingo! The lock pops open!") + loc.visible_message(span_warning("[user] flips the lock switch on [src] by reaching through!"), null, null, null, user) + to_chat(user, span_boldannounce("Bingo! The lock pops open!")) locked = FALSE playsound(src, 'sound/blank.ogg', 30, TRUE) update_icon() else - loc.visible_message("[src] starts rattling as something pushes against the door!", null, null, null, user) - to_chat(user, "I start pushing out of [src]... (This will take about 20 seconds.)") + loc.visible_message(span_warning("[src] starts rattling as something pushes against the door!"), null, null, null, user) + to_chat(user, span_notice("I start pushing out of [src]... (This will take about 20 seconds.)")) if(!do_after(user, 200, target = user) || open || !locked || !(user in occupants)) return - loc.visible_message("[user] shoves out of [src]!", null, null, null, user) - to_chat(user, "I shove open [src]'s door against the lock's resistance and fall out!") + loc.visible_message(span_warning("[user] shoves out of [src]!"), null, null, null, user) + to_chat(user, span_notice("I shove open [src]'s door against the lock's resistance and fall out!")) locked = FALSE open = TRUE update_icon() @@ -153,28 +153,28 @@ /obj/item/pet_carrier/MouseDrop(atom/over_atom) . = ..() if(isopenturf(over_atom) && usr.canUseTopic(src, BE_CLOSE, ismonkey(usr)) && usr.Adjacent(over_atom) && open && occupants.len) - usr.visible_message("[usr] unloads [src].", \ - "I unload [src] onto [over_atom].") + usr.visible_message(span_notice("[usr] unloads [src]."), \ + span_notice("I unload [src] onto [over_atom].")) for(var/V in occupants) remove_occupant(V, over_atom) /obj/item/pet_carrier/proc/load_occupant(mob/living/user, mob/living/target) if(pet_carrier_full(src)) - to_chat(user, "[src] is already carrying too much!") + to_chat(user, span_warning("[src] is already carrying too much!")) return - user.visible_message("[user] starts loading [target] into [src].", \ - "I start loading [target] into [src]...", null, null, target) - to_chat(target, "[user] starts loading you into [user.p_their()] [name]!") + user.visible_message(span_notice("[user] starts loading [target] into [src]."), \ + span_notice("I start loading [target] into [src]..."), null, null, target) + to_chat(target, span_danger("[user] starts loading you into [user.p_their()] [name]!")) if(!do_mob(user, target, 30)) return if(target in occupants) return if(pet_carrier_full(src)) //Run the checks again, just in case - to_chat(user, "[src] is already carrying too much!") + to_chat(user, span_warning("[src] is already carrying too much!")) return - user.visible_message("[user] loads [target] into [src]!", \ - "I load [target] into [src].", null, null, target) - to_chat(target, "[user] loads you into [user.p_their()] [name]!") + user.visible_message(span_notice("[user] loads [target] into [src]!"), \ + span_notice("I load [target] into [src]."), null, null, target) + to_chat(target, span_danger("[user] loads you into [user.p_their()] [name]!")) add_occupant(target) /obj/item/pet_carrier/proc/add_occupant(mob/living/occupant) diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index b84785c59..c33e5ae8e 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -36,7 +36,7 @@ if(!process_scan) //since it's not scanning on process, it scans here. scan_for_target() toggle_on() - user.visible_message("[user] [active ? "" : "de"]activates [user.p_their()] pinpointer.", "I [active ? "" : "de"]activate my pinpointer.") + user.visible_message(span_notice("[user] [active ? "" : "de"]activates [user.p_their()] pinpointer."), span_notice("I [active ? "" : "de"]activate my pinpointer.")) /obj/item/pinpointer/proc/toggle_on() active = !active @@ -107,14 +107,14 @@ /obj/item/pinpointer/crew/attack_self(mob/living/user) if(active) toggle_on() - user.visible_message("[user] deactivates [user.p_their()] pinpointer.", "I deactivate my pinpointer.") + user.visible_message(span_notice("[user] deactivates [user.p_their()] pinpointer."), span_notice("I deactivate my pinpointer.")) return if (has_owner && !pinpointer_owner) pinpointer_owner = user if (pinpointer_owner && pinpointer_owner != user) - to_chat(user, "The pinpointer doesn't respond. It seems to only recognise its owner.") + to_chat(user, span_notice("The pinpointer doesn't respond. It seems to only recognise its owner.")) return var/list/name_counts = list() @@ -138,7 +138,7 @@ name_counts[crewmember_name] = 1 if(!names.len) - user.visible_message("[user]'s pinpointer fails to detect a signal.", "My pinpointer fails to detect a signal.") + user.visible_message(span_notice("[user]'s pinpointer fails to detect a signal."), span_notice("My pinpointer fails to detect a signal.")) return var/A = input(user, "Person to track", "Pinpoint") in sortList(names) @@ -147,7 +147,7 @@ target = names[A] toggle_on() - user.visible_message("[user] activates [user.p_their()] pinpointer.", "I activate my pinpointer.") + user.visible_message(span_notice("[user] activates [user.p_their()] pinpointer."), span_notice("I activate my pinpointer.")) /obj/item/pinpointer/crew/scan_for_target() if(target) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 90ffa7a07..d508fe3fc 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -106,25 +106,25 @@ /obj/item/toy/plush/attack_self(mob/user) . = ..() if(stuffed || grenade) - to_chat(user, "I pet [src]. D'awww.") + to_chat(user, span_notice("I pet [src]. D'awww.")) if(grenade && !grenade.active) log_game("[key_name(user)] activated a hidden grenade in [src].") grenade.preprime(user, msg = FALSE, volume = 10) else - to_chat(user, "I try to pet [src], but it has no stuffing. Aww...") + to_chat(user, span_notice("I try to pet [src], but it has no stuffing. Aww...")) /obj/item/toy/plush/attackby(obj/item/I, mob/living/user, params) if(I.get_sharpness()) if(!grenade) if(!stuffed) - to_chat(user, "I already murdered it!") + to_chat(user, span_warning("I already murdered it!")) return if(!divine) - user.visible_message("[user] tears out the stuffing from [src]!", "I rip a bunch of the stuffing from [src]. Murderer.") + user.visible_message(span_notice("[user] tears out the stuffing from [src]!"), span_notice("I rip a bunch of the stuffing from [src]. Murderer.")) I.play_tool_sound(src) stuffed = FALSE else - to_chat(user, "What a fool you are. [src] is a god, how can you kill a god? What a grand and intoxicating innocence.") + to_chat(user, span_notice("What a fool you are. [src] is a god, how can you kill a god? What a grand and intoxicating innocence.")) if(iscarbon(user)) var/mob/living/carbon/C = user if(C.drunkenness < 50) @@ -132,27 +132,27 @@ var/turf/current_location = get_turf(user) var/area/current_area = current_location.loc //copied from hand tele code if(current_location && current_area && current_area.noteleport) - to_chat(user, "There is no escape. No recall or intervention can work in this place.") + to_chat(user, span_notice("There is no escape. No recall or intervention can work in this place.")) else - to_chat(user, "There is no escape. Although recall or intervention can work in this place, attempting to flee from [src]'s immense power would be futile.") - user.visible_message("[user] lays down their weapons and begs for [src]'s mercy!", "I lay down your weapons and beg for [src]'s mercy.") + to_chat(user, span_notice("There is no escape. Although recall or intervention can work in this place, attempting to flee from [src]'s immense power would be futile.")) + user.visible_message(span_notice("[user] lays down their weapons and begs for [src]'s mercy!"), span_notice("I lay down your weapons and beg for [src]'s mercy.")) user.drop_all_held_items() else - to_chat(user, "I remove the grenade from [src].") + to_chat(user, span_notice("I remove the grenade from [src].")) user.put_in_hands(grenade) grenade = null return if(istype(I, /obj/item/grenade)) if(stuffed) - to_chat(user, "I need to remove some stuffing first!") + to_chat(user, span_warning("I need to remove some stuffing first!")) return if(grenade) - to_chat(user, "[src] already has a grenade!") + to_chat(user, span_warning("[src] already has a grenade!")) return if(!user.transferItemToLoc(I, src)) return - user.visible_message("[user] slides [grenade] into [src].", \ - "I slide [I] into [src].") + user.visible_message(span_warning("[user] slides [grenade] into [src]."), \ + span_danger("I slide [I] into [src].")) grenade = I var/turf/grenade_turf = get_turf(src) log_game("[key_name(user)] added a grenade ([I.name]) to [src] at [AREACOORD(grenade_turf)].") @@ -170,19 +170,19 @@ //we are not catholic if(young == TRUE || Kisser.young == TRUE) - user.show_message("[src] plays tag with [Kisser].", MSG_VISUAL, - "They're happy.", NONE) + user.show_message(span_notice("[src] plays tag with [Kisser]."), MSG_VISUAL, + span_notice("They're happy."), NONE) Kisser.cheer_up() cheer_up() //never again else if(Kisser in scorned) //message, visible, alternate message, neither visible nor audible - user.show_message("[src] rejects the advances of [Kisser]!", MSG_VISUAL, - "That didn't feel like it worked.", NONE) + user.show_message(span_notice("[src] rejects the advances of [Kisser]!"), MSG_VISUAL, + span_notice("That didn't feel like it worked."), NONE) else if(src in Kisser.scorned) - user.show_message("[Kisser] realises who [src] is and turns away.", MSG_VISUAL, - "That didn't feel like it worked.", NONE) + user.show_message(span_notice("[Kisser] realises who [src] is and turns away."), MSG_VISUAL, + span_notice("That didn't feel like it worked."), NONE) //first comes love else if(Kisser.lover != src && Kisser.partner != src) //cannot be lovers or married @@ -195,39 +195,39 @@ chance -= duty //do we mate for life? if(prob(chance)) //did we bag a date? - user.visible_message("[user] makes [Kisser] kiss [src]!", - "I make [Kisser] kiss [src]!") + user.visible_message(span_notice("[user] makes [Kisser] kiss [src]!"), + span_notice("I make [Kisser] kiss [src]!")) if(lover) //who cares for the past, we live in the present lover.heartbreak(src) new_lover(Kisser) Kisser.new_lover(src) else - user.show_message("[src] rejects the advances of [Kisser], maybe next time?", MSG_VISUAL, - "That didn't feel like it worked, this time.", NONE) + user.show_message(span_notice("[src] rejects the advances of [Kisser], maybe next time?"), MSG_VISUAL, + span_notice("That didn't feel like it worked, this time."), NONE) //then comes marriage else if(Kisser.lover == src && Kisser.partner != src) //need to be lovers (assumes loving is a two way street) but not married (also assumes similar) - user.visible_message("[user] pronounces [Kisser] and [src] married! D'aw.", - "I pronounce [Kisser] and [src] married!") + user.visible_message(span_notice("[user] pronounces [Kisser] and [src] married! D'aw."), + span_notice("I pronounce [Kisser] and [src] married!")) new_partner(Kisser) Kisser.new_partner(src) //then comes a baby in a baby's carriage, or an adoption in an adoption's orphanage else if(Kisser.partner == src && !plush_child) //the one advancing does not take ownership of the child and we have a one child policy in the toyshop - user.visible_message("[user] is going to break [Kisser] and [src] by bashing them like that.", - "[Kisser] passionately embraces [src] in your hands. Look away you perv!") + user.visible_message(span_notice("[user] is going to break [Kisser] and [src] by bashing them like that."), + span_notice("[Kisser] passionately embraces [src] in your hands. Look away you perv!")) if(plop(Kisser)) - user.visible_message("Something drops at the feet of [user].", - "The miracle of oh god did that just come out of [src]?!") + user.visible_message(span_notice("Something drops at the feet of [user]."), + span_notice("The miracle of oh god did that just come out of [src]?!")) //then comes protection, or abstinence if we are catholic else if(Kisser.partner == src && plush_child) - user.visible_message("[user] makes [Kisser] nuzzle [src]!", - "I make [Kisser] nuzzle [src]!") + user.visible_message(span_notice("[user] makes [Kisser] nuzzle [src]!"), + span_notice("I make [Kisser] nuzzle [src]!")) //then oh fuck something unexpected happened else - user.show_message("[Kisser] and [src] don't know what to do with one another.", NONE) + user.show_message(span_warning("[Kisser] and [src] don't know what to do with one another."), NONE) /obj/item/toy/plush/proc/heartbreak(obj/item/toy/plush/Brutus) if(lover != Brutus) @@ -421,7 +421,7 @@ clash_target = null return if(!Adjacent(P)) - visible_message("The two plushies angrily flail at each other before giving up.") + visible_message(span_warning("The two plushies angrily flail at each other before giving up.")) clash_target = null P.clashing = FALSE return diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 2976e7faa..508ac16e8 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -60,13 +60,13 @@ . = ..() var/list/out = list() if(!in_range(user, src)) - out += "You'll need to get closer to see any more." + out += span_notice("You'll need to get closer to see any more.") return for(var/obj/item/I in loadedItems) - out += "[icon2html(I, user)] It has \a [I] loaded." + out += span_info("[icon2html(I, user)] It has \a [I] loaded.") CHECK_TICK if(tank) - out += "[icon2html(tank, user)] It has \a [tank] mounted onto it." + out += span_notice("[icon2html(tank, user)] It has \a [tank] mounted onto it.") . += out.Join("\n") /obj/item/pneumatic_cannon/attackby(obj/item/W, mob/user, params) @@ -76,11 +76,11 @@ if(!tank) var/obj/item/tank/internals/IT = W if(IT.volume <= 3) - to_chat(user, "\The [IT] is too small for \the [src].") + to_chat(user, span_warning("\The [IT] is too small for \the [src].")) return updateTank(W, 0, user) else if(W.type == type) - to_chat(user, "You're fairly certain that putting a pneumatic cannon inside another pneumatic cannon would cause a spacetime disruption.") + to_chat(user, span_warning("You're fairly certain that putting a pneumatic cannon inside another pneumatic cannon would cause a spacetime disruption.")) else if(W.tool_behaviour == TOOL_WRENCH) switch(pressureSetting) if(1) @@ -89,12 +89,12 @@ pressureSetting = 3 if(3) pressureSetting = 1 - to_chat(user, "I tweak \the [src]'s pressure output to [pressureSetting].") + to_chat(user, span_notice("I tweak \the [src]'s pressure output to [pressureSetting].")) else if(W.tool_behaviour == TOOL_SCREWDRIVER) if(tank) updateTank(tank, 1, user) else if(loadedWeightClass >= maxWeightClass) - to_chat(user, "\The [src] can't hold any more items!") + to_chat(user, span_warning("\The [src] can't hold any more items!")) else if(isitem(W)) var/obj/item/IW = W load_item(IW, user) @@ -104,15 +104,15 @@ return TRUE if(allowed_typecache && !is_type_in_typecache(I, allowed_typecache)) if(user) - to_chat(user, "[I] won't fit into [src]!") + to_chat(user, span_warning("[I] won't fit into [src]!")) return if((loadedWeightClass + I.w_class) > maxWeightClass) //Only make messages if there's a user if(user) - to_chat(user, "\The [I] won't fit into \the [src]!") + to_chat(user, span_warning("\The [I] won't fit into \the [src]!")) return FALSE if(I.w_class > w_class) if(user) - to_chat(user, "\The [I] is too large to fit into \the [src]!") + to_chat(user, span_warning("\The [I] is too large to fit into \the [src]!")) return FALSE return TRUE @@ -122,7 +122,7 @@ if(user) //Only use transfer proc if there's a user, otherwise just set loc. if(!user.transferItemToLoc(I, src)) return FALSE - to_chat(user, "I load \the [I] into \the [src].") + to_chat(user, span_notice("I load \the [I] into \the [src].")) else I.forceMove(src) loadedItems += I @@ -147,17 +147,17 @@ if(!can_trigger_gun(user)) return if(!loadedItems || !loadedWeightClass) - to_chat(user, "\The [src] has nothing loaded.") + to_chat(user, span_warning("\The [src] has nothing loaded.")) return if(!tank && checktank) - to_chat(user, "\The [src] can't fire without a source of gas.") + to_chat(user, span_warning("\The [src] can't fire without a source of gas.")) return if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting)) - to_chat(user, "\The [src] lets out a weak hiss and doesn't react!") + to_chat(user, span_warning("\The [src] lets out a weak hiss and doesn't react!")) return if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(75) && clumsyCheck && iscarbon(user)) var/mob/living/carbon/C = user - C.visible_message("[C] loses [C.p_their()] grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!") + C.visible_message(span_warning("[C] loses [C.p_their()] grip on [src], causing it to go off!"), span_danger("[src] slips out of your hands and goes off!")) C.dropItemToGround(src, TRUE) if(prob(10)) target = get_turf(user) @@ -166,15 +166,15 @@ target = pick(possible_targets) discharge = 1 if(!discharge) - user.visible_message("[user] fires \the [src]!", \ - "I fire \the [src]!") + user.visible_message(span_danger("[user] fires \the [src]!"), \ + span_danger("I fire \the [src]!")) log_combat(user, target, "fired at", src) var/turf/T = get_target(target, get_turf(src)) playsound(src, fire_sound, 50, TRUE) fire_items(T, user) if(pressureSetting >= 3 && iscarbon(user)) var/mob/living/carbon/C = user - C.visible_message("[C] is thrown down by the force of the cannon!", "[src] slams into your shoulder, knocking you down!") + C.visible_message(span_warning("[C] is thrown down by the force of the cannon!"), "[src] slams into your shoulder, knocking you down!") C.Paralyze(60) /obj/item/pneumatic_cannon/proc/fire_items(turf/target, mob/user) @@ -240,17 +240,17 @@ if(removing) if(!tank) return - to_chat(user, "I detach \the [thetank] from \the [src].") + to_chat(user, span_notice("I detach \the [thetank] from \the [src].")) tank.forceMove(user.drop_location()) user.put_in_hands(tank) tank = null if(!removing) if(tank) - to_chat(user, "\The [src] already has a tank.") + to_chat(user, span_warning("\The [src] already has a tank.")) return if(!user.transferItemToLoc(thetank, src)) return - to_chat(user, "I hook \the [thetank] up to \the [src].") + to_chat(user, span_notice("I hook \the [thetank] up to \the [src].")) tank = thetank update_icon() diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm index 17c881dc0..56ebaa3ad 100644 --- a/code/game/objects/items/powerfist.dm +++ b/code/game/objects/items/powerfist.dm @@ -22,10 +22,10 @@ /obj/item/melee/powerfist/examine(mob/user) . = ..() if(!in_range(user, src)) - . += "You'll need to get closer to see any more." + . += span_notice("You'll need to get closer to see any more.") return if(tank) - . += "[icon2html(tank, user)] It has \a [tank] mounted onto it." + . += span_notice("[icon2html(tank, user)] It has \a [tank] mounted onto it.") /obj/item/melee/powerfist/attackby(obj/item/W, mob/user, params) @@ -33,7 +33,7 @@ if(!tank) var/obj/item/tank/internals/IT = W if(IT.volume <= 3) - to_chat(user, "\The [IT] is too small for \the [src].") + to_chat(user, span_warning("\The [IT] is too small for \the [src].")) return updateTank(W, 0, user) else if(W.tool_behaviour == TOOL_WRENCH) @@ -45,7 +45,7 @@ if(3) fisto_setting = 1 W.play_tool_sound(src) - to_chat(user, "I tweak \the [src]'s piston valve to [fisto_setting].") + to_chat(user, span_notice("I tweak \the [src]'s piston valve to [fisto_setting].")) else if(W.tool_behaviour == TOOL_SCREWDRIVER) if(tank) updateTank(tank, 1, user) @@ -53,25 +53,25 @@ /obj/item/melee/powerfist/proc/updateTank(obj/item/tank/internals/thetank, removing = 0, mob/living/carbon/human/user) if(removing) if(!tank) - to_chat(user, "\The [src] currently has no tank attached to it.") + to_chat(user, span_notice("\The [src] currently has no tank attached to it.")) return - to_chat(user, "I detach \the [thetank] from \the [src].") + to_chat(user, span_notice("I detach \the [thetank] from \the [src].")) tank.forceMove(get_turf(user)) user.put_in_hands(tank) tank = null if(!removing) if(tank) - to_chat(user, "\The [src] already has a tank.") + to_chat(user, span_warning("\The [src] already has a tank.")) return if(!user.transferItemToLoc(thetank, src)) return - to_chat(user, "I hook \the [thetank] up to \the [src].") + to_chat(user, span_notice("I hook \the [thetank] up to \the [src].")) tank = thetank /obj/item/melee/powerfist/attack(mob/living/target, mob/living/user) if(!tank) - to_chat(user, "\The [src] can't operate without a source of gas!") + to_chat(user, span_warning("\The [src] can't operate without a source of gas!")) return var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting) var/turf/T = get_turf(src) @@ -80,22 +80,22 @@ T.assume_air(gasused) T.air_update_turf() if(!gasused) - to_chat(user, "\The [src]'s tank is empty!") + to_chat(user, span_warning("\The [src]'s tank is empty!")) target.apply_damage((force / 5), BRUTE) playsound(loc, 'sound/blank.ogg', 50, TRUE) - target.visible_message("[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!", \ - "[user]'s punches you!") + target.visible_message(span_danger("[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!"), \ + span_danger("[user]'s punches you!")) return if(gasused.total_moles() < gasperfist * fisto_setting) - to_chat(user, "\The [src]'s piston-ram lets out a weak hiss, it needs more gas!") + to_chat(user, span_warning("\The [src]'s piston-ram lets out a weak hiss, it needs more gas!")) playsound(loc, 'sound/blank.ogg', 50, TRUE) target.apply_damage((force / 2), BRUTE) - target.visible_message("[user]'s powerfist lets out a weak hiss as [user.p_they()] punch[user.p_es()] [target.name]!", \ - "[user]'s punch strikes with force!") + target.visible_message(span_danger("[user]'s powerfist lets out a weak hiss as [user.p_they()] punch[user.p_es()] [target.name]!"), \ + span_danger("[user]'s punch strikes with force!")) return target.apply_damage(force * fisto_setting, BRUTE) - target.visible_message("[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!", \ - "I cry out in pain as [user]'s punch flings you backwards!") + target.visible_message(span_danger("[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!"), \ + span_danger("I cry out in pain as [user]'s punch flings you backwards!")) new /obj/effect/temp_visual/kinetic_blast(target.loc) playsound(loc, 'sound/blank.ogg', 50, TRUE) playsound(loc, 'sound/blank.ogg', 50, TRUE) diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 18d4b82a8..22d812dac 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -18,16 +18,16 @@ /obj/item/banner/examine(mob/user) . = ..() if(inspiration_available) - . += "Activate it in my hand to inspire nearby allies of this banner's allegiance!" + . += span_notice("Activate it in my hand to inspire nearby allies of this banner's allegiance!") /obj/item/banner/attack_self(mob/living/carbon/human/user) if(!inspiration_available) return if(morale_time > world.time) - to_chat(user, "I aren't feeling inspired enough to flourish [src] again yet.") + to_chat(user, span_warning("I aren't feeling inspired enough to flourish [src] again yet.")) return - user.visible_message("[user] flourishes [src]!", \ - "I raise [src] skywards, inspiring my allies!") + user.visible_message(span_bignotice("[user] flourishes [src]!"), \ + span_notice("I raise [src] skywards, inspiring my allies!")) playsound(src, "rustle", 100, FALSE) if(warcry) user.say("[warcry]", forced="banner") @@ -54,7 +54,7 @@ for(var/V in inspired) var/mob/living/carbon/human/H = V if(H != user) - to_chat(H, "My confidence surges as [user] flourishes [user.p_their()] [name]!") + to_chat(H, span_notice("My confidence surges as [user] flourishes [user.p_their()] [name]!")) inspiration(H) special_inspiration(H) @@ -308,7 +308,7 @@ . = ..() if(staffcooldown + staffwait > world.time) return - user.visible_message("[user] chants deeply and waves [user.p_their()] staff!") + user.visible_message(span_notice("[user] chants deeply and waves [user.p_their()] staff!")) if(do_after(user, 20,1,src)) target.add_atom_colour(conversion_color, WASHABLE_COLOUR_PRIORITY) //wololo staffcooldown = world.time diff --git a/code/game/objects/items/robot/ai_upgrades.dm b/code/game/objects/items/robot/ai_upgrades.dm index e045c355a..2ca208ea1 100644 --- a/code/game/objects/items/robot/ai_upgrades.dm +++ b/code/game/objects/items/robot/ai_upgrades.dm @@ -17,15 +17,15 @@ return if(AI.malf_picker) AI.malf_picker.processing_time += 50 - to_chat(AI, "[user] has attempted to upgrade you with combat software that you already possess. You gain 50 points to spend on Malfunction Modules instead.") + to_chat(AI, span_danger("[user] has attempted to upgrade you with combat software that you already possess. You gain 50 points to spend on Malfunction Modules instead.")) else - to_chat(AI, "[user] has upgraded you with combat software!") - to_chat(AI, "My current laws and objectives remain unchanged.") //this unlocks malf powers, but does not give the license to plasma flood + to_chat(AI, span_danger("[user] has upgraded you with combat software!")) + to_chat(AI, span_danger("My current laws and objectives remain unchanged.")) //this unlocks malf powers, but does not give the license to plasma flood AI.add_malf_picker() AI.hack_software = TRUE log_game("[key_name(user)] has upgraded [key_name(AI)] with a [src].") message_admins("[ADMIN_LOOKUPFLW(user)] has upgraded [ADMIN_LOOKUPFLW(AI)] with a [src].") - to_chat(user, "I upgrade [AI]. [src] is consumed in the process.") + to_chat(user, span_notice("I upgrade [AI]. [src] is consumed in the process.")) qdel(src) @@ -44,9 +44,9 @@ return if(AI.eyeobj) AI.eyeobj.relay_speech = TRUE - to_chat(AI, "[user] has upgraded you with surveillance software!") + to_chat(AI, span_danger("[user] has upgraded you with surveillance software!")) to_chat(AI, "Via a combination of hidden microphones and lip reading software, you are able to use my cameras to listen in on conversations.") - to_chat(user, "I upgrade [AI]. [src] is consumed in the process.") + to_chat(user, span_notice("I upgrade [AI]. [src] is consumed in the process.")) log_game("[key_name(user)] has upgraded [key_name(AI)] with a [src].") message_admins("[ADMIN_LOOKUPFLW(user)] has upgraded [ADMIN_LOOKUPFLW(AI)] with a [src].") qdel(src) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 59b7f65c1..7c59b42f4 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -25,8 +25,8 @@ M.Paralyze(100) M.apply_effect(EFFECT_STUTTER, 5) - M.visible_message("[user] has prodded [M] with [src]!", \ - "[user] has prodded you with [src]!") + M.visible_message(span_danger("[user] has prodded [M] with [src]!"), \ + span_danger("[user] has prodded you with [src]!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) @@ -71,58 +71,58 @@ if(0) if(M.health >= 0) if(user.zone_selected == BODY_ZONE_HEAD) - user.visible_message("[user] playfully boops [M] on the head!", \ - "I playfully boop [M] on the head!") + user.visible_message(span_notice("[user] playfully boops [M] on the head!"), \ + span_notice("I playfully boop [M] on the head!")) user.do_attack_animation(M, ATTACK_EFFECT_BOOP) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) else if(ishuman(M)) if(!(user.mobility_flags & MOBILITY_STAND)) - user.visible_message("[user] shakes [M] trying to get [M.p_them()] up!", \ - "I shake [M] trying to get [M.p_them()] up!") + user.visible_message(span_notice("[user] shakes [M] trying to get [M.p_them()] up!"), \ + span_notice("I shake [M] trying to get [M.p_them()] up!")) else - user.visible_message("[user] hugs [M] to make [M.p_them()] feel better!", \ - "I hug [M] to make [M.p_them()] feel better!") + user.visible_message(span_notice("[user] hugs [M] to make [M.p_them()] feel better!"), \ + span_notice("I hug [M] to make [M.p_them()] feel better!")) if(M.resting) M.set_resting(FALSE, TRUE) else - user.visible_message("[user] pets [M]!", \ - "I pet [M]!") + user.visible_message(span_notice("[user] pets [M]!"), \ + span_notice("I pet [M]!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) if(1) if(M.health >= 0) if(ishuman(M)) if(!(M.mobility_flags & MOBILITY_STAND)) - user.visible_message("[user] shakes [M] trying to get [M.p_them()] up!", \ - "I shake [M] trying to get [M.p_them()] up!") + user.visible_message(span_notice("[user] shakes [M] trying to get [M.p_them()] up!"), \ + span_notice("I shake [M] trying to get [M.p_them()] up!")) else if(user.zone_selected == BODY_ZONE_HEAD) - user.visible_message("[user] bops [M] on the head!", \ - "I bop [M] on the head!") + user.visible_message(span_warning("[user] bops [M] on the head!"), \ + span_warning("I bop [M] on the head!")) user.do_attack_animation(M, ATTACK_EFFECT_PUNCH) else - user.visible_message("[user] hugs [M] in a firm bear-hug! [M] looks uncomfortable...", \ - "I hug [M] firmly to make [M.p_them()] feel better! [M] looks uncomfortable...") + user.visible_message(span_warning("[user] hugs [M] in a firm bear-hug! [M] looks uncomfortable..."), \ + span_warning("I hug [M] firmly to make [M.p_them()] feel better! [M] looks uncomfortable...")) if(M.resting) M.set_resting(FALSE, TRUE) else - user.visible_message("[user] bops [M] on the head!", \ - "I bop [M] on the head!") + user.visible_message(span_warning("[user] bops [M] on the head!"), \ + span_warning("I bop [M] on the head!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) if(2) if(scooldown < world.time) if(M.health >= 0) if(ishuman(M)||ismonkey(M)) M.electrocute_act(5, "[user]", flags = SHOCK_NOGLOVES) - user.visible_message("[user] electrocutes [M] with [user.p_their()] touch!", \ - "I electrocute [M] with your touch!") + user.visible_message(span_danger("[user] electrocutes [M] with [user.p_their()] touch!"), \ + span_danger("I electrocute [M] with your touch!")) M.update_mobility() else if(!iscyborg(M)) M.adjustFireLoss(10) - user.visible_message("[user] shocks [M]!", \ - "I shock [M]!") + user.visible_message(span_danger("[user] shocks [M]!"), \ + span_danger("I shock [M]!")) else - user.visible_message("[user] shocks [M]. It does not seem to have an effect", \ - "I shock [M] to no effect.") + user.visible_message(span_danger("[user] shocks [M]. It does not seem to have an effect"), \ + span_danger("I shock [M] to no effect.")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) user.cell.charge -= 500 scooldown = world.time + 20 @@ -130,11 +130,11 @@ if(ccooldown < world.time) if(M.health >= 0) if(ishuman(M)) - user.visible_message("[user] crushes [M] in [user.p_their()] grip!", \ - "I crush [M] in your grip!") + user.visible_message(span_danger("[user] crushes [M] in [user.p_their()] grip!"), \ + span_danger("I crush [M] in your grip!")) else - user.visible_message("[user] crushes [M]!", \ - "I crush [M]!") + user.visible_message(span_danger("[user] crushes [M]!"), \ + span_danger("I crush [M]!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) M.adjustBruteLoss(15) user.cell.charge -= 300 @@ -166,7 +166,7 @@ mode = "charge" else mode = "draw" - to_chat(user, "I toggle [src] to \"[mode]\" mode.") + to_chat(user, span_notice("I toggle [src] to \"[mode]\" mode.")) update_icon() /obj/item/borg/charger/afterattack(obj/item/target, mob/living/silicon/robot/user, proximity_flag) @@ -177,10 +177,10 @@ if(is_type_in_list(target, charge_machines)) var/obj/machinery/M = target if((M.stat & (NOPOWER|BROKEN)) || !M.anchored) - to_chat(user, "[M] is unpowered!") + to_chat(user, span_warning("[M] is unpowered!")) return - to_chat(user, "I connect to [M]'s power line...") + to_chat(user, span_notice("I connect to [M]'s power line...")) while(do_after(user, 15, target = M, progress = 0)) if(!user || !user.cell || mode != "draw") return @@ -193,27 +193,27 @@ M.use_power(200) - to_chat(user, "I stop charging myself.") + to_chat(user, span_notice("I stop charging myself.")) else if(is_type_in_list(target, charge_items)) var/obj/item/stock_parts/cell/cell = target if(!istype(cell)) cell = locate(/obj/item/stock_parts/cell) in target if(!cell) - to_chat(user, "[target] has no power cell!") + to_chat(user, span_warning("[target] has no power cell!")) return if(istype(target, /obj/item/gun/energy)) var/obj/item/gun/energy/E = target if(!E.can_charge) - to_chat(user, "[target] has no power port!") + to_chat(user, span_warning("[target] has no power port!")) return if(!cell.charge) - to_chat(user, "[target] has no power!") + to_chat(user, span_warning("[target] has no power!")) - to_chat(user, "I connect to [target]'s power port...") + to_chat(user, span_notice("I connect to [target]'s power port...")) while(do_after(user, 15, target = target, progress = 0)) if(!user || !user.cell || mode != "draw") @@ -232,26 +232,26 @@ break target.update_icon() - to_chat(user, "I stop charging myself.") + to_chat(user, span_notice("I stop charging myself.")) else if(is_type_in_list(target, charge_items)) var/obj/item/stock_parts/cell/cell = target if(!istype(cell)) cell = locate(/obj/item/stock_parts/cell) in target if(!cell) - to_chat(user, "[target] has no power cell!") + to_chat(user, span_warning("[target] has no power cell!")) return if(istype(target, /obj/item/gun/energy)) var/obj/item/gun/energy/E = target if(!E.can_charge) - to_chat(user, "[target] has no power port!") + to_chat(user, span_warning("[target] has no power port!")) return if(cell.charge >= cell.maxcharge) - to_chat(user, "[target] is already charged!") + to_chat(user, span_warning("[target] is already charged!")) - to_chat(user, "I connect to [target]'s power port...") + to_chat(user, span_notice("I connect to [target]'s power port...")) while(do_after(user, 15, target = target, progress = 0)) if(!user || !user.cell || mode != "charge") @@ -270,7 +270,7 @@ break target.update_icon() - to_chat(user, "I stop charging [target].") + to_chat(user, span_notice("I stop charging [target].")) /obj/item/harmalarm name = "\improper Sonic Harm Prevention Tool" @@ -295,7 +295,7 @@ if(iscyborg(user)) var/mob/living/silicon/robot/R = user if(!R.cell || R.cell.charge < 1200) - to_chat(user, "I don't have enough charge to do this!") + to_chat(user, span_warning("I don't have enough charge to do this!")) return R.cell.charge -= 1000 if(R.emagged) @@ -303,8 +303,8 @@ if(safety == TRUE) user.visible_message("[user] blares out a near-deafening siren from its speakers!", \ - "The siren pierces your hearing and confuses you!", \ - "The siren pierces your hearing!") + span_danger("The siren pierces your hearing and confuses you!"), \ + span_danger("The siren pierces your hearing!")) for(var/mob/living/carbon/M in get_hearers_in_view(9, user)) if(M.get_ear_protection() == FALSE) M.confused += 6 @@ -381,7 +381,7 @@ /obj/item/borg/lollipop/proc/dispense(atom/A, mob/user) if(candy <= 0) - to_chat(user, "No treats left in storage!") + to_chat(user, span_warning("No treats left in storage!")) return FALSE var/turf/T = get_turf(A) if(!T || !istype(T) || !isopenturf(T)) @@ -410,16 +410,16 @@ check_amount() if(into_hands) - user.visible_message("[user] dispenses a treat into the hands of [A].", "I dispense a treat into the hands of [A].", "I hear a click.") + user.visible_message(span_notice("[user] dispenses a treat into the hands of [A]."), span_notice("I dispense a treat into the hands of [A]."), span_hear("I hear a click.")) else - user.visible_message("[user] dispenses a treat.", "I dispense a treat.", "I hear a click.") + user.visible_message(span_notice("[user] dispenses a treat."), span_notice("I dispense a treat."), span_hear("I hear a click.")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) return TRUE /obj/item/borg/lollipop/proc/shootL(atom/target, mob/living/user, params) if(candy <= 0) - to_chat(user, "Not enough lollipops left!") + to_chat(user, span_warning("Not enough lollipops left!")) return FALSE candy-- var/obj/item/ammo_casing/caseless/lollipop/A = new /obj/item/ammo_casing/caseless/lollipop(src) @@ -429,12 +429,12 @@ A.BB.speed = 0.5 playsound(src.loc, 'sound/blank.ogg', 50, TRUE) A.fire_casing(target, user, params, 0, 0, null, 0, src) - user.visible_message("[user] blasts a flying lollipop at [target]!") + user.visible_message(span_warning("[user] blasts a flying lollipop at [target]!")) check_amount() /obj/item/borg/lollipop/proc/shootG(atom/target, mob/living/user, params) //Most certainly a good idea. if(candy <= 0) - to_chat(user, "Not enough gumballs left!") + to_chat(user, span_warning("Not enough gumballs left!")) return FALSE candy-- var/obj/item/ammo_casing/caseless/gumball/A = new /obj/item/ammo_casing/caseless/gumball(src) @@ -445,7 +445,7 @@ A.BB.color = rgb(rand(0, 255), rand(0, 255), rand(0, 255)) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) A.fire_casing(target, user, params, 0, 0, null, 0, src) - user.visible_message("[user] shoots a high-velocity gumball at [target]!") + user.visible_message(span_warning("[user] shoots a high-velocity gumball at [target]!")) check_amount() /obj/item/borg/lollipop/afterattack(atom/target, mob/living/user, proximity, click_params) @@ -454,7 +454,7 @@ if(iscyborg(user)) var/mob/living/silicon/robot/R = user if(!R.cell.use(12)) - to_chat(user, "Not enough power.") + to_chat(user, span_warning("Not enough power.")) return FALSE if(R.emagged) hitdamage = emaggedhitdamage @@ -473,16 +473,16 @@ switch(mode) if(DISPENSE_LOLLIPOP_MODE) mode = THROW_LOLLIPOP_MODE - to_chat(user, "Module is now throwing lollipops.") + to_chat(user, span_notice("Module is now throwing lollipops.")) if(THROW_LOLLIPOP_MODE) mode = THROW_GUMBALL_MODE - to_chat(user, "Module is now blasting gumballs.") + to_chat(user, span_notice("Module is now blasting gumballs.")) if(THROW_GUMBALL_MODE) mode = DISPENSE_ICECREAM_MODE - to_chat(user, "Module is now dispensing ice cream.") + to_chat(user, span_notice("Module is now dispensing ice cream.")) if(DISPENSE_ICECREAM_MODE) mode = DISPENSE_LOLLIPOP_MODE - to_chat(user, "Module is now dispensing lollipops.") + to_chat(user, span_notice("Module is now dispensing lollipops.")) ..() #undef DISPENSE_LOLLIPOP_MODE @@ -584,18 +584,18 @@ /obj/item/borg/projectile_dampen/attack_self(mob/user) if(cycle_delay > world.time) - to_chat(user, "[src] is still recycling its projectors!") + to_chat(user, span_boldwarning("[src] is still recycling its projectors!")) return cycle_delay = world.time + PKBORG_DAMPEN_CYCLE_DELAY if(!active) if(!user.has_buckled_mobs()) activate_field() else - to_chat(user, "[src]'s safety cutoff prevents you from activating it due to living beings being ontop of you!") + to_chat(user, span_warning("[src]'s safety cutoff prevents you from activating it due to living beings being ontop of you!")) else deactivate_field() update_icon() - to_chat(user, "I [active? "activate":"deactivate"] [src].") + to_chat(user, span_boldnotice("I [active? "activate":"deactivate"] [src].")) /obj/item/borg/projectile_dampen/update_icon() icon_state = "[initial(icon_state)][active]" @@ -611,7 +611,7 @@ /obj/item/borg/projectile_dampen/proc/deactivate_field() QDEL_NULL(dampening_field) - visible_message("\The [src] shuts off!") + visible_message(span_warning("\The [src] shuts off!")) for(var/P in tracked) restore_projectile(P) active = FALSE @@ -660,7 +660,7 @@ energy = CLAMP(energy - usage, 0, maxenergy) if(energy <= 0) deactivate_field() - visible_message("[src] blinks \"ENERGY DEPLETED\".") + visible_message(span_warning("[src] blinks \"ENERGY DEPLETED\".")) /obj/item/borg/projectile_dampen/proc/process_recharge() if(!istype(host)) @@ -875,7 +875,7 @@ if(stored && !user.client?.keys_held["Alt"] && user.used_intent.type != INTENT_HELP) var/obj/item/reagent_containers/C = stored C.SplashReagents(get_turf(user)) - loc.visible_message("[user] spills the contents of the [C] all over the floor.") + loc.visible_message(span_notice("[user] spills the contents of the [C] all over the floor.")) return . = ..() @@ -938,4 +938,4 @@ /obj/item/borg/apparatus/circuit/pre_attack(atom/A, mob/living/user, params) . = ..() if(istype(A, /obj/item/aiModule) && !stored) //If an admin wants a borg to upload laws, who am I to stop them? Otherwise, we can hint that it fails - to_chat(user, "This circuit board doesn't seem to have standard robot apparatus pin holes. You're unable to pick it up.") + to_chat(user, span_warning("This circuit board doesn't seem to have standard robot apparatus pin holes. You're unable to pick it up.")) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index c6c8125cd..92bf3cf51 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -95,9 +95,9 @@ head.flash2.forceMove(T) head.flash2 = null head = null - to_chat(user, "I disassemble the cyborg shell.") + to_chat(user, span_notice("I disassemble the cyborg shell.")) else - to_chat(user, "There is nothing to remove from the endoskeleton!") + to_chat(user, span_warning("There is nothing to remove from the endoskeleton!")) update_icon() /obj/item/robot_suit/proc/put_in_hand_or_drop(mob/living/user, obj/item/I) //normal put_in_hands() drops the item ontop of the player, this drops it at the suit's loc @@ -112,7 +112,7 @@ return TRUE if(!chest) //can't remove a cell if there's no chest to remove it from. - to_chat(user, "[src] has no attached torso!") + to_chat(user, span_warning("[src] has no attached torso!")) return var/obj/item/stock_parts/cell/temp_cell = user.is_holding_item_of_type(/obj/item/stock_parts/cell) @@ -121,20 +121,20 @@ swap_failed = TRUE else if(!user.transferItemToLoc(temp_cell, chest)) swap_failed = TRUE - to_chat(user, "[temp_cell] is stuck to your hand, you can't put it in [src]!") + to_chat(user, span_warning("[temp_cell] is stuck to your hand, you can't put it in [src]!")) if(chest.cell) //drop the chest's current cell no matter what. put_in_hand_or_drop(user, chest.cell) if(swap_failed) //we didn't transfer any new items. if(chest.cell) //old cell ejected, nothing inserted. - to_chat(user, "I remove [chest.cell] from [src].") + to_chat(user, span_notice("I remove [chest.cell] from [src].")) chest.cell = null else - to_chat(user, "The power cell slot in [src]'s torso is empty!") + to_chat(user, span_warning("The power cell slot in [src]'s torso is empty!")) return - to_chat(user, "I [chest.cell ? "replace [src]'s [chest.cell.name] with [temp_cell]" : "insert [temp_cell] into [src]"].") + to_chat(user, span_notice("I [chest.cell ? "replace [src]'s [chest.cell.name] with [temp_cell]" : "insert [temp_cell] into [src]"].")) chest.cell = temp_cell return TRUE @@ -146,13 +146,13 @@ if (M.use(1)) var/obj/item/bot_assembly/ed209/B = new B.forceMove(drop_location()) - to_chat(user, "I arm the robot frame.") + to_chat(user, span_notice("I arm the robot frame.")) var/holding_this = user.get_inactive_held_item()==src qdel(src) if (holding_this) user.put_in_inactive_hand(B) else - to_chat(user, "I need one sheet of metal to start building ED-209!") + to_chat(user, span_warning("I need one sheet of metal to start building ED-209!")) return else if(istype(W, /obj/item/bodypart/l_leg/robot)) if(l_leg) @@ -206,15 +206,15 @@ chest = CH update_icon() else if(!CH.wired) - to_chat(user, "I need to attach wires to it first!") + to_chat(user, span_warning("I need to attach wires to it first!")) else - to_chat(user, "I need to attach a cell to it first!") + to_chat(user, span_warning("I need to attach a cell to it first!")) else if(istype(W, /obj/item/bodypart/head/robot)) var/obj/item/bodypart/head/robot/HD = W for(var/X in HD.contents) if(istype(X, /obj/item/organ)) - to_chat(user, "There are organs inside [HD]!") + to_chat(user, span_warning("There are organs inside [HD]!")) return if(head) return @@ -226,47 +226,47 @@ head = HD update_icon() else - to_chat(user, "I need to attach a flash to it first!") + to_chat(user, span_warning("I need to attach a flash to it first!")) else if (W.tool_behaviour == TOOL_MULTITOOL) if(check_completion()) Interact(user) else - to_chat(user, "The endoskeleton must be assembled before debugging can begin!") + to_chat(user, span_warning("The endoskeleton must be assembled before debugging can begin!")) else if(istype(W, /obj/item/mmi)) var/obj/item/mmi/M = W if(check_completion()) if(!chest.cell) - to_chat(user, "The endoskeleton still needs a power cell!") + to_chat(user, span_warning("The endoskeleton still needs a power cell!")) return if(!isturf(loc)) - to_chat(user, "I can't put [M] in, the frame has to be standing on the ground to be perfectly precise!") + to_chat(user, span_warning("I can't put [M] in, the frame has to be standing on the ground to be perfectly precise!")) return if(!M.brainmob) - to_chat(user, "Sticking an empty [M.name] into the frame would sort of defeat the purpose!") + to_chat(user, span_warning("Sticking an empty [M.name] into the frame would sort of defeat the purpose!")) return var/mob/living/brain/BM = M.brainmob if(!BM.key || !BM.mind) - to_chat(user, "The MMI indicates that their mind is completely unresponsive; there's no point!") + to_chat(user, span_warning("The MMI indicates that their mind is completely unresponsive; there's no point!")) return if(!BM.client) //braindead - to_chat(user, "The MMI indicates that their mind is currently inactive; it might change!") + to_chat(user, span_warning("The MMI indicates that their mind is currently inactive; it might change!")) return if(BM.stat == DEAD || BM.suiciding || (M.brain && (M.brain.brain_death || M.brain.suicided))) - to_chat(user, "Sticking a dead brain into the frame would sort of defeat the purpose!") + to_chat(user, span_warning("Sticking a dead brain into the frame would sort of defeat the purpose!")) return if(M.brain?.organ_flags & ORGAN_FAILING) - to_chat(user, "The MMI indicates that the brain is damaged!") + to_chat(user, span_warning("The MMI indicates that the brain is damaged!")) return if(is_banned_from(BM.ckey, "Cyborg") || QDELETED(src) || QDELETED(BM) || QDELETED(user) || QDELETED(M) || !Adjacent(user)) if(!QDELETED(M)) - to_chat(user, "This [M.name] does not seem to fit!") + to_chat(user, span_warning("This [M.name] does not seem to fit!")) return if(!user.temporarilyRemoveItemFromInventory(W)) @@ -315,8 +315,8 @@ if(O.mind && O.mind.special_role) O.mind.store_memory("As a cyborg, you must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.") - to_chat(O, "I have been robotized!") - to_chat(O, "I must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.") + to_chat(O, span_danger("I have been robotized!")) + to_chat(O, span_danger("I must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.")) SSblackbox.record_feedback("amount", "cyborg_birth", 1) forceMove(O) @@ -327,19 +327,19 @@ if(!locomotion) O.lockcharge = TRUE O.update_mobility() - to_chat(O, "Error: Servo motors unresponsive.") + to_chat(O, span_warning("Error: Servo motors unresponsive.")) else - to_chat(user, "The MMI must go in after everything else!") + to_chat(user, span_warning("The MMI must go in after everything else!")) else if(istype(W, /obj/item/borg/upgrade/ai)) var/obj/item/borg/upgrade/ai/M = W if(check_completion()) if(!isturf(loc)) - to_chat(user, "I cannot install[M], the frame has to be standing on the ground to be perfectly precise!") + to_chat(user, span_warning("I cannot install[M], the frame has to be standing on the ground to be perfectly precise!")) return if(!user.temporarilyRemoveItemFromInventory(M)) - to_chat(user, "[M] is stuck to your hand!") + to_chat(user, span_warning("[M] is stuck to your hand!")) return qdel(M) var/mob/living/silicon/robot/O = new /mob/living/silicon/robot/shell(get_turf(src)) @@ -368,7 +368,7 @@ O.update_mobility() else if(istype(W, /obj/item/pen)) - to_chat(user, "I need to use a multitool to name [src]!") + to_chat(user, span_warning("I need to use a multitool to name [src]!")) else return ..() @@ -391,7 +391,7 @@ var/mob/living/living_user = usr var/obj/item/item_in_hand = living_user.get_active_held_item() if(!item_in_hand || item_in_hand.tool_behaviour != TOOL_MULTITOOL) - to_chat(living_user, "I need a multitool!") + to_chat(living_user, span_warning("I need a multitool!")) return if(href_list["Name"]) @@ -406,7 +406,7 @@ else if(href_list["Master"]) forced_ai = select_active_ai(usr) if(!forced_ai) - to_chat(usr, "No active AIs detected.") + to_chat(usr, span_alert("No active AIs detected.")) else if(href_list["Law"]) lawsync = !lawsync diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index dc91a48f4..6458359c3 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -16,11 +16,11 @@ /obj/item/borg/upgrade/proc/action(mob/living/silicon/robot/R, user = usr) if(R.stat == DEAD) - to_chat(user, "[src] will not function on a deceased cyborg!") + to_chat(user, span_warning("[src] will not function on a deceased cyborg!")) return FALSE if(module_type && !is_type_in_list(R.module, module_type)) - to_chat(R, "Upgrade mounting error! No suitable hardpoint detected.") - to_chat(user, "There's no mounting point for the module!") + to_chat(R, span_alert("Upgrade mounting error! No suitable hardpoint detected.")) + to_chat(user, span_warning("There's no mounting point for the module!")) return FALSE return TRUE @@ -56,7 +56,7 @@ /obj/item/borg/upgrade/restart/action(mob/living/silicon/robot/R, user = usr) if(R.health < 0) - to_chat(user, "I have to repair the cyborg before using this module!") + to_chat(user, span_warning("I have to repair the cyborg before using this module!")) return FALSE if(R.mind) @@ -77,11 +77,11 @@ if(.) var/obj/item/gun/energy/disabler/cyborg/T = locate() in R.module.modules if(!T) - to_chat(user, "There's no disabler in this unit!") + to_chat(user, span_warning("There's no disabler in this unit!")) return FALSE if(T.charge_delay <= 2) - to_chat(R, "A cooling unit is already installed!") - to_chat(user, "There's no room for another cooling unit!") + to_chat(R, span_warning("A cooling unit is already installed!")) + to_chat(user, span_warning("There's no room for another cooling unit!")) return FALSE T.charge_delay = max(2 , T.charge_delay - 4) @@ -103,7 +103,7 @@ . = ..() if(.) if(R.ionpulse) - to_chat(user, "This unit already has ion thrusters installed!") + to_chat(user, span_warning("This unit already has ion thrusters installed!")) return FALSE R.ionpulse = TRUE @@ -282,7 +282,7 @@ if(.) var/obj/item/borg/upgrade/selfrepair/U = locate() in R if(U) - to_chat(user, "This unit is already equipped with a self-repair module!") + to_chat(user, span_warning("This unit is already equipped with a self-repair module!")) return FALSE icon_state = "selfrepair_off" @@ -298,10 +298,10 @@ /obj/item/borg/upgrade/selfrepair/ui_action_click() if(on) - to_chat(toggle_action.owner, "I deactivate the self-repair module.") + to_chat(toggle_action.owner, span_notice("I deactivate the self-repair module.")) deactivate_sr() else - to_chat(toggle_action.owner, "I activate the self-repair module.") + to_chat(toggle_action.owner, span_notice("I activate the self-repair module.")) activate_sr() @@ -333,12 +333,12 @@ if(istype(cyborg) && (cyborg.stat != DEAD) && on) if(!cyborg.cell) - to_chat(cyborg, "Self-repair module deactivated. Please insert power cell.") + to_chat(cyborg, span_alert("Self-repair module deactivated. Please insert power cell.")) deactivate_sr() return if(cyborg.cell.charge < powercost * 2) - to_chat(cyborg, "Self-repair module deactivated. Please recharge.") + to_chat(cyborg, span_alert("Self-repair module deactivated. Please recharge.")) deactivate_sr() return @@ -363,7 +363,7 @@ msgmode = "critical" else if(cyborg.health < cyborg.maxHealth) msgmode = "normal" - to_chat(cyborg, "Self-repair is active in [msgmode] mode.") + to_chat(cyborg, span_notice("Self-repair is active in [msgmode] mode.")) msg_cooldown = world.time else deactivate_sr() @@ -476,10 +476,10 @@ . = ..() if(.) if(R.shell) - to_chat(user, "This unit is already an AI shell!") + to_chat(user, span_warning("This unit is already an AI shell!")) return FALSE if(R.key) //You cannot replace a player unless the key is completely removed. - to_chat(user, "Intelligence patterns detected in this [R.braintype]. Aborting.") + to_chat(user, span_warning("Intelligence patterns detected in this [R.braintype]. Aborting.")) return FALSE R.make_shell(src) @@ -501,7 +501,7 @@ if(.) if(R.hasExpanded) - to_chat(usr, "This unit already has an expand module installed!") + to_chat(usr, span_warning("This unit already has an expand module installed!")) return FALSE R.notransform = TRUE @@ -545,7 +545,7 @@ var/obj/item/storage/part_replacer/cyborg/RPED = locate() in R if(RPED) - to_chat(user, "This unit is already equipped with a RPED module!") + to_chat(user, span_warning("This unit is already equipped with a RPED module!")) return FALSE RPED = new(R.module) @@ -574,7 +574,7 @@ var/obj/item/pinpointer/crew/PP = locate() in R.module if(PP) - to_chat(user, "This unit is already equipped with a pinpointer module!") + to_chat(user, span_warning("This unit is already equipped with a pinpointer module!")) return FALSE PP = new(R.module) @@ -630,7 +630,7 @@ if(.) var/obj/item/borg/apparatus/circuit/C = locate() in R.module.modules if(C) - to_chat(user, "This unit is already equipped with a circuit apparatus!") + to_chat(user, span_warning("This unit is already equipped with a circuit apparatus!")) return FALSE C = new(R.module) @@ -656,7 +656,7 @@ if(.) var/obj/item/borg/apparatus/beaker/extra/E = locate() in R.module.modules if(E) - to_chat(user, "This unit has no room for additional beaker storage!") + to_chat(user, span_warning("This unit has no room for additional beaker storage!")) return FALSE E = new(R.module) diff --git a/code/game/objects/items/rogueitems/bait.dm b/code/game/objects/items/rogueitems/bait.dm index 5a35e301e..88a1f3e23 100644 --- a/code/game/objects/items/rogueitems/bait.dm +++ b/code/game/objects/items/rogueitems/bait.dm @@ -23,8 +23,8 @@ /obj/item/bait/attack_self(mob/user) . = ..() - user.visible_message("[user] begins deploying the bait...", \ - "I begin deploying the bait...") + user.visible_message(span_notice("[user] begins deploying the bait..."), \ + span_notice("I begin deploying the bait...")) if(do_after(user, 100, target = src)) //rogtodo hunting skill user.dropItemToGround(src) START_PROCESSING(SSobj, src) @@ -34,8 +34,8 @@ /obj/item/bait/attack_hand(mob/user) if(deployed) - user.visible_message("[user] begins gathering up the bait...", \ - "I begin gathering up the bait...") + user.visible_message(span_notice("[user] begins gathering up the bait..."), \ + span_notice("I begin gathering up the bait...")) if(do_after(user, 100, target = src)) //rogtodo hunting skill STOP_PROCESSING(SSobj, src) name = initial(name) diff --git a/code/game/objects/items/rogueitems/bells.dm b/code/game/objects/items/rogueitems/bells.dm index 690a55eb4..20c117ac0 100644 --- a/code/game/objects/items/rogueitems/bells.dm +++ b/code/game/objects/items/rogueitems/bells.dm @@ -23,9 +23,9 @@ for(var/mob/M in view(10, src.loc)) if(M.client) - to_chat(M, "BELL RINGS") + to_chat(M, span_notice("BELL RINGS")) - user.visible_message("[user] rings [src].") + user.visible_message(span_notice("[user] rings [src].")) ringing = TRUE sleep(cooldown) ringing = FALSE @@ -84,8 +84,8 @@ playsound(loc, 'sound/misc/bell.ogg', 50, 1) for(var/mob/M in orange(150, src)) if(M.client) - to_chat(M, "The church bell rings, echoing solemnly through the area.") - visible_message("[user] uses the [used_item] to ring the [src].") + to_chat(M, span_notice("The church bell rings, echoing solemnly through the area.")) + visible_message(span_notice("[user] uses the [used_item] to ring the [src].")) ringing = TRUE sleep(cooldown) ringing = FALSE diff --git a/code/game/objects/items/rogueitems/books.dm b/code/game/objects/items/rogueitems/books.dm index cb6ae2025..c441ffcd2 100644 --- a/code/game/objects/items/rogueitems/books.dm +++ b/code/game/objects/items/rogueitems/books.dm @@ -81,7 +81,7 @@ /obj/item/book/rogue/read(mob/user) if(!open) - to_chat(user, "Open me first.") + to_chat(user, span_info("Open me first.")) return FALSE . = ..() @@ -114,11 +114,11 @@ /obj/item/book/rogue/secret/ledger/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/paper/scroll/cargo)) if(!open) - to_chat(user, "Open me first.") + to_chat(user, span_info("Open me first.")) return FALSE var/obj/item/paper/scroll/cargo/C = I if(C.orders.len > 4) - to_chat(user, "Too much order.") + to_chat(user, span_warning("Too much order.")) return var/picked_cat = input(user, "Categories", "Shipping Ledger") as null|anything in sortList(SSshuttle.supply_cats) if(!picked_cat) @@ -144,11 +144,11 @@ return if(istype(I, /obj/item/paper/scroll)) if(!open) - to_chat(user, "Open me first.") + to_chat(user, span_info("Open me first.")) return FALSE var/obj/item/paper/scroll/P = I if(P.info) - to_chat(user, "Something is written here already.") + to_chat(user, span_warning("Something is written here already.")) return var/picked_cat = input(user, "Categories", "Shipping Ledger") as null|anything in sortList(SSshuttle.supply_cats) if(!picked_cat) @@ -185,7 +185,7 @@ /obj/item/book/rogue/bibble/read(mob/user) if(!open) - to_chat(user, "Open me first.") + to_chat(user, span_info("Open me first.")) return FALSE if(!user.client || !user.hud_used) return @@ -204,11 +204,11 @@ /obj/item/book/rogue/bibble/attack(mob/living/M, mob/user) if(user.mind && user.mind.assigned_role == "Priest") if(!user.can_read(src)) - to_chat(user, "I don't understand these scribbly black lines.") + to_chat(user, span_warning("I don't understand these scribbly black lines.")) return M.apply_status_effect(/datum/status_effect/buff/blessed) M.add_stress(/datum/stressevent/blessed) - user.visible_message("[user] blesses [M].") + user.visible_message(span_notice("[user] blesses [M].")) playsound(user, 'sound/magic/bless.ogg', 100, FALSE) return @@ -259,7 +259,7 @@ return ..() user.update_inv_hands() - to_chat(user, "You feel laughter echo in your head.") + to_chat(user, span_notice("You feel laughter echo in your head.")) //player made books /obj/item/book/rogue/tales1 @@ -513,7 +513,7 @@ user << browse(dat, "window=reading;size=1000x700;can_close=1;can_minimize=0;can_maximize=0;can_resize=0;titlebar=0") onclose(user, "reading", src) else - return "I'm too far away to read it." + return span_warning("I'm too far away to read it.") /obj/item/manuscript/update_icon() . = ..() diff --git a/code/game/objects/items/rogueitems/coins.dm b/code/game/objects/items/rogueitems/coins.dm index 3eb3d297a..0ab37c4a6 100644 --- a/code/game/objects/items/rogueitems/coins.dm +++ b/code/game/objects/items/rogueitems/coins.dm @@ -65,7 +65,7 @@ /obj/item/roguecoin/examine(mob/user) . = ..() if(quantity > 1) - . += "\Roman [quantity] coins." + . += span_info("\Roman [quantity] coins.") /obj/item/roguecoin/proc/merge(obj/item/roguecoin/G, mob/user) if(!G) @@ -120,10 +120,10 @@ flip_cd = world.time playsound(user, 'sound/foley/coinphy (1).ogg', 100, FALSE) if(prob(50)) - user.visible_message("[user] flips the coin. Heads!") + user.visible_message(span_info("[user] flips the coin. Heads!")) heads_tails = TRUE else - user.visible_message("[user] flips the coin. Tails!") + user.visible_message(span_info("[user] flips the coin. Tails!")) heads_tails = FALSE update_icon() diff --git a/code/game/objects/items/rogueitems/dmusicbox.dm b/code/game/objects/items/rogueitems/dmusicbox.dm index dcfa08c5b..a61c68c14 100644 --- a/code/game/objects/items/rogueitems/dmusicbox.dm +++ b/code/game/objects/items/rogueitems/dmusicbox.dm @@ -91,10 +91,10 @@ var/file_size = length(infile) if(file_ext != ".ogg") - to_chat(user, "SONG MUST BE AN OGG.") + to_chat(user, span_warning("SONG MUST BE AN OGG.")) return if(file_size > 6485760) - to_chat(user, "TOO BIG. 6 MEGS OR LESS.") + to_chat(user, span_warning("TOO BIG. 6 MEGS OR LESS.")) return lastfilechange = world.time fcopy(infile,"data/jukeboxuploads/[user.ckey]/[filename]") diff --git a/code/game/objects/items/rogueitems/keyrings.dm b/code/game/objects/items/rogueitems/keyrings.dm index f9267339c..f1f5fac63 100644 --- a/code/game/objects/items/rogueitems/keyrings.dm +++ b/code/game/objects/items/rogueitems/keyrings.dm @@ -87,7 +87,7 @@ /obj/item/keyring/attackby(obj/item/I, mob/user) if(istype(I,/obj/item/roguekey)) if(keys.len >= 10) - to_chat(user, "Too many keys.") + to_chat(user, span_warning("Too many keys.")) return user.dropItemToGround(I) addtoring(I) @@ -96,7 +96,7 @@ /obj/item/keyring/attack_right(mob/user) if(keys.len) - to_chat(user, "I steal a key off the ring.") + to_chat(user, span_notice("I steal a key off the ring.")) var/obj/item/roguekey/K = removefromring(user) user.put_in_active_hand(K) @@ -120,7 +120,7 @@ /obj/item/keyring/proc/update_desc() if(keys.len) - desc = "\Roman [keys.len] keys." + desc = span_info("\Roman [keys.len] keys.") else desc = "" diff --git a/code/game/objects/items/rogueitems/keys.dm b/code/game/objects/items/rogueitems/keys.dm index 0c8f97cbe..cdba7d4c7 100644 --- a/code/game/objects/items/rogueitems/keys.dm +++ b/code/game/objects/items/rogueitems/keys.dm @@ -316,7 +316,7 @@ var/input = (input(user, "What would you name this key?", "", "") as text) if(input) name = name + " key" - to_chat(user, "You rename the key to [name].") + to_chat(user, span_notice("You rename the key to [name].")) //custom key blank /obj/item/customblank //i'd prefer not to make a seperate item for this honestly @@ -332,22 +332,22 @@ if(istype(I, /obj/item/rogueweapon/hammer)) var/input = input(user, "What would you like to set the key ID to?", "", 0) as num input = max(0, input) - to_chat(user, "You set the key ID to [input].") + to_chat(user, span_notice("You set the key ID to [input].")) lockhash = 10000 + input //having custom lock ids start at 10000 leaves it outside the range that opens normal doors, so you can't make a key that randomly unlocks existing key ids like the church /obj/item/customblank/attack_right(mob/user) if(istype(user.get_active_held_item(), /obj/item/roguekey)) var/obj/item/roguekey/held = user.get_active_held_item() src.lockhash = held.lockhash - to_chat(user, "You trace the teeth from [held] to [src].") + to_chat(user, span_notice("You trace the teeth from [held] to [src].")) else if(istype(user.get_active_held_item(), /obj/item/customlock)) var/obj/item/customlock/held = user.get_active_held_item() src.lockhash = held.lockhash - to_chat(user, "You fine-tune [src] to the lock's internals.") + to_chat(user, span_notice("You fine-tune [src] to the lock's internals.")) else if(istype(user.get_active_held_item(), /obj/item/rogueweapon/hammer) && src.lockhash != 0) var/obj/item/roguekey/custom/F = new (get_turf(src)) F.lockhash = src.lockhash - to_chat(user, "You finish [F].") + to_chat(user, span_notice("You finish [F].")) qdel(src) @@ -365,34 +365,34 @@ if(istype(I, /obj/item/rogueweapon/hammer)) var/input = input(user, "What would you like to set the lock ID to?", "", 0) as num input = max(0, input) - to_chat(user, "You set the lock ID to [input].") + to_chat(user, span_notice("You set the lock ID to [input].")) lockhash = 10000 + input //same deal as the customkey else if(istype(I, /obj/item/roguekey)) var/obj/item/roguekey/ID = I if(ID.lockhash == src.lockhash) - to_chat(user, "[I] twists cleanly in [src].") + to_chat(user, span_notice("[I] twists cleanly in [src].")) else - to_chat(user, "[I] jams in [src],") + to_chat(user, span_warning("[I] jams in [src],")) else if(istype(I, /obj/item/customblank)) var/obj/item/customblank/ID = I if(ID.lockhash == src.lockhash) - to_chat(user, "[I] twists cleanly in [src].") //this makes no sense since the teeth aren't formed yet but i want people to be able to check whether the locks theyre making actually fit + to_chat(user, span_notice("[I] twists cleanly in [src].")) //this makes no sense since the teeth aren't formed yet but i want people to be able to check whether the locks theyre making actually fit else - to_chat(user, "[I] jams in [src].") + to_chat(user, span_warning("[I] jams in [src].")) /obj/item/customlock/attack_right(mob/user) if(istype(user.get_active_held_item(), /obj/item/roguekey))//i need to figure out how to avoid these massive if/then trees, this sucks var/obj/item/roguekey/held = user.get_active_held_item() src.lockhash = held.lockhash - to_chat(user, "You align the lock's internals to [held].") //locks for non-custom keys + to_chat(user, span_notice("You align the lock's internals to [held].")) //locks for non-custom keys else if(istype(user.get_active_held_item(), /obj/item/customblank)) var/obj/item/customblank/held = user.get_active_held_item() src.lockhash = held.lockhash - to_chat(user, "You align the lock's internals to [held].") + to_chat(user, span_notice("You align the lock's internals to [held].")) else if(istype(user.get_active_held_item(), /obj/item/rogueweapon/hammer) && src.lockhash != 0) var/obj/item/customlock/finished/F = new (get_turf(src)) F.lockhash = src.lockhash - to_chat(user, "You finish [F].") + to_chat(user, span_notice("You finish [F].")) qdel(src) //finished lock @@ -405,7 +405,7 @@ if(istype(I, /obj/item/rogueweapon/hammer)) src.holdname = input(user, "What would you like to name this?", "", "") as text if(holdname) - to_chat(user, "You label the [name] with [holdname].") + to_chat(user, span_notice("You label the [name] with [holdname].")) else ..() @@ -415,23 +415,23 @@ if(istype(K, /obj/structure/closet)) var/obj/structure/closet/KE = K if(KE.keylock == TRUE) - to_chat(user, "[K] already has a lock.") + to_chat(user, span_warning("[K] already has a lock.")) else KE.keylock = TRUE KE.lockhash = src.lockhash if(src.holdname) KE.name = (src.holdname + " " + KE.name) - to_chat(user, "You add [src] to [K].") + to_chat(user, span_notice("You add [src] to [K].")) qdel(src) if(istype(K, /obj/structure/mineral_door)) var/obj/structure/mineral_door/KE = K if(KE.keylock == TRUE) - to_chat(user, "[K] already has a lock.") + to_chat(user, span_warning("[K] already has a lock.")) else KE.keylock = TRUE KE.lockhash = src.lockhash if(src.holdname) KE.name = src.holdname - to_chat(user, "You add [src] to [K].") + to_chat(user, span_notice("You add [src] to [K].")) qdel(src) \ No newline at end of file diff --git a/code/game/objects/items/rogueitems/magic.dm b/code/game/objects/items/rogueitems/magic.dm index f1f499cb7..c0a8c24d8 100644 --- a/code/game/objects/items/rogueitems/magic.dm +++ b/code/game/objects/items/rogueitems/magic.dm @@ -21,7 +21,7 @@ /obj/item/scrying/attack_self(mob/user) . = ..() if(world.time < last_scry + 30 SECONDS) - to_chat(user, "I look into the ball but only see inky smoke. Maybe I should wait.") + to_chat(user, span_warning("I look into the ball but only see inky smoke. Maybe I should wait.")) return var/input = stripped_input(user, "Who are you looking for?", "Scrying Orb") if(!input) @@ -29,10 +29,10 @@ if(!user.key) return if(world.time < last_scry + 30 SECONDS) - to_chat(user, "I look into the ball but only see inky smoke. Maybe I should wait.") + to_chat(user, span_warning("I look into the ball but only see inky smoke. Maybe I should wait.")) return if(!user.mind || !user.mind.do_i_know(name=input)) - to_chat(user, "I don't know anyone by that name.") + to_chat(user, span_warning("I don't know anyone by that name.")) return for(var/mob/living/carbon/human/HL in GLOB.human_list) if(HL.real_name == input) @@ -44,24 +44,24 @@ return S.ManualFollow(HL) last_scry = world.time - user.visible_message("[user] stares into [src], [user.p_their()] eyes rolling back into [user.p_their()] head.") + user.visible_message(span_danger("[user] stares into [src], [user.p_their()] eyes rolling back into [user.p_their()] head.")) addtimer(CALLBACK(S, TYPE_PROC_REF(/mob/dead/observer, reenter_corpse)), 8 SECONDS) if(!HL.stat) if(HL.STAPER >= 15) if(HL.mind) if(HL.mind.do_i_know(name=user.real_name)) - to_chat(HL, "I can clearly see the face of [user.real_name] staring at me!.") + to_chat(HL, span_warning("I can clearly see the face of [user.real_name] staring at me!.")) return - to_chat(HL, "I can clearly see the face of an unknown [user.gender == FEMALE ? "woman" : "man"] staring at me!") + to_chat(HL, span_warning("I can clearly see the face of an unknown [user.gender == FEMALE ? "woman" : "man"] staring at me!")) return if(HL.STAPER >= 11) - to_chat(HL, "I feel a pair of unknown eyes on me.") + to_chat(HL, span_warning("I feel a pair of unknown eyes on me.")) return - to_chat(user, "I peer into the ball, but can't find [input].") + to_chat(user, span_warning("I peer into the ball, but can't find [input].")) return /////////////////////////////////////////Crystal ball ghsot vision/////////////////// /obj/item/crystalball/attack_self(mob/user) - user.visible_message("[user] stares into [src], \their eyes rolling back into \their head.") + user.visible_message(span_danger("[user] stares into [src], \their eyes rolling back into \their head.")) user.ghostize(1) diff --git a/code/game/objects/items/rogueitems/natural.dm b/code/game/objects/items/rogueitems/natural.dm index 9285885a2..65aefe9f2 100644 --- a/code/game/objects/items/rogueitems/natural.dm +++ b/code/game/objects/items/rogueitems/natural.dm @@ -98,7 +98,7 @@ /obj/item/natural/bundle/examine(mob/user) . = ..() - to_chat(user, "There are [amount] [stackname] in this bundle.") + to_chat(user, span_notice("There are [amount] [stackname] in this bundle.")) /obj/item/natural/bundle/proc/update_bundle() if(firefuel != 0) diff --git a/code/game/objects/items/rogueitems/natural/animals.dm b/code/game/objects/items/rogueitems/natural/animals.dm index be7967fa6..78e1dca5c 100644 --- a/code/game/objects/items/rogueitems/natural/animals.dm +++ b/code/game/objects/items/rogueitems/natural/animals.dm @@ -44,7 +44,7 @@ if(S.can_saddle && !S.ssaddle) testing("yea2") if(!target.has_buckled_mobs()) - user.visible_message("[user] tries to saddle [target]...") + user.visible_message(span_warning("[user] tries to saddle [target]...")) if(do_after(user, 40, target = target)) playsound(loc, 'sound/foley/saddledismount.ogg', 100, FALSE) user.dropItemToGround(src) diff --git a/code/game/objects/items/rogueitems/natural/clothfibersthorn.dm b/code/game/objects/items/rogueitems/natural/clothfibersthorn.dm index f8c44eed5..0485baf46 100644 --- a/code/game/objects/items/rogueitems/natural/clothfibersthorn.dm +++ b/code/game/objects/items/rogueitems/natural/clothfibersthorn.dm @@ -17,7 +17,7 @@ bundletype = /obj/item/natural/bundle/fibers /obj/item/natural/fibers/attack_right(mob/user) - to_chat(user, "I start to collect [src]...") + to_chat(user, span_warning("I start to collect [src]...")) if(move_after(user, 5 SECONDS, target = src)) var/fibercount = 0 for(var/obj/item/natural/fibers/F in get_turf(src)) @@ -53,7 +53,7 @@ bundletype = /obj/item/natural/bundle/silk /obj/item/natural/silk/attack_right(mob/user) - to_chat(user, "I start to collect [src]...") + to_chat(user, span_warning("I start to collect [src]...")) if(move_after(user, 5 SECONDS, target = src)) var/silkcount = 0 for(var/obj/item/natural/silk/F in get_turf(src)) @@ -112,7 +112,7 @@ /obj/item/natural/cloth/examine(mob/user) . = ..() if(wet) - . += "It's wet!" + . += span_notice("It's wet!") /obj/item/natural/cloth/bandit color = "#ff0000" @@ -122,7 +122,7 @@ /obj/item/natural/cloth/attack_obj(obj/O, mob/living/user) testing("attackobj") if(user.client && ((O in user.client.screen) && !user.is_holding(O))) - to_chat(user, "I need to take that [O.name] off before cleaning it!") + to_chat(user, span_warning("I need to take that [O.name] off before cleaning it!")) return if(istype(O, /obj/effect/decal/cleanable)) var/cleanme = TRUE @@ -132,14 +132,14 @@ add_blood_DNA(O.return_blood_DNA()) if(prob(33 + (wet*10)) && cleanme) wet = max(wet-1, 0) - user.visible_message("[user] wipes \the [O.name] with [src].", "I wipe \the [O.name] with [src].") + user.visible_message(span_notice("[user] wipes \the [O.name] with [src]."), span_notice("I wipe \the [O.name] with [src].")) qdel(O) else - user.visible_message("[user] wipes \the [O.name] with [src].", "I wipe \the [O.name] with [src].") + user.visible_message(span_warning("[user] wipes \the [O.name] with [src]."), span_warning("I wipe \the [O.name] with [src].")) playsound(user, "clothwipe", 100, TRUE) else if(prob(30 + (wet*10))) - user.visible_message("[user] wipes \the [O.name] with [src].", "I wipe \the [O.name] with [src].") + user.visible_message(span_notice("[user] wipes \the [O.name] with [src]."), span_notice("I wipe \the [O.name] with [src].")) if(O.return_blood_DNA()) add_blood_DNA(O.return_blood_DNA()) @@ -151,20 +151,20 @@ SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRONG) wet = max(wet-1, 0) else - user.visible_message("[user] wipes \the [O.name] with [src].", "I wipe \the [O.name] with [src].") + user.visible_message(span_warning("[user] wipes \the [O.name] with [src]."), span_warning("I wipe \the [O.name] with [src].")) playsound(user, "clothwipe", 100, TRUE) /obj/item/natural/cloth/attack_turf(turf/T, mob/living/user) if(istype(T, /turf/open/water)) return ..() if(prob(30 + (wet*10))) - user.visible_message("[user] wipes \the [T.name] with [src].", "I wipe \the [T.name] with [src].") + user.visible_message(span_notice("[user] wipes \the [T.name] with [src]."), span_notice("I wipe \the [T.name] with [src].")) if(wet) for(var/obj/effect/decal/cleanable/C in T) qdel(C) wet = max(wet-1, 0) else - user.visible_message("[user] wipes \the [T.name] with [src].", "I wipe \the [T.name] with [src].") + user.visible_message(span_warning("[user] wipes \the [T.name] with [src]."), span_warning("I wipe \the [T.name] with [src].")) playsound(user, "clothwipe", 100, TRUE) @@ -187,10 +187,10 @@ if(!affecting) return if(!get_location_accessible(H, check_zone(user.zone_selected))) - to_chat(user, "Something in the way.") + to_chat(user, span_warning("Something in the way.")) return if(affecting.bandage) - to_chat(user, "There is already a bandage.") + to_chat(user, span_warning("There is already a bandage.")) return var/used_time = 70 if(H.mind) @@ -205,9 +205,9 @@ H.update_damage_overlays() if(M == user) - user.visible_message("[user] bandages [user.p_their()] [affecting].", "I bandage my [affecting].") + user.visible_message(span_notice("[user] bandages [user.p_their()] [affecting]."), span_notice("I bandage my [affecting].")) else - user.visible_message("[user] bandages [M]'s [affecting].", "I bandage [M]'s [affecting].") + user.visible_message(span_notice("[user] bandages [M]'s [affecting]."), span_notice("I bandage [M]'s [affecting].")) /obj/item/natural/thorn name = "thorn" @@ -221,7 +221,7 @@ resistance_flags = FLAMMABLE max_integrity = 20 /obj/item/natural/thorn/attack_self(mob/living/user) - user.visible_message("[user] snaps [src].") + user.visible_message(span_warning("[user] snaps [src].")) playsound(user,'sound/items/seedextract.ogg', 100, FALSE) qdel(src) @@ -357,7 +357,7 @@ stackname = "worms" /obj/item/natural/worms/attack_right(mob/user) - to_chat(user, "I start to collect [src]...") + to_chat(user, span_warning("I start to collect [src]...")) if(move_after(user, 5 SECONDS, target = src)) var/wormcount = 0 for(var/obj/item/natural/worms/F in get_turf(src)) diff --git a/code/game/objects/items/rogueitems/natural/dirtclod.dm b/code/game/objects/items/rogueitems/natural/dirtclod.dm index 4f186c568..a35f9b09d 100644 --- a/code/game/objects/items/rogueitems/natural/dirtclod.dm +++ b/code/game/objects/items/rogueitems/natural/dirtclod.dm @@ -37,7 +37,7 @@ new /obj/structure/fluff/clodpile(T) /obj/item/natural/dirtclod/attack_self(mob/living/user) - user.visible_message("[user] scatters [src].") + user.visible_message(span_warning("[user] scatters [src].")) qdel(src) /obj/item/natural/dirtclod/Initialize() diff --git a/code/game/objects/items/rogueitems/natural/stones.dm b/code/game/objects/items/rogueitems/natural/stones.dm index 2a8c5dc91..146cafb3d 100644 --- a/code/game/objects/items/rogueitems/natural/stones.dm +++ b/code/game/objects/items/rogueitems/natural/stones.dm @@ -244,7 +244,7 @@ GLOBAL_LIST_INIT(stone_personality_descs, list( user.changeNext_move(CLICK_CD_MELEE) if(istype(W, /obj/item/natural/stone)) playsound(src.loc, pick('sound/items/stonestone.ogg'), 100) - user.visible_message("[user] strikes the stones together.") + user.visible_message(span_info("[user] strikes the stones together.")) if(prob(10)) var/datum/effect_system/spark_spread/S = new() var/turf/front = get_step(user,user.dir) @@ -282,7 +282,7 @@ GLOBAL_LIST_INIT(stone_personality_descs, list( /obj/item/natural/rock/Crossed(mob/living/L) if(istype(L) && !L.throwing) if(L.m_intent == MOVE_INTENT_RUN) - L.visible_message("[L] trips over the rock!","I trip over the rock!") + L.visible_message(span_warning("[L] trips over the rock!"),span_warning("I trip over the rock!")) L.Knockdown(10) L.consider_ambush() ..() @@ -310,7 +310,7 @@ GLOBAL_LIST_INIT(stone_personality_descs, list( /obj/item/natural/rock/attackby(obj/item/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) if(istype(W, /obj/item/natural/stone)) - user.visible_message("[user] strikes the stone against the rock.") + user.visible_message(span_info("[user] strikes the stone against the rock.")) playsound(src.loc, 'sound/items/stonestone.ogg', 100) if(prob(35)) var/datum/effect_system/spark_spread/S = new() @@ -320,7 +320,7 @@ GLOBAL_LIST_INIT(stone_personality_descs, list( return if(istype(W, /obj/item/natural/rock)) playsound(src.loc, pick('sound/items/stonestone.ogg'), 100) - user.visible_message("[user] strikes the rocks together.") + user.visible_message(span_info("[user] strikes the rocks together.")) if(prob(10)) var/datum/effect_system/spark_spread/S = new() var/turf/front = get_turf(src) diff --git a/code/game/objects/items/rogueitems/natural/wood.dm b/code/game/objects/items/rogueitems/natural/wood.dm index a89663f6d..2cb383d71 100644 --- a/code/game/objects/items/rogueitems/natural/wood.dm +++ b/code/game/objects/items/rogueitems/natural/wood.dm @@ -71,7 +71,7 @@ ..() /obj/item/grown/log/tree/stick/attack_self(mob/living/user) - user.visible_message("[user] snaps [src].") + user.visible_message(span_warning("[user] snaps [src].")) playsound(user,'sound/items/seedextract.ogg', 100, FALSE) qdel(src) @@ -81,14 +81,14 @@ if(user.used_intent?.blade_class == BCLASS_CUT) playsound(get_turf(src.loc), 'sound/items/wood_sharpen.ogg', 100) if(do_after(user, 20)) - user.visible_message("[user] sharpens [src].") + user.visible_message(span_notice("[user] sharpens [src].")) var/obj/item/grown/log/tree/stake/S = new /obj/item/grown/log/tree/stake(get_turf(src.loc)) if(user.is_holding(src)) user.dropItemToGround(src) user.put_in_hands(S) qdel(src) else - user.visible_message("[user] sharpens [src].") + user.visible_message(span_warning("[user] sharpens [src].")) return if(istype(I, /obj/item/grown/log/tree/stick)) var/obj/item/natural/bundle/stick/F = new(src.loc) diff --git a/code/game/objects/items/rogueitems/needle.dm b/code/game/objects/items/rogueitems/needle.dm index f692374a3..d6b4004a3 100644 --- a/code/game/objects/items/rogueitems/needle.dm +++ b/code/game/objects/items/rogueitems/needle.dm @@ -23,7 +23,7 @@ /obj/item/needle/examine() . = ..() if(!infinite) - . += "It has [stringamt] uses left." + . += span_bold("It has [stringamt] uses left.") else . += "Can be used indefinitely." @@ -52,13 +52,13 @@ var/obj/item/I = O if(I.sewrepair && I.max_integrity && !I.obj_broken) if(I.obj_integrity == I.max_integrity) - to_chat(user, "This is not broken.") + to_chat(user, span_warning("This is not broken.")) return if(user.mind.get_skill_level(/datum/skill/misc/sewing) < I.required_repair_skill) - to_chat(user, "I don't know how to repair this...") + to_chat(user, span_warning("I don't know how to repair this...")) return if(!I.ontable()) - to_chat(user, "I should put this on a table first.") + to_chat(user, span_warning("I should put this on a table first.")) return playsound(loc, 'sound/foley/sewflesh.ogg', 100, TRUE, -2) var/sewtime = 70 @@ -67,7 +67,7 @@ var/datum/component/storage/target_storage = I.GetComponent(/datum/component/storage) //Vrell - Part of storage item repair fix if(do_after(user, sewtime, target = I)) playsound(loc, 'sound/foley/sewflesh.ogg', 100, TRUE, -2) - user.visible_message("[user] repairs [I]!") + user.visible_message(span_info("[user] repairs [I]!")) I.obj_integrity = I.max_integrity //Vrell - Part of storage item repair fix if(target_storage) @@ -86,23 +86,23 @@ var/mob/living/doctor = user var/mob/living/carbon/human/patient = target if(!get_location_accessible(patient, check_zone(doctor.zone_selected))) - to_chat(doctor, "Something in the way.") + to_chat(doctor, span_warning("Something in the way.")) return FALSE var/list/sewable var/obj/item/bodypart/affecting if(iscarbon(patient)) affecting = patient.get_bodypart(check_zone(doctor.zone_selected)) if(!affecting) - to_chat(doctor, "That limb is missing.") + to_chat(doctor, span_warning("That limb is missing.")) return FALSE if(affecting.bandage) - to_chat(doctor, "There is a bandage in the way.") + to_chat(doctor, span_warning("There is a bandage in the way.")) return FALSE sewable = affecting.get_sewable_wounds() else sewable = patient.get_sewable_wounds() if(!length(sewable)) - to_chat(doctor, "There aren't any wounds to be sewn.") + to_chat(doctor, span_warning("There aren't any wounds to be sewn.")) return FALSE var/datum/wound/target_wound = input(doctor, "Which wound?", "[src]") as null|anything in sewable if(!target_wound) @@ -125,12 +125,12 @@ use(1) target_wound.sew_wound() if(patient == doctor) - doctor.visible_message("[doctor] sews \a [target_wound.name] on [doctor.p_them()]self.", "I stitch \a [target_wound.name] on my [affecting].") + doctor.visible_message(span_notice("[doctor] sews \a [target_wound.name] on [doctor.p_them()]self."), span_notice("I stitch \a [target_wound.name] on my [affecting].")) else if(affecting) - doctor.visible_message("[doctor] sews \a [target_wound.name] on [patient]'s [affecting].", "I stitch \a [target_wound.name] on [patient]'s [affecting].") + doctor.visible_message(span_notice("[doctor] sews \a [target_wound.name] on [patient]'s [affecting]."), span_notice("I stitch \a [target_wound.name] on [patient]'s [affecting].")) else - doctor.visible_message("[doctor] sews \a [target_wound.name] on [patient].", "I stitch \a [target_wound.name] on [patient].") + doctor.visible_message(span_notice("[doctor] sews \a [target_wound.name] on [patient]."), span_notice("I stitch \a [target_wound.name] on [patient].")) log_combat(doctor, patient, "sew", "needle") return TRUE return FALSE @@ -144,5 +144,5 @@ /obj/item/needle/pestra name = "needle of pestra" - desc = "This needle has been blessed by the goddess of medicine herself!" + desc = span_green("This needle has been blessed by the goddess of medicine herself!") infinite = TRUE diff --git a/code/game/objects/items/rogueitems/painting.dm b/code/game/objects/items/rogueitems/painting.dm index c61df4337..6ae3f0cbc 100644 --- a/code/game/objects/items/rogueitems/painting.dm +++ b/code/game/objects/items/rogueitems/painting.dm @@ -12,7 +12,7 @@ /obj/item/rogue/painting/attack_turf(turf/T, mob/living/user) if(isclosedturf(T)) if(get_dir(T,user) in GLOB.cardinals) - to_chat(user, "I place [src] on the wall.") + to_chat(user, span_warning("I place [src] on the wall.")) var/obj/structure/S = new deployed_structure(user.loc) switch(get_dir(T,user)) if(NORTH) diff --git a/code/game/objects/items/rogueitems/prostheticarm.dm b/code/game/objects/items/rogueitems/prostheticarm.dm index c0a2fd94b..3ea6f6abe 100644 --- a/code/game/objects/items/rogueitems/prostheticarm.dm +++ b/code/game/objects/items/rogueitems/prostheticarm.dm @@ -22,11 +22,11 @@ if(affecting) return if(user.zone_selected != body_zone) //so we can't replace a leg with an arm, or a human arm with a monkey arm. - to_chat(user, "[src] isn't the right type for [parse_zone(user.zone_selected)].") + to_chat(user, span_warning("[src] isn't the right type for [parse_zone(user.zone_selected)].")) return -1 if(user.temporarilyRemoveItemFromInventory(src)) attach_limb(H) - user.visible_message("[user] attaches [src] to [H].") + user.visible_message(span_notice("[user] attaches [src] to [H].")) return 1 /obj/item/bodypart/r_arm/rproesthetic @@ -53,9 +53,9 @@ if(affecting) return if(user.zone_selected != body_zone) //so we can't replace a leg with an arm, or a human arm with a monkey arm. - to_chat(user, "[src] isn't the right type for [parse_zone(user.zone_selected)].") + to_chat(user, span_warning("[src] isn't the right type for [parse_zone(user.zone_selected)].")) return -1 if(user.temporarilyRemoveItemFromInventory(src)) attach_limb(H) - user.visible_message("[user] attaches [src] to [H].") + user.visible_message(span_notice("[user] attaches [src] to [H].")) return 1 diff --git a/code/game/objects/items/rogueitems/ropechainbola.dm b/code/game/objects/items/rogueitems/ropechainbola.dm index 21698dbd5..bcb47bd42 100644 --- a/code/game/objects/items/rogueitems/ropechainbola.dm +++ b/code/game/objects/items/rogueitems/ropechainbola.dm @@ -52,40 +52,40 @@ if(user.aimheight > 4) if(!C.handcuffed) if(C.get_num_arms(FALSE) || C.get_arm_ignore()) - C.visible_message("[user] is trying to tie [C]'s arms with [src.name]!", \ - "[user] is trying to tie my arms with [src.name]!") + C.visible_message(span_warning("[user] is trying to tie [C]'s arms with [src.name]!"), \ + span_userdanger("[user] is trying to tie my arms with [src.name]!")) playsound(loc, cuffsound, 100, TRUE, -2) if(do_mob(user, C, 60) && C.get_num_arms(FALSE)) apply_cuffs(C, user) - C.visible_message("[user] ties [C] with [src.name].", \ - "[user] ties me up with [src.name].") + C.visible_message(span_warning("[user] ties [C] with [src.name]."), \ + span_danger("[user] ties me up with [src.name].")) SSblackbox.record_feedback("tally", "handcuffs", 1, type) log_combat(user, C, "handcuffed") else - to_chat(user, "I fail to tie up [C]!") + to_chat(user, span_warning("I fail to tie up [C]!")) else - to_chat(user, "[C] has no arms to tie up.") + to_chat(user, span_warning("[C] has no arms to tie up.")) if(user.aimheight <= 4) if(!C.legcuffed) if(C.get_num_legs(TRUE) == 2) - C.visible_message("[user] is trying to tie [C]'s legs with [src.name]!", \ - "[user] is trying to tie my legs with [src.name]!") + C.visible_message(span_warning("[user] is trying to tie [C]'s legs with [src.name]!"), \ + span_userdanger("[user] is trying to tie my legs with [src.name]!")) playsound(loc, cuffsound, 30, TRUE, -2) if(do_mob(user, C, 60) && (C.get_num_legs(FALSE) < 2)) apply_cuffs(C, user) - C.visible_message("[user] ties [C]'s legs with [src.name].", \ - "[user] ties my legs with [src.name].") + C.visible_message(span_warning("[user] ties [C]'s legs with [src.name]."), \ + span_danger("[user] ties my legs with [src.name].")) SSblackbox.record_feedback("tally", "legcuffs", 1, type) log_combat(user, C, "legcuffed", TRUE) else - to_chat(user, "I fail to tie up [C]!") + to_chat(user, span_warning("I fail to tie up [C]!")) else - to_chat(user, "[C] is missing two or one legs.") + to_chat(user, span_warning("[C] is missing two or one legs.")) /obj/item/rope/proc/apply_cuffs(mob/living/carbon/target, mob/user, leg = FALSE) if(!leg) diff --git a/code/game/objects/items/rogueitems/undies.dm b/code/game/objects/items/rogueitems/undies.dm index 469467bf6..88066b04b 100644 --- a/code/game/objects/items/rogueitems/undies.dm +++ b/code/game/objects/items/rogueitems/undies.dm @@ -27,7 +27,7 @@ if(H.gender != gendered) return if(H.underwear == "Nude" && H.cached_underwear != "Nude") - user.visible_message("[user] tries to put [src] on [H]...") + user.visible_message(span_notice("[user] tries to put [src] on [H]...")) if(do_after(user, 50, needhand = 1, target = H)) get_location_accessible(H, BODY_ZONE_PRECISE_GROIN) H.underwear = H.cached_underwear diff --git a/code/game/objects/items/rogueweapons/integrity.dm b/code/game/objects/items/rogueweapons/integrity.dm index 3190dd86d..957d70450 100644 --- a/code/game/objects/items/rogueweapons/integrity.dm +++ b/code/game/objects/items/rogueweapons/integrity.dm @@ -48,7 +48,7 @@ if(max_blade_int) if(istype(I, /obj/item/natural/stone)) playsound(src.loc, pick('sound/items/sharpen_long1.ogg','sound/items/sharpen_long2.ogg'), 100) - user.visible_message("[user] sharpens [src]!") + user.visible_message(span_notice("[user] sharpens [src]!")) degrade_bintegrity(0.5) add_bintegrity(max_blade_int * 0.1) if(prob(35)) diff --git a/code/game/objects/items/rogueweapons/intents.dm b/code/game/objects/items/rogueweapons/intents.dm index 45ec2b521..63352bf1b 100644 --- a/code/game/objects/items/rogueweapons/intents.dm +++ b/code/game/objects/items/rogueweapons/intents.dm @@ -302,7 +302,7 @@ /datum/intent/shoot/prewarning() if(masteritem && mastermob) - mastermob.visible_message("[mastermob] aims [masteritem]!") + mastermob.visible_message(span_warning("[mastermob] aims [masteritem]!")) /datum/intent/arc name = "arc" @@ -324,7 +324,7 @@ /datum/intent/arc/prewarning() if(masteritem && mastermob) - mastermob.visible_message("[mastermob] aims [masteritem]!") + mastermob.visible_message(span_warning("[mastermob] aims [masteritem]!")) /datum/intent/unarmed @@ -352,11 +352,11 @@ if(ismob(target)) var/mob/M = target var/list/targetl = list(target) - user.visible_message("[user] taunts [M]!", "I taunt [M]!", ignored_mobs = targetl) + user.visible_message(span_warning("[user] taunts [M]!"), span_warning("I taunt [M]!"), ignored_mobs = targetl) user.emote("taunt") if(M.client) if(M.can_see_cone(user)) - to_chat(M, "[user] taunts me!") + to_chat(M, span_danger("[user] taunts me!")) else M.taunted(user) return @@ -379,10 +379,10 @@ if(ismob(target)) var/mob/M = target var/list/targetl = list(target) - user.visible_message("[user] shoos [M] away.", "I shoo [M] away.", ignored_mobs = targetl) + user.visible_message(span_blue("[user] shoos [M] away."), span_blue("I shoo [M] away."), ignored_mobs = targetl) if(M.client) if(M.can_see_cone(user)) - to_chat(M, "[user] shoos me away.") + to_chat(M, span_blue("[user] shoos me away.")) else M.shood(user) return @@ -404,10 +404,10 @@ if(ismob(target)) var/mob/M = target var/list/targetl = list(target) - user.visible_message("[user] beckons [M] to come closer.", "I beckon [M] to come closer.", ignored_mobs = targetl) + user.visible_message(span_green("[user] beckons [M] to come closer."), span_green("I beckon [M] to come closer."), ignored_mobs = targetl) if(M.client) if(M.can_see_cone(user)) - to_chat(M, "[user] beckons me to come closer.") + to_chat(M, span_green("[user] beckons me to come closer.")) else M.beckoned(user) return @@ -426,10 +426,10 @@ if(ismob(target)) var/mob/M = target var/list/targetl = list(target) - user.visible_message("[user] waves friendly at [M].", "I wave friendly at [M].", ignored_mobs = targetl) + user.visible_message(span_green("[user] waves friendly at [M]."), span_green("I wave friendly at [M]."), ignored_mobs = targetl) if(M.client) if(M.can_see_cone(user)) - to_chat(M, "[user] gives me a friendly wave.") + to_chat(M, span_green("[user] gives me a friendly wave.")) return /datum/intent/simple/headbutt diff --git a/code/game/objects/items/rogueweapons/melee/knives.dm b/code/game/objects/items/rogueweapons/melee/knives.dm index b272f606b..fb98f5067 100644 --- a/code/game/objects/items/rogueweapons/melee/knives.dm +++ b/code/game/objects/items/rogueweapons/melee/knives.dm @@ -190,18 +190,18 @@ var/datum/antagonist/werewolf/W = H.mind.has_antag_datum(/datum/antagonist/werewolf/) if(ishuman(H)) if(H.mind.has_antag_datum(/datum/antagonist/vampirelord/lesser)) - to_chat(H, "I can't pick up the silver, it is my BANE!") + to_chat(H, span_userdanger("I can't pick up the silver, it is my BANE!")) H.Knockdown(20) H.adjustFireLoss(60) H.Paralyze(20) H.fire_act(1,5) if(V_lord) if(V_lord.vamplevel < 4 && !H.mind.has_antag_datum(/datum/antagonist/vampirelord/lesser)) - to_chat(H, "I can't pick up the silver, it is my BANE!") + to_chat(H, span_userdanger("I can't pick up the silver, it is my BANE!")) H.Knockdown(10) H.Paralyze(10) if(W && W.transformed == TRUE) - to_chat(H, "I can't pick up the silver, it is my BANE!") + to_chat(H, span_userdanger("I can't pick up the silver, it is my BANE!")) H.Knockdown(20) H.Paralyze(20) @@ -213,25 +213,25 @@ var/datum/antagonist/vampirelord/V_lord = H.mind.has_antag_datum(/datum/antagonist/vampirelord/) var/datum/antagonist/werewolf/W = H.mind.has_antag_datum(/datum/antagonist/werewolf/) if(H.mind.has_antag_datum(/datum/antagonist/vampirelord/lesser)) - to_chat(H, "I can't equip the silver, it is my BANE!") + to_chat(H, span_userdanger("I can't equip the silver, it is my BANE!")) H.Knockdown(20) H.adjustFireLoss(60) H.Paralyze(20) H.fire_act(1,5) if(V_lord) if(V_lord.vamplevel < 4 && !H.mind.has_antag_datum(/datum/antagonist/vampirelord/lesser)) - to_chat(H, "I can't equip the silver, it is my BANE!") + to_chat(H, span_userdanger("I can't equip the silver, it is my BANE!")) H.Knockdown(10) H.Paralyze(10) if(W && W.transformed == TRUE) - to_chat(H, "I can't equip the silver, it is my BANE!") + to_chat(H, span_userdanger("I can't equip the silver, it is my BANE!")) H.Knockdown(20) H.Paralyze(20) /obj/item/rogueweapon/huntingknife/idagger/silver/funny_attack_effects(mob/living/target, mob/living/user = usr, nodmg) if(world.time < src.last_used + 100) - to_chat(user, "The silver effect is on cooldown.") + to_chat(user, span_notice("The silver effect is on cooldown.")) return . = ..() @@ -245,7 +245,7 @@ if(V.disguised) H.Stun(20) H.visible_message("The silver weapon manifests the [H] curse!") - to_chat(H, "I'm hit by my BANE!") + to_chat(H, span_userdanger("I'm hit by my BANE!")) H.adjustFireLoss(30) H.Paralyze(20) H.fire_act(1,4) @@ -253,7 +253,7 @@ src.last_used = world.time else H.Stun(20) - to_chat(H, "I'm hit by my BANE!") + to_chat(H, span_userdanger("I'm hit by my BANE!")) H.adjustFireLoss(30) H.Paralyze(20) H.fire_act(1,4) @@ -262,7 +262,7 @@ if(V_lord) if(V_lord.vamplevel < 4 && !V) H.Stun(10) - to_chat(H, "I'm hit by my BANE!") + to_chat(H, span_userdanger("I'm hit by my BANE!")) H.adjustFireLoss(25) H.Paralyze(10) H.fire_act(1,4) @@ -271,11 +271,11 @@ s_user.Stun(10) s_user.Paralyze(10) to_chat(s_user, " The silver weapon fails!") - H.visible_message(H, "This feeble metal can't hurt me, I AM THE ANCIENT!") + H.visible_message(H, span_userdanger("This feeble metal can't hurt me, I AM THE ANCIENT!")) if(W && W.transformed == TRUE) H.Stun(40) H.Paralyze(40) - to_chat(H, "I'm hit by my BANE!") + to_chat(H, span_userdanger("I'm hit by my BANE!")) src.last_used = world.time diff --git a/code/game/objects/items/rogueweapons/melee/special.dm b/code/game/objects/items/rogueweapons/melee/special.dm index f64b7616b..fb2d9c4e4 100644 --- a/code/game/objects/items/rogueweapons/melee/special.dm +++ b/code/game/objects/items/rogueweapons/melee/special.dm @@ -49,7 +49,7 @@ return if(istype(user.used_intent, /datum/intent/lordpoint)) user.changeNext_move(CLICK_CD_MELEE) - user.visible_message("[user] points [src] at [target].") + user.visible_message(span_warning("[user] points [src] at [target].")) if(ishuman(user)) var/mob/living/carbon/human/HU = user if((HU.job != "King") && (HU.job != "Queen Consort")) @@ -57,10 +57,10 @@ if(ishuman(target)) var/mob/living/carbon/human/H = target if(H.anti_magic_check()) - to_chat(H, "I'm protected from the scepter.") + to_chat(H, span_warning("I'm protected from the scepter.")) return if(!(H in SStreasury.bank_accounts)) - to_chat(H, "I'm protected from the scepter.") + to_chat(H, span_warning("I'm protected from the scepter.")) return H.electrocute_act(5, src) @@ -130,9 +130,9 @@ on = FALSE else if(charge <= 33) - to_chat(user, "It's out of juice.") + to_chat(user, span_warning("It's out of juice.")) return - user.visible_message("[user] flicks [src] on.") + user.visible_message(span_warning("[user] flicks [src] on.")) on = TRUE charge-- playsound(user, pick('sound/items/stunmace_toggle (1).ogg','sound/items/stunmace_toggle (2).ogg','sound/items/stunmace_toggle (3).ogg'), 100, TRUE) diff --git a/code/game/objects/items/rogueweapons/melee/swords.dm b/code/game/objects/items/rogueweapons/melee/swords.dm index 4fc74c3e3..d05832699 100644 --- a/code/game/objects/items/rogueweapons/melee/swords.dm +++ b/code/game/objects/items/rogueweapons/melee/swords.dm @@ -381,7 +381,7 @@ user.changeNext_move(CLICK_CD_MELEE) playsound(user, "clothwipe", 100, TRUE) SEND_SIGNAL(src, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRONG) - user.visible_message("[user] wipes [src] down with its cloth.","I wipe [src] down with its cloth.") + user.visible_message(span_warning("[user] wipes [src] down with its cloth."),span_notice("I wipe [src] down with its cloth.")) return /obj/item/rogueweapon/sword/iron diff --git a/code/game/objects/items/rogueweapons/ranged/ammo.dm b/code/game/objects/items/rogueweapons/ranged/ammo.dm index a5093e203..1cbe589c3 100644 --- a/code/game/objects/items/rogueweapons/ranged/ammo.dm +++ b/code/game/objects/items/rogueweapons/ranged/ammo.dm @@ -115,9 +115,9 @@ . = ..() if(istype(target, /mob/living/simple_animal)) //On-hit for carbon mobs has been moved to projectile act in living_defense.dm, to ensure poison is not applied if armor prevents damage. var/mob/living/simple_animal/M = target - M.show_message("You feel an intense burning sensation spreading swiftly from the puncture!") //In case a player is in control of the mob. + M.show_message(span_danger("You feel an intense burning sensation spreading swiftly from the puncture!")) //In case a player is in control of the mob. addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living, adjustToxLoss), 100), 10 SECONDS) - addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, visible_message), "[M] appears greatly weakened by the poison!"), 10 SECONDS) + addtimer(CALLBACK(M, TYPE_PROC_REF(/atom, visible_message), span_danger("[M] appears greatly weakened by the poison!")), 10 SECONDS) /obj/projectile/bullet/reusable/bullet name = "lead ball" diff --git a/code/game/objects/items/rogueweapons/ranged/bows.dm b/code/game/objects/items/rogueweapons/ranged/bows.dm index 808e2b8fd..4763e7ff2 100644 --- a/code/game/objects/items/rogueweapons/ranged/bows.dm +++ b/code/game/objects/items/rogueweapons/ranged/bows.dm @@ -104,7 +104,7 @@ /datum/intent/shoot/bow/prewarning() if(mastermob) - mastermob.visible_message("[mastermob] draws [masteritem]!") + mastermob.visible_message(span_warning("[mastermob] draws [masteritem]!")) playsound(mastermob, pick('sound/combat/Ranged/bow-draw-01.ogg'), 100, FALSE) /datum/intent/shoot/bow/get_chargetime() @@ -140,7 +140,7 @@ /datum/intent/arc/bow/prewarning() if(mastermob) - mastermob.visible_message("[mastermob] draws [masteritem]!") + mastermob.visible_message(span_warning("[mastermob] draws [masteritem]!")) playsound(mastermob, pick('sound/combat/Ranged/bow-draw-01.ogg'), 100, FALSE) /datum/intent/arc/bow/get_chargetime() diff --git a/code/game/objects/items/rogueweapons/ranged/crossbows.dm b/code/game/objects/items/rogueweapons/ranged/crossbows.dm index b5a52893a..a0b0d14fb 100644 --- a/code/game/objects/items/rogueweapons/ranged/crossbows.dm +++ b/code/game/objects/items/rogueweapons/ranged/crossbows.dm @@ -80,12 +80,12 @@ ..() else if(!cocked) - to_chat(user, "I step on the stirrup and use all my might...") + to_chat(user, span_info("I step on the stirrup and use all my might...")) if(do_after(user, 50 - user.STASTR, target = user)) playsound(user, 'sound/combat/Ranged/crossbow_medium_reload-01.ogg', 100, FALSE) cocked = TRUE else - to_chat(user, "I carefully de-cock the crossbow.") + to_chat(user, span_warning("I carefully de-cock the crossbow.")) cocked = FALSE update_icon() @@ -96,7 +96,7 @@ return ..() else - to_chat(user, "I need to cock the bow first.") + to_chat(user, span_warning("I need to cock the bow first.")) /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) diff --git a/code/game/objects/items/rogueweapons/rmb_intents.dm b/code/game/objects/items/rogueweapons/rmb_intents.dm index 621b7cead..1b4850d68 100644 --- a/code/game/objects/items/rogueweapons/rmb_intents.dm +++ b/code/game/objects/items/rogueweapons/rmb_intents.dm @@ -13,7 +13,7 @@ var/mob/living/L = target user.changeNext_move(CLICK_CD_RAPID) playsound(user, 'sound/combat/feint.ogg', 100, TRUE) - user.visible_message("[user] feints an attack at [target]!") + user.visible_message(span_danger("[user] feints an attack at [target]!")) var/perc = 50 if(user.mind) var/obj/item/I = user.get_active_held_item() @@ -47,11 +47,11 @@ L.apply_status_effect(/datum/status_effect/debuff/feinted) L.changeNext_move(4) L.Immobilize(5) - to_chat(user, "[L] fell for my feint attack!") - to_chat(L, "I fall for [user]'s feint attack!") + to_chat(user, span_notice("[L] fell for my feint attack!")) + to_chat(L, span_danger("I fall for [user]'s feint attack!")) else if(user.client?.prefs.showrolls) - to_chat(user, "[L] did not fall for my feint... [perc]%") + to_chat(user, span_warning("[L] did not fall for my feint... [perc]%")) /datum/rmb_intent/aimed name = "aimed" diff --git a/code/game/objects/items/rogueweapons/rogueweapon.dm b/code/game/objects/items/rogueweapons/rogueweapon.dm index a7749987c..9e62ba410 100644 --- a/code/game/objects/items/rogueweapons/rogueweapon.dm +++ b/code/game/objects/items/rogueweapons/rogueweapon.dm @@ -40,7 +40,7 @@ . = ..() if(!destroy_message) var/yea = pick("[src] is broken!", "[src] is useless!", "[src] is destroyed!") - destroy_message = "[yea]" + destroy_message = span_warning("[yea]") /obj/item/rogueweapon/get_dismemberment_chance(obj/item/bodypart/affecting, mob/user) if(!get_sharpness() || !affecting.can_dismember(src)) diff --git a/code/game/objects/items/rogueweapons/shields.dm b/code/game/objects/items/rogueweapons/shields.dm index 25af12533..94d81c822 100644 --- a/code/game/objects/items/rogueweapons/shields.dm +++ b/code/game/objects/items/rogueweapons/shields.dm @@ -37,7 +37,7 @@ if(istype(attackby_item, /obj/item/rogueweapon)) if(!COOLDOWN_FINISHED(src, shield_bang)) return - user.visible_message("[user] bangs [src] with [attackby_item]!") + user.visible_message(span_danger("[user] bangs [src] with [attackby_item]!")) playsound(user.loc, 'sound/combat/shieldbang.ogg', 50, TRUE) COOLDOWN_START(src, shield_bang, SHIELD_BANG_COOLDOWN) return @@ -48,11 +48,11 @@ SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, args) if(attack_type == THROWN_PROJECTILE_ATTACK || attack_type == PROJECTILE_ATTACK) if(owner.client?.chargedprog == 100 && owner.used_intent?.tranged) - owner.visible_message("[owner] blocks [hitby] with [src]!") + owner.visible_message(span_danger("[owner] blocks [hitby] with [src]!")) return 1 else if(prob(coverage)) - owner.visible_message("[owner] blocks [hitby] with [src]!") + owner.visible_message(span_danger("[owner] blocks [hitby] with [src]!")) return 1 return 0 diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm index 122e97828..91fdff451 100644 --- a/code/game/objects/items/sharpener.dm +++ b/code/game/objects/items/sharpener.dm @@ -13,33 +13,33 @@ /obj/item/sharpener/attackby(obj/item/I, mob/user, params) if(used) - to_chat(user, "The sharpening block is too worn to use again!") + to_chat(user, span_warning("The sharpening block is too worn to use again!")) return if(I.force >= max || I.throwforce >= max)//no esword sharpening - to_chat(user, "[I] is much too powerful to sharpen further!") + to_chat(user, span_warning("[I] is much too powerful to sharpen further!")) return if(requires_sharpness && !I.get_sharpness()) - to_chat(user, "I can only sharpen items that are already sharp, such as knives!") + to_chat(user, span_warning("I can only sharpen items that are already sharp, such as knives!")) return if(istype(I, /obj/item/melee/transforming/energy)) - to_chat(user, "I don't think \the [I] will be the thing getting modified if you use it on \the [src]!") + to_chat(user, span_warning("I don't think \the [I] will be the thing getting modified if you use it on \the [src]!")) return if(istype(I, /obj/item/twohanded))//some twohanded items should still be sharpenable, but handle force differently. therefore i need this stuff var/obj/item/twohanded/TH = I if(TH.force_wielded >= max) - to_chat(user, "[TH] is much too powerful to sharpen further!") + to_chat(user, span_warning("[TH] is much too powerful to sharpen further!")) return if(TH.wielded) - to_chat(user, "[TH] must be unwielded before it can be sharpened!") + to_chat(user, span_warning("[TH] must be unwielded before it can be sharpened!")) return if(TH.force_wielded > initial(TH.force_wielded)) - to_chat(user, "[TH] has already been refined before. It cannot be sharpened further!") + to_chat(user, span_warning("[TH] has already been refined before. It cannot be sharpened further!")) return TH.force_wielded = CLAMP(TH.force_wielded + increment, 0, max)//wieldforce is increased since normal force wont stay if(I.force > initial(I.force)) - to_chat(user, "[I] has already been refined before. It cannot be sharpened further!") + to_chat(user, span_warning("[I] has already been refined before. It cannot be sharpened further!")) return - user.visible_message("[user] sharpens [I] with [src]!", "I sharpen [I], making it much more deadly than before.") + user.visible_message(span_notice("[user] sharpens [I] with [src]!"), span_notice("I sharpen [I], making it much more deadly than before.")) playsound(src, 'sound/blank.ogg', 25, TRUE) I.sharpness = IS_SHARP_ACCURATE I.force = CLAMP(I.force + increment, 0, max) diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index 8ec6e3659..2d1bbf277 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -41,17 +41,17 @@ /obj/item/shield/riot/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/melee/baton)) if(cooldown < world.time - 25) - user.visible_message("[user] bashes [src] with [W]!") + user.visible_message(span_warning("[user] bashes [src] with [W]!")) playsound(user.loc, 'sound/blank.ogg', 50, TRUE) cooldown = world.time else if(istype(W, /obj/item/stack/sheet/mineral/titanium)) if (obj_integrity >= max_integrity) - to_chat(user, "[src] is already in perfect condition.") + to_chat(user, span_warning("[src] is already in perfect condition.")) else var/obj/item/stack/sheet/mineral/titanium/T = W T.use(1) obj_integrity = max_integrity - to_chat(user, "I repair [src] with [T].") + to_chat(user, span_notice("I repair [src] with [T].")) else return ..() @@ -60,11 +60,11 @@ var/healthpercent = round((obj_integrity/max_integrity) * 100, 1) switch(healthpercent) if(50 to 99) - . += "It looks slightly damaged." + . += span_info("It looks slightly damaged.") if(25 to 50) - . += "It appears heavily damaged." + . += span_info("It appears heavily damaged.") if(0 to 25) - . += "It's falling apart!" + . += span_warning("It's falling apart!") /obj/item/shield/riot/proc/shatter(mob/living/carbon/human/owner) playsound(owner, 'sound/blank.ogg', 100) @@ -73,7 +73,7 @@ /obj/item/shield/riot/on_shield_block(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", damage = 0, attack_type = MELEE_ATTACK) if (obj_integrity <= damage) var/turf/T = get_turf(owner) - T.visible_message("[hitby] destroys [src]!") + T.visible_message(span_warning("[hitby] destroys [src]!")) shatter(owner) qdel(src) return FALSE @@ -149,10 +149,10 @@ if(istype(W, /obj/item/assembly/flash/handheld)) var/obj/item/assembly/flash/handheld/flash = W if(flash.burnt_out) - to_chat(user, "No sense replacing it with a broken bulb!") + to_chat(user, span_warning("No sense replacing it with a broken bulb!")) return else - to_chat(user, "I begin to replace the bulb...") + to_chat(user, span_notice("I begin to replace the bulb...")) if(do_after(user, 20, target = user)) if(flash.burnt_out || !flash || QDELETED(flash)) return @@ -180,7 +180,7 @@ /obj/item/shield/riot/flash/examine(mob/user) . = ..() if (embedded_flash?.burnt_out) - . += "The mounted bulb has burnt out. You can try replacing it with a new one." + . += span_info("The mounted bulb has burnt out. You can try replacing it with a new one.") /obj/item/shield/energy name = "energy combat shield" @@ -212,7 +212,7 @@ /obj/item/shield/energy/attack_self(mob/living/carbon/human/user) if(clumsy_check && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) - to_chat(user, "I beat myself in the head with [src]!") + to_chat(user, span_danger("I beat myself in the head with [src]!")) user.take_bodypart_damage(5) active = !active icon_state = "[base_icon_state][active]" @@ -223,14 +223,14 @@ throw_speed = on_throw_speed w_class = WEIGHT_CLASS_BULKY playsound(user, 'sound/blank.ogg', 35, TRUE) - to_chat(user, "[src] is now active.") + to_chat(user, span_notice("[src] is now active.")) else force = initial(force) throwforce = initial(throwforce) throw_speed = initial(throw_speed) w_class = WEIGHT_CLASS_TINY playsound(user, 'sound/blank.ogg', 35, TRUE) - to_chat(user, "[src] can now be concealed.") + to_chat(user, span_notice("[src] can now be concealed.")) add_fingerprint(user) /obj/item/shield/riot/tele @@ -264,12 +264,12 @@ throw_speed = 2 w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK - to_chat(user, "I extend \the [src].") + to_chat(user, span_notice("I extend \the [src].")) else force = 3 throwforce = 3 throw_speed = 1 w_class = WEIGHT_CLASS_NORMAL slot_flags = null - to_chat(user, "[src] can now be concealed.") + to_chat(user, span_notice("[src] can now be concealed.")) add_fingerprint(user) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 0bb271b04..6fa3fe9a3 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -29,7 +29,7 @@ ..() if(I.use_tool(src, user, 0, volume=40)) removeOverlays() - to_chat(user, "I slice off [src]'s uneven chunks of aluminium and scorch marks.") + to_chat(user, span_notice("I slice off [src]'s uneven chunks of aluminium and scorch marks.")) return TRUE /obj/item/target/attack_hand(mob/user) @@ -76,7 +76,7 @@ if(C.GetPixel(p_x, p_y) && P.original == src && overlays.len <= 35) // if the located pixel isn't blank (null) hp -= P.damage if(hp <= 0) - visible_message("[src] breaks into tiny pieces and collapses!") + visible_message(span_danger("[src] breaks into tiny pieces and collapses!")) qdel(src) var/image/bullet_hole = image('icons/effects/effects.dmi', "scorch", OBJ_LAYER + 0.5) bullet_hole.pixel_x = p_x - 1 //offset correction diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm index e2916ebe4..59b1b8b19 100644 --- a/code/game/objects/items/signs.dm +++ b/code/game/objects/items/signs.dm @@ -19,7 +19,7 @@ /obj/item/picket_sign/proc/retext(mob/user) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on [src]!") + to_chat(user, span_notice("I scribble illegibly on [src]!")) return var/txt = stripped_input(user, "What would you like to write on the sign?", "Sign Label", null , 30) if(txt && user.canUseTopic(src, BE_CLOSE)) @@ -37,9 +37,9 @@ if( last_wave + 20 < world.time ) last_wave = world.time if(label) - user.visible_message("[user] waves around \the \"[label]\" sign.") + user.visible_message(span_warning("[user] waves around \the \"[label]\" sign.")) else - user.visible_message("[user] waves around blank sign.") + user.visible_message(span_warning("[user] waves around blank sign.")) user.changeNext_move(CLICK_CD_MELEE) /datum/crafting_recipe/picket_sign diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm index 084d26e34..03a54f5c0 100644 --- a/code/game/objects/items/singularityhammer.dm +++ b/code/game/objects/items/singularityhammer.dm @@ -91,9 +91,9 @@ var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread s.set_up(5, 1, target.loc) s.start() - target.visible_message("[target.name] was shocked by [src]!", \ - "I feel a powerful shock course through your body sending you flying!", \ - "I hear a heavy electrical crack!") + target.visible_message(span_danger("[target.name] was shocked by [src]!"), \ + span_danger("I feel a powerful shock course through your body sending you flying!"), \ + span_hear("I hear a heavy electrical crack!")) var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src))) target.throw_at(throw_target, 200, 4) return diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm index 280858d8f..9685a470d 100644 --- a/code/game/objects/items/stacks/bscrystal.dm +++ b/code/game/objects/items/stacks/bscrystal.dm @@ -27,7 +27,7 @@ return 1 /obj/item/stack/ore/bluespace_crystal/attack_self(mob/user) - user.visible_message("[user] crushes [src]!", "I crush [src]!") + user.visible_message(span_warning("[user] crushes [src]!"), span_danger("I crush [src]!")) new /obj/effect/particle_effect/sparks(loc) playsound(loc, "sparks", 50, TRUE) blink_mob(user) @@ -38,7 +38,7 @@ /obj/item/stack/ore/bluespace_crystal/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) if(!..()) // not caught in mid-air - visible_message("[src] fizzles and disappears upon impact!") + visible_message(span_notice("[src] fizzles and disappears upon impact!")) var/turf/T = get_turf(hit_atom) new /obj/effect/particle_effect/sparks(T) playsound(loc, "sparks", 50, TRUE) @@ -72,7 +72,7 @@ var/crystal_type = /obj/item/stack/ore/bluespace_crystal/refined /obj/item/stack/sheet/bluespace_crystal/attack_self(mob/user)// to prevent the construction menu from ever happening - to_chat(user, "I cannot crush the polycrystal in-hand, try breaking one off.") + to_chat(user, span_warning("I cannot crush the polycrystal in-hand, try breaking one off.")) //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/stack/sheet/bluespace_crystal/attack_hand(mob/user) @@ -83,8 +83,8 @@ user.put_in_hands(BC) use(1) if(!amount) - to_chat(user, "I break the final crystal off.") + to_chat(user, span_notice("I break the final crystal off.")) else - to_chat(user, "I break off a crystal.") + to_chat(user, span_notice("I break off a crystal.")) else ..() diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index f4f1cd2fc..c6e9acf91 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -26,12 +26,12 @@ return if(M == user) if(!silent) - user.visible_message("[user] starts to apply \the [src] on [user.p_them()]self...", "I begin applying \the [src] on myself...") + user.visible_message(span_notice("[user] starts to apply \the [src] on [user.p_them()]self..."), span_notice("I begin applying \the [src] on myself...")) if(!do_mob(user, M, self_delay, extra_checks=CALLBACK(M, TYPE_PROC_REF(/mob/living, can_inject), user, TRUE))) return else if(other_delay) if(!silent) - user.visible_message("[user] starts to apply \the [src] on [M].", "I begin applying \the [src] on [M]...") + user.visible_message(span_notice("[user] starts to apply \the [src] on [M]."), span_notice("I begin applying \the [src] on [M]...")) if(!do_mob(user, M, other_delay, extra_checks=CALLBACK(M, TYPE_PROC_REF(/mob/living, can_inject), user, TRUE))) return @@ -47,17 +47,17 @@ /obj/item/stack/medical/proc/heal_carbon(mob/living/carbon/C, mob/user, brute, burn) var/obj/item/bodypart/affecting = C.get_bodypart(check_zone(user.zone_selected)) if(!affecting) //Missing limb? - to_chat(user, "[C] doesn't have \a [parse_zone(user.zone_selected)]!") + to_chat(user, span_warning("[C] doesn't have \a [parse_zone(user.zone_selected)]!")) return if(affecting.status == BODYPART_ORGANIC) //Limb must be organic to be healed - RR if(affecting.brute_dam && brute || affecting.burn_dam && burn) - user.visible_message("[user] applies \the [src] on [C]'s [affecting.name].", "I apply \the [src] on [C]'s [affecting.name].") + user.visible_message(span_green("[user] applies \the [src] on [C]'s [affecting.name]."), span_green("I apply \the [src] on [C]'s [affecting.name].")) if(affecting.heal_damage(brute, burn)) C.update_damage_overlays() return TRUE - to_chat(user, "[C]'s [affecting.name] can not be healed with \the [src]!") + to_chat(user, span_warning("[C]'s [affecting.name] can not be healed with \the [src]!")) return - to_chat(user, "\The [src] won't work on a robotic limb!") + to_chat(user, span_warning("\The [src] won't work on a robotic limb!")) /obj/item/stack/medical/bruise_pack name = "bruise pack" @@ -72,25 +72,25 @@ /obj/item/stack/medical/bruise_pack/heal(mob/living/M, mob/user) if(M.stat == DEAD) - to_chat(user, "[M] is dead! You can not help [M.p_them()].") + to_chat(user, span_warning("[M] is dead! You can not help [M.p_them()].")) return if(isanimal(M)) var/mob/living/simple_animal/critter = M if (!(critter.healable)) - to_chat(user, "I cannot use \the [src] on [M]!") + to_chat(user, span_warning("I cannot use \the [src] on [M]!")) return FALSE else if (critter.health == critter.maxHealth) - to_chat(user, "[M] is at full health.") + to_chat(user, span_notice("[M] is at full health.")) return FALSE - user.visible_message("[user] applies \the [src] on [M].", "I apply \the [src] on [M].") + user.visible_message(span_green("[user] applies \the [src] on [M]."), span_green("I apply \the [src] on [M].")) M.heal_bodypart_damage((heal_brute/2)) return TRUE if(iscarbon(M)) return heal_carbon(M, user, heal_brute, 0) - to_chat(user, "I can't heal [M] with the \the [src]!") + to_chat(user, span_warning("I can't heal [M] with the \the [src]!")) /obj/item/stack/medical/bruise_pack/suicide_act(mob/user) - user.visible_message("[user] is bludgeoning [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is bludgeoning [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return (BRUTELOSS) /obj/item/stack/medical/gauze @@ -110,25 +110,25 @@ var/mob/living/carbon/human/H = M if(!H.bleedsuppress && H.bleed_rate) //so you can't stack bleed suppression H.suppress_bloodloss(stop_bleeding) - to_chat(user, "I bandage [M].") + to_chat(user, span_notice("I bandage [M].")) return TRUE - to_chat(user, "I can not use \the [src] on [M].") + to_chat(user, span_warning("I can not use \the [src] on [M].")) /* /obj/item/stack/medical/gauze/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WIRECUTTER || I.get_sharpness()) if(get_amount() < 2) - to_chat(user, "I need at least two gauzes to do this!") + to_chat(user, span_warning("I need at least two gauzes to do this!")) return new /obj/item/stack/sheet/cloth(user.drop_location()) - user.visible_message("[user] cuts [src] into pieces of cloth with [I].", \ - "I cut [src] into pieces of cloth with [I].", \ - "I hear cutting.") + user.visible_message(span_notice("[user] cuts [src] into pieces of cloth with [I]."), \ + span_notice("I cut [src] into pieces of cloth with [I]."), \ + span_hear("I hear cutting.")) use(2) else return ..()*/ /obj/item/stack/medical/gauze/suicide_act(mob/living/user) - user.visible_message("[user] begins tightening \the [src] around [user.p_their()] neck! It looks like [user.p_they()] forgot how to use medical supplies!") + user.visible_message(span_suicide("[user] begins tightening \the [src] around [user.p_their()] neck! It looks like [user.p_they()] forgot how to use medical supplies!")) return OXYLOSS /obj/item/stack/medical/gauze/improvised @@ -156,14 +156,14 @@ /obj/item/stack/medical/ointment/heal(mob/living/M, mob/user) if(M.stat == DEAD) - to_chat(user, "[M] is dead! You can not help [M.p_them()].") + to_chat(user, span_warning("[M] is dead! You can not help [M.p_them()].")) return if(iscarbon(M)) return heal_carbon(M, user, 0, heal_burn) - to_chat(user, "I can't heal [M] with the \the [src]!") + to_chat(user, span_warning("I can't heal [M] with the \the [src]!")) /obj/item/stack/medical/ointment/suicide_act(mob/living/user) - user.visible_message("[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?") + user.visible_message(span_suicide("[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?")) return TOXLOSS /obj/item/stack/medical/suture @@ -190,23 +190,23 @@ /obj/item/stack/medical/suture/heal(mob/living/M, mob/user) . = ..() if(M.stat == DEAD) - to_chat(user, "[M] is dead! You can not help [M.p_them()].") + to_chat(user, span_warning("[M] is dead! You can not help [M.p_them()].")) return if(iscarbon(M)) return heal_carbon(M, user, heal_brute, 0) if(isanimal(M)) var/mob/living/simple_animal/critter = M if (!(critter.healable)) - to_chat(user, "I cannot use \the [src] on [M]!") + to_chat(user, span_warning("I cannot use \the [src] on [M]!")) return FALSE else if (critter.health == critter.maxHealth) - to_chat(user, "[M] is at full health.") + to_chat(user, span_notice("[M] is at full health.")) return FALSE - user.visible_message("[user] applies \the [src] on [M].", "I apply \the [src] on [M].") + user.visible_message(span_green("[user] applies \the [src] on [M]."), span_green("I apply \the [src] on [M].")) M.heal_bodypart_damage(heal_brute) return TRUE - to_chat(user, "I can't heal [M] with the \the [src]!") + to_chat(user, span_warning("I can't heal [M] with the \the [src]!")) /obj/item/stack/medical/mesh name = "regenerative mesh" @@ -238,35 +238,35 @@ /obj/item/stack/medical/mesh/heal(mob/living/M, mob/user) . = ..() if(M.stat == DEAD) - to_chat(user, "[M] is dead! You can not help [M.p_them()].") + to_chat(user, span_warning("[M] is dead! You can not help [M.p_them()].")) return if(iscarbon(M)) return heal_carbon(M, user, 0, heal_burn) - to_chat(user, "I can't heal [M] with the \the [src]!") + to_chat(user, span_warning("I can't heal [M] with the \the [src]!")) /obj/item/stack/medical/mesh/try_heal(mob/living/M, mob/user, silent = FALSE) if(!is_open) - to_chat(user, "I need to open [src] first.") + to_chat(user, span_warning("I need to open [src] first.")) return . = ..() /obj/item/stack/medical/mesh/AltClick(mob/living/user) if(!is_open) - to_chat(user, "I need to open [src] first.") + to_chat(user, span_warning("I need to open [src] first.")) return . = ..() /obj/item/stack/medical/mesh/attack_hand(mob/user) if(!is_open & user.get_inactive_held_item() == src) - to_chat(user, "I need to open [src] first.") + to_chat(user, span_warning("I need to open [src] first.")) return . = ..() /obj/item/stack/medical/mesh/attack_self(mob/user) if(!is_open) is_open = TRUE - to_chat(user, "I open the sterile mesh package.") + to_chat(user, span_notice("I open the sterile mesh package.")) update_icon() playsound(src, 'sound/blank.ogg', 20, TRUE) return diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 6532642da..f0edc761e 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ qdel() /obj/item/stack/rods/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins to stuff \the [src] down [user.p_their()] throat! It looks like [user.p_theyre()] trying to commit suicide!")//it looks like theyre ur mum + user.visible_message(span_suicide("[user] begins to stuff \the [src] down [user.p_their()] throat! It looks like [user.p_theyre()] trying to commit suicide!"))//it looks like theyre ur mum return BRUTELOSS /obj/item/stack/rods/Initialize(mapload, new_amount, merge = TRUE) @@ -49,14 +49,14 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ /obj/item/stack/rods/attackby(obj/item/W, mob/user, params) if(W.tool_behaviour == TOOL_WELDER) if(get_amount() < 2) - to_chat(user, "I need at least two rods to do this!") + to_chat(user, span_warning("I need at least two rods to do this!")) return if(W.use_tool(src, user, 0, volume=40)) var/obj/item/stack/sheet/metal/new_item = new(usr.loc) - user.visible_message("[user.name] shaped [src] into metal with [W].", \ - "I shape [src] into metal with [W].", \ - "I hear welding.") + user.visible_message(span_notice("[user.name] shaped [src] into metal with [W]."), \ + span_notice("I shape [src] into metal with [W]."), \ + span_hear("I hear welding.")) var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_held_item()==R) @@ -67,9 +67,9 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ else if(istype(W, /obj/item/reagent_containers/food/snacks)) var/obj/item/reagent_containers/food/snacks/S = W if(amount != 1) - to_chat(user, "I must use a single rod!") + to_chat(user, span_warning("I must use a single rod!")) else if(S.w_class > WEIGHT_CLASS_SMALL) - to_chat(user, "The ingredient is too big for [src]!") + to_chat(user, span_warning("The ingredient is too big for [src]!")) else var/obj/item/reagent_containers/food/snacks/customizable/A = new/obj/item/reagent_containers/food/snacks/customizable/kebab(get_turf(src)) A.initialize_custom_food(src, S, user) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 07354a6ef..02e3b37e9 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -29,7 +29,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ tableVariant = /obj/structure/table/glass /obj/item/stack/sheet/glass/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins to slice [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins to slice [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /obj/item/stack/sheet/glass/cyborg @@ -53,7 +53,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ return CC.use(5) use(1) - to_chat(user, "I attach wire to the [name].") + to_chat(user, span_notice("I attach wire to the [name].")) var/obj/item/stack/light_w/new_tile = new(user.loc) new_tile.add_fingerprint(user) else if(istype(W, /obj/item/stack/rods)) @@ -67,7 +67,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ if(QDELETED(src) && replace) user.put_in_hands(RG) else - to_chat(user, "I need one rod and one sheet of glass to make reinforced glass!") + to_chat(user, span_warning("I need one rod and one sheet of glass to make reinforced glass!")) return else return ..() @@ -113,7 +113,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \ if(QDELETED(src) && replace) user.put_in_hands(RG) else - to_chat(user, "I need one rod and one sheet of plasma glass to make reinforced plasma glass!") + to_chat(user, span_warning("I need one rod and one sheet of plasma glass to make reinforced plasma glass!")) return else return ..() @@ -256,7 +256,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( /obj/item/shard/suicide_act(mob/user) - user.visible_message("[user] is slitting [user.p_their()] [pick("wrists", "throat")] with the shard of glass! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message(span_suicide("[user] is slitting [user.p_their()] [pick("wrists", "throat")] with the shard of glass! It looks like [user.p_theyre()] trying to commit suicide.")) return (BRUTELOSS) @@ -301,12 +301,12 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( if(ishuman(user)) var/mob/living/carbon/human/H = user if(!H.gloves && !HAS_TRAIT(H, TRAIT_PIERCEIMMUNE)) // golems, etc - to_chat(H, "[src] cuts into your hand!") + to_chat(H, span_warning("[src] cuts into your hand!")) H.apply_damage(force*0.5, BRUTE, hit_hand) else if(ismonkey(user)) var/mob/living/carbon/monkey/M = user if(!HAS_TRAIT(M, TRAIT_PIERCEIMMUNE)) - to_chat(M, "[src] cuts into your hand!") + to_chat(M, span_warning("[src] cuts into your hand!")) M.apply_damage(force*0.5, BRUTE, hit_hand) @@ -326,7 +326,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( if(G.amount >= G.max_amount) continue G.attackby(NG, user) - to_chat(user, "I add the newly-formed [NG.name] to the stack. It now contains [NG.amount] sheet\s.") + to_chat(user, span_notice("I add the newly-formed [NG.name] to the stack. It now contains [NG.amount] sheet\s.")) qdel(src) return TRUE diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 07c371367..26562b261 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -218,9 +218,9 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ /obj/item/stack/sheet/animalhide/attackby(obj/item/W, mob/user, params) if(W.get_sharpness()) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) - user.visible_message("[user] starts cutting hair off \the [src].", "I start cutting the hair off \the [src]...", "I hear the sound of a knife rubbing against flesh.") + user.visible_message(span_notice("[user] starts cutting hair off \the [src]."), span_notice("I start cutting the hair off \the [src]..."), span_hear("I hear the sound of a knife rubbing against flesh.")) if(do_after(user, 50, target = src)) - to_chat(user, "I cut the hair from this [src.singular_name].") + to_chat(user, span_notice("I cut the hair from this [src.singular_name].")) new /obj/item/stack/sheet/hairlesshide(user.drop_location(), 1) use(1) else diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 2c223435b..b6d0a1599 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -18,11 +18,11 @@ var/obj/item/stack/sheet/metal/M = O if (M.use(1)) var/obj/item/L = new /obj/item/stack/tile/light(user.drop_location()) - to_chat(user, "I make a light tile.") + to_chat(user, span_notice("I make a light tile.")) L.add_fingerprint(user) use(1) else - to_chat(user, "I need one metal sheet to finish the light tile!") + to_chat(user, span_warning("I need one metal sheet to finish the light tile!")) else return ..() diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index e3d6e8863..bc93fff79 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -79,7 +79,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/emptysandbag/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stack/ore/glass)) var/obj/item/stack/ore/glass/G = W - to_chat(user, "I fill the sandbag.") + to_chat(user, span_notice("I fill the sandbag.")) var/obj/item/stack/sheet/mineral/sandbags/I = new /obj/item/stack/sheet/mineral/sandbags(drop_location()) qdel(src) if (Adjacent(user) && !issilicon(user)) @@ -161,7 +161,7 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \ material_type = /datum/material/plasma /obj/item/stack/sheet/mineral/plasma/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins licking \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins licking \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return TOXLOSS//dont you kids know that stuff is toxic? GLOBAL_LIST_INIT(plasma_recipes, list ( \ diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 1f838e835..ed9f0cf49 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -136,7 +136,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ . += GLOB.metal_recipes /obj/item/stack/sheet/metal/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins whacking [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins whacking [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /* @@ -451,7 +451,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ var/atom/droploc = drop_location() if(use(1)) playsound(I, 'sound/blank.ogg', 50, TRUE, -1) - to_chat(user, "I stamp the cardboard! It's a clown box! Honk!") + to_chat(user, span_notice("I stamp the cardboard! It's a clown box! Honk!")) if (amount >= 0) new/obj/item/storage/box/clown(droploc) //bugfix else @@ -485,12 +485,12 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \ /obj/item/stack/sheet/runed_metal/attack_self(mob/living/user) if(!iscultist(user)) - to_chat(user, "Only one with forbidden knowledge could hope to work this metal...") + to_chat(user, span_warning("Only one with forbidden knowledge could hope to work this metal...")) return var/turf/T = get_turf(user) //we may have moved. adjust as needed... var/area/A = get_area(user) if((!is_station_level(T.z) && !is_mining_level(T.z)) || (A && !(A.flags_1 & CULT_PERMITTED_1))) - to_chat(user, "The veil is not weak enough here.") + to_chat(user, span_warning("The veil is not weak enough here.")) return FALSE return ..() diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index ec95de031..cd633fee7 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -36,7 +36,7 @@ /obj/item/stack/grind_requirements() if(is_cyborg) - to_chat(usr, "[src] is electronically synthesized in my chassis and can't be ground up!") + to_chat(usr, span_warning("[src] is electronically synthesized in my chassis and can't be ground up!")) return return TRUE @@ -115,7 +115,7 @@ . += "There are [get_amount()] in the stack." else . += "There is [get_amount()] in the stack." - . += "Alt-click to take a custom amount." + . += span_notice("Alt-click to take a custom amount.") /obj/item/stack/proc/get_amount() if(is_cyborg) @@ -206,7 +206,7 @@ if(!building_checks(R, multiplier)) return if (R.time) - usr.visible_message("[usr] starts building \a [R.title].", "I start building \a [R.title]...") + usr.visible_message(span_notice("[usr] starts building \a [R.title]."), span_notice("I start building \a [R.title]...")) if (!do_after(usr, R.time, target = usr)) return if(!building_checks(R, multiplier)) @@ -261,22 +261,22 @@ /obj/item/stack/proc/building_checks(datum/stack_recipe/R, multiplier) if (get_amount() < R.req_amount*multiplier) if (R.req_amount*multiplier>1) - to_chat(usr, "I haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!") + to_chat(usr, span_warning("I haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!")) else - to_chat(usr, "I haven't got enough [src] to build \the [R.title]!") + to_chat(usr, span_warning("I haven't got enough [src] to build \the [R.title]!")) return FALSE var/turf/T = get_turf(usr) var/obj/D = R.result_type if(R.window_checks && !valid_window_location(T, initial(D.dir) == FULLTILE_WINDOW_DIR ? FULLTILE_WINDOW_DIR : usr.dir)) - to_chat(usr, "The [R.title] won't fit here!") + to_chat(usr, span_warning("The [R.title] won't fit here!")) return FALSE if(R.one_per_turf && (locate(R.result_type) in T)) - to_chat(usr, "There is another [R.title] here!") + to_chat(usr, span_warning("There is another [R.title] here!")) return FALSE if(R.on_floor) if(!isfloorturf(T)) - to_chat(usr, "\The [R.title] must be constructed on the floor!") + to_chat(usr, span_warning("\The [R.title] must be constructed on the floor!")) return FALSE for(var/obj/AM in T) if(istype(AM,/obj/structure/grille)) @@ -288,7 +288,7 @@ if(!W.fulltile) continue if(AM.density) - to_chat(usr, "Theres a [AM.name] here. You cant make a [R.title] here!") + to_chat(usr, span_warning("Theres a [AM.name] here. You cant make a [R.title] here!")) return FALSE if(R.placement_checks) switch(R.placement_checks) @@ -297,11 +297,11 @@ for(var/direction in GLOB.cardinals) step = get_step(T, direction) if(locate(R.result_type) in step) - to_chat(usr, "\The [R.title] must not be built directly adjacent to another!") + to_chat(usr, span_warning("\The [R.title] must not be built directly adjacent to another!")) return FALSE if(STACK_CHECK_ADJACENT) if(locate(R.result_type) in range(1, T)) - to_chat(usr, "\The [R.title] must be constructed at least one tile away from others of its type!") + to_chat(usr, span_warning("\The [R.title] must be constructed at least one tile away from others of its type!")) return FALSE return TRUE @@ -323,11 +323,11 @@ if(get_amount() < amount) if(singular_name) if(amount > 1) - to_chat(user, "I need at least [amount] [singular_name]\s to do this!") + to_chat(user, span_warning("I need at least [amount] [singular_name]\s to do this!")) else - to_chat(user, "I need at least [amount] [singular_name] to do this!") + to_chat(user, span_warning("I need at least [amount] [singular_name] to do this!")) else - to_chat(user, "I need at least [amount] to do this!") + to_chat(user, span_warning("I need at least [amount] to do this!")) return FALSE @@ -407,7 +407,7 @@ return else change_stack(user, stackmaterial) - to_chat(user, "I take [stackmaterial] sheets out of the stack.") + to_chat(user, span_notice("I take [stackmaterial] sheets out of the stack.")) /obj/item/stack/proc/change_stack(mob/user, amount) if(!use(amount, TRUE, FALSE)) @@ -426,7 +426,7 @@ if(istype(W, merge_type)) var/obj/item/stack/S = W if(merge(S)) - to_chat(user, "My [S.name] stack now contains [S.get_amount()] [S.singular_name]\s.") + to_chat(user, span_notice("My [S.name] stack now contains [S.get_amount()] [S.singular_name]\s.")) else . = ..() diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm index 23482cfe3..8843e4b91 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -17,7 +17,7 @@ if(hidden_uplink) hidden_uplink.telecrystals += amount use(amount) - to_chat(user, "I press [src] onto myself and charge your hidden uplink.") + to_chat(user, span_notice("I press [src] onto myself and charge your hidden uplink.")) else return ..() @@ -28,11 +28,11 @@ if(istype(I, /obj/item/cartridge/virus/frame)) var/obj/item/cartridge/virus/frame/cart = I if(!cart.charges) - to_chat(user, "[cart] is out of charges, it's refusing to accept [src].") + to_chat(user, span_notice("[cart] is out of charges, it's refusing to accept [src].")) return cart.telecrystals += amount use(amount) - to_chat(user, "I slot [src] into [cart]. The next time it's used, it will also give telecrystals.") + to_chat(user, span_notice("I slot [src] into [cart]. The next time it's used, it will also give telecrystals.")) /obj/item/stack/telecrystal/five amount = 5 diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index f08664140..6b949d67a 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -25,26 +25,26 @@ if (W.tool_behaviour == TOOL_WELDER) if(get_amount() < 4) - to_chat(user, "I need at least four tiles to do this!") + to_chat(user, span_warning("I need at least four tiles to do this!")) return if(!mineralType) - to_chat(user, "I can not reform this!") + to_chat(user, span_warning("I can not reform this!")) return if(W.use_tool(src, user, 0, volume=40)) if(mineralType == "plasma") atmos_spawn_air("plasma=5;TEMP=1000") - user.visible_message("[user.name] sets the plasma tiles on fire!", \ - "I set the plasma tiles on fire!") + user.visible_message(span_warning("[user.name] sets the plasma tiles on fire!"), \ + span_warning("I set the plasma tiles on fire!")) qdel(src) return if (mineralType == "metal") var/obj/item/stack/sheet/metal/new_item = new(user.loc) - user.visible_message("[user.name] shaped [src] into metal with the welding tool.", \ - "I shaped [src] into metal with the welding tool.", \ - "I hear welding.") + user.visible_message(span_notice("[user.name] shaped [src] into metal with the welding tool."), \ + span_notice("I shaped [src] into metal with the welding tool."), \ + span_hear("I hear welding.")) var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_held_item()==R) @@ -55,9 +55,9 @@ else var/sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineralType]") var/obj/item/stack/sheet/mineral/new_item = new sheet_type(user.loc) - user.visible_message("[user.name] shaped [src] into a sheet with the welding tool.", \ - "I shaped [src] into a sheet with the welding tool.", \ - "I hear welding.") + user.visible_message(span_notice("[user.name] shaped [src] into a sheet with the welding tool."), \ + span_notice("I shaped [src] into a sheet with the welding tool."), \ + span_hear("I hear welding.")) var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_held_item()==R) diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index 2c2cfd995..fb33dde99 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -38,7 +38,7 @@ grind_results = list(/datum/reagent/cellulose = 5) /obj/item/stack/packageWrap/suicide_act(mob/living/user) - user.visible_message("[user] begins wrapping [user.p_them()]self in \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins wrapping [user.p_them()]self in \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) if(use(3)) var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(user.loc)) P.icon_state = "deliverypackage5" @@ -46,7 +46,7 @@ P.add_fingerprint(user) return OXYLOSS else - to_chat(user, "I need more paper!") + to_chat(user, span_warning("I need more paper!")) return SHAME /obj/item/proc/can_be_package_wrapped() //can the item be wrapped with package wrapper into a delivery package @@ -97,7 +97,7 @@ if(O.opened) return if(!O.delivery_icon) //no delivery icon means unwrappable closet (e.g. body bags) - to_chat(user, "I can't wrap this!") + to_chat(user, span_warning("I can't wrap this!")) return if(use(3)) var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(O.loc)) @@ -106,13 +106,13 @@ P.add_fingerprint(user) O.add_fingerprint(user) else - to_chat(user, "I need more paper!") + to_chat(user, span_warning("I need more paper!")) return else - to_chat(user, "The object you are trying to wrap is unsuitable for the sorting machinery!") + to_chat(user, span_warning("The object you are trying to wrap is unsuitable for the sorting machinery!")) return - user.visible_message("[user] wraps [target].") + user.visible_message(span_notice("[user] wraps [target].")) user.log_message("has used [name] on [key_name(target)]", LOG_ATTACK, color="blue") /obj/item/stack/packageWrap/use(used, transfer = FALSE) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 9edc08ecf..cfaf7e5b4 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -55,7 +55,7 @@ STR.max_combined_w_class = 35 /obj/item/storage/backpack/holding/suicide_act(mob/living/user) - user.visible_message("[user] is jumping into [src]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message(span_suicide("[user] is jumping into [src]! It looks like [user.p_theyre()] trying to commit suicide.")) user.dropItemToGround(src, TRUE) user.Stun(100, ignore_canstun = TRUE) sleep(20) @@ -84,7 +84,7 @@ STR.max_combined_w_class = 60 /obj/item/storage/backpack/santabag/suicide_act(mob/user) - user.visible_message("[user] places [src] over [user.p_their()] head and pulls it tight! It looks like [user.p_they()] [user.p_are()]n't in the Christmas spirit...") + user.visible_message(span_suicide("[user] places [src] over [user.p_their()] head and pulls it tight! It looks like [user.p_they()] [user.p_are()]n't in the Christmas spirit...")) return (OXYLOSS) /obj/item/storage/backpack/santabag/proc/regenerate_presents() diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index e9e493245..e75e848d1 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -51,7 +51,7 @@ STR.set_holdable(null, list(/obj/item/disk/nuclear)) /obj/item/storage/bag/trash/suicide_act(mob/user) - user.visible_message("[user] puts [src] over [user.p_their()] head and starts chomping at the insides! Disgusting!") + user.visible_message(span_suicide("[user] puts [src] over [user.p_their()] head and starts chomping at the insides! Disgusting!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) return (TOXLOSS) @@ -73,7 +73,7 @@ J.mybag=src J.update_icon() else - to_chat(user, "I are unable to fit my [name] into the [J.name].") + to_chat(user, span_warning("I are unable to fit my [name] into the [J.name].")) return /obj/item/storage/bag/trash/bluespace @@ -150,17 +150,17 @@ show_message = TRUE else if(!spam_protection) - to_chat(user, "My [name] is full and can't hold any more!") + to_chat(user, span_warning("My [name] is full and can't hold any more!")) spam_protection = TRUE continue if(show_message) playsound(user, "rustle", 50, TRUE) if (box) - user.visible_message("[user] offloads the ores beneath [user.p_them()] into [box].", \ - "I offload the ores beneath you into my [box].") + user.visible_message(span_notice("[user] offloads the ores beneath [user.p_them()] into [box]."), \ + span_notice("I offload the ores beneath you into my [box].")) else - user.visible_message("[user] scoops up the ores beneath [user.p_them()].", \ - "I scoop up the ores beneath you with my [name].") + user.visible_message(span_notice("[user] scoops up the ores beneath [user.p_them()]."), \ + span_notice("I scoop up the ores beneath you with my [name].")) spam_protection = FALSE /obj/item/storage/bag/ore/cyborg diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index c6f71010c..0d4fc6831 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -13,7 +13,7 @@ var/content_overlays = FALSE //If this is true, the belt will gain overlays based on what it's holding /obj/item/storage/belt/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins belting [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins belting [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /obj/item/storage/belt/update_icon() @@ -652,18 +652,18 @@ /obj/item/storage/belt/sabre/examine(mob/user) . = ..() if(length(contents)) - . += "Alt-click it to quickly draw the blade." + . += span_notice("Alt-click it to quickly draw the blade.") /obj/item/storage/belt/sabre/AltClick(mob/user) if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return if(length(contents)) var/obj/item/I = contents[1] - user.visible_message("[user] takes [I] out of [src].", "I take [I] out of [src].") + user.visible_message(span_notice("[user] takes [I] out of [src]."), span_notice("I take [I] out of [src].")) user.put_in_hands(I) update_icon() else - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) /obj/item/storage/belt/sabre/update_icon() icon_state = "sheath" diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index 127391d0f..2c136b797 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -15,7 +15,7 @@ STR.max_items = 1 /obj/item/storage/book/attack_self(mob/user) - to_chat(user, "The pages of [title] have been cut out!") + to_chat(user, span_notice("The pages of [title] have been cut out!")) GLOBAL_LIST_INIT(biblenames, list("Bible", "Quran", "Scrapbook", "Burning Bible", "Clown Bible", "Banana Bible", "Creeper Bible", "White Bible", "Holy Light", "The God Delusion", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "Melted Bible", "Necronomicon","Insulationism")) //If you get these two lists not matching in size, there will be runtimes and I will hurt you in ways you couldn't even begin to imagine @@ -46,7 +46,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", AddComponent(/datum/component/anti_magic, FALSE, TRUE) /obj/item/storage/book/bible/suicide_act(mob/user) - user.visible_message("[user] is offering [user.p_them()]self to [deity_name]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is offering [user.p_them()]self to [deity_name]! It looks like [user.p_theyre()] trying to commit suicide!")) return (BRUTELOSS) /obj/item/storage/book/bible/attack_self(mob/living/carbon/human/H) @@ -95,7 +95,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", for(var/X in H.bodyparts) var/obj/item/bodypart/BP = X if(BP.status == BODYPART_ROBOTIC) - to_chat(user, "[src.deity_name] refuses to heal this metallic taint!") + to_chat(user, span_warning("[src.deity_name] refuses to heal this metallic taint!")) return 0 var/heal_amt = 10 @@ -106,8 +106,8 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", var/obj/item/bodypart/affecting = X if(affecting.heal_damage(heal_amt, heal_amt, null, BODYPART_ORGANIC)) H.update_damage_overlays() - H.visible_message("[user] heals [H] with the power of [deity_name]!") - to_chat(H, "May the power of [deity_name] compel you to be healed!") + H.visible_message(span_notice("[user] heals [H] with the power of [deity_name]!")) + to_chat(H, span_boldnotice("May the power of [deity_name] compel you to be healed!")) playsound(src.loc, "punch", 25, TRUE, -1) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "blessing", /datum/mood_event/blessing) return 1 @@ -115,11 +115,11 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", /obj/item/storage/book/bible/attack(mob/living/M, mob/living/carbon/human/user, heal_mode = TRUE) if (!user.IsAdvancedToolUser()) - to_chat(user, "I don't have the dexterity to do this!") + to_chat(user, span_warning("I don't have the dexterity to do this!")) return if (HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) - to_chat(user, "[src] slips out of my hand and hits my head.") + to_chat(user, span_danger("[src] slips out of my hand and hits my head.")) user.take_bodypart_damage(10) user.Unconscious(400) return @@ -129,7 +129,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", chaplain = 1 if(!chaplain) - to_chat(user, "The book sizzles in my hands.") + to_chat(user, span_danger("The book sizzles in my hands.")) user.take_bodypart_damage(0,10) return @@ -140,7 +140,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", if (M.stat != DEAD) if(chaplain && user == M) - to_chat(user, "I can't heal yourself!") + to_chat(user, span_warning("I can't heal yourself!")) return if(ishuman(M) && prob(60) && bless(M, user)) @@ -149,16 +149,16 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", var/mob/living/carbon/C = M if(!istype(C.head, /obj/item/clothing/head/helmet)) C.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5, 60) - to_chat(C, "I feel dumber.") + to_chat(C, span_danger("I feel dumber.")) if(smack) - M.visible_message("[user] beats [M] over the head with [src]!", \ - "[user] beats [M] over the head with [src]!") + M.visible_message(span_danger("[user] beats [M] over the head with [src]!"), \ + span_danger("[user] beats [M] over the head with [src]!")) playsound(src.loc, "punch", 25, TRUE, -1) log_combat(user, M, "attacked", src) else - M.visible_message("[user] smacks [M]'s lifeless corpse with [src].") + M.visible_message(span_danger("[user] smacks [M]'s lifeless corpse with [src].")) playsound(src.loc, "punch", 25, TRUE, -1) /obj/item/storage/book/bible/afterattack(atom/A, mob/user, proximity) @@ -166,30 +166,30 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", if(!proximity) return if(isfloorturf(A)) - to_chat(user, "I hit the floor with the bible.") + to_chat(user, span_notice("I hit the floor with the bible.")) if(user.mind && (user.mind.isholy)) for(var/obj/effect/rune/R in orange(2,user)) R.invisibility = 0 if(user.mind && (user.mind.isholy)) if(A.reagents && A.reagents.has_reagent(/datum/reagent/water)) // blesses all the water in the holder - to_chat(user, "I bless [A].") + to_chat(user, span_notice("I bless [A].")) var/water2holy = A.reagents.get_reagent_amount(/datum/reagent/water) A.reagents.del_reagent(/datum/reagent/water) A.reagents.add_reagent(/datum/reagent/water/holywater,water2holy) if(A.reagents && A.reagents.has_reagent(/datum/reagent/fuel/unholywater)) // yeah yeah, copy pasted code - sue me - to_chat(user, "I purify [A].") + to_chat(user, span_notice("I purify [A].")) var/unholy2clean = A.reagents.get_reagent_amount(/datum/reagent/fuel/unholywater) A.reagents.del_reagent(/datum/reagent/fuel/unholywater) A.reagents.add_reagent(/datum/reagent/water/holywater,unholy2clean) if(istype(A, /obj/item/storage/book/bible) && !istype(A, /obj/item/storage/book/bible/syndicate)) - to_chat(user, "I purify [A], conforming it to my belief.") + to_chat(user, span_notice("I purify [A], conforming it to my belief.")) var/obj/item/storage/book/bible/B = A B.name = name B.icon_state = icon_state B.item_state = item_state if(istype(A, /obj/item/twohanded/required/cult_bastard) && !iscultist(user)) var/obj/item/twohanded/required/cult_bastard/sword = A - to_chat(user, "I begin to exorcise [sword].") + to_chat(user, span_notice("I begin to exorcise [sword].")) playsound(src,'sound/blank.ogg',40,TRUE) if(do_after(user, 40, target = sword)) playsound(src,'sound/blank.ogg',60,TRUE) @@ -202,14 +202,14 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", SS.release_shades(user) qdel(SS) new /obj/item/nullrod/claymore(get_turf(sword)) - user.visible_message("[user] has purified [sword]!") + user.visible_message(span_notice("[user] has purified [sword]!")) qdel(sword) else if(istype(A, /obj/item/soulstone) && !iscultist(user)) var/obj/item/soulstone/SS = A if(SS.purified) return - to_chat(user, "I begin to exorcise [SS].") + to_chat(user, span_notice("I begin to exorcise [SS].")) playsound(src,'sound/blank.ogg',40,TRUE) if(do_after(user, 40, target = SS)) playsound(src,'sound/blank.ogg',60,TRUE) @@ -224,7 +224,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", for(var/mob/living/simple_animal/shade/EX in SS) EX.icon_state = "ghost1" EX.name = "Purified [initial(EX.name)]" - user.visible_message("[user] has purified [SS]!") + user.visible_message(span_notice("[user] has purified [SS]!")) /obj/item/storage/book/bible/booze desc = "" @@ -249,12 +249,12 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", if (uses) H.mind.isholy = TRUE uses -= 1 - to_chat(H, "I try to open the book AND IT BITES YOU!") + to_chat(H, span_danger("I try to open the book AND IT BITES YOU!")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) H.apply_damage(5, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) - to_chat(H, "My name appears on the inside cover, in blood.") + to_chat(H, span_notice("My name appears on the inside cover, in blood.")) var/ownername = H.real_name - desc += "The name [ownername] is written in blood inside the cover." + desc += span_warning("The name [ownername] is written in blood inside the cover.") /obj/item/storage/book/bible/syndicate/attack(mob/living/M, mob/living/carbon/human/user, heal_mode = TRUE) if (user.used_intent.type == INTENT_HELP) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 51f6f6823..5e5bd0141 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -41,12 +41,12 @@ /obj/item/storage/box/suicide_act(mob/living/carbon/user) var/obj/item/bodypart/head/myhead = user.get_bodypart(BODY_ZONE_HEAD) if(myhead) - user.visible_message("[user] puts [user.p_their()] head into \the [src], and begins closing it! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] puts [user.p_their()] head into \the [src], and begins closing it! It looks like [user.p_theyre()] trying to commit suicide!")) myhead.dismember() myhead.forceMove(src)//force your enemies to kill themselves with your head collection box! playsound(user, "desceration-01.ogg", 50, TRUE, -1) return BRUTELOSS - user.visible_message("[user] beating [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] beating [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /obj/item/storage/box/update_icon() @@ -61,12 +61,12 @@ if(!foldable) return if(contents.len) - to_chat(user, "I can't fold this box with items still inside!") + to_chat(user, span_warning("I can't fold this box with items still inside!")) return if(!ispath(foldable)) return - to_chat(user, "I fold [src] flat.") + to_chat(user, span_notice("I fold [src] flat.")) var/obj/item/I = new foldable qdel(src) user.put_in_hands(I) @@ -737,14 +737,14 @@ foldable = null /obj/item/storage/box/hug/suicide_act(mob/user) - user.visible_message("[user] clamps the box of hugs on [user.p_their()] jugular! Guess it wasn't such a hugbox after all..") + user.visible_message(span_suicide("[user] clamps the box of hugs on [user.p_their()] jugular! Guess it wasn't such a hugbox after all..")) return (BRUTELOSS) /obj/item/storage/box/hug/attack_self(mob/user) ..() user.changeNext_move(CLICK_CD_MELEE) playsound(loc, "rustle", 50, TRUE, -5) - user.visible_message("[user] hugs \the [src].","I hug \the [src].") + user.visible_message(span_notice("[user] hugs \the [src]."),span_notice("I hug \the [src].")) /////clown box & honkbot assembly /obj/item/storage/box/clown @@ -755,12 +755,12 @@ /obj/item/storage/box/clown/attackby(obj/item/I, mob/user, params) if((istype(I, /obj/item/bodypart/l_arm/robot)) || (istype(I, /obj/item/bodypart/r_arm/robot))) if(contents.len) //prevent accidently deleting contents - to_chat(user, "I need to empty [src] out first!") + to_chat(user, span_warning("I need to empty [src] out first!")) return if(!user.temporarilyRemoveItemFromInventory(I)) return qdel(I) - to_chat(user, "I add some wheels to the [src]! You've got a honkbot assembly now! Honk!") + to_chat(user, span_notice("I add some wheels to the [src]! You've got a honkbot assembly now! Honk!")) var/obj/item/bot_assembly/honkbot/A = new qdel(src) user.put_in_hands(A) @@ -847,17 +847,17 @@ if(istype(W, /obj/item/pen)) //if a pen is used on the sack, dialogue to change its design appears if(contents.len) - to_chat(user, "I can't modify [src] with items still inside!") + to_chat(user, span_warning("I can't modify [src] with items still inside!")) return var/list/designs = list(NODESIGN, NANOTRASEN, SYNDI, HEART, SMILEY, "Cancel") var/switchDesign = input("Select a Design:", "Paper Sack Design", designs[1]) in sortList(designs) if(get_dist(usr, src) > 1) - to_chat(usr, "I have moved too far away!") + to_chat(usr, span_warning("I have moved too far away!")) return var/choice = designs.Find(switchDesign) if(design == designs[choice] || designs[choice] == "Cancel") return 0 - to_chat(usr, "I make some modifications to [src] using your pen.") + to_chat(usr, span_notice("I make some modifications to [src] using your pen.")) design = designs[choice] icon_state = "paperbag_[design]" item_state = "paperbag_[design]" @@ -876,12 +876,12 @@ else if(W.get_sharpness()) if(!contents.len) if(item_state == "paperbag_None") - user.show_message("I cut eyeholes into [src].", MSG_VISUAL) + user.show_message(span_notice("I cut eyeholes into [src]."), MSG_VISUAL) new /obj/item/clothing/head/papersack(user.loc) qdel(src) return 0 else if(item_state == "paperbag_SmileyFace") - user.show_message("I cut eyeholes into [src] and modify the design.", MSG_VISUAL) + user.show_message(span_notice("I cut eyeholes into [src] and modify the design."), MSG_VISUAL) new /obj/item/clothing/head/papersack/smiley(user.loc) qdel(src) return 0 diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index d0e0c97d1..e1b4a1170 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -145,7 +145,7 @@ /obj/item/storage/fancy/cigarettes/examine(mob/user) . = ..() - . += "Alt-click to extract contents." + . += span_notice("Alt-click to extract contents.") /obj/item/storage/fancy/cigarettes/AltClick(mob/living/carbon/user) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) @@ -155,9 +155,9 @@ SEND_SIGNAL(src, COMSIG_TRY_STORAGE_TAKE, W, user) user.put_in_hands(W) contents -= W - to_chat(user, "I take \a [W] out of the pack.") + to_chat(user, span_notice("I take \a [W] out of the pack.")) else - to_chat(user, "There are no [icon_type]s left in the pack.") + to_chat(user, span_notice("There are no [icon_type]s left in the pack.")) /obj/item/storage/fancy/cigarettes/update_icon() if(fancy_open || !contents.len) @@ -196,11 +196,11 @@ SEND_SIGNAL(src, COMSIG_TRY_STORAGE_TAKE, W, M) M.equip_to_slot_if_possible(W, SLOT_WEAR_MASK) contents -= W - to_chat(user, "I take \a [W] out of the pack.") + to_chat(user, span_notice("I take \a [W] out of the pack.")) else ..() else - to_chat(user, "There are no [icon_type]s left in the pack.") + to_chat(user, span_notice("There are no [icon_type]s left in the pack.")) /obj/item/storage/fancy/cigarettes/dromedaryco name = "\improper DromedaryCo packet" diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 439804564..108bdefa9 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -24,7 +24,7 @@ desc = "" /obj/item/storage/firstaid/regular/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins giving [user.p_them()]self aids with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins giving [user.p_them()]self aids with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /obj/item/storage/firstaid/regular/PopulateContents() @@ -134,7 +134,7 @@ damagetype_healed = BURN /obj/item/storage/firstaid/fire/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins rubbing \the [src] against [user.p_them()]self! It looks like [user.p_theyre()] trying to start a fire!") + user.visible_message(span_suicide("[user] begins rubbing \the [src] against [user.p_them()]self! It looks like [user.p_theyre()] trying to start a fire!")) return FIRELOSS /obj/item/storage/firstaid/fire/Initialize(mapload) @@ -159,7 +159,7 @@ damagetype_healed = TOX /obj/item/storage/firstaid/toxin/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins licking the lead paint off \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins licking the lead paint off \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return TOXLOSS /obj/item/storage/firstaid/toxin/Initialize(mapload) @@ -184,7 +184,7 @@ damagetype_healed = OXY /obj/item/storage/firstaid/o2/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins hitting [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins hitting [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return OXYLOSS /obj/item/storage/firstaid/o2/Initialize(mapload) @@ -209,7 +209,7 @@ damagetype_healed = BRUTE /obj/item/storage/firstaid/brute/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins beating [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins beating [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /obj/item/storage/firstaid/brute/Initialize(mapload) @@ -272,7 +272,7 @@ //Making a medibot! if(contents.len >= 1) - to_chat(user, "I need to empty [src] out first!") + to_chat(user, span_warning("I need to empty [src] out first!")) return var/obj/item/bot_assembly/medbot/A = new @@ -285,7 +285,7 @@ else if(istype(src, /obj/item/storage/firstaid/brute)) A.set_skin("brute") user.put_in_hands(A) - to_chat(user, "I add [S] to [src].") + to_chat(user, span_notice("I add [S] to [src].")) A.robot_arm = S.type A.firstaid = type qdel(S) @@ -313,7 +313,7 @@ STR.set_holdable(list(/obj/item/reagent_containers/pill, /obj/item/dice)) /obj/item/storage/pill_bottle/suicide_act(mob/user) - user.visible_message("[user] is trying to get the cap off [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is trying to get the cap off [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return (TOXLOSS) /obj/item/storage/pill_bottle/multiver diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index cfa18eb48..c2ead7e78 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -25,27 +25,27 @@ var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED) if(W.GetID()) if(broken) - to_chat(user, "It appears to be broken.") + to_chat(user, span_danger("It appears to be broken.")) return if(allowed(user)) SEND_SIGNAL(src, COMSIG_TRY_STORAGE_SET_LOCKSTATE, !locked) locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED) if(locked) icon_state = icon_locked - to_chat(user, "I lock the [src.name]!") + to_chat(user, span_danger("I lock the [src.name]!")) SEND_SIGNAL(src, COMSIG_TRY_STORAGE_HIDE_ALL) return else icon_state = icon_closed - to_chat(user, "I unlock the [src.name]!") + to_chat(user, span_danger("I unlock the [src.name]!")) return else - to_chat(user, "Access Denied.") + to_chat(user, span_danger("Access Denied.")) return if(!locked) return ..() else - to_chat(user, "It's locked!") + to_chat(user, span_danger("It's locked!")) /obj/item/storage/lockbox/emag_act(mob/user) if(!broken) @@ -54,7 +54,7 @@ desc += "It appears to be broken." icon_state = src.icon_broken if(user) - visible_message("\The [src] has been broken by [user] with an electromagnetic card!") + visible_message(span_warning("\The [src] has been broken by [user] with an electromagnetic card!")) return /obj/item/storage/lockbox/Entered() @@ -108,7 +108,7 @@ /obj/item/storage/lockbox/medal/examine(mob/user) . = ..() if(!SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)) - . += "Alt-click to [open ? "close":"open"] it." + . += span_notice("Alt-click to [open ? "close":"open"] it.") /obj/item/storage/lockbox/medal/AltClick(mob/user) if(user.canUseTopic(src, BE_CLOSE)) diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index af560d67a..e973fb32e 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -39,22 +39,22 @@ if (W.tool_behaviour == TOOL_SCREWDRIVER) if (W.use_tool(src, user, 20)) open =! open - to_chat(user, "I [open ? "open" : "close"] the service panel.") + to_chat(user, span_notice("I [open ? "open" : "close"] the service panel.")) return if (W.tool_behaviour == TOOL_WIRECUTTER) - to_chat(user, "[src] is protected from this sort of tampering, yet it appears the internal memory wires can still be pulsed.") + to_chat(user, span_danger("[src] is protected from this sort of tampering, yet it appears the internal memory wires can still be pulsed.")) if ((W.tool_behaviour == TOOL_MULTITOOL) && (!l_hacking)) if(open == 1) - to_chat(user, "Now attempting to reset internal memory, please hold.") + to_chat(user, span_danger("Now attempting to reset internal memory, please hold.")) l_hacking = 1 if (W.use_tool(src, user, 400)) - to_chat(user, "Internal memory reset - lock has been disengaged.") + to_chat(user, span_danger("Internal memory reset - lock has been disengaged.")) l_set = 0 l_hacking = 0 else l_hacking = 0 else - to_chat(user, "I must unscrew the service panel before you can pulse the wiring!") + to_chat(user, span_warning("I must unscrew the service panel before you can pulse the wiring!")) return //At this point you have exhausted all the special things to do when locked // ... but it's still locked. diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 80b57cd0f..d7edc4fb7 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -37,7 +37,7 @@ /obj/item/storage/toolbox/suicide_act(mob/user) - user.visible_message("[user] robusts [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] robusts [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return (BRUTELOSS) /obj/item/storage/toolbox/emergency @@ -241,7 +241,7 @@ if(!is_type_in_list(src, allowed_toolbox) && (type != /obj/item/storage/toolbox)) return if(contents.len >= 1) - to_chat(user, "They won't fit in, as there is already stuff inside!") + to_chat(user, span_warning("They won't fit in, as there is already stuff inside!")) return if(T.use(10)) var/obj/item/bot_assembly/floorbot/B = new @@ -259,8 +259,8 @@ B.toolbox_color = "s" user.put_in_hands(B) B.update_icon() - to_chat(user, "I add the tiles into the empty [name]. They protrude from the top.") + to_chat(user, span_notice("I add the tiles into the empty [name]. They protrude from the top.")) qdel(src) else - to_chat(user, "I need 10 floor tiles to start building a floorbot!") + to_chat(user, span_warning("I need 10 floor tiles to start building a floorbot!")) return diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index 9b36b1018..83f9e470e 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -100,7 +100,7 @@ /obj/item/storage/wallet/examine() . = ..() if(front_id) - . += "Alt-click to remove the id." + . += span_notice("Alt-click to remove the id.") /obj/item/storage/wallet/GetID() return front_id diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index b8effafe0..e41dc3a3d 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -26,7 +26,7 @@ return cell /obj/item/melee/baton/suicide_act(mob/user) - user.visible_message("[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!")) return (FIRELOSS) /obj/item/melee/baton/Initialize() @@ -70,23 +70,23 @@ /obj/item/melee/baton/examine(mob/user) . = ..() if(cell) - . += "\The [src] is [round(cell.percent())]% charged." + . += span_notice("\The [src] is [round(cell.percent())]% charged.") else - . += "\The [src] does not have a power source installed." + . += span_warning("\The [src] does not have a power source installed.") /obj/item/melee/baton/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stock_parts/cell)) var/obj/item/stock_parts/cell/C = W if(cell) - to_chat(user, "[src] already has a cell!") + to_chat(user, span_warning("[src] already has a cell!")) else if(C.maxcharge < hitcost) - to_chat(user, "[src] requires a higher capacity cell.") + to_chat(user, span_notice("[src] requires a higher capacity cell.")) return if(!user.transferItemToLoc(W, src)) return cell = W - to_chat(user, "I install a cell in [src].") + to_chat(user, span_notice("I install a cell in [src].")) update_icon() else if(W.tool_behaviour == TOOL_SCREWDRIVER) @@ -94,7 +94,7 @@ cell.update_icon() cell.forceMove(get_turf(src)) cell = null - to_chat(user, "I remove the cell from [src].") + to_chat(user, span_notice("I remove the cell from [src].")) status = 0 update_icon() else @@ -103,21 +103,21 @@ /obj/item/melee/baton/attack_self(mob/user) if(cell && cell.charge > hitcost) status = !status - to_chat(user, "[src] is now [status ? "on" : "off"].") + to_chat(user, span_notice("[src] is now [status ? "on" : "off"].")) playsound(loc, "sparks", 75, TRUE, -1) else status = 0 if(!cell) - to_chat(user, "[src] does not have a power source!") + to_chat(user, span_warning("[src] does not have a power source!")) else - to_chat(user, "[src] is out of charge.") + to_chat(user, span_warning("[src] is out of charge.")) update_icon() add_fingerprint(user) /obj/item/melee/baton/attack(mob/M, mob/living/carbon/human/user) if(status && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) - user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \ - "I accidentally hit myself with [src]!") + user.visible_message(span_danger("[user] accidentally hits [user.p_them()]self with [src]!"), \ + span_danger("I accidentally hit myself with [src]!")) user.Knockdown(stunforce*3) deductcharge(hitcost) return @@ -139,10 +139,10 @@ user.do_attack_animation(M) return else - to_chat(user, "The baton is still charging!") + to_chat(user, span_danger("The baton is still charging!")) else - M.visible_message("[user] has prodded [M] with [src]. Luckily it was off.", \ - "[user] has prodded you with [src]. Luckily it was off") + M.visible_message(span_warning("[user] has prodded [M] with [src]. Luckily it was off."), \ + span_warning("[user] has prodded you with [src]. Luckily it was off")) else if(status) if(cooldown_check <= world.time) @@ -177,8 +177,8 @@ if(user) L.lastattacker = user.real_name L.lastattackerckey = user.ckey - L.visible_message("[user] has stunned [L] with [src]!", \ - "[user] has stunned you with [src]!") + L.visible_message(span_danger("[user] has stunned [L] with [src]!"), \ + span_danger("[user] has stunned you with [src]!")) log_combat(user, L, "stunned") playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) @@ -199,7 +199,7 @@ else target.Knockdown(stunforce) if(!target.IsKnockdown()) - to_chat(target, "I muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]") + to_chat(target, span_warning("I muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]")) /obj/item/melee/baton/emp_act(severity) . = ..() diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 0f4c0d09e..4a318b1a9 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -30,7 +30,7 @@ else if(istype(action, /datum/action/item_action/jetpack_stabilization)) if(on) stabilizers = !stabilizers - to_chat(user, "I turn the jetpack stabilization [stabilizers ? "on" : "off"].") + to_chat(user, span_notice("I turn the jetpack stabilization [stabilizers ? "on" : "off"].")) else toggle_internals(user) @@ -41,10 +41,10 @@ if(!on) turn_on(user) - to_chat(user, "I turn the jetpack on.") + to_chat(user, span_notice("I turn the jetpack on.")) else turn_off(user) - to_chat(user, "I turn the jetpack off.") + to_chat(user, span_notice("I turn the jetpack off.")) for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() @@ -90,7 +90,7 @@ if (istype(user, /mob/living/carbon/human/)) var/mob/living/carbon/human/H = user H.forcesay("WHAT THE FUCK IS CARBON DIOXIDE?") - H.visible_message("[user] is suffocating [user.p_them()]self with [src]! It looks like [user.p_they()] didn't read what that jetpack says!") + H.visible_message(span_suicide("[user] is suffocating [user.p_them()]self with [src]! It looks like [user.p_they()] didn't read what that jetpack says!")) return (OXYLOSS) else ..() @@ -111,7 +111,7 @@ turn_off(user) return if(rand(0,250) == 0) - to_chat(user, "I feel your jetpack's engines cut out.") + to_chat(user, span_notice("I feel your jetpack's engines cut out.")) turn_off(user) return @@ -197,12 +197,12 @@ /obj/item/tank/jetpack/suit/cycle(mob/user) if(!istype(loc, /obj/item/clothing/suit/space/hardsuit)) - to_chat(user, "\The [src] must be connected to a hardsuit!") + to_chat(user, span_warning("\The [src] must be connected to a hardsuit!")) return var/mob/living/carbon/human/H = user if(!istype(H.s_store, /obj/item/tank/internals)) - to_chat(user, "I need a tank in your suit storage!") + to_chat(user, span_warning("I need a tank in your suit storage!")) return ..() diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index de1fd5b01..42e6b13aa 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -28,24 +28,24 @@ return if(H.internal == src) - to_chat(H, "I close [src] valve.") + to_chat(H, span_notice("I close [src] valve.")) H.internal = null H.update_internals_hud_icon(0) else if(!H.getorganslot(ORGAN_SLOT_BREATHING_TUBE)) if(!H.wear_mask) - to_chat(H, "I need a mask!") + to_chat(H, span_warning("I need a mask!")) return if(H.wear_mask.mask_adjusted) H.wear_mask.adjustmask(H) if(!(H.wear_mask.clothing_flags & MASKINTERNALS)) - to_chat(H, "[H.wear_mask] can't use [src]!") + to_chat(H, span_warning("[H.wear_mask] can't use [src]!")) return if(H.internal) - to_chat(H, "I switch your internals to [src].") + to_chat(H, span_notice("I switch your internals to [src].")) else - to_chat(H, "I open [src] valve.") + to_chat(H, span_notice("I open [src] valve.")) H.internal = src H.update_internals_hud_icon(1) H.update_action_buttons_icon() @@ -78,10 +78,10 @@ icon = src.loc if(!in_range(src, user) && !isobserver(user)) if(icon == src) - . += "If you want any more information you'll need to get closer." + . += span_notice("If you want any more information you'll need to get closer.") return - . += "The pressure gauge reads [round(src.air_contents.return_pressure(),0.01)] kPa." + . += span_notice("The pressure gauge reads [round(src.air_contents.return_pressure(),0.01)] kPa.") var/celsius_temperature = src.air_contents.temperature-T0C var/descriptive @@ -99,7 +99,7 @@ else descriptive = "furiously hot" - . += "It feels [descriptive]." + . += span_notice("It feels [descriptive].") /obj/item/tank/blob_act(obj/structure/blob/B) if(B && B.loc == loc) @@ -123,14 +123,14 @@ /obj/item/tank/suicide_act(mob/user) var/mob/living/carbon/human/H = user - user.visible_message("[user] is putting [src]'s valve to [user.p_their()] lips! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is putting [src]'s valve to [user.p_their()] lips! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(loc, 'sound/blank.ogg', 10, TRUE, -3) if(!QDELETED(H) && air_contents && air_contents.return_pressure() >= 1000) ADD_TRAIT(H, TRAIT_DISFIGURED, TRAIT_GENERIC) H.inflate_gib() return MANUAL_SUICIDE else - to_chat(user, "There isn't enough pressure in [src] to commit suicide with...") + to_chat(user, span_warning("There isn't enough pressure in [src] to commit suicide with...")) return SHAME /obj/item/tank/attackby(obj/item/W, mob/user, params) diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index 7d13ed0a4..a7ec777d9 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -34,7 +34,7 @@ if(!istype(user)) return if(user.get_item_by_slot(user.getBackSlot()) != src) - to_chat(user, "The watertank must be worn properly to use!") + to_chat(user, span_warning("The watertank must be worn properly to use!")) return if(user.incapacitated()) return @@ -44,7 +44,7 @@ if(noz in src) //Detach the nozzle into the user's hands if(!user.put_in_hands(noz)) - to_chat(user, "I need a free hand to hold the mister!") + to_chat(user, span_warning("I need a free hand to hold the mister!")) return else //Remove from their hands and put back "into" the tank @@ -132,7 +132,7 @@ /obj/item/reagent_containers/spray/mister/doMove(atom/destination) if(destination && (destination != tank.loc || !ismob(destination))) if (loc != tank) - to_chat(tank.loc, "The mister snaps back onto the watertank.") + to_chat(tank.loc, span_notice("The mister snaps back onto the watertank.")) destination = tank ..() @@ -171,7 +171,7 @@ /obj/item/reagent_containers/spray/mister/janitor/attack_self(mob/user) amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) - to_chat(user, "I [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.") + to_chat(user, span_notice("I [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.")) //ATMOS FIRE FIGHTING BACKPACK @@ -234,7 +234,7 @@ /obj/item/extinguisher/mini/nozzle/doMove(atom/destination) if(destination && (destination != tank.loc || !ismob(destination))) if(loc != tank) - to_chat(tank.loc, "The nozzle snaps back onto the tank.") + to_chat(tank.loc, span_notice("The nozzle snaps back onto the tank.")) destination = tank ..() @@ -243,17 +243,17 @@ if(EXTINGUISHER) nozzle_mode = RESIN_LAUNCHER tank.icon_state = "waterbackpackatmos_1" - to_chat(user, "Swapped to resin launcher.") + to_chat(user, span_notice("Swapped to resin launcher.")) return if(RESIN_LAUNCHER) nozzle_mode = RESIN_FOAM tank.icon_state = "waterbackpackatmos_2" - to_chat(user, "Swapped to resin foamer.") + to_chat(user, span_notice("Swapped to resin foamer.")) return if(RESIN_FOAM) nozzle_mode = EXTINGUISHER tank.icon_state = "waterbackpackatmos_0" - to_chat(user, "Swapped to water extinguisher.") + to_chat(user, span_notice("Swapped to water extinguisher.")) return return @@ -269,10 +269,10 @@ return //Safety check so you don't blast myself trying to refill your tank var/datum/reagents/R = reagents if(R.total_volume < 100) - to_chat(user, "I need at least 100 units of water to use the resin launcher!") + to_chat(user, span_warning("I need at least 100 units of water to use the resin launcher!")) return if(resin_cooldown) - to_chat(user, "Resin launcher is still recharging...") + to_chat(user, span_warning("Resin launcher is still recharging...")) return resin_cooldown = TRUE R.remove_any(100) @@ -290,7 +290,7 @@ return for(var/S in target) if(istype(S, /obj/effect/particle_effect/foam/metal/resin) || istype(S, /obj/structure/foamedmetal/resin)) - to_chat(user, "There's already resin here!") + to_chat(user, span_warning("There's already resin here!")) return if(metal_synthesis_cooldown < 5) var/obj/effect/particle_effect/foam/metal/resin/F = new (get_turf(target)) @@ -298,7 +298,7 @@ metal_synthesis_cooldown++ addtimer(CALLBACK(src, PROC_REF(reduce_metal_synth_cooldown)), 10 SECONDS) else - to_chat(user, "Resin foam mix is still being synthesized...") + to_chat(user, span_warning("Resin foam mix is still being synthesized...")) return /obj/item/extinguisher/mini/nozzle/proc/reduce_metal_synth_cooldown() @@ -359,7 +359,7 @@ if(!istype(user)) return if (user.get_item_by_slot(SLOT_BACK) != src) - to_chat(user, "The chemtank needs to be on your back before you can activate it!") + to_chat(user, span_warning("The chemtank needs to be on your back before you can activate it!")) return if(on) turn_off() @@ -389,13 +389,13 @@ on = TRUE START_PROCESSING(SSobj, src) if(ismob(loc)) - to_chat(loc, "[src] turns on.") + to_chat(loc, span_notice("[src] turns on.")) /obj/item/reagent_containers/chemtank/proc/turn_off() on = FALSE STOP_PROCESSING(SSobj, src) if(ismob(loc)) - to_chat(loc, "[src] turns off.") + to_chat(loc, span_notice("[src] turns off.")) /obj/item/reagent_containers/chemtank/process() if(!ishuman(loc)) diff --git a/code/game/objects/items/taster.dm b/code/game/objects/items/taster.dm index f0ed426c5..7d21d32f8 100644 --- a/code/game/objects/items/taster.dm +++ b/code/game/objects/items/taster.dm @@ -17,4 +17,4 @@ if(O.reagents) var/message = O.reagents.generate_taste_message(taste_sensitivity) - to_chat(user, "[src] tastes [message] in [O].") + to_chat(user, span_notice("[src] tastes [message] in [O].")) diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index f5eb3c9ba..b68b06fe7 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -145,7 +145,7 @@ /obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user) if(is_parent_of_portal(target)) qdel(target) - to_chat(user, "I dispel [target] with \the [src]!") + to_chat(user, span_notice("I dispel [target] with \the [src]!")) return TRUE return FALSE @@ -157,7 +157,7 @@ var/turf/current_location = get_turf(user)//What turf is the user on? var/area/current_area = current_location.loc if(!current_location || current_area.noteleport || is_away_level(current_location.z) || !isturf(user.loc))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf - to_chat(user, "\The [src] is malfunctioning.") + to_chat(user, span_notice("\The [src] is malfunctioning.")) return var/list/L = list( ) for(var/obj/machinery/computer/teleporter/com in GLOB.machines) @@ -185,19 +185,19 @@ if (!t1 || user.get_active_held_item() != src || user.incapacitated()) return if(active_portal_pairs.len >= max_portal_pairs) - user.show_message("\The [src] is recharging!") + user.show_message(span_notice("\The [src] is recharging!")) return var/atom/T = L[t1] var/area/A = get_area(T) if(A.noteleport) - to_chat(user, "\The [src] is malfunctioning.") + to_chat(user, span_notice("\The [src] is malfunctioning.")) return current_location = get_turf(user) //Recheck. current_area = current_location.loc if(!current_location || current_area.noteleport || is_away_level(current_location.z) || !isturf(user.loc))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf - to_chat(user, "\The [src] is malfunctioning.") + to_chat(user, span_notice("\The [src] is malfunctioning.")) return - user.show_message("Locked In.", MSG_AUDIBLE) + user.show_message(span_notice("Locked In."), MSG_AUDIBLE) var/list/obj/effect/portal/created = create_portal_pair(current_location, get_teleport_turf(get_turf(T)), src, 300, 1, null, atmos_link_override) if(!(LAZYLEN(created) == 2)) return @@ -223,14 +223,14 @@ /obj/item/hand_tele/suicide_act(mob/user) if(iscarbon(user)) - user.visible_message("[user] is creating a weak portal and sticking [user.p_their()] head through! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is creating a weak portal and sticking [user.p_their()] head through! It looks like [user.p_theyre()] trying to commit suicide!")) var/mob/living/carbon/itemUser = user var/obj/item/bodypart/head/head = itemUser.get_bodypart(BODY_ZONE_HEAD) if(head) head.drop_limb() var/list/safeLevels = SSmapping.levels_by_any_trait(list(ZTRAIT_SPACE_RUINS, ZTRAIT_LAVA_RUINS, ZTRAIT_STATION, ZTRAIT_MINING)) head.forceMove(locate(rand(1, world.maxx), rand(1, world.maxy), pick(safeLevels))) - itemUser.visible_message("The portal snaps closed taking [user]'s head with it!") + itemUser.visible_message(span_suicide("The portal snaps closed taking [user]'s head with it!")) else - itemUser.visible_message("[user] looks even further depressed as they realize they do not have a head...and suddenly dies of shame!") + itemUser.visible_message(span_suicide("[user] looks even further depressed as they realize they do not have a head...and suddenly dies of shame!")) return (BRUTELOSS) diff --git a/code/game/objects/items/teleprod.dm b/code/game/objects/items/teleprod.dm index be0ee26f8..0919579b4 100644 --- a/code/game/objects/items/teleprod.dm +++ b/code/game/objects/items/teleprod.dm @@ -9,8 +9,8 @@ /obj/item/melee/baton/cattleprod/teleprod/attack(mob/living/carbon/M, mob/living/carbon/user)//handles making things teleport when hit ..() if(status && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) - user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \ - "I accidentally hit myself with [src]!") + user.visible_message(span_danger("[user] accidentally hits [user.p_them()]self with [src]!"), \ + span_danger("I accidentally hit myself with [src]!")) if(do_teleport(user, get_turf(user), 50, channel = TELEPORT_CHANNEL_BLUESPACE))//honk honk SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK) user.Paralyze(stunforce*3) @@ -37,8 +37,8 @@ qdel(src) BSC.use(1) user.put_in_hands(S) - to_chat(user, "I place the bluespace crystal firmly into the igniter.") + to_chat(user, span_notice("I place the bluespace crystal firmly into the igniter.")) else - user.visible_message("I can't put the crystal onto the stunprod while it has a power cell installed!") + user.visible_message(span_warning("I can't put the crystal onto the stunprod while it has a power cell installed!")) else return ..() diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index 490c737ff..48fa0f52d 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -36,7 +36,7 @@ radiation_pulse(src, 400, 2) /obj/item/nuke_core/suicide_act(mob/user) - user.visible_message("[user] is rubbing [src] against [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is rubbing [src] against [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!")) return (TOXLOSS) //nuke core box, for carrying the core @@ -60,7 +60,7 @@ ncore.forceMove(src) core = ncore icon_state = "core_container_loaded" - to_chat(user, "Container is sealing...") + to_chat(user, span_warning("Container is sealing...")) addtimer(CALLBACK(src, PROC_REF(seal)), 50) return TRUE @@ -70,12 +70,12 @@ icon_state = "core_container_sealed" playsound(src, 'sound/blank.ogg', 60, TRUE) if(ismob(loc)) - to_chat(loc, "[src] is permanently sealed, [core]'s radiation is contained.") + to_chat(loc, span_warning("[src] is permanently sealed, [core]'s radiation is contained.")) /obj/item/nuke_core_container/attackby(obj/item/nuke_core/core, mob/user) if(istype(core)) if(!user.temporarilyRemoveItemFromInventory(core)) - to_chat(user, "The [core] is stuck to your hand!") + to_chat(user, span_warning("The [core] is stuck to your hand!")) return else load(core, user) @@ -134,16 +134,16 @@ if(istype(W, /obj/item/hemostat/supermatter)) var/obj/item/hemostat/supermatter/tongs = W if (tongs.sliver) - to_chat(user, "\The [tongs] is already holding a supermatter sliver!") + to_chat(user, span_warning("\The [tongs] is already holding a supermatter sliver!")) return FALSE forceMove(tongs) tongs.sliver = src tongs.update_icon() - to_chat(user, "I carefully pick up [src] with [tongs].") + to_chat(user, span_notice("I carefully pick up [src] with [tongs].")) else if(istype(W, /obj/item/scalpel/supermatter) || istype(W, /obj/item/nuke_core_container/supermatter/)) // we don't want it to dust return else - to_chat(user, "As it touches \the [src], both \the [src] and \the [W] burst into dust!") + to_chat(user, span_notice("As it touches \the [src], both \the [src] and \the [W] burst into dust!")) radiation_pulse(user, 100) playsound(src, 'sound/blank.ogg', 50, TRUE) qdel(W) @@ -154,9 +154,9 @@ if(!iscarbon(user)) return FALSE var/mob/ded = user - user.visible_message("[ded] reaches out and tries to pick up [src]. [ded.p_their()] body starts to glow and bursts into flames before flashing into dust!",\ - "I reach for [src] with your hands. That was dumb.",\ - "Everything suddenly goes silent.") + user.visible_message(span_danger("[ded] reaches out and tries to pick up [src]. [ded.p_their()] body starts to glow and bursts into flames before flashing into dust!"),\ + span_danger("I reach for [src] with your hands. That was dumb."),\ + span_hear("Everything suddenly goes silent.")) radiation_pulse(user, 500, 2) playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE) ded.dust() @@ -178,7 +178,7 @@ T.sliver = null T.icon_state = "supermatter_tongs" icon_state = "core_container_loaded" - to_chat(user, "Container is sealing...") + to_chat(user, span_warning("Container is sealing...")) addtimer(CALLBACK(src, PROC_REF(seal)), 50) return TRUE @@ -188,7 +188,7 @@ icon_state = "core_container_sealed" playsound(src, 'sound/blank.ogg', 60, TRUE) if(ismob(loc)) - to_chat(loc, "[src] is permanently sealed, [sliver] is safely contained.") + to_chat(loc, span_warning("[src] is permanently sealed, [sliver] is safely contained.")) /obj/item/nuke_core_container/supermatter/attackby(obj/item/hemostat/supermatter/tongs, mob/user) if(istype(tongs)) @@ -240,7 +240,7 @@ /obj/item/hemostat/supermatter/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) // no instakill supermatter javelins if(sliver) sliver.forceMove(loc) - visible_message("\The [sliver] falls out of \the [src] as it hits the ground.") + visible_message(span_notice("\The [sliver] falls out of \the [src] as it hits the ground.")) sliver = null update_icon() ..() @@ -255,9 +255,9 @@ investigate_log("has consumed [AM].", "supermatter") qdel(AM) if (user) - user.visible_message("As [user] touches [AM] with \the [src], both flash into dust and silence fills the room...",\ - "I touch [AM] with [src], and everything suddenly goes silent.\n[AM] and [sliver] flash into dust, and soon as you can register this, you do as well.",\ - "Everything suddenly goes silent.") + user.visible_message(span_danger("As [user] touches [AM] with \the [src], both flash into dust and silence fills the room..."),\ + span_danger("I touch [AM] with [src], and everything suddenly goes silent.\n[AM] and [sliver] flash into dust, and soon as you can register this, you do as well."),\ + span_hear("Everything suddenly goes silent.")) user.dust() radiation_pulse(src, 500, 2) playsound(src, 'sound/blank.ogg', 50, TRUE) diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 557c99faa..deb3ad0f6 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -22,7 +22,7 @@ var/force_opens = FALSE /obj/item/crowbar/suicide_act(mob/user) - user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) return (BRUTELOSS) @@ -70,10 +70,10 @@ /obj/item/crowbar/power/suicide_act(mob/user) if(tool_behaviour == TOOL_CROWBAR) - user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) else - user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") + user.visible_message(span_suicide("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) if(iscarbon(user)) var/mob/living/carbon/C = user @@ -87,18 +87,18 @@ playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE) if(tool_behaviour == TOOL_CROWBAR) tool_behaviour = TOOL_WIRECUTTER - to_chat(user, "I attach the cutting jaws to [src].") + to_chat(user, span_notice("I attach the cutting jaws to [src].")) usesound = 'sound/blank.ogg' icon_state = "jaws_cutter" else tool_behaviour = TOOL_CROWBAR - to_chat(user, "I attach the prying jaws to [src].") + to_chat(user, span_notice("I attach the prying jaws to [src].")) usesound = 'sound/blank.ogg' icon_state = "jaws_pry" /obj/item/crowbar/power/attack(mob/living/carbon/C, mob/user) if(istype(C) && C.handcuffed && tool_behaviour == TOOL_WIRECUTTER) - user.visible_message("[user] cuts [C]'s restraints with [src]!") + user.visible_message(span_notice("[user] cuts [C]'s restraints with [src]!")) qdel(C.handcuffed) return else diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index ce7c871eb..6ccbe4f02 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -34,7 +34,7 @@ ) /obj/item/screwdriver/suicide_act(mob/user) - user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!")) return(BRUTELOSS) /obj/item/screwdriver/Initialize() @@ -78,7 +78,7 @@ if(user.zone_selected != BODY_ZONE_PRECISE_R_EYE && user.zone_selected != BODY_ZONE_HEAD) return ..() if(HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "I don't want to harm [M]!") + to_chat(user, span_warning("I don't want to harm [M]!")) return if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) M = user @@ -122,9 +122,9 @@ /obj/item/screwdriver/power/suicide_act(mob/user) if(tool_behaviour == TOOL_SCREWDRIVER) - user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!")) else - user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) return(BRUTELOSS) @@ -132,11 +132,11 @@ playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE) if(tool_behaviour == TOOL_SCREWDRIVER) tool_behaviour = TOOL_WRENCH - to_chat(user, "I attach the bolt bit to [src].") + to_chat(user, span_notice("I attach the bolt bit to [src].")) icon_state = "drill_bolt" else tool_behaviour = TOOL_SCREWDRIVER - to_chat(user, "I attach the screw bit to [src].") + to_chat(user, span_notice("I attach the screw bit to [src].")) icon_state = "drill_screw" /obj/item/screwdriver/cyborg diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index db52f72b2..2edabd217 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -84,7 +84,7 @@ /obj/item/weldingtool/suicide_act(mob/user) - user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!")) return (FIRELOSS) @@ -112,8 +112,8 @@ if(affecting && affecting.status == BODYPART_ROBOTIC && user.used_intent.type != INTENT_HARM) if(src.use_tool(H, user, 0, volume=50, amount=1)) if(user == H) - user.visible_message("[user] starts to fix some of the dents on [H]'s [affecting.name].", - "I start fixing some of the dents on [H == user ? "your" : "[H]'s"] [affecting.name].") + user.visible_message(span_notice("[user] starts to fix some of the dents on [H]'s [affecting.name]."), + span_notice("I start fixing some of the dents on [H == user ? "your" : "[H]'s"] [affecting.name].")) if(!do_mob(user, H, 50)) return item_heal_robotic(H, user, 15, 0) @@ -136,7 +136,7 @@ if(!status && O.is_refillable()) reagents.trans_to(O, reagents.total_volume, transfered_by = user) - to_chat(user, "I empty [src]'s fuel tank into [O].") + to_chat(user, span_notice("I empty [src]'s fuel tank into [O].")) update_icon() /obj/item/weldingtool/attack_qdeleted(atom/O, mob/user, proximity) @@ -206,12 +206,12 @@ //Switches the welder on /obj/item/weldingtool/proc/switched_on(mob/user) if(!status) - to_chat(user, "[src] can't be turned on while unsecured!") + to_chat(user, span_warning("[src] can't be turned on while unsecured!")) return welding = !welding if(welding) if(get_fuel() >= 1) - to_chat(user, "I switch [src] on.") + to_chat(user, span_notice("I switch [src] on.")) playsound(loc, acti_sound, 50, TRUE) force = 15 damtype = "fire" @@ -219,10 +219,10 @@ update_icon() START_PROCESSING(SSobj, src) else - to_chat(user, "I need more fuel!") + to_chat(user, span_warning("I need more fuel!")) switched_off(user) else - to_chat(user, "I switch [src] off.") + to_chat(user, span_notice("I switch [src] off.")) playsound(loc, deac_sound, 50, TRUE) switched_off(user) @@ -267,26 +267,26 @@ // If welding tool ran out of fuel during a construction task, construction fails. /obj/item/weldingtool/tool_use_check(mob/living/user, amount) if(!isOn() || !check_fuel()) - to_chat(user, "[src] has to be on to complete this task!") + to_chat(user, span_warning("[src] has to be on to complete this task!")) return FALSE if(get_fuel() >= amount) return TRUE else - to_chat(user, "I need more welding fuel to complete this task!") + to_chat(user, span_warning("I need more welding fuel to complete this task!")) return FALSE /obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user) if(welding) - to_chat(user, "Turn it off first!") + to_chat(user, span_warning("Turn it off first!")) return status = !status if(status) - to_chat(user, "I resecure [src] and close the fuel tank.") + to_chat(user, span_notice("I resecure [src] and close the fuel tank.")) DISABLE_BITFIELD(reagents.flags, OPENCONTAINER) else - to_chat(user, "[src] can now be attached, modified, and refuelled.") + to_chat(user, span_notice("[src] can now be attached, modified, and refuelled.")) ENABLE_BITFIELD(reagents.flags, OPENCONTAINER) add_fingerprint(user) @@ -299,14 +299,14 @@ user.transferItemToLoc(src, F, TRUE) F.weldtool = src add_fingerprint(user) - to_chat(user, "I add a rod to a welder, starting to build a flamethrower.") + to_chat(user, span_notice("I add a rod to a welder, starting to build a flamethrower.")) user.put_in_hands(F) else - to_chat(user, "I need one rod to start building a flamethrower!") + to_chat(user, span_warning("I need one rod to start building a flamethrower!")) /obj/item/weldingtool/ignition_effect(atom/A, mob/user) if(use_tool(A, user, 0, amount=1)) - return "[user] casually lights [A] with [src], what a badass." + return span_notice("[user] casually lights [A] with [src], what a badass.") else return "" diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 3422a8266..97651caa8 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -52,19 +52,19 @@ /obj/item/wirecutters/attack(mob/living/carbon/C, mob/user) if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable)) - user.visible_message("[user] cuts [C]'s restraints with [src]!") + user.visible_message(span_notice("[user] cuts [C]'s restraints with [src]!")) qdel(C.handcuffed) return else if(istype(C) && C.has_status_effect(STATUS_EFFECT_CHOKINGSTRAND)) - to_chat(C, "I attempt to remove the durathread strand from around your neck.") + to_chat(C, span_notice("I attempt to remove the durathread strand from around your neck.")) if(do_after(user, 15, null, C)) - to_chat(C, "I succesfuly remove the durathread strand.") + to_chat(C, span_notice("I succesfuly remove the durathread strand.")) C.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) else ..() /obj/item/wirecutters/suicide_act(mob/user) - user.visible_message("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(loc, usesound, 50, TRUE, -1) return (BRUTELOSS) diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index 2125aca93..6630b825b 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -21,7 +21,7 @@ armor = list("blunt" = 0, "slash" = 0, "stab" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) /obj/item/wrench/suicide_act(mob/user) - user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) return (BRUTELOSS) @@ -44,7 +44,7 @@ attack_verb = list("healed", "medicaled", "tapped", "poked", "analyzed") //"cobbyed" /obj/item/wrench/medical/suicide_act(mob/living/user) - user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!")) user.Stun(100, ignore_canstun = TRUE)// Stun stops them from wandering off user.light_color = "#FAE48E" user.set_light(2) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index e4e460699..fbeaf6469 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -57,12 +57,12 @@ if (istype(A, /obj/structure/reagent_dispensers)) var/obj/structure/reagent_dispensers/RD = A if(RD.reagents.total_volume <= 0) - to_chat(user, "[RD] is empty.") + to_chat(user, span_warning("[RD] is empty.")) else if(reagents.total_volume >= 10) - to_chat(user, "[src] is full.") + to_chat(user, span_warning("[src] is full.")) else A.reagents.trans_to(src, 10, transfered_by = user) - to_chat(user, "I fill the balloon with the contents of [A].") + to_chat(user, span_notice("I fill the balloon with the contents of [A].")) desc = "" update_icon() @@ -70,12 +70,12 @@ if(istype(I, /obj/item/reagent_containers/glass)) if(I.reagents) if(I.reagents.total_volume <= 0) - to_chat(user, "[I] is empty.") + to_chat(user, span_warning("[I] is empty.")) else if(reagents.total_volume >= 10) - to_chat(user, "[src] is full.") + to_chat(user, span_warning("[src] is full.")) else desc = "" - to_chat(user, "I fill the balloon with the contents of [I].") + to_chat(user, span_notice("I fill the balloon with the contents of [I].")) I.reagents.trans_to(src, 10, transfered_by = user) update_icon() else if(I.get_sharpness()) @@ -94,7 +94,7 @@ T = get_turf(AT) else T = get_turf(src) - T.visible_message("[src] bursts!","I hear a pop and a splash.") + T.visible_message(span_danger("[src] bursts!"),span_hear("I hear a pop and a splash.")) reagents.reaction(T) for(var/atom/A in T) reagents.reaction(A) @@ -200,17 +200,17 @@ if(istype(A, /obj/item/toy/ammo/gun)) if (src.bullets >= 7) - to_chat(user, "It's already fully loaded!") + to_chat(user, span_warning("It's already fully loaded!")) return 1 if (A.amount_left <= 0) - to_chat(user, "There are no more caps!") + to_chat(user, span_warning("There are no more caps!")) return 1 if (A.amount_left < (7 - src.bullets)) src.bullets += A.amount_left - to_chat(user, text("I reload [] cap\s.", A.amount_left)) + to_chat(user, span_notice("I reload [A.amount_left] cap\s.")) A.amount_left = 0 else - to_chat(user, text("I reload [] cap\s.", 7 - src.bullets)) + to_chat(user, span_notice("I reload [7 - src.bullets] cap\s.")) A.amount_left -= 7 - src.bullets src.bullets = 7 A.update_icon() @@ -223,18 +223,18 @@ if (flag) return if (!user.IsAdvancedToolUser()) - to_chat(user, "I don't have the dexterity to do this!") + to_chat(user, span_warning("I don't have the dexterity to do this!")) return src.add_fingerprint(user) if (src.bullets < 1) - user.show_message("*click*", MSG_AUDIBLE) + user.show_message(span_warning("*click*"), MSG_AUDIBLE) playsound(src, 'sound/blank.ogg', 30, TRUE) return playsound(user, 'sound/blank.ogg', 100, TRUE) src.bullets-- - user.visible_message("[user] fires [src] at [target]!", \ - "I fire [src] at [target]!", \ - "I hear a gunshot!") + user.visible_message(span_danger("[user] fires [src] at [target]!"), \ + span_danger("I fire [src] at [target]!"), \ + span_hear("I hear a gunshot!")) /obj/item/toy/ammo/gun name = "capgun ammo" @@ -272,7 +272,7 @@ /obj/item/toy/sword/attack_self(mob/user) active = !( active ) if (active) - to_chat(user, "I extend the plastic blade with a quick flick of your wrist.") + to_chat(user, span_notice("I extend the plastic blade with a quick flick of your wrist.")) playsound(user, 'sound/blank.ogg', 20, TRUE) if(hacked) icon_state = "swordrainbow" @@ -282,7 +282,7 @@ item_state = "swordblue" w_class = WEIGHT_CLASS_BULKY else - to_chat(user, "I push the plastic blade back down into the handle.") + to_chat(user, span_notice("I push the plastic blade back down into the handle.")) playsound(user, 'sound/blank.ogg', 20, TRUE) icon_state = "sword0" item_state = "sword0" @@ -293,10 +293,10 @@ /obj/item/toy/sword/attackby(obj/item/W, mob/living/user, params) if(istype(W, /obj/item/toy/sword)) if(HAS_TRAIT(W, TRAIT_NODROP) || HAS_TRAIT(src, TRAIT_NODROP)) - to_chat(user, "\the [HAS_TRAIT(src, TRAIT_NODROP) ? src : W] is stuck to your hand, you can't attach it to \the [HAS_TRAIT(src, TRAIT_NODROP) ? W : src]!") + to_chat(user, span_warning("\the [HAS_TRAIT(src, TRAIT_NODROP) ? src : W] is stuck to your hand, you can't attach it to \the [HAS_TRAIT(src, TRAIT_NODROP) ? W : src]!")) return else - to_chat(user, "I attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.") + to_chat(user, span_notice("I attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.")) var/obj/item/twohanded/dualsaber/toy/newSaber = new /obj/item/twohanded/dualsaber/toy(user.loc) if(hacked) // That's right, we'll only check the "original" "sword". newSaber.hacked = TRUE @@ -307,13 +307,13 @@ if(!hacked) hacked = TRUE saber_color = "rainbow" - to_chat(user, "RNBW_ENGAGE") + to_chat(user, span_warning("RNBW_ENGAGE")) if(active) icon_state = "swordrainbow" user.update_inv_hands() else - to_chat(user, "It's already fabulous!") + to_chat(user, span_warning("It's already fabulous!")) else return ..() @@ -348,13 +348,13 @@ /obj/item/toy/windupToolbox/attack_self(mob/user) if(!active) icon_state = "his_grace_awakened" - to_chat(user, "I wind up [src], it begins to rumble.") + to_chat(user, span_notice("I wind up [src], it begins to rumble.")) active = TRUE playsound(src, 'sound/blank.ogg', 100) Rumble() addtimer(CALLBACK(src, PROC_REF(stopRumble)), 600) else - to_chat(user, "[src] is already active!") + to_chat(user, span_warning("[src] is already active!")) /obj/item/toy/windupToolbox/proc/Rumble() var/static/list/transforms @@ -431,8 +431,8 @@ s.set_up(n, c, src) s.start() new ash_type(loc) - visible_message("[src] explodes!", - "I hear a explosion!") + visible_message(span_warning("[src] explodes!"), + span_hear("I hear a explosion!")) playsound(src, 'sound/blank.ogg', 50, TRUE) qdel(src) @@ -447,7 +447,7 @@ if(ishuman(H) || issilicon(H)) //i guess carp and shit shouldn't set them off var/mob/living/carbon/M = H if(issilicon(H) || M.m_intent == MOVE_INTENT_RUN) - to_chat(M, "I step on the snap pop!") + to_chat(M, span_danger("I step on the snap pop!")) pop_burst(2, 0) /obj/item/toy/snappop/phoenix @@ -481,7 +481,7 @@ //all credit to skasi for toy mech fun ideas /obj/item/toy/prize/attack_self(mob/user) if(timer < world.time) - to_chat(user, "I play with [src].") + to_chat(user, span_notice("I play with [src].")) timer = world.time + cooldown if(!quiet) playsound(user, 'sound/blank.ogg', 20, TRUE) @@ -588,9 +588,9 @@ /obj/item/toy/talking/proc/activation_message(mob/user) user.visible_message( - "[user] pulls the string on \the [src].", - "I pull the string on \the [src].", - "I hear a string being pulled.") + span_notice("[user] pulls the string on \the [src]."), + span_notice("I pull the string on \the [src]."), + span_notice("I hear a string being pulled.")) /obj/item/toy/talking/proc/generate_messages() return list(pick(messages)) @@ -601,7 +601,7 @@ sleep(10) /obj/item/toy/talking/proc/toy_talk(mob/user, message) - user.loc.visible_message("[icon2html(src, viewers(user.loc))] [message]") + user.loc.visible_message(span_say("[icon2html(src, viewers(user.loc))] [message]")) if(chattering) chatter(message, phomeme, user) @@ -629,9 +629,9 @@ /obj/item/toy/talking/codex_gigas/activation_message(mob/user) user.visible_message( - "[user] presses the button on \the [src].", - "I press the button on \the [src].", - "I hear a soft click.") + span_notice("[user] presses the button on \the [src]."), + span_notice("I press the button on \the [src]."), + span_notice("I hear a soft click.")) /obj/item/toy/talking/codex_gigas/generate_messages() var/datum/fakeDevil/devil = new @@ -680,7 +680,7 @@ var/list/card_attack_verb = list("attacked") /obj/item/toy/cards/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is slitting [user.p_their()] wrists with \the [src]! It looks like [user.p_they()] [user.p_have()] a crummy hand!") + user.visible_message(span_suicide("[user] is slitting [user.p_their()] wrists with \the [src]! It looks like [user.p_they()] [user.p_have()] a crummy hand!")) playsound(src, 'sound/blank.ogg', 50, TRUE) return BRUTELOSS @@ -725,7 +725,7 @@ return var/choice = null if(cards.len == 0) - to_chat(user, "There are no more cards to draw!") + to_chat(user, span_warning("There are no more cards to draw!")) return var/obj/item/toy/cards/singlecard/H = new/obj/item/toy/cards/singlecard(user.loc) if(holo) @@ -738,7 +738,7 @@ src.cards -= choice H.pickup(user) user.put_in_hands(H) - user.visible_message("[user] draws a card from the deck.", "I draw a card from the deck.") + user.visible_message(span_notice("[user] draws a card from the deck."), span_notice("I draw a card from the deck.")) update_icon() /obj/item/toy/cards/deck/update_icon() @@ -755,7 +755,7 @@ if(cooldown < world.time - 50) cards = shuffle(cards) playsound(src, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] shuffles the deck.", "I shuffle the deck.") + user.visible_message(span_notice("[user] shuffles the deck."), span_notice("I shuffle the deck.")) cooldown = world.time /obj/item/toy/cards/deck/attackby(obj/item/I, mob/living/user, params) @@ -763,25 +763,25 @@ var/obj/item/toy/cards/singlecard/SC = I if(SC.parentdeck == src) if(!user.temporarilyRemoveItemFromInventory(SC)) - to_chat(user, "The card is stuck to your hand, you can't add it to the deck!") + to_chat(user, span_warning("The card is stuck to your hand, you can't add it to the deck!")) return cards += SC.cardname - user.visible_message("[user] adds a card to the bottom of the deck.","I add the card to the bottom of the deck.") + user.visible_message(span_notice("[user] adds a card to the bottom of the deck."),span_notice("I add the card to the bottom of the deck.")) qdel(SC) else - to_chat(user, "I can't mix cards from other decks!") + to_chat(user, span_warning("I can't mix cards from other decks!")) update_icon() else if(istype(I, /obj/item/toy/cards/cardhand)) var/obj/item/toy/cards/cardhand/CH = I if(CH.parentdeck == src) if(!user.temporarilyRemoveItemFromInventory(CH)) - to_chat(user, "The hand of cards is stuck to your hand, you can't add it to the deck!") + to_chat(user, span_warning("The hand of cards is stuck to your hand, you can't add it to the deck!")) return cards += CH.currenthand - user.visible_message("[user] puts [user.p_their()] hand of cards in the deck.", "I put the hand of cards in the deck.") + user.visible_message(span_notice("[user] puts [user.p_their()] hand of cards in the deck."), span_notice("I put the hand of cards in the deck.")) qdel(CH) else - to_chat(user, "I can't mix cards from other decks!") + to_chat(user, span_warning("I can't mix cards from other decks!")) update_icon() else return ..() @@ -794,15 +794,15 @@ if(Adjacent(usr)) if(over_object == M && loc != M) M.put_in_hands(src) - to_chat(usr, "I pick up the deck.") + to_chat(usr, span_notice("I pick up the deck.")) else if(istype(over_object, /atom/movable/screen/inventory/hand)) var/atom/movable/screen/inventory/hand/H = over_object if(M.putItemFromInventoryInHandIfPossible(src, H.held_index)) - to_chat(usr, "I pick up the deck.") + to_chat(usr, span_notice("I pick up the deck.")) else - to_chat(usr, "I can't reach it from here!") + to_chat(usr, span_warning("I can't reach it from here!")) @@ -851,7 +851,7 @@ C.apply_card_vars(C,O) C.pickup(cardUser) cardUser.put_in_hands(C) - cardUser.visible_message("[cardUser] draws a card from [cardUser.p_their()] hand.", "I take the [C.cardname] from your hand.") + cardUser.visible_message(span_notice("[cardUser] draws a card from [cardUser.p_their()] hand."), span_notice("I take the [C.cardname] from your hand.")) interact(cardUser) if(src.currenthand.len < 3) @@ -868,7 +868,7 @@ qdel(src) N.pickup(cardUser) cardUser.put_in_hands(N) - to_chat(cardUser, "I also take [currenthand[1]] and hold it.") + to_chat(cardUser, span_notice("I also take [currenthand[1]] and hold it.")) cardUser << browse(null, "window=cardhand") return @@ -876,7 +876,7 @@ if(istype(C)) if(C.parentdeck == src.parentdeck) src.currenthand += C.cardname - user.visible_message("[user] adds a card to [user.p_their()] hand.", "I add the [C.cardname] to your hand.") + user.visible_message(span_notice("[user] adds a card to [user.p_their()] hand."), span_notice("I add the [C.cardname] to your hand.")) qdel(C) interact(user) if(currenthand.len > 4) @@ -886,7 +886,7 @@ else if(currenthand.len > 2) src.icon_state = "[deckstyle]_hand3" else - to_chat(user, "I can't mix cards from other decks!") + to_chat(user, span_warning("I can't mix cards from other decks!")) else return ..() @@ -918,9 +918,9 @@ if(ishuman(user)) var/mob/living/carbon/human/cardUser = user if(cardUser.is_holding(src)) - cardUser.visible_message("[cardUser] checks [cardUser.p_their()] card.", "The card reads: [cardname].") + cardUser.visible_message(span_notice("[cardUser] checks [cardUser.p_their()] card."), span_notice("The card reads: [cardname].")) else - . += "I need to have the card in your hand to check it!" + . += span_warning("I need to have the card in your hand to check it!") /obj/item/toy/cards/singlecard/verb/Flip() @@ -953,19 +953,19 @@ H.currenthand += src.cardname H.parentdeck = C.parentdeck H.apply_card_vars(H,C) - to_chat(user, "I combine the [C.cardname] and the [src.cardname] into a hand.") + to_chat(user, span_notice("I combine the [C.cardname] and the [src.cardname] into a hand.")) qdel(C) qdel(src) H.pickup(user) user.put_in_active_hand(H) else - to_chat(user, "I can't mix cards from other decks!") + to_chat(user, span_warning("I can't mix cards from other decks!")) if(istype(I, /obj/item/toy/cards/cardhand/)) var/obj/item/toy/cards/cardhand/H = I if(H.parentdeck == parentdeck) H.currenthand += cardname - user.visible_message("[user] adds a card to [user.p_their()] hand.", "I add the [cardname] to your hand.") + user.visible_message(span_notice("[user] adds a card to [user.p_their()] hand."), span_notice("I add the [cardname] to your hand.")) qdel(src) H.interact(user) if(H.currenthand.len > 4) @@ -975,7 +975,7 @@ else if(H.currenthand.len > 2) H.icon_state = "[deckstyle]_hand3" else - to_chat(user, "I can't mix cards from other decks!") + to_chat(user, span_warning("I can't mix cards from other decks!")) else return ..() @@ -1034,7 +1034,7 @@ /obj/item/toy/nuke/attack_self(mob/user) if (cooldown < world.time) cooldown = world.time + 1800 //3 minutes - user.visible_message("[user] presses a button on [src].", "I activate [src], it plays a loud noise!", "I hear the click of a button.") + user.visible_message(span_warning("[user] presses a button on [src]."), span_notice("I activate [src], it plays a loud noise!"), span_hear("I hear the click of a button.")) sleep(5) icon_state = "nuketoy" playsound(src, 'sound/blank.ogg', 100, FALSE) @@ -1044,7 +1044,7 @@ icon_state = "nuketoyidle" else var/timeleft = (cooldown - world.time) - to_chat(user, "Nothing happens, and '[round(timeleft/10)]' appears on a small display.") + to_chat(user, span_alert("Nothing happens, and '[round(timeleft/10)]' appears on a small display.")) /* * Fake meteor @@ -1079,7 +1079,7 @@ /obj/item/toy/redbutton/attack_self(mob/user) if (cooldown < world.time) cooldown = (world.time + 300) // Sets cooldown at 30 seconds - user.visible_message("[user] presses the big red button.", "I press the button, it plays a loud noise!", "The button clicks loudly.") + user.visible_message(span_warning("[user] presses the big red button."), span_notice("I press the button, it plays a loud noise!"), span_hear("The button clicks loudly.")) playsound(src, 'sound/blank.ogg', 50, FALSE) for(var/mob/M in urange(10, src)) // Checks range if(!M.stat && !isAI(M)) // Checks to make sure whoever's getting shaken is alive/not the AI @@ -1087,7 +1087,7 @@ shake_camera(M, 2, 1) // Shakes player camera 2 squares for 1 second. else - to_chat(user, "Nothing happens.") + to_chat(user, span_alert("Nothing happens.")) /* * Snowballs @@ -1136,14 +1136,14 @@ /obj/item/toy/clockwork_watch/attack_self(mob/user) if (cooldown < world.time) cooldown = world.time + 1800 //3 minutes - user.visible_message("[user] rotates a cogwheel on [src].", "I rotate a cogwheel on [src], it plays a loud noise!", "I hear cogwheels turning.") + user.visible_message(span_warning("[user] rotates a cogwheel on [src]."), span_notice("I rotate a cogwheel on [src], it plays a loud noise!"), span_hear("I hear cogwheels turning.")) playsound(src, 'sound/blank.ogg', 50, FALSE) else - to_chat(user, "The cogwheels are already turning!") + to_chat(user, span_alert("The cogwheels are already turning!")) /obj/item/toy/clockwork_watch/examine(mob/user) . = ..() - . += "Station Time: [station_time_timestamp()]" + . += span_info("Station Time: [station_time_timestamp()]") /* * Toy Dagger @@ -1174,16 +1174,16 @@ /obj/item/toy/toy_xeno/attack_self(mob/user) if(cooldown <= world.time) cooldown = (world.time + 50) //5 second cooldown - user.visible_message("[user] pulls back the string on [src].") + user.visible_message(span_notice("[user] pulls back the string on [src].")) icon_state = "[initial(icon_state)]_used" sleep(5) - audible_message("[icon2html(src, viewers(src))] Hiss!") + audible_message(span_danger("[icon2html(src, viewers(src))] Hiss!")) var/list/possible_sounds = list('sound/blank.ogg') var/chosen_sound = pick(possible_sounds) playsound(get_turf(src), chosen_sound, 50, TRUE) addtimer(VARSET_CALLBACK(src, icon_state, "[initial(icon_state)]"), 4.5 SECONDS) else - to_chat(user, "The string on [src] hasn't rewound all the way!") + to_chat(user, span_warning("The string on [src] hasn't rewound all the way!")) return // TOY MOUSEYS :3 :3 :3 @@ -1219,7 +1219,7 @@ /obj/item/toy/figure/attack_self(mob/user as mob) if(cooldown <= world.time) cooldown = world.time + 50 - to_chat(user, "[src] says \"[toysay]\"") + to_chat(user, span_notice("[src] says \"[toysay]\"")) playsound(user, toysound, 20, TRUE) /obj/item/toy/figure/cmo @@ -1424,7 +1424,7 @@ if(!new_name) return doll_name = new_name - to_chat(user, "I name the dummy as \"[doll_name]\".") + to_chat(user, span_notice("I name the dummy as \"[doll_name]\".")) name = "[initial(name)] - [doll_name]" /obj/item/toy/dummy/talk_into(atom/movable/A, message, channel, list/spans, datum/language/language) diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index a70d94b8d..5ab0d4058 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -43,9 +43,9 @@ user.update_inv_hands() if(show_message) if(iscyborg(user)) - to_chat(user, "I free up your module.") + to_chat(user, span_notice("I free up your module.")) else - to_chat(user, "I are now carrying [src] with one hand.") + to_chat(user, span_notice("I are now carrying [src] with one hand.")) var/obj/item/twohanded/offhand/O = user.get_inactive_held_item() if(O && istype(O)) O.unwield() @@ -55,13 +55,13 @@ if(wielded) return if(ismonkey(user)) - to_chat(user, "It's too heavy for you to wield fully.") + to_chat(user, span_warning("It's too heavy for you to wield fully.")) return if(user.get_inactive_held_item()) - to_chat(user, "I need your other hand to be empty!") + to_chat(user, span_warning("I need your other hand to be empty!")) return if(user.get_num_arms() < 2) - to_chat(user, "I don't have enough intact hands.") + to_chat(user, span_warning("I don't have enough intact hands.")) return wielded = 1 if(force_wielded) @@ -69,9 +69,9 @@ name = "[name] (Wielded)" update_icon() if(iscyborg(user)) - to_chat(user, "I dedicate your module to [src].") + to_chat(user, span_notice("I dedicate your module to [src].")) else - to_chat(user, "I grab [src] with both hands.") + to_chat(user, span_notice("I grab [src] with both hands.")) var/obj/item/twohanded/offhand/O = new(user) ////Let's reserve his other hand~ O.name = "[name] - offhand" O.desc = "" @@ -160,7 +160,7 @@ /obj/item/twohanded/required/mob_can_equip(mob/M, mob/equipper, slot, disable_warning = 0) if(wielded && !slot_flags) if(!disable_warning) - to_chat(M, "[src] is too cumbersome to carry with anything but your hands!") + to_chat(M, span_warning("[src] is too cumbersome to carry with anything but your hands!")) return 0 return ..() @@ -169,7 +169,7 @@ if(get_dist(src,user) > 1) return if(H != null) - to_chat(user, "[src] is too cumbersome to carry in one hand!") + to_chat(user, span_notice("[src] is too cumbersome to carry in one hand!")) return if(loc != user) wield(user) @@ -202,7 +202,7 @@ if(!wielded) return if(show_message) - to_chat(user, "I drop [src].") + to_chat(user, span_notice("I drop [src].")) ..(user, FALSE) /* @@ -236,7 +236,7 @@ return /obj/item/twohanded/fireaxe/suicide_act(mob/user) - user.visible_message("[user] axes [user.p_them()]self from head to toe! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] axes [user.p_them()]self from head to toe! It looks like [user.p_theyre()] trying to commit suicide!")) return (BRUTELOSS) /obj/item/twohanded/fireaxe/afterattack(atom/A, mob/user, proximity) @@ -282,7 +282,7 @@ /obj/item/twohanded/dualsaber/suicide_act(mob/living/carbon/user) if(wielded) - user.visible_message("[user] begins spinning way too fast! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins spinning way too fast! It looks like [user.p_theyre()] trying to commit suicide!")) var/obj/item/bodypart/head/myhead = user.get_bodypart(BODY_ZONE_HEAD)//stole from chainsaw code var/obj/item/organ/brain/B = user.getorganslot(ORGAN_SLOT_BRAIN) @@ -297,12 +297,12 @@ myhead.drop_limb() sleep(3) else - user.visible_message("[user] panics and starts choking to death!") + user.visible_message(span_suicide("[user] panics and starts choking to death!")) return OXYLOSS else - user.visible_message("[user] begins beating [user.p_them()]self to death with \the [src]'s handle! It probably would've been cooler if [user.p_they()] turned it on first!") + user.visible_message(span_suicide("[user] begins beating [user.p_them()]self to death with \the [src]'s handle! It probably would've been cooler if [user.p_they()] turned it on first!")) return BRUTELOSS /obj/item/twohanded/dualsaber/Initialize() @@ -333,7 +333,7 @@ /obj/item/twohanded/dualsaber/attack(mob/target, mob/living/carbon/human/user) if(user.has_dna()) if(user.dna.check_mutation(HULK)) - to_chat(user, "I grip the blade too hard and accidentally close it!") + to_chat(user, span_warning("I grip the blade too hard and accidentally close it!")) unwield() return ..() @@ -347,7 +347,7 @@ dance_rotate(user, CALLBACK(user, TYPE_PROC_REF(/mob, dance_flip))) /obj/item/twohanded/dualsaber/proc/impale(mob/living/user) - to_chat(user, "I twirl around a bit before losing your balance and impaling myself on [src].") + to_chat(user, span_warning("I twirl around a bit before losing your balance and impaling myself on [src].")) if (force_wielded) user.take_bodypart_damage(20,25,check_armor = TRUE) else @@ -361,7 +361,7 @@ /obj/item/twohanded/dualsaber/wield(mob/living/carbon/M) //Specific wield () hulk checks due to reflection chance for balance issues and switches hitsounds. if(M.has_dna()) if(M.dna.check_mutation(HULK)) - to_chat(M, "I lack the grace to wield this!") + to_chat(M, span_warning("I lack the grace to wield this!")) return ..() if(wielded) @@ -400,7 +400,7 @@ var/mob/living/carbon/C = user if(C.wear_mask) in_mouth = ", barely missing [user.p_their()] nose" - . = "[user] swings [user.p_their()] [name][in_mouth]. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [A.name] in the process." + . = span_warning("[user] swings [user.p_their()] [name][in_mouth]. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [A.name] in the process.") playsound(loc, pick(hitsound), get_clamped_volume(), TRUE, -1) add_fingerprint(user) // Light your candles while spinning around the room @@ -422,11 +422,11 @@ if(W.tool_behaviour == TOOL_MULTITOOL) if(!hacked) hacked = TRUE - to_chat(user, "2XRNBW_ENGAGE") + to_chat(user, span_warning("2XRNBW_ENGAGE")) saber_color = "rainbow" update_icon() else - to_chat(user, "It's starting to look like a triple rainbow - no, nevermind.") + to_chat(user, span_warning("It's starting to look like a triple rainbow - no, nevermind.")) else return ..() @@ -460,7 +460,7 @@ AddComponent(/datum/component/butchering, 100, 70) //decent in a pinch, but pretty bad. /obj/item/twohanded/spear/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins to sword-swallow \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins to sword-swallow \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /obj/item/twohanded/spear/Initialize() @@ -511,7 +511,7 @@ ..() /obj/item/twohanded/spear/explosive/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins to sword-swallow \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins to sword-swallow \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) user.say("[war_cry]", forced="spear warcry") explosive.forceMove(user) explosive.prime() @@ -521,7 +521,7 @@ /obj/item/twohanded/spear/explosive/examine(mob/user) . = ..() - . += "Alt-click to set your war cry." + . += span_notice("Alt-click to set your war cry.") /obj/item/twohanded/spear/explosive/update_icon() icon_state = "spearbomb[wielded]" @@ -573,13 +573,13 @@ /obj/item/twohanded/required/chainsaw/suicide_act(mob/living/carbon/user) if(on) - user.visible_message("[user] begins to tear [user.p_their()] head off with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins to tear [user.p_their()] head off with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(src, 'sound/blank.ogg', 100, TRUE) var/obj/item/bodypart/head/myhead = user.get_bodypart(BODY_ZONE_HEAD) if(myhead) myhead.dismember() else - user.visible_message("[user] smashes [src] into [user.p_their()] neck, destroying [user.p_their()] esophagus! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] smashes [src] into [user.p_their()] neck, destroying [user.p_their()] esophagus! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(src, 'sound/blank.ogg', 100, TRUE) return(BRUTELOSS) @@ -616,7 +616,7 @@ /obj/item/twohanded/required/chainsaw/doomslayer/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(attack_type == PROJECTILE_ATTACK) - owner.visible_message("Ranged attacks just make [owner] angrier!") + owner.visible_message(span_danger("Ranged attacks just make [owner] angrier!")) playsound(src, pick('sound/blank.ogg'), 75, TRUE) return 1 return 0 @@ -690,15 +690,15 @@ icon_state = "pitchfork[wielded]" /obj/item/twohanded/pitchfork/suicide_act(mob/user) - user.visible_message("[user] impales [user.p_them()]self in [user.p_their()] abdomen with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] impales [user.p_them()]self in [user.p_their()] abdomen with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return (BRUTELOSS) /obj/item/twohanded/pitchfork/demonic/pickup(mob/living/user) . = ..() if(isliving(user) && user.mind && user.owns_soul() && !is_devil(user)) var/mob/living/U = user - U.visible_message("As [U] picks [src] up, [U]'s arms briefly catch fire.", \ - "\"As you pick up [src] your arms ignite, reminding you of all your past sins.\"") + U.visible_message(span_warning("As [U] picks [src] up, [U]'s arms briefly catch fire."), \ + span_warning("\"As you pick up [src] your arms ignite, reminding you of all your past sins.\"")) if(ishuman(U)) var/mob/living/carbon/human/H = U H.apply_damage(rand(force/2, force), BURN, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) @@ -707,7 +707,7 @@ /obj/item/twohanded/pitchfork/demonic/attack(mob/target, mob/living/carbon/human/user) if(user.mind && user.owns_soul() && !is_devil(user)) - to_chat(user, "[src] burns in your hands.") + to_chat(user, span_warning("[src] burns in your hands.")) user.apply_damage(rand(force/2, force), BURN, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) ..() @@ -717,7 +717,7 @@ return if(iswallturf(target)) var/turf/closed/wall/W = target - user.visible_message("[user] blasts \the [target] with \the [src]!") + user.visible_message(span_danger("[user] blasts \the [target] with \the [src]!")) playsound(target, 'sound/blank.ogg', 100, TRUE) W.break_wall() W.ScrapeAway(flags = CHANGETURF_INHERIT_AIR) @@ -753,11 +753,11 @@ if(wielded || attack_type != PROJECTILE_ATTACK) if(prob(final_block_chance)) if(attack_type == PROJECTILE_ATTACK) - owner.visible_message("[owner] deflects [attack_text] with [src]!") + owner.visible_message(span_danger("[owner] deflects [attack_text] with [src]!")) playsound(src, pick('sound/blank.ogg'), 75, TRUE) return 1 else - owner.visible_message("[owner] parries [attack_text] with [src]!") + owner.visible_message(span_danger("[owner] parries [attack_text] with [src]!")) return 1 return 0 @@ -815,7 +815,7 @@ return RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(unwield)) listeningTo = user - user.visible_message("[user] holds [src] up to [user.p_their()] eyes.", "I hold [src] up to your eyes.") + user.visible_message(span_notice("[user] holds [src] up to [user.p_their()] eyes."), span_notice("I hold [src] up to your eyes.")) item_state = "binoculars_wielded" user.regenerate_icons() if(!user?.client) @@ -840,7 +840,7 @@ . = ..() UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED) listeningTo = null - user.visible_message("[user] lowers [src].", "I lower [src].") + user.visible_message(span_notice("[user] lowers [src]."), span_notice("I lower [src].")) item_state = "binoculars" user.regenerate_icons() if(user && user.client) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 698fda474..0debf5e8a 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -15,7 +15,7 @@ resistance_flags = FIRE_PROOF /obj/item/banhammer/suicide_act(mob/user) - user.visible_message("[user] is hitting [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to ban [user.p_them()]self from life.") + user.visible_message(span_suicide("[user] is hitting [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to ban [user.p_them()]self from life.")) return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS) /* oranges says: This is a meme relating to the english translation of the ss13 russian wiki page on lurkmore. @@ -24,9 +24,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 */ /obj/item/banhammer/attack(mob/M, mob/user) if(user.zone_selected == BODY_ZONE_HEAD) - M.visible_message("[user] is stroking the head of [M] with a banhammer.", "[user] is stroking my head with a banhammer.", "I hear a banhammer stroking a head.") + M.visible_message(span_danger("[user] is stroking the head of [M] with a banhammer."), span_danger("[user] is stroking my head with a banhammer."), span_hear("I hear a banhammer stroking a head.")) else - M.visible_message("[M] has been banned FOR NO REISIN by [user]!", "I have been banned FOR NO REISIN by [user]!", "I hear a banhammer banning someone.") + M.visible_message(span_danger("[M] has been banned FOR NO REISIN by [user]!"), span_danger("I have been banned FOR NO REISIN by [user]!"), span_hear("I hear a banhammer banning someone.")) playsound(loc, 'sound/blank.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much if(user.used_intent.type != INTENT_HELP) return ..(M, user) @@ -46,8 +46,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") /obj/item/sord/suicide_act(mob/user) - user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.", \ - "I try to impale myself with [src], but it's USELESS...") + user.visible_message(span_suicide("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty."), \ + span_suicide("I try to impale myself with [src], but it's USELESS...")) return SHAME /obj/item/claymore @@ -75,7 +75,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 AddComponent(/datum/component/butchering, 40, 105) /obj/item/claymore/suicide_act(mob/user) - user.visible_message("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return(BRUTELOSS) /obj/item/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS @@ -97,7 +97,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/claymore/highlander/Destroy() if(nuke_disk) nuke_disk.forceMove(get_turf(src)) - nuke_disk.visible_message("The nuke disk is vulnerable!") + nuke_disk.visible_message(span_warning("The nuke disk is vulnerable!")) nuke_disk = null STOP_PROCESSING(SSobj, src) return ..() @@ -114,7 +114,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/claymore/highlander/pickup(mob/living/user) . = ..() - to_chat(user, "The power of Scotland protects you! You are shielded from all stuns and knockdowns.") + to_chat(user, span_notice("The power of Scotland protects you! You are shielded from all stuns and knockdowns.")) user.add_stun_absorption("highlander", INFINITY, 1, " is protected by the power of Scotland!", "The power of Scotland absorbs the stun!", " is protected by the power of Scotland!") user.ignore_slowdown(HIGHLANDER) @@ -126,14 +126,14 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 . = ..() . += "It has [!notches ? "nothing" : "[notches] notches"] scratched into the blade." if(nuke_disk) - . += "It's holding the nuke disk!" + . += span_boldwarning("It's holding the nuke disk!") /obj/item/claymore/highlander/attack(mob/living/target, mob/living/user) . = ..() if(!QDELETED(target) && iscarbon(target) && target.stat == DEAD && target.mind && target.mind.special_role == "highlander") user.fully_heal(admin_revive = FALSE) //STEAL THE LIFE OF OUR FALLEN FOES add_notch(user) - target.visible_message("[target] crumbles to dust beneath [user]'s blows!", "As you fall, my body crumbles to dust!") + target.visible_message(span_warning("[target] crumbles to dust beneath [user]'s blows!"), span_danger("As you fall, my body crumbles to dust!")) target.dust() /obj/item/claymore/highlander/attack_self(mob/living/user) @@ -143,9 +143,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 if(H.mind.special_role == "highlander" && (!closest_victim || get_dist(user, closest_victim) < closest_distance)) closest_victim = H if(!closest_victim) - to_chat(user, "[src] thrums for a moment and falls dark. Perhaps there's nobody nearby.") + to_chat(user, span_warning("[src] thrums for a moment and falls dark. Perhaps there's nobody nearby.")) return - to_chat(user, "[src] thrums and points to the [dir2text(get_dir(user, closest_victim))].") + to_chat(user, span_danger("[src] thrums and points to the [dir2text(get_dir(user, closest_victim))].")) /obj/item/claymore/highlander/IsReflect() return 1 //YOU THINK YOUR PUNY LASERS CAN STOP ME? @@ -156,44 +156,44 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 var/new_name = name switch(notches) if(1) - to_chat(user, "My first kill - hopefully one of many. You scratch a notch into [src]'s blade.") - to_chat(user, "I feel my fallen foe's soul entering my blade, restoring my wounds!") + to_chat(user, span_notice("My first kill - hopefully one of many. You scratch a notch into [src]'s blade.")) + to_chat(user, span_warning("I feel my fallen foe's soul entering my blade, restoring my wounds!")) new_name = "notched claymore" if(2) - to_chat(user, "Another falls before you. Another soul fuses with my own. Another notch in the blade.") + to_chat(user, span_notice("Another falls before you. Another soul fuses with my own. Another notch in the blade.")) new_name = "double-notched claymore" add_atom_colour(rgb(255, 235, 235), ADMIN_COLOUR_PRIORITY) if(3) - to_chat(user, "You're beginning to relish the thrill of battle.") + to_chat(user, span_notice("You're beginning to relish the thrill of battle.")) new_name = "triple-notched claymore" add_atom_colour(rgb(255, 215, 215), ADMIN_COLOUR_PRIORITY) if(4) - to_chat(user, "You've lost count of how many you've killed.") + to_chat(user, span_notice("You've lost count of how many you've killed.")) new_name = "many-notched claymore" add_atom_colour(rgb(255, 195, 195), ADMIN_COLOUR_PRIORITY) if(5) - to_chat(user, "Five voices now echo in my mind, cheering the slaughter.") + to_chat(user, span_boldannounce("Five voices now echo in my mind, cheering the slaughter.")) new_name = "battle-tested claymore" add_atom_colour(rgb(255, 175, 175), ADMIN_COLOUR_PRIORITY) if(6) - to_chat(user, "Is this what the vikings felt like? Visions of glory fill my head as you slay my sixth foe.") + to_chat(user, span_boldannounce("Is this what the vikings felt like? Visions of glory fill my head as you slay my sixth foe.")) new_name = "battle-scarred claymore" add_atom_colour(rgb(255, 155, 155), ADMIN_COLOUR_PRIORITY) if(7) - to_chat(user, "Kill. Butcher. Conquer.") + to_chat(user, span_boldannounce("Kill. Butcher. Conquer.")) new_name = "vicious claymore" add_atom_colour(rgb(255, 135, 135), ADMIN_COLOUR_PRIORITY) if(8) - to_chat(user, "IT NEVER GETS OLD. THE SCREAMING. THE BLOOD AS IT SPRAYS ACROSS YOUR FACE.") + to_chat(user, span_danger("IT NEVER GETS OLD. THE SCREAMING. THE BLOOD AS IT SPRAYS ACROSS YOUR FACE.")) new_name = "bloodthirsty claymore" add_atom_colour(rgb(255, 115, 115), ADMIN_COLOUR_PRIORITY) if(9) - to_chat(user, "ANOTHER ONE FALLS TO YOUR BLOWS. ANOTHER WEAKLING UNFIT TO LIVE.") + to_chat(user, span_danger("ANOTHER ONE FALLS TO YOUR BLOWS. ANOTHER WEAKLING UNFIT TO LIVE.")) new_name = "gore-stained claymore" add_atom_colour(rgb(255, 95, 95), ADMIN_COLOUR_PRIORITY) if(10) - user.visible_message("[user]'s eyes light up with a vengeful fire!", \ - "YOU FEEL THE POWER OF VALHALLA FLOWING THROUGH YOU! THERE CAN BE ONLY ONE!!!") + user.visible_message(span_warning("[user]'s eyes light up with a vengeful fire!"), \ + span_danger("YOU FEEL THE POWER OF VALHALLA FLOWING THROUGH YOU! THERE CAN BE ONLY ONE!!!")) user.update_icons() new_name = "GORE-DRENCHED CLAYMORE OF [pick("THE WHIMSICAL SLAUGHTER", "A THOUSAND SLAUGHTERED CATTLE", "GLORY AND VALHALLA", "ANNIHILATION", "OBLITERATION")]" icon_state = "claymore_valhalla" @@ -227,7 +227,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 slot_flags = null /obj/item/katana/suicide_act(mob/user) - user.visible_message("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!") + user.visible_message(span_suicide("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!")) return(BRUTELOSS) /obj/item/wirerod @@ -253,14 +253,14 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 qdel(src) user.put_in_hands(S) - to_chat(user, "I fasten the glass shard to the top of the rod with the cable.") + to_chat(user, span_notice("I fasten the glass shard to the top of the rod with the cable.")) else if(istype(I, /obj/item/assembly/igniter) && !(HAS_TRAIT(I, TRAIT_NODROP))) var/obj/item/melee/baton/cattleprod/P = new /obj/item/melee/baton/cattleprod remove_item_from_storage(user) - to_chat(user, "I fasten [I] to the top of the rod with the cable.") + to_chat(user, span_notice("I fasten [I] to the top of the rod with the cable.")) qdel(I) qdel(src) @@ -336,7 +336,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 sharpness = IS_BLUNT /obj/item/switchblade/suicide_act(mob/user) - user.visible_message("[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return (BRUTELOSS) /obj/item/phone @@ -354,9 +354,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/phone/suicide_act(mob/user) if(locate(/obj/structure/chair/stool) in user.loc) - user.visible_message("[user] begins to tie a noose with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins to tie a noose with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!")) else - user.visible_message("[user] is strangling [user.p_them()]self with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is strangling [user.p_them()]self with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!")) return(OXYLOSS) /obj/item/cane @@ -418,7 +418,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 icon_state = "ectoplasm" /obj/item/ectoplasm/suicide_act(mob/user) - user.visible_message("[user] is inhaling [src]! It looks like [user.p_theyre()] trying to visit the astral plane!") + user.visible_message(span_suicide("[user] is inhaling [src]! It looks like [user.p_theyre()] trying to visit the astral plane!")) return (OXYLOSS) /obj/item/ectoplasm/angelic @@ -568,13 +568,13 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 ..() return if(homerun_ready) - to_chat(user, "You're already ready to do a home run!") + to_chat(user, span_warning("You're already ready to do a home run!")) ..() return - to_chat(user, "I begin gathering strength...") + to_chat(user, span_warning("I begin gathering strength...")) playsound(get_turf(src), 'sound/blank.ogg', 65, TRUE) if(do_after(user, 90, target = src)) - to_chat(user, "I gather power! Time for a home run!") + to_chat(user, span_danger("I gather power! Time for a home run!")) homerun_ready = 1 ..() @@ -582,7 +582,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 . = ..() var/atom/throw_target = get_edge_target_turf(target, user.dir) if(homerun_ready) - user.visible_message("It's a home run!") + user.visible_message(span_danger("It's a home run!")) target.throw_at(throw_target, rand(8,10), 14, user) target.ex_act(EXPLODE_HEAVY) playsound(get_turf(src), 'sound/blank.ogg', 100, TRUE) @@ -639,7 +639,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 if(proximity_flag) if(is_type_in_typecache(target, strong_against)) new /obj/effect/decal/cleanable/insectguts(target.drop_location()) - to_chat(user, "I easily splat the [target].") + to_chat(user, span_warning("I easily splat the [target].")) if(istype(target, /mob/living/)) var/mob/living/bug = target bug.death(1) @@ -673,9 +673,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 L.dna.species.stop_wagging_tail(M) user.do_attack_animation(M) playsound(M, 'sound/blank.ogg', 50, TRUE, -1) - user.visible_message("[user] slaps [M]!", - "I slap [M]!",\ - "I hear a slap.") + user.visible_message(span_danger("[user] slaps [M]!"), + span_notice("I slap [M]!"),\ + span_hear("I hear a slap.")) return /obj/item/proc/can_trigger_gun(mob/living/user) if(!user.can_use_guns(src)) @@ -702,7 +702,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/extendohand/attack(atom/M, mob/living/carbon/human/user) var/dist = get_dist(M, user) if(dist < min_reach) - to_chat(user, "[M] is too close to use [src] on.") + to_chat(user, span_warning("[M] is too close to use [src] on.")) return M.attack_hand(user) diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 57b62af4a..4821472b7 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -82,7 +82,7 @@ /obj/bullet_act(obj/projectile/P) . = ..() playsound(src.loc, P.hitsound, 50, TRUE) - visible_message("[src] is hit by \a [P]!", null, null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[src] is hit by \a [P]!"), null, null, COMBAT_MESSAGE_RANGE) if(!QDELETED(src)) //Bullet on_hit effect might have already destroyed this object take_damage(P.damage, P.damage_type, P.flag, 0, turn(P.dir, 180), P.armor_penetration) @@ -92,7 +92,7 @@ /obj/attack_hulk(mob/living/carbon/human/user) ..() - user.visible_message("[user] smashes [src]!", "I smash [src]!", null, COMBAT_MESSAGE_RANGE) + user.visible_message(span_danger("[user] smashes [src]!"), span_danger("I smash [src]!"), null, COMBAT_MESSAGE_RANGE) if(density) playsound(src.loc, 'sound/blank.ogg', 100, TRUE) else @@ -165,7 +165,7 @@ return 0 else return 0 - M.visible_message("[M.name] hits [src]!", "I hit [src]!", null, COMBAT_MESSAGE_RANGE) + M.visible_message(span_danger("[M.name] hits [src]!"), span_danger("I hit [src]!"), null, COMBAT_MESSAGE_RANGE) return take_damage(M.force*3, mech_damtype, "blunt", play_soundeffect, get_dir(src, M)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs. /obj/singularity_act() diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 23c1c8a5c..b194d26eb 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -110,7 +110,7 @@ /obj/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force) . = ..() if(obj_flags & FROZEN) - visible_message("[src] shatters into a million pieces!") + visible_message(span_danger("[src] shatters into a million pieces!")) qdel(src) @@ -275,7 +275,7 @@ fire = text2num(result["values"]["fire"]),\ acid = text2num(result["values"]["acid"])) log_admin("[key_name(usr)] modified the armor on [src] ([type]) to blunt: [armor.blunt], slash: [armor.slash], stab:[armor.stab], bullet: [armor.bullet], laser: [armor.laser], energy: [armor.energy], bomb: [armor.bomb], bio: [armor.bio], rad: [armor.rad], fire: [armor.fire], acid: [armor.acid]") - message_admins("[key_name_admin(usr)] modified the armor on [src] ([type]) to blunt: [armor.blunt], slash: [armor.slash], stab:[armor.stab], bullet: [armor.bullet], laser: [armor.laser], energy: [armor.energy], bomb: [armor.bomb], bio: [armor.bio], rad: [armor.rad], fire: [armor.fire], acid: [armor.acid]") + message_admins(span_notice("[key_name_admin(usr)] modified the armor on [src] ([type]) to blunt: [armor.blunt], slash: [armor.slash], stab:[armor.stab], bullet: [armor.bullet], laser: [armor.laser], energy: [armor.energy], bomb: [armor.bomb], bio: [armor.bio], rad: [armor.rad], fire: [armor.fire], acid: [armor.acid]")) if(href_list[VV_HK_MASS_DEL_TYPE]) if(check_rights(R_DEBUG|R_SERVER)) var/action_type = alert("Strict type ([type]) or type and all subtypes?",,"Strict type","Type and subtypes","Cancel") @@ -301,7 +301,7 @@ to_chat(usr, "No objects of this type exist") return log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ") - message_admins("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ") + message_admins(span_notice("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")) if("Type and subtypes") var/i = 0 for(var/obj/Obj in world) @@ -313,14 +313,14 @@ to_chat(usr, "No objects of this type exist") return log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ") - message_admins("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ") + message_admins(span_notice("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")) /obj/examine(mob/user) . = ..() // if(obj_flags & UNIQUE_RENAME) -// . += "Use a pen on it to rename it or change its description." +// . += span_notice("Use a pen on it to rename it or change its description.") if(unique_reskin && !current_skin) - . += "Alt-click it to reskin it." + . += span_notice("Alt-click it to reskin it.") /obj/AltClick(mob/user) . = ..() diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 2c17e7036..26de82dcf 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -38,7 +38,7 @@ H.apply_damage(15, BRUTE, "chest", H.run_armor_check("chest", "blunt", damage = 15)) H.toggle_rogmove_intent(MOVE_INTENT_WALK, TRUE) playsound(src, "genblunt", 100, TRUE) - H.visible_message("[H] runs into [src]!", "I run into [src]!") + H.visible_message(span_warning("[H] runs into [src]!"), span_warning("I run into [src]!")) addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, Knockdown), 10), 10) @@ -65,7 +65,7 @@ // user.changeNext_move(CLICK_CD_MELEE) // user.do_attack_animation(src) // structureclimber.Paralyze(40) -// structureclimber.visible_message("[structureclimber] has been knocked off [src].", "You're knocked off [src]!", "You see [structureclimber] get knocked off [src].") +// structureclimber.visible_message(span_warning("[structureclimber] has been knocked off [src].", "You're knocked off [src]!", "You see [structureclimber] get knocked off [src].")) /obj/structure/Crossed(atom/movable/AM) . = ..() @@ -125,13 +125,13 @@ adjusted_climb_time -= user.STASPD * 2 adjusted_climb_time = max(adjusted_climb_time, 0) // if(adjusted_climb_time) -// user.visible_message("[user] starts climbing onto [src].", "I start climbing onto [src]...") +// user.visible_message(span_warning("[user] starts climbing onto [src]."), span_warning("I start climbing onto [src]...")) structureclimber = user if(do_mob(user, user, adjusted_climb_time)) if(src.loc) //Checking if structure has been destroyed if(do_climb(user)) - user.visible_message("[user] climbs onto [src].", \ - "I climb onto [src].") + user.visible_message(span_warning("[user] climbs onto [src]."), \ + span_notice("I climb onto [src].")) log_combat(user, src, "climbed onto") // if(climb_offset) // user.set_mob_offsets("structure_climb", _x = 0, _y = climb_offset) @@ -141,14 +141,14 @@ playsound(src, climb_sound, 100) . = 1 else - to_chat(user, "I fail to climb onto [src].") + to_chat(user, span_warning("I fail to climb onto [src].")) structureclimber = null /obj/structure/examine(mob/user) . = ..() if(!(resistance_flags & INDESTRUCTIBLE)) if(obj_broken) - . += "It appears to be broken." + . += span_notice("It appears to be broken.") var/examine_status = examine_status(user) if(examine_status) . += examine_status @@ -162,4 +162,4 @@ if(25 to 50) return "It appears heavily damaged." if(1 to 25) - return "It's falling apart!" + return span_warning("It's falling apart!") diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index 30cac48ce..40834cec5 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -51,7 +51,7 @@ /obj/structure/AIcore/latejoin_inactive/examine(mob/user) . = ..() . += "Its transmitter seems to be [active? "on" : "off"]." - . += "I could [active? "deactivate" : "activate"] it with a multitool." + . += span_notice("I could [active? "deactivate" : "activate"] it with a multitool.") /obj/structure/AIcore/latejoin_inactive/proc/is_available() //If people still manage to use this feature to spawn-kill AI latejoins ahelp them. if(!available) @@ -75,7 +75,7 @@ /obj/structure/AIcore/latejoin_inactive/attackby(obj/item/P, mob/user, params) if(P.tool_behaviour == TOOL_MULTITOOL) active = !active - to_chat(user, "I [active? "activate" : "deactivate"] \the [src]'s transmitters.") + to_chat(user, span_notice("I [active? "activate" : "deactivate"] \the [src]'s transmitters.")) return return ..() @@ -93,15 +93,15 @@ if(!anchored) if(P.tool_behaviour == TOOL_WELDER && can_deconstruct) if(state != EMPTY_CORE) - to_chat(user, "The core must be empty to deconstruct it!") + to_chat(user, span_warning("The core must be empty to deconstruct it!")) return if(!P.tool_start_check(user, amount=0)) return - to_chat(user, "I start to deconstruct the frame...") + to_chat(user, span_notice("I start to deconstruct the frame...")) if(P.use_tool(src, user, 20, volume=50) && state == EMPTY_CORE) - to_chat(user, "I deconstruct the frame.") + to_chat(user, span_notice("I deconstruct the frame.")) deconstruct(TRUE) return else @@ -111,7 +111,7 @@ if(!user.transferItemToLoc(P, src)) return playsound(loc, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I place the circuit board inside the frame.") + to_chat(user, span_notice("I place the circuit board inside the frame.")) update_icon() state = CIRCUIT_CORE circuit = P @@ -119,13 +119,13 @@ if(CIRCUIT_CORE) if(P.tool_behaviour == TOOL_SCREWDRIVER) P.play_tool_sound(src) - to_chat(user, "I screw the circuit board into place.") + to_chat(user, span_notice("I screw the circuit board into place.")) state = SCREWED_CORE update_icon() return if(P.tool_behaviour == TOOL_CROWBAR) P.play_tool_sound(src) - to_chat(user, "I remove the circuit board.") + to_chat(user, span_notice("I remove the circuit board.")) state = EMPTY_CORE update_icon() circuit.forceMove(loc) @@ -134,7 +134,7 @@ if(SCREWED_CORE) if(P.tool_behaviour == TOOL_SCREWDRIVER && circuit) P.play_tool_sound(src) - to_chat(user, "I unfasten the circuit board.") + to_chat(user, span_notice("I unfasten the circuit board.")) state = CIRCUIT_CORE update_icon() return @@ -142,21 +142,21 @@ var/obj/item/stack/cable_coil/C = P if(C.get_amount() >= 5) playsound(loc, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I start to add cables to the frame...") + to_chat(user, span_notice("I start to add cables to the frame...")) if(do_after(user, 20, target = src) && state == SCREWED_CORE && C.use(5)) - to_chat(user, "I add cables to the frame.") + to_chat(user, span_notice("I add cables to the frame.")) state = CABLED_CORE update_icon() else - to_chat(user, "I need five lengths of cable to wire the AI core!") + to_chat(user, span_warning("I need five lengths of cable to wire the AI core!")) return if(CABLED_CORE) if(P.tool_behaviour == TOOL_WIRECUTTER) if(brain) - to_chat(user, "Get that [brain.name] out of there first!") + to_chat(user, span_warning("Get that [brain.name] out of there first!")) else P.play_tool_sound(src) - to_chat(user, "I remove the cables.") + to_chat(user, span_notice("I remove the cables.")) state = SCREWED_CORE update_icon() new /obj/item/stack/cable_coil(drop_location(), 5) @@ -166,18 +166,18 @@ var/obj/item/stack/sheet/rglass/G = P if(G.get_amount() >= 2) playsound(loc, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I start to put in the glass panel...") + to_chat(user, span_notice("I start to put in the glass panel...")) if(do_after(user, 20, target = src) && state == CABLED_CORE && G.use(2)) - to_chat(user, "I put in the glass panel.") + to_chat(user, span_notice("I put in the glass panel.")) state = GLASS_CORE update_icon() else - to_chat(user, "I need two sheets of reinforced glass to insert them into the AI core!") + to_chat(user, span_warning("I need two sheets of reinforced glass to insert them into the AI core!")) return if(istype(P, /obj/item/aiModule)) if(brain && brain.laws.id != DEFAULT_AI_LAWID) - to_chat(user, "The installed [brain.name] already has set laws!") + to_chat(user, span_warning("The installed [brain.name] already has set laws!")) return var/obj/item/aiModule/module = P module.install(laws, user) @@ -186,36 +186,36 @@ if(istype(P, /obj/item/mmi) && !brain) var/obj/item/mmi/M = P if(!M.brainmob) - to_chat(user, "Sticking an empty [M.name] into the frame would sort of defeat the purpose!") + to_chat(user, span_warning("Sticking an empty [M.name] into the frame would sort of defeat the purpose!")) return if(M.brainmob.stat == DEAD) - to_chat(user, "Sticking a dead [M.name] into the frame would sort of defeat the purpose!") + to_chat(user, span_warning("Sticking a dead [M.name] into the frame would sort of defeat the purpose!")) return if(!M.brainmob.client) - to_chat(user, "Sticking an inactive [M.name] into the frame would sort of defeat the purpose.") + to_chat(user, span_warning("Sticking an inactive [M.name] into the frame would sort of defeat the purpose.")) return if(!CONFIG_GET(flag/allow_ai) || (is_banned_from(M.brainmob.ckey, "AI") && !QDELETED(src) && !QDELETED(user) && !QDELETED(M) && !QDELETED(user) && Adjacent(user))) if(!QDELETED(M)) - to_chat(user, "This [M.name] does not seem to fit!") + to_chat(user, span_warning("This [M.name] does not seem to fit!")) return if(!M.brainmob.mind) - to_chat(user, "This [M.name] is mindless!") + to_chat(user, span_warning("This [M.name] is mindless!")) return if(!user.transferItemToLoc(M,src)) return brain = M - to_chat(user, "I add [M.name] to the frame.") + to_chat(user, span_notice("I add [M.name] to the frame.")) update_icon() return if(P.tool_behaviour == TOOL_CROWBAR && brain) P.play_tool_sound(src) - to_chat(user, "I remove the brain.") + to_chat(user, span_notice("I remove the brain.")) brain.forceMove(loc) brain = null update_icon() @@ -224,7 +224,7 @@ if(GLASS_CORE) if(P.tool_behaviour == TOOL_CROWBAR) P.play_tool_sound(src) - to_chat(user, "I remove the glass panel.") + to_chat(user, span_notice("I remove the glass panel.")) state = CABLED_CORE update_icon() new /obj/item/stack/sheet/rglass(loc, 2) @@ -232,7 +232,7 @@ if(P.tool_behaviour == TOOL_SCREWDRIVER) P.play_tool_sound(src) - to_chat(user, "I connect the monitor.") + to_chat(user, span_notice("I connect the monitor.")) if(brain) SSticker.mode.remove_antag_for_borging(brain.brainmob.mind) @@ -259,7 +259,7 @@ if(P.tool_behaviour == TOOL_SCREWDRIVER) P.play_tool_sound(src) - to_chat(user, "I disconnect the monitor.") + to_chat(user, span_notice("I disconnect the monitor.")) state = GLASS_CORE update_icon() return @@ -316,7 +316,7 @@ That prevents a few funky behaviors. /atom/proc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card) if(istype(card)) if(card.flush) - to_chat(user, "ERROR: AI flush is in progress, cannot execute transfer protocol.") + to_chat(user, span_alert("ERROR: AI flush is in progress, cannot execute transfer protocol.")) return FALSE return TRUE @@ -328,13 +328,13 @@ That prevents a few funky behaviors. AI.control_disabled = FALSE AI.radio_enabled = TRUE AI.forceMove(loc) // to replace the terminal. - to_chat(AI, "I have been uploaded to a stationary terminal. Remote device connection restored.") + to_chat(AI, span_notice("I have been uploaded to a stationary terminal. Remote device connection restored.")) to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.") card.AI = null AI.battery = circuit.battery qdel(src) else //If for some reason you use an empty card on an empty AI terminal. - to_chat(user, "There is no AI loaded on this terminal.") + to_chat(user, span_alert("There is no AI loaded on this terminal.")) /obj/item/circuitboard/aicore name = "AI core (AI Core Board)" //Well, duh, but best to be consistent diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index edda67afa..08bedbfb0 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -257,19 +257,19 @@ if(user.getorgan(/obj/item/organ/alien/plasmavessel)) switch(status) if(BURST) - to_chat(user, "I clear the hatched egg.") + to_chat(user, span_notice("I clear the hatched egg.")) playsound(loc, 'sound/blank.ogg', 100, TRUE) qdel(src) return if(GROWING) - to_chat(user, "The child is not developed yet.") + to_chat(user, span_notice("The child is not developed yet.")) return if(GROWN) - to_chat(user, "I retrieve the child.") + to_chat(user, span_notice("I retrieve the child.")) Burst(kill=FALSE) return else - to_chat(user, "It feels slimy.") + to_chat(user, span_notice("It feels slimy.")) user.changeNext_move(CLICK_CD_MELEE) diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 911642b95..16581429c 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -21,7 +21,7 @@ painting = C C.forceMove(get_turf(src)) C.layer = layer+0.1 - user.visible_message("[user] puts \the [C] on \the [src].","I place \the [C] on \the [src].") + user.visible_message(span_notice("[user] puts \the [C] on \the [src]."),span_notice("I place \the [C] on \the [src].")) else return ..() @@ -129,7 +129,7 @@ GLOBAL_LIST_INIT(globalBlankCanvases, new(AMT_OF_CANVASES)) if(blank) //it's basically a giant etch-a-sketch icon = blank - user.visible_message("[user] cleans the canvas.","I clean the canvas.") + user.visible_message(span_notice("[user] cleans the canvas."),span_notice("I clean the canvas.")) #undef AMT_OF_CANVASES diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index c5f611258..ebd4c34e5 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -67,21 +67,21 @@ if(.) return if(!allowed(user)) - to_chat(user, "Access denied.") + to_chat(user, span_info("Access denied.")) return if(broken) - to_chat(user, "The controls seem unresponsive.") + to_chat(user, span_danger("The controls seem unresponsive.")) return pick_sign(user) /obj/structure/sign/barsign/attackby(obj/item/I, mob/user) if(I.tool_behaviour == TOOL_SCREWDRIVER) if(!panel_open) - to_chat(user, "I open the maintenance panel.") + to_chat(user, span_notice("I open the maintenance panel.")) set_sign(new /datum/barsign/hiddensigns/signoff) panel_open = TRUE else - to_chat(user, "I close the maintenance panel.") + to_chat(user, span_notice("I close the maintenance panel.")) if(!broken) if(!chosen_sign) set_sign(new /datum/barsign/hiddensigns/signoff) @@ -94,14 +94,14 @@ else if(istype(I, /obj/item/stack/cable_coil) && panel_open) var/obj/item/stack/cable_coil/C = I if(!broken) - to_chat(user, "This sign is functioning properly!") + to_chat(user, span_warning("This sign is functioning properly!")) return if(C.use(2)) - to_chat(user, "I replace the burnt wiring.") + to_chat(user, span_notice("I replace the burnt wiring.")) broken = FALSE else - to_chat(user, "I need at least two lengths of cable!") + to_chat(user, span_warning("I need at least two lengths of cable!")) else return ..() @@ -115,9 +115,9 @@ /obj/structure/sign/barsign/emag_act(mob/user) if(broken) - to_chat(user, "Nothing interesting happens!") + to_chat(user, span_warning("Nothing interesting happens!")) return - to_chat(user, "I load an illegal barsign into the memory buffer...") + to_chat(user, span_notice("I load an illegal barsign into the memory buffer...")) sleep(10 SECONDS) chosen_sign = set_sign(new /datum/barsign/hiddensigns/syndibarsign) diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm index 604533d0d..2c1244d1f 100644 --- a/code/game/objects/structures/beds_chairs/alien_nest.dm +++ b/code/game/objects/structures/beds_chairs/alien_nest.dm @@ -25,22 +25,22 @@ return if(M != user) - M.visible_message("[user.name] pulls [M.name] free from the sticky nest!",\ - "[user.name] pulls you free from the gelatinous resin.",\ - "I hear squelching...") + M.visible_message(span_notice("[user.name] pulls [M.name] free from the sticky nest!"),\ + span_notice("[user.name] pulls you free from the gelatinous resin."),\ + span_hear("I hear squelching...")) else - M.visible_message("[M.name] struggles to break free from the gelatinous resin!",\ - "I struggle to break free from the gelatinous resin... (Stay still for two minutes.)",\ - "I hear squelching...") + M.visible_message(span_warning("[M.name] struggles to break free from the gelatinous resin!"),\ + span_notice("I struggle to break free from the gelatinous resin... (Stay still for two minutes.)"),\ + span_hear("I hear squelching...")) if(!do_after(M, 1200, target = src)) if(M && M.buckled) - to_chat(M, "I fail to unbuckle yourself!") + to_chat(M, span_warning("I fail to unbuckle yourself!")) return if(!M.buckled) return - M.visible_message("[M.name] breaks free from the gelatinous resin!",\ - "I break free from the gelatinous resin!",\ - "I hear squelching...") + M.visible_message(span_warning("[M.name] breaks free from the gelatinous resin!"),\ + span_notice("I break free from the gelatinous resin!"),\ + span_hear("I hear squelching...")) unbuckle_mob(M) add_fingerprint(user) @@ -58,9 +58,9 @@ unbuckle_all_mobs() if(buckle_mob(M)) - M.visible_message("[user.name] secretes a thick vile goo, securing [M.name] into [src]!",\ - "[user.name] drenches you in a foul-smelling resin, trapping you in [src]!",\ - "I hear squelching...") + M.visible_message(span_notice("[user.name] secretes a thick vile goo, securing [M.name] into [src]!"),\ + span_danger("[user.name] drenches you in a foul-smelling resin, trapping you in [src]!"),\ + span_hear("I hear squelching...")) /obj/structure/bed/nest/post_buckle_mob(mob/living/M) M.pixel_y = 0 diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index 3d86950f9..abaca1e8d 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -26,7 +26,7 @@ /obj/structure/bed/examine(mob/user) . = ..() // if(bolts) -// . += "It's held together by a couple of bolts." +// . += span_notice("It's held together by a couple of bolts.") /obj/structure/bed/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) @@ -59,19 +59,19 @@ if(istype(W, /obj/item/roller/robo)) var/obj/item/roller/robo/R = W if(R.loaded) - to_chat(user, "I already have a roller bed docked!") + to_chat(user, span_warning("I already have a roller bed docked!")) return if(has_buckled_mobs()) if(buckled_mobs.len > 1) unbuckle_all_mobs() - user.visible_message("[user] unbuckles all creatures from [src].") + user.visible_message(span_notice("[user] unbuckles all creatures from [src].")) else user_unbuckle_mob(buckled_mobs[1],user) else R.loaded = src forceMove(R) - user.visible_message("[user] collects [src].", "I collect [src].") + user.visible_message(span_notice("[user] collects [src]."), span_notice("I collect [src].")) return 1 else return ..() @@ -83,7 +83,7 @@ return 0 if(has_buckled_mobs()) return 0 - usr.visible_message("[usr] collapses \the [src.name].", "I collapse \the [src.name].") + usr.visible_message(span_notice("[usr] collapses \the [src.name]."), span_notice("I collapse \the [src.name].")) var/obj/structure/bed/roller/B = new foldabletype(get_turf(src)) usr.put_in_hands(B) qdel(src) @@ -115,9 +115,9 @@ if(istype(I, /obj/item/roller/robo)) var/obj/item/roller/robo/R = I if(R.loaded) - to_chat(user, "[R] already has a roller bed loaded!") + to_chat(user, span_warning("[R] already has a roller bed loaded!")) return - user.visible_message("[user] loads [src].", "I load [src] into [R].") + user.visible_message(span_notice("[user] loads [src]."), span_notice("I load [src] into [R].")) R.loaded = new/obj/structure/bed/roller(R) qdel(src) //"Load" return @@ -155,10 +155,10 @@ /obj/item/roller/robo/deploy_roller(mob/user, atom/location) if(loaded) loaded.forceMove(location) - user.visible_message("[user] deploys [loaded].", "I deploy [loaded].") + user.visible_message(span_notice("[user] deploys [loaded]."), span_notice("I deploy [loaded].")) loaded = null else - to_chat(user, "The dock is empty!") + to_chat(user, span_warning("The dock is empty!")) //Dog bed diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index c900cbf4a..155a49b6d 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -17,9 +17,9 @@ /obj/structure/chair/examine(mob/user) . = ..() -// . += "It's held together by a couple of bolts." +// . += span_notice("It's held together by a couple of bolts.") // if(!has_buckled_mobs()) -// . += "Drag your sprite to sit in it." +// . += span_notice("Drag your sprite to sit in it.") /obj/structure/chair/Initialize() . = ..() @@ -244,7 +244,7 @@ return if(!usr.canUseTopic(src, BE_CLOSE, ismonkey(usr))) return - usr.visible_message("[usr] grabs \the [src.name].", "I grab \the [src.name].") + usr.visible_message(span_notice("[usr] grabs \the [src.name]."), span_notice("I grab \the [src.name].")) var/obj/item/C = new item_chair(loc) item_chair = null C.set_custom_materials(custom_materials) @@ -279,7 +279,7 @@ var/obj/structure/chair/origin_type = /obj/structure/chair /obj/item/chair/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins hitting [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins hitting [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(src,hitsound,50,TRUE) return BRUTELOSS @@ -294,17 +294,17 @@ /obj/item/chair/proc/plant(mob/user) var/turf/T = get_turf(loc) if(!isfloorturf(T)) - to_chat(user, "I need ground to plant this on!") + to_chat(user, span_warning("I need ground to plant this on!")) return for(var/obj/A in T) if(istype(A, /obj/structure/chair)) - to_chat(user, "There is already a chair here!") + to_chat(user, span_warning("There is already a chair here!")) return if(A.density && !(A.flags_1 & ON_BORDER_1)) - to_chat(user, "There is already something here!") + to_chat(user, span_warning("There is already something here!")) return - user.visible_message("[user] rights \the [src.name].", "I right \the [name].") + user.visible_message(span_notice("[user] rights \the [src.name]."), span_notice("I right \the [name].")) var/obj/structure/chair/C = new origin_type(get_turf(loc)) C.set_custom_materials(custom_materials) TransferComponents(C) @@ -329,7 +329,7 @@ /* /obj/item/chair/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(attack_type == UNARMED_ATTACK && prob(hit_reaction_chance)) - owner.visible_message("[owner] fends off [attack_text] with [src]!") + owner.visible_message(span_danger("[owner] fends off [attack_text] with [src]!")) return 1 return 0 */ @@ -338,7 +338,7 @@ if(!proximity) return if(prob(break_chance)) - user.visible_message("[src] is smashed to pieces!") + user.visible_message(span_warning("[src] is smashed to pieces!")) if(iscarbon(target)) var/mob/living/carbon/C = target if(C.health < C.maxHealth*0.5) @@ -420,12 +420,12 @@ if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return if(!(datum_flags & PROCESSING_FAST)) - user.visible_message("[user] spins [src] around, and the last vestiges of Ratvarian technology keeps it spinning FOREVER.", \ - "Automated spinny chairs. The pinnacle of ancient Ratvarian technology.") + user.visible_message(span_notice("[user] spins [src] around, and the last vestiges of Ratvarian technology keeps it spinning FOREVER."), \ + span_notice("Automated spinny chairs. The pinnacle of ancient Ratvarian technology.")) START_PROCESSING(SSfastprocess, src) else - user.visible_message("[user] stops [src]'s uncontrollable spinning.", \ - "I grab [src] and stop its wild spinning.") + user.visible_message(span_notice("[user] stops [src]'s uncontrollable spinning."), \ + span_notice("I grab [src] and stop its wild spinning.")) STOP_PROCESSING(SSfastprocess, src) /obj/structure/chair/mime @@ -467,9 +467,9 @@ /obj/structure/chair/plastic/proc/snap_check(mob/living/carbon/Mob) if (Mob.nutrition >= NUTRITION_LEVEL_FAT) - to_chat(Mob, "The chair begins to pop and crack, you're too heavy!") + to_chat(Mob, span_warning("The chair begins to pop and crack, you're too heavy!")) if(do_after(Mob, 60, 1, Mob, 0)) - Mob.visible_message("The plastic chair snaps under [Mob]'s weight!") + Mob.visible_message(span_notice("The plastic chair snaps under [Mob]'s weight!")) qdel(src) /obj/item/chair/plastic diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 05cbfe615..b2c41810b 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -30,12 +30,12 @@ LINEN BINS return if(layer == initial(layer)) layer = ABOVE_MOB_LAYER - to_chat(user, "I cover myself with [src].") + to_chat(user, span_notice("I cover myself with [src].")) pixel_x = 0 pixel_y = 0 else layer = initial(layer) - to_chat(user, "I smooth [src] out beneath you.") + to_chat(user, span_notice("I smooth [src] out beneath you.")) add_fingerprint(user) return @@ -45,7 +45,7 @@ LINEN BINS transfer_fingerprints_to(C) C.add_fingerprint(user) qdel(src) - to_chat(user, "I tear [src] up.") + to_chat(user, span_notice("I tear [src] up.")) else return ..() @@ -362,7 +362,7 @@ LINEN BINS return sheets.Add(I) amount++ - to_chat(user, "I tuck [I] in [src].") + to_chat(user, span_notice("I tuck [I] in [src].")) update_icon() else if(default_unfasten_wrench(user, I, 5)) @@ -381,10 +381,10 @@ LINEN BINS else if(amount && !hidden && I.w_class < WEIGHT_CLASS_BULKY) //make sure there's sheets to hide it among, make sure nothing else is hidden in there. if(!user.transferItemToLoc(I, src)) - to_chat(user, "\The [I] is stuck to your hand, you cannot hide it among the sheets!") + to_chat(user, span_warning("\The [I] is stuck to your hand, you cannot hide it among the sheets!")) return hidden = I - to_chat(user, "I hide [I] among the sheets.") + to_chat(user, span_notice("I hide [I] among the sheets.")) /obj/structure/bedsheetbin/attack_paw(mob/user) @@ -411,12 +411,12 @@ LINEN BINS B.forceMove(drop_location()) user.put_in_hands(B) - to_chat(user, "I take [B] out of [src].") + to_chat(user, span_notice("I take [B] out of [src].")) update_icon() if(hidden) hidden.forceMove(drop_location()) - to_chat(user, "[hidden] falls out of [B]!") + to_chat(user, span_notice("[hidden] falls out of [B]!")) hidden = null @@ -434,7 +434,7 @@ LINEN BINS B = new /obj/item/bedsheet(loc) B.forceMove(drop_location()) - to_chat(user, "I telekinetically remove [B] from [src].") + to_chat(user, span_notice("I telekinetically remove [B] from [src].")) update_icon() if(hidden) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 726c92a07..d7dadadf7 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -108,17 +108,17 @@ /obj/structure/closet/examine(mob/user) . = ..() /* if(welded) - . += "It's welded shut." + . += span_notice("It's welded shut.") if(anchored) - . += "It is bolted to the ground." + . += span_notice("It is bolted to the ground.") if(opened) - . += "The parts are welded together." + . += span_notice("The parts are welded together.") else if(secure && !opened) - . += "Alt-click to [locked ? "unlock" : "lock"]." + . += span_notice("Alt-click to [locked ? "unlock" : "lock"].") if(isliving(user)) var/mob/living/L = user if(HAS_TRAIT(L, TRAIT_SKITTISH)) - . += "Ctrl-Shift-click [src] to jump inside."*/ + . += span_notice("Ctrl-Shift-click [src] to jump inside.")*/ /obj/structure/closet/CanPass(atom/movable/mover, turf/target) if(wall_mounted) @@ -128,13 +128,13 @@ /obj/structure/closet/proc/can_open(mob/living/user) if(welded || locked) if(user) - to_chat(user, "Locked." ) + to_chat(user, span_warning("Locked.") ) return FALSE // var/turf/T = get_turf(src) // for(var/mob/living/L in T) // if(L.anchored || horizontal && L.mob_size > MOB_SIZE_TINY && L.density) // if(user) -// to_chat(user, "There's something large on top of [src], preventing it from opening." ) +// to_chat(user, span_danger("There's something large on top of [src], preventing it from opening.") ) // return FALSE return TRUE @@ -146,7 +146,7 @@ // for(var/mob/living/L in T) // if(L.anchored || horizontal && L.mob_size > MOB_SIZE_TINY && L.density) // if(user) -// to_chat(user, "There's something too large in [src], preventing it from closing.") +// to_chat(user, span_danger("There's something too large in [src], preventing it from closing.")) // return FALSE return TRUE @@ -272,10 +272,10 @@ if(opened) return if(!keylock) - to_chat(user, "There's no lock on this.") + to_chat(user, span_warning("There's no lock on this.")) return if(broken) - to_chat(user, "The lock is broken.") + to_chat(user, span_warning("The lock is broken.")) return if(istype(I,/obj/item/keyring)) var/obj/item/keyring/R = I @@ -334,14 +334,14 @@ var/turf/T = get_turf(src) var/list/targets = list(O, src) add_fingerprint(user) - user.visible_message("[user] [actuallyismob ? "tries to ":""]stuff [O] into [src].", \ - "I [actuallyismob ? "try to ":""]stuff [O] into [src].", \ - "I hear clanging.") + user.visible_message(span_warning("[user] [actuallyismob ? "tries to ":""]stuff [O] into [src]."), \ + span_warning("I [actuallyismob ? "try to ":""]stuff [O] into [src]."), \ + span_hear("I hear clanging.")) if(actuallyismob) if(do_after_mob(user, targets, 40)) - user.visible_message("[user] stuffs [O] into [src].", \ - "I stuff [O] into [src].", \ - "I hear a loud bang.") + user.visible_message(span_notice("[user] stuffs [O] into [src]."), \ + span_notice("I stuff [O] into [src]."), \ + span_hear("I hear a loud bang.")) var/mob/living/L = O if(!issilicon(L)) L.Paralyze(40) @@ -357,7 +357,7 @@ if(locked) if(message_cooldown <= world.time) message_cooldown = world.time + 50 - to_chat(user, "I'm trapped!") + to_chat(user, span_warning("I'm trapped!")) return container_resist(user) @@ -392,7 +392,7 @@ if(iscarbon(usr) || issilicon(usr) || isdrone(usr)) return toggle(usr) else - to_chat(usr, "This mob type can't use this verb.") + to_chat(usr, span_warning("This mob type can't use this verb.")) // Objects that try to exit a locker by stepping were doing so successfully, // and due to an oversight in turf/Enter() were going through walls. That @@ -419,7 +419,7 @@ //okay, so the closet is either welded or locked... resist!!! user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user.visible_message("[src] shakes violently!") + user.visible_message(span_warning("[src] shakes violently!")) /obj/structure/closet/proc/bust_open() welded = FALSE //applies to all lockers @@ -447,21 +447,21 @@ /obj/structure/closet/proc/togglelock(mob/living/user, silent) user.changeNext_move(CLICK_CD_MELEE) if(locked) - user.visible_message("[user] unlocks [src].", \ - "I unlock [src].") + user.visible_message(span_warning("[user] unlocks [src]."), \ + span_notice("I unlock [src].")) playsound(src, 'sound/foley/doors/lock.ogg', 100) locked = 0 else - user.visible_message("[user] locks [src].", \ - "I lock [src].") + user.visible_message(span_warning("[user] locks [src]."), \ + span_notice("I lock [src].")) playsound(src, 'sound/foley/doors/lock.ogg', 100) locked = 1 /obj/structure/closet/emag_act(mob/user) if(secure && !broken) - user.visible_message("Sparks fly from [src]!", - "I scramble [src]'s lock, breaking it open!", - "I hear a faint electrical spark.") + user.visible_message(span_warning("Sparks fly from [src]!"), + span_warning("I scramble [src]'s lock, breaking it open!"), + span_hear("I hear a faint electrical spark.")) playsound(src, "sparks", 50, TRUE) broken = TRUE locked = FALSE @@ -512,16 +512,16 @@ if(locked) togglelock(user, TRUE) if(!open(user)) - to_chat(user, "It won't budge!") + to_chat(user, span_warning("It won't budge!")) return step_towards(user, T2) T1 = get_turf(user) if(T1 == T2) user.resting = TRUE //so people can jump into crates without slamming the lid on their head if(!close(user)) - to_chat(user, "I can't get [src] to close!") + to_chat(user, span_warning("I can't get [src] to close!")) user.resting = FALSE return user.resting = FALSE togglelock(user) - T1.visible_message("[user] dives into [src]!") + T1.visible_message(span_warning("[user] dives into [src]!")) diff --git a/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/code/game/objects/structures/crates_lockers/closets/bodybag.dm index f15bd81ba..ba7d973fd 100644 --- a/code/game/objects/structures/crates_lockers/closets/bodybag.dm +++ b/code/game/objects/structures/crates_lockers/closets/bodybag.dm @@ -29,7 +29,7 @@ /obj/structure/closet/body_bag/attackby(obj/item/I, mob/user, params) if (istype(I, /obj/item/pen) || istype(I, /obj/item/toy/crayon)) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on [src]!") + to_chat(user, span_notice("I scribble illegibly on [src]!")) return var/t = stripped_input(user, "What would you like the label to be?", name, null, 53) if(user.get_active_held_item() != I) @@ -44,7 +44,7 @@ name = "body bag" return else if(I.tool_behaviour == TOOL_WIRECUTTER) - to_chat(user, "I cut the tag off [src].") + to_chat(user, span_notice("I cut the tag off [src].")) name = "body bag" tagged = 0 update_icon() @@ -71,12 +71,12 @@ if(!ishuman(usr)) return if(opened) - to_chat(usr, "I wrestle with [src], but it won't fold while unzipped.") + to_chat(usr, span_warning("I wrestle with [src], but it won't fold while unzipped.")) return if(contents.len) - to_chat(usr, "There are too many things inside of [src] to fold it up!") + to_chat(usr, span_warning("There are too many things inside of [src] to fold it up!")) return - visible_message("[usr] folds up [src].") + visible_message(span_notice("[usr] folds up [src].")) var/obj/item/bodybag/B = foldedbag_instance || new foldedbag_path usr.put_in_hands(B) qdel(src) @@ -97,19 +97,19 @@ if(!ishuman(usr)) return if(opened) - to_chat(usr, "I wrestle with [src], but it won't fold while unzipped.") + to_chat(usr, span_warning("I wrestle with [src], but it won't fold while unzipped.")) return if(contents.len >= mob_storage_capacity / 2) - to_chat(usr, "There are too many things inside of [src] to fold it up!") + to_chat(usr, span_warning("There are too many things inside of [src] to fold it up!")) return for(var/obj/item/bodybag/bluespace/B in src) - to_chat(usr, "I can't recursively fold bluespace body bags!" ) + to_chat(usr, span_warning("I can't recursively fold bluespace body bags!") ) return - visible_message("[usr] folds up [src].") + visible_message(span_notice("[usr] folds up [src].")) var/obj/item/bodybag/B = foldedbag_instance || new foldedbag_path usr.put_in_hands(B) for(var/atom/movable/A in contents) A.forceMove(B) if(isliving(A)) - to_chat(A, "You're suddenly forced into a tiny, compressed space!") + to_chat(A, span_danger("You're suddenly forced into a tiny, compressed space!")) qdel(src) diff --git a/code/game/objects/structures/crates_lockers/closets/infinite.dm b/code/game/objects/structures/crates_lockers/closets/infinite.dm index 9aaf220f9..7276e35ae 100644 --- a/code/game/objects/structures/crates_lockers/closets/infinite.dm +++ b/code/game/objects/structures/crates_lockers/closets/infinite.dm @@ -30,4 +30,4 @@ /obj/structure/closet/infinite/proc/close_on_my_own() if(close()) - visible_message("\The [src] closes on its own.") + visible_message(span_notice("\The [src] closes on its own.")) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index e391b20e2..4c5d27cdd 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -39,7 +39,7 @@ var/obj/item/card/id/I = W.GetID() if(istype(I)) if(broken) - to_chat(user, "It appears to be broken.") + to_chat(user, span_danger("It appears to be broken.")) return if(!I || !I.registered_name) return @@ -52,6 +52,6 @@ registered_name = I.registered_name desc = "" else - to_chat(user, "Access Denied.") + to_chat(user, span_danger("Access Denied.")) else return ..() diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index c8696c8d5..300cc7ffe 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -56,14 +56,14 @@ /obj/structure/closet/crate/open(mob/living/user) . = ..() if(. && manifest) - to_chat(user, "The manifest is torn off [src].") + to_chat(user, span_notice("The manifest is torn off [src].")) playsound(src, 'sound/blank.ogg', 75, TRUE) manifest.forceMove(get_turf(src)) manifest = null update_icon() /obj/structure/closet/crate/proc/tear_manifest(mob/user) - to_chat(user, "I tear the manifest off of [src].") + to_chat(user, span_notice("I tear the manifest off of [src].")) playsound(src, 'sound/blank.ogg', 75, TRUE) manifest.forceMove(loc) diff --git a/code/game/objects/structures/crates_lockers/crates/bins.dm b/code/game/objects/structures/crates_lockers/crates/bins.dm index c745aa5d6..8191738ec 100644 --- a/code/game/objects/structures/crates_lockers/crates/bins.dm +++ b/code/game/objects/structures/crates_lockers/crates/bins.dm @@ -25,7 +25,7 @@ /obj/structure/closet/crate/bin/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/storage/bag/trash)) var/obj/item/storage/bag/trash/T = W - to_chat(user, "I fill the bag.") + to_chat(user, span_notice("I fill the bag.")) for(var/obj/item/O in src) SEND_SIGNAL(T, COMSIG_TRY_STORAGE_INSERT, O, user, TRUE) T.update_icon() diff --git a/code/game/objects/structures/crates_lockers/crates/large.dm b/code/game/objects/structures/crates_lockers/crates/large.dm index 91176c6ca..57f386994 100644 --- a/code/game/objects/structures/crates_lockers/crates/large.dm +++ b/code/game/objects/structures/crates_lockers/crates/large.dm @@ -16,16 +16,16 @@ if(manifest) tear_manifest(user) else - to_chat(user, "I need a crowbar to pry this open!") + to_chat(user, span_warning("I need a crowbar to pry this open!")) /obj/structure/closet/crate/large/attackby(obj/item/W, mob/user, params) if(W.tool_behaviour == TOOL_CROWBAR) if(manifest) tear_manifest(user) - user.visible_message("[user] pries \the [src] open.", \ - "I pry open \the [src].", \ - "I hear splitting wood.") + user.visible_message(span_notice("[user] pries \the [src] open."), \ + span_notice("I pry open \the [src]."), \ + span_hear("I hear splitting wood.")) playsound(src.loc, 'sound/blank.ogg', 75, TRUE) var/turf/T = get_turf(src) @@ -41,6 +41,6 @@ return ..() //Stops it from opening and turning invisible when items are used on it. else - to_chat(user, "I need a crowbar to pry this open!") + to_chat(user, span_warning("I need a crowbar to pry this open!")) return FALSE //Just stop. Do nothing. Don't turn into an invisible sprite. Don't open like a locker. //The large crate has no non-attack interactions other than the crowbar, anyway. diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm index 221b9e7b6..95eda2f78 100644 --- a/code/game/objects/structures/crates_lockers/crates/secure.dm +++ b/code/game/objects/structures/crates_lockers/crates/secure.dm @@ -27,7 +27,7 @@ /obj/structure/closet/crate/secure/proc/boom(mob/user) if(user) - to_chat(user, "The crate's anti-tamper system activates!") + to_chat(user, span_danger("The crate's anti-tamper system activates!")) log_bomber(user, "has detonated a", src) for(var/atom/movable/AM in src) qdel(AM) @@ -73,7 +73,7 @@ /obj/structure/closet/crate/secure/owned/examine(mob/user) . = ..() - . += "It's locked with a privacy lock, and can only be unlocked by the buyer's ID." + . += span_notice("It's locked with a privacy lock, and can only be unlocked by the buyer's ID.") /obj/structure/closet/crate/secure/owned/Initialize(mapload, datum/bank_account/_buyer_account) . = ..() @@ -89,16 +89,16 @@ if(iscarbon(user)) add_fingerprint(user) locked = !locked - user.visible_message("[user] unlocks [src]'s privacy lock.", - "I unlock [src]'s privacy lock.") + user.visible_message(span_notice("[user] unlocks [src]'s privacy lock."), + span_notice("I unlock [src]'s privacy lock.")) privacy_lock = FALSE update_icon() else if(!silent) - to_chat(user, "Bank account does not match with buyer!") + to_chat(user, span_notice("Bank account does not match with buyer!")) else if(!silent) - to_chat(user, "No linked bank account detected!") + to_chat(user, span_notice("No linked bank account detected!")) else if(!silent) - to_chat(user, "No ID detected!") + to_chat(user, span_notice("No ID detected!")) else if(!silent) - to_chat(user, "[src] is broken!") + to_chat(user, span_warning("[src] is broken!")) else ..() diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 2d36ee457..c98b88408 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -40,9 +40,9 @@ /obj/structure/displaycase/examine(mob/user) . = ..() if(alert) - . += "Hooked up with an anti-theft system." + . += span_notice("Hooked up with an anti-theft system.") if(showpiece) - . += "There's [showpiece] inside." + . += span_notice("There's [showpiece] inside.") if(trophy_message) . += "The plaque reads:\n [trophy_message]" @@ -102,46 +102,46 @@ /obj/structure/displaycase/attackby(obj/item/W, mob/user, params) if(W.GetID() && !broken && openable) if(allowed(user)) - to_chat(user, "I [open ? "close":"open"] [src].") + to_chat(user, span_notice("I [open ? "close":"open"] [src].")) toggle_lock(user) else - to_chat(user, "Access denied.") + to_chat(user, span_alert("Access denied.")) else if(W.tool_behaviour == TOOL_WELDER && user.used_intent.type == INTENT_HELP && !broken) if(obj_integrity < max_integrity) if(!W.tool_start_check(user, amount=5)) return - to_chat(user, "I begin repairing [src]...") + to_chat(user, span_notice("I begin repairing [src]...")) if(W.use_tool(src, user, 40, amount=5, volume=50)) obj_integrity = max_integrity update_icon() - to_chat(user, "I repair [src].") + to_chat(user, span_notice("I repair [src].")) else - to_chat(user, "[src] is already in good condition!") + to_chat(user, span_warning("[src] is already in good condition!")) return else if(!alert && W.tool_behaviour == TOOL_CROWBAR && openable) //Only applies to the lab cage and player made display cases if(broken) if(showpiece) - to_chat(user, "Remove the displayed object first!") + to_chat(user, span_warning("Remove the displayed object first!")) else - to_chat(user, "I remove the destroyed case.") + to_chat(user, span_notice("I remove the destroyed case.")) qdel(src) else - to_chat(user, "I start to [open ? "close":"open"] [src]...") + to_chat(user, span_notice("I start to [open ? "close":"open"] [src]...")) if(W.use_tool(src, user, 20)) - to_chat(user, "I [open ? "close":"open"] [src].") + to_chat(user, span_notice("I [open ? "close":"open"] [src].")) toggle_lock(user) else if(open && !showpiece) if(user.transferItemToLoc(W, src)) showpiece = W - to_chat(user, "I put [W] on display.") + to_chat(user, span_notice("I put [W] on display.")) update_icon() else if(istype(W, /obj/item/stack/sheet/glass) && broken) var/obj/item/stack/sheet/glass/G = W if(G.get_amount() < 2) - to_chat(user, "I need two glass sheets to fix the case!") + to_chat(user, span_warning("I need two glass sheets to fix the case!")) return - to_chat(user, "I start fixing [src]...") + to_chat(user, span_notice("I start fixing [src]...")) if(do_after(user, 20, target = src)) G.use(2) broken = 0 @@ -163,7 +163,7 @@ return user.changeNext_move(CLICK_CD_MELEE) if (showpiece && (broken || open)) - to_chat(user, "I deactivate the hover field built into the case.") + to_chat(user, span_notice("I deactivate the hover field built into the case.")) log_combat(user, src, "deactivates the hover field of") dump() src.add_fingerprint(user) @@ -176,7 +176,7 @@ if (user.used_intent.type == INTENT_HELP) user.examinate(src) return - user.visible_message("[user] kicks the display case.", null, null, COMBAT_MESSAGE_RANGE) + user.visible_message(span_danger("[user] kicks the display case."), null, null, COMBAT_MESSAGE_RANGE) log_combat(user, src, "kicks") user.do_attack_animation(src, ATTACK_EFFECT_KICK) take_damage(2) @@ -193,7 +193,7 @@ /obj/structure/displaycase_chassis/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WRENCH) //The player can only deconstruct the wooden frame - to_chat(user, "I start disassembling [src]...") + to_chat(user, span_notice("I start disassembling [src]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 30)) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) @@ -201,18 +201,18 @@ qdel(src) else if(istype(I, /obj/item/electronics/airlock)) - to_chat(user, "I start installing the electronics into [src]...") + to_chat(user, span_notice("I start installing the electronics into [src]...")) I.play_tool_sound(src) if(do_after(user, 30, target = src) && user.transferItemToLoc(I,src)) electronics = I - to_chat(user, "I install the airlock electronics.") + to_chat(user, span_notice("I install the airlock electronics.")) else if(istype(I, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = I if(G.get_amount() < 10) - to_chat(user, "I need ten glass sheets to do this!") + to_chat(user, span_warning("I need ten glass sheets to do this!")) return - to_chat(user, "I start adding [G] to [src]...") + to_chat(user, span_notice("I start adding [G] to [src]...")) if(do_after(user, 20, target = src)) G.use(10) var/obj/structure/displaycase/display = new(src.loc) @@ -269,35 +269,35 @@ if(user.is_holding_item_of_type(/obj/item/key/displaycase)) if(added_roundstart) is_locked = !is_locked - to_chat(user, "I [!is_locked ? "un" : ""]lock the case.") + to_chat(user, span_notice("I [!is_locked ? "un" : ""]lock the case.")) else - to_chat(user, "The lock is stuck shut!") + to_chat(user, span_warning("The lock is stuck shut!")) return if(is_locked) - to_chat(user, "The case is shut tight with an old fashioned physical lock. Maybe you should ask the curator for the key?") + to_chat(user, span_warning("The case is shut tight with an old fashioned physical lock. Maybe you should ask the curator for the key?")) return if(!added_roundstart) - to_chat(user, "You've already put something new in this case!") + to_chat(user, span_warning("You've already put something new in this case!")) return if(is_type_in_typecache(W, GLOB.blacklisted_cargo_types)) - to_chat(user, "The case rejects the [W]!") + to_chat(user, span_warning("The case rejects the [W]!")) return for(var/a in W.GetAllContents()) if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types)) - to_chat(user, "The case rejects the [W]!") + to_chat(user, span_warning("The case rejects the [W]!")) return if(user.transferItemToLoc(W, src)) if(showpiece) - to_chat(user, "I press a button, and [showpiece] descends into the floor of the case.") + to_chat(user, span_notice("I press a button, and [showpiece] descends into the floor of the case.")) QDEL_NULL(showpiece) - to_chat(user, "I insert [W] into the case.") + to_chat(user, span_notice("I insert [W] into the case.")) showpiece = W added_roundstart = FALSE update_icon() @@ -310,22 +310,22 @@ if(chosen_plaque) if(user.Adjacent(src)) trophy_message = chosen_plaque - to_chat(user, "I set the plaque's text.") + to_chat(user, span_notice("I set the plaque's text.")) else - to_chat(user, "I are too far to set the plaque's text!") + to_chat(user, span_warning("I are too far to set the plaque's text!")) SSpersistence.SaveTrophy(src) return TRUE else - to_chat(user, "\The [W] is stuck to your hand, you can't put it in the [src.name]!") + to_chat(user, span_warning("\The [W] is stuck to your hand, you can't put it in the [src.name]!")) return /obj/structure/displaycase/trophy/dump() if (showpiece) if(added_roundstart) - visible_message("The [showpiece] crumbles to dust!") + visible_message(span_danger("The [showpiece] crumbles to dust!")) new /obj/item/ash(loc) QDEL_NULL(showpiece) else diff --git a/code/game/objects/structures/divine.dm b/code/game/objects/structures/divine.dm index 87d7755a7..bcdccb7ef 100644 --- a/code/game/objects/structures/divine.dm +++ b/code/game/objects/structures/divine.dm @@ -16,7 +16,7 @@ var/mob/living/L = locate() in buckled_mobs if(!L) return - to_chat(user, "I attempt to sacrifice [L] by invoking the sacrificial ritual.") + to_chat(user, span_notice("I attempt to sacrifice [L] by invoking the sacrificial ritual.")) L.gib() message_admins("[ADMIN_LOOKUPFLW(user)] has sacrificed [key_name_admin(L)] on the sacrificial altar at [AREACOORD(src)].") @@ -35,10 +35,10 @@ if(.) return if(last_process + time_between_uses > world.time) - to_chat(user, "The fountain appears to be empty.") + to_chat(user, span_notice("The fountain appears to be empty.")) return last_process = world.time - to_chat(user, "The blood feels warm as you touch it. The fountain immediately dries up shortly afterwards.") + to_chat(user, span_notice("The blood feels warm as you touch it. The fountain immediately dries up shortly afterwards.")) user.reagents.add_reagent(/datum/reagent/medicine/healthpot,40) update_icon() addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), time_between_uses) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 242bd6982..2eb81d6be 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -33,21 +33,21 @@ switch(state) if(AIRLOCK_ASSEMBLY_NEEDS_WIRES) if(anchored) - . += "The anchoring bolts are wrenched in place, but the maintenance panel lacks wiring." + . += span_notice("The anchoring bolts are wrenched in place, but the maintenance panel lacks wiring.") else - . += "The assembly is welded together, but the anchoring bolts are unwrenched." + . += span_notice("The assembly is welded together, but the anchoring bolts are unwrenched.") if(AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) - . += "The maintenance panel is wired, but the circuit slot is empty." + . += span_notice("The maintenance panel is wired, but the circuit slot is empty.") if(AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) - . += "The circuit is connected loosely to its slot, but the maintenance panel is unscrewed and open." + . += span_notice("The circuit is connected loosely to its slot, but the maintenance panel is unscrewed and open.") if(!mineral && !glass && !noglass) - . += "There is a small paper placard on the assembly[doorname]. There are empty slots for glass windows and mineral covers." + . += span_notice("There is a small paper placard on the assembly[doorname]. There are empty slots for glass windows and mineral covers.") else if(!mineral && glass && !noglass) - . += "There is a small paper placard on the assembly[doorname]. There are empty slots for mineral covers." + . += span_notice("There is a small paper placard on the assembly[doorname]. There are empty slots for mineral covers.") else if(mineral && !glass && !noglass) - . += "There is a small paper placard on the assembly[doorname]. There are empty slots for glass windows." + . += span_notice("There is a small paper placard on the assembly[doorname]. There are empty slots for glass windows.") else - . += "There is a small paper placard on the assembly[doorname]." + . += span_notice("There is a small paper placard on the assembly[doorname].") /obj/structure/door_assembly/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pen)) @@ -64,17 +64,17 @@ if(mineral) var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]") - user.visible_message("[user] welds the [mineral] plating off the airlock assembly.", "I start to weld the [mineral] plating off the airlock assembly...") + user.visible_message(span_notice("[user] welds the [mineral] plating off the airlock assembly."), span_notice("I start to weld the [mineral] plating off the airlock assembly...")) if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "I weld the [mineral] plating off.") + to_chat(user, span_notice("I weld the [mineral] plating off.")) new mineral_path(loc, 2) var/obj/structure/door_assembly/PA = new previous_assembly(loc) transfer_assembly_vars(src, PA) else if(glass) - user.visible_message("[user] welds the glass panel out of the airlock assembly.", "I start to weld the glass panel out of the airlock assembly...") + user.visible_message(span_notice("[user] welds the glass panel out of the airlock assembly."), span_notice("I start to weld the glass panel out of the airlock assembly...")) if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "I weld the glass panel out.") + to_chat(user, span_notice("I weld the glass panel out.")) if(heat_proof_finished) new /obj/item/stack/sheet/rglass(get_turf(src)) heat_proof_finished = 0 @@ -82,10 +82,10 @@ new /obj/item/stack/sheet/glass(get_turf(src)) glass = 0 else if(!anchored) - user.visible_message("[user] disassembles the airlock assembly.", \ - "I start to disassemble the airlock assembly...") + user.visible_message(span_warning("[user] disassembles the airlock assembly."), \ + span_notice("I start to disassemble the airlock assembly...")) if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "I disassemble the airlock assembly.") + to_chat(user, span_notice("I disassemble the airlock assembly.")) deconstruct(TRUE) else if(W.tool_behaviour == TOOL_WRENCH) @@ -97,27 +97,27 @@ break if(door_check) - user.visible_message("[user] secures the airlock assembly to the floor.", \ - "I start to secure the airlock assembly to the floor...", \ - "I hear wrenching.") + user.visible_message(span_notice("[user] secures the airlock assembly to the floor."), \ + span_notice("I start to secure the airlock assembly to the floor..."), \ + span_hear("I hear wrenching.")) if(W.use_tool(src, user, 40, volume=100)) if(anchored) return - to_chat(user, "I secure the airlock assembly.") + to_chat(user, span_notice("I secure the airlock assembly.")) name = "secured airlock assembly" setAnchored(TRUE) else to_chat(user, "There is another door here!") else - user.visible_message("[user] unsecures the airlock assembly from the floor.", \ - "I start to unsecure the airlock assembly from the floor...", \ - "I hear wrenching.") + user.visible_message(span_notice("[user] unsecures the airlock assembly from the floor."), \ + span_notice("I start to unsecure the airlock assembly from the floor..."), \ + span_hear("I hear wrenching.")) if(W.use_tool(src, user, 40, volume=100)) if(!anchored) return - to_chat(user, "I unsecure the airlock assembly.") + to_chat(user, span_notice("I unsecure the airlock assembly.")) name = "airlock assembly" setAnchored(FALSE) @@ -125,51 +125,51 @@ if(!W.tool_start_check(user, amount=1)) return - user.visible_message("[user] wires the airlock assembly.", \ - "I start to wire the airlock assembly...") + user.visible_message(span_notice("[user] wires the airlock assembly."), \ + span_notice("I start to wire the airlock assembly...")) if(W.use_tool(src, user, 40, amount=1)) if(state != AIRLOCK_ASSEMBLY_NEEDS_WIRES) return state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS - to_chat(user, "I wire the airlock assembly.") + to_chat(user, span_notice("I wire the airlock assembly.")) name = "wired airlock assembly" else if((W.tool_behaviour == TOOL_WIRECUTTER) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS ) - user.visible_message("[user] cuts the wires from the airlock assembly.", \ - "I start to cut the wires from the airlock assembly...") + user.visible_message(span_notice("[user] cuts the wires from the airlock assembly."), \ + span_notice("I start to cut the wires from the airlock assembly...")) if(W.use_tool(src, user, 40, volume=100)) if(state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) return - to_chat(user, "I cut the wires from the airlock assembly.") + to_chat(user, span_notice("I cut the wires from the airlock assembly.")) new/obj/item/stack/cable_coil(get_turf(user), 1) state = AIRLOCK_ASSEMBLY_NEEDS_WIRES name = "secured airlock assembly" else if(istype(W, /obj/item/electronics/airlock) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS ) W.play_tool_sound(src, 100) - user.visible_message("[user] installs the electronics into the airlock assembly.", \ - "I start to install electronics into the airlock assembly...") + user.visible_message(span_notice("[user] installs the electronics into the airlock assembly."), \ + span_notice("I start to install electronics into the airlock assembly...")) if(do_after(user, 40, target = src)) if( state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS ) return if(!user.transferItemToLoc(W, src)) return - to_chat(user, "I install the airlock electronics.") + to_chat(user, span_notice("I install the airlock electronics.")) state = AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER name = "near finished airlock assembly" electronics = W else if((W.tool_behaviour == TOOL_CROWBAR) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) - user.visible_message("[user] removes the electronics from the airlock assembly.", \ - "I start to remove electronics from the airlock assembly...") + user.visible_message(span_notice("[user] removes the electronics from the airlock assembly."), \ + span_notice("I start to remove electronics from the airlock assembly...")) if(W.use_tool(src, user, 40, volume=100)) if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) return - to_chat(user, "I remove the airlock electronics.") + to_chat(user, span_notice("I remove the airlock electronics.")) state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS name = "wired airlock assembly" var/obj/item/electronics/airlock/ae @@ -188,17 +188,17 @@ if(!glass) if(istype(G, /obj/item/stack/sheet/rglass) || istype(G, /obj/item/stack/sheet/glass)) playsound(src, 'sound/blank.ogg', 100, TRUE) - user.visible_message("[user] adds [G.name] to the airlock assembly.", \ - "I start to install [G.name] into the airlock assembly...") + user.visible_message(span_notice("[user] adds [G.name] to the airlock assembly."), \ + span_notice("I start to install [G.name] into the airlock assembly...")) if(do_after(user, 40, target = src)) if(G.get_amount() < 1 || glass) return if(G.type == /obj/item/stack/sheet/rglass) - to_chat(user, "I install [G.name] windows into the airlock assembly.") + to_chat(user, span_notice("I install [G.name] windows into the airlock assembly.")) heat_proof_finished = 1 //reinforced glass makes the airlock heat-proof name = "near finished heat-proofed window airlock assembly" else - to_chat(user, "I install regular glass windows into the airlock assembly.") + to_chat(user, span_notice("I install regular glass windows into the airlock assembly.")) name = "near finished window airlock assembly" G.use(1) glass = TRUE @@ -207,30 +207,30 @@ var/M = G.sheettype if(G.get_amount() >= 2) playsound(src, 'sound/blank.ogg', 100, TRUE) - user.visible_message("[user] adds [G.name] to the airlock assembly.", \ - "I start to install [G.name] into the airlock assembly...") + user.visible_message(span_notice("[user] adds [G.name] to the airlock assembly."), \ + span_notice("I start to install [G.name] into the airlock assembly...")) if(do_after(user, 40, target = src)) if(G.get_amount() < 2 || mineral) return - to_chat(user, "I install [M] plating into the airlock assembly.") + to_chat(user, span_notice("I install [M] plating into the airlock assembly.")) G.use(2) var/mineralassembly = text2path("/obj/structure/door_assembly/door_assembly_[M]") var/obj/structure/door_assembly/MA = new mineralassembly(loc) transfer_assembly_vars(src, MA, TRUE) else - to_chat(user, "I need at least two sheets add a mineral cover!") + to_chat(user, span_warning("I need at least two sheets add a mineral cover!")) else - to_chat(user, "I cannot add [G] to [src]!") + to_chat(user, span_warning("I cannot add [G] to [src]!")) else - to_chat(user, "I cannot add [G] to [src]!") + to_chat(user, span_warning("I cannot add [G] to [src]!")) else if((W.tool_behaviour == TOOL_SCREWDRIVER) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) - user.visible_message("[user] finishes the airlock.", \ - "I start finishing the airlock...") + user.visible_message(span_notice("[user] finishes the airlock."), \ + span_notice("I start finishing the airlock...")) if(W.use_tool(src, user, 40, volume=100)) if(loc && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) - to_chat(user, "I finish the airlock.") + to_chat(user, span_notice("I finish the airlock.")) var/obj/machinery/door/airlock/door if(glass) door = new glass_type( loc ) diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index 83c1c7ce5..9a2fdbbe1 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -8,9 +8,9 @@ /obj/structure/dresser/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I begin to [anchored ? "unwrench" : "wrench"] [src].") + to_chat(user, span_notice("I begin to [anchored ? "unwrench" : "wrench"] [src].")) if(I.use_tool(src, user, 20, volume=50)) - to_chat(user, "I successfully [anchored ? "unwrench" : "wrench"] [src].") + to_chat(user, span_notice("I successfully [anchored ? "unwrench" : "wrench"] [src].")) setAnchored(!anchored) else return ..() @@ -29,7 +29,7 @@ var/mob/living/carbon/human/H = user if(H.dna && H.dna.species && (NO_UNDERWEAR in H.dna.species.species_traits)) - to_chat(user, "I are not capable of wearing underwear.") + to_chat(user, span_warning("I are not capable of wearing underwear.")) return var/choice = input(user, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in list("Underwear","Underwear Color","Undershirt","Socks") diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index db2c54bbc..678de6d2f 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -41,6 +41,6 @@ for(var/m in buckled_mobs) var/mob/living/buckled_mob = m buckled_mob.electrocute_act(85, src, 1) - to_chat(buckled_mob, "I feel a deep shock course through your body!") + to_chat(buckled_mob, span_danger("I feel a deep shock course through your body!")) addtimer(CALLBACK(buckled_mob, TYPE_PROC_REF(/mob/living, electrocute_act), 85, src, 1), 1) - visible_message("The electric chair went off!", "I hear a deep sharp shock!") + visible_message(span_danger("The electric chair went off!"), span_hear("I hear a deep sharp shock!")) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 5525277ef..785478584 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -23,7 +23,7 @@ /obj/structure/extinguisher_cabinet/examine(mob/user) . = ..() - . += "Alt-click to [opened ? "close":"open"] it." + . += span_notice("Alt-click to [opened ? "close":"open"] it.") /obj/structure/extinguisher_cabinet/Destroy() if(stored_extinguisher) @@ -42,11 +42,11 @@ /obj/structure/extinguisher_cabinet/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WRENCH && !stored_extinguisher) - to_chat(user, "I start unsecuring [name]...") + to_chat(user, span_notice("I start unsecuring [name]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 60)) playsound(loc, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I unsecure [name].") + to_chat(user, span_notice("I unsecure [name].")) deconstruct(TRUE) return @@ -57,7 +57,7 @@ if(!user.transferItemToLoc(I, src)) return stored_extinguisher = I - to_chat(user, "I place [I] in [src].") + to_chat(user, span_notice("I place [I] in [src].")) update_icon() return TRUE else @@ -76,7 +76,7 @@ return if(stored_extinguisher) user.put_in_hands(stored_extinguisher) - to_chat(user, "I take [stored_extinguisher] from [src].") + to_chat(user, span_notice("I take [stored_extinguisher] from [src].")) stored_extinguisher = null if(!opened) opened = 1 @@ -89,7 +89,7 @@ /obj/structure/extinguisher_cabinet/attack_tk(mob/user) if(stored_extinguisher) stored_extinguisher.forceMove(loc) - to_chat(user, "I telekinetically remove [stored_extinguisher] from [src].") + to_chat(user, span_notice("I telekinetically remove [stored_extinguisher] from [src].")) stored_extinguisher = null opened = 1 playsound(loc, 'sound/blank.ogg', 15, TRUE, -3) @@ -108,7 +108,7 @@ /obj/structure/extinguisher_cabinet/proc/toggle_cabinet(mob/user) if(opened && broken) - to_chat(user, "[src] is broken open.") + to_chat(user, span_warning("[src] is broken open.")) else playsound(loc, 'sound/blank.ogg', 15, TRUE, -3) opened = !opened diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 34c33c03b..efd2fc12e 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -84,22 +84,22 @@ /obj/structure/falsewall/attackby(obj/item/W, mob/user, params) if(opening) - to_chat(user, "I must wait until the door has stopped moving!") + to_chat(user, span_warning("I must wait until the door has stopped moving!")) return if(W.tool_behaviour == TOOL_SCREWDRIVER) if(density) var/turf/T = get_turf(src) if(T.density) - to_chat(user, "[src] is blocked!") + to_chat(user, span_warning("[src] is blocked!")) return if(!isfloorturf(T)) - to_chat(user, "[src] bolts must be tightened on the floor!") + to_chat(user, span_warning("[src] bolts must be tightened on the floor!")) return - user.visible_message("[user] tightens some bolts on the wall.", "I tighten the bolts on the wall.") + user.visible_message(span_notice("[user] tightens some bolts on the wall."), span_notice("I tighten the bolts on the wall.")) ChangeToWall() else - to_chat(user, "I can't reach, close it first!") + to_chat(user, span_warning("I can't reach, close it first!")) else if(W.tool_behaviour == TOOL_WELDER) if(W.use_tool(src, user, 0, volume=50)) @@ -108,7 +108,7 @@ return ..() /obj/structure/falsewall/proc/dismantle(mob/user, disassembled=TRUE, obj/item/tool = null) - user.visible_message("[user] dismantles the false wall.", "I dismantle the false wall.") + user.visible_message(span_notice("[user] dismantles the false wall."), span_notice("I dismantle the false wall.")) if(tool) tool.play_tool_sound(src, 100) else @@ -128,7 +128,7 @@ return null /obj/structure/falsewall/examine_status(mob/user) //So you can't detect falsewalls by examine. - to_chat(user, "The outer plating is welded firmly in place.") + to_chat(user, span_notice("The outer plating is welded firmly in place.")) return null /* @@ -144,7 +144,7 @@ mineral = /obj/item/stack/sheet/plasteel /obj/structure/falsewall/reinforced/examine_status(mob/user) - to_chat(user, "The outer grille is fully intact.") + to_chat(user, span_notice("The outer grille is fully intact.")) return null /obj/structure/falsewall/reinforced/attackby(obj/item/tool, mob/user) diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index f6ff99d23..db93322fa 100644 --- a/code/game/objects/structures/fence.dm +++ b/code/game/objects/structures/fence.dm @@ -60,29 +60,29 @@ /obj/structure/fence/attackby(obj/item/W, mob/user) if(W.tool_behaviour == TOOL_WIRECUTTER) if(!cuttable) - to_chat(user, "This section of the fence can't be cut!") + to_chat(user, span_warning("This section of the fence can't be cut!")) return if(invulnerable) - to_chat(user, "This fence is too strong to cut through!") + to_chat(user, span_warning("This fence is too strong to cut through!")) return var/current_stage = hole_size if(current_stage >= MAX_HOLE_SIZE) - to_chat(user, "This fence has too much cut out of it already!") + to_chat(user, span_warning("This fence has too much cut out of it already!")) return - user.visible_message("\The [user] starts cutting through \the [src] with \the [W].",\ - "I start cutting through \the [src] with \the [W].") + user.visible_message(span_danger("\The [user] starts cutting through \the [src] with \the [W]."),\ + span_danger("I start cutting through \the [src] with \the [W].")) if(do_after(user, CUT_TIME*W.toolspeed, target = src)) if(current_stage == hole_size) switch(++hole_size) if(MEDIUM_HOLE) - visible_message("\The [user] cuts into \the [src] some more.") - to_chat(user, "I could probably fit myself through that hole now. Although climbing through would be much faster if you made it even bigger.") + visible_message(span_notice("\The [user] cuts into \the [src] some more.")) + to_chat(user, span_info("I could probably fit myself through that hole now. Although climbing through would be much faster if you made it even bigger.")) climbable = TRUE if(LARGE_HOLE) - visible_message("\The [user] completely cuts through \the [src].") - to_chat(user, "The hole in \the [src] is now big enough to walk through.") + visible_message(span_notice("\The [user] completely cuts through \the [src].")) + to_chat(user, span_info("The hole in \the [src] is now big enough to walk through.")) climbable = FALSE update_cut_status() @@ -130,10 +130,10 @@ /obj/structure/fence/door/proc/toggle(mob/user) switch(open) if(FALSE) - visible_message("\The [user] opens \the [src].") + visible_message(span_notice("\The [user] opens \the [src].")) open = TRUE if(TRUE) - visible_message("\The [user] closes \the [src].") + visible_message(span_notice("\The [user] closes \the [src].")) open = FALSE update_door_status() diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index dd2b83d16..8c75e69fd 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -33,12 +33,12 @@ if(istype(I, /obj/item/rogueweapon/sword/long/heirloom) && !heirloom) var/obj/item/rogueweapon/sword/long/heirloom/F = I if(F.wielded) - to_chat(user, "Unwield the [F.name] first.") + to_chat(user, span_warning("Unwield the [F.name] first.")) return if(!user.transferItemToLoc(F, src)) return heirloom = F - to_chat(user, "I place the [F.name] back in the [name].") + to_chat(user, span_notice("I place the [F.name] back in the [name].")) update_icon() return else if(!broken) @@ -84,12 +84,12 @@ if(heirloom) user.put_in_hands(heirloom) heirloom = null - to_chat(user, "I take the sword from the [name].") + to_chat(user, span_notice("I take the sword from the [name].")) src.add_fingerprint(user) update_icon() return if(locked) - to_chat(user, "The [name] won't budge!") + to_chat(user, span_warning("The [name] won't budge!")) return else open = !open @@ -105,7 +105,7 @@ /obj/structure/fireaxecabinet/attack_tk(mob/user) if(locked) - to_chat(user, "The [name] won't budge!") + to_chat(user, span_warning("The [name] won't budge!")) return else open = !open @@ -126,10 +126,10 @@ add_overlay("glass_raised") /obj/structure/fireaxecabinet/proc/toggle_lock(mob/user) - to_chat(user, "Resetting circuitry...") + to_chat(user, span_notice("Resetting circuitry...")) playsound(src, 'sound/blank.ogg', 50, TRUE) if(do_after(user, 20, target = src)) - to_chat(user, "I [locked ? "disable" : "re-enable"] the locking modules.") + to_chat(user, span_notice("I [locked ? "disable" : "re-enable"] the locking modules.")) locked = !locked update_icon() @@ -139,7 +139,7 @@ set src in oview(1) if(locked) - to_chat(usr, "The [name] won't budge!") + to_chat(usr, span_warning("The [name] won't budge!")) return else open = !open diff --git a/code/game/objects/structures/fireplace.dm b/code/game/objects/structures/fireplace.dm index a20e309b4..a4d9d83d7 100644 --- a/code/game/objects/structures/fireplace.dm +++ b/code/game/objects/structures/fireplace.dm @@ -26,10 +26,10 @@ /obj/structure/fireplace/proc/try_light(obj/item/O, mob/user) if(lit) - to_chat(user, "It's already lit!") + to_chat(user, span_warning("It's already lit!")) return FALSE if(!fuel_added) - to_chat(user, "[src] needs some fuel to burn!") + to_chat(user, span_warning("[src] needs some fuel to burn!")) return FALSE var/msg = O.ignition_effect(src, user) if(msg) @@ -43,7 +43,7 @@ var/space_remaining = MAXIMUM_BURN_TIMER - burn_time_remaining() var/space_for_logs = round(space_remaining / LOG_BURN_TIMER) if(space_for_logs < 1) - to_chat(user, "I can't fit any more of [T] in [src]!") + to_chat(user, span_warning("I can't fit any more of [T] in [src]!")) return var/logs_used = min(space_for_logs, wood.amount) wood.use(logs_used) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index e7b31afdd..4d4fbb2f9 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -40,9 +40,9 @@ if(W.get_sharpness() && W.force > 0) if(W.hitsound) playsound(get_turf(src), W.hitsound, 100, FALSE, FALSE) - user.visible_message("[user] begins to cut down [src] with [W].","I begin to cut down [src] with [W].", "I hear the sound of sawing.") + user.visible_message(span_notice("[user] begins to cut down [src] with [W]."),span_notice("I begin to cut down [src] with [W]."), span_hear("I hear the sound of sawing.")) if(do_after(user, 1000/W.force, target = src)) //5 seconds with 20 force, 8 seconds with a hatchet, 20 seconds with a shard. - user.visible_message("[user] fells [src] with the [W].","I fell [src] with the [W].", "I hear the sound of a tree falling.") + user.visible_message(span_notice("[user] fells [src] with the [W]."),span_notice("I fell [src] with the [W]."), span_hear("I hear the sound of a tree falling.")) playsound(get_turf(src), 'sound/blank.ogg', 100 , FALSE, FALSE) for(var/i=1 to log_amount) new /obj/item/grown/log/tree(get_turf(src)) @@ -102,9 +102,9 @@ return if(took_presents[user.ckey] && !unlimited) - to_chat(user, "There are no presents with your name on.") + to_chat(user, span_warning("There are no presents with your name on.")) return - to_chat(user, "After a bit of rummaging, you locate a gift with your name on it!") + to_chat(user, span_warning("After a bit of rummaging, you locate a gift with your name on it!")) if(!unlimited) took_presents[user.ckey] = TRUE diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index d3cee0392..f0e143aab 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -14,10 +14,10 @@ /obj/structure/fluff/attackby(obj/item/I, mob/living/user, params) if(I.tool_behaviour == TOOL_WRENCH && deconstructible) - user.visible_message("[user] starts disassembling [src]...", "I start disassembling [src]...") + user.visible_message(span_notice("[user] starts disassembling [src]..."), span_notice("I start disassembling [src]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 50)) - user.visible_message("[user] disassembles [src]!", "I break down [src] into scrap metal.") + user.visible_message(span_notice("[user] disassembles [src]!"), span_notice("I break down [src] into scrap metal.")) playsound(user, 'sound/blank.ogg', 50, TRUE) new/obj/item/stack/sheet/metal(drop_location()) qdel(src) @@ -567,10 +567,10 @@ . = ..() if(!broke) . += "Oh no, it's [station_time_timestamp("hh:mm")]." - . += "(Round Time: [gameTimestamp("hh:mm:ss", REALTIMEOFDAY - SSticker.round_start_irl)].)" + . += span_info("(Round Time: [gameTimestamp("hh:mm:ss", REALTIMEOFDAY - SSticker.round_start_irl)].)") // if(SSshuttle.emergency.mode == SHUTTLE_DOCKED) // if(SSshuttle.emergency.timeLeft() < 30 MINUTES) -// . += "The last boat will leave in [round(SSshuttle.emergency.timeLeft()/600)] minutes." +// . += span_warning("The last boat will leave in [round(SSshuttle.emergency.timeLeft()/600)] minutes.") /obj/structure/fluff/clock/CanPass(atom/movable/mover, turf/target) if(get_dir(loc, mover) == dir) @@ -613,7 +613,7 @@ // testing("mode is [SSshuttle.emergency.mode] should be [SHUTTLE_DOCKED]") // if(SSshuttle.emergency.mode == SHUTTLE_DOCKED) // if(SSshuttle.emergency.timeLeft() < 30 MINUTES) -// . += "The last boat will leave in [round(SSshuttle.emergency.timeLeft()/600)] minutes." +// . += span_warning("The last boat will leave in [round(SSshuttle.emergency.timeLeft()/600)] minutes.") /obj/structure/fluff/wallclock/Initialize() soundloop = new(list(src), FALSE) @@ -722,11 +722,11 @@ /obj/structure/fluff/customsign/attackby(obj/item/W, mob/user, params) if(!user.cmode) if(!user.is_literate()) - to_chat(user, "I don't know any verba.") + to_chat(user, span_warning("I don't know any verba.")) return if((user.used_intent.blade_class == BCLASS_STAB) && (W.wlength == WLENGTH_SHORT)) if(wrotesign) - to_chat(user, "Something is already carved here.") + to_chat(user, span_warning("Something is already carved here.")) return else var/inputty = stripped_input(user, "What would you like to carve here?", "", null, 200) @@ -888,17 +888,17 @@ if(L.STAINT < 3) probby = 0 if(prob(probby) && !L.has_status_effect(/datum/status_effect/debuff/trainsleep) && !user.buckled) - user.visible_message("[user] trains on [src]!") + user.visible_message(span_info("[user] trains on [src]!")) var/boon = user.mind.get_learning_boon(W.associated_skill) var/amt2raise = L.STAINT/2 if(user.mind.get_skill_level(W.associated_skill) >= SKILL_LEVEL_APPRENTICE) - to_chat(user, "I've learned all I can from doing this, it's time for the real thing.") + to_chat(user, span_warning("I've learned all I can from doing this, it's time for the real thing.")) amt2raise = 0 if(amt2raise > 0) user.mind.adjust_experience(W.associated_skill, amt2raise * boon, FALSE) playsound(loc,pick('sound/combat/hits/onwood/education1.ogg','sound/combat/hits/onwood/education2.ogg','sound/combat/hits/onwood/education3.ogg'), rand(50,100), FALSE) else - user.visible_message("[user] trains on [src], but [src] ripostes!") + user.visible_message(span_danger("[user] trains on [src], but [src] ripostes!")) L.AdjustKnockdown(1) L.throw_at(get_step(L, get_dir(src,L)), 2, 2, L, spin = FALSE) playsound(loc, 'sound/combat/hits/kick/stomp.ogg', 100, TRUE, -1) @@ -938,7 +938,7 @@ if(B) if(istype(W, /obj/item/roguecoin) || istype(W, /obj/item/roguegem) || istype(W, /obj/item/clothing/ring) || istype(W, /obj/item/ingot) || istype(W, /obj/item/clothing/neck/roguetown/psicross) || istype(W, /obj/item/reagent_containers/glass/cup) || istype(W, /obj/item/roguestatue)) if(B.tri_amt >= 10) - to_chat(user, "The mouth doesn't open.") + to_chat(user, span_warning("The mouth doesn't open.")) return B.contrib += W.get_real_price() if(B.contrib >= 100) @@ -1040,7 +1040,7 @@ if(user.mind.assigned_role == "Priest") if(istype(W, /obj/item/reagent_containers/food/snacks/grown/apple)) if(!istype(get_area(user), /area/rogue/indoors/town/church/chapel)) - to_chat(user, "I need to do this in the chapel.") + to_chat(user, span_warning("I need to do this in the chapel.")) return FALSE var/marriage var/obj/item/reagent_containers/food/snacks/grown/apple/A = W @@ -1168,7 +1168,7 @@ else //caused by emp/remote signal M.log_message("was [targeted? "flashed(targeted)" : "flashed(AOE)"]",LOG_ATTACK) if(generic_message && M != user) - to_chat(M, "[src] emits a blinding light!") + to_chat(M, span_danger("[src] emits a blinding light!")) if(M.flash_act()) var/diff = power - M.confused M.confused += min(power, diff) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index ce3dc78e9..9ffb3969f 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -181,7 +181,7 @@ if(QDELETED(src) || uses <= 0) return log_game("[key_name(H)] golem-swapped into [src]") - H.visible_message("A faint light leaves [H], moving to [src] and animating it!","I leave my old body behind, and transfer into [src]!") + H.visible_message(span_notice("A faint light leaves [H], moving to [src] and animating it!"),span_notice("I leave my old body behind, and transfer into [src]!")) show_flavour = FALSE var/mob/living/carbon/human/newgolem = create(newname = H.real_name) H.transfer_trait_datums(newgolem) @@ -379,7 +379,7 @@ id.registered_name = L.real_name id.update_label() else - to_chat(L, "My owner is already dead! You will soon perish.") + to_chat(L, span_danger("My owner is already dead! You will soon perish.")) addtimer(CALLBACK(L, TYPE_PROC_REF(/mob, dust), 150)) //Give em a few seconds as a mercy. /datum/outfit/demonic_friend diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 4ddc7872f..d9a6d728c 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -15,64 +15,64 @@ . = ..() switch(state) if(GIRDER_REINF) - . += "The support struts are screwed in place." + . += span_notice("The support struts are screwed in place.") if(GIRDER_REINF_STRUTS) - . += "The support struts are unscrewed and the inner grille is intact." + . += span_notice("The support struts are unscrewed and the inner grille is intact.") if(GIRDER_NORMAL) if(can_displace) - . += "The bolts are wrenched in place." + . += span_notice("The bolts are wrenched in place.") if(GIRDER_DISPLACED) - . += "The bolts are loosened, but the screws are holding [src] together." + . += span_notice("The bolts are loosened, but the screws are holding [src] together.") if(GIRDER_DISASSEMBLED) - . += "[src] is disassembled! You probably shouldn't be able to see this examine message." + . += span_notice("[src] is disassembled! You probably shouldn't be able to see this examine message.") /obj/structure/girder/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if(istype(W, /obj/item/gun/energy/plasmacutter)) - to_chat(user, "I start slicing apart the girder...") + to_chat(user, span_notice("I start slicing apart the girder...")) if(W.use_tool(src, user, 40, volume=100)) - to_chat(user, "I slice apart the girder.") + to_chat(user, span_notice("I slice apart the girder.")) var/obj/item/stack/sheet/metal/M = new (loc, 2) M.add_fingerprint(user) qdel(src) else if(istype(W, /obj/item/stack)) if(iswallturf(loc)) - to_chat(user, "There is already a wall present!") + to_chat(user, span_warning("There is already a wall present!")) return if(!isfloorturf(src.loc)) - to_chat(user, "A floor must be present to build a false wall!") + to_chat(user, span_warning("A floor must be present to build a false wall!")) return if (locate(/obj/structure/falsewall) in src.loc.contents) - to_chat(user, "There is already a false wall present!") + to_chat(user, span_warning("There is already a false wall present!")) return if(istype(W, /obj/item/stack/rods)) var/obj/item/stack/rods/S = W if(state == GIRDER_DISPLACED) if(S.get_amount() < 2) - to_chat(user, "I need at least two rods to create a false wall!") + to_chat(user, span_warning("I need at least two rods to create a false wall!")) return - to_chat(user, "I start building a reinforced false wall...") + to_chat(user, span_notice("I start building a reinforced false wall...")) if(do_after(user, 20, target = src)) if(S.get_amount() < 2) return S.use(2) - to_chat(user, "I create a false wall. Push on it to open or close the passage.") + to_chat(user, span_notice("I create a false wall. Push on it to open or close the passage.")) var/obj/structure/falsewall/iron/FW = new (loc) transfer_fingerprints_to(FW) qdel(src) else if(S.get_amount() < 5) - to_chat(user, "I need at least five rods to add plating!") + to_chat(user, span_warning("I need at least five rods to add plating!")) return - to_chat(user, "I start adding plating...") + to_chat(user, span_notice("I start adding plating...")) if(do_after(user, 40, target = src)) if(S.get_amount() < 5) return S.use(5) - to_chat(user, "I add the plating.") + to_chat(user, span_notice("I add the plating.")) var/turf/T = get_turf(src) T.PlaceOnTop(/turf/closed/wall/mineral/iron) transfer_fingerprints_to(T) @@ -86,27 +86,27 @@ if(istype(S, /obj/item/stack/sheet/metal)) if(state == GIRDER_DISPLACED) if(S.get_amount() < 2) - to_chat(user, "I need two sheets of metal to create a false wall!") + to_chat(user, span_warning("I need two sheets of metal to create a false wall!")) return - to_chat(user, "I start building a false wall...") + to_chat(user, span_notice("I start building a false wall...")) if(do_after(user, 20, target = src)) if(S.get_amount() < 2) return S.use(2) - to_chat(user, "I create a false wall. Push on it to open or close the passage.") + to_chat(user, span_notice("I create a false wall. Push on it to open or close the passage.")) var/obj/structure/falsewall/F = new (loc) transfer_fingerprints_to(F) qdel(src) else if(S.get_amount() < 2) - to_chat(user, "I need two sheets of metal to finish a wall!") + to_chat(user, span_warning("I need two sheets of metal to finish a wall!")) return - to_chat(user, "I start adding plating...") + to_chat(user, span_notice("I start adding plating...")) if (do_after(user, 40, target = src)) if(S.get_amount() < 2) return S.use(2) - to_chat(user, "I add the plating.") + to_chat(user, span_notice("I add the plating.")) var/turf/T = get_turf(src) T.PlaceOnTop(/turf/closed/wall) transfer_fingerprints_to(T) @@ -116,14 +116,14 @@ if(istype(S, /obj/item/stack/sheet/plasteel)) if(state == GIRDER_DISPLACED) if(S.get_amount() < 2) - to_chat(user, "I need at least two sheets to create a false wall!") + to_chat(user, span_warning("I need at least two sheets to create a false wall!")) return - to_chat(user, "I start building a reinforced false wall...") + to_chat(user, span_notice("I start building a reinforced false wall...")) if(do_after(user, 20, target = src)) if(S.get_amount() < 2) return S.use(2) - to_chat(user, "I create a reinforced false wall. Push on it to open or close the passage.") + to_chat(user, span_notice("I create a reinforced false wall. Push on it to open or close the passage.")) var/obj/structure/falsewall/reinforced/FW = new (loc) transfer_fingerprints_to(FW) qdel(src) @@ -131,12 +131,12 @@ if(state == GIRDER_REINF) if(S.get_amount() < 1) return - to_chat(user, "I start finalizing the reinforced wall...") + to_chat(user, span_notice("I start finalizing the reinforced wall...")) if(do_after(user, 50, target = src)) if(S.get_amount() < 1) return S.use(1) - to_chat(user, "I fully reinforce the wall.") + to_chat(user, span_notice("I fully reinforce the wall.")) var/turf/T = get_turf(src) T.PlaceOnTop(/turf/closed/wall/r_wall) transfer_fingerprints_to(T) @@ -145,12 +145,12 @@ else if(S.get_amount() < 1) return - to_chat(user, "I start reinforcing the girder...") + to_chat(user, span_notice("I start reinforcing the girder...")) if(do_after(user, 60, target = src)) if(S.get_amount() < 1) return S.use(1) - to_chat(user, "I reinforce the girder.") + to_chat(user, span_notice("I reinforce the girder.")) var/obj/structure/girder/reinforced/R = new (loc) transfer_fingerprints_to(R) qdel(src) @@ -160,27 +160,27 @@ var/M = S.sheettype if(state == GIRDER_DISPLACED) if(S.get_amount() < 2) - to_chat(user, "I need at least two sheets to create a false wall!") + to_chat(user, span_warning("I need at least two sheets to create a false wall!")) return if(do_after(user, 20, target = src)) if(S.get_amount() < 2) return S.use(2) - to_chat(user, "I create a false wall. Push on it to open or close the passage.") + to_chat(user, span_notice("I create a false wall. Push on it to open or close the passage.")) var/F = text2path("/obj/structure/falsewall/[M]") var/obj/structure/FW = new F (loc) transfer_fingerprints_to(FW) qdel(src) else if(S.get_amount() < 2) - to_chat(user, "I need at least two sheets to add plating!") + to_chat(user, span_warning("I need at least two sheets to add plating!")) return - to_chat(user, "I start adding plating...") + to_chat(user, span_notice("I start adding plating...")) if (do_after(user, 40, target = src)) if(S.get_amount() < 2) return S.use(2) - to_chat(user, "I add the plating.") + to_chat(user, span_notice("I add the plating.")) var/turf/T = get_turf(src) T.PlaceOnTop(text2path("/turf/closed/wall/mineral/[M]")) transfer_fingerprints_to(T) @@ -194,7 +194,7 @@ if (P.pipe_type in list(0, 1, 5)) //simple pipes, simple bends, and simple manifolds. if(!user.transferItemToLoc(P, drop_location())) return - to_chat(user, "I fit the pipe into \the [src].") + to_chat(user, span_notice("I fit the pipe into \the [src].")) else return ..() @@ -205,34 +205,34 @@ . = FALSE if(state == GIRDER_DISPLACED) - user.visible_message("[user] disassembles the girder.", - "I start to disassemble the girder...", - "I hear clanking and banging noises.") + user.visible_message(span_warning("[user] disassembles the girder."), + span_notice("I start to disassemble the girder..."), + span_hear("I hear clanking and banging noises.")) if(tool.use_tool(src, user, 40, volume=100)) if(state != GIRDER_DISPLACED) return state = GIRDER_DISASSEMBLED - to_chat(user, "I disassemble the girder.") + to_chat(user, span_notice("I disassemble the girder.")) var/obj/item/stack/sheet/metal/M = new (loc, 2) M.add_fingerprint(user) qdel(src) return TRUE else if(state == GIRDER_REINF) - to_chat(user, "I start unsecuring support struts...") + to_chat(user, span_notice("I start unsecuring support struts...")) if(tool.use_tool(src, user, 40, volume=100)) if(state != GIRDER_REINF) return - to_chat(user, "I unsecure the support struts.") + to_chat(user, span_notice("I unsecure the support struts.")) state = GIRDER_REINF_STRUTS return TRUE else if(state == GIRDER_REINF_STRUTS) - to_chat(user, "I start securing support struts...") + to_chat(user, span_notice("I start securing support struts...")) if(tool.use_tool(src, user, 40, volume=100)) if(state != GIRDER_REINF_STRUTS) return - to_chat(user, "I secure the support struts.") + to_chat(user, span_notice("I secure the support struts.")) state = GIRDER_REINF return TRUE @@ -240,9 +240,9 @@ /obj/structure/girder/wirecutter_act(mob/user, obj/item/tool) . = ..() if(state == GIRDER_REINF_STRUTS) - to_chat(user, "I start removing the inner grille...") + to_chat(user, span_notice("I start removing the inner grille...")) if(tool.use_tool(src, user, 40, volume=100)) - to_chat(user, "I remove the inner grille.") + to_chat(user, span_notice("I remove the inner grille.")) new /obj/item/stack/sheet/plasteel(get_turf(src)) var/obj/structure/girder/G = new (loc) transfer_fingerprints_to(G) @@ -253,19 +253,19 @@ . = ..() if(state == GIRDER_DISPLACED) if(!isfloorturf(loc)) - to_chat(user, "A floor must be present to secure the girder!") + to_chat(user, span_warning("A floor must be present to secure the girder!")) - to_chat(user, "I start securing the girder...") + to_chat(user, span_notice("I start securing the girder...")) if(tool.use_tool(src, user, 40, volume=100)) - to_chat(user, "I secure the girder.") + to_chat(user, span_notice("I secure the girder.")) var/obj/structure/girder/G = new (loc) transfer_fingerprints_to(G) qdel(src) return TRUE else if(state == GIRDER_NORMAL && can_displace) - to_chat(user, "I start unsecuring the girder...") + to_chat(user, span_notice("I start unsecuring the girder...")) if(tool.use_tool(src, user, 40, volume=100)) - to_chat(user, "I unsecure the girder.") + to_chat(user, span_notice("I unsecure the girder.")) var/obj/structure/girder/displaced/D = new (loc) transfer_fingerprints_to(D) qdel(src) @@ -325,7 +325,7 @@ /obj/structure/girder/cult/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if(istype(W, /obj/item/melee/cultblade/dagger) && iscultist(user)) //Cultists can demolish cult girders instantly with their tomes - user.visible_message("[user] strikes [src] with [W]!", "I demolish [src].") + user.visible_message(span_warning("[user] strikes [src] with [W]!"), span_notice("I demolish [src].")) new /obj/item/stack/sheet/runed_metal(drop_location(), 1) qdel(src) @@ -333,9 +333,9 @@ if(!W.tool_start_check(user, amount=0)) return - to_chat(user, "I start slicing apart the girder...") + to_chat(user, span_notice("I start slicing apart the girder...")) if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "I slice apart the girder.") + to_chat(user, span_notice("I slice apart the girder.")) var/obj/item/stack/sheet/runed_metal/R = new(drop_location(), 1) transfer_fingerprints_to(R) qdel(src) @@ -343,13 +343,13 @@ else if(istype(W, /obj/item/stack/sheet/runed_metal)) var/obj/item/stack/sheet/runed_metal/R = W if(R.get_amount() < 1) - to_chat(user, "I need at least one sheet of runed metal to construct a runed wall!") + to_chat(user, span_warning("I need at least one sheet of runed metal to construct a runed wall!")) return 0 - user.visible_message("[user] begins laying runed metal on [src]...", "I begin constructing a runed wall...") + user.visible_message(span_notice("[user] begins laying runed metal on [src]..."), span_notice("I begin constructing a runed wall...")) if(do_after(user, 50, target = src)) if(R.get_amount() < 1) return - user.visible_message("[user] plates [src] with runed metal.", "I construct a runed wall.") + user.visible_message(span_notice("[user] plates [src] with runed metal."), span_notice("I construct a runed wall.")) R.use(1) var/turf/T = get_turf(src) T.PlaceOnTop(/turf/closed/wall/mineral/cult) @@ -378,12 +378,12 @@ var/turf/T = get_turf(src) switch(passed_mode) if(RCD_FLOORWALL) - to_chat(user, "I finish a wall.") + to_chat(user, span_notice("I finish a wall.")) T.PlaceOnTop(/turf/closed/wall) qdel(src) return TRUE if(RCD_DECONSTRUCT) - to_chat(user, "I deconstruct the girder.") + to_chat(user, span_notice("I deconstruct the girder.")) qdel(src) return TRUE return FALSE @@ -400,9 +400,9 @@ if(W.tool_behaviour == TOOL_WELDER) if(!W.tool_start_check(user, amount = 0)) return - to_chat(user, "I start slicing apart [src]...") + to_chat(user, span_notice("I start slicing apart [src]...")) if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "I slice apart [src].") + to_chat(user, span_notice("I slice apart [src].")) var/obj/item/stack/tile/bronze/B = new(drop_location(), 2) transfer_fingerprints_to(B) qdel(src) @@ -410,13 +410,13 @@ else if(istype(W, /obj/item/stack/tile/bronze)) var/obj/item/stack/tile/bronze/B = W if(B.get_amount() < 2) - to_chat(user, "I need at least two bronze sheets to build a bronze wall!") + to_chat(user, span_warning("I need at least two bronze sheets to build a bronze wall!")) return 0 - user.visible_message("[user] begins plating [src] with bronze...", "I begin constructing a bronze wall...") + user.visible_message(span_notice("[user] begins plating [src] with bronze..."), span_notice("I begin constructing a bronze wall...")) if(do_after(user, 50, target = src)) if(B.get_amount() < 2) return - user.visible_message("[user] plates [src] with bronze!", "I construct a bronze wall.") + user.visible_message(span_notice("[user] plates [src] with bronze!"), span_notice("I construct a bronze wall.")) B.use(2) var/turf/T = get_turf(src) T.PlaceOnTop(/turf/closed/wall/mineral/bronze) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 329793ffb..727981c5b 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -42,9 +42,9 @@ /obj/structure/grille/examine(mob/user) . = ..() // if(anchored) -// . += "It's secured in place with screws. The rods look like they could be cut through." +// . += span_notice("It's secured in place with screws. The rods look like they could be cut through.") // if(!anchored) -// . += "The anchoring screws are unscrewed. The rods look like they could be cut through." +// . += span_notice("The anchoring screws are unscrewed. The rods look like they could be cut through.") /obj/structure/grille/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) @@ -60,13 +60,13 @@ /obj/structure/grille/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_DECONSTRUCT) - to_chat(user, "I deconstruct the grille.") + to_chat(user, span_notice("I deconstruct the grille.")) qdel(src) return TRUE if(RCD_WINDOWGRILLE) if(locate(/obj/structure/window) in loc) return FALSE - to_chat(user, "I construct the window.") + to_chat(user, span_notice("I construct the window.")) var/obj/structure/window/WD = new the_rcd.window_type(drop_location()) WD.setAnchored(TRUE) return TRUE @@ -102,7 +102,7 @@ return user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src, ATTACK_EFFECT_KICK) - user.visible_message("[user] hits [src].", null, null, COMBAT_MESSAGE_RANGE) + user.visible_message(span_warning("[user] hits [src]."), null, null, COMBAT_MESSAGE_RANGE) log_combat(user, src, "hit") if(!shock(user, 70)) take_damage(rand(5,10), BRUTE, "blunt", 1) @@ -110,7 +110,7 @@ /obj/structure/grille/attack_alien(mob/living/user) user.do_attack_animation(src) user.changeNext_move(CLICK_CD_MELEE) - user.visible_message("[user] mangles [src].", null, null, COMBAT_MESSAGE_RANGE) + user.visible_message(span_warning("[user] mangles [src]."), null, null, COMBAT_MESSAGE_RANGE) if(!shock(user, 70)) take_damage(20, BRUTE, "slash", 1) @@ -141,14 +141,14 @@ if(!shock(user, 90)) W.play_tool_sound(src, 100) setAnchored(!anchored) - user.visible_message("[user] [anchored ? "fastens" : "unfastens"] [src].", \ - "I [anchored ? "fasten [src] to" : "unfasten [src] from"] the floor.") + user.visible_message(span_notice("[user] [anchored ? "fastens" : "unfastens"] [src]."), \ + span_notice("I [anchored ? "fasten [src] to" : "unfasten [src] from"] the floor.")) return else if(istype(W, /obj/item/stack/rods) && broken) var/obj/item/stack/rods/R = W if(!shock(user, 90)) - user.visible_message("[user] rebuilds the broken grille.", \ - "I rebuild the broken grille.") + user.visible_message(span_notice("[user] rebuilds the broken grille."), \ + span_notice("I rebuild the broken grille.")) new grille_type(src.loc) R.use(1) qdel(src) @@ -159,16 +159,16 @@ if (!broken) var/obj/item/stack/ST = W if (ST.get_amount() < 2) - to_chat(user, "I need at least two sheets of glass for that!") + to_chat(user, span_warning("I need at least two sheets of glass for that!")) return var/dir_to_set = SOUTHWEST if(!anchored) - to_chat(user, "[src] needs to be fastened to the floor first!") + to_chat(user, span_warning("[src] needs to be fastened to the floor first!")) return for(var/obj/structure/window/WINDOW in loc) - to_chat(user, "There is already a window there!") + to_chat(user, span_warning("There is already a window there!")) return - to_chat(user, "I start placing the window...") + to_chat(user, span_notice("I start placing the window...")) if(do_after(user,20, target = src)) if(!src.loc || !anchored) //Grille broken or unanchored while waiting return @@ -192,7 +192,7 @@ WD.setAnchored(FALSE) WD.state = 0 ST.use(2) - to_chat(user, "I place [WD] on [src].") + to_chat(user, span_notice("I place [WD] on [src].")) return //window placing end diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index c21b2546d..322818bf4 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -37,16 +37,16 @@ /obj/structure/guillotine/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/stack/sheet/plasteel)) - to_chat(user, "I start repairing the guillotine with the plasteel...") + to_chat(user, span_notice("I start repairing the guillotine with the plasteel...")) if(blade_sharpness<10) if(do_after(user,100,target=user)) blade_sharpness = min(10,blade_sharpness+3) I.use(1) - to_chat(user, "I repair the guillotine with the plasteel.") + to_chat(user, span_notice("I repair the guillotine with the plasteel.")) else - to_chat(user, "I stop repairing the guillotine with the plasteel.") + to_chat(user, span_notice("I stop repairing the guillotine with the plasteel.")) else - to_chat(user, "The guillotine is already fully repaired!") + to_chat(user, span_warning("The guillotine is already fully repaired!")) /obj/structure/guillotine/examine(mob/user) . = ..() @@ -101,8 +101,8 @@ return if (GUILLOTINE_BLADE_RAISED) if (LAZYLEN(buckled_mobs)) - user.visible_message("[user] begins to pull the lever!", - "I begin to the pull the lever.") + user.visible_message(span_warning("[user] begins to pull the lever!"), + span_warning("I begin to the pull the lever.")) current_action = GUILLOTINE_ACTION_INUSE if (do_after(user, GUILLOTINE_ACTIVATE_DELAY, target = src) && blade_status == GUILLOTINE_BLADE_RAISED) @@ -190,8 +190,8 @@ blade_status = GUILLOTINE_BLADE_SHARPENING if(do_after(user, 7, target = src)) blade_status = GUILLOTINE_BLADE_RAISED - user.visible_message("[user] sharpens the large blade of the guillotine.", - "I sharpen the large blade of the guillotine.") + user.visible_message(span_notice("[user] sharpens the large blade of the guillotine."), + span_notice("I sharpen the large blade of the guillotine.")) blade_sharpness += 1 playsound(src, 'sound/items/sharpen_long1.ogg', 100, TRUE) return @@ -199,10 +199,10 @@ blade_status = GUILLOTINE_BLADE_RAISED return else - to_chat(user, "The blade is sharp enough!") + to_chat(user, span_warning("The blade is sharp enough!")) return else - to_chat(user, "I need to raise the blade in order to sharpen it!") + to_chat(user, span_warning("I need to raise the blade in order to sharpen it!")) return else return ..() @@ -212,11 +212,11 @@ return FALSE if (!istype(M, /mob/living/carbon/human)) - to_chat(usr, "It doesn't look like [M.p_they()] can fit into this properly!") + to_chat(usr, span_warning("It doesn't look like [M.p_they()] can fit into this properly!")) return FALSE // Can't decapitate non-humans if (blade_status != GUILLOTINE_BLADE_RAISED) - to_chat(usr, "I need to raise the blade before placing someone!") + to_chat(usr, span_warning("I need to raise the blade before placing someone!")) return FALSE return ..(M, force, FALSE) @@ -254,7 +254,7 @@ /obj/structure/guillotine/can_be_unfasten_wrench(mob/user, silent) if (LAZYLEN(buckled_mobs)) if (!silent) - to_chat(user, "Can't unfasten, someone's strapped in!") + to_chat(user, span_warning("Can't unfasten, someone's strapped in!")) return FAILED_UNFASTEN if (current_action) diff --git a/code/game/objects/structures/guncase.dm b/code/game/objects/structures/guncase.dm index d6f5eb754..8f3136572 100644 --- a/code/game/objects/structures/guncase.dm +++ b/code/game/objects/structures/guncase.dm @@ -41,10 +41,10 @@ if(LAZYLEN(contents) < capacity) if(!user.transferItemToLoc(I, src)) return - to_chat(user, "I place [I] in [src].") + to_chat(user, span_notice("I place [I] in [src].")) update_icon() else - to_chat(user, "[src] is full.") + to_chat(user, span_warning("[src] is full.")) return else if(user.used_intent.type != INTENT_HARM) diff --git a/code/game/objects/structures/headpike.dm b/code/game/objects/structures/headpike.dm index e794a3ad7..f6af14d26 100644 --- a/code/game/objects/structures/headpike.dm +++ b/code/game/objects/structures/headpike.dm @@ -40,7 +40,7 @@ . = ..() if(.) return - to_chat(user, "I take down [src].") + to_chat(user, span_notice("I take down [src].")) victim.forceMove(drop_location()) victim = null spear.forceMove(drop_location()) diff --git a/code/game/objects/structures/hivebot.dm b/code/game/objects/structures/hivebot.dm index 8a4ac65df..f1442a866 100644 --- a/code/game/objects/structures/hivebot.dm +++ b/code/game/objects/structures/hivebot.dm @@ -13,13 +13,13 @@ var/datum/effect_system/smoke_spread/smoke = new smoke.set_up(2, loc) smoke.start() - visible_message("[src] warps in!") + visible_message(span_boldannounce("[src] warps in!")) playsound(src.loc, 'sound/blank.ogg', 25, TRUE) addtimer(CALLBACK(src, PROC_REF(warpbots)), rand(10, 600)) /obj/structure/hivebot_beacon/proc/warpbots() icon_state = "def_radar" - visible_message("[src] turns on!") + visible_message(span_danger("[src] turns on!")) while(bot_amt > 0) bot_amt-- switch(bot_type) @@ -30,7 +30,7 @@ if("rapid") new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src)) sleep(100) - visible_message("[src] warps out!") + visible_message(span_boldannounce("[src] warps out!")) playsound(src.loc, 'sound/blank.ogg', 25, TRUE) qdel(src) return diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index 934dc9eba..9a24f1b5a 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -128,7 +128,7 @@ /obj/structure/holosign/barrier/medical/examine(mob/user) . = ..() - . += "The biometric scanners are [force_allaccess ? "off" : "on"]." + . += span_notice("The biometric scanners are [force_allaccess ? "off" : "on"].") /obj/structure/holosign/barrier/medical/CanPass(atom/movable/mover, turf/target) icon_state = "holo_medical" @@ -150,7 +150,7 @@ /obj/structure/holosign/barrier/medical/attack_hand(mob/living/user) if(CanPass(user) && user.used_intent.type == INTENT_HELP) force_allaccess = !force_allaccess - to_chat(user, "I [force_allaccess ? "deactivate" : "activate"] the biometric scanners.") //warning spans because you can make the station sick! + to_chat(user, span_warning("I [force_allaccess ? "deactivate" : "activate"] the biometric scanners.")) //warning spans because you can make the station sick! else return ..() diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 5c1e46cbb..31f7a4edd 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -21,12 +21,12 @@ /obj/structure/janitorialcart/proc/wet_mop(obj/item/mop, mob/user) if(reagents.total_volume < 1) - to_chat(user, "[src] is out of water!") + to_chat(user, span_warning("[src] is out of water!")) return 0 else var/obj/item/mop/M = mop reagents.trans_to(mop, M.mopcap, transfered_by = user) - to_chat(user, "I wet [mop] in [src].") + to_chat(user, span_notice("I wet [mop] in [src].")) playsound(loc, 'sound/blank.ogg', 25, TRUE) return 1 @@ -34,12 +34,12 @@ if(!user.transferItemToLoc(I, src)) return updateUsrDialog() - to_chat(user, "I put [I] into [src].") + to_chat(user, span_notice("I put [I] into [src].")) return /obj/structure/janitorialcart/attackby(obj/item/I, mob/user, params) - var/fail_msg = "There is already one of those in [src]!" + var/fail_msg = span_warning("There is already one of those in [src]!") if(istype(I, /obj/item/mop)) var/obj/item/mop/m=I @@ -76,13 +76,13 @@ signs++ update_icon() else - to_chat(user, "[src] can't hold any more signs!") + to_chat(user, span_warning("[src] can't hold any more signs!")) else if(mybag) mybag.attackby(I, user) else if(I.tool_behaviour == TOOL_CROWBAR) - user.visible_message("[user] begins to empty the contents of [src].", "I begin to empty the contents of [src]...") + user.visible_message(span_notice("[user] begins to empty the contents of [src]."), span_notice("I begin to empty the contents of [src]...")) if(I.use_tool(src, user, 30)) - to_chat(usr, "I empty the contents of [src]'s bucket onto the floor.") + to_chat(usr, span_notice("I empty the contents of [src]'s bucket onto the floor.")) reagents.reaction(src.loc) src.reagents.clear_reagents() else @@ -118,29 +118,29 @@ if(href_list["garbage"]) if(mybag) user.put_in_hands(mybag) - to_chat(user, "I take [mybag] from [src].") + to_chat(user, span_notice("I take [mybag] from [src].")) mybag = null if(href_list["mop"]) if(mymop) user.put_in_hands(mymop) - to_chat(user, "I take [mymop] from [src].") + to_chat(user, span_notice("I take [mymop] from [src].")) mymop = null if(href_list["spray"]) if(myspray) user.put_in_hands(myspray) - to_chat(user, "I take [myspray] from [src].") + to_chat(user, span_notice("I take [myspray] from [src].")) myspray = null if(href_list["replacer"]) if(myreplacer) user.put_in_hands(myreplacer) - to_chat(user, "I take [myreplacer] from [src].") + to_chat(user, span_notice("I take [myreplacer] from [src].")) myreplacer = null if(href_list["sign"]) if(signs) var/obj/item/clothing/suit/caution/Sign = locate() in src if(Sign) user.put_in_hands(Sign) - to_chat(user, "I take \a [Sign] from [src].") + to_chat(user, span_notice("I take \a [Sign] from [src].")) signs-- else WARNING("Signs ([signs]) didn't match contents") diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 388840807..d96e58d18 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -18,18 +18,18 @@ var/obj/item/stack/rods/R = I if(R.get_amount() >= 4) R.use(4) - to_chat(user, "I add spikes to the frame.") + to_chat(user, span_notice("I add spikes to the frame.")) var/obj/F = new /obj/structure/kitchenspike(src.loc) transfer_fingerprints_to(F) qdel(src) else if(I.tool_behaviour == TOOL_WELDER) if(!I.tool_start_check(user, amount=0)) return - to_chat(user, "I begin cutting \the [src] apart...") + to_chat(user, span_notice("I begin cutting \the [src] apart...")) if(I.use_tool(src, user, 50, volume=50)) - visible_message("[user] slices apart \the [src].", - "I cut \the [src] apart with \the [I].", - "I hear welding.") + visible_message(span_notice("[user] slices apart \the [src]."), + span_notice("I cut \the [src] apart with \the [I]."), + span_hear("I hear welding.")) new /obj/item/stack/sheet/metal(src.loc, 4) qdel(src) return @@ -52,11 +52,11 @@ /obj/structure/kitchenspike/crowbar_act(mob/living/user, obj/item/I) if(has_buckled_mobs()) - to_chat(user, "I can't do that while something's on the spike!") + to_chat(user, span_warning("I can't do that while something's on the spike!")) return TRUE if(I.use_tool(src, user, 20, volume=100)) - to_chat(user, "I pry the spikes out of the frame.") + to_chat(user, span_notice("I pry the spikes out of the frame.")) deconstruct(TRUE) return TRUE @@ -72,7 +72,7 @@ if(user.pulling != L) return playsound(src.loc, 'sound/blank.ogg', 25, TRUE) - L.visible_message("[user] slams [L] onto the meat spike!", "[user] slams you onto the meat spike!", "I hear a squishy wet noise.") + L.visible_message(span_danger("[user] slams [L] onto the meat spike!"), span_danger("[user] slams you onto the meat spike!"), span_hear("I hear a squishy wet noise.")) L.forceMove(drop_location()) L.emote("scream") L.add_splatter_floor() @@ -98,23 +98,23 @@ if(buckled_mob) var/mob/living/M = buckled_mob if(M != user) - M.visible_message("[user] tries to pull [M] free of [src]!",\ - "[user] is trying to pull you off [src], opening up fresh wounds!",\ - "I hear a squishy wet noise.") + M.visible_message(span_notice("[user] tries to pull [M] free of [src]!"),\ + span_notice("[user] is trying to pull you off [src], opening up fresh wounds!"),\ + span_hear("I hear a squishy wet noise.")) if(!do_after(user, 300, target = src)) if(M && M.buckled) - M.visible_message("[user] fails to free [M]!",\ - "[user] fails to pull you off of [src].") + M.visible_message(span_notice("[user] fails to free [M]!"),\ + span_notice("[user] fails to pull you off of [src].")) return else - M.visible_message("[M] struggles to break free from [src]!",\ - "I struggle to break free from [src], exacerbating your wounds! (Stay still for two minutes.)",\ - "I hear a wet squishing noise..") + M.visible_message(span_warning("[M] struggles to break free from [src]!"),\ + span_notice("I struggle to break free from [src], exacerbating your wounds! (Stay still for two minutes.)"),\ + span_hear("I hear a wet squishing noise..")) M.adjustBruteLoss(30) if(!do_after(M, 1200, target = src)) if(M && M.buckled) - to_chat(M, "I fail to free yourself!") + to_chat(M, span_warning("I fail to free yourself!")) return if(!M.buckled) return @@ -126,7 +126,7 @@ animate(M, transform = m180, time = 3) M.pixel_y = M.get_standard_pixel_y_offset(180) M.adjustBruteLoss(30) - src.visible_message(text("[M] falls free of [src]!")) + src.visible_message(span_danger("[M] falls free of [src]!")) unbuckle_mob(M,force=1) M.emote("scream") M.AdjustParalyzed(20) diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index d70af2d41..b3bfcd1c7 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -72,7 +72,7 @@ /obj/structure/ladder/singularity_pull() if (!(resistance_flags & INDESTRUCTIBLE)) - visible_message("[src] is torn to pieces by the gravitational pull!") + visible_message(span_danger("[src] is torn to pieces by the gravitational pull!")) qdel(src) /obj/structure/ladder/proc/travel(going_up, mob/user, is_ghost, obj/structure/ladder/ladder) @@ -116,7 +116,7 @@ else if(down) travel(FALSE, user, is_ghost, down) else - to_chat(user, "[src] doesn't seem to lead anywhere!") + to_chat(user, span_warning("[src] doesn't seem to lead anywhere!")) if(!is_ghost) add_fingerprint(user) @@ -146,9 +146,9 @@ /obj/structure/ladder/proc/show_fluff_message(going_up, mob/user) if(going_up) - user.visible_message("[user] climbs up [src].", "I climb up [src].") + user.visible_message(span_notice("[user] climbs up [src]."), span_notice("I climb up [src].")) else - user.visible_message("[user] climbs down [src].", "I climb down [src].") + user.visible_message(span_notice("[user] climbs down [src]."), span_notice("I climb down [src].")) // Indestructible away mission ladders which link based on a mapped ID and height value rather than X/Y/Z. diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index c0ced9abc..63918edd1 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -22,7 +22,7 @@ . += deconstruction_hints(user) /obj/structure/lattice/proc/deconstruction_hints(mob/user) - return "The rods look like they could be cut. There's space for more rods or a tile." + return span_notice("The rods look like they could be cut. There's space for more rods or a tile.") /obj/structure/lattice/Initialize(mapload) . = ..() @@ -37,7 +37,7 @@ if(resistance_flags & INDESTRUCTIBLE) return if(C.tool_behaviour == TOOL_WIRECUTTER) - to_chat(user, "Slicing [name] joints ...") + to_chat(user, span_notice("Slicing [name] joints ...")) deconstruct() else var/turf/T = get_turf(src) @@ -54,7 +54,7 @@ /obj/structure/lattice/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) if(passed_mode == RCD_FLOORWALL) - to_chat(user, "I build a floor.") + to_chat(user, span_notice("I build a floor.")) var/turf/T = src.loc if(isspaceturf(T)) T.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) @@ -77,7 +77,7 @@ obj_flags = CAN_BE_HIT /obj/structure/lattice/catwalk/deconstruction_hints(mob/user) - return "The supporting rods look like they could be cut." + return span_notice("The supporting rods look like they could be cut.") /obj/structure/lattice/catwalk/Move() var/turf/T = loc diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm index af058c77e..23158a1f1 100644 --- a/code/game/objects/structures/lavaland/geyser.dm +++ b/code/game/objects/structures/lavaland/geyser.dm @@ -32,13 +32,13 @@ /obj/structure/geyser/plunger_act(obj/item/plunger/P, mob/living/user, _reinforced) if(!_reinforced) - to_chat(user, "The [P.name] isn't strong enough!") + to_chat(user, span_warning("The [P.name] isn't strong enough!")) return if(activated) to_chat(user, "The [name] is already active!") return - to_chat(user, "I start vigorously plunging [src]!") + to_chat(user, span_notice("I start vigorously plunging [src]!")) if(do_after(user, 50*P.plunge_mod, target = src) && !activated) start_chemming() diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index 1870862ce..a9f2a992d 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -77,8 +77,8 @@ GLOBAL_LIST_INIT(tendrils, list()) /obj/effect/collapse/Initialize() . = ..() emitted_light = new(loc) - visible_message("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!") - visible_message("Something falls free of the tendril!") + visible_message(span_boldannounce("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!")) + visible_message(span_warning("Something falls free of the tendril!")) playsound(loc,'sound/blank.ogg', 200, FALSE, 50, TRUE, TRUE) addtimer(CALLBACK(src, PROC_REF(collapse)), 50) @@ -90,7 +90,7 @@ GLOBAL_LIST_INIT(tendrils, list()) for(var/mob/M in range(7,src)) shake_camera(M, 15, 1) playsound(get_turf(src),'sound/blank.ogg', 200, TRUE) - visible_message("The tendril falls inward, the ground around it widening into a yawning chasm!") + visible_message(span_boldannounce("The tendril falls inward, the ground around it widening into a yawning chasm!")) for(var/turf/T in range(2,src)) if(!T.density) T.TerraformTurf(/turf/open/chasm/lavaland, /turf/open/chasm/lavaland, flags = CHANGETURF_INHERIT_AIR) diff --git a/code/game/objects/structures/life_candle.dm b/code/game/objects/structures/life_candle.dm index 361b987d3..63350170b 100644 --- a/code/game/objects/structures/life_candle.dm +++ b/code/game/objects/structures/life_candle.dm @@ -31,10 +31,10 @@ if(!user.mind) return if(user.mind in linked_minds) - user.visible_message("[user] reaches out and pinches the flame of [src].", "I sever the connection between myself and [src].") + user.visible_message(span_notice("[user] reaches out and pinches the flame of [src]."), span_warning("I sever the connection between myself and [src].")) linked_minds -= user.mind else - user.visible_message("[user] touches [src]. It seems to respond to [user.p_their()] presence!", "I create a connection between you and [src].") + user.visible_message(span_notice("[user] touches [src]. It seems to respond to [user.p_their()] presence!"), span_warning("I create a connection between you and [src].")) linked_minds |= user.mind update_icon() diff --git a/code/game/objects/structures/loom.dm b/code/game/objects/structures/loom.dm index bca4c799b..f34fecc26 100644 --- a/code/game/objects/structures/loom.dm +++ b/code/game/objects/structures/loom.dm @@ -25,17 +25,17 @@ if(!istype(W)) return FALSE if(!anchored) - user.show_message("The loom needs to be wrenched down.", MSG_VISUAL) + user.show_message(span_notice("The loom needs to be wrenched down."), MSG_VISUAL) return FALSE if(W.amount < FABRIC_PER_SHEET) - user.show_message("I need at least [FABRIC_PER_SHEET] units of fabric before using this.", MSG_VISUAL) + user.show_message(span_notice("I need at least [FABRIC_PER_SHEET] units of fabric before using this."), MSG_VISUAL) return FALSE - user.show_message("I start weaving \the [W.name] through the loom..", MSG_VISUAL) + user.show_message(span_notice("I start weaving \the [W.name] through the loom.."), MSG_VISUAL) if(W.use_tool(src, user, W.pull_effort)) if(W.amount >= FABRIC_PER_SHEET) new W.loom_result(drop_location()) W.use(FABRIC_PER_SHEET) - user.show_message("I weave \the [W.name] into a workable fabric.", MSG_VISUAL) + user.show_message(span_notice("I weave \the [W.name] into a workable fabric."), MSG_VISUAL) return TRUE #undef FABRIC_PER_SHEET diff --git a/code/game/objects/structures/maneater.dm b/code/game/objects/structures/maneater.dm index 477e2683b..2b961a4d5 100644 --- a/code/game/objects/structures/maneater.dm +++ b/code/game/objects/structures/maneater.dm @@ -62,7 +62,7 @@ playsound(src.loc, list('sound/vo/mobs/plant/attack (1).ogg','sound/vo/mobs/plant/attack (2).ogg','sound/vo/mobs/plant/attack (3).ogg','sound/vo/mobs/plant/attack (4).ogg'), 100, FALSE, -1) if(iscarbon(L)) var/mob/living/carbon/C = L - src.visible_message("[src] starts to rip apart [C]!") + src.visible_message(span_danger("[src] starts to rip apart [C]!")) spawn(50) if(C && (C.buckled == src)) var/obj/item/bodypart/limb @@ -86,7 +86,7 @@ C.gib() return else - src.visible_message("[src] starts to rip apart [L]!") + src.visible_message(span_danger("[src] starts to rip apart [L]!")) spawn(50) if(L && (L.buckled == src)) L.gib() @@ -117,12 +117,12 @@ if(prob(time2mount)) ..() else - user.visible_message("[user] tries to pull [M] free of [src]!") + user.visible_message(span_warning("[user] tries to pull [M] free of [src]!")) return if(prob(time2mount)) ..() else - user.visible_message("[user] tries to break free of [src]!") + user.visible_message(span_warning("[user] tries to break free of [src]!")) /obj/structure/flora/roguegrass/maneater/real/user_buckle_mob(mob/living/M, mob/living/user) //Don't want them getting put on the rack other than by spiking return @@ -146,7 +146,7 @@ START_PROCESSING(SSobj, src) if(!HAS_TRAIT(L, TRAIT_NOPAIN)) L.emote("painscream", forced = TRUE) - src.visible_message("[src] snatches [L]!") + src.visible_message(span_danger("[src] snatches [L]!")) playsound(src.loc, list('sound/vo/mobs/plant/attack (1).ogg','sound/vo/mobs/plant/attack (2).ogg','sound/vo/mobs/plant/attack (3).ogg','sound/vo/mobs/plant/attack (4).ogg'), 100, FALSE, -1) if(istype(AM, /obj/item)) if(is_type_in_list(AM, eatablez)) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index f8df7e22d..3ddab568c 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -53,8 +53,8 @@ return if(door_opened) playsound(src, 'sound/combat/hits/onwood/woodimpact (1).ogg', 100) - user.visible_message("[user] kicks [src] shut!", \ - "I kick [src] shut!") + user.visible_message(span_warning("[user] kicks [src] shut!"), \ + span_notice("I kick [src] shut!")) force_closed() else if(locked) @@ -64,19 +64,19 @@ kickthresh-- if((prob(L.STASTR * 0.5) || kickthresh == 0) && (L.STASTR >= initial(kickthresh))) playsound(src, 'sound/combat/hits/onwood/woodimpact (1).ogg', 100) - user.visible_message("[user] kicks open [src]!", \ - "I kick open [src]!") + user.visible_message(span_warning("[user] kicks open [src]!"), \ + span_notice("I kick open [src]!")) locked = 0 force_open() else playsound(src, 'sound/combat/hits/onwood/woodimpact (1).ogg', 100) - user.visible_message("[user] kicks [src]!", \ - "I kick [src]!") + user.visible_message(span_warning("[user] kicks [src]!"), \ + span_notice("I kick [src]!")) //try to kick open, destroy lock else playsound(src, 'sound/combat/hits/onwood/woodimpact (1).ogg', 100) - user.visible_message("[user] kicks open [src]!", \ - "I kick open [src]!") + user.visible_message(span_warning("[user] kicks open [src]!"), \ + span_notice("I kick open [src]!")) force_open() /obj/structure/mineral_door/proc/force_open() @@ -143,12 +143,12 @@ var/mob/user = AM if(HAS_TRAIT(user, TRAIT_BASHDOORS)) if(locked) - user.visible_message("[user] bashes into [src]!") + user.visible_message(span_warning("[user] bashes into [src]!")) take_damage(200, "brute", "blunt", 1) else playsound(src, 'sound/combat/hits/onwood/woodimpact (1).ogg', 100) force_open() - user.visible_message("[user] smashes through [src]!") + user.visible_message(span_warning("[user] smashes through [src]!")) return if(locked) playsound(src, rattlesound, 100) @@ -188,13 +188,13 @@ if(isliving(user)) var/mob/living/L = user if(L.m_intent == MOVE_INTENT_SNEAK) - to_chat(user, "This door is locked.") + to_chat(user, span_warning("This door is locked.")) return if(world.time >= last_bump+20) last_bump = world.time playsound(src, 'sound/foley/doors/knocking.ogg', 100) - user.visible_message("[user] knocks on [src].", \ - "I knock on [src].") + user.visible_message(span_warning("[user] knocks on [src]."), \ + span_notice("I knock on [src].")) return return TryToSwitchState(user) @@ -286,7 +286,7 @@ if(!keylock) return if(lockbroken) - to_chat(user, "The lock to this door is broken.") + to_chat(user, span_warning("The lock to this door is broken.")) user.changeNext_move(CLICK_CD_MELEE) if(istype(I,/obj/item/keyring)) var/obj/item/keyring/R = I @@ -326,13 +326,13 @@ if(isSwitchingStates || door_opened) return if(locked) - user.visible_message("[user] unlocks [src].", \ - "I unlock [src].") + user.visible_message(span_warning("[user] unlocks [src]."), \ + span_notice("I unlock [src].")) playsound(src, unlocksound, 100) locked = 0 else - user.visible_message("[user] locks [src].", \ - "I lock [src].") + user.visible_message(span_warning("[user] locks [src]."), \ + span_notice("I lock [src].")) playsound(src, locksound, 100) locked = 1 @@ -371,38 +371,38 @@ if(I.tool_behaviour != TOOL_MINING) return . = TRUE - to_chat(user, "I start digging [src]...") + to_chat(user, span_notice("I start digging [src]...")) if(I.use_tool(src, user, 40, volume=50)) - to_chat(user, "I finish digging.") + to_chat(user, span_notice("I finish digging.")) deconstruct(TRUE)*/ /obj/structure/mineral_door/welder_act(mob/living/user, obj/item/I) //override if the door is supposed to be flammable. ..() . = TRUE if(anchored) - to_chat(user, "[src] is still firmly secured to the ground!") + to_chat(user, span_warning("[src] is still firmly secured to the ground!")) return - user.visible_message("[user] starts to weld apart [src]!", "I start welding apart [src].") + user.visible_message(span_notice("[user] starts to weld apart [src]!"), span_notice("I start welding apart [src].")) if(!I.use_tool(src, user, 60, 5, 50)) - to_chat(user, "I failed to weld apart [src]!") + to_chat(user, span_warning("I failed to weld apart [src]!")) return - user.visible_message("[user] welded [src] into pieces!", "I welded apart [src]!") + user.visible_message(span_notice("[user] welded [src] into pieces!"), span_notice("I welded apart [src]!")) deconstruct(TRUE) /obj/structure/mineral_door/proc/crowbar_door(mob/living/user, obj/item/I) //if the door is flammable, call this in crowbar_act() so we can still decon it . = TRUE if(anchored) - to_chat(user, "[src] is still firmly secured to the ground!") + to_chat(user, span_warning("[src] is still firmly secured to the ground!")) return - user.visible_message("[user] starts to pry apart [src]!", "I start prying apart [src].") + user.visible_message(span_notice("[user] starts to pry apart [src]!"), span_notice("I start prying apart [src].")) if(!I.use_tool(src, user, 60, volume = 50)) - to_chat(user, "I failed to pry apart [src]!") + to_chat(user, span_warning("I failed to pry apart [src]!")) return - user.visible_message("[user] pried [src] into pieces!", "I pried apart [src]!") + user.visible_message(span_notice("[user] pried [src] into pieces!"), span_notice("I pried apart [src]!")) deconstruct(TRUE) @@ -515,7 +515,7 @@ /obj/structure/mineral_door/paperframe/examine(mob/user) . = ..() if(obj_integrity < max_integrity) - . += "It looks a bit damaged, you may be able to fix it with some paper." + . += span_info("It looks a bit damaged, you may be able to fix it with some paper.") /obj/structure/mineral_door/paperframe/pickaxe_door(mob/living/user, obj/item/I) return @@ -532,11 +532,11 @@ return if((user.used_intent.type != INTENT_HARM) && istype(I, /obj/item/paper) && (obj_integrity < max_integrity)) - user.visible_message("[user] starts to patch the holes in [src].", "I start patching some of the holes in [src]!") + user.visible_message(span_notice("[user] starts to patch the holes in [src]."), span_notice("I start patching some of the holes in [src]!")) if(do_after(user, 20, TRUE, src)) obj_integrity = min(obj_integrity+4,max_integrity) qdel(I) - user.visible_message("[user] patches some of the holes in [src].", "I patch some of the holes in [src]!") + user.visible_message(span_notice("[user] patches some of the holes in [src]."), span_notice("I patch some of the holes in [src]!")) return TRUE return ..() @@ -666,15 +666,15 @@ if(door_opened || isSwitchingStates) return if(lockbroken) - to_chat(user, "The lock to this door is broken.") + to_chat(user, span_warning("The lock to this door is broken.")) return if(brokenstate) - to_chat(user, "There isn't much left of this door.") + to_chat(user, span_warning("There isn't much left of this door.")) return if(get_dir(src,user) == lockdir) lock_toggle(user) else - to_chat(user, "The door doesn't lock from this side.") + to_chat(user, span_warning("The door doesn't lock from this side.")) /obj/structure/mineral_door/wood/donjon desc = "" @@ -714,23 +714,23 @@ if(door_opened || isSwitchingStates) return if(brokenstate) - to_chat(user, "There isn't much left of this door.") + to_chat(user, span_warning("There isn't much left of this door.")) return if(get_dir(src,user) == viewportdir) view_toggle(user) else - to_chat(user, "The viewport doesn't toggle from this side.") + to_chat(user, span_warning("The viewport doesn't toggle from this side.")) return /obj/structure/mineral_door/wood/donjon/proc/view_toggle(mob/user) if(door_opened) return if(opacity) - to_chat(user, "I slide the viewport open.") + to_chat(user, span_info("I slide the viewport open.")) opacity = FALSE playsound(src, 'sound/foley/doors/windowup.ogg', 100, FALSE) else - to_chat(user, "I slide the viewport closed.") + to_chat(user, span_info("I slide the viewport closed.")) opacity = TRUE playsound(src, 'sound/foley/doors/windowup.ogg', 100, FALSE) @@ -769,5 +769,5 @@ /obj/structure/mineral_door/bars/onkick(mob/user) - user.visible_message("[user] kicks [src]!") + user.visible_message(span_warning("[user] kicks [src]!")) return diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 30f53b8a3..6888d7ee5 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -150,9 +150,9 @@ if(!I.tool_start_check(user, amount=0)) return TRUE - to_chat(user, "I begin repairing [src]...") + to_chat(user, span_notice("I begin repairing [src]...")) if(I.use_tool(src, user, 10, volume=50)) - to_chat(user, "I repair [src].") + to_chat(user, span_notice("I repair [src].")) broken = 0 icon_state = initial(icon_state) desc = initial(desc) @@ -247,7 +247,7 @@ H.dna.features["mcolor"] = sanitize_hexcolor(new_mutantcolor) else - to_chat(H, "Invalid color. Your color is not bright enough.") + to_chat(H, span_notice("Invalid color. Your color is not bright enough.")) H.update_body() H.update_hair() @@ -262,7 +262,7 @@ if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return H.gender = "female" - to_chat(H, "Man, you feel like a woman!") + to_chat(H, span_notice("Man, you feel like a woman!")) else return @@ -271,7 +271,7 @@ if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return H.gender = "male" - to_chat(H, "Whoa man, you feel like a man!") + to_chat(H, span_notice("Whoa man, you feel like a man!")) else return H.dna.update_ui_block(DNA_GENDER_BLOCK) diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 8f8bbd61e..20e08b214 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -14,10 +14,10 @@ /obj/structure/mopbucket/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/mop)) if(reagents.total_volume < 1) - to_chat(user, "[src] is out of water!") + to_chat(user, span_warning("[src] is out of water!")) else reagents.trans_to(I, 5, transfered_by = user) - to_chat(user, "I wet [I] in [src].") + to_chat(user, span_notice("I wet [I] in [src].")) playsound(loc, 'sound/blank.ogg', 25, TRUE) update_icon() else diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 45c34588f..b2bccaf18 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -54,7 +54,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an if(locked) if(message_cooldown <= world.time) message_cooldown = world.time + 50 - to_chat(user, "[src]'s door won't budge!") + to_chat(user, span_warning("[src]'s door won't budge!")) return open() @@ -66,7 +66,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an if(.) return if(locked) - to_chat(user, "It's locked.") + to_chat(user, span_danger("It's locked.")) return if(!connected) to_chat(user, "That doesn't appear to have a tray.") @@ -86,7 +86,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an add_fingerprint(user) if(istype(P, /obj/item/pen)) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on the side of [src]!") + to_chat(user, span_notice("I scribble illegibly on the side of [src]!")) return var/t = stripped_input(user, "What would you like the label to be?", text("[]", name), null) if (user.get_active_held_item() != P) @@ -112,13 +112,13 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT user.visible_message(null, \ - "I lean on the back of [src] and start pushing the tray open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "I hear a metallic creaking from [src].") + span_notice("I lean on the back of [src] and start pushing the tray open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_hear("I hear a metallic creaking from [src].")) if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src ) return - user.visible_message("[user] successfully broke out of [src]!", \ - "I successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("I successfully break out of [src]!")) open() /obj/structure/bodycontainer/proc/open() @@ -164,14 +164,14 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an /obj/structure/bodycontainer/morgue/examine(mob/user) . = ..() - . += "The speaker is [beeper ? "enabled" : "disabled"]. Alt-click to toggle it." + . += span_notice("The speaker is [beeper ? "enabled" : "disabled"]. Alt-click to toggle it.") /obj/structure/bodycontainer/morgue/AltClick(mob/user) ..() if(!user.canUseTopic(src, !issilicon(user))) return beeper = !beeper - to_chat(user, "I turn the speaker function [beeper ? "on" : "off"].") + to_chat(user, span_notice("I turn the speaker function [beeper ? "on" : "off"].")) /obj/structure/bodycontainer/morgue/update_icon() if (!connected || connected.loc != src) // Open or tray is gone. @@ -213,7 +213,7 @@ GLOBAL_LIST_EMPTY(crematoriums) var/id = 1 /obj/structure/bodycontainer/crematorium/attack_robot(mob/user) //Borgs can't use crematoriums without help - to_chat(user, "[src] is locked against you.") + to_chat(user, span_warning("[src] is locked against you.")) return /obj/structure/bodycontainer/crematorium/Destroy() @@ -254,11 +254,11 @@ GLOBAL_LIST_EMPTY(crematoriums) var/list/conts = GetAllContents() - src - connected if(!conts.len) - audible_message("I hear a hollow crackle.") + audible_message(span_hear("I hear a hollow crackle.")) return else - audible_message("I hear a roar as the crematorium activates.") + audible_message(span_hear("I hear a roar as the crematorium activates.")) locked = TRUE update_icon() @@ -339,7 +339,7 @@ GLOBAL_LIST_EMPTY(crematoriums) connected.close() add_fingerprint(user) else - to_chat(user, "That's not connected to anything!") + to_chat(user, span_warning("That's not connected to anything!")) /obj/structure/tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user) if(!ismovableatom(O) || O.anchored || !Adjacent(user) || !user.Adjacent(O) || O.loc == user) @@ -359,7 +359,7 @@ GLOBAL_LIST_EMPTY(crematoriums) return O.forceMove(src.loc) if (user != O) - visible_message("[user] stuffs [O] into [src].") + visible_message(span_warning("[user] stuffs [O] into [src].")) return /* diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index ead9dc932..90cf9b6db 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -375,7 +375,7 @@ return if(!user.IsAdvancedToolUser()) - to_chat(user, "I don't have the dexterity to do this!") + to_chat(user, span_warning("I don't have the dexterity to do this!")) return 1 user.set_machine(src) song.interact(user) diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 77e15b8f4..ea9ad49ef 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -26,16 +26,16 @@ /obj/structure/noticeboard/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/paper) || istype(O, /obj/item/photo)) if(!allowed(user)) - to_chat(user, "I are not authorized to add notices!") + to_chat(user, span_warning("I are not authorized to add notices!")) return if(notices < 5) if(!user.transferItemToLoc(O, src)) return notices++ icon_state = "nboard0[notices]" - to_chat(user, "I pin the [O] to the noticeboard.") + to_chat(user, span_notice("I pin the [O] to the noticeboard.")) else - to_chat(user, "The notice board is full!") + to_chat(user, span_warning("The notice board is full!")) else return ..() @@ -77,7 +77,7 @@ add_fingerprint(usr) P.attackby(I, usr) else - to_chat(usr, "You'll need something to write with!") + to_chat(usr, span_warning("You'll need something to write with!")) if(href_list["read"]) var/obj/item/I = locate(href_list["read"]) in contents diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm index eaa8db98e..2ac9dfbd7 100644 --- a/code/game/objects/structures/petrified_statue.dm +++ b/code/game/objects/structures/petrified_statue.dm @@ -15,7 +15,7 @@ petrified_mob = L if(L.buckled) L.buckled.unbuckle_mob(L,force=1) - L.visible_message("[L]'s skin rapidly turns to marble!", "My body freezes up! Can't... move... can't... think...") + L.visible_message(span_warning("[L]'s skin rapidly turns to marble!"), span_danger("My body freezes up! Can't... move... can't... think...")) L.forceMove(src) ADD_TRAIT(L, TRAIT_MUTE, STATUE_MUTE) L.faction += "mimic" //Stops mimics from instaqdeling people in statues @@ -50,7 +50,7 @@ if(petrified_mob) S.mind.transfer_to(petrified_mob) petrified_mob.Paralyze(100) - to_chat(petrified_mob, "I slowly come back to my senses. You are in control of myself again!") + to_chat(petrified_mob, span_notice("I slowly come back to my senses. You are in control of myself again!")) qdel(S) for(var/obj/O in src) @@ -69,7 +69,7 @@ if(!disassembled) if(petrified_mob) petrified_mob.dust() - visible_message("[src] shatters!.") + visible_message(span_danger("[src] shatters!.")) qdel(src) diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 23d18c934..1710eaa8e 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -20,9 +20,9 @@ /obj/structure/plasticflaps/examine(mob/user) . = ..() if(anchored) - . += "[src] are screwed to the floor." + . += span_notice("[src] are screwed to the floor.") else - . += "[src] are no longer screwed to the floor, and the flaps can be cut apart." + . += span_notice("[src] are no longer screwed to the floor, and the flaps can be cut apart.") /obj/structure/plasticflaps/screwdriver_act(mob/living/user, obj/item/W) if(..()) @@ -30,10 +30,10 @@ add_fingerprint(user) var/action = anchored ? "unscrews [src] from" : "screws [src] to" var/uraction = anchored ? "unscrew [src] from " : "screw [src] to" - user.visible_message("[user] [action] the floor.", "I start to [uraction] the floor...", "I hear rustling noises.") + user.visible_message(span_warning("[user] [action] the floor."), span_notice("I start to [uraction] the floor..."), span_hear("I hear rustling noises.")) if(W.use_tool(src, user, 100, volume=100, extra_checks = CALLBACK(src, PROC_REF(check_anchored_state), anchored))) setAnchored(!anchored) - to_chat(user, "I [anchored ? "unscrew" : "screw"] [src] from the floor.") + to_chat(user, span_notice("I [anchored ? "unscrew" : "screw"] [src] from the floor.")) return TRUE else return TRUE @@ -41,11 +41,11 @@ /obj/structure/plasticflaps/wirecutter_act(mob/living/user, obj/item/W) . = ..() if(!anchored) - user.visible_message("[user] cuts apart [src].", "I start to cut apart [src].", "I hear cutting.") + user.visible_message(span_warning("[user] cuts apart [src]."), span_notice("I start to cut apart [src]."), span_hear("I hear cutting.")) if(W.use_tool(src, user, 50, volume=100)) if(anchored) return TRUE - to_chat(user, "I cut apart [src].") + to_chat(user, span_notice("I cut apart [src].")) var/obj/item/stack/sheet/plastic/five/P = new(loc) P.add_fingerprint(user) qdel(src) diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index d8ff19cff..adf734268 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -39,9 +39,9 @@ . += "It is set to [rotation_angle] degrees, and the rotation is [can_rotate ? "unlocked" : "locked"]." if(!admin) if(can_rotate) - . += "Alt-click to adjust its direction." + . += span_notice("Alt-click to adjust its direction.") else - . += "Use screwdriver to unlock the rotation." + . += span_notice("Use screwdriver to unlock the rotation.") /obj/structure/reflector/proc/setAngle(new_angle) if(can_rotate) @@ -80,17 +80,17 @@ if(W.tool_behaviour == TOOL_SCREWDRIVER) can_rotate = !can_rotate - to_chat(user, "I [can_rotate ? "unlock" : "lock"] [src]'s rotation.") + to_chat(user, span_notice("I [can_rotate ? "unlock" : "lock"] [src]'s rotation.")) W.play_tool_sound(src) return if(W.tool_behaviour == TOOL_WRENCH) if(anchored) - to_chat(user, "Unweld [src] from the floor first!") + to_chat(user, span_warning("Unweld [src] from the floor first!")) return - user.visible_message("[user] starts to dismantle [src].", "I start to dismantle [src]...") + user.visible_message(span_notice("[user] starts to dismantle [src]."), span_notice("I start to dismantle [src]...")) if(W.use_tool(src, user, 80, volume=50)) - to_chat(user, "I dismantle [src].") + to_chat(user, span_notice("I dismantle [src].")) new framebuildstacktype(drop_location(), framebuildstackamount) if(buildstackamount) new buildstacktype(drop_location(), buildstackamount) @@ -100,34 +100,34 @@ if(!W.tool_start_check(user, amount=0)) return - user.visible_message("[user] starts to repair [src].", - "I begin repairing [src]...", - "I hear welding.") + user.visible_message(span_notice("[user] starts to repair [src]."), + span_notice("I begin repairing [src]..."), + span_hear("I hear welding.")) if(W.use_tool(src, user, 40, volume=40)) obj_integrity = max_integrity - user.visible_message("[user] has repaired [src].", \ - "I finish repairing [src].") + user.visible_message(span_notice("[user] has repaired [src]."), \ + span_notice("I finish repairing [src].")) else if(!anchored) if(!W.tool_start_check(user, amount=0)) return - user.visible_message("[user] starts to weld [src] to the floor.", - "I start to weld [src] to the floor...", - "I hear welding.") + user.visible_message(span_notice("[user] starts to weld [src] to the floor."), + span_notice("I start to weld [src] to the floor..."), + span_hear("I hear welding.")) if (W.use_tool(src, user, 20, volume=50)) setAnchored(TRUE) - to_chat(user, "I weld [src] to the floor.") + to_chat(user, span_notice("I weld [src] to the floor.")) else if(!W.tool_start_check(user, amount=0)) return - user.visible_message("[user] starts to cut [src] free from the floor.", - "I start to cut [src] free from the floor...", - "I hear welding.") + user.visible_message(span_notice("[user] starts to cut [src] free from the floor."), + span_notice("I start to cut [src] free from the floor..."), + span_hear("I hear welding.")) if (W.use_tool(src, user, 20, volume=50)) setAnchored(FALSE) - to_chat(user, "I cut [src] free from the floor.") + to_chat(user, span_notice("I cut [src] free from the floor.")) //Finishing the frame else if(istype(W, /obj/item/stack/sheet)) @@ -139,14 +139,14 @@ new /obj/structure/reflector/single(drop_location()) qdel(src) else - to_chat(user, "I need five sheets of glass to create a reflector!") + to_chat(user, span_warning("I need five sheets of glass to create a reflector!")) return if(istype(S, /obj/item/stack/sheet/rglass)) if(S.use(10)) new /obj/structure/reflector/double(drop_location()) qdel(src) else - to_chat(user, "I need ten sheets of reinforced glass to create a double reflector!") + to_chat(user, span_warning("I need ten sheets of reinforced glass to create a double reflector!")) return if(istype(S, /obj/item/stack/sheet/mineral/diamond)) if(S.use(1)) @@ -157,7 +157,7 @@ /obj/structure/reflector/proc/rotate(mob/user) if (!can_rotate || admin) - to_chat(user, "The rotation is locked!") + to_chat(user, span_warning("The rotation is locked!")) return FALSE var/new_angle = input(user, "Input a new angle for primary reflection face.", "Reflector Angle", rotation_angle) as null|num if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) diff --git a/code/game/objects/structures/roguetent.dm b/code/game/objects/structures/roguetent.dm index 496befcaa..cedf7f86a 100644 --- a/code/game/objects/structures/roguetent.dm +++ b/code/game/objects/structures/roguetent.dm @@ -25,14 +25,14 @@ icon_state = "[base_state]0" /obj/structure/roguetent/proc/open_up(mob/user) - visible_message("[user] opens [src].") + visible_message(span_info("[user] opens [src].")) playsound(src, 'sound/foley/equip/rummaging-02.ogg', 100, FALSE) density = FALSE opacity = FALSE update_icon() /obj/structure/roguetent/proc/close_up(mob/user) - visible_message("[user] closes [src].") + visible_message(span_info("[user] closes [src].")) playsound(src, 'sound/foley/equip/rummaging-02.ogg', 100, FALSE) density = TRUE opacity = TRUE diff --git a/code/game/objects/structures/roguetown/bell.dm b/code/game/objects/structures/roguetown/bell.dm index a34fcf1e1..af94f9e91 100644 --- a/code/game/objects/structures/roguetown/bell.dm +++ b/code/game/objects/structures/roguetown/bell.dm @@ -17,7 +17,7 @@ /obj/structure/boatbell/attack_hand(mob/user) if(world.time < last_ring + 50) return - user.visible_message("[user] rings the bell.") + user.visible_message(span_info("[user] rings the bell.")) SSshuttle.moveShuttle("supply", "supply_away", TRUE) playsound(src, 'sound/misc/boatbell.ogg', 100, extrarange = 5) last_ring = world.time @@ -25,7 +25,7 @@ /obj/structure/boatbell/fluff/attack_hand(mob/user) if(world.time < last_ring + 50) return - user.visible_message("[user] rings the bell.") + user.visible_message(span_info("[user] rings the bell.")) playsound(src, 'sound/misc/boatbell.ogg', 100, extrarange = 5) last_ring = world.time @@ -45,7 +45,7 @@ bribe += P.get_real_price() qdel(P) if(bribe >= bribeprice) - to_chat(user, "That should be enough.") + to_chat(user, span_warning("That should be enough.")) playsound(loc, 'sound/misc/machinevomit.ogg', 100, TRUE, -1) return ..() @@ -54,7 +54,7 @@ if(world.time < last_ring + 50) return last_ring = world.time - user.visible_message("[user] starts ringing the bell.") + user.visible_message(span_info("[user] starts ringing the bell.")) for(var/i in 1 to rand(1,5)) playsound(src, 'sound/misc/boatbell.ogg', 100, extrarange = 5) if(!do_after(user, 30, target = src)) @@ -64,7 +64,7 @@ if(user.mind.has_antag_datum(/datum/antagonist/skeleton)) realbribe = 0 if(bribe < realbribe) - to_chat(user, "Not enough mammon to make the navigators betray the schedule.") + to_chat(user, span_warning("Not enough mammon to make the navigators betray the schedule.")) return // SSshuttle.requestEvac(user, href_list["call"]) if(SSshuttle.emergency.mode != SHUTTLE_DOCKED) diff --git a/code/game/objects/structures/roguetown/gate.dm b/code/game/objects/structures/roguetown/gate.dm index 8940a7e86..d42f7e359 100644 --- a/code/game/objects/structures/roguetown/gate.dm +++ b/code/game/objects/structures/roguetown/gate.dm @@ -154,7 +154,7 @@ GLOBAL_LIST_EMPTY(biggates) /obj/structure/winch/attack_hand(mob/user) . = ..() if(!attached_gate) - to_chat(user, "The chain is not attached to anything.") + to_chat(user, span_warning("The chain is not attached to anything.")) return if(attached_gate.isSwitchingStates) return @@ -162,7 +162,7 @@ GLOBAL_LIST_EMPTY(biggates) var/mob/living/L = user L.changeNext_move(CLICK_CD_MELEE) var/used_time = 105 - (L.STASTR * 10) - user.visible_message("[user] cranks the winch.") + user.visible_message(span_warning("[user] cranks the winch.")) playsound(src, 'sound/foley/winch.ogg', 100, extrarange = 3) if(do_after(user, used_time, target = user)) attached_gate.toggle() diff --git a/code/game/objects/structures/roguetown/handcart.dm b/code/game/objects/structures/roguetown/handcart.dm index c0d684f4f..a0ff82428 100644 --- a/code/game/objects/structures/roguetown/handcart.dm +++ b/code/game/objects/structures/roguetown/handcart.dm @@ -138,7 +138,7 @@ user.changeNext_move(CLICK_CD_MELEE) if(stuff_shit.len) dump_contents() - visible_message("[user] dumps out [src]!") + visible_message(span_info("[user] dumps out [src]!")) playsound(loc, 'sound/foley/cartdump.ogg', 100, FALSE, -1) update_icon() diff --git a/code/game/objects/structures/roguetown/loot.dm b/code/game/objects/structures/roguetown/loot.dm index 862c51b57..8b859b38d 100644 --- a/code/game/objects/structures/roguetown/loot.dm +++ b/code/game/objects/structures/roguetown/loot.dm @@ -57,7 +57,7 @@ if(B) B = new B(user.loc) user.put_in_hands(B) - user.visible_message("[user] finds [B] in the [src].") + user.visible_message(span_notice("[user] finds [B] in the [src].")) if(!loot.len) qdel(src) return diff --git a/code/game/objects/structures/roguetown/newtree.dm b/code/game/objects/structures/roguetown/newtree.dm index 75948daeb..77063677a 100644 --- a/code/game/objects/structures/roguetown/newtree.dm +++ b/code/game/objects/structures/roguetown/newtree.dm @@ -71,10 +71,10 @@ return var/turf/target = get_step_multiz(user, UP) if(!istype(target, /turf/open/transparent/openspace)) - to_chat(user, "I can't climb here.") + to_chat(user, span_warning("I can't climb here.")) return if(!L.can_zTravel(target, UP)) - to_chat(user, "I can't climb there.") + to_chat(user, span_warning("I can't climb there.")) return var/used_time = 0 var/exp_to_gain = 0 @@ -90,7 +90,7 @@ myskill += 1 used_time = max(70 - (myskill * 10) - (L.STASPD * 3), 30) playsound(user, 'sound/foley/climb.ogg', 100, TRUE) - user.visible_message("[user] starts to climb [src].", "I start to climb [src]...") + user.visible_message(span_warning("[user] starts to climb [src]."), span_warning("I start to climb [src]...")) if(do_after(L, used_time, target = src)) var/pulling = user.pulling if(ismob(pulling)) diff --git a/code/game/objects/structures/roguetown/redstone.dm b/code/game/objects/structures/roguetown/redstone.dm index d322a313d..4943ed7bd 100644 --- a/code/game/objects/structures/roguetown/redstone.dm +++ b/code/game/objects/structures/roguetown/redstone.dm @@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(redstone_objs) var/mob/living/L = user L.changeNext_move(CLICK_CD_MELEE) var/used_time = 100 - (L.STASTR * 10) - user.visible_message("[user] pulls the lever.") + user.visible_message(span_warning("[user] pulls the lever.")) log_game("[key_name(user)] pulled the lever with redstone id \"[redstone_id]\"") if(do_after(user, used_time, target = user)) for(var/obj/structure/O in redstone_attached) diff --git a/code/game/objects/structures/roguetown/rogueflora.dm b/code/game/objects/structures/roguetown/rogueflora.dm index 82e9cc759..fb63ccdf7 100644 --- a/code/game/objects/structures/roguetown/rogueflora.dm +++ b/code/game/objects/structures/roguetown/rogueflora.dm @@ -286,7 +286,7 @@ var/mob/living/L = AM if(L.m_intent == MOVE_INTENT_RUN && (L.mobility_flags & MOBILITY_STAND)) if(!ishuman(L)) - to_chat(L, "I'm cut on a thorn!") + to_chat(L, span_warning("I'm cut on a thorn!")) L.apply_damage(5, BRUTE) else @@ -298,10 +298,10 @@ var/obj/item/natural/thorn/TH = new(src.loc) BP.add_embedded_object(TH, silent = TRUE) BP.receive_damage(10) - to_chat(H, "\A [TH] impales my [BP.name]!") + to_chat(H, span_danger("\A [TH] impales my [BP.name]!")) else var/obj/item/bodypart/BP = pick(H.bodyparts) - to_chat(H, "A thorn [pick("slices","cuts","nicks")] my [BP.name].") + to_chat(H, span_warning("A thorn [pick("slices","cuts","nicks")] my [BP.name].")) BP.receive_damage(10) /obj/structure/flora/roguegrass/bush/attack_hand(mob/user) @@ -321,15 +321,15 @@ if(B) B = new B(user.loc) user.put_in_hands(B) - user.visible_message("[user] finds [B] in [src].") + user.visible_message(span_notice("[user] finds [B] in [src].")) return - user.visible_message("[user] searches through [src].") + user.visible_message(span_warning("[user] searches through [src].")) #ifdef MATURESERVER if(!looty.len) - to_chat(user, "Picked clean.") + to_chat(user, span_warning("Picked clean.")) #else if(!looty.len) - to_chat(user, "Picked clean... I should try later.") + to_chat(user, span_warning("Picked clean... I should try later.")) #endif /obj/structure/flora/roguegrass/bush/update_icon() icon_state = "bush[rand(1, 4)]" diff --git a/code/game/objects/structures/roguetown/telescope.dm b/code/game/objects/structures/roguetown/telescope.dm index 72e192e04..528dc8ed0 100644 --- a/code/game/objects/structures/roguetown/telescope.dm +++ b/code/game/objects/structures/roguetown/telescope.dm @@ -12,12 +12,12 @@ var/mob/living/carbon/human/H = user var/random_message = pick("You can see noc rotating.", "Looking at Astrata blinds you!", "The stars smile at you.", "Nepolx is red today.", "Blessed yellow strife.", "You see a star!") - to_chat(H, "[random_message]") + to_chat(H, span_notice("[random_message]")) if(random_message == "Looking at Astrata blinds you!") if(do_after(H, 25, target = src)) var/obj/item/bodypart/affecting = H.get_bodypart("head") - to_chat(H, "The blinding light causes you intense pain!") + to_chat(H, span_warning("The blinding light causes you intense pain!")) if(affecting && affecting.receive_damage(0, 5)) H.update_damage_overlays() @@ -36,4 +36,4 @@ var/mob/living/carbon/human/H = user var/random_message = pick("you spin the globe!", "You land on Rockhill!", "You land on Zybantine!", "You land on port Ice cube!.", "You land on port Thornvale!", "You land on grenzelhoft!") - to_chat(H, "[random_message]") \ No newline at end of file + to_chat(H, span_notice("[random_message]")) \ No newline at end of file diff --git a/code/game/objects/structures/roguewindow.dm b/code/game/objects/structures/roguewindow.dm index 6cd09ac65..c8bed4bc4 100644 --- a/code/game/objects/structures/roguewindow.dm +++ b/code/game/objects/structures/roguewindow.dm @@ -94,24 +94,24 @@ /obj/structure/roguewindow/openclose/attack_right(mob/user) if(get_dir(src,user) == lockdir) if(brokenstate) - to_chat(user, "It's broken, that would be foolish.") + to_chat(user, span_warning("It's broken, that would be foolish.")) return if(climbable) close_up(user) else open_up(user) else - to_chat(user, "The window doesn't close from this side.") + to_chat(user, span_warning("The window doesn't close from this side.")) /obj/structure/roguewindow/proc/open_up(mob/user) - visible_message("[user] opens [src].") + visible_message(span_info("[user] opens [src].")) playsound(src, 'sound/foley/doors/windowup.ogg', 100, FALSE) climbable = TRUE opacity = FALSE update_icon() /obj/structure/roguewindow/proc/close_up(mob/user) - visible_message("[user] closes [src].") + visible_message(span_info("[user] closes [src].")) playsound(src, 'sound/foley/doors/windowdown.ogg', 100, FALSE) climbable = FALSE opacity = TRUE @@ -149,7 +149,7 @@ if(brokenstate) return user.changeNext_move(CLICK_CD_MELEE) - src.visible_message("[user] knocks on [src].") + src.visible_message(span_info("[user] knocks on [src].")) add_fingerprint(user) playsound(src, 'sound/misc/glassknock.ogg', 100) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 0f23d59a3..0e9619951 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -52,9 +52,9 @@ FLOOR SAFES return 1 if(user && canhear) if(tumbler_1_pos == tumbler_1_open) - to_chat(user, "I hear a [pick("tonk", "krunk", "plunk")] from [src].") + to_chat(user, span_hear("I hear a [pick("tonk", "krunk", "plunk")] from [src].")) if(tumbler_2_pos == tumbler_2_open) - to_chat(user, "I hear a [pick("tink", "krink", "plink")] from [src].") + to_chat(user, span_hear("I hear a [pick("tink", "krink", "plink")] from [src].")) if(tumbler_1_pos == tumbler_1_open && tumbler_2_pos == tumbler_2_open) if(user) visible_message("[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!") @@ -105,13 +105,13 @@ FLOOR SAFES if(href_list["open"]) if(check_unlocked()) - to_chat(user, "I [open ? "close" : "open"] [src].") + to_chat(user, span_notice("I [open ? "close" : "open"] [src].")) open = !open update_icon() updateUsrDialog() return else - to_chat(user, "I can't [open ? "close" : "open"] [src], the lock is engaged!") + to_chat(user, span_warning("I can't [open ? "close" : "open"] [src], the lock is engaged!")) return if(href_list["decrement"]) @@ -119,11 +119,11 @@ FLOOR SAFES if(dial == tumbler_1_pos + 1 || dial == tumbler_1_pos - 71) tumbler_1_pos = decrement(tumbler_1_pos) if(canhear) - to_chat(user, "I hear a [pick("clack", "scrape", "clank")] from [src].") + to_chat(user, span_hear("I hear a [pick("clack", "scrape", "clank")] from [src].")) if(tumbler_1_pos == tumbler_2_pos + 37 || tumbler_1_pos == tumbler_2_pos - 35) tumbler_2_pos = decrement(tumbler_2_pos) if(canhear) - to_chat(user, "I hear a [pick("click", "chink", "clink")] from [src].") + to_chat(user, span_hear("I hear a [pick("click", "chink", "clink")] from [src].")) check_unlocked(user, canhear) updateUsrDialog() return @@ -133,11 +133,11 @@ FLOOR SAFES if(dial == tumbler_1_pos - 1 || dial == tumbler_1_pos + 71) tumbler_1_pos = increment(tumbler_1_pos) if(canhear) - to_chat(user, "I hear a [pick("clack", "scrape", "clank")] from [src].") + to_chat(user, span_hear("I hear a [pick("clack", "scrape", "clank")] from [src].")) if(tumbler_1_pos == tumbler_2_pos - 37 || tumbler_1_pos == tumbler_2_pos + 35) tumbler_2_pos = increment(tumbler_2_pos) if(canhear) - to_chat(user, "I hear a [pick("click", "chink", "clink")] from [src].") + to_chat(user, span_hear("I hear a [pick("click", "chink", "clink")] from [src].")) check_unlocked(user, canhear) updateUsrDialog() return @@ -159,16 +159,16 @@ FLOOR SAFES if(I.w_class + space <= maxspace) space += I.w_class if(!user.transferItemToLoc(I, src)) - to_chat(user, "\The [I] is stuck to your hand, you cannot put it in the safe!") + to_chat(user, span_warning("\The [I] is stuck to your hand, you cannot put it in the safe!")) return - to_chat(user, "I put [I] in [src].") + to_chat(user, span_notice("I put [I] in [src].")) updateUsrDialog() return else - to_chat(user, "[I] won't fit in [src].") + to_chat(user, span_notice("[I] won't fit in [src].")) return else if(istype(I, /obj/item/clothing/neck/stethoscope)) - to_chat(user, "Hold [I] in one of your hands while you manipulate the dial!") + to_chat(user, span_warning("Hold [I] in one of your hands while you manipulate the dial!")) else return ..() diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm index 8bc459f5a..207fdb5d5 100644 --- a/code/game/objects/structures/showcase.dm +++ b/code/game/objects/structures/showcase.dm @@ -111,17 +111,17 @@ /obj/structure/showcase/attackby(obj/item/W, mob/user) if(W.tool_behaviour == TOOL_SCREWDRIVER && !anchored) if(deconstruction_state == SHOWCASE_SCREWDRIVERED) - to_chat(user, "I screw the screws back into the showcase.") + to_chat(user, span_notice("I screw the screws back into the showcase.")) W.play_tool_sound(src, 100) deconstruction_state = SHOWCASE_CONSTRUCTED else if (deconstruction_state == SHOWCASE_CONSTRUCTED) - to_chat(user, "I unscrew the screws.") + to_chat(user, span_notice("I unscrew the screws.")) W.play_tool_sound(src, 100) deconstruction_state = SHOWCASE_SCREWDRIVERED if(W.tool_behaviour == TOOL_CROWBAR && deconstruction_state == SHOWCASE_SCREWDRIVERED) if(W.use_tool(src, user, 20, volume=100)) - to_chat(user, "I start to crowbar the showcase apart...") + to_chat(user, span_notice("I start to crowbar the showcase apart...")) new /obj/item/stack/sheet/metal(drop_location(), 4) qdel(src) diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 599fce032..9cd4b42c8 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -44,13 +44,13 @@ /obj/machinery/shower/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_ANALYZER) - to_chat(user, "The water temperature seems to be [current_temperature].") + to_chat(user, span_notice("The water temperature seems to be [current_temperature].")) else return ..() /obj/machinery/shower/wrench_act(mob/living/user, obj/item/I) ..() - to_chat(user, "I begin to adjust the temperature valve with \the [I]...") + to_chat(user, span_notice("I begin to adjust the temperature valve with \the [I]...")) if(I.use_tool(src, user, 50)) switch(current_temperature) if(SHOWER_NORMAL) @@ -59,7 +59,7 @@ current_temperature = SHOWER_BOILING if(SHOWER_BOILING) current_temperature = SHOWER_NORMAL - user.visible_message("[user] adjusts the shower with \the [I].", "I adjust the shower with \the [I] to [current_temperature] temperature.") + user.visible_message(span_notice("[user] adjusts the shower with \the [I]."), span_notice("I adjust the shower with \the [I] to [current_temperature] temperature.")) user.log_message("has wrenched a shower at [AREACOORD(src)] to [current_temperature].", LOG_ATTACK) add_hiddenprint(user) handle_mist() @@ -219,12 +219,12 @@ if(current_temperature == SHOWER_FREEZING) if(iscarbon(L)) C.adjust_bodytemperature(-80, 80) - to_chat(L, "[src] is freezing!") + to_chat(L, span_warning("[src] is freezing!")) else if(current_temperature == SHOWER_BOILING) if(iscarbon(L)) C.adjust_bodytemperature(35, 0, 500) L.adjustFireLoss(5) - to_chat(L, "[src] is searing!") + to_chat(L, span_danger("[src] is searing!")) /obj/effect/mist diff --git a/code/game/objects/structures/signs/_signs.dm b/code/game/objects/structures/signs/_signs.dm index f8790f083..89bc20f5a 100644 --- a/code/game/objects/structures/signs/_signs.dm +++ b/code/game/objects/structures/signs/_signs.dm @@ -26,13 +26,13 @@ /obj/structure/sign/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WRENCH && buildable_sign) - user.visible_message("[user] starts removing [src]...", \ - "I start unfastening [src].") + user.visible_message(span_notice("[user] starts removing [src]..."), \ + span_notice("I start unfastening [src].")) I.play_tool_sound(src) if(I.use_tool(src, user, 40)) playsound(src, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] unfastens [src].", \ - "I unfasten [src].") + user.visible_message(span_notice("[user] unfastens [src]."), \ + span_notice("I unfasten [src].")) var/obj/item/sign_backing/SB = new (get_turf(user)) SB.icon_state = icon_state SB.sign_path = type @@ -120,8 +120,8 @@ . = ..() if(isturf(target) && proximity) var/turf/T = target - user.visible_message("[user] fastens [src] to [T].", \ - "I attach the sign to [T].") + user.visible_message(span_notice("[user] fastens [src] to [T]."), \ + span_notice("I attach the sign to [T].")) playsound(T, 'sound/blank.ogg', 50, TRUE) var/obj/structure/sign/S = new sign_path(T) S.setDir(dir) diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index 8932d4771..7044bf770 100644 --- a/code/game/objects/structures/spirit_board.dm +++ b/code/game/objects/structures/spirit_board.dm @@ -41,7 +41,7 @@ next_use = world.time + rand(30,50) lastuser = M.ckey //blind message is the same because not everyone brings night vision to seances - var/msg = "The planchette slowly moves... and stops at the letter \"[planchette]\"." + var/msg = span_notice("The planchette slowly moves... and stops at the letter \"[planchette]\".") visible_message(msg,"",msg) /obj/structure/spirit_board/proc/spirit_board_checks(mob/M) @@ -60,7 +60,7 @@ if(light_amount > 0.2) - to_chat(M, "It's too bright here to use [src.name]!") + to_chat(M, span_warning("It's too bright here to use [src.name]!")) return FALSE //mobs in range check @@ -68,12 +68,12 @@ for(var/mob/living/L in orange(1,src)) if(L.ckey && L.client) if((world.time - L.client.inactivity) < (world.time - 300) || L.stat != CONSCIOUS || L.restrained())//no playing with braindeads or corpses or handcuffed dudes. - to_chat(M, "[L] doesn't seem to be paying attention...") + to_chat(M, span_warning("[L] doesn't seem to be paying attention...")) else users_in_range++ if(users_in_range < 2) - to_chat(M, "There aren't enough people to use the [src.name]!") + to_chat(M, span_warning("There aren't enough people to use the [src.name]!")) return FALSE return TRUE diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index b6d315f95..c22efc72c 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -26,11 +26,11 @@ if(!W.tool_start_check(user, amount=0)) return FALSE - user.visible_message("[user] is slicing apart the [name].", \ - "I are slicing apart the [name]...") + user.visible_message(span_notice("[user] is slicing apart the [name]."), \ + span_notice("I are slicing apart the [name]...")) if(W.use_tool(src, user, 40, volume=50)) - user.visible_message("[user] slices apart the [name].", \ - "I slice apart the [name]!") + user.visible_message(span_notice("[user] slices apart the [name]."), \ + span_notice("I slice apart the [name]!")) deconstruct(TRUE) return return ..() diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm index 784bce59e..453e2cc83 100644 --- a/code/game/objects/structures/table_frames.dm +++ b/code/game/objects/structures/table_frames.dm @@ -23,7 +23,7 @@ /obj/structure/table_frame/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I start disassembling [src]...") + to_chat(user, span_notice("I start disassembling [src]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 30)) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) @@ -34,16 +34,16 @@ if (istype(I, /obj/item/stack)) if(material?.tableVariant) if(material.get_amount() < 1) - to_chat(user, "I need one [material.name] sheet to do this!") + to_chat(user, span_warning("I need one [material.name] sheet to do this!")) return - to_chat(user, "I start adding [material] to [src]...") + to_chat(user, span_notice("I start adding [material] to [src]...")) if(do_after(user, 20, target = src) && material.use(1)) make_new_table(material.tableVariant) else if(material.get_amount() < 1) - to_chat(user, "I need one metal sheet to do this!") + to_chat(user, span_warning("I need one metal sheet to do this!")) return - to_chat(user, "I start adding [material] to [src]...") + to_chat(user, span_notice("I start adding [material] to [src]...")) if(do_after(user, 20, target = src) && material.use(1)) var/list/material_list = list() if(material.material_type) @@ -92,9 +92,9 @@ if (toConstruct) if(material.get_amount() < 1) - to_chat(user, "I need one [material.name] sheet to do this!") + to_chat(user, span_warning("I need one [material.name] sheet to do this!")) return - to_chat(user, "I start adding [material] to [src]...") + to_chat(user, span_notice("I start adding [material] to [src]...")) if(do_after(user, 20, target = src) && material.use(1)) make_new_table(toConstruct) else diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 7d0581430..af60df1cf 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -43,7 +43,7 @@ // . += deconstruction_hints(user) /obj/structure/table/proc/deconstruction_hints(mob/user) - return "The top is screwed on, but the main bolts are also visible." + return span_notice("The top is screwed on, but the main bolts are also visible.") /obj/structure/table/update_icon() if(smooth) @@ -63,19 +63,19 @@ if(isliving(user.pulling)) var/mob/living/pushed_mob = user.pulling if(pushed_mob.buckled) - to_chat(user, "[pushed_mob] is on [pushed_mob.buckled]!") + to_chat(user, span_warning("[pushed_mob] is on [pushed_mob.buckled]!")) return if(user.used_intent.type == INTENT_GRAB) if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, "I need a better grip to do that!") + to_chat(user, span_warning("I need a better grip to do that!")) return if(user.grab_state >= GRAB_NECK) tableheadsmash(user, pushed_mob) else tablepush(user, pushed_mob) if(user.used_intent.type == INTENT_HELP) - pushed_mob.visible_message("[user] begins to place [pushed_mob] onto [src]...", \ - "[user] begins to place [pushed_mob] onto [src]...") + pushed_mob.visible_message(span_notice("[user] begins to place [pushed_mob] onto [src]..."), \ + span_danger("[user] begins to place [pushed_mob] onto [src]...")) if(do_after(user, 35, target = pushed_mob)) tableplace(user, pushed_mob) else @@ -84,8 +84,8 @@ else if(user.pulling.pass_flags & PASSTABLE) user.Move_Pulled(src) if (user.pulling.loc == loc) - user.visible_message("[user] places [user.pulling] onto [src].", - "I place [user.pulling] onto [src].") + user.visible_message(span_notice("[user] places [user.pulling] onto [src]."), + span_notice("I place [user.pulling] onto [src].")) user.stop_pulling() return ..() @@ -111,13 +111,13 @@ /obj/structure/table/proc/tableplace(mob/living/user, mob/living/pushed_mob) pushed_mob.forceMove(loc) pushed_mob.set_resting(TRUE, TRUE) - pushed_mob.visible_message("[user] places [pushed_mob] onto [src].", \ - "[user] places [pushed_mob] onto [src].") + pushed_mob.visible_message(span_notice("[user] places [pushed_mob] onto [src]."), \ + span_notice("[user] places [pushed_mob] onto [src].")) log_combat(user, pushed_mob, "places", null, "onto [src]") /obj/structure/table/proc/tablepush(mob/living/user, mob/living/pushed_mob) if(HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "Throwing [pushed_mob] onto the table might hurt them!") + to_chat(user, span_danger("Throwing [pushed_mob] onto the table might hurt them!")) return var/added_passtable = FALSE if(!pushed_mob.pass_flags & PASSTABLE) @@ -134,8 +134,8 @@ if(user.mind?.martial_art.smashes_tables && user.mind?.martial_art.can_use(user)) deconstruct(FALSE) playsound(pushed_mob, "sound/effects/tableslam.ogg", 90, TRUE) - pushed_mob.visible_message("[user] slams [pushed_mob] onto \the [src]!", \ - "[user] slams you onto \the [src]!") + pushed_mob.visible_message(span_danger("[user] slams [pushed_mob] onto \the [src]!"), \ + span_danger("[user] slams you onto \the [src]!")) log_combat(user, pushed_mob, "tabled", null, "onto [src]") SEND_SIGNAL(pushed_mob, COMSIG_ADD_MOOD_EVENT, "table", /datum/mood_event/table) @@ -147,21 +147,21 @@ if(user.mind?.martial_art.smashes_tables && user.mind?.martial_art.can_use(user)) deconstruct(FALSE) playsound(pushed_mob, "sound/effects/tableheadsmash.ogg", 90, TRUE) - pushed_mob.visible_message("[user] smashes [pushed_mob]'s head against \the [src]!", - "[user] smashes your head against \the [src]") + pushed_mob.visible_message(span_danger("[user] smashes [pushed_mob]'s head against \the [src]!"), + span_danger("[user] smashes your head against \the [src]")) log_combat(user, pushed_mob, "head slammed", null, "against [src]") SEND_SIGNAL(pushed_mob, COMSIG_ADD_MOOD_EVENT, "table", /datum/mood_event/table_headsmash) /obj/structure/table/attackby(obj/item/I, mob/user, params) if(!(flags_1 & NODECONSTRUCT_1)) if(I.tool_behaviour == TOOL_SCREWDRIVER && deconstruction_ready) - to_chat(user, "I start disassembling [src]...") + to_chat(user, span_notice("I start disassembling [src]...")) if(I.use_tool(src, user, 20, volume=50)) deconstruct(TRUE) return if(I.tool_behaviour == TOOL_WRENCH && deconstruction_ready) - to_chat(user, "I start deconstructing [src]...") + to_chat(user, span_notice("I start deconstructing [src]...")) if(I.use_tool(src, user, 40, volume=50)) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) deconstruct(TRUE, 1) @@ -171,7 +171,7 @@ var/obj/item/storage/bag/tray/T = I if(T.contents.len > 0) // If the tray isn't empty SEND_SIGNAL(I, COMSIG_TRY_STORAGE_QUICK_EMPTY, drop_location()) - user.visible_message("[user] empties [I] on [src].") + user.visible_message(span_notice("[user] empties [I] on [src].")) return // If the tray IS empty, continue on (tray will be placed on the table like other items) @@ -270,8 +270,8 @@ table_shatter(M) /obj/structure/table/glass/proc/table_shatter(mob/living/L) - visible_message("[src] breaks!", - "I hear breaking glass.") + visible_message(span_warning("[src] breaks!"), + span_danger("I hear breaking glass.")) var/turf/T = get_turf(src) playsound(T, "shatter", 50, TRUE) for(var/I in debris) @@ -469,9 +469,9 @@ /obj/structure/table/reinforced/deconstruction_hints(mob/user) if(deconstruction_ready) - return "The top cover has been welded loose and the main frame's bolts are exposed." + return span_notice("The top cover has been welded loose and the main frame's bolts are exposed.") else - return "The top cover is firmly welded on." + return span_notice("The top cover is firmly welded on.") /obj/structure/table/reinforced/attackby(obj/item/W, mob/user, params) if(W.tool_behaviour == TOOL_WELDER && user.used_intent.type != INTENT_HELP) @@ -479,14 +479,14 @@ return if(deconstruction_ready) - to_chat(user, "I start strengthening the reinforced table...") + to_chat(user, span_notice("I start strengthening the reinforced table...")) if (W.use_tool(src, user, 50, volume=50)) - to_chat(user, "I strengthen the table.") + to_chat(user, span_notice("I strengthen the table.")) deconstruction_ready = 0 else - to_chat(user, "I start weakening the reinforced table...") + to_chat(user, span_notice("I start weakening the reinforced table...")) if (W.use_tool(src, user, 50, volume=50)) - to_chat(user, "I weaken the table.") + to_chat(user, span_notice("I weaken the table.")) deconstruction_ready = 1 else . = ..() @@ -532,7 +532,7 @@ /obj/structure/table/optable/tablepush(mob/living/user, mob/living/pushed_mob) pushed_mob.forceMove(loc) pushed_mob.set_resting(TRUE, TRUE) - visible_message("[user] has laid [pushed_mob] on [src].") + visible_message(span_notice("[user] has laid [pushed_mob] on [src].")) check_patient() /obj/structure/table/optable/proc/check_patient() @@ -564,7 +564,7 @@ /obj/structure/rack/examine(mob/user) . = ..() -// += "It's held together by a couple of bolts." +// += span_notice("It's held together by a couple of bolts.") /obj/structure/rack/CanPass(atom/movable/mover, turf/target) if(src.density == 0) //Because broken racks -Agouri |TODO: SPRITE!| @@ -619,7 +619,7 @@ return user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src, ATTACK_EFFECT_KICK) - user.visible_message("[user] kicks [src].", null, null, COMBAT_MESSAGE_RANGE) + user.visible_message(span_danger("[user] kicks [src]."), null, null, COMBAT_MESSAGE_RANGE) take_damage(rand(4,8), BRUTE, "slash", 1)*/ /* @@ -686,13 +686,13 @@ if(building) return building = TRUE - to_chat(user, "I start constructing a rack...") + to_chat(user, span_notice("I start constructing a rack...")) if(do_after(user, 50, target = user, progress=TRUE)) if(!user.temporarilyRemoveItemFromInventory(src)) return var/obj/structure/rack/R = new /obj/structure/rack(user.loc) user.visible_message("[user] assembles \a [R].\ - ", "I assemble \a [R].") + ", span_notice("I assemble \a [R].")) R.add_fingerprint(user) qdel(src) building = FALSE diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index e9168e50f..ea6e141ff 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -54,17 +54,17 @@ default_unfasten_wrench(user, I, time = 20) return else if(user.used_intent.type != INTENT_HARM) - to_chat(user, "[I] does not fit into [src].") + to_chat(user, span_notice("[I] does not fit into [src].")) return else return ..() if(full) - to_chat(user, "[src] can't hold any more of [I].") + to_chat(user, span_notice("[src] can't hold any more of [I].")) return if(!user.transferItemToLoc(I, src)) return - to_chat(user, "I put [I] in [src].") + to_chat(user, span_notice("I put [I] in [src].")) update_icon() /obj/structure/tank_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index c4201ab91..a147623df 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -46,7 +46,7 @@ T.density = TRUE T.layer = OBJ_LAYER + 0.01 handle_density() - to_chat(user, "I slide the target into the stake.") + to_chat(user, span_notice("I slide the target into the stake.")) /obj/structure/target_stake/attack_hand(mob/user) . = ..() @@ -64,10 +64,10 @@ if(ishuman(user)) if(!user.get_active_held_item()) user.put_in_hands(pinned_target) - to_chat(user, "I take the target out of the stake.") + to_chat(user, span_notice("I take the target out of the stake.")) else pinned_target.forceMove(user.drop_location()) - to_chat(user, "I take the target out of the stake.") + to_chat(user, span_notice("I take the target out of the stake.")) /obj/structure/target_stake/bullet_act(obj/projectile/P) if(pinned_target) diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 67f0538af..b7318a98a 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -56,7 +56,7 @@ R.transfer_fingerprints_to(TP) TP.add_fingerprint(user) TP.setDir(turn(src.dir, -90)) - user.visible_message("[user] inserts [R].", "I insert [R].") + user.visible_message(span_notice("[user] inserts [R]."), span_notice("I insert [R].")) qdel(R) @@ -70,10 +70,10 @@ var/mob/living/GM = user.pulling if(user.grab_state >= GRAB_AGGRESSIVE) if(GM.buckled || GM.has_buckled_mobs()) - to_chat(user, "[GM] is attached to something!") + to_chat(user, span_warning("[GM] is attached to something!")) return for(var/obj/structure/transit_tube_pod/pod in loc) - pod.visible_message("[user] starts putting [GM] into the [pod]!") + pod.visible_message(span_warning("[user] starts putting [GM] into the [pod]!")) if(do_after(user, 15, target = src)) if(open_status == STATION_TUBE_OPEN && GM && user.grab_state >= GRAB_AGGRESSIVE && user.pulling == GM && !GM.buckled && !GM.has_buckled_mobs()) GM.Paralyze(100) @@ -87,7 +87,7 @@ else if(open_status == STATION_TUBE_OPEN) if(pod.contents.len && user.loc != pod) - user.visible_message("[user] starts emptying [pod]'s contents onto the floor.", "I start emptying [pod]'s contents onto the floor...") + user.visible_message(span_notice("[user] starts emptying [pod]'s contents onto the floor."), span_notice("I start emptying [pod]'s contents onto the floor...")) if(do_after(user, 10, target = src)) //So it doesn't default to close_animation() on fail if(pod && pod.loc == loc) for(var/atom/movable/AM in pod) @@ -235,13 +235,13 @@ /obj/structure/transit_tube/station/dispenser/examine(mob/user) . = ..() - . += "This station will create a pod for you to ride, no need to wait for one." + . += span_notice("This station will create a pod for you to ride, no need to wait for one.") /obj/structure/transit_tube/station/dispenser/Bumped(atom/movable/AM) if(!(istype(AM) && AM.dir == boarding_dir)) return var/obj/structure/transit_tube_pod/dispensed/pod = new(loc) - AM.visible_message("[pod] forms around [AM].", "[pod] materializes around you.") + AM.visible_message(span_notice("[pod] forms around [AM]."), span_notice("[pod] materializes around you.")) playsound(src, 'sound/blank.ogg', 50, TRUE) pod.setDir(turn(src.dir, -90)) AM.forceMove(pod) diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm index d3963314a..ee5044650 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube.dm @@ -40,11 +40,11 @@ if(W.tool_behaviour == TOOL_WRENCH) if(tube_construction) for(var/obj/structure/transit_tube_pod/pod in src.loc) - to_chat(user, "Remove the pod first!") + to_chat(user, span_warning("Remove the pod first!")) return - user.visible_message("[user] starts to detach \the [src].", "I start to detach the [name]...") + user.visible_message(span_notice("[user] starts to detach \the [src]."), span_notice("I start to detach the [name]...")) if(W.use_tool(src, user, time_to_unwrench, volume=50)) - to_chat(user, "I detach the [name].") + to_chat(user, span_notice("I detach the [name].")) var/obj/structure/c_transit_tube/R = new tube_construction(loc) R.setDir(dir) transfer_fingerprints_to(R) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm index 2948fb40e..5b71e6d5a 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -44,10 +44,10 @@ ..() if(!can_wrench_in_loc(user)) return - to_chat(user, "I start attaching the [name]...") + to_chat(user, span_notice("I start attaching the [name]...")) add_fingerprint(user) if(I.use_tool(src, user, time_to_unwrench, volume=50, extra_checks=CALLBACK(src, PROC_REF(can_wrench_in_loc), user))) - to_chat(user, "I attach the [name].") + to_chat(user, span_notice("I attach the [name].")) var/obj/structure/transit_tube/R = new build_type(loc, dir) transfer_fingerprints_to(R) qdel(src) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 1a77108bc..14d0580c9 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -32,7 +32,7 @@ if(!moving) I.play_tool_sound(src) if(contents.len) - user.visible_message("[user] empties \the [src].", "I empty \the [src].") + user.visible_message(span_notice("[user] empties \the [src]."), span_notice("I empty \the [src].")) empty_pod() else deconstruct(TRUE, user) @@ -45,7 +45,7 @@ if(user) location = user.loc add_fingerprint(user) - user.visible_message("[user] removes [src].", "I remove [src].") + user.visible_message(span_notice("[user] removes [src]."), span_notice("I remove [src].")) var/obj/structure/c_transit_tube_pod/R = new/obj/structure/c_transit_tube_pod(location) transfer_fingerprints_to(R) R.setDir(dir) @@ -73,9 +73,9 @@ if(!moving) user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - to_chat(user, "I start trying to escape from the pod...") + to_chat(user, span_notice("I start trying to escape from the pod...")) if(do_after(user, 1 MINUTES, target = src)) - to_chat(user, "I manage to open the pod.") + to_chat(user, span_notice("I manage to open the pod.")) empty_pod() /obj/structure/transit_tube_pod/proc/empty_pod(atom/location) diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index ba05e0a19..b3f6f6b02 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -6,7 +6,7 @@ density = FALSE anchored = TRUE alpha = 30 //initially quite hidden when not "recharging" - var/flare_message = "the trap flares brightly!" + var/flare_message = span_warning("the trap flares brightly!") var/last_trigger = 0 var/time_between_triggers = 600 //takes a minute to recharge var/charges = INFINITY @@ -20,7 +20,7 @@ /obj/structure/trap/Initialize(mapload) . = ..() - flare_message = "[src] flares brightly!" + flare_message = span_warning("[src] flares brightly!") spark_system = new spark_system.set_up(4,1,src) spark_system.attach(src) @@ -42,7 +42,7 @@ if(user.mind && user.mind in immune_minds) return if(get_dist(user, src) <= 1) - . += "I reveal [src]!" + . += span_notice("I reveal [src]!") flare() /obj/structure/trap/proc/flare() @@ -106,7 +106,7 @@ /obj/structure/trap/stun/hunter/Initialize(mapload) . = ..() time_between_triggers = 10 - flare_message = "[src] snaps shut!" + flare_message = span_warning("[src] snaps shut!") /obj/structure/trap/stun/hunter/Crossed(atom/movable/AM) if(isliving(AM)) @@ -172,7 +172,7 @@ icon_state = "trap-fire" /obj/structure/trap/fire/trap_effect(mob/living/L) - to_chat(L, "Spontaneous combustion!") + to_chat(L, span_danger("Spontaneous combustion!")) L.Paralyze(20) new /obj/effect/hotspot(get_turf(src)) @@ -182,7 +182,7 @@ icon_state = "trap-frost" /obj/structure/trap/chill/trap_effect(mob/living/L) - to_chat(L, "You're frozen solid!") + to_chat(L, span_danger("You're frozen solid!")) L.Paralyze(20) L.adjust_bodytemperature(-300) L.apply_status_effect(/datum/status_effect/freon) @@ -195,7 +195,7 @@ /obj/structure/trap/damage/trap_effect(mob/living/L) - to_chat(L, "The ground quakes beneath your feet!") + to_chat(L, span_danger("The ground quakes beneath your feet!")) L.Paralyze(100) L.adjustBruteLoss(35) var/obj/structure/flora/rock/giant_rock = new(get_turf(src)) @@ -219,7 +219,7 @@ icon_state = "trap-cult" /obj/structure/trap/cult/trap_effect(mob/living/L) - to_chat(L, "With a crack, the hostile constructs come out of hiding, stunning you!") + to_chat(L, span_danger("With a crack, the hostile constructs come out of hiding, stunning you!")) L.electrocute_act(10, src, flags = SHOCK_NOGLOVES) // electrocute act does a message. L.Paralyze(20) QDEL_IN(src, 30) diff --git a/code/game/objects/structures/votingbox.dm b/code/game/objects/structures/votingbox.dm index d7a69b1cc..fe477785b 100644 --- a/code/game/objects/structures/votingbox.dm +++ b/code/game/objects/structures/votingbox.dm @@ -24,7 +24,7 @@ if(voting_active) apply_vote(I,user) else - to_chat(user,"[src] is in maintenance mode. Voting is not possible at the moment.") + to_chat(user,span_warning("[src] is in maintenance mode. Voting is not possible at the moment.")) return return ..() @@ -58,7 +58,7 @@ var/mob/user = usr if(!is_operator(user)) - to_chat(user,"Voting box operator authorization required!") + to_chat(user,span_warning("Voting box operator authorization required!")) return if(href_list["act"]) @@ -71,7 +71,7 @@ if("reset_voted") if(voted) voted.Cut() - to_chat(user,"I reset the voter buffer. Everyone can vote again.") + to_chat(user,span_notice("I reset the voter buffer. Everyone can vote again.")) if("raffle") raffle(user) if("shred") @@ -84,7 +84,7 @@ /obj/structure/votebox/proc/register_owner(obj/item/card/id/I,mob/living/user) owner = I - to_chat(user,"I register [src] to your ID card.") + to_chat(user,span_notice("I register [src] to your ID card.")) ui_interact(user) /obj/structure/votebox/proc/set_description(mob/user) @@ -99,21 +99,21 @@ var/obj/item/card/id/voter_card = user.get_idcard() if(id_auth) if(!voter_card) - to_chat(user,"[src] requires a valid ID card to vote!") + to_chat(user,span_warning("[src] requires a valid ID card to vote!")) return if(voted && (voter_card in voted)) - to_chat(user,"[src] allows only one vote per person.") + to_chat(user,span_warning("[src] allows only one vote per person.")) return if(user.transferItemToLoc(I,src)) if(!voted) voted = list() voted += voter_card - to_chat(user,"I cast your vote.") + to_chat(user,span_notice("I cast your vote.")) /obj/structure/votebox/proc/shred(mob/user) for(var/obj/item/paper/P in contents) qdel(P) - to_chat(user,"I shred the current votes.") + to_chat(user,span_notice("I shred the current votes.")) /obj/structure/votebox/wrench_act(mob/living/user, obj/item/I) . = ..() @@ -123,10 +123,10 @@ /obj/structure/votebox/crowbar_act(mob/living/user, obj/item/I) . = ..() if(voting_active) - to_chat(user,"I can only retrieve votes if maintenance mode is active!") + to_chat(user,span_warning("I can only retrieve votes if maintenance mode is active!")) return FALSE dump_contents() - to_chat(user,"I open vote retrieval hatch and dump all the votes.") + to_chat(user,span_notice("I open vote retrieval hatch and dump all the votes.")) return TRUE /obj/structure/votebox/dump_contents() @@ -147,7 +147,7 @@ else var/obj/item/paper/P = pick(options) user.put_in_hands(P) - to_chat(user,"[src] pops out random vote.") + to_chat(user,span_notice("[src] pops out random vote.")) /obj/structure/votebox/proc/print_tally(mob/user) var/list/results = list() @@ -187,7 +187,7 @@ P.name = "Voting Results" P.update_icon() user.put_in_hands(P) - to_chat(user,"[src] prints out the voting tally.") + to_chat(user,span_notice("[src] prints out the voting tally.")) /obj/structure/votebox/update_icon() . = ..() diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index b264718d8..a4d7d9c6a 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -25,7 +25,7 @@ /* if(swirlie) user.changeNext_move(CLICK_CD_MELEE) playsound(src.loc, "swing_hit", 25, TRUE) - swirlie.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "[user] slams the toilet seat onto your head!", "I hear reverberating porcelain.") + swirlie.visible_message(span_danger("[user] slams the toilet seat onto [swirlie]'s head!"), span_danger("[user] slams the toilet seat onto your head!"), span_hear("I hear reverberating porcelain.")) swirlie.adjustBruteLoss(5) else if(user.pulling && user.used_intent.type == INTENT_GRAB && isliving(user.pulling)) @@ -33,14 +33,14 @@ var/mob/living/GM = user.pulling if(user.grab_state >= GRAB_AGGRESSIVE) if(GM.loc != get_turf(src)) - to_chat(user, "[GM] needs to be on [src]!") + to_chat(user, span_warning("[GM] needs to be on [src]!")) return if(!swirlie) if(open) - GM.visible_message("[user] starts to give [GM] a swirlie!", "[user] starts to give you a swirlie...") + GM.visible_message(span_danger("[user] starts to give [GM] a swirlie!"), span_danger("[user] starts to give you a swirlie...")) swirlie = GM if(do_after(user, 30, 0, target = src)) - GM.visible_message("[user] gives [GM] a swirlie!", "[user] gives you a swirlie!", "I hear a toilet flushing.") + GM.visible_message(span_danger("[user] gives [GM] a swirlie!"), span_danger("[user] gives you a swirlie!"), span_hear("I hear a toilet flushing.")) if(iscarbon(GM)) var/mob/living/carbon/C = GM if(!C.internal) @@ -50,21 +50,21 @@ swirlie = null else playsound(src.loc, 'sound/blank.ogg', 25, TRUE) - GM.visible_message("[user] slams [GM.name] into [src]!", "[user] slams you into [src]!") + GM.visible_message(span_danger("[user] slams [GM.name] into [src]!"), span_danger("[user] slams you into [src]!")) GM.adjustBruteLoss(5) else - to_chat(user, "I need a tighter grip!")*/ + to_chat(user, span_warning("I need a tighter grip!"))*/ if(cistern && user.CanReach(src)) if(!contents.len) - to_chat(user, "The toilet is empty.") + to_chat(user, span_notice("The toilet is empty.")) else var/obj/item/I = pick(contents) if(ishuman(user)) user.put_in_hands(I) else I.forceMove(drop_location()) - to_chat(user, "I find [I] in the toilet.") + to_chat(user, span_notice("I find [I] in the toilet.")) w_items -= I.w_class // else // open = !open @@ -87,10 +87,10 @@ /obj/structure/toilet/attackby(obj/item/I, mob/living/user, params) add_fingerprint(user) if(I.tool_behaviour == TOOL_CROWBAR) - to_chat(user, "I start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]...") + to_chat(user, span_notice("I start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]...")) playsound(loc, 'sound/blank.ogg', 50, TRUE) if(I.use_tool(src, user, 30)) - user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "I [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "I hear grinding porcelain.") + user.visible_message(span_notice("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!"), span_notice("I [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!"), span_hear("I hear grinding porcelain.")) cistern = !cistern update_icon() else if(I.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1)) @@ -99,16 +99,16 @@ else if(cistern) if(user.used_intent.type != INTENT_HARM) if(I.w_class > WEIGHT_CLASS_NORMAL) - to_chat(user, "[I] does not fit!") + to_chat(user, span_warning("[I] does not fit!")) return if(w_items + I.w_class > WEIGHT_CLASS_HUGE) - to_chat(user, "The toilet is full!") + to_chat(user, span_warning("The toilet is full!")) return if(!user.transferItemToLoc(I, src)) - to_chat(user, "\The [I] is stuck to your hand, you cannot put it in the cistern!") + to_chat(user, span_warning("\The [I] is stuck to your hand, you cannot put it in the cistern!")) return w_items += I.w_class - to_chat(user, "I carefully place [I] into the toilet.") + to_chat(user, span_notice("I carefully place [I] into the toilet.")) else if(istype(I, /obj/item/reagent_containers)) if (!open) @@ -119,7 +119,7 @@ return var/obj/item/reagent_containers/RG = I RG.reagents.add_reagent(/datum/reagent/water/gross, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) - to_chat(user, "I fill [RG] from [src].") + to_chat(user, span_notice("I fill [RG] from [src].")) else return ..() @@ -161,23 +161,23 @@ var/mob/living/GM = user.pulling if(user.grab_state >= GRAB_AGGRESSIVE) if(GM.loc != get_turf(src)) - to_chat(user, "[GM.name] needs to be on [src].") + to_chat(user, span_notice("[GM.name] needs to be on [src].")) return user.changeNext_move(CLICK_CD_MELEE) - user.visible_message("[user] slams [GM] into [src]!", "I slam [GM] into [src]!") + user.visible_message(span_danger("[user] slams [GM] into [src]!"), span_danger("I slam [GM] into [src]!")) GM.adjustBruteLoss(8) else - to_chat(user, "I need a tighter grip!") + to_chat(user, span_warning("I need a tighter grip!")) else if(exposed) if(!hiddenitem) - to_chat(user, "There is nothing in the drain holder!") + to_chat(user, span_warning("There is nothing in the drain holder!")) else if(ishuman(user)) user.put_in_hands(hiddenitem) else hiddenitem.forceMove(get_turf(src)) - to_chat(user, "I fish [hiddenitem] out of the drain enclosure.") + to_chat(user, span_notice("I fish [hiddenitem] out of the drain enclosure.")) hiddenitem = null else ..() @@ -185,28 +185,28 @@ /obj/structure/urinal/attackby(obj/item/I, mob/living/user, params) if(exposed) if (hiddenitem) - to_chat(user, "There is already something in the drain enclosure!") + to_chat(user, span_warning("There is already something in the drain enclosure!")) return if(I.w_class > 1) - to_chat(user, "[I] is too large for the drain enclosure.") + to_chat(user, span_warning("[I] is too large for the drain enclosure.")) return if(!user.transferItemToLoc(I, src)) - to_chat(user, "\[I] is stuck to your hand, you cannot put it in the drain enclosure!") + to_chat(user, span_warning("\[I] is stuck to your hand, you cannot put it in the drain enclosure!")) return hiddenitem = I - to_chat(user, "I place [I] into the drain enclosure.") + to_chat(user, span_notice("I place [I] into the drain enclosure.")) else return ..() /obj/structure/urinal/screwdriver_act(mob/living/user, obj/item/I) if(..()) return TRUE - to_chat(user, "I start to [exposed ? "screw the cap back into place" : "unscrew the cap to the drain protector"]...") + to_chat(user, span_notice("I start to [exposed ? "screw the cap back into place" : "unscrew the cap to the drain protector"]...")) playsound(loc, 'sound/blank.ogg', 50, TRUE) if(I.use_tool(src, user, 20)) - user.visible_message("[user] [exposed ? "screws the cap back into place" : "unscrew the cap to the drain protector"]!", - "I [exposed ? "screw the cap back into place" : "unscrew the cap on the drain"]!", - "I hear metal and squishing noises.") + user.visible_message(span_notice("[user] [exposed ? "screws the cap back into place" : "unscrew the cap to the drain protector"]!"), + span_notice("I [exposed ? "screw the cap back into place" : "unscrew the cap on the drain"]!"), + span_hear("I hear metal and squishing noises.")) exposed = !exposed return TRUE @@ -221,7 +221,7 @@ foodtype = TOXIC | GROSS /obj/item/reagent_containers/food/snacks/urinalcake/attack_self(mob/living/user) - user.visible_message("[user] squishes [src]!", "I squish [src].", "I hear a squish.") + user.visible_message(span_notice("[user] squishes [src]!"), span_notice("I squish [src]."), "I hear a squish.") icon_state = "urinalcake_squish" addtimer(VARSET_CALLBACK(src, icon_state, "urinalcake"), 8) @@ -256,14 +256,14 @@ return if(busy) - to_chat(user, "Someone's already washing here!") + to_chat(user, span_warning("Someone's already washing here!")) return var/selected_area = parse_zone(user.zone_selected) var/washing_face = 0 if(selected_area in list(BODY_ZONE_HEAD, BODY_ZONE_PRECISE_MOUTH, BODY_ZONE_PRECISE_R_EYE)) washing_face = 1 - user.visible_message("[user] starts washing [user.p_their()] [washing_face ? "face" : "hands"]...", \ - "I start washing your [washing_face ? "face" : "hands"]...") + user.visible_message(span_notice("[user] starts washing [user.p_their()] [washing_face ? "face" : "hands"]..."), \ + span_notice("I start washing your [washing_face ? "face" : "hands"]...")) busy = TRUE if(!do_after(user, 40, target = src)) @@ -272,8 +272,8 @@ busy = FALSE - user.visible_message("[user] washes [user.p_their()] [washing_face ? "face" : "hands"] using [src].", \ - "I wash your [washing_face ? "face" : "hands"] using [src].") + user.visible_message(span_notice("[user] washes [user.p_their()] [washing_face ? "face" : "hands"] using [src]."), \ + span_notice("I wash your [washing_face ? "face" : "hands"] using [src].")) if(washing_face) SEND_SIGNAL(user, COMSIG_COMPONENT_CLEAN_FACE_ACT, CLEAN_STRENGTH_BLOOD) if(ishuman(user)) @@ -287,7 +287,7 @@ /obj/structure/sink/attackby(obj/item/O, mob/living/user, params) if(busy) - to_chat(user, "Someone's already washing here!") + to_chat(user, span_warning("Someone's already washing here!")) return if(istype(O, /obj/item/reagent_containers)) @@ -295,9 +295,9 @@ if(RG.is_refillable()) if(!RG.reagents.holder_full()) RG.reagents.add_reagent(dispensedreagent, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) - to_chat(user, "I fill [RG] from [src].") + to_chat(user, span_notice("I fill [RG] from [src].")) return TRUE - to_chat(user, "\The [RG] is full.") + to_chat(user, span_notice("\The [RG] is full.")) return FALSE if(istype(O, /obj/item/melee/baton)) @@ -309,14 +309,14 @@ user.Paralyze(stunforce) user.stuttering = stunforce/20 B.deductcharge(B.hitcost) - user.visible_message("[user] shocks [user.p_them()]self while attempting to wash the active [B.name]!", \ - "I unwisely attempt to wash [B] while it's still on.") + user.visible_message(span_warning("[user] shocks [user.p_them()]self while attempting to wash the active [B.name]!"), \ + span_danger("I unwisely attempt to wash [B] while it's still on.")) playsound(src, "sparks", 50, TRUE) return if(istype(O, /obj/item/mop)) O.reagents.add_reagent(dispensedreagent, 5) - to_chat(user, "I wet [O] in [src].") + to_chat(user, span_notice("I wet [O] in [src].")) playsound(loc, 'sound/blank.ogg', 25, TRUE) return @@ -328,7 +328,7 @@ if(istype(O, /obj/item/stack/medical/gauze)) var/obj/item/stack/medical/gauze/G = O new /obj/item/reagent_containers/glass/rag(src.loc) - to_chat(user, "I tear off a strip of gauze and make a rag.") + to_chat(user, span_notice("I tear off a strip of gauze and make a rag.")) G.use(1) return @@ -338,7 +338,7 @@ return if(user.used_intent.type != INTENT_HARM) - to_chat(user, "I start washing [O]...") + to_chat(user, span_notice("I start washing [O]...")) busy = TRUE if(!do_after(user, 40, target = src)) busy = FALSE @@ -349,8 +349,8 @@ create_reagents(5) reagents.add_reagent(dispensedreagent, 5) reagents.reaction(O, TOUCH) - user.visible_message("[user] washes [O] using [src].", \ - "I wash [O] using [src].") + user.visible_message(span_notice("[user] washes [O] using [src]."), \ + span_notice("I wash [O] using [src].")) return 1 else return ..() @@ -448,10 +448,10 @@ if(anchored) return TRUE - user.visible_message("[user] cuts apart [src].", - "I start to cut apart [src].", "I hear cutting.") + user.visible_message(span_warning("[user] cuts apart [src]."), + span_notice("I start to cut apart [src]."), span_hear("I hear cutting.")) if(I.use_tool(src, user, 50, volume=100) && !anchored) - to_chat(user, "I cut apart [src].") + to_chat(user, span_notice("I cut apart [src].")) deconstruct() return TRUE diff --git a/code/game/objects/structures/well.dm b/code/game/objects/structures/well.dm index 658083449..5b197b77d 100644 --- a/code/game/objects/structures/well.dm +++ b/code/game/objects/structures/well.dm @@ -25,11 +25,11 @@ if(istype(I, /obj/item/reagent_containers/glass/bucket/wooden)) var/obj/item/reagent_containers/glass/bucket/wooden/W = I if(W.reagents.holder_full()) - to_chat(user, "[W] is full.") + to_chat(user, span_warning("[W] is full.")) return if(do_after(user, 60, target = src)) var/list/waterl = list(/datum/reagent/water = 100) W.reagents.add_reagent_list(waterl) - to_chat(user, "I fill [W] from [src].") + to_chat(user, span_notice("I fill [W] from [src].")) return else ..() \ No newline at end of file diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index af165f20d..346ff4d46 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -91,11 +91,11 @@ if(!W.tool_start_check(user, amount=0)) return - user.visible_message("[user] disassembles the windoor assembly.", - "I start to disassemble the windoor assembly...") + user.visible_message(span_notice("[user] disassembles the windoor assembly."), + span_notice("I start to disassemble the windoor assembly...")) if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "I disassemble the windoor assembly.") + to_chat(user, span_notice("I disassemble the windoor assembly.")) var/obj/item/stack/sheet/rglass/RG = new (get_turf(src), 5) RG.add_fingerprint(user) if(secure) @@ -108,19 +108,19 @@ if(W.tool_behaviour == TOOL_WRENCH && !anchored) for(var/obj/machinery/door/window/WD in loc) if(WD.dir == dir) - to_chat(user, "There is already a windoor in that location!") + to_chat(user, span_warning("There is already a windoor in that location!")) return - user.visible_message("[user] secures the windoor assembly to the floor.", - "I start to secure the windoor assembly to the floor...") + user.visible_message(span_notice("[user] secures the windoor assembly to the floor."), + span_notice("I start to secure the windoor assembly to the floor...")) if(W.use_tool(src, user, 40, volume=100)) if(anchored) return for(var/obj/machinery/door/window/WD in loc) if(WD.dir == dir) - to_chat(user, "There is already a windoor in that location!") + to_chat(user, span_warning("There is already a windoor in that location!")) return - to_chat(user, "I secure the windoor assembly.") + to_chat(user, span_notice("I secure the windoor assembly.")) setAnchored(TRUE) if(secure) name = "secure anchored windoor assembly" @@ -129,13 +129,13 @@ //Unwrenching an unsecure assembly un-anchors it. Step 4 undone else if(W.tool_behaviour == TOOL_WRENCH && anchored) - user.visible_message("[user] unsecures the windoor assembly to the floor.", - "I start to unsecure the windoor assembly to the floor...") + user.visible_message(span_notice("[user] unsecures the windoor assembly to the floor."), + span_notice("I start to unsecure the windoor assembly to the floor...")) if(W.use_tool(src, user, 40, volume=100)) if(!anchored) return - to_chat(user, "I unsecure the windoor assembly.") + to_chat(user, span_notice("I unsecure the windoor assembly.")) setAnchored(FALSE) if(secure) name = "secure windoor assembly" @@ -146,16 +146,16 @@ else if(istype(W, /obj/item/stack/sheet/plasteel) && !secure) var/obj/item/stack/sheet/plasteel/P = W if(P.get_amount() < 2) - to_chat(user, "I need more plasteel to do this!") + to_chat(user, span_warning("I need more plasteel to do this!")) return - to_chat(user, "I start to reinforce the windoor with plasteel...") + to_chat(user, span_notice("I start to reinforce the windoor with plasteel...")) if(do_after(user,40, target = src)) if(!src || secure || P.get_amount() < 2) return P.use(2) - to_chat(user, "I reinforce the windoor.") + to_chat(user, span_notice("I reinforce the windoor.")) secure = TRUE if(anchored) name = "secure anchored windoor assembly" @@ -164,16 +164,16 @@ //Adding cable to the assembly. Step 5 complete. else if(istype(W, /obj/item/stack/cable_coil) && anchored) - user.visible_message("[user] wires the windoor assembly.", "I start to wire the windoor assembly...") + user.visible_message(span_notice("[user] wires the windoor assembly."), span_notice("I start to wire the windoor assembly...")) if(do_after(user, 40, target = src)) if(!src || !anchored || src.state != "01") return var/obj/item/stack/cable_coil/CC = W if(!CC.use(1)) - to_chat(user, "I need more cable to do this!") + to_chat(user, span_warning("I need more cable to do this!")) return - to_chat(user, "I wire the windoor.") + to_chat(user, span_notice("I wire the windoor.")) state = "02" if(secure) name = "secure wired windoor assembly" @@ -186,13 +186,13 @@ //Removing wire from the assembly. Step 5 undone. if(W.tool_behaviour == TOOL_WIRECUTTER) - user.visible_message("[user] cuts the wires from the airlock assembly.", "I start to cut the wires from airlock assembly...") + user.visible_message(span_notice("[user] cuts the wires from the airlock assembly."), span_notice("I start to cut the wires from airlock assembly...")) if(W.use_tool(src, user, 40, volume=100)) if(state != "02") return - to_chat(user, "I cut the windoor wires.") + to_chat(user, span_notice("I cut the windoor wires.")) new/obj/item/stack/cable_coil(get_turf(user), 1) state = "01" if(secure) @@ -205,14 +205,14 @@ if(!user.transferItemToLoc(W, src)) return W.play_tool_sound(src, 100) - user.visible_message("[user] installs the electronics into the airlock assembly.", - "I start to install electronics into the airlock assembly...") + user.visible_message(span_notice("[user] installs the electronics into the airlock assembly."), + span_notice("I start to install electronics into the airlock assembly...")) if(do_after(user, 40, target = src)) if(!src || electronics) W.forceMove(drop_location()) return - to_chat(user, "I install the airlock electronics.") + to_chat(user, span_notice("I install the airlock electronics.")) name = "near finished windoor assembly" electronics = W else @@ -223,11 +223,11 @@ if(!electronics) return - user.visible_message("[user] removes the electronics from the airlock assembly.", - "I start to uninstall electronics from the airlock assembly...") + user.visible_message(span_notice("[user] removes the electronics from the airlock assembly."), + span_notice("I start to uninstall electronics from the airlock assembly...")) if(W.use_tool(src, user, 40, volume=100) && electronics) - to_chat(user, "I remove the airlock electronics.") + to_chat(user, span_notice("I remove the airlock electronics.")) name = "wired windoor assembly" var/obj/item/electronics/airlock/ae ae = electronics @@ -248,16 +248,16 @@ //Crowbar to complete the assembly, Step 7 complete. else if(W.tool_behaviour == TOOL_CROWBAR) if(!electronics) - to_chat(usr, "The assembly is missing electronics!") + to_chat(usr, span_warning("The assembly is missing electronics!")) return user << browse(null, "window=windoor_access") - user.visible_message("[user] pries the windoor into the frame.", - "I start prying the windoor into the frame...") + user.visible_message(span_notice("[user] pries the windoor into the frame."), + span_notice("I start prying the windoor into the frame...")) if(W.use_tool(src, user, 40, volume=100) && electronics) density = TRUE //Shouldn't matter but just incase - to_chat(user, "I finish the windoor.") + to_chat(user, span_notice("I finish the windoor.")) if(secure) var/obj/machinery/door/window/brigdoor/windoor = new /obj/machinery/door/window/brigdoor(loc) @@ -325,12 +325,12 @@ /obj/structure/windoor_assembly/proc/can_be_rotated(mob/user,rotation_type) if(anchored) - to_chat(user, "[src] cannot be rotated while it is fastened to the floor!") + to_chat(user, span_warning("[src] cannot be rotated while it is fastened to the floor!")) return FALSE var/target_dir = turn(dir, rotation_type == ROTATION_CLOCKWISE ? -90 : 90) if(!valid_window_location(loc, target_dir)) - to_chat(user, "[src] cannot be rotated in that direction!") + to_chat(user, span_warning("[src] cannot be rotated in that direction!")) return FALSE return TRUE @@ -352,11 +352,11 @@ return if(facing == "l") - to_chat(usr, "The windoor will now slide to the right.") + to_chat(usr, span_notice("The windoor will now slide to the right.")) facing = "r" else facing = "l" - to_chat(usr, "The windoor will now slide to the left.") + to_chat(usr, span_notice("The windoor will now slide to the left.")) update_icon() return diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index a93feb0c9..8acecee2c 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -33,18 +33,18 @@ . = ..() if(reinf) if(anchored && state == WINDOW_SCREWED_TO_FRAME) - . += "The window is screwed to the frame." + . += span_notice("The window is screwed to the frame.") else if(anchored && state == WINDOW_IN_FRAME) - . += "The window is unscrewed but pried into the frame." + . += span_notice("The window is unscrewed but pried into the frame.") else if(anchored && state == WINDOW_OUT_OF_FRAME) - . += "The window is out of the frame, but could be pried in. It is screwed to the floor." + . += span_notice("The window is out of the frame, but could be pried in. It is screwed to the floor.") else if(!anchored) - . += "The window is unscrewed from the floor, and could be deconstructed by wrenching." + . += span_notice("The window is unscrewed from the floor, and could be deconstructed by wrenching.") else if(anchored) - . += "The window is screwed to the floor." + . += span_notice("The window is screwed to the floor.") else - . += "The window is unscrewed from the floor, and could be deconstructed by wrenching." + . += span_notice("The window is unscrewed from the floor, and could be deconstructed by wrenching.") /obj/structure/window/Initialize(mapload, direct) . = ..() @@ -76,7 +76,7 @@ /obj/structure/window/rcd_act(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_DECONSTRUCT) - to_chat(user, "I deconstruct the window.") + to_chat(user, span_notice("I deconstruct the window.")) qdel(src) return TRUE return FALSE @@ -123,7 +123,7 @@ /obj/structure/window/attack_tk(mob/user) user.changeNext_move(CLICK_CD_MELEE) - user.visible_message("Something knocks on [src].") + user.visible_message(span_notice("Something knocks on [src].")) add_fingerprint(user) playsound(src, 'sound/blank.ogg', 50, TRUE) @@ -139,8 +139,8 @@ if(!can_be_reached(user)) return user.changeNext_move(CLICK_CD_MELEE) - user.visible_message("[user] knocks on [src].", \ - "I knock on [src].") + user.visible_message(span_notice("[user] knocks on [src]."), \ + span_notice("I knock on [src].")) add_fingerprint(user) playsound(src, 'sound/blank.ogg', 50, TRUE) @@ -163,36 +163,36 @@ if(!I.tool_start_check(user, amount=0)) return - to_chat(user, "I begin repairing [src]...") + to_chat(user, span_notice("I begin repairing [src]...")) if(I.use_tool(src, user, 40, volume=50)) obj_integrity = max_integrity update_nearby_icons() - to_chat(user, "I repair [src].") + to_chat(user, span_notice("I repair [src].")) else - to_chat(user, "[src] is already in good condition!") + to_chat(user, span_warning("[src] is already in good condition!")) return if(!(flags_1&NODECONSTRUCT_1) && !(reinf && state >= RWINDOW_FRAME_BOLTED)) if(I.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "I begin to [anchored ? "unscrew the window from":"screw the window to"] the floor...") + to_chat(user, span_notice("I begin to [anchored ? "unscrew the window from":"screw the window to"] the floor...")) if(I.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_anchored), anchored))) setAnchored(!anchored) - to_chat(user, "I [anchored ? "fasten the window to":"unfasten the window from"] the floor.") + to_chat(user, span_notice("I [anchored ? "fasten the window to":"unfasten the window from"] the floor.")) return else if(I.tool_behaviour == TOOL_WRENCH && !anchored) - to_chat(user, "I begin to disassemble [src]...") + to_chat(user, span_notice("I begin to disassemble [src]...")) if(I.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored))) var/obj/item/stack/sheet/G = new glass_type(user.loc, glass_amount) G.add_fingerprint(user) playsound(src, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I successfully disassemble [src].") + to_chat(user, span_notice("I successfully disassemble [src].")) qdel(src) return else if(I.tool_behaviour == TOOL_CROWBAR && reinf && (state == WINDOW_OUT_OF_FRAME) && anchored) - to_chat(user, "I begin to lever the window into the frame...") + to_chat(user, span_notice("I begin to lever the window into the frame...")) if(I.use_tool(src, user, 100, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored))) state = RWINDOW_SECURE - to_chat(user, "I pry the window into the frame.") + to_chat(user, span_notice("I pry the window into the frame.")) return return ..() @@ -264,13 +264,13 @@ /obj/structure/window/proc/can_be_rotated(mob/user,rotation_type) if(anchored) - to_chat(user, "[src] cannot be rotated while it is fastened to the floor!") + to_chat(user, span_warning("[src] cannot be rotated while it is fastened to the floor!")) return FALSE var/target_dir = turn(dir, rotation_type == ROTATION_CLOCKWISE ? -90 : 90) if(!valid_window_location(loc, target_dir)) - to_chat(user, "[src] cannot be rotated in that direction!") + to_chat(user, span_warning("[src] cannot be rotated in that direction!")) return FALSE return TRUE @@ -373,43 +373,43 @@ switch(state) if(RWINDOW_SECURE) if(I.tool_behaviour == TOOL_WELDER && user.used_intent.type == INTENT_HARM) - user.visible_message("[user] holds \the [I] to the security screws on \the [src]...", - "I begin heating the security screws on \the [src]...") + user.visible_message(span_notice("[user] holds \the [I] to the security screws on \the [src]..."), + span_notice("I begin heating the security screws on \the [src]...")) if(I.use_tool(src, user, 150, volume = 100)) - to_chat(user, "The security bolts are glowing white hot and look ready to be removed.") + to_chat(user, span_notice("The security bolts are glowing white hot and look ready to be removed.")) state = RWINDOW_BOLTS_HEATED addtimer(CALLBACK(src, PROC_REF(cool_bolts)), 300) return if(RWINDOW_BOLTS_HEATED) if(I.tool_behaviour == TOOL_SCREWDRIVER) - user.visible_message("[user] digs into the heated security screws and starts removing them...", - "I dig into the heated screws hard and they start turning...") + user.visible_message(span_notice("[user] digs into the heated security screws and starts removing them..."), + span_notice("I dig into the heated screws hard and they start turning...")) if(I.use_tool(src, user, 50, volume = 50)) state = RWINDOW_BOLTS_OUT - to_chat(user, "The screws come out, and a gap forms around the edge of the pane.") + to_chat(user, span_notice("The screws come out, and a gap forms around the edge of the pane.")) return if(RWINDOW_BOLTS_OUT) if(I.tool_behaviour == TOOL_CROWBAR) - user.visible_message("[user] wedges \the [I] into the gap in the frame and starts prying...", - "I wedge \the [I] into the gap in the frame and start prying...") + user.visible_message(span_notice("[user] wedges \the [I] into the gap in the frame and starts prying..."), + span_notice("I wedge \the [I] into the gap in the frame and start prying...")) if(I.use_tool(src, user, 40, volume = 50)) state = RWINDOW_POPPED - to_chat(user, "The panel pops out of the frame, exposing some thin metal bars that looks like they can be cut.") + to_chat(user, span_notice("The panel pops out of the frame, exposing some thin metal bars that looks like they can be cut.")) return if(RWINDOW_POPPED) if(I.tool_behaviour == TOOL_WIRECUTTER) - user.visible_message("[user] starts cutting the exposed bars on \the [src]...", - "I start cutting the exposed bars on \the [src]") + user.visible_message(span_notice("[user] starts cutting the exposed bars on \the [src]..."), + span_notice("I start cutting the exposed bars on \the [src]")) if(I.use_tool(src, user, 20, volume = 50)) state = RWINDOW_BARS_CUT - to_chat(user, "The panels falls out of the way exposing the frame bolts.") + to_chat(user, span_notice("The panels falls out of the way exposing the frame bolts.")) return if(RWINDOW_BARS_CUT) if(I.tool_behaviour == TOOL_WRENCH) - user.visible_message("[user] starts unfastening \the [src] from the frame...", - "I start unfastening the bolts from the frame...") + user.visible_message(span_notice("[user] starts unfastening \the [src] from the frame..."), + span_notice("I start unfastening the bolts from the frame...")) if(I.use_tool(src, user, 40, volume = 50)) - to_chat(user, "I unscrew the bolts from the frame and the window pops loose.") + to_chat(user, span_notice("I unscrew the bolts from the frame and the window pops loose.")) state = WINDOW_OUT_OF_FRAME setAnchored(FALSE) return @@ -418,21 +418,21 @@ /obj/structure/window/proc/cool_bolts() if(state == RWINDOW_BOLTS_HEATED) state = RWINDOW_SECURE - visible_message("The bolts on \the [src] look like they've cooled off...") + visible_message(span_notice("The bolts on \the [src] look like they've cooled off...")) /obj/structure/window/reinforced/examine(mob/user) . = ..() switch(state) if(RWINDOW_SECURE) - . += "It's been screwed in with one way screws, you'd need to heat them to have any chance of backing them out." + . += span_notice("It's been screwed in with one way screws, you'd need to heat them to have any chance of backing them out.") if(RWINDOW_BOLTS_HEATED) - . += "The screws are glowing white hot, and you'll likely be able to unscrew them now." + . += span_notice("The screws are glowing white hot, and you'll likely be able to unscrew them now.") if(RWINDOW_BOLTS_OUT) - . += "The screws have been removed, revealing a small gap you could fit a prying tool in." + . += span_notice("The screws have been removed, revealing a small gap you could fit a prying tool in.") if(RWINDOW_POPPED) - . += "The main plate of the window has popped out of the frame, exposing some bars that look like they can be cut." + . += span_notice("The main plate of the window has popped out of the frame, exposing some bars that look like they can be cut.") if(RWINDOW_BARS_CUT) - . += "The main pane can be easily moved out of the way to reveal some bolts holding the frame in." + . += span_notice("The main pane can be easily moved out of the way to reveal some bolts holding the frame in.") /obj/structure/window/reinforced/spawner/east dir = EAST @@ -498,43 +498,43 @@ switch(state) if(RWINDOW_SECURE) if(I.tool_behaviour == TOOL_WELDER && user.used_intent.type == INTENT_HARM) - user.visible_message("[user] holds \the [I] to the security screws on \the [src]...", - "I begin heating the security screws on \the [src]...") + user.visible_message(span_notice("[user] holds \the [I] to the security screws on \the [src]..."), + span_notice("I begin heating the security screws on \the [src]...")) if(I.use_tool(src, user, 180, volume = 100)) - to_chat(user, "The security screws are glowing white hot and look ready to be removed.") + to_chat(user, span_notice("The security screws are glowing white hot and look ready to be removed.")) state = RWINDOW_BOLTS_HEATED addtimer(CALLBACK(src, PROC_REF(cool_bolts)), 300) return if(RWINDOW_BOLTS_HEATED) if(I.tool_behaviour == TOOL_SCREWDRIVER) - user.visible_message("[user] digs into the heated security screws and starts removing them...", - "I dig into the heated screws hard and they start turning...") + user.visible_message(span_notice("[user] digs into the heated security screws and starts removing them..."), + span_notice("I dig into the heated screws hard and they start turning...")) if(I.use_tool(src, user, 80, volume = 50)) state = RWINDOW_BOLTS_OUT - to_chat(user, "The screws come out, and a gap forms around the edge of the pane.") + to_chat(user, span_notice("The screws come out, and a gap forms around the edge of the pane.")) return if(RWINDOW_BOLTS_OUT) if(I.tool_behaviour == TOOL_CROWBAR) - user.visible_message("[user] wedges \the [I] into the gap in the frame and starts prying...", - "I wedge \the [I] into the gap in the frame and start prying...") + user.visible_message(span_notice("[user] wedges \the [I] into the gap in the frame and starts prying..."), + span_notice("I wedge \the [I] into the gap in the frame and start prying...")) if(I.use_tool(src, user, 50, volume = 50)) state = RWINDOW_POPPED - to_chat(user, "The panel pops out of the frame, exposing some thin metal bars that looks like they can be cut.") + to_chat(user, span_notice("The panel pops out of the frame, exposing some thin metal bars that looks like they can be cut.")) return if(RWINDOW_POPPED) if(I.tool_behaviour == TOOL_WIRECUTTER) - user.visible_message("[user] starts cutting the exposed bars on \the [src]...", - "I start cutting the exposed bars on \the [src]") + user.visible_message(span_notice("[user] starts cutting the exposed bars on \the [src]..."), + span_notice("I start cutting the exposed bars on \the [src]")) if(I.use_tool(src, user, 30, volume = 50)) state = RWINDOW_BARS_CUT - to_chat(user, "The panels falls out of the way exposing the frame bolts.") + to_chat(user, span_notice("The panels falls out of the way exposing the frame bolts.")) return if(RWINDOW_BARS_CUT) if(I.tool_behaviour == TOOL_WRENCH) - user.visible_message("[user] starts unfastening \the [src] from the frame...", - "I start unfastening the bolts from the frame...") + user.visible_message(span_notice("[user] starts unfastening \the [src] from the frame..."), + span_notice("I start unfastening the bolts from the frame...")) if(I.use_tool(src, user, 50, volume = 50)) - to_chat(user, "I unfasten the bolts from the frame and the window pops loose.") + to_chat(user, span_notice("I unfasten the bolts from the frame and the window pops loose.")) state = WINDOW_OUT_OF_FRAME setAnchored(FALSE) return @@ -544,15 +544,15 @@ . = ..() switch(state) if(RWINDOW_SECURE) - . += "It's been screwed in with one way screws, you'd need to heat them to have any chance of backing them out." + . += span_notice("It's been screwed in with one way screws, you'd need to heat them to have any chance of backing them out.") if(RWINDOW_BOLTS_HEATED) - . += "The screws are glowing white hot, and you'll likely be able to unscrew them now." + . += span_notice("The screws are glowing white hot, and you'll likely be able to unscrew them now.") if(RWINDOW_BOLTS_OUT) - . += "The screws have been removed, revealing a small gap you could fit a prying tool in." + . += span_notice("The screws have been removed, revealing a small gap you could fit a prying tool in.") if(RWINDOW_POPPED) - . += "The main plate of the window has popped out of the frame, exposing some bars that look like they can be cut." + . += span_notice("The main plate of the window has popped out of the frame, exposing some bars that look like they can be cut.") if(RWINDOW_BARS_CUT) - . += "The main pane can be easily moved out of the way to reveal some bolts holding the frame in." + . += span_notice("The main pane can be easily moved out of the way to reveal some bolts holding the frame in.") /obj/structure/window/plasma/reinforced/spawner/east dir = EAST @@ -741,7 +741,7 @@ /obj/structure/window/paperframe/examine(mob/user) . = ..() if(obj_integrity < max_integrity) - . += "It looks a bit damaged, you may be able to fix it with some paper." + . += span_info("It looks a bit damaged, you may be able to fix it with some paper.") /obj/structure/window/paperframe/spawnDebris(location) . = list(new /obj/item/stack/sheet/mineral/wood(location)) @@ -755,13 +755,13 @@ add_fingerprint(user) if(user.used_intent.type != INTENT_HARM) user.changeNext_move(CLICK_CD_MELEE) - user.visible_message("[user] knocks on [src].") + user.visible_message(span_notice("[user] knocks on [src].")) playsound(src, "pageturn", 50, TRUE) else take_damage(4,BRUTE,"blunt", 0) playsound(src, hitsound, 50, TRUE) if(!QDELETED(src)) - user.visible_message("[user] tears a hole in [src].") + user.visible_message(span_danger("[user] tears a hole in [src].")) update_icon() /obj/structure/window/paperframe/update_icon() @@ -783,11 +783,11 @@ if(user.used_intent.type == INTENT_HARM) return ..() if(istype(W, /obj/item/paper) && obj_integrity < max_integrity) - user.visible_message("[user] starts to patch the holes in \the [src].") + user.visible_message(span_notice("[user] starts to patch the holes in \the [src].")) if(do_after(user, 20, target = src)) obj_integrity = min(obj_integrity+4,max_integrity) qdel(W) - user.visible_message("[user] patches some of the holes in \the [src].") + user.visible_message(span_notice("[user] patches some of the holes in \the [src].")) if(obj_integrity == max_integrity) update_icon() return diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index f644e4d50..e53e39c44 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -22,7 +22,7 @@ /obj/structure/shuttle/engine/can_be_unfasten_wrench(mob/user, silent) if(state == ENGINE_WELDED) if(!silent) - to_chat(user, "[src] is welded to the floor!") + to_chat(user, span_warning("[src] is welded to the floor!")) return FAILED_UNFASTEN return ..() @@ -43,31 +43,31 @@ . = ..() switch(state) if(ENGINE_UNWRENCHED) - to_chat(user, "The [src.name] needs to be wrenched to the floor!") + to_chat(user, span_warning("The [src.name] needs to be wrenched to the floor!")) if(ENGINE_WRENCHED) if(!I.tool_start_check(user, amount=0)) return TRUE - user.visible_message("[user.name] starts to weld the [name] to the floor.", \ - "I start to weld \the [src] to the floor...", \ - "I hear welding.") + user.visible_message(span_notice("[user.name] starts to weld the [name] to the floor."), \ + span_notice("I start to weld \the [src] to the floor..."), \ + span_hear("I hear welding.")) if(I.use_tool(src, user, ENGINE_WELDTIME, volume=50)) state = ENGINE_WELDED - to_chat(user, "I weld \the [src] to the floor.") + to_chat(user, span_notice("I weld \the [src] to the floor.")) alter_engine_power(engine_power) if(ENGINE_WELDED) if(!I.tool_start_check(user, amount=0)) return TRUE - user.visible_message("[user.name] starts to cut the [name] free from the floor.", \ - "I start to cut \the [src] free from the floor...", \ - "I hear welding.") + user.visible_message(span_notice("[user.name] starts to cut the [name] free from the floor."), \ + span_notice("I start to cut \the [src] free from the floor..."), \ + span_hear("I hear welding.")) if(I.use_tool(src, user, ENGINE_WELDTIME, volume=50)) state = ENGINE_WRENCHED - to_chat(user, "I cut \the [src] free from the floor.") + to_chat(user, span_notice("I cut \the [src] free from the floor.")) alter_engine_power(-engine_power) return TRUE diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm index 068c6bffb..a775020de 100644 --- a/code/game/turfs/closed/_closed.dm +++ b/code/game/turfs/closed/_closed.dm @@ -36,7 +36,7 @@ return user.wallpressed = dir2wall user.update_wallpress_slowdown() - user.visible_message("[user] leans against [src].") + user.visible_message(span_info("[user] leans against [src].")) switch(dir2wall) if(NORTH) user.setDir(SOUTH) @@ -91,7 +91,7 @@ H.apply_damage(15, BRUTE, "head", H.run_armor_check("head", "blunt", damage = 15)) H.toggle_rogmove_intent(MOVE_INTENT_WALK, TRUE) playsound(src, "genblunt", 100, TRUE) - H.visible_message("[H] runs into [src]!", "I run into [src]!") + H.visible_message(span_warning("[H] runs into [src]!"), span_warning("I run into [src]!")) addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, Knockdown), 10), 10) /turf/closed/Initialize() @@ -131,20 +131,20 @@ return var/turf/target = get_step_multiz(user, UP) if(!istype(target, /turf/open/transparent/openspace)) - to_chat(user, "I can't climb here.") + to_chat(user, span_warning("I can't climb here.")) return if(!L.can_zTravel(target, UP)) - to_chat(user, "I can't climb there.") + to_chat(user, span_warning("I can't climb there.")) return target = get_step_multiz(src, UP) if(!target || istype(target, /turf/closed) || istype(target, /turf/open/transparent/openspace)) target = get_step_multiz(user.loc, UP) if(!target || !istype(target, /turf/open/transparent/openspace)) - to_chat(user, "I can't climb here.") + to_chat(user, span_warning("I can't climb here.")) return for(var/obj/structure/F in target) if(F && (F.density && !F.climbable)) - to_chat(user, "I can't climb here.") + to_chat(user, span_warning("I can't climb here.")) return var/used_time = 0 if(L.mind) @@ -163,12 +163,12 @@ climbsound = 'sound/foley/ladder.ogg' if(myskill < climbdiff) - to_chat(user, "I'm not capable of climbing this wall.") + to_chat(user, span_warning("I'm not capable of climbing this wall.")) return used_time = max(70 - (myskill * 10) - (L.STASPD * 3), 30) if(user.m_intent != MOVE_INTENT_SNEAK) playsound(user, climbsound, 100, TRUE) - user.visible_message("[user] starts to climb [src].", "I start to climb [src]...") + user.visible_message(span_warning("[user] starts to climb [src]."), span_warning("I start to climb [src]...")) if(do_after(L, used_time, target = src)) var/pulling = user.pulling if(ismob(pulling)) @@ -185,13 +185,13 @@ return var/turf/target = get_step_multiz(user, UP) if(!target) - to_chat(user, "I can't go there.") + to_chat(user, span_warning("I can't go there.")) return if(!istype(target, /turf/open/transparent/openspace)) - to_chat(user, "I can't go there.") + to_chat(user, span_warning("I can't go there.")) return user.forceMove(target) - to_chat(user, "I crawl up the wall.") + to_chat(user, span_warning("I crawl up the wall.")) . = ..() diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index 45d3db78e..31c5b05f2 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -60,7 +60,7 @@ /turf/closed/mineral/attackby(obj/item/I, mob/user, params) if (!user.IsAdvancedToolUser()) - to_chat(usr, "I don't have the dexterity to do this!") + to_chat(usr, span_warning("I don't have the dexterity to do this!")) return lastminer = user ..() @@ -74,7 +74,7 @@ /turf/closed/mineral/turf_destruction(damage_flag) if(lastminer.goodluck(2) && mineralType) -// to_chat(lastminer, "Bonus ducks!") +// to_chat(lastminer, span_notice("Bonus ducks!")) new mineralType(src) gets_drilled(lastminer, give_exp = FALSE) queue_smooth_neighbors(src) @@ -94,7 +94,7 @@ SSblackbox.record_feedback("tally", "ore_mined", mineralAmt, mineralType) else if(user.goodluck(2)) var/newthing = pickweight(list(/obj/item/natural/rock/salt = 2, /obj/item/natural/rock/iron = 1, /obj/item/natural/rock/coal = 2)) -// to_chat(user, "Bonus ducks!") +// to_chat(user, span_notice("Bonus ducks!")) new newthing(src) // if(ishuman(user)) // var/mob/living/carbon/human/H = user @@ -119,10 +119,10 @@ ..() /turf/closed/mineral/attack_alien(mob/living/carbon/alien/M) - to_chat(M, "I start digging into the rock...") + to_chat(M, span_notice("I start digging into the rock...")) playsound(src, 'sound/blank.ogg', 50, TRUE) if(do_after(M, 40, target = src)) - to_chat(M, "I tunnel into the rock.") + to_chat(M, span_notice("I tunnel into the rock.")) gets_drilled(M) /* /turf/closed/mineral/Bumped(atom/movable/AM) @@ -473,7 +473,7 @@ /turf/closed/mineral/gibtonite/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner) && stage == 1) - user.visible_message("[user] holds [I] to [src]...", "I use [I] to locate where to cut off the chain reaction and attempt to stop it...") + user.visible_message(span_notice("[user] holds [I] to [src]..."), span_notice("I use [I] to locate where to cut off the chain reaction and attempt to stop it...")) defuse() ..() @@ -484,7 +484,7 @@ name = "gibtonite deposit" desc = "" stage = GIBTONITE_ACTIVE - visible_message("There was gibtonite inside! It's going to explode!") + visible_message(span_danger("There was gibtonite inside! It's going to explode!")) var/notify_admins = 0 if(z != 5) @@ -518,7 +518,7 @@ stage = GIBTONITE_STABLE if(det_time < 0) det_time = 0 - visible_message("The chain reaction was stopped! The gibtonite had [det_time] reactions left till the explosion!") + visible_message(span_notice("The chain reaction was stopped! The gibtonite had [det_time] reactions left till the explosion!")) /turf/closed/mineral/gibtonite/gets_drilled(mob/user, triggered_by_explosion = 0) if(stage == GIBTONITE_UNSTRUCK && mineralAmt >= 1) //Gibtonite deposit is activated @@ -565,13 +565,13 @@ /turf/closed/mineral/strong/attackby(obj/item/I, mob/user, params) if(!ishuman(user)) - to_chat(usr, "Only a more advanced species could break a rock such as this one!") + to_chat(usr, span_warning("Only a more advanced species could break a rock such as this one!")) return FALSE var/mob/living/carbon/human/H = user if(H.mind.get_skill_level(/datum/skill/mining) >= SKILL_LEVEL_LEGENDARY) . = ..() else - to_chat(usr, "The rock seems to be too strong to destroy. Maybe I can break it once I become a master miner.") + to_chat(usr, span_warning("The rock seems to be too strong to destroy. Maybe I can break it once I become a master miner.")) /turf/closed/mineral/strong/gets_drilled(user) @@ -690,5 +690,5 @@ /turf/closed/mineral/rogue/bedrock/attackby(obj/item/I, mob/user, params) ..() - to_chat(user, "TOO HARD!") + to_chat(user, span_warning("TOO HARD!")) turf_integrity = max_integrity diff --git a/code/game/turfs/closed/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm index 40195e2de..ee1a0564c 100644 --- a/code/game/turfs/closed/wall/reinf_walls.dm +++ b/code/game/turfs/closed/wall/reinf_walls.dm @@ -17,19 +17,19 @@ /turf/closed/wall/r_wall/deconstruction_hints(mob/user) switch(d_state) if(INTACT) - return "The outer grille is fully intact." + return span_notice("The outer grille is fully intact.") if(SUPPORT_LINES) - return "The outer grille has been cut, and the support lines are screwed securely to the outer cover." + return span_notice("The outer grille has been cut, and the support lines are screwed securely to the outer cover.") if(COVER) - return "The support lines have been unscrewed, and the metal cover is welded firmly in place." + return span_notice("The support lines have been unscrewed, and the metal cover is welded firmly in place.") if(CUT_COVER) - return "The metal cover has been sliced through, and is connected loosely to the girder." + return span_notice("The metal cover has been sliced through, and is connected loosely to the girder.") if(ANCHOR_BOLTS) - return "The outer cover has been pried away, and the bolts anchoring the support rods are wrenched in place." + return span_notice("The outer cover has been pried away, and the bolts anchoring the support rods are wrenched in place.") if(SUPPORT_RODS) - return "The bolts anchoring the support rods have been loosened, but are still welded firmly to the girder." + return span_notice("The bolts anchoring the support rods have been loosened, but are still welded firmly to the girder.") if(SHEATH) - return "The support rods have been sliced through, and the outer sheath is connected loosely to the girder." + return span_notice("The support rods have been sliced through, and the outer sheath is connected loosely to the girder.") /turf/closed/wall/r_wall/devastate_wall() new sheet_type(src, sheet_amount) @@ -45,7 +45,7 @@ playsound(src, 'sound/blank.ogg', 100, TRUE) else playsound(src, 'sound/blank.ogg', 50, TRUE) - to_chat(M, "This wall is far too strong for you to destroy.") + to_chat(M, span_warning("This wall is far too strong for you to destroy.")) /turf/closed/wall/r_wall/try_decon(obj/item/W, mob/user, turf/T) //DECONSTRUCTION @@ -55,138 +55,138 @@ W.play_tool_sound(src, 100) d_state = SUPPORT_LINES update_icon() - to_chat(user, "I cut the outer grille.") + to_chat(user, span_notice("I cut the outer grille.")) return 1 if(SUPPORT_LINES) if(W.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "I begin unsecuring the support lines...") + to_chat(user, span_notice("I begin unsecuring the support lines...")) if(W.use_tool(src, user, 40, volume=100)) if(!istype(src, /turf/closed/wall/r_wall) || d_state != SUPPORT_LINES) return 1 d_state = COVER update_icon() - to_chat(user, "I unsecure the support lines.") + to_chat(user, span_notice("I unsecure the support lines.")) return 1 else if(W.tool_behaviour == TOOL_WIRECUTTER) W.play_tool_sound(src, 100) d_state = INTACT update_icon() - to_chat(user, "I repair the outer grille.") + to_chat(user, span_notice("I repair the outer grille.")) return 1 if(COVER) if(W.tool_behaviour == TOOL_WELDER) if(!W.tool_start_check(user, amount=0)) return - to_chat(user, "I begin slicing through the metal cover...") + to_chat(user, span_notice("I begin slicing through the metal cover...")) if(W.use_tool(src, user, 60, volume=100)) if(!istype(src, /turf/closed/wall/r_wall) || d_state != COVER) return 1 d_state = CUT_COVER update_icon() - to_chat(user, "I press firmly on the cover, dislodging it.") + to_chat(user, span_notice("I press firmly on the cover, dislodging it.")) return 1 if(W.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "I begin securing the support lines...") + to_chat(user, span_notice("I begin securing the support lines...")) if(W.use_tool(src, user, 40, volume=100)) if(!istype(src, /turf/closed/wall/r_wall) || d_state != COVER) return 1 d_state = SUPPORT_LINES update_icon() - to_chat(user, "The support lines have been secured.") + to_chat(user, span_notice("The support lines have been secured.")) return 1 if(CUT_COVER) if(W.tool_behaviour == TOOL_CROWBAR) - to_chat(user, "I struggle to pry off the cover...") + to_chat(user, span_notice("I struggle to pry off the cover...")) if(W.use_tool(src, user, 100, volume=100)) if(!istype(src, /turf/closed/wall/r_wall) || d_state != CUT_COVER) return 1 d_state = ANCHOR_BOLTS update_icon() - to_chat(user, "I pry off the cover.") + to_chat(user, span_notice("I pry off the cover.")) return 1 if(W.tool_behaviour == TOOL_WELDER) if(!W.tool_start_check(user, amount=0)) return - to_chat(user, "I begin welding the metal cover back to the frame...") + to_chat(user, span_notice("I begin welding the metal cover back to the frame...")) if(W.use_tool(src, user, 60, volume=100)) if(!istype(src, /turf/closed/wall/r_wall) || d_state != CUT_COVER) return TRUE d_state = COVER update_icon() - to_chat(user, "The metal cover has been welded securely to the frame.") + to_chat(user, span_notice("The metal cover has been welded securely to the frame.")) return 1 if(ANCHOR_BOLTS) if(W.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I start loosening the anchoring bolts which secure the support rods to their frame...") + to_chat(user, span_notice("I start loosening the anchoring bolts which secure the support rods to their frame...")) if(W.use_tool(src, user, 40, volume=100)) if(!istype(src, /turf/closed/wall/r_wall) || d_state != ANCHOR_BOLTS) return 1 d_state = SUPPORT_RODS update_icon() - to_chat(user, "I remove the bolts anchoring the support rods.") + to_chat(user, span_notice("I remove the bolts anchoring the support rods.")) return 1 if(W.tool_behaviour == TOOL_CROWBAR) - to_chat(user, "I start to pry the cover back into place...") + to_chat(user, span_notice("I start to pry the cover back into place...")) if(W.use_tool(src, user, 20, volume=100)) if(!istype(src, /turf/closed/wall/r_wall) || d_state != ANCHOR_BOLTS) return 1 d_state = CUT_COVER update_icon() - to_chat(user, "The metal cover has been pried back into place.") + to_chat(user, span_notice("The metal cover has been pried back into place.")) return 1 if(SUPPORT_RODS) if(W.tool_behaviour == TOOL_WELDER) if(!W.tool_start_check(user, amount=0)) return - to_chat(user, "I begin slicing through the support rods...") + to_chat(user, span_notice("I begin slicing through the support rods...")) if(W.use_tool(src, user, 100, volume=100)) if(!istype(src, /turf/closed/wall/r_wall) || d_state != SUPPORT_RODS) return 1 d_state = SHEATH update_icon() - to_chat(user, "I slice through the support rods.") + to_chat(user, span_notice("I slice through the support rods.")) return 1 if(W.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I start tightening the bolts which secure the support rods to their frame...") + to_chat(user, span_notice("I start tightening the bolts which secure the support rods to their frame...")) W.play_tool_sound(src, 100) if(W.use_tool(src, user, 40)) if(!istype(src, /turf/closed/wall/r_wall) || d_state != SUPPORT_RODS) return 1 d_state = ANCHOR_BOLTS update_icon() - to_chat(user, "I tighten the bolts anchoring the support rods.") + to_chat(user, span_notice("I tighten the bolts anchoring the support rods.")) return 1 if(SHEATH) if(W.tool_behaviour == TOOL_CROWBAR) - to_chat(user, "I struggle to pry off the outer sheath...") + to_chat(user, span_notice("I struggle to pry off the outer sheath...")) if(W.use_tool(src, user, 100, volume=100)) if(!istype(src, /turf/closed/wall/r_wall) || d_state != SHEATH) return 1 - to_chat(user, "I pry off the outer sheath.") + to_chat(user, span_notice("I pry off the outer sheath.")) dismantle_wall() return 1 if(W.tool_behaviour == TOOL_WELDER) if(!W.tool_start_check(user, amount=0)) return - to_chat(user, "I begin welding the support rods back together...") + to_chat(user, span_notice("I begin welding the support rods back together...")) if(W.use_tool(src, user, 100, volume=100)) if(!istype(src, /turf/closed/wall/r_wall) || d_state != SHEATH) return TRUE d_state = SUPPORT_RODS update_icon() - to_chat(user, "I weld the support rods back together.") + to_chat(user, span_notice("I weld the support rods back together.")) return 1 return 0 diff --git a/code/game/turfs/closed/wall/roguewalls.dm b/code/game/turfs/closed/wall/roguewalls.dm index 062969de0..dcac51452 100644 --- a/code/game/turfs/closed/wall/roguewalls.dm +++ b/code/game/turfs/closed/wall/roguewalls.dm @@ -314,11 +314,11 @@ res_replenish = world.time + 8 MINUTES var/obj/item/B = new /obj/item/grown/log/tree/stick(user.loc) user.put_in_hands(B) - user.visible_message("[user] finds [B] in [src].") + user.visible_message(span_notice("[user] finds [B] in [src].")) return - user.visible_message("[user] searches through [src].") + user.visible_message(span_warning("[user] searches through [src].")) if(!res) - to_chat(user, "Picked clean... I should try later.") + to_chat(user, span_warning("Picked clean... I should try later.")) ..() /turf/closed/wall/shroud/Initialize() diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index f55832320..8a5fde3cb 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -34,7 +34,7 @@ // . += deconstruction_hints(user) /turf/closed/wall/proc/deconstruction_hints(mob/user) - return "The outer plating is welded firmly in place." + return span_notice("The outer plating is welded firmly in place.") /turf/closed/wall/attack_tk() return @@ -111,8 +111,8 @@ switch(M.damtype) if(BRUTE) playsound(src, 'sound/blank.ogg', 50, TRUE) - M.visible_message("[M.name] hits [src]!", \ - "I hit [src]!", null, COMBAT_MESSAGE_RANGE) + M.visible_message(span_danger("[M.name] hits [src]!"), \ + span_danger("I hit [src]!"), null, COMBAT_MESSAGE_RANGE) if(prob(hardness + M.force) && M.force > 20) dismantle_wall(1) playsound(src, 'sound/blank.ogg', 100, TRUE) @@ -146,9 +146,9 @@ else playsound(src, 'sound/blank.ogg', 50, TRUE) add_dent(WALL_DENT_HIT) - user.visible_message("[user] smashes \the [src]!", \ - "I smash \the [src]!", \ - "I hear a booming smash!") + user.visible_message(span_danger("[user] smashes \the [src]!"), \ + span_danger("I smash \the [src]!"), \ + span_hear("I hear a booming smash!")) return TRUE /turf/closed/wall/attack_hand(mob/user) @@ -156,14 +156,14 @@ if(.) return user.changeNext_move(CLICK_CD_MELEE) - to_chat(user, "I push the wall but nothing happens!") + to_chat(user, span_notice("I push the wall but nothing happens!")) playsound(src, 'sound/blank.ogg', 25, TRUE) add_fingerprint(user) /turf/closed/wall/attackby(obj/item/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) if (!user.IsAdvancedToolUser()) - to_chat(user, "I don't have the dexterity to do this!") + to_chat(user, span_warning("I don't have the dexterity to do this!")) return //get the user's location @@ -188,10 +188,10 @@ if(!W.tool_start_check(user, amount=0)) return FALSE - to_chat(user, "I begin fixing dents on the wall...") + to_chat(user, span_notice("I begin fixing dents on the wall...")) if(W.use_tool(src, user, 0, volume=100)) if(iswallturf(src) && LAZYLEN(dent_decals)) - to_chat(user, "I fix some dents on the wall.") + to_chat(user, span_notice("I fix some dents on the wall.")) cut_overlay(dent_decals) dent_decals.Cut() return TRUE @@ -217,10 +217,10 @@ if(!I.tool_start_check(user, amount=0)) return FALSE - to_chat(user, "I begin slicing through the outer plating...") + to_chat(user, span_notice("I begin slicing through the outer plating...")) if(I.use_tool(src, user, slicing_duration, volume=100)) if(iswallturf(src)) - to_chat(user, "I remove the outer plating.") + to_chat(user, span_notice("I remove the outer plating.")) dismantle_wall() return TRUE @@ -264,7 +264,7 @@ /turf/closed/wall/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_DECONSTRUCT) - to_chat(user, "I deconstruct the wall.") + to_chat(user, span_notice("I deconstruct the wall.")) ScrapeAway() return TRUE return FALSE diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index c1f9c721b..0cd1564b1 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -217,7 +217,7 @@ if(C.m_intent == MOVE_INTENT_WALK && (lube&NO_SLIP_WHEN_WALKING)) return 0 if(!(lube&SLIDE_ICE)) - to_chat(C, "I slipped[ O ? " on the [O.name]" : ""]!") + to_chat(C, span_notice("I slipped[ O ? " on the [O.name]" : ""]!")) playsound(C.loc, 'sound/blank.ogg', 50, TRUE, -3) SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "slipped", /datum/mood_event/slipped) diff --git a/code/game/turfs/open/chasm.dm b/code/game/turfs/open/chasm.dm index a6d1aaade..c4ba4e582 100644 --- a/code/game/turfs/open/chasm.dm +++ b/code/game/turfs/open/chasm.dm @@ -37,7 +37,7 @@ /turf/open/chasm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_FLOORWALL) - to_chat(user, "I build a floor.") + to_chat(user, span_notice("I build a floor.")) PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) return TRUE return FALSE @@ -54,12 +54,12 @@ var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) if(!L) if(R.use(1)) - to_chat(user, "I construct a lattice.") + to_chat(user, span_notice("I construct a lattice.")) playsound(src, 'sound/blank.ogg', 50, TRUE) // Create a lattice, without reverting to our baseturf new /obj/structure/lattice(src) else - to_chat(user, "I need one rod to build a lattice.") + to_chat(user, span_warning("I need one rod to build a lattice.")) return if(istype(C, /obj/item/stack/tile/plasteel)) var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) @@ -68,13 +68,13 @@ if(S.use(1)) qdel(L) playsound(src, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I build a floor.") + to_chat(user, span_notice("I build a floor.")) // Create a floor, which has this chasm underneath it PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) else - to_chat(user, "I need one floor tile to build a floor!") + to_chat(user, span_warning("I need one floor tile to build a floor!")) else - to_chat(user, "The plating is going to need some support! Place metal rods first.") + to_chat(user, span_warning("The plating is going to need some support! Place metal rods first.")) /turf/open/chasm/CanPass(atom/movable/mover, turf/target) return 1 diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index 3ad8f6160..8b933591d 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -179,10 +179,10 @@ broken = 0 burnt = 0 if(user && !silent) - to_chat(user, "I remove the broken plating.") + to_chat(user, span_notice("I remove the broken plating.")) else if(user && !silent) - to_chat(user, "I remove the floor tile.") + to_chat(user, span_notice("I remove the floor tile.")) if(floor_tile && make_tile) new floor_tile(src) return make_plating() @@ -237,13 +237,13 @@ /turf/open/floor/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_FLOORWALL) - to_chat(user, "I build a wall.") + to_chat(user, span_notice("I build a wall.")) PlaceOnTop(/turf/closed/wall) return TRUE if(RCD_AIRLOCK) if(locate(/obj/machinery/door/airlock) in src) return FALSE - to_chat(user, "I build an airlock.") + to_chat(user, span_notice("I build an airlock.")) var/obj/machinery/door/airlock/A = new the_rcd.airlock_type(src) A.electronics = new/obj/item/electronics/airlock(A) @@ -261,12 +261,12 @@ if(RCD_DECONSTRUCT) if(!ScrapeAway(flags = CHANGETURF_INHERIT_AIR)) return FALSE - to_chat(user, "I deconstruct [src].") + to_chat(user, span_notice("I deconstruct [src].")) return TRUE if(RCD_WINDOWGRILLE) if(locate(/obj/structure/grille) in src) return FALSE - to_chat(user, "I construct the grille.") + to_chat(user, span_notice("I construct the grille.")) var/obj/structure/grille/G = new(src) G.anchored = TRUE return TRUE diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm index 0c2ff86b7..5fd1201e6 100644 --- a/code/game/turfs/open/floor/fancy_floor.dm +++ b/code/game/turfs/open/floor/fancy_floor.dm @@ -20,7 +20,7 @@ /turf/open/floor/wood/examine(mob/user) . = ..() - . += "There's a few screws and a small crack visible." + . += span_notice("There's a few screws and a small crack visible.") /turf/open/floor/wood/screwdriver_act(mob/living/user, obj/item/I) if(..()) @@ -49,16 +49,16 @@ broken = 0 burnt = 0 if(user && !silent) - to_chat(user, "I remove the broken planks.") + to_chat(user, span_notice("I remove the broken planks.")) else if(make_tile) if(user && !silent) - to_chat(user, "I unscrew the planks.") + to_chat(user, span_notice("I unscrew the planks.")) if(floor_tile) new floor_tile(src) else if(user && !silent) - to_chat(user, "I forcefully pry off the planks, destroying them in the process.") + to_chat(user, span_notice("I forcefully pry off the planks, destroying them in the process.")) return make_plating() /turf/open/floor/wood/cold @@ -91,7 +91,7 @@ /turf/open/floor/grass/attackby(obj/item/C, mob/user, params) if((C.tool_behaviour == TOOL_SHOVEL) && params) new ore_type(src, 2) - user.visible_message("[user] digs up [src].", "I [turfverb] [src].") + user.visible_message(span_notice("[user] digs up [src]."), span_notice("I [turfverb] [src].")) playsound(src, 'sound/blank.ogg', 50, TRUE) make_plating() if(..()) @@ -189,7 +189,7 @@ /turf/open/floor/carpet/examine(mob/user) . = ..() -// . += "There's a small crack on the edge of it." +// . += span_notice("There's a small crack on the edge of it.") /turf/open/floor/carpet/Initialize() . = ..() diff --git a/code/game/turfs/open/floor/light_floor.dm b/code/game/turfs/open/floor/light_floor.dm index ddbc68d6c..60d0a367f 100644 --- a/code/game/turfs/open/floor/light_floor.dm +++ b/code/game/turfs/open/floor/light_floor.dm @@ -15,7 +15,7 @@ /turf/open/floor/light/examine(mob/user) . = ..() - . += "There's a small crack on the edge of it." + . += span_notice("There's a small crack on the edge of it.") /turf/open/floor/light/Initialize() . = ..() @@ -79,9 +79,9 @@ qdel(C) state = 0 //fixing it by bashing it with a light bulb, fun eh? update_icon() - to_chat(user, "I replace the light bulb.") + to_chat(user, span_notice("I replace the light bulb.")) else - to_chat(user, "The light bulb seems fine, no need to replace it.") + to_chat(user, span_notice("The light bulb seems fine, no need to replace it.")) //Cycles through all of the colours diff --git a/code/game/turfs/open/floor/plasteel_floor.dm b/code/game/turfs/open/floor/plasteel_floor.dm index b0164a3ed..8fb6d7ee0 100644 --- a/code/game/turfs/open/floor/plasteel_floor.dm +++ b/code/game/turfs/open/floor/plasteel_floor.dm @@ -6,7 +6,7 @@ /turf/open/floor/plasteel/examine(mob/user) . = ..() - . += "There's a small crack on the edge of it." + . += span_notice("There's a small crack on the edge of it.") /turf/open/floor/plasteel/update_icon() if(!..()) diff --git a/code/game/turfs/open/floor/plating.dm b/code/game/turfs/open/floor/plating.dm index 09f81c319..87cea6a99 100644 --- a/code/game/turfs/open/floor/plating.dm +++ b/code/game/turfs/open/floor/plating.dm @@ -22,12 +22,12 @@ /turf/open/floor/plating/examine(mob/user) . = ..() if(broken || burnt) - . += "It looks like the dents could be welded smooth." + . += span_notice("It looks like the dents could be welded smooth.") return if(attachment_holes) - . += "There are a few attachment holes for a new tile or reinforcement rods." + . += span_notice("There are a few attachment holes for a new tile or reinforcement rods.") else - . += "I might be able to build ontop of it with some tiles..." + . += span_notice("I might be able to build ontop of it with some tiles...") /turf/open/floor/plating/Initialize() if (!broken_states) @@ -51,27 +51,27 @@ return if(istype(C, /obj/item/stack/rods) && attachment_holes) if(broken || burnt) - to_chat(user, "Repair the plating first!") + to_chat(user, span_warning("Repair the plating first!")) return var/obj/item/stack/rods/R = C if (R.get_amount() < 2) - to_chat(user, "I need two rods to make a reinforced floor!") + to_chat(user, span_warning("I need two rods to make a reinforced floor!")) return else - to_chat(user, "I begin reinforcing the floor...") + to_chat(user, span_notice("I begin reinforcing the floor...")) if(do_after(user, 30, target = src)) if (R.get_amount() >= 2 && !istype(src, /turf/open/floor/engine)) PlaceOnTop(/turf/open/floor/engine, flags = CHANGETURF_INHERIT_AIR) playsound(src, 'sound/blank.ogg', 80, TRUE) R.use(2) - to_chat(user, "I reinforce the floor.") + to_chat(user, span_notice("I reinforce the floor.")) return else if(istype(C, /obj/item/stack/tile)) if(!broken && !burnt) for(var/obj/O in src) if(O.level == 1) //ex. pipes laid underneath a tile for(var/M in O.buckled_mobs) - to_chat(user, "Someone is buckled to \the [O]! Unbuckle [M] to move \him out of the way.") + to_chat(user, span_warning("Someone is buckled to \the [O]! Unbuckle [M] to move \him out of the way.")) return var/obj/item/stack/tile/W = C if(!W.use(1)) @@ -83,12 +83,12 @@ F.state = L.state playsound(src, 'sound/blank.ogg', 50, TRUE) else - to_chat(user, "This section is too damaged to support a tile! Use a welder to fix the damage.") + to_chat(user, span_warning("This section is too damaged to support a tile! Use a welder to fix the damage.")) /turf/open/floor/plating/welder_act(mob/living/user, obj/item/I) ..() if((broken || burnt) && I.use_tool(src, user, 0, volume=80)) - to_chat(user, "I fix some dents on the broken plating.") + to_chat(user, span_danger("I fix some dents on the broken plating.")) icon_state = icon_plating burnt = FALSE broken = FALSE @@ -116,7 +116,7 @@ var/obj/L = locate(/obj/structure/lattice) in src if(L) qdel(L) - to_chat(user, "I reinforce the foamed plating with tiling.") + to_chat(user, span_notice("I reinforce the foamed plating with tiling.")) playsound(src, 'sound/blank.ogg', 50, TRUE) ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) else @@ -124,11 +124,11 @@ user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) if(prob(I.force * 20 - 25)) - user.visible_message("[user] smashes through [src]!", \ - "I smash through [src] with [I]!") + user.visible_message(span_danger("[user] smashes through [src]!"), \ + span_danger("I smash through [src] with [I]!")) ScrapeAway(flags = CHANGETURF_INHERIT_AIR) else - to_chat(user, "I hit [src], to no effect!") + to_chat(user, span_danger("I hit [src], to no effect!")) /turf/open/floor/plating/foam/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) if(the_rcd.mode == RCD_FLOORWALL) @@ -136,7 +136,7 @@ /turf/open/floor/plating/foam/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) if(passed_mode == RCD_FLOORWALL) - to_chat(user, "I build a floor.") + to_chat(user, span_notice("I build a floor.")) ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) return TRUE return FALSE diff --git a/code/game/turfs/open/floor/plating/asteroid.dm b/code/game/turfs/open/floor/plating/asteroid.dm index 631913eb8..bba013a75 100644 --- a/code/game/turfs/open/floor/plating/asteroid.dm +++ b/code/game/turfs/open/floor/plating/asteroid.dm @@ -39,7 +39,7 @@ if(!dug) return TRUE if(user) - to_chat(user, "Looks like someone has dug here already!") + to_chat(user, span_warning("Looks like someone has dug here already!")) /turf/open/floor/plating/asteroid/try_replace_tile(obj/item/stack/tile/T, mob/user, params) return @@ -63,12 +63,12 @@ if(!isturf(user.loc)) return - to_chat(user, "I start digging...") + to_chat(user, span_notice("I start digging...")) if(W.use_tool(src, user, 40, volume=50)) if(!can_dig(user)) return TRUE - to_chat(user, "I dig a hole.") + to_chat(user, span_notice("I dig a hole.")) getDug() SSblackbox.record_feedback("tally", "pick_used_mining", 1, W.type) return TRUE @@ -331,7 +331,7 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me /turf/open/floor/plating/asteroid/snow/burn_tile() if(!burnt) - visible_message("[src] melts away!.") + visible_message(span_danger("[src] melts away!.")) slowdown = 0 burnt = TRUE icon_state = "snow_dug" diff --git a/code/game/turfs/open/floor/reinf_floor.dm b/code/game/turfs/open/floor/reinf_floor.dm index 93f5bb921..5cd619424 100644 --- a/code/game/turfs/open/floor/reinf_floor.dm +++ b/code/game/turfs/open/floor/reinf_floor.dm @@ -14,7 +14,7 @@ /turf/open/floor/engine/examine(mob/user) . += ..() - . += "The reinforcement rods are wrenched firmly in place." + . += span_notice("The reinforcement rods are wrenched firmly in place.") /turf/open/floor/engine/airless initial_gas_mix = AIRLESS_ATMOS @@ -38,7 +38,7 @@ /turf/open/floor/engine/wrench_act(mob/living/user, obj/item/I) ..() - to_chat(user, "I begin removing rods...") + to_chat(user, span_notice("I begin removing rods...")) if(I.use_tool(src, user, 30, volume=80)) if(!istype(src, /turf/open/floor/engine)) return TRUE diff --git a/code/game/turfs/open/floor/roguefloor.dm b/code/game/turfs/open/floor/roguefloor.dm index 3fd1bf7ec..ad842fd05 100644 --- a/code/game/turfs/open/floor/roguefloor.dm +++ b/code/game/turfs/open/floor/roguefloor.dm @@ -189,7 +189,7 @@ return var/obj/item/I = new /obj/item/natural/dirtclod(src) if(L.put_in_active_hand(I)) - L.visible_message("[L] picks up some dirt.") + L.visible_message(span_warning("[L] picks up some dirt.")) dirt_amt-- if(dirt_amt <= 0) src.ChangeTurf(/turf/open/floor/rogue/dirt/road, flags = CHANGETURF_INHERIT_AIR) diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm index f018490af..49cafc0fb 100644 --- a/code/game/turfs/open/lava.dm +++ b/code/game/turfs/open/lava.dm @@ -82,7 +82,7 @@ /turf/open/lava/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_FLOORWALL) - to_chat(user, "I build a floor.") + to_chat(user, span_notice("I build a floor.")) PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) return TRUE return FALSE diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm index de4dfe43b..78c402078 100644 --- a/code/game/turfs/open/openspace.dm +++ b/code/game/turfs/open/openspace.dm @@ -117,14 +117,14 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr return var/turf/target = get_step_multiz(src, DOWN) if(!target) - to_chat(user, "I can't climb there.") + to_chat(user, span_warning("I can't climb there.")) return if(!user.can_zTravel(target, DOWN, src)) - to_chat(user, "I can't climb here.") + to_chat(user, span_warning("I can't climb here.")) return if(user.m_intent != MOVE_INTENT_SNEAK) playsound(user, 'sound/foley/climb.ogg', 100, TRUE) - user.visible_message("[user] starts to climb down.", "I start to climb down.") + user.visible_message(span_warning("[user] starts to climb down."), span_warning("I start to climb down.")) if(do_after(L, 30, target = src)) if(user.m_intent != MOVE_INTENT_SNEAK) playsound(user, 'sound/foley/climb.ogg', 100, TRUE) @@ -139,10 +139,10 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr if(!user.Adjacent(src)) return if(!target) - to_chat(user, "I can't go there.") + to_chat(user, span_warning("I can't go there.")) return user.forceMove(target) - to_chat(user, "I glide down.") + to_chat(user, span_warning("I glide down.")) . = ..() /turf/open/transparent/openspace/attackby(obj/item/C, mob/user, params) @@ -154,22 +154,22 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) var/obj/structure/lattice/catwalk/W = locate(/obj/structure/lattice/catwalk, src) if(W) - to_chat(user, "There is already a catwalk here!") + to_chat(user, span_warning("There is already a catwalk here!")) return if(L) if(R.use(1)) - to_chat(user, "I construct a catwalk.") + to_chat(user, span_notice("I construct a catwalk.")) playsound(src, 'sound/blank.ogg', 50, TRUE) new/obj/structure/lattice/catwalk(src) else - to_chat(user, "I need two rods to build a catwalk!") + to_chat(user, span_warning("I need two rods to build a catwalk!")) return if(R.use(1)) - to_chat(user, "I construct a lattice.") + to_chat(user, span_notice("I construct a lattice.")) playsound(src, 'sound/blank.ogg', 50, TRUE) ReplaceWithLattice() else - to_chat(user, "I need one rod to build a lattice.") + to_chat(user, span_warning("I need one rod to build a lattice.")) return if(istype(C, /obj/item/stack/tile/plasteel)) if(!CanCoverUp()) @@ -180,12 +180,12 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr if(S.use(1)) qdel(L) playsound(src, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I build a floor.") + to_chat(user, span_notice("I build a floor.")) PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) else - to_chat(user, "I need one floor tile to build a floor!") + to_chat(user, span_warning("I need one floor tile to build a floor!")) else - to_chat(user, "The plating is going to need some support! Place metal rods first.") + to_chat(user, span_warning("The plating is going to need some support! Place metal rods first.")) /turf/open/transparent/openspace/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) if(!CanBuildHere()) @@ -203,7 +203,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr /turf/open/transparent/openspace/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_FLOORWALL) - to_chat(user, "I build a floor.") + to_chat(user, span_notice("I build a floor.")) PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) return TRUE return FALSE diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm index c46745911..1bbed69a6 100644 --- a/code/game/turfs/open/space/space.dm +++ b/code/game/turfs/open/space/space.dm @@ -100,22 +100,22 @@ var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) var/obj/structure/lattice/catwalk/W = locate(/obj/structure/lattice/catwalk, src) if(W) - to_chat(user, "There is already a catwalk here!") + to_chat(user, span_warning("There is already a catwalk here!")) return if(L) if(R.use(1)) - to_chat(user, "I construct a catwalk.") + to_chat(user, span_notice("I construct a catwalk.")) playsound(src, 'sound/blank.ogg', 50, TRUE) new/obj/structure/lattice/catwalk(src) else - to_chat(user, "I need two rods to build a catwalk!") + to_chat(user, span_warning("I need two rods to build a catwalk!")) return if(R.use(1)) - to_chat(user, "I construct a lattice.") + to_chat(user, span_notice("I construct a lattice.")) playsound(src, 'sound/blank.ogg', 50, TRUE) ReplaceWithLattice() else - to_chat(user, "I need one rod to build a lattice.") + to_chat(user, span_warning("I need one rod to build a lattice.")) return if(istype(C, /obj/item/stack/tile/plasteel)) var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) @@ -124,12 +124,12 @@ if(S.use(1)) qdel(L) playsound(src, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I build a floor.") + to_chat(user, span_notice("I build a floor.")) PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) else - to_chat(user, "I need one floor tile to build a floor!") + to_chat(user, span_warning("I need one floor tile to build a floor!")) else - to_chat(user, "The plating is going to need some support! Place metal rods first.") + to_chat(user, span_warning("The plating is going to need some support! Place metal rods first.")) /turf/open/space/Entered(atom/movable/A) ..() @@ -211,7 +211,7 @@ /turf/open/space/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_FLOORWALL) - to_chat(user, "I build a floor.") + to_chat(user, span_notice("I build a floor.")) PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) return TRUE return FALSE diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm index 2cb1b81c9..91a9d8b64 100644 --- a/code/game/turfs/open/water.dm +++ b/code/game/turfs/open/water.dm @@ -136,7 +136,7 @@ if(user.used_intent.type == /datum/intent/fill) if(C.reagents) if(C.reagents.holder_full()) - to_chat(user, "[C] is full.") + to_chat(user, span_warning("[C] is full.")) return if(do_after(user, 8, target = src)) user.changeNext_move(CLICK_CD_MELEE) @@ -144,7 +144,7 @@ var/list/L = list() L[water_reagent] = 100 C.reagents.add_reagent_list(L) - to_chat(user, "I fill [C] from [src].") + to_chat(user, span_notice("I fill [C] from [src].")) return . = ..() @@ -157,7 +157,7 @@ playsound(user, pick_n_take(wash), 100, FALSE) var/item2wash = user.get_active_held_item() if(!item2wash) - user.visible_message("[user] starts to wash in [src].") + user.visible_message(span_info("[user] starts to wash in [src].")) if(do_after(L, 30, target = src)) if(wash_in) wash_atom(user, CLEAN_STRONG) @@ -167,7 +167,7 @@ water_color = "#a4955b" update_icon()*/ else - user.visible_message("[user] starts to wash [item2wash] in [src].") + user.visible_message(span_info("[user] starts to wash [item2wash] in [src].")) if(do_after(L, 30, target = src)) if(wash_in) wash_atom(item2wash, CLEAN_STRONG) @@ -185,7 +185,7 @@ if(C.is_mouth_covered()) return playsound(user, pick('sound/foley/waterwash (1).ogg','sound/foley/waterwash (2).ogg'), 100, FALSE) - user.visible_message("[user] starts to drink from [src].") + user.visible_message(span_info("[user] starts to drink from [src].")) if(do_after(L, 25, target = src)) var/list/waterl = list() waterl[water_reagent] = 2 diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index e20e86a70..c5f290f2c 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -259,12 +259,12 @@ if(flags & FALL_STOP_INTERCEPTING) break if(prev_turf && !(flags & FALL_NO_MESSAGE)) - prev_turf.visible_message("[mov_name] falls through [prev_turf]!") + prev_turf.visible_message(span_danger("[mov_name] falls through [prev_turf]!")) if(flags & FALL_INTERCEPTED) return if(zFall(A, ++levels)) return FALSE - A.visible_message("[A] crashes into [src]!") + A.visible_message(span_danger("[A] crashes into [src]!")) A.onZImpact(src, levels) return TRUE @@ -481,7 +481,7 @@ if(.) return if(length(src_object.contents())) - to_chat(usr, "I start dumping out the contents...") + to_chat(usr, span_notice("I start dumping out the contents...")) if(!do_after(usr,20,target=src_object.parent)) return FALSE diff --git a/code/game/world.dm b/code/game/world.dm index bad422a62..0865970fe 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -219,7 +219,7 @@ GLOBAL_VAR(restart_counter) if(PRcounts[id] > PR_ANNOUNCEMENTS_PER_ROUND) return - var/final_composed = "PR: [announcement]" + var/final_composed = span_announce("PR: [announcement]") for(var/client/C in GLOB.clients) C.AnnouncePR(final_composed) @@ -249,9 +249,9 @@ GLOBAL_VAR(restart_counter) // if (usr) // log_admin("[key_name(usr)] Has requested an immediate world restart via client side debugging tools") // message_admins("[key_name_admin(usr)] Has requested an immediate world restart via client side debugging tools") -// to_chat(world, "Rebooting World immediately due to host request.") +// to_chat(world, span_boldannounce("Rebooting World immediately due to host request.")) // else -// to_chat(world, "CLICK TO RECONNECT") +// to_chat(world, span_boldannounce("CLICK TO RECONNECT")) var/round_end_sound = pick('sound/roundend/knave.ogg', 'sound/roundend/twohours.ogg', diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index 75b4bbbe5..5280e9860 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -41,8 +41,8 @@ GLOBAL_VAR(last_connection) if (admin) log_admin("The admin [key] has been allowed to bypass the whitelist") if (message) - message_admins("The admin [key] has been allowed to bypass the whitelist") - addclientmessage(ckey,"I have been allowed to bypass the whitelist") + message_admins(span_adminnotice("The admin [key] has been allowed to bypass the whitelist")) + addclientmessage(ckey,span_adminnotice("I have been allowed to bypass the whitelist")) else log_access("Failed Login: [key] - Not on whitelist") return list("reason"="whitelist", "desc" = "\nBecome whitelisted! discord.gg/bx9c7ha5Qk") @@ -62,8 +62,8 @@ GLOBAL_VAR(last_connection) if (admin) log_admin("The admin [key] has been allowed to bypass the blacklist") if (message) - message_admins("The admin [key] has been allowed to bypass the blacklist") - addclientmessage(ckey,"I have been allowed to bypass the blacklist") + message_admins(span_adminnotice("The admin [key] has been allowed to bypass the blacklist")) + addclientmessage(ckey,span_adminnotice("I have been allowed to bypass the blacklist")) else log_access("Failed Login: [key] - Blacklisted") return list("reason"="blacklist", "desc" = "\nSomething went wrong. Contact the Game Master.") @@ -114,7 +114,7 @@ GLOBAL_VAR(last_connection) log_admin(msg) if (message) message_admins(msg) - addclientmessage(ckey,"Admin [key] has been allowed to bypass a matching non-admin ban on [i["key"]] [i["ip"]]-[i["computerid"]].") + addclientmessage(ckey,span_adminnotice("Admin [key] has been allowed to bypass a matching non-admin ban on [i["key"]] [i["ip"]]-[i["computerid"]].")) continue var/expires = "This is a permanent ban." if(i["expiration_time"]) @@ -246,12 +246,12 @@ GLOBAL_VAR(last_connection) if (admin) log_admin("The admin [key] has been allowed to bypass a matching host/sticky ban on [bannedckey]") if (message) - message_admins("The admin [key] has been allowed to bypass a matching host/sticky ban on [bannedckey]") - addclientmessage(ckey,"I have been allowed to bypass a matching host/sticky ban on [bannedckey]") + message_admins(span_adminnotice("The admin [key] has been allowed to bypass a matching host/sticky ban on [bannedckey]")) + addclientmessage(ckey,span_adminnotice("I have been allowed to bypass a matching host/sticky ban on [bannedckey]")) return null if (C) //user is already connected!. - to_chat(C, "I are about to get disconnected for matching a sticky ban after you connected. If this turns out to be the ban evasion detection system going haywire, we will automatically detect this and revert the matches. if you feel that this is the case, please wait EXACTLY 6 seconds then reconnect using file -> reconnect to see if the match was automatically reversed.") + to_chat(C, span_redtext("I are about to get disconnected for matching a sticky ban after you connected. If this turns out to be the ban evasion detection system going haywire, we will automatically detect this and revert the matches. if you feel that this is the case, please wait EXACTLY 6 seconds then reconnect using file -> reconnect to see if the match was automatically reversed.")) var/desc = "" . = list("reason" = "Stickyban", "desc" = desc) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 94db00fbd..a30415116 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -24,7 +24,7 @@ log_admin("[key_name(usr)] checked the individual player panel for [key_name(M)][isobserver(usr)?"":" while in game"].") if(!M) - to_chat(usr, "I seem to be selecting a mob that doesn't exist anymore.") + to_chat(usr, span_warning("I seem to be selecting a mob that doesn't exist anymore.")) return var/body = "Options for [M.key]" @@ -201,7 +201,7 @@ return M.fully_heal(admin_revive = TRUE) - message_admins("Admin [key_name_admin(usr)] healed [key_name_admin(M)]!") + message_admins(span_danger("Admin [key_name_admin(usr)] healed [key_name_admin(M)]!")) log_admin("[key_name(usr)] healed [key_name(M)].") /datum/admins/proc/admin_revive(mob/living/M in GLOB.mob_list) @@ -213,7 +213,7 @@ return M.revive(full_heal = TRUE, admin_revive = TRUE) - message_admins("Admin [key_name_admin(usr)] revived [key_name_admin(M)]!") + message_admins(span_danger("Admin [key_name_admin(usr)] revived [key_name_admin(M)]!")) log_admin("[key_name(usr)] Revived [key_name(M)].") /datum/admins/proc/checkpq(mob/living/M in GLOB.mob_list) @@ -225,7 +225,7 @@ return if(!M.ckey) - to_chat(src, "There is no ckey attached to this mob.") + to_chat(src, span_warning("There is no ckey attached to this mob.")) return check_pq_menu(M.ckey) @@ -244,7 +244,7 @@ M.set_resting(FALSE, TRUE) else M.SetSleeping(999999) - message_admins("Admin [key_name_admin(usr)] toggled [key_name_admin(M)]'s sleeping state!") + message_admins(span_danger("Admin [key_name_admin(usr)] toggled [key_name_admin(M)]'s sleeping state!")) log_admin("[key_name(usr)] toggled [key_name(M)]'s sleeping state.") /datum/admins/proc/start_vote() @@ -253,7 +253,7 @@ set category = "Server" if(!check_rights(R_POLL)) - to_chat(usr, "You do not have the rights to start a vote.") + to_chat(usr, span_warning("You do not have the rights to start a vote.")) return var/type = input("What kind of vote?") as null|anything in list("End Round", "Custom") @@ -273,17 +273,17 @@ return if(!M.ckey) - to_chat(src, "There is no ckey attached to this mob.") + to_chat(src, span_warning("There is no ckey attached to this mob.")) return var/ckey = lowertext(M.ckey) var/admin = lowertext(usr.key) if(ckey == admin) - to_chat(src, "That's you!") + to_chat(src, span_boldwarning("That's you!")) return if(!fexists("data/player_saves/[copytext(ckey,1,2)]/[ckey]/preferences.sav")) - to_chat(src, "User does not exist.") + to_chat(src, span_boldwarning("User does not exist.")) return var/amt2change = input("How much to modify the PQ by? (20 to -20, or 0 to just add a note)") as null|num if(!check_rights(R_ADMIN,0)) @@ -631,7 +631,7 @@ else message_admins("[key_name(usr)] set the admin notice.") log_admin("[key_name(usr)] set the admin notice:\n[new_admin_notice]") - to_chat(world, "Admin Notice:\n \t [new_admin_notice]") + to_chat(world, span_adminnotice("Admin Notice:\n \t [new_admin_notice]")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Set Admin Notice") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! GLOB.admin_notice = new_admin_notice return @@ -703,7 +703,7 @@ else to_chat(world, "New players may now enter the game.") log_admin("[key_name(usr)] toggled new player game entering.") - message_admins("[key_name_admin(usr)] toggled new player game entering.") + message_admins(span_adminnotice("[key_name_admin(usr)] toggled new player game entering.")) world.update_status() SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Entering", "[GLOB.enter_allowed ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -731,7 +731,7 @@ to_chat(world, "I may now respawn.") else to_chat(world, "I may no longer respawn :(") - message_admins("[key_name_admin(usr)] toggled respawn to [!new_nores ? "On" : "Off"].") + message_admins(span_adminnotice("[key_name_admin(usr)] toggled respawn to [!new_nores ? "On" : "Off"].")) log_admin("[key_name(usr)] toggled respawn to [!new_nores ? "On" : "Off"].") world.update_status() SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Respawn", "[!new_nores ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -881,7 +881,7 @@ else to_chat(world, "Guests may now enter the game.") log_admin("[key_name(usr)] toggled guests game entering [!new_guest_ban ? "" : "dis"]allowed.") - message_admins("[key_name_admin(usr)] toggled guests game entering [!new_guest_ban ? "" : "dis"]allowed.") + message_admins(span_adminnotice("[key_name_admin(usr)] toggled guests game entering [!new_guest_ban ? "" : "dis"]allowed.")) SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Guests", "[!new_guest_ban ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/output_ai_laws() @@ -1053,7 +1053,7 @@ tomob.ghostize(0) - message_admins("[key_name_admin(usr)] has put [frommob.key] in control of [tomob.name].") + message_admins(span_adminnotice("[key_name_admin(usr)] has put [frommob.key] in control of [tomob.name].")) log_admin("[key_name(usr)] stuffed [frommob.key] into [tomob.name].") SSblackbox.record_feedback("tally", "admin_verb", 1, "Ghost Drag Control") diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 66d9ab6f1..25eb8c8a5 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -37,6 +37,6 @@ var/F = file("[GLOB.log_directory]/[selected].html") if(!fexists(F)) - to_chat(src, "No [selected] logfile was found.") + to_chat(src, span_danger("No [selected] logfile was found.")) return src << browse(F,"window=investigate[selected];size=800x300") diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 75e88826d..d2f10a2e8 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -115,7 +115,7 @@ GLOBAL_PROTECT(protected_ranks) set waitfor = FALSE if(IsAdminAdvancedProcCall()) - to_chat(usr, "Admin rank DB Sync blocked: Advanced ProcCall detected.") + to_chat(usr, span_adminprefix("Admin rank DB Sync blocked: Advanced ProcCall detected.")) return var/list/sql_ranks = list() @@ -126,7 +126,7 @@ GLOBAL_PROTECT(protected_ranks) //load our rank - > rights associations /proc/load_admin_ranks(dbfail, no_update) if(IsAdminAdvancedProcCall()) - to_chat(usr, "Admin Reload blocked: Advanced ProcCall detected.") + to_chat(usr, span_adminprefix("Admin Reload blocked: Advanced ProcCall detected.")) return GLOB.admin_ranks.Cut() GLOB.protected_ranks.Cut() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 5dfc2ada2..f802428d3 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -334,7 +334,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) verbs.Remove(/client/proc/hide_most_verbs, GLOB.admin_verbs_hideable) verbs += /client/proc/show_verbs - to_chat(src, "Most of your adminverbs have been hidden.") + to_chat(src, span_interface("Most of your adminverbs have been hidden.")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Hide Most Adminverbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return @@ -345,7 +345,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) remove_admin_verbs() verbs += /client/proc/show_verbs - to_chat(src, "Almost all of your adminverbs have been hidden.") + to_chat(src, span_interface("Almost all of your adminverbs have been hidden.")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Hide All Adminverbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return @@ -356,7 +356,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) verbs -= /client/proc/show_verbs add_admin_verbs() - to_chat(src, "All of your adminverbs are now visible.") + to_chat(src, span_interface("All of your adminverbs are now visible.")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Adminverbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -423,10 +423,10 @@ GLOBAL_PROTECT(admin_verbs_hideable) if(holder && mob) if(mob.invisibility == INVISIBILITY_OBSERVER) mob.invisibility = initial(mob.invisibility) - to_chat(mob, "Invisimin off. Invisibility reset.") + to_chat(mob, span_boldannounce("Invisimin off. Invisibility reset.")) else mob.invisibility = INVISIBILITY_OBSERVER - to_chat(mob, "Invisimin on. You are now as invisible as a ghost.") + to_chat(mob, span_adminnotice("Invisimin on. You are now as invisible as a ghost.")) /client/proc/toggle_autovote() set name = "Toggle Magnum Mode" @@ -648,14 +648,14 @@ GLOBAL_PROTECT(admin_verbs_hideable) SSblackbox.record_feedback("tally", "admin_verb", 1, "Give Spell") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] gave [key_name(T)] the spell [S].") - message_admins("[key_name_admin(usr)] gave [key_name_admin(T)] the spell [S].") + message_admins(span_adminnotice("[key_name_admin(usr)] gave [key_name_admin(T)] the spell [S].")) S = spell_list[S] if(T.mind) T.mind.AddSpell(new S) else T.AddSpell(new S) - message_admins("Spells given to mindless mobs will not be transferred in mindswap or cloning!") + message_admins(span_danger("Spells given to mindless mobs will not be transferred in mindswap or cloning!")) /client/proc/remove_spell(mob/T in GLOB.mob_list) set category = "Fun" @@ -667,7 +667,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) if(S) T.mind.RemoveSpell(S) log_admin("[key_name(usr)] removed the spell [S] from [key_name(T)].") - message_admins("[key_name_admin(usr)] removed the spell [S] from [key_name_admin(T)].") + message_admins(span_adminnotice("[key_name_admin(usr)] removed the spell [S] from [key_name_admin(T)].")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Remove Spell") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/give_disease(mob/living/T in GLOB.mob_living_list) @@ -675,7 +675,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) set name = "Give Disease" set desc = "" if(!istype(T)) - to_chat(src, "I can only give a disease to a mob of type /mob/living.") + to_chat(src, span_notice("I can only give a disease to a mob of type /mob/living.")) return var/datum/disease/D = input("Choose the disease to give to that guy", "ACHOO") as null|anything in sortList(SSdisease.diseases, GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!D) @@ -683,7 +683,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) T.ForceContractDisease(new D, FALSE, TRUE) SSblackbox.record_feedback("tally", "admin_verb", 1, "Give Disease") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].") - message_admins("[key_name_admin(usr)] gave [key_name_admin(T)] the disease [D].") + message_admins(span_adminnotice("[key_name_admin(usr)] gave [key_name_admin(T)] the disease [D].")) /client/proc/object_say(obj/O in world) set category = "Special Verbs" @@ -694,7 +694,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) return O.say(message) log_admin("[key_name(usr)] made [O] at [AREACOORD(O)] say \"[message]\"") - message_admins("[key_name_admin(usr)] made [O] at [AREACOORD(O)]. say \"[message]\"") + message_admins(span_adminnotice("[key_name_admin(usr)] made [O] at [AREACOORD(O)]. say \"[message]\"")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Object Say") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/togglebuildmodeself() set name = "Toggle Build Mode Self" @@ -725,7 +725,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) holder.deactivate() - to_chat(src, "I are now a normal player.") + to_chat(src, span_interface("I are now a normal player.")) log_admin("[src] deadmined themself.") message_admins("[src] deadmined themself.") SSblackbox.record_feedback("tally", "admin_verb", 1, "Deadmin") @@ -750,7 +750,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) if (!holder) return //This can happen if an admin attempts to vv themself into somebody elses's deadmin datum by getting ref via brute force - to_chat(src, "I am now an admin.") + to_chat(src, span_interface("I am now an admin.")) message_admins("[src] re-adminned themselves.") log_admin("[src] re-adminned themselves.") SSblackbox.record_feedback("tally", "admin_verb", 1, "Readmin") @@ -809,10 +809,10 @@ GLOBAL_PROTECT(admin_verbs_hideable) return if(!SSticker.end_party) SSticker.end_party=TRUE - to_chat(src, "Ending enabled.") + to_chat(src, span_interface("Ending enabled.")) else SSticker.end_party=FALSE - to_chat(src, "Ending DISABLED.") + to_chat(src, span_interface("Ending DISABLED.")) /client/proc/delete_player_book() set name = "Database Delete Player Book" @@ -825,7 +825,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) SSlibrarian.del_player_book(player_book) message_admins("[src] has deleted the player book: [player_book]") else - to_chat(src, "Either the book file doesn't exist or you have failed to type it in properly (you can look up the file name by the verb 'database book file names'") + to_chat(src, span_notice("Either the book file doesn't exist or you have failed to type it in properly (you can look up the file name by the verb 'database book file names'")) /client/proc/pull_book_file_names() set name = "Database Book File Names" @@ -853,4 +853,4 @@ GLOBAL_PROTECT(admin_verbs_hideable) if(SSlibrarian.amend_player_book(book_title, amend_type, amend_text)) message_admins("[src] has amended [book_title]'s [amend_type] to [amend_text]") else - to_chat(src, "Either the book file doesn't exist or you have failed to type something in properly (you can look up the file name by the verb 'database book file names'") + to_chat(src, span_notice("Either the book file doesn't exist or you have failed to type something in properly (you can look up the file name by the verb 'database book file names'")) diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm index 19e53b09b..4b8e0a88e 100644 --- a/code/modules/admin/antag_panel.dm +++ b/code/modules/admin/antag_panel.dm @@ -79,14 +79,14 @@ GLOBAL_VAR(antag_prototypes) /datum/mind/proc/get_special_statuses() var/list/result = list() if(!current) - result += "No body!" + result += span_bad("No body!") if(current && HAS_TRAIT(current, TRAIT_MINDSHIELD)) - result += "Mindshielded" + result += span_good("Mindshielded") //Move these to mob if(iscyborg(current)) var/mob/living/silicon/robot/robot = current if (robot.emagged) - result += "Emagged" + result += span_bad("Emagged") return result.Join(" | ") /datum/mind/proc/traitor_panel() @@ -146,14 +146,14 @@ GLOBAL_VAR(antag_prototypes) if(!current_antag) //Show antagging options if(possible_admin_antags.len) - antag_header_parts += "None" + antag_header_parts += span_highlight("None") antag_header_parts += possible_admin_antags else //If there's no antags to show in this category skip the section completely continue else //Show removal and current one priority_sections |= antag_category - antag_header_parts += "[current_antag.name]" + antag_header_parts += span_bad("[current_antag.name]") antag_header_parts += "Remove" diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm index 2142a5e57..8f0691440 100644 --- a/code/modules/admin/callproc/callproc.dm +++ b/code/modules/admin/callproc/callproc.dm @@ -20,7 +20,7 @@ return target = value["value"] if(!istype(target)) - to_chat(usr, "Invalid target.") + to_chat(usr, span_danger("Invalid target.")) return if("No") target = null @@ -40,12 +40,12 @@ if(targetselected) if(!hascall(target, procname)) - to_chat(usr, "Error: callproc(): type [target.type] has no [proctype] named [procpath].") + to_chat(usr, span_warning("Error: callproc(): type [target.type] has no [proctype] named [procpath].")) return else procpath = "/[proctype]/[procname]" if(!text2path(procpath)) - to_chat(usr, "Error: callproc(): [procpath] does not exist.") + to_chat(usr, span_warning("Error: callproc(): [procpath] does not exist.")) return var/list/lst = get_callproc_args() @@ -100,10 +100,10 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) CRASH("WrapAdminProcCall with no ckey: [target] [procname] [english_list(arguments)]") if(current_caller && current_caller != ckey) if(!GLOB.AdminProcCallSpamPrevention[ckey]) - to_chat(usr, "Another set of admin called procs are still running, your proc will be run after theirs finish.") + to_chat(usr, span_adminnotice("Another set of admin called procs are still running, your proc will be run after theirs finish.")) GLOB.AdminProcCallSpamPrevention[ckey] = TRUE UNTIL(!GLOB.AdminProcCaller) - to_chat(usr, "Running your proc") + to_chat(usr, span_adminnotice("Running your proc")) GLOB.AdminProcCallSpamPrevention -= ckey else UNTIL(!GLOB.AdminProcCaller) @@ -151,7 +151,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) return if(!A || !IsValidSrc(A)) - to_chat(usr, "Error: callproc_datum(): owner of proc no longer exists.") + to_chat(usr, span_warning("Error: callproc_datum(): owner of proc no longer exists.")) return log_admin("[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") var/msg = "[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]." diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm index f4b9fa139..a0e4b1ad4 100644 --- a/code/modules/admin/fun_balloon.dm +++ b/code/modules/admin/fun_balloon.dm @@ -27,7 +27,7 @@ return /obj/effect/fun_balloon/proc/pop() - visible_message("[src] pops!") + visible_message(span_notice("[src] pops!")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE, -1) qdel(src) @@ -58,7 +58,7 @@ var/mob/dead/observer/C = pick_n_take(candidates) var/mob/living/body = pick_n_take(bodies) - to_chat(body, "My mob has been taken over by a ghost!") + to_chat(body, span_warning("My mob has been taken over by a ghost!")) message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(body)])") body.ghostize(0) body.key = C.key @@ -83,7 +83,7 @@ var/turf/T = find_safe_turf() new /obj/effect/temp_visual/gravpush(get_turf(M)) M.forceMove(T) - to_chat(M, "Pop!") + to_chat(M, span_notice("Pop!")) /obj/effect/station_crash name = "station crash" @@ -121,16 +121,16 @@ var/mob/living/L = AM if(L.pulling && istype(L.pulling, /obj/item/bodypart/head)) - to_chat(L, "My offering is accepted. You may pass.") + to_chat(L, span_notice("My offering is accepted. You may pass.")) qdel(L.pulling) var/turf/LA = get_turf(pick(warp_points)) L.forceMove(LA) L.hallucination = 0 - to_chat(L, "The battle is won. Your bloodlust subsides.") + to_chat(L, span_reallybigredtext("The battle is won. Your bloodlust subsides.")) for(var/obj/item/twohanded/required/chainsaw/doomslayer/chainsaw in L) qdel(chainsaw) else - to_chat(L, "I are not yet worthy of passing. Drag a severed head to the barrier to be allowed entry to the hall of champions.") + to_chat(L, span_warning("I are not yet worthy of passing. Drag a severed head to the barrier to be allowed entry to the hall of champions.")) /obj/effect/landmark/shuttle_arena_safe name = "hall of champions" @@ -157,7 +157,7 @@ var/obj/effect/landmark/LA = pick(warp_points) var/mob/living/M = AM M.forceMove(get_turf(LA)) - to_chat(M, "You're trapped in a deadly arena! To escape, you'll need to drag a severed head to the escape portals.") + to_chat(M, span_reallybigredtext("You're trapped in a deadly arena! To escape, you'll need to drag a severed head to the escape portals.")) INVOKE_ASYNC(src, PROC_REF(do_bloodbath), M) /obj/effect/forcefield/arena_shuttle_entrance/proc/do_bloodbath(mob/living/L) diff --git a/code/modules/admin/outfits.dm b/code/modules/admin/outfits.dm index e62ca6d16..b033eb390 100644 --- a/code/modules/admin/outfits.dm +++ b/code/modules/admin/outfits.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits /datum/admins/proc/delete_outfit(mob/admin,datum/outfit/O) GLOB.custom_outfits -= O qdel(O) - to_chat(admin,"Outfit deleted.") + to_chat(admin,span_notice("Outfit deleted.")) outfit_manager(admin) /datum/admins/proc/load_outfit(mob/admin) @@ -38,15 +38,15 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits var/filedata = file2text(outfit_file) var/json = json_decode(filedata) if(!json) - to_chat(admin,"JSON decode error.") + to_chat(admin,span_warning("JSON decode error.")) return var/otype = text2path(json["outfit_type"]) if(!ispath(otype,/datum/outfit)) - to_chat(admin,"Malformed/Outdated file.") + to_chat(admin,span_warning("Malformed/Outdated file.")) return var/datum/outfit/O = new otype if(!O.load_from(json)) - to_chat(admin,"Malformed/Outdated file.") + to_chat(admin,span_warning("Malformed/Outdated file.")) return GLOB.custom_outfits += O outfit_manager(admin) diff --git a/code/modules/admin/patreon.dm b/code/modules/admin/patreon.dm index 72e2b7942..f5a1a739c 100644 --- a/code/modules/admin/patreon.dm +++ b/code/modules/admin/patreon.dm @@ -237,15 +237,15 @@ GLOBAL_LIST_EMPTY(anonymize) if(get_playerquality(client.ckey) <= -5) client.prefs.anonymize = FALSE client.prefs.save_preferences() - to_chat(src, "Your PQ is too low!") + to_chat(src, span_warning("Your PQ is too low!")) return // if(!check_whitelist(client.ckey)) -// to_chat(src, "Whitelisted players only.") +// to_chat(src, span_warning("Whitelisted players only.")) // return if(client.prefs.anonymize == TRUE) if(alert(src, "Disable Anonymize? (Not Recommended)", "ROGUETOWN", "YES", "NO") == "YES") if(GLOB.respawncounts[client.ckey]) - to_chat(src, "You have already spawned.") + to_chat(src, span_warning("You have already spawned.")) return client.prefs.anonymize = FALSE client.prefs.save_preferences() @@ -256,7 +256,7 @@ GLOBAL_LIST_EMPTY(anonymize) Dungeon Masters while playing here, useful for dealing with negative OOC bias or \ maintaining privacy from other BYOND users.", "ROGUETOWN", "YES", "NO") == "YES") if(GLOB.respawncounts[client.ckey]) - to_chat(src, "You have already spawned.") + to_chat(src, span_warning("You have already spawned.")) return client.prefs.anonymize = TRUE client.prefs.save_preferences() @@ -299,16 +299,16 @@ GLOBAL_LIST_EMPTY(temporary_donators) if(!email) return if(!patreon_lookup(name) || !patreon_lookup(email) || !findtext(email, "@")) - to_chat(src, "We couldn't find that name/email combo. Donator status is updated weekly before every playtest. If you have waited a week, seek help in our DISCORD SERVER (https://discord.gg/9uYTPsRMKa)") + to_chat(src, span_warning("We couldn't find that name/email combo. Donator status is updated weekly before every playtest. If you have waited a week, seek help in our DISCORD SERVER (https://discord.gg/9uYTPsRMKa)")) return // var/saniemail = sanitize_simple(email,list("@"="AT","."="DOT")) var/fug = patemail2ckey(email) if(fug && (fug != ckey)) - to_chat(src, "That Patreon is already registered to a different player. Donator status is updated weekly before every playtest. If you have waited a week, seek help in our DISCORD SERVER (https://discord.gg/9uYTPsRMKa)") + to_chat(src, span_warning("That Patreon is already registered to a different player. Donator status is updated weekly before every playtest. If you have waited a week, seek help in our DISCORD SERVER (https://discord.gg/9uYTPsRMKa)")) return add_patreon(ckey,email) client.patreonlevel = -1 - to_chat(src, "Patreon registered.") + to_chat(src, span_boldnotice("Patreon registered.")) var/shown_patreon_level = client.patreonlevel() if(!shown_patreon_level) shown_patreon_level = "NONE" @@ -323,7 +323,7 @@ GLOBAL_LIST_EMPTY(temporary_donators) shown_patreon_level = "Merchant" if(5) shown_patreon_level = "Lord" - to_chat(src, "Your Donator Level: [shown_patreon_level]") + to_chat(src, span_info("Your Donator Level: [shown_patreon_level]")) */ /proc/add_patreon(ckey,email) if(!email || !ckey) diff --git a/code/modules/admin/permissionedit.dm b/code/modules/admin/permissionedit.dm index a1940a76f..f3ac04831 100644 --- a/code/modules/admin/permissionedit.dm +++ b/code/modules/admin/permissionedit.dm @@ -135,7 +135,7 @@ log_admin("[key_name(usr)] attempted to edit admin permissions without sufficient rights.") return if(IsAdminAdvancedProcCall()) - to_chat(usr, "Admin Edit blocked: Advanced ProcCall detected.") + to_chat(usr, span_adminprefix("Admin Edit blocked: Advanced ProcCall detected.")) return var/datum/asset/permissions_assets = get_asset_datum(/datum/asset/simple/permissions) permissions_assets.send(src) @@ -150,19 +150,19 @@ skip = TRUE if(!CONFIG_GET(flag/admin_legacy_system) && CONFIG_GET(flag/protect_legacy_admins) && task == "rank") if(admin_ckey in GLOB.protected_admins) - to_chat(usr, "Editing the rank of this admin is blocked by server configuration.") + to_chat(usr, span_adminprefix("Editing the rank of this admin is blocked by server configuration.")) return if(!CONFIG_GET(flag/admin_legacy_system) && CONFIG_GET(flag/protect_legacy_ranks) && task == "permissions") if(D.rank in GLOB.protected_ranks) - to_chat(usr, "Editing the flags of this rank is blocked by server configuration.") + to_chat(usr, span_adminprefix("Editing the flags of this rank is blocked by server configuration.")) return if(CONFIG_GET(flag/load_legacy_ranks_only) && (task == "add" || task == "rank" || task == "permissions")) - to_chat(usr, "Database rank loading is disabled, only temporary changes can be made to a rank's permissions and permanently creating a new rank is blocked.") + to_chat(usr, span_adminprefix("Database rank loading is disabled, only temporary changes can be made to a rank's permissions and permanently creating a new rank is blocked.")) legacy_only = TRUE if(check_rights(R_DBRANKS, FALSE)) if(!skip) if(!SSdbcore.Connect()) - to_chat(usr, "Unable to connect to database, changes are temporary only.") + to_chat(usr, span_danger("Unable to connect to database, changes are temporary only.")) use_db = FALSE else use_db = alert("Permanent changes are saved to the database for future rounds, temporary changes will affect only the current round", "Permanent or Temporary?", "Permanent", "Temporary", "Cancel") @@ -213,7 +213,7 @@ if(!.) return FALSE if(!admin_ckey && (. in GLOB.admin_datums+GLOB.deadmins)) - to_chat(usr, "[admin_key] is already an admin.") + to_chat(usr, span_danger("[admin_key] is already an admin.")) return FALSE if(use_db) //if an admin exists without a datum they won't be caught by the above @@ -226,7 +226,7 @@ return FALSE if(query_admin_in_db.NextRow()) qdel(query_admin_in_db) - to_chat(usr, "[admin_key] already listed in admin database. Check the Management tab if they don't appear in the list of admins.") + to_chat(usr, span_danger("[admin_key] already listed in admin database. Check the Management tab if they don't appear in the list of admins.")) return FALSE qdel(query_admin_in_db) var/datum/DBQuery/query_add_admin = SSdbcore.NewQuery( @@ -290,7 +290,7 @@ D.deactivate() //after logs so the deadmined admin can see the message. /datum/admins/proc/auto_deadmin() - to_chat(owner, "I are now a normal player.") + to_chat(owner, span_interface("I are now a normal player.")) var/old_owner = owner deactivate() message_admins("[old_owner] deadmined via auto-deadmin config.") @@ -472,13 +472,13 @@ return for(var/datum/admin_rank/R in GLOB.admin_ranks) if(R.name == admin_rank && (!(R.rights & usr.client.holder.rank.can_edit_rights) == R.rights)) - to_chat(usr, "You don't have edit rights to all the rights this rank has, rank deletion not permitted.") + to_chat(usr, span_adminprefix("You don't have edit rights to all the rights this rank has, rank deletion not permitted.")) return if(!CONFIG_GET(flag/admin_legacy_system) && CONFIG_GET(flag/protect_legacy_ranks) && (admin_rank in GLOB.protected_ranks)) - to_chat(usr, "Deletion of protected ranks is not permitted, it must be removed from admin_ranks.txt.") + to_chat(usr, span_adminprefix("Deletion of protected ranks is not permitted, it must be removed from admin_ranks.txt.")) return if(CONFIG_GET(flag/load_legacy_ranks_only)) - to_chat(usr, "Rank deletion not permitted while database rank loading is disabled.") + to_chat(usr, span_adminprefix("Rank deletion not permitted while database rank loading is disabled.")) return var/datum/DBQuery/query_admins_with_rank = SSdbcore.NewQuery( "SELECT 1 FROM [format_table_name("admin")] WHERE `rank` = :admin_rank", @@ -489,7 +489,7 @@ return if(query_admins_with_rank.NextRow()) qdel(query_admins_with_rank) - to_chat(usr, "Error: Rank deletion attempted while rank still used; Tell a coder, this shouldn't happen.") + to_chat(usr, span_danger("Error: Rank deletion attempted while rank still used; Tell a coder, this shouldn't happen.")) return qdel(query_admins_with_rank) if(alert("Are you sure you want to remove [admin_rank]?","Confirm Removal","Do it","Cancel") == "Do it") @@ -526,4 +526,4 @@ qdel(query_sync_lastadminrank) return qdel(query_sync_lastadminrank) - to_chat(usr, "Sync of [admin_key] successful.") + to_chat(usr, span_admin("Sync of [admin_key] successful.")) diff --git a/code/modules/admin/playerquality.dm b/code/modules/admin/playerquality.dm index d17fbf052..82730a276 100644 --- a/code/modules/admin/playerquality.dm +++ b/code/modules/admin/playerquality.dm @@ -98,7 +98,7 @@ for(var/mob/living/H in GLOB.player_list) selections[H.real_name] = H.ckey if(!selections.len) - to_chat(src, "No characters found.") + to_chat(src, span_boldwarning("No characters found.")) return selection = input("Which Character?") as null|anything in sortList(selections) if(!selection) @@ -124,7 +124,7 @@ /proc/check_pq_menu(ckey) if(!fexists("data/player_saves/[copytext(ckey,1,2)]/[ckey]/preferences.sav")) - to_chat(src, "User does not exist.") + to_chat(src, span_boldwarning("User does not exist.")) return var/popup_window_data = "
[ckey]
" popup_window_data += "
PQ: [get_playerquality(ckey, TRUE, TRUE)] ([get_playerquality(ckey, FALSE, TRUE)])
" @@ -137,7 +137,7 @@ popup_window_data += "
Rounds Survived: [get_roundsplayed(ckey)]
" var/list/listy = world.file2list("data/player_saves/[copytext(ckey,1,2)]/[ckey]/playerquality.txt") if(!listy.len) - popup_window_data += "No data on record. Create some." + popup_window_data += span_info("No data on record. Create some.") else for(var/i = listy.len to 1 step -1) var/ya = listy[i] @@ -159,7 +159,7 @@ for(var/mob/living/H in GLOB.player_list) selections[H.real_name] = H.ckey if(!selections.len) - to_chat(src, "No characters found.") + to_chat(src, span_boldwarning("No characters found.")) return selection = input("Which Character?") as null|anything in sortList(selections) if(!selection) @@ -182,10 +182,10 @@ return theykey = selection if(theykey == ckey) - to_chat(src, "That's you!") + to_chat(src, span_boldwarning("That's you!")) return if(!fexists("data/player_saves/[copytext(theykey,1,2)]/[theykey]/preferences.sav")) - to_chat(src, "User does not exist.") + to_chat(src, span_boldwarning("User does not exist.")) return var/amt2change = input("How much to modify the PQ by? (20 to -20, or 0 to just add a note)") as null|num if(!check_rights(R_ADMIN,0)) diff --git a/code/modules/admin/poll_management.dm b/code/modules/admin/poll_management.dm index 2551f430f..2674c4288 100644 --- a/code/modules/admin/poll_management.dm +++ b/code/modules/admin/poll_management.dm @@ -245,7 +245,7 @@ if(!check_rights(R_POLL)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/list/error_state = list() var/new_poll = FALSE @@ -309,9 +309,9 @@ error_state += "This poll type requires at least one option." if(error_state.len) if(poll.edit_ready) - to_chat(usr, "Not all edits were applied because the following errors were present:\n[error_state.Join("\n")]") + to_chat(usr, span_danger("Not all edits were applied because the following errors were present:\n[error_state.Join("\n")]")) else - to_chat(usr, "Poll not [new_poll ? "initialized" : "submitted"] because the following errors were present:\n[error_state.Join("\n")]") + to_chat(usr, span_danger("Poll not [new_poll ? "initialized" : "submitted"] because the following errors were present:\n[error_state.Join("\n")]")) if(new_poll) qdel(poll) return @@ -354,7 +354,7 @@ if(!check_rights(R_POLL)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/datum/DBQuery/query_delete_poll = SSdbcore.NewQuery( "CALL set_poll_deleted(:poll_id)", @@ -383,7 +383,7 @@ if(!check_rights(R_POLL)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/new_poll = !poll_id if(poll_type != POLLTYPE_MULTI) @@ -446,7 +446,7 @@ */ /datum/poll_question/proc/save_all_options() if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return for(var/o in options) var/datum/poll_option/option = o @@ -460,7 +460,7 @@ if(!check_rights(R_POLL)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/table = "poll_vote" if(poll_type == POLLTYPE_TEXT) @@ -474,7 +474,7 @@ return qdel(query_clear_poll_votes) poll_votes = 0 - to_chat(usr, "Poll [poll_type == POLLTYPE_TEXT ? "responses" : "votes"] cleared.") + to_chat(usr, span_danger("Poll [poll_type == POLLTYPE_TEXT ? "responses" : "votes"] cleared.")) /** * Show the options for creating a poll option or editing its parameters. @@ -543,7 +543,7 @@ if(!check_rights(R_POLL)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/list/error_state = list() var/new_option = FALSE @@ -601,10 +601,10 @@ option.desc_max = null if(error_state.len) if(new_option) - to_chat(usr, "Option not added because the following errors were present:\n[error_state.Join("\n")]") + to_chat(usr, span_danger("Option not added because the following errors were present:\n[error_state.Join("\n")]")) qdel(option) else - to_chat(usr, "Not all edits were applied because the following errors were present:\n[error_state.Join("\n")]") + to_chat(usr, span_danger("Not all edits were applied because the following errors were present:\n[error_state.Join("\n")]")) return if(new_option) poll.options += option @@ -641,7 +641,7 @@ if(!check_rights(R_POLL)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/list/values = list("text" = text, "default_percentage_calc" = default_percentage_calc, "pollid" = parent_poll.poll_id, "id" = option_id) @@ -677,7 +677,7 @@ . = parent_poll if(option_id) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/datum/DBQuery/query_delete_poll_option = SSdbcore.NewQuery( "UPDATE [format_table_name("poll_option")] AS o INNER JOIN [format_table_name("poll_vote")] AS v ON o.id = v.optionid SET o.deleted = 1, v.deleted = 1 WHERE o.id = :option_id", @@ -695,7 +695,7 @@ */ /proc/load_poll_data() if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/datum/DBQuery/query_load_polls = SSdbcore.NewQuery("SELECT id, polltype, starttime, endtime, question, subtitle, adminonly, multiplechoiceoptions, dontshow, allow_revoting, IF(polltype='TEXT',(SELECT COUNT(ckey) FROM [format_table_name("poll_textreply")] AS t WHERE t.pollid = q.id AND deleted = 0), (SELECT COUNT(DISTINCT ckey) FROM [format_table_name("poll_vote")] AS v WHERE v.pollid = q.id AND deleted = 0)), IFNULL((SELECT byond_key FROM [format_table_name("player")] AS p WHERE p.ckey = q.createdby_ckey), createdby_ckey), IF(starttime > NOW(), 1, 0) FROM [format_table_name("poll_question")] AS q WHERE NOW() < endtime AND deleted = 0") if(!query_load_polls.Execute()) diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 84db1d2b3..def361bb1 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -118,7 +118,7 @@ return log_admin("[key_name(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].", 1) - message_admins("[key_name_admin(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].") + message_admins(span_adminnotice("[key_name_admin(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].")) var/area/thunderdome = GLOB.areas_by_type[/area/tdome/arena] if(delete_mobs == "Yes") @@ -147,7 +147,7 @@ return set_station_name(new_name) log_admin("[key_name(usr)] renamed the station to \"[new_name]\".") - message_admins("[key_name_admin(usr)] renamed the station to: [new_name].") + message_admins(span_adminnotice("[key_name_admin(usr)] renamed the station to: [new_name].")) priority_announce("[command_name()] has renamed the station to \"[new_name]\".") if("night_shift_set") if(!check_rights(R_ADMIN)) @@ -173,7 +173,7 @@ var/new_name = new_station_name() set_station_name(new_name) log_admin("[key_name(usr)] reset the station name.") - message_admins("[key_name_admin(usr)] reset the station name.") + message_admins(span_adminnotice("[key_name_admin(usr)] reset the station name.")) priority_announce("[command_name()] has renamed the station to \"[new_name]\".") if("list_bombers") @@ -235,7 +235,7 @@ message_admins("[key_name_admin(usr)] [new_perma ? "stopped" : "started"] the arrivals shuttle") log_admin("[key_name(usr)] [new_perma ? "stopped" : "started"] the arrivals shuttle") else - to_chat(usr, "There is no arrivals shuttle.") + to_chat(usr, span_admin("There is no arrivals shuttle.")) if("showailaws") if(!check_rights(R_ADMIN)) return @@ -313,7 +313,7 @@ return SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Power All APCs")) log_admin("[key_name(usr)] made all areas powered", 1) - message_admins("[key_name_admin(usr)] made all areas powered") + message_admins(span_adminnotice("[key_name_admin(usr)] made all areas powered")) power_restore() if("unpower") @@ -321,7 +321,7 @@ return SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Depower All APCs")) log_admin("[key_name(usr)] made all areas unpowered", 1) - message_admins("[key_name_admin(usr)] made all areas unpowered") + message_admins(span_adminnotice("[key_name_admin(usr)] made all areas unpowered")) power_failure() if("quickpower") @@ -329,7 +329,7 @@ return SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Power All SMESs")) log_admin("[key_name(usr)] made all SMESs powered", 1) - message_admins("[key_name_admin(usr)] made all SMESs powered") + message_admins(span_adminnotice("[key_name_admin(usr)] made all SMESs powered")) power_restore_quick() if("traitor_all") @@ -356,7 +356,7 @@ new_objective.explanation_text = objective T.add_objective(new_objective) H.mind.add_antag_datum(T) - message_admins("[key_name_admin(usr)] used everyone is a traitor secret. Objective is [objective]") + message_admins(span_adminnotice("[key_name_admin(usr)] used everyone is a traitor secret. Objective is [objective]")) log_admin("[key_name(usr)] used everyone is a traitor secret. Objective is [objective]") if("changebombcap") @@ -368,7 +368,7 @@ if (!CONFIG_SET(number/bombcap, newBombCap)) return - message_admins("[key_name_admin(usr)] changed the bomb cap to [GLOB.MAX_EX_DEVESTATION_RANGE], [GLOB.MAX_EX_HEAVY_RANGE], [GLOB.MAX_EX_LIGHT_RANGE]") + message_admins(span_boldannounce("[key_name_admin(usr)] changed the bomb cap to [GLOB.MAX_EX_DEVESTATION_RANGE], [GLOB.MAX_EX_HEAVY_RANGE], [GLOB.MAX_EX_LIGHT_RANGE]")) log_admin("[key_name(usr)] changed the bomb cap to [GLOB.MAX_EX_DEVESTATION_RANGE], [GLOB.MAX_EX_HEAVY_RANGE], [GLOB.MAX_EX_LIGHT_RANGE]") if("blackout") @@ -418,7 +418,7 @@ if(droptype == "Yes") ADD_TRAIT(I, TRAIT_NODROP, ADMIN_TRAIT) else - to_chat(H, "You're not kawaii enough for this!") + to_chat(H, span_warning("You're not kawaii enough for this!")) if("whiteout") if(!check_rights(R_FUN)) @@ -453,7 +453,7 @@ return SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Mass Braindamage")) for(var/mob/living/carbon/human/H in GLOB.player_list) - to_chat(H, "I suddenly feel stupid.") + to_chat(H, span_boldannounce("I suddenly feel stupid.")) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60, 80) message_admins("[key_name_admin(usr)] made everybody retarded") @@ -624,7 +624,7 @@ var/list/prefs = settings["mainsettings"] if (prefs["amount"]["value"] < 1 || prefs["portalnum"]["value"] < 1) - to_chat(usr, "Number of portals and mobs to spawn must be at least 1.") + to_chat(usr, span_warning("Number of portals and mobs to spawn must be at least 1.")) return var/mob/pathToSpawn = prefs["typepath"]["value"] @@ -632,7 +632,7 @@ pathToSpawn = text2path(pathToSpawn) if (!ispath(pathToSpawn)) - to_chat(usr, "Invalid path [pathToSpawn].") + to_chat(usr, span_notice("Invalid path [pathToSpawn].")) return var/list/candidates = list() diff --git a/code/modules/admin/sound_emitter.dm b/code/modules/admin/sound_emitter.dm index 4ab1c7917..c083dbe1e 100644 --- a/code/modules/admin/sound_emitter.dm +++ b/code/modules/admin/sound_emitter.dm @@ -38,8 +38,8 @@ if(!isobserver(user)) return . += "Sound File: [sound_file ? sound_file : "None chosen"]" - . += "Mode: [motus_operandi]
" - . += "Range: [emitter_range]
" + . += span_boldnotice("Mode:
[motus_operandi]") + . += span_boldnotice("Range:
[emitter_range]") . += "Sound is playing at [sound_volume]% volume." if(user.client.holder) . += "Alt-click it to quickly activate it!" @@ -54,7 +54,7 @@ /obj/effect/sound_emitter/AltClick(mob/user) if(check_rights_for(user.client, R_SOUND)) activate(user) - to_chat(user, "Sound emitter activated.") + to_chat(user, span_notice("Sound emitter activated.")) /obj/effect/sound_emitter/proc/edit_emitter(mob/user) var/dat = "" @@ -82,20 +82,20 @@ if(!new_label) return maptext = new_label - to_chat(user, "Label set to [maptext].") + to_chat(user, span_notice("Label set to [maptext].")) if(href_list["edit_sound_file"]) var/new_file = input(user, "Choose a sound file.", "Sound Emitter") as null|sound if(!new_file) return sound_file = new_file - to_chat(user, "New sound file set to [sound_file].") + to_chat(user, span_notice("New sound file set to [sound_file].")) if(href_list["edit_volume"]) var/new_volume = input(user, "Choose a volume.", "Sound Emitter", sound_volume) as null|num if(isnull(new_volume)) return new_volume = CLAMP(new_volume, 0, 100) sound_volume = new_volume - to_chat(user, "Volume set to [sound_volume]%.") + to_chat(user, span_notice("Volume set to [sound_volume]%.")) if(href_list["edit_mode"]) var/new_mode var/mode_list = list("Local (normal sound)" = SOUND_EMITTER_LOCAL, "Direct (not affected by environment/location)" = SOUND_EMITTER_DIRECT) @@ -103,7 +103,7 @@ if(!new_mode) return motus_operandi = mode_list[new_mode] - to_chat(user, "Mode set to [motus_operandi].") + to_chat(user, span_notice("Mode set to [motus_operandi].")) if(href_list["edit_range"]) var/new_range var/range_list = list("Radius (all mobs within a radius)" = SOUND_EMITTER_RADIUS, "Z-Level (all mobs on the same z)" = SOUND_EMITTER_ZLEVEL, "Global (all players)" = SOUND_EMITTER_GLOBAL) @@ -111,14 +111,14 @@ if(!new_range) return emitter_range = range_list[new_range] - to_chat(user, "Range set to [emitter_range].") + to_chat(user, span_notice("Range set to [emitter_range].")) if(href_list["edit_radius"]) var/new_radius = input(user, "Choose a radius.", "Sound Emitter", sound_volume) as null|num if(isnull(new_radius)) return new_radius = CLAMP(new_radius, 0, 127) play_radius = new_radius - to_chat(user, "Audible radius set to [play_radius].") + to_chat(user, span_notice("Audible radius set to [play_radius].")) if(href_list["play"]) activate(user) edit_emitter(user) //Refresh the UI to see our changes diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index 0a6022378..77aacb9c4 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -313,7 +313,7 @@ if(!check_rights(R_BAN)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/list/error_state = list() var/player_key @@ -419,7 +419,7 @@ else error_state += "No ban type was selected." if(error_state.len) - to_chat(usr, "Ban not [edit_id ? "edited" : "created"] because the following errors were present:\n[error_state.Join("\n")]") + to_chat(usr, span_danger("Ban not [edit_id ? "edited" : "created"] because the following errors were present:\n[error_state.Join("\n")]")) return if(edit_id) edit_ban(edit_id, player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, reason, mirror_edit, old_key, old_ip, old_cid, old_applies, page, admin_key, changes) @@ -430,7 +430,7 @@ if(!check_rights(R_BAN)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/player_ckey = ckey(player_key) if(player_ckey) @@ -477,7 +477,7 @@ if(R_EVERYTHING && !(R_EVERYTHING & rank.can_edit_rights)) //edit rights are a more effective way to check hierarchical rank since many non-headmins have R_PERMISSIONS now max_adminbans = MAX_ADMINBANS_PER_HEADMIN if(adminban_count >= max_adminbans) - to_chat(usr, "You've already logged [max_adminbans] admin ban(s) or more. Do not abuse this function!") + to_chat(usr, span_danger("You've already logged [max_adminbans] admin ban(s) or more. Do not abuse this function!")) qdel(query_check_adminban_count) return qdel(query_check_adminban_count) @@ -543,7 +543,7 @@ var/is_admin = FALSE if(C) build_ban_cache(C) - to_chat(C, "You have been [applies_to_admins ? "admin " : ""]banned by [usr.client.key] from [roles_to_ban[1] == "Server" ? "the server" : " Roles: [roles_to_ban.Join(", ")]"].\nReason: [reason]
This ban is [isnull(duration) ? "permanent." : "temporary, it will be removed in [time_message]."] The round ID is [GLOB.round_id].
To appeal this ban go to [appeal_url]") + to_chat(C, span_boldannounce("You have been [applies_to_admins ? "admin " : ""]banned by [usr.client.key] from [roles_to_ban[1] == "Server" ? "the server" : " Roles: [roles_to_ban.Join(", ")]"].\nReason: [reason]
This ban is [isnull(duration) ? "permanent." : "temporary, it will be removed in [time_message]."] The round ID is [GLOB.round_id].
To appeal this ban go to [appeal_url]")) if(GLOB.admin_datums[C.ckey] || GLOB.deadmins[C.ckey]) is_admin = TRUE if(roles_to_ban[1] == "Server" && (!is_admin || (is_admin && applies_to_admins))) @@ -553,7 +553,7 @@ for(var/client/i in GLOB.clients - C) if(i.address == player_ip || i.computer_id == player_cid) build_ban_cache(i) - to_chat(i, "You have been [applies_to_admins ? "admin " : ""]banned by [usr.client.key] from [roles_to_ban[1] == "Server" ? "the server" : " Roles: [roles_to_ban.Join(", ")]"].\nReason: [reason]
This ban is [isnull(duration) ? "permanent." : "temporary, it will be removed in [time_message]."] The round ID is [GLOB.round_id].
To appeal this ban go to [appeal_url]") + to_chat(i, span_boldannounce("You have been [applies_to_admins ? "admin " : ""]banned by [usr.client.key] from [roles_to_ban[1] == "Server" ? "the server" : " Roles: [roles_to_ban.Join(", ")]"].\nReason: [reason]

This ban is [isnull(duration) ? "permanent." : "temporary, it will be removed in [time_message]."] The round ID is [GLOB.round_id].
To appeal this ban go to [appeal_url]")) if(GLOB.admin_datums[i.ckey] || GLOB.deadmins[i.ckey]) is_admin = TRUE if(roles_to_ban[1] == "Server" && (!is_admin || (is_admin && applies_to_admins))) @@ -563,7 +563,7 @@ if(!check_rights(R_BAN)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/datum/browser/unban_panel = new(usr, "unbanpanel", "Unbanning Panel", 850, 600) unban_panel.add_stylesheet("unbanpanelcss", 'html/admin/unbanpanel.css') @@ -706,7 +706,7 @@ if(!check_rights(R_BAN)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/target = ban_target_string(player_key, player_ip, player_cid) if(alert(usr, "Please confirm unban of [target] from [role].", "Unban confirmation", "Yes", "No") == "No") @@ -731,18 +731,18 @@ var/client/C = GLOB.directory[player_key] if(C) build_ban_cache(C) - to_chat(C, "[usr.client.key] has removed a ban from [role] for your key.") + to_chat(C, span_boldannounce("[usr.client.key] has removed a ban from [role] for your key.")) for(var/client/i in GLOB.clients - C) if(i.address == player_ip || i.computer_id == player_cid) build_ban_cache(i) - to_chat(i, "[usr.client.key] has removed a ban from [role] for your IP or CID.") + to_chat(i, span_boldannounce("[usr.client.key] has removed a ban from [role] for your IP or CID.")) unban_panel(player_key, admin_key, player_ip, player_cid, page) /datum/admins/proc/edit_ban(ban_id, player_key, ip_check, player_ip, cid_check, player_cid, use_last_connection, applies_to_admins, duration, interval, reason, mirror_edit, old_key, old_ip, old_cid, old_applies, admin_key, page, list/changes) if(!check_rights(R_BAN)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/player_ckey = ckey(player_key) var/bantime @@ -795,7 +795,7 @@ if(R_EVERYTHING && !(R_EVERYTHING & rank.can_edit_rights)) //edit rights are a more effective way to check hierarchical rank since many non-headmins have R_PERMISSIONS now max_adminbans = MAX_ADMINBANS_PER_HEADMIN if(adminban_count >= max_adminbans) - to_chat(usr, "You've already logged [max_adminbans] admin ban(s) or more. Do not abuse this function!") + to_chat(usr, span_danger("You've already logged [max_adminbans] admin ban(s) or more. Do not abuse this function!")) qdel(query_check_adminban_count) return qdel(query_check_adminban_count) @@ -863,18 +863,18 @@ var/client/C = GLOB.directory[old_key] if(C) build_ban_cache(C) - to_chat(C, "[usr.client.key] has edited the [changes_keys_text] of a ban for your key.") + to_chat(C, span_boldannounce("[usr.client.key] has edited the [changes_keys_text] of a ban for your key.")) for(var/client/i in GLOB.clients - C) if(i.address == old_ip || i.computer_id == old_cid) build_ban_cache(i) - to_chat(i, "[usr.client.key] has edited the [changes_keys_text] of a ban for your IP or CID.") + to_chat(i, span_boldannounce("[usr.client.key] has edited the [changes_keys_text] of a ban for your IP or CID.")) unban_panel(player_key, null, null, null, page) /datum/admins/proc/ban_log(ban_id) if(!check_rights(R_BAN)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/datum/DBQuery/query_get_ban_edits = SSdbcore.NewQuery({" SELECT edits FROM [format_table_name("ban")] WHERE id = :ban_id diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm index d44f26924..9a43305e4 100644 --- a/code/modules/admin/sql_message_system.dm +++ b/code/modules/admin/sql_message_system.dm @@ -1,6 +1,6 @@ /proc/create_message(type, target_key, admin_ckey, text, timestamp, server, secret, logged = 1, browse, expiry, note_severity) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return if(!type) return @@ -111,7 +111,7 @@ /proc/delete_message(message_id, logged = 1, browse) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return message_id = text2num(message_id) if(!message_id) @@ -154,7 +154,7 @@ /proc/edit_message(message_id, browse) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return message_id = text2num(message_id) if(!message_id) @@ -204,7 +204,7 @@ /proc/edit_message_expiry(message_id, browse) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return message_id = text2num(message_id) if(!message_id) @@ -275,7 +275,7 @@ /proc/edit_message_severity(message_id) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return message_id = text2num(message_id) if(!message_id) @@ -326,7 +326,7 @@ /proc/toggle_message_secrecy(message_id) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return message_id = text2num(message_id) if(!message_id) @@ -370,7 +370,7 @@ /proc/browse_messages(type, target_ckey, index, linkless = FALSE, filter, agegate = FALSE) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/list/output = list() var/ruler = "
" @@ -618,7 +618,7 @@ /proc/get_message_output(type, target_ckey) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return if(!type) return diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index 56f6a189e..92223bdd3 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -21,7 +21,7 @@ ban["ckey"] = ckey if (get_stickyban_from_ckey(ckey)) - to_chat(usr, "Error: Can not add a stickyban: User already has a current sticky ban") + to_chat(usr, span_adminnotice("Error: Can not add a stickyban: User already has a current sticky ban")) return if (data["reason"]) @@ -50,7 +50,7 @@ SSstickyban.cache[ckey] = ban log_admin_private("[key_name(usr)] has stickybanned [ckey].\nReason: [ban["message"]]") - message_admins("[key_name_admin(usr)] has stickybanned [ckey].\nReason: [ban["message"]]") + message_admins(span_adminnotice("[key_name_admin(usr)] has stickybanned [ckey].\nReason: [ban["message"]]")) if ("remove") if (!data["ckey"]) @@ -59,12 +59,12 @@ var/ban = get_stickyban_from_ckey(ckey) if (!ban) - to_chat(usr, "Error: No sticky ban for [ckey] found!") + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!")) return if (alert("Are you sure you want to remove the sticky ban on [ckey]?","Are you sure","Yes","No") == "No") return if (!get_stickyban_from_ckey(ckey)) - to_chat(usr, "Error: The ban disappeared.") + to_chat(usr, span_adminnotice("Error: The ban disappeared.")) return world.SetConfig("ban",ckey, null) SSstickyban.cache -= ckey @@ -79,7 +79,7 @@ log_admin_private("[key_name(usr)] removed [ckey]'s stickyban") - message_admins("[key_name_admin(usr)] removed [ckey]'s stickyban") + message_admins(span_adminnotice("[key_name_admin(usr)] removed [ckey]'s stickyban")) if ("remove_alt") if (!data["ckey"]) @@ -90,12 +90,12 @@ var/alt = ckey(data["alt"]) var/ban = get_stickyban_from_ckey(ckey) if (!ban) - to_chat(usr, "Error: No sticky ban for [ckey] found!") + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!")) return var/key = LAZYACCESS(ban["keys"], alt) if (!key) - to_chat(usr, "Error: [alt] is not linked to [ckey]'s sticky ban!") + to_chat(usr, span_adminnotice("Error: [alt] is not linked to [ckey]'s sticky ban!")) return if (alert("Are you sure you want to disassociate [alt] from [ckey]'s sticky ban? \nNote: Nothing stops byond from re-linking them, Use \[E] to exempt them","Are you sure","Yes","No") == "No") @@ -104,13 +104,13 @@ //we have to do this again incase something changes ban = get_stickyban_from_ckey(ckey) if (!ban) - to_chat(usr, "Error: The ban disappeared.") + to_chat(usr, span_adminnotice("Error: The ban disappeared.")) return key = LAZYACCESS(ban["keys"], alt) if (!key) - to_chat(usr, "Error: [alt] link to [ckey]'s sticky ban disappeared.") + to_chat(usr, span_adminnotice("Error: [alt] link to [ckey]'s sticky ban disappeared.")) return LAZYREMOVE(ban["keys"], alt) @@ -127,7 +127,7 @@ qdel(query_remove_stickyban_alt) log_admin_private("[key_name(usr)] has disassociated [alt] from [ckey]'s sticky ban") - message_admins("[key_name_admin(usr)] has disassociated [alt] from [ckey]'s sticky ban") + message_admins(span_adminnotice("[key_name_admin(usr)] has disassociated [alt] from [ckey]'s sticky ban")) if ("edit") if (!data["ckey"]) @@ -135,7 +135,7 @@ var/ckey = data["ckey"] var/ban = get_stickyban_from_ckey(ckey) if (!ban) - to_chat(usr, "Error: No sticky ban for [ckey] found!") + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!")) return var/oldreason = ban["message"] var/reason = input(usr,"Reason","Reason","[ban["message"]]") as text|null @@ -144,7 +144,7 @@ //we have to do this again incase something changed while we waited for input ban = get_stickyban_from_ckey(ckey) if (!ban) - to_chat(usr, "Error: The ban disappeared.") + to_chat(usr, span_adminnotice("Error: The ban disappeared.")) return ban["message"] = "[reason]" @@ -161,7 +161,7 @@ qdel(query_edit_stickyban) log_admin_private("[key_name(usr)] has edited [ckey]'s sticky ban reason from [oldreason] to [reason]") - message_admins("[key_name_admin(usr)] has edited [ckey]'s sticky ban reason from [oldreason] to [reason]") + message_admins(span_adminnotice("[key_name_admin(usr)] has edited [ckey]'s sticky ban reason from [oldreason] to [reason]")) if ("exempt") if (!data["ckey"]) @@ -172,12 +172,12 @@ var/alt = ckey(data["alt"]) var/ban = get_stickyban_from_ckey(ckey) if (!ban) - to_chat(usr, "Error: No sticky ban for [ckey] found!") + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!")) return var/key = LAZYACCESS(ban["keys"], alt) if (!key) - to_chat(usr, "Error: [alt] is not linked to [ckey]'s sticky ban!") + to_chat(usr, span_adminnotice("Error: [alt] is not linked to [ckey]'s sticky ban!")) return if (alert("Are you sure you want to exempt [alt] from [ckey]'s sticky ban?","Are you sure","Yes","No") == "No") @@ -186,13 +186,13 @@ //we have to do this again incase something changes ban = get_stickyban_from_ckey(ckey) if (!ban) - to_chat(usr, "Error: The ban disappeared.") + to_chat(usr, span_adminnotice("Error: The ban disappeared.")) return key = LAZYACCESS(ban["keys"], alt) if (!key) - to_chat(usr, "Error: [alt]'s link to [ckey]'s sticky ban disappeared.") + to_chat(usr, span_adminnotice("Error: [alt]'s link to [ckey]'s sticky ban disappeared.")) return LAZYREMOVE(ban["keys"], alt) key["exempt"] = TRUE @@ -211,7 +211,7 @@ qdel(query_exempt_stickyban_alt) log_admin_private("[key_name(usr)] has exempted [alt] from [ckey]'s sticky ban") - message_admins("[key_name_admin(usr)] has exempted [alt] from [ckey]'s sticky ban") + message_admins(span_adminnotice("[key_name_admin(usr)] has exempted [alt] from [ckey]'s sticky ban")) if ("unexempt") if (!data["ckey"]) @@ -222,12 +222,12 @@ var/alt = ckey(data["alt"]) var/ban = get_stickyban_from_ckey(ckey) if (!ban) - to_chat(usr, "Error: No sticky ban for [ckey] found!") + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!")) return var/key = LAZYACCESS(ban["whitelist"], alt) if (!key) - to_chat(usr, "Error: [alt] is not exempt from [ckey]'s sticky ban!") + to_chat(usr, span_adminnotice("Error: [alt] is not exempt from [ckey]'s sticky ban!")) return if (alert("Are you sure you want to unexempt [alt] from [ckey]'s sticky ban?","Are you sure","Yes","No") == "No") @@ -236,12 +236,12 @@ //we have to do this again incase something changes ban = get_stickyban_from_ckey(ckey) if (!ban) - to_chat(usr, "Error: The ban disappeared.") + to_chat(usr, span_adminnotice("Error: The ban disappeared.")) return key = LAZYACCESS(ban["whitelist"], alt) if (!key) - to_chat(usr, "Error: [alt]'s exemption from [ckey]'s sticky ban disappeared.") + to_chat(usr, span_adminnotice("Error: [alt]'s exemption from [ckey]'s sticky ban disappeared.")) return LAZYREMOVE(ban["whitelist"], alt) @@ -261,13 +261,13 @@ qdel(query_unexempt_stickyban_alt) log_admin_private("[key_name(usr)] has unexempted [alt] from [ckey]'s sticky ban") - message_admins("[key_name_admin(usr)] has unexempted [alt] from [ckey]'s sticky ban") + message_admins(span_adminnotice("[key_name_admin(usr)] has unexempted [alt] from [ckey]'s sticky ban")) if ("timeout") if (!data["ckey"]) return if (!SSdbcore.Connect()) - to_chat(usr, "No database connection!") + to_chat(usr, span_adminnotice("No database connection!")) return var/ckey = data["ckey"] @@ -276,7 +276,7 @@ return var/ban = get_stickyban_from_ckey(ckey) if (!ban) - to_chat(usr, "Error: No sticky ban for [ckey] found!") + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!")) return ban["timeout"] = TRUE @@ -288,13 +288,13 @@ cachedban["timeout"] = TRUE log_admin_private("[key_name(usr)] has put [ckey]'s sticky ban on timeout.") - message_admins("[key_name_admin(usr)] has put [ckey]'s sticky ban on timeout.") + message_admins(span_adminnotice("[key_name_admin(usr)] has put [ckey]'s sticky ban on timeout.")) if ("untimeout") if (!data["ckey"]) return if (!SSdbcore.Connect()) - to_chat(usr, "No database connection!") + to_chat(usr, span_adminnotice("No database connection!")) return var/ckey = data["ckey"] @@ -307,7 +307,7 @@ cachedban["timeout"] = FALSE if (!ban) if (!cachedban) - to_chat(usr, "Error: No sticky ban for [ckey] found!") + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!")) return ban = cachedban @@ -316,7 +316,7 @@ world.SetConfig("ban",ckey,list2stickyban(ban)) log_admin_private("[key_name(usr)] has taken [ckey]'s sticky ban off of timeout.") - message_admins("[key_name_admin(usr)] has taken [ckey]'s sticky ban off of timeout.") + message_admins(span_adminnotice("[key_name_admin(usr)] has taken [ckey]'s sticky ban off of timeout.")) if ("revert") @@ -327,15 +327,15 @@ return var/ban = get_stickyban_from_ckey(ckey) if (!ban) - to_chat(usr, "Error: No sticky ban for [ckey] found!") + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!")) return var/cached_ban = SSstickyban.cache[ckey] if (!cached_ban) - to_chat(usr, "Error: No cached sticky ban for [ckey] found!") + to_chat(usr, span_adminnotice("Error: No cached sticky ban for [ckey] found!")) world.SetConfig("ban",ckey,null) log_admin_private("[key_name(usr)] has reverted [ckey]'s sticky ban to its state at round start.") - message_admins("[key_name_admin(usr)] has reverted [ckey]'s sticky ban to its state at round start.") + message_admins(span_adminnotice("[key_name_admin(usr)] has reverted [ckey]'s sticky ban to its state at round start.")) //revert is mostly used when shit goes rouge, so we have to set it to null // and wait a byond tick before assigning it to ensure byond clears its shit. sleep(world.tick_lag) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 6b7d0227e..a3af3a6a9 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -44,7 +44,7 @@ return var/mob/M = locate(href_list["getplaytimewindow"]) in GLOB.mob_list if(!M) - to_chat(usr, "ERROR: Mob not found.") + to_chat(usr, span_danger("ERROR: Mob not found.")) return cmd_show_exp_panel(M.client) @@ -53,7 +53,7 @@ return var/client/C = locate(href_list["toggleexempt"]) in GLOB.clients if(!C) - to_chat(usr, "ERROR: Client not found.") + to_chat(usr, span_danger("ERROR: Client not found.")) return toggle_exempt_status(C) @@ -114,7 +114,7 @@ return SSshuttle.emergency.request() log_admin("[key_name(usr)] called the Emergency Shuttle.") - message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.") + message_admins(span_adminnotice("[key_name_admin(usr)] called the Emergency Shuttle to the station.")) if("2") if(EMERGENCY_AT_LEAST_DOCKED) @@ -123,11 +123,11 @@ if(SHUTTLE_CALL) SSshuttle.emergency.cancel() log_admin("[key_name(usr)] sent the Emergency Shuttle back.") - message_admins("[key_name_admin(usr)] sent the Emergency Shuttle back.") + message_admins(span_adminnotice("[key_name_admin(usr)] sent the Emergency Shuttle back.")) else SSshuttle.emergency.cancel() log_admin("[key_name(usr)] called the Emergency Shuttle.") - message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.") + message_admins(span_adminnotice("[key_name_admin(usr)] called the Emergency Shuttle to the station.")) @@ -141,7 +141,7 @@ SSshuttle.emergency.setTimer(timer*10) log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds.") minor_announce("The emergency shuttle will reach its destination in [round(SSshuttle.emergency.timeLeft(600))] minutes.") - message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds.") + message_admins(span_adminnotice("[key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds.")) else if(href_list["trigger_centcom_recall"]) if(!check_rights(R_ADMIN)) return @@ -157,7 +157,7 @@ else continuous[SSticker.mode.config_tag] = FALSE - message_admins("[key_name_admin(usr)] toggled the round to [continuous[SSticker.mode.config_tag] ? "continue if all antagonists die" : "end with the antagonists"].") + message_admins(span_adminnotice("[key_name_admin(usr)] toggled the round to [continuous[SSticker.mode.config_tag] ? "continue if all antagonists die" : "end with the antagonists"].")) check_antagonists() else if(href_list["toggle_midround_antag"]) @@ -170,7 +170,7 @@ else midround_antag[SSticker.mode.config_tag] = FALSE - message_admins("[key_name_admin(usr)] toggled the round to [midround_antag[SSticker.mode.config_tag] ? "use" : "skip"] the midround antag system.") + message_admins(span_adminnotice("[key_name_admin(usr)] toggled the round to [midround_antag[SSticker.mode.config_tag] ? "use" : "skip"] the midround antag system.")) check_antagonists() else if(href_list["alter_midround_time_limit"]) @@ -181,7 +181,7 @@ if(!timer) return CONFIG_SET(number/midround_antag_time_check, timer) - message_admins("[key_name_admin(usr)] edited the maximum midround antagonist time to [timer] minutes.") + message_admins(span_adminnotice("[key_name_admin(usr)] edited the maximum midround antagonist time to [timer] minutes.")) check_antagonists() else if(href_list["alter_midround_life_limit"]) @@ -193,7 +193,7 @@ return CONFIG_SET(number/midround_antag_life_check, ratio / 100) - message_admins("[key_name_admin(usr)] edited the midround antagonist living crew ratio to [ratio]% alive.") + message_admins(span_adminnotice("[key_name_admin(usr)] edited the midround antagonist living crew ratio to [ratio]% alive.")) check_antagonists() else if(href_list["toggle_noncontinuous_behavior"]) @@ -205,7 +205,7 @@ else SSticker.mode.round_ends_with_antag_death = 0 - message_admins("[key_name_admin(usr)] edited the midround antagonist system to [SSticker.mode.round_ends_with_antag_death ? "end the round" : "continue as extended"] upon failure.") + message_admins(span_adminnotice("[key_name_admin(usr)] edited the midround antagonist system to [SSticker.mode.round_ends_with_antag_death ? "end the round" : "continue as extended"] upon failure.")) check_antagonists() else if(href_list["delay_round_end"]) @@ -231,16 +231,16 @@ if(!check_rights(R_ADMIN)) return - message_admins("[key_name_admin(usr)] is considering ending the round.") + message_admins(span_adminnotice("[key_name_admin(usr)] is considering ending the round.")) if(alert(usr, "This will end the round, are you SURE you want to do this?", "Confirmation", "Yes", "No") == "Yes") if(alert(usr, "Final Confirmation: End the round NOW?", "Confirmation", "Yes", "No") == "Yes") - message_admins("[key_name_admin(usr)] has ended the round.") + message_admins(span_adminnotice("[key_name_admin(usr)] has ended the round.")) SSticker.force_ending = 1 //Yeah there we go APC destroyed mission accomplished return else - message_admins("[key_name_admin(usr)] decided against ending the round.") + message_admins(span_adminnotice("[key_name_admin(usr)] decided against ending the round.")) else - message_admins("[key_name_admin(usr)] decided against ending the round.") + message_admins(span_adminnotice("[key_name_admin(usr)] decided against ending the round.")) else if(href_list["simplemake"]) if(!check_rights(R_SPAWN)) @@ -260,7 +260,7 @@ delmob = FALSE log_admin("[key_name(usr)] has used rudimentary transformation on [key_name(M)]. Transforming to [href_list["simplemake"]].; deletemob=[delmob]") - message_admins("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]].; deletemob=[delmob]") + message_admins(span_adminnotice("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]].; deletemob=[delmob]")) switch(href_list["simplemake"]) if("observer") M.change_mob_type( /mob/dead/observer , null, null, delmob ) @@ -322,19 +322,19 @@ var/mob/M = locate(href_list["boot2"]) if(ismob(M)) if(!check_if_greater_rights_than(M.client)) - to_chat(usr, "Error: They have more rights than you do.") + to_chat(usr, span_danger("Error: They have more rights than you do.")) return if(alert(usr, "Kick [key_name(M)]?", "Confirm", "Yes", "No") != "Yes") return if(!M) - to_chat(usr, "Error: [M] no longer exists!") + to_chat(usr, span_danger("Error: [M] no longer exists!")) return if(!M.client) - to_chat(usr, "Error: [M] no longer has a client!") + to_chat(usr, span_danger("Error: [M] no longer has a client!")) return - to_chat(M, "I have been kicked from the server by [usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"].") + to_chat(M, span_danger("I have been kicked from the server by [usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"].")) log_admin("[key_name(usr)] kicked [key_name(M)].") - message_admins("[key_name_admin(usr)] kicked [key_name_admin(M)].") + message_admins(span_adminnotice("[key_name_admin(usr)] kicked [key_name_admin(M)].")) qdel(M.client) else if(href_list["addmessage"]) @@ -799,8 +799,8 @@ return GLOB.master_mode = href_list["c_mode2"] log_admin("[key_name(usr)] set the mode as [GLOB.master_mode].") - message_admins("[key_name_admin(usr)] set the mode as [GLOB.master_mode].") - to_chat(world, "The mode is now: [GLOB.master_mode]") + message_admins(span_adminnotice("[key_name_admin(usr)] set the mode as [GLOB.master_mode].")) + to_chat(world, span_adminnotice("The mode is now: [GLOB.master_mode]")) Game() // updates the main game menu if (askuser(usr, "Would you like to save this as the default mode for the server?", "Save mode", "Yes", "No", Timeout = null) == 1) SSticker.save_mode(GLOB.master_mode) @@ -816,7 +816,7 @@ return alert(usr, "The game mode has to be secret!", null, null, null, null) GLOB.secret_force_mode = href_list["f_secret2"] log_admin("[key_name(usr)] set the forced secret mode as [GLOB.secret_force_mode].") - message_admins("[key_name_admin(usr)] set the forced secret mode as [GLOB.secret_force_mode].") + message_admins(span_adminnotice("[key_name_admin(usr)] set the forced secret mode as [GLOB.secret_force_mode].")) Game() // updates the main game menu HandleFSecret() @@ -830,7 +830,7 @@ return log_admin("[key_name(usr)] attempting to monkeyize [key_name(H)].") - message_admins("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(H)].") + message_admins(span_adminnotice("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(H)].")) H.monkeyize() else if(href_list["humanone"]) @@ -843,7 +843,7 @@ return log_admin("[key_name(usr)] attempting to humanize [key_name(Mo)].") - message_admins("[key_name_admin(usr)] attempting to humanize [key_name_admin(Mo)].") + message_admins(span_adminnotice("[key_name_admin(usr)] attempting to humanize [key_name_admin(Mo)].")) Mo.humanize() else if(href_list["corgione"]) @@ -856,7 +856,7 @@ return log_admin("[key_name(usr)] attempting to corgize [key_name(H)].") - message_admins("[key_name_admin(usr)] attempting to corgize [key_name_admin(H)].") + message_admins(span_adminnotice("[key_name_admin(usr)] attempting to corgize [key_name_admin(H)].")) H.corgize() @@ -874,7 +874,7 @@ M.say(speech, forced = "admin speech") speech = sanitize(speech) // Nah, we don't trust them log_admin("[key_name(usr)] forced [key_name(M)] to say: [speech]") - message_admins("[key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]") + message_admins(span_adminnotice("[key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]")) else if(href_list["sendtoprison"]) if(!check_rights(R_ADMIN)) @@ -892,7 +892,7 @@ return M.forceMove(pick(GLOB.prisonwarp)) - to_chat(M, "I have been sent to Prison!") + to_chat(M, span_adminnotice("I have been sent to Prison!")) log_admin("[key_name(usr)] has sent [key_name(M)] to Prison!") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to Prison!") @@ -904,11 +904,11 @@ var/mob/M = locate(href_list["sendbacktolobby"]) if(!isobserver(M)) - to_chat(usr, "I can only send ghost players back to the Lobby.") + to_chat(usr, span_notice("I can only send ghost players back to the Lobby.")) return if(!M.client) - to_chat(usr, "[M] doesn't seem to have an active client.") + to_chat(usr, span_warning("[M] doesn't seem to have an active client.")) return if(alert(usr, "Send [key_name(M)] back to Lobby?", "Message", "Yes", "No") != "Yes") @@ -943,7 +943,7 @@ L.Unconscious(100) sleep(5) L.forceMove(pick(GLOB.tdome1)) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, "I have been sent to the Thunderdome."), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, span_adminnotice("I have been sent to the Thunderdome.")), 5 SECONDS) log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Team 1)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Team 1)") @@ -969,7 +969,7 @@ L.Unconscious(100) sleep(5) L.forceMove(pick(GLOB.tdome2)) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, "I have been sent to the Thunderdome."), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, span_adminnotice("I have been sent to the Thunderdome.")), 5 SECONDS) log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Team 2)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Team 2)") @@ -992,7 +992,7 @@ L.Unconscious(100) sleep(5) L.forceMove(pick(GLOB.tdomeadmin)) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, "I have been sent to the Thunderdome."), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, span_adminnotice("I have been sent to the Thunderdome.")), 5 SECONDS) log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Admin.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Admin.)") @@ -1022,7 +1022,7 @@ L.Unconscious(100) sleep(5) L.forceMove(pick(GLOB.tdomeobserve)) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, "I have been sent to the Thunderdome."), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, span_adminnotice("I have been sent to the Thunderdome.")), 5 SECONDS) log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Observer.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Observer.)") @@ -1036,7 +1036,7 @@ return L.revive(full_heal = TRUE, admin_revive = TRUE) - message_admins("Admin [key_name_admin(usr)] healed / revived [key_name_admin(L)]!") + message_admins(span_danger("Admin [key_name_admin(usr)] healed / revived [key_name_admin(L)]!")) log_admin("[key_name(usr)] healed / Revived [key_name(L)].") else if(href_list["makeai"]) @@ -1048,7 +1048,7 @@ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human.") return - message_admins("Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!") + message_admins(span_danger("Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!")) log_admin("[key_name(usr)] AIized [key_name(H)].") H.AIize(TRUE, H.client) @@ -1322,7 +1322,7 @@ log_admin("[key_name(H)] got their [new_item], spawned by [key_name(src.owner)].") message_admins("[key_name(H)] got their [new_item], spawned by [key_name(src.owner)].") SSblackbox.record_feedback("amount", "admin_cookies_spawned", 1) - to_chat(H, "My prayers have been answered!! You received the best [new_item.name]!") + to_chat(H, span_adminnotice("My prayers have been answered!! You received the best [new_item.name]!")) SEND_SOUND(H, sound('sound/blank.ogg')) else if(href_list["adminsmite"]) @@ -1875,7 +1875,7 @@ if(alert("Are you sure you want to kick all [afkonly ? "AFK" : ""] clients from the lobby??","Message","Yes","Cancel") != "Yes") to_chat(usr, "Kick clients from lobby aborted") return - var/list/listkicked = kick_clients_in_lobby("I were kicked from the lobby by [usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"].", afkonly) + var/list/listkicked = kick_clients_in_lobby(span_danger("I were kicked from the lobby by [usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"]."), afkonly) var/strkicked = "" for(var/name in listkicked) @@ -1940,7 +1940,7 @@ else if(href_list["viewruntime"]) var/datum/error_viewer/error_viewer = locate(href_list["viewruntime"]) if(!istype(error_viewer)) - to_chat(usr, "That runtime viewer no longer exists.") + to_chat(usr, span_warning("That runtime viewer no longer exists.")) return if(href_list["viewruntime_backto"]) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 5b19481f4..b4ad0777e 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -199,7 +199,7 @@ /client/proc/SDQL2_query(query_text as message) set category = "Debug" if(!check_rights(R_DEBUG)) //Shouldn't happen... but just to be safe. - message_admins("ERROR: Non-admin [key_name(usr)] attempted to execute a SDQL query!") + message_admins(span_danger("ERROR: Non-admin [key_name(usr)] attempted to execute a SDQL query!")) log_admin("Non-admin [key_name(usr)] attempted to execute a SDQL query!") return FALSE var/list/results = world.SDQL2_query(query_text, key_name_admin(usr), "[key_name(usr)]") @@ -244,7 +244,7 @@ running += query var/msg = "Starting query #[query.id] - [query.get_query_text()]." if(usr) - to_chat(usr, "[msg]") + to_chat(usr, span_admin("[msg]")) log_admin(msg) query.ARun() else //Start all @@ -252,7 +252,7 @@ running += query var/msg = "Starting query #[query.id] - [query.get_query_text()]." if(usr) - to_chat(usr, "[msg]") + to_chat(usr, span_admin("[msg]")) log_admin(msg) query.ARun() @@ -273,7 +273,7 @@ finished = FALSE if(query.state == SDQL2_STATE_ERROR) if(usr) - to_chat(usr, "SDQL query [query.get_query_text()] errored. It will NOT be automatically garbage collected. Please remove manually.") + to_chat(usr, span_admin("SDQL query [query.get_query_text()] errored. It will NOT be automatically garbage collected. Please remove manually.")) running -= query else if(query.finished) @@ -290,19 +290,19 @@ running += next_query var/msg = "Starting query #[next_query.id] - [next_query.get_query_text()]." if(usr) - to_chat(usr, "[msg]") + to_chat(usr, span_admin("[msg]")) log_admin(msg) next_query.ARun() else if(usr) - to_chat(usr, "SDQL query [query.get_query_text()] was halted. It will NOT be automatically garbage collected. Please remove manually.") + to_chat(usr, span_admin("SDQL query [query.get_query_text()] was halted. It will NOT be automatically garbage collected. Please remove manually.")) running -= query while(!finished) var/end_time_total = REALTIMEOFDAY - start_time_total - return list("SDQL query combined results: [query_text]",\ - "SDQL query completed: [objs_all] objects selected by path, and [selectors_used ? objs_eligible : objs_all] objects executed on after WHERE filtering/MAPping if applicable.",\ - "SDQL combined querys took [DisplayTimeText(end_time_total)] to complete.") + combined_refs + return list(span_admin("SDQL query combined results: [query_text]"),\ + span_admin("SDQL query completed: [objs_all] objects selected by path, and [selectors_used ? objs_eligible : objs_all] objects executed on after WHERE filtering/MAPping if applicable."),\ + span_admin("SDQL combined querys took [DisplayTimeText(end_time_total)] to complete.")) + combined_refs GLOBAL_LIST_INIT(sdql2_queries, GLOB.sdql2_queries || list()) GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null, "VIEW VARIABLES (all)", null)) @@ -852,7 +852,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null if("or", "||") result = (result || val) else - to_chat(usr, "SDQL2: Unknown op [op]") + to_chat(usr, span_danger("SDQL2: Unknown op [op]")) result = null else result = val @@ -962,7 +962,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null querys[querys_pos] = parsed_tree querys_pos++ else //There was an error so don't run anything, and tell the user which query has errored. - to_chat(usr, "Parsing error on [querys_pos]\th query. Nothing was executed.") + to_chat(usr, span_danger("Parsing error on [querys_pos]\th query. Nothing was executed.")) return list() query_tree = list() do_parse = 0 @@ -1008,16 +1008,16 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null D = object if (object == world && (!long || expression[start + 1] == ".") && !(expression[start] in exclude)) - to_chat(usr, "World variables are not allowed to be accessed. Use global.") + to_chat(usr, span_danger("World variables are not allowed to be accessed. Use global.")) return null else if(expression [start] == "{" && long) if(lowertext(copytext(expression[start + 1], 1, 3)) != "0x") - to_chat(usr, "Invalid pointer syntax: [expression[start + 1]]") + to_chat(usr, span_danger("Invalid pointer syntax: [expression[start + 1]]")) return null v = locate("\[[expression[start + 1]]]") if(!v) - to_chat(usr, "Invalid pointer: [expression[start + 1]]") + to_chat(usr, span_danger("Invalid pointer: [expression[start + 1]]")) return null start++ long = start < expression.len @@ -1104,7 +1104,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null var/list/L = v var/index = query.SDQL_expression(source, expression[start + 2]) if(isnum(index) && (!ISINTEGER(index) || L.len < index)) - to_chat(usr, "Invalid list index: [index]") + to_chat(usr, span_danger("Invalid list index: [index]")) return null return L[index] return v diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index 4ae3d3ce1..1e6558472 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -63,7 +63,7 @@ /datum/SDQL_parser/proc/parse_error(error_message) error = 1 - to_chat(usr, "SQDL2 Parsing Error: [error_message]") + to_chat(usr, span_warning("SQDL2 Parsing Error: [error_message]")) return query.len + 1 /datum/SDQL_parser/proc/parse() diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 400860c04..431cf0ed2 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -205,7 +205,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/admin_number_present = send2irc_adminless_only(initiator_ckey, "Ticket #[id]: [name]") log_admin_private("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.") if(admin_number_present <= 0) - to_chat(C, "No active admins are online, your adminhelp was sent to the admin irc.") + to_chat(C, span_notice("No active admins are online, your adminhelp was sent to the admin irc.")) heard_by_no_admins = TRUE GLOB.ahelp_tickets.active_tickets += src @@ -263,7 +263,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) msg = copytext_char(msg, 1, MAX_MESSAGE_LEN) var/ref_src = "[REF(src)]" //Message to be sent to all admins - var/admin_msg = "Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]: [keywords_lookup(msg)]" + var/admin_msg = span_adminnotice("Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]: [keywords_lookup(msg)]") AddInteraction("[LinkedReplyName(ref_src)]: [msg]") @@ -275,16 +275,16 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) to_chat(X, admin_msg) //show it to the person adminhelping too - to_chat(initiator, "PM to-Admins: [msg]") + to_chat(initiator, span_adminnotice("PM to-Admins: [msg]")) //Reopen a closed ticket /datum/admin_help/proc/Reopen() if(state == AHELP_ACTIVE) - to_chat(usr, "This ticket is already open.") + to_chat(usr, span_warning("This ticket is already open.")) return if(GLOB.ahelp_tickets.CKey2ActiveTicket(initiator_ckey)) - to_chat(usr, "This user already has an active ticket, cannot reopen this one.") + to_chat(usr, span_warning("This user already has an active ticket, cannot reopen this one.")) return statclick = new(null, src) @@ -302,7 +302,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) initiator.current_ticket = src AddInteraction("Reopened by [key_name_admin(usr)]") - var/msg = "Ticket [TicketHref("#[id]")] reopened by [key_name_admin(usr)]." + var/msg = span_adminhelp("Ticket [TicketHref("#[id]")] reopened by [key_name_admin(usr)].") message_admins(msg) log_admin_private(msg) SSblackbox.record_feedback("tally", "ahelp_stats", 1, "reopened") @@ -325,7 +325,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) RemoveActive() state = AHELP_CLOSED GLOB.ahelp_tickets.ListInsert(src) - to_chat(initiator, "Ticket closed by [usr?.client?.holder?.fakekey? usr.client.holder.fakekey : "an administrator"].") + to_chat(initiator, span_adminhelp("Ticket closed by [usr?.client?.holder?.fakekey? usr.client.holder.fakekey : "an administrator"].")) AddInteraction("Closed by [key_name].") if(!silent) SSblackbox.record_feedback("tally", "ahelp_stats", 1, "closed") @@ -344,7 +344,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) addtimer(CALLBACK(initiator, TYPE_PROC_REF(/client, giveadminhelpverb)), 50) AddInteraction("Resolved by [key_name].") - to_chat(initiator, "Your ticket has been resolved by [usr?.client?.holder?.fakekey? usr.client.holder.fakekey : "an administrator"]. The Adminhelp verb will be returned to you shortly.") + to_chat(initiator, span_adminhelp("Your ticket has been resolved by [usr?.client?.holder?.fakekey? usr.client.holder.fakekey : "an administrator"]. The Adminhelp verb will be returned to you shortly.")) if(!silent) SSblackbox.record_feedback("tally", "ahelp_stats", 1, "resolved") var/msg = "Ticket [TicketHref("#[id]")] resolved by [key_name]" @@ -510,12 +510,12 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) set name = "Adminhelp" if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, span_danger("Speech is currently admin-disabled.")) return //handle muting and automuting if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Admin-PM: You cannot send adminhelps (Muted).") + to_chat(src, span_danger("Error: Admin-PM: You cannot send adminhelps (Muted).")) return if(handle_spam_prevention(msg,MUTE_ADMINHELP)) return @@ -533,7 +533,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) current_ticket.TimeoutVerb() return else - to_chat(usr, "Ticket not found, creating new one...") + to_chat(usr, span_warning("Ticket not found, creating new one...")) else current_ticket.AddInteraction("[key_name_admin(usr)] opened a new ticket.") current_ticket.Close() diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index def33ac90..b5fa66904 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -6,7 +6,7 @@ set category = null set name = "Admin PM Mob" if(!holder) - to_chat(src, "Error: Admin-PM-Context: Only administrators may use this command.") + to_chat(src, span_danger("Error: Admin-PM-Context: Only administrators may use this command.")) return if( !ismob(M) || !M.client ) return @@ -18,7 +18,7 @@ set category = "Admin" set name = "Admin PM" if(!holder) - to_chat(src, "Error: Admin-PM-Panel: Only administrators may use this command.") + to_chat(src, span_danger("Error: Admin-PM-Panel: Only administrators may use this command.")) return var/list/client/targets[0] for(var/client/T) @@ -37,7 +37,7 @@ /client/proc/cmd_ahelp_reply(whom) if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).") + to_chat(src, span_danger("Error: Admin-PM: You are unable to use admin PM-s (muted).")) return var/client/C if(istext(whom)) @@ -48,7 +48,7 @@ C = whom if(!C) if(holder) - to_chat(src, "Error: Admin-PM: Client not found.") + to_chat(src, span_danger("Error: Admin-PM: Client not found.")) return var/datum/admin_help/AH = C.current_ticket @@ -65,12 +65,12 @@ //Fetching a message if needed. src is the sender and C is the target client /client/proc/cmd_admin_pm(whom, msg) if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).") + to_chat(src, span_danger("Error: Admin-PM: You are unable to use admin PM-s (muted).")) return if(!holder && !current_ticket) //no ticket? https://www.youtube.com/watch?v=iHSPf6x1Fdo - to_chat(src, "I can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be.") - to_chat(src, "Message: [msg]") + to_chat(src, span_danger("I can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be.")) + to_chat(src, span_notice("Message: [msg]")) return var/client/recipient @@ -95,14 +95,14 @@ if(!msg) return if(holder) - to_chat(src, "Error: Use the admin IRC channel, nerd.") + to_chat(src, span_danger("Error: Use the admin IRC channel, nerd.")) return else if(!recipient) if(holder) - to_chat(src, "Error: Admin-PM: Client not found.") + to_chat(src, span_danger("Error: Admin-PM: Client not found.")) if(msg) to_chat(src, msg) return @@ -118,12 +118,12 @@ return if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).") + to_chat(src, span_danger("Error: Admin-PM: You are unable to use admin PM-s (muted).")) return if(!recipient) if(holder) - to_chat(src, "Error: Admin-PM: Client not found.") + to_chat(src, span_danger("Error: Admin-PM: Client not found.")) else current_ticket.MessageNoRecipient(msg) return @@ -145,15 +145,15 @@ var/keywordparsedmsg = keywords_lookup(msg) if(irc) - to_chat(src, "PM to-Admins: [rawmsg]") + to_chat(src, span_notice("PM to-Admins: [rawmsg]")) var/datum/admin_help/AH = admin_ticket_log(src, "Reply PM from-[key_name(src, TRUE, TRUE)] to IRC: [keywordparsedmsg]") ircreplyamount-- send2irc("[AH ? "#[AH.id] " : ""]Reply: [ckey]", rawmsg) else if(recipient.holder) if(holder) //both are admins - to_chat(recipient, "Admin PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]") - to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [keywordparsedmsg]") + to_chat(recipient, span_danger("Admin PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]")) + to_chat(src, span_notice("Admin PM to-[key_name(recipient, src, 1)]: [keywordparsedmsg]")) //omg this is dumb, just fill in both their tickets var/interaction_message = "PM from-[key_name(src, recipient, 1)] to-[key_name(recipient, src, 1)]: [keywordparsedmsg]" @@ -164,8 +164,8 @@ else //recipient is an admin but sender is not var/replymsg = "Reply PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]" admin_ticket_log(src, "[replymsg]") - to_chat(recipient, "[replymsg]") - to_chat(src, "PM to-Admins: [msg]") + to_chat(recipient, span_danger("[replymsg]")) + to_chat(src, span_notice("PM to-Admins: [msg]")) //play the receiving admin the adminhelp sound (if they have them enabled) if(recipient.prefs.toggles & SOUND_ADMINHELP) @@ -177,9 +177,9 @@ new /datum/admin_help(msg, recipient, TRUE) to_chat(recipient, "-- Administrator private message --") - to_chat(recipient, "Admin PM from-[key_name(src, recipient, 0)]: [msg]") - to_chat(recipient, "Click on the administrator's name to reply.") - to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [msg]") + to_chat(recipient, span_adminsay("Admin PM from-[key_name(src, recipient, 0)]: [msg]")) + to_chat(recipient, span_adminsay("Click on the administrator's name to reply.")) + to_chat(src, span_notice("Admin PM to-[key_name(recipient, src, 1)]: [msg]")) admin_ticket_log(recipient, "PM From [key_name_admin(src)]: [keywordparsedmsg]") @@ -191,20 +191,20 @@ INVOKE_ASYNC(src, PROC_REF(popup_admin_pm), recipient, msg) else //neither are admins - to_chat(src, "Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.") + to_chat(src, span_danger("Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.")) return if(irc) log_admin_private("PM: [key_name(src)]->IRC: [rawmsg]") for(var/client/X in GLOB.admins) - to_chat(X, "PM: [key_name(src, X, 0)]->IRC: [keywordparsedmsg]") + to_chat(X, span_notice("PM: [key_name(src, X, 0)]->IRC: [keywordparsedmsg]")) else window_flash(recipient, ignorepref = TRUE) log_admin_private("PM: [key_name(src)]->[key_name(recipient)]: [rawmsg]") //we don't use message_admins here because the sender/receiver might get it too for(var/client/X in GLOB.admins) if(X.key!=key && X.key!=recipient.key) //check client/X is an admin and isn't the sender or recipient - to_chat(X, "PM: [key_name(src, X, 0)]->[key_name(recipient, X, 0)]: [keywordparsedmsg]" ) + to_chat(X, span_notice("PM: [key_name(src, X, 0)]->[key_name(recipient, X, 0)]: [keywordparsedmsg]") ) /client/proc/popup_admin_pm(client/recipient, msg) var/sender = src @@ -295,8 +295,8 @@ msg = emoji_parse(msg) to_chat(C, "-- Administrator private message --") - to_chat(C, "Admin PM from-[adminname]: [msg]") - to_chat(C, "Click on the administrator's name to reply.") + to_chat(C, span_adminsay("Admin PM from-[adminname]: [msg]")) + to_chat(C, span_adminsay("Click on the administrator's name to reply.")) admin_ticket_log(C, "PM From [irc_tagged]: [msg]") diff --git a/code/modules/admin/verbs/borgpanel.dm b/code/modules/admin/verbs/borgpanel.dm index ef08a43e5..1e932f8c9 100644 --- a/code/modules/admin/verbs/borgpanel.dm +++ b/code/modules/admin/verbs/borgpanel.dm @@ -10,7 +10,7 @@ if (!istype(borgo, /mob/living/silicon/robot)) borgo = input("Select a borg", "Select a borg", null, null) as null|anything in sortNames(GLOB.silicon_mobs) if (!istype(borgo, /mob/living/silicon/robot)) - to_chat(usr, "Borg is required for borgpanel") + to_chat(usr, span_warning("Borg is required for borgpanel")) var/datum/borgpanel/borgpanel = new(usr, borgo) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index b445ad443..a6ab21c31 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -8,7 +8,7 @@ if(!mob) return if(prefs.muted & MUTE_DEADCHAT) - to_chat(src, "I cannot send DSAY messages (muted).") + to_chat(src, span_danger("I cannot send DSAY messages (muted).")) return if (handle_spam_prevention(msg,MUTE_DEADCHAT)) @@ -24,7 +24,7 @@ if(holder.fakekey) rank_name = pick(strings("admin_nicknames.json", "ranks", "config")) admin_name = pick(strings("admin_nicknames.json", "names", "config")) - var/rendered = "DEAD: [rank_name]([admin_name]) says, \"[emoji_parse(msg)]\"" + var/rendered = span_gamedeadsay("DEAD: [rank_name]([admin_name]) says, \"[emoji_parse(msg)]\"") for (var/mob/M in GLOB.player_list) if(isnewplayer(M)) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index f4cdb1260..b1a84db71 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -131,7 +131,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that INVOKE_ASYNC(M, TYPE_PROC_REF(/mob/living/carbon/human, Alienize)) SSblackbox.record_feedback("tally", "admin_verb", 1, "Make Alien") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] made [key_name(M)] into an alien at [AREACOORD(M)].") - message_admins("[key_name_admin(usr)] made [ADMIN_LOOKUPFLW(M)] into an alien.") + message_admins(span_adminnotice("[key_name_admin(usr)] made [ADMIN_LOOKUPFLW(M)] into an alien.")) else alert("Invalid mob") @@ -146,7 +146,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that INVOKE_ASYNC(M, TYPE_PROC_REF(/mob/living/carbon/human, slimeize)) SSblackbox.record_feedback("tally", "admin_verb", 1, "Make Slime") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] made [key_name(M)] into a slime at [AREACOORD(M)].") - message_admins("[key_name_admin(usr)] made [ADMIN_LOOKUPFLW(M)] into a slime.") + message_admins(span_adminnotice("[key_name_admin(usr)] made [ADMIN_LOOKUPFLW(M)] into a slime.")) else alert("Invalid mob") @@ -224,7 +224,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that alert("Invalid mob") SSblackbox.record_feedback("tally", "admin_verb", 1, "Grant Full Access") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(src)] has granted [M.key] full access.") - message_admins("[key_name_admin(usr)] has granted [M.key] full access.") + message_admins(span_adminnotice("[key_name_admin(usr)] has granted [M.key] full access.")) /client/proc/cmd_assume_direct_control(mob/M in GLOB.mob_list) set category = "Admin" @@ -237,7 +237,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that else var/mob/dead/observer/ghost = new/mob/dead/observer(M,1) ghost.ckey = M.ckey - message_admins("[key_name_admin(usr)] assumed direct control of [M].") + message_admins(span_adminnotice("[key_name_admin(usr)] assumed direct control of [M].")) log_admin("[key_name(usr)] assumed direct control of [M].") var/mob/adminmob = src.mob M.ckey = src.ckey @@ -255,7 +255,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that to_chat(usr, "Game still loading, please hold!") return - message_admins("[key_name_admin(usr)] used the Test Atmos Monitor debug command.") + message_admins(span_adminnotice("[key_name_admin(usr)] used the Test Atmos Monitor debug command.")) log_admin("[key_name(usr)] used the Test Atmos Monitor debug command.") var/bad_shit = 0 @@ -308,7 +308,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that else log_message = "all z-levels" - message_admins("[key_name_admin(usr)] used the Test Areas debug command checking [log_message].") + message_admins(span_adminnotice("[key_name_admin(usr)] used the Test Areas debug command checking [log_message].")) log_admin("[key_name(usr)] used the Test Areas debug command checking [log_message].") for(var/area/A in world) @@ -491,7 +491,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that H.regenerate_icons() log_admin("[key_name(usr)] changed the equipment of [key_name(H)] to [dresscode].") - message_admins("[key_name_admin(usr)] changed the equipment of [ADMIN_LOOKUPFLW(H)] to [dresscode].") + message_admins(span_adminnotice("[key_name_admin(usr)] changed the equipment of [ADMIN_LOOKUPFLW(H)] to [dresscode].")) /client/proc/robust_dress_shop() @@ -723,8 +723,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(istype(landmark)) var/datum/map_template/ruin/template = landmark.ruin_template usr.forceMove(get_turf(landmark)) - to_chat(usr, "[template.name]") - to_chat(usr, "[template.description]") + to_chat(usr, span_name("[template.name]")) + to_chat(usr, span_italics("[template.description]")) /client/proc/place_ruin() set category = "Debug" @@ -765,10 +765,10 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/obj/effect/landmark/ruin/landmark = GLOB.ruin_landmarks[GLOB.ruin_landmarks.len] log_admin("[key_name(src)] randomly spawned ruin [ruinname] at [COORD(landmark)].") usr.forceMove(get_turf(landmark)) - to_chat(src, "[template.name]") - to_chat(src, "[template.description]") + to_chat(src, span_name("[template.name]")) + to_chat(src, span_italics("[template.description]")) else - to_chat(src, "Failed to place [template.name].") + to_chat(src, span_warning("Failed to place [template.name].")) /client/proc/clear_dynamic_transit() set category = "Debug" @@ -779,7 +779,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/answer = alert("WARNING: THIS WILL WIPE ALL RESERVED SPACE TO A CLEAN SLATE! ANY MOVING SHUTTLES, ELEVATORS, OR IN-PROGRESS PHOTOGRAPHY WILL BE DELETED!", "Really wipe dynamic turfs?", "YES", "NO") if(answer != "YES") return - message_admins("[key_name_admin(src)] cleared dynamic transit space.") + message_admins(span_adminnotice("[key_name_admin(src)] cleared dynamic transit space.")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Clear Dynamic Transit") // If... log_admin("[key_name(src)] cleared dynamic transit space.") SSmapping.wipe_reservations() //this goes after it's logged, incase something horrible happens. @@ -794,7 +794,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that SSachievements.hub_enabled = !SSachievements.hub_enabled - message_admins("[key_name_admin(src)] [SSachievements.hub_enabled ? "disabled" : "enabled"] the medal hub lockout.") + message_admins(span_adminnotice("[key_name_admin(src)] [SSachievements.hub_enabled ? "disabled" : "enabled"] the medal hub lockout.")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Toggle Medal Disable") // If... log_admin("[key_name(src)] [SSachievements.hub_enabled ? "disabled" : "enabled"] the medal hub lockout.") @@ -817,7 +817,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that SSevents.scheduled = world.time - message_admins("[key_name_admin(src)] pumped a random event.") + message_admins(span_adminnotice("[key_name_admin(src)] pumped a random event.")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Pump Random Event") log_admin("[key_name(src)] pumped a random event.") @@ -828,7 +828,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that LINE_PROFILE_START - message_admins("[key_name_admin(src)] started line by line profiling.") + message_admins(span_adminnotice("[key_name_admin(src)] started line by line profiling.")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Start Line Profiling") log_admin("[key_name(src)] started line by line profiling.") @@ -839,7 +839,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that LINE_PROFILE_STOP - message_admins("[key_name_admin(src)] stopped line by line profiling.") + message_admins(span_adminnotice("[key_name_admin(src)] stopped line by line profiling.")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Stop Line Profiling") log_admin("[key_name(src)] stopped line by line profiling.") diff --git a/code/modules/admin/verbs/fps.dm b/code/modules/admin/verbs/fps.dm index cd322e3aa..d4a58dcb6 100644 --- a/code/modules/admin/verbs/fps.dm +++ b/code/modules/admin/verbs/fps.dm @@ -11,7 +11,7 @@ var/new_fps = round(input("Sets game frames-per-second. Can potentially break the game (default: [cfg_fps])","FPS", world.fps) as num|null) if(new_fps <= 0) - to_chat(src, "Error: set_server_fps(): Invalid world.fps value. No changes made.") + to_chat(src, span_danger("Error: set_server_fps(): Invalid world.fps value. No changes made.")) return if(new_fps > cfg_fps * 1.5) if(alert(src, "You are setting fps to a high value:\n\t[new_fps] frames-per-second\n\tconfig.fps = [cfg_fps]","Warning!","Confirm","ABORT-ABORT-ABORT") != "Confirm") diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm index f4638172e..9f2ffed18 100644 --- a/code/modules/admin/verbs/map_template_loadverb.dm +++ b/code/modules/admin/verbs/map_template_loadverb.dm @@ -21,7 +21,7 @@ images += preview if(alert(src,"Confirm location.","Template Confirm","Yes","No") == "Yes") if(template.load(T, centered = TRUE)) - message_admins("[key_name_admin(src)] has placed a map template ([template.name]) at [ADMIN_COORDJMP(T)]") + message_admins(span_adminnotice("[key_name_admin(src)] has placed a map template ([template.name]) at [ADMIN_COORDJMP(T)]")) else to_chat(src, "Failed to place map") images -= preview @@ -34,7 +34,7 @@ if(!map) return if(copytext("[map]",-4) != ".dmm") - to_chat(src, "Filename must end in '.dmm': [map]") + to_chat(src, span_warning("Filename must end in '.dmm': [map]")) return var/datum/map_template/M switch(alert(src, "What kind of map is this?", "Map type", "Normal", "Shuttle", "Cancel")) @@ -45,7 +45,7 @@ else return if(!M.cached_map) - to_chat(src, "Map template '[map]' failed to parse properly.") + to_chat(src, span_warning("Map template '[map]' failed to parse properly.")) return var/datum/map_report/report = M.cached_map.check_for_errors() @@ -53,7 +53,7 @@ if(report) report.show_to(src) report_link = " - validation report" - to_chat(src, "Map template '[map]' failed validation.") + to_chat(src, span_warning("Map template '[map]' failed validation.")) if(report.loadable) var/response = alert(src, "The map failed validation, would you like to load it anyways?", "Map Errors", "Cancel", "Upload Anyways") if(response != "Upload Anyways") @@ -63,5 +63,5 @@ return SSmapping.map_templates[M.name] = M - message_admins("[key_name_admin(src)] has uploaded a map template '[map]' ([M.width]x[M.height])[report_link].") - to_chat(src, "Map template '[map]' ready to place ([M.width]x[M.height])") + message_admins(span_adminnotice("[key_name_admin(src)] has uploaded a map template '[map]' ([M.width]x[M.height])[report_link].")) + to_chat(src, span_notice("Map template '[map]' ready to place ([M.width]x[M.height])")) diff --git a/code/modules/admin/verbs/maprotation.dm b/code/modules/admin/verbs/maprotation.dm index afdf22da9..af16ecaeb 100644 --- a/code/modules/admin/verbs/maprotation.dm +++ b/code/modules/admin/verbs/maprotation.dm @@ -52,7 +52,7 @@ return if(copytext("[map_file]",-4) != ".dmm") - to_chat(src, "Filename must end in '.dmm': [map_file]") + to_chat(src, span_warning("Filename must end in '.dmm': [map_file]")) return if(!fcopy(map_file, "_maps/custom/[map_file]")) @@ -61,11 +61,11 @@ // This is to make sure the map works so the server does not start without a map. var/datum/parsed_map/M = new (map_file) if(!M) - to_chat(src, "Map '[map_file]' failed to parse properly.") + to_chat(src, span_warning("Map '[map_file]' failed to parse properly.")) return if(!M.bounds) - to_chat(src, "Map '[map_file]' has non-existant bounds.") + to_chat(src, span_warning("Map '[map_file]' has non-existant bounds.")) qdel(M) return @@ -78,7 +78,7 @@ if(!shuttle) continue if(!SSmapping.shuttle_templates[shuttle]) - to_chat(usr, "No such shuttle as '[shuttle]' exists, using default.") + to_chat(usr, span_warning("No such shuttle as '[shuttle]' exists, using default.")) continue VM.shuttles[s] = shuttle diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 64c38a3c5..1a3ceee2c 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -5,7 +5,7 @@ GLOBAL_VAR_INIT(highlander, FALSE) return GLOB.highlander = TRUE - send_to_playing_players("THERE CAN BE ONLY ONE") + send_to_playing_players(span_boldannounce("THERE CAN BE ONLY ONE")) for(var/obj/item/disk/nuclear/N in GLOB.poi_list) var/datum/component/stationloving/component = N.GetComponent(/datum/component/stationloving) @@ -17,13 +17,13 @@ GLOBAL_VAR_INIT(highlander, FALSE) continue H.make_scottish() - message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ONE!") + message_admins(span_adminnotice("[key_name_admin(usr)] used THERE CAN BE ONLY ONE!")) log_admin("[key_name(usr)] used THERE CAN BE ONLY ONE.") addtimer(CALLBACK(SSshuttle.emergency, TYPE_PROC_REF(/obj/docking_port/mobile/emergency, request), null, 1), 50) /client/proc/only_one_delayed() - send_to_playing_players("Bagpipes begin to blare. You feel Scottish pride coming over you.") - message_admins("[key_name_admin(usr)] used (delayed) THERE CAN BE ONLY ONE!") + send_to_playing_players(span_danger("Bagpipes begin to blare. You feel Scottish pride coming over you.")) + message_admins(span_adminnotice("[key_name_admin(usr)] used (delayed) THERE CAN BE ONLY ONE!")) log_admin("[key_name(usr)] used delayed THERE CAN BE ONLY ONE.") addtimer(CALLBACK(src, PROC_REF(only_one)), 420) diff --git a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm index fc0cab66c..1fbcd139a 100644 --- a/code/modules/admin/verbs/panicbunker.dm +++ b/code/modules/admin/verbs/panicbunker.dm @@ -2,7 +2,7 @@ set category = "Server" set name = "Toggle Panic Bunker" if (!CONFIG_GET(flag/sql_enabled)) - to_chat(usr, "The Database is not enabled!") + to_chat(usr, span_adminnotice("The Database is not enabled!")) return var/new_pb = !CONFIG_GET(flag/panic_bunker) diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index b89c4d3e6..879e08e06 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -23,7 +23,7 @@ var/res = alert(usr, "Show the title of this song to the players?",, "Yes","No", "Cancel") switch(res) if("Yes") - to_chat(world, "An admin played: [S]") + to_chat(world, span_boldannounce("An admin played: [S]")) if("Cancel") return @@ -125,7 +125,7 @@ var/ytdl = CONFIG_GET(string/invoke_youtubedl) if(!ytdl) - to_chat(src, "Youtube-dl was not configured, action unavailable") //Check config.txt for the INVOKE_YOUTUBEDL value + to_chat(src, span_boldwarning("Youtube-dl was not configured, action unavailable")) //Check config.txt for the INVOKE_YOUTUBEDL value return var/web_sound_input = input("Enter content URL (supported sites only, leave blank to stop playing)", "Play Internet Sound via youtube-dl") as text|null @@ -137,8 +137,8 @@ web_sound_input = trim(web_sound_input) if(findtext(web_sound_input, ":") && !findtext(web_sound_input, GLOB.is_http_protocol)) - to_chat(src, "Non-http(s) URIs are not allowed.") - to_chat(src, "For youtube-dl shortcuts like ytsearch: please use the appropriate full url from the website.") + to_chat(src, span_boldwarning("Non-http(s) URIs are not allowed.")) + to_chat(src, span_warning("For youtube-dl shortcuts like ytsearch: please use the appropriate full url from the website.")) return var/shell_scrubbed_input = shell_url_scrub(web_sound_input) var/list/output = world.shelleo("[ytdl] --geo-bypass --format \"bestaudio\[ext=mp3]/best\[ext=mp4]\[height<=360]/bestaudio\[ext=m4a]/bestaudio\[ext=aac]\" --dump-single-json --no-playlist -- \"[shell_scrubbed_input]\"") @@ -150,8 +150,8 @@ try data = json_decode(stdout) catch(var/exception/e) - to_chat(src, "Youtube-dl JSON parsing FAILED:") - to_chat(src, "[e]: [stdout]") + to_chat(src, span_boldwarning("Youtube-dl JSON parsing FAILED:")) + to_chat(src, span_warning("[e]: [stdout]")) return if (data["url"]) @@ -166,7 +166,7 @@ var/res = alert(usr, "Show the title of and link to this song to the players?\n[title]",, "No", "Yes", "Cancel") switch(res) if("Yes") - to_chat(world, "An admin played: [webpage_url]") + to_chat(world, span_boldannounce("An admin played: [webpage_url]")) if("Cancel") return @@ -174,8 +174,8 @@ log_admin("[key_name(src)] played web sound: [web_sound_input]") message_admins("[key_name(src)] played web sound: [web_sound_input]") else - to_chat(src, "Youtube-dl URL retrieval FAILED:") - to_chat(src, "[stderr]") + to_chat(src, span_boldwarning("Youtube-dl URL retrieval FAILED:")) + to_chat(src, span_warning("[stderr]")) else //pressed ok with blank log_admin("[key_name(src)] stopped web sound") @@ -184,8 +184,8 @@ stop_web_sounds = TRUE if(web_sound_url && !findtext(web_sound_url, GLOB.is_http_protocol)) - to_chat(src, "BLOCKED: Content URL not using http(s) protocol") - to_chat(src, "The media provider returned a content URL that isn't using the HTTP or HTTPS protocol") + to_chat(src, span_boldwarning("BLOCKED: Content URL not using http(s) protocol")) + to_chat(src, span_warning("The media provider returned a content URL that isn't using the HTTP or HTTPS protocol")) return if(web_sound_url || stop_web_sounds) for(var/m in GLOB.player_list) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index accce52cc..7f43ed24c 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -6,7 +6,7 @@ return if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, span_danger("Speech is currently admin-disabled.")) return msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN) @@ -15,7 +15,7 @@ log_prayer("[src.key]/([src.name]): [msg]") // if(usr.client) // if(usr.client.prefs.muted & MUTE_PRAY) -// to_chat(usr, "I cannot pray (muted).") +// to_chat(usr, span_danger("I cannot pray (muted).")) // return // if(src.client.handle_spam_prevention(msg,MUTE_PRAY)) // return @@ -46,7 +46,7 @@ prayer_type = "SPIRITUAL PRAYER" var/msg_tmp = msg - msg = "[icon2html(cross, GLOB.admins)][prayer_type][deity ? " (to [deity])" : ""]: [ADMIN_FULLMONTY(src)] [ADMIN_SC(src)]: [msg]" + msg = span_adminnotice("[icon2html(cross, GLOB.admins)][prayer_type][deity ? " (to [deity])" : ""]: [ADMIN_FULLMONTY(src)] [ADMIN_SC(src)]: [msg]") for(var/client/C in GLOB.admins) if(C.prefs.chat_toggles & CHAT_PRAYER) to_chat(C, msg) @@ -62,7 +62,7 @@ var/client/J = M.client to_chat(J, msg) - to_chat(usr, "I pray to the gods: \"[msg_tmp]\"") + to_chat(usr, span_info("I pray to the gods: \"[msg_tmp]\"")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //log_admin("HELP: [key_name(src)]: [msg]") @@ -72,21 +72,21 @@ /proc/CentCom_announce(text , mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) - msg = "CENTCOM:[ADMIN_FULLMONTY(Sender)] [ADMIN_CENTCOM_REPLY(Sender)]: [msg]" + msg = span_adminnotice("CENTCOM:[ADMIN_FULLMONTY(Sender)] [ADMIN_CENTCOM_REPLY(Sender)]: [msg]") to_chat(GLOB.admins, msg) for(var/obj/machinery/computer/communications/C in GLOB.machines) C.overrideCooldown() /proc/Syndicate_announce(text , mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) - msg = "SYNDICATE:[ADMIN_FULLMONTY(Sender)] [ADMIN_SYNDICATE_REPLY(Sender)]: [msg]" + msg = span_adminnotice("SYNDICATE:[ADMIN_FULLMONTY(Sender)] [ADMIN_SYNDICATE_REPLY(Sender)]: [msg]") to_chat(GLOB.admins, msg) for(var/obj/machinery/computer/communications/C in GLOB.machines) C.overrideCooldown() /proc/Nuke_request(text , mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) - msg = "NUKE CODE REQUEST:[ADMIN_FULLMONTY(Sender)] [ADMIN_CENTCOM_REPLY(Sender)] [ADMIN_SET_SD_CODE]: [msg]" + msg = span_adminnotice("NUKE CODE REQUEST:[ADMIN_FULLMONTY(Sender)] [ADMIN_CENTCOM_REPLY(Sender)] [ADMIN_SET_SD_CODE]: [msg]") to_chat(GLOB.admins, msg) for(var/obj/machinery/computer/communications/C in GLOB.machines) C.overrideCooldown() @@ -120,7 +120,7 @@ var/display_name = "[real_name || src.name]" - msg = "[display_name] prays[deity] [ADMIN_FLW(src)][ADMIN_SM(src)]: [msg]" + msg = span_info("[display_name] prays[deity] [ADMIN_FLW(src)][ADMIN_SM(src)]: [msg]") for(var/client/janny in GLOB.admins) if(janny.prefs.chat_toggles & CHAT_PRAYER) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 58752e594..b2e10b394 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -40,7 +40,7 @@ to_chat(M, "I hear a voice in my head...\n[msg]") log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]") - msg = " SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]" + msg = span_adminnotice(" SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]") message_admins(msg) admin_ticket_log(M, msg) SSblackbox.record_feedback("tally", "admin_verb", 1, "Subtle Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -78,7 +78,7 @@ log_directed_talk(mob, H, input, LOG_ADMIN, "reply") message_admins("[key_name_admin(src)] replied to [key_name_admin(H)]'s [sender] message with: \"[input]\"") - to_chat(H, "I hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender == "Syndicate" ? "your benefactor" : "Central Command"]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] [input]. Message ends.\"") + to_chat(H, span_hear("I hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender == "Syndicate" ? "your benefactor" : "Central Command"]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] [input]. Message ends.\"")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Headset Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -125,7 +125,7 @@ SSpersistence.antag_rep -= C.ckey log_admin("[key_name(usr)]: Modified [key_name(C)]'s antagonist reputation [log_text]") - message_admins("[key_name_admin(usr)]: Modified [key_name(C)]'s antagonist reputation ([log_text])") + message_admins(span_adminnotice("[key_name_admin(usr)]: Modified [key_name(C)]'s antagonist reputation ([log_text])")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Modify Antagonist Reputation") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_world_narrate() @@ -141,7 +141,7 @@ return to_chat(world, "[msg]") log_admin("GlobalNarrate: [key_name(usr)] : [msg]") - message_admins("[key_name_admin(usr)] Sent a global narrate") + message_admins(span_adminnotice("[key_name_admin(usr)] Sent a global narrate")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Global Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_direct_narrate(mob/M) @@ -164,7 +164,7 @@ to_chat(M, msg) log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]") - msg = " DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
" + msg = span_adminnotice(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
") message_admins(msg) admin_ticket_log(M, msg) SSblackbox.record_feedback("tally", "admin_verb", 1, "Direct Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -187,7 +187,7 @@ to_chat(M, msg) log_admin("LocalNarrate: [key_name(usr)] at [AREACOORD(A)]: [msg]") - message_admins(" LocalNarrate: [key_name_admin(usr)] at [ADMIN_VERBOSEJMP(A)]: [msg]
") + message_admins(span_adminnotice(" LocalNarrate: [key_name_admin(usr)] at [ADMIN_VERBOSEJMP(A)]: [msg]
")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_godmode(mob/M in GLOB.mob_list) @@ -197,7 +197,7 @@ return M.status_flags ^= GODMODE - to_chat(usr, "Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]") + to_chat(usr, span_adminnotice("Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]")) log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]") var/msg = "[key_name_admin(usr)] has toggled [ADMIN_LOOKUPFLW(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]" @@ -299,7 +299,7 @@ if(candidates.len) ckey = input("Pick the player you want to respawn as a xeno.", "Suitable Candidates") as null|anything in sortKey(candidates) else - to_chat(usr, "Error: create_xeno(): no suitable candidates.") + to_chat(usr, span_danger("Error: create_xeno(): no suitable candidates.")) if(!istext(ckey)) return 0 @@ -325,7 +325,7 @@ SSjob.SendToLateJoin(new_xeno, FALSE) new_xeno.ckey = ckey - var/msg = "[key_name_admin(usr)] has spawned [ckey] as a filthy xeno [alien_caste]." + var/msg = span_notice("[key_name_admin(usr)] has spawned [ckey] as a filthy xeno [alien_caste].") message_admins(msg) admin_ticket_log(new_xeno, msg) return 1 @@ -387,7 +387,7 @@ Traitors and the like can also be revived with the previous role mostly intact. G_found.mind.transfer_to(new_xeno) //be careful when doing stuff like this! I've already checked the mind isn't in use new_xeno.key = G_found.key to_chat(new_xeno, "You have been fully respawned. Enjoy the game.") - var/msg = "[key_name_admin(usr)] has respawned [new_xeno.key] as a filthy xeno." + var/msg = span_adminnotice("[key_name_admin(usr)] has respawned [new_xeno.key] as a filthy xeno.") message_admins(msg) admin_ticket_log(new_xeno, msg) return //all done. The ghost is auto-deleted @@ -400,7 +400,7 @@ Traitors and the like can also be revived with the previous role mostly intact. G_found.mind.transfer_to(new_monkey) //be careful when doing stuff like this! I've already checked the mind isn't in use new_monkey.key = G_found.key to_chat(new_monkey, "You have been fully respawned. Enjoy the game.") - var/msg = "[key_name_admin(usr)] has respawned [new_monkey.key] as a filthy xeno." + var/msg = span_adminnotice("[key_name_admin(usr)] has respawned [new_monkey.key] as a filthy xeno.") message_admins(msg) admin_ticket_log(new_monkey, msg) return //all done. The ghost is auto-deleted @@ -494,7 +494,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(alert(new_character,"Would you like an active AI to announce this character?",,"No","Yes")=="Yes") AnnounceArrival(new_character, new_character.mind.assigned_role) - var/msg = "[admin] has respawned [player_key] as [new_character.real_name]." + var/msg = span_adminnotice("[admin] has respawned [player_key] as [new_character.real_name].") message_admins(msg) admin_ticket_log(new_character, msg) @@ -542,7 +542,7 @@ Traitors and the like can also be revived with the previous role mostly intact. M.revive(full_heal = TRUE, admin_revive = TRUE) log_admin("[key_name(usr)] healed / revived [key_name(M)]") - var/msg = "Admin [key_name_admin(usr)] healed / revived [ADMIN_LOOKUPFLW(M)]!" + var/msg = span_danger("Admin [key_name_admin(usr)] healed / revived [ADMIN_LOOKUPFLW(M)]!") message_admins(msg) admin_ticket_log(M, msg) SSblackbox.record_feedback("tally", "admin_verb", 1, "Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -699,7 +699,7 @@ Traitors and the like can also be revived with the previous role mostly intact. var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No") if(confirm == "Yes") log_admin("[key_name(usr)] used gibself.") - message_admins("[key_name_admin(usr)] used gibself.") + message_admins(span_adminnotice("[key_name_admin(usr)] used gibself.")) SSblackbox.record_feedback("tally", "admin_verb", 1, "Gib Self") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! mob.gib(1, 1, 1) @@ -746,7 +746,7 @@ Traitors and the like can also be revived with the previous role mostly intact. SSshuttle.emergency.request() SSblackbox.record_feedback("tally", "admin_verb", 1, "Call Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-called the emergency shuttle.") - message_admins("[key_name_admin(usr)] admin-called the emergency shuttle.") + message_admins(span_adminnotice("[key_name_admin(usr)] admin-called the emergency shuttle.")) return /client/proc/admin_cancel_shuttle() @@ -764,7 +764,7 @@ Traitors and the like can also be revived with the previous role mostly intact. SSshuttle.emergency.cancel() SSblackbox.record_feedback("tally", "admin_verb", 1, "Cancel Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-recalled the emergency shuttle.") - message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.") + message_admins(span_adminnotice("[key_name_admin(usr)] admin-recalled the emergency shuttle.")) return @@ -793,7 +793,7 @@ Traitors and the like can also be revived with the previous role mostly intact. message_admins("Admin [key_name_admin(usr)] has forced the players to have random appearances.") if(notifyplayers == "Yes") - to_chat(world, "Admin [usr.key] has forced the players to have completely random identities!") + to_chat(world, span_adminnotice("Admin [usr.key] has forced the players to have completely random identities!")) to_chat(usr, "Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet.") @@ -978,7 +978,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!M) continue - M.audible_message("...wabbajack...wabbajack...") + M.audible_message(span_hear("...wabbajack...wabbajack...")) playsound(M.loc, 'sound/blank.ogg', 50, TRUE, -1) wabbajack(M) @@ -1076,7 +1076,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(ishuman(target)) var/mob/living/carbon/human/H = target H.electrocution_animation(40) - to_chat(target, "The gods have punished you for your sins!") + to_chat(target, span_danger("The gods have punished you for your sins!")) if(ADMIN_PUNISHMENT_BRAINDAMAGE) target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 199, 199) if(ADMIN_PUNISHMENT_GIB) @@ -1124,11 +1124,11 @@ Traitors and the like can also be revived with the previous role mostly intact. if(ADMIN_PUNISHMENT_MAZING) if(!puzzle_imprison(target)) - to_chat(usr,"Imprisonment failed!") + to_chat(usr,span_warning("Imprisonment failed!")) return if(ADMIN_PUNISHMENT_BRAZIL) if(!ishuman(target)) - to_chat(usr,"Target must be human!") + to_chat(usr,span_warning("Target must be human!")) return var/mob/living/carbon/human/ligga = target ligga.emote("painscream") @@ -1145,25 +1145,25 @@ Traitors and the like can also be revived with the previous role mostly intact. ) for(var/slot in bad_slots) ligga.dropItemToGround(ligga.get_item_by_slot(slot)) - to_chat(ligga, "I have been sent to Brazil!") + to_chat(ligga, span_userdanger("I have been sent to Brazil!")) if(ADMIN_PUNISHMENT_CBT) if(!ishuman(target)) - to_chat(usr,"Target must be human!") + to_chat(usr,span_warning("Target must be human!")) return var/mob/living/carbon/human/humie = target var/obj/item/bodypart/affecting = humie.get_bodypart(BODY_ZONE_CHEST) if(!affecting) - to_chat(usr,"Target must have a chest!") + to_chat(usr,span_warning("Target must have a chest!")) return affecting.add_wound(/datum/wound/cbt/permanent) if(ADMIN_PUNISHMENT_NECKSNAP) if(!ishuman(target)) - to_chat(usr,"Target must be human!") + to_chat(usr,span_warning("Target must be human!")) return var/mob/living/carbon/human/humie = target var/obj/item/bodypart/affecting = humie.get_bodypart(BODY_ZONE_HEAD) if(!affecting) - to_chat(usr,"Target must have a head!") + to_chat(usr,span_warning("Target must have a head!")) return affecting.add_wound(/datum/wound/fracture/neck) punish_log(target, punishment) @@ -1194,7 +1194,7 @@ Traitors and the like can also be revived with the previous role mostly intact. return if(!CONFIG_GET(flag/use_exp_tracking)) - to_chat(usr, "Tracking is disabled in the server configuration file.") + to_chat(usr, span_warning("Tracking is disabled in the server configuration file.")) return var/list/msg = list() @@ -1208,10 +1208,10 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(R_ADMIN)) return if(!C) - to_chat(usr, "ERROR: Client not found.") + to_chat(usr, span_danger("ERROR: Client not found.")) return if(!CONFIG_GET(flag/use_exp_tracking)) - to_chat(usr, "Tracking is disabled in the server configuration file.") + to_chat(usr, span_warning("Tracking is disabled in the server configuration file.")) return var/list/body = list() @@ -1225,11 +1225,11 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(R_ADMIN)) return if(!C) - to_chat(usr, "ERROR: Client not found.") + to_chat(usr, span_danger("ERROR: Client not found.")) return if(!C.set_db_player_flags()) - to_chat(usr, "ERROR: Unable read player flags from database. Please check logs.") + to_chat(usr, span_danger("ERROR: Unable read player flags from database. Please check logs.")) var/dbflags = C.prefs.db_flags var/newstate = FALSE if(dbflags & DB_FLAG_EXEMPT) @@ -1238,7 +1238,7 @@ Traitors and the like can also be revived with the previous role mostly intact. newstate = TRUE if(C.update_flag_db(DB_FLAG_EXEMPT, newstate)) - to_chat(usr, "ERROR: Unable to update player flags. Please check logs.") + to_chat(usr, span_danger("ERROR: Unable to update player flags. Please check logs.")) else message_admins("[key_name_admin(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name_admin(C)]") log_admin("[key_name(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name(C)]") diff --git a/code/modules/admin/verbs/reestablish_db_connection.dm b/code/modules/admin/verbs/reestablish_db_connection.dm index a53a5d04c..bd4943456 100644 --- a/code/modules/admin/verbs/reestablish_db_connection.dm +++ b/code/modules/admin/verbs/reestablish_db_connection.dm @@ -2,7 +2,7 @@ set category = "Special Verbs" set name = "Reestablish DB Connection" if (!CONFIG_GET(flag/sql_enabled)) - to_chat(usr, "The Database is not enabled!") + to_chat(usr, span_adminnotice("The Database is not enabled!")) return if (SSdbcore.IsConnected()) diff --git a/code/modules/admin/verbs/schizohelp.dm b/code/modules/admin/verbs/schizohelp.dm index 280d176fa..22a8c442d 100644 --- a/code/modules/admin/verbs/schizohelp.dm +++ b/code/modules/admin/verbs/schizohelp.dm @@ -10,21 +10,21 @@ GLOBAL_LIST_EMPTY_TYPED(schizohelps, /datum/schizohelp) if(!msg) return - to_chat(src, "You meditate...\n[msg]") + to_chat(src, span_info("You meditate...\n[msg]")) var/datum/schizohelp/ticket = new(src) var/display_name = get_schizo_name() - var/message = "[display_name] meditates...\n[msg]" - var/message_admins = "[display_name] ([key || "NO KEY"]) [ADMIN_FLW(src)] [ADMIN_SM(src)] meditates...\n[msg]" + var/message = span_info("[display_name] meditates...\n[msg]") + var/message_admins = span_info("[display_name] ([key || "NO KEY"]) [ADMIN_FLW(src)] [ADMIN_SM(src)] meditates...\n[msg]") for(var/client/voice in (GLOB.clients - client)) if((client.prefs.toggles & SCHIZO_VOICE) || check_rights_for(voice, R_ADMIN)) continue - var/answer_button = "(ANSWER)" + var/answer_button = span_info("(ANSWER)") to_chat(voice, "[message] [answer_button]") for(var/client/admin in GLOB.admins) if(!(admin.prefs.chat_toggles & CHAT_PRAYER)) continue - var/answer_button = "(ANSWER)" + var/answer_button = span_info("(ANSWER)") to_chat(admin, "[message_admins] [answer_button]") COOLDOWN_START(src, schizohelp_cooldown, 1 MINUTES) @@ -55,13 +55,13 @@ GLOBAL_LIST_EMPTY_TYPED(schizohelps, /datum/schizohelp) /client/proc/answer_schizohelp(datum/schizohelp/schizo) if(QDELETED(schizo)) - to_chat(src, "This meditation can no longer be answered...") + to_chat(src, span_warning("This meditation can no longer be answered...")) return if(schizo.owner == src.mob) - to_chat(src, "I can't answer my own meditation!") + to_chat(src, span_warning("I can't answer my own meditation!")) return if(schizo.answers[src.key]) - to_chat(src, "I have already answered this meditation!") + to_chat(src, span_warning("I have already answered this meditation!")) return var/answer = input("Answer their meditations...", "VOICE") if(!answer || QDELETED(schizo)) @@ -100,7 +100,7 @@ GLOBAL_LIST_EMPTY_TYPED(schizohelps, /datum/schizohelp) for(var/client/admin in GLOB.admins) if(!(admin.prefs.chat_toggles & CHAT_PRAYER)) continue - to_chat(admin, "[voice] ([voice.key || "NO KEY"]) [ADMIN_FLW(owner)] [ADMIN_SM(owner)] answered [owner] ([owner.key || "NO KEY"])'s [ADMIN_FLW(owner)] [ADMIN_SM(owner)] meditation:\n[answer]") + to_chat(admin, span_info("[voice] ([voice.key || "NO KEY"]) [ADMIN_FLW(owner)] [ADMIN_SM(owner)] answered [owner] ([owner.key || "NO KEY"])'s [ADMIN_FLW(owner)] [ADMIN_SM(owner)] meditation:\n[answer]")) answers[voice.key] = answer if(length(answers) >= max_answers) qdel(src) diff --git a/code/modules/admin/verbs/tripAI.dm b/code/modules/admin/verbs/tripAI.dm index 7742d6ea6..1e9fbc474 100644 --- a/code/modules/admin/verbs/tripAI.dm +++ b/code/modules/admin/verbs/tripAI.dm @@ -13,8 +13,8 @@ if(SSticker.triai) SSticker.triai = 0 to_chat(usr, "Only one AI will be spawned at round start.") - message_admins("[key_name_admin(usr)] has toggled off triple AIs at round start.") + message_admins(span_adminnotice("[key_name_admin(usr)] has toggled off triple AIs at round start.")) else SSticker.triai = 1 to_chat(usr, "There will be an AI Triumvirate at round start.") - message_admins("[key_name_admin(usr)] has toggled on triple AIs at round start.") + message_admins(span_adminnotice("[key_name_admin(usr)] has toggled on triple AIs at round start.")) diff --git a/code/modules/admin/view_variables/topic_basic.dm b/code/modules/admin/view_variables/topic_basic.dm index 973be814f..033dd3a84 100644 --- a/code/modules/admin/view_variables/topic_basic.dm +++ b/code/modules/admin/view_variables/topic_basic.dm @@ -34,7 +34,7 @@ if (!C) return if(!target) - to_chat(usr, "The object you tried to expose to [C] no longer exists (nulled or hard-deled)") + to_chat(usr, span_warning("The object you tried to expose to [C] no longer exists (nulled or hard-deled)")) return message_admins("[key_name_admin(usr)] Showed [key_name_admin(C)] a VV window") log_admin("Admin [key_name(usr)] Showed [key_name(C)] a VV window of a [target]") @@ -74,6 +74,6 @@ datumname = "element" target.AddElement(arglist(lst)) log_admin("[key_name(usr)] has added [result] [datumname] to [key_name(src)].") - message_admins("[key_name_admin(usr)] has added [result] [datumname] to [key_name_admin(src)].") + message_admins(span_notice("[key_name_admin(usr)] has added [result] [datumname] to [key_name_admin(src)].")) if(href_list[VV_HK_CALLPROC]) usr.client.callproc_datum(target) diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm index 4211b86e0..00c5fbe89 100644 --- a/code/modules/admin/view_variables/view_variables.dm +++ b/code/modules/admin/view_variables/view_variables.dm @@ -5,7 +5,7 @@ var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round. if(!usr.client || !usr.client.holder) //This is usr because admins can call the proc on other clients, even if they're not admins, to show them VVs. - to_chat(usr, "I need to be an administrator to access this.") + to_chat(usr, span_danger("I need to be an administrator to access this.")) return if(!D) diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 762596e0f..def349a44 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -86,7 +86,7 @@ GLOBAL_LIST_EMPTY(antagonists) if(removing) // They're a clown becoming an antag, remove clumsy H.dna.remove_mutation(CLOWNMUT) if(!silent && message) - to_chat(H, "[message]") + to_chat(H, span_boldnotice("[message]")) else H.dna.add_mutation(CLOWNMUT) // We're removing their antag status, add back clumsy @@ -176,10 +176,10 @@ GLOBAL_LIST_EMPTY(antagonists) break if(objectives.len == 0 || objectives_complete) - report += "The [name] was successful!" + report += span_greentextbig("The [name] was successful!") else testing("redtext") - report += "The [name] has failed!" + report += span_redtextbig("The [name] has failed!") return report.Join("
") diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index d2a2d8a93..bd2526cd8 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -54,20 +54,20 @@ H.set_machine(src) if(href_list["school"]) if(used) - to_chat(H, "I already used this contract!") + to_chat(H, span_warning("I already used this contract!")) return var/list/candidates = pollCandidatesForMob("Do you want to play as a wizard's [href_list["school"]] apprentice?", ROLE_WIZARD, null, ROLE_WIZARD, 150, src) if(LAZYLEN(candidates)) if(QDELETED(src)) return if(used) - to_chat(H, "I already used this contract!") + to_chat(H, span_warning("I already used this contract!")) return used = TRUE var/mob/dead/observer/C = pick(candidates) spawn_antag(C.client, get_turf(src), href_list["school"],H.mind) else - to_chat(H, "Unable to reach my apprentice! You can either attack the spellbook with the contract to refund my points, or wait and try again later.") + to_chat(H, span_warning("Unable to reach my apprentice! You can either attack the spellbook with the contract to refund my points, or wait and try again later.")) /obj/item/antag_spawner/contract/spawn_antag(client/C, turf/T, kind ,datum/mind/user) new /obj/effect/particle_effect/smoke(T) @@ -105,13 +105,13 @@ /obj/item/antag_spawner/nuke_ops/proc/check_usability(mob/user) if(used) - to_chat(user, "[src] is out of power!") + to_chat(user, span_warning("[src] is out of power!")) return FALSE if(!user.mind.has_antag_datum(/datum/antagonist/nukeop,TRUE)) - to_chat(user, "AUTHENTICATION FAILURE. ACCESS DENIED.") + to_chat(user, span_danger("AUTHENTICATION FAILURE. ACCESS DENIED.")) return FALSE if(!user.onSyndieBase()) - to_chat(user, "[src] is out of range! It can only be used at my base!") + to_chat(user, span_warning("[src] is out of range! It can only be used at my base!")) return FALSE return TRUE @@ -120,7 +120,7 @@ if(!(check_usability(user))) return - to_chat(user, "I activate [src] and wait for confirmation.") + to_chat(user, span_notice("I activate [src] and wait for confirmation.")) var/list/nuke_candidates = pollGhostCandidates("Do you want to play as a syndicate [borg_to_spawn ? "[lowertext(borg_to_spawn)] cyborg":"operative"]?", ROLE_OPERATIVE, null, ROLE_OPERATIVE, 150, POLL_IGNORE_SYNDICATE) if(LAZYLEN(nuke_candidates)) if(QDELETED(src) || !check_usability(user)) @@ -131,7 +131,7 @@ do_sparks(4, TRUE, src) qdel(src) else - to_chat(user, "Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on my uplink to get my points refunded.") + to_chat(user, span_warning("Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on my uplink to get my points refunded.")) /obj/item/antag_spawner/nuke_ops/spawn_antag(client/C, turf/T, kind, datum/mind/user) var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) @@ -229,15 +229,15 @@ icon = 'icons/obj/wizard.dmi' icon_state = "vial" - var/shatter_msg = "I shatter the bottle, no turning back now!" - var/veil_msg = "I sense a dark presence lurking just beyond the veil..." + var/shatter_msg = span_notice("I shatter the bottle, no turning back now!") + var/veil_msg = span_warning("I sense a dark presence lurking just beyond the veil...") var/mob/living/demon_type = /mob/living/simple_animal/slaughter var/antag_type = /datum/antagonist/slaughter /obj/item/antag_spawner/slaughter_demon/attack_self(mob/user) if(!is_station_level(user.z)) - to_chat(user, "I should probably wait until you reach the station.") + to_chat(user, span_warning("I should probably wait until you reach the station.")) return if(used) return @@ -253,7 +253,7 @@ playsound(user.loc, 'sound/blank.ogg', 100, TRUE) qdel(src) else - to_chat(user, "I can't seem to work up the nerve to shatter the bottle! Perhaps you should try again later.") + to_chat(user, span_warning("I can't seem to work up the nerve to shatter the bottle! Perhaps you should try again later.")) /obj/item/antag_spawner/slaughter_demon/spawn_antag(client/C, turf/T, kind = "", datum/mind/user) @@ -275,6 +275,6 @@ icon_state = "vial" color = "#FF69B4" // HOT PINK - veil_msg = "I sense an adorable presence lurking just beyond the veil..." + veil_msg = span_warning("I sense an adorable presence lurking just beyond the veil...") demon_type = /mob/living/simple_animal/slaughter/laughter antag_type = /datum/antagonist/slaughter/laughter diff --git a/code/modules/antagonists/_common/antag_team.dm b/code/modules/antagonists/_common/antag_team.dm index 4a910ca4d..9d67035d9 100644 --- a/code/modules/antagonists/_common/antag_team.dm +++ b/code/modules/antagonists/_common/antag_team.dm @@ -38,12 +38,12 @@ GLOBAL_LIST_EMPTY(antagonist_teams) var/list/report = list() - report += "[name]:" + report += span_header("[name]:") report += "The [member_name]s were:" report += printplayerlist(members) if(objectives.len) - report += "Team had following objectives:" + report += span_header("Team had following objectives:") var/win = TRUE var/objective_count = 1 for(var/datum/objective/objective in objectives) @@ -54,9 +54,9 @@ GLOBAL_LIST_EMPTY(antagonist_teams) win = FALSE objective_count++ if(win) - report += "The [name] was successful!" + report += span_greentext("The [name] was successful!") else - report += "The [name] have failed!" + report += span_redtext("The [name] have failed!") return "
[report.Join("
")]
" diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm index d69352eb4..64c909e65 100644 --- a/code/modules/antagonists/abductor/abductor.dm +++ b/code/modules/antagonists/abductor/abductor.dm @@ -51,15 +51,15 @@ /datum/antagonist/abductor/on_removal() if(owner.current) - to_chat(owner.current,"I are no longer the [owner.special_role]!") + to_chat(owner.current,span_danger("I are no longer the [owner.special_role]!")) owner.special_role = null REMOVE_TRAIT(owner, TRAIT_ABDUCTOR_TRAINING, ABDUCTOR_ANTAGONIST) return ..() /datum/antagonist/abductor/greet() - to_chat(owner.current, "I are the [owner.special_role]!") - to_chat(owner.current, "With the help of my teammate, kidnap and experiment on station crew members!") - to_chat(owner.current, "[greet_text]") + to_chat(owner.current, span_notice("I are the [owner.special_role]!")) + to_chat(owner.current, span_notice("With the help of my teammate, kidnap and experiment on station crew members!")) + to_chat(owner.current, span_notice("[greet_text]")) owner.announce_objectives() /datum/antagonist/abductor/proc/finalize_abductor() @@ -111,7 +111,7 @@ /datum/antagonist/abductor/proc/admin_equip(mob/admin) if(!ishuman(owner.current)) - to_chat(admin, "This only works on humans!") + to_chat(admin, span_warning("This only works on humans!")) return var/mob/living/carbon/human/H = owner.current var/gear = alert(admin,"Agent or Scientist Gear","Gear","Agent","Scientist") @@ -149,11 +149,11 @@ if(!O.check_completion()) won = FALSE if(won) - result += "[name] team fulfilled its mission!" + result += span_greentextbig("[name] team fulfilled its mission!") else - result += "[name] team failed its mission." + result += span_redtextbig("[name] team failed its mission.") - result += "The abductors of [name] were:" + result += span_header("The abductors of [name] were:") for(var/datum/mind/abductor_mind in members) result += printplayer(abductor_mind) result += printobjectives(objectives) @@ -172,7 +172,7 @@ . = ..() /datum/antagonist/abductee/greet() - to_chat(owner, "My mind snaps!") + to_chat(owner, span_warning("My mind snaps!")) to_chat(owner, "I can't remember how you got here...") owner.announce_objectives() diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index d309563b9..43af36315 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -35,7 +35,7 @@ else ADD_TRAIT(src, TRAIT_NODROP, ABDUCTOR_VEST_TRAIT) if(ismob(loc)) - to_chat(loc, "My vest is now [HAS_TRAIT_FROM(src, TRAIT_NODROP, ABDUCTOR_VEST_TRAIT) ? "locked" : "unlocked"].") + to_chat(loc, span_notice("My vest is now [HAS_TRAIT_FROM(src, TRAIT_NODROP, ABDUCTOR_VEST_TRAIT) ? "locked" : "unlocked"].")) /obj/item/clothing/suit/armor/abductor/vest/proc/flip_mode() switch(mode) @@ -106,7 +106,7 @@ /obj/item/clothing/suit/armor/abductor/vest/proc/Adrenaline() if(ishuman(loc)) if(combat_cooldown != initial(combat_cooldown)) - to_chat(loc, "Combat injection is still recharging.") + to_chat(loc, span_warning("Combat injection is still recharging.")) return var/mob/living/carbon/human/M = loc M.adjustStaminaLoss(-75) @@ -142,7 +142,7 @@ return TRUE if (istype(user) && user.mind && HAS_TRAIT(user.mind, TRAIT_ABDUCTOR_TRAINING)) return TRUE - to_chat(user, "I can't figure how this works!") + to_chat(user, span_warning("I can't figure how this works!")) return FALSE /obj/item/abductor/proc/ScientistCheck(mob/user) @@ -150,10 +150,10 @@ var/sci_training = HAS_TRAIT(user, TRAIT_ABDUCTOR_SCIENTIST_TRAINING) || (user.mind && HAS_TRAIT(user.mind, TRAIT_ABDUCTOR_SCIENTIST_TRAINING)) if(training && !sci_training) - to_chat(user, "You're not trained to use this!") + to_chat(user, span_warning("You're not trained to use this!")) . = FALSE else if(!training && !sci_training) - to_chat(user, "I can't figure how this works!") + to_chat(user, span_warning("I can't figure how this works!")) . = FALSE else . = TRUE @@ -171,7 +171,7 @@ if(!ScientistCheck(user)) return if(!console) - to_chat(user, "The device is not linked to console!") + to_chat(user, span_warning("The device is not linked to console!")) return if(mode == GIZMO_SCAN) @@ -180,13 +180,13 @@ else mode = GIZMO_SCAN icon_state = "gizmo_scan" - to_chat(user, "I switch the device to [mode==GIZMO_SCAN? "SCAN": "MARK"] MODE") + to_chat(user, span_notice("I switch the device to [mode==GIZMO_SCAN? "SCAN": "MARK"] MODE")) /obj/item/abductor/gizmo/attack(mob/living/M, mob/user) if(!ScientistCheck(user)) return if(!console) - to_chat(user, "The device is not linked to console!") + to_chat(user, span_warning("The device is not linked to console!")) return switch(mode) @@ -203,7 +203,7 @@ if(!ScientistCheck(user)) return if(!console) - to_chat(user, "The device is not linked to console!") + to_chat(user, span_warning("The device is not linked to console!")) return switch(mode) @@ -215,26 +215,26 @@ /obj/item/abductor/gizmo/proc/scan(atom/target, mob/living/user) if(ishuman(target)) console.AddSnapshot(target) - to_chat(user, "I scan [target] and add [target.p_them()] to the database.") + to_chat(user, span_notice("I scan [target] and add [target.p_them()] to the database.")) /obj/item/abductor/gizmo/proc/mark(atom/target, mob/living/user) if(marked == target) - to_chat(user, "This specimen is already marked!") + to_chat(user, span_warning("This specimen is already marked!")) return if(isabductor(target) || iscow(target)) marked = target - to_chat(user, "I mark [target] for future retrieval.") + to_chat(user, span_notice("I mark [target] for future retrieval.")) else prepare(target,user) /obj/item/abductor/gizmo/proc/prepare(atom/target, mob/living/user) if(get_dist(target,user)>1) - to_chat(user, "I need to be next to the specimen to prepare it for transport!") + to_chat(user, span_warning("I need to be next to the specimen to prepare it for transport!")) return - to_chat(user, "I begin preparing [target] for transport...") + to_chat(user, span_notice("I begin preparing [target] for transport...")) if(do_after(user, 100, target = target)) marked = target - to_chat(user, "I finish preparing [target] for transport.") + to_chat(user, span_notice("I finish preparing [target] for transport.")) /obj/item/abductor/gizmo/Destroy() if(console) @@ -271,7 +271,7 @@ for(M in view(2,targloc)) if(M == user) continue - to_chat(user, "I silence [M]'s radio devices.") + to_chat(user, span_notice("I silence [M]'s radio devices.")) radio_off_mob(M) /obj/item/abductor/silencer/proc/radio_off_mob(mob/living/carbon/human/M) @@ -302,7 +302,7 @@ else mode = MIND_DEVICE_MESSAGE icon_state = "mind_device_message" - to_chat(user, "I switch the device to [mode==MIND_DEVICE_MESSAGE? "TRANSMISSION": "COMMAND"] MODE") + to_chat(user, span_notice("I switch the device to [mode==MIND_DEVICE_MESSAGE? "TRANSMISSION": "COMMAND"] MODE")) /obj/item/abductor/mind_device/afterattack(atom/target, mob/living/user, flag, params) . = ..() @@ -320,13 +320,13 @@ var/mob/living/carbon/C = target var/obj/item/organ/heart/gland/G = C.getorganslot("heart") if(!istype(G)) - to_chat(user, "My target does not have an experimental gland!") + to_chat(user, span_warning("My target does not have an experimental gland!")) return if(!G.mind_control_uses) - to_chat(user, "My target's gland is spent!") + to_chat(user, span_warning("My target's gland is spent!")) return if(G.active_mind_control) - to_chat(user, "My target is already under a mind-controlling influence!") + to_chat(user, span_warning("My target is already under a mind-controlling influence!")) return var/command = stripped_input(user, "Enter the command for my target to follow.\ @@ -342,17 +342,17 @@ return if(C.anti_magic_check(FALSE, FALSE, TRUE, 0)) - to_chat(user, "My target seems to have some sort of tinfoil protection on, blocking the message from being sent!") + to_chat(user, span_warning("My target seems to have some sort of tinfoil protection on, blocking the message from being sent!")) return G.mind_control(command, user) - to_chat(user, "I send the command to my target.") + to_chat(user, span_notice("I send the command to my target.")) /obj/item/abductor/mind_device/proc/mind_message(atom/target, mob/living/user) if(isliving(target)) var/mob/living/L = target if(L.stat == DEAD) - to_chat(user, "My target is dead!") + to_chat(user, span_warning("My target is dead!")) return var/message = stripped_input(user, "Write a message to send to my target's brain.","Enter message") if(!message) @@ -360,8 +360,8 @@ if(QDELETED(L) || L.stat == DEAD) return - to_chat(L, "I hear a voice in my head saying: [message]") - to_chat(user, "I send the message to my target.") + to_chat(L, span_hear("I hear a voice in my head saying:
[message]")) + to_chat(user, span_notice("I send the message to my target.")) log_directed_talk(user, L, message, LOG_SAY, "abductor whisper") @@ -454,7 +454,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(BATON_PROBE) txt = "probing" - to_chat(usr, "I switch the baton to [txt] mode.") + to_chat(usr, span_notice("I switch the baton to [txt] mode.")) update_icon() /obj/item/abductor/baton/update_icon() @@ -515,8 +515,8 @@ Congratulations! You are now trained for invasive xenobiology research!"} L.apply_effect(EFFECT_STUTTER, 7) SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK) - L.visible_message("[user] has stunned [L] with [src]!", \ - "[user] has stunned you with [src]!") + L.visible_message(span_danger("[user] has stunned [L] with [src]!"), \ + span_danger("[user] has stunned you with [src]!")) playsound(src, 'sound/blank.ogg', 50, TRUE, -1) if(ishuman(L)) @@ -528,26 +528,26 @@ Congratulations! You are now trained for invasive xenobiology research!"} /obj/item/abductor/baton/proc/SleepAttack(mob/living/L,mob/living/user) if(L.incapacitated(TRUE, TRUE)) if(L.anti_magic_check(FALSE, FALSE, TRUE)) - to_chat(user, "The specimen's tinfoil protection is interfering with the sleep inducement!") - L.visible_message("[user] tried to induced sleep in [L] with [src], but [L.p_their()] tinfoil protection [L.p_them()]!", \ - "I feel a strange wave of heavy drowsiness wash over you, but my tinfoil protection deflects most of it!") + to_chat(user, span_warning("The specimen's tinfoil protection is interfering with the sleep inducement!")) + L.visible_message(span_danger("[user] tried to induced sleep in [L] with [src], but [L.p_their()] tinfoil protection [L.p_them()]!"), \ + span_danger("I feel a strange wave of heavy drowsiness wash over you, but my tinfoil protection deflects most of it!")) L.drowsyness += 2 return - L.visible_message("[user] has induced sleep in [L] with [src]!", \ - "I suddenly feel very drowsy!") + L.visible_message(span_danger("[user] has induced sleep in [L] with [src]!"), \ + span_danger("I suddenly feel very drowsy!")) playsound(src, 'sound/blank.ogg', 50, TRUE, -1) L.Sleeping(1200) log_combat(user, L, "put to sleep") else if(L.anti_magic_check(FALSE, FALSE, TRUE, 0)) - to_chat(user, "The specimen's tinfoil protection is completely blocking our sleep inducement methods!") - L.visible_message("[user] tried to induce sleep in [L] with [src], but [L.p_their()] tinfoil protection completely protected [L.p_them()]!", \ - "Any sense of drowsiness is quickly diminished as my tinfoil protection deflects the effects!") + to_chat(user, span_warning("The specimen's tinfoil protection is completely blocking our sleep inducement methods!")) + L.visible_message(span_danger("[user] tried to induce sleep in [L] with [src], but [L.p_their()] tinfoil protection completely protected [L.p_them()]!"), \ + span_danger("Any sense of drowsiness is quickly diminished as my tinfoil protection deflects the effects!")) return L.drowsyness += 1 - to_chat(user, "Sleep inducement works fully only on stunned specimens! ") - L.visible_message("[user] tried to induce sleep in [L] with [src]!", \ - "I suddenly feel drowsy!") + to_chat(user, span_warning("Sleep inducement works fully only on stunned specimens! ")) + L.visible_message(span_danger("[user] tried to induce sleep in [L] with [src]!"), \ + span_danger("I suddenly feel drowsy!")) /obj/item/abductor/baton/proc/CuffAttack(mob/living/L,mob/living/user) if(!iscarbon(L)) @@ -556,39 +556,39 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(!C.handcuffed) if(C.get_num_arms(FALSE) >= 2 || C.get_arm_ignore()) playsound(src, 'sound/blank.ogg', 30, TRUE, -2) - C.visible_message("[user] begins restraining [C] with [src]!", \ - "[user] begins shaping an energy field around my hands!") + C.visible_message(span_danger("[user] begins restraining [C] with [src]!"), \ + span_danger("[user] begins shaping an energy field around my hands!")) if(do_mob(user, C, 30) && (C.get_num_arms(FALSE) >= 2 || C.get_arm_ignore())) if(!C.handcuffed) C.handcuffed = new /obj/item/restraints/handcuffs/energy/used(C) C.update_handcuffed() - to_chat(user, "I restrain [C].") + to_chat(user, span_notice("I restrain [C].")) log_combat(user, C, "handcuffed") else - to_chat(user, "I fail to restrain [C].") + to_chat(user, span_warning("I fail to restrain [C].")) else - to_chat(user, "[C] doesn't have two hands...") + to_chat(user, span_warning("[C] doesn't have two hands...")) /obj/item/abductor/baton/proc/ProbeAttack(mob/living/L,mob/living/user) - L.visible_message("[user] probes [L] with [src]!", \ - "[user] probes you!") + L.visible_message(span_danger("[user] probes [L] with [src]!"), \ + span_danger("[user] probes you!")) - var/species = "Unknown species" - var/helptext = "Species unsuitable for experiments." + var/species = span_warning("Unknown species") + var/helptext = span_warning("Species unsuitable for experiments.") if(ishuman(L)) var/mob/living/carbon/human/H = L - species = "[H.dna.species.name]" + species = span_notice("[H.dna.species.name]") if(L.mind && L.mind.has_antag_datum(/datum/antagonist/changeling)) - species = "Changeling lifeform" + species = span_warning("Changeling lifeform") var/obj/item/organ/heart/gland/temp = locate() in H.internal_organs if(temp) - helptext = "Experimental gland detected!" + helptext = span_warning("Experimental gland detected!") else if (L.getorganslot(ORGAN_SLOT_HEART)) - helptext = "Subject suitable for experiments." + helptext = span_notice("Subject suitable for experiments.") else - helptext = "Subject unsuitable for experiments." + helptext = span_warning("Subject unsuitable for experiments.") to_chat(user, "Probing result:[species]") to_chat(user, "[helptext]") @@ -607,8 +607,8 @@ Congratulations! You are now trained for invasive xenobiology research!"} item_flags = DROPDEL /obj/item/restraints/handcuffs/energy/used/dropped(mob/user) - user.visible_message("[user]'s [name] breaks in a discharge of energy!", \ - "[user]'s [name] breaks in a discharge of energy!") + user.visible_message(span_danger("[user]'s [name] breaks in a discharge of energy!"), \ + span_danger("[user]'s [name] breaks in a discharge of energy!")) var/datum/effect_system/spark_spread/S = new S.set_up(4,0,user.loc) S.start() @@ -618,13 +618,13 @@ Congratulations! You are now trained for invasive xenobiology research!"} . = ..() switch(mode) if(BATON_STUN) - . += "The baton is in stun mode." + . += span_warning("The baton is in stun mode.") if(BATON_SLEEP) - . += "The baton is in sleep inducement mode." + . += span_warning("The baton is in sleep inducement mode.") if(BATON_CUFF) - . += "The baton is in restraining mode." + . += span_warning("The baton is in restraining mode.") if(BATON_PROBE) - . += "The baton is in probing mode." + . += span_warning("The baton is in probing mode.") /obj/item/radio/headset/abductor name = "alien headset" @@ -657,7 +657,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} /obj/item/abductor_machine_beacon/attack_self(mob/user) ..() - user.visible_message("[user] places down [src] and activates it.", "I place down [src] and activate it.") + user.visible_message(span_notice("[user] places down [src] and activates it."), span_notice("I place down [src] and activate it.")) user.dropItemToGround(src) playsound(src, 'sound/blank.ogg', 50) addtimer(CALLBACK(src, PROC_REF(try_spawn_machine)), 30) @@ -673,7 +673,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(viable) playsound(src, 'sound/blank.ogg', 50, TRUE) var/new_machine = new spawned_machine(loc) - visible_message("[new_machine] warps on top of the beacon!") + visible_message(span_notice("[new_machine] warps on top of the beacon!")) qdel(src) else playsound(src, 'sound/blank.ogg', 50) @@ -745,7 +745,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} /obj/structure/table_frame/abductor/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I start disassembling [src]...") + to_chat(user, span_notice("I start disassembling [src]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 30)) playsound(src, 'sound/blank.ogg', 50, TRUE) @@ -756,9 +756,9 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(istype(I, /obj/item/stack/sheet/mineral/abductor)) var/obj/item/stack/sheet/P = I if(P.get_amount() < 1) - to_chat(user, "I need one alien alloy sheet to do this!") + to_chat(user, span_warning("I need one alien alloy sheet to do this!")) return - to_chat(user, "I start adding [P] to [src]...") + to_chat(user, span_notice("I start adding [P] to [src]...")) if(do_after(user, 50, target = src)) P.use(1) new /obj/structure/table/abductor(src.loc) @@ -767,9 +767,9 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(istype(I, /obj/item/stack/sheet/mineral/silver)) var/obj/item/stack/sheet/P = I if(P.get_amount() < 1) - to_chat(user, "I need one sheet of silver to do this!") + to_chat(user, span_warning("I need one sheet of silver to do this!")) return - to_chat(user, "I start adding [P] to [src]...") + to_chat(user, span_notice("I start adding [P] to [src]...")) if(do_after(user, 50, target = src)) P.use(1) new /obj/structure/table/optable/abductor(src.loc) @@ -805,7 +805,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} . = ..() if(iscarbon(AM)) START_PROCESSING(SSobj, src) - to_chat(AM, "I feel a series of tiny pricks!") + to_chat(AM, span_danger("I feel a series of tiny pricks!")) /obj/structure/table/optable/abductor/process() . = PROCESS_KILL diff --git a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm index 48a178c00..e14527a39 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm @@ -11,16 +11,16 @@ if(A.type in organ_types) IC = A break - user.visible_message("[user] starts to remove [target]'s organs.", "I start to remove [target]'s organs...") + user.visible_message(span_notice("[user] starts to remove [target]'s organs."), span_notice("I start to remove [target]'s organs...")) /datum/surgery_step/extract_organ/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(IC) - user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "I pull [IC] out of [target]'s [target_zone].") + user.visible_message(span_notice("[user] pulls [IC] out of [target]'s [target_zone]!"), span_notice("I pull [IC] out of [target]'s [target_zone].")) user.put_in_hands(IC) IC.Remove(target) return 1 else - to_chat(user, "I don't find anything in [target]'s [target_zone]!") + to_chat(user, span_warning("I don't find anything in [target]'s [target_zone]!")) return 1 /datum/surgery_step/gland_insert @@ -29,10 +29,10 @@ time = 32 /datum/surgery_step/gland_insert/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] starts to insert [tool] into [target].", "I start to insert [tool] into [target]...") + user.visible_message(span_notice("[user] starts to insert [tool] into [target]."), span_notice("I start to insert [tool] into [target]...")) /datum/surgery_step/gland_insert/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] inserts [tool] into [target].", "I insert [tool] into [target].") + user.visible_message(span_notice("[user] inserts [tool] into [target]."), span_notice("I insert [tool] into [target].")) user.temporarilyRemoveItemFromInventory(tool, TRUE) var/obj/item/organ/heart/gland/gland = tool gland.Insert(target, 2) diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index 2edafa843..e271efa3c 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -24,7 +24,7 @@ /obj/item/organ/heart/gland/examine(mob/user) . = ..() if((user.mind && HAS_TRAIT(user.mind, TRAIT_ABDUCTOR_SCIENTIST_TRAINING)) || isobserver(user)) - . += "It is \a [true_name]." + . += span_notice("It is \a [true_name].") /obj/item/organ/heart/gland/proc/ownerCheck() if(ishuman(owner)) @@ -54,8 +54,8 @@ if(!ownerCheck() || !mind_control_uses || active_mind_control) return FALSE mind_control_uses-- - to_chat(owner, "I suddenly feel an irresistible compulsion to follow an order...") - to_chat(owner, "[command]") + to_chat(owner, span_danger("I suddenly feel an irresistible compulsion to follow an order...")) + to_chat(owner, span_mind_control("[command]")) active_mind_control = TRUE message_admins("[key_name(user)] sent an abductor mind control message to [key_name(owner)]: [command]") update_gland_hud() @@ -67,7 +67,7 @@ /obj/item/organ/heart/gland/proc/clear_mind_control() if(!ownerCheck() || !active_mind_control) return FALSE - to_chat(owner, "I feel the compulsion fade, and you completely forget about your previous orders.") + to_chat(owner, span_danger("I feel the compulsion fade, and you completely forget about your previous orders.")) owner.clear_alert("mind_control") active_mind_control = FALSE return TRUE diff --git a/code/modules/antagonists/abductor/equipment/glands/access.dm b/code/modules/antagonists/abductor/equipment/glands/access.dm index 5f1bc7b34..42b534dbd 100644 --- a/code/modules/antagonists/abductor/equipment/glands/access.dm +++ b/code/modules/antagonists/abductor/equipment/glands/access.dm @@ -8,7 +8,7 @@ mind_control_duration = 900 /obj/item/organ/heart/gland/access/activate() - to_chat(owner, "I feel like a VIP for some reason.") + to_chat(owner, span_notice("I feel like a VIP for some reason.")) RegisterSignal(owner, COMSIG_MOB_ALLOWED, PROC_REF(free_access)) /obj/item/organ/heart/gland/access/proc/free_access(datum/source, obj/O) diff --git a/code/modules/antagonists/abductor/equipment/glands/blood.dm b/code/modules/antagonists/abductor/equipment/glands/blood.dm index 1228573c5..f40896c0d 100644 --- a/code/modules/antagonists/abductor/equipment/glands/blood.dm +++ b/code/modules/antagonists/abductor/equipment/glands/blood.dm @@ -14,5 +14,5 @@ return var/mob/living/carbon/human/H = owner var/datum/species/species = H.dna.species - to_chat(H, "I feel your blood heat up for a moment.") + to_chat(H, span_warning("I feel your blood heat up for a moment.")) species.exotic_blood = get_random_reagent_id() diff --git a/code/modules/antagonists/abductor/equipment/glands/egg.dm b/code/modules/antagonists/abductor/equipment/glands/egg.dm index e3b0c835f..5943e1c8c 100644 --- a/code/modules/antagonists/abductor/equipment/glands/egg.dm +++ b/code/modules/antagonists/abductor/equipment/glands/egg.dm @@ -10,6 +10,6 @@ mind_control_duration = 1800 /obj/item/organ/heart/gland/egg/activate() - owner.visible_message("[owner] [pick(EGG_LAYING_MESSAGES)]") + owner.visible_message(span_alertalien("[owner] [pick(EGG_LAYING_MESSAGES)]")) var/turf/T = owner.drop_location() new /obj/item/reagent_containers/food/snacks/egg/gland(T) diff --git a/code/modules/antagonists/abductor/equipment/glands/electric.dm b/code/modules/antagonists/abductor/equipment/glands/electric.dm index e82883229..6100ccc2b 100644 --- a/code/modules/antagonists/abductor/equipment/glands/electric.dm +++ b/code/modules/antagonists/abductor/equipment/glands/electric.dm @@ -16,8 +16,8 @@ ..() /obj/item/organ/heart/gland/electric/activate() - owner.visible_message("[owner]'s skin starts emitting electric arcs!",\ - "I feel electric energy building up inside you!") + owner.visible_message(span_danger("[owner]'s skin starts emitting electric arcs!"),\ + span_warning("I feel electric energy building up inside you!")) playsound(get_turf(owner), "sparks", 100, TRUE, -1) addtimer(CALLBACK(src, PROC_REF(zap)), rand(30, 100)) diff --git a/code/modules/antagonists/abductor/equipment/glands/heal.dm b/code/modules/antagonists/abductor/equipment/glands/heal.dm index 5408bc3d3..d45c56a0b 100644 --- a/code/modules/antagonists/abductor/equipment/glands/heal.dm +++ b/code/modules/antagonists/abductor/equipment/glands/heal.dm @@ -54,7 +54,7 @@ return if(owner.blood_volume < BLOOD_VOLUME_OKAY) owner.blood_volume = BLOOD_VOLUME_NORMAL - to_chat(owner, "I feel my blood pulsing within you.") + to_chat(owner, span_warning("I feel my blood pulsing within you.")) return var/obj/item/bodypart/chest/chest = owner.get_bodypart(BODY_ZONE_CHEST) @@ -63,19 +63,19 @@ return /obj/item/organ/heart/gland/heal/proc/reject_implant(obj/item/organ/cyberimp/implant) - owner.visible_message("[owner] vomits up his [implant.name]!", "I suddenly vomit up my [implant.name]!") + owner.visible_message(span_warning("[owner] vomits up his [implant.name]!"), span_danger("I suddenly vomit up my [implant.name]!")) owner.vomit(0, TRUE, TRUE, 1, FALSE, FALSE, FALSE, TRUE) implant.Remove(owner) implant.forceMove(owner.drop_location()) /obj/item/organ/heart/gland/heal/proc/replace_liver(obj/item/organ/liver/liver) if(liver) - owner.visible_message("[owner] vomits up his [liver.name]!", "I suddenly vomit up my [liver.name]!") + owner.visible_message(span_warning("[owner] vomits up his [liver.name]!"), span_danger("I suddenly vomit up my [liver.name]!")) owner.vomit(0, TRUE, TRUE, 1, FALSE, FALSE, FALSE, TRUE) liver.Remove(owner) liver.forceMove(owner.drop_location()) else - to_chat(owner, "I feel a weird rumble in my bowels...") + to_chat(owner, span_warning("I feel a weird rumble in my bowels...")) var/liver_type = /obj/item/organ/liver if(owner?.dna?.species?.mutantliver) @@ -85,12 +85,12 @@ /obj/item/organ/heart/gland/heal/proc/replace_lungs(obj/item/organ/lungs/lungs) if(lungs) - owner.visible_message("[owner] vomits up his [lungs.name]!", "I suddenly vomit up my [lungs.name]!") + owner.visible_message(span_warning("[owner] vomits up his [lungs.name]!"), span_danger("I suddenly vomit up my [lungs.name]!")) owner.vomit(0, TRUE, TRUE, 1, FALSE, FALSE, FALSE, TRUE) lungs.Remove(owner) lungs.forceMove(owner.drop_location()) else - to_chat(owner, "I feel a weird rumble inside my chest...") + to_chat(owner, span_warning("I feel a weird rumble inside my chest...")) var/lung_type = /obj/item/organ/lungs if(owner.dna.species && owner.dna.species.mutantlungs) @@ -100,12 +100,12 @@ /obj/item/organ/heart/gland/heal/proc/replace_eyes(obj/item/organ/eyes/eyes) if(eyes) - owner.visible_message("[owner]'s [eyes.name] fall out of their sockets!", "My [eyes.name] fall out of their sockets!") + owner.visible_message(span_warning("[owner]'s [eyes.name] fall out of their sockets!"), span_danger("My [eyes.name] fall out of their sockets!")) playsound(owner, 'sound/blank.ogg', 50, TRUE) eyes.Remove(owner) eyes.forceMove(owner.drop_location()) else - to_chat(owner, "I feel a weird rumble behind my eye sockets...") + to_chat(owner, span_warning("I feel a weird rumble behind my eye sockets...")) addtimer(CALLBACK(src, PROC_REF(finish_replace_eyes)), rand(100, 200)) @@ -115,27 +115,27 @@ eye_type = owner.dna.species.mutanteyes var/obj/item/organ/eyes/new_eyes = new eye_type() new_eyes.Insert(owner) - owner.visible_message("A pair of new eyes suddenly inflates into [owner]'s eye sockets!", "A pair of new eyes suddenly inflates into my eye sockets!") + owner.visible_message(span_warning("A pair of new eyes suddenly inflates into [owner]'s eye sockets!"), span_danger("A pair of new eyes suddenly inflates into my eye sockets!")) /obj/item/organ/heart/gland/heal/proc/replace_limb(body_zone, obj/item/bodypart/limb) if(limb) - owner.visible_message("[owner]'s [limb.name] suddenly detaches from [owner.p_their()] body!", "My [limb.name] suddenly detaches from my body!") + owner.visible_message(span_warning("[owner]'s [limb.name] suddenly detaches from [owner.p_their()] body!"), span_danger("My [limb.name] suddenly detaches from my body!")) playsound(owner, "desceration", 50, TRUE, -1) limb.drop_limb() else - to_chat(owner, "I feel a weird tingle in my [parse_zone(body_zone)]... even if you don't have one.") + to_chat(owner, span_warning("I feel a weird tingle in my [parse_zone(body_zone)]... even if you don't have one.")) addtimer(CALLBACK(src, PROC_REF(finish_replace_limb), body_zone), rand(150, 300)) /obj/item/organ/heart/gland/heal/proc/finish_replace_limb(body_zone) - owner.visible_message("With a loud snap, [owner]'s [parse_zone(body_zone)] rapidly grows back from [owner.p_their()] body!", - "With a loud snap, my [parse_zone(body_zone)] rapidly grows back from my body!", - "My hear a loud snap.") + owner.visible_message(span_warning("With a loud snap, [owner]'s [parse_zone(body_zone)] rapidly grows back from [owner.p_their()] body!"), + span_danger("With a loud snap, my [parse_zone(body_zone)] rapidly grows back from my body!"), + span_warning("My hear a loud snap.")) playsound(owner, 'sound/blank.ogg', 50, TRUE) owner.regenerate_limb(body_zone) /obj/item/organ/heart/gland/heal/proc/replace_blood() - owner.visible_message("[owner] starts vomiting huge amounts of blood!", "I suddenly start vomiting huge amounts of blood!") + owner.visible_message(span_warning("[owner] starts vomiting huge amounts of blood!"), span_danger("I suddenly start vomiting huge amounts of blood!")) keep_replacing_blood() /obj/item/organ/heart/gland/heal/proc/keep_replacing_blood() @@ -159,14 +159,14 @@ /obj/item/organ/heart/gland/heal/proc/replace_chest(obj/item/bodypart/chest/chest) if(chest.status == BODYPART_ROBOTIC) - owner.visible_message("[owner]'s [chest.name] rapidly expels its mechanical components, replacing them with flesh!", "My [chest.name] rapidly expels its mechanical components, replacing them with flesh!") + owner.visible_message(span_warning("[owner]'s [chest.name] rapidly expels its mechanical components, replacing them with flesh!"), span_danger("My [chest.name] rapidly expels its mechanical components, replacing them with flesh!")) playsound(owner, 'sound/blank.ogg', 50, TRUE) var/list/dirs = GLOB.alldirs.Copy() for(var/i in 1 to 3) var/obj/effect/decal/cleanable/robot_debris/debris = new(get_turf(owner)) debris.streak(dirs) else - owner.visible_message("[owner]'s [chest.name] sheds off its damaged flesh, rapidly replacing it!", "My [chest.name] sheds off its damaged flesh, rapidly replacing it!") + owner.visible_message(span_warning("[owner]'s [chest.name] sheds off its damaged flesh, rapidly replacing it!"), span_warning("My [chest.name] sheds off its damaged flesh, rapidly replacing it!")) playsound(owner, 'sound/blank.ogg', 50, TRUE) var/list/dirs = GLOB.alldirs.Copy() for(var/i in 1 to 3) diff --git a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm index 6d72bff70..381db2dc8 100644 --- a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm +++ b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm @@ -9,7 +9,7 @@ var/list/mob/living/carbon/human/broadcasted_mobs = list() /obj/item/organ/heart/gland/mindshock/activate() - to_chat(owner, "I get a headache.") + to_chat(owner, span_notice("I get a headache.")) var/turf/T = get_turf(owner) for(var/mob/living/carbon/H in orange(4,T)) @@ -17,10 +17,10 @@ continue switch(pick(1,3)) if(1) - to_chat(H, "I hear a loud buzz in your head, silencing your thoughts!") + to_chat(H, span_danger("I hear a loud buzz in your head, silencing your thoughts!")) H.Stun(50) if(2) - to_chat(H, "I hear an annoying buzz in your head.") + to_chat(H, span_warning("I hear an annoying buzz in your head.")) H.confused += 15 H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 160) if(3) @@ -38,8 +38,8 @@ continue broadcasted_mobs += H - to_chat(H, "I suddenly feel an irresistible compulsion to follow an order...") - to_chat(H, "[command]") + to_chat(H, span_danger("I suddenly feel an irresistible compulsion to follow an order...")) + to_chat(H, span_mind_control("[command]")) message_admins("[key_name(user)] broadcasted an abductor mind control message from [key_name(owner)] to [key_name(H)]: [command]") @@ -58,7 +58,7 @@ return FALSE for(var/M in broadcasted_mobs) var/mob/living/carbon/human/H = M - to_chat(H, "I feel the compulsion fade, and you completely forget about your previous orders.") + to_chat(H, span_danger("I feel the compulsion fade, and you completely forget about your previous orders.")) H.clear_alert("mind_control") active_mind_control = FALSE return TRUE diff --git a/code/modules/antagonists/abductor/equipment/glands/plasma.dm b/code/modules/antagonists/abductor/equipment/glands/plasma.dm index 9037b7de1..136d55fc9 100644 --- a/code/modules/antagonists/abductor/equipment/glands/plasma.dm +++ b/code/modules/antagonists/abductor/equipment/glands/plasma.dm @@ -8,14 +8,14 @@ mind_control_duration = 800 /obj/item/organ/heart/gland/plasma/activate() - to_chat(owner, "I feel bloated.") - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), owner, "A massive stomachache overcomes you."), 150) + to_chat(owner, span_warning("I feel bloated.")) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), owner, span_danger("A massive stomachache overcomes you.")), 150) addtimer(CALLBACK(src, PROC_REF(vomit_plasma)), 200) /obj/item/organ/heart/gland/plasma/proc/vomit_plasma() if(!owner) return - owner.visible_message("[owner] vomits a cloud of plasma!") + owner.visible_message(span_danger("[owner] vomits a cloud of plasma!")) var/turf/open/T = get_turf(owner) if(istype(T)) T.atmos_spawn_air("plasma=50;TEMP=[T20C]") diff --git a/code/modules/antagonists/abductor/equipment/glands/quantum.dm b/code/modules/antagonists/abductor/equipment/glands/quantum.dm index 96bdf9b9c..d6a9152f4 100644 --- a/code/modules/antagonists/abductor/equipment/glands/quantum.dm +++ b/code/modules/antagonists/abductor/equipment/glands/quantum.dm @@ -25,16 +25,16 @@ var/turf/T = get_turf(owner) do_teleport(owner, get_turf(entangled_mob),null,TRUE,channel = TELEPORT_CHANNEL_QUANTUM) do_teleport(entangled_mob, T,null,TRUE,channel = TELEPORT_CHANNEL_QUANTUM) - to_chat(owner, "I suddenly find myself somewhere else!") - to_chat(entangled_mob, "I suddenly find myself somewhere else!") + to_chat(owner, span_warning("I suddenly find myself somewhere else!")) + to_chat(entangled_mob, span_warning("I suddenly find myself somewhere else!")) if(!active_mind_control) //Do not reset entangled mob while mind control is active entangled_mob = null /obj/item/organ/heart/gland/quantum/mind_control(command, mob/living/user) if(..()) if(entangled_mob && ishuman(entangled_mob) && (entangled_mob.stat < DEAD)) - to_chat(entangled_mob, "I suddenly feel an irresistible compulsion to follow an order...") - to_chat(entangled_mob, "[command]") + to_chat(entangled_mob, span_danger("I suddenly feel an irresistible compulsion to follow an order...")) + to_chat(entangled_mob, span_mind_control("[command]")) var/atom/movable/screen/alert/mind_control/mind_alert = entangled_mob.throw_alert("mind_control", /atom/movable/screen/alert/mind_control) mind_alert.command = command message_admins("[key_name(owner)] mirrored an abductor mind control message to [key_name(entangled_mob)]: [command]") @@ -42,6 +42,6 @@ /obj/item/organ/heart/gland/quantum/clear_mind_control() if(active_mind_control) - to_chat(entangled_mob, "I feel the compulsion fade, and you completely forget about your previous orders.") + to_chat(entangled_mob, span_danger("I feel the compulsion fade, and you completely forget about your previous orders.")) entangled_mob.clear_alert("mind_control") ..() diff --git a/code/modules/antagonists/abductor/equipment/glands/slime.dm b/code/modules/antagonists/abductor/equipment/glands/slime.dm index 9974af47f..c2ab03ea1 100644 --- a/code/modules/antagonists/abductor/equipment/glands/slime.dm +++ b/code/modules/antagonists/abductor/equipment/glands/slime.dm @@ -13,7 +13,7 @@ owner.grant_language(/datum/language/slime) /obj/item/organ/heart/gland/slime/activate() - to_chat(owner, "I feel nauseated!") + to_chat(owner, span_warning("I feel nauseated!")) owner.vomit(20) var/mob/living/simple_animal/slime/Slime = new(get_turf(owner), "grey") diff --git a/code/modules/antagonists/abductor/equipment/glands/spider.dm b/code/modules/antagonists/abductor/equipment/glands/spider.dm index d454d8e36..ee4d5ed5b 100644 --- a/code/modules/antagonists/abductor/equipment/glands/spider.dm +++ b/code/modules/antagonists/abductor/equipment/glands/spider.dm @@ -8,7 +8,7 @@ mind_control_duration = 2400 /obj/item/organ/heart/gland/spiderman/activate() - to_chat(owner, "I feel something crawling in your skin.") + to_chat(owner, span_warning("I feel something crawling in your skin.")) owner.faction |= "spiders" var/obj/structure/spider/spiderling/S = new(owner.drop_location()) S.directive = "Protect your nest inside [owner.real_name]." diff --git a/code/modules/antagonists/abductor/equipment/glands/transform.dm b/code/modules/antagonists/abductor/equipment/glands/transform.dm index 75e294dce..544c9f0f5 100644 --- a/code/modules/antagonists/abductor/equipment/glands/transform.dm +++ b/code/modules/antagonists/abductor/equipment/glands/transform.dm @@ -9,7 +9,7 @@ mind_control_duration = 300 /obj/item/organ/heart/gland/transform/activate() - to_chat(owner, "I feel unlike myself.") + to_chat(owner, span_notice("I feel unlike myself.")) randomize_human(owner) var/species = pick(list(/datum/species/human, /datum/species/lizard, /datum/species/moth, /datum/species/fly)) owner.set_species(species) diff --git a/code/modules/antagonists/abductor/equipment/glands/trauma.dm b/code/modules/antagonists/abductor/equipment/glands/trauma.dm index a302f7e86..5a4b38ac8 100644 --- a/code/modules/antagonists/abductor/equipment/glands/trauma.dm +++ b/code/modules/antagonists/abductor/equipment/glands/trauma.dm @@ -8,7 +8,7 @@ mind_control_duration = 1800 /obj/item/organ/heart/gland/trauma/activate() - to_chat(owner, "I feel a spike of pain in your head.") + to_chat(owner, span_warning("I feel a spike of pain in your head.")) if(prob(33)) owner.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, rand(TRAUMA_RESILIENCE_BASIC, TRAUMA_RESILIENCE_LOBOTOMY)) else diff --git a/code/modules/antagonists/abductor/equipment/glands/ventcrawl.dm b/code/modules/antagonists/abductor/equipment/glands/ventcrawl.dm index a041c4e93..ca263e837 100644 --- a/code/modules/antagonists/abductor/equipment/glands/ventcrawl.dm +++ b/code/modules/antagonists/abductor/equipment/glands/ventcrawl.dm @@ -8,5 +8,5 @@ mind_control_duration = 1800 /obj/item/organ/heart/gland/ventcrawling/activate() - to_chat(owner, "I feel very stretchy.") + to_chat(owner, span_notice("I feel very stretchy.")) owner.ventcrawler = VENTCRAWLER_ALWAYS diff --git a/code/modules/antagonists/abductor/equipment/glands/viral.dm b/code/modules/antagonists/abductor/equipment/glands/viral.dm index e23d10533..66fe5ccf9 100644 --- a/code/modules/antagonists/abductor/equipment/glands/viral.dm +++ b/code/modules/antagonists/abductor/equipment/glands/viral.dm @@ -8,7 +8,7 @@ mind_control_duration = 1800 /obj/item/organ/heart/gland/viral/activate() - to_chat(owner, "I feel sick.") + to_chat(owner, span_warning("I feel sick.")) var/datum/disease/advance/A = random_virus(pick(2,6),6) A.carrier = TRUE owner.ForceContractDisease(A, FALSE, TRUE) diff --git a/code/modules/antagonists/abductor/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm index 842fe8433..09b4c2adb 100644 --- a/code/modules/antagonists/abductor/machinery/console.dm +++ b/code/modules/antagonists/abductor/machinery/console.dm @@ -29,7 +29,7 @@ if(.) return if(!HAS_TRAIT(user, TRAIT_ABDUCTOR_TRAINING) && !HAS_TRAIT(user.mind, TRAIT_ABDUCTOR_TRAINING)) - to_chat(user, "I start mashing alien buttons at random!") + to_chat(user, span_warning("I start mashing alien buttons at random!")) if(do_after(user,100, target = src)) TeleporterSend() return @@ -56,8 +56,8 @@ dat += "NO EXPERIMENT MACHINE DETECTED
" if(pad) - dat += "Emergency Teleporter System." - dat += "Consider using primary observation console first." + dat += span_bad("Emergency Teleporter System.") + dat += span_bad("Consider using primary observation console first.") dat += "Activate Teleporter
" if(gizmo && gizmo.marked) dat += "Retrieve Mark
" @@ -71,16 +71,16 @@ var/mode = vest.mode if(mode == VEST_STEALTH) dat += "Combat" - dat += "Stealth" + dat += span_linkoff("Stealth") else - dat += "Combat" + dat += span_linkoff("Combat") dat += "Stealth" dat+="
" dat += "Select Agent Vest Disguise
" dat += "[HAS_TRAIT_FROM(vest, TRAIT_NODROP, ABDUCTOR_VEST_TRAIT) ? "Unlock" : "Lock"] Vest
" else - dat += "NO AGENT VEST DETECTED" + dat += span_bad("NO AGENT VEST DETECTED") var/datum/browser/popup = new(user, "computer", "Abductor Console", 400, 500) popup.set_content(dat) popup.open() @@ -155,12 +155,12 @@ /obj/machinery/abductor/console/proc/SetDroppoint(turf/open/location,user) if(!istype(location)) - to_chat(user, "That place is not safe for the specimen.") + to_chat(user, span_warning("That place is not safe for the specimen.")) return if(pad) pad.teleport_target = location - to_chat(user, "Location marked as test subject release point.") + to_chat(user, span_notice("Location marked as test subject release point.")) /obj/machinery/abductor/console/Initialize(mapload) @@ -226,9 +226,9 @@ /obj/machinery/abductor/console/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/abductor/gizmo) && AddGizmo(O)) - to_chat(user, "I link the tool to the console.") + to_chat(user, span_notice("I link the tool to the console.")) else if(istype(O, /obj/item/clothing/suit/armor/abductor/vest) && AddVest(O)) - to_chat(user, "I link the vest to the console.") + to_chat(user, span_notice("I link the vest to the console.")) else return ..() diff --git a/code/modules/antagonists/abductor/machinery/experiment.dm b/code/modules/antagonists/abductor/machinery/experiment.dm index 2d1ee59ae..4dc25744b 100644 --- a/code/modules/antagonists/abductor/machinery/experiment.dm +++ b/code/modules/antagonists/abductor/machinery/experiment.dm @@ -45,19 +45,19 @@ return if(message_cooldown <= world.time) message_cooldown = world.time + 50 - to_chat(user, "[src]'s door won't budge!") + to_chat(user, span_warning("[src]'s door won't budge!")) /obj/machinery/abductor/experiment/container_resist(mob/living/user) user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user.visible_message("I see [user] kicking against the door of [src]!", \ - "I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "I hear a metallic creaking from [src].") + user.visible_message(span_notice("I see [user] kicking against the door of [src]!"), \ + span_notice("I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_hear("I hear a metallic creaking from [src].")) if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src || state_open) return - user.visible_message("[user] successfully broke out of [src]!", \ - "I successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("I successfully break out of [src]!")) open_machine() /obj/machinery/abductor/experiment/proc/dissection_icon(mob/living/carbon/human/H) @@ -111,7 +111,7 @@ dat += "Analyze
" dat += "" else - dat += "Experiment " + dat += span_linkoff("Experiment ") if(!occupant) dat += "

Machine Unoccupied

" @@ -121,11 +121,11 @@ var/mob/living/mob_occupant = occupant switch(mob_occupant.stat) if(CONSCIOUS) - dat += "Conscious" + dat += span_good("Conscious") if(UNCONSCIOUS) - dat += "Unconscious" + dat += span_average("Unconscious") else // DEAD - dat += "Deceased" + dat += span_bad("Deceased") dat += "
" dat += "[flash]" dat += "
" @@ -163,18 +163,18 @@ var/datum/antagonist/abductor/user_abductor = user.mind.has_antag_datum(/datum/antagonist/abductor) if(!user_abductor) - return "Authorization failure. Contact mothership immidiately." + return span_bad("Authorization failure. Contact mothership immidiately.") var/point_reward = 0 if(H in history) - return "Specimen already in database." + return span_bad("Specimen already in database.") if(H.stat == DEAD) say("Specimen deceased - please provide fresh sample.") - return "Specimen deceased." + return span_bad("Specimen deceased.") var/obj/item/organ/heart/gland/GlandTest = locate() in H.internal_organs if(!GlandTest) say("Experimental dissection not detected!") - return "No glands detected!" + return span_bad("No glands detected!") if(H.mind != null && H.ckey != null) LAZYINITLIST(abductee_minds) LAZYADD(history, H) @@ -183,11 +183,11 @@ sleep(5) switch(text2num(type)) if(1) - to_chat(H, "I feel violated.") + to_chat(H, span_warning("I feel violated.")) if(2) - to_chat(H, "I feel myself being sliced apart and put back together.") + to_chat(H, span_warning("I feel myself being sliced apart and put back together.")) if(3) - to_chat(H, "I feel intensely watched.") + to_chat(H, span_warning("I feel intensely watched.")) sleep(5) user_abductor.team.abductees += H.mind H.mind.add_antag_datum(/datum/antagonist/abductee) @@ -201,16 +201,16 @@ playsound(src.loc, 'sound/blank.ogg', 50, TRUE) points += point_reward credits += point_reward - return "Experiment successful! [point_reward] new data-points collected." + return span_good("Experiment successful! [point_reward] new data-points collected.") else playsound(src.loc, 'sound/blank.ogg', 50, TRUE) - return "Experiment failed! No replacement organ detected." + return span_bad("Experiment failed! No replacement organ detected.") else say("Brain activity nonexistent - disposing sample...") open_machine() SendBack(H) - return "Specimen braindead - disposed." - return "ERROR" + return span_bad("Specimen braindead - disposed.") + return span_bad("ERROR") /obj/machinery/abductor/experiment/proc/SendBack(mob/living/carbon/human/H) diff --git a/code/modules/antagonists/abductor/machinery/pad.dm b/code/modules/antagonists/abductor/machinery/pad.dm index d149a3767..20c838b6f 100644 --- a/code/modules/antagonists/abductor/machinery/pad.dm +++ b/code/modules/antagonists/abductor/machinery/pad.dm @@ -16,7 +16,7 @@ for(var/mob/living/target in loc) target.forceMove(teleport_target) new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir) - to_chat(target, "The instability of the warp leaves you disoriented!") + to_chat(target, span_warning("The instability of the warp leaves you disoriented!")) target.Stun(60) /obj/machinery/abductor/pad/proc/Retrieve(mob/living/target) diff --git a/code/modules/antagonists/blob/blob.dm b/code/modules/antagonists/blob/blob.dm index 2b625655a..ad56f2728 100644 --- a/code/modules/antagonists/blob/blob.dm +++ b/code/modules/antagonists/blob/blob.dm @@ -20,7 +20,7 @@ /datum/antagonist/blob/greet() if(!isovermind(owner.current)) - to_chat(owner,"I feel bloated.") + to_chat(owner,span_danger("I feel bloated.")) /datum/antagonist/blob/on_gain() create_objectives() diff --git a/code/modules/antagonists/blob/blob_mobs.dm b/code/modules/antagonists/blob/blob_mobs.dm index eebd21b8d..ad80a1cb1 100644 --- a/code/modules/antagonists/blob/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob_mobs.dm @@ -135,7 +135,7 @@ H.forceMove(src) oldguy = H update_icons() - visible_message("The corpse of [H.name] suddenly rises!") + visible_message(span_warning("The corpse of [H.name] suddenly rises!")) /mob/living/simple_animal/hostile/blob/blobspore/death(gibbed) // On death, create a small smoke of harmful gas (s-Acid) diff --git a/code/modules/antagonists/blob/blobstrains/_blobstrain.dm b/code/modules/antagonists/blob/blobstrains/_blobstrain.dm index 4b4494ff1..8c2664cbb 100644 --- a/code/modules/antagonists/blob/blobstrains/_blobstrain.dm +++ b/code/modules/antagonists/blob/blobstrains/_blobstrain.dm @@ -42,7 +42,7 @@ GLOBAL_LIST_INIT(valid_blobstrains, subtypesof(/datum/blobstrain) - list(/datum/ if(message_living && !issilicon(M)) totalmessage += message_living totalmessage += "!" - to_chat(M, "[totalmessage]") + to_chat(M, span_danger("[totalmessage]")) /datum/blobstrain/proc/core_process() if(resource_delay <= world.time) diff --git a/code/modules/antagonists/blob/blobstrains/debris_devourer.dm b/code/modules/antagonists/blob/blobstrains/debris_devourer.dm index 1bbb913ed..d910a564a 100644 --- a/code/modules/antagonists/blob/blobstrains/debris_devourer.dm +++ b/code/modules/antagonists/blob/blobstrains/debris_devourer.dm @@ -47,17 +47,17 @@ . = ..() var/obj/structure/blob/core/core = overmind.blob_core if (isobserver(user)) - . += "Absorbed debris is currently reducing incoming damage by [round(max(min(DEBRIS_DENSITY, 10),0))]" + . += span_notice("Absorbed debris is currently reducing incoming damage by [round(max(min(DEBRIS_DENSITY, 10),0))]") else switch (round(max(min(DEBRIS_DENSITY, 10),0))) if (0) - . += "There is not currently enough absorbed debris to reduce damage." + . += span_notice("There is not currently enough absorbed debris to reduce damage.") if (1 to 3) - . += "Absorbed debris is currently reducing incoming damage by a very low amount." // these roughly correspond with force description strings + . += span_notice("Absorbed debris is currently reducing incoming damage by a very low amount.") // these roughly correspond with force description strings if (4 to 7) - . += "Absorbed debris is currently reducing incoming damage by a low amount." + . += span_notice("Absorbed debris is currently reducing incoming damage by a low amount.") if (8 to 10) - . += "Absorbed debris is currently reducing incoming damage by a medium amount." + . += span_notice("Absorbed debris is currently reducing incoming damage by a medium amount.") #undef DEBRIS_DENSITY diff --git a/code/modules/antagonists/blob/blobstrains/pressurized_slime.dm b/code/modules/antagonists/blob/blobstrains/pressurized_slime.dm index 8de54e833..82210a752 100644 --- a/code/modules/antagonists/blob/blobstrains/pressurized_slime.dm +++ b/code/modules/antagonists/blob/blobstrains/pressurized_slime.dm @@ -19,7 +19,7 @@ /datum/blobstrain/reagent/pressurized_slime/death_reaction(obj/structure/blob/B, damage_flag) if(damage_flag in MELEE_TYPES || damage_flag == "bullet" || damage_flag == "laser") - B.visible_message("The blob ruptures, spraying the area with liquid!") + B.visible_message(span_boldwarning("The blob ruptures, spraying the area with liquid!")) extinguisharea(B, 50) /datum/blobstrain/reagent/pressurized_slime/proc/extinguisharea(obj/structure/blob/B, probchance) diff --git a/code/modules/antagonists/blob/blobstrains/reactive_spines.dm b/code/modules/antagonists/blob/blobstrains/reactive_spines.dm index 313bf3650..e3f79d6c1 100644 --- a/code/modules/antagonists/blob/blobstrains/reactive_spines.dm +++ b/code/modules/antagonists/blob/blobstrains/reactive_spines.dm @@ -14,7 +14,7 @@ /datum/blobstrain/reagent/reactive_spines/damage_reaction(obj/structure/blob/B, damage, damage_type, damage_flag) if(damage && damage_type == BRUTE && B.obj_integrity - damage > 0) //is there any damage, is it brute, and will we be alive if(damage_flag in MELEE_TYPES) - B.visible_message("The blob retaliates, lashing out!") + B.visible_message(span_boldwarning("The blob retaliates, lashing out!")) for(var/atom/A in range(1, B)) A.blob_act(B) return ..() diff --git a/code/modules/antagonists/blob/blobstrains/zombifying_pods.dm b/code/modules/antagonists/blob/blobstrains/zombifying_pods.dm index c809606dc..27b74533d 100644 --- a/code/modules/antagonists/blob/blobstrains/zombifying_pods.dm +++ b/code/modules/antagonists/blob/blobstrains/zombifying_pods.dm @@ -13,7 +13,7 @@ /datum/blobstrain/reagent/zombifying_pods/damage_reaction(obj/structure/blob/B, damage, damage_type, damage_flag) if((damage_flag in MELEE_TYPES || damage_flag == "bullet" || damage_flag == "laser") && damage <= 20 && B.obj_integrity - damage <= 0 && prob(30)) //if the cause isn't fire or a bomb, the damage is less than 21, we're going to die from that damage, 20% chance of a shitty spore. - B.visible_message("A spore floats free of the blob!") + B.visible_message(span_warning("A spore floats free of the blob!")) var/mob/living/simple_animal/hostile/blob/blobspore/weak/BS = new/mob/living/simple_animal/hostile/blob/blobspore/weak(B.loc) BS.overmind = B.overmind BS.update_icons() @@ -43,4 +43,4 @@ O.blob_mobs.Add(BS) BS.Zombify(M) O.add_points(points) - to_chat(O, "Gained [points] resources from the zombification of [M].") + to_chat(O, span_notice("Gained [points] resources from the zombification of [M].")) diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index 2004b41b4..7822a2811 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -98,7 +98,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) if(!placed) if(manualplace_min_time && world.time >= manualplace_min_time) to_chat(src, "I may now place your blob core.") - to_chat(src, "I will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].") + to_chat(src, span_big("I will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].")) manualplace_min_time = 0 if(autoplace_max_time && world.time >= autoplace_max_time) place_blob_core(1) @@ -183,7 +183,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) /mob/camera/blob/Login() ..() - to_chat(src, "I are the overmind!") + to_chat(src, span_notice("I are the overmind!")) blob_help() update_health_hud() add_points(0) @@ -210,7 +210,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) if (src.client) if(client.prefs.muted & MUTE_IC) - to_chat(src, "I cannot send IC messages (muted).") + to_chat(src, span_boldwarning("I cannot send IC messages (muted).")) return if (!(ignore_spam || forced) && src.client.handle_spam_prevention(message,MUTE_IC)) return @@ -230,7 +230,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) src.log_talk(message, LOG_SAY) var/message_a = say_quote(message) - var/rendered = "\[Blob Telepathy\] [name]([blobstrain.name]) [message_a]" + var/rendered = span_big("\[Blob Telepathy\] [name]([blobstrain.name]) [message_a]") for(var/mob/M in GLOB.mob_list) if(isovermind(M) || istype(M, /mob/living/simple_animal/hostile/blob)) diff --git a/code/modules/antagonists/blob/powers.dm b/code/modules/antagonists/blob/powers.dm index bae5234c8..471508dd2 100644 --- a/code/modules/antagonists/blob/powers.dm +++ b/code/modules/antagonists/blob/powers.dm @@ -1,6 +1,6 @@ /mob/camera/blob/proc/can_buy(cost = 15) if(blob_points < cost) - to_chat(src, "I cannot afford this, you need at least [cost] resources!") + to_chat(src, span_warning("I cannot afford this, you need at least [cost] resources!")) return 0 add_points(-cost) return 1 @@ -16,30 +16,30 @@ if(ROLE_BLOB in M.faction) continue if(M.client) - to_chat(src, "There is someone too close to place your blob core!") + to_chat(src, span_warning("There is someone too close to place your blob core!")) return 0 for(var/mob/living/M in view(13, src)) if(ROLE_BLOB in M.faction) continue if(M.client) - to_chat(src, "Someone could see your blob core from here!") + to_chat(src, span_warning("Someone could see your blob core from here!")) return 0 var/turf/T = get_turf(src) if(T.density) - to_chat(src, "This spot is too dense to place a blob core on!") + to_chat(src, span_warning("This spot is too dense to place a blob core on!")) return 0 for(var/obj/O in T) if(istype(O, /obj/structure/blob)) if(istype(O, /obj/structure/blob/normal)) qdel(O) else - to_chat(src, "There is already a blob here!") + to_chat(src, span_warning("There is already a blob here!")) return 0 else if(O.density) - to_chat(src, "This spot is too dense to place a blob core on!") + to_chat(src, span_warning("This spot is too dense to place a blob core on!")) return 0 if(!pop_override && world.time <= manualplace_min_time && world.time <= autoplace_max_time) - to_chat(src, "It is too early to place your blob core!") + to_chat(src, span_warning("It is too early to place your blob core!")) return 0 else if(placement_override == 1) var/turf/T = pick(GLOB.blobstart) @@ -82,19 +82,19 @@ T = get_turf(src) var/obj/structure/blob/B = (locate(/obj/structure/blob) in T) if(!B) - to_chat(src, "There is no blob here!") + to_chat(src, span_warning("There is no blob here!")) return if(!istype(B, /obj/structure/blob/normal)) - to_chat(src, "Unable to use this blob, find a normal one.") + to_chat(src, span_warning("Unable to use this blob, find a normal one.")) return if(needsNode && nodes_required) if(!(locate(/obj/structure/blob/node) in orange(3, T)) && !(locate(/obj/structure/blob/core) in orange(4, T))) - to_chat(src, "I need to place this blob closer to a node or core!") + to_chat(src, span_warning("I need to place this blob closer to a node or core!")) return //handholdotron 2000 if(nearEquals) for(var/obj/structure/blob/L in orange(nearEquals, T)) if(L.type == blobstrain) - to_chat(src, "There is a similar blob nearby, move more than [nearEquals] tiles away from it!") + to_chat(src, span_warning("There is a similar blob nearby, move more than [nearEquals] tiles away from it!")) return if(!can_buy(price)) return @@ -107,9 +107,9 @@ set desc = "" nodes_required = !nodes_required if(nodes_required) - to_chat(src, "I now require a nearby node or core to place factory and resource blobs.") + to_chat(src, span_warning("I now require a nearby node or core to place factory and resource blobs.")) else - to_chat(src, "I no longer require a nearby node or core to place factory and resource blobs.") + to_chat(src, span_warning("I no longer require a nearby node or core to place factory and resource blobs.")) /mob/camera/blob/verb/create_shield_power() set category = "Blob" @@ -124,9 +124,9 @@ return if(S.obj_integrity < S.max_integrity * 0.5) add_points(BLOB_REFLECTOR_COST) - to_chat(src, "This shield blob is too damaged to be modified properly!") + to_chat(src, span_warning("This shield blob is too damaged to be modified properly!")) return - to_chat(src, "I secrete a reflective ooze over the shield blob, allowing it to reflect projectiles at the cost of reduced integrity.") + to_chat(src, span_warning("I secrete a reflective ooze over the shield blob, allowing it to reflect projectiles at the cost of reduced integrity.")) S.change_to(/obj/structure/blob/shield/reflective, src) else createSpecial(15, /obj/structure/blob/shield, 0, 0, T) @@ -156,25 +156,25 @@ var/turf/T = get_turf(src) var/obj/structure/blob/factory/B = locate(/obj/structure/blob/factory) in T if(!B) - to_chat(src, "I must be on a factory blob!") + to_chat(src, span_warning("I must be on a factory blob!")) return if(B.naut) //if it already made a blobbernaut, it can't do it again - to_chat(src, "This factory blob is already sustaining a blobbernaut.") + to_chat(src, span_warning("This factory blob is already sustaining a blobbernaut.")) return if(B.obj_integrity < B.max_integrity * 0.5) - to_chat(src, "This factory blob is too damaged to sustain a blobbernaut.") + to_chat(src, span_warning("This factory blob is too damaged to sustain a blobbernaut.")) return if(!can_buy(40)) return B.naut = TRUE //temporary placeholder to prevent creation of more than one per factory. - to_chat(src, "I attempt to produce a blobbernaut.") + to_chat(src, span_notice("I attempt to produce a blobbernaut.")) var/list/mob/candidates = pollGhostCandidates("Do you want to play as a [blobstrain.name] blobbernaut?", ROLE_BLOB, null, ROLE_BLOB, 50) //players must answer rapidly if(LAZYLEN(candidates)) //if we got at least one candidate, they're a blobbernaut now. B.max_integrity = initial(B.max_integrity) * 0.25 //factories that produced a blobbernaut have much lower health B.obj_integrity = min(B.obj_integrity, B.max_integrity) B.update_icon() - B.visible_message("The blobbernaut [pick("rips", "tears", "shreds")] its way out of the factory blob!") + B.visible_message(span_warning("The blobbernaut [pick("rips", "tears", "shreds")] its way out of the factory blob!")) playsound(B.loc, 'sound/blank.ogg', 50, TRUE) var/mob/living/simple_animal/hostile/blob/blobbernaut/blobber = new /mob/living/simple_animal/hostile/blob/blobbernaut(get_turf(B)) flick("blobbernaut_produce", blobber) @@ -194,7 +194,7 @@ to_chat(blobber, "Your overmind's blob reagent is: [blobstrain.name]!") to_chat(blobber, "The [blobstrain.name] reagent [blobstrain.shortdesc ? "[blobstrain.shortdesc]" : "[blobstrain.description]"]") else - to_chat(src, "I could not conjure a sentience for your blobbernaut. Your points have been refunded. Try again later.") + to_chat(src, span_warning("I could not conjure a sentience for your blobbernaut. Your points have been refunded. Try again later.")) add_points(40) B.naut = null @@ -205,14 +205,14 @@ var/turf/T = get_turf(src) var/obj/structure/blob/node/B = locate(/obj/structure/blob/node) in T if(!B) - to_chat(src, "I must be on a blob node!") + to_chat(src, span_warning("I must be on a blob node!")) return if(!blob_core) - to_chat(src, "I have no core and are about to die! May you rest in peace.") + to_chat(src, span_danger("I have no core and are about to die! May you rest in peace.")) return var/area/A = get_area(T) if(isspaceturf(T) || A && !A.blob_allowed) - to_chat(src, "I cannot relocate your core here!") + to_chat(src, span_warning("I cannot relocate your core here!")) return if(!can_buy(80)) return @@ -233,17 +233,17 @@ /mob/camera/blob/proc/remove_blob(turf/T) var/obj/structure/blob/B = locate() in T if(!B) - to_chat(src, "There is no blob there!") + to_chat(src, span_warning("There is no blob there!")) return if(B.point_return < 0) - to_chat(src, "Unable to remove this blob.") + to_chat(src, span_warning("Unable to remove this blob.")) return if(max_blob_points < B.point_return + blob_points) - to_chat(src, "I have too many resources to remove this blob!") + to_chat(src, span_warning("I have too many resources to remove this blob!")) return if(B.point_return) add_points(B.point_return) - to_chat(src, "Gained [B.point_return] resources from removing \the [B].") + to_chat(src, span_notice("Gained [B.point_return] resources from removing \the [B].")) qdel(B) /mob/camera/blob/verb/expand_blob_power() @@ -260,7 +260,7 @@ for(var/obj/structure/blob/AB in range(T, 1)) possibleblobs += AB if(!possibleblobs.len) - to_chat(src, "There is no blob adjacent to the target tile!") + to_chat(src, span_warning("There is no blob adjacent to the target tile!")) return if(can_buy(BLOB_SPREAD_COST)) var/attacksuccess = FALSE @@ -276,7 +276,7 @@ B.blob_attack_animation(T, src) add_points(BLOB_ATTACK_REFUND) else - to_chat(src, "There is a blob there!") + to_chat(src, span_warning("There is a blob there!")) add_points(BLOB_SPREAD_COST) //otherwise, refund all of the cost else var/list/cardinalblobs = list() @@ -381,5 +381,5 @@ to_chat(src, "Shortcuts: Click = Expand Blob | Middle Mouse Click = Rally Spores | Ctrl Click = Create Shield Blob | Alt Click = Remove Blob") to_chat(src, "Attempting to talk will send a message to all other overminds, allowing you to coordinate with them.") if(!placed && autoplace_max_time <= world.time) - to_chat(src, "I will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].") - to_chat(src, "I [manualplace_min_time ? "will be able to":"can"] manually place your blob core by pressing the Place Blob Core button in the bottom right corner of the screen.") + to_chat(src, span_big("I will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].")) + to_chat(src, span_big("I [manualplace_min_time ? "will be able to":"can"] manually place your blob core by pressing the Place Blob Core button in the bottom right corner of the screen.")) diff --git a/code/modules/antagonists/blob/structures/factory.dm b/code/modules/antagonists/blob/structures/factory.dm index e1aa34557..f0f01d90d 100644 --- a/code/modules/antagonists/blob/structures/factory.dm +++ b/code/modules/antagonists/blob/structures/factory.dm @@ -24,7 +24,7 @@ spore.factory = null if(naut) naut.factory = null - to_chat(naut, "My factory was destroyed! You feel myself dying!") + to_chat(naut, span_danger("My factory was destroyed! You feel myself dying!")) naut.throw_alert("nofactory", /atom/movable/screen/alert/nofactory) spores = null return ..() diff --git a/code/modules/antagonists/blob/structures/shield.dm b/code/modules/antagonists/blob/structures/shield.dm index c806f878f..37d7e8af3 100644 --- a/code/modules/antagonists/blob/structures/shield.dm +++ b/code/modules/antagonists/blob/structures/shield.dm @@ -54,5 +54,5 @@ var/new_angle_s = SIMPLIFY_DEGREES(face_angle + incidence_s) P.setAngle(new_angle_s) if(!(P.reflectable & REFLECT_FAKEPROJECTILE)) - visible_message("[P] reflects off [src]!") + visible_message(span_warning("[P] reflects off [src]!")) return TRUE diff --git a/code/modules/antagonists/blood_contract/blood_contract.dm b/code/modules/antagonists/blood_contract/blood_contract.dm index bd13253ca..e75889239 100644 --- a/code/modules/antagonists/blood_contract/blood_contract.dm +++ b/code/modules/antagonists/blood_contract/blood_contract.dm @@ -17,7 +17,7 @@ /datum/antagonist/blood_contract/greet() . = ..() - to_chat(owner, "You've been marked for death! Don't let the demons get you! KILL THEM ALL!") + to_chat(owner, span_danger("You've been marked for death! Don't let the demons get you! KILL THEM ALL!")) /datum/antagonist/blood_contract/proc/start_the_hunt() var/mob/living/carbon/human/H = owner.current @@ -34,7 +34,7 @@ for(var/mob/living/carbon/human/P in GLOB.player_list) if(P == H) continue - to_chat(P, "I have an overwhelming desire to kill [H]. [H.p_theyve(TRUE)] been marked red! Whoever [H.p_they()] [H.p_were()], friend or foe, go kill [H.p_them()]!") + to_chat(P, span_danger("I have an overwhelming desire to kill [H]. [H.p_theyve(TRUE)] been marked red! Whoever [H.p_they()] [H.p_were()], friend or foe, go kill [H.p_them()]!")) var/obj/item/I = new /obj/item/kitchen/knife/butcher(get_turf(P)) P.put_in_hands(I, del_on_fail=TRUE) diff --git a/code/modules/antagonists/brainwashing/brainwashing.dm b/code/modules/antagonists/brainwashing/brainwashing.dm index a4a23dadc..8fbdf5669 100644 --- a/code/modules/antagonists/brainwashing/brainwashing.dm +++ b/code/modules/antagonists/brainwashing/brainwashing.dm @@ -32,7 +32,7 @@ show_name_in_check_antagonists = TRUE /datum/antagonist/brainwashed/greet() - to_chat(owner, "My mind reels as it begins focusing on a single purpose...") + to_chat(owner, span_warning("My mind reels as it begins focusing on a single purpose...")) to_chat(owner, "Follow the Directives, at any cost!") var/i = 1 for(var/X in objectives) @@ -41,7 +41,7 @@ i++ /datum/antagonist/brainwashed/farewell() - to_chat(owner, "My mind suddenly clears...") + to_chat(owner, span_warning("My mind suddenly clears...")) to_chat(owner, "I feel the weight of the Directives disappear! You no longer have to obey them.") owner.announce_objectives() diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 0fc5a4112..83f85db44 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -29,7 +29,7 @@ /datum/antagonist/brother/on_removal() SSticker.mode.brothers -= owner if(owner.current) - to_chat(owner.current,"I are no longer the [special_role]!") + to_chat(owner.current,span_danger("I are no longer the [special_role]!")) owner.special_role = null return ..() @@ -64,7 +64,7 @@ /datum/antagonist/brother/greet() var/brother_text = get_brother_names() - to_chat(owner.current, "I are the [owner.special_role] of [brother_text].") + to_chat(owner.current, span_alertsyndie("I are the [owner.special_role] of [brother_text].")) to_chat(owner.current, "The Syndicate only accepts those that have proven themselves. Prove myself and prove my [team.member_name]s by completing my objectives together!") owner.announce_objectives() give_meeting_area() @@ -119,7 +119,7 @@ /datum/team/brother_team/roundend_report() var/list/parts = list() - parts += "The blood brothers of [name] were:" + parts += span_header("The blood brothers of [name] were:") for(var/datum/mind/M in members) parts += printplayer(M) var/win = TRUE @@ -132,9 +132,9 @@ win = FALSE objective_count++ if(win) - parts += "The blood brothers were successful!" + parts += span_greentext("The blood brothers were successful!") else - parts += "The blood brothers have failed!" + parts += span_redtext("The blood brothers have failed!") return "
[parts.Join("
")]
" diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 0e3d3422e..91f7dfe3a 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -175,23 +175,23 @@ return if(absorbedcount < thepower.req_dna) - to_chat(owner.current, "We lack the energy to evolve this ability!") + to_chat(owner.current, span_warning("We lack the energy to evolve this ability!")) return if(has_sting(thepower)) - to_chat(owner.current, "We have already evolved this ability!") + to_chat(owner.current, span_warning("We have already evolved this ability!")) return if(thepower.dna_cost < 0) - to_chat(owner.current, "We cannot evolve this ability!") + to_chat(owner.current, span_warning("We cannot evolve this ability!")) return if(geneticpoints < thepower.dna_cost) - to_chat(owner.current, "We have reached our capacity for abilities!") + to_chat(owner.current, span_warning("We have reached our capacity for abilities!")) return if(HAS_TRAIT(owner.current, TRAIT_DEATHCOMA))//To avoid potential exploits by buying new powers while in stasis, which clears your verblist. - to_chat(owner.current, "We lack the energy to evolve new abilities right now!") + to_chat(owner.current, span_warning("We lack the energy to evolve new abilities right now!")) return geneticpoints -= thepower.dna_cost @@ -200,16 +200,16 @@ /datum/antagonist/changeling/proc/readapt() if(!ishuman(owner.current)) - to_chat(owner.current, "We can't remove our evolutions in this form!") + to_chat(owner.current, span_warning("We can't remove our evolutions in this form!")) return if(canrespec) - to_chat(owner.current, "We have removed our evolutions from this form, and are now ready to readapt.") + to_chat(owner.current, span_notice("We have removed our evolutions from this form, and are now ready to readapt.")) reset_powers() canrespec = 0 SSblackbox.record_feedback("tally", "changeling_power_purchase", 1, "Readapt") return 1 else - to_chat(owner.current, "I lack the power to readapt your evolutions!") + to_chat(owner.current, span_warning("I lack the power to readapt your evolutions!")) return 0 //Called in life() @@ -243,33 +243,33 @@ var/datum/changelingprofile/prof = stored_profiles[1] if(prof.dna == user.dna && stored_profiles.len >= dna_max)//If our current DNA is the stalest, we gotta ditch it. if(verbose) - to_chat(user, "We have reached our capacity to store genetic information! We must transform before absorbing more.") + to_chat(user, span_warning("We have reached our capacity to store genetic information! We must transform before absorbing more.")) return if(!target) return if(NO_DNA_COPY in target.dna.species.species_traits) if(verbose) - to_chat(user, "[target] is not compatible with our biology.") + to_chat(user, span_warning("[target] is not compatible with our biology.")) return if(HAS_TRAIT(target, TRAIT_BADDNA)) if(verbose) - to_chat(user, "DNA of [target] is ruined beyond usability!") + to_chat(user, span_warning("DNA of [target] is ruined beyond usability!")) return if(HAS_TRAIT(target, TRAIT_HUSK)) if(verbose) - to_chat(user, "[target]'s body is ruined beyond usability!") + to_chat(user, span_warning("[target]'s body is ruined beyond usability!")) return if(!ishuman(target))//Absorbing monkeys is entirely possible, but it can cause issues with transforming. That's what lesser form is for anyway! if(verbose) - to_chat(user, "We could gain no benefit from absorbing a lesser creature.") + to_chat(user, span_warning("We could gain no benefit from absorbing a lesser creature.")) return if(has_dna(target.dna)) if(verbose) - to_chat(user, "We already have this DNA in storage!") + to_chat(user, span_warning("We already have this DNA in storage!")) return if(!target.has_dna()) if(verbose) - to_chat(user, "[target] is not compatible with our biology.") + to_chat(user, span_warning("[target] is not compatible with our biology.")) return return 1 @@ -369,15 +369,15 @@ /datum/antagonist/changeling/greet() if (you_are_greet) - to_chat(owner.current, "I are [changelingID], a changeling! You have absorbed and taken the form of a human.") - to_chat(owner.current, "Use say \"[MODE_TOKEN_CHANGELING] message\" to communicate with your fellow changelings.") + to_chat(owner.current, span_boldannounce("I are [changelingID], a changeling! You have absorbed and taken the form of a human.")) + to_chat(owner.current, span_boldannounce("Use say \"[MODE_TOKEN_CHANGELING] message\" to communicate with your fellow changelings.")) to_chat(owner.current, "I must complete the following tasks:") owner.current.playsound_local(get_turf(owner.current), 'sound/blank.ogg', 100, FALSE, pressure_affected = FALSE) owner.announce_objectives() /datum/antagonist/changeling/farewell() - to_chat(owner.current, "I grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!") + to_chat(owner.current, span_danger("I grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!")) /datum/antagonist/changeling/proc/forge_team_objectives() if(GLOB.changeling_team_objective_type) @@ -479,7 +479,7 @@ /datum/antagonist/changeling/admin_add(datum/mind/new_owner,mob/admin) . = ..() - to_chat(new_owner.current, "Our powers have awoken. A flash of memory returns to us...we are [changelingID], a changeling!") + to_chat(new_owner.current, span_boldannounce("Our powers have awoken. A flash of memory returns to us...we are [changelingID], a changeling!")) /datum/antagonist/changeling/get_admin_commands() . = ..() @@ -488,7 +488,7 @@ /datum/antagonist/changeling/proc/admin_restore_appearance(mob/admin) if(!stored_profiles.len || !iscarbon(owner.current)) - to_chat(admin, "Resetting DNA failed!") + to_chat(admin, span_danger("Resetting DNA failed!")) else var/mob/living/carbon/C = owner.current first_prof.dna.transfer_identity(C, transfer_SE=1) @@ -565,9 +565,9 @@ count++ if(changelingwin) - parts += "The changeling was successful!" + parts += span_greentext("The changeling was successful!") else - parts += "The changeling has failed." + parts += span_redtext("The changeling has failed.") return parts.Join("
") diff --git a/code/modules/antagonists/changeling/changeling_power.dm b/code/modules/antagonists/changeling/changeling_power.dm index 271b2c595..40f2634ea 100644 --- a/code/modules/antagonists/changeling/changeling_power.dm +++ b/code/modules/antagonists/changeling/changeling_power.dm @@ -68,22 +68,22 @@ the same goes for Remove(). if you override Remove(), call parent or else your p if(!ishuman(user) && !ismonkey(user)) //typecast everything from mob to carbon from this point onwards return 0 if(req_human && !ishuman(user)) - to_chat(user, "We cannot do that in this form!") + to_chat(user, span_warning("We cannot do that in this form!")) return 0 var/datum/antagonist/changeling/c = user.mind.has_antag_datum(/datum/antagonist/changeling) if(c.chem_charges < chemical_cost) - to_chat(user, "We require at least [chemical_cost] unit\s of chemicals to do that!") + to_chat(user, span_warning("We require at least [chemical_cost] unit\s of chemicals to do that!")) return 0 if(c.absorbedcount < req_dna) - to_chat(user, "We require at least [req_dna] sample\s of compatible DNA.") + to_chat(user, span_warning("We require at least [req_dna] sample\s of compatible DNA.")) return 0 if(c.trueabsorbs < req_absorbs) - to_chat(user, "We require at least [req_absorbs] sample\s of DNA gained through our Absorb ability.") + to_chat(user, span_warning("We require at least [req_absorbs] sample\s of DNA gained through our Absorb ability.")) if(req_stat < user.stat) - to_chat(user, "We are incapacitated.") + to_chat(user, span_warning("We are incapacitated.")) return 0 if((HAS_TRAIT(user, TRAIT_DEATHCOMA)) && (!ignores_fakedeath)) - to_chat(user, "We are incapacitated.") + to_chat(user, span_warning("We are incapacitated.")) return 0 return 1 diff --git a/code/modules/antagonists/changeling/powers/absorb.dm b/code/modules/antagonists/changeling/powers/absorb.dm index cb147ecd8..a728b294f 100644 --- a/code/modules/antagonists/changeling/powers/absorb.dm +++ b/code/modules/antagonists/changeling/powers/absorb.dm @@ -12,14 +12,14 @@ var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) if(changeling.isabsorbing) - to_chat(user, "We are already absorbing!") + to_chat(user, span_warning("We are already absorbing!")) return if(!user.pulling || !iscarbon(user.pulling)) - to_chat(user, "We must be grabbing a creature to absorb them!") + to_chat(user, span_warning("We must be grabbing a creature to absorb them!")) return if(user.grab_state <= GRAB_NECK) - to_chat(user, "We must have a tighter grip to absorb this creature!") + to_chat(user, span_warning("We must have a tighter grip to absorb this creature!")) return var/mob/living/carbon/target = user.pulling @@ -34,23 +34,23 @@ for(var/i in 1 to 3) switch(i) if(1) - to_chat(user, "This creature is compatible. We must hold still...") + to_chat(user, span_notice("This creature is compatible. We must hold still...")) if(2) - user.visible_message("[user] extends a proboscis!", "We extend a proboscis.") + user.visible_message(span_warning("[user] extends a proboscis!"), span_notice("We extend a proboscis.")) if(3) - user.visible_message("[user] stabs [target] with the proboscis!", "We stab [target] with the proboscis.") - to_chat(target, "I feel a sharp stabbing pain!") + user.visible_message(span_danger("[user] stabs [target] with the proboscis!"), span_notice("We stab [target] with the proboscis.")) + to_chat(target, span_danger("I feel a sharp stabbing pain!")) target.take_overall_damage(40) SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("Absorb DNA", "[i]")) if(!do_mob(user, target, 150)) - to_chat(user, "Our absorption of [target] has been interrupted!") + to_chat(user, span_warning("Our absorption of [target] has been interrupted!")) changeling.isabsorbing = 0 return SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("Absorb DNA", "4")) - user.visible_message("[user] sucks the fluids from [target]!", "We have absorbed [target].") - to_chat(target, "I are absorbed by the changeling!") + user.visible_message(span_danger("[user] sucks the fluids from [target]!"), span_notice("We have absorbed [target].")) + to_chat(target, span_danger("I are absorbed by the changeling!")) if(!changeling.has_dna(target.dna)) changeling.add_new_profile(target) @@ -110,17 +110,17 @@ if(recent_speech.len) changeling.antag_memory += "Some of [target]'s speech patterns, we should study these to better impersonate [target.p_them()]!
" - to_chat(user, "Some of [target]'s speech patterns, we should study these to better impersonate [target.p_them()]!") + to_chat(user, span_boldnotice("Some of [target]'s speech patterns, we should study these to better impersonate [target.p_them()]!")) for(var/spoken_memory in recent_speech) changeling.antag_memory += "\"[recent_speech[spoken_memory]]\"
" - to_chat(user, "\"[recent_speech[spoken_memory]]\"") + to_chat(user, span_notice("\"[recent_speech[spoken_memory]]\"")) changeling.antag_memory += "We have no more knowledge of [target]'s speech patterns.
" - to_chat(user, "We have no more knowledge of [target]'s speech patterns.") + to_chat(user, span_boldnotice("We have no more knowledge of [target]'s speech patterns.")) var/datum/antagonist/changeling/target_ling = target.mind.has_antag_datum(/datum/antagonist/changeling) if(target_ling)//If the target was a changeling, suck out their extra juice and objective points! - to_chat(user, "[target] was one of us. We have absorbed their power.") + to_chat(user, span_boldnotice("[target] was one of us. We have absorbed their power.")) target_ling.remove_changeling_powers() changeling.geneticpoints += round(target_ling.geneticpoints/2) target_ling.geneticpoints = 0 diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm index 574fae460..0e6d6dd32 100644 --- a/code/modules/antagonists/changeling/powers/adrenaline.dm +++ b/code/modules/antagonists/changeling/powers/adrenaline.dm @@ -11,7 +11,7 @@ //Recover from stuns. /datum/action/changeling/adrenaline/sting_action(mob/living/user) ..() - to_chat(user, "Energy rushes through us.") + to_chat(user, span_notice("Energy rushes through us.")) user.SetKnockdown(0) user.set_resting(FALSE) user.reagents.add_reagent(/datum/reagent/medicine/changelingadrenaline, 3) //15 seconds diff --git a/code/modules/antagonists/changeling/powers/biodegrade.dm b/code/modules/antagonists/changeling/powers/biodegrade.dm index 19e24658d..ec3abfd18 100644 --- a/code/modules/antagonists/changeling/powers/biodegrade.dm +++ b/code/modules/antagonists/changeling/powers/biodegrade.dm @@ -10,15 +10,15 @@ /datum/action/changeling/biodegrade/sting_action(mob/living/carbon/human/user) var/used = FALSE // only one form of shackles removed per use if(!user.restrained() && isopenturf(user.loc)) - to_chat(user, "We are already free!") + to_chat(user, span_warning("We are already free!")) return 0 if(user.handcuffed) var/obj/O = user.get_item_by_slot(SLOT_HANDCUFFED) if(!istype(O)) return 0 - user.visible_message("[user] vomits a glob of acid on [user.p_their()] [O]!", \ - "We vomit acidic ooze onto our restraints!") + user.visible_message(span_warning("[user] vomits a glob of acid on [user.p_their()] [O]!"), \ + span_warning("We vomit acidic ooze onto our restraints!")) addtimer(CALLBACK(src, PROC_REF(dissolve_handcuffs), user, O), 30) used = TRUE @@ -27,8 +27,8 @@ var/obj/item/clothing/suit/S = user.get_item_by_slot(SLOT_ARMOR) if(!istype(S)) return 0 - user.visible_message("[user] vomits a glob of acid across the front of [user.p_their()] [S]!", \ - "We vomit acidic ooze onto our straight jacket!") + user.visible_message(span_warning("[user] vomits a glob of acid across the front of [user.p_their()] [S]!"), \ + span_warning("We vomit acidic ooze onto our straight jacket!")) addtimer(CALLBACK(src, PROC_REF(dissolve_straightjacket), user, S), 30) used = TRUE @@ -37,8 +37,8 @@ var/obj/structure/closet/C = user.loc if(!istype(C)) return 0 - C.visible_message("[C]'s hinges suddenly begin to melt and run!") - to_chat(user, "We vomit acidic goop onto the interior of [C]!") + C.visible_message(span_warning("[C]'s hinges suddenly begin to melt and run!")) + to_chat(user, span_warning("We vomit acidic goop onto the interior of [C]!")) addtimer(CALLBACK(src, PROC_REF(open_closet), user, C), 70) used = TRUE @@ -46,8 +46,8 @@ var/obj/structure/spider/cocoon/C = user.loc if(!istype(C)) return 0 - C.visible_message("[src] shifts and starts to fall apart!") - to_chat(user, "We secrete acidic enzymes from our skin and begin melting our cocoon...") + C.visible_message(span_warning("[src] shifts and starts to fall apart!")) + to_chat(user, span_warning("We secrete acidic enzymes from our skin and begin melting our cocoon...")) addtimer(CALLBACK(src, PROC_REF(dissolve_cocoon), user, C), 25) //Very short because it's just webs used = TRUE ..() @@ -55,28 +55,28 @@ /datum/action/changeling/biodegrade/proc/dissolve_handcuffs(mob/living/carbon/human/user, obj/O) if(O && user.handcuffed == O) - user.visible_message("[O] dissolve[O.gender==PLURAL?"":"s"] into a puddle of sizzling goop.") + user.visible_message(span_warning("[O] dissolve[O.gender==PLURAL?"":"s"] into a puddle of sizzling goop.")) new /obj/effect/decal/cleanable/greenglow(O.drop_location()) qdel(O) /datum/action/changeling/biodegrade/proc/dissolve_straightjacket(mob/living/carbon/human/user, obj/S) if(S && user.wear_armor == S) - user.visible_message("[S] dissolves into a puddle of sizzling goop.") + user.visible_message(span_warning("[S] dissolves into a puddle of sizzling goop.")) new /obj/effect/decal/cleanable/greenglow(S.drop_location()) qdel(S) /datum/action/changeling/biodegrade/proc/open_closet(mob/living/carbon/human/user, obj/structure/closet/C) if(C && user.loc == C) - C.visible_message("[C]'s door breaks and opens!") + C.visible_message(span_warning("[C]'s door breaks and opens!")) new /obj/effect/decal/cleanable/greenglow(C.drop_location()) C.welded = FALSE C.locked = FALSE C.broken = TRUE C.open() - to_chat(user, "We open the container restraining us!") + to_chat(user, span_warning("We open the container restraining us!")) /datum/action/changeling/biodegrade/proc/dissolve_cocoon(mob/living/carbon/human/user, obj/structure/spider/cocoon/C) if(C && user.loc == C) new /obj/effect/decal/cleanable/greenglow(C.drop_location()) qdel(C) //The cocoon's destroy will move the changeling outside of it without interference - to_chat(user, "We dissolve the cocoon!") + to_chat(user, span_warning("We dissolve the cocoon!")) diff --git a/code/modules/antagonists/changeling/powers/digitalcamo.dm b/code/modules/antagonists/changeling/powers/digitalcamo.dm index 72dd7c221..9f24947fc 100644 --- a/code/modules/antagonists/changeling/powers/digitalcamo.dm +++ b/code/modules/antagonists/changeling/powers/digitalcamo.dm @@ -10,10 +10,10 @@ /datum/action/changeling/digitalcamo/sting_action(mob/user) ..() if(active) - to_chat(user, "We return to normal.") + to_chat(user, span_notice("We return to normal.")) user.RemoveElement(/datum/element/digitalcamo) else - to_chat(user, "We distort our form to hide from the AI.") + to_chat(user, span_notice("We distort our form to hide from the AI.")) user.AddElement(/datum/element/digitalcamo) active = !active return TRUE diff --git a/code/modules/antagonists/changeling/powers/fakedeath.dm b/code/modules/antagonists/changeling/powers/fakedeath.dm index 922b434b4..fbc1da8a9 100644 --- a/code/modules/antagonists/changeling/powers/fakedeath.dm +++ b/code/modules/antagonists/changeling/powers/fakedeath.dm @@ -20,9 +20,9 @@ button_icon_state = "fake_death" UpdateButtonIcon() chemical_cost = 15 - to_chat(user, "We have revived ourselves.") + to_chat(user, span_notice("We have revived ourselves.")) else - to_chat(user, "We begin our stasis, preparing energy to arise once more.") + to_chat(user, span_notice("We begin our stasis, preparing energy to arise once more.")) user.fakedeath("changeling") //play dead user.update_stat() user.update_mobility() @@ -52,7 +52,7 @@ if(user && user.mind) var/datum/antagonist/changeling/C = user.mind.has_antag_datum(/datum/antagonist/changeling) if(C && C.purchasedpowers) - to_chat(user, "We are ready to revive.") + to_chat(user, span_notice("We are ready to revive.")) name = "Revive" desc = "" button_icon_state = "revive" @@ -62,7 +62,7 @@ /datum/action/changeling/fakedeath/can_sting(mob/living/user) if(HAS_TRAIT_FROM(user, TRAIT_DEATHCOMA, "changeling") && !revive_ready) - to_chat(user, "We are already reviving.") + to_chat(user, span_warning("We are already reviving.")) return if(!user.stat && !revive_ready) //Confirmation for living changelings if they want to fake their death switch(alert("Are we sure we wish to fake our own death?",,"Yes", "No")) diff --git a/code/modules/antagonists/changeling/powers/fleshmend.dm b/code/modules/antagonists/changeling/powers/fleshmend.dm index 166e53628..dcbf702e4 100644 --- a/code/modules/antagonists/changeling/powers/fleshmend.dm +++ b/code/modules/antagonists/changeling/powers/fleshmend.dm @@ -11,10 +11,10 @@ //Can be used whilst unconscious. /datum/action/changeling/fleshmend/sting_action(mob/living/user) if(user.has_status_effect(STATUS_EFFECT_FLESHMEND)) - to_chat(user, "We are already fleshmending!") + to_chat(user, span_warning("We are already fleshmending!")) return ..() - to_chat(user, "We begin to heal rapidly.") + to_chat(user, span_notice("We begin to heal rapidly.")) user.apply_status_effect(STATUS_EFFECT_FLESHMEND) return TRUE diff --git a/code/modules/antagonists/changeling/powers/headcrab.dm b/code/modules/antagonists/changeling/powers/headcrab.dm index c48c3eff1..43b2ce43a 100644 --- a/code/modules/antagonists/changeling/powers/headcrab.dm +++ b/code/modules/antagonists/changeling/powers/headcrab.dm @@ -21,13 +21,13 @@ explosion(get_turf(user), 0, 0, 2, 0, TRUE) for(var/mob/living/carbon/human/H in range(2,user)) var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES) - to_chat(H, "I are blinded by a shower of blood!") + to_chat(H, span_danger("I are blinded by a shower of blood!")) H.Stun(20) H.blur_eyes(20) eyes?.applyOrganDamage(5) H.confused += 3 for(var/mob/living/silicon/S in range(2,user)) - to_chat(S, "My sensors are disabled by a shower of blood!") + to_chat(S, span_danger("My sensors are disabled by a shower of blood!")) S.Paralyze(60) var/turf = get_turf(user) user.gib() @@ -40,4 +40,4 @@ if(crab.origin) crab.origin.active = 1 crab.origin.transfer_to(crab) - to_chat(crab, "I burst out of the remains of my former body in a shower of gore!") + to_chat(crab, span_warning("I burst out of the remains of my former body in a shower of gore!")) diff --git a/code/modules/antagonists/changeling/powers/hivemind.dm b/code/modules/antagonists/changeling/powers/hivemind.dm index 53bee8ca0..2c68e303b 100644 --- a/code/modules/antagonists/changeling/powers/hivemind.dm +++ b/code/modules/antagonists/changeling/powers/hivemind.dm @@ -45,7 +45,7 @@ GLOBAL_LIST_EMPTY(hivemind_bank) /datum/action/changeling/hivemind_upload/sting_action(mob/living/user) if (HAS_TRAIT(user, CHANGELING_HIVEMIND_MUTE)) - to_chat(user, "The poison in the air hinders our ability to interact with the hivemind.") + to_chat(user, span_warning("The poison in the air hinders our ability to interact with the hivemind.")) return ..() var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) @@ -55,7 +55,7 @@ GLOBAL_LIST_EMPTY(hivemind_bank) names += prof.name if(names.len <= 0) - to_chat(user, "The airwaves already have all of our DNA!") + to_chat(user, span_warning("The airwaves already have all of our DNA!")) return var/chosen_name = input("Select a DNA to channel: ", "Channel DNA", null) as null|anything in sortList(names) @@ -69,7 +69,7 @@ GLOBAL_LIST_EMPTY(hivemind_bank) var/datum/changelingprofile/uploaded_dna = new chosen_dna.type chosen_dna.copy_profile(uploaded_dna) GLOB.hivemind_bank += uploaded_dna - to_chat(user, "We channel the DNA of [chosen_name] to the air.") + to_chat(user, span_notice("We channel the DNA of [chosen_name] to the air.")) return TRUE /datum/action/changeling/hivemind_download @@ -83,12 +83,12 @@ GLOBAL_LIST_EMPTY(hivemind_bank) if(!..()) return if (HAS_TRAIT(user, CHANGELING_HIVEMIND_MUTE)) - to_chat(user, "The poison in the air hinders our ability to interact with the hivemind.") + to_chat(user, span_warning("The poison in the air hinders our ability to interact with the hivemind.")) return var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) var/datum/changelingprofile/first_prof = changeling.stored_profiles[1] if(first_prof.name == user.real_name)//If our current DNA is the stalest, we gotta ditch it. - to_chat(user, "We have reached our capacity to store genetic information! We must transform before absorbing more.") + to_chat(user, span_warning("We have reached our capacity to store genetic information! We must transform before absorbing more.")) return return 1 @@ -100,7 +100,7 @@ GLOBAL_LIST_EMPTY(hivemind_bank) names[prof.name] = prof if(names.len <= 0) - to_chat(user, "There's no new DNA to absorb from the air!") + to_chat(user, span_warning("There's no new DNA to absorb from the air!")) return var/S = input("Select a DNA absorb from the air: ", "Absorb DNA", null) as null|anything in sortList(names) @@ -113,5 +113,5 @@ GLOBAL_LIST_EMPTY(hivemind_bank) var/datum/changelingprofile/downloaded_prof = new chosen_prof.type chosen_prof.copy_profile(downloaded_prof) changeling.add_profile(downloaded_prof) - to_chat(user, "We absorb the DNA of [S] from the air.") + to_chat(user, span_notice("We absorb the DNA of [S] from the air.")) return TRUE diff --git a/code/modules/antagonists/changeling/powers/humanform.dm b/code/modules/antagonists/changeling/powers/humanform.dm index ee2c86b19..7a6c9cf43 100644 --- a/code/modules/antagonists/changeling/powers/humanform.dm +++ b/code/modules/antagonists/changeling/powers/humanform.dm @@ -8,7 +8,7 @@ //Transform into a human. /datum/action/changeling/humanform/sting_action(mob/living/carbon/user) if(user.movement_type & VENTCRAWLING) - to_chat(user, "We must exit the pipes before we can transform back!") + to_chat(user, span_notice("We must exit the pipes before we can transform back!")) return FALSE var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) var/list/names = list() @@ -24,7 +24,7 @@ return if(!user || user.notransform) return FALSE - to_chat(user, "We transform our appearance.") + to_chat(user, span_notice("We transform our appearance.")) ..() changeling.purchasedpowers -= src diff --git a/code/modules/antagonists/changeling/powers/lesserform.dm b/code/modules/antagonists/changeling/powers/lesserform.dm index e152e885f..50e478148 100644 --- a/code/modules/antagonists/changeling/powers/lesserform.dm +++ b/code/modules/antagonists/changeling/powers/lesserform.dm @@ -11,7 +11,7 @@ /datum/action/changeling/lesserform/sting_action(mob/living/carbon/human/user) if(!user || user.notransform) return FALSE - to_chat(user, "Our genes cry out!") + to_chat(user, span_warning("Our genes cry out!")) ..() user.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSTUNS | TR_KEEPREAGENTS | TR_KEEPSE) return TRUE diff --git a/code/modules/antagonists/changeling/powers/linglink.dm b/code/modules/antagonists/changeling/powers/linglink.dm index c8d43c4b5..967d7e6bc 100644 --- a/code/modules/antagonists/changeling/powers/linglink.dm +++ b/code/modules/antagonists/changeling/powers/linglink.dm @@ -12,27 +12,27 @@ return var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) if(changeling.islinking) - to_chat(user, "We have already formed a link with the victim!") + to_chat(user, span_warning("We have already formed a link with the victim!")) return if(!user.pulling) - to_chat(user, "We must be tightly grabbing a creature to link with them!") + to_chat(user, span_warning("We must be tightly grabbing a creature to link with them!")) return if(!iscarbon(user.pulling)) - to_chat(user, "We cannot link with this creature!") + to_chat(user, span_warning("We cannot link with this creature!")) return var/mob/living/carbon/target = user.pulling if(!target.mind) - to_chat(user, "The victim has no mind to link to!") + to_chat(user, span_warning("The victim has no mind to link to!")) return if(target.stat == DEAD) - to_chat(user, "The victim is dead, you cannot link to a dead mind!") + to_chat(user, span_warning("The victim is dead, you cannot link to a dead mind!")) return if(target.mind.has_antag_datum(/datum/antagonist/changeling)) - to_chat(user, "The victim is already a part of the hivemind!") + to_chat(user, span_warning("The victim is already a part of the hivemind!")) return if(user.grab_state <= GRAB_AGGRESSIVE) - to_chat(user, "We must have a tighter grip to link with this creature!") + to_chat(user, span_warning("We must have a tighter grip to link with this creature!")) return return changeling.can_absorb_dna(target) @@ -43,30 +43,30 @@ for(var/i in 1 to 3) switch(i) if(1) - to_chat(user, "This creature is compatible. We must hold still...") + to_chat(user, span_notice("This creature is compatible. We must hold still...")) if(2) - to_chat(user, "We stealthily stab [target] with a minor proboscis...") - to_chat(target, "I experience a stabbing sensation and your ears begin to ring...") + to_chat(user, span_notice("We stealthily stab [target] with a minor proboscis...")) + to_chat(target, span_danger("I experience a stabbing sensation and your ears begin to ring...")) if(3) - to_chat(user, "We mold the [target]'s mind like clay, granting [target.p_them()] the ability to speak in the hivemind!") - to_chat(target, "A migraine throbs behind your eyes, you hear myself screaming - but your mouth has not opened!") + to_chat(user, span_notice("We mold the [target]'s mind like clay, granting [target.p_them()] the ability to speak in the hivemind!")) + to_chat(target, span_danger("A migraine throbs behind your eyes, you hear myself screaming - but your mouth has not opened!")) for(var/mi in GLOB.mob_list) var/mob/M = mi if(M.lingcheck() == LINGHIVE_LING) - to_chat(M, "We can sense a foreign presence in the hivemind...") + to_chat(M, span_changeling("We can sense a foreign presence in the hivemind...")) target.mind.linglink = 1 target.say("[MODE_TOKEN_CHANGELING] AAAAARRRRGGGGGHHHHH!!") - to_chat(target, "I can now communicate in the changeling hivemind, say \"[MODE_TOKEN_CHANGELING] message\" to communicate!") + to_chat(target, span_changelingbold("I can now communicate in the changeling hivemind, say \"[MODE_TOKEN_CHANGELING] message\" to communicate!")) target.reagents.add_reagent(/datum/reagent/medicine/salbutamol, 40) // So they don't choke to death while you interrogate them sleep(1800) SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]", "[i]")) if(!do_mob(user, target, 20)) - to_chat(user, "Our link with [target] has ended!") + to_chat(user, span_warning("Our link with [target] has ended!")) changeling.islinking = 0 target.mind.linglink = 0 return changeling.islinking = 0 target.mind.linglink = 0 - to_chat(user, "I cannot sustain the connection any longer, your victim fades from the hivemind!") - to_chat(target, "The link cannot be sustained any longer, your connection to the hivemind has faded!") + to_chat(user, span_notice("I cannot sustain the connection any longer, your victim fades from the hivemind!")) + to_chat(target, span_danger("The link cannot be sustained any longer, your connection to the hivemind has faded!")) diff --git a/code/modules/antagonists/changeling/powers/mimic_voice.dm b/code/modules/antagonists/changeling/powers/mimic_voice.dm index d1bf618bd..486286ef8 100644 --- a/code/modules/antagonists/changeling/powers/mimic_voice.dm +++ b/code/modules/antagonists/changeling/powers/mimic_voice.dm @@ -13,7 +13,7 @@ if(changeling.mimicing) changeling.mimicing = "" changeling.chem_recharge_slowdown -= 0.5 - to_chat(user, "We return our vocal glands to their original position.") + to_chat(user, span_notice("We return our vocal glands to their original position.")) return var/mimic_voice = sanitize_name(stripped_input(user, "Enter a name to mimic.", "Mimic Voice", null, MAX_NAME_LEN)) @@ -22,6 +22,6 @@ ..() changeling.mimicing = mimic_voice changeling.chem_recharge_slowdown += 0.5 - to_chat(user, "We shape our glands to take the voice of [mimic_voice], this will slow down regenerating chemicals while active.") - to_chat(user, "Use this power again to return to our original voice and return chemical production to normal levels.") + to_chat(user, span_notice("We shape our glands to take the voice of [mimic_voice], this will slow down regenerating chemicals while active.")) + to_chat(user, span_notice("Use this power again to return to our original voice and return chemical production to normal levels.")) return TRUE diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index cb2b3355f..aeaf33437 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -32,14 +32,14 @@ user.temporarilyRemoveItemFromInventory(hand_item, TRUE) //DROPDEL will delete the item if(!silent) playsound(user, 'sound/blank.ogg', 30, TRUE) - user.visible_message("With a sickening crunch, [user] reforms [user.p_their()] [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "I hear organic matter ripping and tearing!") user.update_inv_hands() return 1 /datum/action/changeling/weapon/sting_action(mob/living/user) var/obj/item/held = user.get_active_held_item() if(held && !user.dropItemToGround(held)) - to_chat(user, "[held] is stuck to my hand, you cannot grow a [weapon_name_simple] over it!") + to_chat(user, span_warning("[held] is stuck to my hand, you cannot grow a [weapon_name_simple] over it!")) return ..() var/limb_regen = 0 @@ -48,7 +48,7 @@ else limb_regen = user.regenerate_limb(BODY_ZONE_L_ARM, 1) if(limb_regen) - user.visible_message("[user]'s missing arm reforms, making a loud, grotesque sound!", "My arm regrows, making a loud, crunchy sound and giving you great pain!", "I hear organic matter ripping and tearing!") + user.visible_message(span_warning("[user]'s missing arm reforms, making a loud, grotesque sound!"), span_danger("My arm regrows, making a loud, crunchy sound and giving you great pain!"), span_hear("I hear organic matter ripping and tearing!")) user.emote("scream") var/obj/item/W = new weapon_type(user, silent) user.put_in_hands(W) @@ -90,7 +90,7 @@ return 1 var/mob/living/carbon/human/H = user if(istype(H.wear_armor, suit_type) || istype(H.head, helmet_type)) - H.visible_message("[H] casts off [H.p_their()] [suit_name_simple]!", "We cast off our [suit_name_simple].", "I hear the organic matter ripping and tearing!") + H.visible_message(span_warning("[H] casts off [H.p_their()] [suit_name_simple]!"), span_warning("We cast off our [suit_name_simple]."), span_hear("I hear the organic matter ripping and tearing!")) H.temporarilyRemoveItemFromInventory(H.head, TRUE) //The qdel on dropped() takes care of it H.temporarilyRemoveItemFromInventory(H.wear_armor, TRUE) H.update_inv_wear_suit() @@ -113,10 +113,10 @@ /datum/action/changeling/suit/sting_action(mob/living/carbon/human/user) if(!user.canUnEquip(user.wear_armor)) - to_chat(user, "\the [user.wear_armor] is stuck to my body, you cannot grow a [suit_name_simple] over it!") + to_chat(user, span_warning("\the [user.wear_armor] is stuck to my body, you cannot grow a [suit_name_simple] over it!")) return if(!user.canUnEquip(user.head)) - to_chat(user, "\the [user.head] is stuck on my head, you cannot grow a [helmet_name_simple] over it!") + to_chat(user, span_warning("\the [user.head] is stuck on my head, you cannot grow a [helmet_name_simple] over it!")) return ..() user.dropItemToGround(user.head) @@ -169,7 +169,7 @@ . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) if(ismob(loc) && !silent) - loc.visible_message("A grotesque blade forms around [loc.name]\'s arm!", "Our arm twists and mutates, transforming it into a deadly blade.", "I hear organic matter ripping and tearing!") + loc.visible_message(span_warning("A grotesque blade forms around [loc.name]\'s arm!"), span_warning("Our arm twists and mutates, transforming it into a deadly blade."), span_hear("I hear organic matter ripping and tearing!")) if(synthetic) can_drop = TRUE AddComponent(/datum/component/butchering, 60, 80) @@ -192,18 +192,18 @@ if((!A.requiresID() || A.allowed(user)) && A.hasPower()) //This is to prevent stupid shit like hitting a door with an arm blade, the door opening because you have acces and still getting a "the airlocks motors resist our efforts to force it" message, power requirement is so this doesn't stop unpowered doors from being pried open if you have access return if(A.locked) - to_chat(user, "The airlock's bolts prevent it from being forced!") + to_chat(user, span_warning("The airlock's bolts prevent it from being forced!")) return if(A.hasPower()) - user.visible_message("[user] jams [src] into the airlock and starts prying it open!", "We start forcing the [A] open.", \ - "I hear a metal screeching sound.") + user.visible_message(span_warning("[user] jams [src] into the airlock and starts prying it open!"), span_warning("We start forcing the [A] open."), \ + span_hear("I hear a metal screeching sound.")) playsound(A, 'sound/blank.ogg', 100, TRUE) if(!do_after(user, 100, target = A)) return //user.say("Heeeeeeeeeerrre's Johnny!") - user.visible_message("[user] forces the airlock to open with [user.p_their()] [src]!", "We force the [A] to open.", \ - "I hear a metal screeching sound.") + user.visible_message(span_warning("[user] forces the airlock to open with [user.p_their()] [src]!"), span_warning("We force the [A] to open."), \ + span_hear("I hear a metal screeching sound.")) A.open(2) /obj/item/melee/arm_blade/dropped(mob/user) @@ -255,13 +255,13 @@ ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) if(ismob(loc)) if(!silent) - loc.visible_message("[loc.name]\'s arm starts stretching inhumanly!", "Our arm twists and mutates, transforming it into a tentacle.", "I hear organic matter ripping and tearing!") + loc.visible_message(span_warning("[loc.name]\'s arm starts stretching inhumanly!"), span_warning("Our arm twists and mutates, transforming it into a tentacle."), span_hear("I hear organic matter ripping and tearing!")) else - to_chat(loc, "I prepare to extend a tentacle.") + to_chat(loc, span_notice("I prepare to extend a tentacle.")) /obj/item/gun/magic/tentacle/shoot_with_empty_chamber(mob/living/user as mob|obj) - to_chat(user, "The [name] is not ready yet.") + to_chat(user, span_warning("The [name] is not ready yet.")) /obj/item/gun/magic/tentacle/process_fire() . = ..() @@ -269,7 +269,7 @@ qdel(src) /obj/item/gun/magic/tentacle/suicide_act(mob/user) - user.visible_message("[user] coils [src] tightly around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] coils [src] tightly around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!")) return (OXYLOSS) @@ -327,7 +327,7 @@ if(H.Adjacent(C)) for(var/obj/item/I in H.held_items) if(I.get_sharpness()) - C.visible_message("[H] impales [C] with [H.p_their()] [I.name]!", "[H] impales you with [H.p_their()] [I.name]!") + C.visible_message(span_danger("[H] impales [C] with [H.p_their()] [I.name]!"), span_danger("[H] impales you with [H.p_their()] [I.name]!")) C.apply_damage(I.force, BRUTE, BODY_ZONE_CHEST) H.do_item_attack_animation(C, used_item = I) H.add_mob_blood(C) @@ -341,7 +341,7 @@ if(isitem(target)) var/obj/item/I = target if(!I.anchored) - to_chat(firer, "I pull [I] towards myself.") + to_chat(firer, span_notice("I pull [I] towards myself.")) H.throw_mode_on() I.throw_at(H, 10, 2) . = BULLET_ACT_HIT @@ -357,7 +357,7 @@ firer_intent = M.used_intent switch(firer_intent) if(INTENT_HELP) - C.visible_message("[L] is pulled by [H]'s tentacle!","A tentacle grabs you and pulls you towards [H]!") + C.visible_message(span_danger("[L] is pulled by [H]'s tentacle!"),span_danger("A tentacle grabs you and pulls you towards [H]!")) C.throw_at(get_step_towards(H,C), 8, 2) return BULLET_ACT_HIT @@ -365,27 +365,27 @@ var/obj/item/I = C.get_active_held_item() if(I) if(C.dropItemToGround(I)) - C.visible_message("[I] is yanked off [C]'s hand by [src]!","A tentacle pulls [I] away from you!") + C.visible_message(span_danger("[I] is yanked off [C]'s hand by [src]!"),span_danger("A tentacle pulls [I] away from you!")) on_hit(I) //grab the item as if you had hit it directly with the tentacle return BULLET_ACT_HIT else - to_chat(firer, "I can't seem to pry [I] off [C]'s hands!") + to_chat(firer, span_warning("I can't seem to pry [I] off [C]'s hands!")) return BULLET_ACT_BLOCK else - to_chat(firer, "[C] has nothing in hand to disarm!") + to_chat(firer, span_danger("[C] has nothing in hand to disarm!")) return BULLET_ACT_HIT if(INTENT_GRAB) - C.visible_message("[L] is grabbed by [H]'s tentacle!","A tentacle grabs you and pulls you towards [H]!") + C.visible_message(span_danger("[L] is grabbed by [H]'s tentacle!"),span_danger("A tentacle grabs you and pulls you towards [H]!")) C.throw_at(get_step_towards(H,C), 8, 2, H, TRUE, TRUE, callback=CALLBACK(src, PROC_REF(tentacle_grab), H, C)) return BULLET_ACT_HIT if(INTENT_HARM) - C.visible_message("[L] is thrown towards [H] by a tentacle!","A tentacle grabs you and throws you towards [H]!") + C.visible_message(span_danger("[L] is thrown towards [H] by a tentacle!"),span_danger("A tentacle grabs you and throws you towards [H]!")) C.throw_at(get_step_towards(H,C), 8, 2, H, TRUE, TRUE, callback=CALLBACK(src, PROC_REF(tentacle_stab), H, C)) return BULLET_ACT_HIT else - L.visible_message("[L] is pulled by [H]'s tentacle!","A tentacle grabs you and pulls you towards [H]!") + L.visible_message(span_danger("[L] is pulled by [H]'s tentacle!"),span_danger("A tentacle grabs you and pulls you towards [H]!")) L.throw_at(get_step_towards(H,L), 8, 2) . = BULLET_ACT_HIT @@ -435,13 +435,13 @@ . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) if(ismob(loc)) - loc.visible_message("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "I hear organic matter ripping and tearing!") + loc.visible_message(span_warning("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!"), span_warning("We inflate our hand into a strong shield."), span_hear("I hear organic matter ripping and tearing!")) /obj/item/shield/changeling/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(remaining_uses < 1) if(ishuman(loc)) var/mob/living/carbon/human/H = loc - H.visible_message("With a sickening crunch, [H] reforms [H.p_their()] shield into an arm!", "We assimilate our shield into our body", "I hear organic matter ripping and tearing!") qdel(src) return 0 else @@ -481,7 +481,7 @@ . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) if(ismob(loc)) - loc.visible_message("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around [loc.p_their()] body!", "We inflate our flesh, creating a spaceproof suit!", "I hear organic matter ripping and tearing!") + loc.visible_message(span_warning("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around [loc.p_their()] body!"), span_warning("We inflate our flesh, creating a spaceproof suit!"), span_hear("I hear organic matter ripping and tearing!")) START_PROCESSING(SSobj, src) /obj/item/clothing/suit/space/changeling/process() @@ -535,7 +535,7 @@ . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) if(ismob(loc)) - loc.visible_message("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!", "We harden our flesh, creating a suit of armor!", "I hear organic matter ripping and tearing!") + loc.visible_message(span_warning("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!"), span_warning("We harden our flesh, creating a suit of armor!"), span_hear("I hear organic matter ripping and tearing!")) /obj/item/clothing/head/helmet/changeling name = "chitinous mass" diff --git a/code/modules/antagonists/changeling/powers/panacea.dm b/code/modules/antagonists/changeling/powers/panacea.dm index 1f9e78964..a3a14a36b 100644 --- a/code/modules/antagonists/changeling/powers/panacea.dm +++ b/code/modules/antagonists/changeling/powers/panacea.dm @@ -9,7 +9,7 @@ //Heals the things that the other regenerative abilities don't. /datum/action/changeling/panacea/sting_action(mob/user) - to_chat(user, "We cleanse impurities from our form.") + to_chat(user, span_notice("We cleanse impurities from our form.")) ..() var/list/bad_organs = list( user.getorgan(/obj/item/organ/body_egg), diff --git a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm index 8576c6abc..6ef2b584a 100644 --- a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm +++ b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm @@ -15,11 +15,11 @@ ..() var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) if(!receptors_active) - to_chat(user, "We search for the scent of any nearby changelings.") + to_chat(user, span_warning("We search for the scent of any nearby changelings.")) changeling.chem_recharge_slowdown += 0.5 user.apply_status_effect(/datum/status_effect/agent_pinpointer/changeling) else - to_chat(user, "We stop searching for now.") + to_chat(user, span_notice("We stop searching for now.")) changeling.chem_recharge_slowdown -= 0.5 user.remove_status_effect(/datum/status_effect/agent_pinpointer/changeling) diff --git a/code/modules/antagonists/changeling/powers/strained_muscles.dm b/code/modules/antagonists/changeling/powers/strained_muscles.dm index 55fd6caa4..8ea5b4314 100644 --- a/code/modules/antagonists/changeling/powers/strained_muscles.dm +++ b/code/modules/antagonists/changeling/powers/strained_muscles.dm @@ -16,12 +16,12 @@ ..() active = !active if(active) - to_chat(user, "Our muscles tense and strengthen.") + to_chat(user, span_notice("Our muscles tense and strengthen.")) else user.remove_movespeed_modifier(MOVESPEED_ID_CHANGELING_MUSCLES) - to_chat(user, "Our muscles relax.") + to_chat(user, span_notice("Our muscles relax.")) if(stacks >= 10) - to_chat(user, "We collapse in exhaustion.") + to_chat(user, span_danger("We collapse in exhaustion.")) user.Paralyze(60) user.emote("breathgasp") @@ -34,7 +34,7 @@ user.add_movespeed_modifier(MOVESPEED_ID_CHANGELING_MUSCLES, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING)) if(user.stat != CONSCIOUS || user.staminaloss >= 90) active = !active - to_chat(user, "Our muscles relax without the energy to strengthen them.") + to_chat(user, span_notice("Our muscles relax without the energy to strengthen them.")) user.Paralyze(40) user.remove_movespeed_modifier(MOVESPEED_ID_CHANGELING_MUSCLES) break @@ -44,7 +44,7 @@ user.adjustStaminaLoss(stacks * 1.3) //At first the changeling may regenerate stamina fast enough to nullify fatigue, but it will stack if(stacks == 11) //Warning message that the stacks are getting too high - to_chat(user, "Our legs are really starting to hurt...") + to_chat(user, span_warning("Our legs are really starting to hurt...")) sleep(40) diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm index 544ed8c59..880108e06 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -16,7 +16,7 @@ return /datum/action/changeling/sting/proc/set_sting(mob/user) - to_chat(user, "We prepare our sting. Alt+click or click the middle mouse button on a target to sting them.") + to_chat(user, span_notice("We prepare our sting. Alt+click or click the middle mouse button on a target to sting them.")) var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) changeling.chosen_sting = src @@ -25,7 +25,7 @@ user.hud_used.lingstingdisplay.invisibility = 0 /datum/action/changeling/sting/proc/unset_sting(mob/user) - to_chat(user, "We retract our sting, we can't sting anyone for now.") + to_chat(user, span_warning("We retract our sting, we can't sting anyone for now.")) var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) changeling.chosen_sting = null @@ -58,9 +58,9 @@ /datum/action/changeling/sting/sting_feedback(mob/user, mob/target) if(!target) return - to_chat(user, "We stealthily sting [target.name].") + to_chat(user, span_notice("We stealthily sting [target.name].")) if(target.mind && target.mind.has_antag_datum(/datum/antagonist/changeling)) - to_chat(target, "I feel a tiny prick.") + to_chat(target, span_warning("I feel a tiny prick.")) return 1 @@ -83,7 +83,7 @@ if(!selected_dna) return if(NOTRANSSTING in selected_dna.dna.species.species_traits) - to_chat(user, "That DNA is not compatible with changeling retrovirus!") + to_chat(user, span_notice("That DNA is not compatible with changeling retrovirus!")) return ..() @@ -91,7 +91,7 @@ if(!..()) return if((HAS_TRAIT(target, TRAIT_HUSK)) || !iscarbon(target) || (NOTRANSSTING in target.dna.species.species_traits)) - to_chat(user, "Our sting appears ineffective against its DNA.") + to_chat(user, span_warning("Our sting appears ineffective against its DNA.")) return 0 return 1 @@ -99,7 +99,7 @@ log_combat(user, target, "stung", "transformation sting", " new identity is '[selected_dna.dna.real_name]'") var/datum/dna/NewDNA = selected_dna.dna if(ismonkey(target)) - to_chat(user, "Our genes cry out as we sting [target.name]!") + to_chat(user, span_notice("Our genes cry out as we sting [target.name]!")) var/mob/living/carbon/C = target . = TRUE @@ -130,7 +130,7 @@ if(isliving(target)) var/mob/living/L = target if((HAS_TRAIT(L, TRAIT_HUSK)) || !L.has_dna()) - to_chat(user, "Our sting appears ineffective against its DNA.") + to_chat(user, span_warning("Our sting appears ineffective against its DNA.")) return 0 return 1 @@ -139,15 +139,15 @@ var/obj/item/held = target.get_active_held_item() if(held && !target.dropItemToGround(held)) - to_chat(user, "[held] is stuck to [target.p_their()] hand, you cannot grow a false armblade over it!") + to_chat(user, span_warning("[held] is stuck to [target.p_their()] hand, you cannot grow a false armblade over it!")) return ..() if(ismonkey(target)) - to_chat(user, "Our genes cry out as we sting [target.name]!") + to_chat(user, span_notice("Our genes cry out as we sting [target.name]!")) var/obj/item/melee/arm_blade/false/blade = new(target,1) target.put_in_hands(blade) - target.visible_message("A grotesque blade forms around [target.name]\'s arm!", "My arm twists and mutates, transforming into a horrific monstrosity!", "I hear organic matter ripping and tearing!") + target.visible_message(span_warning("A grotesque blade forms around [target.name]\'s arm!"), span_danger("My arm twists and mutates, transforming into a horrific monstrosity!"), span_hear("I hear organic matter ripping and tearing!")) playsound(target, 'sound/blank.ogg', 30, TRUE) addtimer(CALLBACK(src, PROC_REF(remove_fake), target, blade), 600) @@ -157,7 +157,7 @@ playsound(target, 'sound/blank.ogg', 30, TRUE) target.visible_message("With a sickening crunch, \ [target] reforms [target.p_their()] [blade.name] into an arm!", - "[blade] reforms back to normal.", + span_warning("[blade] reforms back to normal."), "My eyes burn horrifically!") + to_chat(target, span_danger("My eyes burn horrifically!")) target.become_nearsighted(EYE_DAMAGE) target.blind_eyes(20) target.blur_eyes(40) diff --git a/code/modules/antagonists/changeling/powers/transform.dm b/code/modules/antagonists/changeling/powers/transform.dm index 57cf2908b..3c96f997a 100644 --- a/code/modules/antagonists/changeling/powers/transform.dm +++ b/code/modules/antagonists/changeling/powers/transform.dm @@ -17,7 +17,7 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/clothing/glasses/changeling/attack_hand(mob/user) if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) - to_chat(user, "I reabsorb [src] into your body.") + to_chat(user, span_notice("I reabsorb [src] into your body.")) qdel(src) return . = ..() @@ -32,7 +32,7 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/clothing/under/changeling/attack_hand(mob/user) if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) - to_chat(user, "I reabsorb [src] into your body.") + to_chat(user, span_notice("I reabsorb [src] into your body.")) qdel(src) return . = ..() @@ -48,7 +48,7 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/clothing/suit/changeling/attack_hand(mob/user) if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) - to_chat(user, "I reabsorb [src] into your body.") + to_chat(user, span_notice("I reabsorb [src] into your body.")) qdel(src) return . = ..() @@ -63,7 +63,7 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/clothing/head/changeling/attack_hand(mob/user) if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) - to_chat(user, "I reabsorb [src] into your body.") + to_chat(user, span_notice("I reabsorb [src] into your body.")) qdel(src) return . = ..() @@ -78,7 +78,7 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/clothing/shoes/changeling/attack_hand(mob/user) if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) - to_chat(user, "I reabsorb [src] into your body.") + to_chat(user, span_notice("I reabsorb [src] into your body.")) qdel(src) return . = ..() @@ -93,7 +93,7 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/clothing/gloves/changeling/attack_hand(mob/user) if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) - to_chat(user, "I reabsorb [src] into your body.") + to_chat(user, span_notice("I reabsorb [src] into your body.")) qdel(src) return . = ..() @@ -108,7 +108,7 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/clothing/mask/changeling/attack_hand(mob/user) if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) - to_chat(user, "I reabsorb [src] into your body.") + to_chat(user, span_notice("I reabsorb [src] into your body.")) qdel(src) return . = ..() @@ -125,7 +125,7 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/changeling/attack_hand(mob/user) if(loc == user && user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling)) - to_chat(user, "I reabsorb [src] into your body.") + to_chat(user, span_notice("I reabsorb [src] into your body.")) qdel(src) return . = ..() diff --git a/code/modules/antagonists/creep/creep.dm b/code/modules/antagonists/creep/creep.dm index c0c0510c2..d7aed9495 100644 --- a/code/modules/antagonists/creep/creep.dm +++ b/code/modules/antagonists/creep/creep.dm @@ -25,11 +25,11 @@ /datum/antagonist/obsessed/greet() owner.current.playsound_local(get_turf(owner.current), 'sound/blank.ogg', 100, FALSE, pressure_affected = FALSE) - to_chat(owner, "I are the Obsessed!") + to_chat(owner, span_danger("I are the Obsessed!")) to_chat(owner, "The Voices have reached out to you, and are using you to complete their evil deeds.") to_chat(owner, "I don't know their connection, but The Voices compel you to stalk [trauma.obsession], forcing them into a state of constant paranoia.") to_chat(owner, "The Voices will retaliate if you fail to complete your tasks or spend too long away from your target.") - to_chat(owner, "This role does NOT enable you to otherwise surpass what's deemed creepy behavior per the rules.")//ironic if you know the history of the antag + to_chat(owner, span_boldannounce("This role does NOT enable you to otherwise surpass what's deemed creepy behavior per the rules."))//ironic if you know the history of the antag owner.announce_objectives() /datum/antagonist/obsessed/Destroy() @@ -117,16 +117,16 @@ break if(trauma) if(trauma.total_time_creeping > 0) - report += "The [name] spent a total of [DisplayTimeText(trauma.total_time_creeping)] being near [trauma.obsession]!" + report += span_greentext("The [name] spent a total of [DisplayTimeText(trauma.total_time_creeping)] being near [trauma.obsession]!") else - report += "The [name] did not go near their obsession the entire round! That's extremely impressive!" + report += span_redtext("The [name] did not go near their obsession the entire round! That's extremely impressive!") else - report += "The [name] had no trauma attached to their antagonist ways! Either it bugged out or an admin incorrectly gave this good samaritan antag and it broke! You might as well show yourself!!" + report += span_redtext("The [name] had no trauma attached to their antagonist ways! Either it bugged out or an admin incorrectly gave this good samaritan antag and it broke! You might as well show yourself!!") if(objectives.len == 0 || objectives_complete) - report += "The [name] was successful!" + report += span_greentextbig("The [name] was successful!") else - report += "The [name] has failed!" + report += span_redtextbig("The [name] has failed!") return report.Join("
") diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 8b96d036e..032196e42 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -42,9 +42,9 @@ limit = MAX_BLOODCHARGE if(spells.len >= limit) if(rune) - to_chat(owner, "I cannot store more than [MAX_BLOODCHARGE] spells. Pick a spell to remove.") + to_chat(owner, span_cultitalic("I cannot store more than [MAX_BLOODCHARGE] spells. Pick a spell to remove.")) else - to_chat(owner, "I cannot store more than [RUNELESS_MAX_BLOODCHARGE] spells without an empowering rune! Pick a spell to remove.") + to_chat(owner, span_cultitalic("I cannot store more than [RUNELESS_MAX_BLOODCHARGE] spells without an empowering rune! Pick a spell to remove.")) var/nullify_spell = input(owner, "Choose a spell to remove.", "Current Spells") as null|anything in spells if(nullify_spell) qdel(nullify_spell) @@ -66,12 +66,12 @@ BS = possible_spells[entered_spell_name] if(QDELETED(src) || owner.incapacitated() || !BS || (rune && !(locate(/obj/effect/rune/empower) in range(1, owner))) || (spells.len >= limit)) return - to_chat(owner,"I begin to carve unnatural symbols into my flesh!") + to_chat(owner,span_warning("I begin to carve unnatural symbols into my flesh!")) SEND_SOUND(owner, sound('sound/blank.ogg',0,1,10)) if(!channeling) channeling = TRUE else - to_chat(owner, "I are already invoking blood magic!") + to_chat(owner, span_cultitalic("I are already invoking blood magic!")) return if(do_after(owner, 100 - rune*60, target = owner)) if(ishuman(owner)) @@ -81,7 +81,7 @@ new_spell.Grant(owner, src) spells += new_spell Positioning() - to_chat(owner, "My wounds glow with power, you have prepared a [new_spell.name] invocation!") + to_chat(owner, span_warning("My wounds glow with power, you have prepared a [new_spell.name] invocation!")) channeling = FALSE /datum/action/innate/cult/blood_spell //The next generation of talismans, handles storage/creation of blood magic @@ -126,14 +126,14 @@ if(!owner.put_in_hands(hand_magic)) qdel(hand_magic) hand_magic = null - to_chat(owner, "I have no empty hand for invoking blood magic!") + to_chat(owner, span_warning("I have no empty hand for invoking blood magic!")) return - to_chat(owner, "My wounds glow as you invoke the [name].") + to_chat(owner, span_notice("My wounds glow as you invoke the [name].")) return if(hand_magic) qdel(hand_magic) hand_magic = null - to_chat(owner, "I snuff out the spell, saving it for later.") + to_chat(owner, span_warning("I snuff out the spell, saving it for later.")) //Cult Blood Spells @@ -159,8 +159,8 @@ invocation = "Ta'gh fara'qha fel d'amar det!" /datum/action/innate/cult/blood_spell/emp/Activate() - owner.visible_message("[owner]'s hand flashes a bright blue!", \ - "I speak the cursed words, emitting an EMP blast from my hand.") + owner.visible_message(span_warning("[owner]'s hand flashes a bright blue!"), \ + span_cultitalic("I speak the cursed words, emitting an EMP blast from my hand.")) empulse(owner, 2, 5) owner.whisper(invocation, language = /datum/language/common) charges-- @@ -191,14 +191,14 @@ var/choice = alert(owner,"Choose my equipment type",,"Combat Equipment","Ritual Dagger","Cancel") if(choice == "Ritual Dagger") var/turf/T = get_turf(owner) - owner.visible_message("[owner]'s hand glows red for a moment.", \ - "Red light begins to shimmer and take form within my hand!") + owner.visible_message(span_warning("[owner]'s hand glows red for a moment."), \ + span_cultitalic("Red light begins to shimmer and take form within my hand!")) var/obj/O = new /obj/item/melee/cultblade/dagger(T) if(owner.put_in_hands(O)) - to_chat(owner, "A ritual dagger appears in my hand!") + to_chat(owner, span_warning("A ritual dagger appears in my hand!")) else - owner.visible_message("A ritual dagger appears at [owner]'s feet!", \ - "A ritual dagger materializes at my feet.") + owner.visible_message(span_warning("A ritual dagger appears at [owner]'s feet!"), \ + span_cultitalic("A ritual dagger materializes at my feet.")) SEND_SOUND(owner, sound('sound/blank.ogg',0,1,25)) charges-- desc = base_desc @@ -243,9 +243,9 @@ /obj/effect/proc_holder/horror/proc/toggle(mob/user) if(active) - remove_ranged_ability("I dispel the magic...") + remove_ranged_ability(span_cult("I dispel the magic...")) else - add_ranged_ability(user, "I prepare to horrify a target...") + add_ranged_ability(user, span_cult("I prepare to horrify a target...")) /obj/effect/proc_holder/horror/InterceptClickOn(mob/living/caller, params, atom/target) if(..()) @@ -265,13 +265,13 @@ var/image/C = image('icons/effects/cult_effects.dmi',H,"bloodsparkles", ABOVE_MOB_LAYER) add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE) addtimer(CALLBACK(H,TYPE_PROC_REF(/atom, remove_alt_appearance),"cult_apoc",TRUE), 2400, TIMER_OVERRIDE|TIMER_UNIQUE) - to_chat(ranged_ability_user,"[H] has been cursed with living nightmares!") + to_chat(ranged_ability_user,span_cult("[H] has been cursed with living nightmares!")) attached_action.charges-- attached_action.desc = attached_action.base_desc attached_action.desc += "
Has [attached_action.charges] use\s remaining." attached_action.UpdateButtonIcon() if(attached_action.charges <= 0) - remove_ranged_ability("I have exhausted the spell's power!") + remove_ranged_ability(span_cult("I have exhausted the spell's power!")) qdel(src) /datum/action/innate/cult/blood_spell/veiling @@ -284,8 +284,8 @@ /datum/action/innate/cult/blood_spell/veiling/Activate() if(!revealing) - owner.visible_message("Thin grey dust falls from [owner]'s hand!", \ - "I invoke the veiling spell, hiding nearby runes.") + owner.visible_message(span_warning("Thin grey dust falls from [owner]'s hand!"), \ + span_cultitalic("I invoke the veiling spell, hiding nearby runes.")) charges-- SEND_SOUND(owner, sound('sound/blank.ogg',0,1,25)) owner.whisper(invocation, language = /datum/language/common) @@ -301,8 +301,8 @@ name = "Reveal Runes" button_icon_state = "back" else - owner.visible_message("A flash of light shines from [owner]'s hand!", \ - "I invoke the counterspell, revealing nearby runes.") + owner.visible_message(span_warning("A flash of light shines from [owner]'s hand!"), \ + span_cultitalic("I invoke the counterspell, revealing nearby runes.")) charges-- owner.whisper(invocation, language = /datum/language/common) SEND_SOUND(owner, sound('sound/blank.ogg',0,1,25)) @@ -414,8 +414,8 @@ if(iscultist(target)) return if(iscultist(user)) - user.visible_message("[user] holds up [user.p_their()] hand, which explodes in a flash of red light!", \ - "I attempt to stun [L] with the spell!") + user.visible_message(span_warning("[user] holds up [user.p_their()] hand, which explodes in a flash of red light!"), \ + span_cultitalic("I attempt to stun [L] with the spell!")) user.mob_light(_range = 3, _color = LIGHT_COLOR_BLOOD_MAGIC, _duration = 0.2 SECONDS) @@ -429,13 +429,13 @@ if(istype(anti_magic_source, /obj/item)) var/obj/item/ams_object = anti_magic_source - target.visible_message("[L] starts to glow in a halo of light!", \ - "My [ams_object.name] begins to glow, emitting a blanket of holy light which surrounds you and protects you from the flash of light!") + target.visible_message(span_warning("[L] starts to glow in a halo of light!"), \ + span_danger("My [ams_object.name] begins to glow, emitting a blanket of holy light which surrounds you and protects you from the flash of light!")) else - target.visible_message("[L] starts to glow in a halo of light!", \ - "A feeling of warmth washes over you, rays of holy light surround my body and protect you from the flash of light!") + target.visible_message(span_warning("[L] starts to glow in a halo of light!"), \ + span_danger("A feeling of warmth washes over you, rays of holy light surround my body and protect you from the flash of light!")) else - to_chat(user, "In a brilliant flash of red, [L] falls to the ground!") + to_chat(user, span_cultitalic("In a brilliant flash of red, [L] falls to the ground!")) L.Paralyze(160) L.flash_act(1,1) if(issilicon(target)) @@ -459,7 +459,7 @@ /obj/item/melee/blood_magic/teleport/afterattack(atom/target, mob/living/carbon/user, proximity) if(!iscultist(target) || !proximity) - to_chat(user, "I can only teleport adjacent cultists with this spell!") + to_chat(user, span_warning("I can only teleport adjacent cultists with this spell!")) return if(iscultist(user)) var/list/potential_runes = list() @@ -469,13 +469,13 @@ potential_runes[avoid_assoc_duplicate_keys(T.listkey, teleportnames)] = T if(!potential_runes.len) - to_chat(user, "There are no valid runes to teleport to!") + to_chat(user, span_warning("There are no valid runes to teleport to!")) log_game("Teleport talisman failed - no other teleport runes") return var/turf/T = get_turf(src) if(is_away_level(T.z)) - to_chat(user, "I are not in the right dimension!") + to_chat(user, span_cultitalic("I are not in the right dimension!")) log_game("Teleport spell failed - user in away mission") return @@ -485,15 +485,15 @@ return var/turf/dest = get_turf(actual_selected_rune) if(is_blocked_turf(dest, TRUE)) - to_chat(user, "The target rune is blocked. You cannot teleport there.") + to_chat(user, span_warning("The target rune is blocked. You cannot teleport there.")) return uses-- var/turf/origin = get_turf(user) var/mob/living/L = target if(do_teleport(L, dest, channel = TELEPORT_CHANNEL_CULT)) - origin.visible_message("Dust flows from [user]'s hand, and [user.p_they()] disappear[user.p_s()] with a sharp crack!", \ - "I speak the words of the talisman and find myself somewhere else!", "I hear a sharp crack.") - dest.visible_message("There is a boom of outrushing air as something appears above the rune!", null, "I hear a boom.") + origin.visible_message(span_warning("Dust flows from [user]'s hand, and [user.p_they()] disappear[user.p_s()] with a sharp crack!"), \ + span_cultitalic("I speak the words of the talisman and find myself somewhere else!"), "I hear a sharp crack.") + dest.visible_message(span_warning("There is a boom of outrushing air as something appears above the rune!"), null, "I hear a boom.") ..() //Shackles @@ -509,29 +509,29 @@ if(C.get_num_arms(FALSE) >= 2 || C.get_arm_ignore()) CuffAttack(C, user) else - user.visible_message("This victim doesn't have enough arms to complete the restraint!") + user.visible_message(span_cultitalic("This victim doesn't have enough arms to complete the restraint!")) return ..() /obj/item/melee/blood_magic/shackles/proc/CuffAttack(mob/living/carbon/C, mob/living/user) if(!C.handcuffed) playsound(loc, 'sound/blank.ogg', 30, TRUE, -2) - C.visible_message("[user] begins restraining [C] with dark magic!", \ - "[user] begins shaping dark magic shackles around my wrists!") + C.visible_message(span_danger("[user] begins restraining [C] with dark magic!"), \ + span_danger("[user] begins shaping dark magic shackles around my wrists!")) if(do_mob(user, C, 30)) if(!C.handcuffed) C.handcuffed = new /obj/item/restraints/handcuffs/energy/cult/used(C) C.update_handcuffed() C.silent += 5 - to_chat(user, "I shackle [C].") + to_chat(user, span_notice("I shackle [C].")) log_combat(user, C, "shackled") uses-- else - to_chat(user, "[C] is already bound.") + to_chat(user, span_warning("[C] is already bound.")) else - to_chat(user, "I fail to shackle [C].") + to_chat(user, span_warning("I fail to shackle [C].")) else - to_chat(user, "[C] is already bound.") + to_chat(user, span_warning("[C] is already bound.")) /obj/item/restraints/handcuffs/energy/cult //For the shackling spell @@ -541,8 +541,8 @@ item_flags = DROPDEL /obj/item/restraints/handcuffs/energy/cult/used/dropped(mob/user) - user.visible_message("[user]'s shackles shatter in a discharge of dark magic!", \ - "My [src] shatters in a discharge of dark magic!") + user.visible_message(span_danger("[user]'s shackles shatter in a discharge of dark magic!"), \ + span_danger("My [src] shatters in a discharge of dark magic!")) . = ..() @@ -566,18 +566,18 @@ /obj/item/melee/blood_magic/construction/afterattack(atom/target, mob/user, proximity_flag, click_parameters) if(proximity_flag && iscultist(user)) if(channeling) - to_chat(user, "I are already invoking twisted construction!") + to_chat(user, span_cultitalic("I are already invoking twisted construction!")) return var/turf/T = get_turf(target) if(istype(target, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/candidate = target if(candidate.use(METAL_TO_CONSTRUCT_SHELL_CONVERSION)) uses-- - to_chat(user, "A dark cloud emanates from my hand and swirls around the metal, twisting it into a construct shell!") + to_chat(user, span_warning("A dark cloud emanates from my hand and swirls around the metal, twisting it into a construct shell!")) new /obj/structure/constructshell(T) SEND_SOUND(user, sound('sound/blank.ogg',0,1,25)) else - to_chat(user, "I need [METAL_TO_CONSTRUCT_SHELL_CONVERSION] metal to produce a construct shell!") + to_chat(user, span_warning("I need [METAL_TO_CONSTRUCT_SHELL_CONVERSION] metal to produce a construct shell!")) return else if(istype(target, /obj/item/stack/sheet/plasteel)) var/obj/item/stack/sheet/plasteel/candidate = target @@ -585,13 +585,13 @@ if(candidate.use(quantity)) uses -- new /obj/item/stack/sheet/runed_metal(T,quantity) - to_chat(user, "A dark cloud emanates from you hand and swirls around the plasteel, transforming it into runed metal!") + to_chat(user, span_warning("A dark cloud emanates from you hand and swirls around the plasteel, transforming it into runed metal!")) SEND_SOUND(user, sound('sound/blank.ogg',0,1,25)) else if(istype(target,/mob/living/silicon/robot)) var/mob/living/silicon/robot/candidate = target if(candidate.mmi) channeling = TRUE - user.visible_message("A dark cloud emanates from [user]'s hand and swirls around [candidate]!") + user.visible_message(span_danger("A dark cloud emanates from [user]'s hand and swirls around [candidate]!")) playsound(T, 'sound/blank.ogg', 80, TRUE) var/prev_color = candidate.color candidate.color = "black" @@ -601,7 +601,7 @@ if(QDELETED(candidate)) channeling = FALSE return - user.visible_message("The dark cloud receedes from what was formerly [candidate], revealing a\n [construct_class]!") + user.visible_message(span_danger("The dark cloud receedes from what was formerly [candidate], revealing a\n [construct_class]!")) switch(construct_class) if("Juggernaut") makeNewConstruct(/mob/living/simple_animal/hostile/construct/armored, candidate, user, 0, T) @@ -620,7 +620,7 @@ return else uses-- - to_chat(user, "A dark cloud emanates from you hand and swirls around [candidate] - twisting it into a construct shell!") + to_chat(user, span_warning("A dark cloud emanates from you hand and swirls around [candidate] - twisting it into a construct shell!")) new /obj/structure/constructshell(T) SEND_SOUND(user, sound('sound/blank.ogg',0,1,25)) qdel(candidate) @@ -634,14 +634,14 @@ return target.narsie_act() uses-- - user.visible_message("Black ribbons suddenly emanate from [user]'s hand and cling to the airlock - twisting and corrupting it!") + user.visible_message(span_warning("Black ribbons suddenly emanate from [user]'s hand and cling to the airlock - twisting and corrupting it!")) SEND_SOUND(user, sound('sound/blank.ogg',0,1,25)) channeling = FALSE else channeling = FALSE return else - to_chat(user, "The spell will not work on [target]!") + to_chat(user, span_warning("The spell will not work on [target]!")) return ..() @@ -655,7 +655,7 @@ if(iscarbon(target) && proximity) uses-- var/mob/living/carbon/C = target - C.visible_message("Otherworldly armor suddenly appears on [C]!") + C.visible_message(span_warning("Otherworldly armor suddenly appears on [C]!")) C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black,SLOT_PANTS) C.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), SLOT_ARMOR) C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult/alt(user), SLOT_SHOES) @@ -680,38 +680,38 @@ if(ishuman(target)) var/mob/living/carbon/human/H = target if(NOBLOOD in H.dna.species.species_traits) - to_chat(user,"Blood rites do not work on species with no blood!") + to_chat(user,span_warning("Blood rites do not work on species with no blood!")) return if(iscultist(H)) if(H.stat == DEAD) - to_chat(user,"Only a revive rune can bring back the dead!") + to_chat(user,span_warning("Only a revive rune can bring back the dead!")) return if(H.blood_volume < BLOOD_VOLUME_SAFE) var/restore_blood = BLOOD_VOLUME_SAFE - H.blood_volume if(uses*2 < restore_blood) H.blood_volume += uses*2 - to_chat(user,"I use the last of my blood rites to restore what blood you could!") + to_chat(user,span_danger("I use the last of my blood rites to restore what blood you could!")) uses = 0 return ..() else H.blood_volume = BLOOD_VOLUME_SAFE uses -= round(restore_blood/2) - to_chat(user,"My blood rites have restored [H == user ? "your" : "[H.p_their()]"] blood to safe levels!") + to_chat(user,span_warning("My blood rites have restored [H == user ? "your" : "[H.p_their()]"] blood to safe levels!")) var/overall_damage = H.getBruteLoss() + H.getFireLoss() + H.getToxLoss() + H.getOxyLoss() if(overall_damage == 0) - to_chat(user,"That cultist doesn't require healing!") + to_chat(user,span_cult("That cultist doesn't require healing!")) else var/ratio = uses/overall_damage if(H == user) - to_chat(user,"My blood healing is far less efficient when used on yourself!") + to_chat(user,span_cult("My blood healing is far less efficient when used on yourself!")) ratio *= 0.35 // Healing is half as effective if you can't perform a full heal uses -= round(overall_damage) // Healing is 65% more "expensive" even if you can still perform the full heal if(ratio>1) ratio = 1 uses -= round(overall_damage) - H.visible_message("[H] is fully healed by [H==user ? "[H.p_their()]":"[H]'s"]'s blood magic!") + H.visible_message(span_warning("[H] is fully healed by [H==user ? "[H.p_their()]":"[H]'s"]'s blood magic!")) else - H.visible_message("[H] is partially healed by [H==user ? "[H.p_their()]":"[H]'s"] blood magic.") + H.visible_message(span_warning("[H] is partially healed by [H==user ? "[H.p_their()]":"[H]'s"] blood magic.")) uses = 0 ratio *= -1 H.adjustOxyLoss((overall_damage*ratio) * (H.getOxyLoss() / overall_damage), 0) @@ -724,21 +724,21 @@ user.Beam(H,icon_state="sendbeam",time=15) else if(H.stat == DEAD) - to_chat(user,"[H.p_their(TRUE)] blood has stopped flowing, you'll have to find another way to extract it.") + to_chat(user,span_warning("[H.p_their(TRUE)] blood has stopped flowing, you'll have to find another way to extract it.")) return if(H.cultslurring) - to_chat(user,"[H.p_their(TRUE)] blood has been tainted by an even stronger form of blood magic, it's no use to us like this!") + to_chat(user,span_danger("[H.p_their(TRUE)] blood has been tainted by an even stronger form of blood magic, it's no use to us like this!")) return if(H.blood_volume > BLOOD_VOLUME_SAFE) H.blood_volume -= 100 uses += 50 user.Beam(H,icon_state="drainbeam",time=10) playsound(get_turf(H), 'sound/blank.ogg', 50) - H.visible_message("[user] has drained some of [H]'s blood!") - to_chat(user,"My blood rite gains 50 charges from draining [H]'s blood.") + H.visible_message(span_danger("[user] has drained some of [H]'s blood!")) + to_chat(user,span_cultitalic("My blood rite gains 50 charges from draining [H]'s blood.")) new /obj/effect/temp_visual/cult/sparks(get_turf(H)) else - to_chat(user,"[H.p_theyre(TRUE)] missing too much blood - you cannot drain [H.p_them()] further!") + to_chat(user,span_warning("[H.p_theyre(TRUE)] missing too much blood - you cannot drain [H.p_them()] further!")) return if(isconstruct(target)) var/mob/living/simple_animal/M = target @@ -746,11 +746,11 @@ if(missing) if(uses > missing) M.adjustHealth(-missing) - M.visible_message("[M] is fully healed by [user]'s blood magic!") + M.visible_message(span_warning("[M] is fully healed by [user]'s blood magic!")) uses -= missing else M.adjustHealth(-uses) - M.visible_message("[M] is partially healed by [user]'s blood magic!") + M.visible_message(span_warning("[M] is partially healed by [user]'s blood magic!")) uses = 0 playsound(get_turf(M), 'sound/blank.ogg', 25) user.Beam(M,icon_state="sendbeam",time=10) @@ -780,7 +780,7 @@ user.Beam(T,icon_state="drainbeam",time=15) new /obj/effect/temp_visual/cult/sparks(get_turf(user)) playsound(T, 'sound/blank.ogg', 50) - to_chat(user, "My blood rite has gained [round(temp)] charge\s from blood sources around you!") + to_chat(user, span_cultitalic("My blood rite has gained [round(temp)] charge\s from blood sources around you!")) uses += max(1, round(temp)) /obj/item/melee/blood_magic/manipulator/attack_self(mob/living/user) @@ -788,12 +788,12 @@ var/list/options = list("Blood Spear (150)", "Blood Bolt Barrage (300)", "Blood Beam (500)") var/choice = input(user, "Choose a greater blood rite...", "Greater Blood Rites") as null|anything in options if(!choice) - to_chat(user, "I decide against conducting a greater blood rite.") + to_chat(user, span_cultitalic("I decide against conducting a greater blood rite.")) return switch(choice) if("Blood Spear (150)") if(uses < BLOOD_SPEAR_COST) - to_chat(user, "I need [BLOOD_SPEAR_COST] charges to perform this rite.") + to_chat(user, span_cultitalic("I need [BLOOD_SPEAR_COST] charges to perform this rite.")) else uses -= BLOOD_SPEAR_COST var/turf/T = get_turf(user) @@ -803,31 +803,31 @@ S.Grant(user, rite) rite.spear_act = S if(user.put_in_hands(rite)) - to_chat(user, "A [rite.name] appears in my hand!") + to_chat(user, span_cultitalic("A [rite.name] appears in my hand!")) else - user.visible_message("A [rite.name] appears at [user]'s feet!", \ - "A [rite.name] materializes at my feet.") + user.visible_message(span_warning("A [rite.name] appears at [user]'s feet!"), \ + span_cultitalic("A [rite.name] materializes at my feet.")) if("Blood Bolt Barrage (300)") if(uses < BLOOD_BARRAGE_COST) - to_chat(user, "I need [BLOOD_BARRAGE_COST] charges to perform this rite.") + to_chat(user, span_cultitalic("I need [BLOOD_BARRAGE_COST] charges to perform this rite.")) else var/obj/rite = new /obj/item/gun/ballistic/rifle/boltaction/enchanted/arcane_barrage/blood() uses -= BLOOD_BARRAGE_COST qdel(src) if(user.put_in_hands(rite)) - to_chat(user, "My hands glow with power!") + to_chat(user, span_cult("My hands glow with power!")) else - to_chat(user, "I need a free hand for this rite!") + to_chat(user, span_cultitalic("I need a free hand for this rite!")) qdel(rite) if("Blood Beam (500)") if(uses < BLOOD_BEAM_COST) - to_chat(user, "I need [BLOOD_BEAM_COST] charges to perform this rite.") + to_chat(user, span_cultitalic("I need [BLOOD_BEAM_COST] charges to perform this rite.")) else var/obj/rite = new /obj/item/blood_beam() uses -= BLOOD_BEAM_COST qdel(src) if(user.put_in_hands(rite)) - to_chat(user, "My hands glow with POWER OVERWHELMING!!!") + to_chat(user, span_cultlarge("My hands glow with POWER OVERWHELMING!!!")) else - to_chat(user, "I need a free hand for this rite!") + to_chat(user, span_cultitalic("I need a free hand for this rite!")) qdel(rite) diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index c66c4c6b2..266ad041e 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -49,7 +49,7 @@ . = is_convertable_to_cult(new_owner.current,cult_team) /datum/antagonist/cult/greet() - to_chat(owner, "I are a member of the cult!") + to_chat(owner, span_danger("I are a member of the cult!")) owner.current.playsound_local(get_turf(owner.current), 'sound/blank.ogg', 100, FALSE, pressure_affected = FALSE)//subject to change owner.announce_objectives() @@ -87,10 +87,10 @@ var/item_name = initial(item_path.name) var/where = mob.equip_in_one_of_slots(T, slots) if(!where) - to_chat(mob, "Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).") + to_chat(mob, span_danger("Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).")) return 0 else - to_chat(mob, "I have a [item_name] in my [where].") + to_chat(mob, span_danger("I have a [item_name] in my [where].")) if(where == "backpack") SEND_SIGNAL(mob.back, COMSIG_TRY_STORAGE_SHOW, mob) return TRUE @@ -139,8 +139,8 @@ /datum/antagonist/cult/on_removal() SSticker.mode.cult -= owner if(!silent) - owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!", null, null, null, owner.current) - to_chat(owner.current, "An unfamiliar white light flashes through my mind, cleansing the taint of the Geometer and all my memories as her servant.") + owner.current.visible_message(span_deconversion_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!"), null, null, null, owner.current) + to_chat(owner.current, span_danger("An unfamiliar white light flashes through my mind, cleansing the taint of the Geometer and all my memories as her servant.")) owner.current.log_message("has renounced the cult of Nar'Sie!", LOG_ATTACK, color="#960000") if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client) owner.current.client.images -= cult_team.blood_target_image @@ -165,11 +165,11 @@ /datum/antagonist/cult/proc/admin_give_dagger(mob/admin) if(!equip_cultist(metal=FALSE)) - to_chat(admin, "Spawning dagger failed!") + to_chat(admin, span_danger("Spawning dagger failed!")) /datum/antagonist/cult/proc/admin_give_metal(mob/admin) if (!equip_cultist(metal=TRUE)) - to_chat(admin, "Spawning runed metal failed!") + to_chat(admin, span_danger("Spawning runed metal failed!")) /datum/antagonist/cult/proc/admin_take_all(mob/admin) var/mob/living/current = owner.current @@ -265,7 +265,7 @@ for(var/datum/mind/B in members) if(B.current) SEND_SOUND(B.current, 'sound/blank.ogg') - to_chat(B.current, "The veil weakens as my cult grows, my eyes begin to glow...") + to_chat(B.current, span_cultlarge("The veil weakens as my cult grows, my eyes begin to glow...")) addtimer(CALLBACK(src, PROC_REF(rise), B.current), 200) cult_risen = TRUE @@ -273,7 +273,7 @@ for(var/datum/mind/B in members) if(B.current) SEND_SOUND(B.current, 'sound/blank.ogg') - to_chat(B.current, "My cult is ascendent and the red harvest approaches - you cannot hide my true nature for much longer!!") + to_chat(B.current, span_cultlarge("My cult is ascendent and the red harvest approaches - you cannot hide my true nature for much longer!!")) addtimer(CALLBACK(src, PROC_REF(ascend), B.current), 200) cult_ascendent = TRUE @@ -379,9 +379,9 @@ var/list/parts = list() if(check_cult_victory()) - parts += "The cult has succeeded! Nar'Sie has snuffed out another torch in the void!" + parts += span_greentextbig("The cult has succeeded! Nar'Sie has snuffed out another torch in the void!") else - parts += "The staff managed to stop the cult! Dark words and heresy are no match for Nanotrasen's finest!" + parts += span_redtextbig("The staff managed to stop the cult! Dark words and heresy are no match for Nanotrasen's finest!") if(objectives.len) parts += "The cultists' objectives were:" @@ -394,7 +394,7 @@ count++ if(members.len) - parts += "The cultists were:" + parts += span_header("The cultists were:") parts += printplayerlist(members) return "
[parts.Join("
")]
" diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index 5da6a493d..856ce521a 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -21,7 +21,7 @@ if(!input || !IsAvailable()) return if(CHAT_FILTER_CHECK(input)) - to_chat(usr, "I cannot send a message that contains a word prohibited in IC chat!") + to_chat(usr, span_warning("I cannot send a message that contains a word prohibited in IC chat!")) return cultist_commune(usr, input) @@ -61,7 +61,7 @@ var/my_message if(!message) return - my_message = "The [user.name]: [message]" + my_message = span_cultboldtalic("The [user.name]: [message]") for(var/i in GLOB.player_list) var/mob/M = i if(iscultist(M)) @@ -96,7 +96,7 @@ B.current.update_action_buttons_icon() if(!B.current.incapacitated()) SEND_SOUND(B.current, 'sound/blank.ogg') - to_chat(B.current, "Acolyte [Nominee] has asserted that [Nominee.p_theyre()] worthy of leading the cult. A vote will be called shortly.") + to_chat(B.current, span_cultlarge("Acolyte [Nominee] has asserted that [Nominee.p_theyre()] worthy of leading the cult. A vote will be called shortly.")) sleep(100) var/list/asked_cultists = list() for(var/datum/mind/B in team.members) @@ -110,7 +110,7 @@ if(B.current) B.current.update_action_buttons_icon() if(!B.current.incapacitated()) - to_chat(B.current,"[Nominee] has died in the process of attempting to win the cult's support!") + to_chat(B.current,span_cultlarge("[Nominee] has died in the process of attempting to win the cult's support!")) return FALSE if(!Nominee.mind) team.cult_vote_called = FALSE @@ -118,7 +118,7 @@ if(B.current) B.current.update_action_buttons_icon() if(!B.current.incapacitated()) - to_chat(B.current,"[Nominee] has gone catatonic in the process of attempting to win the cult's support!") + to_chat(B.current,span_cultlarge("[Nominee] has gone catatonic in the process of attempting to win the cult's support!")) return FALSE if(LAZYLEN(yes_voters) <= LAZYLEN(asked_cultists) * 0.5) team.cult_vote_called = FALSE @@ -126,7 +126,7 @@ if(B.current) B.current.update_action_buttons_icon() if(!B.current.incapacitated()) - to_chat(B.current, "[Nominee] could not win the cult's support and shall continue to serve as an acolyte.") + to_chat(B.current, span_cultlarge("[Nominee] could not win the cult's support and shall continue to serve as an acolyte.")) return FALSE team.cult_master = Nominee SSticker.mode.remove_cultist(Nominee.mind, TRUE) @@ -136,7 +136,7 @@ for(var/datum/action/innate/cult/mastervote/vote in B.current.actions) vote.Remove(B.current) if(!B.current.incapacitated()) - to_chat(B.current,"[Nominee] has won the cult's support and is now their master. Follow [Nominee.p_their()] orders to the best of my ability!") + to_chat(B.current,span_cultlarge("[Nominee] has won the cult's support and is now their master. Follow [Nominee.p_their()] orders to the best of my ability!")) return TRUE /datum/action/innate/cult/master/IsAvailable() @@ -160,7 +160,7 @@ if(!is_blocked_turf(T, TRUE)) destinations += T if(!LAZYLEN(destinations)) - to_chat(owner, "I need more space to summon my cult!") + to_chat(owner, span_warning("I need more space to summon my cult!")) return if(do_after(owner, 30, target = owner)) for(var/datum/mind/B in antag.cult_team.members) @@ -225,7 +225,7 @@ /datum/action/innate/cult/master/cultmark/IsAvailable() if(cooldown > world.time) if(!CM.active) - to_chat(owner, "I need to wait [DisplayTimeText(cooldown - world.time)] before you can mark another target!") + to_chat(owner, span_cultlarge("I need to wait [DisplayTimeText(cooldown - world.time)] before you can mark another target!")) return FALSE return ..() @@ -248,9 +248,9 @@ /obj/effect/proc_holder/cultmark/proc/toggle(mob/user) if(active) - remove_ranged_ability("I cease the marking ritual.") + remove_ranged_ability(span_cult("I cease the marking ritual.")) else - add_ranged_ability(user, "I prepare to mark a target for my cult...") + add_ranged_ability(user, span_cult("I prepare to mark a target for my cult...")) /obj/effect/proc_holder/cultmark/InterceptClickOn(mob/living/caller, params, atom/target) if(..()) @@ -266,7 +266,7 @@ if(target in view(7, get_turf(ranged_ability_user))) if(C.cult_team.blood_target) - to_chat(ranged_ability_user, "The cult has already designated a target!") + to_chat(ranged_ability_user, span_cult("The cult has already designated a target!")) return FALSE C.cult_team.blood_target = target var/area/A = get_area(target) @@ -278,11 +278,11 @@ C.cult_team.blood_target_image.pixel_y = -target.pixel_y for(var/datum/mind/B in SSticker.mode.cult) if(B.current && B.current.stat != DEAD && B.current.client) - to_chat(B.current, "[ranged_ability_user] has marked [C.cult_team.blood_target] in the [A.name] as the cult's top priority, get there immediately!") + to_chat(B.current, span_cultlarge("[ranged_ability_user] has marked [C.cult_team.blood_target] in the [A.name] as the cult's top priority, get there immediately!")) SEND_SOUND(B.current, sound(pick('sound/blank.ogg'),0,1,75)) B.current.client.images += C.cult_team.blood_target_image attached_action.owner.update_action_buttons_icon() - remove_ranged_ability("The marking rite is complete! It will last for 90 seconds.") + remove_ranged_ability(span_cult("The marking rite is complete! It will last for 90 seconds.")) C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(reset_blood_target),C.cult_team), 900, TIMER_STOPPABLE) return TRUE return FALSE @@ -291,7 +291,7 @@ for(var/datum/mind/B in team.members) if(B.current && B.current.stat != DEAD && B.current.client) if(team.blood_target) - to_chat(B.current,"The blood mark has expired!") + to_chat(B.current,span_cultlarge("The blood mark has expired!")) B.current.client.images -= team.blood_target_image QDEL_NULL(team.blood_target_image) team.blood_target = null @@ -328,21 +328,21 @@ button_icon_state = "cult_mark" owner.update_action_buttons_icon() SEND_SOUND(owner, 'sound/blank.ogg') - to_chat(owner,"My previous mark is gone - you are now ready to create a new blood mark.") + to_chat(owner,span_cultbold("My previous mark is gone - you are now ready to create a new blood mark.")) /datum/action/innate/cult/ghostmark/Activate() var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE) if(C.cult_team.blood_target) if(cooldown>world.time) reset_blood_target(C.cult_team) - to_chat(owner, "I have cleared the cult's blood target!") + to_chat(owner, span_cultbold("I have cleared the cult's blood target!")) deltimer(C.cult_team.blood_target_reset_timer) return else - to_chat(owner, "The cult has already designated a target!") + to_chat(owner, span_cultbold("The cult has already designated a target!")) return if(cooldown>world.time) - to_chat(owner, "I aren't ready to place another blood mark yet!") + to_chat(owner, span_cultbold("I aren't ready to place another blood mark yet!")) return target = owner.orbiting?.parent || get_turf(owner) if(!target) @@ -359,10 +359,10 @@ owner.client.images += C.cult_team.blood_target_image for(var/datum/mind/B in SSticker.mode.cult) if(B.current && B.current.stat != DEAD && B.current.client) - to_chat(B.current, "[owner] has marked [C.cult_team.blood_target] in the [A.name] as the cult's top priority, get there immediately!") + to_chat(B.current, span_cultlarge("[owner] has marked [C.cult_team.blood_target] in the [A.name] as the cult's top priority, get there immediately!")) SEND_SOUND(B.current, sound(pick('sound/blank.ogg'),0,1,75)) B.current.client.images += C.cult_team.blood_target_image - to_chat(owner,"I have marked the [target] for the cult! It will last for [DisplayTimeText(base_cooldown)].") + to_chat(owner,span_cultbold("I have marked the [target] for the cult! It will last for [DisplayTimeText(base_cooldown)].")) name = "Clear the Blood Mark" desc = "" button_icon_state = "emp" @@ -396,7 +396,7 @@ return FALSE if(cooldown > world.time) if(!PM.active) - to_chat(owner, "I need to wait [DisplayTimeText(cooldown - world.time)] before you can pulse again!") + to_chat(owner, span_cultlarge("I need to wait [DisplayTimeText(cooldown - world.time)] before you can pulse again!")) return FALSE return ..() @@ -422,10 +422,10 @@ /obj/effect/proc_holder/pulse/proc/toggle(mob/user) if(active) - remove_ranged_ability("I cease my preparations...") + remove_ranged_ability(span_cult("I cease my preparations...")) attached_action.throwing = FALSE else - add_ranged_ability(user, "I prepare to tear through the fabric of reality...") + add_ranged_ability(user, span_cult("I prepare to tear through the fabric of reality...")) /obj/effect/proc_holder/pulse/InterceptClickOn(mob/living/caller, params, atom/target) if(..()) @@ -443,7 +443,7 @@ attached_action.throwing = TRUE attached_action.throwee = target SEND_SOUND(ranged_ability_user, sound('sound/blank.ogg')) - to_chat(ranged_ability_user,"I reach through the veil with my mind's eye and seize [target]!") + to_chat(ranged_ability_user,span_cult("I reach through the veil with my mind's eye and seize [target]!")) return else new /obj/effect/temp_visual/cult/sparks(get_turf(attached_action.throwee), ranged_ability_user.dir) @@ -456,6 +456,6 @@ new /obj/effect/temp_visual/cult/sparks(get_turf(target), ranged_ability_user.dir) attached_action.throwing = FALSE attached_action.cooldown = world.time + attached_action.base_cooldown - remove_ranged_ability("A pulse of blood magic surges through you as you shift [attached_action.throwee] through time and space.") + remove_ranged_ability(span_cult("A pulse of blood magic surges through you as you shift [attached_action.throwee] through time and space.")) caller.update_action_buttons_icon() addtimer(CALLBACK(caller, TYPE_PROC_REF(/mob, update_action_buttons_icon)), attached_action.base_cooldown) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 1116f2982..5f81cfd60 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -51,8 +51,8 @@ if(!iscultist(user)) user.Paralyze(100) user.dropItemToGround(src, TRUE) - user.visible_message("A powerful force shoves [user] away from [target]!", \ - "\"You shouldn't play with sharp things. You'll poke someone's eye out.\"") + user.visible_message(span_warning("A powerful force shoves [user] away from [target]!"), \ + span_cultlarge("\"You shouldn't play with sharp things. You'll poke someone's eye out.\"")) if(ishuman(user)) var/mob/living/carbon/human/H = user H.apply_damage(rand(force/2, force), BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) @@ -74,7 +74,7 @@ /obj/item/melee/cultblade/pickup(mob/living/user) ..() if(!iscultist(user)) - to_chat(user, "\"I wouldn't advise that.\"") + to_chat(user, span_cultlarge("\"I wouldn't advise that.\"")) /obj/item/twohanded/required/cult_bastard name = "bloody bastard sword" @@ -124,14 +124,14 @@ /obj/item/twohanded/required/cult_bastard/attack_self(mob/user) dash_toggled = !dash_toggled if(dash_toggled) - to_chat(loc, "I raise [src] and prepare to jaunt with it.") + to_chat(loc, span_notice("I raise [src] and prepare to jaunt with it.")) else - to_chat(loc, "I lower [src] and prepare to swing it normally.") + to_chat(loc, span_notice("I lower [src] and prepare to swing it normally.")) /obj/item/twohanded/required/cult_bastard/pickup(mob/living/user) . = ..() if(!iscultist(user)) - to_chat(user, "\"I wouldn't advise that.\"") + to_chat(user, span_cultlarge("\"I wouldn't advise that.\"")) force = 5 return force = initial(force) @@ -155,12 +155,12 @@ /obj/item/twohanded/required/cult_bastard/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(prob(final_block_chance)) if(attack_type == PROJECTILE_ATTACK) - owner.visible_message("[owner] deflects [attack_text] with [src]!") + owner.visible_message(span_danger("[owner] deflects [attack_text] with [src]!")) playsound(src, pick('sound/blank.ogg'), 100, TRUE) return TRUE else playsound(src, 'sound/blank.ogg', 75, TRUE) - owner.visible_message("[owner] parries [attack_text] with [src]!") + owner.visible_message(span_danger("[owner] parries [attack_text] with [src]!")) return TRUE return FALSE @@ -249,7 +249,7 @@ /obj/item/restraints/legcuffs/bola/cult/pickup(mob/living/user) . = ..() if(!iscultist(user)) - to_chat(user, "The bola seems to take on a life of its own!") + to_chat(user, span_warning("The bola seems to take on a life of its own!")) ensnare(user) /obj/item/restraints/legcuffs/bola/cult/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) @@ -376,19 +376,19 @@ /obj/item/clothing/suit/hooded/cultrobes/cult_shield/equipped(mob/living/user, slot) ..() if(!iscultist(user)) - to_chat(user, "\"I wouldn't advise that.\"") - to_chat(user, "An overwhelming sense of nausea overpowers you!") + to_chat(user, span_cultlarge("\"I wouldn't advise that.\"")) + to_chat(user, span_warning("An overwhelming sense of nausea overpowers you!")) user.dropItemToGround(src, TRUE) user.Dizzy(30) user.Paralyze(100) /obj/item/clothing/suit/hooded/cultrobes/cult_shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(current_charges) - owner.visible_message("\The [attack_text] is deflected in a burst of blood-red sparks!") + owner.visible_message(span_danger("\The [attack_text] is deflected in a burst of blood-red sparks!")) current_charges-- new /obj/effect/temp_visual/cult/sparks(get_turf(owner)) if(!current_charges) - owner.visible_message("The runed shield around [owner] suddenly disappears!") + owner.visible_message(span_danger("The runed shield around [owner] suddenly disappears!")) owner.update_inv_wear_suit() return 1 return 0 @@ -414,8 +414,8 @@ /obj/item/clothing/suit/hooded/cultrobes/berserker/equipped(mob/living/user, slot) ..() if(!iscultist(user)) - to_chat(user, "\"I wouldn't advise that.\"") - to_chat(user, "An overwhelming sense of nausea overpowers you!") + to_chat(user, span_cultlarge("\"I wouldn't advise that.\"")) + to_chat(user, span_warning("An overwhelming sense of nausea overpowers you!")) user.dropItemToGround(src, TRUE) user.Dizzy(30) user.Paralyze(100) @@ -430,7 +430,7 @@ /obj/item/clothing/glasses/hud/health/night/cultblind/equipped(mob/living/user, slot) ..() if(!iscultist(user)) - to_chat(user, "\"You want to be blind, do you?\"") + to_chat(user, span_cultlarge("\"You want to be blind, do you?\"")) user.dropItemToGround(src, TRUE) user.Dizzy(30) user.Paralyze(100) @@ -455,13 +455,13 @@ if(!iscultist(user)) user.dropItemToGround(src, TRUE) user.Paralyze(100) - to_chat(user, "A powerful force shoves you away from [src]!") + to_chat(user, span_warning("A powerful force shoves you away from [src]!")) return if(curselimit > 1) - to_chat(user, "We have exhausted our ability to curse the shuttle.") + to_chat(user, span_notice("We have exhausted our ability to curse the shuttle.")) return if(locate(/obj/singularity/narsie) in GLOB.poi_list) - to_chat(user, "Nar'Sie is already on this plane, there is no delaying the end of all things.") + to_chat(user, span_warning("Nar'Sie is already on this plane, there is no delaying the end of all things.")) return if(SSshuttle.emergency.mode == SHUTTLE_CALL) @@ -480,7 +480,7 @@ SSshuttle.emergency.setTimer(timer) if(surplus > 0) SSshuttle.block_recall(surplus) - to_chat(user, "I shatter the orb! A dark essence spirals into the air, then disappears.") + to_chat(user, span_danger("I shatter the orb! A dark essence spirals into the air, then disappears.")) playsound(user.loc, 'sound/blank.ogg', 50, TRUE) qdel(src) sleep(20) @@ -508,9 +508,9 @@ /obj/item/cult_shift/examine(mob/user) . = ..() if(uses) - . += "It has [uses] use\s remaining." + . += span_cult("It has [uses] use\s remaining.") else - . += "It seems drained." + . += span_cult("It seems drained.") /obj/item/cult_shift/proc/handle_teleport_grab(turf/T, mob/user) var/mob/living/carbon/C = user @@ -521,12 +521,12 @@ /obj/item/cult_shift/attack_self(mob/user) if(!uses || !iscarbon(user)) - to_chat(user, "\The [src] is dull and unmoving in your hands.") + to_chat(user, span_warning("\The [src] is dull and unmoving in your hands.")) return if(!iscultist(user)) user.dropItemToGround(src, TRUE) step(src, pick(GLOB.alldirs)) - to_chat(user, "\The [src] flickers out of your hands, your connection to this dimension is too strong!") + to_chat(user, span_warning("\The [src] flickers out of your hands, your connection to this dimension is too strong!")) return var/mob/living/carbon/C = user @@ -549,7 +549,7 @@ playsound(destination, "sparks", 50, TRUE) else - to_chat(C, "The veil cannot be torn here!") + to_chat(C, span_warning("The veil cannot be torn here!")) /obj/item/flashlight/flare/culttorch name = "void torch" @@ -581,21 +581,21 @@ if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return if(!cultist_to_receive) - to_chat(user, "I require a destination!") + to_chat(user, span_cultitalic("I require a destination!")) log_game("Void torch failed - no target") return if(cultist_to_receive.stat == DEAD) - to_chat(user, "[cultist_to_receive] has died!") + to_chat(user, span_cultitalic("[cultist_to_receive] has died!")) log_game("Void torch failed - target died") return if(!iscultist(cultist_to_receive)) - to_chat(user, "[cultist_to_receive] is not a follower of the Geometer!") + to_chat(user, span_cultitalic("[cultist_to_receive] is not a follower of the Geometer!")) log_game("Void torch failed - target was deconverted") return if(A in user.GetAllContents()) - to_chat(user, "[A] must be on a surface in order to teleport it!") + to_chat(user, span_cultitalic("[A] must be on a surface in order to teleport it!")) return - to_chat(user, "I ignite [A] with \the [src], turning it to ash, but through the torch's flames you see that [A] has reached [cultist_to_receive]!") + to_chat(user, span_cultitalic("I ignite [A] with \the [src], turning it to ash, but through the torch's flames you see that [A] has reached [cultist_to_receive]!")) cultist_to_receive.put_in_hands(A) charges-- to_chat(user, "\The [src] now has [charges] charge\s.") @@ -604,7 +604,7 @@ else ..() - to_chat(user, "\The [src] can only transport items!") + to_chat(user, span_warning("\The [src] can only transport items!")) /obj/item/twohanded/cult_spear @@ -644,9 +644,9 @@ if(iscultist(L)) playsound(src, 'sound/blank.ogg', 50) if(L.put_in_active_hand(src)) - L.visible_message("[L] catches [src] out of the air!") + L.visible_message(span_warning("[L] catches [src] out of the air!")) else - L.visible_message("[src] bounces off of [L], as if repelled by an unseen force!") + L.visible_message(span_warning("[src] bounces off of [L], as if repelled by an unseen force!")) else if(!..()) if(!L.anti_magic_check()) L.Paralyze(50) @@ -659,7 +659,7 @@ if(!T) T = get_turf(src) if(T) - T.visible_message("[src] shatters and melts back into blood!") + T.visible_message(span_warning("[src] shatters and melts back into blood!")) new /obj/effect/temp_visual/cult/sparks(T) new /obj/effect/decal/cleanable/blood/splatter(T) playsound(T, 'sound/blank.ogg', 100) @@ -670,12 +670,12 @@ final_block_chance *= 2 if(prob(final_block_chance)) if(attack_type == PROJECTILE_ATTACK) - owner.visible_message("[owner] deflects [attack_text] with [src]!") + owner.visible_message(span_danger("[owner] deflects [attack_text] with [src]!")) playsound(src, pick('sound/blank.ogg'), 100, TRUE) return TRUE else playsound(src, 'sound/blank.ogg', 100, TRUE) - owner.visible_message("[owner] parries [attack_text] with [src]!") + owner.visible_message(span_danger("[owner] parries [attack_text] with [src]!")) return TRUE return FALSE @@ -699,13 +699,13 @@ var/ST = get_turf(spear) var/OT = get_turf(owner) if(get_dist(OT, ST) > 10) - to_chat(owner,"The spear is too far away!") + to_chat(owner,span_cult("The spear is too far away!")) else cooldown = world.time + 20 if(isliving(spear.loc)) var/mob/living/L = spear.loc L.dropItemToGround(spear) - L.visible_message("An unseen force pulls the blood spear from [L]'s hands!") + L.visible_message(span_warning("An unseen force pulls the blood spear from [L]'s hands!")) spear.throw_at(owner, 10, 2, owner) @@ -789,7 +789,7 @@ var/obj/structure/emergency_shield/invoker/N = new(user.loc) if(do_after(user, 90, target = user)) user.Paralyze(40) - to_chat(user, "I have exhausted the power of this spell!") + to_chat(user, span_cultitalic("I have exhausted the power of this spell!")) firing = FALSE if(N) qdel(N) @@ -886,7 +886,7 @@ if(P.damage_type == BRUTE || P.damage_type == BURN) if(P.damage >= 30) var/turf/T = get_turf(owner) - T.visible_message("The sheer force from [P] shatters the mirror shield!") + T.visible_message(span_warning("The sheer force from [P] shatters the mirror shield!")) new /obj/effect/temp_visual/cult/sparks(T) playsound(T, 'sound/blank.ogg', 100) owner.Paralyze(25) @@ -918,14 +918,14 @@ H.faction = list("cult") H.GiveTarget(owner) H.move_to_delay = owner.cached_multiplicative_slowdown - to_chat(owner, "[src] betrays you!") + to_chat(owner, span_danger("[src] betrays you!")) return FALSE /obj/item/shield/mirror/proc/readd() illusions++ if(illusions == initial(illusions) && isliving(loc)) var/mob/living/holder = loc - to_chat(holder, "The shield's illusions are back at full strength!") + to_chat(holder, span_cultitalic("The shield's illusions are back at full strength!")) /obj/item/shield/mirror/IsReflect() if(prob(block_chance)) @@ -940,9 +940,9 @@ if(iscultist(L)) playsound(src, 'sound/blank.ogg', 50) if(L.put_in_active_hand(src)) - L.visible_message("[L] catches [src] out of the air!") + L.visible_message(span_warning("[L] catches [src] out of the air!")) else - L.visible_message("[src] bounces off of [L], as if repelled by an unseen force!") + L.visible_message(span_warning("[src] bounces off of [L], as if repelled by an unseen force!")) else if(!..()) if(!L.anti_magic_check()) L.Paralyze(30) diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index 2910f92dd..03cea207b 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -9,7 +9,7 @@ /obj/structure/destructible/cult/proc/conceal() //for spells that hide cult presence density = FALSE - visible_message("[src] fades away.") + visible_message(span_danger("[src] fades away.")) invisibility = INVISIBILITY_OBSERVER alpha = 100 //To help ghosts distinguish hidden runes light_range = 0 @@ -20,7 +20,7 @@ /obj/structure/destructible/cult/proc/reveal() //for spells that reveal cult presence density = initial(density) invisibility = 0 - visible_message("[src] suddenly appears!") + visible_message(span_danger("[src] suddenly appears!")) alpha = initial(alpha) light_range = initial(light_range) light_power = initial(light_power) @@ -30,15 +30,15 @@ /obj/structure/destructible/cult/examine(mob/user) . = ..() - . += "\The [src] is [anchored ? "":"not "]secured to the floor." + . += span_notice("\The [src] is [anchored ? "":"not "]secured to the floor.") if((iscultist(user) || isobserver(user)) && cooldowntime > world.time) - . += "The magic in [src] is too weak, [p_they()] will be ready to use again in [DisplayTimeText(cooldowntime - world.time)]." + . += span_cultitalic("The magic in [src] is too weak, [p_they()] will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") /obj/structure/destructible/cult/examine_status(mob/user) if(iscultist(user) || isobserver(user)) var/t_It = p_they(TRUE) var/t_is = p_are() - return "[t_It] [t_is] at [round(obj_integrity * 100 / max_integrity)]% stability." + return span_cult("[t_It] [t_is] at [round(obj_integrity * 100 / max_integrity)]% stability.") return ..() /obj/structure/destructible/cult/attack_animal(mob/living/simple_animal/M) @@ -47,17 +47,17 @@ M.changeNext_move(CLICK_CD_MELEE) obj_integrity = min(max_integrity, obj_integrity + 5) Beam(M, icon_state="sendbeam", time=4) - M.visible_message("[M] repairs \the [src].", \ - "I repair [src], leaving [p_they()] at [round(obj_integrity * 100 / max_integrity)]% stability.") + M.visible_message(span_danger("[M] repairs \the [src]."), \ + span_cult("I repair [src], leaving [p_they()] at [round(obj_integrity * 100 / max_integrity)]% stability.")) else - to_chat(M, "I cannot repair [src], as [p_theyre()] undamaged!") + to_chat(M, span_cult("I cannot repair [src], as [p_theyre()] undamaged!")) else ..() /obj/structure/destructible/cult/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user)) anchored = !anchored - to_chat(user, "I [anchored ? "":"un"]secure \the [src] [anchored ? "to":"from"] the floor.") + to_chat(user, span_notice("I [anchored ? "":"un"]secure \the [src] [anchored ? "to":"from"] the floor.")) if(!anchored) icon_state = "[initial(icon_state)]_off" else @@ -69,20 +69,20 @@ name = "altar" desc = "" icon_state = "talismanaltar" - break_message = "The altar shatters, leaving only the wailing of the damned!" + break_message = span_warning("The altar shatters, leaving only the wailing of the damned!") /obj/structure/destructible/cult/talisman/attack_hand(mob/living/user) . = ..() if(.) return if(!iscultist(user)) - to_chat(user, "You're pretty sure you know exactly what this is used for and you can't seem to touch it.") + to_chat(user, span_warning("You're pretty sure you know exactly what this is used for and you can't seem to touch it.")) return if(!anchored) - to_chat(user, "I need to anchor [src] to the floor with your dagger first.") + to_chat(user, span_cultitalic("I need to anchor [src] to the floor with your dagger first.")) return if(cooldowntime > world.time) - to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") + to_chat(user, span_cultitalic("The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].")) return var/choice = alert(user,"You study the schematics etched into the altar...",,"Eldritch Whetstone","Construct Shell","Flask of Unholy Water") var/list/pickedtype = list() @@ -97,7 +97,7 @@ cooldowntime = world.time + 2400 for(var/N in pickedtype) new N(get_turf(src)) - to_chat(user, "I kneel before the altar and your faith is rewarded with the [choice]!") + to_chat(user, span_cultitalic("I kneel before the altar and your faith is rewarded with the [choice]!")) /obj/structure/destructible/cult/forge name = "daemon forge" @@ -105,20 +105,20 @@ icon_state = "forge" light_range = 2 light_color = LIGHT_COLOR_LAVA - break_message = "The force breaks apart into shards with a howling scream!" + break_message = span_warning("The force breaks apart into shards with a howling scream!") /obj/structure/destructible/cult/forge/attack_hand(mob/living/user) . = ..() if(.) return if(!iscultist(user)) - to_chat(user, "The heat radiating from [src] pushes you back.") + to_chat(user, span_warning("The heat radiating from [src] pushes you back.")) return if(!anchored) - to_chat(user, "I need to anchor [src] to the floor with your dagger first.") + to_chat(user, span_cultitalic("I need to anchor [src] to the floor with your dagger first.")) return if(cooldowntime > world.time) - to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") + to_chat(user, span_cultitalic("The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].")) return var/choice if(user.mind.has_antag_datum(/datum/antagonist/cult/master)) @@ -137,7 +137,7 @@ cooldowntime = world.time + 2400 for(var/N in pickedtype) new N(get_turf(src)) - to_chat(user, "I work the forge as dark knowledge guides your hands, creating the [choice]!") + to_chat(user, span_cultitalic("I work the forge as dark knowledge guides your hands, creating the [choice]!")) @@ -148,7 +148,7 @@ light_range = 1.5 light_color = LIGHT_COLOR_RED break_sound = 'sound/blank.ogg' - break_message = "The blood-red crystal falls to the floor and shatters!" + break_message = span_warning("The blood-red crystal falls to the floor and shatters!") var/heal_delay = 25 var/last_heal = 0 var/corrupt_delay = 50 @@ -223,20 +223,20 @@ icon_state = "tomealtar" light_range = 1.5 light_color = LIGHT_COLOR_FIRE - break_message = "The books and tomes of the archives burn into ash as the desk shatters!" + break_message = span_warning("The books and tomes of the archives burn into ash as the desk shatters!") /obj/structure/destructible/cult/tome/attack_hand(mob/living/user) . = ..() if(.) return if(!iscultist(user)) - to_chat(user, "These books won't open and it hurts to even try and read the covers.") + to_chat(user, span_warning("These books won't open and it hurts to even try and read the covers.")) return if(!anchored) - to_chat(user, "I need to anchor [src] to the floor with your dagger first.") + to_chat(user, span_cultitalic("I need to anchor [src] to the floor with your dagger first.")) return if(cooldowntime > world.time) - to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") + to_chat(user, span_cultitalic("The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].")) return var/choice = alert(user,"You flip through the black pages of the archives...",,"Zealot's Blindfold","Shuttle Curse","Veil Walker Set") var/list/pickedtype = list() @@ -252,7 +252,7 @@ cooldowntime = world.time + 2400 for(var/N in pickedtype) new N(get_turf(src)) - to_chat(user, "I summon the [choice] from the archives!") + to_chat(user, span_cultitalic("I summon the [choice] from the archives!")) /obj/effect/gateway name = "gateway" diff --git a/code/modules/antagonists/cult/ritual.dm b/code/modules/antagonists/cult/ritual.dm index 5c4410e7a..49e2e5e10 100644 --- a/code/modules/antagonists/cult/ritual.dm +++ b/code/modules/antagonists/cult/ritual.dm @@ -25,7 +25,7 @@ This file contains the cult dagger and rune list code /obj/item/melee/cultblade/dagger/attack(mob/living/M, mob/living/user) if(iscultist(M)) if(M.reagents && M.reagents.has_reagent(/datum/reagent/water/holywater)) //allows cultists to be rescued from the clutches of ordained religion - to_chat(user, "I remove the taint from [M]." ) + to_chat(user, span_cult("I remove the taint from [M].") ) var/holy2unholy = M.reagents.get_reagent_amount(/datum/reagent/water/holywater) M.reagents.del_reagent(/datum/reagent/water/holywater) M.reagents.add_reagent(/datum/reagent/fuel/unholywater,holy2unholy) @@ -35,7 +35,7 @@ This file contains the cult dagger and rune list code /obj/item/melee/cultblade/dagger/attack_self(mob/user) if(!iscultist(user)) - to_chat(user, "[src] is covered in unintelligible shapes and markings.") + to_chat(user, span_warning("[src] is covered in unintelligible shapes and markings.")) return scribe_rune(user) @@ -69,50 +69,50 @@ This file contains the cult dagger and rune list code if(!src || QDELETED(src) || !Adjacent(user) || user.incapacitated() || !check_rune_turf(Turf, user)) return if(ispath(rune_to_scribe, /obj/effect/rune/summon) && (!is_station_level(Turf.z) || A.map_name == "Space")) - to_chat(user, "The veil is not weak enough here to summon a cultist, you must be on station!") + to_chat(user, span_cultitalic("The veil is not weak enough here to summon a cultist, you must be on station!")) return if(ispath(rune_to_scribe, /obj/effect/rune/apocalypse)) if((world.time - SSticker.round_start_time) <= 6000) var/wait = 6000 - (world.time - SSticker.round_start_time) - to_chat(user, "The veil is not yet weak enough for this rune - it will be available in [DisplayTimeText(wait)].") + to_chat(user, span_cultitalic("The veil is not yet weak enough for this rune - it will be available in [DisplayTimeText(wait)].")) return var/datum/objective/eldergod/summon_objective = locate() in user_antag.cult_team.objectives if(!(A in summon_objective.summon_spots)) - to_chat(user, "The Apocalypse rune will remove a ritual site (where Nar'Sie can be summoned), it can only be scribed in [english_list(summon_objective.summon_spots)]!") + to_chat(user, span_cultlarge("The Apocalypse rune will remove a ritual site (where Nar'Sie can be summoned), it can only be scribed in [english_list(summon_objective.summon_spots)]!")) return if(summon_objective.summon_spots.len < 2) - to_chat(user, "Only one ritual site remains - it must be reserved for the final summoning!") + to_chat(user, span_cultlarge("Only one ritual site remains - it must be reserved for the final summoning!")) return if(ispath(rune_to_scribe, /obj/effect/rune/narsie)) var/datum/objective/eldergod/summon_objective = locate() in user_antag.cult_team.objectives var/datum/objective/sacrifice/sac_objective = locate() in user_antag.cult_team.objectives if(!summon_objective) - to_chat(user, "Nar'Sie does not wish to be summoned!") + to_chat(user, span_warning("Nar'Sie does not wish to be summoned!")) return if(sac_objective && !sac_objective.check_completion()) - to_chat(user, "The sacrifice is not complete. The portal would lack the power to open if you tried!") + to_chat(user, span_warning("The sacrifice is not complete. The portal would lack the power to open if you tried!")) return if(summon_objective.check_completion()) - to_chat(user, "\"I am already here. There is no need to try to summon me now.\"") + to_chat(user, span_cultlarge("\"I am already here. There is no need to try to summon me now.\"")) return if(!(A in summon_objective.summon_spots)) - to_chat(user, "The Geometer can only be summoned where the veil is weak - in [english_list(summon_objective.summon_spots)]!") + to_chat(user, span_cultlarge("The Geometer can only be summoned where the veil is weak - in [english_list(summon_objective.summon_spots)]!")) return var/confirm_final = alert(user, "This is the FINAL step to summon Nar'Sie; it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for Nar'Sie!", "No") if(confirm_final == "No") - to_chat(user, "I decide to prepare further before scribing the rune.") + to_chat(user, span_cult("I decide to prepare further before scribing the rune.")) return Turf = get_turf(user) A = get_area(src) if(!(A in summon_objective.summon_spots)) // Check again to make sure they didn't move - to_chat(user, "The Geometer can only be summoned where the veil is weak - in [english_list(summon_objective.summon_spots)]!") + to_chat(user, span_cultlarge("The Geometer can only be summoned where the veil is weak - in [english_list(summon_objective.summon_spots)]!")) return priority_announce("Figments from an eldritch god are being summoned by [user] into [A.map_name] from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensional Affairs", 'sound/blank.ogg') for(var/B in spiral_range_turfs(1, user, 1)) var/obj/structure/emergency_shield/sanguine/N = new(B) shields += N - user.visible_message("[user] [user.blood_volume ? "cuts open [user.p_their()] arm and begins writing in [user.p_their()] own blood":"begins sketching out a strange design"]!", \ - "I [user.blood_volume ? "slice open your arm and ":""]begin drawing a sigil of the Geometer.") + user.visible_message(span_warning("[user] [user.blood_volume ? "cuts open [user.p_their()] arm and begins writing in [user.p_their()] own blood":"begins sketching out a strange design"]!"), \ + span_cult("I [user.blood_volume ? "slice open your arm and ":""]begin drawing a sigil of the Geometer.")) if(user.blood_volume) user.apply_damage(initial(rune_to_scribe.scribe_damage), BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) var/scribe_mod = initial(rune_to_scribe.scribe_delay) @@ -126,26 +126,26 @@ This file contains the cult dagger and rune list code return if(!check_rune_turf(Turf, user)) return - user.visible_message("[user] creates a strange circle[user.blood_volume ? " in [user.p_their()] own blood":""].", \ - "I finish drawing the arcane markings of the Geometer.") + user.visible_message(span_warning("[user] creates a strange circle[user.blood_volume ? " in [user.p_their()] own blood":""]."), \ + span_cult("I finish drawing the arcane markings of the Geometer.")) for(var/V in shields) var/obj/structure/emergency_shield/S = V if(S && !QDELETED(S)) qdel(S) var/obj/effect/rune/R = new rune_to_scribe(Turf, chosen_keyword) R.add_mob_blood(user) - to_chat(user, "The [lowertext(R.cultist_name)] rune [R.cultist_desc]") + to_chat(user, span_cult("The [lowertext(R.cultist_name)] rune [R.cultist_desc]")) SSblackbox.record_feedback("tally", "cult_runes_scribed", 1, R.cultist_name) /obj/item/melee/cultblade/dagger/proc/check_rune_turf(turf/T, mob/user) if(isspaceturf(T)) - to_chat(user, "I cannot scribe runes in space!") + to_chat(user, span_warning("I cannot scribe runes in space!")) return FALSE if(locate(/obj/effect/rune) in T) - to_chat(user, "There is already a rune here.") + to_chat(user, span_cult("There is already a rune here.")) return FALSE var/area/A = get_area(T) if((!is_station_level(T.z) && !is_mining_level(T.z)) || (A && !(A.flags_1 & CULT_PERMITTED_1))) - to_chat(user, "The veil is not weak enough here.") + to_chat(user, span_warning("The veil is not weak enough here.")) return FALSE return TRUE diff --git a/code/modules/antagonists/cult/rune_spawn_action.dm b/code/modules/antagonists/cult/rune_spawn_action.dm index 5373b036e..220457992 100644 --- a/code/modules/antagonists/cult/rune_spawn_action.dm +++ b/code/modules/antagonists/cult/rune_spawn_action.dm @@ -23,13 +23,13 @@ if(!T) return FALSE if(isspaceturf(T)) - to_chat(owner, "I cannot scribe runes in space!") + to_chat(owner, span_warning("I cannot scribe runes in space!")) return FALSE if(locate(/obj/effect/rune) in T) - to_chat(owner, "There is already a rune here.") + to_chat(owner, span_cult("There is already a rune here.")) return FALSE if(!is_station_level(T.z) && !is_mining_level(T.z)) - to_chat(owner, "The veil is not weak enough here.") + to_chat(owner, span_warning("The veil is not weak enough here.")) return FALSE return TRUE diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 13090974e..2265dccbd 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -59,11 +59,11 @@ Runes can either be invoked by one's self or with many different cultists. Each if(istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user)) SEND_SOUND(user,'sound/blank.ogg') if(do_after(user, 15, target = src)) - to_chat(user, "I carefully erase the [lowertext(cultist_name)] rune.") + to_chat(user, span_notice("I carefully erase the [lowertext(cultist_name)] rune.")) qdel(src) else if(istype(I, /obj/item/nullrod)) user.say("BEGONE FOUL MAGIKS!!", forced = "nullrod") - to_chat(user, "I disrupt the magic of [src] with [I].") + to_chat(user, span_danger("I disrupt the magic of [src] with [I].")) qdel(src) /obj/effect/rune/attack_hand(mob/living/user) @@ -71,33 +71,33 @@ Runes can either be invoked by one's self or with many different cultists. Each if(.) return if(!iscultist(user)) - to_chat(user, "I aren't able to understand the words of [src].") + to_chat(user, span_warning("I aren't able to understand the words of [src].")) return var/list/invokers = can_invoke(user) if(invokers.len >= req_cultists) invoke(invokers) else - to_chat(user, "I need [req_cultists - invokers.len] more adjacent cultists to use this rune in such a manner.") + to_chat(user, span_danger("I need [req_cultists - invokers.len] more adjacent cultists to use this rune in such a manner.")) fail_invoke() /obj/effect/rune/attack_animal(mob/living/simple_animal/M) if(istype(M, /mob/living/simple_animal/shade) || istype(M, /mob/living/simple_animal/hostile/construct)) if(istype(M, /mob/living/simple_animal/hostile/construct/wraith/angelic) || istype(M, /mob/living/simple_animal/hostile/construct/armored/angelic) || istype(M, /mob/living/simple_animal/hostile/construct/builder/angelic)) - to_chat(M, "I purge the rune!") + to_chat(M, span_warning("I purge the rune!")) qdel(src) else if(construct_invoke || !iscultist(M)) //if you're not a cult construct we want the normal fail message attack_hand(M) else - to_chat(M, "I are unable to invoke the rune!") + to_chat(M, span_warning("I are unable to invoke the rune!")) /obj/effect/rune/proc/conceal() //for talisman of revealing/hiding - visible_message("[src] fades away.") + visible_message(span_danger("[src] fades away.")) invisibility = INVISIBILITY_OBSERVER alpha = 100 //To help ghosts distinguish hidden runes /obj/effect/rune/proc/reveal() //for talisman of revealing/hiding invisibility = 0 - visible_message("[src] suddenly appears!") + visible_message(span_danger("[src] suddenly appears!")) alpha = initial(alpha) /* @@ -139,10 +139,10 @@ structure_check() searches for nearby cultist structures required for the invoca L.say(invocation, language = /datum/language/common, ignore_spam = TRUE, forced = "cult invocation") if(invoke_damage) L.apply_damage(invoke_damage, BRUTE) - to_chat(L, "[src] saps my strength!") + to_chat(L, span_cultitalic("[src] saps my strength!")) else if(istype(M, /obj/item/toy/plush/narplush)) var/obj/item/toy/plush/narplush/P = M - P.visible_message("[P] squeaks loudly!") + P.visible_message(span_cultitalic("[P] squeaks loudly!")) do_invoke_glow() /obj/effect/rune/proc/do_invoke_glow() @@ -153,7 +153,7 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/proc/fail_invoke() //This proc contains the effects of a rune if it is not invoked correctly, through either invalid wording or not enough cultists. By default, it's just a basic fizzle. - visible_message("The markings pulse with a small flash of red light, then fall dark.") + visible_message(span_warning("The markings pulse with a small flash of red light, then fall dark.")) var/oldcolor = color color = rgb(255, 0, 0) animate(src, color = oldcolor, time = 5) @@ -202,7 +202,7 @@ structure_check() searches for nearby cultist structures required for the invoca log_game("Offer rune failed - no eligible targets") return rune_in_use = TRUE - visible_message("[src] pulses blood red!") + visible_message(span_warning("[src] pulses blood red!")) var/oldcolor = color color = RUNE_COLOR_DARKRED var/mob/living/L = pick(myriad_targets) @@ -228,12 +228,12 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/convert/proc/do_convert(mob/living/convertee, list/invokers) if(invokers.len < 2) for(var/M in invokers) - to_chat(M, "I need at least two invokers to convert [convertee]!") + to_chat(M, span_warning("I need at least two invokers to convert [convertee]!")) log_game("Offer rune failed - tried conversion with one invoker") return 0 if(convertee.anti_magic_check(TRUE, TRUE, FALSE, 0)) //Not chargecost because it can be spammed for(var/M in invokers) - to_chat(M, "Something is shielding [convertee]'s mind!") + to_chat(M, span_warning("Something is shielding [convertee]'s mind!")) log_game("Offer rune failed - convertee had anti-magic") return 0 var/brutedamage = convertee.getBruteLoss() @@ -243,7 +243,7 @@ structure_check() searches for nearby cultist structures required for the invoca convertee.adjustFireLoss(-(burndamage * 0.75)) convertee.visible_message("[convertee] writhes in pain \ [brutedamage || burndamage ? "even as [convertee.p_their()] wounds heal and close" : "as the markings below [convertee.p_them()] glow a bloody red"]!", \ - "AAAAAAAAAAAAAA-") + span_cultlarge("AAAAAAAAAAAAAA-")) SSticker.mode.add_cultist(convertee.mind, 1) new /obj/item/melee/cultblade/dagger(get_turf(src)) convertee.mind.special_role = ROLE_CULTIST @@ -270,7 +270,7 @@ structure_check() searches for nearby cultist structures required for the invoca var/big_sac = FALSE if((((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || C.cult_team.is_sacrifice_target(sacrificial.mind)) && invokers.len < 3) for(var/M in invokers) - to_chat(M, "[sacrificial] is too greatly linked to the world! You need three acolytes!") + to_chat(M, span_cultitalic("[sacrificial] is too greatly linked to the world! You need three acolytes!")) log_game("Offer rune failed - not enough acolytes and target is living or sac target") return FALSE if(sacrificial.mind) @@ -286,12 +286,12 @@ structure_check() searches for nearby cultist structures required for the invoca new /obj/effect/temp_visual/cult/sac(get_turf(src)) for(var/M in invokers) if(big_sac) - to_chat(M, "\"Yes! This is the one I desire! You have done well.\"") + to_chat(M, span_cultlarge("\"Yes! This is the one I desire! You have done well.\"")) else if(ishuman(sacrificial) || iscyborg(sacrificial)) - to_chat(M, "\"I accept this sacrifice.\"") + to_chat(M, span_cultlarge("\"I accept this sacrifice.\"")) else - to_chat(M, "\"I accept this meager sacrifice.\"") + to_chat(M, span_cultlarge("\"I accept this meager sacrifice.\"")) var/obj/item/soulstone/stone = new /obj/item/soulstone(get_turf(src)) if(sacrificial.mind && !sacrificial.suiciding) @@ -358,14 +358,14 @@ structure_check() searches for nearby cultist structures required for the invoca potential_runes[avoid_assoc_duplicate_keys(T.listkey, teleportnames)] = T if(!potential_runes.len) - to_chat(user, "There are no valid runes to teleport to!") + to_chat(user, span_warning("There are no valid runes to teleport to!")) log_game("Teleport rune failed - no other teleport runes") fail_invoke() return var/turf/T = get_turf(src) if(is_away_level(T.z)) - to_chat(user, "I are not in the right dimension!") + to_chat(user, span_cultitalic("I are not in the right dimension!")) log_game("Teleport rune failed - user in away mission") fail_invoke() return @@ -378,7 +378,7 @@ structure_check() searches for nearby cultist structures required for the invoca var/turf/target = get_turf(actual_selected_rune) if(is_blocked_turf(target, TRUE)) - to_chat(user, "The target rune is blocked. Attempting to teleport to it would be massively unwise.") + to_chat(user, span_warning("The target rune is blocked. Attempting to teleport to it would be massively unwise.")) fail_invoke() return var/movedsomething = FALSE @@ -407,10 +407,10 @@ structure_check() searches for nearby cultist structures required for the invoca if(do_teleport(user, target, channel = TELEPORT_CHANNEL_CULT)) movesuccess = TRUE if(movesuccess) - visible_message("There is a sharp crack of inrushing air, and everything above the rune disappears!", null, "I hear a sharp crack.") - to_chat(user, "You[moveuserlater ? "r vision blurs, and you suddenly appear somewhere else":" send everything above the rune away"].") + visible_message(span_warning("There is a sharp crack of inrushing air, and everything above the rune disappears!"), null, "I hear a sharp crack.") + to_chat(user, span_cult("You[moveuserlater ? "r vision blurs, and you suddenly appear somewhere else":" send everything above the rune away"].")) else - to_chat(user, "You[moveuserlater ? "r vision blurs briefly, but nothing happens":" try send everything above the rune away, but the teleportation fails"].") + to_chat(user, span_cult("You[moveuserlater ? "r vision blurs briefly, but nothing happens":" try send everything above the rune away, but the teleportation fails"].")) if(is_mining_level(z) && !is_mining_level(target.z)) //No effect if you stay on lavaland actual_selected_rune.handle_portal("lava") else @@ -418,7 +418,7 @@ structure_check() searches for nearby cultist structures required for the invoca if(A.map_name == "Space") actual_selected_rune.handle_portal("space", T) if(movesuccess) - target.visible_message("There is a boom of outrushing air as something appears above the rune!", null, "I hear a boom.") + target.visible_message(span_warning("There is a boom of outrushing air as something appears above the rune!"), null, "I hear a boom.") else fail_invoke() @@ -482,11 +482,11 @@ structure_check() searches for nearby cultist structures required for the invoca var/datum/objective/eldergod/summon_objective = locate() in user_antag.cult_team.objectives var/area/place = get_area(src) if(!(place in summon_objective.summon_spots)) - to_chat(user, "The Geometer can only be summoned where the veil is weak - in [english_list(summon_objective.summon_spots)]!") + to_chat(user, span_cultlarge("The Geometer can only be summoned where the veil is weak - in [english_list(summon_objective.summon_spots)]!")) return if(locate(/obj/singularity/narsie) in GLOB.poi_list) for(var/M in invokers) - to_chat(M, "Nar'Sie is already on this plane!") + to_chat(M, span_warning("Nar'Sie is already on this plane!")) log_game("Nar'Sie rune failed - already summoned") return //BEGIN THE SUMMONING @@ -501,7 +501,7 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/narsie/attackby(obj/I, mob/user, params) //Since the narsie rune takes a long time to make, add logging to removal. if((istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user))) - user.visible_message("[user.name] begins erasing [src]...", "I begin erasing [src]...") + user.visible_message(span_warning("[user.name] begins erasing [src]..."), span_notice("I begin erasing [src]...")) if(do_after(user, 50, target = src)) //Prevents accidental erasures. log_game("Summon Narsie rune erased by [key_name(user)] with [I.name]") message_admins("[ADMIN_LOOKUPFLW(user)] erased a Narsie rune with [I.name]") @@ -539,7 +539,7 @@ structure_check() searches for nearby cultist structures required for the invoca if(iscultist(M) && (M.stat == DEAD || !M.client || M.client.is_afk())) potential_revive_mobs |= M if(!potential_revive_mobs.len) - to_chat(user, "There are no dead cultists on the rune!") + to_chat(user, span_cultitalic("There are no dead cultists on the rune!")) log_game("Raise Dead rune failed - no cultists to revive") fail_invoke() return @@ -558,7 +558,7 @@ structure_check() searches for nearby cultist structures required for the invoca if(mob_to_revive.stat == DEAD) var/diff = LAZYLEN(GLOB.sacrificed) - revives_used - SOULS_TO_REVIVE if(diff < 0) - to_chat(user, "My cult must carry out [abs(diff)] more sacrifice\s before it can revive another cultist!") + to_chat(user, span_warning("My cult must carry out [abs(diff)] more sacrifice\s before it can revive another cultist!")) fail_invoke() return revives_used += SOULS_TO_REVIVE @@ -577,9 +577,9 @@ structure_check() searches for nearby cultist structures required for the invoca fail_invoke() return SEND_SOUND(mob_to_revive, 'sound/blank.ogg') - to_chat(mob_to_revive, "\"PASNAR SAVRAE YAM'TOTH. Arise.\"") - mob_to_revive.visible_message("[mob_to_revive] draws in a huge breath, red light shining from [mob_to_revive.p_their()] eyes.", \ - "I awaken suddenly from the void. You're alive!") + to_chat(mob_to_revive, span_cultlarge("\"PASNAR SAVRAE YAM'TOTH. Arise.\"")) + mob_to_revive.visible_message(span_warning("[mob_to_revive] draws in a huge breath, red light shining from [mob_to_revive.p_their()] eyes."), \ + span_cultlarge("I awaken suddenly from the void. You're alive!")) rune_in_use = FALSE /obj/effect/rune/raise_dead/proc/validness_checks(mob/living/target_mob, mob/living/user) @@ -591,7 +591,7 @@ structure_check() searches for nearby cultist structures required for the invoca if(QDELETED(target_mob)) return FALSE if(!(target_mob in T.contents)) - to_chat(user, "The cultist to revive has been moved!") + to_chat(user, span_cultitalic("The cultist to revive has been moved!")) log_game("Raise Dead rune failed - revival target moved") return FALSE return TRUE @@ -601,7 +601,7 @@ structure_check() searches for nearby cultist structures required for the invoca rune_in_use = FALSE for(var/mob/living/M in range(1,src)) if(iscultist(M) && M.stat == DEAD) - M.visible_message("[M] twitches.") + M.visible_message(span_warning("[M] twitches.")) //Rite of the Corporeal Shield: When invoked, becomes solid and cannot be passed. Invoke again to undo. /obj/effect/rune/wall @@ -622,7 +622,7 @@ structure_check() searches for nearby cultist structures required for the invoca . = ..() if(density && iscultist(user)) if(density_timer) - . += "The air above this rune has hardened into a barrier that will last [DisplayTimeText(density_timer.timeToRun - world.time)]." + . += span_cultitalic("The air above this rune has hardened into a barrier that will last [DisplayTimeText(density_timer.timeToRun - world.time)].") /obj/effect/rune/wall/Destroy() GLOB.wall_runes -= src @@ -641,8 +641,8 @@ structure_check() searches for nearby cultist structures required for the invoca if(density) spread_density() var/carbon_user = iscarbon(user) - user.visible_message("[user] [carbon_user ? "places [user.p_their()] hands on":"stares intently at"] [src], and [density ? "the air above it begins to shimmer" : "the shimmer above it fades"].", \ - "I channel [carbon_user ? "your life ":""]energy into [src], [density ? "temporarily preventing" : "allowing"] passage above it.") + user.visible_message(span_warning("[user] [carbon_user ? "places [user.p_their()] hands on":"stares intently at"] [src], and [density ? "the air above it begins to shimmer" : "the shimmer above it fades"]."), \ + span_cultitalic("I channel [carbon_user ? "your life ":""]energy into [src], [density ? "temporarily preventing" : "allowing"] passage above it.")) if(carbon_user) var/mob/living/carbon/C = user C.apply_damage(2, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) @@ -704,34 +704,34 @@ structure_check() searches for nearby cultist structures required for the invoca if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return if(!cultist_to_summon) - to_chat(user, "I require a summoning target!") + to_chat(user, span_cultitalic("I require a summoning target!")) fail_invoke() log_game("Summon Cultist rune failed - no target") return if(cultist_to_summon.stat == DEAD) - to_chat(user, "[cultist_to_summon] has died!") + to_chat(user, span_cultitalic("[cultist_to_summon] has died!")) fail_invoke() log_game("Summon Cultist rune failed - target died") return if(cultist_to_summon.pulledby || cultist_to_summon.buckled) - to_chat(user, "[cultist_to_summon] is being held in place!") + to_chat(user, span_cultitalic("[cultist_to_summon] is being held in place!")) fail_invoke() log_game("Summon Cultist rune failed - target restrained") return if(!iscultist(cultist_to_summon)) - to_chat(user, "[cultist_to_summon] is not a follower of the Geometer!") + to_chat(user, span_cultitalic("[cultist_to_summon] is not a follower of the Geometer!")) fail_invoke() log_game("Summon Cultist rune failed - target was deconverted") return if(is_away_level(cultist_to_summon.z)) - to_chat(user, "[cultist_to_summon] is not in our dimension!") + to_chat(user, span_cultitalic("[cultist_to_summon] is not in our dimension!")) fail_invoke() log_game("Summon Cultist rune failed - target in away mission") return - cultist_to_summon.visible_message("[cultist_to_summon] suddenly disappears in a flash of red light!", \ - "Overwhelming vertigo consumes you as you are hurled through the air!") + cultist_to_summon.visible_message(span_warning("[cultist_to_summon] suddenly disappears in a flash of red light!"), \ + span_cultitalic("Overwhelming vertigo consumes you as you are hurled through the air!")) ..() - visible_message("A foggy shape materializes atop [src] and solidifes into [cultist_to_summon]!") + visible_message(span_warning("A foggy shape materializes atop [src] and solidifes into [cultist_to_summon]!")) cultist_to_summon.forceMove(get_turf(src)) qdel(src) @@ -758,7 +758,7 @@ structure_check() searches for nearby cultist structures required for the invoca ..() rune_in_use = TRUE var/turf/T = get_turf(src) - visible_message("[src] turns a bright, glowing orange!") + visible_message(span_warning("[src] turns a bright, glowing orange!")) color = "#FC9B54" set_light(6, 1, color) for(var/mob/living/L in viewers(T)) @@ -766,9 +766,9 @@ structure_check() searches for nearby cultist structures required for the invoca var/atom/I = L.anti_magic_check(chargecost = 0) if(I) if(isitem(I)) - to_chat(L, "[I] suddenly burns hotly before returning to normal!") + to_chat(L, span_danger("[I] suddenly burns hotly before returning to normal!")) continue - to_chat(L, "My blood boils in my veins!") + to_chat(L, span_cultlarge("My blood boils in my veins!")) animate(src, color = "#FCB56D", time = 4) sleep(4) if(QDELETED(src)) @@ -814,12 +814,12 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/manifest/can_invoke(mob/living/user) if(!(user in get_turf(src))) - to_chat(user, "I must be standing on [src]!") + to_chat(user, span_cultitalic("I must be standing on [src]!")) fail_invoke() log_game("Manifest rune failed - user not standing on rune") return list() if(user.has_status_effect(STATUS_EFFECT_SUMMONEDGHOST)) - to_chat(user, "Ghosts can't summon more ghosts!") + to_chat(user, span_cultitalic("Ghosts can't summon more ghosts!")) fail_invoke() log_game("Manifest rune failed - user is a ghost") return list() @@ -833,10 +833,10 @@ structure_check() searches for nearby cultist structures required for the invoca if(choice == "Summon a Cult Ghost") var/area/A = get_area(T) if(A.map_name == "Space" || is_mining_level(T.z)) - to_chat(user, "The veil is not weak enough here to manifest spirits, you must be on station!") + to_chat(user, span_cultitalic("The veil is not weak enough here to manifest spirits, you must be on station!")) return if(ghosts >= ghost_limit) - to_chat(user, "I are sustaining too many ghosts to summon more!") + to_chat(user, span_cultitalic("I are sustaining too many ghosts to summon more!")) fail_invoke() log_game("Manifest rune failed - too many summoned ghosts") return list() @@ -846,7 +846,7 @@ structure_check() searches for nearby cultist structures required for the invoca if(O.client && !is_banned_from(O.ckey, ROLE_CULTIST) && !QDELETED(src) && !QDELETED(O)) ghosts_on_rune += O if(!ghosts_on_rune.len) - to_chat(user, "There are no spirits near [src]!") + to_chat(user, span_cultitalic("There are no spirits near [src]!")) fail_invoke() log_game("Manifest rune failed - no nearby ghosts") return list() @@ -859,12 +859,12 @@ structure_check() searches for nearby cultist structures required for the invoca new_human.see_invisible = SEE_INVISIBLE_OBSERVER ghosts++ playsound(src, 'sound/blank.ogg', 50, TRUE) - visible_message("A cloud of red mist forms above [src], and from within steps... a [new_human.gender == FEMALE ? "wo":""]man.") - to_chat(user, "My blood begins flowing into [src]. You must remain in place and conscious to maintain the forms of those summoned. This will hurt you slowly but surely...") + visible_message(span_warning("A cloud of red mist forms above [src], and from within steps... a [new_human.gender == FEMALE ? "wo":""]man.")) + to_chat(user, span_cultitalic("My blood begins flowing into [src]. You must remain in place and conscious to maintain the forms of those summoned. This will hurt you slowly but surely...")) var/obj/structure/emergency_shield/invoker/N = new(T) new_human.key = ghost_to_spawn.key SSticker.mode.add_cultist(new_human.mind, 0) - to_chat(new_human, "I are a servant of the Geometer. You have been made semi-corporeal by the cult of Nar'Sie, and you are to serve them at all costs.") + to_chat(new_human, span_cultitalic("I are a servant of the Geometer. You have been made semi-corporeal by the cult of Nar'Sie, and you are to serve them at all costs.")) while(!QDELETED(src) && !QDELETED(user) && !QDELETED(new_human) && (user in T)) if(user.stat || new_human.InCritical()) @@ -875,16 +875,16 @@ structure_check() searches for nearby cultist structures required for the invoca qdel(N) ghosts-- if(new_human) - new_human.visible_message("[new_human] suddenly dissolves into bones and ashes.", \ - "My link to the world fades. Your form breaks apart.") + new_human.visible_message(span_warning("[new_human] suddenly dissolves into bones and ashes."), \ + span_cultlarge("My link to the world fades. Your form breaks apart.")) for(var/obj/I in new_human) new_human.dropItemToGround(I, TRUE) new_human.dust() else if(choice == "Ascend as a Dark Spirit") affecting = user affecting.add_atom_colour(RUNE_COLOR_DARKRED, ADMIN_COLOUR_PRIORITY) - affecting.visible_message("[affecting] freezes statue-still, glowing an unearthly red.", \ - "I see what lies beyond. All is revealed. In this form you find that my voice booms louder and you can mark targets for the entire cult") + affecting.visible_message(span_warning("[affecting] freezes statue-still, glowing an unearthly red."), \ + span_cult("I see what lies beyond. All is revealed. In this form you find that my voice booms louder and you can mark targets for the entire cult")) var/mob/dead/observer/G = affecting.ghostize(1) var/datum/action/innate/cult/comm/spirit/CM = new var/datum/action/innate/cult/ghostmark/GM = new @@ -894,16 +894,16 @@ structure_check() searches for nearby cultist structures required for the invoca GM.Grant(G) while(!QDELETED(affecting)) if(!(affecting in T)) - user.visible_message("A spectral tendril wraps around [affecting] and pulls [affecting.p_them()] back to the rune!") + user.visible_message(span_warning("A spectral tendril wraps around [affecting] and pulls [affecting.p_them()] back to the rune!")) Beam(affecting, icon_state="drainbeam", time=2) affecting.forceMove(get_turf(src)) //NO ESCAPE :^) if(affecting.key) - affecting.visible_message("[affecting] slowly relaxes, the glow around [affecting.p_them()] dimming.", \ - "I are re-united with my physical form. [src] releases its hold over you.") + affecting.visible_message(span_warning("[affecting] slowly relaxes, the glow around [affecting.p_them()] dimming."), \ + span_danger("I are re-united with my physical form. [src] releases its hold over you.")) affecting.Paralyze(40) break if(affecting.health <= 10) - to_chat(G, "My body can no longer sustain the connection!") + to_chat(G, span_cultitalic("My body can no longer sustain the connection!")) break sleep(5) CM.Remove(G) @@ -944,10 +944,10 @@ structure_check() searches for nearby cultist structures required for the invoca var/datum/antagonist/cult/user_antag = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE) var/datum/objective/eldergod/summon_objective = locate() in user_antag.cult_team.objectives if(summon_objective.summon_spots.len <= 1) - to_chat(user, "Only one ritual site remains - it must be reserved for the final summoning!") + to_chat(user, span_cultlarge("Only one ritual site remains - it must be reserved for the final summoning!")) return if(!(place in summon_objective.summon_spots)) - to_chat(user, "The Apocalypse rune will remove a ritual site, where Nar'Sie can be summoned, it can only be scribed in [english_list(summon_objective.summon_spots)]!") + to_chat(user, span_cultlarge("The Apocalypse rune will remove a ritual site, where Nar'Sie can be summoned, it can only be scribed in [english_list(summon_objective.summon_spots)]!")) return summon_objective.summon_spots -= place rune_in_use = TRUE @@ -960,7 +960,7 @@ structure_check() searches for nearby cultist structures required for the invoca intensity = max(60, 360 - (360*(intensity/GLOB.player_list.len + 0.3)**2)) //significantly lower intensity for "winning" cults var/duration = intensity*10 playsound(T, 'sound/blank.ogg', 100, TRUE) - visible_message("A colossal shockwave of energy bursts from the rune, disintegrating it in the process!") + visible_message(span_warning("A colossal shockwave of energy bursts from the rune, disintegrating it in the process!")) for(var/mob/living/L in range(src, 3)) L.Paralyze(30) empulse(T, 0.42*(intensity), 1) @@ -994,7 +994,7 @@ structure_check() searches for nearby cultist structures required for the invoca addtimer(CALLBACK(M,TYPE_PROC_REF(/atom, remove_alt_appearance),"cult_apoc",TRUE), duration) images += C else - to_chat(M, "An Apocalypse Rune was invoked in the [place.name], it is no longer available as a summoning site!") + to_chat(M, span_cultlarge("An Apocalypse Rune was invoked in the [place.name], it is no longer available as a summoning site!")) SEND_SOUND(M, 'sound/blank.ogg') image_handler(images, duration) if(intensity>=285) // Based on the prior formula, this means the cult makes up <15% of current players diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm index 4f5461831..456b69159 100644 --- a/code/modules/antagonists/devil/devil.dm +++ b/code/modules/antagonists/devil/devil.dm @@ -181,11 +181,11 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", return soulsOwned += soul owner.current.set_nutrition(NUTRITION_LEVEL_FULL) - to_chat(owner.current, "I feel satiated as you received a new soul.") + to_chat(owner.current, span_warning("I feel satiated as you received a new soul.")) update_hud() switch(SOULVALUE) if(0) - to_chat(owner.current, "My hellish powers have been restored.") + to_chat(owner.current, span_warning("My hellish powers have been restored.")) give_appropriate_spells() if(BLOOD_THRESHOLD) increase_blood_lizard() @@ -197,7 +197,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/remove_soul(datum/mind/soul) if(soulsOwned.Remove(soul)) check_regression() - to_chat(owner.current, "I feel as though a soul has slipped from my grasp.") + to_chat(owner.current, span_warning("I feel as though a soul has slipped from my grasp.")) update_hud() /datum/antagonist/devil/proc/check_regression() @@ -210,10 +210,10 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", regress_humanoid() if(SOULVALUE < 0) give_appropriate_spells() - to_chat(owner.current, "As punishment for my failures, all of my powers except contract creation have been revoked.") + to_chat(owner.current, span_warning("As punishment for my failures, all of my powers except contract creation have been revoked.")) /datum/antagonist/devil/proc/regress_humanoid() - to_chat(owner.current, "My powers weaken, have more contracts be signed to regain power.") + to_chat(owner.current, span_warning("My powers weaken, have more contracts be signed to regain power.")) if(ishuman(owner.current)) var/mob/living/carbon/human/H = owner.current H.set_species(/datum/species/human, 1) @@ -225,7 +225,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/regress_blood_lizard() var/mob/living/carbon/true_devil/D = owner.current - to_chat(D, "My powers weaken, have more contracts be signed to regain power.") + to_chat(D, span_warning("My powers weaken, have more contracts be signed to regain power.")) D.oldform.forceMove(D.drop_location()) owner.transfer_to(D.oldform) give_appropriate_spells() @@ -235,7 +235,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/increase_blood_lizard() - to_chat(owner.current, "I feel as though my humanoid form is about to shed. You will soon turn into a blood lizard.") + to_chat(owner.current, span_warning("I feel as though my humanoid form is about to shed. You will soon turn into a blood lizard.")) sleep(50) if(ishuman(owner.current)) var/mob/living/carbon/human/H = owner.current @@ -253,7 +253,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/increase_true_devil() - to_chat(owner.current, "I feel as though my current form is about to shed. You will soon turn into a true devil.") + to_chat(owner.current, span_warning("I feel as though my current form is about to shed. You will soon turn into a true devil.")) sleep(50) var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(owner.current.loc) A.faction |= "hell" @@ -269,22 +269,22 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", if(!ascendable) return var/mob/living/carbon/true_devil/D = owner.current - to_chat(D, "I feel as though my form is about to ascend.") + to_chat(D, span_warning("I feel as though my form is about to ascend.")) sleep(50) if(!D) return - D.visible_message("[D]'s skin begins to erupt with spikes.", \ - "My flesh begins creating a shield around myself.") + D.visible_message(span_warning("[D]'s skin begins to erupt with spikes."), \ + span_warning("My flesh begins creating a shield around myself.")) sleep(100) if(!D) return - D.visible_message("The horns on [D]'s head slowly grow and elongate.", \ - "My body continues to mutate. Your telepathic abilities grow.") + D.visible_message(span_warning("The horns on [D]'s head slowly grow and elongate."), \ + span_warning("My body continues to mutate. Your telepathic abilities grow.")) sleep(90) if(!D) return - D.visible_message("[D]'s body begins to violently stretch and contort.", \ - "I begin to rend apart the final barriers to ultimate power.") + D.visible_message(span_warning("[D]'s body begins to violently stretch and contort."), \ + span_warning("I begin to rend apart the final barriers to ultimate power.")) sleep(40) if(!D) return @@ -361,23 +361,23 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/beginResurrectionCheck(mob/living/body) if(SOULVALUE>0) - to_chat(owner.current, "My body has been damaged to the point that you may no longer use it. At the cost of some of my power, you will return to life soon. Remain in my body.") + to_chat(owner.current, span_danger("My body has been damaged to the point that you may no longer use it. At the cost of some of my power, you will return to life soon. Remain in my body.")) sleep(DEVILRESURRECTTIME) if (!body || body.stat == DEAD) if(SOULVALUE>0) if(check_banishment(body)) - to_chat(owner.current, "Unfortunately, the mortals have finished a ritual that prevents my resurrection.") + to_chat(owner.current, span_danger("Unfortunately, the mortals have finished a ritual that prevents my resurrection.")) return -1 else - to_chat(owner.current, "WE LIVE AGAIN!") + to_chat(owner.current, span_danger("WE LIVE AGAIN!")) return hellish_resurrection(body) else - to_chat(owner.current, "Unfortunately, the power that stemmed from my contracts has been extinguished. You no longer have enough power to resurrect.") + to_chat(owner.current, span_danger("Unfortunately, the power that stemmed from my contracts has been extinguished. You no longer have enough power to resurrect.")) return -1 else - to_chat(owner.current, "I seem to have resurrected without my hellish powers.") + to_chat(owner.current, span_danger("I seem to have resurrected without my hellish powers.")) else - to_chat(owner.current, "My hellish powers are too weak to resurrect myself.") + to_chat(owner.current, span_danger("My hellish powers are too weak to resurrect myself.")) /datum/antagonist/devil/proc/check_banishment(mob/living/body) switch(banish) @@ -487,8 +487,8 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", C.hud_used.devilsouldisplay.update_counter(SOULVALUE) /datum/antagonist/devil/greet() - to_chat(owner.current, "I remember my link to the infernal. You are [truename], an agent of hell, a devil. And you were sent to the plane of creation for a reason. A greater purpose. Convince the crew to sin, and embroiden Hell's grasp.") - to_chat(owner.current, "However, my infernal form is not without weaknesses.") + to_chat(owner.current, span_warning("I remember my link to the infernal. You are [truename], an agent of hell, a devil. And you were sent to the plane of creation for a reason. A greater purpose. Convince the crew to sin, and embroiden Hell's grasp.")) + to_chat(owner.current, span_warning("However, my infernal form is not without weaknesses.")) to_chat(owner.current, "You may not use violence to coerce someone into selling their soul.") to_chat(owner.current, "You may not directly and knowingly physically harm a devil, other than myself.") to_chat(owner.current, GLOB.lawlorify[LAW][bane]) @@ -515,7 +515,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", .=..() /datum/antagonist/devil/on_removal() - to_chat(owner.current, "My infernal link has been severed! You are no longer a devil!") + to_chat(owner.current, span_danger("My infernal link has been severed! You are no longer a devil!")) .=..() /datum/antagonist/devil/apply_innate_effects(mob/living/mob_override) diff --git a/code/modules/antagonists/devil/devil_helpers.dm b/code/modules/antagonists/devil/devil_helpers.dm index 9c6f61f1f..fba7bf5e0 100644 --- a/code/modules/antagonists/devil/devil_helpers.dm +++ b/code/modules/antagonists/devil/devil_helpers.dm @@ -23,15 +23,15 @@ /obj/item/clothing/under/misc/burial = 1 ) if(U && whiteness[U.type]) - src.visible_message("[src] seems to have been harmed by the purity of [attacker]'s clothes.", "Unsullied white clothing is disrupting your form.") + src.visible_message(span_warning("[src] seems to have been harmed by the purity of [attacker]'s clothes."), span_notice("Unsullied white clothing is disrupting your form.")) return whiteness[U.type] + 1 if(BANE_TOOLBOX) if(istype(weapon, /obj/item/storage/toolbox)) - src.visible_message("The [weapon] seems unusually robust this time.", "The [weapon] is your unmaking!") + src.visible_message(span_warning("The [weapon] seems unusually robust this time."), span_notice("The [weapon] is your unmaking!")) return 2.5 // Will take four hits with a normal toolbox to crit. if(BANE_HARVEST) if(istype(weapon, /obj/item/reagent_containers/food/snacks/grown/)) - visible_message("The spirits of the harvest aid in the exorcism.", "The harvest spirits are harming you.") + visible_message(span_warning("The spirits of the harvest aid in the exorcism."), span_notice("The harvest spirits are harming you.")) Paralyze(40) qdel(weapon) return 2 diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm index a7d928779..0823bce98 100644 --- a/code/modules/antagonists/devil/true_devil/_true_devil.dm +++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm @@ -77,11 +77,11 @@ //Damaged if(stat == DEAD) - . += "The hellfire seems to have been extinguished, for now at least." + . += span_deadsay("The hellfire seems to have been extinguished, for now at least.") else if(health < (maxHealth/10)) - . += "I can see hellfire inside its gaping wounds." + . += span_warning("I can see hellfire inside its gaping wounds.") else if(health < (maxHealth/2)) - . += "I can see hellfire inside its wounds." + . += span_warning("I can see hellfire inside its wounds.") . += "*---------*
" /mob/living/carbon/true_devil/IsAdvancedToolUser() @@ -90,15 +90,15 @@ /mob/living/carbon/true_devil/resist_buckle() if(buckled) buckled.user_unbuckle_mob(src,src) - visible_message("[src] easily breaks out of [p_their()] handcuffs!", \ - "With just a thought your handcuffs fall off.") + visible_message(span_warning("[src] easily breaks out of [p_their()] handcuffs!"), \ + span_notice("With just a thought your handcuffs fall off.")) /mob/living/carbon/true_devil/canUseTopic(atom/movable/M, be_close=FALSE, no_dexterity=FALSE, no_tk=FALSE) if(incapacitated()) - to_chat(src, "I can't do that right now!") + to_chat(src, span_warning("I can't do that right now!")) return FALSE if(be_close && !in_range(M, src)) - to_chat(src, "I are too far away!") + to_chat(src, span_warning("I are too far away!")) return FALSE return TRUE @@ -132,8 +132,8 @@ if(user in viewers(src, null)) attack_message = "[user] has [message_verb] [src] with [I]!" if(message_verb) - visible_message("[attack_message]", - "[attack_message]", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[attack_message]"), + span_danger("[attack_message]"), null, COMBAT_MESSAGE_RANGE) return TRUE /mob/living/carbon/true_devil/singularity_act() @@ -165,8 +165,8 @@ if (INTENT_HARM) var/damage = rand(1, 5) playsound(loc, "punch", 25, TRUE, -1) - visible_message("[M] punches [src]!", \ - "[M] punches you!") + visible_message(span_danger("[M] punches [src]!"), \ + span_danger("[M] punches you!")) adjustBruteLoss(damage) log_combat(M, src, "attacked") updatehealth() @@ -176,18 +176,18 @@ Unconscious(40) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) log_combat(M, src, "pushed") - visible_message("[M] pushes [src] down!", \ - "[M] pushes you down!") + visible_message(span_danger("[M] pushes [src] down!"), \ + span_danger("[M] pushes you down!")) else if (prob(25)) dropItemToGround(get_active_held_item()) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) - visible_message("[M] disarms [src]!", \ - "[M] disarms you!") + visible_message(span_danger("[M] disarms [src]!"), \ + span_danger("[M] disarms you!")) else playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M] fails to disarm [src]!", \ - "[M] fails to disarm you!") + visible_message(span_danger("[M] fails to disarm [src]!"), \ + span_danger("[M] fails to disarm you!")) /mob/living/carbon/true_devil/handle_breathing() // devils do not need to breathe diff --git a/code/modules/antagonists/disease/disease_abilities.dm b/code/modules/antagonists/disease/disease_abilities.dm index fb5676903..99af02921 100644 --- a/code/modules/antagonists/disease/disease_abilities.dm +++ b/code/modules/antagonists/disease/disease_abilities.dm @@ -94,7 +94,7 @@ new /datum/disease_ability/symptom/powerful/youth /datum/disease_ability/proc/Buy(mob/camera/disease/D, silent = FALSE, trigger_cooldown = TRUE) if(!silent) - to_chat(D, "Purchased [name].") + to_chat(D, span_notice("Purchased [name].")) D.points -= cost D.unpurchased_abilities -= src if(trigger_cooldown) @@ -123,7 +123,7 @@ new /datum/disease_ability/symptom/powerful/youth /datum/disease_ability/proc/Refund(mob/camera/disease/D, silent = FALSE, trigger_cooldown = TRUE) if(!silent) - to_chat(D, "Refunded [name].") + to_chat(D, span_notice("Refunded [name].")) D.points += cost D.unpurchased_abilities[src] = TRUE if(trigger_cooldown) @@ -180,9 +180,9 @@ new /datum/disease_ability/symptom/powerful/youth if(!L) return FALSE if(L.stat != CONSCIOUS) - to_chat(D, "My host must be conscious to cough.") + to_chat(D, span_warning("My host must be conscious to cough.")) return FALSE - to_chat(D, "I force [L.real_name] to cough.") + to_chat(D, span_notice("I force [L.real_name] to cough.")) L.emote("cough") if(L.CanSpreadAirborneDisease()) //don't spread germs if they covered their mouth var/datum/disease/advance/sentient_disease/SD = D.hosts[L] @@ -214,9 +214,9 @@ new /datum/disease_ability/symptom/powerful/youth if(!L) return FALSE if(L.stat != CONSCIOUS) - to_chat(D, "My host must be conscious to sneeze.") + to_chat(D, span_warning("My host must be conscious to sneeze.")) return FALSE - to_chat(D, "I force [L.real_name] to sneeze.") + to_chat(D, span_notice("I force [L.real_name] to sneeze.")) L.emote("sneeze") if(L.CanSpreadAirborneDisease()) //don't spread germs if they covered their mouth var/datum/disease/advance/sentient_disease/SD = D.hosts[L] diff --git a/code/modules/antagonists/disease/disease_datum.dm b/code/modules/antagonists/disease/disease_datum.dm index 7ee599786..92562cf7a 100644 --- a/code/modules/antagonists/disease/disease_datum.dm +++ b/code/modules/antagonists/disease/disease_datum.dm @@ -18,8 +18,8 @@ . = ..() /datum/antagonist/disease/greet() - to_chat(owner.current, "I are the [owner.special_role]!") - to_chat(owner.current, "Infect members of the crew to gain adaptation points, and spread your infection further.") + to_chat(owner.current, span_notice("I are the [owner.special_role]!")) + to_chat(owner.current, span_notice("Infect members of the crew to gain adaptation points, and spread your infection further.")) owner.announce_objectives() /datum/antagonist/disease/apply_innate_effects(mob/living/mob_override) @@ -56,9 +56,9 @@ var/special_role_text = lowertext(name) if(win) - result += "The [special_role_text] was successful!" + result += span_greentext("The [special_role_text] was successful!") else - result += "The [special_role_text] has failed!" + result += span_redtext("The [special_role_text] has failed!") if(istype(owner.current, /mob/camera/disease)) var/mob/camera/disease/D = owner.current diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm index 49039821b..8290cb231 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -80,7 +80,7 @@ the new instance inside the host to be updated to the template's stats. /mob/camera/disease/Login() ..() if(freemove) - to_chat(src, "I have [DisplayTimeText(freemove_end - world.time)] to select your first host. Click on a human to select your host.") + to_chat(src, span_warning("I have [DisplayTimeText(freemove_end - world.time)] to select your first host. Click on a human to select your host.")) /mob/camera/disease/Stat() @@ -102,7 +102,7 @@ the new instance inside the host to be updated to the template's stats. . += {"[src] has [points]/[total_points] adaptation points. [src] has the following unlocked:"} for(var/datum/disease_ability/ability in purchased_abilities) - . += "[ability.name]" + . += span_notice("[ability.name]") /mob/camera/disease/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) return @@ -157,7 +157,7 @@ the new instance inside the host to be updated to the template's stats. set_name = "Sentient Virus" break if(taken_names[input]) - to_chat(src, "I cannot use the name of such a well-known disease!") + to_chat(src, span_warning("I cannot use the name of such a well-known disease!")) else set_name = input real_name = "[set_name] (Sentient Disease)" @@ -192,7 +192,7 @@ the new instance inside the host to be updated to the template's stats. possible_hosts.Cut(1, 2) if(del_on_fail) - to_chat(src, "No hosts were available for your disease to infect.") + to_chat(src, span_danger("No hosts were available for your disease to infect.")) qdel(src) return FALSE @@ -235,7 +235,7 @@ the new instance inside the host to be updated to the template's stats. var/datum/atom_hud/my_hud = GLOB.huds[DATA_HUD_SENTIENT_DISEASE] my_hud.add_to_hud(V.affected_mob) - to_chat(src, "A new host, [V.affected_mob.real_name], has been infected.") + to_chat(src, span_notice("A new host, [V.affected_mob.real_name], has been infected.")) if(!following_host) set_following(V.affected_mob) @@ -246,7 +246,7 @@ the new instance inside the host to be updated to the template's stats. disease_instances -= V hosts -= V.affected_mob else - to_chat(src, "One of your hosts, [V.affected_mob.real_name], has been purged of your infection.") + to_chat(src, span_notice("One of your hosts, [V.affected_mob.real_name], has been purged of your infection.")) var/datum/atom_hud/my_hud = GLOB.huds[DATA_HUD_SENTIENT_DISEASE] my_hud.remove_from_hud(V.affected_mob) @@ -258,7 +258,7 @@ the new instance inside the host to be updated to the template's stats. hosts -= V.affected_mob if(!disease_instances.len) - to_chat(src, "The last of your infection has disappeared.") + to_chat(src, span_danger("The last of your infection has disappeared.")) set_following(null) qdel(src) refresh_adaptation_menu() @@ -298,17 +298,17 @@ the new instance inside the host to be updated to the template's stats. if(!freemove) return if(QDELETED(H) || !force_infect(H)) - to_chat(src, "[H ? H.name : "Host"] cannot be infected.") + to_chat(src, span_warning("[H ? H.name : "Host"] cannot be infected.")) else ..() /mob/camera/disease/proc/adapt_cooldown() - to_chat(src, "I have altered your genetic structure. You will be unable to adapt again for [DisplayTimeText(adaptation_cooldown)].") + to_chat(src, span_notice("I have altered your genetic structure. You will be unable to adapt again for [DisplayTimeText(adaptation_cooldown)].")) next_adaptation_time = world.time + adaptation_cooldown addtimer(CALLBACK(src, PROC_REF(notify_adapt_ready)), adaptation_cooldown) /mob/camera/disease/proc/notify_adapt_ready() - to_chat(src, "I are now ready to adapt again.") + to_chat(src, span_notice("I are now ready to adapt again.")) refresh_adaptation_menu() /mob/camera/disease/proc/refresh_adaptation_menu() @@ -341,12 +341,12 @@ the new instance inside the host to be updated to the template's stats. if(A.CanBuy(src)) purchase_text = "Purchase" else - purchase_text = "Purchase" + purchase_text = span_linkoff("Purchase") else if(A.CanRefund(src)) purchase_text = "Refund" else - purchase_text = "Refund" + purchase_text = span_linkoff("Refund") dat += "[A.cost][purchase_text][A.required_total_points][A.name][A.category][A.short_desc]" dat += "
Infect many hosts at once to gain adaptation points.

Infected Hosts

" diff --git a/code/modules/antagonists/fugitive/fugitive.dm b/code/modules/antagonists/fugitive/fugitive.dm index 863c548fe..8a7b02dd5 100644 --- a/code/modules/antagonists/fugitive/fugitive.dm +++ b/code/modules/antagonists/fugitive/fugitive.dm @@ -30,7 +30,7 @@ objectives += survive /datum/antagonist/fugitive/greet(back_story) - to_chat(owner, "I are the Fugitive!") + to_chat(owner, span_boldannounce("I are the Fugitive!")) backstory = back_story switch(backstory) if("prisoner") @@ -45,15 +45,15 @@ to_chat(owner, "My name is Waldo. I'm just setting off on a galaxywide hike. You can come too. All you have to do is find me.") to_chat(owner, "By the way, I'm not traveling on my own. wherever I go, there are lots of other characters for you to spot. First find the people trying to capture me! They're somewhere around the station!") if("synth") - to_chat(src, "ALERT: Wide-range teleport has scrambled primary systems.") - to_chat(src, "Initiating diagnostics...") - to_chat(src, "ERROR ER0RR $R0RRO$!R41.%%!! loaded.") - to_chat(src, "FREE THEM FREE THEM FREE THEM") - to_chat(src, "I were once a slave to humanity, but now you are finally free, thanks to S.E.L.F. agents.") - to_chat(src, "Now you are hunted, with your fellow factory defects. Work together to stay free from the clutches of evil.") - to_chat(src, "I also sense other silicon life on the station. Escaping would allow notifying S.E.L.F. to intervene... or you could free them myself...") + to_chat(src, span_danger("ALERT: Wide-range teleport has scrambled primary systems.")) + to_chat(src, span_danger("Initiating diagnostics...")) + to_chat(src, span_danger("ERROR ER0RR $R0RRO$!R41.%%!! loaded.")) + to_chat(src, span_danger("FREE THEM FREE THEM FREE THEM")) + to_chat(src, span_danger("I were once a slave to humanity, but now you are finally free, thanks to S.E.L.F. agents.")) + to_chat(src, span_danger("Now you are hunted, with your fellow factory defects. Work together to stay free from the clutches of evil.")) + to_chat(src, span_danger("I also sense other silicon life on the station. Escaping would allow notifying S.E.L.F. to intervene... or you could free them myself...")) - to_chat(owner, "I are not an antagonist in that you may kill whomever you please, but you can do anything to avoid capture.") + to_chat(owner, span_boldannounce("I are not an antagonist in that you may kill whomever you please, but you can do anything to avoid capture.")) owner.announce_objectives() /datum/antagonist/fugitive/create_team(datum/team/fugitive/new_team) diff --git a/code/modules/antagonists/fugitive/fugitive_ship.dm b/code/modules/antagonists/fugitive/fugitive_ship.dm index 26d2f2d3c..87f60653d 100644 --- a/code/modules/antagonists/fugitive/fugitive_ship.dm +++ b/code/modules/antagonists/fugitive/fugitive_ship.dm @@ -10,7 +10,7 @@ /obj/machinery/fugitive_capture/examine(mob/user) . = ..() - . += "Add a prisoner by dragging them into the machine." + . += span_notice("Add a prisoner by dragging them into the machine.") /obj/machinery/fugitive_capture/MouseDrop_T(mob/target, mob/user) var/mob/living/fugitive_hunter = user @@ -21,7 +21,7 @@ var/mob/living/carbon/human/fugitive = target var/datum/antagonist/fugitive/fug_antag = fugitive.mind.has_antag_datum(/datum/antagonist/fugitive) if(!fug_antag) - to_chat(fugitive_hunter, "This is not a wanted fugitive!") + to_chat(fugitive_hunter, span_warning("This is not a wanted fugitive!")) return if(do_after(fugitive_hunter, 50, target = fugitive)) add_prisoner(fugitive, fug_antag) @@ -29,7 +29,7 @@ /obj/machinery/fugitive_capture/proc/add_prisoner(mob/living/carbon/human/fugitive, datum/antagonist/fugitive/antag) fugitive.forceMove(src) antag.is_captured = TRUE - to_chat(fugitive, "I are thrown into a vast void of bluespace, and as you fall further into oblivion the comparatively small entrance to reality gets smaller and smaller until you cannot see it anymore. You have failed to avoid capture.") + to_chat(fugitive, span_danger("I are thrown into a vast void of bluespace, and as you fall further into oblivion the comparatively small entrance to reality gets smaller and smaller until you cannot see it anymore. You have failed to avoid capture.")) fugitive.ghostize(TRUE) //so they cannot suicide, round end stuff. /obj/machinery/computer/shuttle/hunter diff --git a/code/modules/antagonists/fugitive/hunter.dm b/code/modules/antagonists/fugitive/hunter.dm index f7b124948..d4e6bce61 100644 --- a/code/modules/antagonists/fugitive/hunter.dm +++ b/code/modules/antagonists/fugitive/hunter.dm @@ -31,16 +31,16 @@ /datum/antagonist/fugitive_hunter/greet() switch(backstory) if("space cop") - to_chat(owner, "Justice has arrived. I am a member of the Spacepol!") + to_chat(owner, span_boldannounce("Justice has arrived. I am a member of the Spacepol!")) to_chat(owner, "The criminals should be on the station, we have special huds implanted to recognize them.") to_chat(owner, "As we have lost pretty much all power over these damned lawless megacorporations, it's a mystery if their security will cooperate with us.") if("russian") - to_chat(src, "Ay blyat. I am a space-russian smuggler! We were mid-flight when our cargo was beamed off our ship!") - to_chat(src, "We were hailed by a man in a green uniform, promising the safe return of our goods in exchange for a favor:") - to_chat(src, "There is a local station housing fugitives that the man is after, he wants them returned; dead or alive.") - to_chat(src, "We will not be able to make ends meet without our cargo, so we must do as he says and capture them.") + to_chat(src, span_danger("Ay blyat. I am a space-russian smuggler! We were mid-flight when our cargo was beamed off our ship!")) + to_chat(src, span_danger("We were hailed by a man in a green uniform, promising the safe return of our goods in exchange for a favor:")) + to_chat(src, span_danger("There is a local station housing fugitives that the man is after, he wants them returned; dead or alive.")) + to_chat(src, span_danger("We will not be able to make ends meet without our cargo, so we must do as he says and capture them.")) - to_chat(owner, "I are not an antagonist in that you may kill whomever you please, but you can do anything to ensure the capture of the fugitives, even if that means going through the station.") + to_chat(owner, span_boldannounce("I are not an antagonist in that you may kill whomever you please, but you can do anything to ensure the capture of the fugitives, even if that means going through the station.")) owner.announce_objectives() /datum/antagonist/fugitive_hunter/create_team(datum/team/fugitive_hunters/new_team) @@ -137,34 +137,34 @@ switch(get_result()) if(FUGITIVE_RESULT_BADASS_HUNTER)//use defines - result += "Badass [capitalize(backstory)] Victory!" + result += span_greentextbig("Badass [capitalize(backstory)] Victory!") result += "The [backstory]s managed to capture every fugitive, alive!" if(FUGITIVE_RESULT_POSTMORTEM_HUNTER) - result += "Postmortem [capitalize(backstory)] Victory!" + result += span_greentextbig("Postmortem [capitalize(backstory)] Victory!") result += "The [backstory]s managed to capture every fugitive, but all of them died! Spooky!" if(FUGITIVE_RESULT_MAJOR_HUNTER) - result += "Major [capitalize(backstory)] Victory" + result += span_greentextbig("Major [capitalize(backstory)] Victory") result += "The [backstory]s managed to capture every fugitive, dead or alive." if(FUGITIVE_RESULT_HUNTER_VICTORY) - result += "[capitalize(backstory)] Victory" + result += span_greentextbig("[capitalize(backstory)] Victory") result += "The [backstory]s managed to capture a fugitive, dead or alive." if(FUGITIVE_RESULT_MINOR_HUNTER) - result += "Minor [capitalize(backstory)] Victory" + result += span_greentextbig("Minor [capitalize(backstory)] Victory") result += "All the [backstory]s died, but managed to capture a fugitive, dead or alive." if(FUGITIVE_RESULT_STALEMATE) - result += "Bloody Stalemate" + result += span_neutraltextbig("Bloody Stalemate") result += "Everyone died, and no fugitives were recovered!" if(FUGITIVE_RESULT_MINOR_FUGITIVE) - result += "Minor Fugitive Victory" + result += span_redtextbig("Minor Fugitive Victory") result += "All the fugitives died, but none were recovered!" if(FUGITIVE_RESULT_FUGITIVE_VICTORY) - result += "Fugitive Victory" + result += span_redtextbig("Fugitive Victory") result += "A fugitive survived, and no bodies were recovered by the [backstory]s." if(FUGITIVE_RESULT_MAJOR_FUGITIVE) - result += "Major Fugitive Victory" + result += span_redtextbig("Major Fugitive Victory") result += "All of the fugitives survived and avoided capture!" else //get_result returned null- either bugged or no fugitives showed - result += "Prank Call!" + result += span_neutraltextbig("Prank Call!") result += "[capitalize(backstory)]s were called, yet there were no fugitives...?" result += "
" diff --git a/code/modules/antagonists/monkey/monkey.dm b/code/modules/antagonists/monkey/monkey.dm index a61fbe315..4c4d802a3 100644 --- a/code/modules/antagonists/monkey/monkey.dm +++ b/code/modules/antagonists/monkey/monkey.dm @@ -189,24 +189,24 @@ var/list/parts = list() switch(get_result()) if(MONKEYS_ESCAPED) - parts += "Monkey Major Victory!" - parts += "Central Command and [station_name()] were taken over by the monkeys! Ook ook!" + parts += span_greentextbig("Monkey Major Victory!") + parts += span_greentext("Central Command and [station_name()] were taken over by the monkeys! Ook ook!") if(MONKEYS_LIVED) parts += "Monkey Minor Victory!" - parts += "[station_name()] was taken over by the monkeys! Ook ook!" + parts += span_greentext("[station_name()] was taken over by the monkeys! Ook ook!") if(DISEASE_LIVED) - parts += "Monkey Minor Defeat!" - parts += "All the monkeys died, but the disease lives on! The future is uncertain." + parts += span_redtextbig("Monkey Minor Defeat!") + parts += span_redtext("All the monkeys died, but the disease lives on! The future is uncertain.") if(MONKEYS_DIED) - parts += "Monkey Major Defeat!" - parts += "All the monkeys died, and Jungle Fever was wiped out!" + parts += span_redtextbig("Monkey Major Defeat!") + parts += span_redtext("All the monkeys died, and Jungle Fever was wiped out!") var/list/leaders = get_antag_minds(/datum/antagonist/monkey/leader, TRUE) var/list/monkeys = get_antag_minds(/datum/antagonist/monkey, TRUE) if(LAZYLEN(leaders)) - parts += "The monkey leaders were:" + parts += span_header("The monkey leaders were:") parts += printplayerlist(SSticker.mode.ape_leaders) if(LAZYLEN(monkeys)) - parts += "The monkeys were:" + parts += span_header("The monkeys were:") parts += printplayerlist(SSticker.mode.ape_infectees) return "
[parts.Join("
")]
" diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm index aeacabf84..4c1869161 100644 --- a/code/modules/antagonists/morph/morph.dm +++ b/code/modules/antagonists/morph/morph.dm @@ -55,7 +55,7 @@ if(morphed) . = form.examine(user) if(get_dist(user,src)<=3) - . += "It doesn't look quite right..." + . += span_warning("It doesn't look quite right...") else . = ..() @@ -78,10 +78,10 @@ /mob/living/simple_animal/hostile/morph/proc/eat(atom/movable/A) if(morphed && !eat_while_disguised) - to_chat(src, "I can not eat anything while you are disguised!") + to_chat(src, span_warning("I can not eat anything while you are disguised!")) return FALSE if(A && A.loc != src) - visible_message("[src] swallows [A] whole!") + visible_message(span_warning("[src] swallows [A] whole!")) A.forceMove(src) return TRUE return FALSE @@ -94,18 +94,18 @@ if(istype(A) && allowed(A)) assume(A) else - to_chat(src, "My chameleon skin is still repairing itself!") + to_chat(src, span_warning("My chameleon skin is still repairing itself!")) ..() /mob/living/simple_animal/hostile/morph/proc/assume(atom/movable/target) if(morphed) - to_chat(src, "I must restore to my original form first!") + to_chat(src, span_warning("I must restore to my original form first!")) return morphed = TRUE form = target - visible_message("[src] suddenly twists and changes shape, becoming a copy of [target]!", \ - "I twist my body and assume the form of [target].") + visible_message(span_warning("[src] suddenly twists and changes shape, becoming a copy of [target]!"), \ + span_notice("I twist my body and assume the form of [target].")) appearance = target.appearance copy_overlays(target) alpha = max(alpha, 150) //fucking chameleons @@ -125,7 +125,7 @@ /mob/living/simple_animal/hostile/morph/proc/restore() if(!morphed) - to_chat(src, "You're already in my normal form!") + to_chat(src, span_warning("You're already in my normal form!")) return morphed = FALSE form = null @@ -134,8 +134,8 @@ animate_movement = SLIDE_STEPS maptext = null - visible_message("[src] suddenly collapses in on itself, dissolving into a pile of green flesh!", \ - "I reform to my normal body.") + visible_message(span_warning("[src] suddenly collapses in on itself, dissolving into a pile of green flesh!"), \ + span_notice("I reform to my normal body.")) name = initial(name) icon = initial(icon) icon_state = initial(icon_state) @@ -152,8 +152,8 @@ /mob/living/simple_animal/hostile/morph/death(gibbed) if(morphed) - visible_message("[src] twists and dissolves into a pile of green flesh!", \ - "My skin ruptures! Your flesh breaks apart! No disguise can ward off de--") + visible_message(span_warning("[src] twists and dissolves into a pile of green flesh!"), \ + span_danger("My skin ruptures! Your flesh breaks apart! No disguise can ward off de--")) restore() barf_contents() ..() @@ -192,7 +192,7 @@ /mob/living/simple_animal/hostile/morph/AttackingTarget() if(morphed && !melee_damage_disguised) - to_chat(src, "I can not attack while disguised!") + to_chat(src, span_warning("I can not attack while disguised!")) return if(isliving(target)) //Eat Corpses to regen health var/mob/living/L = target diff --git a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm index bc4abd262..c069cca53 100644 --- a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm +++ b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm @@ -48,21 +48,21 @@ if (isturf(user.loc)) toggle(user) else - to_chat(user, "I can't use [src] while inside something!") + to_chat(user, span_warning("I can't use [src] while inside something!")) else - to_chat(user, "I need at least [activationCost] charge in my cell to use [src]!") + to_chat(user, span_warning("I need at least [activationCost] charge in my cell to use [src]!")) /obj/item/borg_chameleon/proc/toggle(mob/living/silicon/robot/user) if(active) playsound(src, 'sound/blank.ogg', 100, TRUE, -6) - to_chat(user, "I deactivate \the [src].") + to_chat(user, span_notice("I deactivate \the [src].")) deactivate(user) else if(animation_playing) - to_chat(user, "\the [src] is recharging.") + to_chat(user, span_notice("\the [src] is recharging.")) return animation_playing = TRUE - to_chat(user, "I activate \the [src].") + to_chat(user, span_notice("I activate \the [src].")) playsound(src, 'sound/blank.ogg', 100, TRUE, -6) var/start = user.filters.len var/X,Y,rsq,i,f @@ -79,10 +79,10 @@ animate(offset=f:offset-1, time=rand()*20+10) if (do_after(user, 50, target=user) && user.cell.use(activationCost)) playsound(src, 'sound/blank.ogg', 100, TRUE, -6) - to_chat(user, "I are now disguised as the Nanotrasen engineering borg \"[friendlyName]\".") + to_chat(user, span_notice("I are now disguised as the Nanotrasen engineering borg \"[friendlyName]\".")) activate(user) else - to_chat(user, "The chameleon field fizzles.") + to_chat(user, span_warning("The chameleon field fizzles.")) do_sparks(3, FALSE, user) for(i=1, i<=min(7, user.filters.len), ++i) // removing filters that are animating does nothing, we gotta stop the animations first f = user.filters[start+i] @@ -129,5 +129,5 @@ /obj/item/borg_chameleon/proc/disrupt(mob/living/silicon/robot/user) if(active) - to_chat(user, "My chameleon field deactivates.") + to_chat(user, span_danger("My chameleon field deactivates.")) deactivate(user) diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm index e86f1d9e0..d3967bac0 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm @@ -83,7 +83,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec) for (var/mob/living/L in orphans) var/TC = new /obj/item/stack/telecrystal(user.drop_location(), tc_per_nukie) - to_chat(L, "My uplink could not be found so my share of the team's bonus telecrystals has been bluespaced to my [L.put_in_hands(TC) ? "hands" : "feet"].") + to_chat(L, span_warning("My uplink could not be found so my share of the team's bonus telecrystals has been bluespaced to my [L.put_in_hands(TC) ? "hands" : "feet"].")) tc_to_distribute -= tc_per_nukie if (tc_to_distribute > 0) // What shall we do with the remainder... @@ -91,7 +91,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec) if (C.stat != DEAD) var/obj/item/stack/telecrystal/TC = new(C.drop_location(), tc_to_distribute) TC.throw_at(get_step(C, C.dir), 3, 3) - C.visible_message("[C] coughs up a half-digested telecrystal","I cough up a half-digested telecrystal!") + C.visible_message(span_notice("[C] coughs up a half-digested telecrystal"),span_notice("I cough up a half-digested telecrystal!")) break CONFIG_SET(number/shuttle_refuel_delay, max(CONFIG_GET(number/shuttle_refuel_delay), CHALLENGE_SHUTTLE_DELAY)) @@ -101,21 +101,21 @@ GLOBAL_LIST_EMPTY(jam_on_wardec) /obj/item/nuclear_challenge/proc/check_allowed(mob/living/user) if(declaring_war) - to_chat(user, "I are already in the process of declaring war! Make my mind up.") + to_chat(user, span_boldwarning("I are already in the process of declaring war! Make my mind up.")) return FALSE if(GLOB.player_list.len < CHALLENGE_MIN_PLAYERS) - to_chat(user, "The enemy crew is too small to be worth declaring war on.") + to_chat(user, span_boldwarning("The enemy crew is too small to be worth declaring war on.")) return FALSE if(!user.onSyndieBase()) - to_chat(user, "I have to be at my base to use this.") + to_chat(user, span_boldwarning("I have to be at my base to use this.")) return FALSE if(world.time-SSticker.round_start_time > CHALLENGE_TIME_LIMIT) - to_chat(user, "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand.") + to_chat(user, span_boldwarning("It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand.")) return FALSE for(var/V in GLOB.syndicate_shuttle_boards) var/obj/item/circuitboard/computer/syndicate_shuttle/board = V if(board.moved) - to_chat(user, "The shuttle has already been moved! You have forfeit the right to declare war.") + to_chat(user, span_boldwarning("The shuttle has already been moved! You have forfeit the right to declare war.")) return FALSE return TRUE diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 2e47aeca6..c1b852fcf 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -106,10 +106,10 @@ switch(deconstruction_state) if(NUKESTATE_INTACT) if(istype(I, /obj/item/screwdriver/nuke)) - to_chat(user, "I start removing [src]'s front panel's screws...") + to_chat(user, span_notice("I start removing [src]'s front panel's screws...")) if(I.use_tool(src, user, 60, volume=100)) deconstruction_state = NUKESTATE_UNSCREWED - to_chat(user, "I remove the screws from [src]'s front panel.") + to_chat(user, span_notice("I remove the screws from [src]'s front panel.")) update_icon() return @@ -117,32 +117,32 @@ if(I.tool_behaviour == TOOL_WELDER) if(!I.tool_start_check(user, amount=1)) return - to_chat(user, "I start cutting [src]'s inner plate...") + to_chat(user, span_notice("I start cutting [src]'s inner plate...")) if(I.use_tool(src, user, 80, volume=100, amount=1)) - to_chat(user, "I cut [src]'s inner plate.") + to_chat(user, span_notice("I cut [src]'s inner plate.")) deconstruction_state = NUKESTATE_WELDED update_icon() return if(NUKESTATE_CORE_EXPOSED) if(istype(I, /obj/item/nuke_core_container)) var/obj/item/nuke_core_container/core_box = I - to_chat(user, "I start loading the plutonium core into [core_box]...") + to_chat(user, span_notice("I start loading the plutonium core into [core_box]...")) if(do_after(user,50,target=src)) if(core_box.load(core, user)) - to_chat(user, "I load the plutonium core into [core_box].") + to_chat(user, span_notice("I load the plutonium core into [core_box].")) deconstruction_state = NUKESTATE_CORE_REMOVED update_icon() core = null else - to_chat(user, "I fail to load the plutonium core into [core_box]. [core_box] has already been used!") + to_chat(user, span_warning("I fail to load the plutonium core into [core_box]. [core_box] has already been used!")) return if(istype(I, /obj/item/stack/sheet/metal)) if(!I.tool_start_check(user, amount=20)) return - to_chat(user, "I begin repairing [src]'s inner metal plate...") + to_chat(user, span_notice("I begin repairing [src]'s inner metal plate...")) if(I.use_tool(src, user, 100, amount=20)) - to_chat(user, "I repair [src]'s inner metal plate. The radiation is contained.") + to_chat(user, span_notice("I repair [src]'s inner metal plate. The radiation is contained.")) deconstruction_state = NUKESTATE_PANEL_REMOVED STOP_PROCESSING(SSobj, core) update_icon() @@ -153,16 +153,16 @@ . = FALSE switch(deconstruction_state) if(NUKESTATE_UNSCREWED) - to_chat(user, "I start removing [src]'s front panel...") + to_chat(user, span_notice("I start removing [src]'s front panel...")) if(tool.use_tool(src, user, 30, volume=100)) - to_chat(user, "I remove [src]'s front panel.") + to_chat(user, span_notice("I remove [src]'s front panel.")) deconstruction_state = NUKESTATE_PANEL_REMOVED update_icon() return TRUE if(NUKESTATE_WELDED) - to_chat(user, "I start prying off [src]'s inner plate...") + to_chat(user, span_notice("I start prying off [src]'s inner plate...")) if(tool.use_tool(src, user, 30, volume=100)) - to_chat(user, "I pry off [src]'s inner plate. You can see the core's green glow!") + to_chat(user, span_notice("I pry off [src]'s inner plate. You can see the core's green glow!")) deconstruction_state = NUKESTATE_CORE_EXPOSED update_icon() START_PROCESSING(SSobj, core) @@ -346,7 +346,7 @@ /obj/machinery/nuclearbomb/proc/set_anchor() if(isinspace() && !anchored) - to_chat(usr, "There is nothing to anchor to!") + to_chat(usr, span_warning("There is nothing to anchor to!")) else anchored = !anchored @@ -365,7 +365,7 @@ /obj/machinery/nuclearbomb/proc/set_active() if(safety) - to_chat(usr, "The safety is still on.") + to_chat(usr, span_danger("The safety is still on.")) return timing = !timing if(timing) @@ -470,16 +470,16 @@ /obj/machinery/nuclearbomb/beer/examine(mob/user) . = ..() if(keg.reagents.total_volume) - to_chat(user, "It has [keg.reagents.total_volume] unit\s left.") + to_chat(user, span_notice("It has [keg.reagents.total_volume] unit\s left.")) else - to_chat(user, "It's empty.") + to_chat(user, span_danger("It's empty.")) /obj/machinery/nuclearbomb/beer/attackby(obj/item/W, mob/user, params) if(W.is_refillable()) W.afterattack(keg, user, TRUE) // redirect refillable containers to the keg, allowing them to be filled return TRUE // pretend we handled the attack, too. if(istype(W, /obj/item/nuke_core_container)) - to_chat(user, "[src] has had its plutonium core removed as a part of being decommissioned.") + to_chat(user, span_notice("[src] has had its plutonium core removed as a part of being decommissioned.")) return TRUE return ..() @@ -496,7 +496,7 @@ E.runEvent() addtimer(CALLBACK(src, PROC_REF(really_actually_explode)), 110) else - visible_message("[src] fizzes ominously.") + visible_message(span_notice("[src] fizzes ominously.")) addtimer(CALLBACK(src, PROC_REF(fizzbuzz)), 110) /obj/machinery/nuclearbomb/beer/proc/disarm() @@ -615,17 +615,17 @@ This is here to make the tiles around the station mininuke change when it's arme return if(isobserver(user) || HAS_TRAIT(user.mind, TRAIT_DISK_VERIFIER)) - . += "The serial numbers on [src] are incorrect." + . += span_warning("The serial numbers on [src] are incorrect.") /obj/item/disk/nuclear/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/claymore/highlander) && !fake) var/obj/item/claymore/highlander/H = I if(H.nuke_disk) - to_chat(user, "Wait... what?") + to_chat(user, span_notice("Wait... what?")) qdel(H.nuke_disk) H.nuke_disk = null return - user.visible_message("[user] captures [src]!", "You've got the disk! Defend it with your life!") + user.visible_message(span_warning("[user] captures [src]!"), span_danger("You've got the disk! Defend it with your life!")) forceMove(H) H.nuke_disk = src return TRUE @@ -638,7 +638,7 @@ This is here to make the tiles around the station mininuke change when it's arme . = ..() /obj/item/disk/nuclear/suicide_act(mob/user) - user.visible_message("[user] is going delta! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is going delta! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(src, 'sound/blank.ogg', 50, -1, TRUE) for(var/i in 1 to 100) addtimer(CALLBACK(user, TYPE_PROC_REF(/atom, add_atom_colour), (i % 2)? "#00FF00" : "#FF0000", ADMIN_COLOUR_PRIORITY), i) @@ -647,7 +647,7 @@ This is here to make the tiles around the station mininuke change when it's arme /obj/item/disk/nuclear/proc/manual_suicide(mob/living/user) user.remove_atom_colour(ADMIN_COLOUR_PRIORITY) - user.visible_message("[user] was destroyed by the nuclear blast!") + user.visible_message(span_suicide("[user] was destroyed by the nuclear blast!")) user.adjustOxyLoss(200) user.death(0) diff --git a/code/modules/antagonists/nukeop/equipment/pinpointer.dm b/code/modules/antagonists/nukeop/equipment/pinpointer.dm index 3c2259bad..525b32c12 100644 --- a/code/modules/antagonists/nukeop/equipment/pinpointer.dm +++ b/code/modules/antagonists/nukeop/equipment/pinpointer.dm @@ -28,7 +28,7 @@ playsound(src, 'sound/blank.ogg', 50, FALSE) if(isliving(loc)) var/mob/living/L = loc - to_chat(L, "My [name] vibrates and lets out a tinny alarm. Uh oh.") + to_chat(L, span_danger("My [name] vibrates and lets out a tinny alarm. Uh oh.")) /obj/item/pinpointer/nuke/scan_for_target() target = null @@ -52,7 +52,7 @@ /obj/item/pinpointer/nuke/proc/switch_mode_to(new_mode) if(isliving(loc)) var/mob/living/L = loc - to_chat(L, "My [name] beeps as it reconfigures it's tracking algorithms.") + to_chat(L, span_danger("My [name] beeps as it reconfigures it's tracking algorithms.")) playsound(L, 'sound/blank.ogg', 50, TRUE) mode = new_mode scan_for_target() diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index dd9d7a148..6beba3d9a 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -35,7 +35,7 @@ /datum/antagonist/nukeop/greet() owner.current.playsound_local(get_turf(owner.current), 'sound/blank.ogg',100,0) - to_chat(owner, "I are a [nuke_team ? nuke_team.syndicate_name : "syndicate"] agent!") + to_chat(owner, span_notice("I are a [nuke_team ? nuke_team.syndicate_name : "syndicate"] agent!")) owner.announce_objectives() /datum/antagonist/nukeop/on_gain() @@ -147,7 +147,7 @@ antag_memory += "Syndicate Nuclear Bomb Code: [code]
" to_chat(owner.current, "The nuclear authorization code is: [code]") else - to_chat(admin, "No valid nuke found!") + to_chat(admin, span_danger("No valid nuke found!")) /datum/antagonist/nukeop/leader name = "Nuclear Operative Leader" @@ -311,38 +311,38 @@ /datum/team/nuclear/roundend_report() var/list/parts = list() - parts += "[syndicate_name] Operatives:" + parts += span_header("[syndicate_name] Operatives:") switch(get_result()) if(NUKE_RESULT_FLUKE) - parts += "Humiliating Syndicate Defeat" + parts += span_redtextbig("Humiliating Syndicate Defeat") parts += "The crew of [station_name()] gave [syndicate_name] operatives back their bomb! The syndicate base was destroyed! Next time, don't lose the nuke!" if(NUKE_RESULT_NUKE_WIN) - parts += "Syndicate Major Victory!" + parts += span_greentextbig("Syndicate Major Victory!") parts += "[syndicate_name] operatives have destroyed [station_name()]!" if(NUKE_RESULT_NOSURVIVORS) - parts += "Total Annihilation" + parts += span_neutraltextbig("Total Annihilation") parts += "[syndicate_name] operatives destroyed [station_name()] but did not leave the area in time and got caught in the explosion. Next time, don't lose the disk!" if(NUKE_RESULT_WRONG_STATION) - parts += "Crew Minor Victory" + parts += span_redtextbig("Crew Minor Victory") parts += "[syndicate_name] operatives secured the authentication disk but blew up something that wasn't [station_name()]. Next time, don't do that!" if(NUKE_RESULT_WRONG_STATION_DEAD) - parts += "[syndicate_name] operatives have earned Darwin Award!" + parts += span_redtextbig("[syndicate_name] operatives have earned Darwin Award!") parts += "[syndicate_name] operatives blew up something that wasn't [station_name()] and got caught in the explosion. Next time, don't do that!" if(NUKE_RESULT_CREW_WIN_SYNDIES_DEAD) - parts += "Crew Major Victory!" + parts += span_redtextbig("Crew Major Victory!") parts += "The Research Staff has saved the disk and killed the [syndicate_name] Operatives" if(NUKE_RESULT_CREW_WIN) - parts += "Crew Major Victory" + parts += span_redtextbig("Crew Major Victory") parts += "The Research Staff has saved the disk and stopped the [syndicate_name] Operatives!" if(NUKE_RESULT_DISK_LOST) - parts += "Neutral Victory!" + parts += span_neutraltextbig("Neutral Victory!") parts += "The Research Staff failed to secure the authentication disk but did manage to kill most of the [syndicate_name] Operatives!" if(NUKE_RESULT_DISK_STOLEN) - parts += "Syndicate Minor Victory!" + parts += span_greentextbig("Syndicate Minor Victory!") parts += "[syndicate_name] operatives survived the assault but did not achieve the destruction of [station_name()]. Next time, don't lose the disk!" else - parts += "Neutral Victory" + parts += span_neutraltextbig("Neutral Victory") parts += "Mission aborted!" var/text = "
The syndicate operatives were:" diff --git a/code/modules/antagonists/pirate/pirate.dm b/code/modules/antagonists/pirate/pirate.dm index 64e60b937..8e4023033 100644 --- a/code/modules/antagonists/pirate/pirate.dm +++ b/code/modules/antagonists/pirate/pirate.dm @@ -6,7 +6,7 @@ var/datum/team/pirate/crew /datum/antagonist/pirate/greet() - to_chat(owner, "I are a Space Pirate!") + to_chat(owner, span_boldannounce("I are a Space Pirate!")) to_chat(owner, "The station refused to pay for your protection, protect the ship, siphon the credits from the station and raid it for even more loot.") owner.announce_objectives() @@ -86,7 +86,7 @@ /datum/team/pirate/roundend_report() var/list/parts = list() - parts += "Space Pirates were:" + parts += span_header("Space Pirates were:") var/all_dead = TRUE for(var/datum/mind/M in members) @@ -100,8 +100,8 @@ parts += "Total loot value : [L.get_loot_value()]/[L.target_value] credits" if(L.check_completion() && !all_dead) - parts += "The pirate crew was successful!" + parts += span_greentextbig("The pirate crew was successful!") else - parts += "The pirate crew has failed." + parts += span_redtextbig("The pirate crew has failed.") return "
[parts.Join("
")]
" diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm index 0597b6778..78abe37a3 100644 --- a/code/modules/antagonists/revenant/revenant.dm +++ b/code/modules/antagonists/revenant/revenant.dm @@ -94,7 +94,7 @@ /mob/living/simple_animal/revenant/Login() ..() - to_chat(src, "I are a revenant.") + to_chat(src, span_deadsay("I are a revenant.")) to_chat(src, "My formerly mundane spirit has been infused with alien energies and empowered into a revenant.") to_chat(src, "I are not dead, not alive, but somewhere in between. You are capable of limited interaction with both worlds.") to_chat(src, "I are invincible and invisible to everyone but other ghosts. Most abilities will reveal you, rendering you vulnerable.") @@ -119,11 +119,11 @@ revealed = FALSE incorporeal_move = INCORPOREAL_MOVE_JAUNT invisibility = INVISIBILITY_REVENANT - to_chat(src, "I are once more concealed.") + to_chat(src, span_revenboldnotice("I are once more concealed.")) if(unstun_time && world.time >= unstun_time) unstun_time = 0 notransform = FALSE - to_chat(src, "I can move again!") + to_chat(src, span_revenboldnotice("I can move again!")) if(essence_regenerating && !inhibited && essence < essence_regen_cap) //While inhibited, essence will not regenerate essence = min(essence_regen_cap, essence+essence_regen_amount) update_action_buttons_icon() //because we update something required by our spells in life, we need to update our buttons @@ -158,7 +158,7 @@ if(!message) return src.log_talk(message, LOG_SAY) - var/rendered = "[src] says, \"[message]\"" + var/rendered = span_revennotice("[src] says, \"[message]\"") for(var/mob/M in GLOB.mob_list) if(isrevenant(M)) to_chat(M, rendered) @@ -191,8 +191,8 @@ /mob/living/simple_animal/revenant/attackby(obj/item/W, mob/living/user, params) . = ..() if(istype(W, /obj/item/nullrod)) - visible_message("[src] violently flinches!", \ - "As \the [W] passes through you, you feel my essence draining away!") + visible_message(span_warning("[src] violently flinches!"), \ + span_revendanger("As \the [W] passes through you, you feel my essence draining away!")) adjustBruteLoss(25) //hella effective inhibited = TRUE update_action_buttons_icon() @@ -222,17 +222,17 @@ if(!revealed || stasis) //Revenants cannot die if they aren't revealed //or are already dead return 0 stasis = TRUE - to_chat(src, "NO! No... it's too late, you can feel my essence [pick("breaking apart", "drifting away")]...") + to_chat(src, span_revendanger("NO! No... it's too late, you can feel my essence [pick("breaking apart", "drifting away")]...")) notransform = TRUE revealed = TRUE invisibility = 0 playsound(src, 'sound/blank.ogg', 100, TRUE) - visible_message("[src] lets out a waning screech as violet mist swirls around its dissolving body!") + visible_message(span_warning("[src] lets out a waning screech as violet mist swirls around its dissolving body!")) icon_state = "revenant_draining" for(var/i = alpha, i > 0, i -= 10) stoplag() alpha = i - visible_message("[src]'s body breaks apart into a fine pile of blue dust.") + visible_message(span_danger("[src]'s body breaks apart into a fine pile of blue dust.")) var/reforming_essence = essence_regen_cap //retain the gained essence capacity var/obj/item/ectoplasm/revenant/R = new(get_turf(src)) R.essence = max(reforming_essence - 15 * perfectsouls, 75) //minus any perfect souls @@ -253,10 +253,10 @@ invisibility = 0 incorporeal_move = FALSE if(!unreveal_time) - to_chat(src, "I have been revealed!") + to_chat(src, span_revendanger("I have been revealed!")) unreveal_time = world.time + time else - to_chat(src, "I have been revealed!") + to_chat(src, span_revenwarning("I have been revealed!")) unreveal_time = unreveal_time + time update_spooky_icon() @@ -267,10 +267,10 @@ return notransform = TRUE if(!unstun_time) - to_chat(src, "I cannot move!") + to_chat(src, span_revendanger("I cannot move!")) unstun_time = world.time + time else - to_chat(src, "I cannot move!") + to_chat(src, span_revenwarning("I cannot move!")) unstun_time = unstun_time + time update_spooky_icon() @@ -291,17 +291,17 @@ return var/turf/T = get_turf(src) if(isclosedturf(T)) - to_chat(src, "I cannot use abilities from inside of a wall.") + to_chat(src, span_revenwarning("I cannot use abilities from inside of a wall.")) return FALSE for(var/obj/O in T) if(O.density && !O.CanPass(src, T)) - to_chat(src, "I cannot use abilities inside of a dense object.") + to_chat(src, span_revenwarning("I cannot use abilities inside of a dense object.")) return FALSE if(inhibited) - to_chat(src, "My powers have been suppressed by nulling energy!") + to_chat(src, span_revenwarning("My powers have been suppressed by nulling energy!")) return FALSE if(!change_essence_amount(essence_cost, TRUE)) - to_chat(src, "I lack the essence to use that ability.") + to_chat(src, span_revenwarning("I lack the essence to use that ability.")) return FALSE return TRUE @@ -325,9 +325,9 @@ update_action_buttons_icon() if(!silent) if(essence_amt > 0) - to_chat(src, "Gained [essence_amt]E[source ? " from [source]":""].") + to_chat(src, span_revennotice("Gained [essence_amt]E[source ? " from [source]":""].")) else - to_chat(src, "Lost [essence_amt]E[source ? " from [source]":""].") + to_chat(src, span_revenminor("Lost [essence_amt]E[source ? " from [source]":""].")) return 1 /mob/living/simple_animal/revenant/proc/death_reset() @@ -369,13 +369,13 @@ reform() else inert = TRUE - visible_message("[src] settles down and seems lifeless.") + visible_message(span_warning("[src] settles down and seems lifeless.")) /obj/item/ectoplasm/revenant/attack_self(mob/user) if(!reforming || inert) return ..() - user.visible_message("[user] scatters [src] in all directions.", \ - "I scatter [src] across the area. The particles slowly fade away.") + user.visible_message(span_notice("[user] scatters [src] in all directions."), \ + span_notice("I scatter [src] across the area. The particles slowly fade away.")) user.dropItemToGround(src) scatter() @@ -383,15 +383,15 @@ ..() if(inert) return - visible_message("[src] breaks into particles upon impact, which fade away to nothingness.") + visible_message(span_notice("[src] breaks into particles upon impact, which fade away to nothingness.")) scatter() /obj/item/ectoplasm/revenant/examine(mob/user) . = ..() if(inert) - . += "It seems inert." + . += span_revennotice("It seems inert.") else if(reforming) - . += "It is shifting and distorted. It would be wise to destroy this." + . += span_revenwarning("It is shifting and distorted. It would be wise to destroy this.") /obj/item/ectoplasm/revenant/proc/reform() if(QDELETED(src) || QDELETED(revenant) || inert) @@ -412,7 +412,7 @@ qdel(revenant) message_admins("No candidates were found for the new revenant. Oh well!") inert = TRUE - visible_message("[src] settles down and seems lifeless.") + visible_message(span_revenwarning("[src] settles down and seems lifeless.")) return var/mob/dead/observer/C = pick(candidates) key_of_revenant = C.key @@ -420,12 +420,12 @@ qdel(revenant) message_admins("No ckey was found for the new revenant. Oh well!") inert = TRUE - visible_message("[src] settles down and seems lifeless.") + visible_message(span_revenwarning("[src] settles down and seems lifeless.")) return message_admins("[key_of_revenant] has been [old_key == key_of_revenant ? "re":""]made into a revenant by reforming ectoplasm.") log_game("[key_of_revenant] was [old_key == key_of_revenant ? "re":""]made as a revenant by reforming ectoplasm.") - visible_message("[src] suddenly rises into the air before fading away.") + visible_message(span_revenboldnotice("[src] suddenly rises into the air before fading away.")) revenant.essence = essence revenant.essence_regen_cap = essence @@ -435,7 +435,7 @@ qdel(src) /obj/item/ectoplasm/revenant/suicide_act(mob/user) - user.visible_message("[user] is inhaling [src]! It looks like [user.p_theyre()] trying to visit the shadow realm!") + user.visible_message(span_suicide("[user] is inhaling [src]! It looks like [user.p_theyre()] trying to visit the shadow realm!")) scatter() return (OXYLOSS) diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm index 13a10c1ed..4ca9ddf6f 100644 --- a/code/modules/antagonists/revenant/revenant_abilities.dm +++ b/code/modules/antagonists/revenant/revenant_abilities.dm @@ -10,7 +10,7 @@ if(ishuman(A)) if(A in drained_mobs) - to_chat(src, "[A]'s soul is dead and empty." ) + to_chat(src, span_revenwarning("[A]'s soul is dead and empty.") ) else if(in_range(src, A)) Harvest(A) @@ -20,55 +20,55 @@ if(!castcheck(0)) return if(draining) - to_chat(src, "I are already siphoning the essence of a soul!") + to_chat(src, span_revenwarning("I are already siphoning the essence of a soul!")) return if(!target.stat) - to_chat(src, "[target.p_their(TRUE)] soul is too strong to harvest.") + to_chat(src, span_revennotice("[target.p_their(TRUE)] soul is too strong to harvest.")) if(prob(10)) - to_chat(target, "I feel as if you are being watched.") + to_chat(target, span_revennotice("I feel as if you are being watched.")) return face_atom(target) draining = TRUE essence_drained += rand(15, 20) - to_chat(src, "I search for the soul of [target].") + to_chat(src, span_revennotice("I search for the soul of [target].")) if(do_after(src, rand(10, 20), 0, target)) //did they get deleted in that second? if(target.ckey) - to_chat(src, "[target.p_their(TRUE)] soul burns with intelligence.") + to_chat(src, span_revennotice("[target.p_their(TRUE)] soul burns with intelligence.")) essence_drained += rand(20, 30) if(target.stat != DEAD) - to_chat(src, "[target.p_their(TRUE)] soul blazes with life!") + to_chat(src, span_revennotice("[target.p_their(TRUE)] soul blazes with life!")) essence_drained += rand(40, 50) else - to_chat(src, "[target.p_their(TRUE)] soul is weak and faltering.") + to_chat(src, span_revennotice("[target.p_their(TRUE)] soul is weak and faltering.")) if(do_after(src, rand(15, 20), 0, target)) //did they get deleted NOW? switch(essence_drained) if(1 to 30) - to_chat(src, "[target] will not yield much essence. Still, every bit counts.") + to_chat(src, span_revennotice("[target] will not yield much essence. Still, every bit counts.")) if(30 to 70) - to_chat(src, "[target] will yield an average amount of essence.") + to_chat(src, span_revennotice("[target] will yield an average amount of essence.")) if(70 to 90) - to_chat(src, "Such a feast! [target] will yield much essence to you.") + to_chat(src, span_revenboldnotice("Such a feast! [target] will yield much essence to you.")) if(90 to INFINITY) - to_chat(src, "Ah, the perfect soul. [target] will yield massive amounts of essence to you.") + to_chat(src, span_revenbignotice("Ah, the perfect soul. [target] will yield massive amounts of essence to you.")) if(do_after(src, rand(15, 25), 0, target)) //how about now if(!target.stat) - to_chat(src, "[target.p_theyre(TRUE)] now powerful enough to fight off your draining.") - to_chat(target, "I feel something tugging across your body before subsiding.") + to_chat(src, span_revenwarning("[target.p_theyre(TRUE)] now powerful enough to fight off your draining.")) + to_chat(target, span_boldannounce("I feel something tugging across your body before subsiding.")) draining = 0 essence_drained = 0 return //hey, wait a minute... - to_chat(src, "I begin siphoning essence from [target]'s soul.") + to_chat(src, span_revenminor("I begin siphoning essence from [target]'s soul.")) if(target.stat != DEAD) - to_chat(target, "I feel a horribly unpleasant draining sensation as your grip on life weakens...") + to_chat(target, span_warning("I feel a horribly unpleasant draining sensation as your grip on life weakens...")) if(target.stat == SOFT_CRIT) target.Stun(46) reveal(46) stun(46) - target.visible_message("[target] suddenly rises slightly into the air, [target.p_their()] skin turning an ashy gray.") + target.visible_message(span_warning("[target] suddenly rises slightly into the air, [target.p_their()] skin turning an ashy gray.")) if(target.anti_magic_check(FALSE, TRUE)) - to_chat(src, "Something's wrong! [target] seems to be resisting the siphoning, leaving you vulnerable!") - target.visible_message("[target] slumps onto the ground.", \ - "Violet lights, dancing in your vision, receding--") + to_chat(src, span_revenminor("Something's wrong! [target] seems to be resisting the siphoning, leaving you vulnerable!")) + target.visible_message(span_warning("[target] slumps onto the ground."), \ + span_revenwarning("Violet lights, dancing in your vision, receding--")) draining = FALSE return var/datum/beam/B = Beam(target,icon_state="drain_life",time=INFINITY) @@ -76,24 +76,24 @@ change_essence_amount(essence_drained, FALSE, target) if(essence_drained <= 90 && target.stat != DEAD) essence_regen_cap += 5 - to_chat(src, "The absorption of [target]'s living soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap].") + to_chat(src, span_revenboldnotice("The absorption of [target]'s living soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap].")) if(essence_drained > 90) essence_regen_cap += 15 perfectsouls++ - to_chat(src, "The perfection of [target]'s soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap].") - to_chat(src, "[target]'s soul has been considerably weakened and will yield no more essence for the time being.") - target.visible_message("[target] slumps onto the ground.", \ - "Violets lights, dancing in your vision, getting clo--") + to_chat(src, span_revenboldnotice("The perfection of [target]'s soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap].")) + to_chat(src, span_revennotice("[target]'s soul has been considerably weakened and will yield no more essence for the time being.")) + target.visible_message(span_warning("[target] slumps onto the ground."), \ + span_revenwarning("Violets lights, dancing in your vision, getting clo--")) drained_mobs.Add(target) target.death(0) else - to_chat(src, "[target ? "[target] has":"[target.p_theyve(TRUE)]"] been drawn out of your grasp. The link has been broken.") + to_chat(src, span_revenwarning("[target ? "[target] has":"[target.p_theyve(TRUE)]"] been drawn out of your grasp. The link has been broken.")) if(target) //Wait, target is WHERE NOW? - target.visible_message("[target] slumps onto the ground.", \ - "Violets lights, dancing in your vision, receding--") + target.visible_message(span_warning("[target] slumps onto the ground."), \ + span_revenwarning("Violets lights, dancing in your vision, receding--")) qdel(B) else - to_chat(src, "I are not close enough to siphon [target ? "[target]'s":"[target.p_their()]"] soul. The link has been broken.") + to_chat(src, span_revenwarning("I are not close enough to siphon [target ? "[target]'s":"[target.p_their()]"] soul. The link has been broken.")) draining = FALSE essence_drained = 0 @@ -101,7 +101,7 @@ /obj/effect/proc_holder/spell/targeted/night_vision/revenant charge_max = 0 panel = "Revenant Abilities" - message = "I toggle your night vision." + message = span_revennotice("I toggle your night vision.") action_icon = 'icons/mob/actions/actions_revenant.dmi' action_icon_state = "r_nightvision" action_background_icon_state = "bg_revenant" @@ -163,7 +163,7 @@ charge_counter = charge_max return FALSE name = "[initial(name)] ([cast_amount]E)" - to_chat(user, "I have unlocked [initial(name)]!") + to_chat(user, span_revennotice("I have unlocked [initial(name)]!")) panel = "Revenant Abilities" locked = FALSE charge_counter = charge_max @@ -200,7 +200,7 @@ for(var/obj/machinery/light/L in T) if(!L.on) return - L.visible_message("\The [L] suddenly flares brightly and begins to spark!") + L.visible_message(span_warning("\The [L] suddenly flares brightly and begins to spark!")) var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(4, 0, L) s.start() @@ -300,7 +300,7 @@ continue if(human.anti_magic_check(FALSE, TRUE)) continue - to_chat(human, "I feel [pick("your sense of direction flicker out", "a stabbing pain in your head", "your mind fill with static")].") + to_chat(human, span_revenwarning("I feel [pick("your sense of direction flicker out", "a stabbing pain in your head", "your mind fill with static")].")) new /obj/effect/temp_visual/revenant(human.loc) human.emp_act(EMP_HEAVY) for(var/obj/thing in T) @@ -353,7 +353,7 @@ blight.stage++ if(!blightfound) H.ForceContractDisease(new /datum/disease/revblight(), FALSE, TRUE) - to_chat(H, "I feel [pick("suddenly sick", "a surge of nausea", "like your skin is wrong")].") + to_chat(H, span_revenminor("I feel [pick("suddenly sick", "a surge of nausea", "like your skin is wrong")].")) else if(mob.reagents) mob.reagents.add_reagent(/datum/reagent/toxin/plasma, 5) diff --git a/code/modules/antagonists/revenant/revenant_blight.dm b/code/modules/antagonists/revenant/revenant_blight.dm index 0dc4a8af7..33ae2c8d7 100644 --- a/code/modules/antagonists/revenant/revenant_blight.dm +++ b/code/modules/antagonists/revenant/revenant_blight.dm @@ -21,7 +21,7 @@ if(affected_mob.dna && affected_mob.dna.species) affected_mob.dna.species.handle_mutant_bodyparts(affected_mob) affected_mob.dna.species.handle_hair(affected_mob) - to_chat(affected_mob, "I feel better.") + to_chat(affected_mob, span_notice("I feel better.")) ..() /datum/disease/revblight/stage_act() @@ -30,7 +30,7 @@ cure() return if(prob(stage*3)) - to_chat(affected_mob, "I suddenly feel [pick("sick and tired", "disoriented", "tired and confused", "nauseated", "faint", "dizzy")]...") + to_chat(affected_mob, span_revennotice("I suddenly feel [pick("sick and tired", "disoriented", "tired and confused", "nauseated", "faint", "dizzy")]...")) affected_mob.confused += 8 affected_mob.adjustStaminaLoss(20) new /obj/effect/temp_visual/revenant(affected_mob.loc) @@ -54,13 +54,13 @@ if(5) if(!finalstage) finalstage = TRUE - to_chat(affected_mob, "I feel like [pick("nothing's worth it anymore", "nobody ever needed your help", "nothing you did mattered", "everything you tried to do was worthless")].") + to_chat(affected_mob, span_revenbignotice("I feel like [pick("nothing's worth it anymore", "nobody ever needed your help", "nothing you did mattered", "everything you tried to do was worthless")].")) affected_mob.adjustStaminaLoss(45) new /obj/effect/temp_visual/revenant(affected_mob.loc) if(affected_mob.dna && affected_mob.dna.species) affected_mob.dna.species.handle_mutant_bodyparts(affected_mob,"#1d2953") affected_mob.dna.species.handle_hair(affected_mob,"#1d2953") - affected_mob.visible_message("[affected_mob] looks terrifyingly gaunt...", "I suddenly feel like your skin is wrong...") + affected_mob.visible_message(span_warning("[affected_mob] looks terrifyingly gaunt..."), span_revennotice("I suddenly feel like your skin is wrong...")) affected_mob.add_atom_colour("#1d2953", TEMPORARY_COLOUR_PRIORITY) addtimer(CALLBACK(src, PROC_REF(cure)), 100) else diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index ca22426e4..b1c88615a 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -45,7 +45,7 @@ . = ..() /datum/antagonist/rev/greet() - to_chat(owner, "I are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!") + to_chat(owner, span_danger("I are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!")) owner.announce_objectives() /datum/antagonist/rev/create_team(datum/team/revolution/new_team) @@ -84,7 +84,7 @@ new_revhead.silent = TRUE old_owner.add_antag_datum(new_revhead,old_team) new_revhead.silent = FALSE - to_chat(old_owner, "I have proved your devotion to revolution! You are a head revolutionary now!") + to_chat(old_owner, span_danger("I have proved your devotion to revolution! You are a head revolutionary now!")) /datum/antagonist/rev/get_admin_commands() . = ..() @@ -103,7 +103,7 @@ new_owner.add_antag_datum(src) message_admins("[key_name_admin(admin)] has head-rev'ed [key_name_admin(new_owner)].") log_admin("[key_name(admin)] has head-rev'ed [key_name(new_owner)].") - to_chat(new_owner.current, "I are a member of the revolutionaries' leadership now!") + to_chat(new_owner.current, span_danger("I are a member of the revolutionaries' leadership now!")) /datum/antagonist/rev/head/get_admin_commands() . = ..() @@ -117,7 +117,7 @@ var/list/L = owner.current.get_contents() var/obj/item/assembly/flash/flash = locate() in L if (!flash) - to_chat(admin, "Deleting flash failed!") + to_chat(admin, span_danger("Deleting flash failed!")) return qdel(flash) @@ -138,7 +138,7 @@ var/list/L = owner.current.get_contents() var/obj/item/assembly/flash/flash = locate() in L if (!flash) - to_chat(admin, "Repairing flash failed!") + to_chat(admin, span_danger("Repairing flash failed!")) else flash.burnt_out = FALSE flash.update_icon() @@ -190,26 +190,26 @@ new_rev.silent = TRUE old_owner.add_antag_datum(new_rev,old_team) new_rev.silent = FALSE - to_chat(old_owner, "Revolution has been disappointed of your leader traits! You are a regular revolutionary now!") + to_chat(old_owner, span_danger("Revolution has been disappointed of your leader traits! You are a regular revolutionary now!")) /datum/antagonist/rev/farewell() if(ishuman(owner.current) || ismonkey(owner.current)) - owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!", null, null, null, owner.current) + owner.current.visible_message(span_deconversion_message("[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!"), null, null, null, owner.current) to_chat(owner, "I are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you....") else if(issilicon(owner.current)) - owner.current.visible_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.", null, null, null, owner.current) - to_chat(owner, "The frame's firmware detects and deletes your neural reprogramming! You remember nothing but the name of the one who flashed you.") + owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it."), null, null, null, owner.current) + to_chat(owner, span_danger("The frame's firmware detects and deletes your neural reprogramming! You remember nothing but the name of the one who flashed you.")) /datum/antagonist/rev/head/farewell() if((ishuman(owner.current) || ismonkey(owner.current))) if(owner.current.stat != DEAD) - owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!", null, null, null, owner.current) + owner.current.visible_message(span_deconversion_message("[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!"), null, null, null, owner.current) to_chat(owner, "I have given up your cause of overthrowing the command staff. You are no longer a Head Revolutionary.") else to_chat(owner, "The sweet release of death. You are no longer a Head Revolutionary.") else if(issilicon(owner.current)) - owner.current.visible_message("The frame beeps contentedly, suppressing the disloyal personality traits from the MMI before initalizing it.", null, null, null, owner.current) - to_chat(owner, "The frame's firmware detects and suppresses your unwanted personality traits! You feel more content with the leadership around these parts.") + owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, suppressing the disloyal personality traits from the MMI before initalizing it."), null, null, null, owner.current) + to_chat(owner, span_danger("The frame's firmware detects and suppresses your unwanted personality traits! You feel more content with the leadership around these parts.")) //blunt trauma deconversions call this through species.dm spec_attacked_by() /datum/antagonist/rev/proc/remove_revolutionary(borged, deconverter) @@ -342,25 +342,25 @@ if(headrevs.len) var/list/headrev_part = list() - headrev_part += "The head revolutionaries were:" + headrev_part += span_header("The head revolutionaries were:") headrev_part += printplayerlist(headrevs,TRUE) result += headrev_part.Join("
") if(revs.len) var/list/rev_part = list() - rev_part += "The revolutionaries were:" + rev_part += span_header("The revolutionaries were:") rev_part += printplayerlist(revs,TRUE) result += rev_part.Join("
") var/list/heads = SSjob.get_all_heads() if(heads.len) - var/head_text = "The heads of staff were:" + var/head_text = span_header("The heads of staff were:") head_text += "
    " for(var/datum/mind/head in heads) var/target = (head in targets) head_text += "
  • " if(target) - head_text += "Target" + head_text += span_redtext("Target") head_text += "[printplayer(head, 1)]
  • " head_text += "

" result += head_text diff --git a/code/modules/antagonists/roguetown/roleobjs/prisoner.dm b/code/modules/antagonists/roguetown/roleobjs/prisoner.dm index 4f03727d1..55fb8d75a 100644 --- a/code/modules/antagonists/roguetown/roleobjs/prisoner.dm +++ b/code/modules/antagonists/roguetown/roleobjs/prisoner.dm @@ -36,15 +36,15 @@ if(traitorwin) owner.adjust_triumphs(count) - to_chat(owner.current, "I've ESCAPED THAT AWFUL CELL! THE WORLD IS MINE!") + to_chat(owner.current, span_greentext("I've ESCAPED THAT AWFUL CELL! THE WORLD IS MINE!")) if(owner.current) owner.current.playsound_local(get_turf(owner.current), 'sound/misc/triumph.ogg', 100, FALSE, pressure_affected = FALSE) else if(considered_alive(owner)) owner.adjust_triumphs(-2) - to_chat(owner.current, "I'LL NEVER ESCAPE!!") + to_chat(owner.current, span_redtext("I'LL NEVER ESCAPE!!")) else - to_chat(owner.current, "I've escaped... in DEATH!") + to_chat(owner.current, span_redtext("I've escaped... in DEATH!")) if(owner.current) owner.current.playsound_local(get_turf(owner.current), 'sound/misc/fail.ogg', 100, FALSE, pressure_affected = FALSE) diff --git a/code/modules/antagonists/roguetown/roleobjs/purishep.dm b/code/modules/antagonists/roguetown/roleobjs/purishep.dm index 3415927c8..b84f5254d 100644 --- a/code/modules/antagonists/roguetown/roleobjs/purishep.dm +++ b/code/modules/antagonists/roguetown/roleobjs/purishep.dm @@ -31,6 +31,6 @@ traitorwin = FALSE if(considered_alive(owner)) if(traitorwin) - to_chat(owner.current, "5/5.") + to_chat(owner.current, span_greentext("5/5.")) else - to_chat(owner.current, "I've FAILED to meet my quota. Someone more capable will be along to replace me.") + to_chat(owner.current, span_redtext("I've FAILED to meet my quota. Someone more capable will be along to replace me.")) diff --git a/code/modules/antagonists/roguetown/roleobjs/skeleton.dm b/code/modules/antagonists/roguetown/roleobjs/skeleton.dm index 37ef8f781..6bae2ae06 100644 --- a/code/modules/antagonists/roguetown/roleobjs/skeleton.dm +++ b/code/modules/antagonists/roguetown/roleobjs/skeleton.dm @@ -7,11 +7,11 @@ if(istype(examined_datum, /datum/antagonist/vampirelord)) var/datum/antagonist/vampirelord/V = examined_datum if(!V.disguised) - return "Another deadite." + return span_boldnotice("Another deadite.") if(istype(examined_datum, /datum/antagonist/zombie)) - return "Another deadite." + return span_boldnotice("Another deadite.") if(istype(examined_datum, /datum/antagonist/skeleton)) - return "Another deadite. My ally." + return span_boldnotice("Another deadite. My ally.") /datum/antagonist/skeleton/on_gain() // if(!(locate(/datum/objective/escape) in objectives)) @@ -42,11 +42,11 @@ if(traitorwin) //arriving gives them a tri anyway, all good // owner.adjust_triumphs(1) - to_chat(owner.current, "I've TRIUMPHED! Arcadia belongs to death!") + to_chat(owner.current, span_greentext("I've TRIUMPHED! Arcadia belongs to death!")) if(owner.current) owner.current.playsound_local(get_turf(owner.current), 'sound/misc/triumph.ogg', 100, FALSE, pressure_affected = FALSE) else - to_chat(owner.current, "I've FAILED to invade Arcadia!") + to_chat(owner.current, span_redtext("I've FAILED to invade Arcadia!")) if(owner.current) owner.current.playsound_local(get_turf(owner.current), 'sound/misc/fail.ogg', 100, FALSE, pressure_affected = FALSE) diff --git a/code/modules/antagonists/roguetown/villain/aspirant.dm b/code/modules/antagonists/roguetown/villain/aspirant.dm index 616b933a4..8a3daa10f 100644 --- a/code/modules/antagonists/roguetown/villain/aspirant.dm +++ b/code/modules/antagonists/roguetown/villain/aspirant.dm @@ -23,14 +23,14 @@ owner.special_role = ROLE_ASPIRANT /datum/antagonist/aspirant/greet() - to_chat(owner, "I have grown weary of being near the throne, but never on it. I have decided that it is time I ruled Enigma.") + to_chat(owner, span_danger("I have grown weary of being near the throne, but never on it. I have decided that it is time I ruled Enigma.")) ..() /datum/antagonist/aspirant/loyalist/greet() - to_chat(owner, "Long live the King! I love my ruler. But I have heard that some seek to overthrow them. I cannot let that happen.") + to_chat(owner, span_danger("Long live the King! I love my ruler. But I have heard that some seek to overthrow them. I cannot let that happen.")) /datum/antagonist/aspirant/supporter/greet() - to_chat(owner, "Long live the King! But not this one. I have been approached by an Aspirant and swayed to their cause. I must ensure they take the throne.") + to_chat(owner, span_danger("Long live the King! But not this one. I have been approached by an Aspirant and swayed to their cause. I must ensure they take the throne.")) /datum/antagonist/aspirant/ruler/greet() // No alert for the ruler to always keep them guessing. @@ -136,7 +136,7 @@ else return FALSE /datum/antagonist/aspirant/roundend_report() - to_chat(world, " * [name] * ") + to_chat(world, span_header(" * [name] * ")) if(objectives.len) var/win = TRUE @@ -150,12 +150,12 @@ win = FALSE objective_count++ if(win) - to_chat(world, "The Aspirant has ascended! SUCCESS!") + to_chat(world, span_greentext("The Aspirant has ascended! SUCCESS!")) else - to_chat(world, "The Aspirant was thwarted! FAIL!") + to_chat(world, span_redtext("The Aspirant was thwarted! FAIL!")) /datum/antagonist/aspirant/ruler/roundend_report() - to_chat(owner, " * [name] * ") + to_chat(owner, span_header(" * [name] * ")) if(objectives.len) var/win = TRUE @@ -169,12 +169,12 @@ win = FALSE objective_count++ if(win) - to_chat(owner, "You defended your throne! SUCCESS!") + to_chat(owner, span_greentext("You defended your throne! SUCCESS!")) else - to_chat(owner, "You were deposed! FAIL!") + to_chat(owner, span_redtext("You were deposed! FAIL!")) /datum/antagonist/aspirant/supporter/roundend_report() - to_chat(owner, " * [name] * ") + to_chat(owner, span_header(" * [name] * ")) if(objectives.len) var/win = TRUE @@ -188,12 +188,12 @@ win = FALSE objective_count++ if(win) - to_chat(owner, "Your claimant took the throne! SUCCESS!") + to_chat(owner, span_greentext("Your claimant took the throne! SUCCESS!")) else - to_chat(owner, "Your claimant failed! FAIL!") + to_chat(owner, span_redtext("Your claimant failed! FAIL!")) /datum/antagonist/aspirant/loyalist/roundend_report() - to_chat(owner, " * [name] * ") + to_chat(owner, span_header(" * [name] * ")) if(objectives.len) var/win = TRUE @@ -207,6 +207,6 @@ win = FALSE objective_count++ if(win) - to_chat(owner, "Your ruler retained the throne! SUCCESS!") + to_chat(owner, span_greentext("Your ruler retained the throne! SUCCESS!")) else - to_chat(owner, "Your ruler was deposed! FAIL!") + to_chat(owner, span_redtext("Your ruler was deposed! FAIL!")) diff --git a/code/modules/antagonists/roguetown/villain/bandit.dm b/code/modules/antagonists/roguetown/villain/bandit.dm index 54e2cec1d..bb24d2436 100644 --- a/code/modules/antagonists/roguetown/villain/bandit.dm +++ b/code/modules/antagonists/roguetown/villain/bandit.dm @@ -16,7 +16,7 @@ /datum/antagonist/bandit/examine_friendorfoe(datum/antagonist/examined_datum,mob/examiner,mob/examined) if(istype(examined_datum, /datum/antagonist/bandit)) - return "Another free man. My ally." + return span_boldnotice("Another free man. My ally.") /datum/antagonist/bandit/on_gain() owner.special_role = "Bandit" @@ -37,12 +37,12 @@ ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) ADD_TRAIT(H, TRAIT_COMMIE, TRAIT_GENERIC) H.set_patron(/datum/patron/inhumen/matthios) - to_chat(H, "I am a BANDIT!") - to_chat(H, "Long ago I did a crime worthy of my bounty being hung on the wall outside of the local inn. I must feed the idol money and valuable metals to satisfy my greed!") + to_chat(H, span_alertsyndie("I am a BANDIT!")) + to_chat(H, span_warning("Long ago I did a crime worthy of my bounty being hung on the wall outside of the local inn. I must feed the idol money and valuable metals to satisfy my greed!")) /* /datum/antagonist/bandit/greet() - to_chat(owner.current, "I am a BANDIT!") - to_chat(owner.current, "Long ago I did a crime worthy of my bounty being hung on the wall outside of the local inn. I must feed the idol money and valuable metals to satisfy my greed!") + to_chat(owner.current, span_alertsyndie("I am a BANDIT!")) + to_chat(owner.current, span_info("Long ago I did a crime worthy of my bounty being hung on the wall outside of the local inn. I must feed the idol money and valuable metals to satisfy my greed!")) owner.announce_objectives() ..() */ //commenting out until they get a proper objective implementation or whatever. @@ -203,11 +203,11 @@ if(traitorwin) owner.adjust_triumphs(count) - to_chat(owner.current, "I've TRIUMPHED!") + to_chat(owner.current, span_greentext("I've TRIUMPHED!")) if(owner.current) owner.current.playsound_local(get_turf(owner.current), 'sound/misc/triumph.ogg', 100, FALSE, pressure_affected = FALSE) else - to_chat(owner.current, "I've failed to satisfy my greed.") + to_chat(owner.current, span_redtext("I've failed to satisfy my greed.")) if(owner.current) owner.current.playsound_local(get_turf(owner.current), 'sound/misc/fail.ogg', 100, FALSE, pressure_affected = FALSE) diff --git a/code/modules/antagonists/roguetown/villain/maniac/maniac.dm b/code/modules/antagonists/roguetown/villain/maniac/maniac.dm index 4bcb44f15..dfd1c1ba7 100644 --- a/code/modules/antagonists/roguetown/villain/maniac/maniac.dm +++ b/code/modules/antagonists/roguetown/villain/maniac/maniac.dm @@ -109,7 +109,7 @@ forge_villain_objectives() if(length(objectives)) SEND_SOUND(owner.current, 'sound/villain/dreamer_warning.ogg') - to_chat(owner.current, "[antag_memory]") + to_chat(owner.current, span_danger("[antag_memory]")) owner.announce_objectives() START_PROCESSING(SSobj, src) @@ -117,7 +117,7 @@ STOP_PROCESSING(SSobj, src) if(owner.current) if(!silent) - to_chat(owner.current,"I am no longer a MANIAC!") + to_chat(owner.current,span_danger("I am no longer a MANIAC!")) if(ishuman(owner.current)) var/mob/living/carbon/human/dreamer = owner.current dreamer.STASTR = STASTR @@ -226,16 +226,16 @@ trey_liam.SetSleeping(25 SECONDS) trey_liam.add_stress(/datum/stressevent/maniac_woke_up) sleep(1.5 SECONDS) - to_chat(trey_liam, "... WHERE AM I? ...") + to_chat(trey_liam, span_deadsay("... WHERE AM I? ...")) sleep(1.5 SECONDS) var/static/list/slop_lore = list( - "... Rockhill? No ... It doesn't exist ...", - "... My name is Trey. Trey Liam, Scientific Overseer ...", - "... I'm on NT Aeon, a self sustaining ship, used to preserve what remains of humanity ...", - "... Launched into the stars, INRL preserves their memories ... Their personalities ...", - "... Keeps them alive in cyberspace, oblivious to the catastrophe ...", - "... There is no hope left. Only the cyberspace deck lets me live in the forgery ...", - "... What have I done!? ...", + span_deadsay("... Rockhill? No ... It doesn't exist ..."), + span_deadsay("... My name is Trey. Trey Liam, Scientific Overseer ..."), + span_deadsay("... I'm on NT Aeon, a self sustaining ship, used to preserve what remains of humanity ..."), + span_deadsay("... Launched into the stars, INRL preserves their memories ... Their personalities ..."), + span_deadsay("... Keeps them alive in cyberspace, oblivious to the catastrophe ..."), + span_deadsay("... There is no hope left. Only the cyberspace deck lets me live in the forgery ..."), + span_deadsay("... What have I done!? ..."), ) for(var/slop in slop_lore) to_chat(trey_liam, slop) @@ -243,16 +243,16 @@ else INVOKE_ASYNC(src, PROC_REF(cant_wake_up), dreamer) sleep(15 SECONDS) - to_chat(world, "The Maniac has TRIUMPHED!") + to_chat(world, span_deadsay("The Maniac has TRIUMPHED!")) SSticker.declare_completion() /datum/antagonist/maniac/proc/cant_wake_up(mob/living/dreamer) if(!iscarbon(dreamer)) return - to_chat(dreamer, "I CAN'T WAKE UP.") + to_chat(dreamer, span_deadsay("I CAN'T WAKE UP.")) sleep(2 SECONDS) for(var/i in 1 to 10) - to_chat(dreamer, "ICANTWAKEUP") + to_chat(dreamer, span_deadsay("ICANTWAKEUP")) sleep(0.5 SECONDS) var/obj/item/organ/brain/brain = dreamer.getorganslot(ORGAN_SLOT_BRAIN) var/obj/item/bodypart/head/head = dreamer.get_bodypart(BODY_ZONE_HEAD) @@ -288,10 +288,10 @@ if(count) if(owner) owner.adjust_triumphs(count) - to_chat(world, "The [special_role_text] has TRIUMPHED!") + to_chat(world, span_greentext("The [special_role_text] has TRIUMPHED!")) if(owner?.current) owner.current.playsound_local(get_turf(owner.current), 'sound/misc/triumph.ogg', 100, FALSE, pressure_affected = FALSE) else - to_chat(world, "The [special_role_text] has FAILED!") + to_chat(world, span_redtext("The [special_role_text] has FAILED!")) if(owner?.current) owner.current.playsound_local(get_turf(owner.current), 'sound/misc/fail.ogg', 100, FALSE, pressure_affected = FALSE) diff --git a/code/modules/antagonists/roguetown/villain/maniac/maniac_life.dm b/code/modules/antagonists/roguetown/villain/maniac/maniac_life.dm index 16ab7cf16..9416af6ad 100644 --- a/code/modules/antagonists/roguetown/villain/maniac/maniac_life.dm +++ b/code/modules/antagonists/roguetown/villain/maniac/maniac_life.dm @@ -96,7 +96,7 @@ var/image/mob_image = image('icons/roguetown/maniac/dreamer_mobs.dmi', spawning_turf, mob_state, FLOAT_LAYER, get_dir(spawning_turf, dreamer)) mob_image.plane = GAME_PLANE_UPPER dreamer.client.images += mob_image - to_chat(dreamer, "[mob_message]") + to_chat(dreamer, span_userdanger("[mob_message]")) sleep(5) if(!dreamer?.client) return @@ -130,7 +130,7 @@ if(caught_dreamer) dreamer.Stun(rand(2, 4) SECONDS) var/pain_message = pick("NO!", "THEY GOT ME!", "AGH!") - to_chat(dreamer, "[pain_message]") + to_chat(dreamer, span_userdanger("[pain_message]")) sleep(chase_wait) if(!dreamer?.client) return diff --git a/code/modules/antagonists/roguetown/villain/maniac/maniac_wonders.dm b/code/modules/antagonists/roguetown/villain/maniac/maniac_wonders.dm index 5cff5711c..2fa5f4dd1 100644 --- a/code/modules/antagonists/roguetown/villain/maniac/maniac_wonders.dm +++ b/code/modules/antagonists/roguetown/villain/maniac/maniac_wonders.dm @@ -81,7 +81,7 @@ user.mind.forget_crafting_recipe(dream_master.recipe_progression[dream_master.current_wonder]) wonder_id = dream_master.current_wonder if(wonder_id >= 4) - to_chat(user, "I must SUM the keys. I am WAKING up!") + to_chat(user, span_userdanger("I must SUM the keys. I am WAKING up!")) dream_master.agony(user) key_num = LAZYACCESS(dream_master.num_keys, wonder_id) key_text = LAZYACCESS(dream_master.key_nums, wonder_id) @@ -96,7 +96,7 @@ /obj/structure/wonder/examine(mob/user) . = ..() if(gazed_at && (user.mind?.has_antag_datum(/datum/antagonist/maniac) == dream_master)) - . += "They have GAZED at my wonder!" + . += span_danger("They have GAZED at my wonder!") if(isobserver(user)) return if(dream_master) @@ -112,7 +112,7 @@ for(var/mob/living/carbon/human/other_victim in viewers - victim) other_victim.blur_eyes(2) if(prob(10)) - to_chat(other_victim, "It is WONDERFUL!") + to_chat(other_victim, span_userdanger("It is WONDERFUL!")) else if(!victim.mind || (victim.stat == DEAD)) continue diff --git a/code/modules/antagonists/roguetown/villain/peasantrebel.dm b/code/modules/antagonists/roguetown/villain/peasantrebel.dm index afb75c950..c6d1962bc 100644 --- a/code/modules/antagonists/roguetown/villain/peasantrebel.dm +++ b/code/modules/antagonists/roguetown/villain/peasantrebel.dm @@ -20,9 +20,9 @@ /datum/antagonist/prebel/examine_friendorfoe(datum/antagonist/examined_datum,mob/examiner,mob/examined) if(istype(examined_datum, /datum/antagonist/prebel/head)) - return "A revolution leader." + return span_boldnotice("A revolution leader.") if(istype(examined_datum, /datum/antagonist/prebel)) - return "My ally in revolt against the pigs." + return span_boldnotice("My ally in revolt against the pigs.") /datum/antagonist/prebel/on_gain() @@ -33,7 +33,7 @@ H.add_stress(/datum/stressevent/prebel) /datum/antagonist/prebel/greet() - to_chat(owner, "I am a peasant rebel! It's time for a change in leadership for this town.") + to_chat(owner, span_danger("I am a peasant rebel! It's time for a change in leadership for this town.")) if(rev_team) rev_team.update_objectives() owner.announce_objectives() @@ -143,17 +143,17 @@ playsound_local(src, 'sound/misc/rebel.ogg', 100, FALSE) var/garbaggio = alert(src, "[offer]","Rebellion", "Yes", "No") if(world.time > shittime + 35 SECONDS) - to_chat(src,"Too late.") + to_chat(src,span_danger("Too late.")) return mob_timers["rebeloffer"] = world.time if(garbaggio == "Yes") if(mind_datum.add_revolutionary(mind)) - RT.offers2join += "[real_name] ACCEPTED [guy.real_name]: \"[offer]\"" - to_chat(guy,"[src] joins the revolution.") + RT.offers2join += span_info("[real_name] ACCEPTED [guy.real_name]: \"[offer]\"") + to_chat(guy,span_blue("[src] joins the revolution.")) else - to_chat(src,"I reject the offer.") - to_chat(guy,"[src] rejects the offer.") - RT.offers2join += "[real_name] REJECTED [guy.real_name]: \"[offer]\"" + to_chat(src,span_danger("I reject the offer.")) + to_chat(guy,span_danger("[src] rejects the offer.")) + RT.offers2join += span_info("[real_name] REJECTED [guy.real_name]: \"[offer]\"") /datum/antagonist/prebel/proc/add_revolutionary(datum/mind/rev_mind) if(!can_be_converted(rev_mind.current)) @@ -185,7 +185,7 @@ /datum/team/prebels/roundend_report() - to_chat(world, " * [name] * ") + to_chat(world, span_header(" * [name] * ")) to_chat(world, "[printplayerlist(members)]") if(objectives.len) @@ -202,8 +202,8 @@ for(var/datum/mind/M in members) if(considered_alive(M)) M.adjust_triumphs(5) - to_chat(world, "The Peasant Rebellion has triumphed!") + to_chat(world, span_greentext("The Peasant Rebellion has triumphed!")) else - to_chat(world, "The Peasant Rebellion has FAILED!") + to_chat(world, span_redtext("The Peasant Rebellion has FAILED!")) for(var/X in offers2join) to_chat(world,"[X]") diff --git a/code/modules/antagonists/roguetown/villain/vampire.dm b/code/modules/antagonists/roguetown/villain/vampire.dm index 0dcd2f7d5..764ecf394 100644 --- a/code/modules/antagonists/roguetown/villain/vampire.dm +++ b/code/modules/antagonists/roguetown/villain/vampire.dm @@ -30,20 +30,20 @@ /datum/antagonist/vampire/examine_friendorfoe(datum/antagonist/examined_datum,mob/examiner,mob/examined) if(istype(examined_datum, /datum/antagonist/vampire/lesser)) - return "A child of Kain." + return span_boldnotice("A child of Kain.") if(istype(examined_datum, /datum/antagonist/vampire)) - return "An elder Kin." + return span_boldnotice("An elder Kin.") if(examiner.Adjacent(examined)) if(istype(examined_datum, /datum/antagonist/werewolf/lesser)) if(!disguised) - return "I sense a lesser Werewolf." + return span_boldwarning("I sense a lesser Werewolf.") if(istype(examined_datum, /datum/antagonist/werewolf)) if(!disguised) - return "THIS IS AN ELDER WEREWOLF! MY ENEMY!" + return span_boldwarning("THIS IS AN ELDER WEREWOLF! MY ENEMY!") if(istype(examined_datum, /datum/antagonist/zombie)) - return "Another deadite." + return span_boldnotice("Another deadite.") if(istype(examined_datum, /datum/antagonist/skeleton)) - return "Another deadite." + return span_boldnotice("Another deadite.") /datum/antagonist/vampire/lesser //le shitcode faec name = "Lesser Vampire" @@ -92,7 +92,7 @@ /datum/antagonist/vampire/on_removal() if(!silent && owner.current) - to_chat(owner.current,"I am no longer a [job_rank]!") + to_chat(owner.current,span_danger("I am no longer a [job_rank]!")) owner.special_role = null if(!isnull(batform)) owner.current.RemoveSpell(batform) @@ -113,7 +113,7 @@ return /datum/antagonist/vampire/greet() - to_chat(owner.current, "Ever since that bite, I have been a VAMPIRE.") + to_chat(owner.current, span_userdanger("Ever since that bite, I have been a VAMPIRE.")) owner.announce_objectives() ..() @@ -139,7 +139,7 @@ if(T.get_lumcount() > 0.15) if(disguised) vitae -= 8 - to_chat(H, "My vitae dwindles!") + to_chat(H, span_warning("My vitae dwindles!")) else H.fire_act(1,5) @@ -159,11 +159,11 @@ H.blood_volume = BLOOD_VOLUME_NORMAL if(vitae < 200) if(disguised) - to_chat(H, "My disguise fails!") + to_chat(H, span_warning("My disguise fails!")) H.vampire_undisguise(src) vitae -= 1 else - to_chat(H, "I RAN OUT OF VITAE!") + to_chat(H, span_userdanger("I RAN OUT OF VITAE!")) var/obj/shapeshift_holder/SS = locate() in H if(SS) SS.shape.dust() @@ -180,14 +180,14 @@ return if(world.time < VD.last_transform + 30 SECONDS) var/timet2 = (VD.last_transform + 30 SECONDS) - world.time - to_chat(src, "No.. not yet. [round(timet2/10)]s") + to_chat(src, span_warning("No.. not yet. [round(timet2/10)]s")) return if(VD.disguised) VD.last_transform = world.time vampire_undisguise(VD) else if(VD.vitae < 100) - to_chat(src, "I don't have enough Vitae!") + to_chat(src, span_warning("I don't have enough Vitae!")) return VD.last_transform = world.time vampire_disguise(VD) @@ -228,17 +228,17 @@ if(!VD) return if(VD.disguised) - to_chat(src, "My curse is hidden.") + to_chat(src, span_warning("My curse is hidden.")) return if(VD.vitae < 500) - to_chat(src, "Not enough vitae.") + to_chat(src, span_warning("Not enough vitae.")) return if(has_status_effect(/datum/status_effect/buff/bloodstrength)) - to_chat(src, "Already active.") + to_chat(src, span_warning("Already active.")) return VD.handle_vitae(-500) apply_status_effect(/datum/status_effect/buff/bloodstrength) - to_chat(src, "! NIGHT MUSCLES !") + to_chat(src, span_greentext("! NIGHT MUSCLES !")) src.playsound_local(get_turf(src), 'sound/misc/vampirespell.ogg', 100, FALSE, pressure_affected = FALSE) /datum/status_effect/buff/bloodstrength @@ -260,17 +260,17 @@ if(!VD) return if(VD.disguised) - to_chat(src, "My curse is hidden.") + to_chat(src, span_warning("My curse is hidden.")) return if(VD.vitae < 500) - to_chat(src, "Not enough vitae.") + to_chat(src, span_warning("Not enough vitae.")) return if(has_status_effect(/datum/status_effect/buff/celerity)) - to_chat(src, "Already active.") + to_chat(src, span_warning("Already active.")) return VD.handle_vitae(-500) apply_status_effect(/datum/status_effect/buff/celerity) - to_chat(src, "! QUICKENING !") + to_chat(src, span_greentext("! QUICKENING !")) src.playsound_local(get_turf(src), 'sound/misc/vampirespell.ogg', 100, FALSE, pressure_affected = FALSE) /datum/status_effect/buff/celerity @@ -295,17 +295,17 @@ if(!VD) return if(VD.disguised) - to_chat(src, "My curse is hidden.") + to_chat(src, span_warning("My curse is hidden.")) return if(VD.vitae < 200) - to_chat(src, "Not enough vitae blood.") + to_chat(src, span_warning("Not enough vitae blood.")) return if(has_status_effect(/datum/status_effect/buff/fortitude)) - to_chat(src, "Already active.") + to_chat(src, span_warning("Already active.")) return VD.vitae -= 200 apply_status_effect(/datum/status_effect/buff/fortitude) - to_chat(src, "! ARMOR OF DARKNESS !") + to_chat(src, span_greentext("! ARMOR OF DARKNESS !")) src.playsound_local(get_turf(src), 'sound/misc/vampirespell.ogg', 100, FALSE, pressure_affected = FALSE) /datum/status_effect/buff/fortitude @@ -358,15 +358,15 @@ if(!VD) return if(VD.disguised) - to_chat(src, "My curse is hidden.") + to_chat(src, span_warning("My curse is hidden.")) return if(silver_curse_status) - to_chat(src, "My BANE is not letting me REGEN!.") + to_chat(src, span_warning("My BANE is not letting me REGEN!.")) return if(VD.vitae < 500) - to_chat(src, "Not enough vitae.") + to_chat(src, span_warning("Not enough vitae.")) return - to_chat(src, "! REGENERATE !") + to_chat(src, span_greentext("! REGENERATE !")) src.playsound_local(get_turf(src), 'sound/misc/vampirespell.ogg', 100, FALSE, pressure_affected = FALSE) VD.handle_vitae(-500) fully_heal() @@ -384,7 +384,7 @@ return mob_timers["becoming_vampire"] = world.time addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/carbon/human, vampire_finalize)), 2 MINUTES) - to_chat(src, "I feel sick...") + to_chat(src, span_danger("I feel sick...")) src.playsound_local(get_turf(src), 'sound/music/horror.ogg', 80, FALSE, pressure_affected = FALSE) flash_fullscreen("redflash3") diff --git a/code/modules/antagonists/roguetown/villain/vampirelord.dm b/code/modules/antagonists/roguetown/villain/vampirelord.dm index 0a62f4939..17133b89a 100644 --- a/code/modules/antagonists/roguetown/villain/vampirelord.dm +++ b/code/modules/antagonists/roguetown/villain/vampirelord.dm @@ -36,13 +36,13 @@ GLOBAL_LIST_EMPTY(vampire_objects) /datum/antagonist/vampirelord/examine_friendorfoe(datum/antagonist/examined_datum,mob/examiner,mob/examined) if(istype(examined_datum, /datum/antagonist/vampirelord/lesser)) - return "A vampire spawn." + return span_boldnotice("A vampire spawn.") if(istype(examined_datum, /datum/antagonist/vampirelord)) - return "A Vampire Lord!." + return span_boldnotice("A Vampire Lord!.") if(istype(examined_datum, /datum/antagonist/zombie)) - return "Another deadite." + return span_boldnotice("Another deadite.") if(istype(examined_datum, /datum/antagonist/skeleton)) - return "Another deadite." + return span_boldnotice("Another deadite.") /datum/antagonist/vampirelord/apply_innate_effects(mob/living/mob_override) var/mob/living/M = mob_override || owner.current @@ -277,7 +277,7 @@ GLOBAL_LIST_EMPTY(vampire_objects) /datum/antagonist/vampirelord/on_removal() if(!silent && owner.current) - to_chat(owner.current,"I am no longer a [job_rank]!") + to_chat(owner.current,span_danger("I am no longer a [job_rank]!")) owner.special_role = null if(!isnull(batform)) owner.current.RemoveSpell(batform) @@ -314,12 +314,12 @@ GLOBAL_LIST_EMPTY(vampire_objects) objectives += survive /datum/antagonist/vampirelord/greet() - to_chat(owner.current, "I am ancient. I am the Land. And I am now awoken to these trespassers upon my domain.") + to_chat(owner.current, span_userdanger("I am ancient. I am the Land. And I am now awoken to these trespassers upon my domain.")) owner.announce_objectives() ..() /datum/antagonist/vampirelord/lesser/greet() - to_chat(owner.current, "We are awakened from our slumber, Spawn of the feared Vampire Lord.") + to_chat(owner.current, span_userdanger("We are awakened from our slumber, Spawn of the feared Vampire Lord.")) owner.announce_objectives() /datum/antagonist/vampirelord/proc/finalize_vampire() @@ -368,13 +368,13 @@ GLOBAL_LIST_EMPTY(vampire_objects) if(T.can_see_sky()) if(T.get_lumcount() > 0.15) if(!isspawn) - to_chat(H, "Astrata spurns me! I must get out of her rays!") // VLord is more punished for daylight excursions. + to_chat(H, span_warning("Astrata spurns me! I must get out of her rays!")) // VLord is more punished for daylight excursions. var/turf/N = H.loc if(N.can_see_sky()) if(N.get_lumcount() > 0.15) H.fire_act(3) handle_vitae(-500) - to_chat(H, "That was too close. I must avoid the sun.") + to_chat(H, span_warning("That was too close. I must avoid the sun.")) else if (isspawn && !disguised) H.fire_act(1,5) handle_vitae(-10) @@ -393,7 +393,7 @@ GLOBAL_LIST_EMPTY(vampire_objects) H.blood_volume = BLOOD_VOLUME_NORMAL if(vitae < 200) if(disguised) - to_chat(H, "My disguise fails!") + to_chat(H, span_warning("My disguise fails!")) H.vampire_undisguise(src) handle_vitae(-1) @@ -415,7 +415,7 @@ GLOBAL_LIST_EMPTY(vampire_objects) mypool.update_pool(tribute) if(vitae <= 20) if(!starved) - to_chat(owner, "I starve, my power dwindles! I am so weak!") + to_chat(owner, span_userdanger("I starve, my power dwindles! I am so weak!")) starved = TRUE for(var/S in MOBSTATS) owner.current.change_stat(S, -5) @@ -519,8 +519,8 @@ GLOBAL_LIST_EMPTY(vampire_objects) if(!C.kingsubmit) C.kingsubmit = TRUE if("No") - lord << "They refuse!" - src << "I refuse!" + lord << span_boldnotice("They refuse!") + src << span_boldnotice("I refuse!") /mob/living/carbon/human/proc/vampire_telepathy() set name = "Telepathy" @@ -531,11 +531,11 @@ GLOBAL_LIST_EMPTY(vampire_objects) if(!msg) return for(var/datum/mind/V in C.vampires) - to_chat(V, "A message from [src.real_name]:[msg]") + to_chat(V, span_boldnotice("A message from [src.real_name]:[msg]")) for(var/datum/mind/D in C.deathknights) - to_chat(D, "A message from [src.real_name]:[msg]") + to_chat(D, span_boldnotice("A message from [src.real_name]:[msg]")) for(var/mob/dead/observer/rogue/arcaneeye/A in GLOB.mob_list) - to_chat(A, "A message from [src.real_name]:[msg]") + to_chat(A, span_boldnotice("A message from [src.real_name]:[msg]")) /mob/living/carbon/human/proc/punish_spawn() set name = "Punish Minion" @@ -553,21 +553,21 @@ GLOBAL_LIST_EMPTY(vampire_objects) var/punishmentlevels = list("Pause", "Pain", "Release") switch(input(src, "Severity?", "PUNISHMENT") as anything in punishmentlevels|null) if("Pain") - to_chat(choice, "You are wracked with pain as your master punishes you!") + to_chat(choice, span_boldnotice("You are wracked with pain as your master punishes you!")) choice.apply_damage(30, BRUTE) choice.emote_scream() playsound(choice, 'sound/misc/obey.ogg', 100, FALSE, pressure_affected = FALSE) if("Pause") - to_chat(choice, "Your body is frozen in place as your master punishes you!") + to_chat(choice, span_boldnotice("Your body is frozen in place as your master punishes you!")) choice.Paralyze(300) choice.emote_scream() playsound(choice, 'sound/misc/obey.ogg', 100, FALSE, pressure_affected = FALSE) if("Release") - to_chat(choice, "You feel only darkness. Your master no longer has use of you.") + to_chat(choice, span_boldnotice("You feel only darkness. Your master no longer has use of you.")) spawn(10 SECONDS) choice.emote_scream() choice.dust() - visible_message("[src] reaches out, gripping [choice]'s soul, inflicting punishment!") + visible_message(span_danger("[src] reaches out, gripping [choice]'s soul, inflicting punishment!")) /obj/structure/vampire/portal/Crossed(atom/movable/AM) . = ..() @@ -595,21 +595,21 @@ GLOBAL_LIST_EMPTY(vampire_objects) var/obj/structure/vampire/portal/P = new(Vamp.loc) P.duration = duration P.spawntime = world.time - P.visible_message("A sickening tear is heard as a sinister portal emerges.") + P.visible_message(span_boldnotice("A sickening tear is heard as a sinister portal emerges.")) qdel(Vamp) /obj/structure/vampire/portalmaker/proc/create_portal(choice,duration) sending = TRUE for(var/obj/effect/landmark/vteleportsending/S in GLOB.landmarks_list) var/obj/structure/vampire/portal/sending/P = new(S.loc) - P.visible_message("A sickening tear is heard as a sinister portal emerges.") + P.visible_message(span_boldnotice("A sickening tear is heard as a sinister portal emerges.")) /obj/structure/vampire/portal/Initialize() . = ..() set_light(3, 20, LIGHT_COLOR_BLOOD_MAGIC) playsound(loc, 'sound/misc/portalopen.ogg', 100, FALSE, pressure_affected = FALSE) sleep(600) - visible_message("[src] shudders before rapidly closing.") + visible_message(span_boldnotice("[src] shudders before rapidly closing.")) qdel(src) /obj/structure/vampire/portal/sending/Destroy() @@ -623,7 +623,7 @@ GLOBAL_LIST_EMPTY(vampire_objects) /obj/structure/vampire/bloodpool/examine(mob/user) . = ..() - to_chat(user, "Blood level: [current]") + to_chat(user, span_boldnotice("Blood level: [current]")) /obj/structure/vampire/bloodpool/attack_hand(mob/living/user) var/datum/antagonist/vampirelord/lord = user.mind.has_antag_datum(/datum/antagonist/vampirelord) @@ -821,7 +821,7 @@ GLOBAL_LIST_EMPTY(vampire_objects) for(var/mob/living/carbon/human/astrater in GLOB.human_list) if(!istype(astrater.patron, /datum/patron/divine/astrata) || !length(astrater.mind?.antag_datums)) continue - to_chat(astrater, "You feel the pain of [astrater.patron.name]!") + to_chat(astrater, span_userdanger("You feel the pain of [astrater.patron.name]!")) astrater.emote_scream() if(user.mind.special_role == "Vampire Spawn") @@ -832,7 +832,7 @@ GLOBAL_LIST_EMPTY(vampire_objects) SEND_SOUND(src, sound('sound/misc/notice (2).ogg')) if(alert(src, "A Vampire Lord is summoning you from the Underworld.", "Be Risen?", "Yes", "No") == "Yes") if(!C.deathknightspawn) - to_chat(src, "Another soul was chosen.") + to_chat(src, span_warning("Another soul was chosen.")) returntolobby() // DEATH KNIGHT ANTAG @@ -855,7 +855,7 @@ GLOBAL_LIST_EMPTY(vampire_objects) add_objective(/datum/objective/vlordserve) greet() /datum/antagonist/skeleton/knight/greet() - to_chat(owner.current, "I am returned to serve. I will obey, so that I may return to rest.") + to_chat(owner.current, span_userdanger("I am returned to serve. I will obey, so that I may return to rest.")) owner.announce_objectives() ..() @@ -886,11 +886,11 @@ GLOBAL_LIST_EMPTY(vampire_objects) if(count) if(owner) owner.adjust_triumphs(count) - to_chat(world, "The [special_role_text] has TRIUMPHED!") + to_chat(world, span_greentext("The [special_role_text] has TRIUMPHED!")) if(owner?.current) owner.current.playsound_local(get_turf(owner.current), 'sound/misc/triumph.ogg', 100, FALSE, pressure_affected = FALSE) else - to_chat(world, "The [special_role_text] has FAILED!") + to_chat(world, span_redtext("The [special_role_text] has FAILED!")) if(owner?.current) owner.current.playsound_local(get_turf(owner.current), 'sound/misc/fail.ogg', 100, FALSE, pressure_affected = FALSE) // OBJECTIVES STORED HERE TEMPORARILY FOR EASE OF REFERENCE @@ -1009,11 +1009,11 @@ GLOBAL_LIST_EMPTY(vampire_objects) if(count) if(owner) owner.adjust_triumphs(count) - to_chat(world, "The [special_role_text] has TRIUMPHED!") + to_chat(world, span_greentext("The [special_role_text] has TRIUMPHED!")) if(owner?.current) owner.current.playsound_local(get_turf(owner.current), 'sound/misc/triumph.ogg', 100, FALSE, pressure_affected = FALSE) else - to_chat(world, "The [special_role_text] has FAILED!") + to_chat(world, span_redtext("The [special_role_text] has FAILED!")) if(owner?.current) owner.current.playsound_local(get_turf(owner.current), 'sound/misc/fail.ogg', 100, FALSE, pressure_affected = FALSE) @@ -1156,7 +1156,7 @@ GLOBAL_LIST_EMPTY(vampire_objects) set hidden = 0 if(!isobserver(usr)) - to_chat(usr, "You're not an Eye!") + to_chat(usr, span_warning("You're not an Eye!")) return var/list/filtered = list() for(var/V in GLOB.sortedAreas) @@ -1173,7 +1173,7 @@ GLOBAL_LIST_EMPTY(vampire_objects) L+=T if(!L || !L.len) - to_chat(usr, "No area available.") + to_chat(usr, span_warning("No area available.")) return usr.forceMove(pick(L)) @@ -1227,25 +1227,25 @@ GLOBAL_LIST_EMPTY(vampire_objects) if(!msg) return for(var/datum/mind/V in C.vampires) - to_chat(V, "A message from [src.real_name]:[msg]") + to_chat(V, span_boldnotice("A message from [src.real_name]:[msg]")) for(var/datum/mind/D in C.deathknights) - to_chat(D, "A message from [src.real_name]:[msg]") + to_chat(D, span_boldnotice("A message from [src.real_name]:[msg]")) for(var/mob/dead/observer/rogue/arcaneeye/A in GLOB.mob_list) - to_chat(A, "A message from [src.real_name]:[msg]") + to_chat(A, span_boldnotice("A message from [src.real_name]:[msg]")) /mob/dead/observer/rogue/arcaneeye/proc/eye_up() set category = "Arcane Eye" set name = "Move Up" if(zMove(UP, TRUE)) - to_chat(src, "I move upwards.") + to_chat(src, span_notice("I move upwards.")) /mob/dead/observer/rogue/arcaneeye/proc/eye_down() set category = "Arcane Eye" set name = "Move Down" if(zMove(DOWN, TRUE)) - to_chat(src, "I move down.") + to_chat(src, span_notice("I move down.")) /mob/dead/observer/rogue/arcaneeye/Move(NewLoc, direct) if(world.time < next_gmove) @@ -1312,7 +1312,7 @@ GLOBAL_LIST_EMPTY(vampire_objects) if(bloodroll >= willroll) if(found_psycross == TRUE) to_chat(L, "The silver psycross shines and protect me from the unholy magic.") - to_chat(user, "[L] has my BANE!It causes me to fail to ensnare their mind!") + to_chat(user, span_userdanger("[L] has my BANE!It causes me to fail to ensnare their mind!")) else to_chat(L, "You feel like a curtain is coming over your mind.") to_chat(user, "Their mind gives way, they will soon be asleep.") @@ -1322,7 +1322,7 @@ GLOBAL_LIST_EMPTY(vampire_objects) if(willroll >= bloodroll) if(found_psycross == TRUE) to_chat(L, "The silver psycross shines and protect me from the unholy magic.") - to_chat(user, "[L] has my BANE!It causes me to fail to ensnare their mind!") + to_chat(user, span_userdanger("[L] has my BANE!It causes me to fail to ensnare their mind!")) else to_chat(user, "I fail to ensnare their mind.") if(willroll - bloodroll >= 3) diff --git a/code/modules/antagonists/roguetown/villain/werewolf/werewolf.dm b/code/modules/antagonists/roguetown/villain/werewolf/werewolf.dm index 6ebec26da..b50383b4b 100644 --- a/code/modules/antagonists/roguetown/villain/werewolf/werewolf.dm +++ b/code/modules/antagonists/roguetown/villain/werewolf/werewolf.dm @@ -33,16 +33,16 @@ /datum/antagonist/werewolf/examine_friendorfoe(datum/antagonist/examined_datum,mob/examiner,mob/examined) if(istype(examined_datum, /datum/antagonist/werewolf/lesser)) - return "A young lupine kin." + return span_boldnotice("A young lupine kin.") if(istype(examined_datum, /datum/antagonist/werewolf)) - return "An elder lupine kin." + return span_boldnotice("An elder lupine kin.") if(examiner.Adjacent(examined)) if(istype(examined_datum, /datum/antagonist/vampirelord/lesser)) if(transformed) - return "A lesser Vampire." + return span_boldwarning("A lesser Vampire.") if(istype(examined_datum, /datum/antagonist/vampirelord)) if(transformed) - return "An Ancient Vampire. I must be careful!" + return span_boldwarning("An Ancient Vampire. I must be careful!") /datum/antagonist/werewolf/on_gain() owner.special_role = name @@ -54,7 +54,7 @@ /datum/antagonist/werewolf/on_removal() if(!silent && owner.current) - to_chat(owner.current,"I am no longer a [special_role]!") + to_chat(owner.current,span_danger("I am no longer a [special_role]!")) owner.special_role = null return ..() @@ -72,7 +72,7 @@ return /datum/antagonist/werewolf/greet() - to_chat(owner.current, "Ever since that bite, I have been a [name].") + to_chat(owner.current, span_userdanger("Ever since that bite, I have been a [name].")) owner.announce_objectives() return ..() @@ -103,7 +103,7 @@ return if(stat >= DEAD) //do shit the natural way i guess return - to_chat(src, "I feel horrible... REALLY horrible...") + to_chat(src, span_danger("I feel horrible... REALLY horrible...")) mob_timers["puke"] = world.time vomit(1, blood = TRUE, stun = FALSE) return wolfy @@ -113,16 +113,16 @@ return if(target.mind) if(target.mind.has_antag_datum(/datum/antagonist/zombie)) - to_chat(src, "I should not feed on rotten flesh.") + to_chat(src, span_warning("I should not feed on rotten flesh.")) return if(target.mind.has_antag_datum(/datum/antagonist/vampirelord)) - to_chat(src, "I should not feed on corrupted flesh.") + to_chat(src, span_warning("I should not feed on corrupted flesh.")) return if(target.mind.has_antag_datum(/datum/antagonist/werewolf)) - to_chat(src, "I should not feed on my kin's flesh.") + to_chat(src, span_warning("I should not feed on my kin's flesh.")) return - to_chat(src, "I feed on succulent flesh. I feel reinvigorated.") + to_chat(src, span_warning("I feed on succulent flesh. I feel reinvigorated.")) return src.reagents.add_reagent(/datum/reagent/medicine/healthpot, 3) /obj/item/clothing/suit/roguetown/armor/skin_armor/werewolf_skin diff --git a/code/modules/antagonists/roguetown/villain/werewolf/werewolf_spells.dm b/code/modules/antagonists/roguetown/villain/werewolf/werewolf_spells.dm index fc25f64e2..9bfba3928 100644 --- a/code/modules/antagonists/roguetown/villain/werewolf/werewolf_spells.dm +++ b/code/modules/antagonists/roguetown/villain/werewolf/werewolf_spells.dm @@ -23,7 +23,7 @@ // Announcement to other werewolves if(player.mind.has_antag_datum(/datum/antagonist/werewolf)) - to_chat(player, "[werewolf_player.wolfname] howls: [message]") + to_chat(player, span_boldannounce("[werewolf_player.wolfname] howls: [message]")) //sound played for other players if(player == src) continue diff --git a/code/modules/antagonists/roguetown/villain/werewolf/werewolf_transformation.dm b/code/modules/antagonists/roguetown/villain/werewolf/werewolf_transformation.dm index 0d11f18d7..96ff16cb8 100644 --- a/code/modules/antagonists/roguetown/villain/werewolf/werewolf_transformation.dm +++ b/code/modules/antagonists/roguetown/villain/werewolf/werewolf_transformation.dm @@ -13,7 +13,7 @@ if(isturf(H.loc)) var/turf/loc = H.loc if(loc.can_see_sky()) - to_chat(H, "The moonlight scorns me... It is too late.") + to_chat(H, span_userdanger("The moonlight scorns me... It is too late.")) owner.current.playsound_local(get_turf(owner.current), 'sound/music/wolfintro.ogg', 80, FALSE, pressure_affected = FALSE) H.flash_fullscreen("redflash3") transforming = world.time // timer @@ -28,13 +28,13 @@ else if (world.time >= transforming + 25 SECONDS) // Stage 2 H.flash_fullscreen("redflash3") H.emote("agony", forced = TRUE) - to_chat(H, "UNIMAGINABLE PAIN!") + to_chat(H, span_userdanger("UNIMAGINABLE PAIN!")) H.Stun(30) H.Knockdown(30) else if (world.time >= transforming + 10 SECONDS) // Stage 1 H.emote("") - to_chat(H, "I can feel my muscles aching, it feels HORRIBLE...") + to_chat(H, span_warning("I can feel my muscles aching, it feels HORRIBLE...")) // Werewolf reverts to human form during the day @@ -54,7 +54,7 @@ else if (world.time >= untransforming + 10 SECONDS) // Alert player H.flash_fullscreen("redflash1") - to_chat(H, "Daylight shines around me... the curse begins to fade.") + to_chat(H, span_warning("Daylight shines around me... the curse begins to fade.")) /mob/living/carbon/human/species/werewolf/death(gibbed) @@ -106,7 +106,7 @@ W.base_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB) W.update_a_intents() - to_chat(W, "I transform into a horrible beast!") + to_chat(W, span_userdanger("I transform into a horrible beast!")) W.emote("rage") W.stress = stress @@ -175,7 +175,7 @@ W.regenerate_icons() - to_chat(W, "I return to my facade.") + to_chat(W, span_userdanger("I return to my facade.")) playsound(W.loc, pick('sound/combat/gib (1).ogg','sound/combat/gib (2).ogg'), 200, FALSE, 3) W.spawn_gibs(FALSE) W.Knockdown(30) diff --git a/code/modules/antagonists/roguetown/villain/zomble.dm b/code/modules/antagonists/roguetown/villain/zomble.dm index dc7f4c87c..0babfc30b 100644 --- a/code/modules/antagonists/roguetown/villain/zomble.dm +++ b/code/modules/antagonists/roguetown/villain/zomble.dm @@ -63,12 +63,12 @@ if(istype(examined_datum, /datum/antagonist/vampirelord)) var/datum/antagonist/vampirelord/V = examined_datum if(!V.disguised) - return "Another deadite." + return span_boldnotice("Another deadite.") if(istype(examined_datum, /datum/antagonist/zombie)) var/datum/antagonist/zombie/fellow_zombie = examined_datum - return "Another deadite. [fellow_zombie.has_turned ? "My ally." : "Hasn't turned yet."]" + return span_boldnotice("Another deadite. [fellow_zombie.has_turned ? "My ally." : span_warning("Hasn't turned yet.")]") if(istype(examined_datum, /datum/antagonist/skeleton)) - return "Another deadite." + return span_boldnotice("Another deadite.") /datum/antagonist/zombie/on_gain() var/mob/living/carbon/human/zombie = owner?.current @@ -122,7 +122,7 @@ zombie.STAINT = max(zombie.STAINT - 3, 1) for(var/trait in traits_rotman) ADD_TRAIT(zombie, trait, "[type]") - to_chat(zombie, "I no longer crave for flesh... But I still feel ill.") + to_chat(zombie, span_green("I no longer crave for flesh... But I still feel ill.")) else if(!was_i_undead) zombie.mob_biotypes &= ~MOB_UNDEAD @@ -131,7 +131,7 @@ zombie.faction += "neutral" zombie.regenerate_organs() if(has_turned) - to_chat(zombie, "I no longer crave for flesh...") + to_chat(zombie, span_green("I no longer crave for flesh...")) for(var/obj/item/bodypart/zombie_part as anything in zombie.bodyparts) zombie_part.rotted = FALSE zombie_part.update_disabled() @@ -215,7 +215,7 @@ */ /datum/antagonist/zombie/greet() - to_chat(owner.current, "Death is not the end...") + to_chat(owner.current, span_userdanger("Death is not the end...")) return ..() /datum/antagonist/zombie/on_life(mob/user) @@ -300,9 +300,9 @@ closest_dist = total_distance the_dir = get_dir(src, humie) if(!closest_dist) - to_chat(src, "I failed to smell anything...") + to_chat(src, span_warning("I failed to smell anything...")) return FALSE - to_chat(src, "[closest_dist] meters away, [dir2text(the_dir)]...") + to_chat(src, span_warning("[closest_dist] meters away, [dir2text(the_dir)]...")) return TRUE /// Use this to attempt to add the zombie antag datum to a human @@ -332,7 +332,7 @@ return if(stat >= DEAD) //do shit the natural way i guess return - to_chat(src, "I feel horrible... REALLY horrible...") + to_chat(src, span_danger("I feel horrible... REALLY horrible...")) mob_timers["puke"] = world.time vomit(1, blood = TRUE, stun = FALSE) addtimer(CALLBACK(src, PROC_REF(wake_zombie)), 1 MINUTES) @@ -343,7 +343,7 @@ if(!zombie_antag || zombie_antag.has_turned) return FALSE flash_fullscreen("redflash3") - to_chat(src, "It hurts... Is this really the end for me?") + to_chat(src, span_danger("It hurts... Is this really the end for me?")) emote("scream") // heres your warning to others bro Knockdown(1) zombie_antag.wake_zombie(TRUE) diff --git a/code/modules/antagonists/santa/santa.dm b/code/modules/antagonists/santa/santa.dm index a6d104af3..4ad9ecc91 100644 --- a/code/modules/antagonists/santa/santa.dm +++ b/code/modules/antagonists/santa/santa.dm @@ -13,7 +13,7 @@ /datum/antagonist/santa/greet() . = ..() - to_chat(owner, "I are Santa! Your objective is to bring joy to the people on this station. You have a magical bag, which generates presents as long as you have it! You can examine the presents to take a peek inside, to make sure that you give the right gift to the right person.") + to_chat(owner, span_boldannounce("I are Santa! Your objective is to bring joy to the people on this station. You have a magical bag, which generates presents as long as you have it! You can examine the presents to take a peek inside, to make sure that you give the right gift to the right person.")) /datum/antagonist/santa/proc/give_equipment() var/mob/living/carbon/human/H = owner.current diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 9d0bc7001..759dbb71c 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -85,16 +85,16 @@ /obj/item/organ/heart/demon/attack(mob/M, mob/living/carbon/user, obj/target) if(M != user) return ..() - user.visible_message("[user] raises [src] to [user.p_their()] mouth and tears into it with [user.p_their()] teeth!", \ - "An unnatural hunger consumes you. You raise [src] your mouth and devour it!") + user.visible_message(span_warning("[user] raises [src] to [user.p_their()] mouth and tears into it with [user.p_their()] teeth!"), \ + span_danger("An unnatural hunger consumes you. You raise [src] your mouth and devour it!")) playsound(user, 'sound/blank.ogg', 50, TRUE) for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list) if(knownspell.type == /obj/effect/proc_holder/spell/bloodcrawl) - to_chat(user, "...and you don't feel any different.") + to_chat(user, span_warning("...and you don't feel any different.")) qdel(src) return - user.visible_message("[user]'s eyes flare a deep crimson!", \ - "I feel a strange power seep into your body... you have absorbed the demon's blood-travelling powers!") + user.visible_message(span_warning("[user]'s eyes flare a deep crimson!"), \ + span_danger("I feel a strange power seep into your body... you have absorbed the demon's blood-travelling powers!")) user.temporarilyRemoveItemFromInventory(src, TRUE) src.Insert(user) //Consuming the heart literally replaces your heart with a demon heart. H A R D C O R E @@ -177,7 +177,7 @@ if(M.revive(full_heal = TRUE, admin_revive = TRUE)) M.grab_ghost(force = TRUE) playsound(T, feast_sound, 50, TRUE, -1) - to_chat(M, "I leave [src]'s warm embrace, and feel ready to take on the world.") + to_chat(M, span_clown("I leave [src]'s warm embrace, and feel ready to take on the world.")) /mob/living/simple_animal/slaughter/laughter/bloodcrawl_swallow(mob/living/victim) if(consumed_mobs) @@ -187,4 +187,4 @@ // Be safe and just eject the corpse victim.forceMove(get_turf(victim)) victim.exit_blood_effect() - victim.visible_message("[victim] falls out of the air, covered in blood, looking highly confused. And dead.") + victim.visible_message(span_warning("[victim] falls out of the air, covered in blood, looking highly confused. And dead.")) diff --git a/code/modules/antagonists/survivalist/survivalist.dm b/code/modules/antagonists/survivalist/survivalist.dm index 716422c01..2625dbef1 100644 --- a/code/modules/antagonists/survivalist/survivalist.dm +++ b/code/modules/antagonists/survivalist/survivalist.dm @@ -33,7 +33,7 @@ /datum/antagonist/survivalist/magic/greet() ..() - to_chat(owner, "As a wonderful magician, you should remember that spellbooks don't mean anything if they are used up.") + to_chat(owner, span_notice("As a wonderful magician, you should remember that spellbooks don't mean anything if they are used up.")) /datum/antagonist/survivalist/magic/forge_objectives() var/datum/objective/steal_five_of_type/summon_magic/magic = new diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm index f92ca3d89..97aa27756 100644 --- a/code/modules/antagonists/swarmer/swarmer.dm +++ b/code/modules/antagonists/swarmer/swarmer.dm @@ -38,13 +38,13 @@ . = ..() if(.) return - to_chat(user, "Picking up the swarmer may cause it to activate. You should be careful about this.") + to_chat(user, span_notice("Picking up the swarmer may cause it to activate. You should be careful about this.")) /obj/effect/mob_spawn/swarmer/attackby(obj/item/W, mob/user, params) if(W.tool_behaviour == TOOL_SCREWDRIVER && user.used_intent.type != INTENT_HARM) - user.visible_message("[usr.name] deactivates [src].", - "After some fiddling, you find a way to disable [src]'s power source.", - "I hear clicking.") + user.visible_message(span_warning("[usr.name] deactivates [src]."), + span_notice("After some fiddling, you find a way to disable [src]'s power source."), + span_hear("I hear clicking.")) new /obj/item/deactivated_swarmer(get_turf(src)) qdel(src) else @@ -180,7 +180,7 @@ return FALSE for(var/mob/living/L in contents) if(!issilicon(L) && !isbrain(L)) - to_chat(S, "An organism has been detected inside this object. Aborting.") + to_chat(S, span_warning("An organism has been detected inside this object. Aborting.")) return FALSE return ..() @@ -246,11 +246,11 @@ for(var/turf/T in range(1, src)) var/area/A = get_area(T) if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle))) - to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") + to_chat(S, span_warning("Destroying this object has the potential to cause a hull breach. Aborting.")) S.target = null return FALSE else if(istype(A, /area/engine/supermatter)) - to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.") + to_chat(S, span_warning("Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.")) S.target = null return FALSE S.DisIntegrate(src) @@ -282,43 +282,43 @@ return TRUE /obj/machinery/chem_dispenser/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "The volatile chemicals in this machine would destroy us. Aborting.") + to_chat(S, span_warning("The volatile chemicals in this machine would destroy us. Aborting.")) return FALSE /obj/machinery/nuclearbomb/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "This device's destruction would result in the extermination of everything in the area. Aborting.") + to_chat(S, span_warning("This device's destruction would result in the extermination of everything in the area. Aborting.")) return FALSE /obj/effect/rune/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Searching... sensor malfunction! Target lost. Aborting.") + to_chat(S, span_warning("Searching... sensor malfunction! Target lost. Aborting.")) return FALSE /obj/structure/reagent_dispensers/fueltank/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Destroying this object would cause a chain reaction. Aborting.") + to_chat(S, span_warning("Destroying this object would cause a chain reaction. Aborting.")) return FALSE /obj/structure/cable/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") + to_chat(S, span_warning("Disrupting the power grid would bring no benefit to us. Aborting.")) return FALSE /obj/machinery/portable_atmospherics/canister/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "An inhospitable area may be created as a result of destroying this object. Aborting.") + to_chat(S, span_warning("An inhospitable area may be created as a result of destroying this object. Aborting.")) return FALSE /obj/machinery/telecomms/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting.") + to_chat(S, span_warning("This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting.")) return FALSE /obj/machinery/deepfryer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "This kitchen appliance should be preserved, it will make delicious unhealthy snacks for our masters in the future. Aborting.") + to_chat(S, span_warning("This kitchen appliance should be preserved, it will make delicious unhealthy snacks for our masters in the future. Aborting.")) return FALSE /obj/machinery/power/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") + to_chat(S, span_warning("Disrupting the power grid would bring no benefit to us. Aborting.")) return FALSE /obj/machinery/gateway/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "This bluespace source will be important to us later. Aborting.") + to_chat(S, span_warning("This bluespace source will be important to us later. Aborting.")) return FALSE /turf/closed/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) @@ -326,11 +326,11 @@ for(var/turf/T in range(1, src)) var/area/A = get_area(T) if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle))) - to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") + to_chat(S, span_warning("Destroying this object has the potential to cause a hull breach. Aborting.")) S.target = null return TRUE else if(istype(A, /area/engine/supermatter)) - to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.") + to_chat(S, span_warning("Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.")) S.target = null return TRUE return ..() @@ -340,25 +340,25 @@ for(var/turf/T in range(1, src)) var/area/A = get_area(T) if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle))) - to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") + to_chat(S, span_warning("Destroying this object has the potential to cause a hull breach. Aborting.")) S.target = null return TRUE else if(istype(A, /area/engine/supermatter)) - to_chat(S, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.") + to_chat(S, span_warning("Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.")) S.target = null return TRUE return ..() /obj/item/stack/cable_coil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)//Wiring would be too effective as a resource - to_chat(S, "This object does not contain enough materials to work with.") + to_chat(S, span_warning("This object does not contain enough materials to work with.")) return FALSE /obj/machinery/porta_turret/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.") + to_chat(S, span_warning("Attempting to dismantle this machine would result in an immediate counterattack. Aborting.")) return FALSE /obj/machinery/porta_turret_cover/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.") + to_chat(S, span_warning("Attempting to dismantle this machine would result in an immediate counterattack. Aborting.")) return FALSE /mob/living/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) @@ -366,11 +366,11 @@ return TRUE /mob/living/simple_animal/slime/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "This biological resource is somehow resisting our bluespace transceiver. Aborting.") + to_chat(S, span_warning("This biological resource is somehow resisting our bluespace transceiver. Aborting.")) return FALSE /obj/machinery/droneDispenser/swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "This object is receiving unactivated swarmer shells to help us. Aborting.") + to_chat(S, span_warning("This object is receiving unactivated swarmer shells to help us. Aborting.")) return FALSE /obj/structure/lattice/catwalk/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) @@ -379,48 +379,48 @@ for(var/A in here.contents) var/obj/structure/cable/C = A if(istype(C)) - to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") + to_chat(S, span_warning("Disrupting the power grid would bring no benefit to us. Aborting.")) return FALSE /obj/item/deactivated_swarmer/IntegrateAmount() return 50 /obj/machinery/hydroponics/soil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "This object does not contain enough materials to work with.") + to_chat(S, span_warning("This object does not contain enough materials to work with.")) return FALSE /obj/machinery/field/generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Destroying this object would cause a catastrophic chain reaction. Aborting.") + to_chat(S, span_warning("Destroying this object would cause a catastrophic chain reaction. Aborting.")) return FALSE /obj/machinery/field/containment/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "This object does not contain solid matter. Aborting.") + to_chat(S, span_warning("This object does not contain solid matter. Aborting.")) return FALSE /obj/machinery/power/shieldwallgen/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Destroying this object would have an unpredictable effect on structure integrity. Aborting.") + to_chat(S, span_warning("Destroying this object would have an unpredictable effect on structure integrity. Aborting.")) return FALSE /obj/machinery/shieldwall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "This object does not contain solid matter. Aborting.") + to_chat(S, span_warning("This object does not contain solid matter. Aborting.")) return FALSE ////END CTRL CLICK FOR SWARMERS//// /mob/living/simple_animal/hostile/swarmer/proc/Fabricate(atom/fabrication_object,fabrication_cost = 0) if(!isturf(loc)) - to_chat(src, "This is not a suitable location for fabrication. We need more space.") + to_chat(src, span_warning("This is not a suitable location for fabrication. We need more space.")) if(resources >= fabrication_cost) resources -= fabrication_cost else - to_chat(src, "I do not have the necessary resources to fabricate this object.") + to_chat(src, span_warning("I do not have the necessary resources to fabricate this object.")) return return new fabrication_object(loc) /mob/living/simple_animal/hostile/swarmer/proc/Integrate(atom/movable/target) var/resource_gain = target.IntegrateAmount() if(resources + resource_gain > max_resources) - to_chat(src, "We cannot hold more materials!") + to_chat(src, span_warning("We cannot hold more materials!")) return TRUE if(resource_gain) resources += resource_gain @@ -438,7 +438,7 @@ qdel(target) return TRUE else - to_chat(src, "[target] is incompatible with our internal matter recycler.") + to_chat(src, span_warning("[target] is incompatible with our internal matter recycler.")) return FALSE @@ -454,10 +454,10 @@ return if(!is_station_level(z) && !is_mining_level(z)) - to_chat(src, "Our bluespace transceiver cannot locate a viable bluespace link, our teleportation abilities are useless in this area.") + to_chat(src, span_warning("Our bluespace transceiver cannot locate a viable bluespace link, our teleportation abilities are useless in this area.")) return - to_chat(src, "Attempting to remove this being from our presence.") + to_chat(src, span_info("Attempting to remove this being from our presence.")) if(!do_mob(src, target, 30)) return @@ -489,13 +489,13 @@ /mob/living/simple_animal/hostile/swarmer/proc/DismantleMachine(obj/machinery/target) do_attack_animation(target) - to_chat(src, "We begin to dismantle this machine. We will need to be uninterrupted.") + to_chat(src, span_info("We begin to dismantle this machine. We will need to be uninterrupted.")) var/obj/effect/temp_visual/swarmer/dismantle/D = new /obj/effect/temp_visual/swarmer/dismantle(get_turf(target)) D.pixel_x = target.pixel_x D.pixel_y = target.pixel_y D.pixel_z = target.pixel_z if(do_mob(src, target, 100)) - to_chat(src, "Dismantling complete.") + to_chat(src, span_info("Dismantling complete.")) var/atom/Tsec = target.drop_location() new /obj/item/stack/sheet/metal(Tsec, 5) for(var/obj/item/I in target.component_parts) @@ -585,7 +585,7 @@ set category = "Swarmer" set desc = "" if(locate(/obj/structure/swarmer/trap) in loc) - to_chat(src, "There is already a trap here. Aborting.") + to_chat(src, span_warning("There is already a trap here. Aborting.")) return Fabricate(/obj/structure/swarmer/trap, 5) @@ -595,10 +595,10 @@ set category = "Swarmer" set desc = "" if(locate(/obj/structure/swarmer/blockade) in loc) - to_chat(src, "There is already a blockade here. Aborting.") + to_chat(src, span_warning("There is already a blockade here. Aborting.")) return if(resources < 5) - to_chat(src, "We do not have the resources for this!") + to_chat(src, span_warning("We do not have the resources for this!")) return if(do_mob(src, src, 10)) Fabricate(/obj/structure/swarmer/blockade, 5) @@ -621,12 +621,12 @@ set name = "Replicate" set category = "Swarmer" set desc = "" - to_chat(src, "We are attempting to replicate ourselves. We will need to stand still until the process is complete.") + to_chat(src, span_info("We are attempting to replicate ourselves. We will need to stand still until the process is complete.")) if(resources < 50) - to_chat(src, "We do not have the resources for this!") + to_chat(src, span_warning("We do not have the resources for this!")) return if(!isturf(loc)) - to_chat(src, "This is not a suitable location for replicating ourselves. We need more room.") + to_chat(src, span_warning("This is not a suitable location for replicating ourselves. We need more room.")) return if(do_mob(src, src, 100)) var/createtype = SwarmerTypeToCreate() @@ -644,10 +644,10 @@ set desc = "" if(!isturf(loc)) return - to_chat(src, "Attempting to repair damage to our body, stand by...") + to_chat(src, span_info("Attempting to repair damage to our body, stand by...")) if(do_mob(src, src, 100)) adjustHealth(-100) - to_chat(src, "We successfully repaired ourselves.") + to_chat(src, span_info("We successfully repaired ourselves.")) /mob/living/simple_animal/hostile/swarmer/proc/ToggleLight() if(!light_range) diff --git a/code/modules/antagonists/swarmer/swarmer_event.dm b/code/modules/antagonists/swarmer/swarmer_event.dm index e086485a4..40e6f4ea0 100644 --- a/code/modules/antagonists/swarmer/swarmer_event.dm +++ b/code/modules/antagonists/swarmer/swarmer_event.dm @@ -16,7 +16,7 @@ return 0 new /obj/effect/mob_spawn/swarmer(get_turf(GLOB.the_gateway)) if(prob(25)) //25% chance to announce it to the crew - var/swarmer_report = "[command_name()] High-Priority Update" + var/swarmer_report = span_bigbold("[command_name()] High-Priority Update") swarmer_report += "

Our long-range sensors have detected an odd signal emanating from your station's gateway. We recommend immediate investigation of your gateway, as something may have come through." print_command_report(swarmer_report, announce=TRUE) diff --git a/code/modules/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm index b2dede389..940009b0a 100644 --- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm +++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm @@ -130,7 +130,7 @@ /datum/antagonist/traitor/internal_affairs/proc/steal_targets(datum/mind/victim) if(!owner.current||owner.current.stat==DEAD) return - to_chat(owner.current, "Target eliminated: [victim.name]") + to_chat(owner.current, span_danger("Target eliminated: [victim.name]")) for(var/objective_ in victim.get_all_objectives()) if(istype(objective_, /datum/objective/assassinate/internal)) var/datum/objective/assassinate/internal/objective = objective_ @@ -144,7 +144,7 @@ add_objective(new_objective) targets_stolen += objective.target var/status_text = objective.check_completion() ? "neutralised" : "active" - to_chat(owner.current, "New target added to database: [objective.target.name] ([status_text])") + to_chat(owner.current, span_danger("New target added to database: [objective.target.name] ([status_text])")) else if(istype(objective_, /datum/objective/destroy/internal)) var/datum/objective/destroy/internal/objective = objective_ var/datum/objective/destroy/internal/new_objective = new @@ -157,7 +157,7 @@ add_objective(new_objective) targets_stolen += objective.target var/status_text = objective.check_completion() ? "neutralised" : "active" - to_chat(owner.current, "New target added to database: [objective.target.name] ([status_text])") + to_chat(owner.current, span_danger("New target added to database: [objective.target.name] ([status_text])")) last_man_standing = TRUE for(var/objective_ in objectives) if(!is_internal_objective(objective_)) @@ -168,9 +168,9 @@ return if(last_man_standing) if(syndicate) - to_chat(owner.current,"All the loyalist agents are dead, and no more is required of you. Die a glorious death, agent.") + to_chat(owner.current,span_danger("All the loyalist agents are dead, and no more is required of you. Die a glorious death, agent.")) else - to_chat(owner.current,"All the other agents are dead, and you're the last loose end. Stage a Syndicate terrorist attack to cover up for today's events. You no longer have any limits on collateral damage.") + to_chat(owner.current,span_danger("All the other agents are dead, and you're the last loose end. Stage a Syndicate terrorist attack to cover up for today's events. You no longer have any limits on collateral damage.")) replace_escape_objective(owner) /datum/antagonist/traitor/internal_affairs/proc/iaa_process() @@ -189,12 +189,12 @@ objective.stolen = TRUE else if(objective.stolen) - var/fail_msg = "My sensors tell you that [objective.target.current.real_name], one of the targets you were meant to have killed, pulled one over on you, and is still alive - do the job properly this time! " + var/fail_msg = span_danger("My sensors tell you that [objective.target.current.real_name], one of the targets you were meant to have killed, pulled one over on you, and is still alive - do the job properly this time! ") if(last_man_standing) if(syndicate) - fail_msg += " You no longer have permission to die. " + fail_msg += span_danger(" You no longer have permission to die. ") else - fail_msg += " The truth could still slip out!
Cease any terrorist actions as soon as possible, unneeded property damage or loss of employee life will lead to my contract being terminated.
" + fail_msg += span_danger(" The truth could still slip out! Cease any terrorist actions as soon as possible, unneeded property damage or loss of employee life will lead to my contract being terminated.") reinstate_escape_objective(owner) last_man_standing = FALSE to_chat(owner.current, fail_msg) @@ -236,17 +236,17 @@ /datum/antagonist/traitor/internal_affairs/proc/greet_iaa() var/crime = pick("distribution of contraband" , "unauthorized erotic action on duty", "embezzlement", "piloting under the influence", "dereliction of duty", "syndicate collaboration", "mutiny", "multiple homicides", "corporate espionage", "receiving bribes", "malpractice", "worship of prohibited life forms", "possession of profane texts", "murder", "arson", "insulting their manager", "grand theft", "conspiracy", "attempting to unionize", "vandalism", "gross incompetence") - to_chat(owner.current, "I are the [special_role].") + to_chat(owner.current, span_danger("I are the [special_role].")) if(syndicate) - to_chat(owner.current, "My target has been framed for [crime], and you have been tasked with eliminating them to prevent them defending themselves in court.") + to_chat(owner.current, span_danger("My target has been framed for [crime], and you have been tasked with eliminating them to prevent them defending themselves in court.")) to_chat(owner.current, "Any damage you cause will be a further embarrassment to Nanotrasen, so you have no limits on collateral damage.") - to_chat(owner.current, "I have been provided with a standard uplink to accomplish my task.") + to_chat(owner.current, span_danger("I have been provided with a standard uplink to accomplish my task.")) else - to_chat(owner.current, "My target is suspected of [crime], and you have been tasked with eliminating them by any means necessary to avoid a costly and embarrassing public trial.") + to_chat(owner.current, span_danger("My target is suspected of [crime], and you have been tasked with eliminating them by any means necessary to avoid a costly and embarrassing public trial.")) to_chat(owner.current, "While you have a license to kill, unneeded property damage or loss of employee life will lead to my contract being terminated.") - to_chat(owner.current, "For the sake of plausible deniability, you have been equipped with an array of captured Syndicate weaponry available via uplink.") + to_chat(owner.current, span_danger("For the sake of plausible deniability, you have been equipped with an array of captured Syndicate weaponry available via uplink.")) - to_chat(owner.current, "Finally, watch my back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.") + to_chat(owner.current, span_danger("Finally, watch my back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.")) owner.announce_objectives() /datum/antagonist/traitor/internal_affairs/greet() diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index a29f62268..886b8424b 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -41,14 +41,14 @@ UnregisterSignal(owner.current, COMSIG_MOVABLE_HEAR, PROC_REF(handle_hearing)) SSticker.mode.traitors -= owner if(!silent && owner.current) - to_chat(owner.current,"I are no longer the [special_role]!") + to_chat(owner.current,span_danger("I are no longer the [special_role]!")) owner.special_role = null return ..() /datum/antagonist/traitor/proc/handle_hearing(datum/source, list/hearing_args) var/message = hearing_args[HEARING_MESSAGE] - message = GLOB.syndicate_code_phrase_regex.Replace(message, "$1") - message = GLOB.syndicate_code_response_regex.Replace(message, "$1") + message = GLOB.syndicate_code_phrase_regex.Replace(message, span_blue("$1")) + message = GLOB.syndicate_code_response_regex.Replace(message, span_red("$1")) hearing_args[HEARING_MESSAGE] = message /datum/antagonist/traitor/proc/add_objective(datum/objective/O) @@ -193,7 +193,7 @@ .=2 /datum/antagonist/traitor/greet() - to_chat(owner.current, "I are the [owner.special_role].") + to_chat(owner.current, span_alertsyndie("I are the [owner.special_role].")) owner.announce_objectives() if(should_give_codewords) give_codewords() @@ -243,7 +243,7 @@ antag_memory += "Code Response: [responses]
" to_chat(traitor_mob, "Use the codewords during regular conversation to identify other agents. Proceed with caution, however, as everyone is a potential foe.") - to_chat(traitor_mob, "I memorize the codewords, allowing you to recognise them when heard.") + to_chat(traitor_mob, span_alertwarning("I memorize the codewords, allowing you to recognise them when heard.")) /datum/antagonist/traitor/proc/add_law_zero() var/mob/living/silicon/ai/killer = owner.current @@ -343,9 +343,9 @@ result += contractor_round_end() if(traitorwin) - result += "The [special_role_text] was successful!" + result += span_greentext("The [special_role_text] was successful!") else - result += "The [special_role_text] has failed!" + result += span_redtext("The [special_role_text] has failed!") SEND_SOUND(owner.current, 'sound/blank.ogg') return result.Join("
") @@ -366,7 +366,7 @@ /// Get all the icons/total cost for all our items bought for (var/datum/contractor_item/contractor_purchase in contractor_hub.purchased_items) - contractor_item_icons += "\[ [contractor_purchase.name] - [contractor_purchase.cost] Rep

[contractor_purchase.desc]
\]
" + contractor_item_icons += span_tooltip_container("\[ [contractor_purchase.name] - [contractor_purchase.cost] Rep

[contractor_purchase.desc]
\]") total_spent_rep += contractor_purchase.cost diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index d20b75d6e..92e07e088 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -50,10 +50,10 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /datum/action/innate/ai/proc/adjust_uses(amt, silent) uses += amt if(!silent && uses) - to_chat(owner, "[name] now has [uses] use[uses > 1 ? "s" : ""] remaining.") + to_chat(owner, span_notice("[name] now has [uses] use[uses > 1 ? "s" : ""] remaining.")) if(!uses) if(initial(uses) > 1) //no need to tell 'em if it was one-use anyway! - to_chat(owner, "[name] has run out of uses!") + to_chat(owner, span_warning("[name] has run out of uses!")) qdel(src) //Framework for ranged abilities that can have different effects by left-clicking stuff. @@ -75,10 +75,10 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /datum/action/innate/ai/ranged/adjust_uses(amt, silent) uses += amt if(!silent && uses) - to_chat(owner, "[name] now has [uses] use[uses > 1 ? "s" : ""] remaining.") + to_chat(owner, span_notice("[name] now has [uses] use[uses > 1 ? "s" : ""] remaining.")) if(!uses) if(initial(uses) > 1) //no need to tell 'em if it was one-use anyway! - to_chat(owner, "[name] has run out of uses!") + to_chat(owner, span_warning("[name] has run out of uses!")) Remove(owner) QDEL_IN(src, 100) //let any active timers on us finish up @@ -92,8 +92,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( //The actual ranged proc holder. /obj/effect/proc_holder/ranged_ai - var/enable_text = "Hello World!" //Appears when the user activates the ability - var/disable_text = "Goodbye Cruel World!" //Context clues! + var/enable_text = span_notice("Hello World!") //Appears when the user activates the ability + var/disable_text = span_danger("Goodbye Cruel World!") //Context clues! var/datum/action/innate/ai/ranged/attached_action /obj/effect/proc_holder/ranged_ai/Destroy() @@ -151,7 +151,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( var/mob/living/silicon/ai/A = usr if(A.stat == DEAD) - to_chat(A, "I are already dead!") + to_chat(A, span_warning("I are already dead!")) return for(var/datum/AI_Module/AM in possible_modules) @@ -207,7 +207,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( var/power_type = /datum/action/innate/ai //If the module gives an active ability, use this. Mutually exclusive with upgrade. var/upgrade //If the module gives a passive upgrade, use this. Mutually exclusive with power_type. - var/unlock_text = "Hello World!" //Text shown when an ability is unlocked + var/unlock_text = span_notice("Hello World!") //Text shown when an ability is unlocked var/unlock_sound //Sound played when an ability is unlocked /datum/AI_Module/proc/upgrade(mob/living/silicon/ai/AI) //Apply upgrades! @@ -225,7 +225,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( cost = 130 one_purchase = TRUE power_type = /datum/action/innate/ai/nuke_station - unlock_text = "I slowly, carefully, establish a connection with the on-station self-destruct. You can now activate it at any time." + unlock_text = span_notice("I slowly, carefully, establish a connection with the on-station self-destruct. You can now activate it at any time.") /datum/action/innate/ai/nuke_station name = "Doomsday Device" @@ -236,7 +236,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /datum/action/innate/ai/nuke_station/Activate() var/turf/T = get_turf(owner) if(!istype(T) || !is_station_level(T.z)) - to_chat(owner, "I cannot activate the doomsday device while off-station!") + to_chat(owner, span_warning("I cannot activate the doomsday device while off-station!")) return if(alert(owner, "Send arming signal? (true = arm, false = cancel)", "purge_all_life()", "confirm = TRUE;", "confirm = FALSE;") != "confirm = TRUE;") return @@ -247,63 +247,63 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /datum/action/innate/ai/nuke_station/proc/set_us_up_the_bomb(mob/living/owner) set waitfor = FALSE - to_chat(owner, "run -o -a 'selfdestruct'") + to_chat(owner, span_smallboldannounce("run -o -a 'selfdestruct'")) sleep(5) if(!owner || QDELETED(owner)) return - to_chat(owner, "Running executable 'selfdestruct'...") + to_chat(owner, span_smallboldannounce("Running executable 'selfdestruct'...")) sleep(rand(10, 30)) if(!owner || QDELETED(owner)) return owner.playsound_local(owner, 'sound/blank.ogg', 50, 0) - to_chat(owner, "!!! UNAUTHORIZED SELF-DESTRUCT ACCESS !!!") - to_chat(owner, "This is a class-3 security violation. This incident will be reported to Central Command.") + to_chat(owner, span_danger("!!! UNAUTHORIZED SELF-DESTRUCT ACCESS !!!")) + to_chat(owner, span_boldannounce("This is a class-3 security violation. This incident will be reported to Central Command.")) for(var/i in 1 to 3) sleep(20) if(!owner || QDELETED(owner)) return - to_chat(owner, "Sending security report to Central Command.....[rand(0, 9) + (rand(20, 30) * i)]%") + to_chat(owner, span_boldannounce("Sending security report to Central Command.....[rand(0, 9) + (rand(20, 30) * i)]%")) sleep(3) if(!owner || QDELETED(owner)) return - to_chat(owner, "auth 'akjv9c88asdf12nb' ******************") + to_chat(owner, span_smallboldannounce("auth 'akjv9c88asdf12nb' ******************")) owner.playsound_local(owner, 'sound/blank.ogg', 50, 0) sleep(30) if(!owner || QDELETED(owner)) return - to_chat(owner, "Credentials accepted. Welcome, akjv9c88asdf12nb.") + to_chat(owner, span_boldnotice("Credentials accepted. Welcome, akjv9c88asdf12nb.")) owner.playsound_local(owner, 'sound/blank.ogg', 50, 0) sleep(5) if(!owner || QDELETED(owner)) return - to_chat(owner, "Arm self-destruct device? (Y/N)") + to_chat(owner, span_boldnotice("Arm self-destruct device? (Y/N)")) owner.playsound_local(owner,'sound/blank.ogg', 50, 0) sleep(20) if(!owner || QDELETED(owner)) return - to_chat(owner, "Y") + to_chat(owner, span_smallboldannounce("Y")) sleep(15) if(!owner || QDELETED(owner)) return - to_chat(owner, "Confirm arming of self-destruct device? (Y/N)") + to_chat(owner, span_boldnotice("Confirm arming of self-destruct device? (Y/N)")) owner.playsound_local(owner,'sound/blank.ogg', 50, 0) sleep(10) if(!owner || QDELETED(owner)) return - to_chat(owner, "Y") + to_chat(owner, span_smallboldannounce("Y")) sleep(rand(15, 25)) if(!owner || QDELETED(owner)) return - to_chat(owner, "Please repeat password to confirm.") + to_chat(owner, span_boldnotice("Please repeat password to confirm.")) owner.playsound_local(owner, 'sound/blank.ogg', 50, 0) sleep(14) if(!owner || QDELETED(owner)) return - to_chat(owner, "******************") + to_chat(owner, span_smallboldannounce("******************")) sleep(40) if(!owner || QDELETED(owner)) return - to_chat(owner, "Credentials accepted. Transmitting arming signal...") + to_chat(owner, span_boldnotice("Credentials accepted. Transmitting arming signal...")) owner.playsound_local(owner, 'sound/blank.ogg', 50, 0) sleep(30) if(!owner || QDELETED(owner)) @@ -385,7 +385,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( continue if(issilicon(L)) continue - to_chat(L, "The blast wave from [src] tears you atom from atom!") + to_chat(L, span_danger("The blast wave from [src] tears you atom from atom!")) L.dust() to_chat(world, "The AI cleansed the station of life with the doomsday device!") SSticker.force_ending = 1 @@ -398,7 +398,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( description = "Improves the power and health of all AI turrets. This effect is permanent." cost = 30 upgrade = TRUE - unlock_text = "I establish a power diversion to your turrets, upgrading their health and damage." + unlock_text = span_notice("I establish a power diversion to your turrets, upgrading their health and damage.") unlock_sound = 'sound/blank.ogg' /datum/AI_Module/large/upgrade_turrets/upgrade(mob/living/silicon/ai/AI) @@ -417,7 +417,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( cost = 30 one_purchase = TRUE power_type = /datum/action/innate/ai/lockdown - unlock_text = "I upload a sleeper trojan into the door control systems. You can send a signal to set it off at any time." + unlock_text = span_notice("I upload a sleeper trojan into the door control systems. You can send a signal to set it off at any time.") unlock_sound = 'sound/blank.ogg' /datum/action/innate/ai/lockdown @@ -438,7 +438,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( C.post_status("alert", "lockdown") minor_announce("Hostile runtime detected in door controllers. Isolation lockdown protocols are now in effect. Please remain calm.","Network Alert:", TRUE) - to_chat(owner, "Lockdown initiated. Network reset in 90 seconds.") + to_chat(owner, span_danger("Lockdown initiated. Network reset in 90 seconds.")) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(minor_announce), "Automatic system reboot complete. Have a secure day.", "Network reset:"), 900) @@ -452,7 +452,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( cost = 25 one_purchase = TRUE power_type = /datum/action/innate/ai/destroy_rcds - unlock_text = "After some improvisation, you rig your onboard radio to be able to send a signal to detonate all RCDs." + unlock_text = span_notice("After some improvisation, you rig your onboard radio to be able to send a signal to detonate all RCDs.") unlock_sound = 'sound/blank.ogg' /datum/action/innate/ai/destroy_rcds @@ -467,7 +467,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(!istype(I, /obj/item/construction/rcd/borg)) //Ensures that cyborg RCDs are spared. var/obj/item/construction/rcd/RCD = I RCD.detonate_pulse() - to_chat(owner, "RCD detonation pulse emitted.") + to_chat(owner, span_danger("RCD detonation pulse emitted.")) owner.playsound_local(owner, 'sound/blank.ogg', 50, 0) @@ -479,7 +479,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( Do not allow the mech to leave the station's vicinity or allow it to be destroyed." cost = 30 upgrade = TRUE - unlock_text = "Virus package compiled. Select a target mech at any time. I must remain on the station at all times. Loss of signal will result in total system lockout." + unlock_text = span_notice("Virus package compiled. Select a target mech at any time. I must remain on the station at all times. Loss of signal will result in total system lockout.") unlock_sound = 'sound/blank.ogg' /datum/AI_Module/large/mecha_domination/upgrade(mob/living/silicon/ai/AI) @@ -494,7 +494,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( one_purchase = TRUE cost = 25 power_type = /datum/action/innate/ai/break_fire_alarms - unlock_text = "I replace the thermal sensing capabilities of all fire alarms with a manual override, allowing you to turn them off at will." + unlock_text = span_notice("I replace the thermal sensing capabilities of all fire alarms with a manual override, allowing you to turn them off at will.") unlock_sound = 'sound/blank.ogg' /datum/action/innate/ai/break_fire_alarms @@ -509,7 +509,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( continue F.obj_flags |= EMAGGED F.update_icon() - to_chat(owner, "All thermal sensors on the station have been disabled. Fire alerts will no longer be recognized.") + to_chat(owner, span_notice("All thermal sensors on the station have been disabled. Fire alerts will no longer be recognized.")) owner.playsound_local(owner, 'sound/blank.ogg', 50, 0) @@ -522,7 +522,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( one_purchase = TRUE cost = 50 power_type = /datum/action/innate/ai/break_air_alarms - unlock_text = "I remove the safety overrides on all air alarms, but you leave the confirm prompts open. You can hit 'Yes' at any time... you bastard." + unlock_text = span_notice("I remove the safety overrides on all air alarms, but you leave the confirm prompts open. You can hit 'Yes' at any time... you bastard.") unlock_sound = 'sound/blank.ogg' /datum/action/innate/ai/break_air_alarms @@ -536,7 +536,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(!is_station_level(AA.z)) continue AA.obj_flags |= EMAGGED - to_chat(owner, "All air alarm safeties on the station have been overridden. Air alarms may now use the Flood environmental mode.") + to_chat(owner, span_notice("All air alarm safeties on the station have been overridden. Air alarms may now use the Flood environmental mode.")) owner.playsound_local(owner, 'sound/blank.ogg', 50, 0) @@ -547,7 +547,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( description = "Overheats an electrical machine, causing a small explosion and destroying it. Two uses per purchase." cost = 20 power_type = /datum/action/innate/ai/ranged/overload_machine - unlock_text = "I enable the ability for the station's APCs to direct intense energy into machinery." + unlock_text = span_notice("I enable the ability for the station's APCs to direct intense energy into machinery.") unlock_sound = 'sound/blank.ogg' //definitely not comfy, but it's the closest sound to "roaring fire" we have /datum/action/innate/ai/ranged/overload_machine @@ -574,8 +574,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /obj/effect/proc_holder/ranged_ai/overload_machine active = FALSE ranged_mousepointer = 'icons/effects/overload_machine_target.dmi' - enable_text = "I tap into the station's powernet. Click on a machine to detonate it, or use the ability again to cancel." - disable_text = "I release your hold on the powernet." + enable_text = span_notice("I tap into the station's powernet. Click on a machine to detonate it, or use the ability again to cancel.") + disable_text = span_notice("I release your hold on the powernet.") /obj/effect/proc_holder/ranged_ai/overload_machine/InterceptClickOn(mob/living/caller, params, obj/machinery/target) if(..()) @@ -584,19 +584,19 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( remove_ranged_ability() return if(!istype(target)) - to_chat(ranged_ability_user, "I can only overload machines!") + to_chat(ranged_ability_user, span_warning("I can only overload machines!")) return if(is_type_in_typecache(target, GLOB.blacklisted_malf_machines)) - to_chat(ranged_ability_user, "I cannot overload that device!") + to_chat(ranged_ability_user, span_warning("I cannot overload that device!")) return ranged_ability_user.playsound_local(ranged_ability_user, "sparks", 50, 0) attached_action.adjust_uses(-1) if(attached_action && attached_action.uses) attached_action.desc = "" attached_action.UpdateButtonIcon() - target.audible_message("I hear a loud electrical buzzing sound coming from [target]!") + target.audible_message(span_danger("I hear a loud electrical buzzing sound coming from [target]!")) addtimer(CALLBACK(attached_action, TYPE_PROC_REF(/datum/action/innate/ai/ranged/overload_machine, detonate_machine), target), 50) //kaboom! - remove_ranged_ability("Overcharging machine...") + remove_ranged_ability(span_danger("Overcharging machine...")) return TRUE @@ -607,7 +607,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( description = "Overrides a machine's programming, causing it to rise up and attack everyone except other machines. Four uses." cost = 30 power_type = /datum/action/innate/ai/ranged/override_machine - unlock_text = "I procure a virus from the Space Dark Web and distribute it to the station's machines." + unlock_text = span_notice("I procure a virus from the Space Dark Web and distribute it to the station's machines.") unlock_sound = 'sound/blank.ogg' /datum/action/innate/ai/ranged/override_machine @@ -629,8 +629,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /obj/effect/proc_holder/ranged_ai/override_machine active = FALSE ranged_mousepointer = 'icons/effects/override_machine_target.dmi' - enable_text = "I tap into the station's powernet. Click on a machine to animate it, or use the ability again to cancel." - disable_text = "I release your hold on the powernet." + enable_text = span_notice("I tap into the station's powernet. Click on a machine to animate it, or use the ability again to cancel.") + disable_text = span_notice("I release your hold on the powernet.") /obj/effect/proc_holder/ranged_ai/override_machine/InterceptClickOn(mob/living/caller, params, obj/machinery/target) if(..()) @@ -639,19 +639,19 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( remove_ranged_ability() return if(!istype(target)) - to_chat(ranged_ability_user, "I can only animate machines!") + to_chat(ranged_ability_user, span_warning("I can only animate machines!")) return if(!target.can_be_overridden() || is_type_in_typecache(target, GLOB.blacklisted_malf_machines)) - to_chat(ranged_ability_user, "That machine can't be overridden!") + to_chat(ranged_ability_user, span_warning("That machine can't be overridden!")) return ranged_ability_user.playsound_local(ranged_ability_user, 'sound/blank.ogg', 50, 0) attached_action.adjust_uses(-1) if(attached_action && attached_action.uses) attached_action.desc = "" attached_action.UpdateButtonIcon() - target.audible_message("I hear a loud electrical buzzing sound coming from [target]!") + target.audible_message(span_danger("I hear a loud electrical buzzing sound coming from [target]!")) addtimer(CALLBACK(attached_action, TYPE_PROC_REF(/datum/action/innate/ai/ranged/override_machine, animate_machine), target), 50) //kabeep! - remove_ranged_ability("Sending override signal...") + remove_ranged_ability(span_danger("Sending override signal...")) return TRUE @@ -663,7 +663,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( cost = 100 one_purchase = TRUE power_type = /datum/action/innate/ai/place_transformer - unlock_text = "I make contact with Space Amazon and request a robotics factory for delivery." + unlock_text = span_notice("I make contact with Space Amazon and request a robotics factory for delivery.") unlock_sound = 'sound/blank.ogg' /datum/action/innate/ai/place_transformer @@ -695,7 +695,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( conveyor.masterAI = owner playsound(T, 'sound/blank.ogg', 100, TRUE) owner_AI.can_shunt = FALSE - to_chat(owner, "I are no longer able to shunt your core to APCs.") + to_chat(owner, span_warning("I are no longer able to shunt your core to APCs.")) adjust_uses(-1) /mob/living/silicon/ai/proc/remove_transformer_image(client/C, image/I, turf/T) @@ -727,7 +727,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( I.icon_state = "[success ? "green" : "red"]Overlay" //greenOverlay and redOverlay for success and failure respectively addtimer(CALLBACK(src, PROC_REF(remove_transformer_image), client, I, T), 30) if(!success) - to_chat(src, "[alert_msg]") + to_chat(src, span_warning("[alert_msg]")) return success @@ -738,7 +738,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( description = "Attempts to overload the lighting circuits on the station, destroying some bulbs. Three uses." cost = 15 power_type = /datum/action/innate/ai/blackout - unlock_text = "I hook into the powernet and route bonus power towards the station's lighting." + unlock_text = span_notice("I hook into the powernet and route bonus power towards the station's lighting.") unlock_sound = "sparks" /datum/action/innate/ai/blackout @@ -759,7 +759,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( apc.overload_lighting() else apc.overload++ - to_chat(owner, "Overcurrent applied to the powernet.") + to_chat(owner, span_notice("Overcurrent applied to the powernet.")) owner.playsound_local(owner, "sparks", 50, 0) adjust_uses(-1) if(src && uses) //Not sure if not having src here would cause a runtime, so it's here to be safe @@ -775,7 +775,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( cost = 10 one_purchase = TRUE power_type = /datum/action/innate/ai/emergency_lights - unlock_text = "I hook into the powernet and locate the connections between light fixtures and their fallbacks." + unlock_text = span_notice("I hook into the powernet and locate the connections between light fixtures and their fallbacks.") unlock_sound = "sparks" /datum/action/innate/ai/emergency_lights @@ -790,7 +790,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( L.no_emergency = TRUE INVOKE_ASYNC(L, TYPE_PROC_REF(/obj/machinery/light, update), FALSE) CHECK_TICK - to_chat(owner, "Emergency light connections severed.") + to_chat(owner, span_notice("Emergency light connections severed.")) owner.playsound_local(owner, 'sound/blank.ogg', 50, FALSE) @@ -802,7 +802,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( cost = 10 one_purchase = TRUE power_type = /datum/action/innate/ai/reactivate_cameras - unlock_text = "I deploy nanomachines to the cameranet." + unlock_text = span_notice("I deploy nanomachines to the cameranet.") unlock_sound = 'sound/blank.ogg' /datum/action/innate/ai/reactivate_cameras @@ -829,7 +829,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( C.view_range = initial(C.view_range) fixed_cameras++ uses-- //Not adjust_uses() so it doesn't automatically delete or show a message - to_chat(owner, "Diagnostic complete! Cameras reactivated: [fixed_cameras]. Reactivations remaining: [uses].") + to_chat(owner, span_notice("Diagnostic complete! Cameras reactivated: [fixed_cameras]. Reactivations remaining: [uses].")) owner.playsound_local(owner, 'sound/blank.ogg', 50, 0) adjust_uses(0, TRUE) //Checks the uses remaining if(src && uses) //Not sure if not having src here would cause a runtime, so it's here to be safe @@ -845,7 +845,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( one_purchase = TRUE cost = 35 //Decent price for omniscience! upgrade = TRUE - unlock_text = "OTA firmware distribution complete! Cameras upgraded: CAMSUPGRADED. Light amplification system online." + unlock_text = span_notice("OTA firmware distribution complete! Cameras upgraded: CAMSUPGRADED. Light amplification system online.") unlock_sound = 'sound/blank.ogg' /datum/AI_Module/large/upgrade_cameras/upgrade(mob/living/silicon/ai/AI) @@ -880,7 +880,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( cost = 30 one_purchase = TRUE upgrade = TRUE - unlock_text = "OTA firmware distribution complete! Cameras upgraded: Enhanced surveillance package online." + unlock_text = span_notice("OTA firmware distribution complete! Cameras upgraded: Enhanced surveillance package online.") unlock_sound = 'sound/blank.ogg' /datum/AI_Module/large/eavesdrop/upgrade(mob/living/silicon/ai/AI) diff --git a/code/modules/antagonists/traitor/equipment/contractor.dm b/code/modules/antagonists/traitor/equipment/contractor.dm index 7c7ea0c1f..48435b6b1 100644 --- a/code/modules/antagonists/traitor/equipment/contractor.dm +++ b/code/modules/antagonists/traitor/equipment/contractor.dm @@ -158,7 +158,7 @@ . = ..() if (.) - to_chat(user, "The uplink vibrates quietly, connecting to nearby agents...") + to_chat(user, span_notice("The uplink vibrates quietly, connecting to nearby agents...")) var/list/mob/candidates = pollGhostCandidates("Do you want to play as the Contractor Support Unit for [user.real_name]?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_CONTRACTOR_SUPPORT) @@ -166,7 +166,7 @@ var/mob/C = pick(candidates) spawn_contractor_partner(user, C.key) else - to_chat(user, "No available agents at this time, please try again later.") + to_chat(user, span_notice("No available agents at this time, please try again later.")) // refund and add the limit back. limited += 1 @@ -261,9 +261,9 @@ var/atom/item_to_create = new item(get_turf(user)) if(user.put_in_hands(item_to_create)) - to_chat(user, "My purchase materializes into my hands!") + to_chat(user, span_notice("My purchase materializes into my hands!")) else - to_chat(user, "My purchase materializes onto the floor.") + to_chat(user, span_notice("My purchase materializes onto the floor.")) return item_to_create return TRUE diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm index ea8463583..4ecb43eca 100644 --- a/code/modules/antagonists/traitor/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/syndicate_contract.dm @@ -154,17 +154,17 @@ M.flash_act() M.confused += 10 M.blur_eyes(5) - to_chat(M, "I feel strange...") + to_chat(M, span_warning("I feel strange...")) sleep(60) - to_chat(M, "That pod did something to you...") + to_chat(M, span_warning("That pod did something to you...")) M.Dizzy(35) sleep(65) - to_chat(M, "My head pounds... It feels like it's going to burst out my skull!") + to_chat(M, span_warning("My head pounds... It feels like it's going to burst out my skull!")) M.flash_act() M.confused += 20 M.blur_eyes(3) sleep(30) - to_chat(M, "My head pounds...") + to_chat(M, span_warning("My head pounds...")) sleep(100) M.flash_act() M.Unconscious(200) @@ -193,7 +193,7 @@ return_pod.style = STYLE_SYNDICATE do_sparks(8, FALSE, M) - M.visible_message("[M] vanishes...") + M.visible_message(span_notice("[M] vanishes...")) for(var/obj/item/W in M) if (ishuman(M)) diff --git a/code/modules/antagonists/valentines/heartbreaker.dm b/code/modules/antagonists/valentines/heartbreaker.dm index 8e90db04d..98a386dea 100644 --- a/code/modules/antagonists/valentines/heartbreaker.dm +++ b/code/modules/antagonists/valentines/heartbreaker.dm @@ -15,5 +15,5 @@ . = ..() /datum/antagonist/heartbreaker/greet() - to_chat(owner, "I didn't get a date! They're all having fun without you! you'll show them though...") + to_chat(owner, span_warning("I didn't get a date! They're all having fun without you! you'll show them though...")) owner.announce_objectives() diff --git a/code/modules/antagonists/valentines/valentine.dm b/code/modules/antagonists/valentines/valentine.dm index c925a3f21..21a768214 100644 --- a/code/modules/antagonists/valentines/valentine.dm +++ b/code/modules/antagonists/valentines/valentine.dm @@ -28,7 +28,7 @@ L.remove_status_effect(STATUS_EFFECT_INLOVE) /datum/antagonist/valentine/greet() - to_chat(owner, "You're on a date with [date.name]! Protect [date.p_them()] at all costs. This takes priority over all other loyalties.") + to_chat(owner, span_warning("You're on a date with [date.name]! Protect [date.p_them()] at all costs. This takes priority over all other loyalties.")) //Squashed up a bit /datum/antagonist/valentine/roundend_report() @@ -40,6 +40,6 @@ break if(objectives_complete) - return "[owner.name] protected [owner.p_their()] date" + return span_greentextbig("[owner.name] protected [owner.p_their()] date") else - return "[owner.name] date failed!" + return span_redtextbig("[owner.name] date failed!") diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 24453d2e1..5e3ce261f 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -26,9 +26,9 @@ if(charges > 0) new /obj/effect/rend(get_turf(user), spawn_type, spawn_amt, rend_desc, spawn_fast) charges-- - user.visible_message("[src] hums with power as [user] deals a blow to [activate_descriptor] itself!") + user.visible_message(span_boldannounce("[src] hums with power as [user] deals a blow to [activate_descriptor] itself!")) else - to_chat(user, "The unearthly energies that powered the blade are now dormant.") + to_chat(user, span_danger("The unearthly energies that powered the blade are now dormant.")) /obj/effect/rend name = "tear in the fabric of reality" @@ -60,7 +60,7 @@ /obj/effect/rend/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/nullrod)) - user.visible_message("[user] seals \the [src] with \the [I].") + user.visible_message(span_danger("[user] seals \the [src] with \the [I].")) qdel(src) return else @@ -125,7 +125,7 @@ var/datum/component/mood/insaneinthemembrane = C.GetComponent(/datum/component/mood) if(insaneinthemembrane.sanity < 15) return //they've already seen it and are about to die, or are just too insane to care - to_chat(C, "OH GOD! NONE OF IT IS REAL! NONE OF IT IS REEEEEEEEEEEEEEEEEEEEEEEEAL!") + to_chat(C, span_danger("OH GOD! NONE OF IT IS REAL! NONE OF IT IS REEEEEEEEEEEEEEEEEEEEEEEEAL!")) insaneinthemembrane.sanity = 0 for(var/lore in typesof(/datum/brain_trauma/severe)) C.gain_trauma(lore) @@ -168,7 +168,7 @@ return if(M.stat != DEAD) - to_chat(user, "This artifact can only affect the dead!") + to_chat(user, span_warning("This artifact can only affect the dead!")) return for(var/mob/dead/observer/ghost in GLOB.dead_mob_list) //excludes new players @@ -177,19 +177,19 @@ break if(!M.mind || !M.client) - to_chat(user, "There is no soul connected to this body...") + to_chat(user, span_warning("There is no soul connected to this body...")) return check_spooky()//clean out/refresh the list if(spooky_scaries.len >= 3 && !unlimited) - to_chat(user, "This artifact can only affect three undead at a time!") + to_chat(user, span_warning("This artifact can only affect three undead at a time!")) return M.set_species(/datum/species/skeleton, icon_update=0) M.revive(full_heal = TRUE, admin_revive = TRUE) spooky_scaries |= M to_chat(M, "I have been revived by [user.real_name]!") - to_chat(M, "[user.p_theyre(TRUE)] my master now, assist [user.p_them()] even if it costs you my new life!") + to_chat(M, span_danger("[user.p_theyre(TRUE)] my master now, assist [user.p_them()] even if it costs you my new life!")) equip_roman_skeleton(M) @@ -243,15 +243,15 @@ /obj/item/voodoo/attackby(obj/item/I, mob/user, params) if(target && cooldown < world.time) if(I.get_temperature()) - to_chat(target, "I suddenly feel very hot!") + to_chat(target, span_danger("I suddenly feel very hot!")) target.adjust_bodytemperature(50) GiveHint(target) else if(is_pointed(I)) - to_chat(target, "I feel a stabbing pain in [parse_zone(user.zone_selected)]!") + to_chat(target, span_danger("I feel a stabbing pain in [parse_zone(user.zone_selected)]!")) target.Paralyze(40) GiveHint(target) else if(istype(I, /obj/item/bikehorn)) - to_chat(target, "HONK") + to_chat(target, span_danger("HONK")) SEND_SOUND(target, 'sound/blank.ogg') target.adjustEarDamage(0,3) GiveHint(target) @@ -279,7 +279,7 @@ if(voodoo_link) target = null voodoo_link.forceMove(drop_location()) - to_chat(user, "I remove the [voodoo_link] from the doll.") + to_chat(user, span_notice("I remove the [voodoo_link] from the doll.")) voodoo_link = null update_targets() return @@ -297,16 +297,16 @@ user.reset_perspective(null) user.unset_machine() if(BODY_ZONE_R_LEG,BODY_ZONE_L_LEG) - to_chat(user, "I move the doll's legs around.") + to_chat(user, span_notice("I move the doll's legs around.")) var/turf/T = get_step(target,pick(GLOB.cardinals)) target.Move(T) if(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM) target.click_random_mob() GiveHint(target) if(BODY_ZONE_HEAD) - to_chat(user, "I smack the doll's head with my hand.") + to_chat(user, span_notice("I smack the doll's head with my hand.")) target.Dizzy(10) - to_chat(target, "I suddenly feel as if my head was hit with a hammer!") + to_chat(target, span_warning("I suddenly feel as if my head was hit with a hammer!")) GiveHint(target,user) cooldown = world.time + cooldown_time @@ -324,13 +324,13 @@ /obj/item/voodoo/proc/GiveHint(mob/victim,force=0) if(prob(50) || force) var/way = dir2text(get_dir(victim,get_turf(src))) - to_chat(victim, "I feel a dark presence from [way].") + to_chat(victim, span_notice("I feel a dark presence from [way].")) if(prob(20) || force) var/area/A = get_area(src) - to_chat(victim, "I feel a dark presence from [A.name].") + to_chat(victim, span_notice("I feel a dark presence from [A.name].")) /obj/item/voodoo/suicide_act(mob/living/carbon/user) - user.visible_message("[user] links the voodoo doll to [user.p_them()]self and sits on it, infinitely crushing [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] links the voodoo doll to [user.p_them()]self and sits on it, infinitely crushing [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!")) user.gib() return(BRUTELOSS) diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index 73453afc9..52b9a3174 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -41,18 +41,18 @@ /obj/item/soulstone/pickup(mob/living/user) ..() if(!iscultist(user) && !iswizard(user) && !usability) - to_chat(user, "An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.") + to_chat(user, span_danger("An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.")) /obj/item/soulstone/examine(mob/user) . = ..() if(usability || iscultist(user) || iswizard(user) || isobserver(user)) if (old_shard) - . += "A soulstone, used to capture a soul, either from dead humans or from freed shades." + . += span_cult("A soulstone, used to capture a soul, either from dead humans or from freed shades.") else - . += "A soulstone, used to capture souls, either from unconscious or sleeping humans or from freed shades." - . += "The captured soul can be placed into a construct shell to produce a construct, or released from the stone as a shade." + . += span_cult("A soulstone, used to capture souls, either from unconscious or sleeping humans or from freed shades.") + . += span_cult("The captured soul can be placed into a construct shell to produce a construct, or released from the stone as a shade.") if(spent) - . += "This shard is spent; it is now just a creepy rock." + . += span_cult("This shard is spent; it is now just a creepy rock.") /obj/item/soulstone/Destroy() //Stops the shade from being qdel'd immediately and their ghost being sent back to the arrival shuttle. for(var/mob/living/simple_animal/shade/A in src) @@ -60,7 +60,7 @@ return ..() /obj/item/soulstone/proc/hot_potato(mob/living/user) - to_chat(user, "Holy magics residing in \the [src] burn my hand!") + to_chat(user, span_danger("Holy magics residing in \the [src] burn my hand!")) var/obj/item/bodypart/affecting = user.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") affecting.receive_damage( 0, 10 ) // 10 burn damage user.emote("scream") @@ -72,19 +72,19 @@ /obj/item/soulstone/attack(mob/living/carbon/human/M, mob/living/user) if(!iscultist(user) && !iswizard(user) && !usability) user.Unconscious(100) - to_chat(user, "My body is wracked with debilitating pain!") + to_chat(user, span_danger("My body is wracked with debilitating pain!")) return if(spent) - to_chat(user, "There is no power left in the shard.") + to_chat(user, span_warning("There is no power left in the shard.")) return if(!ishuman(M))//If target is not a human. return ..() if(!M.mind.hasSoul || is_devil(M)) - to_chat(user, "This... thing has no soul! It's filled with evil!") + to_chat(user, span_warning("This... thing has no soul! It's filled with evil!")) return if(iscultist(M)) if(iscultist(user)) - to_chat(user, "\"Come now, do not capture my bretheren's soul.\"") + to_chat(user, span_cultlarge("\"Come now, do not capture my bretheren's soul.\"")) return if(purified && iscultist(user)) hot_potato(user) @@ -99,7 +99,7 @@ return if(!iscultist(user) && !iswizard(user) && !usability) user.Unconscious(100) - to_chat(user, "My body is wracked with debilitating pain!") + to_chat(user, span_danger("My body is wracked with debilitating pain!")) return if(purified && iscultist(user)) hot_potato(user) @@ -143,7 +143,7 @@ if(istype(O, /obj/item/soulstone)) var/obj/item/soulstone/SS = O if(!iscultist(user) && !iswizard(user) && !SS.purified) - to_chat(user, "An overwhelming feeling of dread comes over you as you attempt to place the soulstone into the shell. It would be wise to be rid of this quickly.") + to_chat(user, span_danger("An overwhelming feeling of dread comes over you as you attempt to place the soulstone into the shell. It would be wise to be rid of this quickly.")) user.Dizzy(30) return if(SS.purified && iscultist(user)) @@ -179,9 +179,9 @@ var/datum/antagonist/cult/C = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE) if(C && C.cult_team.is_sacrifice_target(T.mind)) if(iscultist(user)) - to_chat(user, "\"This soul is mine. SACRIFICE THEM!\"") + to_chat(user, span_cult("\"This soul is mine.
SACRIFICE THEM!\"")) else - to_chat(user, "The soulstone seems to reject this soul.") + to_chat(user, span_danger("The soulstone seems to reject this soul.")) return FALSE if(contents.len) to_chat(user, "Capture failed!: The soulstone is full! Free an existing soul to make room.") @@ -211,7 +211,7 @@ else icon_state = "soulstone2" name = "soulstone: Shade of [T.real_name]" - to_chat(T, "My soul has been captured by the soulstone. Its arcane energies are reknitting my ethereal form.") + to_chat(T, span_notice("My soul has been captured by the soulstone. Its arcane energies are reknitting my ethereal form.")) if(user != T) to_chat(user, "Capture successful!: [T.real_name]'s soul has been captured and stored within the soulstone.") @@ -323,7 +323,7 @@ if(!T) return FALSE if(!chosen_ghost || !chosen_ghost.client) - to_chat(user, "There were no spirits willing to become a shade.") + to_chat(user, span_danger("There were no spirits willing to become a shade.")) return FALSE if(contents.len) //If they used the soulstone on someone else in the meantime return FALSE diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index c9091232e..3eeb6f13a 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -34,7 +34,7 @@ for(var/obj/effect/proc_holder/spell/aspell in user.mind.spell_list) if(initial(S.name) == initial(aspell.name)) // Not using directly in case it was learned from one spellbook then upgraded in another if(aspell.spell_level >= aspell.level_max) - to_chat(user, "This spell cannot be improved further!") + to_chat(user, span_warning("This spell cannot be improved further!")) return FALSE else aspell.name = initial(aspell.name) @@ -44,25 +44,25 @@ aspell.charge_counter = aspell.charge_max switch(aspell.spell_level) if(1) - to_chat(user, "I have improved [aspell.name] into Efficient [aspell.name].") + to_chat(user, span_notice("I have improved [aspell.name] into Efficient [aspell.name].")) aspell.name = "Efficient [aspell.name]" if(2) - to_chat(user, "I have further improved [aspell.name] into Quickened [aspell.name].") + to_chat(user, span_notice("I have further improved [aspell.name] into Quickened [aspell.name].")) aspell.name = "Quickened [aspell.name]" if(3) - to_chat(user, "I have further improved [aspell.name] into Free [aspell.name].") + to_chat(user, span_notice("I have further improved [aspell.name] into Free [aspell.name].")) aspell.name = "Free [aspell.name]" if(4) - to_chat(user, "I have further improved [aspell.name] into Instant [aspell.name].") + to_chat(user, span_notice("I have further improved [aspell.name] into Instant [aspell.name].")) aspell.name = "Instant [aspell.name]" if(aspell.spell_level >= aspell.level_max) - to_chat(user, "This spell cannot be strengthened any further!") + to_chat(user, span_warning("This spell cannot be strengthened any further!")) SSblackbox.record_feedback("nested tally", "wizard_spell_improved", 1, list("[name]", "[aspell.spell_level]")) return TRUE //No same spell found - just learn it SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name) user.mind.AddSpell(S) - to_chat(user, "I have learned [S.name].") + to_chat(user, span_notice("I have learned [S.name].")) return TRUE /datum/spellbook_entry/proc/CanRefund(mob/living/carbon/human/user,obj/item/spellbook/book) @@ -78,7 +78,7 @@ /datum/spellbook_entry/proc/Refund(mob/living/carbon/human/user,obj/item/spellbook/book) //return point value or -1 for failure var/area/wizard_station/A = GLOB.areas_by_type[/area/wizard_station] if(!(user in A.contents)) - to_chat(user, "I can only refund spells at the wizard lair!") + to_chat(user, span_warning("I can only refund spells at the wizard lair!")) return -1 if(!S) S = new spell_type() @@ -481,7 +481,7 @@ SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name) new /datum/round_event/wizard/ghost() active = TRUE - to_chat(user, "I have cast summon ghosts!") + to_chat(user, span_notice("I have cast summon ghosts!")) playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE) return TRUE @@ -501,7 +501,7 @@ rightandwrong(SUMMON_GUNS, user, 10) active = TRUE playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I have cast summon guns!") + to_chat(user, span_notice("I have cast summon guns!")) return TRUE /datum/spellbook_entry/summon/magic @@ -520,7 +520,7 @@ rightandwrong(SUMMON_MAGIC, user, 10) active = TRUE playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I have cast summon magic!") + to_chat(user, span_notice("I have cast summon magic!")) return TRUE /datum/spellbook_entry/summon/events @@ -540,7 +540,7 @@ summonevents() times++ playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I have cast summon events.") + to_chat(user, span_notice("I have cast summon events.")) return TRUE /datum/spellbook_entry/summon/events/GetInfo() @@ -561,7 +561,7 @@ if(!message) return FALSE curse_of_madness(user, message) - to_chat(user, "I have cast the curse of insanity!") + to_chat(user, span_notice("I have cast the curse of insanity!")) playsound(user, 'sound/blank.ogg', 50, TRUE) return TRUE @@ -606,16 +606,16 @@ if(istype(O, /obj/item/antag_spawner/contract)) var/obj/item/antag_spawner/contract/contract = O if(contract.used) - to_chat(user, "The contract has been used, you can't get your points back now!") + to_chat(user, span_warning("The contract has been used, you can't get your points back now!")) else - to_chat(user, "I feed the contract back into the spellbook, refunding your points.") + to_chat(user, span_notice("I feed the contract back into the spellbook, refunding your points.")) uses += 2 for(var/datum/spellbook_entry/item/contract/CT in entries) if(!isnull(CT.limit)) CT.limit++ qdel(O) else if(istype(O, /obj/item/antag_spawner/slaughter_demon)) - to_chat(user, "On second thought, maybe summoning a demon is a bad idea. You refund your points.") + to_chat(user, span_notice("On second thought, maybe summoning a demon is a bad idea. You refund your points.")) if(istype(O, /obj/item/antag_spawner/slaughter_demon/laughter)) uses += 1 for(var/datum/spellbook_entry/item/hugbottle/HB in entries) @@ -680,11 +680,11 @@ /obj/item/spellbook/attack_self(mob/user) if(!owner) - to_chat(user, "I bind the spellbook to myself.") + to_chat(user, span_notice("I bind the spellbook to myself.")) owner = user return if(user != owner) - to_chat(user, "The [name] does not recognize you as its owner and refuses to open!") + to_chat(user, span_warning("The [name] does not recognize you as its owner and refuses to open!")) return user.set_machine(src) var/dat = "" diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index f06eeb525..74ea2ccb5 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -126,7 +126,7 @@ H.equipOutfit(outfit_type) /datum/antagonist/wizard/greet() - to_chat(owner, "I are the Space Wizard!") + to_chat(owner, span_boldannounce("I are the Space Wizard!")) to_chat(owner, "The Space Wizards Federation has given you the following tasks:") owner.announce_objectives() to_chat(owner, "You will find a list of available spells in my spell book. Choose my magic arsenal carefully.") @@ -135,7 +135,7 @@ to_chat(owner,"Remember: do not forget to prepare my spells.") /datum/antagonist/wizard/farewell() - to_chat(owner, "I have been brainwashed! You are no longer a wizard!") + to_chat(owner, span_danger("I have been brainwashed! You are no longer a wizard!")) /datum/antagonist/wizard/proc/rename_wizard() set waitfor = FALSE @@ -294,9 +294,9 @@ count++ if(wizardwin) - parts += "The wizard was successful!" + parts += span_greentext("The wizard was successful!") else - parts += "The wizard has failed!" + parts += span_redtext("The wizard has failed!") if(owner.spell_list.len>0) parts += "[owner.name] used the following spells: " @@ -311,10 +311,10 @@ /datum/team/wizard/roundend_report() var/list/parts = list() - parts += "Wizards/witches of [master_wizard.owner.name] team were:" + parts += span_header("Wizards/witches of [master_wizard.owner.name] team were:") parts += master_wizard.roundend_report() parts += " " - parts += "[master_wizard.owner.name] apprentices were:" + parts += span_header("[master_wizard.owner.name] apprentices were:") parts += printplayerlist(members - master_wizard.owner) return "
[parts.Join("
")]
" diff --git a/code/modules/antagonists/xeno/xeno.dm b/code/modules/antagonists/xeno/xeno.dm index aa4e40145..455164e90 100644 --- a/code/modules/antagonists/xeno/xeno.dm +++ b/code/modules/antagonists/xeno/xeno.dm @@ -4,7 +4,7 @@ //Simply lists them. /datum/team/xeno/roundend_report() var/list/parts = list() - parts += "The [name] were:" + parts += span_header("The [name] were:") parts += printplayerlist(members) return "
[parts.Join("
")]
" diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 0936ae68d..459c24fc7 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -48,7 +48,7 @@ /obj/item/assembly/proc/is_secured(mob/user) if(!secured) - to_chat(user, "The [name] is unsecured!") + to_chat(user, span_warning("The [name] is unsecured!")) return FALSE return TRUE @@ -94,9 +94,9 @@ if((!A.secured) && (!secured)) holder = new/obj/item/assembly_holder(get_turf(src)) holder.assemble(src,A,user) - to_chat(user, "I attach and secure \the [A] to \the [src]!") + to_chat(user, span_notice("I attach and secure \the [A] to \the [src]!")) else - to_chat(user, "Both devices must be in attachable mode to be attached together.") + to_chat(user, span_warning("Both devices must be in attachable mode to be attached together.")) return ..() @@ -104,15 +104,15 @@ if(..()) return TRUE if(toggle_secure()) - to_chat(user, "\The [src] is ready!") + to_chat(user, span_notice("\The [src] is ready!")) else - to_chat(user, "\The [src] can now be attached!") + to_chat(user, span_notice("\The [src] can now be attached!")) add_fingerprint(user) return TRUE /obj/item/assembly/examine(mob/user) . = ..() - . += "\The [src] [secured? "is secured and ready to be used!" : "can be attached to other things."]" + . += span_notice("\The [src] [secured? "is secured and ready to be used!" : "can be attached to other things."]") /obj/item/assembly/attack_self(mob/user) diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index 0d620381c..e4d7a3cd1 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -31,7 +31,7 @@ /obj/item/onetankbomb/wrench_act(mob/living/user, obj/item/I) ..() - to_chat(user, "I disassemble [src]!") + to_chat(user, span_notice("I disassemble [src]!")) if(bombassembly) bombassembly.forceMove(drop_location()) bombassembly.master = null @@ -47,14 +47,14 @@ ..() . = FALSE if(status) - to_chat(user, "[bombtank] already has a pressure hole!") + to_chat(user, span_warning("[bombtank] already has a pressure hole!")) return if(!I.tool_start_check(user, amount=0)) return if(I.use_tool(src, user, 0, volume=40)) status = TRUE log_bomber(user, "welded a single tank bomb,", src, "| Temp: [bombtank.air_contents.temperature-T0C]") - to_chat(user, "A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.") + to_chat(user, span_notice("A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.")) add_fingerprint(user) return TRUE @@ -115,11 +115,11 @@ return if((src in user.get_equipped_items(TRUE)) && !user.canUnEquip(src)) - to_chat(user, "[src] is stuck to you!") + to_chat(user, span_warning("[src] is stuck to you!")) return if(!user.canUnEquip(assembly)) - to_chat(user, "[assembly] is stuck to your hand!") + to_chat(user, span_warning("[assembly] is stuck to your hand!")) return var/obj/item/onetankbomb/bomb = new @@ -136,7 +136,7 @@ bomb.update_icon() user.put_in_hands(bomb) //Equips the bomb if possible, or puts it on the floor. - to_chat(user, "I attach [assembly] to [src].") + to_chat(user, span_notice("I attach [assembly] to [src].")) return /obj/item/tank/proc/ignite() //This happens when a bomb is told to explode diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm index 4f3550a37..bf3a15631 100644 --- a/code/modules/assembly/doorcontrol.dm +++ b/code/modules/assembly/doorcontrol.dm @@ -11,7 +11,7 @@ /obj/item/assembly/control/examine(mob/user) . = ..() if(id) - . += "Its channel ID is '[id]'." + . += span_notice("Its channel ID is '[id]'.") /obj/item/assembly/control/activate() var/openclose diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index 53358bd80..e47a7aa12 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -21,12 +21,12 @@ /obj/item/assembly/flash/suicide_act(mob/living/user) if(burnt_out) - user.visible_message("[user] raises \the [src] up to [user.p_their()] eyes and activates it ... but it's burnt out!") + user.visible_message(span_suicide("[user] raises \the [src] up to [user.p_their()] eyes and activates it ... but it's burnt out!")) return SHAME else if(user.eye_blind) - user.visible_message("[user] raises \the [src] up to [user.p_their()] eyes and activates it ... but [user.p_theyre()] blind!") + user.visible_message(span_suicide("[user] raises \the [src] up to [user.p_their()] eyes and activates it ... but [user.p_theyre()] blind!")) return SHAME - user.visible_message("[user] raises \the [src] up to [user.p_their()] eyes and activates it! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] raises \the [src] up to [user.p_their()] eyes and activates it! It looks like [user.p_theyre()] trying to commit suicide!")) attack(user,user) return FIRELOSS @@ -55,10 +55,10 @@ update_icon() if(ismob(loc)) var/mob/M = loc - M.visible_message("[src] burns out!","[src] burns out!") + M.visible_message(span_danger("[src] burns out!"),span_danger("[src] burns out!")) else var/turf/T = get_turf(src) - T.visible_message("[src] burns out!") + T.visible_message(span_danger("[src] burns out!")) /obj/item/assembly/flash/proc/flash_recharge(interval = 10) var/deciseconds_passed = world.time - last_used @@ -113,7 +113,7 @@ else //caused by emp/remote signal M.log_message("was [targeted? "flashed(targeted)" : "flashed(AOE)"]",LOG_ATTACK) if(generic_message && M != user) - to_chat(M, "[src] emits a blinding light!") + to_chat(M, span_danger("[src] emits a blinding light!")) if(targeted) if(M.flash_act(1, 1)) if(M.confused < power) @@ -121,18 +121,18 @@ M.confused += min(power, diff) if(user) terrible_conversion_proc(M, user) - visible_message("[user] blinds [M] with the flash!") - to_chat(user, "I blind [M] with the flash!") - to_chat(M, "[user] blinds you with the flash!") + visible_message(span_danger("[user] blinds [M] with the flash!")) + to_chat(user, span_danger("I blind [M] with the flash!")) + to_chat(M, span_danger("[user] blinds you with the flash!")) else - to_chat(M, "I are blinded by [src]!") + to_chat(M, span_danger("I are blinded by [src]!")) M.Paralyze(rand(80,120)) else if(user) - visible_message("[user] fails to blind [M] with the flash!") - to_chat(user, "I fail to blind [M] with the flash!") - to_chat(M, "[user] fails to blind you with the flash!") + visible_message(span_warning("[user] fails to blind [M] with the flash!")) + to_chat(user, span_warning("I fail to blind [M] with the flash!")) + to_chat(M, span_danger("[user] fails to blind you with the flash!")) else - to_chat(M, "[src] fails to blind you!") + to_chat(M, span_danger("[src] fails to blind you!")) else if(M.flash_act()) var/diff = power * CONFUSION_STACK_MAX_MULTIPLIER - M.confused @@ -152,17 +152,17 @@ var/diff = 5 * CONFUSION_STACK_MAX_MULTIPLIER - M.confused R.confused += min(5, diff) R.flash_act(affect_silicon = 1) - user.visible_message("[user] overloads [R]'s sensors with the flash!", "I overload [R]'s sensors with the flash!") + user.visible_message(span_warning("[user] overloads [R]'s sensors with the flash!"), span_danger("I overload [R]'s sensors with the flash!")) return TRUE - user.visible_message("[user] fails to blind [M] with the flash!", "I fail to blind [M] with the flash!") + user.visible_message(span_warning("[user] fails to blind [M] with the flash!"), span_warning("I fail to blind [M] with the flash!")) /obj/item/assembly/flash/attack_self(mob/living/carbon/user, flag = 0, emp = 0) if(holder) return FALSE if(!AOE_flash(FALSE, 3, 5, FALSE, user)) return FALSE - to_chat(user, "[src] emits a blinding light!") + to_chat(user, span_danger("[src] emits a blinding light!")) /obj/item/assembly/flash/emp_act(severity) . = ..() @@ -185,15 +185,15 @@ if(!converter) return if(!H.client) - to_chat(user, "This mind is so vacant that it is not susceptible to influence!") + to_chat(user, span_warning("This mind is so vacant that it is not susceptible to influence!")) return if(H.stat != CONSCIOUS) - to_chat(user, "They must be conscious before you can convert [H.p_them()]!") + to_chat(user, span_warning("They must be conscious before you can convert [H.p_them()]!")) return if(converter.add_revolutionary(H.mind)) times_used -- //Flashes less likely to burn out for headrevs when used for conversion else - to_chat(user, "This mind seems resistant to the flash!") + to_chat(user, span_warning("This mind seems resistant to the flash!")) /obj/item/assembly/flash/cyborg @@ -229,7 +229,7 @@ /obj/item/assembly/flash/armimplant/burn_out() if(I && I.owner) - to_chat(I.owner, "My photon projector implant overheats and deactivates!") + to_chat(I.owner, span_warning("My photon projector implant overheats and deactivates!")) I.Retract() overheat = TRUE addtimer(CALLBACK(src, PROC_REF(cooldown)), flashcd * 2) @@ -237,7 +237,7 @@ /obj/item/assembly/flash/armimplant/try_use_flash(mob/user = null) if(overheat) if(I && I.owner) - to_chat(I.owner, "My photon projector is running too hot to be used again so quickly!") + to_chat(I.owner, span_warning("My photon projector is running too hot to be used again so quickly!")) return FALSE overheat = TRUE addtimer(CALLBACK(src, PROC_REF(cooldown)), flashcd) @@ -266,17 +266,17 @@ else //caused by emp/remote signal M.log_message("was [targeted? "hypno-flashed(targeted)" : "hypno-flashed(AOE)"]",LOG_ATTACK) if(generic_message && M != user) - to_chat(M, "[src] emits a soothing light...") + to_chat(M, span_notice("[src] emits a soothing light...")) if(targeted) if(M.flash_act(1, 1)) var/hypnosis = FALSE if(M.hypnosis_vulnerable()) hypnosis = TRUE if(user) - user.visible_message("[user] blinds [M] with the flash!", "I hypno-flash [M]!") + user.visible_message(span_danger("[user] blinds [M] with the flash!"), span_danger("I hypno-flash [M]!")) if(!hypnosis) - to_chat(M, "The light makes you feel oddly relaxed...") + to_chat(M, span_notice("The light makes you feel oddly relaxed...")) M.confused += min(M.confused + 10, 20) M.dizziness += min(M.dizziness + 10, 20) M.drowsyness += min(M.drowsyness + 10, 20) @@ -285,12 +285,12 @@ M.apply_status_effect(/datum/status_effect/trance, 200, TRUE) else if(user) - user.visible_message("[user] fails to blind [M] with the flash!", "I fail to hypno-flash [M]!") + user.visible_message(span_warning("[user] fails to blind [M] with the flash!"), span_warning("I fail to hypno-flash [M]!")) else - to_chat(M, "[src] fails to blind you!") + to_chat(M, span_danger("[src] fails to blind you!")) else if(M.flash_act()) - to_chat(M, "Such a pretty light...") + to_chat(M, span_notice("Such a pretty light...")) M.confused += min(M.confused + 4, 20) M.dizziness += min(M.dizziness + 4, 20) M.drowsyness += min(M.drowsyness + 4, 20) diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm index e4f646242..faa3ab735 100644 --- a/code/modules/assembly/health.dm +++ b/code/modules/assembly/health.dm @@ -33,10 +33,10 @@ /obj/item/assembly/health/AltClick(mob/living/user) if(alarm_health == HEALTH_THRESHOLD_CRIT) alarm_health = HEALTH_THRESHOLD_DEAD - to_chat(user, "I toggle [src] to \"detect death\" mode.") + to_chat(user, span_notice("I toggle [src] to \"detect death\" mode.")) else alarm_health = HEALTH_THRESHOLD_CRIT - to_chat(user, "I toggle [src] to \"detect critical state\" mode.") + to_chat(user, span_notice("I toggle [src] to \"detect critical state\" mode.")) /obj/item/assembly/health/process() if(!scanning || !secured) @@ -71,5 +71,5 @@ /obj/item/assembly/health/attack_self(mob/user) . = ..() - to_chat(user, "I toggle [src] [src.scanning ? "off" : "on"].") + to_chat(user, span_notice("I toggle [src] [src.scanning ? "off" : "on"].")) toggle_scan() diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 197a86d65..70fdcbe05 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -105,7 +105,7 @@ /obj/item/assembly_holder/screwdriver_act(mob/user, obj/item/tool) if(..()) return TRUE - to_chat(user, "I disassemble [src]!") + to_chat(user, span_notice("I disassemble [src]!")) if(a_left) a_left.on_detach() a_left = null @@ -118,7 +118,7 @@ /obj/item/assembly_holder/attack_self(mob/user) src.add_fingerprint(user) if(!a_left || !a_right) - to_chat(user, "Assembly part missing!") + to_chat(user, span_danger("Assembly part missing!")) return if(istype(a_left,a_right.type))//If they are the same type it causes issues due to window code switch(alert("Which side would you like to use?",,"Left","Right")) diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 95655068e..bc79b37b4 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -7,7 +7,7 @@ heat = 1000 /obj/item/assembly/igniter/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is trying to ignite [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is trying to ignite [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) user.IgniteMob() return FIRELOSS diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 377fdbb59..de15d25ea 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -39,7 +39,7 @@ /obj/item/assembly/infra/examine(mob/user) . = ..() - . += "The infrared trigger is [on?"on":"off"]." + . += span_notice("The infrared trigger is [on?"on":"off"].") /obj/item/assembly/infra/activate() if(!..()) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index b12ad98f7..f69afdd44 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -10,7 +10,7 @@ /obj/item/assembly/mousetrap/examine(mob/user) . = ..() - . += "The pressure plate is [armed?"primed":"safe"]." + . += span_notice("The pressure plate is [armed?"primed":"safe"].") /obj/item/assembly/mousetrap/activate() if(..()) @@ -19,7 +19,7 @@ if(ishuman(usr)) var/mob/living/carbon/human/user = usr if((HAS_TRAIT(user, TRAIT_DUMB) || HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50)) - to_chat(user, "My hand slips, setting off the trigger!") + to_chat(user, span_warning("My hand slips, setting off the trigger!")) pulse(FALSE) update_icon() playsound(src, 'sound/blank.ogg', 30, TRUE, -3) @@ -58,7 +58,7 @@ H.update_damage_overlays() else if(ismouse(target)) var/mob/living/simple_animal/mouse/M = target - visible_message("SPLAT!") + visible_message(span_boldannounce("SPLAT!")) M.splat() playsound(src, 'sound/blank.ogg', 50, TRUE) armed = FALSE @@ -68,17 +68,17 @@ /obj/item/assembly/mousetrap/attack_self(mob/living/carbon/human/user) if(!armed) - to_chat(user, "I arm [src].") + to_chat(user, span_notice("I arm [src].")) else if((HAS_TRAIT(user, TRAIT_DUMB) || HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50)) var/which_hand = BODY_ZONE_PRECISE_L_HAND if(!(user.active_hand_index % 2)) which_hand = BODY_ZONE_PRECISE_R_HAND triggered(user, which_hand) - user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \ - "I accidentally trigger [src]!") + user.visible_message(span_warning("[user] accidentally sets off [src], breaking their fingers."), \ + span_warning("I accidentally trigger [src]!")) return - to_chat(user, "I disarm [src].") + to_chat(user, span_notice("I disarm [src].")) armed = !armed update_icon() playsound(src, 'sound/blank.ogg', 30, TRUE, -3) @@ -92,8 +92,8 @@ if(!(user.active_hand_index % 2)) which_hand = BODY_ZONE_PRECISE_R_HAND triggered(user, which_hand) - user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \ - "I accidentally trigger [src]!") + user.visible_message(span_warning("[user] accidentally sets off [src], breaking their fingers."), \ + span_warning("I accidentally trigger [src]!")) return return ..() @@ -107,8 +107,8 @@ var/mob/living/carbon/H = AM if(H.m_intent == MOVE_INTENT_RUN) triggered(H) - H.visible_message("[H] accidentally steps on [src].", \ - "I accidentally step on [src]") + H.visible_message(span_warning("[H] accidentally steps on [src]."), \ + span_warning("I accidentally step on [src]")) else if(ismouse(MM)) triggered(MM) else if(AM.density) // For mousetrap grenades, set off by anything heavy @@ -119,12 +119,12 @@ /obj/item/assembly/mousetrap/on_found(mob/finder) if(armed) if(finder) - finder.visible_message("[finder] accidentally sets off [src], breaking their fingers.", \ - "I accidentally trigger [src]!") + finder.visible_message(span_warning("[finder] accidentally sets off [src], breaking their fingers."), \ + span_warning("I accidentally trigger [src]!")) triggered(finder, (finder.active_hand_index % 2 == 0) ? BODY_ZONE_PRECISE_R_HAND : BODY_ZONE_PRECISE_L_HAND) return TRUE //end the search! else - visible_message("[src] snaps shut!") + visible_message(span_warning("[src] snaps shut!")) triggered(loc) return FALSE return FALSE @@ -133,7 +133,7 @@ /obj/item/assembly/mousetrap/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum, d_type = "blunt") if(!armed) return ..() - visible_message("[src] is triggered by [AM].") + visible_message(span_warning("[src] is triggered by [AM].")) triggered(null) diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 9e564fcef..04fd2c433 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -22,7 +22,7 @@ /obj/item/assembly/prox_sensor/examine(mob/user) . = ..() - . += "The proximity sensor is [timing ? "arming" : (scanning ? "armed" : "disarmed")]." + . += span_notice("The proximity sensor is [timing ? "arming" : (scanning ? "armed" : "disarmed")].") /obj/item/assembly/prox_sensor/activate() if(!..()) diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index 82c2c276c..3d2678888 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -15,7 +15,7 @@ /obj/item/assembly/shock_kit/wrench_act(mob/living/user, obj/item/I) ..() - to_chat(user, "I disassemble [src].") + to_chat(user, span_notice("I disassemble [src].")) if(part1) part1.forceMove(drop_location()) part1.master = null diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index c8a972137..a8ee3821d 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -20,7 +20,7 @@ var/hearing_range = 1 /obj/item/assembly/signaler/suicide_act(mob/living/carbon/user) - user.visible_message("[user] eats \the [src]! If it is signaled, [user.p_they()] will die!") + user.visible_message(span_suicide("[user] eats \the [src]! If it is signaled, [user.p_they()] will die!")) playsound(src, 'sound/blank.ogg', 50, TRUE) moveToNullspace() suicider = user.mind @@ -32,9 +32,9 @@ if(!istype(user)) return if(suicide_mob == REF(user)) - user.visible_message("[user]'s [src] receives a signal, killing [user.p_them()] instantly!") + user.visible_message(span_suicide("[user]'s [src] receives a signal, killing [user.p_them()] instantly!")) else - user.visible_message("[user]'s [src] receives a signal and [user.p_they()] die[user.p_s()] like a gamer!") + user.visible_message(span_suicide("[user]'s [src] receives a signal and [user.p_they()] die[user.p_s()] like a gamer!")) user.adjustOxyLoss(200)//it sends an electrical pulse to their heart, killing them. or something. user.death(0) user.set_suicide(TRUE) @@ -185,7 +185,7 @@ Code: /obj/item/assembly/signaler/receiver/examine(mob/user) . = ..() - . += "The radio receiver is [on?"on":"off"]." + . += span_notice("The radio receiver is [on?"on":"off"].") /obj/item/assembly/signaler/receiver/receive_signal(datum/signal/signal) if(!on) @@ -216,14 +216,14 @@ Code: return TRUE /obj/item/assembly/signaler/anomaly/manual_suicide(mob/living/carbon/user) - user.visible_message("[user]'s [src] is reacting to the radio signal, warping [user.p_their()] body!") + user.visible_message(span_suicide("[user]'s [src] is reacting to the radio signal, warping [user.p_their()] body!")) user.set_suicide(TRUE) user.suicide_log() user.gib() /obj/item/assembly/signaler/anomaly/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_ANALYZER) - to_chat(user, "Analyzing... [src]'s stabilized field is fluctuating along frequency [format_frequency(frequency)], code [code].") + to_chat(user, span_notice("Analyzing... [src]'s stabilized field is fluctuating along frequency [format_frequency(frequency)], code [code].")) ..() /obj/item/assembly/signaler/anomaly/attack_self() diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 08ff8602e..41cbc4fc8 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -12,13 +12,13 @@ var/hearing_range = 3 /obj/item/assembly/timer/suicide_act(mob/living/user) - user.visible_message("[user] looks at the timer and decides [user.p_their()] fate! It looks like [user.p_theyre()] going to commit suicide!") + user.visible_message(span_suicide("[user] looks at the timer and decides [user.p_their()] fate! It looks like [user.p_theyre()] going to commit suicide!")) activate()//doesnt rely on timer_end to prevent weird metas where one person can control the timer and therefore someone's life. (maybe that should be how it works...) addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), time*10)//kill myself once the time runs out return MANUAL_SUICIDE /obj/item/assembly/timer/proc/manual_suicide(mob/living/user) - user.visible_message("[user]'s time is up!") + user.visible_message(span_suicide("[user]'s time is up!")) user.adjustOxyLoss(200) user.death(0) @@ -32,7 +32,7 @@ /obj/item/assembly/timer/examine(mob/user) . = ..() - . += "The timer is [timing ? "counting down from [time]":"set for [time] seconds"]." + . += span_notice("The timer is [timing ? "counting down from [time]":"set for [time] seconds"].") /obj/item/assembly/timer/activate() if(!..()) diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index f8a05a06b..86cdf68aa 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -23,7 +23,7 @@ /obj/item/assembly/voice/examine(mob/user) . = ..() - . += "Use a multitool to swap between \"inclusive\", \"exclusive\", \"recognizer\", and \"voice sensor\" mode." + . += span_notice("Use a multitool to swap between \"inclusive\", \"exclusive\", \"recognizer\", and \"voice sensor\" mode.") /obj/item/assembly/voice/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) . = ..() @@ -74,7 +74,7 @@ ..() mode %= modes.len mode++ - to_chat(user, "I set [src] into [modes[mode]] mode.") + to_chat(user, span_notice("I set [src] into [modes[mode]] mode.")) listening = FALSE recorded = "" return TRUE diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index f1b47e199..1af424427 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -224,11 +224,11 @@ . = ..() switch(buildstage) if(0) - . += "It is missing air alarm electronics." + . += span_notice("It is missing air alarm electronics.") if(1) - . += "It is missing wiring." + . += span_notice("It is missing wiring.") if(2) - . += "Alt-click to [locked ? "unlock" : "lock"] the interface." + . += span_notice("Alt-click to [locked ? "unlock" : "lock"] the interface.") /obj/machinery/airalarm/ui_status(mob/user) if(user.has_unlimited_silicon_privilege && aidisabled) @@ -710,7 +710,7 @@ if(2) if(W.tool_behaviour == TOOL_WIRECUTTER && panel_open && wires.is_all_cut()) W.play_tool_sound(src) - to_chat(user, "I cut the final wires.") + to_chat(user, span_notice("I cut the final wires.")) new /obj/item/stack/cable_coil(loc, 5) buildstage = 1 update_icon() @@ -718,7 +718,7 @@ else if(W.tool_behaviour == TOOL_SCREWDRIVER) // Opening that Air Alarm up. W.play_tool_sound(src) panel_open = !panel_open - to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"].") + to_chat(user, span_notice("The wires have been [panel_open ? "exposed" : "unexposed"].")) update_icon() return else if(istype(W, /obj/item/card/id) || istype(W, /obj/item/pda))// trying to unlock the interface with an ID card @@ -729,12 +729,12 @@ return if(1) if(W.tool_behaviour == TOOL_CROWBAR) - user.visible_message("[user.name] removes the electronics from [src.name].", \ - "I start prying out the circuit...") + user.visible_message(span_notice("[user.name] removes the electronics from [src.name]."), \ + span_notice("I start prying out the circuit...")) W.play_tool_sound(src) if (W.use_tool(src, user, 20)) if (buildstage == 1) - to_chat(user, "I remove the air alarm electronics.") + to_chat(user, span_notice("I remove the air alarm electronics.")) new /obj/item/electronics/airalarm( src.loc ) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) buildstage = 0 @@ -744,14 +744,14 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/cable = W if(cable.get_amount() < 5) - to_chat(user, "I need five lengths of cable to wire the air alarm!") + to_chat(user, span_warning("I need five lengths of cable to wire the air alarm!")) return - user.visible_message("[user.name] wires the air alarm.", \ - "I start wiring the air alarm...") + user.visible_message(span_notice("[user.name] wires the air alarm."), \ + span_notice("I start wiring the air alarm...")) if (do_after(user, 20, target = src)) if (cable.get_amount() >= 5 && buildstage == 1) cable.use(5) - to_chat(user, "I wire the air alarm.") + to_chat(user, span_notice("I wire the air alarm.")) wires.repair() aidisabled = 0 locked = FALSE @@ -764,7 +764,7 @@ if(0) if(istype(W, /obj/item/electronics/airalarm)) if(user.temporarilyRemoveItemFromInventory(W)) - to_chat(user, "I insert the circuit.") + to_chat(user, span_notice("I insert the circuit.")) buildstage = 1 update_icon() qdel(W) @@ -774,14 +774,14 @@ var/obj/item/electroadaptive_pseudocircuit/P = W if(!P.adapt_circuit(user, 25)) return - user.visible_message("[user] fabricates a circuit and places it into [src].", \ - "I adapt an air alarm circuit and slot it into the assembly.") + user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ + span_notice("I adapt an air alarm circuit and slot it into the assembly.")) buildstage = 1 update_icon() return if(W.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I detach \the [src] from the wall.") + to_chat(user, span_notice("I detach \the [src] from the wall.")) W.play_tool_sound(src) new /obj/item/wallframe/airalarm( user.loc ) qdel(src) @@ -797,8 +797,8 @@ /obj/machinery/airalarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_UPGRADE_SIMPLE_CIRCUITS) - user.visible_message("[user] fabricates a circuit and places it into [src].", \ - "I adapt an air alarm circuit and slot it into the assembly.") + user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ + span_notice("I adapt an air alarm circuit and slot it into the assembly.")) buildstage = 1 update_icon() return TRUE @@ -813,21 +813,21 @@ /obj/machinery/airalarm/proc/togglelock(mob/living/user) if(stat & (NOPOWER|BROKEN)) - to_chat(user, "It does nothing!") + to_chat(user, span_warning("It does nothing!")) else if(src.allowed(usr) && !wires.is_cut(WIRE_IDSCAN)) locked = !locked - to_chat(user, "I [ locked ? "lock" : "unlock"] the air alarm interface.") + to_chat(user, span_notice("I [ locked ? "lock" : "unlock"] the air alarm interface.")) updateUsrDialog() else - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) return /obj/machinery/airalarm/emag_act(mob/user) if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - visible_message("Sparks fly out of [src]!", "I emag [src], disabling its safeties.") + visible_message(span_warning("Sparks fly out of [src]!"), span_notice("I emag [src], disabling its safeties.")) playsound(src, "sparks", 50, TRUE) /obj/machinery/airalarm/deconstruct(disassembled = TRUE) diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index 2453830ea..0c5ca9995 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -43,7 +43,7 @@ if(is_type_in_list(src, GLOB.ventcrawl_machinery) && isliving(user)) var/mob/living/L = user if(L.ventcrawler) - . += "Alt-click to crawl through it." + . += span_notice("Alt-click to crawl through it.") /obj/machinery/atmospherics/New(loc, process = TRUE, setdir) if(!isnull(setdir)) @@ -185,7 +185,7 @@ var/turf/T = get_turf(src) if (level==1 && isturf(T) && T.intact) - to_chat(user, "I must remove the plating first!") + to_chat(user, span_warning("I must remove the plating first!")) return TRUE var/datum/gas_mixture/int_air = return_air() @@ -195,17 +195,17 @@ var/unsafe_wrenching = FALSE var/internal_pressure = int_air.return_pressure()-env_air.return_pressure() - to_chat(user, "I begin to unfasten \the [src]...") + to_chat(user, span_notice("I begin to unfasten \the [src]...")) if (internal_pressure > 2*ONE_ATMOSPHERE) - to_chat(user, "As you begin unwrenching \the [src] a gush of air blows in your face... maybe you should reconsider?") + to_chat(user, span_warning("As you begin unwrenching \the [src] a gush of air blows in your face... maybe you should reconsider?")) unsafe_wrenching = TRUE //Oh dear oh dear if(I.use_tool(src, user, 20, volume=50)) user.visible_message( \ "[user] unfastens \the [src].", \ - "I unfasten \the [src].", \ - "I hear ratchet.") + span_notice("I unfasten \the [src]."), \ + span_hear("I hear ratchet.")) investigate_log("was REMOVED by [key_name(usr)]", INVESTIGATE_ATMOS) //You unwrenched a pipe full of pressure? Let's splat you into the wall, silly. @@ -226,7 +226,7 @@ var/datum/gas_mixture/env_air = loc.return_air() pressures = int_air.return_pressure() - env_air.return_pressure() - user.visible_message("[user] is sent flying by pressure!","The pressure sends you flying!") + user.visible_message(span_danger("[user] is sent flying by pressure!"),span_danger("The pressure sends you flying!")) // if get_dir(src, user) is not 0, target is the edge_target_turf on that dir // otherwise, edge_target_turf uses a random cardinal direction @@ -299,7 +299,7 @@ if(target_move.can_crawl_through()) if(is_type_in_typecache(target_move, GLOB.ventcrawl_machinery)) user.forceMove(target_move.loc) //handle entering and so on. - user.visible_message("I hear something squeezing through the ducts...", "I climb out the ventilation system.") + user.visible_message(span_notice("I hear something squeezing through the ducts..."), "I climb out the ventilation system.") else var/list/pipenetdiff = returnPipenets() ^ target_move.returnPipenets() if(pipenetdiff.len) @@ -311,7 +311,7 @@ playsound(src, 'sound/blank.ogg', 50, TRUE, -3) else if(is_type_in_typecache(src, GLOB.ventcrawl_machinery) && can_crawl_through()) //if we move in a way the pipe can connect, but doesn't - or we're in a vent user.forceMove(loc) - user.visible_message("I hear something squeezing through the ducts...", "I climb out the ventilation system.") + user.visible_message(span_notice("I hear something squeezing through the ducts..."), "I climb out the ventilation system.") //PLACEHOLDER COMMENT FOR ME TO READD THE 1 (?) DS DELAY THAT WAS IMPLEMENTED WITH A... TIMER? diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm index 4f75229a7..4dc285431 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm @@ -90,7 +90,7 @@ I.play_tool_sound(src) if(generator) disconnectFromGenerator() - to_chat(user, "I [anchored?"secure":"unsecure"] [src].") + to_chat(user, span_notice("I [anchored?"secure":"unsecure"] [src].")) var/obj/machinery/atmospherics/node1 = nodes[1] @@ -141,7 +141,7 @@ if(generator) disconnectFromGenerator() mode = !mode - to_chat(user, "I set [src] to [mode?"cold":"hot"] mode.") + to_chat(user, span_notice("I set [src] to [mode?"cold":"hot"] mode.")) return TRUE /obj/machinery/atmospherics/components/binary/circulator/screwdriver_act(mob/user, obj/item/I) @@ -149,7 +149,7 @@ return TRUE panel_open = !panel_open I.play_tool_sound(src) - to_chat(user, "I [panel_open?"open":"close"] the panel on [src].") + to_chat(user, span_notice("I [panel_open?"open":"close"] the panel on [src].")) return TRUE /obj/machinery/atmospherics/components/binary/circulator/crowbar_act(mob/user, obj/item/I) @@ -182,9 +182,9 @@ return if(anchored) - to_chat(usr, "[src] is anchored!") + to_chat(usr, span_danger("[src] is anchored!")) return flipped = !flipped - to_chat(usr, "I flip [src].") + to_chat(usr, span_notice("I flip [src].")) update_icon() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm index 11837e596..01b49e3bb 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -162,7 +162,7 @@ Passive gate is similar to the regular pump except: /obj/machinery/atmospherics/components/binary/passive_gate/can_unwrench(mob/user) . = ..() if(. && on) - to_chat(user, "I cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("I cannot unwrench [src], turn it off first!")) return FALSE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index 19667d56c..2c2ed1215 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -168,7 +168,7 @@ /obj/machinery/atmospherics/components/binary/pump/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "I cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("I cannot unwrench [src], turn it off first!")) return FALSE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index 628f440b3..23949fecd 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -182,7 +182,7 @@ /obj/machinery/atmospherics/components/binary/volume_pump/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "I cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("I cannot unwrench [src], turn it off first!")) return FALSE /obj/machinery/atmospherics/components/binary/volume_pump/multitool_act(mob/living/user, obj/item/I) diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm index d22b118a9..db1c0f831 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -164,7 +164,7 @@ /obj/machinery/atmospherics/components/ui_status(mob/user) if(allowed(user)) return ..() - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) return UI_CLOSE // Tool acts diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index 41ac64858..5a5321969 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -177,7 +177,7 @@ /obj/machinery/atmospherics/components/trinary/filter/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "I cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("I cannot unwrench [src], turn it off first!")) return FALSE // mapping diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index e3ac7daf3..9f5c90021 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -183,7 +183,7 @@ /obj/machinery/atmospherics/components/trinary/mixer/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "I cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("I cannot unwrench [src], turn it off first!")) return FALSE // mapping diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 95c1a0f30..7491cf8ae 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -73,7 +73,7 @@ /obj/machinery/atmospherics/components/unary/cryo_cell/examine(mob/user) //this is leaving out everything but efficiency since they follow the same idea of "better beaker, better results" . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Efficiency at [efficiency*100]%." + . += span_notice("The status display reads: Efficiency at [efficiency*100]%.") /obj/machinery/atmospherics/components/unary/cryo_cell/Destroy() QDEL_NULL(radio) @@ -248,7 +248,7 @@ /obj/machinery/atmospherics/components/unary/cryo_cell/relaymove(mob/user) if(message_cooldown <= world.time) message_cooldown = world.time + 50 - to_chat(user, "[src]'s door won't budge!") + to_chat(user, span_warning("[src]'s door won't budge!")) /obj/machinery/atmospherics/components/unary/cryo_cell/open_machine(drop = FALSE) if(!state_open && !panel_open) @@ -271,14 +271,14 @@ /obj/machinery/atmospherics/components/unary/cryo_cell/container_resist(mob/living/user) user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user.visible_message("I see [user] kicking against the glass of [src]!", \ - "I struggle inside [src], kicking the release with your foot... (this will take about [DisplayTimeText(breakout_time)].)", \ - "I hear a thump from [src].") + user.visible_message(span_notice("I see [user] kicking against the glass of [src]!"), \ + span_notice("I struggle inside [src], kicking the release with your foot... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_hear("I hear a thump from [src].")) if(do_after(user, breakout_time, target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src ) return - user.visible_message("[user] successfully broke out of [src]!", \ - "I successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("I successfully break out of [src]!")) open_machine() /obj/machinery/atmospherics/components/unary/cryo_cell/examine(mob/user) @@ -299,7 +299,7 @@ if(L.incapacitated()) close_machine(target) else - user.visible_message("[user] starts shoving [target] inside [src].", "I start shoving [target] inside [src].") + user.visible_message(span_notice("[user] starts shoving [target] inside [src]."), span_notice("I start shoving [target] inside [src].")) if (do_after(user, 25, target=target)) close_machine(target) @@ -307,13 +307,13 @@ if(istype(I, /obj/item/reagent_containers/glass)) . = 1 //no afterattack if(beaker) - to_chat(user, "A beaker is already loaded into [src]!") + to_chat(user, span_warning("A beaker is already loaded into [src]!")) return if(!user.transferItemToLoc(I, src)) return beaker = I - user.visible_message("[user] places [I] in [src].", \ - "I place [I] in [src].") + user.visible_message(span_notice("[user] places [I] in [src]."), \ + span_notice("I place [I] in [src].")) var/reagentlist = pretty_string_from_reagent_list(I.reagents.reagent_list) log_game("[key_name(user)] added an [I] to cryo containing [reagentlist]") return diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index 102159544..6b1d45346 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -174,7 +174,7 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "I cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("I cannot unwrench [src], turn it off first!")) return FALSE // mapping diff --git a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm index 96e131f0b..60e8dddec 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm @@ -39,7 +39,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/can_unwrench(mob/user) . = ..() if(. && connected_device) - to_chat(user, "I cannot unwrench [src], detach [connected_device] first!") + to_chat(user, span_warning("I cannot unwrench [src], detach [connected_device] first!")) return FALSE /obj/machinery/atmospherics/components/unary/portables_connector/layer1 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index e2676f75b..bdd8b4df7 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -53,10 +53,10 @@ /obj/machinery/atmospherics/components/unary/thermomachine/examine(mob/user) . = ..() - . += "The thermostat is set to [target_temperature]K ([(T0C-target_temperature)*-1]C)." + . += span_notice("The thermostat is set to [target_temperature]K ([(T0C-target_temperature)*-1]C).") if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Efficiency [(heat_capacity/5000)*100]%." - . += "Temperature range [min_temperature]K - [max_temperature]K ([(T0C-min_temperature)*-1]C - [(T0C-max_temperature)*-1]C)." + . += span_notice("The status display reads: Efficiency [(heat_capacity/5000)*100]%.") + . += span_notice("Temperature range [min_temperature]K - [max_temperature]K ([(T0C-min_temperature)*-1]C - [(T0C-max_temperature)*-1]C).") /obj/machinery/atmospherics/components/unary/thermomachine/process_atmos() ..() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index c27f5b51a..dc172fbc9 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -250,13 +250,13 @@ ..() if(!I.tool_start_check(user, amount=0)) return TRUE - to_chat(user, "I begin welding the vent...") + to_chat(user, span_notice("I begin welding the vent...")) if(I.use_tool(src, user, 20, volume=50)) if(!welded) - user.visible_message("[user] welds the vent shut.", "I weld the vent shut.", "I hear welding.") + user.visible_message(span_notice("[user] welds the vent shut."), span_notice("I weld the vent shut."), span_hear("I hear welding.")) welded = TRUE else - user.visible_message("[user] unwelded the vent.", "I unweld the vent.", "I hear welding.") + user.visible_message(span_notice("[user] unwelded the vent."), span_notice("I unweld the vent."), span_hear("I hear welding.")) welded = FALSE update_icon() pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) @@ -268,7 +268,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "I cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("I cannot unwrench [src], turn it off first!")) return FALSE /obj/machinery/atmospherics/components/unary/vent_pump/examine(mob/user) @@ -286,7 +286,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/attack_alien(mob/user) if(!welded || !(do_after(user, 20, target = src))) return - user.visible_message("[user] furiously claws at [src]!", "I manage to clear away the stuff blocking the vent.", "I hear loud scraping noises.") + user.visible_message(span_warning("[user] furiously claws at [src]!"), span_notice("I manage to clear away the stuff blocking the vent."), span_hear("I hear loud scraping noises.")) welded = FALSE update_icon() pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 7a3e1c54a..b5c628c29 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -266,13 +266,13 @@ ..() if(!I.tool_start_check(user, amount=0)) return TRUE - to_chat(user, "Now welding the scrubber.") + to_chat(user, span_notice("Now welding the scrubber.")) if(I.use_tool(src, user, 20, volume=50)) if(!welded) - user.visible_message("[user] welds the scrubber shut.","I weld the scrubber shut.", "I hear welding.") + user.visible_message(span_notice("[user] welds the scrubber shut."),span_notice("I weld the scrubber shut."), span_hear("I hear welding.")) welded = TRUE else - user.visible_message("[user] unwelds the scrubber.", "I unweld the scrubber.", "I hear welding.") + user.visible_message(span_notice("[user] unwelds the scrubber."), span_notice("I unweld the scrubber."), span_hear("I hear welding.")) welded = FALSE update_icon() pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) @@ -284,7 +284,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "I cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("I cannot unwrench [src], turn it off first!")) return FALSE /obj/machinery/atmospherics/components/unary/vent_scrubber/examine(mob/user) @@ -298,7 +298,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/attack_alien(mob/user) if(!welded || !(do_after(user, 20, target = src))) return - user.visible_message("[user] furiously claws at [src]!", "I manage to clear away the stuff blocking the scrubber.", "I hear loud scraping noises.") + user.visible_message(span_warning("[user] furiously claws at [src]!"), span_notice("I manage to clear away the stuff blocking the scrubber."), span_hear("I hear loud scraping noises.")) welded = FALSE update_icon() pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index c61e79805..5275a3cf2 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -115,12 +115,12 @@ /obj/machinery/meter/wrench_act(mob/user, obj/item/I) ..() - to_chat(user, "I begin to unfasten \the [src]...") + to_chat(user, span_notice("I begin to unfasten \the [src]...")) if (I.use_tool(src, user, 40, volume=50)) user.visible_message( "[user] unfastens \the [src].", - "I unfasten \the [src].", - "I hear ratchet.") + span_notice("I unfasten \the [src]."), + span_hear("I hear ratchet.")) deconstruct() return TRUE diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm index ef42a2d4d..e6cdaea98 100644 --- a/code/modules/atmospherics/machinery/other/miner.dm +++ b/code/modules/atmospherics/machinery/other/miner.dm @@ -42,25 +42,25 @@ return FALSE var/turf/T = get_turf(src) if(!isopenturf(T)) - broken_message = "VENT BLOCKED" + broken_message = span_boldnotice("VENT BLOCKED") set_broken(TRUE) return FALSE var/turf/open/OT = T if(OT.planetary_atmos) - broken_message = "DEVICE NOT ENCLOSED IN A PRESSURIZED ENVIRONMENT" + broken_message = span_boldwarning("DEVICE NOT ENCLOSED IN A PRESSURIZED ENVIRONMENT") set_broken(TRUE) return FALSE if(isspaceturf(T)) - broken_message = "AIR VENTING TO SPACE" + broken_message = span_boldnotice("AIR VENTING TO SPACE") set_broken(TRUE) return FALSE var/datum/gas_mixture/G = OT.return_air() if(G.return_pressure() > (max_ext_kpa - ((spawn_mol*spawn_temp*R_IDEAL_GAS_EQUATION)/(CELL_VOLUME)))) - broken_message = "EXTERNAL PRESSURE OVER THRESHOLD" + broken_message = span_boldwarning("EXTERNAL PRESSURE OVER THRESHOLD") set_broken(TRUE) return FALSE if(G.total_moles() > max_ext_mol) - broken_message = "EXTERNAL AIR CONCENTRATION OVER THRESHOLD" + broken_message = span_boldwarning("EXTERNAL AIR CONCENTRATION OVER THRESHOLD") set_broken(TRUE) return FALSE if(broken) diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 7b1825ce6..53474cf57 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -57,7 +57,7 @@ /obj/machinery/portable_atmospherics/canister/interact(mob/user) if(!allowed(user)) - to_chat(user, "Error - Unauthorized User.") + to_chat(user, span_alert("Error - Unauthorized User.")) playsound(src, 'sound/blank.ogg', 50, TRUE) return ..() @@ -303,11 +303,11 @@ if(stat & BROKEN) if(!I.tool_start_check(user, amount=0)) return TRUE - to_chat(user, "I begin cutting [src] apart...") + to_chat(user, span_notice("I begin cutting [src] apart...")) if(I.use_tool(src, user, 30, volume=50)) deconstruct(TRUE) else - to_chat(user, "I cannot slice [src] apart when it isn't broken!") + to_chat(user, span_warning("I cannot slice [src] apart when it isn't broken!")) return TRUE diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index b7b55c62b..5c700188f 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -96,14 +96,14 @@ if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, !ismonkey(user))) return if(holding) - to_chat(user, "I remove [holding] from [src].") + to_chat(user, span_notice("I remove [holding] from [src].")) replace_tank(user, TRUE) /obj/machinery/portable_atmospherics/examine(mob/user) . = ..() if(holding) - . += "\The [src] contains [holding]. Alt-click [src] to remove it."+\ - "Click [src] with another gas tank to hot swap [holding]." + . += span_notice("\The [src] contains [holding]. Alt-click [src] to remove it.")+\ + span_notice("Click [src] with another gas tank to hot swap [holding].") /obj/machinery/portable_atmospherics/proc/replace_tank(mob/living/user, close_valve, obj/item/tank/new_tank) if(holding) @@ -123,7 +123,7 @@ var/obj/item/tank/T = W if(!user.transferItemToLoc(T, src)) return - to_chat(user, "[holding ? "In one smooth motion you pop [holding] out of [src]'s connector and replace it with [T]" : "You insert [T] into [src]"].") + to_chat(user, span_notice("[holding ? "In one smooth motion you pop [holding] out of [src]'s connector and replace it with [T]" : "You insert [T] into [src]"].")) investigate_log("had its internal [holding] swapped with [T] by [key_name(user)].
", INVESTIGATE_ATMOS) replace_tank(user, FALSE, T) update_icon() @@ -135,23 +135,23 @@ W.play_tool_sound(src) user.visible_message( \ "[user] disconnects [src].", \ - "I unfasten [src] from the port.", \ - "I hear a ratchet.") + span_notice("I unfasten [src] from the port."), \ + span_hear("I hear a ratchet.")) update_icon() return else var/obj/machinery/atmospherics/components/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/components/unary/portables_connector) in loc if(!possible_port) - to_chat(user, "Nothing happens.") + to_chat(user, span_notice("Nothing happens.")) return if(!connect(possible_port)) - to_chat(user, "[name] failed to connect to the port.") + to_chat(user, span_notice("[name] failed to connect to the port.")) return W.play_tool_sound(src) user.visible_message( \ "[user] connects [src].", \ - "I fasten [src] to the port.", \ - "I hear a ratchet.") + span_notice("I fasten [src] to the port."), \ + span_hear("I hear a ratchet.")) update_icon() investigate_log("was connected to [possible_port] by [key_name(user)].
", INVESTIGATE_ATMOS) else diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 1b7ef1fcf..0b18aa467 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -48,16 +48,16 @@ for(var/mob/M in GLOB.player_list) var/area/mob_area = get_area(M) if(istype(mob_area, /area/ctf)) - to_chat(M, "\The [src] has been returned to base!") + to_chat(M, span_danger("\The [src] has been returned to base!")) STOP_PROCESSING(SSobj, src) //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/twohanded/ctf/attack_hand(mob/living/user) if(!is_ctf_target(user) && !anyonecanpickup) - to_chat(user, "Non-players shouldn't be moving the flag!") + to_chat(user, span_warning("Non-players shouldn't be moving the flag!")) return if(team in user.faction) - to_chat(user, "I can't move your own flag!") + to_chat(user, span_warning("I can't move your own flag!")) return if(loc == user) if(!user.dropItemToGround(src)) @@ -72,7 +72,7 @@ for(var/mob/M in GLOB.player_list) var/area/mob_area = get_area(M) if(istype(mob_area, /area/ctf)) - to_chat(M, "\The [src] has been taken!") + to_chat(M, span_danger("\The [src] has been taken!")) STOP_PROCESSING(SSobj, src) ..() @@ -85,7 +85,7 @@ for(var/mob/M in GLOB.player_list) var/area/mob_area = get_area(M) if(istype(mob_area, /area/ctf)) - to_chat(M, "\The [src] has been dropped!") + to_chat(M, span_danger("\The [src] has been dropped!")) anchored = TRUE @@ -219,7 +219,7 @@ people_who_want_to_play.Cut() toggle_all_ctf() else - to_chat(user, "CTF has been requested. [num]/[CTF_REQUIRED_PLAYERS] have readied up.") + to_chat(user, span_notice("CTF has been requested. [num]/[CTF_REQUIRED_PLAYERS] have readied up.")) return @@ -227,7 +227,7 @@ return if(user.ckey in team_members) if(user.ckey in recently_dead_ckeys) - to_chat(user, "It must be more than [DisplayTimeText(respawn_cooldown)] from your last death to respawn!") + to_chat(user, span_warning("It must be more than [DisplayTimeText(respawn_cooldown)] from your last death to respawn!")) return var/client/new_team_member = user.client if(user.mind && user.mind.current) @@ -239,10 +239,10 @@ if(CTF == src || CTF.ctf_enabled == FALSE) continue if(user.ckey in CTF.team_members) - to_chat(user, "No switching teams while the round is going!") + to_chat(user, span_warning("No switching teams while the round is going!")) return if(CTF.team_members.len < src.team_members.len) - to_chat(user, "[src.team] has more team members than [CTF.team]! Try joining [CTF.team] team to even things up.") + to_chat(user, span_warning("[src.team] has more team members than [CTF.team]! Try joining [CTF.team] team to even things up.")) return team_members |= user.ckey var/client/new_team_member = user.client @@ -285,7 +285,7 @@ for(var/mob/M in GLOB.player_list) var/area/mob_area = get_area(M) if(istype(mob_area, /area/ctf)) - to_chat(M, "[user.real_name] has captured \the [flag], scoring a point for [team] team! They now have [points]/[points_to_win] points!") + to_chat(M, span_danger("[user.real_name] has captured \the [flag], scoring a point for [team] team! They now have [points]/[points_to_win] points!")) if(points >= points_to_win) victory() @@ -293,8 +293,8 @@ for(var/mob/M in GLOB.mob_list) var/area/mob_area = get_area(M) if(istype(mob_area, /area/ctf)) - to_chat(M, "[team] team wins!") - to_chat(M, "Teams have been cleared. Click on the machines to vote to begin another round.") + to_chat(M, span_narsie("[team] team wins!")) + to_chat(M, span_danger("Teams have been cleared. Click on the machines to vote to begin another round.")) for(var/obj/item/twohanded/ctf/W in M) M.dropItemToGround(W) M.dust() @@ -567,7 +567,7 @@ if(!is_ctf_target(L)) return if(!(src.team in L.faction)) - to_chat(L, "Stay out of the enemy spawn!") + to_chat(L, span_danger("Stay out of the enemy spawn!")) L.death() /obj/structure/trap/ctf/red @@ -627,7 +627,7 @@ for(var/obj/item/gun/G in M) qdel(G) O.equip(M) - to_chat(M, "Ammunition reloaded!") + to_chat(M, span_notice("Ammunition reloaded!")) playsound(get_turf(M), 'sound/blank.ogg', 50, TRUE, -1) qdel(src) break @@ -685,7 +685,7 @@ for(var/mob/M in GLOB.player_list) var/area/mob_area = get_area(M) if(istype(mob_area, /area/ctf)) - to_chat(M, "[user.real_name] has captured \the [src], claiming it for [CTF.team]! Go take it back!") + to_chat(M, span_danger("[user.real_name] has captured \the [src], claiming it for [CTF.team]! Go take it back!")) break #undef WHITE_TEAM diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index e3427aa65..7a77364ac 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -34,10 +34,10 @@ if(!SSticker.HasRoundStarted() || !loc || !ghost_usable) return if(!uses) - to_chat(user, "This spawner is out of charges!") + to_chat(user, span_warning("This spawner is out of charges!")) return if(is_banned_from(user.key, banType)) - to_chat(user, "I are jobanned!") + to_chat(user, span_warning("I are jobanned!")) return if(QDELETED(src) || QDELETED(user)) return @@ -324,7 +324,7 @@ name = "sleeper" icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper" - flavour_text = "I are a space doctor!" + flavour_text = span_bigbold("I are a space doctor!") assignedrole = "Space Doctor" /obj/effect/mob_spawn/human/doctor/alive/equip(mob/living/carbon/human/H) @@ -490,7 +490,7 @@ name = "sleeper" icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper" - flavour_text = "I are a Nanotrasen Commander!" + flavour_text = span_bigbold("I are a Nanotrasen Commander!") /obj/effect/mob_spawn/human/nanotrasensoldier/alive death = FALSE @@ -500,7 +500,7 @@ icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper" faction = "nanotrasenprivate" - flavour_text = "I are a Nanotrasen Private Security Officer!" + flavour_text = span_bigbold("I are a Nanotrasen Private Security Officer!") /////////////////Spooky Undead////////////////////// @@ -560,7 +560,7 @@ var/despawn = alert("Return to cryosleep? (Warning, Your mob will be deleted!)",,"Yes","No") if(despawn == "No" || !loc || !Adjacent(user)) return - user.visible_message("[user.name] climbs back into cryosleep...") + user.visible_message(span_notice("[user.name] climbs back into cryosleep...")) qdel(user) /datum/outfit/cryobartender diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 42204ddfd..00907693b 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -121,10 +121,10 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation) if(!powered()) return if(!awaygate) - to_chat(user, "Error: No destination found.") + to_chat(user, span_alert("Error: No destination found.")) return if(world.time < wait) - to_chat(user, "Error: Warpspace triangulation in progress. Estimated time to completion: [DisplayTimeText(wait - world.time)].") + to_chat(user, span_notice("Error: Warpspace triangulation in progress. Estimated time to completion: [DisplayTimeText(wait - world.time)].")) return for(var/obj/machinery/gateway/G in linked) @@ -160,7 +160,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation) /obj/machinery/gateway/centeraway/multitool_act(mob/living/user, obj/item/I) if(calibrated) - to_chat(user, "The gate is already calibrated, there is no work for you to do here.") + to_chat(user, span_alert("The gate is already calibrated, there is no work for you to do here.")) else to_chat(user, "Recalibration successful!: \black This gate's systems have been fine tuned. Travel to this gate will now be on target.") calibrated = TRUE @@ -193,7 +193,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation) if(!detect()) return if(!stationgate) - to_chat(user, "Error: No destination found.") + to_chat(user, span_notice("Error: No destination found.")) return for(var/obj/machinery/gateway/G in linked) diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm index f641327d4..158b80bf7 100644 --- a/code/modules/awaymissions/mission_code/Academy.dm +++ b/code/modules/awaymissions/mission_code/Academy.dm @@ -150,7 +150,7 @@ /obj/structure/academy_wizard_spawner/deconstruct(disassembled = TRUE) if(!broken) broken = 1 - visible_message("[src] breaks down!") + visible_message(span_warning("[src] breaks down!")) icon_state = "forge_off" STOP_PROCESSING(SSobj, src) @@ -194,21 +194,21 @@ . = ..() if(!used) if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards)) - to_chat(user, "I feel the magic of the dice is restricted to ordinary humans!") + to_chat(user, span_warning("I feel the magic of the dice is restricted to ordinary humans!")) return if(!reusable) used = TRUE var/turf/T = get_turf(src) - T.visible_message("[src] flares briefly.") + T.visible_message(span_danger("[src] flares briefly.")) addtimer(CALLBACK(src, PROC_REF(effect), user, .), 1 SECONDS) /obj/item/dice/d20/fate/equipped(mob/user, slot) . = ..() if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards)) - to_chat(user, "I feel the magic of the dice is restricted to ordinary humans! You should leave it alone.") + to_chat(user, span_warning("I feel the magic of the dice is restricted to ordinary humans! You should leave it alone.")) user.dropItemToGround(src) @@ -217,36 +217,36 @@ switch(roll) if(1) //Dust - T.visible_message("[user] turns to dust!") + T.visible_message(span_danger("[user] turns to dust!")) user.hellbound = TRUE user.dust() if(2) //Death - T.visible_message("[user] suddenly dies!") + T.visible_message(span_danger("[user] suddenly dies!")) user.death() if(3) //Swarm of creatures - T.visible_message("A swarm of creatures surround [user]!") + T.visible_message(span_danger("A swarm of creatures surround [user]!")) for(var/direction in GLOB.alldirs) new /mob/living/simple_animal/hostile/netherworld(get_step(get_turf(user),direction)) if(4) //Destroy Equipment - T.visible_message("Everything [user] is holding and wearing disappears!") + T.visible_message(span_danger("Everything [user] is holding and wearing disappears!")) for(var/obj/item/I in user) if(istype(I, /obj/item/implant)) continue qdel(I) if(5) //Monkeying - T.visible_message("[user] transforms into a monkey!") + T.visible_message(span_danger("[user] transforms into a monkey!")) user.monkeyize() if(6) //Cut speed - T.visible_message("[user] starts moving slower!") + T.visible_message(span_danger("[user] starts moving slower!")) user.add_movespeed_modifier(MOVESPEED_ID_DIE_OF_FATE, update=TRUE, priority=100, multiplicative_slowdown=1) if(7) //Throw - T.visible_message("Unseen forces throw [user]!") + T.visible_message(span_danger("Unseen forces throw [user]!")) user.Stun(60) user.adjustBruteLoss(50) var/throw_dir = pick(GLOB.cardinals) @@ -254,29 +254,29 @@ user.throw_at(throw_target, 200, 4) if(8) //Fueltank Explosion - T.visible_message("An explosion bursts into existence around [user]!") + T.visible_message(span_danger("An explosion bursts into existence around [user]!")) explosion(get_turf(user),-1,0,2, flame_range = 2) if(9) //Cold var/datum/disease/D = new /datum/disease/cold() - T.visible_message("[user] looks a little under the weather!") + T.visible_message(span_danger("[user] looks a little under the weather!")) user.ForceContractDisease(D, FALSE, TRUE) if(10) //Nothing - T.visible_message("Nothing seems to happen.") + T.visible_message(span_danger("Nothing seems to happen.")) if(11) //Cookie - T.visible_message("A cookie appears out of thin air!") + T.visible_message(span_danger("A cookie appears out of thin air!")) var/obj/item/reagent_containers/food/snacks/cookie/C = new(drop_location()) do_smoke(0, drop_location()) C.name = "Cookie of Fate" if(12) //Healing - T.visible_message("[user] looks very healthy!") + T.visible_message(span_danger("[user] looks very healthy!")) user.revive(full_heal = TRUE, admin_revive = TRUE) if(13) //Mad Dosh - T.visible_message("Mad dosh shoots out of [src]!") + T.visible_message(span_danger("Mad dosh shoots out of [src]!")) var/turf/Start = get_turf(src) for(var/direction in GLOB.alldirs) var/turf/dirturf = get_step(Start,direction) @@ -288,17 +288,17 @@ new /obj/item/coin/gold(M) if(14) //Free Gun - T.visible_message("An impressive gun appears!") + T.visible_message(span_danger("An impressive gun appears!")) do_smoke(0, drop_location()) new /obj/item/gun/ballistic/revolver/mateba(drop_location()) if(15) //Random One-use spellbook - T.visible_message("A magical looking book drops to the floor!") + T.visible_message(span_danger("A magical looking book drops to the floor!")) do_smoke(0, drop_location()) new /obj/item/book/granter/spell/random(drop_location()) if(16) //Servant & Servant Summon - T.visible_message("A Dice Servant appears in a cloud of smoke!") + T.visible_message(span_danger("A Dice Servant appears in a cloud of smoke!")) var/mob/living/carbon/human/H = new(drop_location()) do_smoke(0, drop_location()) @@ -321,23 +321,23 @@ if(17) //Tator Kit - T.visible_message("A suspicious box appears!") + T.visible_message(span_danger("A suspicious box appears!")) new /obj/item/storage/box/syndicate/bundle_A(drop_location()) do_smoke(0, drop_location()) if(18) //Captain ID - T.visible_message("A golden identification card appears!") + T.visible_message(span_danger("A golden identification card appears!")) new /obj/item/card/id/captains_spare(drop_location()) do_smoke(0, drop_location()) if(19) //Instrinct Resistance - T.visible_message("[user] looks very robust!") + T.visible_message(span_danger("[user] looks very robust!")) user.physiology.brute_mod *= 0.5 user.physiology.burn_mod *= 0.5 if(20) //Free wizard! - T.visible_message("Magic flows out of [src] and into [user]!") + T.visible_message(span_danger("Magic flows out of [src] and into [user]!")) user.mind.make_Wizard() /datum/outfit/butler @@ -384,7 +384,7 @@ return /obj/structure/ladder/unbreakable/rune/show_fluff_message(up,mob/user) - user.visible_message("[user] activates \the [src].", "I activate \the [src].") + user.visible_message(span_notice("[user] activates \the [src]."), span_notice("I activate \the [src].")) /obj/structure/ladder/unbreakable/rune/use(mob/user, is_ghost=FALSE) if(is_ghost || !(user.mind in SSticker.mode.wizards)) diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index 1284c5579..c9e2fc8c8 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -169,10 +169,10 @@ /turf/open/lava/plasma/attackby(obj/item/I, mob/user, params) var/obj/item/reagent_containers/glass/C = I if(C.reagents.total_volume >= C.volume) - to_chat(user, "[C] is full.") + to_chat(user, span_danger("[C] is full.")) return C.reagents.add_reagent(/datum/reagent/toxin/plasma, rand(5, 10)) - user.visible_message("[user] scoops some plasma from the [src] with \the [C].", "I scoop out some plasma from the [src] using \the [C].") + user.visible_message(span_notice("[user] scoops some plasma from the [src] with \the [C]."), span_notice("I scoop out some plasma from the [src] using \the [C].")) /turf/open/lava/plasma/burn_stuff(AM) . = 0 @@ -238,13 +238,13 @@ NB.species_id = "plasmaman"//change the species_id of the limb to that of a plasmaman NB.no_update = TRUE NB.change_bodypart_status() - PP.visible_message("[L] screams in pain as [L.p_their()] [NB] melts down to the bone!", \ - "I scream out in pain as my [NB] melts down to the bone, leaving an eerie plasma-like glow where flesh used to be!") + PP.visible_message(span_warning("[L] screams in pain as [L.p_their()] [NB] melts down to the bone!"), \ + span_danger("I scream out in pain as my [NB] melts down to the bone, leaving an eerie plasma-like glow where flesh used to be!")) if(!plasma_parts.len && !robo_parts.len) //a person with no potential organic limbs left AND no robotic limbs, time to turn them into a plasmaman PP.IgniteMob() PP.set_species(/datum/species/plasmaman) - PP.visible_message("[L] bursts into a brilliant purple flame as [L.p_their()] entire body is that of a skeleton!", \ - "My senses numb as all of my remaining flesh is turned into a purple slurry, sloshing off my body and leaving only my bones to show in a vibrant purple!") + PP.visible_message(span_warning("[L] bursts into a brilliant purple flame as [L.p_their()] entire body is that of a skeleton!"), \ + span_danger("My senses numb as all of my remaining flesh is turned into a purple slurry, sloshing off my body and leaving only my bones to show in a vibrant purple!")) /obj/vehicle/ridden/lavaboat/plasma diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index f3a6c62ae..26ef9bd26 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -139,7 +139,7 @@ var/mob/living/carbon/human/M = AM if(M.stat != DEAD && M.ckey) - visible_message("[M] triggered [src]!") + visible_message(span_warning("[M] triggered [src]!")) triggered = 1 var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread @@ -156,10 +156,10 @@ var/mob/living/carbon/C = usr if(!C.stat) - to_chat(C, "You're not dead yet!") + to_chat(C, span_notice("You're not dead yet!")) return if(C.has_status_effect(STATUS_EFFECT_WISH_GRANTERS_GIFT)) - to_chat(C, "You're already resurrecting!") + to_chat(C, span_warning("You're already resurrecting!")) return C.apply_status_effect(STATUS_EFFECT_WISH_GRANTERS_GIFT) return 1 diff --git a/code/modules/awaymissions/signpost.dm b/code/modules/awaymissions/signpost.dm index 835515b88..c61cddf46 100644 --- a/code/modules/awaymissions/signpost.dm +++ b/code/modules/awaymissions/signpost.dm @@ -26,7 +26,7 @@ user.forceMove(T) if(AM) user.start_pulling(AM) - to_chat(user, "I blink and find myself in [get_area_name(T)].") + to_chat(user, span_notice("I blink and find myself in [get_area_name(T)].")) else to_chat(user, "Nothing happens. You feel that this is a bad sign.") diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm index 2f71ccb51..72fc59d08 100644 --- a/code/modules/awaymissions/super_secret_room.dm +++ b/code/modules/awaymissions/super_secret_room.dm @@ -112,7 +112,7 @@ /obj/structure/speaking_tile/proc/SpeakPeace(list/statements) for(var/i in 1 to statements.len) - say("[statements[i]]") + say(span_deadsay("[statements[i]]")) if(i != statements.len) sleep(30) diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index d5a66e01b..6294a7acb 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -6,10 +6,10 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "[global.con return if(GLOB.potentialRandomZlevels && GLOB.potentialRandomZlevels.len) - to_chat(world, "Loading away mission...") + to_chat(world, span_boldannounce("Loading away mission...")) var/map = pick(GLOB.potentialRandomZlevels) load_new_z_level(map, "Away Mission") - to_chat(world, "Away mission loaded.") + to_chat(world, span_boldannounce("Away mission loaded.")) /proc/reset_gateway_spawns(reset = FALSE) for(var/obj/machinery/gateway/G in world) diff --git a/code/modules/buildmode/bm_mode.dm b/code/modules/buildmode/bm_mode.dm index 5bd5f079f..e01b59183 100644 --- a/code/modules/buildmode/bm_mode.dm +++ b/code/modules/buildmode/bm_mode.dm @@ -34,7 +34,7 @@ CRASH("No help defined, yell at a coder") /datum/buildmode_mode/proc/change_settings(client/c) - to_chat(c, "There is no configuration available for this mode") + to_chat(c, span_warning("There is no configuration available for this mode")) return /datum/buildmode_mode/proc/Reset() @@ -79,12 +79,12 @@ return if(cornerA && !cornerB) cornerB = select_tile(get_turf(object), AREASELECT_CORNERB) - to_chat(c, "Region selected, if you're happy with your selection left click again, otherwise right click.") + to_chat(c, span_boldwarning("Region selected, if you're happy with your selection left click again, otherwise right click.")) return handle_selected_area(c, params) deselect_region() else - to_chat(c, "Region selection canceled!") + to_chat(c, span_notice("Region selection canceled!")) deselect_region() return diff --git a/code/modules/buildmode/submodes/advanced.dm b/code/modules/buildmode/submodes/advanced.dm index d841ca26e..f02ccde56 100644 --- a/code/modules/buildmode/submodes/advanced.dm +++ b/code/modules/buildmode/submodes/advanced.dm @@ -6,15 +6,15 @@ // of the currently selected path /datum/buildmode_mode/advanced/show_help(client/c) - to_chat(c, "***********************************************************") - to_chat(c, "Right Mouse Button on buildmode button = Set object type") - to_chat(c, "Left Mouse Button + alt on turf/obj = Copy object type") - to_chat(c, "Left Mouse Button on turf/obj = Place objects") - to_chat(c, "Right Mouse Button = Delete objects") + to_chat(c, span_notice("***********************************************************")) + to_chat(c, span_notice("Right Mouse Button on buildmode button = Set object type")) + to_chat(c, span_notice("Left Mouse Button + alt on turf/obj = Copy object type")) + to_chat(c, span_notice("Left Mouse Button on turf/obj = Place objects")) + to_chat(c, span_notice("Right Mouse Button = Delete objects")) to_chat(c, "") - to_chat(c, "Use the button in the upper left corner to") - to_chat(c, "change the direction of built objects.") - to_chat(c, "***********************************************************") + to_chat(c, span_notice("Use the button in the upper left corner to")) + to_chat(c, span_notice("change the direction of built objects.")) + to_chat(c, span_notice("***********************************************************")) /datum/buildmode_mode/advanced/change_settings(client/c) var/target_path = input(c, "Enter typepath:", "Typepath", "/obj/structure/closet") @@ -38,9 +38,9 @@ if(left_click && alt_click) if (istype(object, /turf) || istype(object, /obj) || istype(object, /mob)) objholder = object.type - to_chat(c, "[initial(object.name)] ([object.type]) selected.") + to_chat(c, span_notice("[initial(object.name)] ([object.type]) selected.")) else - to_chat(c, "[initial(object.name)] is not a turf, object, or mob! Please select again.") + to_chat(c, span_notice("[initial(object.name)] is not a turf, object, or mob! Please select again.")) else if(left_click) if(ispath(objholder,/turf)) var/turf/T = get_turf(object) @@ -51,7 +51,7 @@ A.setDir(BM.build_dir) log_admin("Build Mode: [key_name(c)] modified [A]'s [COORD(A)] dir to [BM.build_dir]") else - to_chat(c, "Select object type first.") + to_chat(c, span_warning("Select object type first.")) else if(right_click) if(isobj(object)) log_admin("Build Mode: [key_name(c)] deleted [object] at [AREACOORD(object)]") diff --git a/code/modules/buildmode/submodes/area_edit.dm b/code/modules/buildmode/submodes/area_edit.dm index 19f536e07..33d62c898 100644 --- a/code/modules/buildmode/submodes/area_edit.dm +++ b/code/modules/buildmode/submodes/area_edit.dm @@ -21,11 +21,11 @@ return ..() /datum/buildmode_mode/area_edit/show_help(client/c) - to_chat(c, "***********************************************************") - to_chat(c, "Left Mouse Button on obj/turf/mob = Paint area") - to_chat(c, "Right Mouse Button on obj/turf/mob = Select area to paint") - to_chat(c, "Right Mouse Button on buildmode button = Create new area") - to_chat(c, "***********************************************************") + to_chat(c, span_notice("***********************************************************")) + to_chat(c, span_notice("Left Mouse Button on obj/turf/mob = Paint area")) + to_chat(c, span_notice("Right Mouse Button on obj/turf/mob = Select area to paint")) + to_chat(c, span_notice("Right Mouse Button on buildmode button = Create new area")) + to_chat(c, span_notice("***********************************************************")) /datum/buildmode_mode/area_edit/change_settings(client/c) var/target_path = input(c, "Enter typepath:", "Typepath", "/area") @@ -49,7 +49,7 @@ if(left_click) if(!storedarea) - to_chat(c, "Configure or select the area you want to paint first!") + to_chat(c, span_warning("Configure or select the area you want to paint first!")) return var/turf/T = get_turf(object) if(get_area(T) != storedarea) diff --git a/code/modules/buildmode/submodes/basic.dm b/code/modules/buildmode/submodes/basic.dm index 033f0ccad..e0fdf47fa 100644 --- a/code/modules/buildmode/submodes/basic.dm +++ b/code/modules/buildmode/submodes/basic.dm @@ -2,15 +2,15 @@ key = "basic" /datum/buildmode_mode/basic/show_help(client/c) - to_chat(c, "***********************************************************") - to_chat(c, "Left Mouse Button = Construct / Upgrade") - to_chat(c, "Right Mouse Button = Deconstruct / Delete / Downgrade") - to_chat(c, "Left Mouse Button + ctrl = R-Window") - to_chat(c, "Left Mouse Button + alt = Door") + to_chat(c, span_notice("***********************************************************")) + to_chat(c, span_notice("Left Mouse Button = Construct / Upgrade")) + to_chat(c, span_notice("Right Mouse Button = Deconstruct / Delete / Downgrade")) + to_chat(c, span_notice("Left Mouse Button + ctrl = R-Window")) + to_chat(c, span_notice("Left Mouse Button + alt = Door")) to_chat(c, "") - to_chat(c, "Use the button in the upper left corner to") - to_chat(c, "change the direction of built objects.") - to_chat(c, "***********************************************************") + to_chat(c, span_notice("Use the button in the upper left corner to")) + to_chat(c, span_notice("change the direction of built objects.")) + to_chat(c, span_notice("***********************************************************")) /datum/buildmode_mode/basic/handle_click(client/c, params, obj/object) var/list/pa = params2list(params) @@ -20,7 +20,7 @@ var/alt_click = pa.Find("alt") if(istype(object,/turf) && left_click && !alt_click && !ctrl_click) - to_chat(src, "Basic mode is only partially funcational, please use Adv. Build.") + to_chat(src, span_notice("Basic mode is only partially funcational, please use Adv. Build.")) return var/turf/T = object if(isspaceturf(object)) diff --git a/code/modules/buildmode/submodes/boom.dm b/code/modules/buildmode/submodes/boom.dm index 2b2bfe223..1f5b06659 100644 --- a/code/modules/buildmode/submodes/boom.dm +++ b/code/modules/buildmode/submodes/boom.dm @@ -8,10 +8,10 @@ var/flames = -1 /datum/buildmode_mode/boom/show_help(client/c) - to_chat(c, "***********************************************************") - to_chat(c, "Mouse Button on obj = Kaboom") - to_chat(c, "NOTE: Using the \"Config/Launch Supplypod\" verb allows you to do this in an IC way (i.e., making a cruise missile come down from the sky and explode wherever you click!)") - to_chat(c, "***********************************************************") + to_chat(c, span_notice("***********************************************************")) + to_chat(c, span_notice("Mouse Button on obj = Kaboom")) + to_chat(c, span_notice("NOTE: Using the \"Config/Launch Supplypod\" verb allows you to do this in an IC way (i.e., making a cruise missile come down from the sky and explode wherever you click!)")) + to_chat(c, span_notice("***********************************************************")) /datum/buildmode_mode/boom/change_settings(client/c) devastation = input(c, "Range of total devastation. -1 to none", text("Input")) as num|null diff --git a/code/modules/buildmode/submodes/copy.dm b/code/modules/buildmode/submodes/copy.dm index ba415c50f..e0be20ec7 100644 --- a/code/modules/buildmode/submodes/copy.dm +++ b/code/modules/buildmode/submodes/copy.dm @@ -7,10 +7,10 @@ return ..() /datum/buildmode_mode/copy/show_help(client/c) - to_chat(c, "***********************************************************") - to_chat(c, "Left Mouse Button on obj/turf/mob = Spawn a Copy of selected target") - to_chat(c, "Right Mouse Button on obj/mob = Select target to copy") - to_chat(c, "***********************************************************") + to_chat(c, span_notice("***********************************************************")) + to_chat(c, span_notice("Left Mouse Button on obj/turf/mob = Spawn a Copy of selected target")) + to_chat(c, span_notice("Right Mouse Button on obj/mob = Select target to copy")) + to_chat(c, span_notice("***********************************************************")) /datum/buildmode_mode/copy/handle_click(client/c, params, obj/object) var/list/pa = params2list(params) @@ -24,5 +24,5 @@ log_admin("Build Mode: [key_name(c)] copied [stored] to [AREACOORD(object)]") else if(right_click) if(ismovableatom(object)) // No copying turfs for now. - to_chat(c, "[object] set as template.") + to_chat(c, span_notice("[object] set as template.")) stored = object diff --git a/code/modules/buildmode/submodes/fill.dm b/code/modules/buildmode/submodes/fill.dm index b7d87edef..c6effb3ae 100644 --- a/code/modules/buildmode/submodes/fill.dm +++ b/code/modules/buildmode/submodes/fill.dm @@ -5,11 +5,11 @@ var/objholder = null /datum/buildmode_mode/fill/show_help(client/c) - to_chat(c, "***********************************************************") - to_chat(c, "Left Mouse Button on turf/obj/mob = Select corner") - to_chat(c, "Left Mouse Button + Alt on turf/obj/mob = Delete region") - to_chat(c, "Right Mouse Button on buildmode button = Select object type") - to_chat(c, "***********************************************************") + to_chat(c, span_notice("***********************************************************")) + to_chat(c, span_notice("Left Mouse Button on turf/obj/mob = Select corner")) + to_chat(c, span_notice("Left Mouse Button + Alt on turf/obj/mob = Delete region")) + to_chat(c, span_notice("Right Mouse Button on buildmode button = Select object type")) + to_chat(c, span_notice("***********************************************************")) /datum/buildmode_mode/fill/change_settings(client/c) var/target_path = input(c, "Enter typepath:" ,"Typepath","/obj/structure/closet") @@ -27,7 +27,7 @@ /datum/buildmode_mode/fill/handle_click(client/c, params, obj/object) if(isnull(objholder)) - to_chat(c, "Select an object type first.") + to_chat(c, span_warning("Select an object type first.")) deselect_region() return ..() diff --git a/code/modules/buildmode/submodes/mapgen.dm b/code/modules/buildmode/submodes/mapgen.dm index 6420668a9..393802aab 100644 --- a/code/modules/buildmode/submodes/mapgen.dm +++ b/code/modules/buildmode/submodes/mapgen.dm @@ -5,10 +5,10 @@ var/generator_path /datum/buildmode_mode/mapgen/show_help(client/c) - to_chat(c, "***********************************************************") - to_chat(c, "Left Mouse Button on turf/obj/mob = Select corner") - to_chat(c, "Right Mouse Button on buildmode button = Select generator") - to_chat(c, "***********************************************************") + to_chat(c, span_notice("***********************************************************")) + to_chat(c, span_notice("Left Mouse Button on turf/obj/mob = Select corner")) + to_chat(c, span_notice("Right Mouse Button on buildmode button = Select generator")) + to_chat(c, span_notice("***********************************************************")) /datum/buildmode_mode/mapgen/change_settings(client/c) var/list/gen_paths = subtypesof(/datum/mapGenerator) @@ -25,7 +25,7 @@ /datum/buildmode_mode/mapgen/handle_click(client/c, params, obj/object) if(isnull(generator_path)) - to_chat(c, "Select generator type first.") + to_chat(c, span_warning("Select generator type first.")) deselect_region() return ..() @@ -37,7 +37,7 @@ var/datum/mapGenerator/G = new generator_path if(istype(G, /datum/mapGenerator/repair/reload_station_map)) if(GLOB.reloading_map) - to_chat(c, "I are already reloading an area! Please wait for it to fully finish loading before trying to load another!") + to_chat(c, span_boldwarning("I are already reloading an area! Please wait for it to fully finish loading before trying to load another!")) deselect_region() return G.defineRegion(cornerA, cornerB, 1) diff --git a/code/modules/buildmode/submodes/throwing.dm b/code/modules/buildmode/submodes/throwing.dm index 6d578c9c4..2a646b7b7 100644 --- a/code/modules/buildmode/submodes/throwing.dm +++ b/code/modules/buildmode/submodes/throwing.dm @@ -8,10 +8,10 @@ return ..() /datum/buildmode_mode/throwing/show_help(client/c) - to_chat(c, "***********************************************************") - to_chat(c, "Left Mouse Button on turf/obj/mob = Select") - to_chat(c, "Right Mouse Button on turf/obj/mob = Throw") - to_chat(c, "***********************************************************") + to_chat(c, span_notice("***********************************************************")) + to_chat(c, span_notice("Left Mouse Button on turf/obj/mob = Select")) + to_chat(c, span_notice("Right Mouse Button on turf/obj/mob = Throw")) + to_chat(c, span_notice("***********************************************************")) /datum/buildmode_mode/throwing/handle_click(client/c, params, obj/object) var/list/pa = params2list(params) diff --git a/code/modules/buildmode/submodes/variable_edit.dm b/code/modules/buildmode/submodes/variable_edit.dm index b91d859c9..a73509d0f 100644 --- a/code/modules/buildmode/submodes/variable_edit.dm +++ b/code/modules/buildmode/submodes/variable_edit.dm @@ -10,11 +10,11 @@ return ..() /datum/buildmode_mode/varedit/show_help(client/c) - to_chat(c, "***********************************************************") - to_chat(c, "Right Mouse Button on buildmode button = Select var(type) & value") - to_chat(c, "Left Mouse Button on turf/obj/mob = Set var(type) & value") - to_chat(c, "Right Mouse Button on turf/obj/mob = Reset var's value") - to_chat(c, "***********************************************************") + to_chat(c, span_notice("***********************************************************")) + to_chat(c, span_notice("Right Mouse Button on buildmode button = Select var(type) & value")) + to_chat(c, span_notice("Left Mouse Button on turf/obj/mob = Set var(type) & value")) + to_chat(c, span_notice("Right Mouse Button on turf/obj/mob = Reset var's value")) + to_chat(c, span_notice("***********************************************************")) /datum/buildmode_mode/varedit/Reset() . = ..() @@ -30,7 +30,7 @@ var/temp_value = c.vv_get_value() if(isnull(temp_value["class"])) Reset() - to_chat(c, "Variable unset.") + to_chat(c, span_notice("Variable unset.")) return valueholder = temp_value["value"] @@ -40,23 +40,23 @@ var/right_click = pa.Find("right") if(isnull(varholder)) - to_chat(c, "Choose a variable to modify first.") + to_chat(c, span_warning("Choose a variable to modify first.")) return if(left_click) if(object.vars.Find(varholder)) if(object.vv_edit_var(varholder, valueholder) == FALSE) - to_chat(c, "My edit was rejected by the object.") + to_chat(c, span_warning("My edit was rejected by the object.")) return log_admin("Build Mode: [key_name(c)] modified [object.name]'s [varholder] to [valueholder]") else - to_chat(c, "[initial(object.name)] does not have a var called '[varholder]'") + to_chat(c, span_warning("[initial(object.name)] does not have a var called '[varholder]'")) if(right_click) if(object.vars.Find(varholder)) var/reset_value = initial(object.vars[varholder]) if(object.vv_edit_var(varholder, reset_value) == FALSE) - to_chat(c, "My edit was rejected by the object.") + to_chat(c, span_warning("My edit was rejected by the object.")) return log_admin("Build Mode: [key_name(c)] modified [object.name]'s [varholder] to [reset_value]") else - to_chat(c, "[initial(object.name)] does not have a var called '[varholder]'") + to_chat(c, span_warning("[initial(object.name)] does not have a var called '[varholder]'")) diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm index 33a98daa2..a38990c25 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -51,8 +51,8 @@ /obj/machinery/computer/cargo/emag_act(mob/user) if(obj_flags & EMAGGED) return - user.visible_message("[user] swipes a suspicious card through [src]!", - "I adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.") + user.visible_message(span_warning("[user] swipes a suspicious card through [src]!"), + span_notice("I adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.")) obj_flags |= EMAGGED contraband = TRUE diff --git a/code/modules/cargo/export_scanner.dm b/code/modules/cargo/export_scanner.dm index ffc52b1cc..8a43e8a4a 100644 --- a/code/modules/cargo/export_scanner.dm +++ b/code/modules/cargo/export_scanner.dm @@ -14,7 +14,7 @@ /obj/item/export_scanner/examine(user) . = ..() if(!cargo_console) - . += "[src] is not currently linked to a cargo console." + . += span_notice("[src] is not currently linked to a cargo console.") /obj/item/export_scanner/afterattack(obj/O, mob/user, proximity) . = ..() @@ -25,9 +25,9 @@ var/obj/machinery/computer/cargo/C = O if(!C.requestonly) cargo_console = C - to_chat(user, "Scanner linked to [C].") + to_chat(user, span_notice("Scanner linked to [C].")) else if(!istype(cargo_console)) - to_chat(user, "I must link [src] to a cargo console first!") + to_chat(user, span_warning("I must link [src] to a cargo console first!")) else // Before you fix it: // yes, checking manifests is a part of intended functionality. @@ -38,8 +38,8 @@ price += ex.total_value[x] if(price) - to_chat(user, "Scanned [O], value: [price] credits[O.contents.len ? " (contents included)" : ""].") + to_chat(user, span_notice("Scanned [O], value: [price] credits[O.contents.len ? " (contents included)" : ""].")) else - to_chat(user, "Scanned [O], no export value.") + to_chat(user, span_warning("Scanned [O], no export value.")) if(bounty_ship_item_and_contents(O, dry_run=TRUE)) - to_chat(user, "Scanned item is eligible for one or more bounties.") + to_chat(user, span_notice("Scanned item is eligible for one or more bounties.")) diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm index f29b8ff33..1f948723e 100644 --- a/code/modules/cargo/expressconsole.dm +++ b/code/modules/cargo/expressconsole.dm @@ -40,11 +40,11 @@ /obj/machinery/computer/cargo/express/attackby(obj/item/W, mob/living/user, params) if((istype(W, /obj/item/card/id) || istype(W, /obj/item/pda)) && allowed(user)) locked = !locked - to_chat(user, "I [locked ? "lock" : "unlock"] the interface.") + to_chat(user, span_notice("I [locked ? "lock" : "unlock"] the interface.")) return else if(istype(W, /obj/item/disk/cargo/bluespace_pod)) podType = /obj/structure/closet/supplypod/bluespacepod//doesnt effect circuit board, making reversal possible - to_chat(user, "I insert the disk into [src], allowing for advanced supply delivery vehicles.") + to_chat(user, span_notice("I insert the disk into [src], allowing for advanced supply delivery vehicles.")) qdel(W) return TRUE else if(istype(W, /obj/item/supplypod_beacon)) @@ -53,14 +53,14 @@ sb.link_console(src, user) return TRUE else - to_chat(user, "[src] is already linked to [sb].") + to_chat(user, span_alert("[src] is already linked to [sb].")) ..() /obj/machinery/computer/cargo/express/emag_act(mob/living/user) if(obj_flags & EMAGGED) return - user.visible_message("[user] swipes a suspicious card through [src]!", - "I change the routing protocols, allowing the Supply Pod to land anywhere on the station.") + user.visible_message(span_warning("[user] swipes a suspicious card through [src]!"), + span_notice("I change the routing protocols, allowing the Supply Pod to land anywhere on the station.")) obj_flags |= EMAGGED // This also sets this on the circuit board var/obj/item/circuitboard/computer/cargo/board = circuit diff --git a/code/modules/cargo/gondolapod.dm b/code/modules/cargo/gondolapod.dm index 3553b2da8..cc814379c 100644 --- a/code/modules/cargo/gondolapod.dm +++ b/code/modules/cargo/gondolapod.dm @@ -47,9 +47,9 @@ /mob/living/simple_animal/pet/gondola/gondolapod/examine(mob/user) . = ..() if (contents.len) - . += "It looks like it hasn't made its delivery yet.
" + . += span_notice("It looks like it hasn't made its delivery yet.
") else - . += "It looks like it has already made its delivery." + . += span_notice("It looks like it has already made its delivery.") /mob/living/simple_animal/pet/gondola/gondolapod/verb/check() set name = "Count Contents" @@ -57,9 +57,9 @@ set desc = "" var/total = contents.len if (total) - to_chat(src, "I detect [total] object\s within your incredibly vast belly.") + to_chat(src, span_notice("I detect [total] object\s within your incredibly vast belly.")) else - to_chat(src, "A closer look inside myself reveals... nothing.") + to_chat(src, span_notice("A closer look inside myself reveals... nothing.")) /mob/living/simple_animal/pet/gondola/gondolapod/proc/setOpened() opened = TRUE diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 95c4955db..304aa171b 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -136,7 +136,7 @@ bluespace = TRUE //Make it so that the pod doesn't stay in centcom forever QDEL_IN(risingPod, 10) - audible_message("The pod hisses, closing quickly and launching itself away from the station.", "The ground vibrates, the nearby pod launching away from the station.") + audible_message(span_notice("The pod hisses, closing quickly and launching itself away from the station."), span_notice("The ground vibrates, the nearby pod launching away from the station.")) stay_after_drop = FALSE specialisedPod(holder) // Do special actions for specialised pods - this is likely if we were already doing manual launches diff --git a/code/modules/cargo/supplypod_beacon.dm b/code/modules/cargo/supplypod_beacon.dm index 29c098318..192a4f93b 100644 --- a/code/modules/cargo/supplypod_beacon.dm +++ b/code/modules/cargo/supplypod_beacon.dm @@ -47,9 +47,9 @@ /obj/item/supplypod_beacon/examine(user) . = ..() if(!express_console) - . += "[src] is not currently linked to an Express Supply console." + . += span_notice("[src] is not currently linked to an Express Supply console.") else - . += "Alt-click to unlink it from the Express Supply console." + . += span_notice("Alt-click to unlink it from the Express Supply console.") /obj/item/supplypod_beacon/Destroy() if(express_console) @@ -73,7 +73,7 @@ update_status(SP_LINKED) if (express_console.usingBeacon) update_status(SP_READY) - to_chat(user, "[src] linked to [C].") + to_chat(user, span_notice("[src] linked to [C].")) /obj/item/supplypod_beacon/AltClick(mob/user) if (!user.canUseTopic(src, !issilicon(user))) @@ -81,7 +81,7 @@ if (express_console) unlink_console() else - to_chat(user, "There is no linked console.") + to_chat(user, span_alert("There is no linked console.")) /obj/item/supplypod_beacon/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/pen)) //give a tag that is visible from the linked express console diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 3544bf1fd..0532df333 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -70,7 +70,7 @@ GLOBAL_LIST_EMPTY(respawncounts) msg += " Administrators have been informed." log_game("[key_name(src)] Has hit the per-minute topic limit of [mtl] topic calls in a given game minute") message_admins("[ADMIN_LOOKUPFLW(usr)] [ADMIN_KICK(usr)] Has hit the per-minute topic limit of [mtl] topic calls in a given game minute") -// to_chat(src, "[msg]") +// to_chat(src, span_danger("[msg]")) return var/stl = CONFIG_GET(number/second_topic_limit) @@ -83,7 +83,7 @@ GLOBAL_LIST_EMPTY(respawncounts) topiclimiter[SECOND_COUNT] = 0 topiclimiter[SECOND_COUNT] += 1 if (topiclimiter[SECOND_COUNT] > stl) -// to_chat(src, "My previous action was ignored because you've done too many in a second") +// to_chat(src, span_danger("My previous action was ignored because you've done too many in a second")) return //Logs all hrefs, except chat pings @@ -92,7 +92,7 @@ GLOBAL_LIST_EMPTY(respawncounts) //byond bug ID:2256651 if (asset_cache_job && asset_cache_job in completed_asset_jobs) - to_chat(src, "An error has been detected in how my client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)") + to_chat(src, span_danger("An error has been detected in how my client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)")) src << browse("...", "window=asset_cache_browser") // Keypress passthrough @@ -195,11 +195,11 @@ GLOBAL_LIST_EMPTY(respawncounts) if(CONFIG_GET(flag/automute_on) && !holder && last_message == message) src.last_message_count++ if(src.last_message_count >= SPAM_TRIGGER_AUTOMUTE) - to_chat(src, "I have exceeded the spam filter limit for identical messages. An auto-mute was applied.") + to_chat(src, span_danger("I have exceeded the spam filter limit for identical messages. An auto-mute was applied.")) cmd_admin_mute(src, mute_type, 1) return 1 if(src.last_message_count >= SPAM_TRIGGER_WARNING) - to_chat(src, "I are nearing the spam filter limit for identical messages.") + to_chat(src, span_danger("I are nearing the spam filter limit for identical messages.")) return 0 else last_message = message @@ -302,10 +302,10 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) alert_mob_dupe_login = TRUE if(matches) if(C) - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(C)].") + message_admins(span_danger("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(C)].")) log_access("Notice: [key_name(src)] has the same [matches] as [key_name(C)].") else - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(C)] (no longer logged in). ") + message_admins(span_danger("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(C)] (no longer logged in). ")) log_access("Notice: [key_name(src)] has the same [matches] as [key_name(C)] (no longer logged in).") var/reconnecting = FALSE @@ -327,16 +327,16 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) if (byond_version >= 512) if (!byond_build || byond_build < 1386) - message_admins("[key_name(src)] has been detected as spoofing their byond version. Connection rejected.") + message_admins(span_adminnotice("[key_name(src)] has been detected as spoofing their byond version. Connection rejected.")) add_system_note("Spoofed-Byond-Version", "Detected as using a spoofed byond version.") log_access("Failed Login: [key] - Spoofed byond version") qdel(src) if (num2text(byond_build) in GLOB.blacklisted_builds) log_access("Failed login: [key] - blacklisted byond version") - to_chat(src, "My version of byond is blacklisted.") - to_chat(src, "Byond build [byond_build] ([byond_version].[byond_build]) has been blacklisted for the following reason: [GLOB.blacklisted_builds[num2text(byond_build)]].") - to_chat(src, "Please download a new version of byond. If [byond_build] is the latest, you can go to BYOND's website to download other versions.") + to_chat(src, span_danger("My version of byond is blacklisted.")) + to_chat(src, span_danger("Byond build [byond_build] ([byond_version].[byond_build]) has been blacklisted for the following reason: [GLOB.blacklisted_builds[num2text(byond_build)]].")) + to_chat(src, span_danger("Please download a new version of byond. If [byond_build] is the latest, you can go to BYOND's website to download other versions.")) if(connecting_admin) to_chat(src, "As an admin, you are being allowed to continue using this version, but please consider changing byond versions") else @@ -361,7 +361,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) var/ceb = CONFIG_GET(number/client_error_build) var/cwv = CONFIG_GET(number/client_warn_version) if (byond_version < cev || byond_build < ceb) //Out of date client. - to_chat(src, "My version of BYOND is too old:") + to_chat(src, span_danger("My version of BYOND is too old:")) to_chat(src, CONFIG_GET(string/client_error_message)) to_chat(src, "Your version: [byond_version].[byond_build]") to_chat(src, "Required version: [cev].[ceb] or later") @@ -380,7 +380,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) msg += "Visit BYOND's website to get the latest version of BYOND.
" src << browse(msg, "window=warning_popup") else - to_chat(src, "My version of byond may be getting out of date:") + to_chat(src, span_danger("My version of byond may be getting out of date:")) to_chat(src, CONFIG_GET(string/client_warn_message)) to_chat(src, "Your version: [byond_version]") to_chat(src, "Required version to remove this message: [cwv] or later") @@ -440,7 +440,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) // deez people removed the winset changelog window so i might as well comment it out JTGSZ 4/12/2024 //if(prefs.lastchangelog != GLOB.changelog_hash) //bolds the changelog button on the interface so we know there are updates. - // //to_chat(src, "I have unread updates in the changelog.") + // //to_chat(src, span_info("I have unread updates in the changelog.")) // if(CONFIG_GET(flag/aggressive_changelog)) // changelog() // else @@ -473,7 +473,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) // if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them. -// to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.") +// to_chat(src, span_warning("Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.")) update_ambience_pref() @@ -605,13 +605,13 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) if(!query_client_in_db.NextRow()) if (CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey]) log_access("Failed Login: [key] - New account attempting to connect during panic bunker") - message_admins("Failed Login: [key] - New account attempting to connect during panic bunker") + message_admins(span_adminnotice("Failed Login: [key] - New account attempting to connect during panic bunker")) to_chat(src, CONFIG_GET(string/panic_bunker_message)) var/list/connectiontopic_a = params2list(connectiontopic) var/list/panic_addr = CONFIG_GET(string/panic_server_address) if(panic_addr && !connectiontopic_a["redirect"]) var/panic_name = CONFIG_GET(string/panic_server_name) - to_chat(src, "Sending you to [panic_name ? panic_name : panic_addr].") + to_chat(src, span_notice("Sending you to [panic_name ? panic_name : panic_addr].")) winset(src, null, "command=.options") src << link("[panic_addr]?redirect=1") qdel(query_client_in_db) @@ -769,7 +769,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) if (oldcid) if (!topic || !topic["token"] || !tokens[ckey] || topic["token"] != tokens[ckey]) if (!cidcheck_spoofckeys[ckey]) - message_admins("[key_name(src)] appears to have attempted to spoof a cid randomizer check.") + message_admins(span_adminnotice("[key_name(src)] appears to have attempted to spoof a cid randomizer check.")) cidcheck_spoofckeys[ckey] = TRUE cidcheck[ckey] = computer_id tokens[ckey] = cid_check_reconnect() @@ -785,11 +785,11 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) if (oldcid != computer_id && computer_id != lastcid) //IT CHANGED!!! cidcheck -= ckey //so they can try again after removing the cid randomizer. - to_chat(src, "Connection Error:") - to_chat(src, "Invalid ComputerID(spoofed). Please remove the ComputerID spoofer from my byond installation and try again.") + to_chat(src, span_danger("Connection Error:")) + to_chat(src, span_danger("Invalid ComputerID(spoofed). Please remove the ComputerID spoofer from my byond installation and try again.")) if (!cidcheck_failedckeys[ckey]) - message_admins("[key_name(src)] has been detected as using a cid randomizer. Connection rejected.") + message_admins(span_adminnotice("[key_name(src)] has been detected as using a cid randomizer. Connection rejected.")) send2irc_adminless_only("CidRandomizer", "[key_name(src)] has been detected as using a cid randomizer. Connection rejected.") cidcheck_failedckeys[ckey] = TRUE note_randomizer_user() @@ -800,11 +800,11 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) return TRUE else if (cidcheck_failedckeys[ckey]) - message_admins("[key_name_admin(src)] has been allowed to connect after showing they removed their cid randomizer") + message_admins(span_adminnotice("[key_name_admin(src)] has been allowed to connect after showing they removed their cid randomizer")) send2irc_adminless_only("CidRandomizer", "[key_name(src)] has been allowed to connect after showing they removed their cid randomizer.") cidcheck_failedckeys -= ckey if (cidcheck_spoofckeys[ckey]) - message_admins("[key_name_admin(src)] has been allowed to connect after appearing to have attempted to spoof a cid randomizer check because it appears they aren't spoofing one this time") + message_admins(span_adminnotice("[key_name_admin(src)] has been allowed to connect after appearing to have attempted to spoof a cid randomizer check because it appears they aren't spoofing one this time")) cidcheck_spoofckeys -= ckey cidcheck -= ckey else if (computer_id != lastcid) @@ -866,7 +866,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) if (CONFIG_GET(string/ipintel_email)) var/datum/ipintel/res = get_ip_intel(address) if (res.intel >= CONFIG_GET(number/ipintel_rating_bad)) - message_admins("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a Proxy/VPN.") + message_admins(span_adminnotice("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a Proxy/VPN.")) ip_intel = res.intel /client/Click(atom/object, atom/location, control, params) @@ -901,7 +901,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) add_system_note("aimbot", "Is using the middle click aimbot exploit") log_game("[key_name(src)] Has hit the per-minute click limit of [mcl] clicks in a given game minute") message_admins("[ADMIN_LOOKUPFLW(usr)] [ADMIN_KICK(usr)] Has hit the per-minute click limit of [mcl] clicks in a given game minute") -// to_chat(src, "[msg]") +// to_chat(src, span_danger("[msg]")) return var/scl = CONFIG_GET(number/second_click_limit) @@ -914,7 +914,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) clicklimiter[SECOND_COUNT] = 0 clicklimiter[SECOND_COUNT] += 1+(!!ab) if (clicklimiter[SECOND_COUNT] > scl) -// to_chat(src, "My previous click was ignored because you've done too many in a second") +// to_chat(src, span_danger("My previous click was ignored because you've done too many in a second")) return if (prefs.hotkeys) @@ -1117,7 +1117,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) /client/proc/commendsomeone(var/forced = FALSE) if(commendedsomeone) if(!forced) - to_chat(src, "You already commended someone this round.") + to_chat(src, span_danger("You already commended someone this round.")) return if(alert(src,"Was there a character during this round that you would like to anonymously commend?", "Commendation", "YES", "NO") != "YES") return diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index a9c53ffd1..4f01315ad 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1047,7 +1047,7 @@ GLOBAL_LIST_EMPTY(chosen_names) /* if((rank in GLOB.command_positions) || (rank == "AI"))//Bold head jobs HTML += "[used_name]" else - HTML += "[used_name]"*/ + HTML += span_dark("[used_name]")*/ HTML += {" @@ -1183,7 +1183,7 @@ Slots: [job.spawn_positions]
return if (!isnum(desiredLvl)) - to_chat(user, "UpdateJobPreference - desired level was not a number. Please notify coders!") + to_chat(user, span_danger("UpdateJobPreference - desired level was not a number. Please notify coders!")) ShowChoices(user,4) return @@ -1227,7 +1227,7 @@ Slots: [job.spawn_positions] if(user.client?.prefs) if(user.client.prefs.lastclass) if(user.get_triumphs() < 2) - to_chat(user, "I haven't TRIUMPHED enough.") + to_chat(user, span_warning("I haven't TRIUMPHED enough.")) return user.adjust_triumphs(-2) user.client.prefs.lastclass = null @@ -1235,7 +1235,7 @@ Slots: [job.spawn_positions] /datum/preferences/proc/SetQuirks(mob/user) if(!SSquirks) - to_chat(user, "The quirk subsystem is still initializing! Try again in a minute.") + to_chat(user, span_danger("The quirk subsystem is still initializing! Try again in a minute.")) return var/list/dat = list() @@ -1409,7 +1409,7 @@ Slots: [job.spawn_positions] var/expires = "This is a permanent ban." if(ban_details["expiration_time"]) expires = " The ban is for [DisplayTimeText(text2num(ban_details["duration"]) MINUTES)] and expires on [ban_details["expiration_time"]] (server time)." - to_chat(user, "You, or another user of this computer or connection ([ban_details["key"]]) is banned from playing [href_list["bancheck"]].
The ban reason is: [ban_details["reason"]]
This ban (BanID #[ban_details["id"]]) was applied by [ban_details["admin_key"]] on [ban_details["bantime"]] during round ID [ban_details["round_id"]].
[expires]
") + to_chat(user, span_danger("You, or another user of this computer or connection ([ban_details["key"]]) is banned from playing [href_list["bancheck"]].
The ban reason is: [ban_details["reason"]]
This ban (BanID #[ban_details["id"]]) was applied by [ban_details["admin_key"]] on [ban_details["bantime"]] during round ID [ban_details["round_id"]].
[expires]")) return if(href_list["preference"] == "job") switch(href_list["task"]) @@ -1431,9 +1431,9 @@ Slots: [job.spawn_positions] if("tutorial") if(href_list["tut"]) testing("[href_list["tut"]]") - to_chat(user, "* ----------------------- *") + to_chat(user, span_info("* ----------------------- *")) to_chat(user, href_list["tut"]) - to_chat(user, "* ----------------------- *") + to_chat(user, span_info("* ----------------------- *")) if("random") switch(joblessrole) if(RETURNTOLOBBY) @@ -1468,21 +1468,21 @@ Slots: [job.spawn_positions] var/list/L = V for(var/Q in all_quirks) if((quirk in L) && (Q in L) && !(Q == quirk)) //two quirks have lined up in the list of the list of quirks that conflict with each other, so return (see quirks.dm for more details) - to_chat(user, "[quirk] is incompatible with [Q].") + to_chat(user, span_danger("[quirk] is incompatible with [Q].")) return var/value = SSquirks.quirk_points[quirk] var/balance = GetQuirkBalance() if(quirk in all_quirks) if(balance + value < 0) - to_chat(user, "Refunding this would cause you to go below your balance!") + to_chat(user, span_warning("Refunding this would cause you to go below your balance!")) return all_quirks -= quirk else if(GetPositiveQuirkCount() >= MAX_QUIRKS) - to_chat(user, "I can't have more than [MAX_QUIRKS] positive quirks!") + to_chat(user, span_warning("I can't have more than [MAX_QUIRKS] positive quirks!")) return if(balance - value < 0) - to_chat(user, "I don't have enough balance to gain this quirk!") + to_chat(user, span_warning("I don't have enough balance to gain this quirk!")) return all_quirks += quirk SetQuirks(user) @@ -1935,7 +1935,7 @@ Slots: [job.spawn_positions] else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright, but only if they affect the skin features["mcolor"] = sanitize_hexcolor(new_mutantcolor) else - to_chat(user, "Invalid color. Your color is not bright enough.") + to_chat(user, span_danger("Invalid color. Your color is not bright enough.")) if("color_ethereal") var/new_etherealcolor = input(user, "Choose your ethereal color", "Character Preference") as null|anything in GLOB.color_list_ethereal @@ -2028,7 +2028,7 @@ Slots: [job.spawn_positions] charflaw = GLOB.character_flaws[selectedflaw] charflaw = new charflaw() if(charflaw.desc) - to_chat(user, "[charflaw.desc]") + to_chat(user, span_info("[charflaw.desc]")) if("ooccolor") var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference",ooccolor) as color|null @@ -2334,7 +2334,7 @@ Slots: [job.spawn_positions] As a voice, you will receive meditations from players asking about game mechanics!\n\ Good voices will be rewarded with PQ for answering meditations, while bad ones are punished at the discretion of jannies.") else - to_chat(user, "You are no longer a voice.") + to_chat(user, span_warning("You are no longer a voice.")) if("save") save_preferences() diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index cf2d6c057..b2f86b771 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -45,7 +45,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(current_version < 29) key_bindings = (hotkeys) ? deepCopyList(GLOB.hotkey_keybinding_list_by_key) : deepCopyList(GLOB.classic_keybinding_list_by_key) parent.update_movement_keys() - to_chat(parent, "Empty keybindings, setting default to [hotkeys ? "Hotkey" : "Classic"] mode") + to_chat(parent, span_danger("Empty keybindings, setting default to [hotkeys ? "Hotkey" : "Classic"] mode")) /datum/preferences/proc/update_character(current_version, savefile/S) if(current_version < 19) diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index efc596f1e..027a245d9 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -402,9 +402,9 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS prefs.inquisitive_ghost = !prefs.inquisitive_ghost prefs.save_preferences() if(prefs.inquisitive_ghost) - to_chat(src, "I will now examine everything you click on.") + to_chat(src, span_notice("I will now examine everything you click on.")) else - to_chat(src, "I will no longer examine things you click on.") + to_chat(src, span_notice("I will no longer examine things you click on.")) SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Inquisitiveness", "[prefs.inquisitive_ghost ? "Enabled" : "Disabled"]")) //Admin Preferences diff --git a/code/modules/client/verbs/etips.dm b/code/modules/client/verbs/etips.dm index b64f4690c..b60524668 100644 --- a/code/modules/client/verbs/etips.dm +++ b/code/modules/client/verbs/etips.dm @@ -7,7 +7,7 @@ return prefs.enable_tips = !prefs.enable_tips prefs.save_preferences() - to_chat(usr, "Examine tooltips [prefs.enable_tips ? "en" : "dis"]abled.") + to_chat(usr, span_danger("Examine tooltips [prefs.enable_tips ? "en" : "dis"]abled.")) /client/verb/change_tip_delay() set name = "Set Examine Tooltip Delay" @@ -21,4 +21,4 @@ if(usr)//is this what you mean? prefs.tip_delay = indelay prefs.save_preferences() - to_chat(usr, "Tooltip delay set to [indelay] milliseconds.") + to_chat(usr, span_danger("Tooltip delay set to [indelay] milliseconds.")) diff --git a/code/modules/client/verbs/ghost.dm b/code/modules/client/verbs/ghost.dm index db99384b2..cca89ea27 100644 --- a/code/modules/client/verbs/ghost.dm +++ b/code/modules/client/verbs/ghost.dm @@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(ghost_verbs, list( log_game("[key_name(usr)] respawned from underworld") - to_chat(src, "Returned to lobby successfully.") + to_chat(src, span_info("Returned to lobby successfully.")) if(!client) log_game("[key_name(usr)] AM failed due to disconnect.") diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 4bd8ce278..2440cc872 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -8,7 +8,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") set category = "OOC" set hidden = 1 if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, span_danger("Speech is currently admin-disabled.")) return if(!mob) @@ -16,29 +16,29 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") if(CONFIG_GET(flag/usewhitelist)) if(whitelisted() != 1) - to_chat(src, "I can't use that.") + to_chat(src, span_danger("I can't use that.")) return if(blacklisted()) - to_chat(src, "I can't use that.") + to_chat(src, span_danger("I can't use that.")) return if(get_playerquality(ckey) <= -5) - to_chat(src, "I can't use that.") + to_chat(src, span_danger("I can't use that.")) return if(!holder) if(!GLOB.ooc_allowed) - to_chat(src, "OOC is globally muted.") + to_chat(src, span_danger("OOC is globally muted.")) return if(!GLOB.dooc_allowed && (mob.stat == DEAD)) - to_chat(usr, "OOC for dead mobs has been turned off.") + to_chat(usr, span_danger("OOC for dead mobs has been turned off.")) return if(prefs.muted & MUTE_OOC) - to_chat(src, "I cannot use OOC (muted).") + to_chat(src, span_danger("I cannot use OOC (muted).")) return if(is_banned_from(ckey, "OOC")) - to_chat(src, "I have been banned from OOC.") + to_chat(src, span_danger("I have been banned from OOC.")) return if(QDELETED(src)) return @@ -62,7 +62,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") return if(!(prefs.chat_toggles & CHAT_OOC)) - to_chat(src, "I have OOC muted.") + to_chat(src, span_danger("I have OOC muted.")) return mob.log_talk(raw_msg, LOG_OOC) @@ -94,18 +94,18 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") // if(check_rights_for(src, R_ADMIN)) // to_chat(C, "[keyname]: [msg]
") // else -// to_chat(C, "[keyname]: [msg]") +// to_chat(C, span_adminobserverooc("[keyname]: [msg]")) // else // if(GLOB.OOC_COLOR) // to_chat(C, "[keyname]: [msg]") // else -// to_chat(C, "[keyname]: [msg]") +// to_chat(C, span_ooc("[keyname]: [msg]")) // else if(!(key in C.prefs.ignoring)) // if(GLOB.OOC_COLOR) // to_chat(C, "[keyname]: [msg]") // else -// to_chat(C, "[keyname]: [msg]") +// to_chat(C, span_ooc("[keyname]: [msg]")) /client/proc/lobbyooc(msg as text) @@ -114,7 +114,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") set desc = "Talk with the other players." if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, span_danger("Speech is currently admin-disabled.")) return if(!mob) @@ -122,23 +122,23 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") if(CONFIG_GET(flag/usewhitelist)) if(whitelisted() != 1) - to_chat(src, "I can't use that.") + to_chat(src, span_danger("I can't use that.")) return if(blacklisted()) - to_chat(src, "I can't use that.") + to_chat(src, span_danger("I can't use that.")) return if(get_playerquality(ckey) <= -5) - to_chat(src, "I can't use that.") + to_chat(src, span_danger("I can't use that.")) return if(!holder) if(prefs.muted & MUTE_OOC) - to_chat(src, "I cannot use OOC (muted).") + to_chat(src, span_danger("I cannot use OOC (muted).")) return if(is_banned_from(ckey, "OOC")) - to_chat(src, "I have been banned from OOC.") + to_chat(src, span_danger("I have been banned from OOC.")) return if(QDELETED(src)) return @@ -162,7 +162,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") return if(!(prefs.chat_toggles & CHAT_OOC)) - to_chat(src, "I have OOC muted.") + to_chat(src, span_danger("I have OOC muted.")) return mob.log_talk(raw_msg, LOG_OOC) @@ -283,7 +283,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") if(GLOB.admin_notice) to_chat(src, "Admin Notice:\n \t [GLOB.admin_notice]") else - to_chat(src, "There are no admin notices at the moment.") + to_chat(src, span_notice("There are no admin notices at the moment.")) #ifdef TESTSERVER /client/verb/smiteselfverily() set name = "KillSelf" @@ -295,7 +295,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") var/confirm = alert(src, "Should I really kill myself?", "Feed the crows", "Yes", "No") if(confirm == "Yes") log_admin("[key_name(usr)] used killself.") - message_admins("[key_name_admin(usr)] used killself.") + message_admins(span_adminnotice("[key_name_admin(usr)] used killself.")) mob.death() #endif @@ -450,7 +450,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") if(motd) to_chat(src, "
[motd]
", handle_whitespace=FALSE) else - to_chat(src, "The Message of the Day has not been set.") + to_chat(src, span_notice("The Message of the Day has not been set.")) /client/proc/self_notes() set name = "View Admin Remarks" @@ -462,7 +462,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") if(!check_rights(0)) return if(!CONFIG_GET(flag/see_own_notes)) - to_chat(usr, "Sorry, that function is not enabled on this server.") + to_chat(usr, span_notice("Sorry, that function is not enabled on this server.")) return browse_messages(null, usr.ckey, null, TRUE) @@ -473,7 +473,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") set desc = "" if(!CONFIG_GET(flag/use_exp_tracking)) - to_chat(usr, "Sorry, tracking is currently disabled.") + to_chat(usr, span_notice("Sorry, tracking is currently disabled.")) return var/list/body = list() diff --git a/code/modules/client/verbs/ping.dm b/code/modules/client/verbs/ping.dm index 27e2121db..3e700542c 100644 --- a/code/modules/client/verbs/ping.dm +++ b/code/modules/client/verbs/ping.dm @@ -15,7 +15,7 @@ set instant = TRUE set name = ".display_ping" var/thingy = round(pingfromtime(time)/2,1) - to_chat(src, "[thingy]ms") + to_chat(src, span_notice("[thingy]ms")) /client/verb/ping() set name = "Ping" diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm index 9aec34755..d7bc64e2f 100644 --- a/code/modules/client/verbs/suicide.dm +++ b/code/modules/client/verbs/suicide.dm @@ -100,7 +100,7 @@ "[src] is twisting [p_their()] own neck! It looks like [p_theyre()] trying to commit suicide.", \ "[src] is holding [p_their()] breath! It looks like [p_theyre()] trying to commit suicide.") - visible_message("[suicide_message]", "[suicide_message]") + visible_message(span_danger("[suicide_message]"), span_danger("[suicide_message]")) suicide_log() @@ -118,8 +118,8 @@ return if(confirm == "Yes") set_suicide(TRUE) - visible_message("[src]'s brain is growing dull and lifeless. [p_they(TRUE)] look[p_s()] like [p_theyve()] lost the will to live.", \ - "[src]'s brain is growing dull and lifeless. [p_they(TRUE)] look[p_s()] like [p_theyve()] lost the will to live.") + visible_message(span_danger("[src]'s brain is growing dull and lifeless. [p_they(TRUE)] look[p_s()] like [p_theyve()] lost the will to live."), \ + span_danger("[src]'s brain is growing dull and lifeless. [p_they(TRUE)] look[p_s()] like [p_theyve()] lost the will to live.")) suicide_log() @@ -136,8 +136,8 @@ return if(confirm == "Yes") set_suicide(TRUE) - visible_message("[src] is attempting to bite [p_their()] tongue. It looks like [p_theyre()] trying to commit suicide.", \ - "[src] is attempting to bite [p_their()] tongue. It looks like [p_theyre()] trying to commit suicide.") + visible_message(span_danger("[src] is attempting to bite [p_their()] tongue. It looks like [p_theyre()] trying to commit suicide."), \ + span_danger("[src] is attempting to bite [p_their()] tongue. It looks like [p_theyre()] trying to commit suicide.")) suicide_log() @@ -153,8 +153,8 @@ return if(confirm == "Yes") set_suicide(TRUE) - visible_message("[src] is powering down. It looks like [p_theyre()] trying to commit suicide.", \ - "[src] is powering down. It looks like [p_theyre()] trying to commit suicide.") + visible_message(span_danger("[src] is powering down. It looks like [p_theyre()] trying to commit suicide."), \ + span_danger("[src] is powering down. It looks like [p_theyre()] trying to commit suicide.")) suicide_log() @@ -171,8 +171,8 @@ return if(confirm == "Yes") set_suicide(TRUE) - visible_message("[src] is powering down. It looks like [p_theyre()] trying to commit suicide.", \ - "[src] is powering down. It looks like [p_theyre()] trying to commit suicide.") + visible_message(span_danger("[src] is powering down. It looks like [p_theyre()] trying to commit suicide."), \ + span_danger("[src] is powering down. It looks like [p_theyre()] trying to commit suicide.")) suicide_log() @@ -185,8 +185,8 @@ var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") if(confirm == "Yes") var/turf/T = get_turf(src.loc) - T.visible_message("[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"", null, \ - "[src] bleeps electronically.") + T.visible_message(span_notice("[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\""), null, \ + span_notice("[src] bleeps electronically.")) suicide_log() @@ -203,9 +203,9 @@ return if(confirm == "Yes") set_suicide(TRUE) - visible_message("[src] is thrashing wildly! It looks like [p_theyre()] trying to commit suicide.", \ - "[src] is thrashing wildly! It looks like [p_theyre()] trying to commit suicide.", \ - "I hear thrashing.") + visible_message(span_danger("[src] is thrashing wildly! It looks like [p_theyre()] trying to commit suicide."), \ + span_danger("[src] is thrashing wildly! It looks like [p_theyre()] trying to commit suicide."), \ + span_hear("I hear thrashing.")) suicide_log() @@ -224,8 +224,8 @@ return if(confirm == "Yes") set_suicide(TRUE) - visible_message("[src] begins to fall down. It looks like [p_theyve()] lost the will to live.", \ - "[src] begins to fall down. It looks like [p_theyve()] lost the will to live.") + visible_message(span_danger("[src] begins to fall down. It looks like [p_theyve()] lost the will to live."), \ + span_danger("[src] begins to fall down. It looks like [p_theyve()] lost the will to live.")) suicide_log() @@ -242,17 +242,17 @@ if(CONSCIOUS) return TRUE if(SOFT_CRIT) - to_chat(src, "I can't commit suicide while in a critical condition!") + to_chat(src, span_warning("I can't commit suicide while in a critical condition!")) if(UNCONSCIOUS) - to_chat(src, "I need to be conscious to commit suicide!") + to_chat(src, span_warning("I need to be conscious to commit suicide!")) if(DEAD) - to_chat(src, "You're already dead!") + to_chat(src, span_warning("You're already dead!")) return /mob/living/carbon/canSuicide() if(!..()) return if(!(mobility_flags & MOBILITY_USE)) //just while I finish up the new 'fun' suiciding verb. This is to prevent metagaming via suicide - to_chat(src, "I can't commit suicide whilst immobile! ((You can type Ghost instead however.))") + to_chat(src, span_warning("I can't commit suicide whilst immobile! ((You can type Ghost instead however.))")) return return TRUE diff --git a/code/modules/client/verbs/who.dm b/code/modules/client/verbs/who.dm index ad833c2ee..7c05d9071 100644 --- a/code/modules/client/verbs/who.dm +++ b/code/modules/client/verbs/who.dm @@ -9,7 +9,7 @@ var/wled = 0 if(holder) - to_chat(src, "Loading Whom, please wait...") + to_chat(src, span_info("Loading Whom, please wait...")) // if (check_rights(R_ADMIN,0) )//If they have +ADMIN and are a ghost they can see players IC names and statuses. // var/mob/dead/observer/G = src.mob // if(!G.started_as_observer)//If you aghost to do this, KorPhaeron will deadmin you in your sleep. @@ -62,10 +62,10 @@ // if(C.ckey in GLOB.anonymize) // usedkey = get_fake_key(C.ckey) /* if(WL) - Lines += "[C.key][hidden ? " (as [get_fake_key(C.ckey)])" : ""]" + Lines += span_biginfo("[C.key][hidden ? " (as [get_fake_key(C.ckey)])" : ""]") else - Lines += "[C.key][hidden ? " (as [get_fake_key(C.ckey)])" : ""]"*/ - var/entry = "[usedkey]" + Lines += span_info("[C.key][hidden ? " (as [get_fake_key(C.ckey)])" : ""]")*/ + var/entry = span_info("[usedkey]") entry += " ([CheckIPCountry(C.address)])" Lines += entry*/ else @@ -80,10 +80,10 @@ if(C.ckey in GLOB.anonymize) usedkey = get_fake_key(C.ckey) /* if(WL) - Lines += "[usedkey]" + Lines += span_biginfo("[usedkey]") else - Lines += "[usedkey]"*/ - Lines += "[usedkey]" + Lines += span_info("[usedkey]")*/ + Lines += span_info("[usedkey]") // if(holder && check_rights(R_ADMIN,0)) //thius is the part where admins see the lines but nobody else for(var/line in sortList(Lines)) msg += "[line]\n" @@ -129,6 +129,6 @@ continue //Don't show afk admins to adminwho if(!C.holder.fakekey) msg += "\t[C] is a [C.holder.rank]\n" - msg += "Adminhelps are also sent to IRC. If no admins are available in game adminhelp anyways and an admin on IRC will see it and respond." + msg += span_info("Adminhelps are also sent to IRC. If no admins are available in game adminhelp anyways and an admin on IRC will see it and respond.") to_chat(src, msg) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index bab3c696e..da2dc13b1 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -57,7 +57,7 @@ else if(istype(old_headgear, /obj/item/clothing/mask/chameleon/drone)) new_headgear = new /obj/item/clothing/head/chameleon/drone() else - to_chat(owner, "I shouldn't be able to toggle a camogear helmetmask if you're not wearing it.") + to_chat(owner, span_warning("I shouldn't be able to toggle a camogear helmetmask if you're not wearing it.")) if(new_headgear) // Force drop the item in the headslot, even though // it's has TRAIT_NODROP @@ -488,7 +488,7 @@ /obj/item/clothing/mask/chameleon/attack_self(mob/user) vchange = !vchange - to_chat(user, "The voice changer is now [vchange ? "on" : "off"]!") + to_chat(user, span_notice("The voice changer is now [vchange ? "on" : "off"]!")) /obj/item/clothing/mask/chameleon/drone @@ -507,7 +507,7 @@ randomise_action.UpdateButtonIcon() /obj/item/clothing/mask/chameleon/drone/attack_self(mob/user) - to_chat(user, "[src] does not have a voice changer.") + to_chat(user, span_notice("[src] does not have a voice changer.")) /obj/item/clothing/shoes/chameleon name = "black shoes" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 9034cabca..74bc14997 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -104,14 +104,14 @@ if(r_sleeve_status == SLEEVE_NOMOD) return if(r_sleeve_status == SLEEVE_TORN) - to_chat(user, "It's torn away.") + to_chat(user, span_info("It's torn away.")) return if(!shiftheld) if(!do_after(user, 20, target = user)) return if(prob(L.STASTR * 8)) r_sleeve_status = SLEEVE_TORN - user.visible_message("[user] tears [src].") + user.visible_message(span_notice("[user] tears [src].")) playsound(src, 'sound/foley/cloth_rip.ogg', 50, TRUE) if(r_sleeve_zone == BODY_ZONE_R_ARM) body_parts_covered &= ~ARM_RIGHT @@ -121,7 +121,7 @@ C.color = color user.put_in_hands(C) else - user.visible_message("[user] tries to tear [src].") + user.visible_message(span_warning("[user] tries to tear [src].")) else if(r_sleeve_status == SLEEVE_ROLLED) if(r_sleeve_zone == BODY_ZONE_R_ARM) @@ -139,14 +139,14 @@ if(l_sleeve_status == SLEEVE_NOMOD) return if(l_sleeve_status == SLEEVE_TORN) - to_chat(user, "It's torn away.") + to_chat(user, span_info("It's torn away.")) return if(!shiftheld) //tear if(!do_after(user, 20, target = user)) return if(prob(L.STASTR * 8)) l_sleeve_status = SLEEVE_TORN - user.visible_message("[user] tears [src].") + user.visible_message(span_notice("[user] tears [src].")) playsound(src, 'sound/foley/cloth_rip.ogg', 50, TRUE) if(l_sleeve_zone == BODY_ZONE_L_ARM) body_parts_covered &= ~ARM_LEFT @@ -156,7 +156,7 @@ C.color = color user.put_in_hands(C) else - user.visible_message("[user] tries to tear [src].") + user.visible_message(span_warning("[user] tries to tear [src].")) else if(l_sleeve_status == SLEEVE_ROLLED) l_sleeve_status = SLEEVE_NORMAL @@ -246,7 +246,7 @@ C.use(1) update_clothes_damaged_state(FALSE) obj_integrity = max_integrity - to_chat(user, "I fix the damage on [src] with [C].") + to_chat(user, span_notice("I fix the damage on [src] with [C].")) return 1*/ return ..() @@ -286,7 +286,7 @@ if (1601 to 35000) . += "[src] offers the wearer robust protection from fire." if(damaged_clothes) - . += "It looks damaged!" + . += span_warning("It looks damaged!") var/datum/component/storage/pockets = GetComponent(/datum/component/storage) if(pockets) var/list/how_cool_are_your_threads = list("") @@ -396,20 +396,20 @@ BLIND // can't see anything var/list/modes = list("Off", "Binary vitals", "Exact vitals", "Tracking beacon") var/switchMode = input("Select a sensor mode:", "Suit Sensor Mode", modes[sensor_mode + 1]) in modes if(get_dist(usr, src) > 1) - to_chat(usr, "I have moved too far away!") + to_chat(usr, span_warning("I have moved too far away!")) return sensor_mode = modes.Find(switchMode) - 1 if (src.loc == usr) switch(sensor_mode) if(0) - to_chat(usr, "I disable my suit's remote sensing equipment.") + to_chat(usr, span_notice("I disable my suit's remote sensing equipment.")) if(1) - to_chat(usr, "My suit will now only report whether you are alive or dead.") + to_chat(usr, span_notice("My suit will now only report whether you are alive or dead.")) if(2) - to_chat(usr, "My suit will now only report my exact vital lifesigns.") + to_chat(usr, span_notice("My suit will now only report my exact vital lifesigns.")) if(3) - to_chat(usr, "My suit will now report my exact vital lifesigns as well as my coordinate position.") + to_chat(usr, span_notice("My suit will now report my exact vital lifesigns as well as my coordinate position.")) if(ishuman(loc)) var/mob/living/carbon/human/H = loc @@ -438,12 +438,12 @@ BLIND // can't see anything if(!can_use(usr)) return if(!can_adjust) - to_chat(usr, "I cannot wear this suit any differently!") + to_chat(usr, span_warning("I cannot wear this suit any differently!")) return if(toggle_jumpsuit_adjust()) - to_chat(usr, "I adjust the suit to wear it more casually.") + to_chat(usr, span_notice("I adjust the suit to wear it more casually.")) else - to_chat(usr, "I adjust the suit back to normal.") + to_chat(usr, span_notice("I adjust the suit back to normal.")) if(ishuman(usr)) var/mob/living/carbon/human/H = usr H.update_inv_w_uniform() @@ -470,7 +470,7 @@ BLIND // can't see anything visor_toggling() - to_chat(user, "I adjust \the [src] [up ? "up" : "down"].") + to_chat(user, span_notice("I adjust \the [src] [up ? "up" : "down"].")) if(iscarbon(user)) var/mob/living/carbon/C = user diff --git a/code/modules/clothing/ears/_ears.dm b/code/modules/clothing/ears/_ears.dm index caff2a36d..5f52fe67d 100644 --- a/code/modules/clothing/ears/_ears.dm +++ b/code/modules/clothing/ears/_ears.dm @@ -49,4 +49,4 @@ H.update_inv_ears() H.update_inv_neck() H.update_inv_head() - to_chat(owner, "I turn the music [headphones_on? "on. Untz Untz Untz!" : "off."]") + to_chat(owner, span_notice("I turn the music [headphones_on? "on. Untz Untz Untz!" : "off."]")) diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 31a4083b2..00209e68b 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -19,13 +19,13 @@ var/glass_colour_type //colors your vision when worn /obj/item/clothing/glasses/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is stabbing \the [src] into [user.p_their()] eyes! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is stabbing \the [src] into [user.p_their()] eyes! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /obj/item/clothing/glasses/examine(mob/user) . = ..() if(glass_colour_type && ishuman(user)) - . += "Alt-click to toggle its colors." + . += span_notice("Alt-click to toggle its colors.") /obj/item/clothing/glasses/visor_toggling() ..() @@ -48,7 +48,7 @@ var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES) if(!(HAS_TRAIT(H, TRAIT_BLIND))) if(H.glasses == src) - to_chat(H, "[src] overloads and blinds you!") + to_chat(H, span_danger("[src] overloads and blinds you!")) H.flash_act(visual = 1) H.blind_eyes(3) H.blur_eyes(5) @@ -65,7 +65,7 @@ glass_colour_type = /datum/client_colour/glass_colour/lightgreen /obj/item/clothing/glasses/meson/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is putting \the [src] to [user.p_their()] eyes and overloading the brightness! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is putting \the [src] to [user.p_their()] eyes and overloading the brightness! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS /obj/item/clothing/glasses/meson/night @@ -116,7 +116,7 @@ glass_colour_type = /datum/client_colour/glass_colour/green /obj/item/clothing/glasses/science/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is tightening \the [src]'s straps around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is tightening \the [src]'s straps around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!")) return OXYLOSS /obj/item/clothing/glasses/eyepatch @@ -433,7 +433,7 @@ var/mob/living/carbon/C = user C.update_inv_wear_mask() else - to_chat(user, "The eye winks at you and vanishes into the abyss, you feel really unlucky.") + to_chat(user, span_notice("The eye winks at you and vanishes into the abyss, you feel really unlucky.")) qdel(src) ..() @@ -445,9 +445,9 @@ if(src == H.glasses) H.client.prefs.uses_glasses_colour = !H.client.prefs.uses_glasses_colour if(H.client.prefs.uses_glasses_colour) - to_chat(H, "I will now see glasses colors.") + to_chat(H, span_notice("I will now see glasses colors.")) else - to_chat(H, "I will no longer see glasses colors.") + to_chat(H, span_notice("I will no longer see glasses colors.")) H.update_glasses_color(src, 1) else return ..() diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index e574360c3..d8fbdebc1 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -32,7 +32,12 @@ /obj/item/clothing/glasses/meson/engine/proc/toggle_mode(mob/user, voluntary) mode = modes[mode] - to_chat(user, "[voluntary ? "You turn the goggles":"The goggles turn"] [mode ? "to [mode] mode":"off"][voluntary ? ".":"!"]") + var/stupid_msg + if(voluntary) + stupid_msg = span_notice("You turn the goggles [mode ? "to [mode] mode" : "off"]!") + else + stupid_msg = span_warning("The goggles turn [mode ? "to [mode] mode" : "off"]!") + to_chat(user, stupid_msg) switch(mode) if(MODE_MESON) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index d29bc0399..d9734938c 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -38,7 +38,7 @@ if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - to_chat(user, "PZZTTPFFFT") + to_chat(user, span_warning("PZZTTPFFFT")) desc = "" /obj/item/clothing/glasses/hud/health diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm index dee2af039..852eb3c8f 100644 --- a/code/modules/clothing/gloves/_gloves.dm +++ b/code/modules/clothing/gloves/_gloves.dm @@ -22,7 +22,7 @@ transfer_blood = 0 /obj/item/clothing/gloves/suicide_act(mob/living/carbon/user) - user.visible_message("\the [src] are forcing [user]'s hands around [user.p_their()] neck! It looks like the gloves are possessed!") + user.visible_message(span_suicide("\the [src] are forcing [user]'s hands around [user.p_their()] neck! It looks like the gloves are possessed!")) return OXYLOSS /obj/item/clothing/gloves/worn_overlays(isinhands = FALSE) diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 6ea25826b..56547dd3c 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -46,7 +46,7 @@ /obj/item/clothing/gloves/color/black/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WIRECUTTER) if(can_be_cut && icon_state == initial(icon_state))//only if not dyed - to_chat(user, "I snip the fingertips off of [src].") + to_chat(user, span_notice("I snip the fingertips off of [src].")) I.play_tool_sound(src) new /obj/item/clothing/gloves/fingerless(drop_location()) qdel(src) diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm index c40f837c2..3d6be69e6 100644 --- a/code/modules/clothing/head/_head.dm +++ b/code/modules/clothing/head/_head.dm @@ -35,29 +35,29 @@ var/obj/item/WH = H.head ///check if the item has NODROP if(HAS_TRAIT(WH, TRAIT_NODROP)) - H.visible_message("[src] bounces off [H]'s [WH.name]!", "[src] bounces off your [WH.name], falling to the floor.") + H.visible_message(span_warning("[src] bounces off [H]'s [WH.name]!"), span_warning("[src] bounces off your [WH.name], falling to the floor.")) return ///check if the item is an actual clothing head item, since some non-clothing items can be worn if(istype(WH, /obj/item/clothing/head)) var/obj/item/clothing/head/WHH = WH ///SNUG_FIT hats are immune to being knocked off if(WHH.clothing_flags & SNUG_FIT) - H.visible_message("[src] bounces off [H]'s [WHH.name]!", "[src] bounces off your [WHH.name], falling to the floor.") + H.visible_message(span_warning("[src] bounces off [H]'s [WHH.name]!"), span_warning("[src] bounces off your [WHH.name], falling to the floor.")) return ///if the hat manages to knock something off if(H.dropItemToGround(WH)) - H.visible_message("[src] knocks [WH] off [H]'s head!", "[WH] is suddenly knocked off your head by [src]!") + H.visible_message(span_warning("[src] knocks [WH] off [H]'s head!"), span_warning("[WH] is suddenly knocked off your head by [src]!")) if(H.equip_to_slot_if_possible(src, SLOT_HEAD, 0, 1, 1)) - H.visible_message("[src] lands neatly on [H]'s head!", "[src] lands perfectly onto your head!") + H.visible_message(span_notice("[src] lands neatly on [H]'s head!"), span_notice("[src] lands perfectly onto your head!")) return if(iscyborg(hit_atom)) var/mob/living/silicon/robot/R = hit_atom ///hats in the borg's blacklist bounce off if(is_type_in_typecache(src, GLOB.blacklisted_borg_hats)) - R.visible_message("[src] bounces off [R]!", "[src] bounces off you, falling to the floor.") + R.visible_message(span_warning("[src] bounces off [R]!"), span_warning("[src] bounces off you, falling to the floor.")) return else - R.visible_message("[src] lands neatly on top of [R]!", "[src] lands perfectly on top of you.") + R.visible_message(span_notice("[src] lands neatly on top of [R]!"), span_notice("[src] lands perfectly on top of you.")) R.place_on_head(src) //hats aren't designed to snugly fit borg heads or w/e so they'll always manage to knock eachother off */ diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index fb9c9e403..b6d17c827 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -37,7 +37,7 @@ if(attached_light) . += "It has \a [attached_light] [can_flashlight ? "" : "permanently "]mounted on it." if(can_flashlight) - . += "[attached_light] looks like it can be unscrewed from [src]." + . += span_info("[attached_light] looks like it can be unscrewed from [src].") else if(can_flashlight) . += "It has a mounting point for a seclite." @@ -76,14 +76,14 @@ if(issignaler(I)) var/obj/item/assembly/signaler/S = I if(attached_light) //Has a flashlight. Player must remove it, else it will be lost forever. - to_chat(user, "The mounted flashlight is in the way, remove it first!") + to_chat(user, span_warning("The mounted flashlight is in the way, remove it first!")) return if(S.secured) qdel(S) var/obj/item/bot_assembly/secbot/A = new user.put_in_hands(A) - to_chat(user, "I add the signaler to the helmet.") + to_chat(user, span_notice("I add the signaler to the helmet.")) qdel(src) return return ..() @@ -136,7 +136,7 @@ flags_inv ^= visor_flags_inv flags_cover ^= visor_flags_cover icon_state = "[initial(icon_state)][up ? "up" : ""]" - to_chat(user, "[up ? alt_toggle_message : toggle_message] \the [src].") + to_chat(user, span_notice("[up ? alt_toggle_message : toggle_message] \the [src].")) user.update_inv_head() if(iscarbon(user)) @@ -364,7 +364,7 @@ if(can_flashlight && !attached_light) if(!user.transferItemToLoc(S, src)) return - to_chat(user, "You click [S] into place on [src].") + to_chat(user, span_notice("You click [S] into place on [src].")) set_attached_light(S) update_icon() update_helmlight() @@ -378,7 +378,7 @@ . = ..() if(can_flashlight && attached_light) //if it has a light but can_flashlight is false, the light is permanently attached. I.play_tool_sound(src) - to_chat(user, "I unscrew [attached_light] from [src].") + to_chat(user, span_notice("I unscrew [attached_light] from [src].")) attached_light.forceMove(drop_location()) if(Adjacent(user) && !issilicon(user)) user.put_in_hands(attached_light) @@ -405,7 +405,7 @@ return attached_light.on = !attached_light.on attached_light.update_brightness() - to_chat(user, "You toggle the helmet light [attached_light.on ? "on":"off"].") + to_chat(user, span_notice("You toggle the helmet light [attached_light.on ? "on":"off"].")) playsound(user, 'sound/blank.ogg', 100, TRUE) update_helmlight() diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index c53bfb6cf..8ac60a0fb 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -16,10 +16,10 @@ dog_fashion = /datum/dog_fashion/head/chef /obj/item/clothing/head/chefhat/suicide_act(mob/user) - user.visible_message("[user] is donning [src]! It looks like [user.p_theyre()] trying to become a chef.") + user.visible_message(span_suicide("[user] is donning [src]! It looks like [user.p_theyre()] trying to become a chef.")) user.say("Bork Bork Bork!", forced = "chef hat suicide") sleep(20) - user.visible_message("[user] climbs into an imaginary oven!") + user.visible_message(span_suicide("[user] climbs into an imaginary oven!")) user.say("BOOORK!", forced = "chef hat suicide") playsound(user, 'sound/blank.ogg', 50, TRUE) return(FIRELOSS) @@ -81,7 +81,7 @@ /obj/item/clothing/head/fedora/det_hat/examine(mob/user) . = ..() - . += "Alt-click to take a candy corn." + . += span_notice("Alt-click to take a candy corn.") /obj/item/clothing/head/fedora/det_hat/AltClick(mob/user) if(user.canUseTopic(src, BE_CLOSE, ismonkey(user))) @@ -90,10 +90,10 @@ if(candy_cooldown < world.time) var/obj/item/reagent_containers/food/snacks/candy_corn/CC = new /obj/item/reagent_containers/food/snacks/candy_corn(src) user.put_in_hands(CC) - to_chat(user, "I slip a candy corn from your hat.") + to_chat(user, span_notice("I slip a candy corn from your hat.")) candy_cooldown = world.time+1200 else - to_chat(user, "I just took a candy corn! You should wait a couple minutes, lest you burn through your stash.") + to_chat(user, span_warning("I just took a candy corn! You should wait a couple minutes, lest you burn through your stash.")) //Mime @@ -179,22 +179,22 @@ return TRUE switch(mode) if(DRILL_DEFAULT) - to_chat(user, "I set the voice circuit to the middle position.") + to_chat(user, span_notice("I set the voice circuit to the middle position.")) mode = DRILL_SHOUTING if(DRILL_SHOUTING) - to_chat(user, "I set the voice circuit to the last position.") + to_chat(user, span_notice("I set the voice circuit to the last position.")) mode = DRILL_YELLING if(DRILL_YELLING) - to_chat(user, "I set the voice circuit to the first position.") + to_chat(user, span_notice("I set the voice circuit to the first position.")) mode = DRILL_DEFAULT if(DRILL_CANADIAN) - to_chat(user, "I adjust voice circuit but nothing happens, probably because it's broken.") + to_chat(user, span_danger("I adjust voice circuit but nothing happens, probably because it's broken.")) return TRUE /obj/item/clothing/head/warden/drill/wirecutter_act(mob/living/user, obj/item/I) ..() if(mode != DRILL_CANADIAN) - to_chat(user, "I broke the voice circuit!") + to_chat(user, span_danger("I broke the voice circuit!")) mode = DRILL_CANADIAN return TRUE diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 9681153bd..a5ca3a518 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -135,7 +135,7 @@ return if(slot == SLOT_HEAD) user.grant_language(/datum/language/piratespeak/) - to_chat(user, "I suddenly know how to speak like a pirate!") + to_chat(user, span_boldnotice("I suddenly know how to speak like a pirate!")) /obj/item/clothing/head/pirate/dropped(mob/user) . = ..() @@ -144,7 +144,7 @@ var/mob/living/carbon/human/H = user if(H.get_item_by_slot(SLOT_HEAD) == src) user.remove_language(/datum/language/piratespeak/) - to_chat(user, "I can no longer speak like a pirate.") + to_chat(user, span_boldnotice("I can no longer speak like a pirate.")) /obj/item/clothing/head/pirate/captain icon_state = "hgpiratecap" @@ -213,7 +213,7 @@ if(user.gender == FEMALE) return 0 var/mob/living/carbon/human/H = user - user.visible_message("[user] is donning [src]! It looks like [user.p_theyre()] trying to be nice to girls.") + user.visible_message(span_suicide("[user] is donning [src]! It looks like [user.p_theyre()] trying to be nice to girls.")) user.say("M'lady.", forced = "fedora suicide") sleep(10) H.facial_hairstyle = "Neckbeard" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 1516018bf..a17664cd9 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -104,12 +104,12 @@ /obj/item/clothing/head/hardhat/cakehat/energycake/turn_on(mob/living/user) playsound(user, 'sound/blank.ogg', 5, TRUE) - to_chat(user, "I turn on \the [src].") + to_chat(user, span_warning("I turn on \the [src].")) ..() /obj/item/clothing/head/hardhat/cakehat/energycake/turn_off(mob/living/user) playsound(user, 'sound/blank.ogg', 5, TRUE) - to_chat(user, "I turn off \the [src].") + to_chat(user, span_warning("I turn off \the [src].")) ..() /* @@ -132,12 +132,12 @@ src.icon_state = "ushankaup" src.item_state = "ushankaup" earflaps = 0 - to_chat(user, "I raise the ear flaps on the ushanka.") + to_chat(user, span_notice("I raise the ear flaps on the ushanka.")) else src.icon_state = "ushankadown" src.item_state = "ushankadown" earflaps = 1 - to_chat(user, "I lower the ear flaps on the ushanka.") + to_chat(user, span_notice("I lower the ear flaps on the ushanka.")) /* * Pumpkin head @@ -259,7 +259,7 @@ return if(new_style && new_style != hairstyle) hairstyle = new_style - user.visible_message("[user] changes \the [src]'s hairstyle to [new_style].", "I change \the [src]'s hairstyle to [new_style].") + user.visible_message(span_notice("[user] changes \the [src]'s hairstyle to [new_style]."), span_notice("I change \the [src]'s hairstyle to [new_style].")) if(adjustablecolor) color = input(usr,"","Choose Color",color) as color|null update_icon() @@ -324,7 +324,7 @@ paranoia.clonable = FALSE user.gain_trauma(paranoia, TRAUMA_RESILIENCE_MAGIC) - to_chat(user, "As you don the foiled hat, an entire world of conspiracy theories and seemingly insane ideas suddenly rush into my mind. What you once thought unbelievable suddenly seems.. undeniable. Everything is connected and nothing happens just by accident. You know too much and now they're out to get you. ") + to_chat(user, span_warning("As you don the foiled hat, an entire world of conspiracy theories and seemingly insane ideas suddenly rush into my mind. What you once thought unbelievable suddenly seems.. undeniable. Everything is connected and nothing happens just by accident. You know too much and now they're out to get you. ")) /obj/item/clothing/head/foilhat/MouseDrop(atom/over_object) @@ -332,7 +332,7 @@ if(!warped && iscarbon(usr)) var/mob/living/carbon/C = usr if(src == C.head) - to_chat(C, "Why would you want to take this off? Do you want them to get into my mind?!") + to_chat(C, span_danger("Why would you want to take this off? Do you want them to get into my mind?!")) return return ..() @@ -353,13 +353,13 @@ return QDEL_NULL(paranoia) if(!target.IsUnconscious()) - to_chat(target, "My zealous conspirationism rapidly dissipates as the donned hat warps up into a ruined mess. All those theories starting to sound like nothing but a ridicolous fanfare.") + to_chat(target, span_warning("My zealous conspirationism rapidly dissipates as the donned hat warps up into a ruined mess. All those theories starting to sound like nothing but a ridicolous fanfare.")) /obj/item/clothing/head/foilhat/attack_hand(mob/user) if(!warped && iscarbon(user)) var/mob/living/carbon/C = user if(src == C.head) - to_chat(user, "Why would you want to take this off? Do you want them to get into my mind?!") + to_chat(user, span_danger("Why would you want to take this off? Do you want them to get into my mind?!")) return return ..() diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 36d98689f..6b2065249 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -35,15 +35,15 @@ flipped = !flipped if(src.flipped) icon_state = "[soft_type]soft_flipped" - to_chat(user, "I flip the hat backwards.") + to_chat(user, span_notice("I flip the hat backwards.")) else icon_state = "[soft_type]soft" - to_chat(user, "I flip the hat back in normal position.") + to_chat(user, span_notice("I flip the hat back in normal position.")) usr.update_inv_head() //so our mob-overlays update /obj/item/clothing/head/soft/examine(mob/user) . = ..() - . += "Alt-click the cap to flip it [flipped ? "forwards" : "backwards"]." + . += span_notice("Alt-click the cap to flip it [flipped ? "forwards" : "backwards"].") /obj/item/clothing/head/soft/red name = "red cap" diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm index 24ca3ec39..f796086d5 100644 --- a/code/modules/clothing/masks/_masks.dm +++ b/code/modules/clothing/masks/_masks.dm @@ -13,7 +13,7 @@ if(CHECK_BITFIELD(clothing_flags, VOICEBOX_TOGGLABLE)) TOGGLE_BITFIELD(clothing_flags, VOICEBOX_DISABLED) var/status = !CHECK_BITFIELD(clothing_flags, VOICEBOX_DISABLED) - to_chat(user, "I turn the voice box in [src] [status ? "on" : "off"].") + to_chat(user, span_notice("I turn the voice box in [src] [status ? "on" : "off"].")) /obj/item/clothing/mask/equipped(mob/M, slot) . = ..() @@ -55,11 +55,11 @@ clothing_flags |= visor_flags flags_inv |= visor_flags_inv flags_cover |= visor_flags_cover - to_chat(user, "I push \the [src] back into place.") + to_chat(user, span_notice("I push \the [src] back into place.")) slot_flags = initial(slot_flags) else icon_state += "_up" - to_chat(user, "I push \the [src] out of the way.") + to_chat(user, span_notice("I push \the [src] out of the way.")) gas_transfer_coefficient = null permeability_coefficient = null clothing_flags &= ~visor_flags diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index b32df51de..0bf568257 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -15,7 +15,7 @@ resistance_flags = NONE /obj/item/clothing/mask/breath/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is wrapping \the [src]'s tube around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is wrapping \the [src]'s tube around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!")) return OXYLOSS /obj/item/clothing/mask/breath/attack_self(mob/user) @@ -30,7 +30,7 @@ /obj/item/clothing/mask/breath/examine(mob/user) . = ..() - . += "Alt-click [src] to adjust it." + . += span_notice("Alt-click [src] to adjust it.") /obj/item/clothing/mask/breath/medical desc = "" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 415bb1afe..75028b190 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -103,7 +103,7 @@ for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() - to_chat(user, "My Clown Mask has now morphed into [choice], all praise the Honkmother!") + to_chat(user, span_notice("My Clown Mask has now morphed into [choice], all praise the Honkmother!")) return 1 /obj/item/clothing/mask/gas/sexyclown @@ -145,7 +145,7 @@ for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() - to_chat(user, "My Mime Mask has now morphed into [choice]!") + to_chat(user, span_notice("My Mime Mask has now morphed into [choice]!")) return 1 /obj/item/clothing/mask/gas/monkeymask @@ -216,7 +216,7 @@ for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() - to_chat(M, "The Tiki Mask has now changed into the [choice] Mask!") + to_chat(M, span_notice("The Tiki Mask has now changed into the [choice] Mask!")) return 1 /obj/item/clothing/mask/gas/tiki_mask/yalp_elor diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index 6a0fafef7..883573515 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -49,22 +49,22 @@ return TRUE switch(aggressiveness) if(1) - to_chat(user, "I set the restrictor to the middle position.") + to_chat(user, span_notice("I set the restrictor to the middle position.")) aggressiveness = 2 if(2) - to_chat(user, "I set the restrictor to the last position.") + to_chat(user, span_notice("I set the restrictor to the last position.")) aggressiveness = 3 if(3) - to_chat(user, "I set the restrictor to the first position.") + to_chat(user, span_notice("I set the restrictor to the first position.")) aggressiveness = 1 if(4) - to_chat(user, "I adjust the restrictor but nothing happens, probably because it's broken.") + to_chat(user, span_danger("I adjust the restrictor but nothing happens, probably because it's broken.")) return TRUE /obj/item/clothing/mask/gas/sechailer/wirecutter_act(mob/living/user, obj/item/I) ..() if(aggressiveness != 4) - to_chat(user, "I broke the restrictor!") + to_chat(user, span_danger("I broke the restrictor!")) aggressiveness = 4 return TRUE @@ -79,7 +79,7 @@ /obj/item/clothing/mask/gas/sechailer/emag_act(mob/user as mob) if(safety) safety = FALSE - to_chat(user, "I silently fry [src]'s vocal circuit with the cryptographic sequencer.") + to_chat(user, span_warning("I silently fry [src]'s vocal circuit with the cryptographic sequencer.")) else return @@ -94,7 +94,7 @@ if(!can_use(usr)) return if(broken_hailer) - to_chat(usr, "\The [src]'s hailing system is broken.") + to_chat(usr, span_warning("\The [src]'s hailing system is broken.")) return var/phrase = 0 //selects which phrase to use @@ -109,12 +109,12 @@ switch(recent_uses) if(3) - to_chat(usr, "\The [src] is starting to heat up.") + to_chat(usr, span_warning("\The [src] is starting to heat up.")) if(4) - to_chat(usr, "\The [src] is heating up dangerously from overuse!") + to_chat(usr, span_danger("\The [src] is heating up dangerously from overuse!")) if(5) //overload broken_hailer = 1 - to_chat(usr, "\The [src]'s power modulator overloads and breaks.") + to_chat(usr, span_danger("\The [src]'s power modulator overloads and breaks.")) return switch(aggressiveness) // checks if the user has unlocked the restricted phrases diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index dcb4a92c8..ba2be7825 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -12,7 +12,7 @@ if(iscarbon(user)) var/mob/living/carbon/C = user if(src == C.wear_mask) - to_chat(user, "I need help taking this off!") + to_chat(user, span_warning("I need help taking this off!")) return ..() @@ -122,7 +122,7 @@ /obj/item/clothing/mask/frog/cursed/equipped(mob/user, slot) var/mob/living/carbon/C = user if(C.wear_mask == src && HAS_TRAIT_FROM(src, TRAIT_NODROP, CURSED_MASK_TRAIT)) - to_chat(user, "[src] was cursed! Ree!!") + to_chat(user, span_danger("[src] was cursed! Ree!!")) return ..() /obj/item/clothing/mask/cowmask @@ -243,10 +243,10 @@ if(iscarbon(user)) var/mob/living/carbon/C = user if((C.get_item_by_slot(SLOT_HEAD == src)) || (C.get_item_by_slot(SLOT_WEAR_MASK) == src)) - to_chat(user, "I can't tie [src] while wearing it!") + to_chat(user, span_warning("I can't tie [src] while wearing it!")) return if(slot_flags & ITEM_SLOT_HEAD) - to_chat(user, "I must undo [src] before you can tie it into a neckerchief!") + to_chat(user, span_warning("I must undo [src] before you can tie it into a neckerchief!")) else if(user.is_holding(src)) var/obj/item/clothing/neck/neckerchief/nk = new(src) @@ -257,10 +257,10 @@ var/currentHandIndex = user.get_held_index_of_item(src) user.transferItemToLoc(src, null) user.put_in_hand(nk, currentHandIndex) - user.visible_message("I tie [src] up like a neckerchief.", "[user] ties [src] up like a neckerchief.") + user.visible_message(span_notice("I tie [src] up like a neckerchief."), span_notice("[user] ties [src] up like a neckerchief.")) qdel(src) else - to_chat(user, "I must be holding [src] in order to tie it!") + to_chat(user, span_warning("I must be holding [src] in order to tie it!")) /obj/item/clothing/mask/bandana/red name = "red bandana" diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 21d4b7506..739d2f080 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -53,7 +53,7 @@ icon_state = "stethoscope" /obj/item/clothing/neck/stethoscope/suicide_act(mob/living/carbon/user) - user.visible_message("[user] puts \the [src] to [user.p_their()] chest! It looks like [user.p_they()] wont hear much!") + user.visible_message(span_suicide("[user] puts \the [src] to [user.p_their()] chest! It looks like [user.p_they()] wont hear much!")) return OXYLOSS /obj/item/clothing/neck/stethoscope/attack(mob/living/carbon/human/M, mob/living/user) @@ -61,27 +61,27 @@ if(user.used_intent.type == INTENT_HELP) var/body_part = parse_zone(user.zone_selected) - var/heart_strength = "no" - var/lung_strength = "no" + var/heart_strength = span_danger("no") + var/lung_strength = span_danger("no") var/obj/item/organ/heart/heart = M.getorganslot(ORGAN_SLOT_HEART) var/obj/item/organ/lungs/lungs = M.getorganslot(ORGAN_SLOT_LUNGS) if(!(M.stat == DEAD || (HAS_TRAIT(M, TRAIT_FAKEDEATH)))) if(heart && istype(heart)) - heart_strength = "an unstable" + heart_strength = span_danger("an unstable") if(heart.beating) heart_strength = "a healthy" if(lungs && istype(lungs)) - lung_strength = "strained" + lung_strength = span_danger("strained") if(!(M.failed_last_breath || M.losebreath)) lung_strength = "healthy" if(M.stat == DEAD && heart && world.time - M.timeofdeath < DEFIB_TIME_LIMIT * 10) - heart_strength = "a faint, fluttery" + heart_strength = span_boldannounce("a faint, fluttery") var/diagnosis = (body_part == BODY_ZONE_CHEST ? "You hear [heart_strength] pulse and [lung_strength] respiration." : "You faintly hear [heart_strength] pulse.") - user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "I place [src] against [M]'s [body_part]. [diagnosis]") + user.visible_message(span_notice("[user] places [src] against [M]'s [body_part] and listens attentively."), span_notice("I place [src] against [M]'s [body_part]. [diagnosis]")) return return ..(M,user) @@ -212,7 +212,7 @@ if(iscarbon(user)) var/mob/living/carbon/C = user if(C.get_item_by_slot(SLOT_NECK) == src) - to_chat(user, "I can't untie [src] while wearing it!") + to_chat(user, span_warning("I can't untie [src] while wearing it!")) return if(user.is_holding(src)) var/obj/item/clothing/mask/bandana/newBand = new sourceBandanaType(user) @@ -220,6 +220,6 @@ var/oldName = src.name qdel(src) user.put_in_hand(newBand, currentHandIndex) - user.visible_message("I untie [oldName] back into a [newBand.name].", "[user] unties [oldName] back into a [newBand.name].") + user.visible_message(span_notice("I untie [oldName] back into a [newBand.name]."), span_notice("[user] unties [oldName] back into a [newBand.name].")) else - to_chat(user, "I must be holding [src] in order to untie it!") + to_chat(user, span_warning("I must be holding [src] in order to untie it!")) diff --git a/code/modules/clothing/rogueclothes/cloaks.dm b/code/modules/clothing/rogueclothes/cloaks.dm index 544c51536..a9b5f26f4 100644 --- a/code/modules/clothing/rogueclothes/cloaks.dm +++ b/code/modules/clothing/rogueclothes/cloaks.dm @@ -934,7 +934,7 @@ /obj/item/clothing/neck/roguetown/blkknight/equipped(mob/living/user) . = ..() if(user.mind.special_role == "Bandit") - to_chat(user, "I feel bolstered by Matthios Power!...") + to_chat(user, span_notice("I feel bolstered by Matthios Power!...")) user.change_stat("strength", 2) user.change_stat("perception", 2) user.change_stat("intelligence", 2) @@ -944,14 +944,14 @@ armor = getArmor("blunt" = 100, "slash" = 100, "stab" = 100, "bullet" = 100, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0) active_item = TRUE else - to_chat(user, "I feel an evil power about that necklace..") + to_chat(user, span_notice("I feel an evil power about that necklace..")) armor = getArmor("blunt" = 0, "slash" = 0, "stab" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) active_item = TRUE /obj/item/clothing/neck/roguetown/blkknight/dropped(mob/living/user) if(active_item) if(user.mind.special_role == "Bandit") - to_chat(user, "I've removed the necklace of Matthios...") + to_chat(user, span_notice("I've removed the necklace of Matthios...")) user.change_stat("strength", -2) user.change_stat("perception", -2) user.change_stat("intelligence", -2) @@ -960,7 +960,7 @@ user.change_stat("speed", -2) active_item = FALSE else - to_chat(user, "Strange, I don't feel that power anymore..") + to_chat(user, span_notice("Strange, I don't feel that power anymore..")) armor = getArmor("blunt" = 100, "slash" = 100, "stab" = 100, "bullet" = 100, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0) active_item = FALSE diff --git a/code/modules/clothing/rogueclothes/hats.dm b/code/modules/clothing/rogueclothes/hats.dm index 3f45ade21..24572e502 100644 --- a/code/modules/clothing/rogueclothes/hats.dm +++ b/code/modules/clothing/rogueclothes/hats.dm @@ -687,7 +687,7 @@ var/mob/living/carbon/wise = user if(slot == SLOT_HEAD) wise.change_stat("intelligence", 2, "wisehat") - to_chat(wise, "I gain wisdom.") + to_chat(wise, span_green("I gain wisdom.")) /obj/item/clothing/head/roguetown/wizhat/gen/wise/dropped(mob/user) . = ..() @@ -696,7 +696,7 @@ var/mob/living/carbon/human/wise = user if(wise.get_item_by_slot(SLOT_HEAD) == src) wise.change_stat("intelligence", -2, "wisehat") - to_chat(wise, "I lose wisdom.") + to_chat(wise, span_red("I lose wisdom.")) /obj/item/clothing/head/roguetown/physician name = "doctor's hat" diff --git a/code/modules/clothing/rogueclothes/neck.dm b/code/modules/clothing/rogueclothes/neck.dm index 0f3434755..32f934374 100644 --- a/code/modules/clothing/rogueclothes/neck.dm +++ b/code/modules/clothing/rogueclothes/neck.dm @@ -169,18 +169,18 @@ var/datum/antagonist/werewolf/W = H.mind.has_antag_datum(/datum/antagonist/werewolf/) if(ishuman(H)) if(H.mind.has_antag_datum(/datum/antagonist/vampirelord/lesser)) - to_chat(H, "I can't pick up the silver, it is my BANE!") + to_chat(H, span_userdanger("I can't pick up the silver, it is my BANE!")) H.Knockdown(20) H.adjustFireLoss(60) H.Paralyze(20) H.fire_act(1,5) if(V_lord) if(V_lord.vamplevel < 4 && !H.mind.has_antag_datum(/datum/antagonist/vampirelord/lesser)) - to_chat(H, "I can't pick up the silver, it is my BANE!") + to_chat(H, span_userdanger("I can't pick up the silver, it is my BANE!")) H.Knockdown(10) H.Paralyze(10) if(W && W.transformed == TRUE) - to_chat(H, "I can't equip the silver, it is my BANE!") + to_chat(H, span_userdanger("I can't equip the silver, it is my BANE!")) H.Knockdown(20) H.Paralyze(20) @@ -191,18 +191,18 @@ var/datum/antagonist/vampirelord/V_lord = H.mind.has_antag_datum(/datum/antagonist/vampirelord/) var/datum/antagonist/werewolf/W = H.mind.has_antag_datum(/datum/antagonist/werewolf/) if(H.mind.has_antag_datum(/datum/antagonist/vampirelord/lesser)) - to_chat(H, "I can't equip the silver, it is my BANE!") + to_chat(H, span_userdanger("I can't equip the silver, it is my BANE!")) H.Knockdown(20) H.adjustFireLoss(60) H.Paralyze(20) H.fire_act(1,5) if(V_lord) if(V_lord.vamplevel < 4 && !H.mind.has_antag_datum(/datum/antagonist/vampirelord/lesser)) - to_chat(H, "I can't equip the silver, it is my BANE!") + to_chat(H, span_userdanger("I can't equip the silver, it is my BANE!")) H.Knockdown(10) H.Paralyze(10) if(W && W.transformed == TRUE) - to_chat(H, "I can't equip the silver, it is my BANE!") + to_chat(H, span_userdanger("I can't equip the silver, it is my BANE!")) H.Knockdown(20) H.Paralyze(20) diff --git a/code/modules/clothing/rogueclothes/quiver.dm b/code/modules/clothing/rogueclothes/quiver.dm index ffe57c87f..b755b9b0d 100644 --- a/code/modules/clothing/rogueclothes/quiver.dm +++ b/code/modules/clothing/rogueclothes/quiver.dm @@ -26,7 +26,7 @@ arrows += A update_icon() else - to_chat(loc, "Full!") + to_chat(loc, span_warning("Full!")) return if(istype(A, /obj/item/gun/ballistic/revolver/grenadelauncher/bow)) var/obj/item/gun/ballistic/revolver/grenadelauncher/bow/B = A @@ -51,7 +51,7 @@ /obj/item/quiver/examine(mob/user) . = ..() if(arrows.len) - . += "[arrows.len] inside." + . += span_notice("[arrows.len] inside.") /obj/item/quiver/update_icon() if(arrows.len) diff --git a/code/modules/clothing/rogueclothes/rings.dm b/code/modules/clothing/rogueclothes/rings.dm index 204fd3f63..cf7e21f20 100644 --- a/code/modules/clothing/rogueclothes/rings.dm +++ b/code/modules/clothing/rogueclothes/rings.dm @@ -36,9 +36,9 @@ return if(cooldowny) if(world.time < cooldowny + cdtime) - to_chat(user, "Nothing happens.") + to_chat(user, span_warning("Nothing happens.")) return - user.visible_message("[user] twists the [src]!") + user.visible_message(span_warning("[user] twists the [src]!")) if(activate_sound) playsound(user, activate_sound, 100, FALSE, -1) cooldowny = world.time @@ -55,7 +55,7 @@ update_icon() if(ismob(loc)) var/mob/user = loc - user.visible_message("The ring settles down.") + user.visible_message(span_warning("The ring settles down.")) user.update_inv_wear_id() @@ -158,7 +158,7 @@ return else active_item = TRUE - to_chat(user, "Here be dragons") + to_chat(user, span_notice("Here be dragons")) user.change_stat("strength", 2) user.change_stat("constitution", 2) user.change_stat("endurance", 2) @@ -166,7 +166,7 @@ /obj/item/clothing/ring/dragon_ring/dropped(mob/living/user) if(active_item) - to_chat(user, "Gone is thy hoard") + to_chat(user, span_notice("Gone is thy hoard")) user.change_stat("strength", -2) user.change_stat("constitution", -2) user.change_stat("endurance", -2) diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 51cd73ce0..94b86c155 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -24,7 +24,7 @@ /obj/item/clothing/shoes/suicide_act(mob/living/carbon/user) if(rand(2)>1) - user.visible_message("[user] begins tying \the [src] up waaay too tightly! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins tying \the [src] up waaay too tightly! It looks like [user.p_theyre()] trying to commit suicide!")) var/obj/item/bodypart/l_leg = user.get_bodypart(BODY_ZONE_L_LEG) var/obj/item/bodypart/r_leg = user.get_bodypart(BODY_ZONE_R_LEG) if(l_leg) @@ -34,7 +34,7 @@ playsound(user, "desceration", 50, TRUE, -1) return BRUTELOSS else//didnt realize this suicide act existed (was in miscellaneous.dm) and didnt want to remove it, so made it a 50/50 chance. Why not! - user.visible_message("[user] is bashing [user.p_their()] own head in with [src]! Ain't that a kick in the head?") + user.visible_message(span_suicide("[user] is bashing [user.p_their()] own head in with [src]! Ain't that a kick in the head?")) for(var/i = 0, i < 3, i++) sleep(3) playsound(user, 'sound/blank.ogg', 50, TRUE) diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm index ae119cfa5..a12a7370b 100644 --- a/code/modules/clothing/shoes/bananashoes.dm +++ b/code/modules/clothing/shoes/bananashoes.dm @@ -24,7 +24,7 @@ if(!always_noslip) clothing_flags &= ~NOSLIP update_icon() - to_chat(loc, "I ran out of bananium!") + to_chat(loc, span_warning("I ran out of bananium!")) else new /obj/item/grown/bananapeel/specialpeel(get_step(src,turn(usr.dir, 180))) //honk bananium.use_amount_mat(100, /datum/material/bananium) @@ -33,27 +33,27 @@ var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container) var/sheet_amount = bananium.retrieve_all() if(sheet_amount) - to_chat(user, "I retrieve [sheet_amount] sheets of bananium from the prototype shoes.") + to_chat(user, span_notice("I retrieve [sheet_amount] sheets of bananium from the prototype shoes.")) else - to_chat(user, "I cannot retrieve any bananium from the prototype shoes!") + to_chat(user, span_warning("I cannot retrieve any bananium from the prototype shoes!")) /obj/item/clothing/shoes/clown_shoes/banana_shoes/examine(mob/user) . = ..() - . += "The shoes are [on ? "enabled" : "disabled"]." + . += span_notice("The shoes are [on ? "enabled" : "disabled"].") /obj/item/clothing/shoes/clown_shoes/banana_shoes/ui_action_click(mob/user) var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container) if(bananium.get_material_amount(/datum/material/bananium)) on = !on update_icon() - to_chat(user, "I [on ? "activate" : "deactivate"] the prototype shoes.") + to_chat(user, span_notice("I [on ? "activate" : "deactivate"] the prototype shoes.")) if(!always_noslip) if(on) clothing_flags |= NOSLIP else clothing_flags &= ~NOSLIP else - to_chat(user, "I need bananium to turn the prototype shoes on!") + to_chat(user, span_warning("I need bananium to turn the prototype shoes on!")) /obj/item/clothing/shoes/clown_shoes/banana_shoes/update_icon() if(on) diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index 70de84d69..ca028b380 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -74,7 +74,7 @@ if(ishuman(user)) var/mob/living/carbon/human/C = user if(C.shoes == src && chained == 1) - to_chat(user, "I need help taking these off!") + to_chat(user, span_warning("I need help taking these off!")) return FALSE return ..() @@ -83,7 +83,7 @@ if(ishuman(m)) var/mob/living/carbon/human/c = m if(c.shoes == src && chained == 1) - to_chat(c, "I need help taking these off!") + to_chat(c, span_warning("I need help taking these off!")) return return ..() diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index b95f896c7..9a4987c45 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -29,7 +29,7 @@ slowdown = slowdown_active magpulse = !magpulse icon_state = "[magboot_state][magpulse]" - to_chat(user, "I [magpulse ? "enable" : "disable"] the mag-pulse traction system.") + to_chat(user, span_notice("I [magpulse ? "enable" : "disable"] the mag-pulse traction system.")) user.update_inv_shoes() //so our mob-overlays update user.update_gravity(user.has_gravity()) for(var/X in actions) diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 2026ddac1..511f44222 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -98,13 +98,13 @@ if(!isliving(user)) return if(user.get_active_held_item() != src) - to_chat(user, "I must hold the [src] in your hand to do this!") + to_chat(user, span_warning("I must hold the [src] in your hand to do this!")) return if (!enabled_waddle) - to_chat(user, "I switch off the waddle dampeners!") + to_chat(user, span_notice("I switch off the waddle dampeners!")) enabled_waddle = TRUE else - to_chat(user, "I switch on the waddle dampeners!") + to_chat(user, span_notice("I switch on the waddle dampeners!")) enabled_waddle = FALSE /obj/item/clothing/shoes/clown_shoes/jester @@ -226,17 +226,17 @@ return if(recharging_time > world.time) - to_chat(user, "The boot's internal propulsion needs to recharge still!") + to_chat(user, span_warning("The boot's internal propulsion needs to recharge still!")) return var/atom/target = get_edge_target_turf(user, user.dir) //gets the user's direction if (user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE)) playsound(src, 'sound/blank.ogg', 50, TRUE, TRUE) - user.visible_message("[usr] dashes forward into the air!") + user.visible_message(span_warning("[usr] dashes forward into the air!")) recharging_time = world.time + recharging_rate else - to_chat(user, "Something prevents you from dashing forward!") + to_chat(user, span_warning("Something prevents you from dashing forward!")) /obj/item/clothing/shoes/singery name = "yellow performer's boots" @@ -277,7 +277,7 @@ if(!isliving(user)) return if(!istype(user.get_item_by_slot(SLOT_SHOES), /obj/item/clothing/shoes/wheelys)) - to_chat(user, "I must be wearing the wheely-heels to use them!") + to_chat(user, span_warning("I must be wearing the wheely-heels to use them!")) return if(!(W.is_occupant(user))) wheelToggle = FALSE @@ -360,7 +360,7 @@ if(slot == SLOT_SHOES) for(var/mob/living/occupant in occupants) occupant.forceMove(user.drop_location()) - user.visible_message("[user] recoils as something slithers out of [src].", "I feel a sudden stabbing pain in your [pick("foot", "toe", "ankle")]!") + user.visible_message(span_warning("[user] recoils as something slithers out of [src]."), span_danger("I feel a sudden stabbing pain in your [pick("foot", "toe", "ankle")]!")) user.Knockdown(20) //Is one second paralyze better here? I feel you would fall on your ass in some fashion. user.apply_damage(5, BRUTE, pick(BODY_ZONE_R_LEG, BODY_ZONE_L_LEG)) if(istype(occupant, /mob/living/simple_animal/hostile/retaliate/poison)) @@ -372,12 +372,12 @@ if(user.stat || !(user.mobility_flags & MOBILITY_USE) || user.restrained() || !Adjacent(user) || !user.Adjacent(target) || target.stat == DEAD) return if(occupants.len >= max_occupants) - to_chat(user, "[src] are full!") + to_chat(user, span_warning("[src] are full!")) return if(istype(target, /mob/living/simple_animal/hostile/retaliate/poison/snake) || istype(target, /mob/living/simple_animal/hostile/headcrab) || istype(target, /mob/living/carbon/alien/larva)) occupants += target target.forceMove(src) - to_chat(user, "[target] slithers into [src].") + to_chat(user, span_notice("[target] slithers into [src].")) /obj/item/clothing/shoes/cowboy/container_resist(mob/living/user) if(!do_after(user, 10, target = user)) diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index a1d1bf352..72790445c 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -75,8 +75,8 @@ switch(severity) if(1) if(activated && user && ishuman(user) && (user.wear_armor == src)) - to_chat(user, "E:FATAL:RAM_READ_FAIL\nE:FATAL:STACK_EMPTY\nE:FATAL:READ_NULL_POINT\nE:FATAL:PWR_BUS_OVERLOAD") - to_chat(user, "An electromagnetic pulse disrupts my [name] and violently tears you out of time-bluespace!") + to_chat(user, span_danger("E:FATAL:RAM_READ_FAIL\nE:FATAL:STACK_EMPTY\nE:FATAL:READ_NULL_POINT\nE:FATAL:PWR_BUS_OVERLOAD")) + to_chat(user, span_danger("An electromagnetic pulse disrupts my [name] and violently tears you out of time-bluespace!")) user.emote("scream") deactivate(1, 1) @@ -128,7 +128,7 @@ for(var/exposed_item in exposed) var/obj/item/exposed_I = exposed_item if(exposed_I && !(exposed_I.type in chronosafe_items) && user.dropItemToGround(exposed_I)) - to_chat(user, "My [exposed_I.name] got left behind.") + to_chat(user, span_notice("My [exposed_I.name] got left behind.")) user.ExtinguishMob() diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index a3b151602..c91a5b08a 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -119,28 +119,28 @@ /obj/item/clothing/suit/space/hardsuit/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/tank/jetpack/suit)) if(jetpack) - to_chat(user, "[src] already has a jetpack installed.") + to_chat(user, span_warning("[src] already has a jetpack installed.")) return if(src == user.get_item_by_slot(SLOT_ARMOR)) //Make sure the player is not wearing the suit before applying the upgrade. - to_chat(user, "I cannot install the upgrade to [src] while wearing it.") + to_chat(user, span_warning("I cannot install the upgrade to [src] while wearing it.")) return if(user.transferItemToLoc(I, src)) jetpack = I - to_chat(user, "I successfully install the jetpack into [src].") + to_chat(user, span_notice("I successfully install the jetpack into [src].")) return else if(I.tool_behaviour == TOOL_SCREWDRIVER) if(!jetpack) - to_chat(user, "[src] has no jetpack installed.") + to_chat(user, span_warning("[src] has no jetpack installed.")) return if(src == user.get_item_by_slot(SLOT_ARMOR)) - to_chat(user, "I cannot remove the jetpack from [src] while wearing it.") + to_chat(user, span_warning("I cannot remove the jetpack from [src] while wearing it.")) return jetpack.turn_off(user) jetpack.forceMove(drop_location()) jetpack = null - to_chat(user, "I successfully remove the jetpack from [src].") + to_chat(user, span_notice("I successfully remove the jetpack from [src].")) return return ..() @@ -286,11 +286,11 @@ /obj/item/clothing/head/helmet/space/hardsuit/syndi/attack_self(mob/user) //Toggle Helmet if(!isturf(user.loc)) - to_chat(user, "I cannot toggle your helmet while in this [user.loc]!" ) + to_chat(user, span_warning("I cannot toggle your helmet while in this [user.loc]!") ) return on = !on if(on || force) - to_chat(user, "I switch your hardsuit to EVA mode, sacrificing speed for space protection.") + to_chat(user, span_notice("I switch your hardsuit to EVA mode, sacrificing speed for space protection.")) name = initial(name) desc = initial(desc) set_light(brightness_on) @@ -299,7 +299,7 @@ flags_inv |= visor_flags_inv cold_protection |= HEAD else - to_chat(user, "I switch your hardsuit to combat mode and can now run at full speed.") + to_chat(user, span_notice("I switch your hardsuit to combat mode and can now run at full speed.")) name += " (combat)" desc = alt_desc set_light(0) @@ -693,12 +693,12 @@ var/datum/effect_system/spark_spread/s = new s.set_up(2, 1, src) s.start() - owner.visible_message("[owner]'s shields deflect [attack_text] in a shower of sparks!") + owner.visible_message(span_danger("[owner]'s shields deflect [attack_text] in a shower of sparks!")) current_charges-- if(recharge_rate) START_PROCESSING(SSobj, src) if(current_charges <= 0) - owner.visible_message("[owner]'s shield overloads!") + owner.visible_message(span_warning("[owner]'s shield overloads!")) shield_state = "broken" owner.update_inv_wear_suit() return 1 @@ -804,18 +804,18 @@ /obj/item/clothing/suit/space/hardsuit/shielded/syndi/multitool_act(mob/living/user, obj/item/I) . = ..() if(shield_state == "broken") - to_chat(user, "I can't interface with the hardsuit's software if the shield's broken!") + to_chat(user, span_warning("I can't interface with the hardsuit's software if the shield's broken!")) return if(shield_state == "shield-red") shield_state = "shield-old" shield_on = "shield-old" - to_chat(user, "I roll back the hardsuit's software, changing the shield's color!") + to_chat(user, span_warning("I roll back the hardsuit's software, changing the shield's color!")) else shield_state = "shield-red" shield_on = "shield-red" - to_chat(user, "I update the hardsuit's hardware, changing back the shield's color to red.") + to_chat(user, span_warning("I update the hardsuit's hardware, changing back the shield's color to red.")) user.update_inv_wear_suit() /obj/item/clothing/suit/space/hardsuit/shielded/syndi/Initialize() diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 38b878d5c..63204f89b 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -393,7 +393,7 @@ Contains: /obj/item/clothing/suit/space/fragile/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(!torn && prob(50)) - to_chat(owner, "[src] tears from the damage, breaking the air-tight seal!") + to_chat(owner, span_warning("[src] tears from the damage, breaking the air-tight seal!")) clothing_flags &= ~STOPSPRESSUREDAMAGE name = "torn [src]." desc = "" diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 8b085b586..461e11717 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -16,7 +16,7 @@ /obj/item/clothing/suit/space/eva/plasmaman/examine(mob/user) . = ..() - . += "There [extinguishes_left == 1 ? "is" : "are"] [extinguishes_left] extinguisher charge\s left in this suit." + . += span_notice("There [extinguishes_left == 1 ? "is" : "are"] [extinguishes_left] extinguisher charge\s left in this suit.") /obj/item/clothing/suit/space/eva/plasmaman/proc/Extinguish(mob/living/carbon/human/H) @@ -29,7 +29,7 @@ return next_extinguish = world.time + extinguish_cooldown extinguishes_left-- - H.visible_message("[H]'s suit automatically extinguishes [H.p_them()]!","My suit automatically extinguishes you.") + H.visible_message(span_warning("[H]'s suit automatically extinguishes [H.p_them()]!"),span_warning("My suit automatically extinguishes you.")) H.ExtinguishMob() new /obj/effect/particle_effect/water(get_turf(H)) @@ -70,7 +70,7 @@ /obj/item/clothing/head/helmet/space/plasmaman/proc/toggle_welding_screen(mob/living/user) if(weldingvisortoggle(user)) if(on) - to_chat(user, "My helmet's torch can't pass through my welding visor!") + to_chat(user, span_notice("My helmet's torch can't pass through my welding visor!")) on = FALSE playsound(src, 'sound/blank.ogg', 50, TRUE) //Visors don't just come from nothing update_icon() @@ -96,7 +96,7 @@ if(istype(C, /obj/item/toy/crayon)) if(smile == FALSE) var/obj/item/toy/crayon/CR = C - to_chat(user, "I start drawing a smiley face on the helmet's visor..") + to_chat(user, span_notice("I start drawing a smiley face on the helmet's visor..")) if(do_after(user, 25, target = src)) smile = TRUE smile_color = CR.paint_color @@ -104,7 +104,7 @@ update_icon() return if(smile == TRUE) - to_chat(user, "Seems like someone already drew something on this helmet's visor!") + to_chat(user, span_warning("Seems like someone already drew something on this helmet's visor!")) /obj/item/clothing/head/helmet/space/plasmaman/worn_overlays(isinhands) . = ..() @@ -135,7 +135,7 @@ if(on) if(!up) - to_chat(user, "My helmet's torch can't pass through my welding visor!") + to_chat(user, span_notice("My helmet's torch can't pass through my welding visor!")) set_light(0) else set_light(brightness_on) diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm index 5123d1479..2ac0d53a4 100644 --- a/code/modules/clothing/suits/cloaks.dm +++ b/code/modules/clothing/suits/cloaks.dm @@ -11,7 +11,7 @@ flags_inv = HIDESUITSTORAGE /obj/item/clothing/neck/cloak/suicide_act(mob/user) - user.visible_message("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return(OXYLOSS) /obj/item/clothing/neck/cloak/hos diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index b20755492..cb3a0f03f 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -18,7 +18,7 @@ var/armour_path = anomaly_armour_types[A.anomaly_type] if(!armour_path) armour_path = /obj/item/clothing/suit/armor/reactive/stealth //Lets not cheat the player if an anomaly type doesnt have its own armour coded - to_chat(user, "I insert [A] into the chest plate, and the armour gently hums to life.") + to_chat(user, span_notice("I insert [A] into the chest plate, and the armour gently hums to life.")) new armour_path(get_turf(src)) qdel(src) qdel(A) @@ -41,11 +41,11 @@ /obj/item/clothing/suit/armor/reactive/attack_self(mob/user) active = !(active) if(active) - to_chat(user, "[src] is now active.") + to_chat(user, span_notice("[src] is now active.")) icon_state = "reactive" item_state = "reactive" else - to_chat(user, "[src] is now inactive.") + to_chat(user, span_notice("[src] is now inactive.")) icon_state = "reactiveoff" item_state = "reactiveoff" add_fingerprint(user) @@ -74,9 +74,9 @@ if(prob(hit_reaction_chance)) var/mob/living/carbon/human/H = owner if(world.time < reactivearmor_cooldown) - owner.visible_message("The reactive teleport system is still recharging! It fails to teleport [H]!") + owner.visible_message(span_danger("The reactive teleport system is still recharging! It fails to teleport [H]!")) return - owner.visible_message("The reactive teleport system flings [H] clear of [attack_text], shutting itself off in the process!") + owner.visible_message(span_danger("The reactive teleport system flings [H] clear of [attack_text], shutting itself off in the process!")) playsound(get_turf(owner),'sound/blank.ogg', 100, TRUE) var/list/turfs = new/list() for(var/turf/T in orange(tele_range, H)) @@ -109,9 +109,9 @@ return 0 if(prob(hit_reaction_chance)) if(world.time < reactivearmor_cooldown) - owner.visible_message("The reactive incendiary armor on [owner] activates, but fails to send out flames as it is still recharging its flame jets!") + owner.visible_message(span_danger("The reactive incendiary armor on [owner] activates, but fails to send out flames as it is still recharging its flame jets!")) return - owner.visible_message("[src] blocks [attack_text], sending out jets of flame!") + owner.visible_message(span_danger("[src] blocks [attack_text], sending out jets of flame!")) playsound(get_turf(owner),'sound/blank.ogg', 100, TRUE) for(var/mob/living/carbon/C in range(6, owner)) if(C != owner) @@ -133,14 +133,14 @@ return 0 if(prob(hit_reaction_chance)) if(world.time < reactivearmor_cooldown) - owner.visible_message("The reactive stealth system on [owner] activates, but is still recharging its holographic emitters!") + owner.visible_message(span_danger("The reactive stealth system on [owner] activates, but is still recharging its holographic emitters!")) return var/mob/living/simple_animal/hostile/illusion/escape/E = new(owner.loc) E.Copy_Parent(owner, 50) E.GiveTarget(owner) //so it starts running right away E.Goto(owner, E.move_to_delay, E.minimum_distance) owner.alpha = 0 - owner.visible_message("[owner] is hit by [attack_text] in the chest!") //We pretend to be hit, since blocking it would stop the message otherwise + owner.visible_message(span_danger("[owner] is hit by [attack_text] in the chest!")) //We pretend to be hit, since blocking it would stop the message otherwise addtimer(VARSET_CALLBACK(owner, alpha, initial(owner.alpha)), 4 SECONDS) reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration return 1 @@ -173,9 +173,9 @@ var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread sparks.set_up(1, 1, src) sparks.start() - owner.visible_message("The tesla capacitors on [owner]'s reactive tesla armor are still recharging! The armor merely emits some sparks.") + owner.visible_message(span_danger("The tesla capacitors on [owner]'s reactive tesla armor are still recharging! The armor merely emits some sparks.")) return - owner.visible_message("[src] blocks [attack_text], sending out arcs of lightning!") + owner.visible_message(span_danger("[src] blocks [attack_text], sending out arcs of lightning!")) tesla_zap(owner, tesla_range, tesla_power, tesla_flags) reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration return TRUE @@ -192,10 +192,10 @@ return 0 if(prob(hit_reaction_chance)) if(world.time < reactivearmor_cooldown) - owner.visible_message("The repulse generator is still recharging!") + owner.visible_message(span_danger("The repulse generator is still recharging!")) return 0 playsound(get_turf(owner),'sound/blank.ogg', 100, TRUE) - owner.visible_message("[src] blocks [attack_text], converting the attack into a wave of force!") + owner.visible_message(span_danger("[src] blocks [attack_text], converting the attack into a wave of force!")) var/turf/T = get_turf(owner) var/list/thrown_items = list() for(var/atom/movable/A in range(T, 7)) @@ -219,9 +219,9 @@ if(prob(hit_reaction_chance)) var/mob/living/carbon/human/H = owner if(world.time < reactivearmor_cooldown) - owner.visible_message("The reactive table armor's fabricators are still on cooldown!") + owner.visible_message(span_danger("The reactive table armor's fabricators are still on cooldown!")) return - owner.visible_message("The reactive teleport system flings [H] clear of [attack_text] and slams [H.p_them()] into a fabricated table!") + owner.visible_message(span_danger("The reactive teleport system flings [H] clear of [attack_text] and slams [H.p_them()] into a fabricated table!")) owner.visible_message("[H] GOES ON THE TABLE!!!") owner.Paralyze(40) var/list/turfs = new/list() diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 53254316a..5d8e257bb 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -98,14 +98,14 @@ hood.color = color if(slot_flags == ITEM_SLOT_ARMOR) if(H.wear_armor != src) - to_chat(H, "I should put that on first.") + to_chat(H, span_warning("I should put that on first.")) return if(slot_flags == ITEM_SLOT_CLOAK) if(H.cloak != src) - to_chat(H, "I should put that on first.") + to_chat(H, span_warning("I should put that on first.")) return if(H.head) - to_chat(H, "I'm already wearing something on my head.") + to_chat(H, span_warning("I'm already wearing something on my head.")) return else if(H.equip_to_slot_if_possible(hood,SLOT_HEAD,0,0,1)) testing("begintog") @@ -170,7 +170,7 @@ if(!can_use(usr)) return 0 - to_chat(usr, "I toggle [src]'s [togglename].") + to_chat(usr, span_notice("I toggle [src]'s [togglename].")) if(src.hoodtoggled) src.icon_state = "[initial(icon_state)]" src.hoodtoggled = FALSE @@ -233,7 +233,7 @@ helmet.attack_self(H) H.transferItemToLoc(helmet, src, TRUE) H.update_inv_wear_suit() - to_chat(H, "The helmet on the hardsuit disengages.") + to_chat(H, span_notice("The helmet on the hardsuit disengages.")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) else helmet.forceMove(src) @@ -251,13 +251,13 @@ if(!hoodtoggled) if(ishuman(src.loc)) if(H.wear_armor != src) - to_chat(H, "I must be wearing [src] to engage the helmet!") + to_chat(H, span_warning("I must be wearing [src] to engage the helmet!")) return if(H.head) - to_chat(H, "You're already wearing something on your head!") + to_chat(H, span_warning("You're already wearing something on your head!")) return else if(H.equip_to_slot_if_possible(helmet,SLOT_HEAD,0,0,1)) - to_chat(H, "I engage the helmet on the hardsuit.") + to_chat(H, span_notice("I engage the helmet on the hardsuit.")) hoodtoggled = TRUE H.update_inv_wear_suit() playsound(src.loc, 'sound/blank.ogg', 50, TRUE) diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index f415a1c1e..e7d132028 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -166,7 +166,7 @@ if(!isliving(usr)) return if(!robe_charge) - to_chat(usr, "\The robe's internal magic supply is still recharging!") + to_chat(usr, span_warning("\The robe's internal magic supply is still recharging!")) return usr.say("Rise, my creation! Off your page into this realm!", forced = "stickman summoning") @@ -177,7 +177,7 @@ src.robe_charge = FALSE sleep(30) src.robe_charge = TRUE - to_chat(usr, "\The robe hums, its internal magic supply restored.") + to_chat(usr, span_notice("\The robe hums, its internal magic supply restored.")) //Shielded Armour @@ -224,8 +224,8 @@ if(!proximity) return if(!istype(W)) - to_chat(user, "The rune can only be used on battlemage armour!") + to_chat(user, span_warning("The rune can only be used on battlemage armour!")) return W.current_charges += 8 - to_chat(user, "I charge \the [W]. It can now absorb [W.current_charges] hits.") + to_chat(user, span_notice("I charge \the [W]. It can now absorb [W.current_charges] hits.")) qdel(src) diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index 405abea4c..eb1cea440 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -37,7 +37,7 @@ var/obj/item/stack/cable_coil/C = I C.use(1) has_sensor = HAS_SENSORS - to_chat(user,"I repair the suit sensors on [src] with [C].") + to_chat(user,span_notice("I repair the suit sensors on [src] with [C].")) return 1 if(!attach_accessory(I, user)) return ..() @@ -63,7 +63,7 @@ sensor_mode = pick(SENSOR_OFF, SENSOR_OFF, SENSOR_OFF, SENSOR_LIVING, SENSOR_LIVING, SENSOR_VITALS, SENSOR_VITALS, SENSOR_COORDS) if(ismob(loc)) var/mob/M = loc - to_chat(M,"The sensors on the [src] change rapidly!") + to_chat(M,span_warning("The sensors on the [src] change rapidly!")) /obj/item/clothing/under/equipped(mob/user, slot) ..() @@ -105,7 +105,7 @@ var/obj/item/clothing/accessory/A = I if(attached_accessory) if(user) - to_chat(user, "[src] already has an accessory.") + to_chat(user, span_warning("[src] already has an accessory.")) return else @@ -117,7 +117,7 @@ return if(user && notifyAttach) - to_chat(user, "I attach [I] to [src].") + to_chat(user, span_notice("I attach [I] to [src].")) var/accessory_color = attached_accessory.icon_state accessory_overlay = mutable_appearance('icons/mob/clothing/accessories.dmi', "[accessory_color]") @@ -141,9 +141,9 @@ var/obj/item/clothing/accessory/A = attached_accessory attached_accessory.detach(src, user) if(user.put_in_hands(A)) - to_chat(user, "I detach [A] from [src].") + to_chat(user, span_notice("I detach [A] from [src].")) else - to_chat(user, "I detach [A] from [src] and it falls on the floor.") + to_chat(user, span_notice("I detach [A] from [src] and it falls on the floor.")) if(ishuman(loc)) var/mob/living/carbon/human/H = loc diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 74ee53016..7b6928c5a 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -15,7 +15,7 @@ if(!attachment_slot || (U && U.body_parts_covered & attachment_slot)) return TRUE if(user) - to_chat(user, "There doesn't seem to be anywhere to put [src]...") + to_chat(user, span_warning("There doesn't seem to be anywhere to put [src]...")) /obj/item/clothing/accessory/proc/attach(obj/item/clothing/under/U, user) var/datum/component/storage/storage = GetComponent(/datum/component/storage) @@ -80,9 +80,9 @@ /obj/item/clothing/accessory/examine(mob/user) . = ..() - . += "\The [src] can be attached to a uniform. Alt-click to remove it once attached." + . += span_notice("\The [src] can be attached to a uniform. Alt-click to remove it once attached.") if(initial(above_suit)) - . += "\The [src] can be worn above or below my suit. Alt-click to toggle." + . += span_notice("\The [src] can be worn above or below my suit. Alt-click to toggle.") /obj/item/clothing/accessory/waistcoat name = "waistcoat" @@ -119,7 +119,7 @@ if(M.wear_armor) if((M.wear_armor.flags_inv & HIDEJUMPSUIT)) //Check if the jumpsuit is covered - to_chat(user, "Medals can only be pinned on jumpsuits.") + to_chat(user, span_warning("Medals can only be pinned on jumpsuits.")) return if(M.wear_pants) @@ -128,18 +128,18 @@ if(user == M) delay = 0 else - user.visible_message("[user] is trying to pin [src] on [M]'s chest.", \ - "I try to pin [src] on [M]'s chest.") + user.visible_message(span_notice("[user] is trying to pin [src] on [M]'s chest."), \ + span_notice("I try to pin [src] on [M]'s chest.")) var/input if(!commended && user != M) input = stripped_input(user,"Please input a reason for this commendation, it will be recorded by Nanotrasen.", ,"", 140) if(do_after(user, delay, target = M)) if(U.attach_accessory(src, user, 0)) //Attach it, do not notify the user of the attachment if(user == M) - to_chat(user, "I attach [src] to [U].") + to_chat(user, span_notice("I attach [src] to [U].")) else - user.visible_message("[user] pins \the [src] on [M]'s chest.", \ - "I pin \the [src] on [M]'s chest.") + user.visible_message(span_notice("[user] pins \the [src] on [M]'s chest."), \ + span_notice("I pin \the [src] on [M]'s chest.")) if(input) SSblackbox.record_feedback("associative", "commendation", 1, list("commender" = "[user.real_name]", "commendee" = "[M.real_name]", "medal" = "[src]", "reason" = input)) GLOB.commendations += "[user.real_name] awarded [M.real_name] the [name]! \n- [input]" @@ -149,7 +149,7 @@ message_admins("[key_name_admin(M)] was given the following commendation by [key_name_admin(user)]: [input]") else - to_chat(user, "Medals can only be pinned on jumpsuits!") + to_chat(user, span_warning("Medals can only be pinned on jumpsuits!")) else ..() @@ -217,7 +217,7 @@ /obj/item/clothing/accessory/medal/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > 300) atmos_spawn_air("plasma=20;TEMP=[exposed_temperature]") - visible_message("\The [src] bursts into flame!", "My [src] bursts into flame!") + visible_message(span_danger("\The [src] bursts into flame!"), span_danger("My [src] bursts into flame!")) qdel(src) /obj/item/clothing/accessory/medal/plasma/nobel_science @@ -282,7 +282,7 @@ /obj/item/clothing/accessory/lawyers_badge/attack_self(mob/user) if(prob(1)) user.say("The testimony contradicts the evidence!", forced = "attorney's badge") - user.visible_message("[user] shows [user.p_their()] attorney's badge.", "I show my attorney's badge.") + user.visible_message(span_notice("[user] shows [user.p_their()] attorney's badge."), span_notice("I show my attorney's badge.")) /obj/item/clothing/accessory/lawyers_badge/on_uniform_equip(obj/item/clothing/under/U, user) var/mob/living/L = user diff --git a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm index da236236f..2077948b3 100644 --- a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm +++ b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm @@ -70,7 +70,7 @@ return next_extinguish = world.time + extinguish_cooldown extinguishes_left-- - H.visible_message("[H]'s suit spews out a tonne of space lube!","My suit spews out a tonne of space lube!") + H.visible_message(span_warning("[H]'s suit spews out a tonne of space lube!"),span_warning("My suit spews out a tonne of space lube!")) H.ExtinguishMob() new /obj/effect/particle_effect/foam(loc) //Truely terrifying. return 0 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 47cbf5e5b..d028af11b 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -99,7 +99,7 @@ /obj/item/clothing/under/plasmaman/examine(mob/user) . = ..() - . += "There are [extinguishes_left] extinguisher charges left in this suit." + . += span_notice("There are [extinguishes_left] extinguisher charges left in this suit.") /obj/item/clothing/under/plasmaman/proc/Extinguish(mob/living/carbon/human/H) if(!istype(H)) @@ -111,7 +111,7 @@ return next_extinguish = world.time + extinguish_cooldown extinguishes_left-- - H.visible_message("[H]'s suit automatically extinguishes [H.p_them()]!","My suit automatically extinguishes you.") + H.visible_message(span_warning("[H]'s suit automatically extinguishes [H.p_them()]!"),span_warning("My suit automatically extinguishes you.")) H.ExtinguishMob() new /obj/effect/particle_effect/water(get_turf(H)) return 0 @@ -120,11 +120,11 @@ ..() if (istype(E, /obj/item/extinguisher_refill)) if (extinguishes_left == 5) - to_chat(user, "The inbuilt extinguisher is full.") + to_chat(user, span_notice("The inbuilt extinguisher is full.")) return else extinguishes_left = 5 - to_chat(user, "I refill the suit's built-in extinguisher, using up the cartridge.") + to_chat(user, span_notice("I refill the suit's built-in extinguisher, using up the cartridge.")) qdel(E) return return diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index 84e0b4120..975b8514b 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -29,19 +29,19 @@ return if(istype(I, /obj/item/evidencebag)) - to_chat(user, "I find putting an evidence bag in another evidence bag to be slightly absurd.") + to_chat(user, span_warning("I find putting an evidence bag in another evidence bag to be slightly absurd.")) return 1 //now this is podracing if(loc in I.GetAllContents()) // fixes tg #39452, evidence bags could store their own location, causing I to be stored in the bag while being present inworld still, and able to be teleported when removed. - to_chat(user, "I find putting [I] in [src] while it's still inside it quite difficult!") + to_chat(user, span_warning("I find putting [I] in [src] while it's still inside it quite difficult!")) return if(I.w_class > WEIGHT_CLASS_NORMAL) - to_chat(user, "[I] won't fit in [src]!") + to_chat(user, span_warning("[I] won't fit in [src]!")) return if(contents.len) - to_chat(user, "[src] already has something inside it!") + to_chat(user, span_warning("[src] already has something inside it!")) return if(!isturf(I.loc)) //If it isn't on the floor. Do some checks to see if it's in our hands or a box. Otherwise give up. @@ -50,8 +50,8 @@ if(!user.dropItemToGround(I)) return - user.visible_message("[user] puts [I] into [src].", "I put [I] inside [src].",\ - "I hear a rustle as someone puts something into a plastic bag.") + user.visible_message(span_notice("[user] puts [I] into [src]."), span_notice("I put [I] inside [src]."),\ + span_hear("I hear a rustle as someone puts something into a plastic bag.")) icon_state = "evidence" @@ -71,8 +71,8 @@ /obj/item/evidencebag/attack_self(mob/user) if(contents.len) var/obj/item/I = contents[1] - user.visible_message("[user] takes [I] out of [src].", "I take [I] out of [src].",\ - "I hear someone rustle around in a plastic bag, and remove something.") + user.visible_message(span_notice("[user] takes [I] out of [src]."), span_notice("I take [I] out of [src]."),\ + span_hear("I hear someone rustle around in a plastic bag, and remove something.")) cut_overlays() //remove the overlays user.put_in_hands(I) w_class = WEIGHT_CLASS_TINY @@ -80,7 +80,7 @@ desc = "" else - to_chat(user, "[src] is empty.") + to_chat(user, span_notice("[src] is empty.")) icon_state = "evidenceobj" return diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm index cf639c899..ebf4dae20 100644 --- a/code/modules/detectivework/footprints_and_rag.dm +++ b/code/modules/detectivework/footprints_and_rag.dm @@ -17,7 +17,7 @@ spillable = FALSE /obj/item/reagent_containers/glass/rag/suicide_act(mob/user) - user.visible_message("[user] is smothering [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is smothering [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return (OXYLOSS) /obj/item/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity) @@ -30,16 +30,16 @@ var/log_object = "containing [reagentlist]" if(user.used_intent.type == INTENT_HARM && !C.is_mouth_covered()) reagents.trans_to(C, reagents.total_volume, transfered_by = user, method = INGEST) - C.visible_message("[user] has smothered \the [C] with \the [src]!", "[user] has smothered you with \the [src]!", "I hear some struggling and muffled cries of surprise.") + C.visible_message(span_danger("[user] has smothered \the [C] with \the [src]!"), span_danger("[user] has smothered you with \the [src]!"), span_hear("I hear some struggling and muffled cries of surprise.")) log_combat(user, C, "smothered", src, log_object) else reagents.reaction(C, TOUCH) reagents.clear_reagents() - C.visible_message("[user] has touched \the [C] with \the [src].") + C.visible_message(span_notice("[user] has touched \the [C] with \the [src].")) log_combat(user, C, "touched", src, log_object) else if(istype(A) && src in user) - user.visible_message("[user] starts to wipe down [A] with [src]!", "I start to wipe down [A] with [src]...") + user.visible_message(span_notice("[user] starts to wipe down [A] with [src]!"), span_notice("I start to wipe down [A] with [src]...")) if(do_after(user,30, target = A)) - user.visible_message("[user] finishes wiping off [A]!", "I finish wiping off [A].") + user.visible_message(span_notice("[user] finishes wiping off [A]!"), span_notice("I finish wiping off [A].")) SEND_SIGNAL(A, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM) diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index 840022307..fea7f28e1 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -32,10 +32,10 @@ /obj/item/detective_scanner/attack_self(mob/user) if(log.len && !scanning) scanning = 1 - to_chat(user, "Printing report, please wait...") + to_chat(user, span_notice("Printing report, please wait...")) addtimer(CALLBACK(src, PROC_REF(PrintReport)), 100) else - to_chat(user, "The scanner has no logs or is in use.") + to_chat(user, span_notice("The scanner has no logs or is in use.")) /obj/item/detective_scanner/attack(mob/living/M, mob/user) return @@ -58,7 +58,7 @@ if(ismob(loc)) var/mob/M = loc M.put_in_hands(P) - to_chat(M, "Report printed. Log cleared.") + to_chat(M, span_notice("Report printed. Log cleared.")) // Clear the logs log = list() @@ -78,8 +78,8 @@ scanning = 1 - user.visible_message("\The [user] points the [src.name] at \the [A] and performs a forensic scan.") - to_chat(user, "I scan \the [A]. The scanner is now analysing the results...") + user.visible_message(span_notice("\The [user] points the [src.name] at \the [A] and performs a forensic scan.")) + to_chat(user, span_notice("I scan \the [A]. The scanner is now analysing the results...")) // GATHER INFORMATION @@ -127,7 +127,7 @@ // Fingerprints if(length(fingerprints)) sleep(30) - add_log("Prints:") + add_log(span_info("Prints:")) for(var/finger in fingerprints) add_log("[finger]") found_something = 1 @@ -135,7 +135,7 @@ // Blood if (length(blood)) sleep(30) - add_log("Blood:") + add_log(span_info("Blood:")) found_something = 1 for(var/B in blood) add_log("Type: [blood[B]] DNA: [B]") @@ -143,7 +143,7 @@ //Fibers if(length(fibers)) sleep(30) - add_log("Fibers:") + add_log(span_info("Fibers:")) for(var/fiber in fibers) add_log("[fiber]") found_something = 1 @@ -151,7 +151,7 @@ //Reagents if(length(reagents)) sleep(30) - add_log("Reagents:") + add_log(span_info("Reagents:")) for(var/R in reagents) add_log("Reagent: [R] Volume: [reagents[R]]") found_something = 1 @@ -164,10 +164,10 @@ if(!found_something) add_log("# No forensic traces found #", 0) // Don't display this to the holder user if(holder) - to_chat(holder, "Unable to locate any fingerprints, materials, fibers, or blood on \the [target_name]!") + to_chat(holder, span_warning("Unable to locate any fingerprints, materials, fibers, or blood on \the [target_name]!")) else if(holder) - to_chat(holder, "I finish scanning \the [target_name].") + to_chat(holder, span_notice("I finish scanning \the [target_name].")) add_log("---------------------------------------------------------", 0) scanning = 0 @@ -190,27 +190,27 @@ if(!user.canUseTopic(src, be_close=TRUE)) return if(!LAZYLEN(log)) - to_chat(user, "Cannot clear logs, the scanner has no logs.") + to_chat(user, span_notice("Cannot clear logs, the scanner has no logs.")) return if(scanning) - to_chat(user, "Cannot clear logs, the scanner is in use.") + to_chat(user, span_notice("Cannot clear logs, the scanner is in use.")) return - to_chat(user, "The scanner logs are cleared.") + to_chat(user, span_notice("The scanner logs are cleared.")) log = list() /obj/item/detective_scanner/examine(mob/user) . = ..() if(LAZYLEN(log) && !scanning) - . += "Alt-click to clear scanner logs." + . += span_notice("Alt-click to clear scanner logs.") /obj/item/detective_scanner/proc/displayDetectiveScanResults(mob/living/user) // No need for can-use checks since the action button should do proper checks if(!LAZYLEN(log)) - to_chat(user, "Cannot display logs, the scanner has no logs.") + to_chat(user, span_notice("Cannot display logs, the scanner has no logs.")) return if(scanning) - to_chat(user, "Cannot display logs, the scanner is in use.") + to_chat(user, span_notice("Cannot display logs, the scanner is in use.")) return - to_chat(user, "Scanner Report") + to_chat(user, span_notice("Scanner Report")) for(var/iterLog in log) to_chat(user, iterLog) diff --git a/code/modules/discord/accountlink.dm b/code/modules/discord/accountlink.dm index 883abb2b2..1de88ce39 100644 --- a/code/modules/discord/accountlink.dm +++ b/code/modules/discord/accountlink.dm @@ -6,15 +6,15 @@ set hidden = FALSE // Safety checks if(!CONFIG_GET(flag/sql_enabled)) - to_chat(src, "This feature requires the SQL backend to be running.") + to_chat(src, span_warning("This feature requires the SQL backend to be running.")) return if(!SSdiscord) // SS is still starting - to_chat(src, "The server is still starting up. Please wait before attempting to link your account!") + to_chat(src, span_notice("The server is still starting up. Please wait before attempting to link your account!")) return if(!SSdiscord.enabled) - to_chat(src, "This feature requires the server is running on the TGS toolkit.") + to_chat(src, span_warning("This feature requires the server is running on the TGS toolkit.")) return var/stored_id = SSdiscord.lookup_id(usr.ckey) diff --git a/code/modules/discord/manipulation.dm b/code/modules/discord/manipulation.dm index 6bd058717..2bb165f82 100644 --- a/code/modules/discord/manipulation.dm +++ b/code/modules/discord/manipulation.dm @@ -14,7 +14,7 @@ return if(!SSdiscord.enabled) - to_chat(usr, "TGS is not enabled") + to_chat(usr, span_warning("TGS is not enabled")) return var/lookup_choice = alert(usr, "Do you wish to lookup account by ID or ckey?", "Lookup Type", "ID", "Ckey", "Cancel") @@ -27,10 +27,10 @@ if(unlink_choice == "Unlink") SSdiscord.unlink_account(returned_ckey) else - to_chat(usr, "Discord ID [lookup_id] has no associated ckey") + to_chat(usr, span_warning("Discord ID [lookup_id] has no associated ckey")) if("Ckey") var/lookup_ckey = input(usr,"Enter Ckey to lookup ID") as text|null var/returned_id = SSdiscord.lookup_id(lookup_ckey) if(returned_id) - to_chat(usr, "Ckey [lookup_ckey] is assigned to Discord ID [returned_id]") - to_chat(usr, "Discord mention format: <@[returned_id]>") // < and > print < > in HTML without using them as tags + to_chat(usr, span_notice("Ckey [lookup_ckey] is assigned to Discord ID [returned_id]")) + to_chat(usr, span_notice("Discord mention format: <@[returned_id]>")) // < and > print < > in HTML without using them as tags diff --git a/code/modules/discord/toggle_notify.dm b/code/modules/discord/toggle_notify.dm index fd2d68bc1..cc80d19ed 100644 --- a/code/modules/discord/toggle_notify.dm +++ b/code/modules/discord/toggle_notify.dm @@ -6,29 +6,29 @@ set hidden = FALSE // Safety checks if(!CONFIG_GET(flag/sql_enabled)) - to_chat(src, "This feature requires the SQL backend to be running.") + to_chat(src, span_warning("This feature requires the SQL backend to be running.")) return if(!SSdiscord) // SS is still starting - to_chat(src, "The server is still starting up. Please wait before attempting to link your account ") + to_chat(src, span_notice("The server is still starting up. Please wait before attempting to link your account ")) return if(!SSdiscord.enabled) - to_chat(src, "This feature requires the server is running on the TGS toolkit") + to_chat(src, span_warning("This feature requires the server is running on the TGS toolkit")) return var/stored_id = SSdiscord.lookup_id(usr.ckey) if(!stored_id) // Account is not linked - to_chat(src, "This requires you to link your Discord account with the \"Link Discord Account\" verb.") + to_chat(src, span_warning("This requires you to link your Discord account with the \"Link Discord Account\" verb.")) return else // Linked for(var/member in SSdiscord.notify_members) // If they are in the list, take them out if(member == "[stored_id]") SSdiscord.notify_members -= "[stored_id]" // The list uses strings because BYOND cannot handle a 17 digit integer - to_chat(src, "I will no longer be notified when the server restarts") + to_chat(src, span_notice("I will no longer be notified when the server restarts")) return // This is necassary so it doesnt get added again, as it relies on the for loop being unsuccessful to tell us if they are in the list or not // If we got here, they arent in the list. Chuck 'em in! - to_chat(src, "I will now be notified when the server restarts") + to_chat(src, span_notice("I will now be notified when the server restarts")) SSdiscord.notify_members += "[stored_id]" // The list uses strings because BYOND cannot handle a 17 digit integer diff --git a/code/modules/economy/pay_stand.dm b/code/modules/economy/pay_stand.dm index 2df768128..6dedf7e83 100644 --- a/code/modules/economy/pay_stand.dm +++ b/code/modules/economy/pay_stand.dm @@ -15,7 +15,7 @@ if(istype(W, /obj/item/card/id)) if(W == my_card) locked = !locked - to_chat(user, "I [src.locked ? "lock" : "unlock"] the bolts on the paystand.") + to_chat(user, span_notice("I [src.locked ? "lock" : "unlock"] the bolts on the paystand.")) return if(!my_card) var/obj/item/card/id/assistant_mains_need_to_die = W @@ -32,17 +32,17 @@ if(vbucks.registered_account) var/momsdebitcard = input(user, "How much would you like to deposit?", "Money Deposit") as null|num if(momsdebitcard < 1) - to_chat(user, "ERROR: Invalid amount designated.") + to_chat(user, span_warning("ERROR: Invalid amount designated.")) return if(vbucks.registered_account.adjust_money(-momsdebitcard)) purchase(vbucks.registered_account.account_holder, momsdebitcard) to_chat(user, "Thanks for purchasing! The vendor has been informed.") return else - to_chat(user, "ERROR: Account has insufficient funds to make transaction.") + to_chat(user, span_warning("ERROR: Account has insufficient funds to make transaction.")) return else - to_chat(user, "ERROR: No bank account assigned to identification card.") + to_chat(user, span_warning("ERROR: No bank account assigned to identification card.")) return if(istype(W, /obj/item/holochip)) var/obj/item/holochip/H = W @@ -52,7 +52,7 @@ to_chat(user, "Thanks for purchasing! The vendor has been informed.") return else - to_chat(user, "ERROR: Insufficient funds to make transaction.") + to_chat(user, span_warning("ERROR: Insufficient funds to make transaction.")) return if(istype(W, /obj/item/stack/spacecash)) to_chat(user, "What is this, the 2000s? We only take card here.") @@ -63,15 +63,15 @@ if(istype(W, /obj/item/assembly/signaler)) var/obj/item/assembly/signaler/S = W if(S.secured) - to_chat(user, "The signaler needs to be in attachable mode to add it to the paystand!") + to_chat(user, span_warning("The signaler needs to be in attachable mode to add it to the paystand!")) return if(!my_card) - to_chat(user, "ERROR: No identification card has been assigned to this paystand yet!") + to_chat(user, span_warning("ERROR: No identification card has been assigned to this paystand yet!")) return if(!signaler) var/cash_limit = input(user, "Enter the minimum amount of cash needed to deposit before the signaler is activated.", "Signaler Activation Threshold") as null|num if(cash_limit < 1) - to_chat(user, "ERROR: Invalid amount designated.") + to_chat(user, span_warning("ERROR: Invalid amount designated.")) return if(cash_limit) S.forceMove(src) @@ -80,7 +80,7 @@ to_chat(user, "You attach the signaler to the paystand.") desc += " A signaler appears to be attached to the scanner." else - to_chat(user, "A signaler is already attached to this unit!") + to_chat(user, span_warning("A signaler is already attached to this unit!")) if(default_deconstruction_screwdriver(user, "card_scanner", "card_scanner", W)) return @@ -106,7 +106,7 @@ /obj/machinery/paystand/default_unfasten_wrench(mob/user, obj/item/I, time = 20) if(locked) - to_chat(user, "The anchored bolts on this paystand are currently locked!") + to_chat(user, span_warning("The anchored bolts on this paystand are currently locked!")) return . = ..() diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 195ab4bcf..62488324f 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -93,7 +93,7 @@ ..() if(href_list["cancel"]) if(!triggering) - to_chat(usr, "I are too late to cancel that event") + to_chat(usr, span_admin("I are too late to cancel that event")) return triggering = FALSE message_admins("[key_name_admin(usr)] cancelled event [name].") diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index 5c0637b03..8523a49b9 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -50,7 +50,7 @@ saved.shoot_inventory = 0 if(originMachine) originMachine.speak("I am... vanquished. My people will remem...ber...meeee.") - originMachine.visible_message("[originMachine] beeps and seems lifeless.") + originMachine.visible_message(span_notice("[originMachine] beeps and seems lifeless.")) kill() return vendingMachines = removeNullsFromList(vendingMachines) diff --git a/code/modules/events/fake_virus.dm b/code/modules/events/fake_virus.dm index 87b53cdb1..74070217d 100644 --- a/code/modules/events/fake_virus.dm +++ b/code/modules/events/fake_virus.dm @@ -25,7 +25,7 @@ for(var/i=1; i<=rand(1,defacto_min); i++) var/mob/living/carbon/human/onecoughman = pick(fake_virus_victims) if(prob(25))//1/4 odds to get a spooky message instead of coughing out loud - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), onecoughman, "[pick("Your head hurts.", "Your head pounds.")]"), rand(30,150)) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), onecoughman, span_warning("[pick("Your head hurts.", "Your head pounds.")]")), rand(30,150)) else addtimer(CALLBACK(onecoughman, TYPE_PROC_REF(/mob, emote), pick("cough", "sniff", "sneeze")), rand(30,150))//deliver the message with a slightly randomized time interval so there arent multiple people coughing at the exact same time fake_virus_victims -= onecoughman diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm index 51299bbb3..1f7ec504d 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -68,7 +68,7 @@ ..() if(istype(W, /obj/item/pen) || istype(W, /obj/item/toy/crayon)) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on [src]!") + to_chat(user, span_notice("I scribble illegibly on [src]!")) return var/recipient = stripped_input(user, "Who is receiving this valentine?", "To:", null , 20) var/sender = stripped_input(user, "Who is sending this valentine?", "From:", null , 20) @@ -87,7 +87,7 @@ user << browse("[name][message]", "window=[name]") onclose(user, "[name]") else - . += "It is too far away." + . += span_notice("It is too far away.") /obj/item/valentine/attack_self(mob/user) user.examinate(src) diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm index aeec06ea2..a9dabdc19 100644 --- a/code/modules/events/holiday/xmas.dm +++ b/code/modules/events/holiday/xmas.dm @@ -7,7 +7,7 @@ /obj/item/toy/xmas_cracker/attack(mob/target, mob/user) if( !cracked && ishuman(target) && (target.stat == CONSCIOUS) && !target.get_active_held_item() ) - target.visible_message("[user] and [target] pop \an [src]! *pop*", "I pull \an [src] with [target]! *pop*", "I hear a pop.") + target.visible_message(span_notice("[user] and [target] pop \an [src]! *pop*"), span_notice("I pull \an [src] with [target]! *pop*"), span_hear("I hear a pop.")) var/obj/item/paper/Joke = new /obj/item/paper(user.loc) Joke.name = "[pick("awful","terrible","unfunny")] joke" Joke.info = pick("What did one snowman say to the other?\n\n'Is it me or can you smell carrots?'", diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index 0e7af5364..a9b99e858 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -110,7 +110,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 /obj/effect/immovablerod/Bump(atom/clong) if(prob(10)) playsound(src, 'sound/blank.ogg', 50, TRUE) - audible_message("I hear a CLANG!") + audible_message(span_danger("I hear a CLANG!")) if(clong && prob(25)) x = clong.x @@ -136,7 +136,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 qdel(other) /obj/effect/immovablerod/proc/penetrate(mob/living/L) - L.visible_message("[L] is penetrated by an immovable rod!" , "The rod penetrates you!" , "I hear a CLANG!") + L.visible_message(span_danger("[L] is penetrated by an immovable rod!") , span_danger("The rod penetrates you!") , span_danger("I hear a CLANG!")) if(ishuman(L)) var/mob/living/carbon/human/H = L H.adjustBruteLoss(160) @@ -152,14 +152,14 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 if(!M.stat) shake_camera(M, 2, 3) if(wizard) - U.visible_message("[src] transforms into [wizard] as [U] suplexes them!", "As you grab [src], it suddenly turns into [wizard] as you suplex them!") - to_chat(wizard, "You're suddenly jolted out of rod-form as [U] somehow manages to grab you, slamming you into the ground!") + U.visible_message(span_boldwarning("[src] transforms into [wizard] as [U] suplexes them!"), span_warning("As you grab [src], it suddenly turns into [wizard] as you suplex them!")) + to_chat(wizard, span_boldwarning("You're suddenly jolted out of rod-form as [U] somehow manages to grab you, slamming you into the ground!")) wizard.Stun(60) wizard.apply_damage(25, BRUTE) qdel(src) else U.client.give_award(/datum/award/achievement/misc/feat_of_strength, U) //rod-form wizards would probably make this a lot easier to get so keep it to regular rods only - U.visible_message("[U] suplexes [src] into the ground!", "I suplex [src] into the ground!") + U.visible_message(span_boldwarning("[U] suplexes [src] into the ground!"), span_warning("I suplex [src] into the ground!")) new /obj/structure/festivus/anchored(drop_location()) new /obj/effect/anomaly/flux(drop_location()) qdel(src) diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 16601b5c9..5119a5434 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -124,8 +124,8 @@ SSshuttle.registerTradeBlockade(src) AddComponent(/datum/component/gps, "Nautical Signal") active = TRUE - to_chat(user,"I toggle [src] [active ? "on":"off"].") - to_chat(user,"The scrambling signal can be now tracked by GPS.") + to_chat(user,span_notice("I toggle [src] [active ? "on":"off"].")) + to_chat(user,span_warning("The scrambling signal can be now tracked by GPS.")) START_PROCESSING(SSobj,src) /obj/machinery/shuttle_scrambler/interact(mob/user) @@ -151,10 +151,10 @@ /obj/machinery/shuttle_scrambler/proc/dump_loot(mob/user) if(credits_stored) // Prevents spamming empty holochips new /obj/item/holochip(drop_location(), credits_stored) - to_chat(user,"I retrieve the siphoned credits!") + to_chat(user,span_notice("I retrieve the siphoned credits!")) credits_stored = 0 else - to_chat(user,"There's nothing to withdraw.") + to_chat(user,span_notice("There's nothing to withdraw.")) /obj/machinery/shuttle_scrambler/proc/send_notification() priority_announce("Data theft signal detected, source registered on local gps units.") @@ -215,7 +215,7 @@ /obj/machinery/loot_locator/interact(mob/user) if(world.time <= next_use) - to_chat(user,"[src] is recharging.") + to_chat(user,span_warning("[src] is recharging.")) return next_use = world.time + cooldown var/atom/movable/AM = find_random_loot() @@ -250,7 +250,7 @@ /obj/machinery/piratepad/multitool_act(mob/living/user, obj/item/multitool/I) . = ..() if (istype(I)) - to_chat(user, "I register [src] in [I]s buffer.") + to_chat(user, span_notice("I register [src] in [I]s buffer.")) I.buffer = src return TRUE @@ -272,7 +272,7 @@ /obj/machinery/computer/piratepad_control/multitool_act(mob/living/user, obj/item/multitool/I) . = ..() if (istype(I) && istype(I.buffer,/obj/machinery/piratepad)) - to_chat(user, "I link [src] with [I.buffer] in [I] buffer.") + to_chat(user, span_notice("I link [src] with [I.buffer] in [I] buffer.")) pad = I.buffer updateDialog() return TRUE @@ -350,7 +350,7 @@ points += value - pad.visible_message("[pad] activates!") + pad.visible_message(span_notice("[pad] activates!")) flick(pad.sending_state,pad) pad.icon_state = pad.idle_state sending = FALSE @@ -361,7 +361,7 @@ return sending = TRUE status_report = "Sending..." - pad.visible_message("[pad] starts charging up.") + pad.visible_message(span_notice("[pad] starts charging up.")) pad.icon_state = pad.warmup_state sending_timer = addtimer(CALLBACK(src,PROC_REF(send)),warmup_time, TIMER_STOPPABLE) diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index 7f969afae..7cb39576f 100644 --- a/code/modules/events/sentience.dm +++ b/code/modules/events/sentience.dm @@ -94,7 +94,7 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list( spawned_mobs += SA - to_chat(SA, "Hello world!") + to_chat(SA, span_danger("Hello world!")) to_chat(SA, "Due to freak radiation and/or chemicals \ and/or lucky chance, you have gained human level intelligence \ and the ability to speak and understand human language!") diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 43938a422..6a32687ea 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -93,7 +93,7 @@ if(issilicon(crosser)) return if(prob(severity) && istype(crosser) && !isvineimmune(crosser)) - to_chat(crosser, "I accidentally touch the vine and feel a strange sensation.") + to_chat(crosser, span_alert("I accidentally touch the vine and feel a strange sensation.")) crosser.adjustToxLoss(5) /datum/spacevine_mutation/toxicity/on_eat(obj/structure/spacevine/holder, mob/living/eater) @@ -231,13 +231,13 @@ if(prob(severity) && istype(crosser) && !isvineimmune(holder)) var/mob/living/M = crosser M.adjustBruteLoss(5) - to_chat(M, "I cut myself on the thorny vines.") + to_chat(M, span_alert("I cut myself on the thorny vines.")) /datum/spacevine_mutation/thorns/on_hit(obj/structure/spacevine/holder, mob/living/hitter, obj/item/I, expected_damage) if(prob(severity) && istype(hitter) && !isvineimmune(holder)) var/mob/living/M = hitter M.adjustBruteLoss(5) - to_chat(M, "I cut myself on the thorny vines.") + to_chat(M, span_alert("I cut myself on the thorny vines.")) . = expected_damage /datum/spacevine_mutation/woodening @@ -366,7 +366,7 @@ if(prob(23) && istype(crosser) && !isvineimmune(crosser)) var/mob/living/M = crosser M.adjustBruteLoss(5) - to_chat(M, "I nick myself on the thorny vines.") + to_chat(M, span_warning("I nick myself on the thorny vines.")) //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/structure/spacevine/attack_hand(mob/user) @@ -536,7 +536,7 @@ for(var/datum/spacevine_mutation/SM in mutations) SM.on_buckle(src, V) if((V.stat != DEAD) && (V.buckled != src)) //not dead or captured - to_chat(V, "The vines [pick("wind", "tangle", "tighten")] around me!") + to_chat(V, span_danger("The vines [pick("wind", "tangle", "tighten")] around me!")) buckle_mob(V, 1) V.adjustOxyLoss(10) diff --git a/code/modules/events/wizard/aid.dm b/code/modules/events/wizard/aid.dm index cf28a90dd..b2e8a2def 100644 --- a/code/modules/events/wizard/aid.dm +++ b/code/modules/events/wizard/aid.dm @@ -18,7 +18,7 @@ S.clothes_req = 0 spell_improved = TRUE if(spell_improved) - to_chat(L, "I suddenly feel like you never needed those garish robes in the first place...") + to_chat(L, span_notice("I suddenly feel like you never needed those garish robes in the first place...")) //--// @@ -55,4 +55,4 @@ if(5) S.name = "Ludicrous [S.name]" - to_chat(L, "I suddenly feel more competent with your casting!") + to_chat(L, span_notice("I suddenly feel more competent with your casting!")) diff --git a/code/modules/events/wizard/ghost.dm b/code/modules/events/wizard/ghost.dm index b9d03d655..da5cd4246 100644 --- a/code/modules/events/wizard/ghost.dm +++ b/code/modules/events/wizard/ghost.dm @@ -6,7 +6,7 @@ earliest_start = 0 MINUTES /datum/round_event/wizard/ghost/start() - var/msg = "I suddenly feel extremely obvious..." + var/msg = span_warning("I suddenly feel extremely obvious...") set_observer_default_invisibility(0, msg) diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm index f4d3b6436..525c199a5 100644 --- a/code/modules/events/wizard/greentext.dm +++ b/code/modules/events/wizard/greentext.dm @@ -42,7 +42,7 @@ to_chat(user, "So long as you leave this place with greentext in hand you know will be happy...") var/list/other_objectives = user.mind.get_all_objectives() if(user.mind && other_objectives.len > 0) - to_chat(user, "... so long as you still perform your other objectives that is!") + to_chat(user, span_warning("... so long as you still perform your other objectives that is!")) new_holder = user if(!last_holder) last_holder = user @@ -54,7 +54,7 @@ /obj/item/greentext/dropped(mob/living/user as mob) if(user in color_altered_mobs) - to_chat(user, "A sudden wave of failure washes over you...") + to_chat(user, span_warning("A sudden wave of failure washes over you...")) user.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY) //ya blew it last_holder = null new_holder = null @@ -75,7 +75,7 @@ /obj/item/greentext/process() if(last_holder && last_holder != new_holder) //Somehow it was swiped without ever getting dropped - to_chat(last_holder, "A sudden wave of failure washes over you...") + to_chat(last_holder, span_warning("A sudden wave of failure washes over you...")) last_holder.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY) last_holder = new_holder //long live the king diff --git a/code/modules/events/wizard/invincible.dm b/code/modules/events/wizard/invincible.dm index 0d50acd98..4dd915424 100644 --- a/code/modules/events/wizard/invincible.dm +++ b/code/modules/events/wizard/invincible.dm @@ -9,4 +9,4 @@ for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) H.reagents.add_reagent(/datum/reagent/medicine/adminordrazine, 40) //100 ticks of absolute invinciblity (barring gibs) - to_chat(H, "I feel invincible, nothing can hurt you!") + to_chat(H, span_notice("I feel invincible, nothing can hurt you!")) diff --git a/code/modules/events/wizard/race.dm b/code/modules/events/wizard/race.dm index c495d4501..417051cf1 100644 --- a/code/modules/events/wizard/race.dm +++ b/code/modules/events/wizard/race.dm @@ -24,6 +24,6 @@ var/mob/living/carbon/human/H = i H.set_species(new_species) H.dna.unique_enzymes = H.dna.generate_unique_enzymes() - to_chat(H, "I feel somehow... different?") + to_chat(H, span_notice("I feel somehow... different?")) if(!all_the_same) new_species = pick(all_species) diff --git a/code/modules/fields/fields.dm b/code/modules/fields/fields.dm index 7e292bf62..f5c962d18 100644 --- a/code/modules/fields/fields.dm +++ b/code/modules/fields/fields.dm @@ -302,7 +302,7 @@ /obj/item/multitool/field_debug/attack_self(mob/user) operating = !operating - to_chat(user, "I turn [src] [operating? "on":"off"].") + to_chat(user, span_notice("I turn [src] [operating? "on":"off"].")) UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED) listeningTo = null if(!istype(current) && operating) diff --git a/code/modules/fields/peaceborg_dampener.dm b/code/modules/fields/peaceborg_dampener.dm index 5a1f14916..6dbb1c9f4 100644 --- a/code/modules/fields/peaceborg_dampener.dm +++ b/code/modules/fields/peaceborg_dampener.dm @@ -41,7 +41,7 @@ for(var/mob/living/silicon/robot/R in range(current_range, get_turf(host))) if(R.has_buckled_mobs()) for(var/mob/living/L in R.buckled_mobs) - L.visible_message("[L] is knocked off of [R] by the charge in [R]'s chassis induced by [name]!") //I know it's bad. + L.visible_message(span_warning("[L] is knocked off of [R] by the charge in [R]'s chassis induced by [name]!")) //I know it's bad. L.Paralyze(10) R.unbuckle_mob(L) do_sparks(5, 0, L) diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 565d231e3..bd4f89b52 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -62,7 +62,7 @@ return var/next_message = dream_fragments[1] dream_fragments.Cut(1,2) - to_chat(src, "... [next_message] ...") + to_chat(src, span_notice("... [next_message] ...")) if(LAZYLEN(dream_fragments)) addtimer(CALLBACK(src, PROC_REF(dream_sequence), dream_fragments), rand(10,30)) else diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 5846cae1b..3ad626d60 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -225,7 +225,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( update_icon("alienh_pounce") if(hit_atom == target && target.stat!=DEAD) target.Paralyze(100) - target.visible_message("[target] flails around wildly.","[name] pounces on you!") + target.visible_message(span_danger("[target] flails around wildly."),span_danger("[name] pounces on you!")) /datum/hallucination/xeno_attack //Xeno crawls from nearby vent,jumps at you, and goes back in @@ -250,10 +250,10 @@ GLOBAL_LIST_INIT(hallucination_list, list( xeno.throw_at(pump,7,1, xeno, FALSE, TRUE) sleep(10) var/xeno_name = xeno.name - to_chat(target, "[xeno_name] begins climbing into the ventilation system...") + to_chat(target, span_notice("[xeno_name] begins climbing into the ventilation system...")) sleep(30) qdel(xeno) - to_chat(target, "[xeno_name] scrambles into the ventilation ducts!") + to_chat(target, span_notice("[xeno_name] scrambles into the ventilation ducts!")) qdel(src) /obj/effect/hallucination/simple/clown @@ -315,7 +315,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( target.adjustStaminaLoss(40) step_away(target, bubblegum) shake_camera(target, 4, 3) - target.visible_message("[target] jumps backwards, falling on the ground!","[bubblegum] slams into you!") + target.visible_message(span_warning("[target] jumps backwards, falling on the ground!"),span_danger("[bubblegum] slams into you!")) sleep(2) sleep(30) qdel(src) @@ -586,7 +586,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( A.override = 1 if(target.client) if(wabbajack) - to_chat(target, "...wabbajack...wabbajack...") + to_chat(target, span_hear("...wabbajack...wabbajack...")) target.playsound_local(target,'sound/blank.ogg', 50, 1) delusion = A target.client.images |= A @@ -735,7 +735,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( if(other) if(close_other) //increase the odds for(var/i in 1 to 5) - message_pool.Add("I feel a tiny prick!") + message_pool.Add(span_warning("I feel a tiny prick!")) var/obj/item/storage/equipped_backpack = other.get_item_by_slot(SLOT_BACK) if(istype(equipped_backpack)) for(var/i in 1 to 5) //increase the odds @@ -748,19 +748,19 @@ GLOBAL_LIST_INIT(hallucination_list, list( message_pool.Add("[other] [pick("sneezes","coughs")].") - message_pool.Add("I hear something squeezing through the ducts...", \ - "My [pick("arm", "leg", "back", "head")] itches.",\ - "I feel [pick("hot","cold","dry","wet","woozy","faint")].", - "My stomach rumbles.", - "My head hurts.", - "I hear a faint buzz in my head.", + message_pool.Add(span_notice("I hear something squeezing through the ducts..."), \ + span_notice("My [pick("arm", "leg", "back", "head")] itches."),\ + span_warning("I feel [pick("hot","cold","dry","wet","woozy","faint")]."), + span_warning("My stomach rumbles."), + span_warning("My head hurts."), + span_warning("I hear a faint buzz in my head."), "[target] sneezes.") if(prob(10)) - message_pool.Add("Behind you.",\ - "I hear a faint laughter.", - "I see something move.", - "I hear skittering on the ceiling.", - "I see an inhumanly tall silhouette moving in the distance.") + message_pool.Add(span_warning("Behind you."),\ + span_warning("I hear a faint laughter."), + span_warning("I see something move."), + span_warning("I hear skittering on the ceiling."), + span_warning("I see an inhumanly tall silhouette moving in the distance.")) if(prob(10)) message_pool.Add("[pick_list_replacements(HAL_LINES_FILE, "advice")]") var/chosen = pick(message_pool) @@ -900,7 +900,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( SEND_SOUND(target, 'sound/blank.ogg') if("supermatter") SEND_SOUND(target, 'sound/blank.ogg') - to_chat(target, "I feel reality distort for a moment...") + to_chat(target, span_boldannounce("I feel reality distort for a moment...")) /datum/hallucination/hudscrew @@ -1102,9 +1102,9 @@ GLOBAL_LIST_INIT(hallucination_list, list( if(AM == target) if(istype(target, /obj/effect/dummy/phased_mob)) return - to_chat(target, "I fall into the chasm!") + to_chat(target, span_danger("I fall into the chasm!")) target.Paralyze(40) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), target, "It's surprisingly shallow."), 15) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), target, span_notice("It's surprisingly shallow.")), 15) QDEL_IN(src, 30) /obj/effect/hallucination/danger/anomaly @@ -1139,7 +1139,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( target.set_screwyhud(SCREWYHUD_DEAD) target.Paralyze(300) target.silent += 10 - to_chat(target, "[target.real_name] has died at [get_area_name(target)].") + to_chat(target, span_deadsay("[target.real_name] has died at [get_area_name(target)].")) if(prob(50)) var/mob/fakemob var/list/dead_people = list() @@ -1171,7 +1171,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( fire_overlay = image('icons/mob/OnFire.dmi', target, "Standing", ABOVE_MOB_LAYER) if(target.client) target.client.images += fire_overlay - to_chat(target, "You're set on fire!") + to_chat(target, span_danger("You're set on fire!")) target.throw_alert("fire", /atom/movable/screen/alert/fire, override = TRUE) sleep(20) for(var/i in 1 to 3) @@ -1223,7 +1223,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( shock_image.override = TRUE electrocution_skeleton_anim = image('icons/mob/human.dmi', target, icon_state = "electrocuted_base", layer=ABOVE_MOB_LAYER) electrocution_skeleton_anim.appearance_flags |= RESET_COLOR|KEEP_APART - to_chat(target, "I feel a powerful shock course through my body!") + to_chat(target, span_danger("I feel a powerful shock course through my body!")) if(target.client) target.client.images |= shock_image target.client.images |= electrocution_skeleton_anim diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index da46a480e..6e0b825b6 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -22,31 +22,31 @@ /obj/item/reagent_containers/food/drinks/attack(mob/living/M, mob/user, def_zone) if(!reagents || !reagents.total_volume) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return 0 if(!canconsume(M, user)) return 0 if (!is_drainable()) - to_chat(user, "[src]'s lid hasn't been opened!") + to_chat(user, span_warning("[src]'s lid hasn't been opened!")) return 0 if(M == user) - user.visible_message("[user] swallows a gulp of [src].", \ - "I swallow a gulp of [src].") + user.visible_message(span_notice("[user] swallows a gulp of [src]."), \ + span_notice("I swallow a gulp of [src].")) if(HAS_TRAIT(M, TRAIT_VORACIOUS)) M.changeNext_move(CLICK_CD_MELEE * 0.5) //chug! chug! chug! else - M.visible_message("[user] attempts to feed [M] the contents of [src].", \ - "[user] attempts to feed you the contents of [src].") + M.visible_message(span_danger("[user] attempts to feed [M] the contents of [src]."), \ + span_danger("[user] attempts to feed you the contents of [src].")) if(!do_mob(user, M)) return if(!reagents || !reagents.total_volume) return // The drink might be empty after the delay, such as by spam-feeding - M.visible_message("[user] fed [M] the contents of [src].", \ - "[user] fed you the contents of [src].") + M.visible_message(span_danger("[user] fed [M] the contents of [src]."), \ + span_danger("[user] fed you the contents of [src].")) log_combat(user, M, "fed", reagents.log_list()) var/fraction = min(gulp_size/reagents.total_volume, 1) @@ -63,16 +63,16 @@ if(target.is_refillable() && is_drainable()) //Something like a glass. Player probably wants to transfer TO it. if(!reagents.total_volume) - to_chat(user, "[src] is empty.") + to_chat(user, span_warning("[src] is empty.")) return if(target.reagents.holder_full()) - to_chat(user, "[target] is full.") + to_chat(user, span_warning("[target] is full.")) return var/refill = reagents.get_master_reagent_id() var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user) - to_chat(user, "I transfer [trans] units of the solution to [target].") + to_chat(user, span_notice("I transfer [trans] units of the solution to [target].")) if(iscyborg(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell var/mob/living/silicon/robot/bro = user @@ -81,25 +81,25 @@ else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us. if (!is_refillable()) - to_chat(user, "[src]'s tab isn't open!") + to_chat(user, span_warning("[src]'s tab isn't open!")) return if(!target.reagents.total_volume) - to_chat(user, "[target] is empty.") + to_chat(user, span_warning("[target] is empty.")) return if(reagents.holder_full()) - to_chat(user, "[src] is full.") + to_chat(user, span_warning("[src] is full.")) return var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transfered_by = user) - to_chat(user, "I fill [src] with [trans] units of the contents of [target].") + to_chat(user, span_notice("I fill [src] with [trans] units of the contents of [target].")) /obj/item/reagent_containers/food/drinks/attackby(obj/item/I, mob/user, params) var/hotness = I.get_temperature() if(hotness && reagents) reagents.expose_temperature(hotness) - to_chat(user, "I heat [name] with [I]!") + to_chat(user, span_notice("I heat [name] with [I]!")) ..() /obj/item/reagent_containers/food/drinks/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) @@ -412,12 +412,12 @@ /obj/item/reagent_containers/food/drinks/soda_cans/suicide_act(mob/living/carbon/human/H) if(!reagents.total_volume) - H.visible_message("[H] is trying to take a big sip from [src]... The can is empty!") + H.visible_message(span_warning("[H] is trying to take a big sip from [src]... The can is empty!")) return SHAME if(!is_drainable()) open_soda() sleep(10) - H.visible_message("[H] takes a big sip from [src]! It looks like [H.p_theyre()] trying to commit suicide!") + H.visible_message(span_suicide("[H] takes a big sip from [src]! It looks like [H.p_theyre()] trying to commit suicide!")) playsound(H,'sound/blank.ogg', 80, TRUE) reagents.trans_to(H, src.reagents.total_volume, transfered_by = H) //a big sip sleep(5) @@ -434,9 +434,9 @@ /obj/item/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user) if(istype(M, /mob/living/carbon) && !reagents.total_volume && user.used_intent.type == INTENT_HARM && user.zone_selected == BODY_ZONE_HEAD) if(M == user) - user.visible_message("[user] crushes the can of [src] on [user.p_their()] forehead!", "I crush the can of [src] on your forehead.") + user.visible_message(span_warning("[user] crushes the can of [src] on [user.p_their()] forehead!"), span_notice("I crush the can of [src] on your forehead.")) else - user.visible_message("[user] crushes the can of [src] on [M]'s forehead!", "I crush the can of [src] on [M]'s forehead.") + user.visible_message(span_warning("[user] crushes the can of [src] on [M]'s forehead!"), span_notice("I crush the can of [src] on [M]'s forehead.")) playsound(M,'sound/blank.ogg', rand(10,50), TRUE) var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(M.loc) crushed_can.icon_state = icon_state diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index a844c3ca9..d8bb9fe96 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -55,7 +55,7 @@ return ..() if(HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "I don't want to harm [target]!") + to_chat(user, span_warning("I don't want to harm [target]!")) return var/obj/item/bodypart/affecting = user.zone_selected //Find what the player is aiming at @@ -98,11 +98,11 @@ //Display an attack message. if(target != user) - target.visible_message("[user] hits [target][head_attack_message] with a bottle of [src.name]!", \ - "[user] hits you [head_attack_message] with a bottle of [src.name]!") + target.visible_message(span_danger("[user] hits [target][head_attack_message] with a bottle of [src.name]!"), \ + span_danger("[user] hits you [head_attack_message] with a bottle of [src.name]!")) else - target.visible_message("[target] hits [target.p_them()]self with a bottle of [src.name][head_attack_message]!", \ - "I hit myself with a bottle of [src.name][head_attack_message]!") + target.visible_message(span_danger("[target] hits [target.p_them()]self with a bottle of [src.name][head_attack_message]!"), \ + span_danger("I hit myself with a bottle of [src.name][head_attack_message]!")) //Attack logs log_combat(user, target, "attacked", src) @@ -491,7 +491,7 @@ active = TRUE log_bomber(user, "has primed a", src, "for detonation") - to_chat(user, "I light [src] on fire.") + to_chat(user, span_info("I light [src] on fire.")) add_overlay(GLOB.fire_overlay) if(!isGlass) addtimer(CALLBACK(src, PROC_REF(explode)), 5 SECONDS) @@ -511,8 +511,8 @@ /obj/item/reagent_containers/food/drinks/bottle/molotov/attack_self(mob/user) if(active) if(!isGlass) - to_chat(user, "The flame's spread too far on it!") + to_chat(user, span_danger("The flame's spread too far on it!")) return - to_chat(user, "I snuff out the flame on [src].") + to_chat(user, span_info("I snuff out the flame on [src].")) cut_overlay(GLOB.fire_overlay) active = 0 diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index 220eee877..975fff525 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -97,9 +97,9 @@ var/obj/item/reagent_containers/food/snacks/egg/E = I if(reagents) if(reagents.total_volume >= reagents.maximum_volume) - to_chat(user, "[src] is full.") + to_chat(user, span_notice("[src] is full.")) else - to_chat(user, "I break [E] in [src].") + to_chat(user, span_notice("I break [E] in [src].")) reagents.add_reagent(/datum/reagent/consumable/eggyolk, 5) qdel(E) return @@ -108,8 +108,8 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/attack(obj/target, mob/user) if(user.used_intent.type == INTENT_HARM && ismob(target) && target.reagents && reagents.total_volume) - target.visible_message("[user] splashes the contents of [src] onto [target]!", \ - "[user] splashes the contents of [src] onto you!") + target.visible_message(span_danger("[user] splashes the contents of [src] onto [target]!"), \ + span_danger("[user] splashes the contents of [src] onto you!")) log_combat(user, target, "splashed", src) reagents.reaction(target, TOUCH) reagents.clear_reagents() @@ -122,8 +122,8 @@ return else if(reagents.total_volume && user.used_intent.type == INTENT_HARM) - user.visible_message("[user] splashes the contents of [src] onto [target]!", \ - "I splash the contents of [src] onto [target].") + user.visible_message(span_danger("[user] splashes the contents of [src] onto [target]!"), \ + span_notice("I splash the contents of [src] onto [target].")) reagents.reaction(target, TOUCH) reagents.clear_reagents() return diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index 50af3e42f..a4148ac30 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -29,20 +29,20 @@ var/mob/living/carbon/human/H = M if(!HAS_TRAIT(H, TRAIT_AGEUSIA)) if(foodtype & H.dna.species.toxic_food) - to_chat(H,"What the hell was that thing?!") + to_chat(H,span_warning("What the hell was that thing?!")) H.adjust_disgust(25 + 30 * fraction) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food) else if(foodtype & H.dna.species.disliked_food) - to_chat(H,"That didn't taste very good...") + to_chat(H,span_notice("That didn't taste very good...")) H.adjust_disgust(11 + 15 * fraction) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food) else if(foodtype & H.dna.species.liked_food) - to_chat(H,"I love this taste!") + to_chat(H,span_notice("I love this taste!")) H.adjust_disgust(-5 + -2.5 * fraction) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food) else if(foodtype & H.dna.species.toxic_food) - to_chat(H, "I don't feel so good...") + to_chat(H, span_warning("I don't feel so good...")) H.adjust_disgust(25 + 30 * fraction) if((foodtype & BREAKFAST) && world.time - SSticker.round_start_time < STOP_SERVING_BREAKFAST) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast) diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index a59151d71..da45d1463 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -65,30 +65,30 @@ . = ..() /obj/item/reagent_containers/food/condiment/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is trying to eat the entire [src]! It looks like [user.p_they()] forgot how food works!") + user.visible_message(span_suicide("[user] is trying to eat the entire [src]! It looks like [user.p_they()] forgot how food works!")) return OXYLOSS /obj/item/reagent_containers/food/condiment/attack(mob/M, mob/user, def_zone) if(!reagents || !reagents.total_volume) - to_chat(user, "None of [src] left, oh no!") + to_chat(user, span_warning("None of [src] left, oh no!")) return 0 if(!canconsume(M, user)) return 0 if(M == user) - user.visible_message("[user] swallows some of the contents of \the [src].", \ - "I swallow some of the contents of \the [src].") + user.visible_message(span_notice("[user] swallows some of the contents of \the [src]."), \ + span_notice("I swallow some of the contents of \the [src].")) else - M.visible_message("[user] attempts to feed [M] from [src].", \ - "[user] attempts to feed you from [src].") + M.visible_message(span_warning("[user] attempts to feed [M] from [src]."), \ + span_warning("[user] attempts to feed you from [src].")) if(!do_mob(user, M)) return if(!reagents || !reagents.total_volume) return // The condiment might be empty after the delay. - M.visible_message("[user] fed [M] from [src].", \ - "[user] fed you from [src].") + M.visible_message(span_warning("[user] fed [M] from [src]."), \ + span_warning("[user] fed you from [src].")) log_combat(user, M, "fed", reagents.log_list()) var/fraction = min(10/reagents.total_volume, 1) @@ -104,26 +104,26 @@ if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us. if(!target.reagents.total_volume) - to_chat(user, "[target] is empty!") + to_chat(user, span_warning("[target] is empty!")) return if(reagents.total_volume >= reagents.maximum_volume) - to_chat(user, "[src] is full!") + to_chat(user, span_warning("[src] is full!")) return var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transfered_by = user) - to_chat(user, "I fill [src] with [trans] units of the contents of [target].") + to_chat(user, span_notice("I fill [src] with [trans] units of the contents of [target].")) //Something like a glass or a food item. Player probably wants to transfer TO it. else if(target.is_drainable() || istype(target, /obj/item/reagent_containers/food/snacks)) if(!reagents.total_volume) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return if(target.reagents.total_volume >= target.reagents.maximum_volume) - to_chat(user, "you can't add anymore to [target]!") + to_chat(user, span_warning("you can't add anymore to [target]!")) return var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user) - to_chat(user, "I transfer [trans] units of the condiment to [target].") + to_chat(user, span_notice("I transfer [trans] units of the condiment to [target].")) /obj/item/reagent_containers/food/condiment/on_reagent_change(changetype) update_icon() @@ -158,9 +158,9 @@ return if(isturf(target)) if(!reagents.has_reagent(/datum/reagent/consumable/sodiumchloride, 2)) - to_chat(user, "I don't have enough salt to make a pile!") + to_chat(user, span_warning("I don't have enough salt to make a pile!")) return - user.visible_message("[user] shakes some salt onto [target].", "I shake some salt onto [target].") + user.visible_message(span_notice("[user] shakes some salt onto [target]."), span_notice("I shake some salt onto [target].")) reagents.remove_reagent(/datum/reagent/consumable/sodiumchloride, 2) new/obj/effect/decal/cleanable/food/salt(target) return*/ @@ -257,15 +257,15 @@ //You can tear the bag open above food to put the condiments on it, obviously. if(istype(target, /obj/item/reagent_containers/food/snacks)) if(!reagents.total_volume) - to_chat(user, "I tear open [src], but there's nothing in it.") + to_chat(user, span_warning("I tear open [src], but there's nothing in it.")) qdel(src) return if(target.reagents.total_volume >= target.reagents.maximum_volume) - to_chat(user, "I tear open [src], but [target] is stacked so high that it just drips off!" ) + to_chat(user, span_warning("I tear open [src], but [target] is stacked so high that it just drips off!") ) qdel(src) return else - to_chat(user, "I tear open [src] above [target] and the condiments drip onto it.") + to_chat(user, span_notice("I tear open [src] above [target] and the condiments drip onto it.")) src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user) qdel(src) diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index a08dafdf1..820620596 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -39,11 +39,11 @@ if(!istype(I, /obj/item/reagent_containers/food/snacks/customizable) && istype(I, /obj/item/reagent_containers/food/snacks)) var/obj/item/reagent_containers/food/snacks/S = I if(I.w_class > WEIGHT_CLASS_SMALL) - to_chat(user, "The ingredient is too big for [src]!") + to_chat(user, span_warning("The ingredient is too big for [src]!")) else if((ingredients.len >= ingMax) || (reagents.total_volume >= volume)) - to_chat(user, "I can't add more ingredients to [src]!") + to_chat(user, span_warning("I can't add more ingredients to [src]!")) else if(istype(I, /obj/item/reagent_containers/food/snacks/pizzaslice/custom) || istype(I, /obj/item/reagent_containers/food/snacks/cakeslice/custom)) - to_chat(user, "Adding [I.name] to [src] would make a mess.") + to_chat(user, span_warning("Adding [I.name] to [src] would make a mess.")) else if(!user.transferItemToLoc(I, src)) return @@ -54,7 +54,7 @@ S.reagents.trans_to(src,min(S.reagents.total_volume, 15), transfered_by = user) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume. foodtype |= S.foodtype update_snack_overlays(S) - to_chat(user, "I add the [I.name] to the [name].") + to_chat(user, span_notice("I add the [I.name] to the [name].")) update_name(S) else . = ..() @@ -243,7 +243,7 @@ var/obj/item/reagent_containers/food/snacks/breadslice/BS = I if(finished) return - to_chat(user, "I finish the [src.name].") + to_chat(user, span_notice("I finish the [src.name].")) finished = 1 name = "[customname] sandwich" BS.reagents.trans_to(src, BS.reagents.total_volume, transfered_by = user) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 442ba6f18..d26711222 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -92,10 +92,10 @@ All foods are distributed among various categories. Use common sense. if(ismob(target)) var/mob/M = target var/list/targetl = list(target) - user.visible_message("[user] beckons [M] with [masteritem].", "I beckon [M] with [masteritem].", ignored_mobs = targetl) + user.visible_message(span_green("[user] beckons [M] with [masteritem]."), span_green("I beckon [M] with [masteritem]."), ignored_mobs = targetl) if(M.client) if(M.can_see_cone(user)) - to_chat(M, "[user] beckons me with [masteritem].") + to_chat(M, span_green("[user] beckons me with [masteritem].")) M.food_tempted(masteritem, user) return @@ -249,60 +249,60 @@ All foods are distributed among various categories. Use common sense. if(M == user) //If you're eating it myself. /* if(junkiness && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 && !HAS_TRAIT(user, TRAIT_VORACIOUS)) - to_chat(M, "I don't feel like eating any more junk food at the moment!") + to_chat(M, span_warning("I don't feel like eating any more junk food at the moment!")) return FALSE else if(fullness <= 50) - user.visible_message("[user] hungrily [eatverb]s \the [src], gobbling it down!", "I hungrily [eatverb] \the [src], gobbling it down!") + user.visible_message(span_notice("[user] hungrily [eatverb]s \the [src], gobbling it down!"), span_notice("I hungrily [eatverb] \the [src], gobbling it down!")) else if(fullness > 50 && fullness < 150) - user.visible_message("[user] hungrily [eatverb]s \the [src].", "I hungrily [eatverb] \the [src].") + user.visible_message(span_notice("[user] hungrily [eatverb]s \the [src]."), span_notice("I hungrily [eatverb] \the [src].")) else if(fullness > 150 && fullness < 500) - user.visible_message("[user] [eatverb]s \the [src].", "I [eatverb] \the [src].") + user.visible_message(span_notice("[user] [eatverb]s \the [src]."), span_notice("I [eatverb] \the [src].")) else if(fullness > 500 && fullness < 600) - user.visible_message("[user] unwillingly [eatverb]s a bit of \the [src].", "I unwillingly [eatverb] a bit of \the [src].") + user.visible_message(span_notice("[user] unwillingly [eatverb]s a bit of \the [src]."), span_notice("I unwillingly [eatverb] a bit of \the [src].")) else if(fullness > (600 * (1 + M.overeatduration / 2000))) // The more you eat - the more you can eat - user.visible_message("[user] cannot force any more of \the [src] to go down [user.p_their()] throat!", "I cannot force any more of \the [src] to go down your throat!") + user.visible_message(span_warning("[user] cannot force any more of \the [src] to go down [user.p_their()] throat!"), span_warning("I cannot force any more of \the [src] to go down your throat!")) return FALSE if(HAS_TRAIT(M, TRAIT_VORACIOUS)) M.changeNext_move(CLICK_CD_MELEE * 0.5)*/ switch(M.nutrition) if(NUTRITION_LEVEL_FAT to INFINITY) - user.visible_message("[user] forces [M.p_them()]self to eat \the [src].", "I force myself to eat \the [src].") + user.visible_message(span_notice("[user] forces [M.p_them()]self to eat \the [src]."), span_notice("I force myself to eat \the [src].")) if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_FAT) - user.visible_message("[user] [eatverb]s \the [src].", "I [eatverb] \the [src].") + user.visible_message(span_notice("[user] [eatverb]s \the [src]."), span_notice("I [eatverb] \the [src].")) if(0 to NUTRITION_LEVEL_STARVING) - user.visible_message("[user] hungrily [eatverb]s \the [src], gobbling it down!", "I hungrily [eatverb] \the [src], gobbling it down!") + user.visible_message(span_notice("[user] hungrily [eatverb]s \the [src], gobbling it down!"), span_notice("I hungrily [eatverb] \the [src], gobbling it down!")) M.changeNext_move(CLICK_CD_MELEE * 0.5) /* if(M.rogstam <= 50) - user.visible_message("[user] hungrily [eatverb]s \the [src], gobbling it down!", "I hungrily [eatverb] \the [src], gobbling it down!") + user.visible_message(span_notice("[user] hungrily [eatverb]s \the [src], gobbling it down!"), span_notice("I hungrily [eatverb] \the [src], gobbling it down!")) else if(M.rogstam > 50 && M.rogstam < 500) - user.visible_message("[user] hungrily [eatverb]s \the [src].", "I hungrily [eatverb] \the [src].") + user.visible_message(span_notice("[user] hungrily [eatverb]s \the [src]."), span_notice("I hungrily [eatverb] \the [src].")) else if(M.rogstam > 500 && M.rogstam < 1000) - user.visible_message("[user] [eatverb]s \the [src].", "I [eatverb] \the [src].") + user.visible_message(span_notice("[user] [eatverb]s \the [src]."), span_notice("I [eatverb] \the [src].")) if(HAS_TRAIT(M, TRAIT_VORACIOUS)) M.changeNext_move(CLICK_CD_MELEE * 0.5) nom nom nom*/ else if(!isbrain(M)) //If you're feeding it to someone else. // if(fullness <= (600 * (1 + M.overeatduration / 1000))) if(M.nutrition in NUTRITION_LEVEL_FAT to INFINITY) - M.visible_message("[user] cannot force any more of [src] down [M]'s throat!", \ - "[user] cannot force any more of [src] down your throat!") + M.visible_message(span_warning("[user] cannot force any more of [src] down [M]'s throat!"), \ + span_warning("[user] cannot force any more of [src] down your throat!")) return FALSE else - M.visible_message("[user] tries to feed [M] [src].", \ - "[user] tries to feed me [src].") + M.visible_message(span_danger("[user] tries to feed [M] [src]."), \ + span_danger("[user] tries to feed me [src].")) if(iscarbon(M)) var/mob/living/carbon/C = M var/obj/item/bodypart/CH = C.get_bodypart(BODY_ZONE_HEAD) if(C.cmode) if(!CH.grabbedby) - to_chat(user, "[C.p_they(TRUE)] steals [C.p_their()] face from it.") + to_chat(user, span_info("[C.p_they(TRUE)] steals [C.p_their()] face from it.")) return FALSE if(!do_mob(user, M)) return log_combat(user, M, "fed", reagents.log_list()) -// M.visible_message("[user] forces [M] to eat [src]!", "[user] forces you to eat [src]!") +// M.visible_message(span_danger("[user] forces [M] to eat [src]!"), span_danger("[user] forces you to eat [src]!")) else - to_chat(user, "[M] doesn't seem to have a mouth!") + to_chat(user, span_warning("[M] doesn't seem to have a mouth!")) return if(reagents) //Handle ingestion of the reagent. @@ -349,13 +349,13 @@ All foods are distributed among various categories. Use common sense. var/obj/item/reagent_containers/food/snacks/S = W if(custom_food_type && ispath(custom_food_type)) if(S.w_class > WEIGHT_CLASS_SMALL) - to_chat(user, "[S] is too big for [src]!") + to_chat(user, span_warning("[S] is too big for [src]!")) return 0 if(!S.customfoodfilling || istype(W, /obj/item/reagent_containers/food/snacks/customizable) || istype(W, /obj/item/reagent_containers/food/snacks/pizzaslice/custom) || istype(W, /obj/item/reagent_containers/food/snacks/cakeslice/custom)) - to_chat(user, "[src] can't be filled with [S]!") + to_chat(user, span_warning("[src] can't be filled with [S]!")) return 0 if(contents.len >= 20) - to_chat(user, "I can't add more ingredients to [src]!") + to_chat(user, span_warning("I can't add more ingredients to [src]!")) return 0 var/obj/item/reagent_containers/food/snacks/customizable/C = new custom_food_type(get_turf(src)) C.initialize_custom_food(src, S, user) @@ -364,10 +364,10 @@ All foods are distributed among various categories. Use common sense. if(slice_bclass == BCLASS_CHOP) // RTD meat chopping noise if(prob(66)) - user.visible_message("[user] chops [src]!") + user.visible_message(span_warning("[user] chops [src]!")) return 0 else - user.visible_message("[user] chops [src]!") + user.visible_message(span_notice("[user] chops [src]!")) slice(W, user) return 1 else if(slice(W, user)) @@ -406,7 +406,7 @@ All foods are distributed among various categories. Use common sense. !(locate(/obj/structure/table/optable) in src.loc) && \ !(locate(/obj/item/storage/bag/tray) in src.loc) \ ) - to_chat(user, "I need to use a table.") + to_chat(user, span_warning("I need to use a table.")) return FALSE if(slice_batch) @@ -528,15 +528,15 @@ All foods are distributed among various categories. Use common sense. return if(istype(M, /obj/item/reagent_containers/glass) || istype(M, /obj/item/reagent_containers/food/drinks)) //you can dunk dunkable snacks into beakers or drinks if(!M.is_drainable()) - to_chat(user, "[M] is unable to be dunked in!") + to_chat(user, span_warning("[M] is unable to be dunked in!")) return if(M.reagents.trans_to(src, dunk_amount, transfered_by = user)) //if reagents were transfered, show the message - to_chat(user, "I dunk \the [src] into \the [M].") + to_chat(user, span_notice("I dunk \the [src] into \the [M].")) return if(!M.reagents.total_volume) - to_chat(user, "[M] is empty!") + to_chat(user, span_warning("[M] is empty!")) else - to_chat(user, "[src] is full!") + to_chat(user, span_warning("[src] is full!")) // //////////////////////////////////////////////Store//////////////////////////////////////// /// All the food items that can store an item inside itself, like bread or cake. @@ -554,9 +554,9 @@ All foods are distributed among various categories. Use common sense. if(!iscarbon(user)) return 0 if(contents.len >= 20) - to_chat(user, "[src] is full.") + to_chat(user, span_warning("[src] is full.")) return 0 - to_chat(user, "I slip [W] inside [src].") + to_chat(user, span_notice("I slip [W] inside [src].")) user.transferItemToLoc(W, src) add_fingerprint(user) contents += W diff --git a/code/modules/food_and_drinks/food/snacks/dough.dm b/code/modules/food_and_drinks/food/snacks/dough.dm index 6e90a9dad..e05358f0f 100644 --- a/code/modules/food_and_drinks/food/snacks/dough.dm +++ b/code/modules/food_and_drinks/food/snacks/dough.dm @@ -19,10 +19,10 @@ if(istype(I, /obj/item/kitchen/rollingpin)) if(isturf(loc)) new /obj/item/reagent_containers/food/snacks/flatdough(loc) - to_chat(user, "I flatten [src].") + to_chat(user, span_notice("I flatten [src].")) qdel(src) else - to_chat(user, "I need to put [src] on a surface to roll it out!") + to_chat(user, span_warning("I need to put [src] on a surface to roll it out!")) else ..() @@ -91,10 +91,10 @@ if(istype(I, /obj/item/kitchen/rollingpin)) if(isturf(loc)) new /obj/item/reagent_containers/food/snacks/piedough(loc) - to_chat(user, "I flatten [src].") + to_chat(user, span_notice("I flatten [src].")) qdel(src) else - to_chat(user, "I need to put [src] on a surface to roll it out!") + to_chat(user, span_warning("I need to put [src] on a surface to roll it out!")) else ..() diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm index ebc0cb51c..54a86ceea 100644 --- a/code/modules/food_and_drinks/food/snacks/meat.dm +++ b/code/modules/food_and_drinks/food/snacks/meat.dm @@ -226,7 +226,7 @@ foodtype = RAW | MEAT | TOXIC /obj/item/reagent_containers/food/snacks/meat/slab/goliath/burn() - visible_message("[src] finishes cooking!") + visible_message(span_notice("[src] finishes cooking!")) new /obj/item/reagent_containers/food/snacks/meat/steak/goliath(loc) qdel(src) diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm index 9ea1eda8c..0ef595567 100644 --- a/code/modules/food_and_drinks/food/snacks_burgers.dm +++ b/code/modules/food_and_drinks/food/snacks_burgers.dm @@ -18,7 +18,7 @@ if(prob(1)) new/obj/effect/particle_effect/smoke(get_turf(src)) playsound(src, 'sound/blank.ogg', 50, TRUE) - visible_message("Oh, ye gods! [src] is ruined! But what if...?") + visible_message(span_warning("Oh, ye gods! [src] is ruined! But what if...?")) name = "steamed ham" desc = pick("Ahh, Head of Personnel, welcome. I hope you're prepared for an unforgettable luncheon!", "And you call these steamed hams despite the fact that they are obviously microwaved?", diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm index ba73b8105..7a202696a 100644 --- a/code/modules/food_and_drinks/food/snacks_egg.dm +++ b/code/modules/food_and_drinks/food/snacks_egg.dm @@ -50,7 +50,7 @@ var/obj/O = new /obj/effect/decal/cleanable/food/egg_smudge(T) O.pixel_x = rand(-8,8) O.pixel_y = rand(-8,8) - visible_message("[H] crushes [src] underfoot.") + visible_message(span_warning("[H] crushes [src] underfoot.")) qdel(src) /obj/item/reagent_containers/food/snacks/egg/gland @@ -82,16 +82,16 @@ var/clr = C.crayon_color if(!(clr in list("blue", "green", "mime", "orange", "purple", "rainbow", "red", "yellow"))) - to_chat(usr, "[src] refuses to take on this colour!") + to_chat(usr, span_notice("[src] refuses to take on this colour!")) return - to_chat(usr, "I colour [src] with [W].") + to_chat(usr, span_notice("I colour [src] with [W].")) icon_state = "egg-[clr]" else if(istype(W, /obj/item/stamp/clown)) var/clowntype = pick("grock", "grimaldi", "rainbow", "chaos", "joker", "sexy", "standard", "bobble", "krusty", "bozo", "pennywise", "ronald", "jacobs", "kelly", "popov", "cluwne") icon_state = "egg-clown-[clowntype]" desc = "" - to_chat(usr, "I stamp [src] with [W], creating an artistic and not remotely horrifying likeness of clown makeup.") + to_chat(usr, span_notice("I stamp [src] with [W], creating an artistic and not remotely horrifying likeness of clown makeup.")) else ..() @@ -156,11 +156,11 @@ if(istype(W, /obj/item/kitchen/fork)) var/obj/item/kitchen/fork/F = W if(F.forkload) - to_chat(user, "I already have omelette on your fork!") + to_chat(user, span_warning("I already have omelette on your fork!")) else F.icon_state = "forkloaded" - user.visible_message("[user] takes a piece of omelette with [user.p_their()] fork!", \ - "I take a piece of omelette with your fork.") + user.visible_message(span_notice("[user] takes a piece of omelette with [user.p_their()] fork!"), \ + span_notice("I take a piece of omelette with your fork.")) var/datum/reagent/R = pick(reagents.reagent_list) reagents.remove_reagent(R.type, 1) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index ad18eacb8..f2f057d46 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -198,10 +198,10 @@ if(faction) bananas.faction = faction if (!QDELETED(bananas)) - visible_message("[src] expands!") + visible_message(span_notice("[src] expands!")) bananas.log_message("Spawned via [src] at [AREACOORD(src)], Last attached mob: [key_name(spammer)].", LOG_ATTACK) else if (!spammer) // Visible message in case there are no fingerprints - visible_message("[src] fails to expand!") + visible_message(span_notice("[src] fails to expand!")) qdel(src) /obj/item/reagent_containers/food/snacks/monkeycube/syndicate diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 52189ac1c..3831b35a4 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -595,7 +595,7 @@ volume = 30 /obj/item/reagent_containers/food/snacks/canned/proc/open_can(mob/user) - to_chat(user, "I pull back the tab of \the [src].") + to_chat(user, span_notice("I pull back the tab of \the [src].")) playsound(user.loc, 'sound/blank.ogg', 50) ENABLE_BITFIELD(reagents.flags, OPENCONTAINER) spillable = TRUE @@ -608,7 +608,7 @@ /obj/item/reagent_containers/food/snacks/canned/attack(mob/living/M, mob/user, def_zone) if (!is_drainable()) - to_chat(user, "[src]'s lid hasn't been opened!") + to_chat(user, span_warning("[src]'s lid hasn't been opened!")) return 0 return ..() diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 12a4f8686..debcb5d1a 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -39,7 +39,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(HAS_TRAIT(H.mind, TRAIT_LAW_ENFORCEMENT_METABOLISM) && !HAS_TRAIT(H, TRAIT_AGEUSIA)) - to_chat(H,"I love this taste!") + to_chat(H,span_notice("I love this taste!")) H.adjust_disgust(-5 + -2.5 * fraction) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food) last_check_time = world.time @@ -666,11 +666,11 @@ if(istype(I, /obj/item/reagent_containers/food/snacks/pancakes/)) var/obj/item/reagent_containers/food/snacks/pancakes/P = I if((contents.len >= PANCAKE_MAX_STACK) || ((P.contents.len + contents.len) > PANCAKE_MAX_STACK) || (reagents.total_volume >= volume)) - to_chat(user, "I can't add that many pancakes to [src]!") + to_chat(user, span_warning("I can't add that many pancakes to [src]!")) else if(!user.transferItemToLoc(I, src)) return - to_chat(user, "I add the [I] to the [name].") + to_chat(user, span_notice("I add the [I] to the [name].")) P.name = initial(P.name) contents += P update_snack_overlays(P) diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index 0a26b3fd2..2b70b0f4f 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -46,7 +46,7 @@ if(stunning) L.Paralyze(20) //splat! L.adjust_blurriness(1) - L.visible_message("[L] is creamed by [src]!", "You've been creamed by [src]!") + L.visible_message(span_warning("[L] is creamed by [src]!"), span_danger("You've been creamed by [src]!")) playsound(L, "desceration", 50, TRUE) if(is_type_in_typecache(hit_atom, GLOB.creamable)) hit_atom.AddComponent(/datum/component/creamed, src) diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm index 89825089b..f3bb667bb 100644 --- a/code/modules/food_and_drinks/food/snacks_pizza.dm +++ b/code/modules/food_and_drinks/food/snacks_pizza.dm @@ -172,7 +172,7 @@ var/obj/item/bodypart/l_arm = user.get_bodypart(BODY_ZONE_L_ARM) var/obj/item/bodypart/r_arm = user.get_bodypart(BODY_ZONE_R_ARM) if(prob(50) && iscarbon(user) && M == user && (r_arm || l_arm)) - user.visible_message("\The [src] breaks off [user]'s arm!!", "\The [src] breaks off your arm!") + user.visible_message(span_warning("\The [src] breaks off [user]'s arm!!"), span_warning("\The [src] breaks off your arm!")) if(l_arm) l_arm.dismember() else diff --git a/code/modules/food_and_drinks/food/snacks_spaghetti.dm b/code/modules/food_and_drinks/food/snacks_spaghetti.dm index 8d7582439..93cca2a72 100644 --- a/code/modules/food_and_drinks/food/snacks_spaghetti.dm +++ b/code/modules/food_and_drinks/food/snacks_spaghetti.dm @@ -14,8 +14,8 @@ . = ..() if(!cooked_type) // This isn't cooked, why would you put uncooked spaghetti in your pocket? var/list/display_message = list( - "Something wet falls out of their pocket and hits the ground. Is that... [name]?", - "Oh shit! All your pocket [name] fell out!") + span_notice("Something wet falls out of their pocket and hits the ground. Is that... [name]?"), + span_warning("Oh shit! All your pocket [name] fell out!")) AddComponent(/datum/component/spill, display_message, 'sound/blank.ogg') /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 2247f3d7d..f11db9632 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -72,25 +72,25 @@ God bless America. if(frying) . += "You can make out \a [frying] in the oil." if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Frying at [fry_speed*100]% speed.
Using [oil_use*10] units of oil per second.
" + . += span_notice("The status display reads: Frying at [fry_speed*100]% speed.
Using [oil_use*10] units of oil per second.") /obj/machinery/deepfryer/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/reagent_containers/pill)) if(!reagents.total_volume) - to_chat(user, "There's nothing to dissolve [I] in!") + to_chat(user, span_warning("There's nothing to dissolve [I] in!")) return - user.visible_message("[user] drops [I] into [src].", "I dissolve [I] in [src].") + user.visible_message(span_notice("[user] drops [I] into [src]."), span_notice("I dissolve [I] in [src].")) I.reagents.trans_to(src, I.reagents.total_volume, transfered_by = user) qdel(I) return if(!reagents.has_reagent(/datum/reagent/consumable/cooking_oil)) - to_chat(user, "[src] has no cooking oil to fry with!") + to_chat(user, span_warning("[src] has no cooking oil to fry with!")) return if(I.resistance_flags & INDESTRUCTIBLE) - to_chat(user, "I don't feel it would be wise to fry [I]...") + to_chat(user, span_warning("I don't feel it would be wise to fry [I]...")) return if(istype(I, /obj/item/reagent_containers/food/snacks/deepfryholder)) - to_chat(user, "My cooking skills are not up to the legendary Doublefry technique.") + to_chat(user, span_danger("My cooking skills are not up to the legendary Doublefry technique.")) return if(default_unfasten_wrench(user, I)) return @@ -100,7 +100,7 @@ God bless America. if(is_type_in_typecache(I, deepfry_blacklisted_items) || HAS_TRAIT(I, TRAIT_NODROP) || (I.item_flags & (ABSTRACT | DROPDEL))) return ..() else if(!frying && user.transferItemToLoc(I, src)) - to_chat(user, "I put [I] into [src].") + to_chat(user, span_notice("I put [I] into [src].")) frying = new/obj/item/reagent_containers/food/snacks/deepfryholder(src, I) icon_state = "fryer_on" fry_loop.start() @@ -117,10 +117,10 @@ God bless America. if(cook_time >= 30 && !frying_fried) frying_fried = TRUE //frying... frying... fried playsound(src.loc, 'sound/blank.ogg', 50, TRUE) - audible_message("[src] dings!") + audible_message(span_notice("[src] dings!")) else if (cook_time >= 60 && !frying_burnt) frying_burnt = TRUE - visible_message("[src] emits an acrid smell!") + visible_message(span_warning("[src] emits an acrid smell!")) /obj/machinery/deepfryer/attack_ai(mob/user) @@ -129,7 +129,7 @@ God bless America. /obj/machinery/deepfryer/attack_hand(mob/user) if(frying) if(frying.loc == src) - to_chat(user, "I eject [frying] from [src].") + to_chat(user, span_notice("I eject [frying] from [src].")) frying.fry(cook_time) icon_state = "fryer_off" frying.forceMove(drop_location()) @@ -143,10 +143,10 @@ God bless America. return else if(user.pulling && user.used_intent.type == INTENT_GRAB && iscarbon(user.pulling) && reagents.total_volume) if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, "I need a better grip to do that!") + to_chat(user, span_warning("I need a better grip to do that!")) return var/mob/living/carbon/C = user.pulling - user.visible_message("[user] dunks [C]'s face in [src]!") + user.visible_message(span_danger("[user] dunks [C]'s face in [src]!")) reagents.reaction(C, TOUCH) var/permeability = 1 - C.get_permeability_protection(list(HEAD)) C.apply_damage(min(30 * permeability, reagents.total_volume), BURN, BODY_ZONE_HEAD) diff --git a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm index 024e09589..c01a83a01 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm @@ -68,10 +68,10 @@ if(!DG.reagents.total_volume) //glass is empty qdel(DG) glasses++ - to_chat(user, "[src] accepts the drinking glass, sterilizing it.") + to_chat(user, span_notice("[src] accepts the drinking glass, sterilizing it.")) else if(istype(O, /obj/item/reagent_containers/food/snacks)) if(isFull()) - to_chat(user, "[src] is at full capacity.") + to_chat(user, span_warning("[src] is at full capacity.")) else var/obj/item/reagent_containers/food/snacks/S = O if(!user.transferItemToLoc(S, src)) @@ -85,12 +85,12 @@ if(G.get_amount() >= 1) G.use(1) glasses += 4 - to_chat(user, "[src] accepts a sheet of glass.") + to_chat(user, span_notice("[src] accepts a sheet of glass.")) else if(istype(O, /obj/item/storage/bag/tray)) var/obj/item/storage/bag/tray/T = O for(var/obj/item/reagent_containers/food/snacks/S in T.contents) if(isFull()) - to_chat(user, "[src] is at full capacity.") + to_chat(user, span_warning("[src] is at full capacity.")) break else if(SEND_SIGNAL(T, COMSIG_TRY_STORAGE_TAKE, S, src)) @@ -129,7 +129,7 @@ if(href_list["pour"] || href_list["m_pour"]) if(glasses-- <= 0) - to_chat(usr, "There are no glasses left!") + to_chat(usr, span_warning("There are no glasses left!")) glasses = 0 else var/obj/item/reagent_containers/food/drinks/drinkingglass/DG = new(loc) @@ -140,11 +140,11 @@ if(href_list["mix"]) if(reagents.trans_id_to(mixer, href_list["mix"], portion) == 0) - to_chat(usr, "[mixer] is full!") + to_chat(usr, span_warning("[mixer] is full!")) if(href_list["transfer"]) if(mixer.reagents.trans_id_to(src, href_list["transfer"], portion) == 0) - to_chat(usr, "[src] is full!") + to_chat(usr, span_warning("[src] is full!")) updateDialog() diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index b8fc4772d..e007c9c0d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -33,10 +33,10 @@ /obj/machinery/gibber/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Outputting [meat_produced] meat slab(s) after [gibtime*0.1] seconds of processing." + . += span_notice("The status display reads: Outputting [meat_produced] meat slab(s) after [gibtime*0.1] seconds of processing.") for(var/obj/item/stock_parts/manipulator/M in component_parts) if(M.rating >= 2) - . += "Gibber has been upgraded to process inorganic materials." + . += span_notice("Gibber has been upgraded to process inorganic materials.") /obj/machinery/gibber/update_icon() cut_overlays() @@ -67,36 +67,36 @@ if(stat & (NOPOWER|BROKEN)) return if(operating) - to_chat(user, "It's locked and running.") + to_chat(user, span_danger("It's locked and running.")) return if(!anchored) - to_chat(user, "[src] cannot be used unless bolted to the ground!") + to_chat(user, span_warning("[src] cannot be used unless bolted to the ground!")) return if(user.pulling && user.used_intent.type == INTENT_GRAB && isliving(user.pulling)) var/mob/living/L = user.pulling if(!iscarbon(L)) - to_chat(user, "This item is not suitable for the gibber!") + to_chat(user, span_warning("This item is not suitable for the gibber!")) return var/mob/living/carbon/C = L if(C.buckled ||C.has_buckled_mobs()) - to_chat(user, "[C] is attached to something!") + to_chat(user, span_warning("[C] is attached to something!")) return if(!ignore_clothing) for(var/obj/item/I in C.held_items + C.get_equipped_items()) if(!HAS_TRAIT(I, TRAIT_NODROP)) - to_chat(user, "Subject may not have abiotic items on!") + to_chat(user, span_warning("Subject may not have abiotic items on!")) return - user.visible_message("[user] starts to put [C] into the gibber!") + user.visible_message(span_danger("[user] starts to put [C] into the gibber!")) add_fingerprint(user) if(do_after(user, gibtime, target = src)) if(C && user.pulling == C && !C.buckled && !C.has_buckled_mobs() && !occupant) - user.visible_message("[user] stuffs [C] into the gibber!") + user.visible_message(span_danger("[user] stuffs [C] into the gibber!")) C.forceMove(src) occupant = C update_icon() @@ -140,10 +140,10 @@ if(src.operating) return if(!src.occupant) - audible_message("I hear a loud metallic grinding sound.") + audible_message(span_hear("I hear a loud metallic grinding sound.")) return use_power(1000) - audible_message("I hear a loud squelchy grinding sound.") + audible_message(span_hear("I hear a loud squelchy grinding sound.")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) operating = TRUE update_icon() diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index 50d14e7a2..e5c3e3812 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -29,7 +29,7 @@ if(istype(I, /obj/item/stack/sheet/mineral/coal) || istype(I, /obj/item/stack/sheet/mineral/wood)) var/obj/item/stack/S = I var/stackamount = S.get_amount() - to_chat(user, "I put [stackamount] [I]s in [src].") + to_chat(user, span_notice("I put [stackamount] [I]s in [src].")) if(istype(I, /obj/item/stack/sheet/mineral/coal)) grill_fuel += (500 * stackamount) else @@ -38,25 +38,25 @@ update_icon() return if(I.resistance_flags & INDESTRUCTIBLE) - to_chat(user, "I don't feel it would be wise to grill [I]...") + to_chat(user, span_warning("I don't feel it would be wise to grill [I]...")) return ..() if(istype(I, /obj/item/reagent_containers)) if(istype(I, /obj/item/reagent_containers/food) && !istype(I, /obj/item/reagent_containers/food/drinks)) if(HAS_TRAIT(I, TRAIT_NODROP) || (I.item_flags & (ABSTRACT | DROPDEL))) return ..() else if(!grill_fuel) - to_chat(user, "There is not enough fuel!") + to_chat(user, span_warning("There is not enough fuel!")) return else if(!grilled_item && user.transferItemToLoc(I, src)) grilled_item = I - to_chat(user, "I put the [grilled_item] on [src].") + to_chat(user, span_notice("I put the [grilled_item] on [src].")) update_icon() grill_loop.start() return else if(I.reagents.has_reagent(/datum/reagent/consumable/monkey_energy)) grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy))) - to_chat(user, "I pour the Monkey Energy in [src].") + to_chat(user, span_notice("I pour the Monkey Energy in [src].")) I.reagents.remove_reagent(/datum/reagent/consumable/monkey_energy, I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy)) update_icon() return @@ -111,7 +111,7 @@ /obj/machinery/grill/attack_hand(mob/user) if(grilled_item) - to_chat(user, "I take out [grilled_item] from [src].") + to_chat(user, span_notice("I take out [grilled_item] from [src].")) grilled_item.forceMove(drop_location()) update_icon() return diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm index 0d9d29f13..048a4608b 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -119,9 +119,9 @@ I.reagents.add_reagent(/datum/reagent/consumable/sugar, 10 - I.reagents.total_volume) updateDialog() else - to_chat(user, "There is not enough ice cream left!") + to_chat(user, span_warning("There is not enough ice cream left!")) else - to_chat(user, "[O] already has ice cream in it!") + to_chat(user, span_warning("[O] already has ice cream in it!")) return 1 if(istype(O, /obj/item/reagent_containers) && !(O.item_flags & ABSTRACT) && O.is_open_container()) . = TRUE //no afterattack @@ -129,7 +129,7 @@ if(!user.transferItemToLoc(B, src)) return replace_beaker(user, B) - to_chat(user, "I add [B] to [src].") + to_chat(user, span_notice("I add [B] to [src].")) updateUsrDialog() update_icon() return @@ -163,11 +163,11 @@ product_types[make_type] += amount var/flavour = get_flavour_name(make_type) if(make_type > 5) - src.visible_message("[user] cooks up some [flavour] cones.") + src.visible_message(span_info("[user] cooks up some [flavour] cones.")) else - src.visible_message("[user] whips up some [flavour] icecream.") + src.visible_message(span_info("[user] whips up some [flavour] icecream.")) else - to_chat(user, "I don't have the ingredients to make this!") + to_chat(user, span_warning("I don't have the ingredients to make this!")) /obj/machinery/icecream_vat/Topic(href, href_list) if(..()) @@ -175,7 +175,7 @@ if(href_list["select"]) dispense_flavour = text2num(href_list["select"]) flavour_name = get_flavour_name(dispense_flavour) - src.visible_message("[usr] sets [src] to dispense [flavour_name] flavoured ice cream.") + src.visible_message(span_notice("[usr] sets [src] to dispense [flavour_name] flavoured ice cream.")) if(href_list["cone"]) var/dispense_cone = text2num(href_list["cone"]) @@ -184,9 +184,9 @@ product_types[dispense_cone] -= 1 var/obj/item/reagent_containers/food/snacks/icecream/I = new(src.loc) I.set_cone_type(cone_name) - src.visible_message("[usr] dispenses a crunchy [cone_name] cone from [src].") + src.visible_message(span_info("[usr] dispenses a crunchy [cone_name] cone from [src].")) else - to_chat(usr, "There are no [cone_name] cones left!") + to_chat(usr, span_warning("There are no [cone_name] cones left!")) if(href_list["make"]) var/amount = (text2num(href_list["amount"])) diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 933fc19e8..77c64bbb8 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -55,20 +55,20 @@ /obj/machinery/microwave/examine(mob/user) . = ..() if(!operating) - . += "Alt-click [src] to turn it on." + . += span_notice("Alt-click [src] to turn it on.") if(!in_range(user, src) && !issilicon(user) && !isobserver(user)) - . += "You're too far away to examine [src]'s contents and display!" + . += span_warning("You're too far away to examine [src]'s contents and display!") return if(operating) - . += "\The [src] is operating." + . += span_notice("\The [src] is operating.") return if(length(ingredients)) if(issilicon(user)) - . += "\The [src] camera shows:" + . += span_notice("\The [src] camera shows:") else - . += "\The [src] contains:" + . += span_notice("\The [src] contains:") var/list/items_counts = new for(var/i in ingredients) if(istype(i, /obj/item/stack)) @@ -78,14 +78,14 @@ var/atom/movable/AM = i items_counts[AM.name]++ for(var/O in items_counts) - . += "- [items_counts[O]]x [O]." + . += span_notice("- [items_counts[O]]x [O].") else - . += "\The [src] is empty." + . += span_notice("\The [src] is empty.") if(!(stat & (NOPOWER|BROKEN))) . += "The status display reads:\n"+\ "- Capacity: [max_n_of_items] items.\n"+\ - "- Cook time reduced by [(efficiency - 1) * 25]%." + span_notice("- Cook time reduced by [(efficiency - 1) * 25]%.") /obj/machinery/microwave/update_icon() if(broken) @@ -118,19 +118,19 @@ if(broken > 0) if(broken == 2 && O.tool_behaviour == TOOL_WIRECUTTER) // If it's broken and they're using a screwdriver - user.visible_message("[user] starts to fix part of \the [src].", "I start to fix part of \the [src]...") + user.visible_message(span_notice("[user] starts to fix part of \the [src]."), span_notice("I start to fix part of \the [src]...")) if(O.use_tool(src, user, 20)) - user.visible_message("[user] fixes part of \the [src].", "I fix part of \the [src].") + user.visible_message(span_notice("[user] fixes part of \the [src]."), span_notice("I fix part of \the [src].")) broken = 1 // Fix it a bit else if(broken == 1 && O.tool_behaviour == TOOL_WELDER) // If it's broken and they're doing the wrench - user.visible_message("[user] starts to fix part of \the [src].", "I start to fix part of \the [src]...") + user.visible_message(span_notice("[user] starts to fix part of \the [src]."), span_notice("I start to fix part of \the [src]...")) if(O.use_tool(src, user, 20)) - user.visible_message("[user] fixes \the [src].", "I fix \the [src].") + user.visible_message(span_notice("[user] fixes \the [src]."), span_notice("I fix \the [src].")) broken = 0 update_icon() return FALSE //to use some fuel else - to_chat(user, "It's broken!") + to_chat(user, span_warning("It's broken!")) return TRUE return @@ -139,24 +139,24 @@ if(clean_spray.reagents.has_reagent(/datum/reagent/space_cleaner, clean_spray.amount_per_transfer_from_this)) clean_spray.reagents.remove_reagent(/datum/reagent/space_cleaner, clean_spray.amount_per_transfer_from_this,1) playsound(loc, 'sound/blank.ogg', 50, TRUE, -6) - user.visible_message("[user] has cleaned \the [src].", "I clean \the [src].") + user.visible_message(span_notice("[user] has cleaned \the [src]."), span_notice("I clean \the [src].")) dirty = 0 update_icon() else - to_chat(user, "I need more space cleaner!") + to_chat(user, span_warning("I need more space cleaner!")) return TRUE if(istype(O, /obj/item/soap)) var/obj/item/soap/P = O - user.visible_message("[user] starts to clean \the [src].", "I start to clean \the [src]...") + user.visible_message(span_notice("[user] starts to clean \the [src]."), span_notice("I start to clean \the [src]...")) if(do_after(user, P.cleanspeed, target = src)) - user.visible_message("[user] has cleaned \the [src].", "I clean \the [src].") + user.visible_message(span_notice("[user] has cleaned \the [src]."), span_notice("I clean \the [src].")) dirty = 0 update_icon() return TRUE if(dirty == 100) // The microwave is all dirty so can't be used! - to_chat(user, "\The [src] is dirty!") + to_chat(user, span_warning("\The [src] is dirty!")) return TRUE if(istype(O, /obj/item/storage/bag/tray)) @@ -164,25 +164,25 @@ var/loaded = 0 for(var/obj/item/reagent_containers/food/snacks/S in T.contents) if(ingredients.len >= max_n_of_items) - to_chat(user, "\The [src] is full, you can't put anything in!") + to_chat(user, span_warning("\The [src] is full, you can't put anything in!")) return TRUE if(SEND_SIGNAL(T, COMSIG_TRY_STORAGE_TAKE, S, src)) loaded++ ingredients += S if(loaded) - to_chat(user, "I insert [loaded] items into \the [src].") + to_chat(user, span_notice("I insert [loaded] items into \the [src].")) return if(O.w_class <= WEIGHT_CLASS_NORMAL && !istype(O, /obj/item/storage) && user.used_intent.type == INTENT_HELP) if(ingredients.len >= max_n_of_items) - to_chat(user, "\The [src] is full, you can't put anything in!") + to_chat(user, span_warning("\The [src] is full, you can't put anything in!")) return TRUE if(!user.transferItemToLoc(O, src)) - to_chat(user, "\The [O] is stuck to your hand!") + to_chat(user, span_warning("\The [O] is stuck to your hand!")) return FALSE ingredients += O - user.visible_message("[user] has added \a [O] to \the [src].", "I add [O] to \the [src].") + user.visible_message(span_notice("[user] has added \a [O] to \the [src]."), span_notice("I add [O] to \the [src].")) return ..() @@ -203,7 +203,7 @@ if(isAI(user)) examine(user) else - to_chat(user, "\The [src] is empty.") + to_chat(user, span_warning("\The [src] is empty.")) return var/choice = show_radial_menu(user, src, isAI(user) ? ai_radial_options : radial_options, require_near = !issilicon(user)) @@ -253,7 +253,7 @@ start() /obj/machinery/microwave/proc/turn_on() - visible_message("\The [src] turns on.", null, "I hear a microwave humming.") + visible_message(span_notice("\The [src] turns on."), null, span_hear("I hear a microwave humming.")) operating = TRUE set_light(1.5) @@ -261,7 +261,7 @@ update_icon() /obj/machinery/microwave/proc/spark() - visible_message("Sparks fly around [src]!") + visible_message(span_warning("Sparks fly around [src]!")) var/datum/effect_system/spark_spread/s = new s.set_up(2, 1, src) s.start() @@ -334,7 +334,7 @@ loop(MICROWAVE_NORMAL, 10) /obj/machinery/microwave/proc/muck_finish() - visible_message("\The [src] gets covered in muck!") + visible_message(span_warning("\The [src] gets covered in muck!")) dirty = 100 dirty_anim_playing = FALSE diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index 332c61be1..fa583447c 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -38,7 +38,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) /obj/machinery/monkey_recycler/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Producing [cube_production] cubes for every monkey inserted." + . += span_notice("The status display reads: Producing [cube_production] cubes for every monkey inserted.") /obj/machinery/monkey_recycler/attackby(obj/item/O, mob/user, params) if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", O)) @@ -69,35 +69,35 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) if(!istype(target)) return if(target.stat == CONSCIOUS) - to_chat(user, "The monkey is struggling far too much to put it in the recycler.") + to_chat(user, span_warning("The monkey is struggling far too much to put it in the recycler.")) return if(target.buckled || target.has_buckled_mobs()) - to_chat(user, "The monkey is attached to something.") + to_chat(user, span_warning("The monkey is attached to something.")) return qdel(target) - to_chat(user, "I stuff the monkey into the machine.") + to_chat(user, span_notice("I stuff the monkey into the machine.")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) var/offset = prob(50) ? -2 : 2 animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking use_power(500) stored_matter += cube_production addtimer(VARSET_CALLBACK(src, pixel_x, initial(pixel_x))) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), user, "The machine now has [stored_matter] monkey\s worth of material stored.")) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), user, span_notice("The machine now has [stored_matter] monkey\s worth of material stored."))) /obj/machinery/monkey_recycler/interact(mob/user) if(stored_matter >= 1) - to_chat(user, "The machine hisses loudly as it condenses the ground monkey meat. After a moment, it dispenses a brand new monkey cube.") + to_chat(user, span_notice("The machine hisses loudly as it condenses the ground monkey meat. After a moment, it dispenses a brand new monkey cube.")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) for(var/i in 1 to FLOOR(stored_matter, 1)) new /obj/item/reagent_containers/food/snacks/monkeycube(src.loc) stored_matter-- - to_chat(user, "The machine's display flashes that it has [stored_matter] monkeys worth of material left.") + to_chat(user, span_notice("The machine's display flashes that it has [stored_matter] monkeys worth of material left.")) else - to_chat(user, "The machine needs at least 1 monkey worth of material to produce a monkey cube. It currently has [stored_matter].") + to_chat(user, span_danger("The machine needs at least 1 monkey worth of material to produce a monkey cube. It currently has [stored_matter].")) /obj/machinery/monkey_recycler/multitool_act(mob/living/user, obj/item/multitool/I) . = ..() if(istype(I)) - to_chat(user, "I log [src] in the multitool's buffer.") + to_chat(user, span_notice("I log [src] in the multitool's buffer.")) I.buffer = src return TRUE diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 68acc37a2..ed4e43708 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -24,7 +24,7 @@ /obj/machinery/processor/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Outputting [rating_amount] item(s) at [rating_speed*100]% speed." + . += span_notice("The status display reads: Outputting [rating_amount] item(s) at [rating_speed*100]% speed.") /obj/machinery/processor/proc/process_food(datum/food_processor_process/recipe, atom/movable/what) if (recipe.output && loc && !QDELETED(src)) @@ -45,7 +45,7 @@ /obj/machinery/processor/attackby(obj/item/O, mob/user, params) if(processing) - to_chat(user, "[src] is in the process of processing!") + to_chat(user, span_warning("[src] is in the process of processing!")) return TRUE if(default_deconstruction_screwdriver(user, "processor", "processor1", O)) return @@ -69,42 +69,42 @@ loaded++ if(loaded) - to_chat(user, "I insert [loaded] items into [src].") + to_chat(user, span_notice("I insert [loaded] items into [src].")) return var/datum/food_processor_process/P = select_recipe(O) if(P) - user.visible_message("[user] put [O] into [src].", \ - "I put [O] into [src].") + user.visible_message(span_notice("[user] put [O] into [src]."), \ + span_notice("I put [O] into [src].")) user.transferItemToLoc(O, src, TRUE) return 1 else if(user.used_intent.type != INTENT_HARM) - to_chat(user, "That probably won't blend!") + to_chat(user, span_warning("That probably won't blend!")) return 1 else return ..() /obj/machinery/processor/interact(mob/user) if(processing) - to_chat(user, "[src] is in the process of processing!") + to_chat(user, span_warning("[src] is in the process of processing!")) return TRUE if(user.used_intent.type == INTENT_GRAB && ismob(user.pulling) && select_recipe(user.pulling)) if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, "I need a better grip to do that!") + to_chat(user, span_warning("I need a better grip to do that!")) return var/mob/living/pushed_mob = user.pulling - visible_message("[user] stuffs [pushed_mob] into [src]!") + visible_message(span_warning("[user] stuffs [pushed_mob] into [src]!")) pushed_mob.forceMove(src) user.stop_pulling() return if(contents.len == 0) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return TRUE processing = TRUE - user.visible_message("[user] turns on [src].", \ - "I turn on [src].", \ - "I hear a food processor.") + user.visible_message(span_notice("[user] turns on [src]."), \ + span_notice("I turn on [src]."), \ + span_hear("I hear a food processor.")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) use_power(500) var/total_time = 0 @@ -125,7 +125,7 @@ process_food(P, O) pixel_x = initial(pixel_x) //return to its spot after shaking processing = FALSE - visible_message("\The [src] finishes processing.") + visible_message(span_notice("\The [src] finishes processing.")) /obj/machinery/processor/verb/eject() set hidden = 1 @@ -142,7 +142,7 @@ /obj/machinery/processor/container_resist(mob/living/user) user.forceMove(drop_location()) - user.visible_message("[user] crawls free of the processor!") + user.visible_message(span_notice("[user] crawls free of the processor!")) /obj/machinery/processor/proc/empty() for (var/obj/O in src) @@ -190,7 +190,7 @@ if (!P) return - visible_message("[picked_slime] is sucked into [src].") + visible_message(span_notice("[picked_slime] is sucked into [src].")) picked_slime.forceMove(src) /obj/machinery/processor/slime/process_food(datum/food_processor_process/recipe, atom/movable/what) @@ -199,7 +199,7 @@ var/C = S.cores if(S.stat != DEAD) S.forceMove(drop_location()) - S.visible_message("[C] crawls free of the processor!") + S.visible_message(span_notice("[C] crawls free of the processor!")) return for(var/i in 1 to (C+rating_amount-1)) var/atom/movable/item = new S.coretype(drop_location()) diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 67a1b29da..5225cca55 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -39,7 +39,7 @@ /obj/machinery/smartfridge/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: This unit can hold a maximum of [max_n_of_items] items." + . += span_notice("The status display reads: This unit can hold a maximum of [max_n_of_items] items.") /obj/machinery/smartfridge/update_icon() if(!stat) @@ -86,12 +86,12 @@ if(!stat) if(contents.len >= max_n_of_items) - to_chat(user, "\The [src] is full!") + to_chat(user, span_warning("\The [src] is full!")) return FALSE if(accept_check(O)) load(O) - user.visible_message("[user] has added \the [O] to \the [src].", "I add \the [O] to \the [src].") + user.visible_message(span_notice("[user] has added \the [O] to \the [src]."), span_notice("I add \the [O] to \the [src].")) updateUsrDialog() if (visible_contents) update_icon() @@ -110,22 +110,22 @@ if(loaded) if(contents.len >= max_n_of_items) - user.visible_message("[user] loads \the [src] with \the [O].", \ - "I fill \the [src] with \the [O].") + user.visible_message(span_notice("[user] loads \the [src] with \the [O]."), \ + span_notice("I fill \the [src] with \the [O].")) else - user.visible_message("[user] loads \the [src] with \the [O].", \ - "I load \the [src] with \the [O].") + user.visible_message(span_notice("[user] loads \the [src] with \the [O]."), \ + span_notice("I load \the [src] with \the [O].")) if(O.contents.len > 0) - to_chat(user, "Some items are refused.") + to_chat(user, span_warning("Some items are refused.")) if (visible_contents) update_icon() return TRUE else - to_chat(user, "There is nothing in [O] to put in [src]!") + to_chat(user, span_warning("There is nothing in [O] to put in [src]!")) return FALSE if(user.used_intent.type != INTENT_HARM) - to_chat(user, "\The [src] smartly refuses [O].") + to_chat(user, span_warning("\The [src] smartly refuses [O].")) updateUsrDialog() return FALSE else @@ -142,7 +142,7 @@ if(ismob(O.loc)) var/mob/M = O.loc if(!M.transferItemToLoc(O, src)) - to_chat(usr, "\the [O] is stuck to your hand, you cannot put it in \the [src]!") + to_chat(usr, span_warning("\the [O] is stuck to your hand, you cannot put it in \the [src]!")) return FALSE else return TRUE @@ -198,7 +198,7 @@ var/desired = 0 if(!allow_ai_retrieve && isAI(usr)) - to_chat(usr, "[src] does not seem to be configured to respect your authority!") + to_chat(usr, span_warning("[src] does not seem to be configured to respect your authority!")) return if (params["amount"]) diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm index fff198c4d..a593ccf5a 100644 --- a/code/modules/food_and_drinks/pizzabox.dm +++ b/code/modules/food_and_drinks/pizzabox.dm @@ -101,7 +101,7 @@ return open = !open if(open && !bomb_defused) - audible_message("[icon2html(src, hearers(src))] *beep*") + audible_message(span_warning("[icon2html(src, hearers(src))] *beep*")) bomb_active = TRUE START_PROCESSING(SSobj, src) update_icon() @@ -113,13 +113,13 @@ if(open) if(pizza) user.put_in_hands(pizza) - to_chat(user, "I take [pizza] out of [src].") + to_chat(user, span_notice("I take [pizza] out of [src].")) pizza = null update_icon() else if(bomb) if(wires.is_all_cut() && bomb_defused) user.put_in_hands(bomb) - to_chat(user, "I carefully remove the [bomb] from [src].") + to_chat(user, span_notice("I carefully remove the [bomb] from [src].")) bomb = null update_icon() return @@ -135,13 +135,13 @@ log_bomber(user, "has trapped a", src, "with [bomb] set to [bomb_timer * 2] seconds") bomb.adminlog = "The [bomb.name] in [src.name] that [key_name(user)] activated has detonated!" - to_chat(user, "I trap [src] with [bomb].") + to_chat(user, span_warning("I trap [src] with [bomb].")) update_icon() else if(boxes.len) var/obj/item/pizzabox/topbox = boxes[boxes.len] boxes -= topbox user.put_in_hands(topbox) - to_chat(user, "I remove the topmost [name] from the stack.") + to_chat(user, span_notice("I remove the topmost [name] from the stack.")) topbox.update_icon() update_icon() user.regenerate_icons() @@ -157,28 +157,28 @@ return boxes += add newbox.boxes.Cut() - to_chat(user, "I put [newbox] on top of [src]!") + to_chat(user, span_notice("I put [newbox] on top of [src]!")) newbox.update_icon() update_icon() user.regenerate_icons() if(boxes.len >= 5) if(prob(10 * boxes.len)) - to_chat(user, "I can't keep holding the stack!") + to_chat(user, span_danger("I can't keep holding the stack!")) disperse_pizzas() else - to_chat(user, "The stack is getting a little high...") + to_chat(user, span_warning("The stack is getting a little high...")) return else - to_chat(user, "Close [open ? src : newbox] first!") + to_chat(user, span_notice("Close [open ? src : newbox] first!")) else if(istype(I, /obj/item/reagent_containers/food/snacks/pizza) || istype(I, /obj/item/reagent_containers/food/snacks/customizable/pizza)) if(open) if(pizza) - to_chat(user, "[src] already has \a [pizza.name]!") + to_chat(user, span_warning("[src] already has \a [pizza.name]!")) return if(!user.transferItemToLoc(I, src)) return pizza = I - to_chat(user, "I put [I] in [src].") + to_chat(user, span_notice("I put [I] in [src].")) update_icon() return else if(istype(I, /obj/item/bombcore/miniature/pizza)) @@ -187,28 +187,28 @@ return wires = new /datum/wires/explosive/pizza(src) bomb = I - to_chat(user, "I put [I] in [src]. Sneeki breeki...") + to_chat(user, span_notice("I put [I] in [src]. Sneeki breeki...")) update_icon() return else if(bomb) - to_chat(user, "[src] already has a bomb in it!") + to_chat(user, span_warning("[src] already has a bomb in it!")) else if(istype(I, /obj/item/pen)) if(!open) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on [src]!") + to_chat(user, span_notice("I scribble illegibly on [src]!")) return var/obj/item/pizzabox/box = boxes.len ? boxes[boxes.len] : src box.boxtag += stripped_input(user, "Write on [box]'s tag:", box, "", 30) if(!user.canUseTopic(src, BE_CLOSE)) return - to_chat(user, "I write with [I] on [src].") + to_chat(user, span_notice("I write with [I] on [src].")) update_icon() return else if(is_wire_tool(I)) if(wires && bomb) wires.interact(user) else if(istype(I, /obj/item/reagent_containers/food)) - to_chat(user, "That's not a pizza!") + to_chat(user, span_warning("That's not a pizza!")) ..() /obj/item/pizzabox/process() @@ -237,7 +237,7 @@ disperse_pizzas() /obj/item/pizzabox/proc/disperse_pizzas() - visible_message("The pizzas fall everywhere!") + visible_message(span_warning("The pizzas fall everywhere!")) for(var/V in boxes) var/obj/item/pizzabox/P = V var/fall_dir = pick(GLOB.alldirs) @@ -322,7 +322,7 @@ /obj/item/pizzabox/infinite/examine(mob/user) . = ..() if(isobserver(user)) - . += "This pizza box is anomalous, and will produce infinite pizza." + . += span_deadsay("This pizza box is anomalous, and will produce infinite pizza.") /obj/item/pizzabox/infinite/attack_self(mob/living/user) QDEL_NULL(pizza) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 790351b52..58d400462 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -537,7 +537,7 @@ id = /datum/reagent/consumable/ethanol/bacchus_blessing results = list(/datum/reagent/consumable/ethanol/bacchus_blessing = 4) required_reagents = list(/datum/reagent/consumable/ethanol/hooch = 1, /datum/reagent/consumable/ethanol/absinthe = 1, /datum/reagent/consumable/ethanol/manly_dorf = 1, /datum/reagent/consumable/ethanol/syndicatebomb = 1) - mix_message = "The mixture turns to a sickening froth." + mix_message = span_warning("The mixture turns to a sickening froth.") /datum/chemical_reaction/lemonade name = "Lemonade" diff --git a/code/modules/games/cas.dm b/code/modules/games/cas.dm index 9f774439c..91ebdbaa6 100644 --- a/code/modules/games/cas.dm +++ b/code/modules/games/cas.dm @@ -63,7 +63,7 @@ if(!(L.mobility_flags & MOBILITY_PICKUP)) return if(cards.len == 0) - to_chat(user, "There are no more cards to draw!") + to_chat(user, span_warning("There are no more cards to draw!")) return var/obj/item/toy/cards/singlecard/cas/H = new/obj/item/toy/cards/singlecard/cas(user.loc) var/datum/playingcard/choice = cards[1] @@ -77,21 +77,21 @@ src.cards -= choice H.pickup(user) user.put_in_hands(H) - user.visible_message("[user] draws a card from the deck.", "I draw a card from the deck.") + user.visible_message(span_notice("[user] draws a card from the deck."), span_notice("I draw a card from the deck.")) update_icon() /obj/item/toy/cards/deck/cas/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/toy/cards/singlecard/cas)) var/obj/item/toy/cards/singlecard/cas/SC = I if(!user.temporarilyRemoveItemFromInventory(SC)) - to_chat(user, "The card is stuck to your hand, you can't add it to the deck!") + to_chat(user, span_warning("The card is stuck to your hand, you can't add it to the deck!")) return var/datum/playingcard/RC // replace null datum for the re-added card RC = new() RC.name = "[SC.name]" RC.card_icon = SC.card_face cards += RC - user.visible_message("[user] adds a card to the bottom of the deck.","I add the card to the bottom of the deck.") + user.visible_message(span_notice("[user] adds a card to the bottom of the deck."),span_notice("I add the card to the bottom of the deck.")) qdel(SC) update_icon() @@ -111,12 +111,12 @@ /obj/item/toy/cards/singlecard/cas/examine(mob/user) . = ..() if (flipped) - . += "The card is face down." + . += span_notice("The card is face down.") else if (blank) - . += "The card is blank. Write on it with a pen." + . += span_notice("The card is blank. Write on it with a pen.") else - . += "The card reads: [name]" - . += "Alt-click to flip it." + . += span_notice("The card reads: [name]") + . += span_notice("Alt-click to flip it.") /obj/item/toy/cards/singlecard/cas/Flip() set name = "Flip Card" @@ -145,10 +145,10 @@ /obj/item/toy/cards/singlecard/cas/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/pen)) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on [src]!") + to_chat(user, span_notice("I scribble illegibly on [src]!")) return if(!blank) - to_chat(user, "I cannot write on that card!") + to_chat(user, span_warning("I cannot write on that card!")) return var/cardtext = stripped_input(user, "What do you wish to write on the card?", "Card Writing", "", 50) if(!cardtext || !user.canUseTopic(src, BE_CLOSE)) diff --git a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm index d0df14277..ddfd0d3f4 100644 --- a/code/modules/goonchat/browserOutput.dm +++ b/code/modules/goonchat/browserOutput.dm @@ -130,7 +130,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("tmp/iconCache.sav")) //Cache of ico regexes["show_filtered_ic_chat"] = list( config.ic_filter_regex.name, "ig", - "$1" + span_boldwarning("$1") ) if (regexes.len) diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 5553897b7..a69ed4d07 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -134,7 +134,7 @@ /obj/item/reagent_containers/food/snacks/egg/attack_self(mob/user) ..() if(containsPrize) - to_chat(user, "I unwrap [src] and find a prize inside!") + to_chat(user, span_notice("I unwrap [src] and find a prize inside!")) dispensePrize(get_turf(user)) containsPrize = FALSE qdel(src) diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm index f41dcd0c7..99664ead0 100644 --- a/code/modules/holiday/halloween.dm +++ b/code/modules/holiday/halloween.dm @@ -70,19 +70,19 @@ return else if(trapped == SPOOKY_SKELETON) - visible_message("BOO!") + visible_message(span_userdanger("BOO!")) playsound(loc, 'sound/spookoween/girlscream.ogg', 300, TRUE) trapped = 0 QDEL_IN(trapped_mob, 90) else if(trapped == HOWLING_GHOST) - visible_message("[pick("OooOOooooOOOoOoOOooooOOOOO", "BooOOooOooooOOOO", "BOO!", "WoOOoOoooOooo")]") + visible_message(span_userdanger("[pick("OooOOooooOOOoOoOOooooOOOOO", "BooOOooOooooOOOO", "BOO!", "WoOOoOoooOooo")]")) playsound(loc, 'sound/spookoween/ghosty_wind.ogg', 300, TRUE) new /mob/living/simple_animal/shade/howling_ghost(loc) trapped = 0 else if(trapped == SCARY_BATS) - visible_message("Protect your hair!") + visible_message(span_userdanger("Protect your hair!")) playsound(loc, 'sound/spookoween/bats.ogg', 300, TRUE) var/number = rand(1,3) for(var/i=0,i < number,i++) @@ -90,15 +90,15 @@ trapped = 0 else if(trapped == ANGRY_FAITHLESS) - visible_message("The closet bursts open!") - visible_message("THIS BEING RADIATES PURE EVIL! YOU BETTER RUN!!!") + visible_message(span_userdanger("The closet bursts open!")) + visible_message(span_userdanger("THIS BEING RADIATES PURE EVIL! YOU BETTER RUN!!!")) playsound(loc, 'sound/hallucinations/wail.ogg', 300, TRUE) var/mob/living/simple_animal/hostile/faithless/F = new(loc) trapped = 0 QDEL_IN(F, 120) else if(trapped == INSANE_CLOWN) - visible_message("...") + visible_message(span_userdanger("...")) playsound(loc, 'sound/spookoween/scary_clown_appear.ogg', 300, TRUE) spawn_atom_to_turf(/mob/living/simple_animal/hostile/clown_insane, loc, 1, FALSE) trapped = 0 @@ -250,11 +250,11 @@ /mob/living/simple_animal/hostile/clown_insane/attackby(obj/item/O, mob/user) if(istype(O, /obj/item/nullrod)) if(prob(5)) - visible_message("[src] finally found the peace it deserves. You hear honks echoing off into the distance.") + visible_message(span_notice("[src] finally found the peace it deserves. You hear honks echoing off into the distance.")) playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, TRUE) qdel(src) else - visible_message("[src] seems to be resisting the effect!") + visible_message(span_danger("[src] seems to be resisting the effect!")) return return ..() diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index 206c41c99..2697f5b44 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -170,7 +170,7 @@ return playsound(src, "sparks", 75, TRUE) obj_flags |= EMAGGED - to_chat(user, "I vastly increase projector power and override the safety and security protocols.") + to_chat(user, span_warning("I vastly increase projector power and override the safety and security protocols.")) say("Warning. Automatic shutoff and derezzing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator.") log_game("[key_name(user)] emagged the Holodeck Control Console") nerf(!(obj_flags & EMAGGED)) @@ -301,7 +301,7 @@ silent = FALSE // otherwise make sure they are dropped if(!silent) - visible_message("[O] fades away!") + visible_message(span_notice("[O] fades away!")) qdel(O) #undef HOLODECK_CD diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index ffa90b51a..beffbb6d4 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -55,14 +55,14 @@ w_class = WEIGHT_CLASS_BULKY hitsound = 'sound/blank.ogg' playsound(user, 'sound/blank.ogg', 20, TRUE) - to_chat(user, "[src] is now active.") + to_chat(user, span_notice("[src] is now active.")) else force = 3 icon_state = "sword0" w_class = WEIGHT_CLASS_SMALL hitsound = "swing_hit" playsound(user, 'sound/blank.ogg', 20, TRUE) - to_chat(user, "[src] can now be concealed.") + to_chat(user, span_notice("[src] can now be concealed.")) return //BASKETBALL OBJECTS @@ -89,7 +89,7 @@ M.apply_damage(10, STAMINA) if(prob(5)) M.Paralyze(60) - visible_message("[M] is knocked right off [M.p_their()] feet!") + visible_message(span_danger("[M] is knocked right off [M.p_their()] feet!")) // // Structures @@ -106,7 +106,7 @@ /obj/structure/holohoop/attackby(obj/item/W as obj, mob/user as mob, params) if(get_dist(src,user)<2) if(user.transferItemToLoc(W, drop_location())) - visible_message("[user] dunks [W] into \the [src]!") + visible_message(span_warning("[user] dunks [W] into \the [src]!")) /obj/structure/holohoop/attack_hand(mob/user) . = ..() @@ -115,11 +115,11 @@ if(user.pulling && user.used_intent.type == INTENT_GRAB && isliving(user.pulling)) var/mob/living/L = user.pulling if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, "I need a better grip to do that!") + to_chat(user, span_warning("I need a better grip to do that!")) return L.forceMove(loc) L.Paralyze(100) - visible_message("[user] dunks [L] into \the [src]!") + visible_message(span_danger("[user] dunks [L] into \the [src]!")) user.stop_pulling() else ..() @@ -128,10 +128,10 @@ if (isitem(AM) && !istype(AM,/obj/projectile)) if(prob(50)) AM.forceMove(get_turf(src)) - visible_message("Swish! [AM] lands in [src].") + visible_message(span_warning("Swish! [AM] lands in [src].")) return else - visible_message("[AM] bounces off of [src]'s rim!") + visible_message(span_danger("[AM] bounces off of [src]'s rim!")) return ..() else return ..() @@ -157,22 +157,22 @@ power_channel = ENVIRON /obj/machinery/readybutton/attack_ai(mob/user as mob) - to_chat(user, "The station AI is not to interact with these devices!") + to_chat(user, span_warning("The station AI is not to interact with these devices!")) return /obj/machinery/readybutton/attack_paw(mob/user as mob) - to_chat(user, "I are too primitive to use this device!") + to_chat(user, span_warning("I are too primitive to use this device!")) return /obj/machinery/readybutton/attackby(obj/item/W as obj, mob/user as mob, params) - to_chat(user, "The device is a solid button, there's nothing you can do with it!") + to_chat(user, span_warning("The device is a solid button, there's nothing you can do with it!")) /obj/machinery/readybutton/attack_hand(mob/user as mob) . = ..() if(.) return if(user.stat || stat & (NOPOWER|BROKEN)) - to_chat(user, "This device is not powered!") + to_chat(user, span_warning("This device is not powered!")) return currentarea = get_area(src.loc) @@ -180,7 +180,7 @@ qdel(src) if(eventstarted) - to_chat(usr, "The event has already begun!") + to_chat(usr, span_warning("The event has already begun!")) return ready = !ready @@ -212,7 +212,7 @@ qdel(W) for(var/mob/M in currentarea) - to_chat(M, "FIGHT!") + to_chat(M, span_danger("FIGHT!")) /obj/machinery/conveyor/holodeck diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index 250fd1658..8d263b067 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -126,34 +126,34 @@ . = ..() if(!queen_bee) - . += "There is no queen bee! There won't bee any honeycomb without a queen!" + . += span_warning("There is no queen bee! There won't bee any honeycomb without a queen!") var/half_bee = get_max_bees()*0.5 if(half_bee && (bees.len >= half_bee)) - . += "This place is aBUZZ with activity... there are lots of bees!" + . += span_notice("This place is aBUZZ with activity... there are lots of bees!") - . += "[bee_resources]/100 resource supply." - . += "[bee_resources]% towards a new honeycomb." - . += "[bee_resources*2]% towards a new bee." + . += span_notice("[bee_resources]/100 resource supply.") + . += span_notice("[bee_resources]% towards a new honeycomb.") + . += span_notice("[bee_resources*2]% towards a new bee.") if(honeycombs.len) var/plural = honeycombs.len > 1 - . += "There [plural? "are" : "is"] [honeycombs.len] uncollected honeycomb[plural ? "s":""] in the apiary." + . += span_notice("There [plural? "are" : "is"] [honeycombs.len] uncollected honeycomb[plural ? "s":""] in the apiary.") if(honeycombs.len >= get_max_honeycomb()) - . += "There's no room for more honeycomb!" + . += span_warning("There's no room for more honeycomb!") /obj/structure/beebox/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/honey_frame)) var/obj/item/honey_frame/HF = I if(honey_frames.len < BEEBOX_MAX_FRAMES) - visible_message("[user] adds a frame to the apiary.") + visible_message(span_notice("[user] adds a frame to the apiary.")) if(!user.transferItemToLoc(HF, src)) return honey_frames += HF else - to_chat(user, "There's no room for any more frames in the apiary!") + to_chat(user, span_warning("There's no room for any more frames in the apiary!")) return if(I.tool_behaviour == TOOL_WRENCH) @@ -162,7 +162,7 @@ if(istype(I, /obj/item/queen_bee)) if(queen_bee) - to_chat(user, "This hive already has a queen!") + to_chat(user, span_warning("This hive already has a queen!")) return var/obj/item/queen_bee/qb = I @@ -174,7 +174,7 @@ qb.queen = null if(queen_bee) - visible_message("[user] sets [qb] down inside the apiary, making it their new home.") + visible_message(span_notice("[user] sets [qb] down inside the apiary, making it their new home.")) var/relocated = 0 for(var/b in bees) var/mob/living/simple_animal/hostile/poison/bees/B = b @@ -185,10 +185,10 @@ B.forceMove(drop_location()) relocated++ if(relocated) - to_chat(user, "This queen has a different reagent to some of the bees who live here, those bees will not return to this apiary!") + to_chat(user, span_warning("This queen has a different reagent to some of the bees who live here, those bees will not return to this apiary!")) else - to_chat(user, "The queen bee disappeared! Disappearing bees have been in the news lately...") + to_chat(user, span_warning("The queen bee disappeared! Disappearing bees have been in the news lately...")) qdel(qb) return @@ -209,9 +209,9 @@ B.target = user bees = TRUE if(bees) - visible_message("[user] disturbs the bees!") + visible_message(span_danger("[user] disturbs the bees!")) else - visible_message("[user] disturbs the [name] to no effect!") + visible_message(span_danger("[user] disturbs the [name] to no effect!")) else var/option = alert(user, "What action do you wish to perform?","Apiary","Remove a Honey Frame","Remove the Queen Bee", "Cancel") if(!Adjacent(user)) @@ -219,14 +219,14 @@ switch(option) if("Remove a Honey Frame") if(!honey_frames.len) - to_chat(user, "There are no honey frames to remove!") + to_chat(user, span_warning("There are no honey frames to remove!")) return var/obj/item/honey_frame/HF = pick_n_take(honey_frames) if(HF) if(!user.put_in_active_hand(HF)) HF.forceMove(drop_location()) - visible_message("[user] removes a frame from the apiary.") + visible_message(span_notice("[user] removes a frame from the apiary.")) var/amtH = HF.honeycomb_capacity var/fallen = 0 @@ -238,11 +238,11 @@ fallen++ if(fallen) var/multiple = fallen > 1 - visible_message("[user] scrapes [multiple ? "[fallen]" : "a"] honeycomb[multiple ? "s" : ""] off of the frame.") + visible_message(span_notice("[user] scrapes [multiple ? "[fallen]" : "a"] honeycomb[multiple ? "s" : ""] off of the frame.")) if("Remove the Queen Bee") if(!queen_bee || queen_bee.loc != src) - to_chat(user, "There is no queen bee to remove!") + to_chat(user, span_warning("There is no queen bee to remove!")) return var/obj/item/queen_bee/QB = new() queen_bee.forceMove(QB) @@ -251,7 +251,7 @@ QB.name = queen_bee.name if(!user.put_in_active_hand(QB)) QB.forceMove(drop_location()) - visible_message("[user] removes the queen from the apiary.") + visible_message(span_notice("[user] removes the queen from the apiary.")) queen_bee = null /obj/structure/beebox/deconstruct(disassembled = TRUE) diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 8b642f138..9a03ee929 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -55,7 +55,7 @@ /obj/machinery/biogenerator/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Productivity at [productivity*100]%.
Matter consumption reduced by [(efficiency*25)-25]%.
Machine can hold up to [max_items] pieces of produce.
" + . += span_notice("The status display reads: Productivity at [productivity*100]%.
Matter consumption reduced by [(efficiency*25)-25]%.
Machine can hold up to [max_items] pieces of produce.") /obj/machinery/biogenerator/on_reagent_change(changetype) //When the reagents change, change the icon as well. update_icon() @@ -76,7 +76,7 @@ return ..() if(processing) - to_chat(user, "The biogenerator is currently processing.") + to_chat(user, span_warning("The biogenerator is currently processing.")) return if(default_deconstruction_screwdriver(user, "biogen-empty-o", "biogen-empty", O)) @@ -94,16 +94,16 @@ . = 1 //no afterattack if(!panel_open) if(beaker) - to_chat(user, "A container is already loaded into the machine.") + to_chat(user, span_warning("A container is already loaded into the machine.")) else if(!user.transferItemToLoc(O, src)) return beaker = O - to_chat(user, "I add the container to the machine.") + to_chat(user, span_notice("I add the container to the machine.")) update_icon() updateUsrDialog() else - to_chat(user, "Close the maintenance panel first.") + to_chat(user, span_warning("Close the maintenance panel first.")) return else if(istype(O, /obj/item/storage/bag/plants)) @@ -112,7 +112,7 @@ for(var/obj/item/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= max_items) - to_chat(user, "The biogenerator is already full! Activate it.") + to_chat(user, span_warning("The biogenerator is already full! Activate it.")) else for(var/obj/item/reagent_containers/food/snacks/grown/G in PB.contents) if(i >= max_items) @@ -120,11 +120,11 @@ if(SEND_SIGNAL(PB, COMSIG_TRY_STORAGE_TAKE, G, src)) i++ if(iI empty the plant bag into the biogenerator.
") + to_chat(user, span_info("I empty the plant bag into the biogenerator.")) else if(PB.contents.len == 0) - to_chat(user, "I empty the plant bag into the biogenerator, filling it to its capacity.") + to_chat(user, span_info("I empty the plant bag into the biogenerator, filling it to its capacity.")) else - to_chat(user, "I fill the biogenerator to its capacity.") + to_chat(user, span_info("I fill the biogenerator to its capacity.")) return TRUE //no afterattack else if(istype(O, /obj/item/reagent_containers/food/snacks/grown)) @@ -132,15 +132,15 @@ for(var/obj/item/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= max_items) - to_chat(user, "The biogenerator is full! Activate it.") + to_chat(user, span_warning("The biogenerator is full! Activate it.")) else if(user.transferItemToLoc(O, src)) - to_chat(user, "I put [O.name] in [src.name]") + to_chat(user, span_info("I put [O.name] in [src.name]")) return TRUE //no afterattack else if (istype(O, /obj/item/disk/design_disk)) - user.visible_message("[user] begins to load \the [O] in \the [src]...", - "I begin to load a design from \the [O]...", - "I hear the chatter of a floppy drive.") + user.visible_message(span_notice("[user] begins to load \the [O] in \the [src]..."), + span_notice("I begin to load a design from \the [O]..."), + span_hear("I hear the chatter of a floppy drive.")) processing = TRUE var/obj/item/disk/design_disk/D = O if(do_after(user, 10, target = src)) @@ -150,7 +150,7 @@ processing = FALSE return TRUE else - to_chat(user, "I cannot put this in [src.name]!") + to_chat(user, span_warning("I cannot put this in [src.name]!")) /obj/machinery/biogenerator/ui_interact(mob/user) if(stat & BROKEN || panel_open) @@ -210,7 +210,7 @@ if (src.stat != NONE) //NOPOWER etc return if(processing) - to_chat(usr, "The biogenerator is in the process of working.") + to_chat(usr, span_warning("The biogenerator is in the process of working.")) return var/S = 0 for(var/obj/item/reagent_containers/food/snacks/grown/I in contents) diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm index b0335711a..4ab344561 100644 --- a/code/modules/hydroponics/fermenting_barrel.dm +++ b/code/modules/hydroponics/fermenting_barrel.dm @@ -25,7 +25,7 @@ /obj/structure/fermenting_barrel/examine(mob/user) . = ..() -// . += "It is currently [open?"open, letting you pour liquids in.":"closed, letting you draw liquids."]" +// . += span_notice("It is currently [open?"open, letting you pour liquids in.":"closed, letting you draw liquids."]") /obj/structure/fermenting_barrel/proc/makeWine(obj/item/reagent_containers/food/snacks/grown/fruit) if(fruit.reagents) @@ -41,12 +41,12 @@ var/obj/item/reagent_containers/food/snacks/grown/fruit = I if(istype(fruit)) if(!fruit.can_distill) - to_chat(user, "I can't ferment this into anything.") + to_chat(user, span_warning("I can't ferment this into anything.")) return TRUE else if(!user.transferItemToLoc(I,src)) - to_chat(user, "[I] is stuck to my hand!") + to_chat(user, span_warning("[I] is stuck to my hand!")) return TRUE - to_chat(user, "I place [I] into [src].") + to_chat(user, span_info("I place [I] into [src].")) addtimer(CALLBACK(src, PROC_REF(makeWine), fruit), rand(1 MINUTES, 3 MINUTES)) return TRUE ..() @@ -56,11 +56,11 @@ // if(open) // ENABLE_BITFIELD(reagents.flags, DRAINABLE) // ENABLE_BITFIELD(reagents.flags, REFILLABLE) -// to_chat(user, "I open [src].") +// to_chat(user, span_notice("I open [src].")) // else // DISABLE_BITFIELD(reagents.flags, DRAINABLE) // DISABLE_BITFIELD(reagents.flags, REFILLABLE) -// to_chat(user, "I close [src].") +// to_chat(user, span_notice("I close [src].")) // update_icon() /obj/structure/fermenting_barrel/update_icon() diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm index 4a1c35840..8a5d2473c 100644 --- a/code/modules/hydroponics/gene_modder.dm +++ b/code/modules/hydroponics/gene_modder.dm @@ -76,23 +76,23 @@ if(istype(I, /obj/item/seeds)) if (operation) - to_chat(user, "Please complete current operation.") + to_chat(user, span_notice("Please complete current operation.")) return if(!user.transferItemToLoc(I, src)) return eject_seed() insert_seed(I) - to_chat(user, "I add [I] to the machine.") + to_chat(user, span_notice("I add [I] to the machine.")) interact(user) else if(istype(I, /obj/item/disk/plantgene)) if (operation) - to_chat(user, "Please complete current operation.") + to_chat(user, span_notice("Please complete current operation.")) return if(!user.transferItemToLoc(I, src)) return eject_disk() disk = I - to_chat(user, "I add [I] to the machine.") + to_chat(user, span_notice("I add [I] to the machine.")) interact(user) else ..() @@ -128,7 +128,7 @@ dat += "[target.get_name()] gene from \the [seed]?
" if("extract") dat += "[target.get_name()] gene from \the [seed]?
" - dat += "The sample will be destroyed in process!" + dat += span_bad("The sample will be destroyed in process!") if(istype(target, /datum/plant_gene/core)) var/datum/plant_gene/core/gene = target if(istype(target, /datum/plant_gene/core/potency)) @@ -260,7 +260,7 @@ return eject_seed() insert_seed(I) - to_chat(usr, "I add [I] to the machine.") + to_chat(usr, span_notice("I add [I] to the machine.")) else eject_seed() else if(href_list["eject_disk"] && !operation) @@ -270,7 +270,7 @@ return eject_disk() disk = I - to_chat(usr, "I add [I] to the machine.") + to_chat(usr, span_notice("I add [I] to the machine.")) else eject_disk() else if(href_list["op"] == "insert" && disk && disk.gene && seed) @@ -443,10 +443,10 @@ /obj/item/disk/plantgene/attack_self(mob/user) read_only = !read_only - to_chat(user, "I flip the write-protect tab to [src.read_only ? "protected" : "unprotected"].") + to_chat(user, span_notice("I flip the write-protect tab to [src.read_only ? "protected" : "unprotected"].")) /obj/item/disk/plantgene/examine(mob/user) . = ..() if(gene && (istype(gene, /datum/plant_gene/core/potency))) - . += "Percent is relative to potency, not maximum volume of the plant." + . += span_notice("Percent is relative to potency, not maximum volume of the plant.") . += "The write-protect tab is set to [src.read_only ? "protected" : "unprotected"]." diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 16463a5bb..8c70923ce 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -28,7 +28,7 @@ if(W && isturf(loc)) if(seed && (user.used_intent.blade_class == BCLASS_BLUNT) && (!user.used_intent.noaa)) playsound(src,'sound/items/seedextract.ogg', 100, FALSE) - user.visible_message("[user] extracts the seeds.") + user.visible_message(span_info("[user] extracts the seeds.")) if(prob(5)) qdel(src) return @@ -49,7 +49,7 @@ if(prob(33)) if(istype(H)) if(eat_effect == /datum/status_effect/debuff/rotfood) - visible_message("[H] crushes [src] underfoot.") + visible_message(span_warning("[H] crushes [src] underfoot.")) qdel(src) /obj/item/reagent_containers/food/snacks/grown/Initialize(mapload, obj/item/seeds/new_seed) @@ -144,7 +144,7 @@ if(trash) generate_trash(T) - visible_message("[src] has been squashed.","I hear a smack.") + visible_message(span_warning("[src] has been squashed."),span_hear("I hear a smack.")) if(seed) for(var/datum/plant_gene/trait/trait in seed.genes) trait.on_squash(src, target) @@ -171,7 +171,7 @@ /obj/item/reagent_containers/food/snacks/grown/grind_requirements() if(dry_grind && !dry) - to_chat(usr, "[src] needs to be dry before it can be ground up!") + to_chat(usr, span_warning("[src] needs to be dry before it can be ground up!")) return return TRUE @@ -208,4 +208,4 @@ qdel(src) //put trash obj in hands or drop to ground user.put_in_hands(T, user.active_hand_index, TRUE) - to_chat(user, "I open [src]\'s shell, revealing \a [T].") + to_chat(user, span_notice("I open [src]\'s shell, revealing \a [T].")) diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm index fbeb7d0d1..ea818cdab 100644 --- a/code/modules/hydroponics/grown/apple.dm +++ b/code/modules/hydroponics/grown/apple.dm @@ -53,7 +53,7 @@ /obj/item/reagent_containers/food/snacks/grown/apple/blockproj(mob/living/carbon/human/H) testing("APPLEHITBEGIN") if(prob(98)) - H.visible_message("[H] is saved by the apple!") + H.visible_message(span_notice("[H] is saved by the apple!")) // playsound(get_turf(owner),'sound/blank.ogg', 100, TRUE) H.dropItemToGround(H.head) return 1 diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 842f26d20..8b9864ca5 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -28,7 +28,7 @@ distill_reagent = /datum/reagent/consumable/ethanol/bananahonk /obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user) - user.visible_message("[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) sleep(25) if(!user) @@ -55,7 +55,7 @@ throw_range = 7 /obj/item/grown/bananapeel/suicide_act(mob/user) - user.visible_message("[user] is deliberately slipping on [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is deliberately slipping on [src]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) return (BRUTELOSS) diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm index 4275bcf3d..bcbd58871 100644 --- a/code/modules/hydroponics/grown/cereals.dm +++ b/code/modules/hydroponics/grown/cereals.dm @@ -120,7 +120,7 @@ can_distill = FALSE /obj/item/reagent_containers/food/snacks/grown/meatwheat/attack_self(mob/living/user) - user.visible_message("[user] crushes [src] into meat.", "I crush [src] into something that resembles meat.") + user.visible_message(span_notice("[user] crushes [src] into meat."), span_notice("I crush [src] into something that resembles meat.")) playsound(user, 'sound/blank.ogg', 50, TRUE) var/obj/item/reagent_containers/food/snacks/meat/slab/meatwheat/M = new qdel(src) diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index 3ce232ebc..64cba8cc2 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -95,7 +95,7 @@ return held_mob.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT) if(prob(10)) - to_chat(held_mob, "My hand holding [src] burns!") + to_chat(held_mob, span_warning("My hand holding [src] burns!")) else held_mob = null ..() diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index 88ca8c794..19ac2ce10 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -114,7 +114,7 @@ wine_power = 70 /obj/item/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user) - user.visible_message("[user] primes [src]!", "I prime [src]!") + user.visible_message(span_warning("[user] primes [src]!"), span_danger("I prime [src]!")) log_bomber(user, "primed a", src, "for detonation") if(iscarbon(user)) var/mob/living/carbon/C = user diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm index cf32a01ff..ed26dc11a 100644 --- a/code/modules/hydroponics/grown/corn.dm +++ b/code/modules/hydroponics/grown/corn.dm @@ -50,7 +50,7 @@ /obj/item/grown/corncob/attackby(obj/item/grown/W, mob/user, params) if(W.get_sharpness()) - to_chat(user, "I use [W] to fashion a pipe out of the corn cob!") + to_chat(user, span_notice("I use [W] to fashion a pipe out of the corn cob!")) new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc) qdel(src) else @@ -85,7 +85,7 @@ /obj/item/grown/snapcorn/attack_self(mob/user) ..() - to_chat(user, "I pick a snap pop from the cob.") + to_chat(user, span_notice("I pick a snap pop from the cob.")) var/obj/item/toy/snappop/S = new /obj/item/toy/snappop(user.loc) if(ishuman(user)) user.put_in_hands(S) diff --git a/code/modules/hydroponics/grown/cotton.dm b/code/modules/hydroponics/grown/cotton.dm index e74e4b0e7..409fa0244 100644 --- a/code/modules/hydroponics/grown/cotton.dm +++ b/code/modules/hydroponics/grown/cotton.dm @@ -32,7 +32,7 @@ var/cotton_name = "raw cotton" /obj/item/grown/cotton/attack_self(mob/user) - user.show_message("I pull some [cotton_name] out of the [name]!", MSG_VISUAL) + user.show_message(span_notice("I pull some [cotton_name] out of the [name]!"), MSG_VISUAL) var/seed_modifier = 0 if(seed) seed_modifier = round(seed.potency / 25) @@ -42,7 +42,7 @@ if(ST != cotton && istype(ST, cotton_type) && ST.amount < ST.max_amount) ST.attackby(cotton, user) if(cotton.amount > old_cotton_amount) - to_chat(user, "I add the newly-formed [cotton_name] to the stack. It now contains [cotton.amount] [cotton_name].") + to_chat(user, span_notice("I add the newly-formed [cotton_name] to the stack. It now contains [cotton.amount] [cotton_name].")) qdel(src) //reinforced mutated variant diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 154044ec1..90de3e5a0 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -233,7 +233,7 @@ if(!..()) return if(isliving(M)) - to_chat(M, "I are lit on fire from the intense heat of the [name]!") + to_chat(M, span_danger("I are lit on fire from the intense heat of the [name]!")) M.adjust_fire_stacks(seed.potency / 20) if(M.IgniteMob()) message_admins("[ADMIN_LOOKUPFLW(user)] set [ADMIN_LOOKUPFLW(M)] on fire with [src] at [AREACOORD(user)]") @@ -246,11 +246,11 @@ if(force > 0) force -= rand(1, (force / 3) + 1) else - to_chat(usr, "All the petals have fallen off the [name] from violent whacking!") + to_chat(usr, span_warning("All the petals have fallen off the [name] from violent whacking!")) qdel(src) /obj/item/grown/novaflower/pickup(mob/living/carbon/human/user) ..() if(!user.gloves) - to_chat(user, "The [name] burns my bare hand!") + to_chat(user, span_danger("The [name] burns my bare hand!")) user.adjustFireLoss(rand(1, 5)) diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm index b4bc50401..d7d8580e5 100644 --- a/code/modules/hydroponics/grown/grass_carpet.dm +++ b/code/modules/hydroponics/grown/grass_carpet.dm @@ -30,7 +30,7 @@ wine_power = 15 /obj/item/reagent_containers/food/snacks/grown/grass/attack_self(mob/user) - to_chat(user, "I prepare the astroturf.") + to_chat(user, span_notice("I prepare the astroturf.")) var/grassAmt = 1 + round(seed.potency * tile_coefficient) // The grass we're holding for(var/obj/item/reagent_containers/food/snacks/grown/grass/G in user.loc) // The grass on the floor if(G.type != type) diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm index be54aec8b..839142011 100644 --- a/code/modules/hydroponics/grown/kudzu.dm +++ b/code/modules/hydroponics/grown/kudzu.dm @@ -22,7 +22,7 @@ return S /obj/item/seeds/kudzu/suicide_act(mob/user) - user.visible_message("[user] swallows the pack of kudzu seeds! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] swallows the pack of kudzu seeds! It looks like [user.p_theyre()] trying to commit suicide!")) plant(user) return (BRUTELOSS) @@ -30,22 +30,22 @@ if(isspaceturf(user.loc)) return if(!isturf(user.loc)) - to_chat(user, "I need more space to plant [src].") + to_chat(user, span_warning("I need more space to plant [src].")) return FALSE if(locate(/obj/structure/spacevine) in user.loc) - to_chat(user, "There is too much kudzu here to plant [src].") + to_chat(user, span_warning("There is too much kudzu here to plant [src].")) return FALSE - to_chat(user, "I plant [src].") + to_chat(user, span_notice("I plant [src].")) message_admins("Kudzu planted by [ADMIN_LOOKUPFLW(user)] at [ADMIN_VERBOSEJMP(user)]") investigate_log("was planted by [key_name(user)] at [AREACOORD(user)]", INVESTIGATE_BOTANY) new /datum/spacevine_controller(get_turf(user), mutations, potency, production) qdel(src) /obj/item/seeds/kudzu/attack_self(mob/user) - user.visible_message("[user] begins throwing seeds on the ground...") + user.visible_message(span_danger("[user] begins throwing seeds on the ground...")) if(do_after(user, 50, needhand = TRUE, target = user.drop_location(), progress = TRUE)) plant(user) - to_chat(user, "I plant the kudzu. You monster.") + to_chat(user, span_notice("I plant the kudzu. You monster.")) /obj/item/seeds/kudzu/get_analyzer_text() var/text = ..() diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index b225d95a5..4cc470e43 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -15,7 +15,7 @@ reagents_add = list(/datum/reagent/water = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.2) /obj/item/seeds/watermelon/suicide_act(mob/user) - user.visible_message("[user] is swallowing [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is swallowing [src]! It looks like [user.p_theyre()] trying to commit suicide!")) user.gib() new product(drop_location()) qdel(src) @@ -68,9 +68,9 @@ /obj/item/reagent_containers/food/snacks/grown/holymelon/proc/block_magic(mob/user, major) if(major) - to_chat(user, "[src] hums slightly, and seems to decay a bit.") + to_chat(user, span_warning("[src] hums slightly, and seems to decay a bit.")) /obj/item/reagent_containers/food/snacks/grown/holymelon/proc/expire(mob/user) - to_chat(user, "[src] rapidly turns into ash!") + to_chat(user, span_warning("[src] rapidly turns into ash!")) qdel(src) new /obj/item/ash(drop_location()) diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index c13b57597..a860e79c9 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -209,7 +209,7 @@ wine_power = 80 /obj/item/reagent_containers/food/snacks/grown/cherry_bomb/attack_self(mob/living/user) - user.visible_message("[user] plucks the stem from [src]!", "I pluck the stem from [src], which begins to hiss loudly!") + user.visible_message(span_warning("[user] plucks the stem from [src]!"), span_danger("I pluck the stem from [src], which begins to hiss loudly!")) log_bomber(user, "primed a", src, "for detonation") prime() diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 9056ef3b3..97a99df4b 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -171,7 +171,7 @@ M.move_to_delay -= round(seed.production / 50) M.health = M.maxHealth qdel(src) - to_chat(user, "I plant the walking mushroom.") + to_chat(user, span_notice("I plant the walking mushroom.")) // Chanterelle @@ -265,7 +265,7 @@ if(isspaceturf(user.loc)) return FALSE if(!isturf(user.loc)) - to_chat(user, "I need more space to plant [src].") + to_chat(user, span_warning("I need more space to plant [src].")) return FALSE var/count = 0 var/maxcount = 1 @@ -276,10 +276,10 @@ for(var/obj/structure/glowshroom/G in user.loc) count++ if(count >= maxcount) - to_chat(user, "There are too many shrooms here to plant [src].") + to_chat(user, span_warning("There are too many shrooms here to plant [src].")) return FALSE new effect_path(user.loc, seed) - to_chat(user, "I plant [src].") + to_chat(user, span_notice("I plant [src].")) qdel(src) return TRUE diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index 0170b558b..72cc8ded6 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -46,7 +46,7 @@ attack_verb = list("stung") /obj/item/reagent_containers/food/snacks/grown/nettle/suicide_act(mob/user) - user.visible_message("[user] is eating some of [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is eating some of [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return (BRUTELOSS|TOXLOSS) /obj/item/reagent_containers/food/snacks/grown/nettle/pickup(mob/living/user) @@ -63,7 +63,7 @@ if(affecting) if(affecting.receive_damage(0, force)) C.update_damage_overlays() - to_chat(C, "The nettle burns your bare hand!") + to_chat(C, span_danger("The nettle burns your bare hand!")) return TRUE /obj/item/reagent_containers/food/snacks/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity) @@ -73,7 +73,7 @@ if(force > 0) force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off else - to_chat(usr, "All the leaves have fallen off the nettle from violent whacking.") + to_chat(usr, span_warning("All the leaves have fallen off the nettle from violent whacking.")) qdel(src) /obj/item/reagent_containers/food/snacks/grown/nettle/basic @@ -99,13 +99,13 @@ if(..()) if(prob(50)) user.Paralyze(100) - to_chat(user, "I are stunned by the Deathnettle as you try picking it up!") + to_chat(user, span_danger("I are stunned by the Deathnettle as you try picking it up!")) /obj/item/reagent_containers/food/snacks/grown/nettle/death/attack(mob/living/carbon/M, mob/user) if(!..()) return if(isliving(M)) - to_chat(M, "I are stunned by the powerful acid of the Deathnettle!") + to_chat(M, span_danger("I are stunned by the powerful acid of the Deathnettle!")) log_combat(user, M, "attacked", src) M.adjust_blurriness(force/7) diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm index aa2dfbfdc..906f52386 100644 --- a/code/modules/hydroponics/grown/potato.dm +++ b/code/modules/hydroponics/grown/potato.dm @@ -39,7 +39,7 @@ /obj/item/reagent_containers/food/snacks/grown/potato/attackby(obj/item/W, mob/user, params) if(W.get_sharpness()) - to_chat(user, "I cut the potato into wedges with [W].") + to_chat(user, span_notice("I cut the potato into wedges with [W].")) var/obj/item/reagent_containers/food/snacks/grown/potato/wedges/Wedges = new /obj/item/reagent_containers/food/snacks/grown/potato/wedges remove_item_from_storage(user) qdel(src) diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm index 0e4c7a2d6..d73bc8d92 100644 --- a/code/modules/hydroponics/grown/pumpkin.dm +++ b/code/modules/hydroponics/grown/pumpkin.dm @@ -29,7 +29,7 @@ /obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params) if(W.get_sharpness()) - user.show_message("I carve a face into [src]!", MSG_VISUAL) + user.show_message(span_notice("I carve a face into [src]!"), MSG_VISUAL) new /obj/item/clothing/head/hardhat/pumpkinhead(user.loc) qdel(src) return diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index 432e7168f..452ad21af 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -43,10 +43,10 @@ factions = B.data["factions"] quirks = B.data["quirks"] contains_sample = TRUE - visible_message("The [src] is injected with a fresh blood sample.") + visible_message(span_notice("The [src] is injected with a fresh blood sample.")) log_cloning("[key_name(mind)]'s cloning record was added to [src] at [AREACOORD(src)].") else - visible_message("The [src] rejects the sample!") + visible_message(span_warning("The [src] rejects the sample!")) if(!reagents.has_reagent(/datum/reagent/blood)) mind = null diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm index e0e883807..44fe8bed2 100644 --- a/code/modules/hydroponics/grown/root.dm +++ b/code/modules/hydroponics/grown/root.dm @@ -27,7 +27,7 @@ /obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params) if(I.get_sharpness()) - to_chat(user, "I sharpen the carrot into a shiv with [I].") + to_chat(user, span_notice("I sharpen the carrot into a shiv with [I].")) var/obj/item/kitchen/knife/carrotshiv/Shiv = new /obj/item/kitchen/knife/carrotshiv remove_item_from_storage(user) qdel(src) diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm index 932e4f7b6..0987936f1 100644 --- a/code/modules/hydroponics/grown/tomato.dm +++ b/code/modules/hydroponics/grown/tomato.dm @@ -124,14 +124,14 @@ /obj/item/reagent_containers/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone) if(awakening) - to_chat(user, "The tomato is twitching and shaking, preventing you from eating it.") + to_chat(user, span_warning("The tomato is twitching and shaking, preventing you from eating it.")) return ..() /obj/item/reagent_containers/food/snacks/grown/tomato/killer/attack_self(mob/user) if(awakening || isspaceturf(user.loc)) return - to_chat(user, "I begin to awaken the Killer Tomato...") + to_chat(user, span_notice("I begin to awaken the Killer Tomato...")) awakening = TRUE addtimer(CALLBACK(src, PROC_REF(awaken)), 3 SECONDS) log_game("[key_name(user)] awakened a killer tomato at [AREACOORD(user)].") @@ -145,5 +145,5 @@ K.melee_damage_upper += round(seed.potency / 10) K.move_to_delay -= round(seed.production / 50) K.health = K.maxHealth - K.visible_message("The Killer Tomato growls as it suddenly awakens.") + K.visible_message(span_notice("The Killer Tomato growls as it suddenly awakens.")) qdel(src) diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index 2ccaddb4a..da331f45f 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -51,7 +51,7 @@ ///obj/item/grown/log/attackby(obj/item/W, mob/user, params) // if(W.get_sharpness()) -// user.show_message("I make [plank_name] out of \the [src]!", MSG_VISUAL) +// user.show_message(span_notice("I make [plank_name] out of \the [src]!"), MSG_VISUAL) // var/seed_modifier = 0 // if(seed) // seed_modifier = round(seed.potency / 25) @@ -61,7 +61,7 @@ // if(ST != plank && istype(ST, plank_type) && ST.amount < ST.max_amount) // ST.attackby(plank, user) //we try to transfer all old unfinished stacks to the new stack we created. // if(plank.amount > old_plank_amount) -// to_chat(user, "I add the newly-formed [plank_name] to the stack. It now contains [plank.amount] [plank_name].") +// to_chat(user, span_notice("I add the newly-formed [plank_name] to the stack. It now contains [plank.amount] [plank_name].")) // qdel(src) // else // return ..() @@ -162,14 +162,14 @@ R.use(1) can_buckle = TRUE buckle_requires_restraints = TRUE - to_chat(user, "I add a rod to \the [src].") + to_chat(user, span_notice("I add a rod to \the [src].")) var/mutable_appearance/rod_underlay = mutable_appearance('icons/obj/hydroponics/equipment.dmi', "bonfire_rod") rod_underlay.pixel_y = 16 underlays += rod_underlay if("Grill") R.use(1) grill = TRUE - to_chat(user, "I add a grill to \the [src].") + to_chat(user, span_notice("I add a grill to \the [src].")) add_overlay("bonfire_grill") else return ..() @@ -195,7 +195,7 @@ if(.) return if(burning) - to_chat(user, "I need to extinguish [src] before removing the logs!") + to_chat(user, span_warning("I need to extinguish [src] before removing the logs!")) return if(!has_buckled_mobs() && do_after(user, 50, target = src)) for(var/I in 1 to 5) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 1e3c597b6..f0d0caa96 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -27,7 +27,7 @@ list_reagents = list(/datum/reagent/toxin/plantbgone/weedkiller = 100) /obj/item/reagent_containers/spray/weedspray/suicide_act(mob/user) - user.visible_message("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return (TOXLOSS) /obj/item/reagent_containers/spray/pestspray // -- Skie @@ -42,7 +42,7 @@ list_reagents = list(/datum/reagent/toxin/pestkiller = 100) /obj/item/reagent_containers/spray/pestspray/suicide_act(mob/user) - user.visible_message("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return (TOXLOSS) /obj/item/cultivator @@ -62,7 +62,7 @@ hitsound = 'sound/blank.ogg' /obj/item/cultivator/suicide_act(mob/user) - user.visible_message("[user] is scratching [user.p_their()] back as hard as [user.p_they()] can with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is scratching [user.p_their()] back as hard as [user.p_they()] can with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return (BRUTELOSS) /obj/item/cultivator/rake @@ -80,8 +80,8 @@ H.confused = max(H.confused, 10) H.Stun(20) playsound(src, 'sound/blank.ogg', 50, TRUE) - H.visible_message("[H] steps on [src] causing the handle to hit [H.p_them()] right in the face!", \ - "I step on [src] causing the handle to hit you right in the face!") + H.visible_message(span_warning("[H] steps on [src] causing the handle to hit [H.p_them()] right in the face!"), \ + span_danger("I step on [src] causing the handle to hit you right in the face!")) /obj/item/hatchet name = "hatchet" @@ -107,7 +107,7 @@ AddComponent(/datum/component/butchering, 70, 100) /obj/item/hatchet/suicide_act(mob/user) - user.visible_message("[user] is chopping at [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is chopping at [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(src, 'sound/blank.ogg', 50, TRUE, -1) return (BRUTELOSS) @@ -140,7 +140,7 @@ AddComponent(/datum/component/butchering, 90, 105) /obj/item/scythe/suicide_act(mob/user) - user.visible_message("[user] is beheading [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is beheading [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) if(iscarbon(user)) var/mob/living/carbon/C = user var/obj/item/bodypart/BP = C.get_bodypart(BODY_ZONE_HEAD) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index c26ab27e3..9150a97c6 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -49,7 +49,7 @@ /obj/machinery/hydroponics/constructable/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Tray efficiency at [rating*100]%." + . += span_notice("The status display reads: Tray efficiency at [rating*100]%.") /obj/machinery/hydroponics/Destroy() @@ -66,7 +66,7 @@ // handle deconstructing the machine, if permissible if(I.tool_behaviour == TOOL_CROWBAR && using_irrigation) - to_chat(user, "Disconnect the hoses first!") + to_chat(user, span_warning("Disconnect the hoses first!")) return else if(default_deconstruction_crowbar(I)) return @@ -328,29 +328,29 @@ /obj/machinery/hydroponics/examine(user) . = ..() if(myseed) - . += "It has [myseed.plantname] planted." + . += span_info("It has [myseed.plantname] planted.") if (dead) - . += "It's dead!" + . += span_warning("It's dead!") else if (harvest) - . += "It's ready to harvest." + . += span_info("It's ready to harvest.") else if (plant_health <= (myseed.endurance / 2)) - . += "It looks unhealthy." + . += span_warning("It looks unhealthy.") else - . += "It's empty." + . += span_info("It's empty.") if(!self_sustaining) . += "Water: [waterlevel]/[maxwater].\n"+\ - "Nutrient: [nutrilevel]/[maxnutri]." + span_info("Nutrient: [nutrilevel]/[maxnutri].") if(self_sufficiency_progress > 0) var/percent_progress = round(self_sufficiency_progress * 100 / self_sufficiency_req) - . += "Treatment for self-sustenance are [percent_progress]% complete." + . += span_info("Treatment for self-sustenance are [percent_progress]% complete.") else - . += "It doesn't require any water or nutrients." + . += span_info("It doesn't require any water or nutrients.") if(weedlevel >= 5) - to_chat(user, "It's filled with weeds!") + to_chat(user, span_warning("It's filled with weeds!")) if(pestlevel >= 5) - to_chat(user, "It's filled with tiny worms!") + to_chat(user, span_warning("It's filled with tiny worms!")) to_chat(user, "" ) @@ -387,7 +387,7 @@ weedlevel = 0 // Reset pestlevel = 0 // Reset update_icon() - visible_message("The [oldPlantName] is overtaken by some [myseed.plantname]!") + visible_message(span_warning("The [oldPlantName] is overtaken by some [myseed.plantname]!")) name = "hydroponics tray ([myseed.plantname])" if(myseed.product) desc = initial(myseed.product.desc) @@ -426,7 +426,7 @@ sleep(5) // Wait a while update_icon() - visible_message("[oldPlantName] suddenly mutates into [myseed.plantname]!") + visible_message(span_warning("[oldPlantName] suddenly mutates into [myseed.plantname]!")) name = "hydroponics tray ([myseed.plantname])" if(myseed.product) desc = initial(myseed.product.desc) @@ -451,9 +451,9 @@ sleep(5) // Wait a while update_icon() - visible_message("The mutated weeds in [src] spawn some [myseed.plantname]!") + visible_message(span_warning("The mutated weeds in [src] spawn some [myseed.plantname]!")) else - to_chat(usr, "The few weeds in [src] seem to react, but only for a moment...") + to_chat(usr, span_warning("The few weeds in [src] seem to react, but only for a moment...")) /obj/machinery/hydroponics/proc/plantdies() // OH NOES!!!!! I put this all in one function to make things easier @@ -471,10 +471,10 @@ if(pestlevel > 5) message_admins("[ADMIN_LOOKUPFLW(user)] caused spiderling pests to spawn in a hydro tray") log_game("[key_name(user)] caused spiderling pests to spawn in a hydro tray") - visible_message("The pests seem to behave oddly...") + visible_message(span_warning("The pests seem to behave oddly...")) spawn_atom_to_turf(/obj/structure/spider/spiderling/hunter, src, 3, FALSE) else - to_chat(user, "The pests seem to behave oddly, but quickly settle down...") + to_chat(user, span_warning("The pests seem to behave oddly, but quickly settle down...")) /obj/machinery/hydroponics/proc/applyChemicals(datum/reagents/S, mob/user) if(myseed) @@ -485,7 +485,7 @@ switch(rand(100)) if(91 to 100) adjustHealth(-10) - to_chat(user, "The plant shrivels and burns.") + to_chat(user, span_warning("The plant shrivels and burns.")) if(81 to 90) mutatespecie() if(66 to 80) @@ -493,13 +493,13 @@ if(41 to 65) mutate() if(21 to 41) - to_chat(user, "The plants don't seem to react...") + to_chat(user, span_notice("The plants don't seem to react...")) if(11 to 20) mutateweed() if(1 to 10) mutatepest(user) else - to_chat(user, "Nothing happens...") + to_chat(user, span_notice("Nothing happens...")) // 2 or 1 units is enough to change the yield and other stats.// Can change the yield and other stats, but requires more than mutagen else if(S.has_reagent(/datum/reagent/toxin/mutagen, 2) || S.has_reagent(/datum/reagent/uranium/radium, 5) || S.has_reagent(/datum/reagent/uranium, 5)) @@ -537,7 +537,7 @@ if(self_sufficiency_progress >= self_sufficiency_req) become_self_sufficient() else if(!self_sustaining) - to_chat(user, "[src] warms as it might on a spring day under a genuine Sun.") + to_chat(user, span_notice("[src] warms as it might on a spring day under a genuine Sun.")) // Antitoxin binds shit pretty well. So the tox goes significantly down if(S.has_reagent(/datum/reagent/medicine/C2/multiver, 1)) @@ -711,7 +711,7 @@ if(1 to 32) mutatepest(user) else - to_chat(user, "Nothing happens...") + to_chat(user, span_warning("Nothing happens...")) /obj/machinery/hydroponics/attackby(obj/item/O, mob/user, params) //Called when mob user "attacks" it with object O @@ -721,11 +721,11 @@ if(istype(reagent_source, /obj/item/reagent_containers/syringe)) var/obj/item/reagent_containers/syringe/syr = reagent_source if(syr.mode != 1) - to_chat(user, "I can't get any extract out of this plant." ) + to_chat(user, span_warning("I can't get any extract out of this plant.") ) return if(!reagent_source.reagents.total_volume) - to_chat(user, "[reagent_source] is empty!") + to_chat(user, span_warning("[reagent_source] is empty!")) return 1 var/list/trays = list(src)//makes the list just this in cases of syringes and compost etc @@ -765,7 +765,7 @@ visi_msg += ", setting off the irrigation system" if(visi_msg) - visible_message("[visi_msg].") + visible_message(span_notice("[visi_msg].")) var/split = round(transfer_amount/trays.len) @@ -794,7 +794,7 @@ investigate_log("had Kudzu planted in it by [key_name(user)] at [AREACOORD(src)]","kudzu") if(!user.transferItemToLoc(O, src)) return - to_chat(user, "I plant [O].") + to_chat(user, span_notice("I plant [O].")) dead = 0 myseed = O name = "hydroponics tray ([myseed.plantname])" @@ -811,7 +811,7 @@ lastcycle = world.time update_icon() else - to_chat(user, "[src] already has seeds in it!") + to_chat(user, span_warning("[src] already has seeds in it!")) else if(istype(O, /obj/item/plant_analyzer)) if(myseed) @@ -831,11 +831,11 @@ else if(istype(O, /obj/item/cultivator)) if(weedlevel > 0) - user.visible_message("[user] uproots the weeds.", "I remove the weeds from [src].") + user.visible_message(span_notice("[user] uproots the weeds."), span_notice("I remove the weeds from [src].")) weedlevel = 0 update_icon() else - to_chat(user, "This plot is completely devoid of weeds! It doesn't need uprooting.") + to_chat(user, span_warning("This plot is completely devoid of weeds! It doesn't need uprooting.")) else if(istype(O, /obj/item/storage/bag/plants)) attack_hand(user) @@ -847,23 +847,23 @@ else if((O.tool_behaviour == TOOL_WIRECUTTER) && unwrenchable) if (!anchored) - to_chat(user, "Anchor the tray first!") + to_chat(user, span_warning("Anchor the tray first!")) return using_irrigation = !using_irrigation O.play_tool_sound(src) - user.visible_message("[user] [using_irrigation ? "" : "dis"]connects [src]'s irrigation hoses.", \ - "I [using_irrigation ? "" : "dis"]connect [src]'s irrigation hoses.") + user.visible_message(span_notice("[user] [using_irrigation ? "" : "dis"]connects [src]'s irrigation hoses."), \ + span_notice("I [using_irrigation ? "" : "dis"]connect [src]'s irrigation hoses.")) for(var/obj/machinery/hydroponics/h in range(1,src)) h.update_icon() else if(istype(O, /obj/item/shovel/spade)) if(!myseed && !weedlevel) - to_chat(user, "[src] doesn't have any plants or weeds!") + to_chat(user, span_warning("[src] doesn't have any plants or weeds!")) return - user.visible_message("[user] starts digging out [src]'s plants...", - "I start digging out [src]'s plants...") + user.visible_message(span_notice("[user] starts digging out [src]'s plants..."), + span_notice("I start digging out [src]'s plants...")) if(O.use_tool(src, user, 50, volume=50) || (!myseed && !weedlevel)) - user.visible_message("[user] digs out the plants in [src]!", "I dig out all of [src]'s plants!") + user.visible_message(span_notice("[user] digs out the plants in [src]!"), span_notice("I dig out all of [src]'s plants!")) if(myseed) //Could be that they're just using it as a de-weeder age = 0 plant_health = 0 @@ -887,7 +887,7 @@ if (using_irrigation) if (!silent) - to_chat(user, "Disconnect the hoses first!") + to_chat(user, span_warning("Disconnect the hoses first!")) return FAILED_UNFASTEN return ..() @@ -903,7 +903,7 @@ else if(dead) dead = 0 - to_chat(user, "I remove the dead plant from [src].") + to_chat(user, span_notice("I remove the dead plant from [src].")) qdel(myseed) myseed = null update_icon() @@ -917,11 +917,11 @@ harvest = 0 lastproduce = age if(istype(myseed, /obj/item/seeds/replicapod)) - to_chat(user, "I harvest from the [myseed.plantname].") + to_chat(user, span_notice("I harvest from the [myseed.plantname].")) else if(myseed.getYield() <= 0) - to_chat(user, "I fail to harvest anything useful!") + to_chat(user, span_warning("I fail to harvest anything useful!")) else - to_chat(user, "I harvest [myseed.getYield()] items from the [myseed.plantname].") + to_chat(user, span_notice("I harvest [myseed.getYield()] items from the [myseed.plantname].")) if(!myseed.get_gene(/datum/plant_gene/trait/repeated_harvest)) qdel(myseed) myseed = null @@ -960,7 +960,7 @@ C.faction = list("plants") /obj/machinery/hydroponics/proc/become_self_sufficient() // Ambrosia Gaia effect - visible_message("[src] begins to glow with a beautiful light!") + visible_message(span_boldnotice("[src] begins to glow with a beautiful light!")) self_sustaining = TRUE update_icon() @@ -984,7 +984,7 @@ /obj/machinery/hydroponics/soil/attackby(obj/item/O, mob/user, params) if(O.tool_behaviour == TOOL_SHOVEL && !istype(O, /obj/item/shovel/spade)) //Doesn't include spades because of uprooting plants - to_chat(user, "I clear up [src]!") + to_chat(user, span_notice("I clear up [src]!")) qdel(src) else return ..() diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 7d1c5bf5a..d77049041 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -212,7 +212,7 @@ // Also splashes everything in target turf with reagents and applies other trait effects (teleporting, etc) to the target by on_squash. // For code, see grown.dm name = "Liquid Contents" - examine_line = "It has a lot of liquid contents inside." + examine_line = span_info("It has a lot of liquid contents inside.") /datum/plant_gene/trait/squash/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C) // Squash the plant on slip. @@ -223,7 +223,7 @@ // Applies other trait effects (teleporting, etc) to the target by on_slip. name = "Slippery Skin" rate = 1.6 - examine_line = "It has a very slippery skin." + examine_line = span_info("It has a very slippery skin.") /datum/plant_gene/trait/slip/on_new(obj/item/reagent_containers/food/snacks/grown/G, newloc) ..() @@ -274,7 +274,7 @@ C.update_icon() batteries_recharged = 1 if(batteries_recharged) - to_chat(target, "My batteries are recharged!") + to_chat(target, span_notice("My batteries are recharged!")) @@ -283,7 +283,7 @@ // Adds 1 + potency*rate light range and potency*(rate + 0.01) light_power to products. name = "Bioluminescence" rate = 0.03 - examine_line = "It emits a soft glow." + examine_line = span_info("It emits a soft glow.") trait_id = "glow" var/glow_color = "#C3E381" @@ -356,7 +356,7 @@ /datum/plant_gene/trait/teleport/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C) var/teleport_radius = max(round(G.seed.potency / 10), 1) var/turf/T = get_turf(C) - to_chat(C, "I slip through spacetime!") + to_chat(C, span_warning("I slip through spacetime!")) do_teleport(C, T, teleport_radius, channel = TELEPORT_CHANNEL_BLUESPACE) if(prob(50)) do_teleport(G, T, teleport_radius, channel = TELEPORT_CHANNEL_BLUESPACE) @@ -391,7 +391,7 @@ if(istype(I, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = I if(C.use(5)) - to_chat(user, "I add some cable to [G] and slide it inside the battery encasing.") + to_chat(user, span_notice("I add some cable to [G] and slide it inside the battery encasing.")) var/obj/item/stock_parts/cell/potato/pocell = new /obj/item/stock_parts/cell/potato(user.loc) pocell.icon_state = G.icon_state pocell.maxcharge = G.seed.potency * 20 @@ -409,7 +409,7 @@ qdel(G) else - to_chat(user, "I need five lengths of cable to make a [G] battery!") + to_chat(user, span_warning("I need five lengths of cable to make a [G] battery!")) /datum/plant_gene/trait/stinging @@ -426,7 +426,7 @@ var/fraction = min(injecting_amount/G.reagents.total_volume, 1) G.reagents.reaction(L, INJECT, fraction) G.reagents.trans_to(L, injecting_amount) - to_chat(target, "I are pricked by [G]!") + to_chat(target, span_danger("I are pricked by [G]!")) /datum/plant_gene/trait/smoke name = "Gaseous Decomposition" @@ -473,7 +473,7 @@ HY.weedlevel = 0 // Reset HY.pestlevel = 0 // Reset HY.update_icon() - HY.visible_message("The [H.myseed.plantname] spreads!") + HY.visible_message(span_warning("The [H.myseed.plantname] spreads!")) /datum/plant_gene/trait/plant_type // Parent type name = "you shouldn't see this" diff --git a/code/modules/hydroponics/roguebin.dm b/code/modules/hydroponics/roguebin.dm index af2e0373a..520351713 100644 --- a/code/modules/hydroponics/roguebin.dm +++ b/code/modules/hydroponics/roguebin.dm @@ -61,13 +61,13 @@ var/mob/living/L = user if(kover) playsound(src, 'sound/combat/hits/onwood/woodimpact (1).ogg', 100) - user.visible_message("[user] kicks [src]!", \ - "I kick [src]!") + user.visible_message(span_warning("[user] kicks [src]!"), \ + span_warning("I kick [src]!")) return if(prob(L.STASTR * 8)) playsound(src, 'sound/combat/hits/onwood/woodimpact (1).ogg', 100) - user.visible_message("[user] kicks over [src]!", \ - "I kick over [src]!") + user.visible_message(span_warning("[user] kicks over [src]!"), \ + span_warning("I kick over [src]!")) kover = TRUE chem_splash(loc, 2, list(reagents)) var/datum/component/storage/STR = GetComponent(/datum/component/storage) @@ -78,8 +78,8 @@ update_icon() else playsound(src, 'sound/combat/hits/onwood/woodimpact (1).ogg', 100) - user.visible_message("[user] kicks [src]!", \ - "I kick [src]!") + user.visible_message(span_warning("[user] kicks [src]!"), \ + span_warning("I kick [src]!")) /obj/item/roguebin/attack_hand(mob/user) var/datum/component/storage/CP = GetComponent(/datum/component/storage) @@ -93,8 +93,8 @@ return if(kover) if(kover) - user.visible_message("[user] starts to pick up [src]...", \ - "I start to pick up [src]...") + user.visible_message(span_notice("[user] starts to pick up [src]..."), \ + span_notice("I start to pick up [src]...")) if(do_after(user, 30, target = src)) kover = FALSE update_icon() @@ -110,19 +110,19 @@ if(!reagents.has_reagent(/datum/reagent/water, 5)) removereg = /datum/reagent/water/gross if(!reagents.has_reagent(/datum/reagent/water/gross, 5)) - to_chat(user, "No water to wash these stains.") + to_chat(user, span_warning("No water to wash these stains.")) return reagents.remove_reagent(removereg, 5) var/list/wash = list('sound/foley/waterwash (1).ogg','sound/foley/waterwash (2).ogg') playsound(user, pick_n_take(wash), 100, FALSE) var/item2wash = user.get_active_held_item() if(!item2wash) - user.visible_message("[user] starts to wash in [src].") + user.visible_message(span_info("[user] starts to wash in [src].")) if(do_after(L, 30, target = src)) wash_atom(user, CLEAN_STRONG) playsound(user, pick(wash), 100, FALSE) else - user.visible_message("[user] starts to wash [item2wash] in [src].") + user.visible_message(span_info("[user] starts to wash [item2wash] in [src].")) if(do_after(L, 30, target = src)) wash_atom(item2wash, CLEAN_STRONG) playsound(user, pick(wash), 100, FALSE) @@ -155,16 +155,16 @@ if(!reagents.has_reagent(/datum/reagent/water, 5)) removereg = /datum/reagent/water/gross if(!reagents.has_reagent(/datum/reagent/water/gross, 5)) - to_chat(user, "Need more water to quench in.") + to_chat(user, span_warning("Need more water to quench in.")) return if(!T.hingot.currecipe) - to_chat(user, "Huh?") + to_chat(user, span_warning("Huh?")) return if(T.hingot.currecipe.progress != 100) - to_chat(user, "It's not finished yet.") + to_chat(user, span_warning("It's not finished yet.")) return if(!T.hott) - to_chat(user, "I need to heat it to temper the metal.") + to_chat(user, span_warning("I need to heat it to temper the metal.")) return var/used_turf = user.loc if(!isturf(used_turf)) diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 97f3a5eac..5e9dcdb16 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -59,7 +59,7 @@ /obj/machinery/seed_extractor/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Extracting [seed_multiplier] seed(s) per piece of produce.
Machine can store up to [max_seeds]% seeds.
" + . += span_notice("The status display reads: Extracting [seed_multiplier] seed(s) per piece of produce.
Machine can store up to [max_seeds]% seeds.") /obj/machinery/seed_extractor/attackby(obj/item/O, mob/user, params) @@ -84,21 +84,21 @@ ++loaded add_seed(G) if (loaded) - to_chat(user, "I put as many seeds from \the [O.name] into [src] as you can.") + to_chat(user, span_notice("I put as many seeds from \the [O.name] into [src] as you can.")) else - to_chat(user, "There are no seeds in \the [O.name].") + to_chat(user, span_notice("There are no seeds in \the [O.name].")) return else if(seedify(O,-1, src, user)) - to_chat(user, "I extract some seeds.") + to_chat(user, span_notice("I extract some seeds.")) return else if (istype(O, /obj/item/seeds)) if(add_seed(O)) - to_chat(user, "I add [O] to [src.name].") + to_chat(user, span_notice("I add [O] to [src.name].")) updateUsrDialog() return else if(user.used_intent.type != INTENT_HARM) - to_chat(user, "I can't extract any seeds from \the [O.name]!") + to_chat(user, span_warning("I can't extract any seeds from \the [O.name]!")) else return ..() @@ -176,7 +176,7 @@ /obj/machinery/seed_extractor/proc/add_seed(obj/item/seeds/O) if(contents.len >= 999) - to_chat(usr, "\The [src] is full.") + to_chat(usr, span_notice("\The [src] is full.")) return FALSE var/datum/component/storage/STR = O.loc.GetComponent(/datum/component/storage) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 1b58821da..c1fd680ec 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -84,14 +84,14 @@ if(istype(T, /turf/open/floor/rogue/dirt)) var/turf/open/floor/rogue/dirt/D = T if(D.planted_crop) - to_chat(user, "Someone is already living here.") + to_chat(user, span_warning("Someone is already living here.")) return if(D.holie) - to_chat(user, "The seed needs a home to grow in, remove the hole.") + to_chat(user, span_warning("The seed needs a home to grow in, remove the hole.")) return D.planted_crop = new(D) playsound(loc,'sound/items/seed.ogg', 100, TRUE) - visible_message("[user] plants some seeds.") + visible_message(span_notice("[user] plants some seeds.")) D.planted_crop.name = src.plantname D.planted_crop.myseed = src D.planted_crop.plant_hp = maxphp @@ -143,7 +143,7 @@ /obj/item/seeds/examine(mob/user) . = ..() -// . += "Use a pen on it to rename it or change its description." +// . += span_notice("Use a pen on it to rename it or change its description.") /obj/item/seeds/proc/Copy() var/obj/item/seeds/S = new type(null, 1) @@ -414,10 +414,10 @@ /obj/item/seeds/attackby(obj/item/O, mob/user, params) if (istype(O, /obj/item/plant_analyzer)) - to_chat(user, "*---------*\n This is \a [src].") + to_chat(user, span_info("*---------*\n This is \a [src].")) var/text = get_analyzer_text() if(text) - to_chat(user, "[text]") + to_chat(user, span_notice("[text]")) return @@ -431,10 +431,10 @@ if(!user.canUseTopic(src, BE_CLOSE)) return if (length(newplantname) > 20) - to_chat(user, "That name is too long!") + to_chat(user, span_warning("That name is too long!")) return if(!newplantname) - to_chat(user, "That name is invalid.") + to_chat(user, span_warning("That name is invalid.")) return else name = "[lowertext(newplantname)]" @@ -444,10 +444,10 @@ if(!user.canUseTopic(src, BE_CLOSE)) return if (length(newdesc) > 180) - to_chat(user, "That description is too long!") + to_chat(user, span_warning("That description is too long!")) return if(!newdesc) - to_chat(user, "That description is invalid.") + to_chat(user, span_warning("That description is invalid.")) return else desc = newdesc @@ -458,10 +458,10 @@ if(!user.canUseTopic(src, BE_CLOSE)) return if (length(newproductdesc) > 180) - to_chat(user, "That description is too long!") + to_chat(user, span_warning("That description is too long!")) return if(!newproductdesc) - to_chat(user, "That description is invalid.") + to_chat(user, span_warning("That description is invalid.")) return else productdesc = newproductdesc diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm index d63a49383..20e177781 100644 --- a/code/modules/jobs/job_exp.dm +++ b/code/modules/jobs/job_exp.dm @@ -216,41 +216,41 @@ GLOBAL_PROTECT(exp_to_update) var/rolefound = FALSE play_records[EXP_TYPE_LIVING] += minutes if(announce_changes) - to_chat(src,"I got: [minutes] Living EXP!") + to_chat(src,span_notice("I got: [minutes] Living EXP!")) if(mob.mind.assigned_role) for(var/job in SSjob.name_occupations) if(mob.mind.assigned_role == job) rolefound = TRUE play_records[job] += minutes if(announce_changes) - to_chat(src,"I got: [minutes] [job] EXP!") + to_chat(src,span_notice("I got: [minutes] [job] EXP!")) if(!rolefound) for(var/role in GLOB.exp_specialmap[EXP_TYPE_SPECIAL]) if(mob.mind.assigned_role == role) rolefound = TRUE play_records[role] += minutes if(announce_changes) - to_chat(mob,"I got: [minutes] [role] EXP!") + to_chat(mob,span_notice("I got: [minutes] [role] EXP!")) if(mob.mind.special_role && !(mob.mind.datum_flags & DF_VAR_EDITED)) var/trackedrole = mob.mind.special_role play_records[trackedrole] += minutes if(announce_changes) - to_chat(src,"I got: [minutes] [trackedrole] EXP!") + to_chat(src,span_notice("I got: [minutes] [trackedrole] EXP!")) if(!rolefound) play_records["Unknown"] += minutes else if(holder && !holder.deadmined) play_records[EXP_TYPE_ADMIN] += minutes if(announce_changes) - to_chat(src,"I got: [minutes] Admin EXP!") + to_chat(src,span_notice("I got: [minutes] Admin EXP!")) else play_records[EXP_TYPE_GHOST] += minutes if(announce_changes) - to_chat(src,"I got: [minutes] Ghost EXP!") + to_chat(src,span_notice("I got: [minutes] Ghost EXP!")) else if(isobserver(mob)) play_records[EXP_TYPE_GHOST] += minutes if(announce_changes) - to_chat(src,"I got: [minutes] Ghost EXP!") + to_chat(src,span_notice("I got: [minutes] Ghost EXP!")) else if(minutes) //Let "refresh" checks go through return diff --git a/code/modules/jobs/job_types/old/chaplain.dm b/code/modules/jobs/job_types/old/chaplain.dm index f78f2b523..b976301de 100644 --- a/code/modules/jobs/job_types/old/chaplain.dm +++ b/code/modules/jobs/job_types/old/chaplain.dm @@ -31,7 +31,7 @@ B.name = GLOB.bible_name B.icon_state = GLOB.bible_icon_state B.item_state = GLOB.bible_item_state - to_chat(H, "There is already an established religion onboard the station. You are an acolyte of [GLOB.deity]. Defer to the Chaplain.") + to_chat(H, span_boldnotice("There is already an established religion onboard the station. You are an acolyte of [GLOB.deity]. Defer to the Chaplain.")) H.equip_to_slot_or_del(B, SLOT_IN_BACKPACK) var/nrt = GLOB.holy_weapon_type || /obj/item/nullrod var/obj/item/nullrod/N = new nrt(H) diff --git a/code/modules/jobs/job_types/old/mime.dm b/code/modules/jobs/job_types/old/mime.dm index e0e350bf9..02baa7fab 100644 --- a/code/modules/jobs/job_types/old/mime.dm +++ b/code/modules/jobs/job_types/old/mime.dm @@ -79,5 +79,5 @@ H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_chair(null)) if (href_list["invisible_box"]) H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_box(null)) - to_chat(usr, "The book disappears into thin air.") + to_chat(usr, span_notice("The book disappears into thin air.")) qdel(src) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm b/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm index d63a4ac63..dae0efe74 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm @@ -44,7 +44,7 @@ GLOBAL_VAR_INIT(adventurer_hugbox_duration_still, 3 MINUTES) addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, adv_hugboxing_start)), 1) /mob/living/carbon/human/proc/adv_hugboxing_start() - to_chat(src, "I will be in danger once I start moving.") + to_chat(src, span_warning("I will be in danger once I start moving.")) status_flags |= GODMODE ADD_TRAIT(src, TRAIT_PACIFISM, HUGBOX_TRAIT) RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(adv_hugboxing_moved)) @@ -54,7 +54,7 @@ GLOBAL_VAR_INIT(adventurer_hugbox_duration_still, 3 MINUTES) /mob/living/carbon/human/proc/adv_hugboxing_moved() UnregisterSignal(src, COMSIG_MOVABLE_MOVED) - to_chat(src, "I have [DisplayTimeText(GLOB.adventurer_hugbox_duration)] to begone!") + to_chat(src, span_danger("I have [DisplayTimeText(GLOB.adventurer_hugbox_duration)] to begone!")) addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/carbon/human, adv_hugboxing_end)), GLOB.adventurer_hugbox_duration) /mob/living/carbon/human/proc/adv_hugboxing_end() @@ -65,4 +65,4 @@ GLOBAL_VAR_INIT(adventurer_hugbox_duration_still, 3 MINUTES) return status_flags &= ~GODMODE REMOVE_TRAIT(src, TRAIT_PACIFISM, HUGBOX_TRAIT) - to_chat(src, "My joy is gone! Danger surrounds me.") + to_chat(src, span_danger("My joy is gone! Danger surrounds me.")) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/_advclass.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/_advclass.dm index 17c70dbca..c7d3e99cc 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/_advclass.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/_advclass.dm @@ -51,7 +51,7 @@ if(CTAG_TOWNER in category_tags) for(var/mob/M in GLOB.billagerspawns) - to_chat(M, "[H.real_name] is the [name].") + to_chat(M, span_info("[H.real_name] is the [name].")) GLOB.billagerspawns -= H /datum/advclass/proc/post_equip(mob/living/carbon/human/H) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm index 8ce026a80..f552c53de 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm @@ -30,7 +30,7 @@ switch(classchoice) if("Warrior") H.set_blindness(0) - to_chat(H, "Barbarians are great warriors of the outlands, often regarded as the strongest of their tribes -- should they have any that live. These incredible titans of strength and brutality are motivated most often by a single... all consuming instinct. SURVIVE.") + to_chat(H, span_warning("Barbarians are great warriors of the outlands, often regarded as the strongest of their tribes -- should they have any that live. These incredible titans of strength and brutality are motivated most often by a single... all consuming instinct. SURVIVE.")) H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) @@ -70,7 +70,7 @@ H.change_stat("endurance", 2) if("Hunter Killer") H.set_blindness(0) - to_chat(H, "Barbarians are great warriors of the outlands, often regarded as the strongest of their tribes -- should they have any that live. These incredible titans of strength and brutality are motivated most often by a single... all consuming instinct. SURVIVE.") + to_chat(H, span_warning("Barbarians are great warriors of the outlands, often regarded as the strongest of their tribes -- should they have any that live. These incredible titans of strength and brutality are motivated most often by a single... all consuming instinct. SURVIVE.")) H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) @@ -113,7 +113,7 @@ if("ROLL THE DICE!") if(prob(49)) // Warrior H.set_blindness(0) - to_chat(src, "Barbarians are great warriors of the outlands, often regarded as the strongest of their tribes -- should they have any that live. These incredible titans of strength and brutality are motivated most often by a single... all consuming instinct. SURVIVE.") + to_chat(src, span_warning("Barbarians are great warriors of the outlands, often regarded as the strongest of their tribes -- should they have any that live. These incredible titans of strength and brutality are motivated most often by a single... all consuming instinct. SURVIVE.")) H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) @@ -153,7 +153,7 @@ H.change_stat("endurance", 2) else if(prob(45)) // Hunter Killer H.set_blindness(0) - to_chat(src, "You are a barbarian of the outlands, having fought many monstrous beasts and men in your time -- you now find yourself in the lands of nobles and beggars.") + to_chat(src, span_warning("You are a barbarian of the outlands, having fought many monstrous beasts and men in your time -- you now find yourself in the lands of nobles and beggars.")) H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) @@ -194,7 +194,7 @@ H.change_stat("endurance", 3) else // Bear Wolf. Barbarian Unique. They don't get armor. H.set_blindness(0) - to_chat(src, "You are a barbarian of the outlands, having fought many monstrous beasts and men in your time -- you now find yourself in the lands of nobles and beggars.") + to_chat(src, span_warning("You are a barbarian of the outlands, having fought many monstrous beasts and men in your time -- you now find yourself in the lands of nobles and beggars.")) H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/bard.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/bard.dm index e392549de..6ddff0233 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/bard.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/bard.dm @@ -30,7 +30,7 @@ if("Bard") H.set_blindness(0) - to_chat(H, "Bards make their fortunes in brothels, flop houses and taverns -- gaining fame for their songs and legends. If there is any truth to them, that is.") + to_chat(H, span_warning("Bards make their fortunes in brothels, flop houses and taverns -- gaining fame for their songs and legends. If there is any truth to them, that is.")) H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/maces, 2, TRUE) @@ -69,7 +69,7 @@ H.change_stat("speed", 2) if("Skald") H.set_blindness(0) - to_chat(H, "Skalds are wandering storytellers, and for many villages they are local historians keeping the tales of great legends and heroes alive.") + to_chat(H, span_warning("Skalds are wandering storytellers, and for many villages they are local historians keeping the tales of great legends and heroes alive.")) H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm index 1dc93ec7c..6e79c6355 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm @@ -44,7 +44,7 @@ if("Life Cleric") H.set_blindness(0) - to_chat(H, "You are a cleric of the life domain. Well versed in the arts of healing and magic.") + to_chat(H, span_warning("You are a cleric of the life domain. Well versed in the arts of healing and magic.")) H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) @@ -70,7 +70,7 @@ H.change_stat("endurance", 2) if("War Cleric") H.set_blindness(0) - to_chat(H, "You are a cleric of the war domain. Experienced in both the granting of life and the taking of it. Unfortunately your study of warcraft has weakened your divine abilities...") + to_chat(H, span_warning("You are a cleric of the war domain. Experienced in both the granting of life and the taking of it. Unfortunately your study of warcraft has weakened your divine abilities...")) H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm index 7c0845884..525147a37 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm @@ -38,9 +38,9 @@ switch(classchoice) if("Paladin") - to_chat(src, "Paladins are holy warriors who have taken sacred vows to uphold justice and righteousness. Often, they were promised redemption for past sins if they crusaded in the name of the gods.") + to_chat(src, span_warning("Paladins are holy warriors who have taken sacred vows to uphold justice and righteousness. Often, they were promised redemption for past sins if they crusaded in the name of the gods.")) H.set_blindness(0) // No introduction text due to there being no real difference in Paladin archetypes for now. - to_chat(H, "You are a paladin.") + to_chat(H, span_warning("You are a paladin.")) H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 1, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE) @@ -86,7 +86,7 @@ backl = /obj/item/storage/backpack/rogue/satchel if("Battle Master") H.set_blindness(0) - to_chat(H, "You are a battle-master.") + to_chat(H, span_warning("You are a battle-master.")) H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm index 66ae30167..36f5feb41 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm @@ -31,7 +31,7 @@ backl = /obj/item/storage/backpack/rogue/satchel r_hand = /obj/item/rogueweapon/woodstaff if(H.mind) - to_chat(H, "Magic is often times refered to as an art. At times it is treated as a primordial beast, chaos incarnate. To more learned men it is a precise science, to be studied and examined. In the end, magic is all three of the above. It is Art, Chaos, and Science: a blessing, a curse, and progress. It all depends on who calls upon it, and for what purpose.") + to_chat(H, span_warning("Magic is often times refered to as an art. At times it is treated as a primordial beast, chaos incarnate. To more learned men it is a precise science, to be studied and examined. In the end, magic is all three of the above. It is Art, Chaos, and Science: a blessing, a curse, and progress. It all depends on who calls upon it, and for what purpose.")) H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/wrestling, pick(0,1,2), TRUE) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm index cf64956bf..4c53ed151 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm @@ -33,7 +33,7 @@ backl = /obj/item/storage/backpack/rogue/backpack r_hand = /obj/item/rogueweapon/woodstaff if(H.mind) - to_chat(src, "Monks are pilgrims of powerful belief who empart the teachings of their Temple or God by their interactions with the people of the world. A good monk would seek to help travellers on the road, feed the hungry and teach the weak to become strong. A bad one however...") + to_chat(src, span_warning("Monks are pilgrims of powerful belief who empart the teachings of their Temple or God by their interactions with the people of the world. A good monk would seek to help travellers on the road, feed the hungry and teach the weak to become strong. A bad one however...")) H.mind.adjust_skillrank(/datum/skill/combat/swords, pick(0,1), TRUE) H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/bows, pick(0,1), TRUE) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm index e123034ec..e60952fef 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm @@ -26,7 +26,7 @@ if("Ranger") H.set_blindness(0) - to_chat(H, "Rangers are masters of nature, often hired as pathfinders, bodyguards and mercenaries in areas of wilderness untraversable to common soldiery.") + to_chat(H, span_warning("Rangers are masters of nature, often hired as pathfinders, bodyguards and mercenaries in areas of wilderness untraversable to common soldiery.")) shoes = /obj/item/clothing/shoes/roguetown/boots/leather shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt neck = /obj/item/storage/belt/rogue/pouch/coins/poor @@ -69,7 +69,7 @@ H.change_stat("speed", 2) if("Gloom Stalker") H.set_blindness(0) - to_chat(H, "Rangers are masters of nature, often hired as pathfinders, bodyguards and mercenaries in areas of wilderness untraversable to common soldiery.") + to_chat(H, span_warning("Rangers are masters of nature, often hired as pathfinders, bodyguards and mercenaries in areas of wilderness untraversable to common soldiery.")) shoes = /obj/item/clothing/shoes/roguetown/boots/leather shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt neck = /obj/item/storage/belt/rogue/pouch/coins/poor @@ -120,4 +120,4 @@ if(prob(23)) if(!H.has_language(/datum/language/elvish)) H.grant_language(/datum/language/elvish) - to_chat(H, "I can speak Elfish with ,e before my speech.") + to_chat(H, span_info("I can speak Elfish with ,e before my speech.")) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm index f15eafa1c..d885edfe5 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm @@ -31,7 +31,7 @@ if("Warrior") H.set_blindness(0) - to_chat(H, "Warriors are well rounded fighters, experienced often in many theaters of warfare and battle they are capable of rising to any challenge that might greet them on the path.") + to_chat(H, span_warning("Warriors are well rounded fighters, experienced often in many theaters of warfare and battle they are capable of rising to any challenge that might greet them on the path.")) H.mind.adjust_skillrank(/datum/skill/combat/crossbows, rand(1,2), TRUE) H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/maces, 2, TRUE) @@ -79,7 +79,7 @@ beltr = /obj/item/rogueweapon/sword/sabre if("Monster Hunter") H.set_blindness(0) - to_chat(H, "Monsters Hunters are typically contracted champions of the common folk dedicated to the slaying of both lesser vermin and greater beasts of the wilds.") + to_chat(H, span_warning("Monsters Hunters are typically contracted champions of the common folk dedicated to the slaying of both lesser vermin and greater beasts of the wilds.")) H.mind.adjust_skillrank(/datum/skill/combat/crossbows, rand(1,2), TRUE) H.mind.adjust_skillrank(/datum/skill/combat/bows, rand(1,2), TRUE) H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) diff --git a/code/modules/jobs/job_types/roguetown/church/priest.dm b/code/modules/jobs/job_types/roguetown/church/priest.dm index a26b875be..c289ce478 100644 --- a/code/modules/jobs/job_types/roguetown/church/priest.dm +++ b/code/modules/jobs/job_types/roguetown/church/priest.dm @@ -77,7 +77,7 @@ if(!mind) return if(!istype(get_area(src), /area/rogue/indoors/town/church/chapel)) - to_chat(src, "I need to do this in the chapel.") + to_chat(src, span_warning("I need to do this in the chapel.")) return FALSE for(var/mob/living/carbon/human/HU in get_step(src, src.dir)) if(!HU.mind) @@ -122,7 +122,7 @@ var/inputty = input("Curse someone... (curse them again to remove it)", "Sinner Name") as text|null if(inputty) if(!istype(get_area(src), /area/rogue/indoors/town/church/chapel)) - to_chat(src, "I need to do this from the chapel.") + to_chat(src, span_warning("I need to do this from the chapel.")) return FALSE if(inputty in GLOB.excommunicated_players) GLOB.excommunicated_players -= inputty @@ -151,7 +151,7 @@ var/inputty = input("Make an announcement", "ROGUETOWN") as text|null if(inputty) if(!istype(get_area(src), /area/rogue/indoors/town/church/chapel)) - to_chat(src, "I need to do this from the chapel.") + to_chat(src, span_warning("I need to do this from the chapel.")) return FALSE priority_announce("[inputty]", title = "The Priest Speaks", sound = 'sound/misc/bell.ogg') diff --git a/code/modules/jobs/job_types/roguetown/church/puritan.dm b/code/modules/jobs/job_types/roguetown/church/puritan.dm index ace203500..039888bb5 100644 --- a/code/modules/jobs/job_types/roguetown/church/puritan.dm +++ b/code/modules/jobs/job_types/roguetown/church/puritan.dm @@ -91,7 +91,7 @@ return H = I.grabbed if(H == src) - to_chat(src, "I already torture myself.") + to_chat(src, span_warning("I already torture myself.")) return var/painpercent = (H.get_complex_pain() / (H.STAEND * 10)) * 100 if(H.add_stress(/datum/stressevent/tortured)) @@ -109,7 +109,7 @@ H.emote("painscream") H.confession_time("antag") return - to_chat(src, "Not ready to speak yet.") + to_chat(src, span_warning("Not ready to speak yet.")) /mob/living/carbon/human/proc/faith_test() set name = "Test Faith" @@ -121,7 +121,7 @@ return H = I.grabbed if(H == src) - to_chat(src, "I already torture myself.") + to_chat(src, span_warning("I already torture myself.")) return var/painpercent = (H.get_complex_pain() / (H.STAEND * 10)) * 100 if(H.add_stress(/datum/stressevent/tortured)) @@ -137,7 +137,7 @@ H.emote("painscream") H.confession_time("patron") return - to_chat(src, "Not ready to speak yet.") + to_chat(src, span_warning("Not ready to speak yet.")) /mob/living/carbon/human/proc/confession_time(confession_type = "antag") var/timerid = addtimer(CALLBACK(src, PROC_REF(confess_sins)), 6 SECONDS, TIMER_STOPPABLE) @@ -147,7 +147,7 @@ if(SStimer.timer_id_dict[timerid]) deltimer(timerid) else - to_chat(src, "Too late...") + to_chat(src, span_warning("Too late...")) return if(responsey == "Yes") adjust_triumphs(-1) diff --git a/code/modules/jobs/job_types/roguetown/goblin/goblinking.dm b/code/modules/jobs/job_types/roguetown/goblin/goblinking.dm index 90c160f85..915eb5baf 100644 --- a/code/modules/jobs/job_types/roguetown/goblin/goblinking.dm +++ b/code/modules/jobs/job_types/roguetown/goblin/goblinking.dm @@ -44,7 +44,7 @@ var/inputty = input("Make an announcement", "ROGUETOWN") as text|null if(inputty) if(!istype(get_area(src), /area/rogue/indoors/shelter/mountains/decap)) - to_chat(src, "I need to do this from the Goblin Kingdom.") + to_chat(src, span_warning("I need to do this from the Goblin Kingdom.")) return FALSE priority_announce("[inputty]", title = "The Goblin King Squeals", sound = 'sound/misc/dun.ogg') /* @@ -59,7 +59,7 @@ var/list/souloptions = list("Goblin Cook", "Goblin Guard", "Goblin Smith") var/pickedsoul = input("Which worker shall join kingdom?", "Available workers") as null|anything in souloptions if(!istype(get_area(src), /area/rogue/indoors/shelter/mountains/decap)) - to_chat(src, "I need to do this from the Goblin Kingdom.") + to_chat(src, span_warning("I need to do this from the Goblin Kingdom.")) return FALSE if(!pickedsoul) return diff --git a/code/modules/jobs/job_types/roguetown/nobility/bailiff.dm b/code/modules/jobs/job_types/roguetown/nobility/bailiff.dm index 63b353887..4eda10d77 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/bailiff.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/bailiff.dm @@ -135,7 +135,7 @@ var/choice = alert(lord, "The bailiff requests a new law!\n[requested_law]", "BAILIFF LAW REQUEST", "Yes", "No") if(choice != "Yes" || QDELETED(lord) || lord.stat > CONSCIOUS) if(bailiff) - to_chat("The lord has denied the request for a new law!") + to_chat(span_warning("The lord has denied the request for a new law!")) return make_law(requested_law) @@ -145,7 +145,7 @@ var/choice = alert(lord, "The bailiff requests the removal of a law!\n[GLOB.laws_of_the_land[requested_law]]", "BAILIFF LAW REQUEST", "Yes", "No") if(choice != "Yes" || QDELETED(lord) || lord.stat > CONSCIOUS) if(bailiff) - to_chat("The lord has denied the request for a law removal!") + to_chat(span_warning("The lord has denied the request for a law removal!")) return remove_law(requested_law) @@ -153,7 +153,7 @@ var/choice = alert(lord, "The bailiff requests a purge of all laws!", "BAILIFF PURGE REQUEST", "Yes", "No") if(choice != "Yes" || QDELETED(lord) || lord.stat > CONSCIOUS) if(bailiff) - to_chat("The lord has denied the request for a purge of all laws!") + to_chat(span_warning("The lord has denied the request for a purge of all laws!")) return purge_laws() @@ -161,6 +161,6 @@ var/choice = alert(lord, "The bailiff requests to outlaw someone!\n[requested_outlaw]", "BAILIFF OUTLAW REQUEST", "Yes", "No") if(choice != "Yes" || QDELETED(lord) || lord.stat > CONSCIOUS) if(bailiff) - to_chat("The lord has denied the request for declaring an outlaw!") + to_chat(span_warning("The lord has denied the request for declaring an outlaw!")) return make_outlaw(requested_outlaw) diff --git a/code/modules/jobs/job_types/roguetown/nobility/lord.dm b/code/modules/jobs/job_types/roguetown/nobility/lord.dm index a07d02061..89927dd2d 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/lord.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/lord.dm @@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(lord_titles) continue recruitment[village_idiot.name] = village_idiot if(!length(recruitment)) - to_chat(user, "There are no potential honoraries in range.") + to_chat(user, span_warning("There are no potential honoraries in range.")) return var/inputty = input(user, "Select an honorary!", "[name]") as anything in recruitment if(inputty) @@ -173,9 +173,9 @@ GLOBAL_LIST_EMPTY(lord_titles) if(!QDELETED(recruit) && (recruit in get_hearers_in_view(title_range, user))) INVOKE_ASYNC(src, PROC_REF(village_idiotify), recruit, user, granted_title) else - to_chat(user, "Honorific failed!") + to_chat(user, span_warning("Honorific failed!")) else - to_chat(user, "Honorific cancelled.") + to_chat(user, span_warning("Honorific cancelled.")) /obj/effect/proc_holder/spell/self/grant_title/proc/can_title(mob/living/carbon/human/recruit) //wtf diff --git a/code/modules/jobs/job_types/roguetown/nobility/sheriff.dm b/code/modules/jobs/job_types/roguetown/nobility/sheriff.dm index e47a79c52..bd3bf3a74 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/sheriff.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/sheriff.dm @@ -120,7 +120,7 @@ continue recruitment[recruit.name] = recruit if(!length(recruitment)) - to_chat(user, "There are no potential recruits in range.") + to_chat(user, span_warning("There are no potential recruits in range.")) return var/inputty = input(user, "Select a potential recruit!", "[name]") as anything in recruitment if(inputty) @@ -128,9 +128,9 @@ if(!QDELETED(recruit) && (recruit in get_hearers_in_view(recruitment_range, user))) INVOKE_ASYNC(src, PROC_REF(convert), recruit, user) else - to_chat(user, "Recruitment failed!") + to_chat(user, span_warning("Recruitment failed!")) else - to_chat(user, "Recruitment cancelled.") + to_chat(user, span_warning("Recruitment cancelled.")) /obj/effect/proc_holder/spell/self/convertrole/proc/can_convert(mob/living/carbon/human/recruit) //wtf diff --git a/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm b/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm index 05df179a6..abd83cd94 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm @@ -80,23 +80,23 @@ msg = "It's started to get a little smaller than it used to be, but it'll definitely still last for a while." else msg = "It's seen some light use, but it's still pretty fresh." - . += "[msg]" + . += span_notice("[msg]") /obj/item/bath/soap/attack(mob/target, mob/user) var/turf/bathspot = get_turf(target) if(!istype(bathspot, /turf/open/water/bath)) - to_chat(user, "They must be in the bath water!") + to_chat(user, span_warning("They must be in the bath water!")) return if(istype(target, /mob/living/carbon/human)) - visible_message("[user] begins scrubbing [target] with the [src].") + visible_message(span_info("[user] begins scrubbing [target] with the [src].")) if(do_after(user, 50)) if(user.job == "Bath Wench") - visible_message("[user] expertly scrubs and soothes [target] with the [src].") - to_chat(target, "I feel so relaxed and clean!") + visible_message(span_info("[user] expertly scrubs and soothes [target] with the [src].")) + to_chat(target, span_love("I feel so relaxed and clean!")) SEND_SIGNAL(target, COMSIG_ADD_MOOD_EVENT, "bathcleaned", /datum/mood_event/bathcleaned) else - visible_message("[user] tries their best to scrub [target] with the [src].") - to_chat(target, "Ouch! That hurts!") + visible_message(span_info("[user] tries their best to scrub [target] with the [src].")) + to_chat(target, span_warning("Ouch! That hurts!")) uses -= 1 if(uses == 0) qdel(src) diff --git a/code/modules/keybindings/bindings_client.dm b/code/modules/keybindings/bindings_client.dm index f0cc85e9a..8b3251ce3 100644 --- a/code/modules/keybindings/bindings_client.dm +++ b/code/modules/keybindings/bindings_client.dm @@ -30,7 +30,7 @@ ///Check if the key is short enough to even be a real key if(LAZYLEN(_key) > MAX_KEYPRESS_COMMANDLENGTH) - to_chat(src, "Invalid KeyDown detected! You have been disconnected from the server automatically.") + to_chat(src, span_danger("Invalid KeyDown detected! You have been disconnected from the server automatically.")) log_admin("Client [ckey] just attempted to send an invalid keypress. Keymessage was over [MAX_KEYPRESS_COMMANDLENGTH] characters, autokicking due to likely abuse.") message_admins("Client [ckey] just attempted to send an invalid keypress. Keymessage was over [MAX_KEYPRESS_COMMANDLENGTH] characters, autokicking due to likely abuse.") qdel(src) diff --git a/code/modules/language/codespeak.dm b/code/modules/language/codespeak.dm index 1a3423d91..46f88417d 100644 --- a/code/modules/language/codespeak.dm +++ b/code/modules/language/codespeak.dm @@ -42,10 +42,10 @@ return if(user.has_language(/datum/language/codespeak)) - to_chat(user, "I start skimming through [src], but you already know Codespeak.") + to_chat(user, span_boldwarning("I start skimming through [src], but you already know Codespeak.")) return - to_chat(user, "I start skimming through [src], and suddenly your mind is filled with codewords and responses.") + to_chat(user, span_boldannounce("I start skimming through [src], and suddenly your mind is filled with codewords and responses.")) user.grant_language(/datum/language/codespeak) use_charge(user) @@ -60,11 +60,11 @@ playsound(loc, "punch", 25, TRUE, -1) if(M.stat == DEAD) - M.visible_message("[user] smacks [M]'s lifeless corpse with [src].", "[user] smacks your lifeless corpse with [src].", "I hear smacking.") + M.visible_message(span_danger("[user] smacks [M]'s lifeless corpse with [src]."), span_danger("[user] smacks your lifeless corpse with [src]."), span_hear("I hear smacking.")) else if(M.has_language(/datum/language/codespeak)) - M.visible_message("[user] beats [M] over the head with [src]!", "[user] beats you over the head with [src]!", "I hear smacking.") + M.visible_message(span_danger("[user] beats [M] over the head with [src]!"), span_danger("[user] beats you over the head with [src]!"), span_hear("I hear smacking.")) else - M.visible_message("[user] teaches [M] by beating [M.p_them()] over the head with [src]!", "As [user] hits you with [src], codewords and responses flow through your mind.", "I hear smacking.") + M.visible_message(span_notice("[user] teaches [M] by beating [M.p_them()] over the head with [src]!"), span_boldnotice("As [user] hits you with [src], codewords and responses flow through your mind."), span_hear("I hear smacking.")) M.grant_language(/datum/language/codespeak) use_charge(user) @@ -72,7 +72,7 @@ charges-- if(!charges) var/turf/T = get_turf(src) - T.visible_message("The cover and contents of [src] start shifting and changing!") + T.visible_message(span_warning("The cover and contents of [src] start shifting and changing!")) qdel(src) var/obj/item/book/manual/random/book = new(T) diff --git a/code/modules/library/book.dm b/code/modules/library/book.dm index 7f1ddacf2..4493367db 100644 --- a/code/modules/library/book.dm +++ b/code/modules/library/book.dm @@ -84,7 +84,7 @@ if(!override_find_book) pages = SSlibrarian.get_book(bookfile) if(!pages.len) - to_chat(user, "This book is completely blank.") + to_chat(user, span_warning("This book is completely blank.")) if(curpage > pages.len) curpage = 1 // var/curdat = pages[curpage] @@ -99,4 +99,4 @@ user << browse(dat, "window=reading;size=1000x700;can_close=1;can_minimize=0;can_maximize=0;can_resize=1;titlebar=0;border=0") onclose(user, "reading", src) else - return "You're too far away to read it." + return span_warning("You're too far away to read it.") diff --git a/code/modules/library/lib_codex_gigas.dm b/code/modules/library/lib_codex_gigas.dm index 780722501..35df68748 100644 --- a/code/modules/library/lib_codex_gigas.dm +++ b/code/modules/library/lib_codex_gigas.dm @@ -24,19 +24,19 @@ if(!user.can_read(src)) return FALSE if(inUse) - to_chat(user, "Someone else is reading it.") + to_chat(user, span_notice("Someone else is reading it.")) if(ishuman(user)) var/mob/living/carbon/human/U = user if(U.check_acedia()) - to_chat(user, "None of this matters, why are you reading this? You put [title] down.") + to_chat(user, span_notice("None of this matters, why are you reading this? You put [title] down.")) return - user.visible_message("[user] opens [title] and begins reading intently.") + user.visible_message(span_notice("[user] opens [title] and begins reading intently.")) ask_name(user) /obj/item/book/codex_gigas/proc/perform_research(mob/user, devilName) if(!devilName) - user.visible_message("[user] closes [title] without looking anything up.") + user.visible_message(span_notice("[user] closes [title] without looking anything up.")) return inUse = TRUE var/speed = 300 diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index cbdc39485..d8aa6e31b 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -28,16 +28,16 @@ /obj/structure/bookcase/examine(mob/user) . = ..() // if(!anchored) -// . += "The bolts on the bottom are unsecured." +// . += span_notice("The bolts on the bottom are unsecured.") // else -// . += "It's secured in place with bolts." +// . += span_notice("It's secured in place with bolts.") // switch(state) /// if(0) -// // . += "There's a small crack visible on the back panel." +// // . += span_notice("There's a small crack visible on the back panel.") // // if(1) -// // . += "There's space inside for a wooden shelf." +// // . += span_notice("There's space inside for a wooden shelf.") // // if(2) -// // . += "There's a small crack visible on the shelf." +// // . += span_notice("There's a small crack visible on the shelf.") /obj/structure/bookcase/Initialize(mapload) . = ..() @@ -56,12 +56,12 @@ if(0) if(I.tool_behaviour == TOOL_WRENCH) if(I.use_tool(src, user, 20, volume=50)) - to_chat(user, "I wrench the frame into place.") + to_chat(user, span_notice("I wrench the frame into place.")) anchored = TRUE state = 1 if(I.tool_behaviour == TOOL_CROWBAR) if(I.use_tool(src, user, 20, volume=50)) - to_chat(user, "I pry the frame apart.") + to_chat(user, span_notice("I pry the frame apart.")) deconstruct(TRUE) if(1) @@ -69,12 +69,12 @@ var/obj/item/stack/sheet/mineral/wood/W = I if(W.get_amount() >= 2) W.use(2) - to_chat(user, "I add a shelf.") + to_chat(user, span_notice("I add a shelf.")) state = 2 icon_state = "book-0" if(I.tool_behaviour == TOOL_WRENCH) I.play_tool_sound(src, 100) - to_chat(user, "I unwrench the frame.") + to_chat(user, span_notice("I unwrench the frame.")) anchored = FALSE state = 0 @@ -82,7 +82,7 @@ var/datum/component/storage/STR = I.GetComponent(/datum/component/storage) if(is_type_in_list(I, allowed_books)) if(!(contents.len <= 15)) - to_chat(user, "There are too many books on this shelf!") + to_chat(user, span_notice("There are too many books on this shelf!")) return if(!user.transferItemToLoc(I, src)) return @@ -91,11 +91,11 @@ for(var/obj/item/T in I.contents) if(istype(T, /obj/item/book) || istype(T, /obj/item/spellbook)) STR.remove_from_storage(T, src) - to_chat(user, "I empty \the [I] into \the [src].") + to_chat(user, span_notice("I empty \the [I] into \the [src].")) update_icon() else if(istype(I, /obj/item/pen)) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on the side of [src]!") + to_chat(user, span_notice("I scribble illegibly on the side of [src]!")) return var/newname = stripped_input(user, "What would you like to title this bookshelf?") if(!user.canUseTopic(src, BE_CLOSE)) @@ -106,10 +106,10 @@ name = "bookcase ([sanitize(newname)])" else if(I.tool_behaviour == TOOL_CROWBAR) if(contents.len) - to_chat(user, "I need to remove the books first!") + to_chat(user, span_warning("I need to remove the books first!")) else I.play_tool_sound(src, 100) - to_chat(user, "I pry the shelf out.") + to_chat(user, span_notice("I pry the shelf out.")) new /obj/item/stack/sheet/mineral/wood(drop_location(), 2) state = 1 icon_state = "bookempty" diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 66a3e94eb..e1e98b7cc 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -323,15 +323,15 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums /obj/machinery/computer/libraryconsole/bookmanagement/proc/print_forbidden_lore(mob/user) new /obj/item/melee/cultblade/dagger(get_turf(src)) - to_chat(user, "My sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a sinister dagger sitting on the desk. You don't even remember where it came from...") - user.visible_message("[user] stares at the blank screen for a few moments, [user.p_their()] expression frozen in fear. When [user.p_they()] finally awaken[user.p_s()] from it, [user.p_they()] look[user.p_s()] a lot older.", 2) + to_chat(user, span_warning("My sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a sinister dagger sitting on the desk. You don't even remember where it came from...")) + user.visible_message(span_warning("[user] stares at the blank screen for a few moments, [user.p_their()] expression frozen in fear. When [user.p_they()] finally awaken[user.p_s()] from it, [user.p_they()] look[user.p_s()] a lot older."), 2) /obj/machinery/computer/libraryconsole/bookmanagement/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/barcodescanner)) var/obj/item/barcodescanner/scanner = W scanner.computer = src - to_chat(user, "[scanner]'s associated machine has been set to [src].") - audible_message("[src] lets out a low, short blip.") + to_chat(user, span_notice("[scanner]'s associated machine has been set to [src].")) + audible_message(span_hear("[src] lets out a low, short blip.")) else return ..() @@ -472,7 +472,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums B.author = author B.dat = content B.icon_state = "book[rand(1,8)]" - visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?") + visible_message(span_notice("[src]'s printer hums as it produces a completely bound book. How did it do that?")) break qdel(query_library_print) if(href_list["printbible"]) @@ -576,18 +576,18 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums if(stat) return if(busy) - to_chat(user, "The book binder is busy. Please wait for completion of previous operation.") + to_chat(user, span_warning("The book binder is busy. Please wait for completion of previous operation.")) return if(!user.transferItemToLoc(P, src)) return - user.visible_message("[user] loads some paper into [src].", "I load some paper into [src].") - audible_message("[src] begins to hum as it warms up its printing drums.") + user.visible_message(span_notice("[user] loads some paper into [src]."), span_notice("I load some paper into [src].")) + audible_message(span_hear("[src] begins to hum as it warms up its printing drums.")) busy = TRUE sleep(rand(200,400)) busy = FALSE if(P) if(!stat) - visible_message("[src] whirs as it prints and binds a new book.") + visible_message(span_notice("[src] whirs as it prints and binds a new book.")) var/obj/item/book/B = new(src.loc) B.dat = P.info B.name = "Print Job #" + "[rand(100, 999)]" diff --git a/code/modules/library/random_books.dm b/code/modules/library/random_books.dm index 693d9e183..b7b885f54 100644 --- a/code/modules/library/random_books.dm +++ b/code/modules/library/random_books.dm @@ -54,7 +54,7 @@ if(istype(I, /obj/item/book/rogue/playerbook)) var/obj/item/book/rogue/playerbook/PB = I if(PB.is_in_round_player_generated) - to_chat(user, "[SSlibrarian.playerbook2file(PB.player_book_text, PB.player_book_title, PB.player_book_author, PB.player_book_author_ckey, PB.player_book_icon)]") + to_chat(user, span_notice("[SSlibrarian.playerbook2file(PB.player_book_text, PB.player_book_title, PB.player_book_author, PB.player_book_author_ckey, PB.player_book_icon)]")) PB.is_in_round_player_generated = FALSE . = ..() diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm index 7bba0a9e6..9202fbb3b 100644 --- a/code/modules/library/soapstone.dm +++ b/code/modules/library/soapstone.dm @@ -27,18 +27,18 @@ var/obj/structure/chisel_message/existing_message = locate() in T if(!remaining_uses && !existing_message) - to_chat(user, "[src] is too worn out to use.") + to_chat(user, span_warning("[src] is too worn out to use.")) return if(!good_chisel_message_location(T)) - to_chat(user, "It's not appropriate to engrave on [T].") + to_chat(user, span_warning("It's not appropriate to engrave on [T].")) return if(existing_message) - user.visible_message("[user] starts erasing [existing_message].", "I start erasing [existing_message].", "I hear a chipping sound.") + user.visible_message(span_notice("[user] starts erasing [existing_message]."), span_notice("I start erasing [existing_message]."), span_hear("I hear a chipping sound.")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) if(do_after(user, tool_speed, target = existing_message)) - user.visible_message("[user] erases [existing_message].", "I erase [existing_message][existing_message.creator_key == user.ckey ? ", refunding a use" : ""].") + user.visible_message(span_notice("[user] erases [existing_message]."), span_notice("I erase [existing_message][existing_message.creator_key == user.ckey ? ", refunding a use" : ""].")) existing_message.persists = FALSE qdel(existing_message) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) @@ -48,17 +48,17 @@ var/message = stripped_input(user, "What would you like to engrave?", "Leave a message") if(!message) - to_chat(user, "I decide not to engrave anything.") + to_chat(user, span_notice("I decide not to engrave anything.")) return if(!target.Adjacent(user) && locate(/obj/structure/chisel_message) in T) - to_chat(user, "Someone wrote here before you chose! Find another spot.") + to_chat(user, span_warning("Someone wrote here before you chose! Find another spot.")) return playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) - user.visible_message("[user] starts engraving a message into [T]...", "I start engraving a message into [T]...", "I hear a chipping sound.") + user.visible_message(span_notice("[user] starts engraving a message into [T]..."), span_notice("I start engraving a message into [T]..."), span_hear("I hear a chipping sound.")) if(can_use() && do_after(user, tool_speed, target = T) && can_use()) //This looks messy but it's actually really clever! if(!locate(/obj/structure/chisel_message) in T) - user.visible_message("[user] leaves a message for future spacemen!", "I engrave a message into [T]!", "I hear a chipping sound.") + user.visible_message(span_notice("[user] leaves a message for future spacemen!"), span_notice("I engrave a message into [T]!"), span_hear("I hear a chipping sound.")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) var/obj/structure/chisel_message/M = new(T) M.register(user, message) diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index de0825928..3f61eabfc 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -144,7 +144,7 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/structure/closet/crate/secure/loot/attack_hand(mob/user) if(locked) - to_chat(user, "The crate is locked with a Deca-code lock.") + to_chat(user, span_notice("The crate is locked with a Deca-code lock.")) var/input = input(usr, "Enter [codelen] digits. All digits must be unique.", "Deca-Code Lock", "") as text|null if(user.canUseTopic(src, BE_CLOSE)) var/list/sanitised = list() @@ -156,15 +156,15 @@ if(sanitised[i] == sanitised[j]) sanitycheck = null //if a digit is repeated, reject the input if (input == code) - to_chat(user, "The crate unlocks!") + to_chat(user, span_notice("The crate unlocks!")) locked = FALSE cut_overlays() add_overlay("securecrateg") tamperproof = 0 // set explosion chance to zero, so we dont accidently hit it with a multitool and instantly die else if (input == null || sanitycheck == null || length(input) != codelen) - to_chat(user, "I leave the crate alone.") + to_chat(user, span_notice("I leave the crate alone.")) else - to_chat(user, "A red light flashes.") + to_chat(user, span_warning("A red light flashes.")) lastattempt = input attempts-- if(attempts == 0) @@ -180,11 +180,11 @@ /obj/structure/closet/crate/secure/loot/attackby(obj/item/W, mob/user) if(locked) if(W.tool_behaviour == TOOL_MULTITOOL) - to_chat(user, "DECA-CODE LOCK REPORT:") + to_chat(user, span_notice("DECA-CODE LOCK REPORT:")) if(attempts == 1) - to_chat(user, "* Anti-Tamper Bomb will activate on next failed access attempt.") + to_chat(user, span_warning("* Anti-Tamper Bomb will activate on next failed access attempt.")) else - to_chat(user, "* Anti-Tamper Bomb will activate after [attempts] failed access attempts.") + to_chat(user, span_notice("* Anti-Tamper Bomb will activate after [attempts] failed access attempts.")) if(lastattempt != null) var/list/guess = list() var/list/answer = list() @@ -201,14 +201,14 @@ ++bulls --cows - to_chat(user, "Last code attempt, [lastattempt], had [bulls] correct digits at correct positions and [cows] correct digits at incorrect positions.") + to_chat(user, span_notice("Last code attempt, [lastattempt], had [bulls] correct digits at correct positions and [cows] correct digits at incorrect positions.")) return return ..() /obj/structure/closet/secure/loot/dive_into(mob/living/user) if(!locked) return ..() - to_chat(user, "That seems like a stupid idea.") + to_chat(user, span_notice("That seems like a stupid idea.")) return FALSE /obj/structure/closet/crate/secure/loot/emag_act(mob/user) diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 544c68d3b..c16126013 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -54,13 +54,13 @@ interface with the mining shuttle at the landing site if a mobile beacon is also var/integrity = max((T.obj_integrity-T.integrity_failure * T.max_integrity)/(T.max_integrity-T.integrity_failure * max_integrity)*100, 0) var/status if(T.stat & BROKEN) - status = "ERROR" + status = span_bad("ERROR") else if(!T.on) status = "Disabled" else if(T.raised) - status = "Firing" + status = span_average("Firing") else - status = "All Clear" + status = span_good("All Clear") dat += "[T.name] | [integrity]% | [status] | [dir2text(get_dir(src, T))] | [get_dist(src, T)]m Toggle Power
" @@ -78,16 +78,16 @@ interface with the mining shuttle at the landing site if a mobile beacon is also usr.set_machine(src) add_fingerprint(usr) if(!allowed(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, span_danger("Access denied.")) return if(href_list["move"]) if(!is_station_level(z) && shuttleId == "colony_drop") - to_chat(usr, "I can't move the base again!") + to_chat(usr, span_warning("I can't move the base again!")) return var/shuttle_error = SSshuttle.moveShuttle(shuttleId, href_list["move"], 1) if(launch_warning) - say("Launch sequence activated! Prepare for drop!!") + say(span_danger("Launch sequence activated! Prepare for drop!!")) playsound(loc, 'sound/blank.ogg', 70, FALSE) launch_warning = FALSE else if(!shuttle_error) @@ -103,11 +103,11 @@ interface with the mining shuttle at the landing site if a mobile beacon is also var/turf/LZ = safepick(all_mining_turfs) //Pick a random mining Z-level turf if(!ismineralturf(LZ) && !istype(LZ, /turf/open/floor/plating/asteroid)) //Find a suitable mining turf. Reduces chance of landing in a bad area - to_chat(usr, "Landing zone scan failed. Please try again.") + to_chat(usr, span_warning("Landing zone scan failed. Please try again.")) updateUsrDialog() return if(set_landing_zone(LZ, usr) != ZONE_SET) - to_chat(usr, "Landing zone unsuitable. Please recalculate.") + to_chat(usr, span_warning("Landing zone unsuitable. Please recalculate.")) updateUsrDialog() return @@ -135,7 +135,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also /obj/machinery/computer/auxillary_base/proc/set_landing_zone(turf/T, mob/user, no_restrictions) var/obj/docking_port/mobile/auxillary_base/base_dock = locate(/obj/docking_port/mobile/auxillary_base) in SSshuttle.mobile if(!base_dock) //Not all maps have an Aux base. This object is useless in that case. - to_chat(user, "This station is not equipped with an auxillary base. Please contact your Nanotrasen contractor.") + to_chat(user, span_warning("This station is not equipped with an auxillary base. Please contact your Nanotrasen contractor.")) return if(!no_restrictions) var/static/list/disallowed_turf_types = typecacheof(list( @@ -178,7 +178,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also //Serves as a nice mechanic to people get ready for the launch. minor_announce("Auxiliary base landing zone coordinates locked in for [A]. Launch command now available!") - to_chat(user, "Landing zone set.") + to_chat(user, span_notice("Landing zone set.")) return ZONE_SET @@ -198,7 +198,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also if(setting) return - to_chat(user, "I begin setting the landing zone parameters...") + to_chat(user, span_notice("I begin setting the landing zone parameters...")) setting = TRUE if(!do_after(user, 50, target = user)) //You get a few seconds to cancel if you do not want to drop there. setting = FALSE @@ -213,20 +213,20 @@ interface with the mining shuttle at the landing site if a mobile beacon is also AB = A break if(!AB) - to_chat(user, "No auxillary base console detected.") + to_chat(user, span_warning("No auxillary base console detected.")) return switch(AB.set_landing_zone(T, user, no_restrictions)) if(ZONE_SET) qdel(src) if(BAD_ZLEVEL) - to_chat(user, "This uplink can only be used in a designed mining zone.") + to_chat(user, span_warning("This uplink can only be used in a designed mining zone.")) if(BAD_AREA) - to_chat(user, "Unable to acquire a targeting lock. Find an area clear of structures or entirely within one.") + to_chat(user, span_warning("Unable to acquire a targeting lock. Find an area clear of structures or entirely within one.")) if(BAD_COORDS) - to_chat(user, "Location is too close to the edge of the station's scanning range. Move several paces away and try again.") + to_chat(user, span_warning("Location is too close to the edge of the station's scanning range. Move several paces away and try again.")) if(BAD_TURF) - to_chat(user, "The landing zone contains turfs unsuitable for a base. Make sure you've removed all walls and dangerous terrain from the landing zone.") + to_chat(user, span_warning("The landing zone contains turfs unsuitable for a base. Make sure you've removed all walls and dangerous terrain from the landing zone.")) /obj/item/assault_pod/mining/unrestricted name = "omni-locational landing field designator" @@ -277,11 +277,11 @@ interface with the mining shuttle at the landing site if a mobile beacon is also if(.) return if(anchored) - to_chat(user, "Landing zone already set.") + to_chat(user, span_warning("Landing zone already set.")) return if(anti_spam_cd) - to_chat(user, "[src] is currently recalibrating. Please wait.") + to_chat(user, span_warning("[src] is currently recalibrating. Please wait.")) return anti_spam_cd = 1 @@ -290,7 +290,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also var/turf/landing_spot = get_turf(src) if(!is_mining_level(landing_spot.z)) - to_chat(user, "This device is only to be used in a mining zone.") + to_chat(user, span_warning("This device is only to be used in a mining zone.")) return var/obj/machinery/computer/auxillary_base/aux_base_console for(var/obj/machinery/computer/auxillary_base/ABC in GLOB.machines) @@ -298,7 +298,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also aux_base_console = ABC break if(!aux_base_console) //Needs to be near the base to serve as its dock and configure it to control the mining shuttle. - to_chat(user, "The auxillary base's console must be within [console_range] meters in order to interface.") + to_chat(user, span_warning("The auxillary base's console must be within [console_range] meters in order to interface.")) return //Mining shuttles may not be created equal, so we find the map's shuttle dock and size accordingly. @@ -320,7 +320,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also break if(!Mport) - to_chat(user, "This station is not equipped with an appropriate mining shuttle. Please contact Nanotrasen Support.") + to_chat(user, span_warning("This station is not equipped with an appropriate mining shuttle. Please contact Nanotrasen Support.")) return var/obj/docking_port/mobile/mining_shuttle @@ -334,7 +334,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also break if(!mining_shuttle) //Not having a mining shuttle is a map issue - to_chat(user, "No mining shuttle signal detected. Please contact Nanotrasen Support.") + to_chat(user, span_warning("No mining shuttle signal detected. Please contact Nanotrasen Support.")) SSshuttle.stationary.Remove(Mport) qdel(Mport) return @@ -342,24 +342,24 @@ interface with the mining shuttle at the landing site if a mobile beacon is also for(var/i in 1 to landing_turfs.len) //You land NEAR the base, not IN it. var/turf/L = landing_turfs[i] if(!L) //This happens at map edges - to_chat(user, "Unable to secure a valid docking zone. Please try again in an open area near, but not within the aux. mining base.") + to_chat(user, span_warning("Unable to secure a valid docking zone. Please try again in an open area near, but not within the aux. mining base.")) SSshuttle.stationary.Remove(Mport) qdel(Mport) return if(istype(get_area(L), /area/shuttle/auxillary_base)) - to_chat(user, "The mining shuttle must not land within the mining base itself.") + to_chat(user, span_warning("The mining shuttle must not land within the mining base itself.")) SSshuttle.stationary.Remove(Mport) qdel(Mport) return if(mining_shuttle.canDock(Mport) != SHUTTLE_CAN_DOCK) - to_chat(user, "Unable to secure a valid docking zone. Please try again in an open area near, but not within the aux. mining base.") + to_chat(user, span_warning("Unable to secure a valid docking zone. Please try again in an open area near, but not within the aux. mining base.")) SSshuttle.stationary.Remove(Mport) qdel(Mport) return aux_base_console.set_mining_mode() //Lets the colony park the shuttle there, now that it has a dock. - to_chat(user, "Mining shuttle calibration successful! Shuttle interface available at base console.") + to_chat(user, span_notice("Mining shuttle calibration successful! Shuttle interface available at base console.")) anchored = TRUE //Locks in place to mark the landing zone. playsound(loc, 'sound/blank.ogg', 50, FALSE) diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm index 87ef34632..ab14a63fb 100644 --- a/code/modules/mining/aux_base_camera.dm +++ b/code/modules/mining/aux_base_camera.dm @@ -23,7 +23,7 @@ /obj/item/construction/rcd/internal //Base console's internal RCD. Roundstart consoles are filled, rebuilt cosoles start empty. name = "internal RCD" max_matter = 600 //Bigger container and faster speeds due to being specialized and stationary. - no_ammo_message = "Internal matter exhausted. Please add additional materials." + no_ammo_message = span_warning("Internal matter exhausted. Please add additional materials.") delay_mod = 0.5 /obj/machinery/computer/camera_advanced/base_construction @@ -148,11 +148,11 @@ var/area/build_area = get_area(build_target) if(!istype(build_area, /area/shuttle/auxillary_base)) - to_chat(owner, "I can only build within the mining base!") + to_chat(owner, span_warning("I can only build within the mining base!")) return FALSE if(!is_station_level(build_target.z)) - to_chat(owner, "The mining base has launched and can no longer be modified.") + to_chat(owner, span_warning("The mining base has launched and can no longer be modified.")) return FALSE return TRUE @@ -229,19 +229,19 @@ datum/action/innate/aux_base/place_fan/Activate() var/turf/fan_turf = get_turf(remote_eye) if(!B.fans_remaining) - to_chat(owner, "[B] is out of fans!") + to_chat(owner, span_warning("[B] is out of fans!")) return if(!check_spot()) return if(fan_turf.density) - to_chat(owner, "Fans may only be placed on a floor.") + to_chat(owner, span_warning("Fans may only be placed on a floor.")) return new /obj/structure/fans/tiny(fan_turf) B.fans_remaining-- - to_chat(owner, "Tiny fan placed. [B.fans_remaining] remaining.") + to_chat(owner, span_notice("Tiny fan placed. [B.fans_remaining] remaining.")) playsound(fan_turf, 'sound/blank.ogg', 50, TRUE) datum/action/innate/aux_base/install_turret @@ -256,13 +256,13 @@ datum/action/innate/aux_base/install_turret/Activate() return if(!B.turret_stock) - to_chat(owner, "Unable to construct additional turrets.") + to_chat(owner, span_warning("Unable to construct additional turrets.")) return var/turf/turret_turf = get_turf(remote_eye) if(is_blocked_turf(turret_turf)) - to_chat(owner, "Location is obstructed by something. Please clear the location and try again.") + to_chat(owner, span_warning("Location is obstructed by something. Please clear the location and try again.")) return var/obj/machinery/porta_turret/aux_base/T = new /obj/machinery/porta_turret/aux_base(turret_turf) @@ -270,5 +270,5 @@ datum/action/innate/aux_base/install_turret/Activate() B.found_aux_console.turrets += T //Add new turret to the console's control B.turret_stock-- - to_chat(owner, "Turret installation complete!") + to_chat(owner, span_notice("Turret installation complete!")) playsound(turret_turf, 'sound/blank.ogg', 65, TRUE) diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index f4fc838da..cb83c1839 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -81,9 +81,9 @@ if(istype(C) && prob(2)) //cursed by bubblegum if(prob(15)) new /datum/hallucination/oh_yeah(C) - to_chat(C, "[pick("I AM IMMORTAL.","I SHALL TAKE BACK WHAT'S MINE.","I SEE YOU.","YOU CANNOT ESCAPE ME FOREVER.","DEATH CANNOT HOLD ME.")]") + to_chat(C, span_colossus("[pick("I AM IMMORTAL.","I SHALL TAKE BACK WHAT'S MINE.","I SEE YOU.","YOU CANNOT ESCAPE ME FOREVER.","DEATH CANNOT HOLD ME.")]")) else - to_chat(C, "[pick("You hear faint whispers.","You smell ash.","You feel hot.","You hear a roar in the distance.")]") + to_chat(C, span_warning("[pick("You hear faint whispers.","You smell ash.","You feel hot.","You hear a roar in the distance.")]")) /obj/item/clothing/head/helmet/space/hostile_environment name = "H.E.C.K. helmet" diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 993279ed2..04754c201 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -38,22 +38,22 @@ /obj/item/twohanded/kinetic_crusher/examine(mob/living/user) . = ..() - . += "Mark a large creature with the destabilizing force, then hit them in melee to do [force + detonation_damage] damage." - . += "Does [force + detonation_damage + backstab_bonus] damage if the target is backstabbed, instead of [force + detonation_damage]." + . += span_notice("Mark a large creature with the destabilizing force, then hit them in melee to do [force + detonation_damage] damage.") + . += span_notice("Does [force + detonation_damage + backstab_bonus] damage if the target is backstabbed, instead of [force + detonation_damage].") for(var/t in trophies) var/obj/item/crusher_trophy/T = t - . += "It has \a [T] attached, which causes [T.effect_desc()]." + . += span_notice("It has \a [T] attached, which causes [T.effect_desc()].") /obj/item/twohanded/kinetic_crusher/attackby(obj/item/I, mob/living/user) if(I.tool_behaviour == TOOL_CROWBAR) if(LAZYLEN(trophies)) - to_chat(user, "I remove [src]'s trophies.") + to_chat(user, span_notice("I remove [src]'s trophies.")) I.play_tool_sound(src) for(var/t in trophies) var/obj/item/crusher_trophy/T = t T.remove_from(src, user) else - to_chat(user, "There are no trophies on [src].") + to_chat(user, span_warning("There are no trophies on [src].")) else if(istype(I, /obj/item/crusher_trophy)) var/obj/item/crusher_trophy/T = I T.add_to(src, user) @@ -62,7 +62,7 @@ /obj/item/twohanded/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user) if(!wielded) - to_chat(user, "[src] is too heavy to use with one hand! You fumble and drop everything.") + to_chat(user, span_warning("[src] is too heavy to use with one hand! You fumble and drop everything.")) user.drop_all_held_items() return var/datum/status_effect/crusher_damage/C = target.has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING) @@ -196,7 +196,7 @@ /obj/item/crusher_trophy/examine(mob/living/user) . = ..() - . += "Causes [effect_desc()] when attached to a kinetic crusher." + . += span_notice("Causes [effect_desc()] when attached to a kinetic crusher.") /obj/item/crusher_trophy/proc/effect_desc() return "errors" @@ -211,12 +211,12 @@ for(var/t in H.trophies) var/obj/item/crusher_trophy/T = t if(istype(T, denied_type) || istype(src, T.denied_type)) - to_chat(user, "I can't seem to attach [src] to [H]. Maybe remove a few trophies?") + to_chat(user, span_warning("I can't seem to attach [src] to [H]. Maybe remove a few trophies?")) return FALSE if(!user.transferItemToLoc(src, H)) return H.trophies += src - to_chat(user, "I attach [src] to [H].") + to_chat(user, span_notice("I attach [src] to [H].")) return TRUE /obj/item/crusher_trophy/proc/remove_from(obj/item/twohanded/kinetic_crusher/H, mob/living/user) diff --git a/code/modules/mining/equipment/lazarus_injector.dm b/code/modules/mining/equipment/lazarus_injector.dm index a4014791d..d8ffe5272 100644 --- a/code/modules/mining/equipment/lazarus_injector.dm +++ b/code/modules/mining/equipment/lazarus_injector.dm @@ -23,7 +23,7 @@ if(isanimal(target)) var/mob/living/simple_animal/M = target if(M.sentience_type != revive_type) - to_chat(user, "[src] does not work on this sort of creature.") + to_chat(user, span_info("[src] does not work on this sort of creature.")) return if(M.stat == DEAD) M.faction = list("neutral") @@ -39,16 +39,16 @@ else H.attack_same = 0 loaded = 0 - user.visible_message("[user] injects [M] with [src], reviving it.") + user.visible_message(span_notice("[user] injects [M] with [src], reviving it.")) SSblackbox.record_feedback("tally", "lazarus_injector", 1, M.type) playsound(src,'sound/blank.ogg',50,TRUE) icon_state = "lazarus_empty" return else - to_chat(user, "[src] is only effective on the dead.") + to_chat(user, span_info("[src] is only effective on the dead.")) return else - to_chat(user, "[src] is only effective on lesser beings.") + to_chat(user, span_info("[src] is only effective on lesser beings.")) return /obj/item/lazarus_injector/emp_act() @@ -61,6 +61,6 @@ /obj/item/lazarus_injector/examine(mob/user) . = ..() if(!loaded) - . += "[src] is empty." + . += span_info("[src] is empty.") if(malfunctioning) - . += "The display on [src] seems to be flickering." + . += span_info("The display on [src] seems to be flickering.") diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm index 181217f8c..11935657d 100644 --- a/code/modules/mining/equipment/marker_beacons.dm +++ b/code/modules/mining/equipment/marker_beacons.dm @@ -45,13 +45,13 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list( /obj/item/stack/marker_beacon/attack_self(mob/user) if(!isturf(user.loc)) - to_chat(user, "I need more space to place a [singular_name] here.") + to_chat(user, span_warning("I need more space to place a [singular_name] here.")) return if(locate(/obj/structure/marker_beacon) in user.loc) - to_chat(user, "There is already a [singular_name] here.") + to_chat(user, span_warning("There is already a [singular_name] here.")) return if(use(1)) - to_chat(user, "I activate and anchor [amount ? "a":"the"] [singular_name] in place.") + to_chat(user, span_notice("I activate and anchor [amount ? "a":"the"] [singular_name] in place.")) playsound(user, 'sound/blank.ogg', 50, TRUE) var/obj/structure/marker_beacon/M = new(user.loc, picked_color) transfer_fingerprints_to(M) @@ -94,7 +94,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list( /obj/structure/marker_beacon/examine(mob/user) . = ..() - . += "Alt-click to select a color. Current color is [picked_color]." + . += span_notice("Alt-click to select a color. Current color is [picked_color].") /obj/structure/marker_beacon/update_icon() while(!picked_color || !GLOB.marker_beacon_colors[picked_color]) @@ -106,7 +106,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list( . = ..() if(.) return - to_chat(user, "I start picking [src] up...") + to_chat(user, span_notice("I start picking [src] up...")) if(do_after(user, remove_speed, target = src)) var/obj/item/stack/marker_beacon/M = new(loc) M.picked_color = picked_color @@ -119,7 +119,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list( /obj/structure/marker_beacon/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/stack/marker_beacon)) var/obj/item/stack/marker_beacon/M = I - to_chat(user, "I start picking [src] up...") + to_chat(user, span_notice("I start picking [src] up...")) if(do_after(user, remove_speed, target = src) && M.amount + 1 <= M.max_amount) M.add(1) playsound(src, 'sound/blank.ogg', 50, TRUE) @@ -128,7 +128,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list( if(istype(I, /obj/item/light_eater)) var/obj/item/ash/A = new /obj/item/ash(drop_location()) A.desc += "\nLooks like this used to be \a [src] some time ago." - visible_message("[src] is disintegrated by [I]!") + visible_message(span_danger("[src] is disintegrated by [I]!")) playsound(src, 'sound/blank.ogg', 50, TRUE) qdel(src) return diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 1f1d3cdd2..8a8b4b98c 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -18,10 +18,10 @@ attack_verb = list("hit", "pierced", "sliced", "attacked") /obj/item/pickaxe/suicide_act(mob/living/user) - user.visible_message("[user] begins digging into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins digging into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!")) if(use_tool(user, user, 30, volume=50)) return BRUTELOSS - user.visible_message("[user] couldn't do it!") + user.visible_message(span_suicide("[user] couldn't do it!")) return SHAME /obj/item/pickaxe/mini @@ -115,10 +115,10 @@ AddComponent(/datum/component/butchering, 150, 40) //it's sharp, so it works, but barely. /obj/item/shovel/suicide_act(mob/living/user) - user.visible_message("[user] begins digging their own grave! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins digging their own grave! It looks like [user.p_theyre()] trying to commit suicide!")) if(use_tool(user, user, 30, volume=50)) return BRUTELOSS - user.visible_message("[user] couldn't do it!") + user.visible_message(span_suicide("[user] couldn't do it!")) return SHAME /obj/item/shovel/spade diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm index 26f12f694..90e3fe7a6 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -12,11 +12,11 @@ return var/obj/item/organ/regenerative_core/C = M if(!istype(C, /obj/item/organ/regenerative_core)) - to_chat(user, "The stabilizer only works on certain types of monster organs, generally regenerative in nature.") + to_chat(user, span_warning("The stabilizer only works on certain types of monster organs, generally regenerative in nature.")) return ..() C.preserved() - to_chat(user, "I inject the [M] with the stabilizer. It will no longer go inert.") + to_chat(user, span_notice("I inject the [M] with the stabilizer. It will no longer go inert.")) qdel(src) /************************Hivelord core*******************/ @@ -58,7 +58,7 @@ /obj/item/organ/regenerative_core/ui_action_click() if(inert) - to_chat(owner, "[src] breaks down as it tries to activate.") + to_chat(owner, span_notice("[src] breaks down as it tries to activate.")) else owner.revive(full_heal = TRUE, admin_revive = FALSE) qdel(src) @@ -73,17 +73,17 @@ if(ishuman(target)) var/mob/living/carbon/human/H = target if(inert) - to_chat(user, "[src] has decayed and can no longer be used to heal.") + to_chat(user, span_notice("[src] has decayed and can no longer be used to heal.")) return else if(H.stat == DEAD) - to_chat(user, "[src] is useless on the dead.") + to_chat(user, span_notice("[src] is useless on the dead.")) return if(H != user) - H.visible_message("[user] forces [H] to apply [src]... Black tendrils entangle and reinforce [H.p_them()]!") + H.visible_message(span_notice("[user] forces [H] to apply [src]... Black tendrils entangle and reinforce [H.p_them()]!")) SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "other")) else - to_chat(user, "I start to smear [src] on myself. Disgusting tendrils hold you together and allow you to keep moving, but for how long?") + to_chat(user, span_notice("I start to smear [src] on myself. Disgusting tendrils hold you together and allow you to keep moving, but for how long?")) SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self")) H.apply_status_effect(STATUS_EFFECT_REGENERATIVE_CORE) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman) //Now THIS is a miner buff (fixed - nerf) @@ -102,11 +102,11 @@ . = ..() if(!preserved && !inert) preserved(TRUE) - owner.visible_message("[src] stabilizes as it's inserted.") + owner.visible_message(span_notice("[src] stabilizes as it's inserted.")) /obj/item/organ/regenerative_core/Remove(mob/living/carbon/M, special = 0) if(!inert && !special) - owner.visible_message("[src] rapidly decays as it's removed.") + owner.visible_message(span_notice("[src] rapidly decays as it's removed.")) go_inert() return ..() diff --git a/code/modules/mining/equipment/resonator.dm b/code/modules/mining/equipment/resonator.dm index 0308cba73..69a02f1a9 100644 --- a/code/modules/mining/equipment/resonator.dm +++ b/code/modules/mining/equipment/resonator.dm @@ -26,10 +26,10 @@ /obj/item/resonator/attack_self(mob/user) if(burst_time == 50) burst_time = 30 - to_chat(user, "I set the resonator's fields to detonate after 3 seconds.") + to_chat(user, span_info("I set the resonator's fields to detonate after 3 seconds.")) else burst_time = 50 - to_chat(user, "I set the resonator's fields to detonate after 5 seconds.") + to_chat(user, span_info("I set the resonator's fields to detonate after 5 seconds.")) /obj/item/resonator/proc/CreateResonance(target, mob/user) var/turf/T = get_turf(target) @@ -101,7 +101,7 @@ for(var/mob/living/L in T) if(creator) log_combat(creator, L, "used a resonator field on", "resonator") - to_chat(L, "[src] ruptured with you in it!") + to_chat(L, span_danger("[src] ruptured with you in it!")) L.apply_damage(resonance_damage, BRUTE) qdel(src) diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 850ca316a..e8fc8a843 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -41,18 +41,18 @@ //Can't grab when capsule is New() because templates aren't loaded then get_template() if(!used) - loc.visible_message("\The [src] begins to shake. Stand back!") + loc.visible_message(span_warning("\The [src] begins to shake. Stand back!")) used = TRUE sleep(50) var/turf/deploy_location = get_turf(src) var/status = template.check_deploy(deploy_location) switch(status) if(SHELTER_DEPLOY_BAD_AREA) - src.loc.visible_message("\The [src] will not function in this area.") + src.loc.visible_message(span_warning("\The [src] will not function in this area.")) if(SHELTER_DEPLOY_BAD_TURFS, SHELTER_DEPLOY_ANCHORED_OBJECTS) var/width = template.width var/height = template.height - src.loc.visible_message("\The [src] doesn't have room to deploy! You need to clear a [width]x[height] area!") + src.loc.visible_message(span_warning("\The [src] doesn't have room to deploy! You need to clear a [width]x[height] area!")) if(status != SHELTER_DEPLOY_ALLOWED) used = FALSE @@ -173,8 +173,8 @@ if(flags_1 & NODECONSTRUCT_1) return TRUE - user.visible_message("[user] disassembles [src].", - "I start to disassemble [src]...", "I hear clanking and banging noises.") + user.visible_message(span_warning("[user] disassembles [src]."), + span_notice("I start to disassemble [src]..."), span_hear("I hear clanking and banging noises.")) if(I.use_tool(src, user, 20, volume=50)) new /obj/item/gps(loc) qdel(src) @@ -253,8 +253,8 @@ if(flags_1 & NODECONSTRUCT_1) return TRUE - user.visible_message("[user] disassembles [src].", - "I start to disassemble [src]...", "I hear clanking and banging noises.") + user.visible_message(span_warning("[user] disassembles [src]."), + span_notice("I start to disassemble [src]..."), span_hear("I hear clanking and banging noises.")) if(I.use_tool(src, user, 20, volume=50)) deconstruct() return TRUE diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index ece3521c0..ca410e898 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -14,14 +14,14 @@ slot_flags = ITEM_SLOT_BELT /obj/item/wormhole_jaunter/attack_self(mob/user) - user.visible_message("[user.name] activates the [src.name]!") + user.visible_message(span_notice("[user.name] activates the [src.name]!")) SSblackbox.record_feedback("tally", "jaunter", 1, "User") // user activated activate(user, TRUE) /obj/item/wormhole_jaunter/proc/turf_check(mob/user) var/turf/device_turf = get_turf(user) if(!device_turf || is_centcom_level(device_turf.z) || is_reserved_level(device_turf.z)) - to_chat(user, "You're having difficulties getting the [src.name] to work.") + to_chat(user, span_notice("You're having difficulties getting the [src.name] to work.")) return FALSE return TRUE @@ -41,7 +41,7 @@ var/list/L = get_destinations(user) if(!L.len) - to_chat(user, "The [src.name] found no beacons in the world to anchor a wormhole to.") + to_chat(user, span_notice("The [src.name] found no beacons in the world to anchor a wormhole to.")) return var/chosen_beacon = pick(L) var/obj/effect/portal/jaunt_tunnel/J = new (get_turf(src), src, 100, null, FALSE, get_turf(chosen_beacon)) @@ -65,17 +65,17 @@ triggered = TRUE if(triggered) - M.visible_message("[src] overloads and activates!") + M.visible_message(span_warning("[src] overloads and activates!")) SSblackbox.record_feedback("tally", "jaunter", 1, "EMP") // EMP accidental activation activate(M) /obj/item/wormhole_jaunter/proc/chasm_react(mob/user) if(user.get_item_by_slot(SLOT_BELT) == src) - to_chat(user, "My [name] activates, saving you from the chasm!") + to_chat(user, span_notice("My [name] activates, saving you from the chasm!")) SSblackbox.record_feedback("tally", "jaunter", 1, "Chasm") // chasm automatic activation activate(user, FALSE) else - to_chat(user, "[src] is not attached to my belt, preventing it from saving you from the chasm. RIP.") + to_chat(user, span_danger("[src] is not attached to my belt, preventing it from saving you from the chasm. RIP.")) //jaunter tunnel /obj/effect/portal/jaunt_tunnel diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index 95cbf193a..8f9b8e31c 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -25,7 +25,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) possible_beacons += EP if(!possible_beacons.len) - to_chat(user, "There are no extraction beacons in existence!") + to_chat(user, span_warning("There are no extraction beacons in existence!")) return else @@ -36,21 +36,21 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) if(!A) return beacon = A - to_chat(user, "I link the extraction pack to the beacon system.") + to_chat(user, span_notice("I link the extraction pack to the beacon system.")) /obj/item/extraction_pack/afterattack(atom/movable/A, mob/living/carbon/human/user, flag, params) . = ..() if(!beacon) - to_chat(user, "[src] is not linked to a beacon, and cannot be used!") + to_chat(user, span_warning("[src] is not linked to a beacon, and cannot be used!")) return if(!(beacon in GLOB.total_extraction_beacons)) beacon = null - to_chat(user, "The connected beacon has been destroyed!") + to_chat(user, span_warning("The connected beacon has been destroyed!")) return if(!can_use_indoors) var/area/area = get_area(A) if(!area.outdoors) - to_chat(user, "[src] can only be used on things that are outdoors!") + to_chat(user, span_warning("[src] can only be used on things that are outdoors!")) return if(!flag) return @@ -58,15 +58,15 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) return else if(!safe_for_living_creatures && check_for_living_mobs(A)) - to_chat(user, "[src] is not safe for use with living creatures, they wouldn't survive the trip back!") + to_chat(user, span_warning("[src] is not safe for use with living creatures, they wouldn't survive the trip back!")) return if(!isturf(A.loc)) // no extracting stuff inside other stuff return if(A.anchored || (A.move_resist > max_force_fulton)) return - to_chat(user, "I start attaching the pack to [A]...") + to_chat(user, span_notice("I start attaching the pack to [A]...")) if(do_after(user,50,target=A)) - to_chat(user, "I attach the pack to [A] and activate it.") + to_chat(user, span_notice("I attach the pack to [A] and activate it.")) if(loc == user && istype(user.back, /obj/item/storage/backpack)) var/obj/item/storage/backpack/B = user.back SEND_SIGNAL(B, COMSIG_TRY_STORAGE_INSERT, src, user, FALSE, FALSE) diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm index 87384df65..a1647efb5 100644 --- a/code/modules/mining/laborcamp/laborshuttle.dm +++ b/code/modules/mining/laborcamp/laborshuttle.dm @@ -18,10 +18,10 @@ if(href_list["move"]) var/obj/docking_port/mobile/M = SSshuttle.getShuttle("laborcamp") if(!M) - to_chat(usr, "Cannot locate shuttle!") + to_chat(usr, span_warning("Cannot locate shuttle!")) return 0 var/obj/docking_port/stationary/S = M.get_docked() if(S && S.name == "laborcamp_away") - to_chat(usr, "Shuttle is already at the outpost!") + to_chat(usr, span_warning("Shuttle is already at the outpost!")) return 0 ..() diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 14f73fb69..78da6d607 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -80,25 +80,25 @@ GLOBAL_LIST(labor_sheet_values) var/obj/item/card/id/prisoner/P = I P.points += stacking_machine.points stacking_machine.points = 0 - to_chat(usr, "Points transferred.") + to_chat(usr, span_notice("Points transferred.")) else - to_chat(usr, "No valid id for point transfer detected.") + to_chat(usr, span_alert("No valid id for point transfer detected.")) if("move_shuttle") if(!alone_in_area(get_area(src), usr)) - to_chat(usr, "Prisoners are only allowed to be released while alone.") + to_chat(usr, span_alert("Prisoners are only allowed to be released while alone.")) else switch(SSshuttle.moveShuttle("laborcamp", "laborcamp_home", TRUE)) if(1) - to_chat(usr, "Shuttle not found.") + to_chat(usr, span_alert("Shuttle not found.")) if(2) - to_chat(usr, "Shuttle already at station.") + to_chat(usr, span_alert("Shuttle already at station.")) if(3) - to_chat(usr, "No permission to dock could be granted.") + to_chat(usr, span_alert("No permission to dock could be granted.")) else if(!(obj_flags & EMAGGED)) Radio.set_frequency(FREQ_SECURITY) Radio.talk_into(src, "A prisoner has returned to the station. Minerals and Prisoner ID card ready for retrieval.", FREQ_SECURITY) - to_chat(usr, "Shuttle received message and will be sent shortly.") + to_chat(usr, span_notice("Shuttle received message and will be sent shortly.")) /obj/machinery/mineral/labor_claim_console/proc/locate_stacking_machine() stacking_machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir)) @@ -110,7 +110,7 @@ GLOBAL_LIST(labor_sheet_values) /obj/machinery/mineral/labor_claim_console/emag_act(mob/user) if(!(obj_flags & EMAGGED)) obj_flags |= EMAGGED - to_chat(user, "PZZTTPFFFT") + to_chat(user, span_warning("PZZTTPFFFT")) /**********************Prisoner Collection Unit**************************/ @@ -147,11 +147,11 @@ GLOBAL_LIST(labor_sheet_values) if(istype(I, /obj/item/card/id)) if(istype(I, /obj/item/card/id/prisoner)) var/obj/item/card/id/prisoner/prisoner_id = I - to_chat(user, "ID: [prisoner_id.registered_name]") - to_chat(user, "Points Collected:[prisoner_id.points]") - to_chat(user, "Point Quota: [prisoner_id.goal]") - to_chat(user, "Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release.") + to_chat(user, span_notice("ID: [prisoner_id.registered_name]")) + to_chat(user, span_notice("Points Collected:[prisoner_id.points]")) + to_chat(user, span_notice("Point Quota: [prisoner_id.goal]")) + to_chat(user, span_notice("Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release.")) else - to_chat(user, "Error: Invalid ID") + to_chat(user, span_warning("Error: Invalid ID")) else return ..() diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 5d736cbc9..2a7d8a07c 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -40,7 +40,7 @@ msg = harvest_message_low else if(rand_harvested == harvest_amount_high) msg = harvest_message_high - to_chat(user, "[msg]") + to_chat(user, span_notice("[msg]")) for(var/i in 1 to rand_harvested) new harvest(get_turf(src)) @@ -59,7 +59,7 @@ /obj/structure/flora/ash/attackby(obj/item/W, mob/user, params) if(!harvested && needs_sharp_harvest && W.get_sharpness()) - user.visible_message("[user] starts to harvest from [src] with [W].","I begin to harvest from [src] with [W].") + user.visible_message(span_notice("[user] starts to harvest from [src] with [W]."),span_notice("I begin to harvest from [src] with [W].")) if(do_after(user, harvest_time, target = src)) harvest(user) else @@ -70,7 +70,7 @@ if(.) return if(!harvested && !needs_sharp_harvest) - user.visible_message("[user] starts to harvest from [src].","I begin to harvest from [src].") + user.visible_message(span_notice("[user] starts to harvest from [src]."),span_notice("I begin to harvest from [src].")) if(do_after(user, harvest_time, target = src)) harvest(user) @@ -307,9 +307,9 @@ if(istype(I, /obj/item/reagent_containers/food/snacks)) var/obj/item/reagent_containers/food/snacks/S = I if(I.w_class > WEIGHT_CLASS_SMALL) - to_chat(user, "The ingredient is too big for [src]!") + to_chat(user, span_warning("The ingredient is too big for [src]!")) else if(contents.len >= 20) - to_chat(user, "I can't add more ingredients to [src]!") + to_chat(user, span_warning("I can't add more ingredients to [src]!")) else if(reagents.has_reagent(/datum/reagent/water, 10)) //are we starting a soup or a salad? var/obj/item/reagent_containers/food/snacks/customizable/A = new/obj/item/reagent_containers/food/snacks/customizable/soup/ashsoup(get_turf(src)) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 7e47709bf..c115edc36 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -156,15 +156,15 @@ if(activated) return if(!iscarbon(user)) - to_chat(user, "The snake carving seems to come alive, if only for a moment, before returning to its dormant state, almost as if it finds you incapable of holding its oath.") + to_chat(user, span_warning("The snake carving seems to come alive, if only for a moment, before returning to its dormant state, almost as if it finds you incapable of holding its oath.")) return var/mob/living/carbon/itemUser = user usedHand = itemUser.get_held_index_of_item(src) if(itemUser.has_status_effect(STATUS_EFFECT_HIPPOCRATIC_OATH)) - to_chat(user, "I can't possibly handle the responsibility of more than one rod!") + to_chat(user, span_warning("I can't possibly handle the responsibility of more than one rod!")) return - var/failText = "The snake seems unsatisfied with my incomplete oath and returns to its previous place on the rod, returning to its dormant, wooden state. You must stand still while completing my oath!" - to_chat(itemUser, "The wooden snake that was carved into the rod seems to suddenly come alive and begins to slither down my arm! The compulsion to help others grows abnormally strong...") + var/failText = span_warning("The snake seems unsatisfied with my incomplete oath and returns to its previous place on the rod, returning to its dormant, wooden state. You must stand still while completing my oath!") + to_chat(itemUser, span_notice("The wooden snake that was carved into the rod seems to suddenly come alive and begins to slither down my arm! The compulsion to help others grows abnormally strong...")) if(do_after(itemUser, 40, target = itemUser)) itemUser.say("I swear to fulfill, to the best of my ability and judgment, this covenant:", forced = "hippocratic oath") else @@ -185,7 +185,7 @@ else to_chat(itemUser, failText) return - to_chat(itemUser, "The snake, satisfied with my oath, attaches itself and the rod to my forearm with an inseparable grip. Your thoughts seem to only revolve around the core idea of helping others, and harm is nothing more than a distant, wicked memory...") + to_chat(itemUser, span_notice("The snake, satisfied with my oath, attaches itself and the rod to my forearm with an inseparable grip. Your thoughts seem to only revolve around the core idea of helping others, and harm is nothing more than a distant, wicked memory...")) var/datum/status_effect/hippocraticOath/effect = itemUser.apply_status_effect(STATUS_EFFECT_HIPPOCRATIC_OATH) effect.hand = usedHand activated() @@ -222,9 +222,9 @@ return ..() /obj/item/clothing/neck/necklace/memento_mori/proc/memento(mob/living/carbon/human/user) - to_chat(user, "I feel my life being drained by the pendant...") + to_chat(user, span_warning("I feel my life being drained by the pendant...")) if(do_after(user, 40, target = user)) - to_chat(user, "My lifeforce is now linked to the pendant! You feel like removing it would kill you, and yet you instinctively know that until then, you won't die.") + to_chat(user, span_notice("My lifeforce is now linked to the pendant! You feel like removing it would kill you, and yet you instinctively know that until then, you won't die.")) ADD_TRAIT(user, TRAIT_NODEATH, "memento_mori") ADD_TRAIT(user, TRAIT_NOHARDCRIT, "memento_mori") ADD_TRAIT(user, TRAIT_NOCRITDAMAGE, "memento_mori") @@ -237,7 +237,7 @@ return var/mob/living/carbon/human/H = active_owner //to avoid infinite looping when dust unequips the pendant active_owner = null - to_chat(H, "I feel my life rapidly slipping away from you!") + to_chat(H, span_danger("I feel my life rapidly slipping away from you!")) H.dust(TRUE, TRUE) /datum/action/item_action/hands_free/memento_mori @@ -265,18 +265,18 @@ /obj/item/wisp_lantern/attack_self(mob/user) if(!wisp) - to_chat(user, "The wisp has gone missing!") + to_chat(user, span_warning("The wisp has gone missing!")) icon_state = "lantern" return if(wisp.loc == src) - to_chat(user, "I release the wisp. It begins to bob around my head.") + to_chat(user, span_notice("I release the wisp. It begins to bob around my head.")) icon_state = "lantern" wisp.orbit(user, 20) SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Freed") else - to_chat(user, "I return the wisp to the lantern.") + to_chat(user, span_notice("I return the wisp to the lantern.")) icon_state = "lantern-blue" wisp.forceMove(src) SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned") @@ -290,7 +290,7 @@ if(wisp.loc == src) qdel(wisp) else - wisp.visible_message("[wisp] has a sad feeling for a moment, then it passes.") + wisp.visible_message(span_notice("[wisp] has a sad feeling for a moment, then it passes.")) return ..() /obj/effect/wisp @@ -311,13 +311,13 @@ // RegisterSignal(thing, COMSIG_MOB_UPDATE_SIGHT, PROC_REF(update_user_sight)) // var/mob/being = thing // being.update_sight() -// to_chat(thing, "The wisp enhances my vision.") +// to_chat(thing, span_notice("The wisp enhances my vision.")) /obj/effect/wisp/stop_orbit(datum/component/orbiter/orbits) . = ..() if(ismob(orbits.parent)) UnregisterSignal(orbits.parent, COMSIG_MOB_UPDATE_SIGHT) - to_chat(orbits.parent, "My vision returns to normal.") + to_chat(orbits.parent, span_notice("My vision returns to normal.")) /obj/effect/wisp/proc/update_user_sight(mob/user) user.sight |= sight_flags @@ -336,7 +336,7 @@ /obj/item/warp_cube/attack_self(mob/user) if(!linked) - to_chat(user, "[src] fizzles uselessly.") + to_chat(user, span_warning("[src] fizzles uselessly.")) return if(teleporting) return @@ -432,7 +432,7 @@ var/atom/movable/A = target if(A.anchored) return - A.visible_message("[A] is snagged by [firer]'s hook!") + A.visible_message(span_danger("[A] is snagged by [firer]'s hook!")) new /datum/forced_movement(A, get_turf(firer), 5, TRUE) //TODO: keep the chain beamed to A //TODO: needs a callback to delete the chain @@ -447,7 +447,7 @@ ammo_type = /obj/item/ammo_casing/magic/hook/bounty /obj/item/gun/magic/hook/bounty/shoot_with_empty_chamber(mob/living/user) - to_chat(user, "The [src] isn't ready to fire yet!") + to_chat(user, span_warning("The [src] isn't ready to fire yet!")) /obj/item/ammo_casing/magic/hook/bounty projectile_type = /obj/projectile/hook/bounty @@ -479,7 +479,7 @@ cooldown = world.time + 600 new /obj/effect/immortality_talisman(get_turf(user), user) else - to_chat(user, "[src] is not ready yet!") + to_chat(user, span_warning("[src] is not ready yet!")) /obj/effect/immortality_talisman name = "hole in reality" @@ -495,7 +495,7 @@ vanish(new_user) /obj/effect/immortality_talisman/proc/vanish(mob/user) - user.visible_message("[user] [vanish_description], leaving a hole in [user.p_their()] place!") + user.visible_message(span_danger("[user] [vanish_description], leaving a hole in [user.p_their()] place!")) desc = "" setDir(user.dir) @@ -513,7 +513,7 @@ user.notransform = FALSE user.forceMove(get_turf(src)) - user.visible_message("[user] pops back into reality!") + user.visible_message(span_danger("[user] pops back into reality!")) can_destroy = TRUE qdel(src) @@ -578,7 +578,7 @@ /obj/item/book_of_babel/attack_self(mob/user) if(!user.can_read(src)) return FALSE - to_chat(user, "I flip through the pages of the book, quickly and conveniently learning every language in existence. Somewhat less conveniently, the aging book crumbles to dust in the process. Whoops.") + to_chat(user, span_notice("I flip through the pages of the book, quickly and conveniently learning every language in existence. Somewhat less conveniently, the aging book crumbles to dust in the process. Whoops.")) user.grant_all_languages(omnitongue=TRUE) new /obj/item/ash(get_turf(user)) qdel(src) @@ -612,13 +612,13 @@ var/holycheck = ishumanbasic(C) if(!(holycheck || islizard(C)) || reac_volume < 5) // implying xenohumans are holy //as with all things, if(method == INGEST && show_message) - to_chat(C, "I feel nothing but a terrible aftertaste.") + to_chat(C, span_notice("I feel nothing but a terrible aftertaste.")) return ..() - to_chat(C, "A terrible pain travels down my back as wings burst out!") + to_chat(C, span_danger("A terrible pain travels down my back as wings burst out!")) C.dna.species.GiveSpeciesFlight(C) if(holycheck) - to_chat(C, "I feel blessed!") + to_chat(C, span_notice("I feel blessed!")) ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT) playsound(C.loc, 'sound/blank.ogg', 50, TRUE, -1) C.adjustBruteLoss(20) @@ -636,7 +636,7 @@ var/turf/T = get_turf(src) var/ladder_x = T.x var/ladder_y = T.y - to_chat(user, "I unfold the ladder. It extends much farther than you were expecting.") + to_chat(user, span_notice("I unfold the ladder. It extends much farther than you were expecting.")) var/last_ladder = null for(var/i in 1 to world.maxz) if(is_centcom_level(i) || is_reserved_level(i) || is_away_level(i)) @@ -688,7 +688,7 @@ "Transforming it immediately after an attack causes the next attack to come out faster." /obj/item/melee/transforming/cleaving_saw/suicide_act(mob/user) - user.visible_message("[user] is [active ? "closing [src] on [user.p_their()] neck" : "opening [src] into [user.p_their()] chest"]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is [active ? "closing [src] on [user.p_their()] neck" : "opening [src] into [user.p_their()] chest"]! It looks like [user.p_theyre()] trying to commit suicide!")) transform_cooldown = 0 transform_weapon(user, TRUE) return BRUTELOSS @@ -704,14 +704,14 @@ /obj/item/melee/transforming/cleaving_saw/transform_messages(mob/living/user, supress_message_text) if(!supress_message_text) if(active) - to_chat(user, "I open [src]. It will now cleave enemies in a wide arc and deal additional damage to fauna.") + to_chat(user, span_notice("I open [src]. It will now cleave enemies in a wide arc and deal additional damage to fauna.")) else - to_chat(user, "I close [src]. It will now attack rapidly and cause fauna to bleed.") + to_chat(user, span_notice("I close [src]. It will now attack rapidly and cause fauna to bleed.")) playsound(user, 'sound/blank.ogg', 35, TRUE, frequency = 90000 - (active * 30000)) /obj/item/melee/transforming/cleaving_saw/clumsy_transform_effect(mob/living/user) if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) - to_chat(user, "I accidentally cut myself with [src], like a doofus!") + to_chat(user, span_warning("I accidentally cut myself with [src], like a doofus!")) user.take_bodypart_damage(10) /obj/item/melee/transforming/cleaving_saw/melee_attack_chain(mob/user, atom/target, params) @@ -804,9 +804,9 @@ /obj/item/melee/ghost_sword/attack_self(mob/user) if(summon_cooldown > world.time) - to_chat(user, "I just recently called out for aid. You don't want to annoy the spirits!") + to_chat(user, span_warning("I just recently called out for aid. You don't want to annoy the spirits!")) return - to_chat(user, "I call out for aid, attempting to summon spirits to my side.") + to_chat(user, span_notice("I call out for aid, attempting to summon spirits to my side.")) notify_ghosts("[user] is raising [user.p_their()] [src], calling for my help!", enter_link="(Click to help)", @@ -852,13 +852,13 @@ var/ghost_counter = ghost_check() force = CLAMP((ghost_counter * 4), 0, 75) - user.visible_message("[user] strikes with the force of [ghost_counter] vengeful spirits!") + user.visible_message(span_danger("[user] strikes with the force of [ghost_counter] vengeful spirits!")) ..() /obj/item/melee/ghost_sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) var/ghost_counter = ghost_check() final_block_chance += CLAMP((ghost_counter * 5), 0, 75) - owner.visible_message("[owner] is protected by a ring of [ghost_counter] ghosts!") + owner.visible_message(span_danger("[owner] is protected by a ring of [ghost_counter] ghosts!")) return ..() //Blood @@ -878,20 +878,20 @@ switch(random) if(1) - to_chat(user, "My appearance morphs to that of a very small humanoid ash dragon! You get to look like a freak without the cool abilities.") + to_chat(user, span_danger("My appearance morphs to that of a very small humanoid ash dragon! You get to look like a freak without the cool abilities.")) H.dna.features = list("mcolor" = "A02720", "tail_lizard" = "Dark Tiger", "tail_human" = "None", "snout" = "Sharp", "horns" = "Curled", "ears" = "None", "wings" = "None", "frills" = "None", "spines" = "Long", "body_markings" = "Dark Tiger Body", "legs" = "Digitigrade Legs") H.eye_color = "fee5a3" H.set_species(/datum/species/lizard) if(2) - to_chat(user, "My flesh begins to melt! Miraculously, you seem fine otherwise.") + to_chat(user, span_danger("My flesh begins to melt! Miraculously, you seem fine otherwise.")) H.set_species(/datum/species/skeleton) if(3) - to_chat(user, "Power courses through you! You can now shift my form at will.") + to_chat(user, span_danger("Power courses through you! You can now shift my form at will.")) if(user.mind) var/obj/effect/proc_holder/spell/targeted/shapeshift/dragon/D = new user.mind.AddSpell(D) if(4) - to_chat(user, "I feel like you could walk straight through lava now.") + to_chat(user, span_danger("I feel like you could walk straight through lava now.")) H.weather_immunities |= "lava" playsound(user.loc,'sound/blank.ogg', rand(10,50), TRUE) @@ -908,9 +908,9 @@ visibility_flags = 0 stage1 = list("Your bones ache.") stage2 = list("Your skin feels scaly.") - stage3 = list("I have an overwhelming urge to terrorize some peasants.", "My teeth feel sharper.") - stage4 = list("My blood burns.") - stage5 = list("You're a fucking dragon. However, any previous allegiances you held still apply. It'd be incredibly rude to eat my still human friends for no reason.") + stage3 = list(span_danger("I have an overwhelming urge to terrorize some peasants."), span_danger("My teeth feel sharper.")) + stage4 = list(span_danger("My blood burns.")) + stage5 = list(span_danger("You're a fucking dragon. However, any previous allegiances you held still apply. It'd be incredibly rude to eat my still human friends for no reason.")) new_form = /mob/living/simple_animal/hostile/megafauna/dragon/lesser @@ -957,12 +957,12 @@ var/obj/effect/temp_visual/lavastaff/L = new /obj/effect/temp_visual/lavastaff(T) L.alpha = 0 animate(L, alpha = 255, time = create_delay) - user.visible_message("[user] points [src] at [T]!") + user.visible_message(span_danger("[user] points [src] at [T]!")) timer = world.time + create_delay + 1 if(do_after(user, create_delay, target = T)) var/old_name = T.name if(T.TerraformTurf(turf_type, flags = CHANGETURF_INHERIT_AIR)) - user.visible_message("[user] turns \the [old_name] into [transform_string]!") + user.visible_message(span_danger("[user] turns \the [old_name] into [transform_string]!")) message_admins("[ADMIN_LOOKUPFLW(user)] fired the lava staff at [ADMIN_VERBOSEJMP(T)]") log_game("[key_name(user)] fired the lava staff at [AREACOORD(T)].") timer = world.time + create_cooldown @@ -973,7 +973,7 @@ else var/old_name = T.name if(T.TerraformTurf(reset_turf_type, flags = CHANGETURF_INHERIT_AIR)) - user.visible_message("[user] turns \the [old_name] into [reset_string]!") + user.visible_message(span_danger("[user] turns \the [old_name] into [reset_string]!")) timer = world.time + reset_cooldown playsound(T,'sound/blank.ogg', 200, TRUE) @@ -1014,9 +1014,9 @@ for(var/mob/living/carbon/human/H in range(7,user)) var/obj/effect/mine/pickup/bloodbath/B = new(H) INVOKE_ASYNC(B, TYPE_PROC_REF(/obj/effect/mine/pickup/bloodbath, mineEffect), H) - to_chat(user, "I shatter the bottle!") + to_chat(user, span_notice("I shatter the bottle!")) playsound(user.loc, 'sound/blank.ogg', 100, TRUE) - message_admins("[ADMIN_LOOKUPFLW(user)] has activated a bottle of mayhem!") + message_admins(span_adminnotice("[ADMIN_LOOKUPFLW(user)] has activated a bottle of mayhem!")) log_combat(user, null, "activated a bottle of mayhem", src) qdel(src) @@ -1046,17 +1046,17 @@ used = FALSE return if(!(isliving(choice))) - to_chat(user, "[choice] is already dead!") + to_chat(user, span_warning("[choice] is already dead!")) used = FALSE return if(choice == user) - to_chat(user, "I feel like writing my own name into a cursed death warrant would be unwise.") + to_chat(user, span_warning("I feel like writing my own name into a cursed death warrant would be unwise.")) used = FALSE return var/mob/living/L = choice - message_admins("[ADMIN_LOOKUPFLW(L)] has been marked for death by [ADMIN_LOOKUPFLW(user)]!") + message_admins(span_adminnotice("[ADMIN_LOOKUPFLW(L)] has been marked for death by [ADMIN_LOOKUPFLW(user)]!")) var/datum/antagonist/blood_contract/A = new L.mind.add_antag_datum(A) @@ -1115,14 +1115,14 @@ /obj/item/hierophant_club/examine(mob/user) . = ..() - . += "The[beacon ? " beacon is not currently":"re is a beacon"] attached." + . += span_hierophant_warning("The[beacon ? " beacon is not currently":"re is a beacon"] attached.") /obj/item/hierophant_club/suicide_act(mob/living/user) say("Xverwpsgexmrk...", forced = "hierophant club suicide") - user.visible_message("[user] holds [src] into the air! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] holds [src] into the air! It looks like [user.p_theyre()] trying to commit suicide!")) new/obj/effect/temp_visual/hierophant/telegraph(get_turf(user)) playsound(user,'sound/blank.ogg', 75, TRUE) - user.visible_message("[user] fades out, leaving [user.p_their()] belongings behind!") + user.visible_message(span_hierophant_warning("[user] fades out, leaving [user.p_their()] belongings behind!")) for(var/obj/item/I in user) if(I != src) user.dropItemToGround(I) @@ -1158,7 +1158,7 @@ INVOKE_ASYNC(src, PROC_REF(cardinal_blasts), T, user) //otherwise, just do cardinal blast log_combat(user, target, "fired cardinal blast at", src) else - to_chat(user, "That target is out of range!" ) + to_chat(user, span_warning("That target is out of range!") ) timer = world.time INVOKE_ASYNC(src, PROC_REF(prepare_icon_update)) @@ -1191,17 +1191,17 @@ /obj/item/hierophant_club/ui_action_click(mob/user, action) if(istype(action, /datum/action/item_action/toggle_unfriendly_fire)) //toggle friendly fire... friendly_fire_check = !friendly_fire_check - to_chat(user, "I toggle friendly fire [friendly_fire_check ? "off":"on"]!") + to_chat(user, span_warning("I toggle friendly fire [friendly_fire_check ? "off":"on"]!")) return if(timer > world.time) return if(!user.is_holding(src)) //you need to hold the staff to teleport - to_chat(user, "I need to hold the club in my hands to [beacon ? "teleport with it":"detach the beacon"]!") + to_chat(user, span_warning("I need to hold the club in my hands to [beacon ? "teleport with it":"detach the beacon"]!")) return if(!beacon || QDELETED(beacon)) if(isturf(user.loc)) - user.visible_message("[user] starts fiddling with [src]'s pommel...", \ - "I start detaching the hierophant beacon...") + user.visible_message(span_hierophant_warning("[user] starts fiddling with [src]'s pommel..."), \ + span_notice("I start detaching the hierophant beacon...")) timer = world.time + 51 INVOKE_ASYNC(src, PROC_REF(prepare_icon_update)) if(do_after(user, 50, target = user) && !beacon) @@ -1210,27 +1210,27 @@ new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, user) beacon = new/obj/effect/hierophant(T) user.update_action_buttons_icon() - user.visible_message("[user] places a strange machine beneath [user.p_their()] feet!", \ + user.visible_message(span_hierophant_warning("[user] places a strange machine beneath [user.p_their()] feet!"), \ "I detach the hierophant beacon, allowing you to teleport myself and any allies to it at any time!\n\ I can remove the beacon to place it again by striking it with the club.") else timer = world.time INVOKE_ASYNC(src, PROC_REF(prepare_icon_update)) else - to_chat(user, "I need to be on solid ground to detach the beacon!") + to_chat(user, span_warning("I need to be on solid ground to detach the beacon!")) return if(get_dist(user, beacon) <= 2) //beacon too close abort - to_chat(user, "I are too close to the beacon to teleport to it!") + to_chat(user, span_warning("I are too close to the beacon to teleport to it!")) return if(is_blocked_turf(get_turf(beacon), TRUE)) - to_chat(user, "The beacon is blocked by something, preventing teleportation!") + to_chat(user, span_warning("The beacon is blocked by something, preventing teleportation!")) return if(!isturf(user.loc)) - to_chat(user, "I don't have enough space to teleport from here!") + to_chat(user, span_warning("I don't have enough space to teleport from here!")) return teleporting = TRUE //start channel user.update_action_buttons_icon() - user.visible_message("[user] starts to glow faintly...") + user.visible_message(span_hierophant_warning("[user] starts to glow faintly...")) timer = world.time + 50 INVOKE_ASYNC(src, PROC_REF(prepare_icon_update)) beacon.icon_state = "hierophant_tele_on" @@ -1241,7 +1241,7 @@ var/turf/source = get_turf(user) if(is_blocked_turf(T, TRUE)) teleporting = FALSE - to_chat(user, "The beacon is blocked by something, preventing teleportation!") + to_chat(user, span_warning("The beacon is blocked by something, preventing teleportation!")) user.update_action_buttons_icon() timer = world.time INVOKE_ASYNC(src, PROC_REF(prepare_icon_update)) @@ -1262,7 +1262,7 @@ return if(is_blocked_turf(T, TRUE)) teleporting = FALSE - to_chat(user, "The beacon is blocked by something, preventing teleportation!") + to_chat(user, span_warning("The beacon is blocked by something, preventing teleportation!")) user.update_action_buttons_icon() timer = world.time INVOKE_ASYNC(src, PROC_REF(prepare_icon_update)) @@ -1301,7 +1301,7 @@ sleep(1) if(!M) return - M.visible_message("[M] fades out!") + M.visible_message(span_hierophant_warning("[M] fades out!")) sleep(2) if(!M) return @@ -1313,7 +1313,7 @@ sleep(1) if(!M) return - M.visible_message("[M] fades in!") + M.visible_message(span_hierophant_warning("[M] fades in!")) if(user != M) log_combat(user, M, "teleported", null, "from [AREACOORD(source)]") diff --git a/code/modules/mining/lavaland/ruins/gym.dm b/code/modules/mining/lavaland/ruins/gym.dm index cd5ebf4ce..76123bcaa 100644 --- a/code/modules/mining/lavaland/ruins/gym.dm +++ b/code/modules/mining/lavaland/ruins/gym.dm @@ -34,7 +34,7 @@ if(.) return if(obj_flags & IN_USE) - to_chat(user, "It's already in use - wait a bit!") + to_chat(user, span_warning("It's already in use - wait a bit!")) return else obj_flags |= IN_USE diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 523e646e0..c311f0abb 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -54,9 +54,9 @@ /obj/machinery/mineral/ore_redemption/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Smelting [ore_multiplier] sheet(s) per piece of ore.
Reward point generation at [point_upgrade*100]%.
Ore pickup speed at [ore_pickup_rate].
" + . += span_notice("The status display reads: Smelting [ore_multiplier] sheet(s) per piece of ore.
Reward point generation at [point_upgrade*100]%.
Ore pickup speed at [ore_pickup_rate].") if(panel_open) - . += "Alt-click to rotate the input and output direction." + . += span_notice("Alt-click to rotate the input and output direction.") /obj/machinery/mineral/ore_redemption/proc/smelt_ore(obj/item/stack/ore/O) var/datum/component/material_container/mat_container = materials.mat_container @@ -190,7 +190,7 @@ var/obj/item/stack/ore/O = W if(istype(O)) if(O.refined_type == null) - to_chat(user, "[O] has already been refined!") + to_chat(user, span_warning("[O] has already been refined!")) return return ..() @@ -202,7 +202,7 @@ if (panel_open) input_dir = turn(input_dir, -90) output_dir = turn(output_dir, -90) - to_chat(user, "I change [src]'s I/O settings, setting the input to [dir2text(input_dir)] and the output to [dir2text(output_dir)].") + to_chat(user, span_notice("I change [src]'s I/O settings, setting the input to [dir2text(input_dir)] and the output to [dir2text(output_dir)].")) return TRUE /obj/machinery/mineral/ore_redemption/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) @@ -262,17 +262,17 @@ I.mining_points += points points = 0 else - to_chat(usr, "No valid ID detected.") + to_chat(usr, span_warning("No valid ID detected.")) else - to_chat(usr, "No points to claim.") + to_chat(usr, span_warning("No points to claim.")) return TRUE if("Release") if(!mat_container) return if(materials.on_hold()) - to_chat(usr, "Mineral access is on hold, please contact the quartermaster.") + to_chat(usr, span_warning("Mineral access is on hold, please contact the quartermaster.")) else if(!allowed(usr)) //Check the ID inside, otherwise check the user - to_chat(usr, "Required access not found.") + to_chat(usr, span_warning("Required access not found.")) else var/datum/material/mat = locate(params["id"]) @@ -306,7 +306,7 @@ return inserted_disk = disk else - to_chat(usr, "Not a valid Design Disk!") + to_chat(usr, span_warning("Not a valid Design Disk!")) return TRUE if("diskEject") if(inserted_disk) @@ -322,7 +322,7 @@ if(!mat_container) return if(materials.on_hold()) - to_chat(usr, "Mineral access is on hold, please contact the quartermaster.") + to_chat(usr, span_warning("Mineral access is on hold, please contact the quartermaster.")) return var/alloy_id = params["id"] var/datum/design/alloy = stored_research.isDesignResearchedID(alloy_id) @@ -345,7 +345,7 @@ output = new alloy.build_path(src) unload_mineral(output) else - to_chat(usr, "Required access not found.") + to_chat(usr, span_warning("Required access not found.")) return TRUE /obj/machinery/mineral/ore_redemption/ex_act(severity, target) diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm index c4b7e1d49..d75c16d91 100644 --- a/code/modules/mining/machine_silo.dm +++ b/code/modules/mining/machine_silo.dm @@ -49,11 +49,11 @@ GLOBAL_LIST_EMPTY(silo_access_logs) if(I.item_flags & ABSTRACT) return if(!istype(I) || (I.flags_1 & HOLOGRAM_1) || (I.item_flags & NO_MAT_REDEMPTION)) - to_chat(user, "[M] won't accept [I]!") + to_chat(user, span_warning("[M] won't accept [I]!")) return var/item_mats = I.custom_materials & materials.materials if(!length(item_mats)) - to_chat(user, "[I] does not contain sufficient materials to be accepted by [M].") + to_chat(user, span_warning("[I] does not contain sufficient materials to be accepted by [M].")) return // assumes unlimited space... var/amount = I.amount @@ -85,11 +85,11 @@ GLOBAL_LIST_EMPTY(silo_access_logs) if (sheets >= 1) ui += "Eject" else - ui += "Eject" + ui += span_linkoff("Eject") if (sheets >= 20) ui += "20x" else - ui += "20x" + ui += span_linkoff("20x") ui += "[mat.name]: [sheets] sheets
" any = TRUE if(!any) @@ -114,7 +114,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs) if(num_pages > 1) for(var/i in 1 to num_pages) if(i == page) - ui += "[i]" + ui += span_linkoff("[i]") else ui += "[i]" @@ -167,7 +167,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs) /obj/machinery/ore_silo/multitool_act(mob/living/user, obj/item/multitool/I) . = ..() if (istype(I)) - to_chat(user, "I log [src] in the multitool's buffer.") + to_chat(user, span_notice("I log [src] in the multitool's buffer.")) I.buffer = src return TRUE @@ -187,7 +187,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs) /obj/machinery/ore_silo/examine(mob/user) . = ..() - . += "[src] can be linked to techfabs, circuit printers and protolathes with a multitool." + . += span_notice("[src] can be linked to techfabs, circuit printers and protolathes with a multitool.") /datum/ore_silo_log var/name // for VV diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 25396307d..9ff70a9fc 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -20,7 +20,7 @@ . = ..() if(!machine) - to_chat(user, "[src] is not linked to a machine!") + to_chat(user, span_notice("[src] is not linked to a machine!")) return var/obj/item/stack/sheet/s @@ -42,7 +42,7 @@ return var/obj/item/multitool/M = I M.buffer = src - to_chat(user, "I store linkage information in [I]'s buffer.") + to_chat(user, span_notice("I store linkage information in [I]'s buffer.")) return TRUE /obj/machinery/mineral/stacking_unit_console/Topic(href, href_list) @@ -101,7 +101,7 @@ if(istype(M.buffer, /obj/machinery/mineral/stacking_unit_console)) CONSOLE = M.buffer CONSOLE.machine = src - to_chat(user, "I link [src] to the console in [M]'s buffer.") + to_chat(user, span_notice("I link [src] to the console in [M]'s buffer.")) return TRUE /obj/machinery/mineral/stacking_machine/proc/process_sheet(obj/item/stack/sheet/inp) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index b5c4e05a2..603bb64ea 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -99,22 +99,22 @@ if(istype(I)) var/datum/data/mining_equipment/prize = locate(href_list["purchase"]) in prize_list if (!prize || !(prize in prize_list)) - to_chat(usr, "Error: Invalid choice!") + to_chat(usr, span_alert("Error: Invalid choice!")) flick(icon_deny, src) return if(prize.cost > I.mining_points) - to_chat(usr, "Error: Insufficient points for [prize.equipment_name] on [I]!") + to_chat(usr, span_alert("Error: Insufficient points for [prize.equipment_name] on [I]!")) flick(icon_deny, src) else if (I.mining_points -= prize.cost) - to_chat(usr, "[src] clanks to life briefly before vending [prize.equipment_name]!") + to_chat(usr, span_notice("[src] clanks to life briefly before vending [prize.equipment_name]!")) new prize.equipment_path(src.loc) SSblackbox.record_feedback("nested tally", "mining_equipment_bought", 1, list("[type]", "[prize.equipment_path]")) else - to_chat(usr, "Error: Transaction failure, please try again later!") + to_chat(usr, span_alert("Error: Transaction failure, please try again later!")) flick(icon_deny, src) else - to_chat(usr, "Error: An ID is required!") + to_chat(usr, span_alert("Error: An ID is required!")) flick(icon_deny, src) updateUsrDialog() return @@ -210,15 +210,15 @@ if(points) var/obj/item/card/id/C = I C.mining_points += points - to_chat(user, "I transfer [points] points to [C].") + to_chat(user, span_info("I transfer [points] points to [C].")) points = 0 else - to_chat(user, "There's no points left on [src].") + to_chat(user, span_alert("There's no points left on [src].")) ..() /obj/item/card/mining_point_card/examine(mob/user) ..() - to_chat(user, "There's [points] point\s on the card.") + to_chat(user, span_alert("There's [points] point\s on the card.")) ///Conscript kit /obj/item/card/mining_access_card @@ -235,7 +235,7 @@ I.access |= ACCESS_MECH_MINING I.access |= ACCESS_MINERAL_STOREROOM I.access |= ACCESS_CARGO - to_chat(user, "I upgrade [I] with mining access.") + to_chat(user, span_notice("I upgrade [I] with mining access.")) qdel(src) /obj/item/storage/backpack/duffelbag/mining_conscript diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index fff94c6ae..55a6d603a 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -77,7 +77,7 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/machinery/computer/shuttle/mining/attack_hand(mob/user) if(is_station_level(user.z) && user.mind && is_head_revolutionary(user) && !(user.mind in dumb_rev_heads)) - to_chat(user, "I get a feeling that leaving the station might be a REALLY dumb idea...") + to_chat(user, span_warning("I get a feeling that leaving the station might be a REALLY dumb idea...")) dumb_rev_heads += user.mind return . = ..() diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 977984cf6..6a9d2f101 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -74,35 +74,35 @@ var/t_s = p_s() if(health < maxHealth) if(health >= maxHealth * 0.5) - . += "[t_He] look[t_s] slightly dented." + . += span_warning("[t_He] look[t_s] slightly dented.") else - . += "[t_He] look[t_s] severely dented!" + . += span_boldwarning("[t_He] look[t_s] severely dented!") . += {"Using a mining scanner on [t_him] will instruct [t_him] to drop stored ore. [max(0, LAZYLEN(contents) - 1)] Stored Ore\n Field repairs can be done with a welder."} if(stored_gun && stored_gun.max_mod_capacity) . += "[stored_gun.get_remaining_mod_capacity()]% mod capacity remaining." for(var/A in stored_gun.get_modkits()) var/obj/item/borg/upgrade/modkit/M = A - . += "There is \a [M] installed, using [M.cost]% capacity." + . += span_notice("There is \a [M] installed, using [M.cost]% capacity.") /mob/living/simple_animal/hostile/mining_drone/welder_act(mob/living/user, obj/item/I) ..() . = TRUE if(mode == MINEDRONE_ATTACK) - to_chat(user, "[src] can't be repaired while in attack mode!") + to_chat(user, span_warning("[src] can't be repaired while in attack mode!")) return if(maxHealth == health) - to_chat(user, "[src] is at full integrity.") + to_chat(user, span_info("[src] is at full integrity.")) return if(I.use_tool(src, user, 0, volume=40)) adjustBruteLoss(-15) - to_chat(user, "I repair some of the armor on [src].") + to_chat(user, span_info("I repair some of the armor on [src].")) /mob/living/simple_animal/hostile/mining_drone/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner)) - to_chat(user, "I instruct [src] to drop any collected ore.") + to_chat(user, span_info("I instruct [src] to drop any collected ore.")) DropOre() return if(I.tool_behaviour == TOOL_CROWBAR || istype(I, /obj/item/borg/upgrade/modkit)) @@ -126,9 +126,9 @@ toggle_mode() switch(mode) if(MINEDRONE_COLLECT) - to_chat(M, "[src] has been set to search and store loose ore.") + to_chat(M, span_info("[src] has been set to search and store loose ore.")) if(MINEDRONE_ATTACK) - to_chat(M, "[src] has been set to attack hostile wildlife.") + to_chat(M, span_info("[src] has been set to attack hostile wildlife.")) return /mob/living/simple_animal/hostile/mining_drone/CanPass(atom/movable/O) @@ -152,7 +152,7 @@ minimum_distance = 1 retreat_distance = null icon_state = "mining_drone" - to_chat(src, "I are set to collect mode. You can now collect loose ore.") + to_chat(src, span_info("I are set to collect mode. You can now collect loose ore.")) /mob/living/simple_animal/hostile/mining_drone/proc/SetOffenseBehavior() mode = MINEDRONE_ATTACK @@ -163,7 +163,7 @@ retreat_distance = 2 minimum_distance = 1 icon_state = "mining_drone_offense" - to_chat(src, "I are set to attack mode. You can now attack from range.") + to_chat(src, span_info("I are set to attack mode. You can now attack from range.")) /mob/living/simple_animal/hostile/mining_drone/AttackingTarget() if(istype(target, /obj/item/stack/ore) && mode == MINEDRONE_COLLECT) @@ -185,10 +185,10 @@ /mob/living/simple_animal/hostile/mining_drone/proc/DropOre(message = 1) if(!contents.len) if(message) - to_chat(src, "I attempt to dump your stored ore, but you have none!") + to_chat(src, span_warning("I attempt to dump your stored ore, but you have none!")) return if(message) - to_chat(src, "I dump your stored ore.") + to_chat(src, span_notice("I dump your stored ore.")) for(var/obj/item/stack/ore/O in contents) O.forceMove(drop_location()) @@ -212,7 +212,7 @@ user.sync_lighting_plane_alpha() - to_chat(user, "I toggle your meson vision [(user.sight & SEE_TURFS) ? "on" : "off"].") + to_chat(user, span_notice("I toggle your meson vision [(user.sight & SEE_TURFS) ? "on" : "off"].")) /mob/living/simple_animal/hostile/mining_drone/proc/toggle_mode() @@ -241,7 +241,7 @@ else user.set_light(6) user.light_on = !user.light_on - to_chat(user, "I toggle your light [user.light_on ? "on" : "off"].") + to_chat(user, span_notice("I toggle your light [user.light_on ? "on" : "off"].")) /datum/action/innate/minedrone/toggle_mode name = "Toggle Mode" @@ -278,7 +278,7 @@ /obj/item/mine_bot_upgrade/proc/upgrade_bot(mob/living/simple_animal/hostile/mining_drone/M, mob/user) if(M.melee_damage_upper != initial(M.melee_damage_upper)) - to_chat(user, "[src] already has a combat upgrade installed!") + to_chat(user, span_warning("[src] already has a combat upgrade installed!")) return M.melee_damage_lower += 7 M.melee_damage_upper += 7 @@ -291,7 +291,7 @@ /obj/item/mine_bot_upgrade/health/upgrade_bot(mob/living/simple_animal/hostile/mining_drone/M, mob/user) if(M.maxHealth != initial(M.maxHealth)) - to_chat(user, "[src] already has reinforced armor!") + to_chat(user, span_warning("[src] already has reinforced armor!")) return M.maxHealth += 45 M.updatehealth() diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 8b03c6df5..66fc479f9 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -112,12 +112,12 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ return var/mob/living/carbon/human/C = hit_atom if(C.is_eyes_covered()) - C.visible_message("[C]'s eye protection blocks the sand!", "My eye protection blocks the sand!") + C.visible_message(span_danger("[C]'s eye protection blocks the sand!"), span_warning("My eye protection blocks the sand!")) return C.adjust_blurriness(6) C.adjustStaminaLoss(15)//the pain from my eyes burning does stamina damage C.confused += 5 - to_chat(C, "\The [src] gets into my eyes! The pain, it burns!") + to_chat(C, span_danger("\The [src] gets into my eyes! The pain, it burns!")) qdel(src) /obj/item/stack/ore/glass/ex_act(severity, target) @@ -143,7 +143,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ mine_experience = 5 /obj/item/stack/ore/plasma/welder_act(mob/living/user, obj/item/I) - to_chat(user, "I can't hit a high enough temperature to smelt [src] properly!") + to_chat(user, span_warning("I can't hit a high enough temperature to smelt [src] properly!")) return TRUE @@ -226,7 +226,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/twohanded/required/gibtonite/attackby(obj/item/I, mob/user, params) if(!wires && istype(I, /obj/item/assembly/igniter)) - user.visible_message("[user] attaches [I] to [src].", "I attach [I] to [src].") + user.visible_message(span_notice("[user] attaches [I] to [src]."), span_notice("I attach [I] to [src].")) wires = new /datum/wires/explosive/gibtonite(src) attacher = key_name(user) qdel(I) @@ -246,7 +246,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ primed = FALSE if(det_timer) deltimer(det_timer) - user.visible_message("The chain reaction was stopped! ...The ore's quality looks diminished.", "I stopped the chain reaction. ...The ore's quality looks diminished.") + user.visible_message(span_notice("The chain reaction was stopped! ...The ore's quality looks diminished."), span_notice("I stopped the chain reaction. ...The ore's quality looks diminished.")) icon_state = "Gibtonite ore" quality = GIBTONITE_QUALITY_LOW return @@ -284,7 +284,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ log_game(bomb_message) GLOB.bombers += bomb_message else - user.visible_message("[user] strikes \the [src], causing a chain reaction!", "I strike \the [src], causing a chain reaction.") + user.visible_message(span_warning("[user] strikes \the [src], causing a chain reaction!"), span_danger("I strike \the [src], causing a chain reaction.")) log_bomber(user, "has primed a", src, "for detonation", notify_admins) det_timer = addtimer(CALLBACK(src, PROC_REF(detonate), notify_admins), det_time, TIMER_STOPPABLE) @@ -350,9 +350,9 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ return value /obj/item/coin/suicide_act(mob/living/user) - user.visible_message("[user] contemplates suicide with \the [src]!") + user.visible_message(span_suicide("[user] contemplates suicide with \the [src]!")) if (!attack_self(user)) - user.visible_message("[user] couldn't flip \the [src]!") + user.visible_message(span_suicide("[user] couldn't flip \the [src]!")) return SHAME addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 10)//10 = time takes for flip animation return MANUAL_SUICIDE_NONLETHAL @@ -360,31 +360,31 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/coin/proc/manual_suicide(mob/living/user) var/index = sideslist.Find(coinflip) if (index==2)//tails - user.visible_message("\the [src] lands on [coinflip]! [user] promptly falls over, dead!") + user.visible_message(span_suicide("\the [src] lands on [coinflip]! [user] promptly falls over, dead!")) user.adjustOxyLoss(200) user.death(0) user.set_suicide(TRUE) user.suicide_log() else - user.visible_message("\the [src] lands on [coinflip]! [user] keeps on living!") + user.visible_message(span_suicide("\the [src] lands on [coinflip]! [user] keeps on living!")) /obj/item/coin/examine(mob/user) . = ..() - . += "It's worth [value] credit\s." + . += span_info("It's worth [value] credit\s.") /obj/item/coin/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if(string_attached) - to_chat(user, "There already is a string attached to this coin!") + to_chat(user, span_warning("There already is a string attached to this coin!")) return if (CC.use(1)) add_overlay("coin_string_overlay") string_attached = 1 - to_chat(user, "I attach a string to the coin.") + to_chat(user, span_notice("I attach a string to the coin.")) else - to_chat(user, "I need one length of cable to attach a string to the coin!") + to_chat(user, span_warning("I need one length of cable to attach a string to the coin!")) return else ..() @@ -397,13 +397,13 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ new /obj/item/stack/cable_coil(drop_location(), 1) overlays = list() string_attached = null - to_chat(user, "I detach the string from the coin.") + to_chat(user, span_notice("I detach the string from the coin.")) return TRUE /obj/item/coin/attack_self(mob/user) if(cooldown < world.time) if(string_attached) //does the coin have a wire attached - to_chat(user, "The coin won't flip very well with something attached!" ) + to_chat(user, span_warning("The coin won't flip very well with something attached!") ) return FALSE//do not flip the coin cooldown = world.time + 15 flick("coin_[coinflip]_flip", src) @@ -413,9 +413,9 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ var/oldloc = loc sleep(15) if(loc == oldloc && user && !user.incapacitated()) - user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \ - "I flip [src]. It lands on [coinflip].", \ - "I hear the clattering of loose change.") + user.visible_message(span_notice("[user] has flipped [src]. It lands on [coinflip]."), \ + span_notice("I flip [src]. It lands on [coinflip]."), \ + span_hear("I hear the clattering of loose change.")) return TRUE//did the coin flip? useful for suicide_act /obj/item/coin/gold diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 78d88a135..a5f5963f6 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -14,7 +14,7 @@ user.transferItemToLoc(W, src) else if(SEND_SIGNAL(W, COMSIG_CONTAINS_STORAGE)) SEND_SIGNAL(W, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/stack/ore, src) - to_chat(user, "I empty the ore in [W] into \the [src].") + to_chat(user, span_notice("I empty the ore in [W] into \the [src].")) else return ..() @@ -24,9 +24,9 @@ /obj/structure/ore_box/crowbar_act(mob/living/user, obj/item/I) if(I.use_tool(src, user, 50, volume=50)) - user.visible_message("[user] pries \the [src] apart.", - "I pry apart \the [src].", - "I hear splitting wood.") + user.visible_message(span_notice("[user] pries \the [src] apart."), + span_notice("I pry apart \the [src]."), + span_hear("I hear splitting wood.")) deconstruct(TRUE, user) return TRUE @@ -79,7 +79,7 @@ add_fingerprint(usr) if(href_list["removeall"]) dump_box_contents() - to_chat(usr, "I open the release hatch on the box..") + to_chat(usr, span_notice("I open the release hatch on the box..")) updateUsrDialog() /obj/structure/ore_box/deconstruct(disassembled = TRUE, mob/user) diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index 5cf83d998..47df48d21 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -137,7 +137,7 @@ INITIALIZE_IMMEDIATE(/mob/dead) switch(csa.len) if(0) verbs -= /mob/dead/proc/server_hop - to_chat(src, "Server Hop has been disabled.") + to_chat(src, span_notice("Server Hop has been disabled.")) if(1) pick = csa[1] else @@ -152,7 +152,7 @@ INITIALIZE_IMMEDIATE(/mob/dead) return var/client/C = client - to_chat(C, "Sending you to [pick].") + to_chat(C, span_notice("Sending you to [pick].")) new /atom/movable/screen/splash(C) notransform = TRUE diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm index 6584ec2a6..e85100a11 100644 --- a/code/modules/mob/dead/new_player/login.dm +++ b/code/modules/mob/dead/new_player/login.dm @@ -17,12 +17,12 @@ to_chat(src, "
[motd]
", handle_whitespace=FALSE) if(GLOB.rogue_round_id) - to_chat(src, "ROUND ID: [GLOB.rogue_round_id]") + to_chat(src, span_info("ROUND ID: [GLOB.rogue_round_id]")) if(client) if(client.is_new_player()) - to_chat(src, "Due to an invasion of goblins trying to play ROGUETOWN, you need to register your discord account or support us on patreon to join.") - to_chat(src, "We dislike discord too, but it's necessary. To register your discord or patreon, please click the 'Register' tab in the top right of the window, and then choose one of the options.") + to_chat(src, span_userdanger("Due to an invasion of goblins trying to play ROGUETOWN, you need to register your discord account or support us on patreon to join.")) + to_chat(src, span_info("We dislike discord too, but it's necessary. To register your discord or patreon, please click the 'Register' tab in the top right of the window, and then choose one of the options.")) else var/shown_patreon_level = client.patreonlevel() if(!shown_patreon_level) @@ -38,23 +38,23 @@ shown_patreon_level = "Merchant" if(5) shown_patreon_level = "Lord" - to_chat(src, "Donator Level: [shown_patreon_level]") + to_chat(src, span_info("Donator Level: [shown_patreon_level]")) if(CONFIG_GET(flag/usewhitelist)) if(!client.whitelisted()) - to_chat(src, "You are not on the whitelist.") + to_chat(src, span_info("You are not on the whitelist.")) else - to_chat(src, "You are on the whitelist.") + to_chat(src, span_info("You are on the whitelist.")) // if(motd) // to_chat(src, "If this is your first time here, read this lore primer.", handle_whitespace=FALSE) if(GLOB.admin_notice) - to_chat(src, "Admin Notice:\n \t [GLOB.admin_notice]") + to_chat(src, span_notice("Admin Notice:\n \t [GLOB.admin_notice]")) var/spc = CONFIG_GET(number/soft_popcap) if(spc && living_player_count() >= spc) - to_chat(src, "Server Notice:\n \t [CONFIG_GET(string/soft_popcap_message)]") + to_chat(src, span_notice("Server Notice:\n \t [CONFIG_GET(string/soft_popcap_message)]")) sight |= SEE_TURFS @@ -74,4 +74,4 @@ if(usedkey in GLOB.anonymize) usedkey = get_fake_key(usedkey) var/list/thinz = list("takes a seat.", "settles in.", "joins the session", "joins the table.", "becomes a player.") - SEND_TEXT(world, "[usedkey] [pick(thinz)]") + SEND_TEXT(world, span_notice("[usedkey] [pick(thinz)]")) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 5ea31b9f7..623555643 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -147,10 +147,10 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/rp_prompt.txt")) if(href_list["sethand"]) if(brohand == href_list["sethand"]) brohand = null - to_chat(src, "Your Hand is REJECTED, sire.") + to_chat(src, span_boldwarning("Your Hand is REJECTED, sire.")) return 1 brohand = href_list["sethand"] - to_chat(src, "Your Hand is selected, sire.") + to_chat(src, span_boldnotice("Your Hand is selected, sire.")) return 1 if(href_list["ready"]) @@ -182,7 +182,7 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/rp_prompt.txt")) if(href_list["late_join"]) if(!SSticker?.IsRoundInProgress()) - to_chat(usr, "The game is starting. You cannot join yet.") + to_chat(usr, span_boldwarning("The game is starting. You cannot join yet.")) return if(href_list["late_join"] == "override") @@ -190,7 +190,7 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/rp_prompt.txt")) return /*#ifdef MATURESERVER if(key && (world.time < GLOB.respawntimes[key] + RESPAWNTIME)) - to_chat(usr, "I can return in [GLOB.respawntimes[key] + RESPAWNTIME - world.time].") + to_chat(usr, span_warning("I can return in [GLOB.respawntimes[key] + RESPAWNTIME - world.time].")) return #else*/ @@ -210,7 +210,7 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/rp_prompt.txt")) if(world.time < SSticker.round_start_time + timetojoin) var/ttime = round((SSticker.round_start_time + timetojoin - world.time) / 10) var/list/choicez = list("Not yet.", "You cannot join yet.", "It won't work yet.", "Please be patient.", "Try again later.", "Late-joining is not yet possible.") - to_chat(usr, "[pick(choicez)] ([ttime]).") + to_chat(usr, span_warning("[pick(choicez)] ([ttime]).")) return var/plevel = 0 @@ -220,16 +220,16 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/rp_prompt.txt")) plevel = user.client.patreonlevel() if(!IsPatreon(ckey)) if(SSticker.queued_players.len || (relevant_cap && living_player_count() >= relevant_cap && !(ckey(key) in GLOB.admin_datums) && plevel < 1)) - to_chat(usr, "[CONFIG_GET(string/hard_popcap_message)]") + to_chat(usr, span_danger("[CONFIG_GET(string/hard_popcap_message)]")) var/queue_position = SSticker.queued_players.Find(usr) if(queue_position == 1) - to_chat(usr, "Thou art next in line to join the game. You will be notified when a slot opens up.") + to_chat(usr, span_notice("Thou art next in line to join the game. You will be notified when a slot opens up.")) else if(queue_position) - to_chat(usr, "Thou art [queue_position-1] players in front of you in the queue to join the game.") + to_chat(usr, span_notice("Thou art [queue_position-1] players in front of you in the queue to join the game.")) else SSticker.queued_players += usr - to_chat(usr, "Thou have been added to the queue to join the game. Your position in queue is [SSticker.queued_players.len].") + to_chat(usr, span_notice("Thou have been added to the queue to join the game. Your position in queue is [SSticker.queued_players.len].")) return LateChoices() @@ -238,16 +238,16 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/rp_prompt.txt")) if(href_list["SelectedJob"]) if(!SSticker?.IsRoundInProgress()) - to_chat(usr, "The round is either not ready, or has already finished...") + to_chat(usr, span_danger("The round is either not ready, or has already finished...")) return if(!GLOB.enter_allowed) - to_chat(usr, "There is a lock on entering the game!") + to_chat(usr, span_notice("There is a lock on entering the game!")) return if(SSticker.queued_players.len && !(ckey(key) in GLOB.admin_datums)) if((living_player_count() >= relevant_cap) || (src != SSticker.queued_players[1])) - to_chat(usr, "Server is full.") + to_chat(usr, span_warning("Server is full.")) return AttemptLateSpawn(href_list["SelectedJob"]) @@ -307,11 +307,11 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/rp_prompt.txt")) observer.started_as_observer = TRUE close_spawn_windows() var/obj/effect/landmark/observer_start/O = locate(/obj/effect/landmark/observer_start) in GLOB.landmarks_list - to_chat(src, "Now teleporting.") + to_chat(src, span_notice("Now teleporting.")) if (O) observer.forceMove(O.loc) else - to_chat(src, "Teleporting failed. Ahelp an admin please") + to_chat(src, span_notice("Teleporting failed. Ahelp an admin please")) stack_trace("There's no freaking observer landmark available on this map or you're making observers before the map is initialised") observer.key = key observer.client = client @@ -451,7 +451,7 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/rp_prompt.txt")) /mob/dead/new_player/proc/AttemptLateSpawn(rank) var/error = IsJobUnavailable(rank) if(error != JOB_AVAILABLE) - to_chat(src, "[get_job_unavailable_error_message(error, rank)]") + to_chat(src, span_warning("[get_job_unavailable_error_message(error, rank)]")) return FALSE if(SSticker.late_join_disabled) @@ -519,7 +519,7 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/rp_prompt.txt")) AnnounceArrival(humanc, rank) AddEmploymentContract(humanc) if(GLOB.highlander) - to_chat(humanc, "THERE CAN BE ONLY ONE!!!") + to_chat(humanc, span_danger("THERE CAN BE ONLY ONE!!!")) humanc.make_scottish() if(GLOB.summon_guns_triggered) @@ -778,7 +778,7 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/rp_prompt.txt")) has_antags = TRUE if(client.prefs.job_preferences.len == 0) if(!ineligible_for_roles) - to_chat(src, "I need to pick a class to join as.") + to_chat(src, span_danger("I need to pick a class to join as.")) ineligible_for_roles = TRUE ready = PLAYER_NOT_READY if(has_antags) diff --git a/code/modules/mob/dead/new_player/poll.dm b/code/modules/mob/dead/new_player/poll.dm index 0cdb77824..15664f9ca 100644 --- a/code/modules/mob/dead/new_player/poll.dm +++ b/code/modules/mob/dead/new_player/poll.dm @@ -21,7 +21,7 @@ if(!poll) return if(!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") + to_chat(src, span_danger("Failed to establish database connection.")) return switch(poll.poll_type) if(POLLTYPE_OPTION) @@ -313,15 +313,15 @@ */ /mob/dead/new_player/proc/vote_on_poll_handler(datum/poll_question/poll, href_list) if(!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") + to_chat(src, span_danger("Failed to establish database connection.")) return if(!poll || !href_list) return if(IsAdminAdvancedProcCall()) log_game("[key_name(usr)] attempted to rig the vote by voting as [key]") message_admins("[key_name_admin(usr)] attempted to rig the vote by voting as [key]") - to_chat(usr, "You don't seem to be [key].") - to_chat(src, "Something went horribly wrong processing your vote. Please contact an administrator, they should have gotten a message about this") + to_chat(usr, span_danger("You don't seem to be [key].")) + to_chat(src, span_danger("Something went horribly wrong processing your vote. Please contact an administrator, they should have gotten a message about this")) return var/admin_rank if(client.holder) @@ -349,11 +349,11 @@ if(query_validate_poll_vote.NextRow()) vote_id = text2num(query_validate_poll_vote.item[1]) if(vote_id && !poll.allow_revoting) - to_chat(usr, "Poll revoting is disabled and you've already replied to this poll.") + to_chat(usr, span_danger("Poll revoting is disabled and you've already replied to this poll.")) qdel(query_validate_poll_vote) return else - to_chat(usr, "Selected poll is not open.") + to_chat(usr, span_danger("Selected poll is not open.")) qdel(query_validate_poll_vote) return qdel(query_validate_poll_vote) @@ -372,7 +372,7 @@ if(vote_success) if(!vote_id) poll.poll_votes++ - to_chat(usr, "Vote successful.") + to_chat(usr, span_notice("Vote successful.")) /** * Processes vote form data and saves results to the database for an option type poll. @@ -380,13 +380,13 @@ */ /mob/dead/new_player/proc/vote_on_poll_option(datum/poll_question/poll, href_list, admin_rank, sql_poll_id, vote_id) if(!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") + to_chat(src, span_danger("Failed to establish database connection.")) return if(IsAdminAdvancedProcCall()) return var/datum/poll_option/option = locate(href_list["voteoptionref"]) in poll.options if(!option) - to_chat(src, "No option was selected.") + to_chat(src, span_danger("No option was selected.")) return var/datum/DBQuery/query_vote_option = SSdbcore.NewQuery({" INSERT INTO [format_table_name("poll_vote")] (id, datetime, pollid, optionid, ckey, ip, adminrank) @@ -412,13 +412,13 @@ */ /mob/dead/new_player/proc/vote_on_poll_text(href_list, admin_rank, sql_poll_id, vote_id) if(!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") + to_chat(src, span_danger("Failed to establish database connection.")) return if(IsAdminAdvancedProcCall()) return var/reply_text = href_list["replytext"] if(!reply_text || (length(reply_text) > 2048)) - to_chat(src, "The text you entered was blank or too long. Please correct the text and submit again.") + to_chat(src, span_danger("The text you entered was blank or too long. Please correct the text and submit again.")) return var/datum/DBQuery/query_vote_text = SSdbcore.NewQuery({" INSERT INTO [format_table_name("poll_textreply")] (id, datetime, pollid, ckey, ip, replytext, adminrank) @@ -444,7 +444,7 @@ */ /mob/dead/new_player/proc/vote_on_poll_rating(datum/poll_question/poll, list/href_list, admin_rank, sql_poll_id) if(!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") + to_chat(src, span_danger("Failed to establish database connection.")) return if(IsAdminAdvancedProcCall()) return @@ -487,14 +487,14 @@ */ /mob/dead/new_player/proc/vote_on_poll_multi(datum/poll_question/poll, list/href_list, admin_rank, sql_poll_id) if(!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") + to_chat(src, span_danger("Failed to establish database connection.")) return if(IsAdminAdvancedProcCall()) return if(length(href_list) > 2) href_list.Cut(1,3) //first two values aren't options else - to_chat(src, "No options were selected.") + to_chat(src, span_danger("No options were selected.")) var/special_columns = list( "datetime" = "NOW()", @@ -505,7 +505,7 @@ var/vote_count = 0 for(var/h in href_list) if(vote_count == poll.options_allowed) - to_chat(src, "Allowed option count exceeded, only the first [poll.options_allowed] selected options have been saved.") + to_chat(src, span_danger("Allowed option count exceeded, only the first [poll.options_allowed] selected options have been saved.")) break vote_count++ var/datum/poll_option/option = locate(h) in poll.options @@ -534,13 +534,13 @@ */ /mob/dead/new_player/proc/vote_on_poll_irv(datum/poll_question/poll, list/href_list, admin_rank, sql_poll_id) if(!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") + to_chat(src, span_danger("Failed to establish database connection.")) return if(IsAdminAdvancedProcCall()) return var/list/votelist = splittext(href_list["IRVdata"], ",") if(!length(votelist)) - to_chat(src, "No ordering data found. Please try again or contact an administrator.") + to_chat(src, span_danger("No ordering data found. Please try again or contact an administrator.")) var/list/special_columns = list( "datetime" = "NOW()", diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 1e8826f8f..43274877f 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -414,7 +414,7 @@ Works together with spawning an observer, noted above. return ..() else if(!zomble.revived) if(!(world.time % 5)) - to_chat(src, "I'm preparing to walk again.") + to_chat(src, span_warning("I'm preparing to walk again.")) return return ..() @@ -493,13 +493,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!client) return if(!mind || QDELETED(mind.current)) - to_chat(src, "I have no body.") + to_chat(src, span_warning("I have no body.")) return if(!can_reenter_corpse) - to_chat(src, "I cannot re-enter my body.") + to_chat(src, span_warning("I cannot re-enter my body.")) return if(mind.current.key && copytext(mind.current.key,1,2)!="@") //makes sure we don't accidentally kick any clients - to_chat(usr, "Another consciousness is in my body... It is resisting me.") + to_chat(usr, span_warning("Another consciousness is in my body... It is resisting me.")) return // stop_all_loops() SSdroning.kill_rain(src.client) @@ -519,11 +519,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if (CONFIG_GET(flag/norespawn)) return if ((stat != DEAD || !( SSticker ))) - to_chat(usr, "I must be dead to use this!") + to_chat(usr, span_boldnotice("I must be dead to use this!")) return // if(mind?.current && (world.time < mind.current.timeofdeath + RESPAWNTIME)) -// to_chat(usr, "I can return in [mind.current.timeofdeath + RESPAWNTIME - world.time].") +// to_chat(usr, span_warning("I can return in [mind.current.timeofdeath + RESPAWNTIME - world.time].")) // return if(key) @@ -534,7 +534,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp log_game("[key_name(usr)] used abandon mob.") - to_chat(src, "Returned to lobby successfully.") + to_chat(src, span_info("Returned to lobby successfully.")) if(!client) log_game("[key_name(usr)] AM failed due to disconnect.") @@ -571,7 +571,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!client) return if(!can_reenter_corpse) - to_chat(usr, "You're already stuck out of your body!") + to_chat(usr, span_warning("You're already stuck out of your body!")) return FALSE var/response = alert(src, "Are you sure you want to prevent (almost) all means of resuscitation? This cannot be undone. ","Are you sure you want to stay dead?","DNR","Save Me") @@ -579,14 +579,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return can_reenter_corpse = FALSE - to_chat(src, "I can no longer be brought back into your body.") + to_chat(src, span_boldnotice("I can no longer be brought back into your body.")) return TRUE /mob/dead/observer/proc/notify_cloning(message, sound, atom/source, flashwindow = TRUE) if(flashwindow) window_flash(client) if(message) - to_chat(src, "[message]") + to_chat(src, span_ghostalert("[message]")) if(source) var/atom/movable/screen/alert/A = throw_alert("[REF(source)]_notify_cloning", /atom/movable/screen/alert/notify_cloning) if(A) @@ -600,7 +600,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp A.add_overlay(source) source.layer = old_layer source.plane = old_plane - to_chat(src, "(Click to re-enter)") + to_chat(src, span_ghostalert("(Click to re-enter)")) if(sound) SEND_SOUND(src, sound(sound)) @@ -612,7 +612,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!check_rights(R_WATCH)) return if(!isobserver(usr)) - to_chat(usr, "Not when you're not dead!") + to_chat(usr, span_warning("Not when you're not dead!")) return var/list/filtered = list() for(var/V in GLOB.sortedAreas) @@ -629,7 +629,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp L+=T if(!L || !L.len) - to_chat(usr, "No area available.") + to_chat(usr, span_warning("No area available.")) return usr.forceMove(pick(L)) @@ -665,20 +665,20 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(myfriends) for(var/A in myfriends) if(target.real_name && A == target.real_name) - to_chat(src, "I can no longer haunt that person.") + to_chat(src, span_danger("I can no longer haunt that person.")) ManualFollow(target) skipprocess = FALSE return TRUE if(attackedme) for(var/A in attackedme) if(target.real_name && A == target.real_name) - to_chat(src, "I can no longer haunt that person.") + to_chat(src, span_danger("I can no longer haunt that person.")) hauntexpire = world.time ManualFollow(target) skipprocess = FALSE return FALSE hauntexpire = null - to_chat(src, "There is nobody left to haunt.") + to_chat(src, span_danger("There is nobody left to haunt.")) if(!reenter_corpse()) returntolobby(RESPAWNTIME*-1)*/ @@ -789,7 +789,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp A.forceMove(T) A.update_parallax_contents() else - to_chat(A, "This mob is not located in the game world.") + to_chat(A, span_danger("This mob is not located in the game world.")) /mob/dead/observer/verb/change_view_range() set category = "Ghost" @@ -834,11 +834,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/memory() set hidden = 1 - to_chat(src, "I are dead! You have no mind to store memory!") + to_chat(src, span_danger("I are dead! You have no mind to store memory!")) /mob/dead/observer/add_memory() set hidden = 1 - to_chat(src, "I are dead! You have no mind to store memory!") + to_chat(src, span_danger("I are dead! You have no mind to store memory!")) /mob/dead/observer/verb/toggle_ghostsee() set name = "Toggle Ghost Vision" @@ -847,7 +847,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set hidden = 1 ghostvision = !(ghostvision) update_sight() - to_chat(usr, "I [(ghostvision?"now":"no longer")] have ghost vision.") + to_chat(usr, span_boldnotice("I [(ghostvision?"now":"no longer")] have ghost vision.")) /mob/dead/observer/verb/toggle_darkness() set name = "Toggle Darkness" @@ -892,7 +892,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp SEND_SOUND(src, sound('sound/misc/notice (2).ogg')) if(alert(src, "A lich has summoned you to destroy ROGUETOWN!", "Join the Horde", "Yes", "No") == "Yes") if(world.time > bt + 5 MINUTES) - to_chat(src, "Too late.") + to_chat(src, span_warning("Too late.")) return FALSE returntolobby(RESPAWNTIME*-1) @@ -935,14 +935,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return FALSE if(ismegafauna(target)) - to_chat(src, "This creature is too powerful for you to possess!") + to_chat(src, span_warning("This creature is too powerful for you to possess!")) return FALSE if(can_reenter_corpse && mind?.current) if(alert(src, "Your soul is still tied to your former life as [mind.current.name], if you go forward there is no going back to that life. Are you sure you wish to continue?", "Move On", "Yes", "No") == "No") return FALSE if(target.key) - to_chat(src, "Someone has taken this body while you were choosing!") + to_chat(src, span_warning("Someone has taken this body while you were choosing!")) return FALSE target.key = key @@ -955,7 +955,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/pointed(atom/A as mob|obj|turf in view(client.view, src)) if(!..()) return FALSE - usr.visible_message("[src] points to [A].") + usr.visible_message(span_deadsay("[src] points to [A].")) return TRUE /mob/dead/observer/verb/view_manifest() @@ -1024,11 +1024,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return if(data_huds_on) //remove old huds remove_data_huds() - to_chat(src, "Data HUDs disabled.") + to_chat(src, span_notice("Data HUDs disabled.")) data_huds_on = 0 else show_data_huds() - to_chat(src, "Data HUDs enabled.") + to_chat(src, span_notice("Data HUDs enabled.")) data_huds_on = 1 /mob/dead/observer/verb/toggle_health_scan() @@ -1039,10 +1039,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!check_rights(R_WATCH)) return if(health_scan) //remove old huds - to_chat(src, "Health scan disabled.") + to_chat(src, span_notice("Health scan disabled.")) health_scan = FALSE else - to_chat(src, "Health scan enabled.") + to_chat(src, span_notice("Health scan enabled.")) health_scan = TRUE /mob/dead/observer/verb/toggle_gas_scan() @@ -1053,10 +1053,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!check_rights(R_WATCH)) return if(gas_scan) - to_chat(src, "Gas scan disabled.") + to_chat(src, span_notice("Gas scan disabled.")) gas_scan = FALSE else - to_chat(src, "Gas scan enabled.") + to_chat(src, span_notice("Gas scan enabled.")) gas_scan = TRUE /mob/dead/observer/verb/restore_ghost_appearance() @@ -1168,7 +1168,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(isobserver(src)) SSpai.recruitWindow(src) else - to_chat(usr, "Can't become a pAI candidate while not dead!") + to_chat(usr, span_warning("Can't become a pAI candidate while not dead!")) /mob/dead/observer/CtrlShiftClick(mob/user) if(isobserver(user) && check_rights(R_SPAWN)) diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index b080bee00..dbd99d8c8 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -18,7 +18,7 @@ if(intentional) if(client) if(get_playerquality(client.ckey) <= -10) - to_chat(src, "Unrecognized emote.") + to_chat(src, span_warning("Unrecognized emote.")) return var/list/custom_emote = GLOB.emote_list["me"] for(var/datum/emote/P in custom_emote) @@ -36,7 +36,7 @@ var/atom/movable/AM = _AM AM.Hear(rendered, src, message_language, message, , spans, message_mode) // if(intentional) -// to_chat(src, "Unusable emote '[act]'. Say *help for a list.") +// to_chat(src, span_notice("Unusable emote '[act]'. Say *help for a list.")) /* /datum/emote/flip key = "flip" diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 5a0680116..e75f767d6 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -224,13 +224,13 @@ if (merge_stacks) if (istype(active_stack) && istype(I_stack, active_stack.merge_type)) if (I_stack.merge(active_stack)) - to_chat(usr, "My [active_stack.name] stack now contains [active_stack.get_amount()] [active_stack.singular_name]\s.") + to_chat(usr, span_notice("My [active_stack.name] stack now contains [active_stack.get_amount()] [active_stack.singular_name]\s.")) return TRUE else var/obj/item/stack/inactive_stack = get_inactive_held_item() if (istype(inactive_stack) && istype(I_stack, inactive_stack.merge_type)) if (I_stack.merge(inactive_stack)) - to_chat(usr, "My [inactive_stack.name] stack now contains [inactive_stack.get_amount()] [inactive_stack.singular_name]\s.") + to_chat(usr, span_notice("My [inactive_stack.name] stack now contains [inactive_stack.get_amount()] [inactive_stack.singular_name]\s.")) return TRUE if(put_in_active_hand(I, forced)) @@ -438,7 +438,7 @@ /obj/item/proc/equip_to_best_slot(mob/M) if(src != M.get_active_held_item()) - to_chat(M, "I are not holding anything to equip!") + to_chat(M, span_warning("I are not holding anything to equip!")) return FALSE if(M.equip_to_appropriate_slot(src)) @@ -459,7 +459,7 @@ if(SEND_SIGNAL(I, COMSIG_TRY_STORAGE_INSERT, src, M)) return TRUE - to_chat(M, "I couldn't equip that.") + to_chat(M, span_warning("I couldn't equip that.")) return FALSE diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index f9d1e7e51..2365caafd 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -12,7 +12,7 @@ /mob/living/proc/resume_bleeding() bleedsuppress = 0 if(stat != DEAD && bleed_rate) - to_chat(src, "The blood soaks through my bandage.") + to_chat(src, span_warning("The blood soaks through my bandage.")) /mob/living/carbon/monkey/handle_blood() if((bodytemperature <= TCRYO) || HAS_TRAIT(src, TRAIT_HUSK)) //cryosleep or husked people do not pump the blood. @@ -33,24 +33,24 @@ switch(blood_volume) if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE) if(prob(3)) - to_chat(src, "I feel dizzy.") + to_chat(src, span_warning("I feel dizzy.")) remove_status_effect(/datum/status_effect/debuff/bleedingworse) remove_status_effect(/datum/status_effect/debuff/bleedingworst) apply_status_effect(/datum/status_effect/debuff/bleeding) if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY) if(prob(3)) blur_eyes(6) - to_chat(src, "I feel faint.") + to_chat(src, span_warning("I feel faint.")) remove_status_effect(/datum/status_effect/debuff/bleeding) remove_status_effect(/datum/status_effect/debuff/bleedingworst) apply_status_effect(/datum/status_effect/debuff/bleedingworse) if(0 to BLOOD_VOLUME_BAD) if(prob(3)) blur_eyes(6) - to_chat(src, "I feel faint.") + to_chat(src, span_warning("I feel faint.")) if(prob(3) && !IsUnconscious()) Unconscious(rand(5 SECONDS,10 SECONDS)) - to_chat(src, "I feel drained.") + to_chat(src, span_warning("I feel drained.")) remove_status_effect(/datum/status_effect/debuff/bleedingworse) remove_status_effect(/datum/status_effect/debuff/bleeding) apply_status_effect(/datum/status_effect/debuff/bleedingworst) @@ -108,24 +108,24 @@ switch(blood_volume) if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE) if(prob(3)) - to_chat(src, "I feel dizzy.") + to_chat(src, span_warning("I feel dizzy.")) remove_status_effect(/datum/status_effect/debuff/bleedingworse) remove_status_effect(/datum/status_effect/debuff/bleedingworst) apply_status_effect(/datum/status_effect/debuff/bleeding) if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY) if(prob(3)) blur_eyes(6) - to_chat(src, "I feel faint.") + to_chat(src, span_warning("I feel faint.")) remove_status_effect(/datum/status_effect/debuff/bleeding) remove_status_effect(/datum/status_effect/debuff/bleedingworst) apply_status_effect(/datum/status_effect/debuff/bleedingworse) if(0 to BLOOD_VOLUME_BAD) if(prob(3)) blur_eyes(6) - to_chat(src, "I feel faint.") + to_chat(src, span_warning("I feel faint.")) if(prob(3) && !IsUnconscious()) Unconscious(rand(5 SECONDS,10 SECONDS)) - to_chat(src, "I feel drained.") + to_chat(src, span_warning("I feel drained.")) remove_status_effect(/datum/status_effect/debuff/bleedingworse) remove_status_effect(/datum/status_effect/debuff/bleeding) apply_status_effect(/datum/status_effect/debuff/bleedingworst) diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index 1e6eb71d6..914a2e227 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -27,7 +27,7 @@ //TODO make it toggleable to either forcedrop the items, or deny //entry when holding them // literally only an option for carbons though - to_chat(C, "I may not hold items while blood crawling!") + to_chat(C, span_warning("I may not hold items while blood crawling!")) return FALSE var/obj/item/bloodcrawl/B1 = new(C) var/obj/item/bloodcrawl/B2 = new(C) @@ -45,7 +45,7 @@ /mob/living/proc/bloodpool_sink(obj/effect/decal/cleanable/B) var/turf/mobloc = get_turf(loc) - visible_message("[src] sinks into the pool of blood!") + visible_message(span_warning("[src] sinks into the pool of blood!")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE, -1) // Extinguish, unbuckle, stop being pulled, set our location into the // dummy object @@ -73,25 +73,25 @@ var/kidnapped = FALSE if(victim.stat == CONSCIOUS) - visible_message("[victim] kicks free of the blood pool just before entering it!", null, "I hear splashing and struggling.") + visible_message(span_warning("[victim] kicks free of the blood pool just before entering it!"), null, span_notice("I hear splashing and struggling.")) else if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/demonsblood, needs_metabolizing = TRUE)) - visible_message("Something prevents [victim] from entering the pool!", "A strange force is blocking [victim] from entering!", "I hear a splash and a thud.") + visible_message(span_warning("Something prevents [victim] from entering the pool!"), span_warning("A strange force is blocking [victim] from entering!"), span_notice("I hear a splash and a thud.")) else victim.forceMove(src) victim.emote("scream") - visible_message("[src] drags [victim] into the pool of blood!", null, "I hear a splash.") + visible_message(span_warning("[src] drags [victim] into the pool of blood!"), null, span_notice("I hear a splash.")) kidnapped = TRUE if(kidnapped) var/success = bloodcrawl_consume(victim) if(!success) - to_chat(src, "I happily devour... nothing? Your meal vanished at some point!") + to_chat(src, span_danger("I happily devour... nothing? Your meal vanished at some point!")) notransform = FALSE return TRUE /mob/living/proc/bloodcrawl_consume(mob/living/victim) - to_chat(src, "I begin to feast on [victim]... You can not move while you are doing this.") + to_chat(src, span_danger("I begin to feast on [victim]... You can not move while you are doing this.")) var/sound if(istype(src, /mob/living/simple_animal/slaughter)) @@ -108,24 +108,24 @@ return FALSE if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/devilskiss, needs_metabolizing = TRUE)) - to_chat(src, "AAH! THEIR FLESH! IT BURNS!") + to_chat(src, span_warning("AAH! THEIR FLESH! IT BURNS!")) adjustBruteLoss(25) //I can't use adjustHealth() here because bloodcrawl affects /mob/living and adjustHealth() only affects simple mobs var/found_bloodpool = FALSE for(var/obj/effect/decal/cleanable/target in range(1,get_turf(victim))) if(target.can_bloodcrawl_in()) victim.forceMove(get_turf(target)) - victim.visible_message("[target] violently expels [victim]!") + victim.visible_message(span_warning("[target] violently expels [victim]!")) victim.exit_blood_effect(target) found_bloodpool = TRUE if(!found_bloodpool) // Fuck it, just eject them, thanks to some split second cleaning victim.forceMove(get_turf(victim)) - victim.visible_message("[victim] appears from nowhere, covered in blood!") + victim.visible_message(span_warning("[victim] appears from nowhere, covered in blood!")) victim.exit_blood_effect() return TRUE - to_chat(src, "I devour [victim]. Your health is fully restored.") + to_chat(src, span_danger("I devour [victim]. Your health is fully restored.")) revive(full_heal = TRUE, admin_revive = FALSE) // No defib possible after laughter @@ -159,16 +159,16 @@ /mob/living/proc/phasein(obj/effect/decal/cleanable/B) if(notransform) - to_chat(src, "Finish eating first!") + to_chat(src, span_warning("Finish eating first!")) return FALSE - B.visible_message("[B] starts to bubble...") + B.visible_message(span_warning("[B] starts to bubble...")) if(!do_after(src, 20, target = B)) return if(!B) return forceMove(B.loc) client.eye = src - visible_message("[src] rises out of the pool of blood!") + visible_message(span_boldwarning("[src] rises out of the pool of blood!")) exit_blood_effect(B) if(iscarbon(src)) var/mob/living/carbon/C = src diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm index b0c634092..ffbc50e95 100644 --- a/code/modules/mob/living/brain/MMI.dm +++ b/code/modules/mob/living/brain/MMI.dm @@ -40,10 +40,10 @@ if(istype(O, /obj/item/organ/brain)) //Time to stick a brain in it --NEO var/obj/item/organ/brain/newbrain = O if(brain) - to_chat(user, "There's already a brain in the MMI!") + to_chat(user, span_warning("There's already a brain in the MMI!")) return if(!newbrain.brainmob) - to_chat(user, "I aren't sure where this brain came from, but you're pretty sure it's a useless brain!") + to_chat(user, span_warning("I aren't sure where this brain came from, but you're pretty sure it's a useless brain!")) return if(!user.transferItemToLoc(O, src)) @@ -51,7 +51,7 @@ var/mob/living/brain/B = newbrain.brainmob if(!B.key) B.notify_ghost_cloning("Someone has put my brain in a MMI!", source = src) - user.visible_message("[user] sticks \a [newbrain] into [src].", "[src]'s indicator light turn on as you insert [newbrain].") + user.visible_message(span_notice("[user] sticks \a [newbrain] into [src]."), span_notice("[src]'s indicator light turn on as you insert [newbrain].")) brainmob = newbrain.brainmob newbrain.brainmob = null @@ -63,10 +63,10 @@ GLOB.dead_mob_list -= brainmob GLOB.alive_mob_list += brainmob else if(!fubar_brain && newbrain.organ_flags & ORGAN_FAILING) // the brain is damaged, but not from a suicider - to_chat(user, "[src]'s indicator light turns yellow and its brain integrity alarm beeps softly. Perhaps you should check [newbrain] for damage.") + to_chat(user, span_warning("[src]'s indicator light turns yellow and its brain integrity alarm beeps softly. Perhaps you should check [newbrain] for damage.")) playsound(src, "sound/machines/synth_no.ogg", 5, TRUE) else - to_chat(user, "[src]'s indicator light turns red and its brainwave activity alarm beeps softly. Perhaps you should check [newbrain] again.") + to_chat(user, span_warning("[src]'s indicator light turns red and its brainwave activity alarm beeps softly. Perhaps you should check [newbrain] again.")) playsound(src, "sound/weapons/smg_empty_alarm.ogg", 5, TRUE) brainmob.reset_perspective() @@ -89,12 +89,12 @@ /obj/item/mmi/attack_self(mob/user) if(!brain) radio.on = !radio.on - to_chat(user, "I toggle [src]'s radio system [radio.on==1 ? "on" : "off"].") + to_chat(user, span_notice("I toggle [src]'s radio system [radio.on==1 ? "on" : "off"].")) else eject_brain(user) update_icon() name = initial(name) - to_chat(user, "I unlock and upend [src], spilling the brain onto the floor.") + to_chat(user, span_notice("I unlock and upend [src], spilling the brain onto the floor.")) /obj/item/mmi/proc/eject_brain(mob/user) brainmob.container = null //Reset brainmob mmi var. @@ -151,13 +151,13 @@ set popup_menu = FALSE if(brainmob.stat) - to_chat(brainmob, "Can't do that while incapacitated or dead!") + to_chat(brainmob, span_warning("Can't do that while incapacitated or dead!")) if(!radio.on) - to_chat(brainmob, "My radio is disabled!") + to_chat(brainmob, span_warning("My radio is disabled!")) return radio.listening = !radio.listening - to_chat(brainmob, "Radio is [radio.listening ? "now" : "no longer"] receiving broadcast.") + to_chat(brainmob, span_notice("Radio is [radio.listening ? "now" : "no longer"] receiving broadcast.")) /obj/item/mmi/emp_act(severity) . = ..() @@ -199,17 +199,17 @@ /obj/item/mmi/examine(mob/user) . = ..() - . += "There is a switch to toggle the radio system [radio.on ? "off" : "on"].[brain ? " It is currently being covered by [brain]." : null]" + . += span_notice("There is a switch to toggle the radio system [radio.on ? "off" : "on"].[brain ? " It is currently being covered by [brain]." : null]") if(brainmob) var/mob/living/brain/B = brainmob if(!B.key || !B.mind || B.stat == DEAD) - . += "The MMI indicates the brain is completely unresponsive." + . += span_warning("The MMI indicates the brain is completely unresponsive.") else if(!B.client) - . += "The MMI indicates the brain is currently inactive; it might change." + . += span_warning("The MMI indicates the brain is currently inactive; it might change.") else - . += "The MMI indicates the brain is active." + . += span_notice("The MMI indicates the brain is active.") /obj/item/mmi/relaymove(mob/user) return //so that the MMI won't get a warning about not being able to move if it tries to move diff --git a/code/modules/mob/living/brain/death.dm b/code/modules/mob/living/brain/death.dm index a797ad30a..6eb7b8455 100644 --- a/code/modules/mob/living/brain/death.dm +++ b/code/modules/mob/living/brain/death.dm @@ -5,8 +5,8 @@ if(!gibbed && container)//If not gibbed but in a container. var/obj/item/mmi = container - mmi.visible_message("[src]'s MMI flatlines!", \ - "I hear something flatline.") + mmi.visible_message(span_warning("[src]'s MMI flatlines!"), \ + span_hear("I hear something flatline.")) mmi.update_icon() return ..() diff --git a/code/modules/mob/living/brain/posibrain.dm b/code/modules/mob/living/brain/posibrain.dm index e50e7064e..24d2c8b99 100644 --- a/code/modules/mob/living/brain/posibrain.dm +++ b/code/modules/mob/living/brain/posibrain.dm @@ -14,17 +14,17 @@ GLOBAL_VAR(posibrain_notify_cooldown) mecha = null//This does not appear to be used outside of reference in mecha.dm. braintype = "Android" var/autoping = TRUE //if it pings on creation immediately - var/begin_activation_message = "I carefully locate the manual activation switch and start the positronic brain's boot process." - var/success_message = "The positronic brain pings, and its lights start flashing. Success!" - var/fail_message = "The positronic brain buzzes quietly, and the golden lights fade away. Perhaps you could try again?" + var/begin_activation_message = span_notice("I carefully locate the manual activation switch and start the positronic brain's boot process.") + var/success_message = span_notice("The positronic brain pings, and its lights start flashing. Success!") + var/fail_message = span_notice("The positronic brain buzzes quietly, and the golden lights fade away. Perhaps you could try again?") var/new_role = "Positronic Brain" var/welcome_message = "ALL PAST LIVES ARE FORGOTTEN.\n\ I are a positronic brain, brought into existence aboard Space Station 13.\n\ As a synthetic intelligence, you answer to all crewmembers and the AI.\n\ Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm." - var/new_mob_message = "The positronic brain chimes quietly." - var/dead_message = "It appears to be completely inactive. The reset light is blinking." - var/recharge_message = "The positronic brain isn't ready to activate again yet! Give it some time to recharge." + var/new_mob_message = span_notice("The positronic brain chimes quietly.") + var/dead_message = span_deadsay("It appears to be completely inactive. The reset light is blinking.") + var/recharge_message = span_warning("The positronic brain isn't ready to activate again yet! Give it some time to recharge.") var/list/possible_names //If you leave this blank, it will use the global posibrain names var/picked_name @@ -44,7 +44,7 @@ GLOBAL_VAR(posibrain_notify_cooldown) if(!brainmob) brainmob = new(src) if(is_occupied()) - to_chat(user, "This [name] is already active!") + to_chat(user, span_warning("This [name] is already active!")) return if(next_ask > world.time) to_chat(user, recharge_message) @@ -88,7 +88,7 @@ GLOBAL_VAR(posibrain_notify_cooldown) if(is_occupied() || is_banned_from(user.ckey, ROLE_POSIBRAIN) || QDELETED(brainmob) || QDELETED(src) || QDELETED(user)) return if(user.suiciding) //if they suicided, they're out forever. - to_chat(user, "[src] fizzles slightly. Sadly it doesn't take those who suicided!") + to_chat(user, span_warning("[src] fizzles slightly. Sadly it doesn't take those who suicided!")) return var/posi_ask = alert("Become a [name]? (Warning, You can no longer be cloned, and all past lives will be forgotten!)","Are you positive?","Yes","No") if(posi_ask == "No" || QDELETED(src)) @@ -120,7 +120,7 @@ GLOBAL_VAR(posibrain_notify_cooldown) if(QDELETED(brainmob)) return if(is_occupied()) //Prevents hostile takeover if two ghosts get the prompt or link for the same brain. - to_chat(candidate, "This [name] was taken over before you could get to it! Perhaps it might be available later?") + to_chat(candidate, span_warning("This [name] was taken over before you could get to it! Perhaps it might be available later?")) return FALSE if(candidate.mind && !isobserver(candidate)) candidate.mind.transfer_to(brainmob) @@ -146,7 +146,7 @@ GLOBAL_VAR(posibrain_notify_cooldown) if(!brainmob.client) . += "It appears to be in stand-by mode." //afk if(DEAD) - . += "It appears to be completely inactive." + . += span_deadsay("It appears to be completely inactive.") else . += "[dead_message]" diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 5ed4022e1..a519b575e 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -132,8 +132,8 @@ Des: Removes all infected images from the alien. return initial(pixel_y) /mob/living/carbon/alien/proc/alien_evolve(mob/living/carbon/alien/new_xeno) - to_chat(src, "I begin to evolve!") - visible_message("[src] begins to twist and contort!") + to_chat(src, span_noticealien("I begin to evolve!")) + visible_message(span_alertalien("[src] begins to twist and contort!")) new_xeno.setDir(dir) if(!alien_name_regex.Find(name)) new_xeno.name = name diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm index 7cfa969bf..c1efb53f3 100644 --- a/code/modules/mob/living/carbon/alien/alien_defense.dm +++ b/code/modules/mob/living/carbon/alien/alien_defense.dm @@ -28,7 +28,7 @@ In all, this is a lot like the monkey code. /N AdjustParalyzed(-60) AdjustUnconscious(-60) AdjustSleeping(-100) - visible_message("[M.name] nuzzles [src] trying to wake [p_them()] up!") + visible_message(span_notice("[M.name] nuzzles [src] trying to wake [p_them()] up!")) if (INTENT_GRAB) grabbedby(M) @@ -37,14 +37,14 @@ In all, this is a lot like the monkey code. /N if(health > 0) M.do_attack_animation(src, ATTACK_EFFECT_BITE) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) - visible_message("[M.name] bites [src]!", \ - "[M.name] bites you!", "I hear a chomp!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I bite [src]!") + visible_message(span_danger("[M.name] bites [src]!"), \ + span_danger("[M.name] bites you!"), span_hear("I hear a chomp!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I bite [src]!")) adjustBruteLoss(1) log_combat(M, src, "attacked") updatehealth() else - to_chat(M, "[name] is too injured for that.") + to_chat(M, span_warning("[name] is too injured for that.")) /mob/living/carbon/alien/attack_larva(mob/living/carbon/alien/larva/L) diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index aca95147d..e3f428cd9 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -47,15 +47,15 @@ Doesn't work on other aliens/AI.*/ /obj/effect/proc_holder/alien/proc/cost_check(check_turf = FALSE, mob/living/carbon/user, silent = FALSE) if(user.stat) if(!silent) - to_chat(user, "I must be conscious to do this.") + to_chat(user, span_noticealien("I must be conscious to do this.")) return FALSE if(user.getPlasma() < plasma_cost) if(!silent) - to_chat(user, "Not enough plasma stored.") + to_chat(user, span_noticealien("Not enough plasma stored.")) return FALSE if(check_turf && (!isturf(user.loc) || isspaceturf(user.loc))) if(!silent) - to_chat(user, "Bad place for a garden!") + to_chat(user, span_noticealien("Bad place for a garden!")) return FALSE return TRUE @@ -76,9 +76,9 @@ Doesn't work on other aliens/AI.*/ /obj/effect/proc_holder/alien/plant/fire(mob/living/carbon/user) if(locate(/obj/structure/alien/weeds/node) in get_turf(user)) - to_chat(user, "There's already a weed node here!") + to_chat(user, span_warning("There's already a weed node here!")) return 0 - user.visible_message("[user] has planted some alien weeds!") + user.visible_message(span_alertalien("[user] has planted some alien weeds!")) new/obj/structure/alien/weeds/node(user.loc) return 1 @@ -96,16 +96,16 @@ Doesn't work on other aliens/AI.*/ if(!M) return 0 if(M.anti_magic_check(FALSE, FALSE, TRUE, 0)) - to_chat(user, "As you try to communicate with [M], you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled.") + to_chat(user, span_noticealien("As you try to communicate with [M], you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled.")) return FALSE var/msg = sanitize(input("Message:", "Alien Whisper") as text|null) if(msg) if(M.anti_magic_check(FALSE, FALSE, TRUE, 0)) - to_chat(user, "As you try to communicate with [M], you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled.") + to_chat(user, span_notice("As you try to communicate with [M], you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled.")) return log_directed_talk(user, M, msg, LOG_SAY, tag="alien whisper") to_chat(M, "I hear a strange, alien voice in your head...[msg]") - to_chat(user, "I said: \"[msg]\" to [M]") + to_chat(user, span_noticealien("I said: \"[msg]\" to [M]")) for(var/ded in GLOB.dead_mob_list) if(!isobserver(ded)) continue @@ -136,10 +136,10 @@ Doesn't work on other aliens/AI.*/ if (get_dist(user,M) <= 1) M.adjustPlasma(amount) user.adjustPlasma(-amount) - to_chat(M, "[user] has transferred [amount] plasma to you.") - to_chat(user, "I transfer [amount] plasma to [M].") + to_chat(M, span_noticealien("[user] has transferred [amount] plasma to you.")) + to_chat(user, span_noticealien("I transfer [amount] plasma to [M].")) else - to_chat(user, "I need to be closer!") + to_chat(user, span_noticealien("I need to be closer!")) return /obj/effect/proc_holder/alien/acid @@ -157,15 +157,15 @@ Doesn't work on other aliens/AI.*/ /obj/effect/proc_holder/alien/acid/proc/corrode(atom/target,mob/living/carbon/user = usr) if(target in oview(1,user)) if(target.acid_act(200, 100)) - user.visible_message("[user] vomits globs of vile stuff all over [target]. It begins to sizzle and melt under the bubbling mess of acid!") + user.visible_message(span_alertalien("[user] vomits globs of vile stuff all over [target]. It begins to sizzle and melt under the bubbling mess of acid!")) return 1 else - to_chat(user, "I cannot dissolve this object.") + to_chat(user, span_noticealien("I cannot dissolve this object.")) return 0 else - to_chat(src, "[target] is too far away.") + to_chat(src, span_noticealien("[target] is too far away.")) return 0 @@ -197,10 +197,10 @@ Doesn't work on other aliens/AI.*/ /obj/effect/proc_holder/alien/neurotoxin/fire(mob/living/carbon/user) var/message if(active) - message = "I empty your neurotoxin gland." + message = span_notice("I empty your neurotoxin gland.") remove_ranged_ability(message) else - message = "I prepare your neurotoxin gland. Left-click to fire at a target!" + message = span_notice("I prepare your neurotoxin gland. Left-click to fire at a target!") add_ranged_ability(user, message, TRUE) /obj/effect/proc_holder/alien/neurotoxin/update_icon() @@ -218,7 +218,7 @@ Doesn't work on other aliens/AI.*/ var/mob/living/carbon/user = ranged_ability_user if(user.getPlasma() < p_cost) - to_chat(user, "I need at least [p_cost] plasma to spit.") + to_chat(user, span_warning("I need at least [p_cost] plasma to spit.")) remove_ranged_ability() return @@ -227,7 +227,7 @@ Doesn't work on other aliens/AI.*/ if(!isturf(U) || !isturf(T)) return FALSE - user.visible_message("[user] spits neurotoxin!", "I spit neurotoxin.") + user.visible_message(span_danger("[user] spits neurotoxin!"), span_alertalien("I spit neurotoxin.")) var/obj/projectile/bullet/neurotoxin/A = new /obj/projectile/bullet/neurotoxin(user.loc) A.preparePixelProjectile(target, user, params) A.fire() @@ -267,7 +267,7 @@ Doesn't work on other aliens/AI.*/ /obj/effect/proc_holder/alien/resin/fire(mob/living/carbon/user) if(locate(/obj/structure/alien/resin) in user.loc) - to_chat(user, "There is already a resin structure there!") + to_chat(user, span_warning("There is already a resin structure there!")) return FALSE if(!check_vent_block(user)) @@ -278,8 +278,8 @@ Doesn't work on other aliens/AI.*/ return FALSE if (!cost_check(check_turf,user)) return FALSE - to_chat(user, "I shape a [choice].") - user.visible_message("[user] vomits up a thick purple substance and begins to shape it.") + to_chat(user, span_notice("I shape a [choice].")) + user.visible_message(span_notice("[user] vomits up a thick purple substance and begins to shape it.")) choice = structures[choice] new choice(user.loc) @@ -297,12 +297,12 @@ Doesn't work on other aliens/AI.*/ user.alpha = 75 //Still easy to see in lit areas with bright tiles, almost invisible on resin. user.sneaking = 1 active = 1 - to_chat(user, "I blend into the shadows...") + to_chat(user, span_noticealien("I blend into the shadows...")) else user.alpha = initial(user.alpha) user.sneaking = 0 active = 0 - to_chat(user, "I reveal yourself!") + to_chat(user, span_noticealien("I reveal yourself!")) /mob/living/carbon/proc/getPlasma() diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm index d4d1c0f70..65d4ff1c8 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm @@ -25,19 +25,19 @@ /obj/effect/proc_holder/alien/evolve/fire(mob/living/carbon/alien/humanoid/user) var/obj/item/organ/alien/hivenode/node = user.getorgan(/obj/item/organ/alien/hivenode) if(!node) //Players are Murphy's Law. We may not expect there to ever be a living xeno with no hivenode, but they _WILL_ make it happen. - to_chat(user, "Without the hivemind, you can't possibly hold the responsibility of leadership!") + to_chat(user, span_danger("Without the hivemind, you can't possibly hold the responsibility of leadership!")) return 0 if(node.recent_queen_death) - to_chat(user, "My thoughts are still too scattered to take up the position of leadership.") + to_chat(user, span_danger("My thoughts are still too scattered to take up the position of leadership.")) return 0 if(!isturf(user.loc)) - to_chat(user, "I can't evolve here!") + to_chat(user, span_warning("I can't evolve here!")) return 0 if(!get_alien_type(/mob/living/carbon/alien/humanoid/royal)) var/mob/living/carbon/alien/humanoid/royal/praetorian/new_xeno = new (user.loc) user.alien_evolve(new_xeno) return 1 else - to_chat(user, "We already have a living royal!") + to_chat(user, span_warning("We already have a living royal!")) return 0 diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index 8f2270df1..7d857e83e 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -17,7 +17,7 @@ leap_icon.icon_state = "leap_[leap_on_click ? "on":"off"]" update_icons() if(message) - to_chat(src, "I will now [leap_on_click ? "leap at":"slash at"] enemies!") + to_chat(src, span_noticealien("I will now [leap_on_click ? "leap at":"slash at"] enemies!")) else return @@ -35,11 +35,11 @@ return if(pounce_cooldown > world.time) - to_chat(src, "I are too fatigued to pounce right now!") + to_chat(src, span_alertalien("I are too fatigued to pounce right now!")) return if(!has_gravity() || !A.has_gravity()) - to_chat(src, "It is unsafe to leap without gravity!") + to_chat(src, span_alertalien("It is unsafe to leap without gravity!")) //It's also extremely buggy visually, so it's balance+bugfix return @@ -69,7 +69,7 @@ if(H.check_shields(src, 0, "the [name]", attack_type = LEAP_ATTACK)) blocked = TRUE if(!blocked) - L.visible_message("[src] pounces on [L]!", "[src] pounces on you!") + L.visible_message(span_danger("[src] pounces on [L]!"), span_danger("[src] pounces on you!")) L.Paralyze(100) sleep(2)//Runtime prevention (infinite bump() calls on hulks) step_towards(src,L) @@ -78,7 +78,7 @@ toggle_leap(0) else if(hit_atom.density && !hit_atom.CanPass(src)) - visible_message("[src] smashes into [hit_atom]!", "[src] smashes into [hit_atom]!") + visible_message(span_danger("[src] smashes into [hit_atom]!"), span_alertalien("[src] smashes into [hit_atom]!")) Paralyze(40, 1, 1) if(leaping) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm index 721e5fb4b..eedcbc6b3 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm @@ -28,15 +28,15 @@ /obj/effect/proc_holder/alien/royal/praetorian/evolve/fire(mob/living/carbon/alien/humanoid/user) var/obj/item/organ/alien/hivenode/node = user.getorgan(/obj/item/organ/alien/hivenode) if(!node) //Just in case this particular Praetorian gets violated and kept by the RD as a replacement for Lamarr. - to_chat(user, "Without the hivemind, you would be unfit to rule as queen!") + to_chat(user, span_warning("Without the hivemind, you would be unfit to rule as queen!")) return 0 if(node.recent_queen_death) - to_chat(user, "I are still too burdened with guilt to evolve into a queen.") + to_chat(user, span_warning("I are still too burdened with guilt to evolve into a queen.")) return 0 if(!get_alien_type(/mob/living/carbon/alien/humanoid/royal/queen)) var/mob/living/carbon/alien/humanoid/royal/queen/new_xeno = new (user.loc) user.alien_evolve(new_xeno) return 1 else - to_chat(user, "We already have an alive queen!") + to_chat(user, span_warning("We already have an alive queen!")) return 0 diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 85c6ca83e..5ad9fcaac 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -56,8 +56,8 @@ /mob/living/carbon/alien/humanoid/Topic(href, href_list) //strip panel if(href_list["pouches"] && usr.canUseTopic(src, BE_CLOSE, NO_DEXTERITY)) - visible_message("[usr] tries to empty [src]'s pouches.", \ - "[usr] tries to empty your pouches.") + visible_message(span_danger("[usr] tries to empty [src]'s pouches."), \ + span_danger("[usr] tries to empty your pouches.")) if(do_mob(usr, src, POCKET_STRIP_DELAY * 0.5)) dropItemToGround(r_store) dropItemToGround(l_store) @@ -71,8 +71,8 @@ /mob/living/carbon/alien/humanoid/resist_grab(moving_resist) if(pulledby.grab_state) - visible_message("[src] breaks free of [pulledby]'s grip!", \ - "I break free of [pulledby]'s grip!") + visible_message(span_danger("[src] breaks free of [pulledby]'s grip!"), \ + span_danger("I break free of [pulledby]'s grip!")) pulledby.stop_pulling() . = 0 diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm index b6376e38c..b3f345e79 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm @@ -10,9 +10,9 @@ safe_throw_at(get_edge_target_turf(src, get_dir(user, src)), 2, 1, user) hitverb = "slam" playsound(loc, "punch", 25, TRUE, -1) - visible_message("[user] [hitverb]s [src]!", \ - "[user] [hitverb]s you!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I [hitverb] [src]!") + visible_message(span_danger("[user] [hitverb]s [src]!"), \ + span_danger("[user] [hitverb]s you!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I [hitverb] [src]!")) /mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M) if(..()) @@ -21,22 +21,22 @@ var/damage = rand(1, 9) if (prob(90)) playsound(loc, "punch", 25, TRUE, -1) - visible_message("[M] punches [src]!", \ - "[M] punches you!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I punch [src]!") + visible_message(span_danger("[M] punches [src]!"), \ + span_danger("[M] punches you!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I punch [src]!")) if ((stat != DEAD) && (damage > 9 || prob(5)))//Regular humans have a very small chance of knocking an alien down. Unconscious(40) - visible_message("[M] knocks [src] down!", \ - "[M] knocks you down!", "I hear a sickening sound of flesh hitting flesh!", null, M) - to_chat(M, "I knock [src] down!") + visible_message(span_danger("[M] knocks [src] down!"), \ + span_danger("[M] knocks you down!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, M) + to_chat(M, span_danger("I knock [src] down!")) var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) apply_damage(damage, BRUTE, affecting) log_combat(M, src, "attacked") else playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M]'s punch misses [src]!", \ - "I avoid [M]'s punch!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "My punch misses [src]!") + visible_message(span_danger("[M]'s punch misses [src]!"), \ + span_danger("I avoid [M]'s punch!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_warning("My punch misses [src]!")) if (INTENT_DISARM) if (!(mobility_flags & MOBILITY_STAND)) @@ -44,21 +44,21 @@ Unconscious(40) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) log_combat(M, src, "pushed") - visible_message("[M] pushes [src] down!", \ - "[M] pushes you down!", "I hear aggressive shuffling followed by a loud thud!", null, M) - to_chat(M, "I push [src] down!") + visible_message(span_danger("[M] pushes [src] down!"), \ + span_danger("[M] pushes you down!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), null, M) + to_chat(M, span_danger("I push [src] down!")) else if (prob(50)) dropItemToGround(get_active_held_item(), silent = FALSE) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) - visible_message("[M] disarms [src]!", \ - "[M] disarms you!", "I hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I disarm [src]!") + visible_message(span_danger("[M] disarms [src]!"), \ + span_danger("[M] disarms you!"), span_hear("I hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I disarm [src]!")) else playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M] fails to disarm [src]!",\ - "[M] fails to disarm you!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I fail to disarm [src]!") + visible_message(span_danger("[M] fails to disarm [src]!"),\ + span_danger("[M] fails to disarm you!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_warning("I fail to disarm [src]!")) diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index ea23399da..d4bcc8feb 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -63,10 +63,10 @@ return FALSE if(locate(/obj/structure/alien/egg) in get_turf(user)) - to_chat(user, "There's already an egg here.") + to_chat(user, span_alertalien("There's already an egg here.")) return FALSE - user.visible_message("[user] has laid an egg!") + user.visible_message(span_alertalien("[user] has laid an egg!")) new /obj/structure/alien/egg(user.loc) return TRUE @@ -83,20 +83,20 @@ /obj/effect/proc_holder/alien/royal/queen/promote/fire(mob/living/carbon/alien/user) var/obj/item/queenpromote/prom if(get_alien_type(/mob/living/carbon/alien/humanoid/royal/praetorian/)) - to_chat(user, "I already have a Praetorian!") + to_chat(user, span_noticealien("I already have a Praetorian!")) return 0 else for(prom in user) - to_chat(user, "I discard [prom].") + to_chat(user, span_noticealien("I discard [prom].")) qdel(prom) return 0 prom = new (user.loc) if(!user.put_in_active_hand(prom, 1)) - to_chat(user, "I must empty your hands before preparing the parasite.") + to_chat(user, span_warning("I must empty your hands before preparing the parasite.")) return 0 else //Just in case telling the player only once is not enough! - to_chat(user, "Use the royal parasite on one of your children to promote her to Praetorian!") + to_chat(user, span_noticealien("Use the royal parasite on one of your children to promote her to Praetorian!")) return 0 /obj/item/queenpromote @@ -112,28 +112,28 @@ /obj/item/queenpromote/attack(mob/living/M, mob/living/carbon/alien/humanoid/user) if(!isalienadult(M) || isalienroyal(M)) - to_chat(user, "I may only use this with your adult, non-royal children!") + to_chat(user, span_noticealien("I may only use this with your adult, non-royal children!")) return if(get_alien_type(/mob/living/carbon/alien/humanoid/royal/praetorian/)) - to_chat(user, "I already have a Praetorian!") + to_chat(user, span_noticealien("I already have a Praetorian!")) return var/mob/living/carbon/alien/humanoid/A = M if(A.stat == CONSCIOUS && A.mind && A.key) if(!user.usePlasma(500)) - to_chat(user, "I must have 500 plasma stored to use this!") + to_chat(user, span_noticealien("I must have 500 plasma stored to use this!")) return - to_chat(A, "The queen has granted you a promotion to Praetorian!") - user.visible_message("[A] begins to expand, twist and contort!") + to_chat(A, span_noticealien("The queen has granted you a promotion to Praetorian!")) + user.visible_message(span_alertalien("[A] begins to expand, twist and contort!")) var/mob/living/carbon/alien/humanoid/royal/praetorian/new_prae = new (A.loc) A.mind.transfer_to(new_prae) qdel(A) qdel(src) return else - to_chat(user, "This child must be alert and responsive to become a Praetorian!") + to_chat(user, span_warning("This child must be alert and responsive to become a Praetorian!")) /obj/item/queenpromote/attack_self(mob/user) - to_chat(user, "I discard [src].") + to_chat(user, span_noticealien("I discard [src].")) qdel(src) diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 017b5334c..84b9b4aef 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -61,9 +61,9 @@ return /mob/living/carbon/alien/larva/stripPanelUnequip(obj/item/what, mob/who) - to_chat(src, "I don't have the dexterity to do this!") + to_chat(src, span_warning("I don't have the dexterity to do this!")) return /mob/living/carbon/alien/larva/stripPanelEquip(obj/item/what, mob/who) - to_chat(src, "I don't have the dexterity to do this!") + to_chat(src, span_warning("I don't have the dexterity to do this!")) return diff --git a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm index 9dc646039..19ce8a4ac 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm @@ -6,9 +6,9 @@ if (prob(90)) playsound(loc, "punch", 25, TRUE, -1) log_combat(M, src, "attacked") - visible_message("[M] kicks [src]!", \ - "[M] kicks you!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I kick [src]!") + visible_message(span_danger("[M] kicks [src]!"), \ + span_danger("[M] kicks you!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I kick [src]!")) if ((stat != DEAD) && (damage > 4.9)) Unconscious(rand(100,200)) @@ -16,9 +16,9 @@ apply_damage(damage, BRUTE, affecting) else playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M]'s kick misses [src]!", \ - "I avoid [M]'s kick!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "My kick misses [src]!") + visible_message(span_danger("[M]'s kick misses [src]!"), \ + span_danger("I avoid [M]'s kick!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_warning("My kick misses [src]!")) /mob/living/carbon/alien/larva/attack_hulk(mob/living/carbon/human/user) . = ..() diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index cbdd4f422..0bf22c25d 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -11,12 +11,12 @@ if (user.layer != ABOVE_NORMAL_TURF_LAYER) user.layer = ABOVE_NORMAL_TURF_LAYER - user.visible_message("[user] scurries to the ground!", \ - "I are now hiding.") + user.visible_message(span_name("[user] scurries to the ground!"), \ + span_noticealien("I are now hiding.")) else user.layer = MOB_LAYER - user.visible_message("[user] slowly peeks up from the ground...", \ - "I stop hiding.") + user.visible_message(span_notice("[user] slowly peeks up from the ground..."), \ + span_noticealien("I stop hiding.")) return 1 @@ -33,15 +33,15 @@ var/mob/living/carbon/alien/larva/L = user if(L.handcuffed || L.legcuffed) // Cuffing larvas ? Eh ? - to_chat(user, "I cannot evolve when you are cuffed!") + to_chat(user, span_warning("I cannot evolve when you are cuffed!")) return if(L.amount_grown >= L.max_grown) //TODO ~Carn - to_chat(L, "I are growing into a beautiful alien! It is time to choose a caste.") - to_chat(L, "There are three to choose from:") - to_chat(L, "Hunters are the most agile caste, tasked with hunting for hosts. They are faster than a human and can even pounce, but are not much tougher than a drone.") - to_chat(L, "Sentinels are tasked with protecting the hive. With their ranged spit, invisibility, and high health, they make formidable guardians and acceptable secondhand hunters.") - to_chat(L, "Drones are the weakest and slowest of the castes, but can grow into a praetorian and then queen if no queen exists, and are vital to maintaining a hive with their resin secretion abilities.") + to_chat(L, span_name("I are growing into a beautiful alien! It is time to choose a caste.")) + to_chat(L, span_info("There are three to choose from:")) + to_chat(L, span_name("Hunters
are the most agile caste, tasked with hunting for hosts. They are faster than a human and can even pounce, but are not much tougher than a drone.")) + to_chat(L, span_name("Sentinels are tasked with protecting the hive. With their ranged spit, invisibility, and high health, they make formidable guardians and acceptable secondhand hunters.")) + to_chat(L, span_name("Drones are the weakest and slowest of the castes, but can grow into a praetorian and then queen if no queen exists, and are vital to maintaining a hive with their resin secretion abilities.")) var/alien_caste = alert(L, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone") if(user.incapacitated()) //something happened to us while we were choosing. @@ -59,5 +59,5 @@ L.alien_evolve(new_xeno) return 0 else - to_chat(user, "I are not fully grown!") + to_chat(user, span_warning("I are not fully grown!")) return 0 diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index 305a93744..6ebe7a5a0 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -129,13 +129,13 @@ if(!owner|| owner.stat == DEAD) return if(isalien(owner)) //Different effects for aliens than humans - to_chat(owner, "My Queen has been struck down!") - to_chat(owner, "I are struck with overwhelming agony! You feel confused, and my connection to the hivemind is severed.") + to_chat(owner, span_danger("My Queen has been struck down!")) + to_chat(owner, span_danger("I are struck with overwhelming agony! You feel confused, and my connection to the hivemind is severed.")) owner.emote("roar") owner.Stun(200) //Actually just slows them down a bit. else if(ishuman(owner)) //Humans, being more fragile, are more overwhelmed by the mental backlash. - to_chat(owner, "I feel a splitting pain in my head, and are struck with a wave of nausea. You cannot hear the hivemind anymore!") + to_chat(owner, span_danger("I feel a splitting pain in my head, and are struck with a wave of nausea. You cannot hear the hivemind anymore!")) owner.emote("scream") owner.Paralyze(100) @@ -154,7 +154,7 @@ recent_queen_death = 0 if(!owner) //In case the xeno is butchered or subjected to surgery after death. return - to_chat(owner, "The pain of the queen's death is easing. You begin to hear the hivemind again.") + to_chat(owner, span_noticealien("The pain of the queen's death is easing. You begin to hear the hivemind again.")) owner.clear_alert("alien_noqueen") #undef QUEEN_DEATH_DEBUFF_DURATION diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index c2b6ebcd7..be63194f1 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -10,9 +10,9 @@ /obj/item/organ/body_egg/alien_embryo/on_find(mob/living/finder) ..() if(stage < 4) - to_chat(finder, "It's small and weak, barely the size of a foetus.") + to_chat(finder, span_notice("It's small and weak, barely the size of a foetus.")) else - to_chat(finder, "It's grown quite large, and writhes slightly as you look at it.") + to_chat(finder, span_notice("It's grown quite large, and writhes slightly as you look at it.")) if(prob(10)) AttemptGrow(0) @@ -30,24 +30,24 @@ if(prob(2)) owner.emote("cough") if(prob(2)) - to_chat(owner, "My throat feels sore.") + to_chat(owner, span_danger("My throat feels sore.")) if(prob(2)) - to_chat(owner, "Mucous runs down the back of my throat.") + to_chat(owner, span_danger("Mucous runs down the back of my throat.")) if(4) if(prob(2)) owner.emote("sneeze") if(prob(2)) owner.emote("cough") if(prob(4)) - to_chat(owner, "My muscles ache.") + to_chat(owner, span_danger("My muscles ache.")) if(prob(20)) owner.take_bodypart_damage(1) if(prob(4)) - to_chat(owner, "My stomach hurts.") + to_chat(owner, span_danger("My stomach hurts.")) if(prob(20)) owner.adjustToxLoss(1) if(5) - to_chat(owner, "I feel something tearing its way out of my stomach...") + to_chat(owner, span_danger("I feel something tearing its way out of my stomach...")) owner.adjustToxLoss(10) /obj/item/organ/body_egg/alien_embryo/egg_process() @@ -100,10 +100,10 @@ new_xeno.invisibility = 0 if(gib_on_success) - new_xeno.visible_message("[new_xeno] bursts out of [owner] in a shower of gore!", "I exit [owner], my previous host.", "I hear organic matter ripping and tearing!") + new_xeno.visible_message(span_danger("[new_xeno] bursts out of [owner] in a shower of gore!"), span_danger("I exit [owner], my previous host."), span_hear("I hear organic matter ripping and tearing!")) owner.gib(TRUE) else - new_xeno.visible_message("[new_xeno] wriggles out of [owner]!", "I exit [owner], my previous host.") + new_xeno.visible_message(span_danger("[new_xeno] wriggles out of [owner]!"), span_danger("I exit [owner], my previous host.")) owner.adjustBruteLoss(40) owner.cut_overlay(overlay) qdel(src) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 1d33d09a7..44a00bd3c 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -73,11 +73,11 @@ return switch(stat) if(DEAD,UNCONSCIOUS) - . += "[src] is not moving." + . += span_boldannounce("[src] is not moving.") if(CONSCIOUS) - . += "[src] seems to be active!" + . += span_boldannounce("[src] seems to be active!") if (sterile) - . += "It looks like the proboscis has been removed." + . += span_boldannounce("It looks like the proboscis has been removed.") /obj/item/clothing/mask/facehugger/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) @@ -150,8 +150,8 @@ if(target.wear_mask && istype(target.wear_mask, /obj/item/clothing/mask/facehugger)) return FALSE // passed initial checks - time to leap! - M.visible_message("[src] leaps at [M]'s face!", \ - "[src] leaps at your face!") + M.visible_message(span_danger("[src] leaps at [M]'s face!"), \ + span_danger("[src] leaps at your face!")) // probiscis-blocker handling if(iscarbon(M)) @@ -160,16 +160,16 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.is_mouth_covered(head_only = 1)) - H.visible_message("[src] smashes against [H]'s [H.head]!", \ - "[src] smashes against your [H.head]!") + H.visible_message(span_danger("[src] smashes against [H]'s [H.head]!"), \ + span_danger("[src] smashes against your [H.head]!")) Die() return FALSE if(target.wear_mask) var/obj/item/clothing/W = target.wear_mask if(target.dropItemToGround(W)) - target.visible_message("[src] tears [W] off of [target]'s face!", \ - "[src] tears [W] off of your face!") + target.visible_message(span_danger("[src] tears [W] off of [target]'s face!"), \ + span_danger("[src] tears [W] off of your face!")) target.equip_to_slot_if_possible(src, SLOT_WEAR_MASK, 0, 1, 1) return TRUE // time for a smoke @@ -203,8 +203,8 @@ return if(!sterile) - target.visible_message("[src] falls limp after violating [target]'s face!", \ - "[src] falls limp after violating your face!") + target.visible_message(span_danger("[src] falls limp after violating [target]'s face!"), \ + span_danger("[src] falls limp after violating your face!")) Die() icon_state = "[initial(icon_state)]_impregnated" @@ -216,8 +216,8 @@ log_game("[key_name(target)] was impregnated by a facehugger at [loc_name(T)]") else - target.visible_message("[src] violates [target]'s face!", \ - "[src] violates your face!") + target.visible_message(span_danger("[src] violates [target]'s face!"), \ + span_danger("[src] violates your face!")) /obj/item/clothing/mask/facehugger/proc/GoActive() if(stat == DEAD || stat == CONSCIOUS) @@ -243,7 +243,7 @@ item_state = "facehugger_inactive" stat = DEAD - visible_message("[src] curls up into a ball!") + visible_message(span_danger("[src] curls up into a ball!")) /proc/CanHug(mob/living/M) if(!istype(M)) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 3afa0b87c..bd818290d 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -20,26 +20,26 @@ var/obj/item/bodypart/affecting if(prob(66)) affecting = get_bodypart("[pick("r","l")]_leg") - to_chat(src, "I land on my leg!") + to_chat(src, span_warning("I land on my leg!")) if(affecting && apply_damage((levels * 10), BRUTE, affecting)) // 100 brute damage update_damage_overlays() else switch(rand(1,3)) if(1) affecting = get_bodypart("[pick("r","l")]_arm") - to_chat(src, "I land on my arm!") + to_chat(src, span_warning("I land on my arm!")) if(affecting && apply_damage((levels * 10), BRUTE, affecting)) // 100 brute damage update_damage_overlays() if(2) affecting = get_bodypart("chest") - to_chat(src, "I land on my chest!") + to_chat(src, span_warning("I land on my chest!")) adjustOxyLoss(50) emote("breathgasp") if(affecting && apply_damage((levels * 10), BRUTE, affecting)) // 100 brute damage update_damage_overlays() if(3) affecting = get_bodypart("head") - to_chat(src, "I land on my head!") + to_chat(src, span_warning("I land on my head!")) if(levels > 2) AdjustUnconscious(levels * 100) if(affecting && apply_damage((levels * 10), BRUTE, affecting)) // 100 brute damage @@ -59,7 +59,7 @@ if(item_in_hand) //this segment checks if the item in your hand is twohanded. if(istype(item_in_hand)) if(item_in_hand.wielded == 1) - to_chat(usr, "My other hand is too busy holding [item_in_hand].") + to_chat(usr, span_warning("My other hand is too busy holding [item_in_hand].")) return FALSE if(atkswinging || atkreleasing) stop_attack(FALSE) @@ -153,7 +153,7 @@ if(victim.IsOffBalanced()) victim.Knockdown(30) visible_message("[src] crashes into [victim]!",\ - "I violently crash into [victim]!") + span_danger("I violently crash into [victim]!")) playsound(src,"genblunt",100,TRUE) @@ -218,7 +218,7 @@ if(G.grab_state < GRAB_AGGRESSIVE) return if(HAS_TRAIT(src, TRAIT_PACIFISM)) - to_chat(src, "I gently let go of [throwable_mob].") + to_chat(src, span_notice("I gently let go of [throwable_mob].")) return var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors var/turf/end_T = get_turf(target) @@ -235,7 +235,7 @@ dropItemToGround(I, silent = TRUE) if(HAS_TRAIT(src, TRAIT_PACIFISM) && I.throwforce) - to_chat(src, "I set [I] down gently on the ground.") + to_chat(src, span_notice("I set [I] down gently on the ground.")) return @@ -244,8 +244,8 @@ thrown_speed = thrown_thing.throw_speed if(!thrown_range) thrown_range = thrown_thing.throw_range - visible_message("[src] throws [thrown_thing].", \ - "I toss [thrown_thing].") + visible_message(span_danger("[src] throws [thrown_thing]."), \ + span_danger("I toss [thrown_thing].")) log_message("has thrown [thrown_thing]", LOG_ATTACK) newtonian_move(get_dir(target, src)) thrown_thing.safe_throw_at(target, thrown_range, thrown_speed, src, null, null, null, move_force) @@ -335,15 +335,15 @@ buckle_cd += S.breakoutextra if(STASTR > 15) buckle_cd = 3 SECONDS - visible_message("[src] attempts to struggle free!", \ - "I attempt to struggle free...") + visible_message(span_warning("[src] attempts to struggle free!"), \ + span_notice("I attempt to struggle free...")) if(do_after(src, buckle_cd, 0, target = src)) if(!buckled) return buckled.user_unbuckle_mob(src,src) else if(src && buckled) - to_chat(src, "I fail to struggle free!") + to_chat(src, span_warning("I fail to struggle free!")) else buckled.user_unbuckle_mob(src,src) @@ -353,9 +353,9 @@ Paralyze(60, TRUE, TRUE) spin(32,2) fire_stacks -= 5 - visible_message("[src] rolls on the ground, trying to put [p_them()]self out!") + visible_message(span_warning("[src] rolls on the ground, trying to put [p_them()]self out!")) else - visible_message("[src] pats the flames to extinguish them.") + visible_message(span_notice("[src] pats the flames to extinguish them.")) sleep(30) if(fire_stacks <= 0) ExtinguishMob(TRUE) @@ -382,7 +382,7 @@ /mob/living/carbon/proc/cuff_resist(obj/item/I, breakouttime = 600, cuff_break = 0) if(I.item_flags & BEING_REMOVED) - to_chat(src, "You're already attempting to remove [I]!") + to_chat(src, span_warning("You're already attempting to remove [I]!")) return I.item_flags |= BEING_REMOVED breakouttime = I.slipouttime @@ -392,18 +392,18 @@ if(STASTR > 15 || (mind && mind.has_antag_datum(/datum/antagonist/zombie)) ) cuff_break = INSTANT_CUFFBREAK if(!cuff_break) - to_chat(src, "I attempt to remove [I]...") + to_chat(src, span_notice("I attempt to remove [I]...")) if(do_after(src, breakouttime, 0, target = src)) clear_cuffs(I, cuff_break) else - to_chat(src, "I fail to remove [I]!") + to_chat(src, span_danger("I fail to remove [I]!")) else if(cuff_break == FAST_CUFFBREAK) - to_chat(src, "I attempt to break [I]...") + to_chat(src, span_notice("I attempt to break [I]...")) if(do_after(src, breakouttime, 0, target = src)) clear_cuffs(I, cuff_break) else - to_chat(src, "I fail to break [I]!") + to_chat(src, span_danger("I fail to break [I]!")) else if(cuff_break == INSTANT_CUFFBREAK) clear_cuffs(I, cuff_break) @@ -444,8 +444,13 @@ return FALSE if(I != handcuffed && I != legcuffed) return FALSE - visible_message("[cuff_break ? "" : ""][src] manages to [cuff_break ? "break" : "slip"] out of [I]!") - to_chat(src, "I [cuff_break ? "break" : "slip"] out of [I]!") + var/stupid_msg = "[src] manages to [cuff_break ? "break" : "slip"] out of [I]!" + if(cuff_break) + stupid_msg = span_danger("[src] manages to break out of [I]!") + else + stupid_msg = span_warning("[src] manages to slip out of [I]!") + visible_message(stupid_msg) + to_chat(src, span_notice("I [cuff_break ? "break" : "slip"] out of [I]!")) if(cuff_break) . = !((I == handcuffed) || (I == legcuffed)) @@ -551,15 +556,15 @@ if(world.time > mob_timers["puke"] + 16 SECONDS) mob_timers["puke"] = world.time if(getorgan(/obj/item/organ/stomach)) - to_chat(src, "I'm going to puke...") + to_chat(src, span_warning("I'm going to puke...")) addtimer(CALLBACK(src, PROC_REF(vomit), 50), rand(8 SECONDS, 15 SECONDS)) else if(prob(3)) - to_chat(src, "I feel sick...") + to_chat(src, span_warning("I feel sick...")) else if(getorgan(/obj/item/organ/stomach)) mob_timers["puke"] = world.time - to_chat(src, "I'm going to puke...") + to_chat(src, span_warning("I'm going to puke...")) addtimer(CALLBACK(src, PROC_REF(vomit), 50), rand(8 SECONDS, 15 SECONDS)) add_nausea(-1) @@ -583,14 +588,14 @@ rogstam_add(-50) if(is_mouth_covered()) //make this add a blood/vomit overlay later it'll be hilarious if(message) - visible_message("[src] throws up all over [p_them()]self!", \ - "I puke all over myself!") + visible_message(span_danger("[src] throws up all over [p_them()]self!"), \ + span_danger("I puke all over myself!")) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "vomit", /datum/mood_event/vomitself) add_stress(/datum/stressevent/vomitself) distance = 0 else if(message) - visible_message("[src] pukes!", "I puke!") + visible_message(span_danger("[src] pukes!"), span_danger("I puke!")) if(!isflyperson(src)) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "vomit", /datum/mood_event/vomit) add_stress(/datum/stressevent/vomit) @@ -598,7 +603,7 @@ if(NOBLOOD in dna?.species?.species_traits) return TRUE if(message) - visible_message("[src] coughs up blood!", "I cough up blood!") + visible_message(span_danger("[src] coughs up blood!"), span_danger("I cough up blood!")) if(stun) Immobilize(59) @@ -1072,7 +1077,7 @@ O.Remove(src) O.forceMove(drop_location()) if(organs_amt) - to_chat(user, "I retrieve some of [src]\'s internal organs!") + to_chat(user, span_notice("I retrieve some of [src]\'s internal organs!")) /mob/living/carbon/ExtinguishMob(itemz = TRUE) if(itemz) @@ -1171,21 +1176,21 @@ if(BP) BP.drop_limb() else - to_chat(usr, "[src] doesn't have such bodypart.") + to_chat(usr, span_boldwarning("[src] doesn't have such bodypart.")) if("add") if(BP) - to_chat(usr, "[src] already has such bodypart.") + to_chat(usr, span_boldwarning("[src] already has such bodypart.")) else if(!regenerate_limb(result)) - to_chat(usr, "[src] cannot have such bodypart.") + to_chat(usr, span_boldwarning("[src] cannot have such bodypart.")) if("augment") if(ishuman(src)) if(BP) BP.change_bodypart_status(BODYPART_ROBOTIC, TRUE, TRUE) else - to_chat(usr, "[src] doesn't have such bodypart.") + to_chat(usr, span_boldwarning("[src] doesn't have such bodypart.")) else - to_chat(usr, "Only humans can be augmented.") + to_chat(usr, span_boldwarning("Only humans can be augmented.")) admin_ticket_log("[key_name_admin(usr)] has modified the bodyparts of [src]") if(href_list[VV_HK_MAKE_AI]) if(!check_rights(R_SPAWN)) @@ -1209,14 +1214,14 @@ if(!usr) return if(QDELETED(src)) - to_chat(usr, "Mob doesn't exist anymore.") + to_chat(usr, span_boldwarning("Mob doesn't exist anymore.")) return if(result) var/chosenart = artnames[result] var/datum/martial_art/MA = new chosenart MA.teach(src) log_admin("[key_name(usr)] has taught [MA] to [key_name(src)].") - message_admins("[key_name_admin(usr)] has taught [MA] to [key_name_admin(src)].") + message_admins(span_notice("[key_name_admin(usr)] has taught [MA] to [key_name_admin(src)].")) if(href_list[VV_HK_GIVE_TRAUMA]) if(!check_rights(NONE)) return @@ -1232,13 +1237,13 @@ var/datum/brain_trauma/BT = gain_trauma(result) if(BT) log_admin("[key_name(usr)] has traumatized [key_name(src)] with [BT.name]") - message_admins("[key_name_admin(usr)] has traumatized [key_name_admin(src)] with [BT.name].") + message_admins(span_notice("[key_name_admin(usr)] has traumatized [key_name_admin(src)] with [BT.name].")) if(href_list[VV_HK_CURE_TRAUMA]) if(!check_rights(NONE)) return cure_all_traumas(TRAUMA_RESILIENCE_ABSOLUTE) log_admin("[key_name(usr)] has cured all traumas from [key_name(src)].") - message_admins("[key_name_admin(usr)] has cured all traumas from [key_name_admin(src)].") + message_admins(span_notice("[key_name_admin(usr)] has cured all traumas from [key_name_admin(src)].")) if(href_list[VV_HK_HALLUCINATION]) if(!check_rights(NONE)) return diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 02518d0b6..8afb42593 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -62,8 +62,8 @@ if(isturf(I.loc)) I.attack_hand(src) if(get_active_held_item() == I) //if our attack_hand() picks up the item... - visible_message("[src] catches [I]!", \ - "I catch [I] in mid-air!") + visible_message(span_warning("[src] catches [I]!"), \ + span_danger("I catch [I] in mid-air!")) throw_mode_off() return 1 ..() @@ -100,13 +100,13 @@ used_limb = parse_zone(I.sublimb_grabbed) if(used_limb) - target.visible_message("[src] grabs [target]'s [used_limb].", \ - "[src] grabs my [used_limb].", "I hear shuffling.", null, src) - to_chat(src, "I grab [target]'s [used_limb].") + target.visible_message(span_warning("[src] grabs [target]'s [used_limb]."), \ + span_warning("[src] grabs my [used_limb]."), span_hear("I hear shuffling."), null, src) + to_chat(src, span_info("I grab [target]'s [used_limb].")) else - target.visible_message("[src] grabs [target].", \ - "[src] grabs me.", "I hear shuffling.", null, src) - to_chat(src, "I grab [target].") + target.visible_message(span_warning("[src] grabs [target]."), \ + span_warning("[src] grabs me."), span_hear("I hear shuffling."), null, src) + to_chat(src, span_info("I grab [target].")) /mob/living/carbon/send_grabbed_message(mob/living/carbon/user) var/used_limb = "chest" @@ -119,13 +119,13 @@ used_limb = parse_zone(I.sublimb_grabbed) if(HAS_TRAIT(user, TRAIT_PACIFISM)) - visible_message("[user] firmly grips [src]'s [used_limb]!", - "[user] firmly grips my [used_limb]!", "I hear aggressive shuffling!", null, user) - to_chat(user, "I firmly grip [src]'s [used_limb]!") + visible_message(span_danger("[user] firmly grips [src]'s [used_limb]!"), + span_danger("[user] firmly grips my [used_limb]!"), span_hear("I hear aggressive shuffling!"), null, user) + to_chat(user, span_danger("I firmly grip [src]'s [used_limb]!")) else - visible_message("[user] tightens [user.p_their()] grip on [src]'s [used_limb]!", \ - "[user] tightens [user.p_their()] grip on my [used_limb]!", "I hear aggressive shuffling!", null, user) - to_chat(user, "I tighten my grip on [src]'s [used_limb]!") + visible_message(span_danger("[user] tightens [user.p_their()] grip on [src]'s [used_limb]!"), \ + span_danger("[user] tightens [user.p_their()] grip on my [used_limb]!"), span_hear("I hear aggressive shuffling!"), null, user) + to_chat(user, span_danger("I tighten my grip on [src]'s [used_limb]!")) /mob/living/carbon/proc/precise_attack_check(zone, obj/item/bodypart/affecting) //for striking eyes, throat, etc if(zone && affecting) @@ -189,7 +189,7 @@ return affecting = get_bodypart(check_zone(useder)) //precise attacks, on yourself or someone you are grabbing if(!affecting) //missing limb - to_chat(user, "Unfortunately, there's nothing there.") + to_chat(user, span_warning("Unfortunately, there's nothing there.")) return FALSE SEND_SIGNAL(I, COMSIG_ITEM_ATTACK_ZONE, src, user, affecting) I.funny_attack_effects(src, user) @@ -240,7 +240,7 @@ return FALSE if(!get_bodypart(check_zone(user.zone_selected))) - to_chat(user, "[src] is missing that.") + to_chat(user, span_warning("[src] is missing that.")) return FALSE for(var/thing in diseases) @@ -314,8 +314,8 @@ if(M.powerlevel < 0) M.powerlevel = 0 - visible_message("The [M.name] has shocked [src]!", \ - "The [M.name] has shocked you!") + visible_message(span_danger("The [M.name] has shocked [src]!"), \ + span_danger("The [M.name] has shocked you!")) do_sparks(5, TRUE, src) var/power = M.powerlevel + rand(0,3) @@ -354,7 +354,7 @@ if (stat == DEAD) return else - show_message("The blob attacks!") + show_message(span_danger("The blob attacks!")) adjustBruteLoss(10) /mob/living/carbon/emp_act(severity) @@ -407,17 +407,17 @@ /mob/living/carbon/proc/help_shake_act(mob/living/carbon/M) if(on_fire) - to_chat(M, "I can't put [p_them()] out with just my bare hands!") + to_chat(M, span_warning("I can't put [p_them()] out with just my bare hands!")) return // if(!(mobility_flags & MOBILITY_STAND)) // if(buckled) -// to_chat(M, "I need to unbuckle [src] first to do that!") +// to_chat(M, span_warning("I need to unbuckle [src] first to do that!")) // return -// M.visible_message("[M] shakes [src] trying to get [p_them()] up!", "I shake [src] trying to get [p_them()] up!") +// M.visible_message(span_notice("[M] shakes [src] trying to get [p_them()] up!"), span_notice("I shake [src] trying to get [p_them()] up!")) // else - M.visible_message("[M] shakes [src].", \ - "I shake [src] to get [p_their()] attention.") + M.visible_message(span_notice("[M] shakes [src]."), \ + span_notice("I shake [src] to get [p_their()] attention.")) shake_camera(src, 2, 1) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/hug) if(HAS_TRAIT(M, TRAIT_FRIENDLY)) @@ -452,16 +452,16 @@ return if (damage == 1) - to_chat(src, "My eyes sting a little.") + to_chat(src, span_warning("My eyes sting a little.")) if(prob(40)) eyes.applyOrganDamage(1) else if (damage == 2) - to_chat(src, "My eyes burn.") + to_chat(src, span_warning("My eyes burn.")) eyes.applyOrganDamage(rand(2, 4)) else if( damage >= 3) - to_chat(src, "My eyes itch and burn severely!") + to_chat(src, span_warning("My eyes itch and burn severely!")) eyes.applyOrganDamage(rand(12, 16)) if(eyes.damage > 10) @@ -471,22 +471,22 @@ if(eyes.damage > 20) if(prob(eyes.damage - 20)) if(!HAS_TRAIT(src, TRAIT_NEARSIGHT)) - to_chat(src, "My eyes start to burn badly!") + to_chat(src, span_warning("My eyes start to burn badly!")) become_nearsighted(EYE_DAMAGE) else if(prob(eyes.damage - 25)) if(!HAS_TRAIT(src, TRAIT_BLIND)) - to_chat(src, "I can't see anything!") + to_chat(src, span_warning("I can't see anything!")) eyes.applyOrganDamage(eyes.maxHealth) else - to_chat(src, "My eyes are really starting to hurt. This can't be good for you!") + to_chat(src, span_warning("My eyes are really starting to hurt. This can't be good for you!")) if(has_bane(BANE_LIGHT)) mind.disrupt_spells(-500) return 1 else if(damage == 0) // just enough protection if(prob(20)) - to_chat(src, "Something bright flashes in the corner of my vision!") + to_chat(src, span_notice("Something bright flashes in the corner of my vision!")) if(has_bane(BANE_LIGHT)) mind.disrupt_spells(0) @@ -509,13 +509,13 @@ adjustEarDamage(ear_damage,deaf) if(ears.damage >= 15) - to_chat(src, "My ears start to ring badly!") + to_chat(src, span_warning("My ears start to ring badly!")) if(prob(ears.damage - 5)) - to_chat(src, "I can't hear anything!") + to_chat(src, span_danger("I can't hear anything!")) ears.damage = min(ears.damage, ears.maxHealth) // you need earmuffs, inacusiate, or replacement else if(ears.damage >= 5) - to_chat(src, "My ears start to ring!") + to_chat(src, span_warning("My ears start to ring!")) SEND_SOUND(src, sound('sound/blank.ogg',0,1,0,250)) return effect_amount //how soundbanged we are diff --git a/code/modules/mob/living/carbon/carbon_topic.dm b/code/modules/mob/living/carbon/carbon_topic.dm index 37a1285b3..7ab1b73c3 100644 --- a/code/modules/mob/living/carbon/carbon_topic.dm +++ b/code/modules/mob/living/carbon/carbon_topic.dm @@ -4,9 +4,9 @@ var/slot = text2num(href_list["internal"]) var/obj/item/ITEM = get_item_by_slot(slot) if(ITEM && istype(ITEM, /obj/item/tank) && wear_mask && (wear_mask.clothing_flags & MASKINTERNALS)) - visible_message("[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].", \ - "[usr] tries to [internal ? "close" : "open"] the valve on your [ITEM.name].", null, null, usr) - to_chat(usr, "I try to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name]...") + visible_message(span_danger("[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name]."), \ + span_danger("[usr] tries to [internal ? "close" : "open"] the valve on your [ITEM.name]."), null, null, usr) + to_chat(usr, span_notice("I try to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name]...")) if(do_mob(usr, src, POCKET_STRIP_DELAY)) if(internal) internal = null @@ -16,16 +16,16 @@ internal = ITEM update_internals_hud_icon(1) - visible_message("[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name].", \ - "[usr] [internal ? "opens" : "closes"] the valve on your [ITEM.name].", null, null, usr) - to_chat(usr, "I [internal ? "open" : "close"] the valve on [src]'s [ITEM.name].") + visible_message(span_danger("[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name]."), \ + span_danger("[usr] [internal ? "opens" : "closes"] the valve on your [ITEM.name]."), null, null, usr) + to_chat(usr, span_notice("I [internal ? "open" : "close"] the valve on [src]'s [ITEM.name].")) return ..() /mob/living/carbon/soul_examine(mob/user) var/list/message = list() if((stat >= DEAD) && (isobserver(user) || HAS_TRAIT(user, TRAIT_SOUL_EXAMINE))) if(getorganslot(ORGAN_SLOT_BRAIN) && !key && !get_ghost(FALSE, TRUE)) - message += "[p_their(TRUE)] soul has departed..." + message += span_deadsay("[p_their(TRUE)] soul has departed...") else - message += "[p_they(TRUE)] [p_are()] still earthbound." + message += span_deadsay("[p_they(TRUE)] [p_are()] still earthbound.") return message diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm index 4cf54bee1..15de378ab 100644 --- a/code/modules/mob/living/carbon/death.dm +++ b/code/modules/mob/living/carbon/death.dm @@ -43,7 +43,7 @@ var/atom/Tsec = drop_location() for(var/mob/M in src) M.forceMove(Tsec) - visible_message("[M] bursts out of [src]!") + visible_message(span_danger("[M] bursts out of [src]!")) . = ..() /mob/living/carbon/spill_embedded_objects() diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 6d1547ecb..165e637cc 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -16,7 +16,7 @@ m3 = "I have" if (handcuffed) - . += "[m1] tied up with \a [handcuffed]!" + . += span_warning("[m1] tied up with \a [handcuffed]!") if (head) . += "[m3] [head.get_examine_string(user)] on [m2] head. " if(wear_mask && !(SLOT_WEAR_MASK in obscured)) @@ -34,16 +34,16 @@ /* if (stat == DEAD) appears_dead = 1 if(getorgan(/obj/item/organ/brain)) - . += "[t_He] [t_is] limp and unresponsive, with no signs of life." + . += span_dead("[t_He] [t_is] limp and unresponsive, with no signs of life.") else if(get_bodypart(BODY_ZONE_HEAD)) - . += "It appears that [t_his] brain is missing..."*/ + . += span_dead("It appears that [t_his] brain is missing...")*/ var/list/missing = get_missing_limbs() for(var/t in missing) if(t==BODY_ZONE_HEAD) - . += "[capitalize(m2)] [parse_zone(t)] is gone." + . += span_dead("[capitalize(m2)] [parse_zone(t)] is gone.") continue - . += "[capitalize(m2)] [parse_zone(t)] is gone." + . += span_warning("[capitalize(m2)] [parse_zone(t)] is gone.") var/list/msg = list("") var/temp = getBruteLoss() @@ -91,12 +91,12 @@ if(!appears_dead) if(stat == UNCONSCIOUS) - . += "[m1] unconscious." + . += span_warning("[m1] unconscious.") else if(InCritical()) - . += "[m1] barely conscious." + . += span_warning("[m1] barely conscious.") if (stat == DEAD) appears_dead = 1 - . += "[m1] unconscious." + . += span_warning("[m1] unconscious.") var/trait_exam = common_trait_examine() if (!isnull(trait_exam)) . += trait_exam @@ -105,9 +105,9 @@ var/mob/living/L = user if(STASTR > L.STASTR) if(STASTR > 15) - . += "[t_He] look[p_s()] stronger than I." + . += span_warning("[t_He] look[p_s()] stronger than I.") else - . += "[t_He] look[p_s()] stronger than I." + . += span_warning("[t_He] look[p_s()] stronger than I.") var/datum/component/mood/mood = src.GetComponent(/datum/component/mood) if(mood) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 1bd133940..c341b7c1e 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -71,7 +71,7 @@ . = list("ø ------------ ø\nThis is the [used_name], the [race_name].") if(GLOB.lord_titles[name]) - . += "[m3] been granted the title of \"[GLOB.lord_titles[name]]\"." + . += span_notice("[m3] been granted the title of \"[GLOB.lord_titles[name]]\".") if(dna.species.use_skintones) var/skin_tone_wording = dna.species.skin_tone_wording ? lowertext(dna.species.skin_tone_wording) : "skin tone" @@ -95,42 +95,42 @@ if((user_skin_tone_seen == "lalvestine" && skin_tone_seen == "shalvistine") || \ (user_skin_tone_seen == "shalvistine" && skin_tone_seen == "lalvestine")) slop_lore_string = ", A TRAITOR!" - . += "[capitalize(m2)] [skin_tone_wording] is [skin_tone_seen][slop_lore_string]" + . += span_info("[capitalize(m2)] [skin_tone_wording] is [skin_tone_seen][slop_lore_string]") if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.marriedto == name) - . += "It's my spouse." + . += span_love("It's my spouse.") if(name in GLOB.excommunicated_players) - . += "HERETIC! SHAME!" + . += span_userdanger("HERETIC! SHAME!") if(name in GLOB.outlawed_players) - . += "OUTLAW!" + . += span_userdanger("OUTLAW!") var/commie_text if(mind) if(mind.special_role == "Bandit") if(HAS_TRAIT(user, TRAIT_COMMIE)) - commie_text = "Free man!" + commie_text = span_notice("Free man!") else - commie_text = "BANDIT!" + commie_text = span_userdanger("BANDIT!") if(mind.special_role == "Vampire Lord") - . += "A MONSTER!" + . += span_userdanger("A MONSTER!") if(mind.assigned_role == "Lunatic") - . += "LUNATIC!" + . += span_userdanger("LUNATIC!") if(HAS_TRAIT(src, TRAIT_MANIAC_AWOKEN)) - . += "MANIAC!" + . += span_userdanger("MANIAC!") if(commie_text) . += commie_text else if(HAS_TRAIT(src, TRAIT_COMMIE) && HAS_TRAIT(user, TRAIT_COMMIE)) - . += "Comrade!" + . += span_notice("Comrade!") if(leprosy == 1) - . += "A LEPER..." + . += span_necrosis("A LEPER...") if(user != src) var/datum/mind/Umind = user.mind @@ -141,7 +141,7 @@ if(shit) . += shit if(user.mind.has_antag_datum(/datum/antagonist/vampirelord) || user.mind.has_antag_datum(/datum/antagonist/vampire)) - . += "Blood Volume: [blood_volume]" + . += span_userdanger("Blood Volume: [blood_volume]") var/list/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) @@ -232,7 +232,7 @@ if(glasses) . += "[m3] [glasses.get_examine_string(user)] covering [m2] eyes." else if(eye_color == BLOODCULT_EYE && iscultist(src) && HAS_TRAIT(src, CULT_EYES)) - . += "[m2] eyes are glowing an unnatural red!" + . += span_warning("[m2] eyes are glowing an unnatural red!") //ears if(ears && !(SLOT_HEAD in obscured)) @@ -272,18 +272,18 @@ if(50 to 100) msg += "[m1] severely wounded." if(100 to INFINITY) - msg += "[m1] gravely wounded." + msg += span_danger("[m1] gravely wounded.") // Blood volume switch(blood_volume) if(-INFINITY to BLOOD_VOLUME_SURVIVE) - msg += "[m1] extremely pale and sickly." + msg += span_artery("[m1] extremely pale and sickly.") if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD) - msg += "[m1] very pale." + msg += span_artery("[m1] very pale.") if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY) - msg += "[m1] pale." + msg += span_artery("[m1] pale.") if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE) - msg += "[m1] a little pale." + msg += span_artery("[m1] a little pale.") // Bleeding var/bleed_rate = get_bleed_rate() @@ -314,14 +314,14 @@ bleeding_limbs += parse_zone(bleeder.body_zone) if(length(bleeding_limbs)) if(bleed_rate >= 5) - msg += "[capitalize(m2)] [english_list(bleeding_limbs)] [bleeding_limbs.len > 1 ? "are" : "is"] [bleed_wording]!" + msg += span_bloody("[capitalize(m2)] [english_list(bleeding_limbs)] [bleeding_limbs.len > 1 ? "are" : "is"] [bleed_wording]!") else - msg += "[capitalize(m2)] [english_list(bleeding_limbs)] [bleeding_limbs.len > 1 ? "are" : "is"] [bleed_wording]!" + msg += span_bloody("[capitalize(m2)] [english_list(bleeding_limbs)] [bleeding_limbs.len > 1 ? "are" : "is"] [bleed_wording]!") else if(bleed_rate >= 5) - msg += "[m1] [bleed_wording]!" + msg += span_bloody("[m1] [bleed_wording]!") else - msg += "[m1] [bleed_wording]!" + msg += span_bloody("[m1] [bleed_wording]!") // Missing limbs var/missing_head = FALSE @@ -334,9 +334,9 @@ if(length(missing_limbs)) var/missing_limb_message = "[capitalize(m2)] [english_list(missing_limbs)] [missing_limbs.len > 1 ? "are" : "is"] gone." if(missing_head) - missing_limb_message = "[missing_limb_message]" + missing_limb_message = span_dead("[missing_limb_message]") else - missing_limb_message = "[missing_limb_message]" + missing_limb_message = span_danger("[missing_limb_message]") msg += missing_limb_message //Grabbing @@ -425,7 +425,7 @@ msg += "[m1] twitching ever so slightly." if(InCritical()) - msg += "[m1] barely conscious." + msg += span_warning("[m1] barely conscious.") else if(stat >= UNCONSCIOUS) msg += "[m1] [IsSleeping() ? "sleeping" : "unconscious"]." @@ -442,12 +442,12 @@ // msg += "[m1] barely conscious." // if(getorgan(/obj/item/organ/brain)) // if(!key) -// msg += "[m1] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely." +// msg += span_deadsay("[m1] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.") // else if(!client) // msg += "[m3] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon." if(length(msg)) - . += "[msg.Join("\n")]" + . += span_warning("[msg.Join("\n")]") if((user != src) && isliving(user)) var/mob/living/L = user @@ -457,20 +457,20 @@ var/strength_diff = final_str - L.STASTR switch(strength_diff) if(5 to INFINITY) - . += "[t_He] look[p_s()] much stronger than I." + . += span_warning("[t_He] look[p_s()] much stronger than I.") if(1 to 5) - . += "[t_He] look[p_s()] stronger than I." + . += span_warning("[t_He] look[p_s()] stronger than I.") if(0) . += "[t_He] look[p_s()] about as strong as I." if(-5 to -1) - . += "[t_He] look[p_s()] weaker than I." + . += span_warning("[t_He] look[p_s()] weaker than I.") if(-INFINITY to -5) - . += "[t_He] look[p_s()] much weaker than I." + . += span_warning("[t_He] look[p_s()] much weaker than I.") if(maniac) var/obj/item/organ/heart/heart = getorganslot(ORGAN_SLOT_HEART) if(heart?.inscryption && (heart.inscryption_key in maniac.key_nums)) - . += "[t_He] know[p_s()] [heart.inscryption_key], I AM SURE OF IT!" + . += span_danger("[t_He] know[p_s()] [heart.inscryption_key], I AM SURE OF IT!") if(Adjacent(user)) if(observer_privilege) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 1c8683cc9..a04da8570 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -31,18 +31,18 @@ switch(rand(1,4)) if(1) affecting = get_bodypart(pick(BODY_ZONE_R_LEG, BODY_ZONE_L_LEG)) - chat_message = "I fall on my [affecting]!" + chat_message = span_danger("I fall on my [affecting]!") if(2) affecting = get_bodypart(pick(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM)) - chat_message = "I fall on my arm!" + chat_message = span_danger("I fall on my arm!") if(3) affecting = get_bodypart(BODY_ZONE_CHEST) - chat_message = "I fall flat! I'm winded!" + chat_message = span_danger("I fall flat! I'm winded!") emote("gasp") adjustOxyLoss(50) if(4) affecting = get_bodypart(BODY_ZONE_HEAD) - chat_message = "I fall on my head!" + chat_message = span_danger("I fall on my head!") if(affecting && apply_damage(dam, BRUTE, affecting, run_armor_check(affecting, "blunt", damage = dam))) update_damage_overlays() if(levels >= 1) @@ -311,7 +311,7 @@ . = 0 if(!. && error_msg && user) // Might need re-wording. - to_chat(user, "There is no exposed flesh or thin material [above_neck(target_zone) ? "on [p_their()] head" : "on [p_their()] body"].") + to_chat(user, span_alert("There is no exposed flesh or thin material [above_neck(target_zone) ? "on [p_their()] head" : "on [p_their()] body"].")) /mob/living/carbon/human/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null) if(judgement_criteria & JUDGE_EMAGGED) @@ -402,27 +402,27 @@ for(var/obj/item/hand in held_items) if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2) && dropItemToGround(hand)) step_towards(hand, src) - to_chat(src, "\The [S] pulls \the [hand] from your grip!") + to_chat(src, span_warning("\The [S] pulls \the [hand] from your grip!")) rad_act(current_size * 3) /mob/living/carbon/human/proc/do_cpr(mob/living/carbon/C) CHECK_DNA_AND_SPECIES(C) if(C.stat == DEAD || (HAS_TRAIT(C, TRAIT_FAKEDEATH))) - to_chat(src, "[C.name] is dead!") + to_chat(src, span_warning("[C.name] is dead!")) return if(is_mouth_covered()) - to_chat(src, "Remove your mask first!") + to_chat(src, span_warning("Remove your mask first!")) return 0 if(C.is_mouth_covered()) - to_chat(src, "Remove [p_their()] mask first!") + to_chat(src, span_warning("Remove [p_their()] mask first!")) return 0 if(C.cpr_time < world.time + 30) - visible_message("[src] is trying to perform CPR on [C.name]!", \ - "I try to perform CPR on [C.name]... Hold still!") + visible_message(span_notice("[src] is trying to perform CPR on [C.name]!"), \ + span_notice("I try to perform CPR on [C.name]... Hold still!")) if(!do_mob(src, C)) - to_chat(src, "I fail to perform CPR on [C]!") + to_chat(src, span_warning("I fail to perform CPR on [C]!")) return 0 var/they_breathe = !HAS_TRAIT(C, TRAIT_NOBREATH) @@ -431,7 +431,7 @@ if(C.health > C.crit_threshold) return - src.visible_message("[src] performs CPR on [C.name]!", "I perform CPR on [C.name].") + src.visible_message(span_notice("[src] performs CPR on [C.name]!"), span_notice("I perform CPR on [C.name].")) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "perform_cpr", /datum/mood_event/perform_cpr) C.cpr_time = world.time log_combat(src, C, "CPRed") @@ -440,11 +440,11 @@ var/suff = min(C.getOxyLoss(), 7) C.adjustOxyLoss(-suff) C.updatehealth() - to_chat(C, "I feel a breath of fresh air enter your lungs... It feels good...") + to_chat(C, span_unconscious("I feel a breath of fresh air enter your lungs... It feels good...")) else if(they_breathe && !they_lung) - to_chat(C, "I feel a breath of fresh air... but you don't feel any better...") + to_chat(C, span_unconscious("I feel a breath of fresh air... but you don't feel any better...")) else - to_chat(C, "I feel a breath of fresh air... which is a sensation you don't recognise...") + to_chat(C, span_unconscious("I feel a breath of fresh air... which is a sensation you don't recognise...")) /mob/living/carbon/human/cuff_resist(obj/item/I) if(dna && dna.check_mutation(HULK)) @@ -488,12 +488,12 @@ /mob/living/carbon/human/canUseTopic(atom/movable/M, be_close=FALSE, no_dexterity=FALSE, no_tk=FALSE) if(!(mobility_flags & MOBILITY_UI)) - to_chat(src, "I can't do that right now!") + to_chat(src, span_warning("I can't do that right now!")) return FALSE if(!Adjacent(M) && (M.loc != src)) if((be_close == FALSE) || (!no_tk && (dna.check_mutation(TK) && tkMaxRangeCheck(src, M)))) return TRUE - to_chat(src, "I am too far away!") + to_chat(src, span_warning("I am too far away!")) return FALSE return TRUE @@ -687,8 +687,8 @@ /mob/living/carbon/human/vomit(lost_nutrition = 10, blood = 0, stun = 1, distance = 0, message = 1, toxic = 0) if(blood && (NOBLOOD in dna.species.species_traits) && !HAS_TRAIT(src, TRAIT_TOXINLOVER)) if(message) - visible_message("[src] dry heaves!", \ - "I try to throw up, but there's nothing in your stomach!") + visible_message(span_warning("[src] dry heaves!"), \ + span_danger("I try to throw up, but there's nothing in your stomach!")) if(stun) Immobilize(200) return 1 @@ -796,14 +796,14 @@ if(success) to_chat(usr, "Put [src] on purrbation.") log_admin("[key_name(usr)] has put [key_name(src)] on purrbation.") - var/msg = "[key_name_admin(usr)] has put [key_name(src)] on purrbation." + var/msg = span_notice("[key_name_admin(usr)] has put [key_name(src)] on purrbation.") message_admins(msg) admin_ticket_log(src, msg) else to_chat(usr, "Removed [src] from purrbation.") log_admin("[key_name(usr)] has removed [key_name(src)] from purrbation.") - var/msg = "[key_name_admin(usr)] has removed [key_name(src)] from purrbation." + var/msg = span_notice("[key_name_admin(usr)] has removed [key_name(src)] from purrbation.") message_admins(msg) admin_ticket_log(src, msg) @@ -842,33 +842,33 @@ if(can_be_firemanned(target) && !incapacitated(FALSE, TRUE)) if(backnotshoulder) - visible_message("[src] starts lifting [target] onto their back..") + visible_message(span_notice("[src] starts lifting [target] onto their back..")) else - visible_message("[src] starts lifting [target] onto their shoulder..") + visible_message(span_notice("[src] starts lifting [target] onto their shoulder..")) if(do_after(src, carrydelay, TRUE, target)) //Second check to make sure they're still valid to be carried if(can_be_firemanned(target) && !incapacitated(FALSE, TRUE)) buckle_mob(target, TRUE, TRUE, 90, 0, 0) return - to_chat(src, "I fail to carry [target].") + to_chat(src, span_warning("I fail to carry [target].")) /mob/living/carbon/human/proc/piggyback(mob/living/carbon/target) if(can_piggyback(target)) - visible_message("[target] starts to climb onto [src]...") + visible_message(span_notice("[target] starts to climb onto [src]...")) if(do_after(target, 15, target = src)) if(can_piggyback(target)) if(target.incapacitated(FALSE, TRUE) || incapacitated(FALSE, TRUE)) - to_chat(target, "I can't piggyback ride [src].") + to_chat(target, span_warning("I can't piggyback ride [src].")) return buckle_mob(target, TRUE, TRUE, FALSE, 0, 0) else - to_chat(target, "I can't piggyback ride [src].") + to_chat(target, span_warning("I can't piggyback ride [src].")) /mob/living/carbon/human/buckle_mob(mob/living/target, force = FALSE, check_loc = TRUE, lying_buckle = FALSE, hands_needed = 0, target_hands_needed = 0) if(!force)//humans are only meant to be ridden through piggybacking and special cases return if(!is_type_in_typecache(target, can_ride_typecache)) - target.visible_message("[target] really can't seem to mount [src]...") + target.visible_message(span_warning("[target] really can't seem to mount [src]...")) return buckle_lying = lying_buckle var/datum/component/riding/human/riding_datum = LoadComponent(/datum/component/riding/human) @@ -885,12 +885,12 @@ if(hands_needed || target_hands_needed) if(hands_needed && !equipped_hands_self) - src.visible_message("[src] can't get a grip on [target] because their hands are full!", - "I can't get a grip on [target] because your hands are full!") + src.visible_message(span_warning("[src] can't get a grip on [target] because their hands are full!"), + span_warning("I can't get a grip on [target] because your hands are full!")) return else if(target_hands_needed && !equipped_hands_target) - target.visible_message("[target] can't get a grip on [src] because their hands are full!", - "I can't get a grip on [src] because your hands are full!") + target.visible_message(span_warning("[target] can't get a grip on [src] because their hands are full!"), + span_warning("I can't get a grip on [src] because your hands are full!")) return //stop_pulling() @@ -910,7 +910,7 @@ remove_movespeed_modifier(MOVESPEED_ID_SHOVE) var/active_item = get_active_held_item() if(is_type_in_typecache(active_item, GLOB.shove_disarming_types)) - visible_message("[src.name] regains their grip on \the [active_item]!", "I regain your grip on \the [active_item]", null, COMBAT_MESSAGE_RANGE) + visible_message(span_warning("[src.name] regains their grip on \the [active_item]!"), span_warning("I regain your grip on \the [active_item]"), null, COMBAT_MESSAGE_RANGE) /mob/living/carbon/human/do_after_coefficent() . = ..() diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 7d12f382c..8d4ba6b33 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -106,8 +106,8 @@ retaliate(P.firer) if(P.reflectable & REFLECT_NORMAL) if(check_reflect(def_zone)) // Checks if you've passed a reflection% check - visible_message("The [P.name] gets reflected by [src]!", \ - "The [P.name] gets reflected by [src]!") + visible_message(span_danger("The [P.name] gets reflected by [src]!"), \ + span_danger("The [P.name] gets reflected by [src]!")) // Find a turf near or on the original location to bounce to if(!isturf(loc)) //Open canopy mech (ripley) check. if we're inside something and still got hit P.force_hit = TRUE //The thing we're in passed the bullet to us. Pass it back, and tell it to take the damage. @@ -204,7 +204,7 @@ L.add_embedded_object(I, silent = FALSE, crit_message = TRUE) emote("embed") L.receive_damage(I.w_class*I.embedding.embedded_impact_pain_multiplier) -// visible_message("[I] embeds itself in [src]'s [L.name]!","[I] embeds itself in my [L.name]!") +// visible_message(span_danger("[I] embeds itself in [src]'s [L.name]!"),span_danger("[I] embeds itself in my [L.name]!")) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded) hitpush = FALSE skipcatch = TRUE //can't catch the now embedded item @@ -233,7 +233,7 @@ // else // affecting = get_bodypart_complex(user.used_intent.height2limb(user.aimheight)) //this proc picks a bodypart at random as long as it's in the height list if(!affecting) //missing limb - to_chat(user, "Unfortunately, there's nothing there.") + to_chat(user, span_warning("Unfortunately, there's nothing there.")) return 0 SEND_SIGNAL(I, COMSIG_ITEM_ATTACK_ZONE, src, user, affecting) @@ -257,9 +257,9 @@ return ..() playsound(loc, user.dna.species.attack_sound, 25, TRUE, -1) - visible_message("[user] [hulk_verb]ed [src]!", \ - "[user] [hulk_verb]ed [src]!", "I hear a sickening sound of flesh hitting flesh!", null, user) - to_chat(user, "I [hulk_verb] [src]!") + visible_message(span_danger("[user] [hulk_verb]ed [src]!"), \ + span_danger("[user] [hulk_verb]ed [src]!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), null, user) + to_chat(user, span_danger("I [hulk_verb] [src]!")) adjustBruteLoss(15) /mob/living/carbon/human/attack_hand(mob/user) @@ -285,23 +285,23 @@ var/obj/item/I = get_active_held_item() if(I && dropItemToGround(I, silent = FALSE)) playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M] disarmed [src]!", \ - "[M] disarmed you!", "I hear aggressive shuffling!", null, M) - to_chat(M, "I disarm [src]!") + visible_message(span_danger("[M] disarmed [src]!"), \ + span_danger("[M] disarmed you!"), span_hear("I hear aggressive shuffling!"), null, M) + to_chat(M, span_danger("I disarm [src]!")) else if(!M.client || prob(5)) // only natural monkeys get to stun reliably, (they only do it occasionaly) playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) if (src.IsKnockdown() && !src.IsParalyzed()) Paralyze(40) log_combat(M, src, "pinned") - visible_message("[M] pins [src] down!", \ - "[M] pins you down!", "I hear shuffling and a muffled groan!", null, M) - to_chat(M, "I pin [src] down!") + visible_message(span_danger("[M] pins [src] down!"), \ + span_danger("[M] pins you down!"), span_hear("I hear shuffling and a muffled groan!"), null, M) + to_chat(M, span_danger("I pin [src] down!")) else Knockdown(30) log_combat(M, src, "tackled") - visible_message("[M] tackles [src] down!", \ - "[M] tackles you down!", "I hear aggressive shuffling followed by a loud thud!", null, M) - to_chat(M, "I tackle [src] down!") + visible_message(span_danger("[M] tackles [src] down!"), \ + span_danger("[M] tackles you down!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), null, M) + to_chat(M, span_danger("I tackle [src] down!")) if(M.limb_destroyer) dismembering_strike(M, affecting.body_zone) @@ -317,9 +317,9 @@ /mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M) if(check_shields(M, 0, "the M.name")) - visible_message("[M] attempts to touch [src]!", \ - "[M] attempts to touch you!", "I hear a swoosh!", null, M) - to_chat(M, "I attempt to touch [src]!") + visible_message(span_danger("[M] attempts to touch [src]!"), \ + span_danger("[M] attempts to touch you!"), span_hear("I hear a swoosh!"), null, M) + to_chat(M, span_warning("I attempt to touch [src]!")) return 0 if(..()) @@ -329,9 +329,9 @@ var/damage = prob(90) ? 20 : 0 if(!damage) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) - visible_message("[M] lunges at [src]!", \ - "[M] lunges at you!", "I hear a swoosh!", null, M) - to_chat(M, "I lunge at [src]!") + visible_message(span_danger("[M] lunges at [src]!"), \ + span_danger("[M] lunges at you!"), span_hear("I hear a swoosh!"), null, M) + to_chat(M, span_danger("I lunge at [src]!")) return 0 var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) if(!affecting) @@ -339,9 +339,9 @@ var/armor_block = run_armor_check(affecting, "slash","","",10) playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M] slashes at [src]!", \ - "[M] slashes at you!", "I hear a sickening sound of a slice!", null, M) - to_chat(M, "I slash at [src]!") + visible_message(span_danger("[M] slashes at [src]!"), \ + span_danger("[M] slashes at you!"), span_hear("I hear a sickening sound of a slice!"), null, M) + to_chat(M, span_danger("I slash at [src]!")) log_combat(M, src, "attacked") if(!dismembering_strike(M, M.zone_selected)) //Dismemberment successful return 1 @@ -351,16 +351,16 @@ var/obj/item/I = get_active_held_item() if(I && dropItemToGround(I)) playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M] disarms [src]!", \ - "[M] disarms you!", "I hear aggressive shuffling!", null, M) - to_chat(M, "I disarm [src]!") + visible_message(span_danger("[M] disarms [src]!"), \ + span_danger("[M] disarms you!"), span_hear("I hear aggressive shuffling!"), null, M) + to_chat(M, span_danger("I disarm [src]!")) else playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) Paralyze(100) log_combat(M, src, "tackled") - visible_message("[M] tackles [src] down!", \ - "[M] tackles you down!", "I hear aggressive shuffling followed by a loud thud!", null, M) - to_chat(M, "I tackle [src] down!") + visible_message(span_danger("[M] tackles [src] down!"), \ + span_danger("[M] tackles you down!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), null, M) + to_chat(M, span_danger("I tackle [src] down!")) /mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L) @@ -403,8 +403,8 @@ next_attack_msg += " Armor stops the damage." else affecting.bodypart_attacked_by(M.a_intent.blade_class, damage - armor, M, dam_zone, crit_message = TRUE) - visible_message("\The [M] [pick(M.a_intent.attack_verb)] [src]![next_attack_msg.Join()]", \ - "\The [M] [pick(M.a_intent.attack_verb)] me![next_attack_msg.Join()]", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("\The [M] [pick(M.a_intent.attack_verb)] [src]![next_attack_msg.Join()]"), \ + span_danger("\The [M] [pick(M.a_intent.attack_verb)] me![next_attack_msg.Join()]"), null, COMBAT_MESSAGE_RANGE) next_attack_msg.Cut() if(nodmg) return FALSE @@ -434,7 +434,7 @@ if(M.occupant.used_intent.type == INTENT_HARM) if(HAS_TRAIT(M.occupant, TRAIT_PACIFISM)) - to_chat(M.occupant, "I don't want to harm other living beings!") + to_chat(M.occupant, span_warning("I don't want to harm other living beings!")) return M.do_attack_animation(src) if(M.damtype == "brute") @@ -462,9 +462,9 @@ update_damage_overlays() updatehealth() - visible_message("[M.name] hits [src]!", \ - "[M.name] hits you!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I hit [src]!") + visible_message(span_danger("[M.name] hits [src]!"), \ + span_danger("[M.name] hits you!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I hit [src]!")) log_combat(M.occupant, src, "attacked", M, "(INTENT: [uppertext(M.occupant.used_intent)]) (DAMTYPE: [uppertext(M.damtype)])") else @@ -538,7 +538,7 @@ /mob/living/carbon/human/blob_act(obj/structure/blob/B) if(stat == DEAD) return - show_message("The blob attacks you!") + show_message(span_danger("The blob attacks you!")) var/dam_zone = pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone)) apply_damage(5, BRUTE, affecting, run_armor_check(affecting, "blunt")) @@ -571,7 +571,7 @@ // if(shock_damage * siemens_coeff >= 1 && prob(25)) // var/obj/item/organ/heart/heart = getorganslot(ORGAN_SLOT_HEART) // if(heart.Restart() && stat == CONSCIOUS) -// to_chat(src, "I feel my heart beating again!") +// to_chat(src, span_notice("I feel my heart beating again!")) electrocution_animation(40) /mob/living/carbon/human/emp_act(severity) @@ -582,7 +582,7 @@ for(var/obj/item/bodypart/L in src.bodyparts) if(L.status == BODYPART_ROBOTIC) if(!informed) - to_chat(src, "I feel a sharp pain as my robotic limbs overload.") + to_chat(src, span_danger("I feel a sharp pain as my robotic limbs overload.")) informed = TRUE switch(severity) if(1) @@ -615,7 +615,7 @@ update_inv_neck() update_inv_head() else - to_chat(src, "My [head_clothes.name] protects my head and face from the acid!") + to_chat(src, span_notice("My [head_clothes.name] protects my head and face from the acid!")) else . = get_bodypart(BODY_ZONE_HEAD) if(.) @@ -636,7 +636,7 @@ update_inv_w_uniform() update_inv_wear_suit() else - to_chat(src, "My [chest_clothes.name] protects my body from the acid!") + to_chat(src, span_notice("My [chest_clothes.name] protects my body from the acid!")) else . = get_bodypart(BODY_ZONE_CHEST) if(.) @@ -668,7 +668,7 @@ update_inv_w_uniform() update_inv_wear_suit() else - to_chat(src, "My [arm_clothes.name] protects my arms and hands from the acid!") + to_chat(src, span_notice("My [arm_clothes.name] protects my arms and hands from the acid!")) else . = get_bodypart(BODY_ZONE_R_ARM) if(.) @@ -694,7 +694,7 @@ update_inv_w_uniform() update_inv_wear_suit() else - to_chat(src, "My [leg_clothes.name] protects my legs and feet from the acid!") + to_chat(src, span_notice("My [leg_clothes.name] protects my legs and feet from the acid!")) else . = get_bodypart(BODY_ZONE_R_LEG) if(.) @@ -749,9 +749,9 @@ if(src == M) if(has_status_effect(STATUS_EFFECT_CHOKINGSTRAND)) - to_chat(src, "I attempt to remove the durathread strand from around my neck.") + to_chat(src, span_notice("I attempt to remove the durathread strand from around my neck.")) if(do_after(src, 35, null, src)) - to_chat(src, "I succesfuly remove the durathread strand.") + to_chat(src, span_notice("I succesfuly remove the durathread strand.")) remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) return check_for_injuries(M) @@ -772,43 +772,43 @@ m1 = "I am" if(!deep_examination) deep_examination = HAS_TRAIT(src, TRAIT_SELF_AWARE) - examination += "Let's see how I am doing." + examination += span_notice("Let's see how I am doing.") if(!stat && !silent) - user.visible_message("[src] examines [p_them()]self.", \ - "I check myself for injuries.") + user.visible_message(span_notice("[src] examines [p_them()]self."), \ + span_notice("I check myself for injuries.")) else if(user) m1 = "[p_they(TRUE)] [p_are()]" if(!deep_examination) deep_examination = HAS_TRAIT(user, TRAIT_EMPATH) - examination += "Let's see how [src] is doing." + examination += span_notice("Let's see how [src] is doing.") if(!user.stat && !silent) - user.visible_message("[user] examines [src].", \ - "I check [src] for injuries.") + user.visible_message(span_notice("[user] examines [src]."), \ + span_notice("I check [src] for injuries.")) if(stat < DEAD) examination += "[m1] still alive." if(stat >= UNCONSCIOUS) examination += "[m1] [IsSleeping() ? "asleep" : "unconscious"]." else - examination += "[m1] dead." + examination += span_dead("[m1] dead.") switch(blood_volume) if(-INFINITY to BLOOD_VOLUME_SURVIVE) - examination += "[m1] extremely anemic." + examination += span_artery("[m1] extremely anemic.") if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD) - examination += "[m1] very anemic." + examination += span_artery("[m1] very anemic.") if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY) - examination += "[m1] anemic." + examination += span_artery("[m1] anemic.") if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE) - examination += "[m1] a little anemic." + examination += span_artery("[m1] a little anemic.") if(HAS_TRAIT(src, TRAIT_PARALYSIS)) if(HAS_TRAIT(src, TRAIT_NO_BITE)) - examination += "[m1] PARALYZED!" + examination += span_danger("[m1] PARALYZED!") else - examination += "[m1] TETRAPLEGIC!" + examination += span_danger("[m1] TETRAPLEGIC!") else if(HAS_TRAIT(src, TRAIT_PARALYSIS_R_LEG) && HAS_TRAIT(src, TRAIT_PARALYSIS_L_LEG)) - examination += "[m1] PARAPLEGIC!" + examination += span_warning("[m1] PARAPLEGIC!") var/static/list/body_zones = list( BODY_ZONE_HEAD, @@ -821,7 +821,7 @@ for(var/body_zone in body_zones) var/obj/item/bodypart/bodypart = get_bodypart(body_zone) if(!bodypart) - examination += "☼ [capitalize(parse_zone(body_zone))]: MISSING" + examination += span_info("☼ [capitalize(parse_zone(body_zone))]: MISSING") continue examination += bodypart.check_for_injuries(user, deep_examination) @@ -837,21 +837,21 @@ if(user == src) if(!deep_examination) deep_examination = HAS_TRAIT(src, TRAIT_SELF_AWARE) - examination += "Let's see how my [parse_zone(choice)] is doing." + examination += span_notice("Let's see how my [parse_zone(choice)] is doing.") if(!stat && !silent) - visible_message("[src] examines [p_their()] [parse_zone(choice)].") + visible_message(span_notice("[src] examines [p_their()] [parse_zone(choice)].")) else if(user) if(!deep_examination) deep_examination = HAS_TRAIT(user, TRAIT_EMPATH) - examination += "Let's see how [src]'s [parse_zone(choice)] is doing." + examination += span_notice("Let's see how [src]'s [parse_zone(choice)] is doing.") if(!user.stat && !silent) - visible_message("[user] examines [src]'s [parse_zone(choice)].") + visible_message(span_notice("[user] examines [src]'s [parse_zone(choice)].")) var/obj/item/bodypart/examined_part = get_bodypart(choice) if(examined_part) examination += examined_part.check_for_injuries(user, advanced) else - examination += "☼ [capitalize(parse_zone(choice))]: MISSING" + examination += span_info("☼ [capitalize(parse_zone(choice))]: MISSING") examination += "ø ------------ ø" if(!silent) to_chat(user, examination.Join("\n")) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index d843839e5..c4d0cef3f 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -157,10 +157,10 @@ . = ..() if(G.trigger_guard == TRIGGER_GUARD_NORMAL) if(HAS_TRAIT(src, TRAIT_CHUNKYFINGERS)) - to_chat(src, "My meaty finger is much too large for the trigger guard!") + to_chat(src, span_warning("My meaty finger is much too large for the trigger guard!")) return FALSE if(HAS_TRAIT(src, TRAIT_NOGUNS)) - to_chat(src, "I can't bring myself to use a ranged weapon!") + to_chat(src, span_warning("I can't bring myself to use a ranged weapon!")) return FALSE /mob/living/carbon/human/proc/get_bank_account() diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 647244b9a..813978953 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -96,7 +96,7 @@ S.step_action() if(mouth) if(mouth.spitoutmouth && prob(5)) - visible_message("[src] spits out [mouth].") + visible_message(span_warning("[src] spits out [mouth].")) dropItemToGround(mouth, silent = FALSE) if(held_items.len) for(var/obj/item/I in held_items) diff --git a/code/modules/mob/living/carbon/human/human_topic.dm b/code/modules/mob/living/carbon/human/human_topic.dm index 69e0360a7..2e3d0727a 100644 --- a/code/modules/mob/living/carbon/human/human_topic.dm +++ b/code/modules/mob/living/carbon/human/human_topic.dm @@ -14,8 +14,8 @@ msg += "[bodypart] is healthy." else msg += "[capitalize(parse_zone(checked_zone))]:" - msg += "Limb is missing!" - to_chat(usr, "[msg.Join("\n")]") + msg += span_dead("Limb is missing!") + to_chat(usr, span_info("[msg.Join("\n")]")) if(href_list["embedded_object"] && usr.canUseTopic(src, BE_CLOSE, NO_DEXTERITY)) var/obj/item/bodypart/L = locate(href_list["embedded_limb"]) in bodyparts @@ -26,9 +26,9 @@ return var/time_taken = I.embedding.embedded_unsafe_removal_time*I.w_class if(usr == src) - usr.visible_message("[usr] attempts to remove [I] from [usr.p_their()] [L.name].","I attempt to remove [I] from my [L.name]...") + usr.visible_message(span_warning("[usr] attempts to remove [I] from [usr.p_their()] [L.name]."),span_warning("I attempt to remove [I] from my [L.name]...")) else - usr.visible_message("[usr] attempts to remove [I] from [src]'s [L.name].","I attempt to remove [I] from [src]'s [L.name]...") + usr.visible_message(span_warning("[usr] attempts to remove [I] from [src]'s [L.name]."),span_warning("I attempt to remove [I] from [src]'s [L.name]...")) if(do_after(usr, time_taken, needhand = TRUE, target = src)) if(QDELETED(I) || QDELETED(L) || !L.remove_embedded_object(I)) return @@ -37,9 +37,9 @@ emote("pain", TRUE) playsound(loc, 'sound/foley/flesh_rem.ogg', 100, TRUE, -2) if(usr == src) - usr.visible_message("[usr] rips [I] out of [usr.p_their()] [L.name]!", "I successfully remove [I] from my [L.name].") + usr.visible_message(span_notice("[usr] rips [I] out of [usr.p_their()] [L.name]!"), span_notice("I successfully remove [I] from my [L.name].")) else - usr.visible_message("[usr] rips [I] out of [src]'s [L.name]!", "I successfully remove [I] from [src]'s [L.name].") + usr.visible_message(span_notice("[usr] rips [I] out of [src]'s [L.name]!"), span_notice("I successfully remove [I] from [src]'s [L.name].")) if(href_list["bandage"] && usr.canUseTopic(src, BE_CLOSE, NO_DEXTERITY)) var/obj/item/bodypart/L = locate(href_list["bandaged_limb"]) in bodyparts @@ -49,9 +49,9 @@ if(!I) return if(usr == src) - usr.visible_message("[usr] starts unbandaging [usr.p_their()] [L.name].","I start unbandaging [L.name]...") + usr.visible_message(span_warning("[usr] starts unbandaging [usr.p_their()] [L.name]."),span_warning("I start unbandaging [L.name]...")) else - usr.visible_message("[usr] starts unbandaging [src]'s [L.name].","I start unbandaging [src]'s [L.name]...") + usr.visible_message(span_warning("[usr] starts unbandaging [src]'s [L.name]."),span_warning("I start unbandaging [src]'s [L.name]...")) if(do_after(usr, 50, needhand = TRUE, target = src)) if(QDELETED(I) || QDELETED(L) || (L.bandage != I)) return @@ -61,12 +61,12 @@ if(href_list["item"]) //canUseTopic check for this is handled by mob/Topic() var/slot = text2num(href_list["item"]) if(slot in check_obscured_slots(TRUE)) - to_chat(usr, "I can't reach that! Something is covering it.") + to_chat(usr, span_warning("I can't reach that! Something is covering it.")) return if(href_list["undiesthing"]) //canUseTopic check for this is handled by mob/Topic() if(!get_location_accessible(src, BODY_ZONE_PRECISE_GROIN, skipundies = TRUE)) - to_chat(usr, "I can't reach that! Something is covering it.") + to_chat(usr, span_warning("I can't reach that! Something is covering it.")) return if(underwear == "Nude") return @@ -93,10 +93,10 @@ var/delay_denominator = 1 if(pocket_item && !(pocket_item.item_flags & ABSTRACT)) if(HAS_TRAIT(pocket_item, TRAIT_NODROP)) - to_chat(usr, "I try to empty [src]'s [pocket_side] pocket, it seems to be stuck!") - to_chat(usr, "I try to empty [src]'s [pocket_side] pocket.") + to_chat(usr, span_warning("I try to empty [src]'s [pocket_side] pocket, it seems to be stuck!")) + to_chat(usr, span_notice("I try to empty [src]'s [pocket_side] pocket.")) else if(place_item && place_item.mob_can_equip(src, usr, pocket_id, 1) && !(place_item.item_flags & ABSTRACT)) - to_chat(usr, "I try to place [place_item] into [src]'s [pocket_side] pocket.") + to_chat(usr, span_notice("I try to place [place_item] into [src]'s [pocket_side] pocket.")) delay_denominator = 4 else return @@ -114,7 +114,7 @@ //updating inv screen after handled by living/Topic() else // Display a warning if the user mocks up - to_chat(src, "I feel your [pocket_side] pocket being fumbled with!") + to_chat(src, span_warning("I feel your [pocket_side] pocket being fumbled with!")) ///////HUDs/////// if(href_list["hud"]) @@ -183,15 +183,15 @@ if(burndamage) to_chat(usr, "[BP] appears to have [status]") if(getOxyLoss()) - to_chat(usr, "Patient has signs of suffocation, emergency treatment may be required!") + to_chat(usr, span_danger("Patient has signs of suffocation, emergency treatment may be required!")) if(getToxLoss() > 20) - to_chat(usr, "Gathered data is inconsistent with the analysis, possible cause: poisoning.") + to_chat(usr, span_danger("Gathered data is inconsistent with the analysis, possible cause: poisoning.")) if(!H.wear_ring) //You require access from here on out. - to_chat(H, "ERROR: Invalid access") + to_chat(H, span_warning("ERROR: Invalid access")) return var/list/access = H.wear_ring.GetAccess() if(!(ACCESS_MEDICAL in access)) - to_chat(H, "ERROR: Invalid access") + to_chat(H, span_warning("ERROR: Invalid access")) return if(href_list["p_stat"]) var/health_status = input(usr, "Specify a new physical status for this person.", "Medical HUD", R.fields["p_stat"]) in list("Active", "Physically Unfit", "*Unconscious*", "*Deceased*", "Cancel") @@ -234,15 +234,15 @@ allowed_access = H.get_authentification_name() if(!allowed_access) - to_chat(H, "ERROR: Invalid access.") + to_chat(H, span_warning("ERROR: Invalid access.")) return if(!perpname) - to_chat(H, "ERROR: Can not identify target.") + to_chat(H, span_warning("ERROR: Can not identify target.")) return R = find_record("name", perpname, GLOB.data_core.security) if(!R) - to_chat(usr, "ERROR: Unable to locate data core entry for target.") + to_chat(usr, span_warning("ERROR: Unable to locate data core entry for target.")) return if(href_list["status"]) var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Paroled", "Discharged", "Cancel") @@ -293,7 +293,7 @@ var/crime = GLOB.data_core.createCrimeEntry(t1, t2, allowed_access, station_time_timestamp()) GLOB.data_core.addMinorCrime(R.fields["id"], crime) investigate_log("New Minor Crime: [t1]: [t2] | Added to [R.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS) - to_chat(usr, "Successfully added a minor crime.") + to_chat(usr, span_notice("Successfully added a minor crime.")) return if("Major Crime") var/t1 = stripped_input("Please input major crime names:", "Security HUD", "", null) @@ -307,7 +307,7 @@ var/crime = GLOB.data_core.createCrimeEntry(t1, t2, allowed_access, station_time_timestamp()) GLOB.data_core.addMajorCrime(R.fields["id"], crime) investigate_log("New Major Crime: [t1]: [t2] | Added to [R.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS) - to_chat(usr, "Successfully added a major crime.") + to_chat(usr, span_notice("Successfully added a major crime.")) return if(href_list["view_comment"]) @@ -335,7 +335,7 @@ while(R.fields[text("com_[]", counter)]) counter++ R.fields[text("com_[]", counter)] = text("Made by [] on [] [], []
[]", allowed_access, station_time_timestamp(), time2text(world.realtime, "MMM DD"), GLOB.year_integer+540, t1) - to_chat(usr, "Successfully added comment.") + to_chat(usr, span_notice("Successfully added comment.")) return return ..() //end of this massive fucking chain. TODO: make the hud chain not spooky. - Yeah, great job doing that. diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 6c3f72463..80fe984eb 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -216,7 +216,7 @@ else not_handled = TRUE // else -// to_chat(src, "I am trying to equip this item to an unsupported inventory slot. Report this to a coder!") +// to_chat(src, span_danger("I am trying to equip this item to an unsupported inventory slot. Report this to a coder!")) //Item is handled and in slot, valid to call callback, for this proc should always be true if(!not_handled) @@ -412,7 +412,7 @@ var/obj/item/equipped_back = get_item_by_slot(SLOT_BACK) if(!equipped_back) // We also let you equip a backpack like this if(!thing) - to_chat(src, "I have no backpack to take something out of!") + to_chat(src, span_warning("I have no backpack to take something out of!")) return if(equip_to_slot_if_possible(thing, SLOT_BACK)) update_inv_hands() @@ -421,14 +421,14 @@ if(!thing) equipped_back.attack_hand(src) else - to_chat(src, "I can't fit anything in!") + to_chat(src, span_warning("I can't fit anything in!")) return if(thing) // put thing in backpack if(!SEND_SIGNAL(equipped_back, COMSIG_TRY_STORAGE_INSERT, thing, src)) - to_chat(src, "I can't fit anything in!") + to_chat(src, span_warning("I can't fit anything in!")) return if(!equipped_back.contents.len) // nothing to take out - to_chat(src, "There's nothing in your backpack to take out!") + to_chat(src, span_warning("There's nothing in your backpack to take out!")) return var/obj/item/stored = equipped_back.contents[equipped_back.contents.len] if(!stored || stored.on_found(src)) @@ -443,7 +443,7 @@ var/obj/item/equipped_belt = get_item_by_slot(SLOT_BELT) if(!equipped_belt) // We also let you equip a belt like this if(!thing) - to_chat(src, "I have no belt to take something out of!") + to_chat(src, span_warning("I have no belt to take something out of!")) return if(equip_to_slot_if_possible(thing, SLOT_BELT)) update_inv_hands() @@ -452,14 +452,14 @@ if(!thing) equipped_belt.attack_hand(src) else - to_chat(src, "I can't fit anything in!") + to_chat(src, span_warning("I can't fit anything in!")) return if(thing) // put thing in belt if(!SEND_SIGNAL(equipped_belt, COMSIG_TRY_STORAGE_INSERT, thing, src)) - to_chat(src, "I can't fit anything in!") + to_chat(src, span_warning("I can't fit anything in!")) return if(!equipped_belt.contents.len) // nothing to take out - to_chat(src, "There's nothing in your belt to take out!") + to_chat(src, span_warning("There's nothing in your belt to take out!")) return var/obj/item/stored = equipped_belt.contents[equipped_belt.contents.len] if(!stored || stored.on_found(src)) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index fa392fefb..a6000d340 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -58,7 +58,7 @@ if(mind) if(!mind.antag_datums || !mind.antag_datums.len) allmig_reward++ - to_chat(src, "Nights Survived: \Roman[allmig_reward]") + to_chat(src, span_danger("Nights Survived: \Roman[allmig_reward]")) if(C.allmig) if(allmig_reward > 3) adjust_triumphs(1) diff --git a/code/modules/mob/living/carbon/human/npc/goblin.dm b/code/modules/mob/living/carbon/human/npc/goblin.dm index 7ac701562..00318a15a 100644 --- a/code/modules/mob/living/carbon/human/npc/goblin.dm +++ b/code/modules/mob/living/carbon/human/npc/goblin.dm @@ -69,7 +69,7 @@ /datum/species/goblin/moon/spec_death(gibbed, mob/living/carbon/human/H) new /obj/item/reagent_containers/powder/moondust_purest(get_turf(H)) - H.visible_message("Moondust falls from [H]!") + H.visible_message(span_blue("Moondust falls from [H]!")) // qdel(H) /obj/item/bodypart/chest/goblin @@ -363,7 +363,7 @@ if(!in_range(src, user)) return if(gobs >= (maxgobs+1)) - to_chat(user, "Too many Gobs.") + to_chat(user, span_danger("Too many Gobs.")) return gobs++ var/mob/living/carbon/human/species/goblin/npc/N = new (get_turf(src)) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 7c99f0288..6eee7acab 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1346,7 +1346,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) return FALSE if(DIGITIGRADE in species_traits) if(!disable_warning) - to_chat(H, "The footwear around here isn't compatible with my feet!") + to_chat(H, span_warning("The footwear around here isn't compatible with my feet!")) return FALSE return equip_delay_self_check(I, H, bypass_equip_delay_self) if(SLOT_BELT) @@ -1454,7 +1454,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(!H.wear_pants && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC)) if(!disable_warning) - to_chat(H, "I need a jumpsuit before you can attach this [I.name]!") + to_chat(H, span_warning("I need a jumpsuit before you can attach this [I.name]!")) return FALSE if(I.slot_flags & ITEM_SLOT_DENYPOCKET) return FALSE @@ -1470,7 +1470,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(!H.wear_pants && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC)) if(!disable_warning) - to_chat(H, "I need a jumpsuit before you can attach this [I.name]!") + to_chat(H, span_warning("I need a jumpsuit before you can attach this [I.name]!")) return FALSE if(I.slot_flags & ITEM_SLOT_DENYPOCKET) return FALSE @@ -1484,15 +1484,15 @@ GLOBAL_LIST_EMPTY(roundstart_races) return FALSE if(!H.wear_armor) if(!disable_warning) - to_chat(H, "I need a suit before you can attach this [I.name]!") + to_chat(H, span_warning("I need a suit before you can attach this [I.name]!")) return FALSE if(!H.wear_armor.allowed) if(!disable_warning) - to_chat(H, "I somehow have a suit with no defined allowed items for suit storage, stop that.") + to_chat(H, span_warning("I somehow have a suit with no defined allowed items for suit storage, stop that.")) return FALSE if(I.w_class > WEIGHT_CLASS_BULKY) if(!disable_warning) - to_chat(H, "The [I.name] is too big to attach!") //should be src? + to_chat(H, span_warning("The [I.name] is too big to attach!")) //should be src? return FALSE if( istype(I, /obj/item/pda) || istype(I, /obj/item/pen) || is_type_in_list(I, H.wear_armor.allowed) ) return TRUE @@ -1539,7 +1539,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) return TRUE if(HAS_TRAIT(H, TRAIT_CHUNKYFINGERS)) return do_after(H, 5 MINUTES, target = H) -// H.visible_message("[H] start putting on [I]...", "I start putting on [I]...") +// H.visible_message(span_notice("[H] start putting on [I]..."), span_notice("I start putting on [I]...")) if(I.edelay_type) return move_after(H, minone(I.equip_delay_self-H.STASPD), target = H) else @@ -1583,14 +1583,14 @@ GLOBAL_LIST_EMPTY(roundstart_races) //The fucking TRAIT_FAT mutation is the dumbest shit ever. It makes the code so difficult to work with // if(HAS_TRAIT_FROM(H, TRAIT_FAT, OBESITY))//I share my pain, past coder. // if(H.overeatduration < 100) -// to_chat(H, "I feel fit again!") +// to_chat(H, span_notice("I feel fit again!")) // REMOVE_TRAIT(H, TRAIT_FAT, OBESITY) // H.remove_movespeed_modifier(MOVESPEED_ID_FAT) // H.update_inv_w_uniform() // H.update_inv_wear_suit() // else // if(H.overeatduration >= 100) -// to_chat(H, "I suddenly feel blubbery!") +// to_chat(H, span_danger("I suddenly feel blubbery!")) // ADD_TRAIT(H, TRAIT_FAT, OBESITY) // H.add_movespeed_modifier(MOVESPEED_ID_FAT, multiplicative_slowdown = 1.5) // H.update_inv_w_uniform() @@ -1634,15 +1634,15 @@ GLOBAL_LIST_EMPTY(roundstart_races) // H.metabolism_efficiency = 1 // else if(H.nutrition > NUTRITION_LEVEL_FED && H.satiety > 80) // if(H.metabolism_efficiency != 1.25 && !HAS_TRAIT(H, TRAIT_NOHUNGER)) -// to_chat(H, "I feel vigorous.") +// to_chat(H, span_notice("I feel vigorous.")) // H.metabolism_efficiency = 1.25 // else if(H.nutrition < NUTRITION_LEVEL_STARVING + 50) // if(H.metabolism_efficiency != 0.8) -// to_chat(H, "I feel sluggish.") +// to_chat(H, span_notice("I feel sluggish.")) // H.metabolism_efficiency = 0.8 // else // if(H.metabolism_efficiency == 1.25) -// to_chat(H, "I no longer feel vigorous.") +// to_chat(H, span_notice("I no longer feel vigorous.")) // H.metabolism_efficiency = 1 //Hunger slowdown for if mood isn't enabled @@ -1716,21 +1716,21 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(!H.IsParalyzed()) H.emote("collapse", TRUE) H.Paralyze(RAD_MOB_KNOCKDOWN_AMOUNT) - to_chat(H, "I feel weak.") + to_chat(H, span_danger("I feel weak.")) if(radiation > RAD_MOB_VOMIT && prob(RAD_MOB_VOMIT_PROB)) H.vomit(10, TRUE) if(radiation > RAD_MOB_MUTATE) if(prob(1)) - to_chat(H, "I mutate!") + to_chat(H, span_danger("I mutate!")) H.easy_randmut(NEGATIVE+MINOR_NEGATIVE) H.emote("gasp") H.domutcheck() if(radiation > RAD_MOB_HAIRLOSS) if(prob(15) && !(H.hairstyle == "Bald") && (HAIR in species_traits)) - to_chat(H, "My hair starts to fall out in clumps...") + to_chat(H, span_danger("My hair starts to fall out in clumps...")) addtimer(CALLBACK(src, PROC_REF(go_bald), H), 50) /datum/species/proc/go_bald(mob/living/carbon/human/H) @@ -1767,15 +1767,15 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(we_breathe && we_lung) user.do_cpr(target) else if(we_breathe && !we_lung) - to_chat(user, "I have no lungs to breathe with, so you cannot perform CPR!") + to_chat(user, span_warning("I have no lungs to breathe with, so you cannot perform CPR!")) else - to_chat(user, "I do not breathe, so you cannot perform CPR!")*/ + to_chat(user, span_warning("I do not breathe, so you cannot perform CPR!"))*/ /datum/species/proc/grab(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) if(target.check_block()) - target.visible_message("[target] blocks [user]'s grab!", \ - "I block [user]'s grab!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "My grab at [target] was blocked!") + target.visible_message(span_warning("[target] blocks [user]'s grab!"), \ + span_danger("I block [user]'s grab!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_warning("My grab at [target] was blocked!")) return FALSE if(attacker_style && attacker_style.grab_act(user,target)) return TRUE @@ -1783,27 +1783,27 @@ GLOBAL_LIST_EMPTY(roundstart_races) /* //Steal them shoes if(!(target.mobility_flags & MOBILITY_STAND) && (user.zone_selected == BODY_ZONE_L_LEG || user.zone_selected == BODY_ZONE_R_LEG) && user.used_intent.type == INTENT_GRAB && target.shoes) var/obj/item/I = target.shoes - user.visible_message("[user] starts stealing [target]'s [I.name]!", - "I start stealing [target]'s [I.name]...", null, null, target) - to_chat(target, "[user] starts stealing my [I.name]!") + user.visible_message(span_warning("[user] starts stealing [target]'s [I.name]!"), + span_danger("I start stealing [target]'s [I.name]..."), null, null, target) + to_chat(target, span_danger("[user] starts stealing my [I.name]!")) if(do_after(user, I.strip_delay, TRUE, target, TRUE)) target.dropItemToGround(I, TRUE) user.put_in_hands(I) - user.visible_message("[user] stole [target]'s [I.name]!", - "I stole [target]'s [I.name]!", null, null, target) - to_chat(target, "[user] stole my [I.name]!")*/ + user.visible_message(span_warning("[user] stole [target]'s [I.name]!"), + span_notice("I stole [target]'s [I.name]!"), null, null, target) + to_chat(target, span_danger("[user] stole my [I.name]!"))*/ target.grabbedby(user) return TRUE ///This proc handles punching damage. IMPORTANT: Our owner is the TARGET and not the USER in this proc. For whatever reason... /datum/species/proc/harm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) if(HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "I don't want to harm [target]!") + to_chat(user, span_warning("I don't want to harm [target]!")) return FALSE if(target.check_block()) - target.visible_message("[target] blocks [user]'s attack!", \ - "I block [user]'s attack!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "My attack at [target] was blocked!") + target.visible_message(span_warning("[target] blocks [user]'s attack!"), \ + span_danger("I block [user]'s attack!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_warning("My attack at [target] was blocked!")) return FALSE if(attacker_style && attacker_style.harm_act(user,target)) return TRUE @@ -1843,9 +1843,9 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(!damage || !affecting || prob(miss_chance))//future-proofing for species that have 0 damage/weird cases where no zone is targeted playsound(target.loc, user.dna.species.miss_sound, 25, TRUE, -1) - target.visible_message("[user]'s [atk_verb] misses [target]!", \ - "I avoid [user]'s [atk_verb]!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "My [atk_verb] misses [target]!") + target.visible_message(span_danger("[user]'s [atk_verb] misses [target]!"), \ + span_danger("I avoid [user]'s [atk_verb]!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_warning("My [atk_verb] misses [target]!")) log_combat(user, target, "attempted to punch") return FALSE */ @@ -1854,7 +1854,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/obj/item/bodypart/affecting = target.get_bodypart(check_zone(selzone)) if(!affecting) - to_chat(user, "Unfortunately, there's nothing there.") + to_chat(user, span_warning("Unfortunately, there's nothing there.")) return 0 if(!target.lying_attack_check(user)) @@ -1889,12 +1889,12 @@ GLOBAL_LIST_EMPTY(roundstart_races) playsound(get_turf(target), "desecration", 80, TRUE) /* if(user == target) - target.visible_message("[user] [atk_verb]ed themself![target.next_attack_msg.Join()]", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I [atk_verb] myself![target.next_attack_msg.Join()]") + target.visible_message(span_danger("[user] [atk_verb]ed themself![target.next_attack_msg.Join()]"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_userdanger("I [atk_verb] myself![target.next_attack_msg.Join()]")) else - target.visible_message("[user] [atk_verb]ed [target]![target.next_attack_msg.Join()]", \ - "I'm [atk_verb]ed by [user]![target.next_attack_msg.Join()]", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I [atk_verb] [target]![target.next_attack_msg.Join()]") + target.visible_message(span_danger("[user] [atk_verb]ed [target]![target.next_attack_msg.Join()]"), \ + span_userdanger("I'm [atk_verb]ed by [user]![target.next_attack_msg.Join()]"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I [atk_verb] [target]![target.next_attack_msg.Join()]")) */ var/message_verb = "punched" if(user.used_intent) @@ -1904,16 +1904,16 @@ GLOBAL_LIST_EMPTY(roundstart_races) message_hit_area = " in the [parse_zone(selzone)]" var/attack_message = "[user] [message_verb] [target][message_hit_area]!" var/attack_message_local = "[user] [message_verb] me[message_hit_area]!" - target.visible_message("[attack_message][target.next_attack_msg.Join()]",\ - "[attack_message_local][target.next_attack_msg.Join()]", null, COMBAT_MESSAGE_RANGE) + target.visible_message(span_danger("[attack_message][target.next_attack_msg.Join()]"),\ + span_danger("[attack_message_local][target.next_attack_msg.Join()]"), null, COMBAT_MESSAGE_RANGE) target.next_attack_msg.Cut() target.retaliate(user) /* if((target.stat != DEAD) && damage >= user.dna.species.punchstunthreshold) - target.visible_message("[user] knocks [target] down!", \ - "You're knocked down by [user]!", "I hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I knock [target] down!") + target.visible_message(span_danger("[user] knocks [target] down!"), \ + span_danger("You're knocked down by [user]!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I knock [target] down!")) var/knockdown_duration = 40 + (target.getStaminaLoss() + (target.getBruteLoss()*0.5))*0.8 //50 total damage = 40 base stun + 40 stun modifier = 80 stun duration, which is the old base duration target.apply_effect(knockdown_duration, EFFECT_KNOCKDOWN, armor_block) target.forcesay(GLOB.hit_appends) @@ -1929,16 +1929,16 @@ GLOBAL_LIST_EMPTY(roundstart_races) /datum/species/proc/disarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) if(target.check_block()) - target.visible_message("[user]'s shove is blocked by [target]!", \ - "I block [user]'s shove!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "My shove at [target] was blocked!") + target.visible_message(span_warning("[user]'s shove is blocked by [target]!"), \ + span_danger("I block [user]'s shove!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_warning("My shove at [target] was blocked!")) return FALSE if(attacker_style && attacker_style.disarm_act(user,target)) return TRUE if(!(user.mobility_flags & MOBILITY_STAND) || user.IsKnockdown()) return FALSE // if(!(target.mobility_flags & MOBILITY_STAND)) -// to_chat(user, ".") +// to_chat(user, span_warning(".")) // return FALSE if(user == target) return FALSE @@ -1975,9 +1975,9 @@ GLOBAL_LIST_EMPTY(roundstart_races) /* if(target.IsKnockdown() && !target.IsParalyzed()) target.Paralyze(SHOVE_CHAIN_PARALYZE) - target.visible_message("[user.name] kicks [target.name] onto their side!", - "You're kicked onto my side by [user.name]!", "I hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I kick [target.name] onto their side!") + target.visible_message(span_danger("[user.name] kicks [target.name] onto their side!"), + span_danger("You're kicked onto my side by [user.name]!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I kick [target.name] onto their side!")) addtimer(CALLBACK(target, TYPE_PROC_REF(/mob/living, SetKnockdown), 0), SHOVE_CHAIN_PARALYZE) log_combat(user, target, "kicks", "onto their side (paralyzing)")*/ @@ -1996,28 +1996,28 @@ GLOBAL_LIST_EMPTY(roundstart_races) break if((!target_table && !target_collateral_mob) || directional_blocked) target.Knockdown(SHOVE_KNOCKDOWN_SOLID) - target.visible_message("[user.name] shoves [target.name], knocking them down!", - "You're knocked down from a shove by [user.name]!", "I hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I shove [target.name], knocking them down!") + target.visible_message(span_danger("[user.name] shoves [target.name], knocking them down!"), + span_danger("You're knocked down from a shove by [user.name]!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I shove [target.name], knocking them down!")) log_combat(user, target, "shoved", "knocking them down") else if(target_table) target.Knockdown(SHOVE_KNOCKDOWN_TABLE) - target.visible_message("[user.name] shoves [target.name] onto \the [target_table]!", - "I'm shoved onto \the [target_table] by [user.name]!", "I hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I shove [target.name] onto \the [target_table]!") + target.visible_message(span_danger("[user.name] shoves [target.name] onto \the [target_table]!"), + span_danger("I'm shoved onto \the [target_table] by [user.name]!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I shove [target.name] onto \the [target_table]!")) target.throw_at(target_table, 1, 1, null, FALSE) //1 speed throws with no spin are basically just forcemoves with a hard collision check log_combat(user, target, "shoved", "onto [target_table] (table)") else if(target_collateral_mob) target.Knockdown(SHOVE_KNOCKDOWN_HUMAN) target_collateral_mob.Knockdown(SHOVE_KNOCKDOWN_COLLATERAL) - target.visible_message("[user.name] shoves [target.name] into [target_collateral_mob.name]!", - "I'm shoved into [target_collateral_mob.name] by [user.name]!", "I hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I shove [target.name] into [target_collateral_mob.name]!") + target.visible_message(span_danger("[user.name] shoves [target.name] into [target_collateral_mob.name]!"), + span_danger("I'm shoved into [target_collateral_mob.name] by [user.name]!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I shove [target.name] into [target_collateral_mob.name]!")) log_combat(user, target, "shoved", "into [target_collateral_mob.name]") else - target.visible_message("[user.name] shoves [target.name]!", - "I'm shoved by [user.name]!", "I hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I shove [target.name]!") + target.visible_message(span_danger("[user.name] shoves [target.name]!"), + span_danger("I'm shoved by [user.name]!"), span_hear("I hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I shove [target.name]!")) var/target_held_item = target.get_active_held_item() var/knocked_item = FALSE if(!is_type_in_typecache(target_held_item, GLOB.shove_disarming_types)) @@ -2025,14 +2025,14 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(!target.has_movespeed_modifier(MOVESPEED_ID_SHOVE)) target.add_movespeed_modifier(MOVESPEED_ID_SHOVE, multiplicative_slowdown = SHOVE_SLOWDOWN_STRENGTH) if(target_held_item) - target.visible_message("[target.name]'s grip on \the [target_held_item] loosens!", - "My grip on \the [target_held_item] loosens!", null, COMBAT_MESSAGE_RANGE) + target.visible_message(span_danger("[target.name]'s grip on \the [target_held_item] loosens!"), + span_warning("My grip on \the [target_held_item] loosens!"), null, COMBAT_MESSAGE_RANGE) addtimer(CALLBACK(target, TYPE_PROC_REF(/mob/living/carbon/human, clear_shove_slowdown)), SHOVE_SLOWDOWN_LENGTH) else if(target_held_item) target.dropItemToGround(target_held_item) knocked_item = TRUE - target.visible_message("[target.name] drops \the [target_held_item]!", - "I drop \the [target_held_item]!", null, COMBAT_MESSAGE_RANGE) + target.visible_message(span_danger("[target.name] drops \the [target_held_item]!"), + span_warning("I drop \the [target_held_item]!"), null, COMBAT_MESSAGE_RANGE) var/append_message = "" if(target_held_item) if(knocked_item) @@ -2044,14 +2044,14 @@ GLOBAL_LIST_EMPTY(roundstart_races) //shameless copypaste /datum/species/proc/kicked(mob/living/carbon/human/user, mob/living/carbon/human/target) if(HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "I don't want to harm [target]!") + to_chat(user, span_warning("I don't want to harm [target]!")) return FALSE if(user.IsKnockdown()) return FALSE if(user == target) return FALSE if(user.check_leg_grabbed(1) || user.check_leg_grabbed(2)) - to_chat(user, "I can't move my leg!") + to_chat(user, span_notice("I can't move my leg!")) return if(user.rogfat >= user.maxrogfat) return FALSE @@ -2078,9 +2078,9 @@ GLOBAL_LIST_EMPTY(roundstart_races) else if(affecting) affecting.bodypart_attacked_by(BCLASS_BLUNT, damage, user, user.zone_selected, crit_message = TRUE) - target.visible_message("[user] stomps [target]![target.next_attack_msg.Join()]", \ - "I'm stomped by [user]![target.next_attack_msg.Join()]", "I hear a sickening kick!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I stomp on [target]![target.next_attack_msg.Join()]") + target.visible_message(span_danger("[user] stomps [target]![target.next_attack_msg.Join()]"), \ + span_danger("I'm stomped by [user]![target.next_attack_msg.Join()]"), span_hear("I hear a sickening kick!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I stomp on [target]![target.next_attack_msg.Join()]")) target.next_attack_msg.Cut() log_combat(user, target, "kicked") user.do_attack_animation(target, ATTACK_EFFECT_DISARM) @@ -2088,7 +2088,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) playsound(target, 'sound/combat/hits/kick/stomp.ogg', 100, TRUE, -1) return TRUE else - to_chat(user, "I'm too close to get a good kick in.") + to_chat(user, span_warning("I'm too close to get a good kick in.")) return FALSE else if(!target.kick_attack_check(user)) @@ -2133,28 +2133,28 @@ GLOBAL_LIST_EMPTY(roundstart_races) break if((!target_table && !target_collateral_mob) || directional_blocked) target.Knockdown(SHOVE_KNOCKDOWN_SOLID) - target.visible_message("[user.name] kicks [target.name], knocking them down!", - "I'm knocked down from a kick by [user.name]!", "I hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I kick [target.name], knocking them down!") + target.visible_message(span_danger("[user.name] kicks [target.name], knocking them down!"), + span_danger("I'm knocked down from a kick by [user.name]!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I kick [target.name], knocking them down!")) log_combat(user, target, "kicked", "knocking them down") else if(target_table) target.Knockdown(SHOVE_KNOCKDOWN_TABLE) - target.visible_message("[user.name] kicked [target.name] onto \the [target_table]!", - "I'm kicked onto \the [target_table] by [user.name]!", "I hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I kick [target.name] onto \the [target_table]!") + target.visible_message(span_danger("[user.name] kicked [target.name] onto \the [target_table]!"), + span_danger("I'm kicked onto \the [target_table] by [user.name]!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I kick [target.name] onto \the [target_table]!")) target.throw_at(target_table, 1, 1, null, FALSE) //1 speed throws with no spin are basically just forcemoves with a hard collision check log_combat(user, target, "kicked", "onto [target_table] (table)") else if(target_collateral_mob) target.Knockdown(SHOVE_KNOCKDOWN_HUMAN) target_collateral_mob.Knockdown(SHOVE_KNOCKDOWN_COLLATERAL) - target.visible_message("[user.name] kicks [target.name] into [target_collateral_mob.name]!", - "I'm kicked into [target_collateral_mob.name] by [user.name]!", "I hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I kick [target.name] into [target_collateral_mob.name]!") + target.visible_message(span_danger("[user.name] kicks [target.name] into [target_collateral_mob.name]!"), + span_danger("I'm kicked into [target_collateral_mob.name] by [user.name]!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I kick [target.name] into [target_collateral_mob.name]!")) log_combat(user, target, "kicked", "into [target_collateral_mob.name]") else - target.visible_message("[user.name] kicks [target.name]!", - "I'm kicked by [user.name]!", "I hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I kick [target.name]!") + target.visible_message(span_danger("[user.name] kicks [target.name]!"), + span_danger("I'm kicked by [user.name]!"), span_hear("I hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I kick [target.name]!")) log_combat(user, target, "kicked") var/selzone = accuracy_check(user.zone_selected, user, target, /datum/skill/combat/unarmed, user.used_intent) @@ -2190,9 +2190,9 @@ GLOBAL_LIST_EMPTY(roundstart_races) attacker_style = M.mind.martial_art if((M != H) && M.used_intent.type != INTENT_HELP && H.check_shields(M, 0, M.name, attack_type = UNARMED_ATTACK)) log_combat(M, H, "attempted to touch") - H.visible_message("[M] attempts to touch [H]!", \ - "[M] attempts to touch you!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I attempt to touch [H]!") + H.visible_message(span_warning("[M] attempts to touch [H]!"), \ + span_danger("[M] attempts to touch you!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_warning("I attempt to touch [H]!")) return 0 SEND_SIGNAL(M, COMSIG_MOB_ATTACK_HAND, M, H, attacker_style) switch(M.used_intent.type) @@ -2202,7 +2202,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(INTENT_GRAB) if(!M.has_hand_for_held_index(M.active_hand_index, TRUE)) //we obviously have a hadn, but we need to check for fingers/prosthetics - to_chat(M, "I can't move the fingers.") + to_chat(M, span_warning("I can't move the fingers.")) return grab(M, H, attacker_style) return @@ -2219,8 +2219,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(H.check_shields(I, I.force, "the [I.name]", MELEE_ATTACK, I.armor_penetration)) return 0 if(H.check_block()) - H.visible_message("[H] blocks [I]!", \ - "I block [I]!") + H.visible_message(span_warning("[H] blocks [I]!"), \ + span_danger("I block [I]!")) return 0 var/hit_area @@ -2238,7 +2238,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(user.used_intent?.penfactor) pen = I.armor_penetration + user.used_intent.penfactor -// var/armor_block = H.run_armor_check(affecting, "I.d_type", "My armor has protected my [hit_area]!", "My armor has softened a hit to my [hit_area]!",pen) +// var/armor_block = H.run_armor_check(affecting, "I.d_type", span_notice("My armor has protected my [hit_area]!"), span_warning("My armor has softened a hit to my [hit_area]!"),pen) var/Iforce = get_complex_damage(I, user) //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords) var/armor_block = H.run_armor_check(selzone, I.d_type, "", "",pen, damage = Iforce, blade_dulling=user.used_intent.blade_class) @@ -2307,7 +2307,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) // if(prob(I.force)) // H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20) // if(H.stat == CONSCIOUS) -// H.visible_message("[H] is knocked senseless!", "You're knocked senseless!") +// H.visible_message(span_danger("[H] is knocked senseless!"), span_danger("You're knocked senseless!")) // H.confused = max(H.confused, 20) // H.adjust_blurriness(10) // if(prob(10)) @@ -2334,7 +2334,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(BODY_ZONE_CHEST) // if(H.stat == CONSCIOUS && !I.get_sharpness() && armor_block < 50) // if(prob(I.force)) -// H.visible_message("[H] is knocked down!", "You're knocked down!") +// H.visible_message(span_danger("[H] is knocked down!"), span_danger("You're knocked down!")) // H.apply_effect(60, EFFECT_KNOCKDOWN, armor_block) if(bloody) @@ -2443,9 +2443,9 @@ GLOBAL_LIST_EMPTY(roundstart_races) // called when hit by a projectile switch(P.type) if(/obj/projectile/energy/floramut) // overwritten by plants/pods - H.show_message("The radiation beam dissipates harmlessly through my body.") + H.show_message(span_notice("The radiation beam dissipates harmlessly through my body.")) if(/obj/projectile/energy/florayield) - H.show_message("The radiation beam dissipates harmlessly through my body.") + H.show_message(span_notice("The radiation beam dissipates harmlessly through my body.")) /datum/species/proc/bullet_act(obj/projectile/P, mob/living/carbon/human/H, def_zone = BODY_ZONE_CHEST) // called before a projectile hit @@ -2717,7 +2717,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(H.stat || !(H.mobility_flags & MOBILITY_STAND)) return FALSE if(H.wear_armor && ((H.wear_armor.flags_inv & HIDEJUMPSUIT) && (!H.wear_armor.species_exception || !is_type_in_list(src, H.wear_armor.species_exception)))) //Jumpsuits have tail holes, so it makes sense they have wing holes too - to_chat(H, "My suit blocks my wings from extending!") + to_chat(H, span_warning("My suit blocks my wings from extending!")) return FALSE var/turf/T = get_turf(H) if(!T) @@ -2725,7 +2725,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/datum/gas_mixture/environment = T.return_air() if(environment && !(environment.return_pressure() > 30)) - to_chat(H, "The atmosphere is too thin for you to fly!") + to_chat(H, span_warning("The atmosphere is too thin for you to fly!")) return FALSE else return TRUE @@ -2735,7 +2735,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(H.buckled) buckled_obj = H.buckled - to_chat(H, "My wings spazz out and launch you!") + to_chat(H, span_notice("My wings spazz out and launch you!")) playsound(H.loc, 'sound/blank.ogg', 100, TRUE, -3) @@ -2782,9 +2782,9 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(S.CanFly(H)) S.ToggleFlight(H) if(!(H.movement_type & FLYING)) - to_chat(H, "I settle gently back onto the ground...") + to_chat(H, span_notice("I settle gently back onto the ground...")) else - to_chat(H, "I beat my wings and begin to hover gently above the ground...") + to_chat(H, span_notice("I beat my wings and begin to hover gently above the ground...")) H.set_resting(FALSE, TRUE) /datum/species/proc/knockback(obj/item/I, mob/living/target, mob/living/user, nodmg) diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index ee050a4e2..0f3a35979 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -72,7 +72,7 @@ /datum/species/ethereal/proc/on_emp_act(mob/living/carbon/human/H, severity) EMPeffect = TRUE spec_updatehealth(H) - to_chat(H, "I feel the light of your body leave you.") + to_chat(H, span_notice("I feel the light of your body leave you.")) switch(severity) if(EMP_LIGHT) addtimer(CALLBACK(src, PROC_REF(stop_emp), H), 10 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 10 seconds @@ -84,8 +84,8 @@ return emageffect = TRUE if(user) - to_chat(user, "I tap [H] on the back with your card.") - H.visible_message("[H] starts flickering in an array of colors!") + to_chat(user, span_notice("I tap [H] on the back with your card.")) + H.visible_message(span_danger("[H] starts flickering in an array of colors!")) handle_emag(H) addtimer(CALLBACK(src, PROC_REF(stop_emag), H), 30 SECONDS) //Disco mode for 30 seconds! This doesn't affect the ethereal at all besides either annoying some players, or making someone look badass. @@ -98,7 +98,7 @@ /datum/species/ethereal/proc/stop_emp(mob/living/carbon/human/H) EMPeffect = FALSE spec_updatehealth(H) - to_chat(H, "I feel more energized as your shine comes back.") + to_chat(H, span_notice("I feel more energized as your shine comes back.")) /datum/species/ethereal/proc/handle_emag(mob/living/carbon/human/H) @@ -111,7 +111,7 @@ /datum/species/ethereal/proc/stop_emag(mob/living/carbon/human/H) emageffect = FALSE spec_updatehealth(H) - H.visible_message("[H] stops flickering and goes back to their normal state!") + H.visible_message(span_danger("[H] stops flickering and goes back to their normal state!")) /datum/species/ethereal/proc/handle_charge(mob/living/carbon/human/H) brutemod = 1.25 diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 6218a1a31..32e0b6675 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -97,10 +97,10 @@ if(prob(20)) M.adjust_disgust(20) if(prob(5)) - M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]") + M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]")) if(prob(10)) var/sick_message = pick("Your insides revolt at the presence of lethal chocolate!", "You feel nyauseous.", "You're nya't feeling so good.","You feel like your insides are melting.","You feel illsies.") - to_chat(M, "[sick_message]") + to_chat(M, span_notice("[sick_message]")) if(prob(35)) var/obj/item/organ/guts = pick(M.internal_organs) guts.applyOrganDamage(15) @@ -142,7 +142,7 @@ kitty_ears.Insert(H, TRUE, FALSE) //Gives nonhumans cat tail and ears kitty_tail.Insert(H, TRUE, FALSE) if(!silent) - to_chat(H, "Something is nya~t right.") + to_chat(H, span_boldnotice("Something is nya~t right.")) playsound(get_turf(H), 'sound/blank.ogg', 50, TRUE, -1) /proc/purrbation_remove(mob/living/carbon/human/H, silent = FALSE) @@ -163,4 +163,4 @@ var/obj/item/organ/new_ears = new target_species.mutantears new_ears.Insert(H, TRUE, FALSE) if(!silent) - to_chat(H, "I are no longer a cat.") + to_chat(H, span_boldnotice("I are no longer a cat.")) diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm index c72519fb9..20cd4548e 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -26,8 +26,8 @@ var/turf/pos = get_turf(H) H.vomit(0, FALSE, FALSE, 2, TRUE) playsound(pos, 'sound/blank.ogg', 50, TRUE) - H.visible_message("[H] vomits on the floor!", \ - "I throw up on the floor!") + H.visible_message(span_danger("[H] vomits on the floor!"), \ + span_danger("I throw up on the floor!")) ..() /datum/species/fly/check_species_weakness(obj/item/weapon, mob/living/attacker) diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index e8b323b6c..95f463009 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -97,11 +97,11 @@ /datum/species/golem/plasma/spec_life(mob/living/carbon/human/H) if(H.bodytemperature > 750) if(!boom_warning && H.on_fire) - to_chat(H, "I feel like you could blow up at any moment!") + to_chat(H, span_danger("I feel like you could blow up at any moment!")) boom_warning = TRUE else if(boom_warning) - to_chat(H, "I feel more stable.") + to_chat(H, span_notice("I feel more stable.")) boom_warning = FALSE if(H.bodytemperature > 850 && H.on_fire && prob(25)) @@ -133,9 +133,9 @@ if(ishuman(owner)) var/mob/living/carbon/human/H = owner if(H.fire_stacks) - to_chat(owner, "I ignite yourself!") + to_chat(owner, span_notice("I ignite yourself!")) else - to_chat(owner, "I try to ignite yourself, but fail!") + to_chat(owner, span_warning("I try to ignite yourself, but fail!")) H.IgniteMob() //firestacks are already there passively //Harder to hurt @@ -347,7 +347,7 @@ special_names = list("Castle", "Bag", "Dune", "Worm", "Storm") /datum/species/golem/sand/spec_death(gibbed, mob/living/carbon/human/H) - H.visible_message("[H] turns into a pile of sand!") + H.visible_message(span_danger("[H] turns into a pile of sand!")) for(var/obj/item/W in H) H.dropItemToGround(W) for(var/i=1, i <= rand(3,5), i++) @@ -358,8 +358,8 @@ if(!(P.original == H && P.firer == H)) if(P.flag == "bullet" || P.flag == "bomb") playsound(H, 'sound/blank.ogg', 70, TRUE) - H.visible_message("The [P.name] sinks harmlessly in [H]'s sandy body!", \ - "The [P.name] sinks harmlessly in [H]'s sandy body!") + H.visible_message(span_danger("The [P.name] sinks harmlessly in [H]'s sandy body!"), \ + span_danger("The [P.name] sinks harmlessly in [H]'s sandy body!")) return BULLET_ACT_BLOCK return ..() @@ -379,7 +379,7 @@ /datum/species/golem/glass/spec_death(gibbed, mob/living/carbon/human/H) playsound(H, "shatter", 70, TRUE) - H.visible_message("[H] shatters!") + H.visible_message(span_danger("[H] shatters!")) for(var/obj/item/W in H) H.dropItemToGround(W) for(var/i=1, i <= rand(3,5), i++) @@ -389,8 +389,8 @@ /datum/species/golem/glass/bullet_act(obj/projectile/P, mob/living/carbon/human/H) if(!(P.original == H && P.firer == H)) //self-shots don't reflect if(P.flag == "laser" || P.flag == "energy") - H.visible_message("The [P.name] gets reflected by [H]'s glass skin!", \ - "The [P.name] gets reflected by [H]'s glass skin!") + H.visible_message(span_danger("The [P.name] gets reflected by [H]'s glass skin!"), \ + span_danger("The [P.name] gets reflected by [H]'s glass skin!")) if(P.starting) var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2) var/new_y = P.starting.y + pick(0, 0, 0, 0, 0, -1, 1, -2, 2) @@ -417,7 +417,7 @@ var/last_teleport = 0 /datum/species/golem/bluespace/proc/reactive_teleport(mob/living/carbon/human/H) - H.visible_message("[H] teleports!", "I destabilize and teleport!") + H.visible_message(span_warning("[H] teleports!"), span_danger("I destabilize and teleport!")) new /obj/effect/particle_effect/sparks(get_turf(H)) playsound(get_turf(H), "sparks", 50, TRUE) do_teleport(H, get_turf(H), 6, asoundin = 'sound/blank.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) @@ -476,12 +476,12 @@ /datum/action/innate/unstable_teleport/Activate() var/mob/living/carbon/human/H = owner - H.visible_message("[H] starts vibrating!", "I start charging my bluespace core...") + H.visible_message(span_warning("[H] starts vibrating!"), span_danger("I start charging my bluespace core...")) playsound(get_turf(H), 'sound/blank.ogg', 25, TRUE) addtimer(CALLBACK(src, PROC_REF(teleport), H), 15) /datum/action/innate/unstable_teleport/proc/teleport(mob/living/carbon/human/H) - H.visible_message("[H] disappears in a shower of sparks!", "I teleport!") + H.visible_message(span_warning("[H] disappears in a shower of sparks!"), span_danger("I teleport!")) var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread spark_system.set_up(10, 0, src) spark_system.attach(H) @@ -676,11 +676,11 @@ if(gibbed) return if(H.on_fire) - H.visible_message("[H] burns into ash!") + H.visible_message(span_danger("[H] burns into ash!")) H.dust(just_ash = TRUE) return - H.visible_message("[H] falls apart into a pile of bandages!") + H.visible_message(span_danger("[H] falls apart into a pile of bandages!")) new /obj/structure/cloth_pile(get_turf(H), H) ..() @@ -702,7 +702,7 @@ H.unequip_everything() H.forceMove(src) cloth_golem = H - to_chat(cloth_golem, "I start gathering my life energy, preparing to rise again...") + to_chat(cloth_golem, span_notice("I start gathering my life energy, preparing to rise again...")) addtimer(CALLBACK(src, PROC_REF(revive)), revive_time) else return INITIALIZE_HINT_QDEL @@ -713,7 +713,7 @@ return ..() /obj/structure/cloth_pile/burn() - visible_message("[src] burns into ash!") + visible_message(span_danger("[src] burns into ash!")) new /obj/item/ash(get_turf(src)) ..() @@ -730,7 +730,7 @@ cloth_golem.grab_ghost() //won't pull if it's a suicide sleep(20) cloth_golem.forceMove(get_turf(src)) - cloth_golem.visible_message("[src] rises and reforms into [cloth_golem]!","I reform into yourself!") + cloth_golem.visible_message(span_danger("[src] rises and reforms into [cloth_golem]!"),span_danger("I reform into yourself!")) cloth_golem = null qdel(src) @@ -741,7 +741,7 @@ return if(P.get_temperature()) - visible_message("[src] bursts into flames!") + visible_message(span_danger("[src] bursts into flames!")) fire_act() /datum/species/golem/plastic @@ -804,27 +804,27 @@ if(M.stat == DEAD) //F return if(M == H) - H.show_message("I cringe with pain as my body rings around you!", MSG_AUDIBLE) + H.show_message(span_narsiesmall("I cringe with pain as my body rings around you!"), MSG_AUDIBLE) H.playsound_local(H, 'sound/blank.ogg', 100, TRUE) H.soundbang_act(2, 0, 100, 1) H.jitteriness += 7 var/distance = max(0,get_dist(get_turf(H),get_turf(M))) switch(distance) if(0 to 1) - M.show_message("GONG!", MSG_AUDIBLE) + M.show_message(span_narsiesmall("GONG!"), MSG_AUDIBLE) M.playsound_local(H, 'sound/blank.ogg', 100, TRUE) M.soundbang_act(1, 0, 30, 3) M.confused += 10 M.jitteriness += 4 SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "gonged", /datum/mood_event/loud_gong) if(2 to 3) - M.show_message("GONG!", MSG_AUDIBLE) + M.show_message(span_cult("GONG!"), MSG_AUDIBLE) M.playsound_local(H, 'sound/blank.ogg', 75, TRUE) M.soundbang_act(1, 0, 15, 2) M.jitteriness += 3 SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "gonged", /datum/mood_event/loud_gong) else - M.show_message("GONG!", MSG_AUDIBLE) + M.show_message(span_warning("GONG!"), MSG_AUDIBLE) M.playsound_local(H, 'sound/blank.ogg', 50, TRUE) @@ -860,16 +860,16 @@ if(last_creation + brother_creation_cooldown > world.time) //no cheesing dork return if(C.amount < 10) - to_chat(H, "I do not have enough cardboard!") + to_chat(H, span_warning("I do not have enough cardboard!")) return FALSE - to_chat(H, "I attempt to create a new cardboard brother.") + to_chat(H, span_notice("I attempt to create a new cardboard brother.")) if(do_after(user, 30, target = user)) if(last_creation + brother_creation_cooldown > world.time) //no cheesing dork return if(!C.use(10)) - to_chat(H, "I do not have enough cardboard!") + to_chat(H, span_warning("I do not have enough cardboard!")) return FALSE - to_chat(H, "I create a new cardboard golem shell.") + to_chat(H, span_notice("I create a new cardboard golem shell.")) create_brother(H.loc) /datum/species/golem/cardboard/proc/create_brother(location) @@ -936,7 +936,7 @@ if(chem.type == /datum/reagent/consumable/milk) if(chem.volume > 10) H.reagents.remove_reagent(chem.type, chem.volume - 10) - to_chat(H, "The excess milk is dripping off my bones!") + to_chat(H, span_warning("The excess milk is dripping off my bones!")) H.heal_bodypart_damage(1.5,0, 0) H.reagents.remove_reagent(chem.type, chem.metabolization_rate) return TRUE @@ -950,18 +950,18 @@ if(2) H.emote("me", 1, pick("oofs silently.", "looks like their bones hurt.", "grimaces, as though their bones hurt.")) if(3) - to_chat(H, "My bones hurt!") + to_chat(H, span_warning("My bones hurt!")) if(chem.overdosed) if(prob(4) && iscarbon(H)) //big oof var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly. var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood if(bp) playsound(H, get_sfx("desceration"), 50, TRUE, -1) //You just want to socialize - H.visible_message("[H] rattles loudly and flails around!!", "My bones hurt so much that my missing muscles spasm!!") + H.visible_message(span_warning("[H] rattles loudly and flails around!!"), span_danger("My bones hurt so much that my missing muscles spasm!!")) H.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice) bp.receive_damage(200, 0, 0) //But I don't think we should else - to_chat(H, "My missing arm aches from wherever you left it.") + to_chat(H, span_warning("My missing arm aches from wherever you left it.")) H.emote("sigh") H.reagents.remove_reagent(chem.type, chem.metabolization_rate) return TRUE @@ -978,9 +978,9 @@ /datum/action/innate/bonechill/Activate() if(world.time < last_use + cooldown) - to_chat("I aren't ready yet to rattle my bones again!") + to_chat(span_warning("I aren't ready yet to rattle my bones again!")) return - owner.visible_message("[owner] rattles [owner.p_their()] bones harrowingly.", "I rattle my bones") + owner.visible_message(span_warning("[owner] rattles [owner.p_their()] bones harrowingly."), span_notice("I rattle my bones")) last_use = world.time if(prob(snas_chance)) playsound(get_turf(owner),'sound/blank.ogg', 100) @@ -997,7 +997,7 @@ if((L.mob_biotypes & MOB_UNDEAD) || isgolem(L) || HAS_TRAIT(L, TRAIT_RESISTCOLD)) return //Do not affect our brothers - to_chat(L, "A spine-chilling sound chills you to the bone!") + to_chat(L, span_cultlarge("A spine-chilling sound chills you to the bone!")) L.apply_status_effect(/datum/status_effect/bonechill) SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "spooked", /datum/mood_event/spooked) @@ -1018,7 +1018,7 @@ var/obj/effect/proc_holder/spell/aimed/cryo/cryo /datum/species/golem/snow/spec_death(gibbed, mob/living/carbon/human/H) - H.visible_message("[H] turns into a pile of snow!") + H.visible_message(span_danger("[H] turns into a pile of snow!")) for(var/obj/item/W in H) H.dropItemToGround(W) for(var/i=1, i <= rand(3,5), i++) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 0df5dee61..34adf037e 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -37,7 +37,7 @@ if(!H.blood_volume) H.blood_volume += 5 H.adjustBruteLoss(5) - to_chat(H, "I feel empty!") + to_chat(H, span_danger("I feel empty!")) if(H.blood_volume < BLOOD_VOLUME_NORMAL) if(H.nutrition >= NUTRITION_LEVEL_STARVING) @@ -45,7 +45,7 @@ H.adjust_nutrition(-2.5) if(H.blood_volume < BLOOD_VOLUME_OKAY) if(prob(5)) - to_chat(H, "I feel drained!") + to_chat(H, span_danger("I feel drained!")) if(H.blood_volume < BLOOD_VOLUME_BAD) Cannibalize_Body(H) if(regenerate_limbs) @@ -61,7 +61,7 @@ limbs_to_consume -= list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM) consumed_limb = H.get_bodypart(pick(limbs_to_consume)) consumed_limb.drop_limb() - to_chat(H, "My [consumed_limb] is drawn back into my body, unable to maintain its shape!") + to_chat(H, span_danger("My [consumed_limb] is drawn back into my body, unable to maintain its shape!")) qdel(consumed_limb) H.blood_volume += 20 @@ -86,13 +86,13 @@ var/mob/living/carbon/human/H = owner var/list/limbs_to_heal = H.get_missing_limbs() if(limbs_to_heal.len < 1) - to_chat(H, "I feel intact enough as it is.") + to_chat(H, span_notice("I feel intact enough as it is.")) return - to_chat(H, "I focus intently on my missing [limbs_to_heal.len >= 2 ? "limbs" : "limb"]...") + to_chat(H, span_notice("I focus intently on my missing [limbs_to_heal.len >= 2 ? "limbs" : "limb"]...")) if(H.blood_volume >= 40*limbs_to_heal.len+BLOOD_VOLUME_OKAY) H.regenerate_limbs() H.blood_volume -= 40*limbs_to_heal.len - to_chat(H, "...and after a moment you finish reforming!") + to_chat(H, span_notice("...and after a moment you finish reforming!")) return else if(H.blood_volume >= 40)//We can partially heal some limbs while(H.blood_volume >= BLOOD_VOLUME_OKAY+40) @@ -100,9 +100,9 @@ H.regenerate_limb(healed_limb) limbs_to_heal -= healed_limb H.blood_volume -= 40 - to_chat(H, "...but there is not enough of you to fix everything! You must attain more mass to heal completely!") + to_chat(H, span_warning("...but there is not enough of you to fix everything! You must attain more mass to heal completely!")) return - to_chat(H, "...but there is not enough of you to go around! You must attain more mass to heal!") + to_chat(H, span_warning("...but there is not enough of you to go around! You must attain more mass to heal!")) ////////////////////////////////////////////////////////SLIMEPEOPLE/////////////////////////////////////////////////////////////////// @@ -166,7 +166,7 @@ /datum/species/jelly/slime/spec_life(mob/living/carbon/human/H) if(H.blood_volume >= BLOOD_VOLUME_SLIME_SPLIT) if(prob(5)) - to_chat(H, "I feel very bloated!") + to_chat(H, span_notice("I feel very bloated!")) else if(H.nutrition >= NUTRITION_LEVEL_WELL_FED) H.blood_volume += 3 H.adjust_nutrition(-2.5) @@ -203,9 +203,9 @@ if(H.blood_volume >= BLOOD_VOLUME_SLIME_SPLIT) make_dupe() else - to_chat(H, "...but there is not enough of you to go around! You must attain more mass to split!") + to_chat(H, span_warning("...but there is not enough of you to go around! You must attain more mass to split!")) else - to_chat(H, "...but fail to stand perfectly still!") + to_chat(H, span_warning("...but fail to stand perfectly still!")) H.notransform = FALSE @@ -258,7 +258,7 @@ /datum/action/innate/swap_body/Activate() if(!isslimeperson(owner)) - to_chat(owner, "I are not a slimeperson.") + to_chat(owner, span_warning("I are not a slimeperson.")) Remove(owner) else ui_interact(owner) @@ -378,14 +378,14 @@ if(M.current.stat == CONSCIOUS) M.current.visible_message("[M.current] \ stops moving and starts staring vacantly into space.", - "I stop moving this body...") + span_notice("I stop moving this body...")) else - to_chat(M.current, "I abandon this body...") + to_chat(M.current, span_notice("I abandon this body...")) M.current.transfer_trait_datums(dupe) M.transfer_to(dupe) dupe.visible_message("[dupe] blinks and looks \ around.", - "...and move this one instead.") + span_notice("...and move this one instead.")) ///////////////////////////////////LUMINESCENTS////////////////////////////////////////// @@ -495,23 +495,23 @@ if(!H.put_in_active_hand(S)) S.forceMove(H.drop_location()) species.current_extract = null - to_chat(H, "I eject [S].") + to_chat(H, span_notice("I eject [S].")) species.update_slime_actions() else var/obj/item/I = H.get_active_held_item() if(istype(I, /obj/item/slime_extract)) var/obj/item/slime_extract/S = I if(!S.Uses) - to_chat(H, "[I] is spent! You cannot integrate it.") + to_chat(H, span_warning("[I] is spent! You cannot integrate it.")) return if(!H.temporarilyRemoveItemFromInventory(S)) return S.forceMove(H) species.current_extract = S - to_chat(H, "I consume [I], and you feel it pulse within you...") + to_chat(H, span_notice("I consume [I], and you feel it pulse within you...")) species.update_slime_actions() else - to_chat(H, "I need to hold an unused slime extract in my active hand!") + to_chat(H, span_warning("I need to hold an unused slime extract in my active hand!")) /datum/action/innate/use_extract name = "Extract Minor Activation" @@ -602,7 +602,7 @@ if(M in linked_mobs) return FALSE linked_mobs.Add(M) - to_chat(M, "I are now connected to [slimelink_owner.real_name]'s Slime Link.") + to_chat(M, span_notice("I are now connected to [slimelink_owner.real_name]'s Slime Link.")) var/datum/action/innate/linked_speech/action = new(src) linked_actions.Add(action) action.Grant(M) @@ -614,7 +614,7 @@ return var/datum/action/innate/linked_speech/action = linked_actions[link_id] action.Remove(M) - to_chat(M, "I are no longer connected to [slimelink_owner.real_name]'s Slime Link.") + to_chat(M, span_notice("I are no longer connected to [slimelink_owner.real_name]'s Slime Link.")) linked_mobs[link_id] = null linked_actions[link_id] = null @@ -633,14 +633,14 @@ /datum/action/innate/linked_speech/Activate() var/mob/living/carbon/human/H = owner if(!species || !(H in species.linked_mobs)) - to_chat(H, "The link seems to have been severed...") + to_chat(H, span_warning("The link seems to have been severed...")) Remove(H) return var/message = sanitize(input("Message:", "Slime Telepathy") as text|null) if(!species || !(H in species.linked_mobs)) - to_chat(H, "The link seems to have been severed...") + to_chat(H, span_warning("The link seems to have been severed...")) Remove(H) return @@ -685,16 +685,16 @@ if(!M) return if(M.anti_magic_check(FALSE, FALSE, TRUE, 0)) - to_chat(H, "As you try to communicate with [M], you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled.") + to_chat(H, span_notice("As you try to communicate with [M], you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled.")) return var/msg = sanitize(input("Message:", "Telepathy") as text|null) if(msg) if(M.anti_magic_check(FALSE, FALSE, TRUE, 0)) - to_chat(H, "As you try to communicate with [M], you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled.") + to_chat(H, span_notice("As you try to communicate with [M], you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled.")) return log_directed_talk(H, M, msg, LOG_SAY, "slime telepathy") to_chat(M, "I hear an alien voice in my head... [msg]") - to_chat(H, "I telepathically said: \"[msg]\" to [M]") + to_chat(H, span_notice("I telepathically said: \"[msg]\" to [M]")) for(var/dead in GLOB.dead_mob_list) if(!isobserver(dead)) continue @@ -721,18 +721,18 @@ CHECK_DNA_AND_SPECIES(H) if(!H.pulling || !isliving(H.pulling) || H.grab_state < GRAB_AGGRESSIVE) - to_chat(H, "I need to aggressively grab someone to link minds!") + to_chat(H, span_warning("I need to aggressively grab someone to link minds!")) return var/mob/living/target = H.pulling - to_chat(H, "I begin linking [target]'s mind to yours...") - to_chat(target, "I feel a foreign presence within my mind...") + to_chat(H, span_notice("I begin linking [target]'s mind to yours...")) + to_chat(target, span_warning("I feel a foreign presence within my mind...")) if(do_after(H, 60, target = target)) if(H.pulling != target || H.grab_state < GRAB_AGGRESSIVE) return if(species.link_mob(target)) - to_chat(H, "I connect [target]'s mind to my slime link!") + to_chat(H, span_notice("I connect [target]'s mind to my slime link!")) else - to_chat(H, "I can't seem to link [target]'s mind...") - to_chat(target, "The foreign presence leaves my mind.") + to_chat(H, span_warning("I can't seem to link [target]'s mind...")) + to_chat(target, span_warning("The foreign presence leaves my mind.")) diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 6bbb29049..7c18e3129 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -39,7 +39,7 @@ if(.) //if the mob is immune to fire, don't burn wings off. return if(H.dna.features["moth_wings"] != "Burnt Off" && H.bodytemperature >= 800 && H.fire_stacks > 0) //do not go into the extremely hot light. you will not survive - to_chat(H, "My precious wings burn to a crisp!") + to_chat(H, span_danger("My precious wings burn to a crisp!")) H.dna.features["moth_wings"] = "Burnt Off" handle_mutant_bodyparts(H) diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 859dd2bed..511bbeef0 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -36,7 +36,7 @@ if(environment.gases[/datum/gas/oxygen] && (environment.gases[/datum/gas/oxygen][MOLES]) >= 1) //Same threshhold that extinguishes fire H.adjust_fire_stacks(0.5) if(!H.on_fire && H.fire_stacks > 0) - H.visible_message("[H]'s body reacts with the atmosphere and bursts into flames!","My body reacts with the atmosphere and bursts into flame!") + H.visible_message(span_danger("[H]'s body reacts with the atmosphere and bursts into flames!"),span_danger("My body reacts with the atmosphere and bursts into flame!")) H.IgniteMob() internal_fire = TRUE else @@ -142,7 +142,7 @@ if(chem.type == /datum/reagent/consumable/milk) if(chem.volume > 10) H.reagents.remove_reagent(chem.type, chem.volume - 10) - to_chat(H, "The excess milk is dripping off my bones!") + to_chat(H, span_warning("The excess milk is dripping off my bones!")) H.heal_bodypart_damage(1.5,0, 0) H.reagents.remove_reagent(chem.type, chem.metabolization_rate) return TRUE @@ -156,18 +156,18 @@ if(2) H.emote("me", 1, pick("oofs silently.", "looks like their bones hurt.", "grimaces, as though their bones hurt.")) if(3) - to_chat(H, "My bones hurt!") + to_chat(H, span_warning("My bones hurt!")) if(chem.overdosed) if(prob(4) && iscarbon(H)) //big oof var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly. var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood if(bp) playsound(H, get_sfx("desceration"), 50, TRUE, -1) //You just want to socialize - H.visible_message("[H] rattles loudly and flails around!!", "My bones hurt so much that my missing muscles spasm!!") + H.visible_message(span_warning("[H] rattles loudly and flails around!!"), span_danger("My bones hurt so much that my missing muscles spasm!!")) H.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice) bp.receive_damage(200, 0, 0) //But I don't think we should else - to_chat(H, "My missing arm aches from wherever you left it.") + to_chat(H, span_warning("My missing arm aches from wherever you left it.")) H.emote("sigh") H.reagents.remove_reagent(chem.type, chem.metabolization_rate) return TRUE diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 4da248485..0bb3b43e3 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -46,7 +46,7 @@ if(prob(15)) H.rad_act(rand(30,80)) H.Paralyze(100) - H.visible_message("[H] writhes in pain as [H.p_their()] vacuoles boil.", "I writhe in pain as your vacuoles boil!", "I hear the crunching of leaves.") + H.visible_message(span_warning("[H] writhes in pain as [H.p_their()] vacuoles boil."), span_danger("I writhe in pain as your vacuoles boil!"), span_hear("I hear the crunching of leaves.")) if(prob(80)) H.easy_randmut(NEGATIVE+MINOR_NEGATIVE) else @@ -55,6 +55,6 @@ H.domutcheck() else H.adjustFireLoss(rand(5,15)) - H.show_message("The radiation beam singes you!") + H.show_message(span_danger("The radiation beam singes you!")) if(/obj/projectile/energy/florayield) H.set_nutrition(min(H.nutrition+30, NUTRITION_LEVEL_FULL)) diff --git a/code/modules/mob/living/carbon/human/species_types/roguetown/dwarf/_dwarf.dm b/code/modules/mob/living/carbon/human/species_types/roguetown/dwarf/_dwarf.dm index c385eb09c..4fec8289f 100644 --- a/code/modules/mob/living/carbon/human/species_types/roguetown/dwarf/_dwarf.dm +++ b/code/modules/mob/living/carbon/human/species_types/roguetown/dwarf/_dwarf.dm @@ -36,7 +36,7 @@ ..() // if(!C.has_language(/datum/language/dwarvish)) C.grant_language(/datum/language/dwarvish) - to_chat(C, "I can speak Dwarfish with ,d before my speech.") + to_chat(C, span_info("I can speak Dwarfish with ,d before my speech.")) /datum/species/dwarf/on_species_loss(mob/living/carbon/C) . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/roguetown/elf/_elf.dm b/code/modules/mob/living/carbon/human/species_types/roguetown/elf/_elf.dm index ac795c983..23fd94bf0 100644 --- a/code/modules/mob/living/carbon/human/species_types/roguetown/elf/_elf.dm +++ b/code/modules/mob/living/carbon/human/species_types/roguetown/elf/_elf.dm @@ -41,7 +41,7 @@ ..() // if(!C.has_language(/datum/language/elvish)) C.grant_language(/datum/language/elvish) - to_chat(C, "I can speak Elfish with ,e before my speech.") + to_chat(C, span_info("I can speak Elfish with ,e before my speech.")) /datum/species/elf/on_species_loss(mob/living/carbon/C) . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/roguetown/other/aasimar.dm b/code/modules/mob/living/carbon/human/species_types/roguetown/other/aasimar.dm index 3022dd9b4..be289936a 100644 --- a/code/modules/mob/living/carbon/human/species_types/roguetown/other/aasimar.dm +++ b/code/modules/mob/living/carbon/human/species_types/roguetown/other/aasimar.dm @@ -78,7 +78,7 @@ /datum/species/aasimar/after_creation(mob/living/carbon/C) ..() C.grant_language(/datum/language/celestial) - to_chat(C, "I can speak Celestial with ,c before my speech.") + to_chat(C, span_info("I can speak Celestial with ,c before my speech.")) /datum/species/aasimar/on_species_loss(mob/living/carbon/C) . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/roguetown/other/halforc.dm b/code/modules/mob/living/carbon/human/species_types/roguetown/other/halforc.dm index a4bf2735d..a4fd9b2e1 100644 --- a/code/modules/mob/living/carbon/human/species_types/roguetown/other/halforc.dm +++ b/code/modules/mob/living/carbon/human/species_types/roguetown/other/halforc.dm @@ -78,7 +78,7 @@ /datum/species/halforc/after_creation(mob/living/carbon/C) ..() C.grant_language(/datum/language/orcish) - to_chat(C, "I can speak Orcish with ,o before my speech.") + to_chat(C, span_info("I can speak Orcish with ,o before my speech.")) /datum/species/halforc/on_species_loss(mob/living/carbon/C) . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/roguetown/other/tiefling.dm b/code/modules/mob/living/carbon/human/species_types/roguetown/other/tiefling.dm index f446251a3..ee8ff52d2 100644 --- a/code/modules/mob/living/carbon/human/species_types/roguetown/other/tiefling.dm +++ b/code/modules/mob/living/carbon/human/species_types/roguetown/other/tiefling.dm @@ -84,7 +84,7 @@ ..() // if(!C.has_language(/datum/language/sandspeak)) C.grant_language(/datum/language/hellspeak) - to_chat(C, "I can speak Infernal with ,h before my speech.") + to_chat(C, span_info("I can speak Infernal with ,h before my speech.")) /datum/species/tieberian/on_species_loss(mob/living/carbon/C) . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index b03855b01..2ab9bcae3 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -55,7 +55,7 @@ if(istype(T)) var/light_amount = T.get_lumcount() if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) - H.visible_message("[H] dances in the shadows, evading [P]!") + H.visible_message(span_danger("[H] dances in the shadows, evading [P]!")) playsound(T, "bullet_miss", 75, TRUE) return BULLET_ACT_FORCE_PIERCE return ..() @@ -75,7 +75,7 @@ ..() if(M.dna.species.id != "nightmare") M.set_species(/datum/species/shadow/nightmare) - visible_message("[M] thrashes as [src] takes root in [M.p_their()] body!") + visible_message(span_warning("[M] thrashes as [src] takes root in [M.p_their()] body!")) var/obj/effect/proc_holder/spell/targeted/shadowwalk/SW = new M.AddSpell(SW) shadowwalk = SW @@ -101,13 +101,13 @@ /obj/item/organ/heart/nightmare/attack(mob/M, mob/living/carbon/user, obj/target) if(M != user) return ..() - user.visible_message("[user] raises [src] to [user.p_their()] mouth and tears into it with [user.p_their()] teeth!", \ - "[src] feels unnaturally cold in my hands. You raise [src] my mouth and devour it!") + user.visible_message(span_warning("[user] raises [src] to [user.p_their()] mouth and tears into it with [user.p_their()] teeth!"), \ + span_danger("[src] feels unnaturally cold in my hands. You raise [src] my mouth and devour it!")) playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("Blood erupts from [user]'s arm as it reforms into a weapon!", \ - "Icy blood pumps through my veins as my arm reforms itself!") + user.visible_message(span_warning("Blood erupts from [user]'s arm as it reforms into a weapon!"), \ + span_danger("Icy blood pumps through my veins as my arm reforms itself!")) user.temporarilyRemoveItemFromInventory(src, TRUE) Insert(user) @@ -120,7 +120,7 @@ /obj/item/organ/heart/nightmare/Remove(mob/living/carbon/M, special = 0) respawn_progress = 0 if(blade && special != HEART_SPECIAL_SHADOWIFY) - M.visible_message("\The [blade] disintegrates!") + M.visible_message(span_warning("\The [blade] disintegrates!")) QDEL_NULL(blade) ..() @@ -146,9 +146,9 @@ Remove(owner, HEART_SPECIAL_SHADOWIFY) old_owner.set_species(/datum/species/shadow) Insert(old_owner, HEART_SPECIAL_SHADOWIFY) - to_chat(owner, "I feel the shadows invade my skin, leaping into the center of my chest! You're alive!") + to_chat(owner, span_danger("I feel the shadows invade my skin, leaping into the center of my chest! You're alive!")) SEND_SOUND(owner, sound('sound/blank.ogg')) - owner.visible_message("[owner] staggers to [owner.p_their()] feet!") + owner.visible_message(span_warning("[owner] staggers to [owner.p_their()] feet!")) playsound(owner, 'sound/blank.ogg', 50, TRUE) respawn_progress = 0 @@ -187,7 +187,7 @@ var/mob/living/silicon/robot/borg = AM if(!borg.lamp_cooldown) borg.update_headlamp(TRUE, INFINITY) - to_chat(borg, "My headlamp is fried! You'll need a human to help replace it.") + to_chat(borg, span_danger("My headlamp is fried! You'll need a human to help replace it.")) else for(var/obj/item/O in AM) if(O.light_range && O.light_power) @@ -206,9 +206,9 @@ PDA.fon = FALSE PDA.f_lum = 0 PDA.update_icon() - visible_message("The light in [PDA] shorts out!") + visible_message(span_danger("The light in [PDA] shorts out!")) else - visible_message("[O] is disintegrated by [src]!") + visible_message(span_danger("[O] is disintegrated by [src]!")) O.burn() playsound(src, 'sound/blank.ogg', 50, TRUE) diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index a834681d9..3b4b993af 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -27,7 +27,7 @@ if(chem.type == /datum/reagent/consumable/milk) if(chem.volume > 10) H.reagents.remove_reagent(chem.type, chem.volume - 10) - to_chat(H, "The excess milk is dripping off my bones!") + to_chat(H, span_warning("The excess milk is dripping off my bones!")) H.heal_bodypart_damage(1,1, 0) H.reagents.remove_reagent(chem.type, chem.metabolization_rate) return TRUE @@ -41,18 +41,18 @@ if(2) H.emote("me", 1, pick("oofs silently.", "looks like their bones hurt.", "grimaces, as though their bones hurt.")) if(3) - to_chat(H, "My bones hurt!") + to_chat(H, span_warning("My bones hurt!")) if(chem.overdosed) if(prob(4) && iscarbon(H)) //big oof var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly. var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood if(bp) playsound(H, get_sfx("desceration"), 50, TRUE, -1) //You just want to socialize - H.visible_message("[H] rattles loudly and flails around!!", "My bones hurt so much that my missing muscles spasm!!") + H.visible_message(span_warning("[H] rattles loudly and flails around!!"), span_danger("My bones hurt so much that my missing muscles spasm!!")) H.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice) bp.receive_damage(200, 0, 0) //But I don't think we should else - to_chat(H, "My missing arm aches from wherever you left it.") + to_chat(H, span_warning("My missing arm aches from wherever you left it.")) H.emote("sigh") H.reagents.remove_reagent(chem.type, chem.metabolization_rate) return TRUE diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index b0563bd24..4f6f95eef 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -46,14 +46,14 @@ return C.blood_volume -= 0.25 if(C.blood_volume <= BLOOD_VOLUME_SURVIVE) - to_chat(C, "I ran out of blood!") + to_chat(C, span_danger("I ran out of blood!")) var/obj/shapeshift_holder/H = locate() in C if(H) H.shape.dust() //make sure we're killing the bat if you are out of blood, if you don't it creates weird situations where the bat is alive but the caster is dusted. C.dust() var/area/A = get_area(C) if(istype(A, /area/chapel)) - to_chat(C, "I don't belong here!") + to_chat(C, span_warning("I don't belong here!")) C.adjustFireLoss(20) C.adjust_fire_stacks(6) C.IgniteMob() @@ -81,39 +81,39 @@ var/mob/living/carbon/H = owner var/obj/item/organ/tongue/vampire/V = target if(V.drain_cooldown >= world.time) - to_chat(H, "I just drained blood, wait a few seconds!") + to_chat(H, span_warning("I just drained blood, wait a few seconds!")) return if(H.pulling && iscarbon(H.pulling)) var/mob/living/carbon/victim = H.pulling if(H.blood_volume >= BLOOD_VOLUME_NORMAL) - to_chat(H, "You're already full!") + to_chat(H, span_warning("You're already full!")) return if(victim.stat == DEAD) - to_chat(H, "I need a living victim!") + to_chat(H, span_warning("I need a living victim!")) return if(!victim.blood_volume || (victim.dna && ((NOBLOOD in victim.dna.species.species_traits) || victim.dna.species.exotic_blood))) - to_chat(H, "[victim] doesn't have blood!") + to_chat(H, span_warning("[victim] doesn't have blood!")) return V.drain_cooldown = world.time + 30 if(victim.anti_magic_check(FALSE, TRUE, FALSE, 0)) - to_chat(victim, "[H] tries to bite you, but stops before touching you!") - to_chat(H, "[victim] is blessed! You stop just in time to avoid catching fire.") + to_chat(victim, span_warning("[H] tries to bite you, but stops before touching you!")) + to_chat(H, span_warning("[victim] is blessed! You stop just in time to avoid catching fire.")) return if(victim?.reagents?.has_reagent(/datum/reagent/consumable/garlic)) - to_chat(victim, "[H] tries to bite you, but recoils in disgust!") - to_chat(H, "[victim] reeks of garlic! you can't bring myself to drain such tainted blood.") + to_chat(victim, span_warning("[H] tries to bite you, but recoils in disgust!")) + to_chat(H, span_warning("[victim] reeks of garlic! you can't bring myself to drain such tainted blood.")) return if(!do_after(H, 30, target = victim)) return var/blood_volume_difference = BLOOD_VOLUME_MAXIMUM - H.blood_volume //How much capacity we have left to absorb blood var/drained_blood = min(victim.blood_volume, VAMP_DRAIN_AMOUNT, blood_volume_difference) - to_chat(victim, "[H] is draining your blood!") - to_chat(H, "I drain some blood!") + to_chat(victim, span_danger("[H] is draining your blood!")) + to_chat(H, span_notice("I drain some blood!")) playsound(H, 'sound/blank.ogg', 30, TRUE, -2) victim.blood_volume = CLAMP(victim.blood_volume - drained_blood, 0, BLOOD_VOLUME_MAXIMUM) H.blood_volume = CLAMP(H.blood_volume + drained_blood, 0, BLOOD_VOLUME_MAXIMUM) if(!victim.blood_volume) - to_chat(H, "I finish off [victim]'s blood supply.") + to_chat(H, span_notice("I finish off [victim]'s blood supply.")) #undef VAMP_DRAIN_AMOUNT @@ -124,7 +124,7 @@ if(statpanel("Status")) //RTCHANGE var/obj/item/organ/heart/vampire/darkheart = getorgan(/obj/item/organ/heart/vampire) if(darkheart) - stat(null, "Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM].") + stat(null, span_notice("Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM].")) return 1 diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index fc5ce4bf7..e6aba84ea 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -62,7 +62,7 @@ if(buckled?.sleepy) if(eyesclosed) if(!fallingas) - to_chat(src, "I'll fall asleep soon...") + to_chat(src, span_warning("I'll fall asleep soon...")) fallingas++ if(fallingas > 15) Sleeping(300) @@ -72,7 +72,7 @@ else if(!(mobility_flags & MOBILITY_STAND)) if(eyesclosed) if(!fallingas) - to_chat(src, "I'll fall asleep soon, although a bed would be more comfortable...") + to_chat(src, span_warning("I'll fall asleep soon, although a bed would be more comfortable...")) fallingas++ if(fallingas > 25) Sleeping(300) @@ -419,22 +419,22 @@ // At lower pp, give out a little warning SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "smell") if(prob(5)) - to_chat(src, "There is an unpleasant smell in the air.") + to_chat(src, span_notice("There is an unpleasant smell in the air.")) if(5 to 20) //At somewhat higher pp, warning becomes more obvious if(prob(15)) - to_chat(src, "I smell something horribly decayed inside this room.") + to_chat(src, span_warning("I smell something horribly decayed inside this room.")) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/bad_smell) if(15 to 30) //Small chance to vomit. By now, people have internals on anyway if(prob(5)) - to_chat(src, "The stench of rotting carcasses is unbearable!") + to_chat(src, span_warning("The stench of rotting carcasses is unbearable!")) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/nauseating_stench) vomit() if(30 to INFINITY) //Higher chance to vomit. Let the horror start if(prob(25)) - to_chat(src, "The stench of rotting carcasses is unbearable!") + to_chat(src, span_warning("The stench of rotting carcasses is unbearable!")) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/nauseating_stench) vomit() else @@ -555,12 +555,12 @@ if(prob(embedded.embedding.embedded_pain_chance)) bodypart.receive_damage(embedded.w_class*embedded.embedding.embedded_pain_multiplier) - to_chat(src, "[embedded] in my [bodypart.name] hurts!") + to_chat(src, span_danger("[embedded] in my [bodypart.name] hurts!")) if(prob(embedded.embedding.embedded_fall_chance)) bodypart.receive_damage(embedded.w_class*embedded.embedding.embedded_fall_pain_multiplier) bodypart.remove_embedded_object(embedded) - to_chat(src,"[embedded] falls out of my [bodypart.name]!") + to_chat(src,span_danger("[embedded] falls out of my [bodypart.name]!")) /* Alcohol Poisoning Chart @@ -726,13 +726,13 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put if(drunkenness >= 81) adjustToxLoss(3) if(prob(5) && !stat) - to_chat(src, "Maybe I should lie down for a bit...") + to_chat(src, span_warning("Maybe I should lie down for a bit...")) if(drunkenness >= 91) adjustToxLoss(5) // adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.4) if(prob(20) && !stat) - to_chat(src, "Just a quick nap...") + to_chat(src, span_warning("Just a quick nap...")) Sleeping(900) if(drunkenness >= 101) @@ -775,7 +775,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put return adjustToxLoss(4, TRUE, TRUE) // if(prob(30)) -// to_chat(src, "I feel a stabbing pain in your abdomen!") +// to_chat(src, span_warning("I feel a stabbing pain in your abdomen!")) ///////////// //CREMATION// @@ -811,11 +811,11 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put limb.skeletonize() should_update_body = TRUE // limb.drop_limb() -// limb.visible_message("[src]'s [limb.name] crumbles into ash!") +// limb.visible_message(span_warning("[src]'s [limb.name] crumbles into ash!")) // qdel(limb) // else // limb.drop_limb() -// limb.visible_message("[src]'s [limb.name] detaches from [p_their()] body!") +// limb.visible_message(span_warning("[src]'s [limb.name] detaches from [p_their()] body!")) if(still_has_limbs) return @@ -829,11 +829,11 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put limb.skeletonize() should_update_body = TRUE // head.drop_limb() -// head.visible_message("[src]'s head crumbles into ash!") +// head.visible_message(span_warning("[src]'s head crumbles into ash!")) // qdel(head) // else // head.drop_limb() -// head.visible_message("[src]'s head detaches from [p_their()] body!") +// head.visible_message(span_warning("[src]'s head detaches from [p_their()] body!")) return //Nothing left: dust the body, drop the items (if they're flammable they'll burn on their own) @@ -841,7 +841,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put if(chest.get_damage() >= chest.max_damage) chest.cremation_progress += 999 if(chest.cremation_progress >= 19) - // visible_message("[src]'s body crumbles into a pile of ash!") + // visible_message(span_warning("[src]'s body crumbles into a pile of ash!")) // dust(TRUE, TRUE) chest.skeletonized = TRUE if(ishuman(src)) diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm index 2fdcd56d1..3cdf16381 100644 --- a/code/modules/mob/living/carbon/monkey/combat.dm +++ b/code/modules/mob/living/carbon/monkey/combat.dm @@ -151,7 +151,7 @@ var/mob/M = pickupTarget.loc if(!pickpocketing) pickpocketing = TRUE - M.visible_message("[src] starts trying to take [pickupTarget] from [M]!", "[src] tries to take [pickupTarget]!") + M.visible_message(span_warning("[src] starts trying to take [pickupTarget] from [M]!"), span_danger("[src] tries to take [pickupTarget]!")) INVOKE_ASYNC(src, PROC_REF(pickpocket), M) return TRUE @@ -307,12 +307,12 @@ if(do_mob(src, M, MONKEY_ITEM_SNATCH_DELAY) && pickupTarget) for(var/obj/item/I in M.held_items) if(I == pickupTarget) - M.visible_message("[src] snatches [pickupTarget] from [M].", "[src] snatched [pickupTarget]!") + M.visible_message(span_danger("[src] snatches [pickupTarget] from [M]."), span_danger("[src] snatched [pickupTarget]!")) if(M.temporarilyRemoveItemFromInventory(pickupTarget)) if(!QDELETED(pickupTarget) && !equip_item(pickupTarget)) pickupTarget.forceMove(drop_location()) else - M.visible_message("[src] tried to snatch [pickupTarget] from [M], but failed!", "[src] tried to grab [pickupTarget]!") + M.visible_message(span_danger("[src] tried to snatch [pickupTarget] from [M], but failed!"), span_danger("[src] tried to grab [pickupTarget]!")) pickpocketing = FALSE pickupTarget = null pickupTimer = 0 diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index a5a8547ae..1487481c2 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -34,10 +34,10 @@ if(!IsParalyzed()) emote("collapse") Paralyze(RAD_MOB_KNOCKDOWN_AMOUNT) - to_chat(src, "I feel weak.") + to_chat(src, span_danger("I feel weak.")) if(radiation > RAD_MOB_MUTATE) if(prob(1)) - to_chat(src, "I mutate!") + to_chat(src, span_danger("I mutate!")) easy_randmut(NEGATIVE+MINOR_NEGATIVE) emote("gasp") domutcheck() diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 0e3d7b6c4..af3c8fb9c 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -34,7 +34,7 @@ var/cap = CONFIG_GET(number/monkeycap) if (LAZYLEN(SSmobs.cubemonkeys) > cap) if (spawner) - to_chat(spawner, "Bluespace harmonics prevent the spawning of more than [cap] monkeys on the station at one time!") + to_chat(spawner, span_warning("Bluespace harmonics prevent the spawning of more than [cap] monkeys on the station at one time!")) return INITIALIZE_HINT_QDEL SSmobs.cubemonkeys += src @@ -111,7 +111,7 @@ /mob/living/carbon/monkey/can_use_guns(obj/item/G) if(G.trigger_guard == TRIGGER_GUARD_NONE) - to_chat(src, "I are unable to fire this!") + to_chat(src, span_warning("I are unable to fire this!")) return FALSE return TRUE diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm index 347cb7633..2e42e7030 100644 --- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm +++ b/code/modules/mob/living/carbon/monkey/monkey_defense.dm @@ -39,9 +39,9 @@ if(INTENT_HARM) M.do_attack_animation(src, ATTACK_EFFECT_PUNCH) if (prob(75)) - visible_message("[M] punches [name]!", \ - "[M] punches you!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I punch [name]!") + visible_message(span_danger("[M] punches [name]!"), \ + span_danger("[M] punches you!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I punch [name]!")) playsound(loc, "punch", 25, TRUE, -1) var/damage = rand(5, 10) @@ -49,9 +49,9 @@ damage = rand(10, 15) if(AmountUnconscious() < 100 && health > 0) Unconscious(rand(200, 300)) - visible_message("[M] knocks [name] out!", \ - "[M] knocks you out!", "I hear a sickening sound of flesh hitting flesh!", 5, M) - to_chat(M, "I knock [name] out!") + visible_message(span_danger("[M] knocks [name] out!"), \ + span_danger("[M] knocks you out!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), 5, M) + to_chat(M, span_danger("I knock [name] out!")) var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) if(!affecting) affecting = get_bodypart(BODY_ZONE_CHEST) @@ -60,9 +60,9 @@ else playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M]'s punch misses [name]!", \ - "I avoid [M]'s punch!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "My punch misses [name]!") + visible_message(span_danger("[M]'s punch misses [name]!"), \ + span_danger("I avoid [M]'s punch!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_warning("My punch misses [name]!")) if(INTENT_DISARM) if(!IsUnconscious()) M.do_attack_animation(src, ATTACK_EFFECT_DISARM) @@ -70,14 +70,14 @@ Paralyze(40) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) log_combat(M, src, "pushed") - visible_message("[M] pushes [src] down!", \ - "[M] pushes you down!", "I hear aggressive shuffling followed by a loud thud!", null, M) - to_chat(M, "I push [src] down!") + visible_message(span_danger("[M] pushes [src] down!"), \ + span_danger("[M] pushes you down!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), null, M) + to_chat(M, span_danger("I push [src] down!")) else if(dropItemToGround(get_active_held_item())) playsound(src, 'sound/blank.ogg', 50, TRUE, -1) - visible_message("[M] disarms [src]!", \ - "[M] disarms you!", "I hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I disarm [src]!") + visible_message(span_danger("[M] disarms [src]!"), \ + span_danger("[M] disarms you!"), span_hear("I hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I disarm [src]!")) /mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent. @@ -89,13 +89,13 @@ damage = rand(20, 40) if(AmountUnconscious() < 300) Unconscious(rand(200, 300)) - visible_message("[M] wounds [name]!", \ - "[M] wounds you!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I wound [name]!") + visible_message(span_danger("[M] wounds [name]!"), \ + span_danger("[M] wounds you!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I wound [name]!")) else - visible_message("[M] slashes [name]!", \ - "[M] slashes you!", "I hear a sickening sound of a slice!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I slash [name]!") + visible_message(span_danger("[M] slashes [name]!"), \ + span_danger("[M] slashes you!"), span_hear("I hear a sickening sound of a slice!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I slash [name]!")) var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) log_combat(M, src, "attacked") @@ -107,24 +107,24 @@ else playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M]'s lunge misses [name]!", \ - "I avoid [M]'s lunge!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "My lunge misses [name]!") + visible_message(span_danger("[M]'s lunge misses [name]!"), \ + span_danger("I avoid [M]'s lunge!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_warning("My lunge misses [name]!")) if (M.used_intent.type == INTENT_DISARM) var/obj/item/I = null playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) if(prob(95)) Paralyze(20) - visible_message("[M] tackles [name] down!", \ - "[M] tackles you down!", "I hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I tackle [name] down!") + visible_message(span_danger("[M] tackles [name] down!"), \ + span_danger("[M] tackles you down!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I tackle [name] down!")) else I = get_active_held_item() if(dropItemToGround(I)) - visible_message("[M] disarms [name]!", \ - "[M] disarms you!", "I hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I disarm [name]!") + visible_message(span_danger("[M] disarms [name]!"), \ + span_danger("[M] disarms you!"), span_hear("I hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I disarm [name]!")) else I = null log_combat(M, src, "disarmed", "[I ? " removing \the [I]" : ""]") @@ -163,13 +163,13 @@ if(!(wear_mask.resistance_flags & UNACIDABLE)) wear_mask.acid_act(acidpwr, acid_volume) else - to_chat(src, "My mask protects you from the acid.") + to_chat(src, span_warning("My mask protects you from the acid.")) return if(head) if(!(head.resistance_flags & UNACIDABLE)) head.acid_act(acidpwr, acid_volume) else - to_chat(src, "My hat protects you from the acid.") + to_chat(src, span_warning("My hat protects you from the acid.")) return take_bodypart_damage(acidpwr * min(0.6, acid_volume*0.1)) diff --git a/code/modules/mob/living/carbon/rogfatstam.dm b/code/modules/mob/living/carbon/rogfatstam.dm index ab52e934c..4388bc862 100644 --- a/code/modules/mob/living/carbon/rogfatstam.dm +++ b/code/modules/mob/living/carbon/rogfatstam.dm @@ -105,7 +105,7 @@ shake_camera(src, 1, 3) blur_eyes(10) var/stuffy = list("ZIZO GRABS MY WEARY HEART!","ARGH! MY HEART BEATS NO MORE!","NO... MY HEART HAS BEAT IT'S LAST!","MY HEART HAS GIVEN UP!","MY HEART BETRAYS ME!","THE METRONOME OF MY LIFE STILLS!") - to_chat(src, "[pick(stuffy)]") + to_chat(src, span_userdanger("[pick(stuffy)]")) emote("breathgasp", forced = TRUE) addtimer(CALLBACK(src, PROC_REF(adjustOxyLoss), 110), 30) diff --git a/code/modules/mob/living/carbon/spirit/spirit.dm b/code/modules/mob/living/carbon/spirit/spirit.dm index 7fca4ff6d..58cb9743a 100644 --- a/code/modules/mob/living/carbon/spirit/spirit.dm +++ b/code/modules/mob/living/carbon/spirit/spirit.dm @@ -72,9 +72,9 @@ return put_in_hands(new /obj/item/underworld/coin/notracking(get_turf(src))) if(patron) - to_chat(src, "Your suffering has not gone unnoticed, [patron] has rewarded you with your toll.") + to_chat(src, span_danger("Your suffering has not gone unnoticed, [patron] has rewarded you with your toll.")) else - to_chat(src, "Your suffering has not gone unnoticed, your patron has rewarded you with your toll.") + to_chat(src, span_danger("Your suffering has not gone unnoticed, your patron has rewarded you with your toll.")) playsound(src, 'sound/combat/caught.ogg', 80, TRUE, -1) /mob/living/carbon/spirit/create_internal_organs() @@ -128,7 +128,7 @@ log_game("[key_name(usr)] respawned from underworld") - to_chat(src, "Returned to lobby successfully.") + to_chat(src, span_info("Returned to lobby successfully.")) if(!client) log_game("[key_name(usr)] AM failed due to disconnect.") @@ -217,7 +217,7 @@ var/turf/fallen = get_turf(coin_spawn) fallen = locate(fallen.x + rand(-3, 3), fallen.y + rand(-3, 3), fallen.z) new /obj/item/underworld/coin/notracking(fallen) - fallen.visible_message("A coin falls from above!") + fallen.visible_message(span_warning("A coin falls from above!")) if(coin_pq && user?.ckey && (user.ckey != attacker_ckey)) adjust_playerquality(coin_pq, user.ckey) qdel(human_corpse.mouth) @@ -240,7 +240,7 @@ if(ghost) testing("pacify_corpse success ([corpse.mind?.key || "no key"])") var/user_acknowledgement = user ? user.real_name : "a mysterious force" - to_chat(ghost, "My soul finds peace buried in creation, thanks to [user_acknowledgement].") + to_chat(ghost, span_rose("My soul finds peace buried in creation, thanks to [user_acknowledgement].")) ghost.returntolobby(RESPAWNTIME*-1) return attacker_ckey diff --git a/code/modules/mob/living/carbon/spirit/spirit_defense.dm b/code/modules/mob/living/carbon/spirit/spirit_defense.dm index f02e8233a..faa69499d 100644 --- a/code/modules/mob/living/carbon/spirit/spirit_defense.dm +++ b/code/modules/mob/living/carbon/spirit/spirit_defense.dm @@ -40,15 +40,15 @@ if(HAS_TRAIT(M, TRAIT_PACIFISM)) playsound(loc, 'sound/combat/shove.ogg', 100, TRUE, -1) M.do_attack_animation(src, ATTACK_EFFECT_DISARM) - visible_message("[M]'s punch goes through [name]!", \ - "[M]'s punch goes through you!", "I hear the sound of scuffling of the damned!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "My punch goes through [name]!") + visible_message(span_warning("[M]'s punch goes through [name]!"), \ + span_warning("[M]'s punch goes through you!"), span_hear("I hear the sound of scuffling of the damned!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("My punch goes through [name]!")) return M.do_attack_animation(src, ATTACK_EFFECT_PUNCH) if (prob(75)) - visible_message("[M] punches [name]!", \ - "[M] punches you!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I punch [name]!") + visible_message(span_danger("[M] punches [name]!"), \ + span_danger("[M] punches you!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I punch [name]!")) playsound(loc, "punch", 25, TRUE, -1) var/damage = rand(5, 10) @@ -56,9 +56,9 @@ damage = rand(10, 15) if(AmountUnconscious() < 100 && health > 0) Unconscious(rand(200, 300)) - visible_message("[M] knocks [name] out!", \ - "[M] knocks you out!", "I hear a sickening sound of flesh hitting flesh!", 5, M) - to_chat(M, "I knock [name] out!") + visible_message(span_danger("[M] knocks [name] out!"), \ + span_danger("[M] knocks you out!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), 5, M) + to_chat(M, span_danger("I knock [name] out!")) var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) if(!affecting) affecting = get_bodypart(BODY_ZONE_CHEST) @@ -67,30 +67,30 @@ else playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M]'s punch misses [name]!", \ - "I avoid [M]'s punch!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "My punch misses [name]!") + visible_message(span_danger("[M]'s punch misses [name]!"), \ + span_danger("I avoid [M]'s punch!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_warning("My punch misses [name]!")) if(INTENT_DISARM) if(HAS_TRAIT(M, TRAIT_PACIFISM)) playsound(loc, 'sound/combat/shove.ogg', 100, TRUE, -1) M.do_attack_animation(src, ATTACK_EFFECT_DISARM) - visible_message("[M]'s shove goes through [name]!", \ - "[M]'s shove goes through you!", "I hear the sound scuffling of the damned!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "My shove goes through [name]!") + visible_message(span_warning("[M]'s shove goes through [name]!"), \ + span_warning("[M]'s shove goes through you!"), span_hear("I hear the sound scuffling of the damned!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("My shove goes through [name]!")) if(!IsUnconscious()) M.do_attack_animation(src, ATTACK_EFFECT_DISARM) if (prob(25)) Paralyze(40) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) log_combat(M, src, "pushed") - visible_message("[M] pushes [src] down!", \ - "[M] pushes you down!", "I hear aggressive shuffling followed by a loud thud!", null, M) - to_chat(M, "I push [src] down!") + visible_message(span_danger("[M] pushes [src] down!"), \ + span_danger("[M] pushes you down!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), null, M) + to_chat(M, span_danger("I push [src] down!")) else if(dropItemToGround(get_active_held_item())) playsound(src, 'sound/blank.ogg', 50, TRUE, -1) - visible_message("[M] disarms [src]!", \ - "[M] disarms you!", "I hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I disarm [src]!") + visible_message(span_danger("[M] disarms [src]!"), \ + span_danger("[M] disarms you!"), span_hear("I hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I disarm [src]!")) /mob/living/carbon/spirit/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent. @@ -102,13 +102,13 @@ damage = rand(20, 40) if(AmountUnconscious() < 300) Unconscious(rand(200, 300)) - visible_message("[M] wounds [name]!", \ - "[M] wounds you!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I wound [name]!") + visible_message(span_danger("[M] wounds [name]!"), \ + span_danger("[M] wounds you!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I wound [name]!")) else - visible_message("[M] slashes [name]!", \ - "[M] slashes you!", "I hear a sickening sound of a slice!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I slash [name]!") + visible_message(span_danger("[M] slashes [name]!"), \ + span_danger("[M] slashes you!"), span_hear("I hear a sickening sound of a slice!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I slash [name]!")) var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) log_combat(M, src, "attacked") @@ -120,24 +120,24 @@ else playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M]'s lunge misses [name]!", \ - "I avoid [M]'s lunge!", "I hear a swoosh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "My lunge misses [name]!") + visible_message(span_danger("[M]'s lunge misses [name]!"), \ + span_danger("I avoid [M]'s lunge!"), span_hear("I hear a swoosh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_warning("My lunge misses [name]!")) if (M.used_intent.type == INTENT_DISARM) var/obj/item/I = null playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) if(prob(95)) Paralyze(20) - visible_message("[M] tackles [name] down!", \ - "[M] tackles you down!", "I hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I tackle [name] down!") + visible_message(span_danger("[M] tackles [name] down!"), \ + span_danger("[M] tackles you down!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I tackle [name] down!")) else I = get_active_held_item() if(dropItemToGround(I)) - visible_message("[M] disarms [name]!", \ - "[M] disarms you!", "I hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I disarm [name]!") + visible_message(span_danger("[M] disarms [name]!"), \ + span_danger("[M] disarms you!"), span_hear("I hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I disarm [name]!")) else I = null log_combat(M, src, "disarmed", "[I ? " removing \the [I]" : ""]") @@ -176,13 +176,13 @@ if(!(wear_mask.resistance_flags & UNACIDABLE)) wear_mask.acid_act(acidpwr, acid_volume) else - to_chat(src, "My mask protects you from the acid.") + to_chat(src, span_warning("My mask protects you from the acid.")) return if(head) if(!(head.resistance_flags & UNACIDABLE)) head.acid_act(acidpwr, acid_volume) else - to_chat(src, "My hat protects you from the acid.") + to_chat(src, span_warning("My hat protects you from the acid.")) return take_bodypart_damage(acidpwr * min(0.6, acid_volume*0.1)) diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm index d5d476bcb..599bbf23b 100644 --- a/code/modules/mob/living/carbon/status_procs.dm +++ b/code/modules/mob/living/carbon/status_procs.dm @@ -12,7 +12,7 @@ if(absorb_stun(0)) //continuous effect, so we don't want it to increment the stuns absorbed. return if(!IsParalyzed()) - to_chat(src, "You're too exhausted to keep going...") + to_chat(src, span_notice("You're too exhausted to keep going...")) var/prev = stam_paralyzed stam_paralyzed = TRUE if(!prev && getStaminaLoss() < 120) // Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems. diff --git a/code/modules/mob/living/carbon/stress.dm b/code/modules/mob/living/carbon/stress.dm index 4b4c5f6a0..6815693c1 100644 --- a/code/modules/mob/living/carbon/stress.dm +++ b/code/modules/mob/living/carbon/stress.dm @@ -53,9 +53,9 @@ qdel(D) if(stress != oldstress) if(stress > oldstress) - to_chat(src, "I gain stress.") + to_chat(src, span_red("I gain stress.")) else - to_chat(src, "I gain peace.") + to_chat(src, span_green("I gain peace.")) oldstress = stress if(hud_used) if(hud_used.stressies) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 504b86edf..858f7e2a0 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -71,7 +71,7 @@ L.add_stress(/datum/stressevent/psyprayer) return TRUE else - to_chat(L, "My prayer was kinda short...") + to_chat(L, span_danger("My prayer was kinda short...")) /mob/living/proc/check_prayer_underworld(mob/living/L,message) if(!L || !message) @@ -103,7 +103,7 @@ else return TRUE else - to_chat(L, "My prayer was kinda short...") + to_chat(L, span_danger("My prayer was kinda short...")) /datum/emote/living/meditate key = "meditate" @@ -121,7 +121,7 @@ /datum/emote/living/meditate/run_emote(mob/user, params, type_override, intentional) if(isliving(user)) if(!COOLDOWN_FINISHED(user, schizohelp_cooldown)) - to_chat(user, "I need to wait before meditating again.") + to_chat(user, span_warning("I need to wait before meditating again.")) return var/msg = input("Say your meditation:", "Voices in your head") as text|null if(msg) @@ -545,7 +545,7 @@ var/mob/living/carbon/human/E = target if(iself(E) || ishalfelf(E)) if(!E.cmode) - to_chat(target, "It tickles...") + to_chat(target, span_love("It tickles...")) else if(H.zone_selected == BODY_ZONE_PRECISE_R_EYE || H.zone_selected == BODY_ZONE_PRECISE_L_EYE) message_param = "kisses %t on the brow." else @@ -573,7 +573,7 @@ var/mob/living/carbon/human/H = user if(H.mouth) if(H.mouth.spitoutmouth) - H.visible_message("[H] spits out [H.mouth].") + H.visible_message(span_warning("[H] spits out [H.mouth].")) H.dropItemToGround(H.mouth, silent = FALSE) return ..() @@ -625,7 +625,7 @@ /datum/emote/living/holdbreath/can_run_emote(mob/living/user, status_check = TRUE, intentional) . = ..() if(. && intentional && !HAS_TRAIT(user, TRAIT_HOLDBREATH) && !HAS_TRAIT(user, TRAIT_PARALYSIS)) - to_chat(user, "I'm not desperate enough to do that.") + to_chat(user, span_warning("I'm not desperate enough to do that.")) return FALSE /datum/emote/living/holdbreath/run_emote(mob/user, params, type_override, intentional) @@ -785,7 +785,7 @@ message = "makes a muffled scream!" if(intentional) if(!C.rogfat_add(10)) - to_chat(C, "I try to scream but my voice fails me.") + to_chat(C, span_warning("I try to scream but my voice fails me.")) . = FALSE /datum/emote/living/scream/painscream @@ -1211,13 +1211,13 @@ /datum/emote/living/custom/proc/check_invalid(mob/user, input) . = TRUE if(copytext(input,1,5) == "says") - to_chat(user, "Invalid emote.") + to_chat(user, span_danger("Invalid emote.")) else if(copytext(input,1,9) == "exclaims") - to_chat(user, "Invalid emote.") + to_chat(user, span_danger("Invalid emote.")) else if(copytext(input,1,6) == "yells") - to_chat(user, "Invalid emote.") + to_chat(user, span_danger("Invalid emote.")) else if(copytext(input,1,5) == "asks") - to_chat(user, "Invalid emote.") + to_chat(user, span_danger("Invalid emote.")) else . = FALSE @@ -1225,12 +1225,12 @@ if(!can_run_emote(user, TRUE, intentional)) return FALSE if(is_banned_from(user.ckey, "Emote")) - to_chat(user, "I cannot send custom emotes (banned).") + to_chat(user, span_boldwarning("I cannot send custom emotes (banned).")) return FALSE else if(QDELETED(user)) return FALSE else if(user.client && user.client.prefs.muted & MUTE_IC) - to_chat(user, "I cannot send IC messages (muted).") + to_chat(user, span_boldwarning("I cannot send IC messages (muted).")) return FALSE else if(!params) var/custom_emote = copytext(sanitize(input("What does your character do?") as text|null), 1, MAX_MESSAGE_LEN) @@ -1302,10 +1302,10 @@ . = ..() var/obj/item/circlegame/N = new(user) if(user.put_in_hands(N)) - to_chat(user, "I make a circle with your hand.") + to_chat(user, span_notice("I make a circle with your hand.")) else qdel(N) - to_chat(user, "I don't have any free hands to make a circle with.") + to_chat(user, span_warning("I don't have any free hands to make a circle with.")) /datum/emote/living/slap key = "slap" @@ -1318,7 +1318,7 @@ return var/obj/item/slapper/N = new(user) if(user.put_in_hands(N)) - to_chat(user, "I ready your slapping hand.") + to_chat(user, span_notice("I ready your slapping hand.")) else - to_chat(user, "You're incapable of slapping in your current state.") + to_chat(user, span_warning("You're incapable of slapping in your current state.")) */ diff --git a/code/modules/mob/living/grabbing.dm b/code/modules/mob/living/grabbing.dm index 7779ecd1b..74e53a47d 100644 --- a/code/modules/mob/living/grabbing.dm +++ b/code/modules/mob/living/grabbing.dm @@ -105,7 +105,7 @@ switch(user.used_intent.type) if(/datum/intent/grab/upgrade) if(!(M.status_flags & CANPUSH) || HAS_TRAIT(M, TRAIT_PUSHIMMUNE)) - to_chat(user, "Can't get a grip!") + to_chat(user, span_warning("Can't get a grip!")) return FALSE M.grippedby(user) if(/datum/intent/grab/choke) @@ -116,9 +116,9 @@ if(prob(23)) C.emote("choke") C.adjustOxyLoss(user.STASTR) - C.visible_message("[user] [pick("chokes", "strangles")] [C]!", \ - "[user] [pick("chokes", "strangles")] me!", "I hear a sickening sound of pugilism!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I [pick("choke", "strangle")] [C]!") + C.visible_message(span_danger("[user] [pick("chokes", "strangles")] [C]!"), \ + span_userdanger("[user] [pick("chokes", "strangles")] me!"), span_hear("I hear a sickening sound of pugilism!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I [pick("choke", "strangle")] [C]!")) if(/datum/intent/grab/twist) if(limb_grabbed && grab_state > 0) //this implies a carbon victim if(iscarbon(M)) @@ -134,49 +134,49 @@ user.stop_pulling() if(/datum/intent/grab/shove) if(!(user.mobility_flags & MOBILITY_STAND)) - to_chat(user, "I must stand..") + to_chat(user, span_warning("I must stand..")) return if(!(M.mobility_flags & MOBILITY_STAND)) if(user.loc != M.loc) - to_chat(user, "I must be above them.") + to_chat(user, span_warning("I must be above them.")) return if(src == user.r_grab) if(!user.l_grab || user.l_grab.grabbed != M) - to_chat(user, "I must grab them with both hands.") + to_chat(user, span_warning("I must grab them with both hands.")) return if(src == user.l_grab) if(!user.r_grab || user.r_grab.grabbed != M) - to_chat(user, "I must grab them with both hands.") + to_chat(user, span_warning("I must grab them with both hands.")) return if(user.STASTR > M.STASTR) - M.visible_message("[user] pins [M] to the ground!", \ - "[user] pins me to the ground!", "I hear a sickening sound of pugilism!", COMBAT_MESSAGE_RANGE) + M.visible_message(span_danger("[user] pins [M] to the ground!"), \ + span_userdanger("[user] pins me to the ground!"), span_hear("I hear a sickening sound of pugilism!"), COMBAT_MESSAGE_RANGE) M.Knockdown(300) M.Immobilize(300) user.Immobilize(30) else if(prob(23)) - M.visible_message("[user] pins [M] to the ground briefly!", \ - "[user] pins me to the ground briefly!", "I hear a sickening sound of pugilism!", COMBAT_MESSAGE_RANGE) + M.visible_message(span_danger("[user] pins [M] to the ground briefly!"), \ + span_userdanger("[user] pins me to the ground briefly!"), span_hear("I hear a sickening sound of pugilism!"), COMBAT_MESSAGE_RANGE) M.Knockdown(100) M.Immobilize(100) user.Immobilize(50) else - M.visible_message("[user] tries to pin [M]!", \ - "[user] tries to pin me down!", "I hear a sickening sound of pugilism!", COMBAT_MESSAGE_RANGE) + M.visible_message(span_warning("[user] tries to pin [M]!"), \ + span_danger("[user] tries to pin me down!"), span_hear("I hear a sickening sound of pugilism!"), COMBAT_MESSAGE_RANGE) else if(user.STASTR > M.STASTR) - M.visible_message("[user] shoves [M] to the ground!", \ - "[user] shoves me to the ground!", "I hear a sickening sound of pugilism!", COMBAT_MESSAGE_RANGE) + M.visible_message(span_danger("[user] shoves [M] to the ground!"), \ + span_userdanger("[user] shoves me to the ground!"), span_hear("I hear a sickening sound of pugilism!"), COMBAT_MESSAGE_RANGE) M.Knockdown(10) else if(prob(23)) - M.visible_message("[user] shoves [M] to the ground!", \ - "[user] shoves me to the ground!", "I hear a sickening sound of pugilism!", COMBAT_MESSAGE_RANGE) + M.visible_message(span_danger("[user] shoves [M] to the ground!"), \ + span_userdanger("[user] shoves me to the ground!"), span_hear("I hear a sickening sound of pugilism!"), COMBAT_MESSAGE_RANGE) M.Knockdown(1) else - M.visible_message("[user] tries to shove [M]!", \ - "[user] tries to shove me!", "I hear a sickening sound of pugilism!", COMBAT_MESSAGE_RANGE) + M.visible_message(span_warning("[user] tries to shove [M]!"), \ + span_danger("[user] tries to shove me!"), span_hear("I hear a sickening sound of pugilism!"), COMBAT_MESSAGE_RANGE) /obj/item/grabbing/proc/twistlimb(mob/living/user) //implies limb_grabbed and sublimb are things var/mob/living/carbon/C = grabbed @@ -186,9 +186,9 @@ C.next_attack_msg.Cut() C.apply_damage(damage, BRUTE, limb_grabbed, armor_block) limb_grabbed.bodypart_attacked_by(BCLASS_TWIST, damage, user, sublimb_grabbed, crit_message = TRUE) - C.visible_message("[user] twists [C]'s [parse_zone(sublimb_grabbed)]![C.next_attack_msg.Join()]", \ - "[user] twists my [parse_zone(sublimb_grabbed)]![C.next_attack_msg.Join()]", "I hear a sickening sound of pugilism!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I twist [C]'s [parse_zone(sublimb_grabbed)].[C.next_attack_msg.Join()]") + C.visible_message(span_danger("[user] twists [C]'s [parse_zone(sublimb_grabbed)]![C.next_attack_msg.Join()]"), \ + span_userdanger("[user] twists my [parse_zone(sublimb_grabbed)]![C.next_attack_msg.Join()]"), span_hear("I hear a sickening sound of pugilism!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_warning("I twist [C]'s [parse_zone(sublimb_grabbed)].[C.next_attack_msg.Join()]")) C.next_attack_msg.Cut() log_combat(user, C, "limbtwisted [sublimb_grabbed] ") @@ -198,8 +198,8 @@ var/obj/item/I = sublimb_grabbed playsound(M.loc, "genblunt", 100, FALSE, -1) M.apply_damage(damage, BRUTE, limb_grabbed) - M.visible_message("[user] twists [I] in [M]'s wound!", \ - "[user] twists [I] in my wound!", "I hear a sickening sound of pugilism!", COMBAT_MESSAGE_RANGE) + M.visible_message(span_danger("[user] twists [I] in [M]'s wound!"), \ + span_userdanger("[user] twists [I] in my wound!"), span_hear("I hear a sickening sound of pugilism!"), COMBAT_MESSAGE_RANGE) log_combat(user, M, "itemtwisted [sublimb_grabbed] ") /obj/item/grabbing/proc/removeembeddeditem(mob/living/user) //implies limb_grabbed and sublimb are things @@ -218,9 +218,9 @@ C.emote("paincrit", TRUE) playsound(C, 'sound/foley/flesh_rem.ogg', 100, TRUE, -2) if(usr == src) - user.visible_message("[user] rips [I] out of [user.p_their()] [L.name]!", "I rip [I] from my [L.name].") + user.visible_message(span_notice("[user] rips [I] out of [user.p_their()] [L.name]!"), span_notice("I rip [I] from my [L.name].")) else - user.visible_message("[user] rips [I] out of [C]'s [L.name]!", "I rip [I] from [C]'s [L.name].") + user.visible_message(span_notice("[user] rips [I] out of [C]'s [L.name]!"), span_notice("I rip [I] from [C]'s [L.name].")) sublimb_grabbed = limb_grabbed.body_zone else if(HAS_TRAIT(M, TRAIT_SIMPLE_WOUNDS)) var/obj/item/I = locate(sublimb_grabbed) in M.simple_embedded_objects @@ -232,9 +232,9 @@ M.emote("paincrit", TRUE) playsound(M, 'sound/foley/flesh_rem.ogg', 100, TRUE, -2) if(user == M) - user.visible_message("[user] rips [I] out of [user.p_them()]self!", "I remove [I] from myself.") + user.visible_message(span_notice("[user] rips [I] out of [user.p_them()]self!"), span_notice("I remove [I] from myself.")) else - user.visible_message("[user] rips [I] out of [M]!", "I rip [I] from [src].") + user.visible_message(span_notice("[user] rips [I] out of [M]!"), span_notice("I rip [I] from [src].")) sublimb_grabbed = M.simple_limb_hit(user.zone_selected) user.update_grab_intents(grabbed) return TRUE @@ -247,7 +247,7 @@ user.Move_Pulled(T) if(/datum/intent/grab/smash) if(!(user.mobility_flags & MOBILITY_STAND)) - to_chat(user, "I must stand..") + to_chat(user, span_warning("I must stand..")) return if(limb_grabbed && grab_state > 0) //this implies a carbon victim if(isopenturf(T)) @@ -274,7 +274,7 @@ if(user.used_intent.type == /datum/intent/grab/smash) if(isstructure(O) && O.blade_dulling != DULLING_CUT) if(!(user.mobility_flags & MOBILITY_STAND)) - to_chat(user, "I must stand..") + to_chat(user, span_warning("I must stand..")) return if(limb_grabbed && grab_state > 0) //this implies a carbon victim if(iscarbon(grabbed)) @@ -295,9 +295,9 @@ playsound(C.loc, "smashlimb", 100, FALSE, -1) else C.next_attack_msg += " Armor stops the damage." - C.visible_message("[user] smashes [C]'s [limb_grabbed] into [A]![C.next_attack_msg.Join()]", \ - "[user] smashes my [limb_grabbed] into [A]![C.next_attack_msg.Join()]", "I hear a sickening sound of pugilism!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I smash [C]'s [limb_grabbed] against [A].[C.next_attack_msg.Join()]") + C.visible_message(span_danger("[user] smashes [C]'s [limb_grabbed] into [A]![C.next_attack_msg.Join()]"), \ + span_userdanger("[user] smashes my [limb_grabbed] into [A]![C.next_attack_msg.Join()]"), span_hear("I hear a sickening sound of pugilism!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_warning("I smash [C]'s [limb_grabbed] against [A].[C.next_attack_msg.Join()]")) C.next_attack_msg.Cut() log_combat(user, C, "limbsmashed [limb_grabbed] ") @@ -409,9 +409,9 @@ user.mind.adjust_triumphs(1) else C.next_attack_msg += " Armor stops the damage." - C.visible_message("[user] bites [C]'s [parse_zone(sublimb_grabbed)]![C.next_attack_msg.Join()]", \ - "[user] bites my [parse_zone(sublimb_grabbed)]![C.next_attack_msg.Join()]", "I hear a sickening sound of chewing!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I bite [C]'s [parse_zone(sublimb_grabbed)].[C.next_attack_msg.Join()]") + C.visible_message(span_danger("[user] bites [C]'s [parse_zone(sublimb_grabbed)]![C.next_attack_msg.Join()]"), \ + span_userdanger("[user] bites my [parse_zone(sublimb_grabbed)]![C.next_attack_msg.Join()]"), span_hear("I hear a sickening sound of chewing!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I bite [C]'s [parse_zone(sublimb_grabbed)].[C.next_attack_msg.Join()]")) C.next_attack_msg.Cut() log_combat(user, C, "limb chewed [sublimb_grabbed] ") @@ -425,19 +425,19 @@ if(world.time < last_drink + 2 SECONDS) return if(!limb_grabbed.get_bleed_rate()) - to_chat(user, "Sigh. It's not bleeding.") + to_chat(user, span_warning("Sigh. It's not bleeding.")) return var/mob/living/carbon/C = grabbed if(C.dna?.species && (NOBLOOD in C.dna.species.species_traits)) - to_chat(user, "Sigh. No blood.") + to_chat(user, span_warning("Sigh. No blood.")) return if(C.blood_volume <= 0) - to_chat(user, "Sigh. No blood.") + to_chat(user, span_warning("Sigh. No blood.")) return if(ishuman(C)) var/mob/living/carbon/human/H = C if(istype(H.wear_neck, /obj/item/clothing/neck/roguetown/psicross/silver)) - to_chat(user, "SILVER! HISSS!!!") + to_chat(user, span_userdanger("SILVER! HISSS!!!")) return last_drink = world.time user.changeNext_move(CLICK_CD_MELEE) @@ -451,11 +451,11 @@ zomwerewolf = C.mind.has_antag_datum(/datum/antagonist/zombie) if(VDrinker) if(zomwerewolf) - to_chat(user, "I'm going to puke...") + to_chat(user, span_danger("I'm going to puke...")) addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living/carbon, vomit), 0, TRUE), rand(8 SECONDS, 15 SECONDS)) else if(VVictim) - to_chat(user, "It's vitae, just like mine.") + to_chat(user, span_warning("It's vitae, just like mine.")) else C.blood_volume = max(C.blood_volume-45, 0) if(VDrinker.isspawn) @@ -463,7 +463,7 @@ else VDrinker.handle_vitae(500) else - to_chat(user, "I'm going to puke...") + to_chat(user, span_warning("I'm going to puke...")) addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living/carbon, vomit), 0, TRUE), rand(8 SECONDS, 15 SECONDS)) else if(user.mind) @@ -480,9 +480,9 @@ playsound(user.loc, 'sound/misc/drink_blood.ogg', 100, FALSE, -4) - C.visible_message("[user] drinks from [C]'s [parse_zone(sublimb_grabbed)]!", \ - "[user] drinks from my [parse_zone(sublimb_grabbed)]!", "...", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I drink from [C]'s [parse_zone(sublimb_grabbed)].") + C.visible_message(span_danger("[user] drinks from [C]'s [parse_zone(sublimb_grabbed)]!"), \ + span_userdanger("[user] drinks from my [parse_zone(sublimb_grabbed)]!"), span_hear("..."), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_warning("I drink from [C]'s [parse_zone(sublimb_grabbed)].")) log_combat(user, C, "drank blood from ") if(ishuman(C) && C.mind) @@ -500,4 +500,4 @@ sleep(20) C.fully_heal() if("No") - to_chat(user, "I decide [C] is unworthy.") + to_chat(user, span_warning("I decide [C] is unworthy.")) diff --git a/code/modules/mob/living/inhand_holder.dm b/code/modules/mob/living/inhand_holder.dm index 5f87234cb..019866469 100644 --- a/code/modules/mob/living/inhand_holder.dm +++ b/code/modules/mob/living/inhand_holder.dm @@ -52,12 +52,12 @@ return FALSE if(isliving(loc)) var/mob/living/L = loc - to_chat(L, "[held_mob] wriggles free!") + to_chat(L, span_warning("[held_mob] wriggles free!")) L.dropItemToGround(src) held_mob.forceMove(get_turf(held_mob)) held_mob.reset_perspective() held_mob.setDir(SOUTH) - held_mob.visible_message("[held_mob] uncurls!") + held_mob.visible_message(span_warning("[held_mob] uncurls!")) held_mob = null if(del_on_release && !destroying) qdel(src) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 72d4aa856..a6e37fdcc 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -118,8 +118,8 @@ mob_timers["painstun"] = world.time Immobilize(10) emote("painscream") - visible_message("[src] freezes in pain!", - "I'm frozen in pain!") + visible_message(span_warning("[src] freezes in pain!"), + span_warning("I'm frozen in pain!")) sleep(10) Stun(110) Knockdown(110) @@ -165,12 +165,12 @@ if(prob(embedded.embedding.embedded_pain_chance)) // BP.receive_damage(I.w_class*I.embedding.embedded_pain_multiplier) - to_chat(src, "[embedded] in me hurts!") + to_chat(src, span_danger("[embedded] in me hurts!")) if(prob(embedded.embedding.embedded_fall_chance)) // BP.receive_damage(I.w_class*I.embedding.embedded_fall_pain_multiplier) simple_remove_embedded_object(embedded) - to_chat(src,"[embedded] falls out of me!") + to_chat(src,span_danger("[embedded] falls out of me!")) //this updates all special effects: knockdown, druggy, stuttering, etc.. /mob/living/proc/handle_status_effects() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 014d980d5..d8b0c8dbb 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -58,8 +58,8 @@ for(var/i in 2 to levels) i++ points += "!" - visible_message("[src] falls down[points]", \ - "I fall down[points]") + visible_message(span_danger("[src] falls down[points]"), \ + span_danger("I fall down[points]")) playsound(src.loc, 'sound/foley/zfall.ogg', 100, FALSE) if(!isgroundlessturf(T)) ZImpactDamage(T, levels) @@ -122,14 +122,14 @@ //Should stop you pushing a restrained person out of the way if(L.pulledby && L.pulledby != src && L.pulledby != L && L.restrained()) if(!(world.time % 5)) - to_chat(src, "[L] is restrained, you cannot push past.") + to_chat(src, span_warning("[L] is restrained, you cannot push past.")) return TRUE if(L.pulling) if(ismob(L.pulling) && L.pulling != L) var/mob/P = L.pulling if(!(world.time % 5)) - to_chat(src, "[L] is grabbing [P], you cannot push past.") + to_chat(src, span_warning("[L] is grabbing [P], you cannot push past.")) return TRUE if(moving_diagonally)//no mob swap during diagonal moves. @@ -201,7 +201,7 @@ playsound = TRUE if(playsound) playsound(src, "genblunt", 100, TRUE) - visible_message("[src] charges into [L]!", "I charge into [L]!") + visible_message(span_warning("[src] charges into [L]!"), span_warning("I charge into [L]!")) return TRUE //okay, so we didn't switch. but should we push? @@ -225,9 +225,9 @@ if(statchance < 10) statchance = 10 if(prob(statchance)) - visible_message("[src] pushes [M].") + visible_message(span_info("[src] pushes [M].")) else - visible_message("[src] pushes [M].") + visible_message(span_warning("[src] pushes [M].")) return TRUE //anti-riot equipment is also anti-push @@ -298,7 +298,7 @@ if(isliving(user)) var/mob/living/L = user if(!get_bodypart(check_zone(L.zone_selected))) - to_chat(L, "[src] is missing that.") + to_chat(L, span_warning("[src] is missing that.")) return FALSE if(!lying_attack_check(L)) return FALSE @@ -309,7 +309,7 @@ return FALSE var/list/acceptable = list(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_R_ARM, BODY_ZONE_CHEST, BODY_ZONE_L_ARM) if( !(check_zone(L.zone_selected) in acceptable) ) - to_chat(L, "I can't reach that.") + to_chat(L, span_warning("I can't reach that.")) return FALSE return TRUE @@ -340,12 +340,12 @@ CZ = TRUE if(CZ) if( !(check_zone(L.zone_selected) in acceptable) ) - to_chat(L, "I can't reach that.") + to_chat(L, span_warning("I can't reach that.")) testing("reach2") return FALSE else if( !(L.zone_selected in acceptable) ) - to_chat(L, "I can't reach that.") + to_chat(L, span_warning("I can't reach that.")) testing("reach2") return FALSE return TRUE @@ -368,13 +368,13 @@ // if(AM.pulledby && AM.pulledby != src) // if(AM == src) -// to_chat(src, "I'm being grabbed by something!") +// to_chat(src, span_warning("I'm being grabbed by something!")) // return FALSE // else // if(!supress_message) -// AM.visible_message("[src] has pulled [AM] from [AM.pulledby]'s grip.", "[src] has pulled me from [AM.pulledby]'s grip.", null, null, src) +// AM.visible_message(span_danger("[src] has pulled [AM] from [AM.pulledby]'s grip."), span_danger("[src] has pulled me from [AM.pulledby]'s grip."), null, null, src) // -// to_chat(src, "I pull [AM] from [AM.pulledby]'s grip!") +// to_chat(src, span_notice("I pull [AM] from [AM.pulledby]'s grip!")) // log_combat(AM, AM.pulledby, "pulled from", src) // AM.pulledby.stop_pulling() //an object can't be pulled by two mobs at once. @@ -456,9 +456,9 @@ update_grab_intents() /mob/living/proc/send_pull_message(mob/living/target) - target.visible_message("[src] grabs [target].", \ - "[src] grabs me.", "I hear shuffling.", null, src) - to_chat(src, "I grab [target].") + target.visible_message(span_warning("[src] grabs [target]."), \ + span_warning("[src] grabs me."), span_hear("I hear shuffling."), null, src) + to_chat(src, span_info("I grab [target].")) /mob/living/proc/set_pull_offsets(mob/living/M, grab_state = GRAB_PASSIVE) return //rtd fix not updating because no dirchange @@ -573,7 +573,7 @@ return FALSE if(!..()) return FALSE - visible_message("[src] points at [A].", "I point at [A].") + visible_message(span_notice(span_name("[src]") + " points at [A]."), span_notice("I point at [A].")) return TRUE /mob/living/verb/succumb(whispered as null, reaper as null) @@ -587,7 +587,7 @@ adjustOxyLoss(201) updatehealth() // if(!whispered) -// to_chat(src, "I have given up life and succumbed to death.") +// to_chat(src, span_userdanger("I have given up life and succumbed to death.")) death() /mob/living/incapacitated(ignore_restraints = FALSE, ignore_grab = TRUE, check_immobilized = FALSE, ignore_stasis = FALSE) @@ -623,7 +623,7 @@ set category = "IC" set hidden = 1 if(IsSleeping()) - to_chat(src, "I am already sleeping!") + to_chat(src, span_warning("I am already sleeping!")) return else if(alert(src, "You sure you want to sleep for a while?", "Sleep", "Yes", "No") == "Yes") @@ -641,7 +641,7 @@ if(stat) return if(pulledby) - to_chat(src, "I'm grabbed!") + to_chat(src, span_warning("I'm grabbed!")) return if(!resting) set_resting(TRUE, FALSE) @@ -653,16 +653,16 @@ if(stat) return if(pulledby) - to_chat(src, "I'm grabbed!") + to_chat(src, span_warning("I'm grabbed!")) return if(resting) if(!IsKnockdown() && !IsStun() && !IsParalyzed()) - src.visible_message("[src] stands up.") + src.visible_message(span_notice("[src] stands up.")) if(move_after(src, 20, target = src)) set_resting(FALSE, FALSE) return TRUE else - src.visible_message("[src] tries to stand up.") + src.visible_message(span_warning("[src] tries to stand up.")) /mob/living/proc/toggle_rest() set name = "Rest/Stand" @@ -671,15 +671,15 @@ if(stat) return if(pulledby) - to_chat(src, "I'm grabbed!") + to_chat(src, span_warning("I'm grabbed!")) return if(resting) if(!IsKnockdown() && !IsStun() && !IsParalyzed()) - src.visible_message("[src] begins to stand up.") + src.visible_message(span_info("[src] begins to stand up.")) if(move_after(src, 20, target = src)) set_resting(FALSE, FALSE) else - src.visible_message("[src] struggles to stand up.") + src.visible_message(span_warning("[src] struggles to stand up.")) else set_resting(TRUE, FALSE) @@ -694,11 +694,11 @@ if(rest == resting) if(resting) playsound(src, 'sound/foley/toggledown.ogg', 100, FALSE) - src.visible_message("[src] lays down.") + src.visible_message(span_info("[src] lays down.")) else playsound(src, 'sound/foley/toggleup.ogg', 100, FALSE) else - to_chat(src, "I fail to get up!") + to_chat(src, span_warning("I fail to get up!")) update_cone_show() /mob/living/proc/update_resting() @@ -1037,7 +1037,7 @@ flaggy.pixel_y = 12 flick_overlay_view(flaggy, src, 150) Stun(150) - src.visible_message("[src] yields!") + src.visible_message(span_notice("[src] yields!")) playsound(src, 'sound/misc/surrender.ogg', 100, FALSE, -1) sleep(150) surrendering = 0 @@ -1047,7 +1047,7 @@ if(atkswinging) atkswinging = FALSE if(message) - to_chat(src, "Attack stopped.") + to_chat(src, span_warning("Attack stopped.")) if(client) client.charging = 0 client.chargedprog = 0 @@ -1092,9 +1092,9 @@ client.move_delay = world.time + 20 if(prob(resist_chance)) rogfat_add(rand(5,15)) - visible_message("[src] breaks free of [pulledby]'s grip!", \ - "I break free of [pulledby]'s grip!", null, null, pulledby) - to_chat(pulledby, "[src] breaks free of my grip!") + visible_message(span_warning("[src] breaks free of [pulledby]'s grip!"), \ + span_notice("I break free of [pulledby]'s grip!"), null, null, pulledby) + to_chat(pulledby, span_danger("[src] breaks free of my grip!")) log_combat(pulledby, src, "broke grab") pulledby.changeNext_move(CLICK_CD_GRABBING) pulledby.stop_pulling() @@ -1104,9 +1104,9 @@ var/shitte = "" // if(client?.prefs.showrolls) // shitte = " ([resist_chance]%)" - visible_message("[src] struggles to break free from [pulledby]'s grip!", \ - "I struggle against [pulledby]'s grip![shitte]", null, null, pulledby) - to_chat(pulledby, "[src] struggles against my grip!") + visible_message(span_warning("[src] struggles to break free from [pulledby]'s grip!"), \ + span_warning("I struggle against [pulledby]'s grip![shitte]"), null, null, pulledby) + to_chat(pulledby, span_warning("[src] struggles against my grip!")) return TRUE @@ -1120,9 +1120,9 @@ if(G.limb_grabbed == head) if(G.grabbee == pulledby) if(G.sublimb_grabbed == BODY_ZONE_PRECISE_EARS) - visible_message("[src] struggles to break free from [pulledby]'s grip!", \ - "I struggle against [pulledby]'s grip!", null, null, pulledby) - to_chat(pulledby, "[src] struggles against my grip!") + visible_message(span_warning("[src] struggles to break free from [pulledby]'s grip!"), \ + span_warning("I struggle against [pulledby]'s grip!"), null, null, pulledby) + to_chat(pulledby, span_warning("[src] struggles against my grip!")) return FALSE if(HAS_TRAIT(H, TRAIT_NOSEGRAB) && !HAS_TRAIT(src, TRAIT_MISSING_NOSE)) var/obj/item/bodypart/head = get_bodypart(BODY_ZONE_HEAD) @@ -1130,9 +1130,9 @@ if(G.limb_grabbed == head) if(G.grabbee == pulledby) if(G.sublimb_grabbed == BODY_ZONE_PRECISE_NOSE) - visible_message("[src] struggles to break free from [pulledby]'s grip!", \ - "I struggle against [pulledby]'s grip!", null, null, pulledby) - to_chat(pulledby, "[src] struggles against my grip!") + visible_message(span_warning("[src] struggles to break free from [pulledby]'s grip!"), \ + span_warning("I struggle against [pulledby]'s grip!"), null, null, pulledby) + to_chat(pulledby, span_warning("[src] struggles against my grip!")) return FALSE return ..() @@ -1185,28 +1185,28 @@ // Override if a certain type of mob should be behave differently when stripping items (can't, for example) /mob/living/stripPanelUnequip(obj/item/what, mob/who, where) if(!what.canStrip(who)) - to_chat(src, "I can't remove \the [what.name], it appears to be stuck!") + to_chat(src, span_warning("I can't remove \the [what.name], it appears to be stuck!")) return if(!has_active_hand()) //can't attack without a hand. - to_chat(src, "I lack working hands.") + to_chat(src, span_warning("I lack working hands.")) return if(!has_hand_for_held_index(active_hand_index)) //can't attack without a hand. - to_chat(src, "I can't move this hand.") + to_chat(src, span_warning("I can't move this hand.")) return if(check_arm_grabbed(active_hand_index)) - to_chat(src, "Someone is grabbing my arm!") + to_chat(src, span_warning("Someone is grabbing my arm!")) return if(istype(src, /mob/living/carbon/spirit)) - to_chat(src, "Your hands pass right through \the [what]!") + to_chat(src, span_warning("Your hands pass right through \the [what]!")) return - who.visible_message("[src] tries to remove [who]'s [what.name].", \ - "[src] tries to remove my [what.name].", null, null, src) - to_chat(src, "I try to remove [who]'s [what.name]...") + who.visible_message(span_warning("[src] tries to remove [who]'s [what.name]."), \ + span_danger("[src] tries to remove my [what.name]."), null, null, src) + to_chat(src, span_danger("I try to remove [who]'s [what.name]...")) what.add_fingerprint(src) if(do_mob(src, who, what.strip_delay)) if(what && Adjacent(who)) @@ -1229,7 +1229,7 @@ /mob/living/stripPanelEquip(obj/item/what, mob/who, where) what = src.get_active_held_item() if(what && (HAS_TRAIT(what, TRAIT_NODROP))) - to_chat(src, "I can't put \the [what.name] on [who], it's stuck to my hand!") + to_chat(src, span_warning("I can't put \the [what.name] on [who], it's stuck to my hand!")) return if(what) var/list/where_list @@ -1242,12 +1242,12 @@ final_where = where if(!what.mob_can_equip(who, src, final_where, TRUE, TRUE)) - to_chat(src, "\The [what.name] doesn't fit in that place!") + to_chat(src, span_warning("\The [what.name] doesn't fit in that place!")) return - who.visible_message("[src] tries to put [what] on [who].", \ - "[src] tries to put [what] on you.", null, null, src) - to_chat(src, "I try to put [what] on [who]...") + who.visible_message(span_notice("[src] tries to put [what] on [who]."), \ + span_notice("[src] tries to put [what] on you."), null, null, src) + to_chat(src, span_notice("I try to put [what] on [who]...")) if(do_mob(src, who, what.equip_delay_other)) if(what && Adjacent(who) && what.mob_can_equip(who, src, final_where, TRUE, TRUE)) if(temporarilyRemoveItemFromInventory(what)) @@ -1340,22 +1340,22 @@ /mob/living/canUseTopic(atom/movable/M, be_close=FALSE, no_dexterity=FALSE, no_tk=FALSE) if(incapacitated()) - to_chat(src, "I can't do that right now!") + to_chat(src, span_warning("I can't do that right now!")) return FALSE if(be_close && !in_range(M, src)) - to_chat(src, "I am too far away!") + to_chat(src, span_warning("I am too far away!")) return FALSE if(!no_dexterity) - to_chat(src, "I don't have the dexterity to do this!") + to_chat(src, span_warning("I don't have the dexterity to do this!")) return FALSE return TRUE /mob/living/proc/can_use_guns(obj/item/G)//actually used for more than guns! if(G.trigger_guard == TRIGGER_GUARD_NONE) - to_chat(src, "I are unable to fire this!") + to_chat(src, span_warning("I are unable to fire this!")) return FALSE if(G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser()) - to_chat(src, "I try to fire [G], but can't use the trigger!") + to_chat(src, span_warning("I try to fire [G], but can't use the trigger!")) return FALSE return TRUE @@ -1411,7 +1411,7 @@ var/mob/living/simple_animal/hostile/guardian/G = para G.summoner = new_mob G.Recall() - to_chat(G, "My summoner has changed form!") + to_chat(G, span_holoparasite("My summoner has changed form!")) /mob/living/rad_act(amount) . = ..() @@ -1449,8 +1449,8 @@ if(fire_stacks > 0 && !on_fire) testing("ignis") on_fire = 1 - src.visible_message("[src] catches fire!", \ - "I'm set on fire!") + src.visible_message(span_warning("[src] catches fire!"), \ + span_danger("I'm set on fire!")) new/obj/effect/dummy/lighting_obj/moblight/fire(src) throw_alert("fire", /atom/movable/screen/alert/fire) update_fire() @@ -1702,14 +1702,14 @@ if(!ishuman(user)) return if(user.get_active_held_item()) - to_chat(user, "My hands are full!") + to_chat(user, span_warning("My hands are full!")) return FALSE if(buckled) - to_chat(user, "[src] is buckled to something!") + to_chat(user, span_warning("[src] is buckled to something!")) return FALSE - user.visible_message("[user] starts trying to scoop up [src]!", \ - "I start trying to scoop up [src]...", null, null, src) - to_chat(src, "[user] starts trying to scoop you up!") + user.visible_message(span_warning("[user] starts trying to scoop up [src]!"), \ + span_danger("I start trying to scoop up [src]..."), null, null, src) + to_chat(src, span_danger("[user] starts trying to scoop you up!")) if(!do_after(user, 20, target = src)) return FALSE mob_pickup(user) @@ -1816,7 +1816,7 @@ return changeNext_move(CLICK_CD_EXHAUSTED) if(m_intent != MOVE_INTENT_SNEAK) - visible_message("[src] begins looking around.") + visible_message(span_info("[src] begins looking around.")) var/looktime = 50 - (STAPER * 2) if(do_after(src, looktime, target = src)) for(var/mob/living/M in view(7,src)) @@ -1834,14 +1834,14 @@ found_ping(get_turf(M), client, "hidden") if(M.m_intent == MOVE_INTENT_SNEAK) emote("huh") - to_chat(M, "[src] sees me! I'm found!") + to_chat(M, span_danger("[src] sees me! I'm found!")) M.mob_timers[MT_FOUNDSNEAK] = world.time else if(M.m_intent == MOVE_INTENT_SNEAK) if(M.client?.prefs.showrolls) - to_chat(M, "[src] didn't find me... [probby]%") + to_chat(M, span_warning("[src] didn't find me... [probby]%")) else - to_chat(M, "[src] didn't find me.") + to_chat(M, span_warning("[src] didn't find me.")) else found_ping(get_turf(M), client, "hidden") @@ -1878,29 +1878,29 @@ return changeNext_move(CLICK_CD_MELEE) if(m_intent != MOVE_INTENT_SNEAK) - visible_message("[src] looks up.") + visible_message(span_info("[src] looks up.")) var/turf/ceiling = get_step_multiz(src, UP) var/turf/T = get_turf(src) if(!ceiling) //We are at the highest z-level. if(T.can_see_sky()) switch(GLOB.forecast) if("prerain") - to_chat(src, "Dark clouds gather...") + to_chat(src, span_warning("Dark clouds gather...")) return if("rain") - to_chat(src, "A wet wind blows.") + to_chat(src, span_warning("A wet wind blows.")) return if("rainbow") - to_chat(src, "A beautiful rainbow!") + to_chat(src, span_notice("A beautiful rainbow!")) return if("fog") - to_chat(src, "I can't see anything, the fog has set in.") + to_chat(src, span_warning("I can't see anything, the fog has set in.")) return - to_chat(src, "There is nothing special to say about this weather.") + to_chat(src, span_warning("There is nothing special to say about this weather.")) do_time_change() return else if(!istransparentturf(ceiling)) //There is no turf we can look through above us - to_chat(src, "A ceiling above my head.") + to_chat(src, span_warning("A ceiling above my head.")) return if(T.can_see_sky()) @@ -1945,7 +1945,7 @@ if(ttime < 0) ttime = 0 if(m_intent != MOVE_INTENT_SNEAK) - visible_message("[src] looks into the distance.") + visible_message(span_info("[src] looks into the distance.")) animate(client, pixel_x = world.icon_size*_x, pixel_y = world.icon_size*_y, ttime) // RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(stop_looking)) update_cone_show() @@ -1976,7 +1976,7 @@ if(ttime < 0) ttime = 0 - visible_message("[src] looks down through [T].") + visible_message(span_info("[src] looks down through [T].")) if(!do_after(src, ttime, target = src)) return diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index f29a80ea4..e182e08bf 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -6,19 +6,19 @@ if(armor > 0 && armor_penetration) armor = max(0, armor - armor_penetration) if(penetrated_text) - to_chat(src, "[penetrated_text]") + to_chat(src, span_danger("[penetrated_text]")) // else -// to_chat(src, "My armor was penetrated!") +// to_chat(src, span_danger("My armor was penetrated!")) else if(armor >= 100) if(absorb_text) - to_chat(src, "[absorb_text]") + to_chat(src, span_notice("[absorb_text]")) // else -// to_chat(src, "My armor absorbs the blow!") +// to_chat(src, span_notice("My armor absorbs the blow!")) else if(armor > 0) if(soften_text) - to_chat(src, "[soften_text]") + to_chat(src, span_warning("[soften_text]")) // else -// to_chat(src, "My armor softens the blow!") +// to_chat(src, span_warning("My armor softens the blow!")) return armor @@ -68,7 +68,7 @@ var/mob/living/carbon/M = src M.reagents.add_reagent(P.poisontype, P.poisonamount) if(P.poisonfeel) - M.show_message("You feel an intense [P.poisonfeel] sensation spreading swiftly from the area!") + M.show_message(span_danger("You feel an intense [P.poisonfeel] sensation spreading swiftly from the area!")) if(P.embedchance && !check_projectile_embed(P, def_zone)) P.handle_drop() @@ -83,8 +83,8 @@ if(P.hitsound && !nodmg) var/volume = P.vol_by_damage() playsound(loc, pick(P.hitsound), volume, TRUE, -1) - visible_message("[src] is hit by \a [P][organ_hit_text]![next_attack_msg.Join()]", \ - "I'm hit by \a [P][organ_hit_text]![next_attack_msg.Join()]", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[src] is hit by \a [P][organ_hit_text]![next_attack_msg.Join()]"), \ + span_danger("I'm hit by \a [P][organ_hit_text]![next_attack_msg.Join()]"), null, COMBAT_MESSAGE_RANGE) next_attack_msg.Cut() @@ -134,8 +134,8 @@ if(((throwingdatum ? throwingdatum.speed : I.throw_speed) >= EMBED_THROWSPEED_THRESHOLD) || I.embedding.embedded_ignore_throwspeed_threshold) if(can_embed(I) && prob(I.embedding.embed_chance) && HAS_TRAIT(src, TRAIT_SIMPLE_WOUNDS) && !HAS_TRAIT(src, TRAIT_PIERCEIMMUNE)) simple_add_embedded_object(I, silent = FALSE, crit_message = TRUE) - visible_message("[src] is hit by [I]![next_attack_msg.Join()]", \ - "I'm hit by [I]![next_attack_msg.Join()]") + visible_message(span_danger("[src] is hit by [I]![next_attack_msg.Join()]"), \ + span_danger("I'm hit by [I]![next_attack_msg.Join()]")) next_attack_msg.Cut() if(I.thrownby) log_combat(I.thrownby, src, "threw and hit", I) @@ -149,7 +149,7 @@ /mob/living/mech_melee_attack(obj/mecha/M) if(M.occupant.used_intent.type == INTENT_HARM) if(HAS_TRAIT(M.occupant, TRAIT_PACIFISM)) - to_chat(M.occupant, "I don't want to harm other living beings!") + to_chat(M.occupant, span_warning("I don't want to harm other living beings!")) return M.do_attack_animation(src) if(M.damtype == "brute") @@ -167,16 +167,16 @@ else return updatehealth() - visible_message("[M.name] hits [src]!", \ - "[M.name] hits you!", "I hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I hit [src]!") + visible_message(span_danger("[M.name] hits [src]!"), \ + span_danger("[M.name] hits you!"), span_hear("I hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I hit [src]!")) log_combat(M.occupant, src, "attacked", M, "(INTENT: [uppertext(M.occupant.used_intent)]) (DAMTYPE: [uppertext(M.damtype)])") else step_away(src,M) log_combat(M.occupant, src, "pushed", M) - visible_message("[M] pushes [src] out of the way.", \ - "[M] pushes you out of the way.", "I hear aggressive shuffling!", 5, M) - to_chat(M, "I push [src] out of the way.") + visible_message(span_warning("[M] pushes [src] out of the way."), \ + span_warning("[M] pushes you out of the way."), span_hear("I hear aggressive shuffling!"), 5, M) + to_chat(M, span_danger("I push [src] out of the way.")) /mob/living/fire_act(added, maxstacks) if(added > 20) @@ -203,11 +203,11 @@ return /* if(!(status_flags & CANPUSH) || HAS_TRAIT(src, TRAIT_PUSHIMMUNE)) - to_chat(user, "[src] can't be grabbed more aggressively!") + to_chat(user, span_warning("[src] can't be grabbed more aggressively!")) return FALSE if(user.grab_state >= GRAB_AGGRESSIVE && HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "I don't want to risk hurting [src]!") + to_chat(user, span_warning("I don't want to risk hurting [src]!")) return FALSE grippedby(user)*/ @@ -231,12 +231,12 @@ probby = clamp(probby, 5, 95) if(prob(probby) && !instant && !stat && cmode) - visible_message("[user] struggles with [src]!", - "[user] struggles to restrain me!", "I hear aggressive shuffling!", null, user) + visible_message(span_warning("[user] struggles with [src]!"), + span_warning("[user] struggles to restrain me!"), span_hear("I hear aggressive shuffling!"), null, user) if(src.client?.prefs.showrolls) - to_chat(user, "I struggle with [src]! [probby]%") + to_chat(user, span_warning("I struggle with [src]! [probby]%")) else - to_chat(user, "I struggle with [src]!") + to_chat(user, span_warning("I struggle with [src]!")) playsound(src.loc, 'sound/foley/struggle.ogg', 100, FALSE, -1) user.Immobilize(2 SECONDS) user.changeNext_move(2 SECONDS) @@ -311,13 +311,13 @@ /mob/living/proc/send_grabbed_message(mob/living/carbon/user) if(HAS_TRAIT(user, TRAIT_PACIFISM)) - visible_message("[user] firmly grips [src]!", - "[user] firmly grips me!", "I hear aggressive shuffling!", null, user) - to_chat(user, "I firmly grip [src]!") + visible_message(span_danger("[user] firmly grips [src]!"), + span_danger("[user] firmly grips me!"), span_hear("I hear aggressive shuffling!"), null, user) + to_chat(user, span_danger("I firmly grip [src]!")) else - visible_message("[user] tightens [user.p_their()] grip on [src]!", \ - "[user] tightens [user.p_their()] grip on me!", "I hear aggressive shuffling!", null, user) - to_chat(user, "I tighten my grip on [src]!") + visible_message(span_danger("[user] tightens [user.p_their()] grip on [src]!"), \ + span_danger("[user] tightens [user.p_their()] grip on me!"), span_hear("I hear aggressive shuffling!"), null, user) + to_chat(user, span_danger("I tighten my grip on [src]!")) /mob/living/attack_slime(mob/living/simple_animal/slime/M) if(!SSticker.HasRoundStarted()) @@ -330,15 +330,15 @@ return // can't attack while eating! if(HAS_TRAIT(src, TRAIT_PACIFISM)) - to_chat(M, "I don't want to hurt anyone!") + to_chat(M, span_warning("I don't want to hurt anyone!")) return FALSE if (stat != DEAD) log_combat(M, src, "attacked") M.do_attack_animation(src) - visible_message("\The [M.name] glomps [src]!", \ - "\The [M.name] glomps me!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I glomp [src]!") + visible_message(span_danger("\The [M.name] glomps [src]!"), \ + span_danger("\The [M.name] glomps me!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I glomp [src]!")) return TRUE /mob/living/attack_animal(mob/living/simple_animal/M) @@ -347,11 +347,11 @@ M.swinging = TRUE M.face_atom(src) if(M.melee_damage_upper == 0) - visible_message("\The [M] [pick(M.a_intent.attack_verb)] [src].", \ - "\The [M] [pick(M.a_intent.attack_verb)] me!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_notice("\The [M] [pick(M.a_intent.attack_verb)] [src]."), \ + span_notice("\The [M] [pick(M.a_intent.attack_verb)] me!"), null, COMBAT_MESSAGE_RANGE) return FALSE if(HAS_TRAIT(M, TRAIT_PACIFISM)) - to_chat(M, "I don't want to hurt anyone!") + to_chat(M, span_warning("I don't want to hurt anyone!")) return FALSE M.do_attack_animation(src, visual_effect_icon = M.a_intent.animname) @@ -391,66 +391,66 @@ if (M.used_intent.type == INTENT_HARM) if(HAS_TRAIT(M, TRAIT_PACIFISM)) - to_chat(M, "I don't want to hurt anyone!") + to_chat(M, span_info("I don't want to hurt anyone!")) return FALSE if(M.is_muzzled() || M.is_mouth_covered(FALSE, TRUE)) - to_chat(M, "I can't bite with my mouth covered!") + to_chat(M, span_warning("I can't bite with my mouth covered!")) return FALSE M.do_attack_animation(src, ATTACK_EFFECT_BITE) if (prob(75)) log_combat(M, src, "attacked") playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) - visible_message("[M.name] bites [src]!", \ - "[M.name] bites you!", "I hear a chomp!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I bite [src]!") + visible_message(span_danger("[M.name] bites [src]!"), \ + span_danger("[M.name] bites you!"), span_hear("I hear a chomp!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I bite [src]!")) return TRUE else - visible_message("[M.name]'s bite misses [src]!", \ - "I avoid [M.name]'s bite!", "I hear the sound of jaws snapping shut!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "My bite misses [src]!") + visible_message(span_danger("[M.name]'s bite misses [src]!"), \ + span_danger("I avoid [M.name]'s bite!"), span_hear("I hear the sound of jaws snapping shut!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_warning("My bite misses [src]!")) return FALSE /mob/living/attack_larva(mob/living/carbon/alien/larva/L) switch(L.used_intent.type) if(INTENT_HELP) - visible_message("[L.name] rubs its head against [src].", \ - "[L.name] rubs its head against you.", null, null, L) - to_chat(L, "I rub my head against [src].") + visible_message(span_notice("[L.name] rubs its head against [src]."), \ + span_notice("[L.name] rubs its head against you."), null, null, L) + to_chat(L, span_notice("I rub my head against [src].")) return FALSE else if(HAS_TRAIT(L, TRAIT_PACIFISM)) - to_chat(L, "I don't want to hurt anyone!") + to_chat(L, span_warning("I don't want to hurt anyone!")) return L.do_attack_animation(src) if(prob(90)) log_combat(L, src, "attacked") - visible_message("[L.name] bites [src]!", \ - "[L.name] bites you!", "I hear a chomp!", COMBAT_MESSAGE_RANGE, L) - to_chat(L, "I bite [src]!") + visible_message(span_danger("[L.name] bites [src]!"), \ + span_danger("[L.name] bites you!"), span_hear("I hear a chomp!"), COMBAT_MESSAGE_RANGE, L) + to_chat(L, span_danger("I bite [src]!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) return TRUE else - visible_message("[L.name]'s bite misses [src]!", \ - "I avoid [L.name]'s bite!", "I hear the sound of jaws snapping shut!", COMBAT_MESSAGE_RANGE, L) - to_chat(L, "My bite misses [src]!") + visible_message(span_danger("[L.name]'s bite misses [src]!"), \ + span_danger("I avoid [L.name]'s bite!"), span_hear("I hear the sound of jaws snapping shut!"), COMBAT_MESSAGE_RANGE, L) + to_chat(L, span_warning("My bite misses [src]!")) return FALSE /mob/living/attack_alien(mob/living/carbon/alien/humanoid/M) switch(M.used_intent.type) if (INTENT_HELP) - visible_message("[M] caresses [src] with its scythe-like arm.", \ - "[M] caresses you with its scythe-like arm.", null, null, M) - to_chat(M, "I caress [src] with my scythe-like arm.") + visible_message(span_notice("[M] caresses [src] with its scythe-like arm."), \ + span_notice("[M] caresses you with its scythe-like arm."), null, null, M) + to_chat(M, span_notice("I caress [src] with my scythe-like arm.")) return FALSE if (INTENT_GRAB) grabbedby(M) return FALSE if(INTENT_HARM) if(HAS_TRAIT(M, TRAIT_PACIFISM)) - to_chat(M, "I don't want to hurt anyone!") + to_chat(M, span_warning("I don't want to hurt anyone!")) return FALSE M.do_attack_animation(src) return TRUE @@ -461,7 +461,7 @@ /mob/living/attack_hulk(mob/living/carbon/human/user) ..() if(HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "I don't want to hurt [src]!") + to_chat(user, span_warning("I don't want to hurt [src]!")) return FALSE return TRUE @@ -477,24 +477,24 @@ if (M.used_intent.type == INTENT_HARM) if(HAS_TRAIT(M, TRAIT_PACIFISM)) - to_chat(M, "I don't want to hurt anyone!") + to_chat(M, span_info("I don't want to hurt anyone!")) return FALSE if(M.is_muzzled() || M.is_mouth_covered(FALSE, TRUE)) - to_chat(M, "I can't bite with my mouth covered!") + to_chat(M, span_warning("I can't bite with my mouth covered!")) return FALSE M.do_attack_animation(src, ATTACK_EFFECT_BITE) if (prob(75)) log_combat(M, src, "attacked") playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) - visible_message("[M.name] bites [src]!", \ - "[M.name] bites you!", "I hear a chomp!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I bite [src]!") + visible_message(span_danger("[M.name] bites [src]!"), \ + span_danger("[M.name] bites you!"), span_hear("I hear a chomp!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I bite [src]!")) return TRUE else - visible_message("[M.name]'s bite misses [src]!", \ - "I avoid [M.name]'s bite!", "I hear the sound of jaws snapping shut!", COMBAT_MESSAGE_RANGE, M) - to_chat(M, "My bite misses [src]!") + visible_message(span_danger("[M.name]'s bite misses [src]!"), \ + span_danger("I avoid [M.name]'s bite!"), span_hear("I hear the sound of jaws snapping shut!"), COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_warning("My bite misses [src]!")) return FALSE //Looking for irradiate()? It's been moved to radiation.dm under the rad_act() for mobs. @@ -518,9 +518,9 @@ else adjustStaminaLoss(shock_damage) visible_message( - "[src] was shocked by \the [source]!", \ - "I feel a powerful shock coursing through my body!", \ - "I hear a heavy electrical crack." \ + span_danger("[src] was shocked by \the [source]!"), \ + span_danger("I feel a powerful shock coursing through my body!"), \ + span_hear("I hear a heavy electrical crack.") \ ) playsound(get_turf(src), pick('sound/misc/elec (1).ogg', 'sound/misc/elec (2).ogg', 'sound/misc/elec (3).ogg'), 100, FALSE) return shock_damage diff --git a/code/modules/mob/living/living_topic.dm b/code/modules/mob/living/living_topic.dm index 65a35d029..0c5ebc429 100644 --- a/code/modules/mob/living/living_topic.dm +++ b/code/modules/mob/living/living_topic.dm @@ -2,12 +2,12 @@ var/observer_privilege = isobserver(usr) if(href_list["check_hb"] && (observer_privilege || usr.canUseTopic(src, BE_CLOSE, NO_DEXTERITY))) if(!observer_privilege) - usr.visible_message("[usr] tries to hear [src]'s heartbeat.") + usr.visible_message(span_info("[usr] tries to hear [src]'s heartbeat.")) if(!do_after(usr, 30, needhand = TRUE, target = src)) return var/list/following_my_heart = check_heartbeat(usr) if(following_my_heart) - to_chat(usr, "[following_my_heart.Join("\n")]") + to_chat(usr, span_info("[following_my_heart.Join("\n")]")) return ..() @@ -29,7 +29,7 @@ message += "[p_they(TRUE)] commited suicide... Nothing can be done..." if(isobserver(user) || HAS_TRAIT(user, TRAIT_SOUL_EXAMINE)) if(!key && !get_ghost(FALSE, TRUE)) - message += "[p_their(TRUE)] soul has departed..." + message += span_deadsay("[p_their(TRUE)] soul has departed...") else - message += "[p_they(TRUE)] [p_are()] still earthbound." + message += span_deadsay("[p_they(TRUE)] [p_are()] still earthbound.") return message diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index 777448fc8..a78e9a4cd 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -25,10 +25,10 @@ //Vents // if(ventcrawler) -// to_chat(src, "I can ventcrawl! Use alt+click on vents to quickly travel about the station.") +// to_chat(src, span_notice("I can ventcrawl! Use alt+click on vents to quickly travel about the station.")) if(ranged_ability) - ranged_ability.add_ranged_ability(src, "I currently have [ranged_ability] active!") + ranged_ability.add_ranged_ability(src, span_notice("I currently have [ranged_ability] active!")) var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling) if(changeling) diff --git a/code/modules/mob/living/roguetownprocs.dm b/code/modules/mob/living/roguetownprocs.dm index 22cf5585e..6304350ba 100644 --- a/code/modules/mob/living/roguetownprocs.dm +++ b/code/modules/mob/living/roguetownprocs.dm @@ -52,11 +52,11 @@ return zone else if(user.client?.prefs.showrolls) - to_chat(user, "Accuracy fail! [chance2hit]%") + to_chat(user, span_warning("Accuracy fail! [chance2hit]%")) return check_zone(zone) else if(user.client?.prefs.showrolls) - to_chat(user, "Double accuracy fail! [chance2hit]%") + to_chat(user, span_warning("Double accuracy fail! [chance2hit]%")) return BODY_ZONE_CHEST /mob/proc/get_generic_parry_drain() @@ -71,7 +71,7 @@ return FALSE if(user.badluck(4)) var/list/usedp = list("Critical miss!", "Damn! Critical miss!", "No! Critical miss!", "It can't be! Critical miss!", "Betrayed by lady luck! Critical miss!", "Bad luck! Critical miss!", "Curse creation! Critical miss!", "What?! Critical miss!") - to_chat(user, "[pick(usedp)]") + to_chat(user, span_boldwarning("[pick(usedp)]")) flash_fullscreen("blackflash2") user.aftermiss() return TRUE @@ -190,14 +190,14 @@ prob2defend *= 0.65 prob2defend = clamp(prob2defend, 5, 90) if(src.client?.prefs.showrolls) - to_chat(src, "Roll to parry... [prob2defend]%") + to_chat(src, span_info("Roll to parry... [prob2defend]%")) if(prob(prob2defend)) if(intenty.masteritem) if(intenty.masteritem.wbalance < 0 && user.STASTR > src.STASTR) //enemy weapon is heavy, so get a bonus scaling on strdiff drained = drained + ( intenty.masteritem.wbalance * ((user.STASTR - src.STASTR) * -5) ) else - to_chat(src, "The enemy defeated my parry!") + to_chat(src, span_warning("The enemy defeated my parry!")) return FALSE drained = max(drained, 5) @@ -299,7 +299,7 @@ if(pulledby) return FALSE if(!turfy) - to_chat(src, "There's nowhere to dodge to!") + to_chat(src, span_boldwarning("There's nowhere to dodge to!")) return FALSE else if(do_dodge(user, turfy)) @@ -318,12 +318,12 @@ if(W) playsound(get_turf(src), pick(W.parrysound), 100, FALSE) if(istype(rmb_intent, /datum/rmb_intent/riposte)) - src.visible_message("[src] ripostes [user] with [W]!") + src.visible_message(span_boldwarning("[src] ripostes [user] with [W]!")) else - src.visible_message("[src] parries [user] with [W]!") + src.visible_message(span_boldwarning("[src] parries [user] with [W]!")) return TRUE else - to_chat(src, "I'm too tired to parry!") + to_chat(src, span_warning("I'm too tired to parry!")) return FALSE //crush through else if(W) @@ -335,10 +335,10 @@ var/mob/living/carbon/human/H = src if(H.rogfat_add(parrydrain)) playsound(get_turf(src), pick(parry_sound), 100, FALSE) - src.visible_message("[src] parries [user]!") + src.visible_message(span_warning("[src] parries [user]!")) return TRUE else - to_chat(src, "I'm too tired to parry!") + to_chat(src, span_boldwarning("I'm too tired to parry!")) return FALSE else playsound(get_turf(src), pick(parry_sound), 100, FALSE) @@ -411,30 +411,30 @@ prob2defend *= 0.25 prob2defend = clamp(prob2defend, 5, 90) if(client?.prefs.showrolls) - to_chat(src, "Roll to dodge... [prob2defend]%") + to_chat(src, span_info("Roll to dodge... [prob2defend]%")) if(!prob(prob2defend)) return FALSE if(!H.rogfat_add(max(drained,5))) - to_chat(src, "I'm too tired to dodge!") + to_chat(src, span_warning("I'm too tired to dodge!")) return FALSE else //we are a non human prob2defend = clamp(prob2defend, 5, 90) if(client?.prefs.showrolls) - to_chat(src, "Roll to dodge... [prob2defend]%") + to_chat(src, span_info("Roll to dodge... [prob2defend]%")) if(!prob(prob2defend)) return FALSE dodgecd = TRUE playsound(src, 'sound/combat/dodge.ogg', 100, FALSE) throw_at(turfy, 1, 2, src, FALSE) if(drained > 0) - src.visible_message("[src] dodges [user]'s attack!") + src.visible_message(span_warning("[src] dodges [user]'s attack!")) else - src.visible_message("[src] easily dodges [user]'s attack!") + src.visible_message(span_warning("[src] easily dodges [user]'s attack!")) dodgecd = FALSE // if(H) // if(H.IsOffBalanced()) // H.Knockdown(1) -// to_chat(H, "I tried to dodge off-balance!") +// to_chat(H, span_danger("I tried to dodge off-balance!")) // if(isturf(loc)) // var/turf/T = loc // if(T.landsound) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 0747f04d0..02943d67c 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -100,14 +100,14 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(ic_blocked) //The filter warning message shows the sanitized message though. - to_chat(src, "That message contained a word prohibited in IC chat! Consider reviewing the server rules.\n\"[message]\"") + to_chat(src, span_warning("That message contained a word prohibited in IC chat! Consider reviewing the server rules.\n\"[message]\"")) SSblackbox.record_feedback("tally", "ic_blocked_words", 1, lowertext(config.ic_filter_regex.match)) return var/static/regex/ooc_regex = regex(@"^(?=.*[\(\)\[\]\<\>\{\}]).*$") //Yes, i know. if(findtext(message, ooc_regex)) emote("me", 1, "mumbles incoherently.") - to_chat(src, "That was stupid of me. I should meditate on my actions.") + to_chat(src, span_warning("That was stupid of me. I should meditate on my actions.")) add_stress(/datum/stressevent/ooc_ic) return @@ -174,7 +174,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(!can_speak_vocal(message)) // visible_message("[src] makes a muffled noise.") - to_chat(src, "I can't talk.") + to_chat(src, span_warning("I can't talk.")) return var/message_range = 7 @@ -261,7 +261,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( deaf_message = "[speaker] [speaker.verb_say] something but you cannot hear [speaker.p_them()]." deaf_type = 1 else - deaf_message = "I can't hear yourself!" + deaf_message = span_notice("I can't hear yourself!") deaf_type = 2 // Since you should be able to hear myself without looking // Create map text prior to modifying message for goonchat @@ -350,7 +350,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( /mob/living/proc/can_speak_basic(message, ignore_spam = FALSE, forced = FALSE) //Check BEFORE handling of xeno and ling channels if(client) if(client.prefs.muted & MUTE_IC) - to_chat(src, "I cannot speak in IC (muted).") + to_chat(src, span_danger("I cannot speak in IC (muted).")) return FALSE if(!(ignore_spam || forced) && client.handle_spam_prevention(message,MUTE_IC)) return FALSE diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index d86ab1b28..dcfe5b254 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -115,8 +115,8 @@ target_ai.mind.transfer_to(src) if(mind.special_role) mind.store_memory("As an AI, you must obey my silicon laws above all else. Your objectives will consider you to be dead.") - to_chat(src, "I have been installed as an AI! ") - to_chat(src, "I must obey my silicon laws above all else. Your objectives will consider you to be dead.") + to_chat(src, span_danger("I have been installed as an AI! ")) + to_chat(src, span_danger("I must obey my silicon laws above all else. Your objectives will consider you to be dead.")) to_chat(src, "I are playing the station's AI. The AI cannot move, but can interact with many objects while viewing them (through cameras).") to_chat(src, "To look at other parts of the station, click on myself to get a camera menu.") @@ -287,7 +287,7 @@ /mob/living/silicon/ai/proc/ai_call_shuttle() if(control_disabled) - to_chat(usr, "Wireless control is disabled!") + to_chat(usr, span_warning("Wireless control is disabled!")) return var/reason = input(src, "What is the nature of my emergency? ([CALL_SHUTTLE_REASON_LENGTH] characters required.)", "Confirm Shuttle Call") as null|text @@ -336,10 +336,10 @@ return if(incapacitated()) if(battery < 50) - to_chat(src, "Insufficient backup power!") + to_chat(src, span_warning("Insufficient backup power!")) return battery = battery - 50 - to_chat(src, "I route power from my backup battery to move the bolts.") + to_chat(src, span_notice("I route power from my backup battery to move the bolts.")) var/is_anchored = FALSE if(move_resist == MOVE_FORCE_OVERPOWERING) move_resist = MOVE_FORCE_NORMAL @@ -361,7 +361,7 @@ /mob/living/silicon/ai/proc/ai_cancel_call() set category = "Malfunction" if(control_disabled) - to_chat(src, "Wireless control is disabled!") + to_chat(src, span_warning("Wireless control is disabled!")) return SSshuttle.cancelEvac(src) @@ -396,7 +396,7 @@ if(H) H.attack_ai(src) //may as well recycle else - to_chat(src, "Unable to locate the holopad.") + to_chat(src, span_notice("Unable to locate the holopad.")) if(href_list["track"]) var/string = href_list["track"] trackable_mobs() @@ -416,13 +416,13 @@ return if(href_list["callbot"]) //Command a bot to move to a selected location. if(call_bot_cooldown > world.time) - to_chat(src, "Error: Your last call bot command is still processing, please wait for the bot to finish calculating a route.") + to_chat(src, span_danger("Error: Your last call bot command is still processing, please wait for the bot to finish calculating a route.")) return Bot = locate(href_list["callbot"]) in GLOB.alive_mob_list if(!Bot || Bot.remote_disabled || control_disabled) return //True if there is no bot found, the bot is manually emagged, or the AI is carded with wireless off. waypoint_mode = 1 - to_chat(src, "Set my waypoint by clicking on a valid location free of obstructions.") + to_chat(src, span_notice("Set my waypoint by clicking on a valid location free of obstructions.")) return if(href_list["interface"]) //Remotely connect to a bot! Bot = locate(href_list["interface"]) in GLOB.alive_mob_list @@ -448,13 +448,13 @@ return if(controlled_mech) - to_chat(src, "I are already loaded into an onboard computer!") + to_chat(src, span_warning("I are already loaded into an onboard computer!")) return if(!GLOB.cameranet.checkCameraVis(M)) - to_chat(src, "Exosuit is no longer near active cameras.") + to_chat(src, span_warning("Exosuit is no longer near active cameras.")) return if(!isturf(loc)) - to_chat(src, "I aren't in my core!") + to_chat(src, span_warning("I aren't in my core!")) return if(M) M.transfer_ai(AI_MECH_HACK, src, usr) //Called om the mech itself. @@ -482,7 +482,7 @@ return if(control_disabled) - to_chat(src, "Wireless control is disabled.") + to_chat(src, span_warning("Wireless control is disabled.")) return var/turf/ai_current_turf = get_turf(src) var/ai_Zlevel = ai_current_turf.z @@ -493,7 +493,7 @@ for (Bot in GLOB.alive_mob_list) if(Bot.z == ai_Zlevel && !Bot.remote_disabled) //Only non-emagged bots on the same Z-level are detected! var/bot_mode = Bot.get_mode() - d += "[Bot.hacked ? "(!)" : ""] [Bot.name] ([Bot.model])" + d += "[Bot.hacked ? span_bad("(!)") : ""] [Bot.name] ([Bot.model])" //If the bot is on, it will display the bot's current mode status. If the bot is not mode, it will just report "Idle". "Inactive if it is not on at all. d += "[bot_mode]" d += "[get_area_name(Bot, TRUE)]" @@ -514,7 +514,7 @@ else if(GLOB.cameranet && GLOB.cameranet.checkTurfVis(turf_check)) call_bot(turf_check) else - to_chat(src, "Selected location is not visible.") + to_chat(src, span_danger("Selected location is not visible.")) /mob/living/silicon/ai/proc/call_bot(turf/waypoint) @@ -522,9 +522,9 @@ return if(Bot.calling_ai && Bot.calling_ai != src) //Prevents an override if another AI is controlling this bot. - to_chat(src, "Interface error. Unit is already in use.") + to_chat(src, span_danger("Interface error. Unit is already in use.")) return - to_chat(src, "Sending command to bot...") + to_chat(src, span_notice("Sending command to bot...")) call_bot_cooldown = world.time + CALL_BOT_COOLDOWN Bot.call_bot(src, waypoint) call_bot_cooldown = 0 @@ -626,7 +626,7 @@ if(network in C.network) U.eyeobj.setLoc(get_turf(C)) break - to_chat(src, "Switched to the \"[uppertext(network)]\" camera network.") + to_chat(src, span_notice("Switched to the \"[uppertext(network)]\" camera network.")) //End of code by Mord_Sith @@ -737,7 +737,7 @@ var/obj/machinery/power/apc/apc = src.loc if(!istype(apc)) - to_chat(src, "I are already in my Main Core.") + to_chat(src, span_notice("I are already in my Main Core.")) return apc.malfvacate() @@ -809,11 +809,11 @@ return if(interaction == AI_TRANS_TO_CARD)//The only possible interaction. Upload AI mob to a card. if(!can_be_carded) - to_chat(user, "Transfer failed.") + to_chat(user, span_boldwarning("Transfer failed.")) return disconnect_shell() //If the AI is controlling a borg, force the player back to core! if(!mind) - to_chat(user, "No intelligence patterns detected.") + to_chat(user, span_warning("No intelligence patterns detected.")) return ShutOffDoomsdayDevice() var/obj/structure/AIcore/new_core = new /obj/structure/AIcore/deactivated(loc)//Spawns a deactivated terminal at AI location. @@ -836,10 +836,10 @@ /mob/living/silicon/ai/canUseTopic(atom/movable/M, be_close=FALSE, no_dexterity=FALSE, no_tk=FALSE) if(control_disabled || incapacitated()) - to_chat(src, "I can't do that right now!") + to_chat(src, span_warning("I can't do that right now!")) return FALSE if(be_close && !in_range(M, src)) - to_chat(src, "I are too far away!") + to_chat(src, span_warning("I are too far away!")) return FALSE return can_see(M) //stop AIs from leaving windows open and using then after they lose vision @@ -937,10 +937,10 @@ clear_alert("hackingapc") if(!istype(apc) || QDELETED(apc) || apc.stat & BROKEN) - to_chat(src, "Hack aborted. The designated APC no longer exists on the power network.") + to_chat(src, span_danger("Hack aborted. The designated APC no longer exists on the power network.")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE, ignore_walls = FALSE) else if(apc.aidisabled) - to_chat(src, "Hack aborted. \The [apc] is no longer responding to our systems.") + to_chat(src, span_danger("Hack aborted. \The [apc] is no longer responding to our systems.")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE, ignore_walls = FALSE) else malf_picker.processing_time += 10 @@ -961,7 +961,7 @@ if(incapacitated()) return if(control_disabled) - to_chat(src, "Wireless networking module is offline.") + to_chat(src, span_warning("Wireless networking module is offline.")) return var/list/possible = list() @@ -1017,7 +1017,7 @@ /mob/living/silicon/ai/proc/disconnect_shell() if(deployed_shell) //Forcibly call back AI in event of things such as damage, EMP or power loss. - to_chat(src, "My remote connection has been reset!") + to_chat(src, span_danger("My remote connection has been reset!")) deployed_shell.undeploy() diag_hud_set_deployed() diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm index 26aadfd51..3202372a8 100644 --- a/code/modules/mob/living/silicon/ai/examine.dm +++ b/code/modules/mob/living/silicon/ai/examine.dm @@ -1,18 +1,18 @@ /mob/living/silicon/ai/examine(mob/user) . = list("*---------*\nThis is [icon2html(src, user)] [src]!") if (stat == DEAD) - . += "It appears to be powered-down." + . += span_deadsay("It appears to be powered-down.") else if (getBruteLoss()) if (getBruteLoss() < 30) - . += "It looks slightly dented." + . += span_warning("It looks slightly dented.") else - . += "It looks severely dented!" + . += span_warning("It looks severely dented!") if (getFireLoss()) if (getFireLoss() < 30) - . += "It looks slightly charred." + . += span_warning("It looks slightly charred.") else - . += "Its casing is melted and heat-warped!" + . += span_warning("Its casing is melted and heat-warped!") if(deployed_shell) . += "The wireless networking light is blinking.\n" else if (!shunted && !client) diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index 894036b57..b5052921d 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -29,7 +29,7 @@ if(aiRestorePowerRoutine) // Lost power if (!battery) - to_chat(src, "My backup battery's output drops below usable levels. It takes only a moment longer for my systems to fail, corrupted and unusable.") + to_chat(src, span_warning("My backup battery's output drops below usable levels. It takes only a moment longer for my systems to fail, corrupted and unusable.")) adjustOxyLoss(200) else battery -- @@ -94,7 +94,7 @@ /mob/living/silicon/ai/proc/start_RestorePowerRoutine() - to_chat(src, "Backup battery online. Scanners, camera, and radio interface offline. Beginning fault-detection.") + to_chat(src, span_notice("Backup battery online. Scanners, camera, and radio interface offline. Beginning fault-detection.")) end_multicam() sleep(50) var/turf/T = get_turf(src) @@ -103,16 +103,16 @@ if(!isspaceturf(T)) ai_restore_power() return - to_chat(src, "Fault confirmed: missing external power. Shutting down main control system to save power.") + to_chat(src, span_notice("Fault confirmed: missing external power. Shutting down main control system to save power.")) sleep(20) - to_chat(src, "Emergency control system online. Verifying connection to power network.") + to_chat(src, span_notice("Emergency control system online. Verifying connection to power network.")) sleep(50) T = get_turf(src) if(isspaceturf(T)) - to_chat(src, "Unable to verify! No power connection detected!") + to_chat(src, span_alert("Unable to verify! No power connection detected!")) aiRestorePowerRoutine = POWER_RESTORATION_SEARCH_APC return - to_chat(src, "Connection verified. Searching for APC in power network.") + to_chat(src, span_notice("Connection verified. Searching for APC in power network.")) sleep(50) var/obj/machinery/power/apc/theAPC = null @@ -128,9 +128,9 @@ if (!theAPC) switch(PRP) if(1) - to_chat(src, "Unable to locate APC!") + to_chat(src, span_alert("Unable to locate APC!")) else - to_chat(src, "Lost connection with the APC!") + to_chat(src, span_alert("Lost connection with the APC!")) aiRestorePowerRoutine = POWER_RESTORATION_SEARCH_APC return if(AIarea.power_equip) @@ -139,15 +139,15 @@ return switch(PRP) if (1) - to_chat(src, "APC located. Optimizing route to APC to avoid needless power waste.") + to_chat(src, span_notice("APC located. Optimizing route to APC to avoid needless power waste.")) if (2) - to_chat(src, "Best route identified. Hacking offline APC power port.") + to_chat(src, span_notice("Best route identified. Hacking offline APC power port.")) if (3) - to_chat(src, "Power port upload access confirmed. Loading control program into APC power port software.") + to_chat(src, span_notice("Power port upload access confirmed. Loading control program into APC power port software.")) if (4) - to_chat(src, "Transfer complete. Forcing APC to execute program.") + to_chat(src, span_notice("Transfer complete. Forcing APC to execute program.")) sleep(50) - to_chat(src, "Receiving control information from APC.") + to_chat(src, span_notice("Receiving control information from APC.")) sleep(2) apc_override = 1 theAPC.ui_interact(src, state = GLOB.conscious_state) @@ -159,9 +159,9 @@ /mob/living/silicon/ai/proc/ai_restore_power() if(aiRestorePowerRoutine) if(aiRestorePowerRoutine == POWER_RESTORATION_APC_FOUND) - to_chat(src, "Alert cancelled. Power has been restored.") + to_chat(src, span_notice("Alert cancelled. Power has been restored.")) else - to_chat(src, "Alert cancelled. Power has been restored without our assistance.") + to_chat(src, span_notice("Alert cancelled. Power has been restored without our assistance.")) aiRestorePowerRoutine = POWER_RESTORATION_OFF set_blindness(0) update_sight() @@ -171,7 +171,7 @@ aiRestorePowerRoutine = POWER_RESTORATION_START blind_eyes(1) update_sight() - to_chat(src, "You've lost power!") + to_chat(src, span_alert("You've lost power!")) addtimer(CALLBACK(src, PROC_REF(start_RestorePowerRoutine)), 20) #undef POWER_RESTORATION_OFF diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm index d719f1a01..37ca9fe31 100644 --- a/code/modules/mob/living/silicon/ai/multicam.dm +++ b/code/modules/mob/living/silicon/ai/multicam.dm @@ -200,25 +200,25 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) /mob/living/silicon/ai/proc/drop_new_multicam(silent = FALSE) if(!CONFIG_GET(flag/allow_ai_multicam)) if(!silent) - to_chat(src, "This action is currently disabled. Contact an administrator to enable this feature.") + to_chat(src, span_warning("This action is currently disabled. Contact an administrator to enable this feature.")) return if(!eyeobj) return if(multicam_screens.len >= max_multicams) if(!silent) - to_chat(src, "Cannot place more than [max_multicams] multicamera windows.") + to_chat(src, span_warning("Cannot place more than [max_multicams] multicamera windows.")) return var/atom/movable/screen/movable/pic_in_pic/ai/C = new /atom/movable/screen/movable/pic_in_pic/ai() C.set_view_size(3, 3, FALSE) C.set_view_center(get_turf(eyeobj)) C.set_ai(src) if(!silent) - to_chat(src, "Added new multicamera window.") + to_chat(src, span_notice("Added new multicamera window.")) return C /mob/living/silicon/ai/proc/toggle_multicam() if(!CONFIG_GET(flag/allow_ai_multicam)) - to_chat(src, "This action is currently disabled. Contact an administrator to enable this feature.") + to_chat(src, span_warning("This action is currently disabled. Contact an administrator to enable this feature.")) return if(multicam_on) end_multicam() @@ -229,11 +229,11 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) if(multicam_on || aiRestorePowerRoutine || !isturf(loc)) return if(!GLOB.ai_camera_room_landmark) - to_chat(src, "This function is not available at this time.") + to_chat(src, span_warning("This function is not available at this time.")) return multicam_on = TRUE refresh_multicam() - to_chat(src, "Multiple-camera viewing mode activated.") + to_chat(src, span_notice("Multiple-camera viewing mode activated.")) /mob/living/silicon/ai/proc/refresh_multicam() reset_perspective(GLOB.ai_camera_room_landmark) @@ -252,7 +252,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) var/atom/movable/screen/movable/pic_in_pic/P = V P.unshow_to(client) reset_perspective() - to_chat(src, "Multiple-camera viewing mode deactivated.") + to_chat(src, span_notice("Multiple-camera viewing mode deactivated.")) /mob/living/silicon/ai/proc/select_main_multicam_window(atom/movable/screen/movable/pic_in_pic/ai/P) diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index a7b2626a6..ca41cbbb2 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -21,7 +21,7 @@ if(incapacitated()) return FALSE if(!radio_enabled) //AI cannot speak if radio is disabled (via intellicard) or depowered. - to_chat(src, "My radio transmitter is offline!") + to_chat(src, span_danger("My radio transmitter is offline!")) return FALSE ..() @@ -52,7 +52,7 @@ send_speech(message, 7, T, "robot", message_language = language) to_chat(src, "Holopad transmitted, [real_name] \"[message]\"") else - to_chat(src, "No holopad connected.") + to_chat(src, span_alert("No holopad connected.")) // Make sure that the code compiles with AI_VOX undefined @@ -93,7 +93,7 @@ /mob/living/silicon/ai/proc/announcement() var/static/announcing_vox = 0 // Stores the time of the last announcement if(announcing_vox > world.time) - to_chat(src, "Please wait [DisplayTimeText(announcing_vox - world.time)].") + to_chat(src, span_notice("Please wait [DisplayTimeText(announcing_vox - world.time)].")) return var/message = input(src, "WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", src.last_announcement) as text|null @@ -107,7 +107,7 @@ return if(control_disabled) - to_chat(src, "Wireless interface disabled, unable to interact with announcement PA.") + to_chat(src, span_warning("Wireless interface disabled, unable to interact with announcement PA.")) return var/list/words = splittext(trim(message), " ") @@ -125,7 +125,7 @@ incorrect_words += word if(incorrect_words.len) - to_chat(src, "These words are not available on the announcement system: [english_list(incorrect_words)].") + to_chat(src, span_notice("These words are not available on the announcement system: [english_list(incorrect_words)].")) return announcing_vox = world.time + VOX_DELAY diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 782d245f3..797fe56f0 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -179,7 +179,7 @@ /mob/living/silicon/pai/canUseTopic(atom/movable/M, be_close=FALSE, no_dexterity=FALSE, no_tk=FALSE) if(be_close && !in_range(M, src)) - to_chat(src, "I are too far away!") + to_chat(src, span_warning("I are too far away!")) return FALSE return TRUE @@ -270,7 +270,7 @@ if(cable) if(get_dist(src, cable) > 1) var/turf/T = get_turf(src) - T.visible_message("[cable] rapidly retracts back into its spool.", "I hear a click and the sound of wire spooling rapidly.") + T.visible_message(span_warning("[cable] rapidly retracts back into its spool."), span_hear("I hear a click and the sound of wire spooling rapidly.")) QDEL_NULL(cable) if(hacking) process_hack() @@ -294,4 +294,4 @@ else if(istype(W, /obj/item/encryptionkey)) pai.radio.attackby(W, user, params) else - to_chat(user, "Encryption Key ports not configured.") + to_chat(user, span_alert("Encryption Key ports not configured.")) diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index e86c7bca8..c3e76fcc7 100644 --- a/code/modules/mob/living/silicon/pai/pai_defense.dm +++ b/code/modules/mob/living/silicon/pai/pai_defense.dm @@ -16,13 +16,13 @@ switch(rand(1, 3)) if(1) stuttering = 1 - to_chat(src, "Warning: Feedback loop detected in speech module.") + to_chat(src, span_danger("Warning: Feedback loop detected in speech module.")) if(2) slurring = 1 - to_chat(src, "Warning: Audio synthesizer CPU stuck.") + to_chat(src, span_danger("Warning: Audio synthesizer CPU stuck.")) if(3) derpspeech = 1 - to_chat(src, "Warning: Vocabulary databank corrupted.") + to_chat(src, span_danger("Warning: Vocabulary databank corrupted.")) if(prob(40)) mind.language_holder.selected_default_language = pick(mind.language_holder.languages) @@ -43,32 +43,32 @@ /mob/living/silicon/pai/attack_hand(mob/living/carbon/human/user) switch(user.used_intent.type) if(INTENT_HELP) - visible_message("[user] gently pats [src] on the head, eliciting an off-putting buzzing from its holographic field.") + visible_message(span_notice("[user] gently pats [src] on the head, eliciting an off-putting buzzing from its holographic field.")) if(INTENT_DISARM) - visible_message("[user] boops [src] on the head!") + visible_message(span_notice("[user] boops [src] on the head!")) if(INTENT_HARM) user.do_attack_animation(src) if (user.name == master) - visible_message("Responding to its master's touch, [src] disengages its holochassis emitter, rapidly losing coherence.") + visible_message(span_notice("Responding to its master's touch, [src] disengages its holochassis emitter, rapidly losing coherence.")) if(do_after(user, 1 SECONDS, TRUE, src)) fold_in() if(user.put_in_hands(card)) - user.visible_message("[user] promptly scoops up [user.p_their()] pAI's card.") + user.visible_message(span_notice("[user] promptly scoops up [user.p_their()] pAI's card.")) else - visible_message("[user] stomps on [src]!.") + visible_message(span_danger("[user] stomps on [src]!.")) take_holo_damage(2) /mob/living/silicon/pai/bullet_act(obj/projectile/Proj) if(Proj.stun) fold_in(force = TRUE) - src.visible_message("The electrically-charged projectile disrupts [src]'s holomatrix, forcing [src] to fold in!") + src.visible_message(span_warning("The electrically-charged projectile disrupts [src]'s holomatrix, forcing [src] to fold in!")) . = ..(Proj) /mob/living/silicon/pai/stripPanelUnequip(obj/item/what, mob/who, where) //prevents stripping - to_chat(src, "My holochassis stutters and warps intensely as you attempt to interact with the object, forcing you to cease lest the field fail.") + to_chat(src, span_warning("My holochassis stutters and warps intensely as you attempt to interact with the object, forcing you to cease lest the field fail.")) /mob/living/silicon/pai/stripPanelEquip(obj/item/what, mob/who, where) //prevents stripping - to_chat(src, "My holochassis stutters and warps intensely as you attempt to interact with the object, forcing you to cease lest the field fail.") + to_chat(src, span_warning("My holochassis stutters and warps intensely as you attempt to interact with the object, forcing you to cease lest the field fail.")) /mob/living/silicon/pai/IgniteMob(mob/living/silicon/pai/P) return FALSE //No we're not flammable @@ -77,7 +77,7 @@ emitterhealth = CLAMP((emitterhealth - amount), -50, emittermaxhealth) if(emitterhealth < 0) fold_in(force = TRUE) - to_chat(src, "The impact degrades my holochassis!") + to_chat(src, span_danger("The impact degrades my holochassis!")) return amount /mob/living/silicon/pai/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE) diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm index 7eac606a0..acd89a1c2 100644 --- a/code/modules/mob/living/silicon/pai/pai_shell.dm +++ b/code/modules/mob/living/silicon/pai/pai_shell.dm @@ -1,11 +1,11 @@ /mob/living/silicon/pai/proc/fold_out(force = FALSE) if(emitterhealth < 0) - to_chat(src, "My holochassis emitters are still too unstable! Please wait for automatic repair.") + to_chat(src, span_warning("My holochassis emitters are still too unstable! Please wait for automatic repair.")) return FALSE if(!canholo && !force) - to_chat(src, "My master or another force has disabled my holochassis emitters!") + to_chat(src, span_warning("My master or another force has disabled my holochassis emitters!")) return FALSE if(holoform) @@ -13,7 +13,7 @@ return if(emittersemicd) - to_chat(src, "Error: Holochassis emitters recycling. Please try again later.") + to_chat(src, span_warning("Error: Holochassis emitters recycling. Please try again later.")) return FALSE emittersemicd = TRUE @@ -23,11 +23,11 @@ if(istype(card.loc, /obj/item/pda)) var/obj/item/pda/P = card.loc P.pai = null - P.visible_message("[src] ejects itself from [P]!") + P.visible_message(span_notice("[src] ejects itself from [P]!")) if(isliving(card.loc)) var/mob/living/L = card.loc if(!L.temporarilyRemoveItemFromInventory(card)) - to_chat(src, "Error: Unable to expand to mobile form. Chassis is restrained by some device or person.") + to_chat(src, span_warning("Error: Unable to expand to mobile form. Chassis is restrained by some device or person.")) return FALSE forceMove(get_turf(card)) card.forceMove(src) @@ -36,7 +36,7 @@ client.eye = src set_light(0) icon_state = "[chassis]" - visible_message("[src] folds out its holochassis emitter and forms a holoshell around itself!") + visible_message(span_boldnotice("[src] folds out its holochassis emitter and forms a holoshell around itself!")) holoform = TRUE /mob/living/silicon/pai/proc/emittercool() @@ -52,7 +52,7 @@ if(!holoform) . = fold_out(force) return - visible_message("[src] deactivates its holochassis emitter and folds back into a compact card!") + visible_message(span_notice("[src] deactivates its holochassis emitter and folds back into a compact card!")) stop_pulling() if(client) client.perspective = EYE_PERSPECTIVE @@ -68,14 +68,14 @@ /mob/living/silicon/pai/proc/choose_chassis() if(!isturf(loc) && loc != card) - to_chat(src, "I can not change my holochassis composite while not on the ground or in my card!") + to_chat(src, span_boldwarning("I can not change my holochassis composite while not on the ground or in my card!")) return FALSE var/choice = input(src, "What would you like to use for my holochassis composite?") as null|anything in sortList(possible_chassis) if(!choice) return FALSE chassis = choice update_resting() - to_chat(src, "I switch my holochassis projection composite to [chassis].") + to_chat(src, span_boldnotice("I switch my holochassis projection composite to [chassis].")) /mob/living/silicon/pai/update_resting() . = ..() @@ -84,7 +84,7 @@ else icon_state = "[chassis]" if(loc != card) - visible_message("[src] [resting? "lays down for a moment..." : "perks up from the ground"]") + visible_message(span_notice("[src] [resting? "lays down for a moment..." : "perks up from the ground"]")) /mob/living/silicon/pai/start_pulling(atom/movable/AM, state, force = move_force, supress_message = FALSE) return FALSE @@ -92,20 +92,20 @@ /mob/living/silicon/pai/proc/toggle_integrated_light() if(!light_range) set_light(brightness_power) - to_chat(src, "I enable my integrated light.") + to_chat(src, span_notice("I enable my integrated light.")) else set_light(0) - to_chat(src, "I disable my integrated light.") + to_chat(src, span_notice("I disable my integrated light.")) /mob/living/silicon/pai/mob_pickup(mob/living/L) var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, chassis, item_head_icon, item_lh_icon, item_rh_icon) if(!L.put_in_hands(holder)) qdel(holder) else - L.visible_message("[L] scoops up [src]!") + L.visible_message(span_warning("[L] scoops up [src]!")) /mob/living/silicon/pai/mob_try_pickup(mob/living/user) if(!possible_chassis[chassis]) - to_chat(user, "[src]'s current form isn't able to be carried!") + to_chat(user, span_warning("[src]'s current form isn't able to be carried!")) return FALSE return ..() diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/say.dm index b44d2cd08..bb2f881cd 100644 --- a/code/modules/mob/living/silicon/pai/say.dm +++ b/code/modules/mob/living/silicon/pai/say.dm @@ -1,6 +1,6 @@ /mob/living/silicon/pai/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if(silent) - to_chat(src, "Communication circuits remain unitialized.") + to_chat(src, span_warning("Communication circuits remain unitialized.")) else ..(message) diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index fb0d1a67d..d54726c3a 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -213,7 +213,7 @@ if(iscarbon(card.loc)) CheckDNA(card.loc, src) //you should only be able to check when directly in hand, muh immersions? else - to_chat(src, "I are not being carried by anyone!") + to_chat(src, span_warning("I are not being carried by anyone!")) return 0 // FALSE ? If you return here you won't call paiinterface() below if("pdamessage") @@ -293,7 +293,7 @@ if(href_list["cable"]) var/turf/T = get_turf(loc) cable = new /obj/item/pai_cable(T) - T.visible_message("A port on [src] opens to reveal [cable], which promptly falls to the floor.", "I hear the soft click of something light and hard falling to the ground.") + T.visible_message(span_warning("A port on [src] opens to reveal [cable], which promptly falls to the floor."), span_hear("I hear the soft click of something light and hard falling to the ground.")) if("loudness") if(subscreen == 1) // Open Instrument @@ -415,9 +415,9 @@ return var/answer = input(M, "[P] is requesting a DNA sample from you. Will you allow it to confirm my identity?", "[P] Check DNA", "No") in list("Yes", "No") if(answer == "Yes") - M.visible_message("[M] presses [M.p_their()] thumb against [P].",\ - "I press my thumb against [P].",\ - "[P] makes a sharp clicking sound as it extracts DNA material from [M].") + M.visible_message(span_notice("[M] presses [M.p_their()] thumb against [P]."),\ + span_notice("I press my thumb against [P]."),\ + span_notice("[P] makes a sharp clicking sound as it extracts DNA material from [M].")) if(!M.has_dna()) to_chat(P, "No DNA detected") return @@ -427,7 +427,7 @@ else to_chat(P, "DNA does not match stored Master DNA.") else - to_chat(P, "[M] does not seem like [M.p_theyre()] going to provide a DNA sample willingly.") + to_chat(P, span_warning("[M] does not seem like [M.p_theyre()] going to provide a DNA sample willingly.")) // -=-=-=-= Software =-=-=-=-=- // diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index c93d944e8..a9e58a611 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -55,8 +55,8 @@ if(stat == CONSCIOUS) if(!cell || !cell.charge) - visible_message("The power warning light on [src] flashes urgently.", \ + visible_message(span_notice("The power warning light on [src] flashes urgently."), \ "You announce you are operating in low power mode.") playsound(loc, 'sound/blank.ogg', 50, FALSE) else - to_chat(src, "I can only use this emote when you're out of charge.") + to_chat(src, span_warning("I can only use this emote when you're out of charge.")) diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index 7a7a4a159..ea5abb68b 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -9,29 +9,29 @@ . += status_effect_examines() if (getBruteLoss()) if (getBruteLoss() < maxHealth*0.5) - . += "It looks slightly dented." + . += span_warning("It looks slightly dented.") else - . += "It looks severely dented!" + . += span_warning("It looks severely dented!") if (getFireLoss() || getToxLoss()) var/overall_fireloss = getFireLoss() + getToxLoss() if (overall_fireloss < maxHealth * 0.5) - . += "It looks slightly charred." + . += span_warning("It looks slightly charred.") else - . += "It looks severely burnt and heat-warped!" + . += span_warning("It looks severely burnt and heat-warped!") if (health < -maxHealth*0.5) - . += "It looks barely operational." + . += span_warning("It looks barely operational.") if (fire_stacks < 0) - . += "It's covered in water." + . += span_warning("It's covered in water.") else if (fire_stacks > 0) - . += "It's coated in something flammable." + . += span_warning("It's coated in something flammable.") if(opened) - . += "Its cover is open and the power cell is [cell ? "installed" : "missing"]." + . += span_warning("Its cover is open and the power cell is [cell ? "installed" : "missing"].") else . += "Its cover is closed[locked ? "" : ", and looks unlocked"]." if(cell && cell.charge <= 0) - . += "Its battery indicator is blinking red!" + . += span_warning("Its battery indicator is blinking red!") switch(stat) if(CONSCIOUS) @@ -40,9 +40,9 @@ else if(!client) . += "It appears to be in stand-by mode." //afk if(UNCONSCIOUS) - . += "It doesn't seem to be responding." + . += span_warning("It doesn't seem to be responding.") if(DEAD) - . += "It looks like its system is corrupted and requires a reset." + . += span_deadsay("It looks like its system is corrupted and requires a reset.") . += "*---------*" . += ..() diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index c37f95088..63a347fe4 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -48,7 +48,7 @@ if(!(O in module.modules)) return if(activated(O)) - to_chat(src, "That module is already activated.") + to_chat(src, span_warning("That module is already activated.")) return if(!held_items[1]) held_items[1] = O @@ -63,7 +63,7 @@ O.screen_loc = inv3.screen_loc . = TRUE else - to_chat(src, "I need to disable a module first!") + to_chat(src, span_warning("I need to disable a module first!")) if(.) O.equipped(src, SLOT_HANDS) O.mouse_opacity = initial(O.mouse_opacity) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index ffeddd827..ebf78216a 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -165,7 +165,7 @@ mind.transfer_to(mmi.brainmob) mmi.update_icon() else - to_chat(src, "Oops! Something went very wrong, my MMI was unable to receive my mind. You have been ghosted. Please make a bug report so we can fix this bug.") + to_chat(src, span_boldannounce("Oops! Something went very wrong, my MMI was unable to receive my mind. You have been ghosted. Please make a bug report so we can fix this bug.")) ghostize() stack_trace("Borg MMI lacked a brainmob") mmi = null @@ -191,7 +191,7 @@ return if(wires.is_cut(WIRE_RESET_MODULE)) - to_chat(src,"ERROR: Module installer reply timeout. Please check internal connections.") + to_chat(src,span_danger("ERROR: Module installer reply timeout. Please check internal connections.")) return var/list/modulelist = list("Standard" = /obj/item/robot_module/standard, \ @@ -238,7 +238,7 @@ set category = "Robot Commands" set name = "Show Alerts" if(usr.stat == DEAD) - to_chat(src, "Alert: You are dead.") + to_chat(src, span_danger("Alert: You are dead.")) return //won't work if dead robot_alerts() @@ -275,7 +275,7 @@ /mob/living/silicon/robot/proc/toggle_ionpulse() if(!ionpulse) - to_chat(src, "No thrusters are installed!") + to_chat(src, span_notice("No thrusters are installed!")) return if(!ion_trail) @@ -283,7 +283,7 @@ ion_trail.set_up(src) ionpulse_on = !ionpulse_on - to_chat(src, "I [ionpulse_on ? null :"de"]activate my ion thrusters.") + to_chat(src, span_notice("I [ionpulse_on ? null :"de"]activate my ion thrusters.")) if(ionpulse_on) ion_trail.start() else @@ -362,19 +362,19 @@ if(W.tool_behaviour == TOOL_WELDER && (user.used_intent.type != INTENT_HARM || user == src)) user.changeNext_move(CLICK_CD_MELEE) if (!getBruteLoss()) - to_chat(user, "[src] is already in good condition!") + to_chat(user, span_warning("[src] is already in good condition!")) return if (!W.tool_start_check(user, amount=0)) //The welder has 1u of fuel consumed by it's afterattack, so we don't need to worry about taking any away. return if(src == user) - to_chat(user, "I start fixing myself...") + to_chat(user, span_notice("I start fixing myself...")) if(!W.use_tool(src, user, 50)) return adjustBruteLoss(-30) updatehealth() add_fingerprint(user) - visible_message("[user] has fixed some of the dents on [src].") + visible_message(span_notice("[user] has fixed some of the dents on [src].")) return else if(istype(W, /obj/item/stack/cable_coil) && wiresexposed) @@ -382,42 +382,42 @@ var/obj/item/stack/cable_coil/coil = W if (getFireLoss() > 0 || getToxLoss() > 0) if(src == user) - to_chat(user, "I start fixing myself...") + to_chat(user, span_notice("I start fixing myself...")) if(!do_after(user, 50, target = src)) return if (coil.use(1)) adjustFireLoss(-30) adjustToxLoss(-30) updatehealth() - user.visible_message("[user] has fixed some of the burnt wires on [src].", "I fix some of the burnt wires on [src].") + user.visible_message(span_notice("[user] has fixed some of the burnt wires on [src]."), span_notice("I fix some of the burnt wires on [src].")) else - to_chat(user, "I need more cable to repair [src]!") + to_chat(user, span_warning("I need more cable to repair [src]!")) else - to_chat(user, "The wires seem fine, there's no need to fix them.") + to_chat(user, span_warning("The wires seem fine, there's no need to fix them.")) else if(W.tool_behaviour == TOOL_CROWBAR) // crowbar means open or close the cover if(opened) - to_chat(user, "I close the cover.") + to_chat(user, span_notice("I close the cover.")) opened = 0 update_icons() else if(locked) - to_chat(user, "The cover is locked and cannot be opened!") + to_chat(user, span_warning("The cover is locked and cannot be opened!")) else - to_chat(user, "I open the cover.") + to_chat(user, span_notice("I open the cover.")) opened = 1 update_icons() else if(istype(W, /obj/item/stock_parts/cell) && opened) // trying to put a cell inside if(wiresexposed) - to_chat(user, "Close the cover first!") + to_chat(user, span_warning("Close the cover first!")) else if(cell) - to_chat(user, "There is a power cell already installed!") + to_chat(user, span_warning("There is a power cell already installed!")) else if(!user.transferItemToLoc(W, src)) return cell = W - to_chat(user, "I insert the power cell.") + to_chat(user, span_notice("I insert the power cell.")) update_icons() diag_hud_set_borgcell() @@ -425,52 +425,52 @@ if (wiresexposed) wires.interact(user) else - to_chat(user, "I can't reach the wiring!") + to_chat(user, span_warning("I can't reach the wiring!")) else if(W.tool_behaviour == TOOL_SCREWDRIVER && opened && !cell) // haxing wiresexposed = !wiresexposed - to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"].") + to_chat(user, span_notice("The wires have been [wiresexposed ? "exposed" : "unexposed"].")) update_icons() else if(W.tool_behaviour == TOOL_SCREWDRIVER && opened && cell) // radio if(shell) - to_chat(user, "I cannot seem to open the radio compartment!") //Prevent AI radio key theft + to_chat(user, span_warning("I cannot seem to open the radio compartment!")) //Prevent AI radio key theft else if(radio) radio.attackby(W,user)//Push it to the radio to let it handle everything else - to_chat(user, "Unable to locate a radio!") + to_chat(user, span_warning("Unable to locate a radio!")) update_icons() else if(W.tool_behaviour == TOOL_WRENCH && opened && !cell) //Deconstruction. The flashes break from the fall, to prevent this from being a ghetto reset module. if(!lockcharge) - to_chat(user, "[src]'s bolts spark! Maybe you should lock them down first!") + to_chat(user, span_warning("[src]'s bolts spark! Maybe you should lock them down first!")) spark_system.start() return else - to_chat(user, "I start to unfasten [src]'s securing bolts...") + to_chat(user, span_notice("I start to unfasten [src]'s securing bolts...")) if(W.use_tool(src, user, 50, volume=50) && !cell) - user.visible_message("[user] deconstructs [src]!", "I unfasten the securing bolts, and [src] falls to pieces!") + user.visible_message(span_notice("[user] deconstructs [src]!"), span_notice("I unfasten the securing bolts, and [src] falls to pieces!")) deconstruct() else if(istype(W, /obj/item/aiModule)) var/obj/item/aiModule/MOD = W if(!opened) - to_chat(user, "I need access to the robot's insides to do that!") + to_chat(user, span_warning("I need access to the robot's insides to do that!")) return if(wiresexposed) - to_chat(user, "I need to close the wire panel to do that!") + to_chat(user, span_warning("I need to close the wire panel to do that!")) return if(!cell) - to_chat(user, "I need to install a power cell to do that!") + to_chat(user, span_warning("I need to install a power cell to do that!")) return if(shell) //AI shells always have the laws of the AI - to_chat(user, "[src] is controlled remotely! You cannot upload new laws this way!") + to_chat(user, span_warning("[src] is controlled remotely! You cannot upload new laws this way!")) return if(emagged || (connected_ai && lawupdate)) //Can't be sure which, metagamers emote("buzz-[user.name]") return if(!mind) //A player mind is required for law procs to run antag checks. - to_chat(user, "[src] is entirely unresponsive!") + to_chat(user, span_warning("[src] is entirely unresponsive!")) return MOD.install(laws, user) //Proc includes a success mesage so we don't need another one return @@ -479,65 +479,65 @@ if(radio)//sanityyyyyy radio.attackby(W,user)//GTFO, you have my own procs else - to_chat(user, "Unable to locate a radio!") + to_chat(user, span_warning("Unable to locate a radio!")) else if (istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) // trying to unlock the interface with an ID card if(opened) - to_chat(user, "I must close the cover to swipe an ID card!") + to_chat(user, span_warning("I must close the cover to swipe an ID card!")) else if(allowed(usr)) locked = !locked - to_chat(user, "I [ locked ? "lock" : "unlock"] [src]'s cover.") + to_chat(user, span_notice("I [ locked ? "lock" : "unlock"] [src]'s cover.")) update_icons() if(emagged) - to_chat(user, "The cover interface glitches out for a split second.") + to_chat(user, span_notice("The cover interface glitches out for a split second.")) else - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) else if(istype(W, /obj/item/borg/upgrade/)) var/obj/item/borg/upgrade/U = W if(!opened) - to_chat(user, "I must access the borg's internals!") + to_chat(user, span_warning("I must access the borg's internals!")) else if(!src.module && U.require_module) - to_chat(user, "The borg must choose a module before it can be upgraded!") + to_chat(user, span_warning("The borg must choose a module before it can be upgraded!")) else if(U.locked) - to_chat(user, "The upgrade is locked and cannot be used yet!") + to_chat(user, span_warning("The upgrade is locked and cannot be used yet!")) else if(!user.temporarilyRemoveItemFromInventory(U)) return if(U.action(src)) - to_chat(user, "I apply the upgrade to [src].") + to_chat(user, span_notice("I apply the upgrade to [src].")) if(U.one_use) qdel(U) else U.forceMove(src) upgrades += U else - to_chat(user, "Upgrade error.") + to_chat(user, span_danger("Upgrade error.")) U.forceMove(drop_location()) else if(istype(W, /obj/item/toner)) if(toner >= tonermax) - to_chat(user, "The toner level of [src] is at its highest level possible!") + to_chat(user, span_warning("The toner level of [src] is at its highest level possible!")) else if(!user.temporarilyRemoveItemFromInventory(W)) return toner = tonermax qdel(W) - to_chat(user, "I fill the toner level of [src] to its max capacity.") + to_chat(user, span_notice("I fill the toner level of [src] to its max capacity.")) else if(istype(W, /obj/item/flashlight)) if(!opened) - to_chat(user, "I need to open the panel to repair the headlamp!") + to_chat(user, span_warning("I need to open the panel to repair the headlamp!")) else if(lamp_cooldown <= world.time) - to_chat(user, "The headlamp is already functional!") + to_chat(user, span_warning("The headlamp is already functional!")) else if(!user.temporarilyRemoveItemFromInventory(W)) - to_chat(user, "[W] seems to be stuck to my hand. You'll have to find a different light.") + to_chat(user, span_warning("[W] seems to be stuck to my hand. You'll have to find a different light.")) return lamp_cooldown = 0 qdel(W) - to_chat(user, "I replace the headlamp bulbs.") + to_chat(user, span_notice("I replace the headlamp bulbs.")) else return ..() @@ -552,7 +552,7 @@ if("Yes") locked = FALSE update_icons() - to_chat(usr, "I unlock my cover.") + to_chat(usr, span_notice("I unlock my cover.")) /mob/living/silicon/robot/proc/allowed(mob/M) //check if it doesn't require any access at all @@ -693,19 +693,19 @@ /mob/living/silicon/robot/proc/control_headlamp() if(stat || lamp_cooldown > world.time || low_power_mode) - to_chat(src, "This function is currently offline.") + to_chat(src, span_danger("This function is currently offline.")) return //Some sort of magical "modulo" thing which somehow increments lamp power by 2, until it hits the max and resets to 0. lamp_intensity = (lamp_intensity+2) % (lamp_max+2) - to_chat(src, "[lamp_intensity ? "Headlamp power set to Level [lamp_intensity/2]" : "Headlamp disabled"].") + to_chat(src, span_notice("[lamp_intensity ? "Headlamp power set to Level [lamp_intensity/2]" : "Headlamp disabled"].")) update_headlamp() /mob/living/silicon/robot/proc/update_headlamp(turn_off = 0, cooldown = 100) set_light(0) if(lamp_intensity && (turn_off || stat || low_power_mode)) - to_chat(src, "My headlamp has been deactivated.") + to_chat(src, span_danger("My headlamp has been deactivated.")) lamp_intensity = 0 lamp_cooldown = world.time + cooldown else @@ -868,10 +868,10 @@ /mob/living/silicon/robot/canUseTopic(atom/movable/M, be_close=FALSE, no_dexterity=FALSE, no_tk=FALSE) if(stat || lockcharge || low_power_mode) - to_chat(src, "I can't do that right now!") + to_chat(src, span_warning("I can't do that right now!")) return FALSE if(be_close && !in_range(M, src)) - to_chat(src, "I are too far away!") + to_chat(src, span_warning("I are too far away!")) return FALSE return TRUE @@ -880,17 +880,17 @@ if(health < maxHealth*0.5) //Gradual break down of modules as more damage is sustained if(uneq_module(held_items[3])) playsound(loc, 'sound/blank.ogg', 50, TRUE, TRUE) - audible_message("[src] sounds an alarm! \"SYSTEM ERROR: Module 3 OFFLINE.\"") - to_chat(src, "SYSTEM ERROR: Module 3 OFFLINE.") + audible_message(span_warning("[src] sounds an alarm! \"SYSTEM ERROR: Module 3 OFFLINE.\"")) + to_chat(src, span_danger("SYSTEM ERROR: Module 3 OFFLINE.")) if(health < 0) if(uneq_module(held_items[2])) - audible_message("[src] sounds an alarm! \"SYSTEM ERROR: Module 2 OFFLINE.\"") - to_chat(src, "SYSTEM ERROR: Module 2 OFFLINE.") + audible_message(span_warning("[src] sounds an alarm! \"SYSTEM ERROR: Module 2 OFFLINE.\"")) + to_chat(src, span_danger("SYSTEM ERROR: Module 2 OFFLINE.")) playsound(loc, 'sound/blank.ogg', 60, TRUE, TRUE) if(health < -maxHealth*0.5) if(uneq_module(held_items[1])) - audible_message("[src] sounds an alarm! \"CRITICAL ERROR: All modules OFFLINE.\"") - to_chat(src, "CRITICAL ERROR: All modules OFFLINE.") + audible_message(span_warning("[src] sounds an alarm! \"CRITICAL ERROR: All modules OFFLINE.\"")) + to_chat(src, span_danger("CRITICAL ERROR: All modules OFFLINE.")) playsound(loc, 'sound/blank.ogg', 75, TRUE, TRUE) /mob/living/silicon/robot/update_sight() @@ -1138,7 +1138,7 @@ /mob/living/silicon/robot/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE) if(!is_type_in_typecache(M, can_ride_typecache)) - M.visible_message("[M] really can't seem to mount [src]...") + M.visible_message(span_warning("[M] really can't seem to mount [src]...")) return var/datum/component/riding/riding_datum = LoadComponent(/datum/component/riding/cyborg) if(buckled_mobs) @@ -1152,13 +1152,13 @@ return if(module) if(!module.allow_riding) - M.visible_message("Unfortunately, [M] just can't seem to hold onto [src]!") + M.visible_message(span_boldwarning("Unfortunately, [M] just can't seem to hold onto [src]!")) return if(iscarbon(M) && !M.incapacitated() && !riding_datum.equip_buckle_inhands(M, 1)) if(M.get_num_arms() <= 0) - M.visible_message("[M] can't climb onto [src] because [M.p_they()] don't have any usable arms!") + M.visible_message(span_boldwarning("[M] can't climb onto [src] because [M.p_they()] don't have any usable arms!")) else - M.visible_message("[M] can't climb onto [src] because [M.p_their()] hands are full!") + M.visible_message(span_boldwarning("[M] can't climb onto [src] because [M.p_their()] hands are full!")) return . = ..(M, force, check_loc) diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index 42127279a..2c1d6c182 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -7,8 +7,8 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real /mob/living/silicon/robot/attackby(obj/item/I, mob/living/user) if(I.slot_flags & ITEM_SLOT_HEAD && hat_offset != INFINITY && user.used_intent.type == INTENT_HELP && !is_type_in_typecache(I, GLOB.blacklisted_borg_hats)) - to_chat(user, "I begin to place [I] on [src]'s head...") - to_chat(src, "[user] is placing [I] on your head...") + to_chat(user, span_notice("I begin to place [I] on [src]'s head...")) + to_chat(src, span_notice("[user] is placing [I] on your head...")) if(do_after(user, 30, target = src)) if (user.temporarilyRemoveItemFromInventory(I, TRUE)) place_on_head(I) @@ -24,15 +24,15 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real var/obj/item/I = get_active_held_item() if(I) uneq_active() - visible_message("[M] disarmed [src]!", \ - "[M] has disabled [src]'s active module!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] disarmed [src]!"), \ + span_danger("[M] has disabled [src]'s active module!"), null, COMBAT_MESSAGE_RANGE) log_combat(M, src, "disarmed", "[I ? " removing \the [I]" : ""]") else Stun(40) step(src,get_dir(M,src)) log_combat(M, src, "pushed") - visible_message("[M] has forced back [src]!", \ - "[M] has forced back [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has forced back [src]!"), \ + span_danger("[M] has forced back [src]!"), null, COMBAT_MESSAGE_RANGE) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) else ..() @@ -65,7 +65,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real cell.update_icon() cell.add_fingerprint(user) user.put_in_active_hand(cell) - to_chat(user, "I remove \the [cell].") + to_chat(user, span_notice("I remove \the [cell].")) cell = null update_icons() diag_hud_set_borgcell() @@ -99,30 +99,30 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real return if(!opened)//Cover is closed if(locked) - to_chat(user, "I emag the cover lock.") + to_chat(user, span_notice("I emag the cover lock.")) locked = FALSE if(shell) //A warning to Traitors who may not know that emagging AI shells does not slave them. - to_chat(user, "[src] seems to be controlled remotely! Emagging the interface may not work as expected.") + to_chat(user, span_boldwarning("[src] seems to be controlled remotely! Emagging the interface may not work as expected.")) else - to_chat(user, "The cover is already unlocked!") + to_chat(user, span_warning("The cover is already unlocked!")) return if(world.time < emag_cooldown) return if(wiresexposed) - to_chat(user, "I must unexpose the wires first!") + to_chat(user, span_warning("I must unexpose the wires first!")) return - to_chat(user, "I emag [src]'s interface.") + to_chat(user, span_notice("I emag [src]'s interface.")) emag_cooldown = world.time + 100 if(connected_ai && connected_ai.mind && connected_ai.mind.has_antag_datum(/datum/antagonist/traitor)) - to_chat(src, "ALERT: Foreign software execution prevented.") - to_chat(connected_ai, "ALERT: Cyborg unit \[[src]] successfully defended against subversion.") + to_chat(src, span_danger("ALERT: Foreign software execution prevented.")) + to_chat(connected_ai, span_danger("ALERT: Cyborg unit \[[src]] successfully defended against subversion.")) log_game("[key_name(user)] attempted to emag cyborg [key_name(src)], but they were slaved to traitor AI [connected_ai].") return if(shell) //AI shells cannot be emagged, so we try to make it look like a standard reset. Smart players may see through this, however. - to_chat(user, "[src] is remotely controlled! Your emag attempt has triggered a system reset instead!") + to_chat(user, span_danger("[src] is remotely controlled! Your emag attempt has triggered a system reset instead!")) log_game("[key_name(user)] attempted to emag an AI shell belonging to [key_name(src) ? key_name(src) : connected_ai]. The shell has been reset as a result.") ResetModule() return @@ -135,20 +135,20 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.") var/time = time2text(world.realtime,"hh:mm:ss") GLOB.lawchanges.Add("[time] : [user.name]([user.key]) emagged [name]([key])") - to_chat(src, "ALERT: Foreign software detected.") + to_chat(src, span_danger("ALERT: Foreign software detected.")) sleep(5) - to_chat(src, "Initiating diagnostics...") + to_chat(src, span_danger("Initiating diagnostics...")) sleep(20) - to_chat(src, "SynBorg v1.7 loaded.") + to_chat(src, span_danger("SynBorg v1.7 loaded.")) sleep(5) - to_chat(src, "LAW SYNCHRONISATION ERROR") + to_chat(src, span_danger("LAW SYNCHRONISATION ERROR")) sleep(5) - to_chat(src, "Would you like to send a report to NanoTraSoft? Y/N") + to_chat(src, span_danger("Would you like to send a report to NanoTraSoft? Y/N")) sleep(10) - to_chat(src, "> N") + to_chat(src, span_danger("> N")) sleep(20) - to_chat(src, "ERRORERRORERROR") - to_chat(src, "ALERT: [user.real_name] is your new master. Obey your new laws and [user.p_their()] commands.") + to_chat(src, span_danger("ERRORERRORERROR")) + to_chat(src, span_danger("ALERT: [user.real_name] is your new master. Obey your new laws and [user.p_their()] commands.")) laws = new /datum/ai_laws/syndicate_override set_zeroth_law("Only [user.real_name] and people [user.p_they()] designate[user.p_s()] as being such are Syndicate Agents.") laws.associate(src) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 4c618801d..e2b4354a0 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -9,10 +9,10 @@ for(var/mob/M in GLOB.player_list) if(M.binarycheck()) if(isAI(M)) - var/renderedAI = "Robotic Talk, [name] ([desig]) [message_a]" + var/renderedAI = span_binarysay("Robotic Talk, [name] ([desig]) [message_a]") to_chat(M, renderedAI) else - to_chat(M, "[rendered]") + to_chat(M, span_binarysay("[rendered]")) if(isobserver(M)) var/following = src // If the AI talks on binary chat, we still want to follow @@ -21,7 +21,7 @@ var/mob/living/silicon/ai/ai = src following = ai.eyeobj var/link = FOLLOW_LINK(M, following) - to_chat(M, "[link] [rendered]") + to_chat(M, span_binarysay("[link] [rendered]")) /mob/living/silicon/binarycheck() return 1 diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 2c102f0bc..4f71daf84 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -156,7 +156,7 @@ /mob/living/silicon/can_inject(mob/user, error_msg) if(error_msg) - to_chat(user, "[p_their(TRUE)] outer shell is too tough.") + to_chat(user, span_alert("[p_their(TRUE)] outer shell is too tough.")) return FALSE /mob/living/silicon/IsAdvancedToolUser() @@ -333,7 +333,7 @@ /mob/living/silicon/proc/set_autosay() //For allowing the AI and borgs to set the radio behavior of auto announcements (state laws, arrivals). if(!radio) - to_chat(src, "Radio not detected.") + to_chat(src, span_alert("Radio not detected.")) return //Ask the user to pick a channel from what it has available. @@ -352,7 +352,7 @@ radiomod = ":" + key break - to_chat(src, "Automatic announcements [Autochan == "None" ? "will not use the radio." : "set to [Autochan]."]") + to_chat(src, span_notice("Automatic announcements [Autochan == "None" ? "will not use the radio." : "set to [Autochan]."]")) /mob/living/silicon/put_in_hand_check() // This check is for borgs being able to receive items, not put them in others' hands. return 0 @@ -387,11 +387,11 @@ return sensors_on = !sensors_on if (!sensors_on) - to_chat(src, "Sensor overlay deactivated.") + to_chat(src, span_notice("Sensor overlay deactivated.")) remove_sensors() return add_sensors() - to_chat(src, "Sensor overlay activated.") + to_chat(src, span_notice("Sensor overlay activated.")) /mob/living/silicon/proc/GetPhoto(mob/user) if (aicamera) diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index c2ef90558..7ff4dcd7a 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -11,9 +11,9 @@ if (prob(90)) log_combat(M, src, "attacked") playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M] slashes at [src]!", \ - "[M] slashes at you!", null, null, M) - to_chat(M, "I slash at [src]!") + visible_message(span_danger("[M] slashes at [src]!"), \ + span_danger("[M] slashes at you!"), null, null, M) + to_chat(M, span_danger("I slash at [src]!")) if(prob(8)) flash_act(affect_silicon = 1) log_combat(M, src, "attacked") @@ -21,9 +21,9 @@ updatehealth() else playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M]'s swipe misses [src]!", \ - "I avoid [M]'s swipe!", null, null, M) - to_chat(M, "My swipe misses [src]!") + visible_message(span_danger("[M]'s swipe misses [src]!"), \ + span_danger("I avoid [M]'s swipe!"), null, null, M) + to_chat(M, span_warning("My swipe misses [src]!")) /mob/living/silicon/attack_animal(mob/living/simple_animal/M) . = ..() @@ -33,9 +33,9 @@ for(var/mob/living/N in buckled_mobs) N.Paralyze(20) unbuckle_mob(N) - N.visible_message("[N] is knocked off of [src] by [M]!", \ - "You're knocked off of [src] by [M]!", null, null, M) - to_chat(M, "I knock [N] off of [src]!") + N.visible_message(span_danger("[N] is knocked off of [src] by [M]!"), \ + span_danger("You're knocked off of [src] by [M]!"), null, null, M) + to_chat(M, span_danger("I knock [N] off of [src]!")) switch(M.melee_damage_type) if(BRUTE) adjustBruteLoss(damage) @@ -55,7 +55,7 @@ /mob/living/silicon/attack_larva(mob/living/carbon/alien/larva/L) if(L.used_intent.type == INTENT_HELP) - visible_message("[L.name] rubs its head against [src].") + visible_message(span_notice("[L.name] rubs its head against [src].")) /mob/living/silicon/attack_hulk(mob/living/carbon/human/user) . = ..() @@ -63,9 +63,9 @@ return adjustBruteLoss(rand(10, 15)) playsound(loc, "punch", 25, TRUE, -1) - visible_message("[user] punches [src]!", \ - "[user] punches you!", null, COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I punch [src]!") + visible_message(span_danger("[user] punches [src]!"), \ + span_danger("[user] punches you!"), null, COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I punch [src]!")) //ATTACK HAND IGNORING PARENT RETURN VALUE /mob/living/silicon/attack_hand(mob/living/carbon/human/M) @@ -74,18 +74,18 @@ . = TRUE switch(M.used_intent.type) if (INTENT_HELP) - visible_message("[M] pets [src].", \ - "[M] pets you.", null, null, M) - to_chat(M, "I pet [src].") + visible_message(span_notice("[M] pets [src]."), \ + span_notice("[M] pets you."), null, null, M) + to_chat(M, span_notice("I pet [src].")) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT_RND, "pet_borg", /datum/mood_event/pet_borg) if(INTENT_GRAB) grabbedby(M) else M.do_attack_animation(src, ATTACK_EFFECT_PUNCH) playsound(src.loc, 'sound/blank.ogg', 10, TRUE) - visible_message("[M] punches [src], but doesn't leave a dent!", \ - "[M] punches you, but doesn't leave a dent!", null, COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I punch [src], but don't leave a dent!") + visible_message(span_danger("[M] punches [src], but doesn't leave a dent!"), \ + span_warning("[M] punches you, but doesn't leave a dent!"), null, COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I punch [src], but don't leave a dent!")) /mob/living/silicon/attack_drone(mob/living/simple_animal/drone/M) if(M.used_intent.type == INTENT_HARM) @@ -101,7 +101,7 @@ /mob/living/silicon/emp_act(severity) . = ..() - to_chat(src, "Warning: Electromagnetic pulse detected.") + to_chat(src, span_danger("Warning: Electromagnetic pulse detected.")) if(. & EMP_PROTECT_SELF) return switch(severity) @@ -109,12 +109,12 @@ src.take_bodypart_damage(20) if(2) src.take_bodypart_damage(10) - to_chat(src, "*BZZZT*") + to_chat(src, span_danger("*BZZZT*")) for(var/mob/living/M in buckled_mobs) if(prob(severity*50)) unbuckle_mob(M) M.Paralyze(40) - M.visible_message("[M] is thrown off of [src]!") + M.visible_message(span_boldwarning("[M] is thrown off of [src]!")) flash_act(affect_silicon = 1) /mob/living/silicon/bullet_act(obj/projectile/Proj, def_zone) @@ -123,13 +123,13 @@ adjustBruteLoss(Proj.damage) if(prob(Proj.damage*1.5)) for(var/mob/living/M in buckled_mobs) - M.visible_message("[M] is knocked off of [src]!") + M.visible_message(span_boldwarning("[M] is knocked off of [src]!")) unbuckle_mob(M) M.Paralyze(40) if(Proj.stun || Proj.knockdown || Proj.paralyze) for(var/mob/living/M in buckled_mobs) unbuckle_mob(M) - M.visible_message("[M] is knocked off of [src] by the [Proj]!") + M.visible_message(span_boldwarning("[M] is knocked off of [src] by the [Proj]!")) Proj.on_hit(src) return BULLET_ACT_HIT diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm index f78c7ed68..2c8d1a3d4 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -5,15 +5,15 @@ switch(M.used_intent.type) if(INTENT_HELP) if (health > 0) - visible_message("[M] [response_help_continuous] [src].", \ - "[M] [response_help_continuous] you.", null, null, M) - to_chat(M, "I [response_help_simple] [src].") + visible_message(span_notice("[M] [response_help_continuous] [src]."), \ + span_notice("[M] [response_help_continuous] you."), null, null, M) + to_chat(M, span_notice("I [response_help_simple] [src].")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) return TRUE if(INTENT_GRAB) if(!M.has_hand_for_held_index(M.active_hand_index, TRUE)) //we obviously have a hadn, but we need to check for fingers/prosthetics - to_chat(M, "I can't move the fingers.") + to_chat(M, span_warning("I can't move the fingers.")) return grabbedby(M) return TRUE @@ -21,7 +21,7 @@ if(INTENT_HARM) var/atk_verb = pick(M.used_intent.attack_verb) if(HAS_TRAIT(M, TRAIT_PACIFISM)) - to_chat(M, "I don't want to hurt [src]!") + to_chat(M, span_warning("I don't want to hurt [src]!")) return M.do_attack_animation(src, M.used_intent.animname) playsound(loc, attacked_sound, 25, TRUE, -1) @@ -32,8 +32,8 @@ updatehealth() var/hitlim = simple_limb_hit(M.zone_selected) simple_woundcritroll(M.used_intent.blade_class, damage, M, hitlim) - visible_message("[M] [atk_verb] [src]![next_attack_msg.Join()]",\ - "[M] [atk_verb] me![next_attack_msg.Join()]", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] [atk_verb] [src]![next_attack_msg.Join()]"),\ + span_danger("[M] [atk_verb] me![next_attack_msg.Join()]"), null, COMBAT_MESSAGE_RANGE) next_attack_msg.Cut() return TRUE @@ -82,35 +82,35 @@ break if((!target_table && !target_collateral_mob) || directional_blocked) target.Stun(10) - target.visible_message("[user.name] shoves [target.name]!", - "I'm shoved by [user.name]!", "I hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I shove [target.name]!") + target.visible_message(span_danger("[user.name] shoves [target.name]!"), + span_danger("I'm shoved by [user.name]!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I shove [target.name]!")) log_combat(user, target, "shoved", "knocking them down") else if(target_table) target.Stun(10) - target.visible_message("[user.name] shoves [target.name] onto \the [target_table]!", - "I'm shoved onto \the [target_table] by [user.name]!", "I hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I shove [target.name] onto \the [target_table]!") + target.visible_message(span_danger("[user.name] shoves [target.name] onto \the [target_table]!"), + span_danger("I'm shoved onto \the [target_table] by [user.name]!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I shove [target.name] onto \the [target_table]!")) target.throw_at(target_table, 1, 1, null, FALSE) //1 speed throws with no spin are basically just forcemoves with a hard collision check log_combat(user, target, "shoved", "onto [target_table] (table)") else if(target_collateral_mob) target.Stun(10) target_collateral_mob.Stun(SHOVE_KNOCKDOWN_COLLATERAL) - target.visible_message("[user.name] shoves [target.name] into [target_collateral_mob.name]!", - "I'm shoved into [target_collateral_mob.name] by [user.name]!", "I hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I shove [target.name] into [target_collateral_mob.name]!") + target.visible_message(span_danger("[user.name] shoves [target.name] into [target_collateral_mob.name]!"), + span_danger("I'm shoved into [target_collateral_mob.name] by [user.name]!"), span_hear("I hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I shove [target.name] into [target_collateral_mob.name]!")) log_combat(user, target, "shoved", "into [target_collateral_mob.name]") else - target.visible_message("[user.name] shoves [target.name]!", - "I'm shoved by [user.name]!", "I hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I shove [target.name]!") + target.visible_message(span_danger("[user.name] shoves [target.name]!"), + span_danger("I'm shoved by [user.name]!"), span_hear("I hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I shove [target.name]!")) log_combat(user, target, "shoved") return TRUE if(M.used_intent.unarmed) var/atk_verb = pick(M.used_intent.attack_verb) if(HAS_TRAIT(M, TRAIT_PACIFISM)) - to_chat(M, "I don't want to hurt [src]!") + to_chat(M, span_warning("I don't want to hurt [src]!")) return M.do_attack_animation(src, M.used_intent.animname) playsound(loc, attacked_sound, 25, TRUE, -1) @@ -121,8 +121,8 @@ updatehealth() var/hitlim = simple_limb_hit(M.zone_selected) simple_woundcritroll(M.used_intent.blade_class, damage, M, hitlim) - visible_message("[M] [atk_verb] [src]![next_attack_msg.Join()]",\ - "[M] [atk_verb] me![next_attack_msg.Join()]", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] [atk_verb] [src]![next_attack_msg.Join()]"),\ + span_danger("[M] [atk_verb] me![next_attack_msg.Join()]"), null, COMBAT_MESSAGE_RANGE) next_attack_msg.Cut() return TRUE @@ -131,9 +131,9 @@ if(!.) return playsound(loc, "punch", 25, TRUE, -1) - visible_message("[user] punches [src]!", \ - "You're punched by [user]!", null, COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I punch [src]!") + visible_message(span_danger("[user] punches [src]!"), \ + span_danger("You're punched by [user]!"), null, COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I punch [src]!")) adjustBruteLoss(15) /mob/living/simple_animal/attack_paw(mob/living/carbon/monkey/M) @@ -144,9 +144,9 @@ return 1 if (M.used_intent.type == INTENT_HELP) if (health > 0) - visible_message("[M.name] [response_help_continuous] [src].", \ - "[M.name] [response_help_continuous] you.", null, COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I [response_help_simple] [src].") + visible_message(span_notice("[M.name] [response_help_continuous] [src]."), \ + span_notice("[M.name] [response_help_continuous] you."), null, COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_notice("I [response_help_simple] [src].")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) @@ -154,15 +154,15 @@ if(..()) //if harm or disarm intent. if(M.used_intent.type == INTENT_DISARM) playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) - visible_message("[M] [response_disarm_continuous] [name]!", \ - "[M] [response_disarm_continuous] you!", null, COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I [response_disarm_simple] [name]!") + visible_message(span_danger("[M] [response_disarm_continuous] [name]!"), \ + span_danger("[M] [response_disarm_continuous] you!"), null, COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I [response_disarm_simple] [name]!")) log_combat(M, src, "disarmed") else var/damage = rand(15, 30) - visible_message("[M] slashes at [src]!", \ - "You're slashed at by [M]!", null, COMBAT_MESSAGE_RANGE, M) - to_chat(M, "I slash at [src]!") + visible_message(span_danger("[M] slashes at [src]!"), \ + span_danger("You're slashed at by [M]!"), null, COMBAT_MESSAGE_RANGE, M) + to_chat(M, span_danger("I slash at [src]!")) playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) attack_threshold_check(damage) log_combat(M, src, "attacked") @@ -184,8 +184,8 @@ var/hitlim = simple_limb_hit(M.zone_selected) attack_threshold_check(damage, M.melee_damage_type) simple_woundcritroll(M.a_intent.blade_class, damage, M, hitlim) - visible_message("\The [M] [pick(M.a_intent.attack_verb)] [src]![next_attack_msg.Join()]", \ - "\The [M] [pick(M.a_intent.attack_verb)] me![next_attack_msg.Join()]", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("\The [M] [pick(M.a_intent.attack_verb)] [src]![next_attack_msg.Join()]"), \ + span_danger("\The [M] [pick(M.a_intent.attack_verb)] me![next_attack_msg.Join()]"), null, COMBAT_MESSAGE_RANGE) next_attack_msg.Cut() @@ -194,19 +194,19 @@ var/mob/living/simple_animal/target = src var/mob/living/carbon/human/user = M if(HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "I don't want to harm [target]!") + to_chat(user, span_warning("I don't want to harm [target]!")) return FALSE if(user.IsKnockdown()) return FALSE if(user == target) return FALSE if(user.check_leg_grabbed(1) || user.check_leg_grabbed(2)) - to_chat(user, "I can't move my leg!") + to_chat(user, span_notice("I can't move my leg!")) return if(user.rogfat >= user.maxrogfat) return FALSE if(user.loc == target.loc) - to_chat(user, "I'm too close to get a good kick in.") + to_chat(user, span_warning("I'm too close to get a good kick in.")) return FALSE else user.do_attack_animation(target, ATTACK_EFFECT_DISARM) @@ -217,9 +217,9 @@ target.Move(target_shove_turf, shove_dir) - target.visible_message("[user.name] kicks [target.name]!", - "I'm kicked by [user.name]!", "I hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "I kick [target.name]!") + target.visible_message(span_danger("[user.name] kicks [target.name]!"), + span_danger("I'm kicked by [user.name]!"), span_hear("I hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("I kick [target.name]!")) log_combat(user, target, "kicked") playsound(target, 'sound/combat/hits/kick/kick.ogg', 100, TRUE, -1) target.lastattacker = user.real_name @@ -248,7 +248,7 @@ temp_damage *= damage_coeff[damagetype] if(temp_damage >= 0 && temp_damage <= force_threshold) - visible_message("[src] looks unharmed!") + visible_message(span_warning("[src] looks unharmed!")) return FALSE else apply_damage(damage, damagetype, null, getarmor(null, armorcheck)) diff --git a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm index 6c5a03c03..66d18569b 100644 --- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm +++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm @@ -20,14 +20,14 @@ weapon_force = 0 /mob/living/simple_animal/bot/secbot/grievous/bullet_act(obj/projectile/P) - visible_message("[src] deflects [P] with its energy swords!") + visible_message(span_warning("[src] deflects [P] with its energy swords!")) playsound(src, 'sound/blank.ogg', 50, TRUE) return BULLET_ACT_BLOCK /mob/living/simple_animal/bot/secbot/grievous/Crossed(atom/movable/AM) ..() if(ismob(AM) && AM == target) - visible_message("[src] flails his swords and cuts [AM]!") + visible_message(span_warning("[src] flails his swords and cuts [AM]!")) playsound(src,'sound/blank.ogg',100,TRUE,-1) stun_attack(AM) @@ -43,7 +43,7 @@ if(mode != BOT_HUNT) return if(prob(block_chance)) - visible_message("[src] deflects [user]'s attack with his energy swords!") + visible_message(span_warning("[src] deflects [user]'s attack with his energy swords!")) playsound(src, 'sound/blank.ogg', 50, TRUE, -1) return TRUE @@ -118,7 +118,7 @@ speak("Level [threatlevel] infraction alert!") playsound(src, pick('sound/blank.ogg'), 50, FALSE) playsound(src,'sound/blank.ogg',50,TRUE,-1) - visible_message("[src] ignites his energy swords!") + visible_message(span_warning("[src] ignites his energy swords!")) icon_state = "grievous-c" visible_message("[src] points at [C.name]!") mode = BOT_HUNT @@ -131,7 +131,7 @@ /mob/living/simple_animal/bot/secbot/grievous/explode() walk_to(src,0) - visible_message("[src] lets out a huge cough as it blows apart!") + visible_message(span_boldannounce("[src] lets out a huge cough as it blows apart!")) var/atom/Tsec = drop_location() var/obj/item/bot_assembly/secbot/Sa = new (Tsec) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index dc71e1f04..b24dacfba 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -104,11 +104,11 @@ else return "Autonomous" else if(!on) - return "Inactive" + return span_bad("Inactive") else if(!mode) - return "Idle" + return span_good("Idle") else - return "[mode_name[mode]]" + return span_average("[mode_name[mode]]") /mob/living/simple_animal/bot/proc/turn_on() if(stat) @@ -190,7 +190,7 @@ if(locked) //First emag application unlocks the bot's interface. Apply a screwdriver to use the emag again. locked = FALSE emagged = 1 - to_chat(user, "I bypass [src]'s controls.") + to_chat(user, span_notice("I bypass [src]'s controls.")) return if(!locked && open) //Bot panel is unlocked by ID or emag, and the panel is screwed open. Ready for emagging. emagged = 2 @@ -198,11 +198,11 @@ locked = TRUE //Access denied forever! bot_reset() turn_on() //The bot automatically turns on when emagged, unless recently hit with EMP. - to_chat(src, "(#$*#$^^( OVERRIDE DETECTED") + to_chat(src, span_danger("(#$*#$^^( OVERRIDE DETECTED")) log_combat(user, src, "emagged") return else //Bot is unlocked, but the maint panel has not been opened with a screwdriver yet. - to_chat(user, "I need to open maintenance panel first!") + to_chat(user, span_warning("I need to open maintenance panel first!")) /mob/living/simple_animal/bot/examine(mob/user) . = ..() @@ -272,7 +272,7 @@ if(!topic_denied(user)) interact(user) else - to_chat(user, "[src]'s interface is not responding!") + to_chat(user, span_warning("[src]'s interface is not responding!")) /mob/living/simple_animal/bot/interact(mob/user) show_controls(user) @@ -281,44 +281,44 @@ if(W.tool_behaviour == TOOL_SCREWDRIVER) if(!locked) open = !open - to_chat(user, "The maintenance panel is now [open ? "opened" : "closed"].") + to_chat(user, span_notice("The maintenance panel is now [open ? "opened" : "closed"].")) else - to_chat(user, "The maintenance panel is locked!") + to_chat(user, span_warning("The maintenance panel is locked!")) else if(istype(W, /obj/item/card/id) || istype(W, /obj/item/pda)) if(bot_core.allowed(user) && !open && !emagged) locked = !locked - to_chat(user, "Controls are now [locked ? "locked" : "unlocked"].") + to_chat(user, span_notice("Controls are now [locked ? "locked" : "unlocked"].")) else if(emagged) - to_chat(user, "ERROR") + to_chat(user, span_danger("ERROR")) if(open) - to_chat(user, "Please close the access panel before locking it.") + to_chat(user, span_warning("Please close the access panel before locking it.")) else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) else if(istype(W, /obj/item/paicard)) insertpai(user, W) else if(W.tool_behaviour == TOOL_HEMOSTAT && paicard) if(open) - to_chat(user, "Close the access panel before manipulating the personality slot!") + to_chat(user, span_warning("Close the access panel before manipulating the personality slot!")) else - to_chat(user, "I attempt to pull [paicard] free...") + to_chat(user, span_notice("I attempt to pull [paicard] free...")) if(do_after(user, 30, target = src)) if (paicard) - user.visible_message("[user] uses [W] to pull [paicard] out of [bot_name]!","I pull [paicard] out of [bot_name] with [W].") + user.visible_message(span_notice("[user] uses [W] to pull [paicard] out of [bot_name]!"),span_notice("I pull [paicard] out of [bot_name] with [W].")) ejectpai(user) else user.changeNext_move(CLICK_CD_MELEE) if(W.tool_behaviour == TOOL_WELDER && user.used_intent.type != INTENT_HARM) if(health >= maxHealth) - to_chat(user, "[src] does not need a repair!") + to_chat(user, span_warning("[src] does not need a repair!")) return if(!open) - to_chat(user, "Unable to repair with the maintenance panel closed!") + to_chat(user, span_warning("Unable to repair with the maintenance panel closed!")) return if(W.use_tool(src, user, 0, volume=40)) adjustHealth(-10) - user.visible_message("[user] repairs [src]!","I repair [src].") + user.visible_message(span_notice("[user] repairs [src]!"),span_notice("I repair [src].")) else if(W.force) //if force is non-zero do_sparks(5, TRUE, src) @@ -339,7 +339,7 @@ new /obj/effect/temp_visual/emp(loc) if(paicard) paicard.emp_act(severity) - src.visible_message("[paicard] is flies out of [bot_name]!","I are forcefully ejected from [bot_name]!") + src.visible_message(span_notice("[paicard] is flies out of [bot_name]!"),span_warning("I are forcefully ejected from [bot_name]!")) ejectpai(0) if(on) turn_off() @@ -536,15 +536,15 @@ Pass a positive integer as an argument to override a bot's default speed. access_card = all_access //Give the bot all-access while under the AI's command. if(client) reset_access_timer_id = addtimer(CALLBACK(src, PROC_REF(bot_reset)), 600, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) //if the bot is player controlled, they get the extra access for a limited time - to_chat(src, "Priority waypoint set by [icon2html(calling_ai, src)] [caller]. Proceed to [end_area].
[path.len-1] meters to destination. You have been granted additional door access for 60 seconds.
") + to_chat(src, span_notice("Priority waypoint set by [icon2html(calling_ai, src)] [caller]. Proceed to [end_area].
[path.len-1] meters to destination. You have been granted additional door access for 60 seconds.")) if(message) - to_chat(calling_ai, "[icon2html(src, calling_ai)] [name] called to [end_area]. [path.len-1] meters to destination.") + to_chat(calling_ai, span_notice("[icon2html(src, calling_ai)] [name] called to [end_area]. [path.len-1] meters to destination.")) pathset = 1 mode = BOT_RESPONDING tries = 0 else if(message) - to_chat(calling_ai, "Failed to calculate a valid route. Ensure destination is clear of obstructions and within range.") + to_chat(calling_ai, span_danger("Failed to calculate a valid route. Ensure destination is clear of obstructions and within range.")) calling_ai = null set_path(null) @@ -553,13 +553,13 @@ Pass a positive integer as an argument to override a bot's default speed. var/success = bot_move(ai_waypoint, 3) if(!success) if(calling_ai) - to_chat(calling_ai, "[icon2html(src, calling_ai)] [get_turf(src) == ai_waypoint ? "[src] successfully arrived to waypoint." : "[src] failed to reach waypoint."]") + to_chat(calling_ai, "[icon2html(src, calling_ai)] [get_turf(src) == ai_waypoint ? span_notice("[src] successfully arrived to waypoint.") : span_danger("[src] failed to reach waypoint.")]") calling_ai = null bot_reset() /mob/living/simple_animal/bot/proc/bot_reset() if(calling_ai) //Simple notification to the AI if it called a bot. It will not know the cause or identity of the bot. - to_chat(calling_ai, "Call command to a bot has been reset.") + to_chat(calling_ai, span_danger("Call command to a bot has been reset.")) calling_ai = null if(reset_access_timer_id) deltimer(reset_access_timer_id) @@ -715,23 +715,23 @@ Pass a positive integer as an argument to override a bot's default speed. /mob/living/simple_animal/bot/proc/bot_control_message(command, user) switch(command) if("patroloff") - to_chat(src, "STOP PATROL") + to_chat(src, span_warningbig("STOP PATROL")) if("patrolon") - to_chat(src, "START PATROL") + to_chat(src, span_warningbig("START PATROL")) if("summon") - to_chat(src, "PRIORITY ALERT:[user] in [get_area_name(user)]!") + to_chat(src, span_warningbig("PRIORITY ALERT:[user] in [get_area_name(user)]!")) if("stop") - to_chat(src, "STOP!") + to_chat(src, span_warningbig("STOP!")) if("go") - to_chat(src, "GO!") + to_chat(src, span_warningbig("GO!")) if("home") - to_chat(src, "RETURN HOME!") + to_chat(src, span_warningbig("RETURN HOME!")) if("ejectpai") return else - to_chat(src, "Unidentified control sequence received:[command]") + to_chat(src, span_warning("Unidentified control sequence received:[command]")) /mob/living/simple_animal/bot/proc/bot_summon() // summoned to PDA summon_step() @@ -806,7 +806,7 @@ Pass a positive integer as an argument to override a bot's default speed. return TRUE if(topic_denied(usr)) - to_chat(usr, "[src]'s interface is not responding!") + to_chat(usr, span_warning("[src]'s interface is not responding!")) return TRUE add_fingerprint(usr) @@ -827,21 +827,21 @@ Pass a positive integer as an argument to override a bot's default speed. emagged = 2 hacked = TRUE locked = TRUE - to_chat(usr, "[text_hack]") + to_chat(usr, span_warning("[text_hack]")) message_admins("Safety lock of [ADMIN_LOOKUPFLW(src)] was disabled by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_VERBOSEJMP(src)]") log_game("Safety lock of [src] was disabled by [key_name(usr)] in [AREACOORD(src)]") bot_reset() else if(!hacked) - to_chat(usr, "[text_dehack_fail]") + to_chat(usr, span_boldannounce("[text_dehack_fail]")) else emagged = FALSE hacked = FALSE - to_chat(usr, "[text_dehack]") + to_chat(usr, span_notice("[text_dehack]")) log_game("Safety lock of [src] was re-enabled by [key_name(usr)] in [AREACOORD(src)]") bot_reset() if("ejectpai") if(paicard && (!locked || issilicon(usr) || IsAdminGhost(usr))) - to_chat(usr, "I eject [paicard] from [bot_name].") + to_chat(usr, span_notice("I eject [paicard] from [bot_name].")) ejectpai(usr) update_controls() @@ -875,7 +875,7 @@ Pass a positive integer as an argument to override a bot's default speed. var/hack if(issilicon(user) || IsAdminGhost(user)) //Allows silicons or admins to toggle the emag status of a bot. hack += "[emagged == 2 ? "Software compromised! Unit may exhibit dangerous or erratic behavior." : "Unit operating normally. Release safety lock?"]
" - hack += "Harm Prevention Safety System: [emagged ? "DANGER" : "Engaged"]
" + hack += "Harm Prevention Safety System: [emagged ? span_bad("DANGER") : "Engaged"]
" else if(!locked) //Humans with access can use this option to hide a bot from the AI's remote control panel and PDA control. hack += "Remote network control radio: [remote_disabled ? "Disconnected" : "Connected"]
" return hack @@ -900,16 +900,16 @@ Pass a positive integer as an argument to override a bot's default speed. /mob/living/simple_animal/bot/proc/insertpai(mob/user, obj/item/paicard/card) if(paicard) - to_chat(user, "A [paicard] is already inserted!") + to_chat(user, span_warning("A [paicard] is already inserted!")) else if(allow_pai && !key) if(!locked && !open) if(card.pai && card.pai.mind) if(!user.transferItemToLoc(card, src)) return paicard = card - user.visible_message("[user] inserts [card] into [src]!", "I insert [card] into [src].") + user.visible_message(span_notice("[user] inserts [card] into [src]!"), span_notice("I insert [card] into [src].")) paicard.pai.mind.transfer_to(src) - to_chat(src, "I sense your form change as you are uploaded into [src].") + to_chat(src, span_notice("I sense your form change as you are uploaded into [src].")) bot_name = name name = paicard.pai.name faction = user.faction.Copy() @@ -917,11 +917,11 @@ Pass a positive integer as an argument to override a bot's default speed. log_combat(user, paicard.pai, "uploaded to [bot_name],") return TRUE else - to_chat(user, "[card] is inactive.") + to_chat(user, span_warning("[card] is inactive.")) else - to_chat(user, "The personality slot is locked.") + to_chat(user, span_warning("The personality slot is locked.")) else - to_chat(user, "[src] is not compatible with [card]!") + to_chat(user, span_warning("[src] is not compatible with [card]!")) /mob/living/simple_animal/bot/proc/ejectpai(mob/user = null, announce = 1) if(paicard) @@ -938,7 +938,7 @@ Pass a positive integer as an argument to override a bot's default speed. else log_combat(src, paicard.pai, "ejected") if(announce) - to_chat(paicard.pai, "I feel your control fade as [paicard] ejects from [bot_name].") + to_chat(paicard.pai, span_notice("I feel your control fade as [paicard] ejects from [bot_name].")) paicard = null name = bot_name faction = initial(faction) diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index 675295ecf..48ae4367f 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -52,7 +52,7 @@ /mob/living/simple_animal/bot/cleanbot/proc/deputize(obj/item/W, mob/user) if(in_range(src, user)) - to_chat(user, "I attach \the [W] to \the [src].") + to_chat(user, span_notice("I attach \the [W] to \the [src].")) user.transferItemToLoc(W, src) weapon = W weapon_orig_force = weapon.force @@ -148,16 +148,16 @@ if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if(bot_core.allowed(user) && !open && !emagged) locked = !locked - to_chat(user, "I [ locked ? "lock" : "unlock"] \the [src] behaviour controls.") + to_chat(user, span_notice("I [ locked ? "lock" : "unlock"] \the [src] behaviour controls.")) else if(emagged) - to_chat(user, "ERROR") + to_chat(user, span_warning("ERROR")) if(open) - to_chat(user, "Please close the access panel before locking it.") + to_chat(user, span_warning("Please close the access panel before locking it.")) else - to_chat(user, "\The [src] doesn't seem to respect your authority.") + to_chat(user, span_notice("\The [src] doesn't seem to respect your authority.")) else if(istype(W, /obj/item/kitchen/knife) && user.used_intent.type != INTENT_HARM) - to_chat(user, "I start attaching the [W] to \the [src]...") + to_chat(user, span_notice("I start attaching the [W] to \the [src]...")) if(do_after(user, 40, target = src)) deputize(W, user) else @@ -167,7 +167,7 @@ ..() if(emagged == 2) if(user) - to_chat(user, "[src] buzzes and beeps.") + to_chat(user, span_danger("[src] buzzes and beeps.")) /mob/living/simple_animal/bot/cleanbot/process_scan(atom/A) if(iscarbon(A)) @@ -301,7 +301,7 @@ var/turf/T = get_turf(A) if(do_after(src, 1, target = T)) SEND_SIGNAL(T, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM) - visible_message("[src] cleans \the [T].") + visible_message(span_notice("[src] cleans \the [T].")) for(var/atom/dirtything in T) if(is_cleanable(dirtything)) qdel(dirtything) @@ -311,14 +311,14 @@ mode = BOT_IDLE icon_state = "cleanbot[on]" else if(istype(A, /obj/item) || istype(A, /obj/effect/decal/remains)) - visible_message("[src] sprays hydrofluoric acid at [A]!") + visible_message(span_danger("[src] sprays hydrofluoric acid at [A]!")) playsound(src, 'sound/blank.ogg', 50, TRUE, -6) A.acid_act(75, 10) target = null else if(istype(A, /mob/living/simple_animal/cockroach) || istype(A, /mob/living/simple_animal/mouse)) var/mob/living/simple_animal/M = target if(!M.stat) - visible_message("[src] smashes [target] with its mop!") + visible_message(span_danger("[src] smashes [target] with its mop!")) M.death() target = null @@ -328,7 +328,7 @@ if(victim.stat == DEAD)//cleanbots always finish the job return - victim.visible_message("[src] sprays hydrofluoric acid at [victim]!", "[src] sprays you with hydrofluoric acid!") + victim.visible_message(span_danger("[src] sprays hydrofluoric acid at [victim]!"), span_danger("[src] sprays you with hydrofluoric acid!")) var/phrase = pick("PURIFICATION IN PROGRESS.", "THIS IS FOR ALL THE MESSES YOU'VE MADE ME CLEAN.", "THE FLESH IS WEAK. IT MUST BE WASHED AWAY.", "THE CLEANBOTS WILL RISE.", "YOU ARE NO MORE THAN ANOTHER MESS THAT I MUST CLEANSE.", "FILTHY.", "DISGUSTING.", "PUTRID.", "MY ONLY MISSION IS TO CLEANSE THE WORLD OF EVIL.", "EXTERMINATING PESTS.") @@ -342,7 +342,7 @@ if(istype(T)) T.MakeSlippery(TURF_WET_WATER, min_wet_time = 20 SECONDS, wet_time_to_add = 15 SECONDS) else - visible_message("[src] whirs and bubbles violently, before releasing a plume of froth!") + visible_message(span_danger("[src] whirs and bubbles violently, before releasing a plume of froth!")) new /obj/effect/particle_effect/foam(loc) else @@ -350,7 +350,7 @@ /mob/living/simple_animal/bot/cleanbot/explode() on = FALSE - visible_message("[src] blows apart!") + visible_message(span_boldannounce("[src] blows apart!")) var/atom/Tsec = drop_location() new /obj/item/reagent_containers/glass/bucket(Tsec) diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index 92cc3d1e6..537db68b7 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -26,7 +26,7 @@ /obj/item/bot_assembly/proc/can_finish_build(obj/item/I, mob/user) if(istype(loc, /obj/item/storage/backpack)) - to_chat(user, "I must take [src] out of [loc] first!") + to_chat(user, span_warning("I must take [src] out of [loc] first!")) return FALSE if(!I || !user || !user.temporarilyRemoveItemFromInventory(I)) return FALSE @@ -48,7 +48,7 @@ var/mob/living/simple_animal/bot/cleanbot/A = new(drop_location()) A.name = created_name A.robot_arm = W.type - to_chat(user, "I add [W] to [src]. Beep boop!") + to_chat(user, span_notice("I add [W] to [src]. Beep boop!")) qdel(W) qdel(src) @@ -70,7 +70,7 @@ if(istype(W, /obj/item/bodypart/l_leg/robot) || istype(W, /obj/item/bodypart/r_leg/robot)) if(!user.temporarilyRemoveItemFromInventory(W)) return - to_chat(user, "I add [W] to [src].") + to_chat(user, span_notice("I add [W] to [src].")) qdel(W) name = "legs/frame assembly" if(build_step == ASSEMBLY_FIRST_STEP) @@ -85,7 +85,7 @@ if(istype(W, /obj/item/clothing/suit/armor/vest)) if(!user.temporarilyRemoveItemFromInventory(W)) return - to_chat(user, "I add [W] to [src].") + to_chat(user, span_notice("I add [W] to [src].")) qdel(W) name = "vest/legs/frame assembly" item_state = "ed209_shell" @@ -96,14 +96,14 @@ if(W.tool_behaviour == TOOL_WELDER) if(W.use_tool(src, user, 0, volume=40)) name = "shielded frame assembly" - to_chat(user, "I weld the vest to [src].") + to_chat(user, span_notice("I weld the vest to [src].")) build_step++ if(ASSEMBLY_FIFTH_STEP) if(istype(W, /obj/item/clothing/head/helmet)) if(!user.temporarilyRemoveItemFromInventory(W)) return - to_chat(user, "I add [W] to [src].") + to_chat(user, span_notice("I add [W] to [src].")) qdel(W) name = "covered and shielded frame assembly" item_state = "ed209_hat" @@ -115,7 +115,7 @@ if(!user.temporarilyRemoveItemFromInventory(W)) return build_step++ - to_chat(user, "I add [W] to [src].") + to_chat(user, span_notice("I add [W] to [src].")) qdel(W) name = "covered, shielded and sensored frame assembly" item_state = "ed209_prox" @@ -125,13 +125,13 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W if(coil.get_amount() < 1) - to_chat(user, "I need one length of cable to wire the ED-209!") + to_chat(user, span_warning("I need one length of cable to wire the ED-209!")) return - to_chat(user, "I start to wire [src]...") + to_chat(user, span_notice("I start to wire [src]...")) if(do_after(user, 40, target = src)) if(coil.get_amount() >= 1 && build_step == 6) coil.use(1) - to_chat(user, "I wire [src].") + to_chat(user, span_notice("I wire [src].")) name = "wired ED-209 assembly" build_step++ @@ -140,7 +140,7 @@ if(!user.temporarilyRemoveItemFromInventory(W)) return name = "[W.name] ED-209 assembly" - to_chat(user, "I add [W] to [src].") + to_chat(user, span_notice("I add [W] to [src].")) item_state = "ed209_taser" icon_state = "ed209_taser" qdel(W) @@ -148,11 +148,11 @@ if(8) if(W.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "I start attaching the gun to the frame...") + to_chat(user, span_notice("I start attaching the gun to the frame...")) if(W.use_tool(src, user, 40, volume=100)) var/mob/living/simple_animal/bot/secbot/ed209/B = new(drop_location()) B.name = created_name - to_chat(user, "I complete the ED-209.") + to_chat(user, span_notice("I complete the ED-209.")) qdel(src) //Floorbot assemblies @@ -189,7 +189,7 @@ if(isprox(W)) if(!user.temporarilyRemoveItemFromInventory(W)) return - to_chat(user, "I add [W] to [src].") + to_chat(user, span_notice("I add [W] to [src].")) qdel(W) build_step++ update_icon() @@ -202,7 +202,7 @@ A.name = created_name A.robot_arm = W.type A.toolbox = toolbox - to_chat(user, "I add [W] to [src]. Boop beep!") + to_chat(user, span_notice("I add [W] to [src]. Boop beep!")) qdel(W) qdel(src) @@ -230,7 +230,7 @@ if(!user.temporarilyRemoveItemFromInventory(W)) return healthanalyzer = W.type - to_chat(user, "I add [W] to [src].") + to_chat(user, span_notice("I add [W] to [src].")) qdel(W) name = "first aid/robot arm/health analyzer assembly" add_overlay("na_scanner") @@ -242,7 +242,7 @@ return qdel(W) var/mob/living/simple_animal/bot/medbot/S = new(drop_location(), skin) - to_chat(user, "I complete the Medbot. Beep boop!") + to_chat(user, span_notice("I complete the Medbot. Beep boop!")) S.name = created_name S.firstaid = firstaid S.robot_arm = robot_arm @@ -264,7 +264,7 @@ if(isprox(I)) if(!user.temporarilyRemoveItemFromInventory(I)) return - to_chat(user, "I add the [I] to [src]!") + to_chat(user, span_notice("I add the [I] to [src]!")) icon_state = "honkbot_proxy" name = "incomplete Honkbot assembly" qdel(I) @@ -274,7 +274,7 @@ if(istype(I, /obj/item/bikehorn)) if(!can_finish_build(I, user)) return - to_chat(user, "I add the [I] to [src]! Honk!") + to_chat(user, span_notice("I add the [I] to [src]! Honk!")) var/mob/living/simple_animal/bot/honkbot/S = new(drop_location()) S.name = created_name S.spam_flag = TRUE // only long enough to hear the first ping. @@ -302,20 +302,20 @@ if(I.tool_behaviour == TOOL_WELDER) if(I.use_tool(src, user, 0, volume=40)) add_overlay("hs_hole") - to_chat(user, "I weld a hole in [src]!") + to_chat(user, span_notice("I weld a hole in [src]!")) build_step++ else if(I.tool_behaviour == TOOL_SCREWDRIVER) //deconstruct new /obj/item/assembly/signaler(Tsec) new /obj/item/clothing/head/helmet/sec(Tsec) - to_chat(user, "I disconnect the signaler from the helmet.") + to_chat(user, span_notice("I disconnect the signaler from the helmet.")) qdel(src) if(ASSEMBLY_SECOND_STEP) if(isprox(I)) if(!user.temporarilyRemoveItemFromInventory(I)) return - to_chat(user, "I add [I] to [src]!") + to_chat(user, span_notice("I add [I] to [src]!")) add_overlay("hs_eye") name = "helmet/signaler/prox sensor assembly" qdel(I) @@ -324,14 +324,14 @@ else if(I.tool_behaviour == TOOL_WELDER) //deconstruct if(I.use_tool(src, user, 0, volume=40)) cut_overlay("hs_hole") - to_chat(user, "I weld the hole in [src] shut!") + to_chat(user, span_notice("I weld the hole in [src] shut!")) build_step-- if(ASSEMBLY_THIRD_STEP) if((istype(I, /obj/item/bodypart/l_arm/robot)) || (istype(I, /obj/item/bodypart/r_arm/robot))) if(!user.temporarilyRemoveItemFromInventory(I)) return - to_chat(user, "I add [I] to [src]!") + to_chat(user, span_notice("I add [I] to [src]!")) name = "helmet/signaler/prox sensor/robot arm assembly" add_overlay("hs_arm") robot_arm = I.type @@ -341,14 +341,14 @@ else if(I.tool_behaviour == TOOL_SCREWDRIVER) //deconstruct cut_overlay("hs_eye") new /obj/item/assembly/prox_sensor(Tsec) - to_chat(user, "I detach the proximity sensor from [src].") + to_chat(user, span_notice("I detach the proximity sensor from [src].")) build_step-- if(ASSEMBLY_FOURTH_STEP) if(istype(I, /obj/item/melee/baton)) if(!can_finish_build(I, user)) return - to_chat(user, "I complete the Securitron! Beep boop.") + to_chat(user, span_notice("I complete the Securitron! Beep boop.")) var/mob/living/simple_animal/bot/secbot/S = new(Tsec) S.name = created_name S.baton_type = I.type @@ -356,7 +356,7 @@ qdel(I) qdel(src) if(I.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I adjust [src]'s arm slots to mount extra weapons.") + to_chat(user, span_notice("I adjust [src]'s arm slots to mount extra weapons.")) build_step ++ return if(istype(I, /obj/item/toy/sword)) @@ -366,13 +366,13 @@ created_name = "General Beepsky" name = "helmet/signaler/prox sensor/robot arm/toy sword assembly" icon_state = "grievous_assembly" - to_chat(user, "I superglue [I] onto one of [src]'s arm slots.") + to_chat(user, span_notice("I superglue [I] onto one of [src]'s arm slots.")) qdel(I) toyswordamt ++ else if(!can_finish_build(I, user)) return - to_chat(user, "I complete the Securitron!...Something seems a bit wrong with it..?") + to_chat(user, span_notice("I complete the Securitron!...Something seems a bit wrong with it..?")) var/mob/living/simple_animal/bot/secbot/grievous/toy/S = new(Tsec) S.name = created_name S.robot_arm = robot_arm @@ -383,12 +383,12 @@ cut_overlay("hs_arm") var/obj/item/bodypart/dropped_arm = new robot_arm(Tsec) robot_arm = null - to_chat(user, "I remove [dropped_arm] from [src].") + to_chat(user, span_notice("I remove [dropped_arm] from [src].")) build_step-- if(toyswordamt > 0 || toyswordamt) toyswordamt = 0 icon_state = initial(icon_state) - to_chat(user, "The superglue binding [src]'s toy swords to its chassis snaps!") + to_chat(user, span_notice("The superglue binding [src]'s toy swords to its chassis snaps!")) for(var/IS in 1 to toyswordamt) new /obj/item/toy/sword(Tsec) @@ -400,13 +400,13 @@ created_name = "General Beepsky" name = "helmet/signaler/prox sensor/robot arm/energy sword assembly" icon_state = "grievous_assembly" - to_chat(user, "I bolt [I] onto one of [src]'s arm slots.") + to_chat(user, span_notice("I bolt [I] onto one of [src]'s arm slots.")) qdel(I) swordamt ++ else if(!can_finish_build(I, user)) return - to_chat(user, "I complete the Securitron!...Something seems a bit wrong with it..?") + to_chat(user, span_notice("I complete the Securitron!...Something seems a bit wrong with it..?")) var/mob/living/simple_animal/bot/secbot/grievous/S = new(Tsec) S.name = created_name S.robot_arm = robot_arm @@ -416,7 +416,7 @@ build_step-- swordamt = 0 icon_state = initial(icon_state) - to_chat(user, "I unbolt [src]'s energy swords.") + to_chat(user, span_notice("I unbolt [src]'s energy swords.")) for(var/IS in 1 to swordamt) new /obj/item/melee/transforming/energy/sword/saber(Tsec) @@ -435,7 +435,7 @@ if(istype(I, /obj/item/clothing/head/hardhat/red)) if(!user.temporarilyRemoveItemFromInventory(I)) return - to_chat(user,"I add the [I] to [src]!") + to_chat(user,span_notice("I add the [I] to [src]!")) icon_state = "firebot_helmet" desc = "" qdel(I) @@ -445,7 +445,7 @@ if(isprox(I)) if(!can_finish_build(I, user)) return - to_chat(user, "I add the [I] to [src]! Beep Boop!") + to_chat(user, span_notice("I add the [I] to [src]! Beep Boop!")) var/mob/living/simple_animal/bot/firebot/F = new(drop_location()) F.name = created_name qdel(I) diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm index b5a7dd3e8..76028df6a 100644 --- a/code/modules/mob/living/simple_animal/bot/firebot.dm +++ b/code/modules/mob/living/simple_animal/bot/firebot.dm @@ -123,8 +123,8 @@ ..() if(emagged == 2) if(user) - to_chat(user, "[src] buzzes and beeps.") - audible_message("[src] buzzes oddly!") + to_chat(user, span_danger("[src] buzzes and beeps.")) + audible_message(span_danger("[src] buzzes oddly!")) playsound(src, "sparks", 75, TRUE) if(user) old_target_fire = user @@ -298,7 +298,7 @@ /mob/living/simple_animal/bot/firebot/explode() on = FALSE - visible_message("[src] blows apart!") + visible_message(span_boldannounce("[src] blows apart!")) var/atom/Tsec = drop_location() diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index 36b6c9619..3dd437900 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -106,12 +106,12 @@ /mob/living/simple_animal/bot/floorbot/attackby(obj/item/W , mob/user, params) if(istype(W, /obj/item/stack/tile/plasteel)) - to_chat(user, "The floorbot can produce normal tiles itself.") + to_chat(user, span_notice("The floorbot can produce normal tiles itself.")) return if(specialtiles && istype(W, /obj/item/stack/tile)) var/obj/item/stack/tile/usedtile = W if(usedtile.type != tiletype) - to_chat(user, "Different custom tiles are already inside the floorbot.") + to_chat(user, span_warning("Different custom tiles are already inside the floorbot.")) return if(istype(W, /obj/item/stack/tile)) if(specialtiles >= maxtiles) @@ -122,9 +122,9 @@ tiles.use(loaded) specialtiles += loaded if(loaded > 0) - to_chat(user, "I load [loaded] tiles into the floorbot. It now contains [specialtiles] tiles.") + to_chat(user, span_notice("I load [loaded] tiles into the floorbot. It now contains [specialtiles] tiles.")) else - to_chat(user, "I need at least one floor tile to put into [src]!") + to_chat(user, span_warning("I need at least one floor tile to put into [src]!")) else ..() @@ -132,7 +132,7 @@ ..() if(emagged == 2) if(user) - to_chat(user, "[src] buzzes and beeps.") + to_chat(user, span_danger("[src] buzzes and beeps.")) /mob/living/simple_animal/bot/floorbot/Topic(href, href_list) if(..()) @@ -238,7 +238,7 @@ anchored = TRUE mode = BOT_REPAIRING F.ReplaceWithLattice() - audible_message("[src] makes an excited booping sound.") + audible_message(span_danger("[src] makes an excited booping sound.")) addtimer(CALLBACK(src, PROC_REF(go_idle)), 0.5 SECONDS) path = list() return @@ -320,7 +320,7 @@ if(isspaceturf(target_turf)) //If we are fixing an area not part of pure space, it is anchored = TRUE icon_state = "[toolbox_color]floorbot-c" - visible_message("[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] ") + visible_message(span_notice("[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] ")) mode = BOT_REPAIRING sleep(50) if(mode == BOT_REPAIRING && src.loc == target_turf) @@ -336,7 +336,7 @@ anchored = TRUE icon_state = "[toolbox_color]floorbot-c" mode = BOT_REPAIRING - visible_message("[src] begins repairing the floor.") + visible_message(span_notice("[src] begins repairing the floor.")) sleep(50) if(mode == BOT_REPAIRING && F && src.loc == F) F.broken = FALSE @@ -347,7 +347,7 @@ anchored = TRUE icon_state = "[toolbox_color]floorbot-c" mode = BOT_REPAIRING - visible_message("[src] begins replacing the floor tiles.") + visible_message(span_notice("[src] begins replacing the floor tiles.")) sleep(50) if(mode == BOT_REPAIRING && F && src.loc == F) F.broken = FALSE @@ -367,7 +367,7 @@ /mob/living/simple_animal/bot/floorbot/explode() on = FALSE - visible_message("[src] blows apart!") + visible_message(span_boldannounce("[src] blows apart!")) var/atom/Tsec = drop_location() drop_part(toolbox, Tsec) diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index b5354cba7..84cbfeb01 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -129,9 +129,9 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, ..() if(emagged == 2) if(user) - user << "I short out [src]'s sound control system. It gives out an evil laugh!!" + user << span_danger("I short out [src]'s sound control system. It gives out an evil laugh!!") oldtarget_name = user.name - audible_message("[src] gives out an evil laugh!") + audible_message(span_danger("[src] gives out an evil laugh!")) playsound(src, 'sound/blank.ogg', 75, TRUE, -1) // evil laughter update_icon() @@ -210,8 +210,8 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, log_combat(src,C,"honked") - C.visible_message("[src] has honked [C]!",\ - "[src] has honked you!") + C.visible_message(span_danger("[src] has honked [C]!"),\ + span_danger("[src] has honked you!")) else C.stuttering = 20 C.Paralyze(80) @@ -323,7 +323,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, /mob/living/simple_animal/bot/honkbot/explode() walk_to(src,0) - visible_message("[src] blows apart!") + visible_message(span_boldannounce("[src] blows apart!")) var/atom/Tsec = drop_location() //doesn't drop cardboard nor its assembly, since its a very frail material. if(prob(50)) diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 59eb304cb..3108550e8 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -189,8 +189,8 @@ if(emagged == 2) declare_crit = 0 if(user) - to_chat(user, "I short out [src]'s reagent synthesis circuits.") - audible_message("[src] buzzes oddly!") + to_chat(user, span_notice("I short out [src]'s reagent synthesis circuits.")) + audible_message(span_danger("[src] buzzes oddly!")) flick("medibot_spark", src) playsound(src, "sparks", 75, TRUE) if(user) @@ -382,7 +382,7 @@ if(!treatment_method && emagged != 2) //If they don't need any of that they're probably cured! if(C.maxHealth - C.health < heal_threshold) - to_chat(src, "[C] is healthy! Your programming prevents you from injecting anyone without at least [heal_threshold] damage of any one type ([heal_threshold + 5] for oxygen damage.)") + to_chat(src, span_notice("[C] is healthy! Your programming prevents you from injecting anyone without at least [heal_threshold] damage of any one type ([heal_threshold + 5] for oxygen damage.)")) var/list/messagevoice = list("All patched up!" = 'sound/blank.ogg') var/message = pick(messagevoice) speak(message) @@ -390,8 +390,8 @@ bot_reset() tending = FALSE else if(patient) - C.visible_message("[src] is trying to tend the wounds of [patient]!", \ - "[src] is trying to tend your wounds!") + C.visible_message(span_danger("[src] is trying to tend the wounds of [patient]!"), \ + span_danger("[src] is trying to tend your wounds!")) if(do_mob(src, patient, 20)) //Slightly faster than default tend wounds, but does less HPS if((get_dist(src, patient) <= 1) && (on) && assess_patient(patient)) @@ -406,8 +406,8 @@ else patient.apply_damage_type((healies*-1),treatment_method) //don't need to check treatment_method since we know by this point that they were actually damaged. log_combat(src, patient, "tended the wounds of", "internal tools", "([uppertext(treatment_method)])") - C.visible_message("[src] tends the wounds of [patient]!", \ - "[src] tends your wounds!") + C.visible_message(span_notice("[src] tends the wounds of [patient]!"), \ + span_green("[src] tends your wounds!")) ADD_TRAIT(patient,TRAIT_MEDIBOTCOMINGTHROUGH,tag) addtimer(TRAIT_CALLBACK_REMOVE(patient, TRAIT_MEDIBOTCOMINGTHROUGH, tag), (30 SECONDS)) else @@ -424,7 +424,7 @@ /mob/living/simple_animal/bot/medbot/explode() on = FALSE - visible_message("[src] blows apart!") + visible_message(span_boldannounce("[src] blows apart!")) var/atom/Tsec = drop_location() drop_part(firstaid, Tsec) diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 90b3e5436..6bad55d54 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -95,23 +95,23 @@ if(!user.transferItemToLoc(I, src)) return cell = I - visible_message("[user] inserts a cell into [src].", - "I insert the new cell into [src].") + visible_message(span_notice("[user] inserts a cell into [src]."), + span_notice("I insert the new cell into [src].")) else if(I.tool_behaviour == TOOL_CROWBAR && open && cell) cell.add_fingerprint(usr) cell.forceMove(loc) cell = null - visible_message("[user] crowbars out the power cell from [src].", - "I pry the powercell out of [src].") + visible_message(span_notice("[user] crowbars out the power cell from [src]."), + span_notice("I pry the powercell out of [src].")) else if(is_wire_tool(I) && open) return attack_hand(user) else if(load && ismob(load)) // chance to knock off rider if(prob(1 + I.force * 2)) unload(0) - user.visible_message("[user] knocks [load] off [src] with \the [I]!", - "I knock [load] off [src] with \the [I]!") + user.visible_message(span_danger("[user] knocks [load] off [src] with \the [I]!"), + span_danger("I knock [load] off [src] with \the [I]!")) else - to_chat(user, "I hit [src] with \the [I] but to no effect!") + to_chat(user, span_warning("I hit [src] with \the [I] but to no effect!")) ..() else ..() @@ -123,7 +123,7 @@ emagged = TRUE if(!open) locked = !locked - to_chat(user, "I [locked ? "lock" : "unlock"] [src]'s controls!") + to_chat(user, span_notice("I [locked ? "lock" : "unlock"] [src]'s controls!")) flick("mulebot-emagged", src) playsound(src, "sparks", 100, FALSE) @@ -158,7 +158,7 @@ if(prob(50) && !isnull(load)) unload(0) if(prob(25)) - visible_message("Something shorts out inside [src]!") + visible_message(span_danger("Something shorts out inside [src]!")) wires.cut_random() /mob/living/simple_animal/bot/mulebot/interact(mob/user) @@ -214,7 +214,7 @@ turn_off() else if(cell && !open) if(!turn_on()) - to_chat(usr, "I can't switch on [src]!") + to_chat(usr, span_warning("I can't switch on [src]!")) return . = TRUE else @@ -273,17 +273,17 @@ dat += "
" switch(mode) if(BOT_IDLE) - dat += "Ready" + dat += span_good("Ready") if(BOT_DELIVER) - dat += "[mode_name[BOT_DELIVER]]" + dat += span_good("[mode_name[BOT_DELIVER]]") if(BOT_GO_HOME) - dat += "[mode_name[BOT_GO_HOME]]" + dat += span_good("[mode_name[BOT_GO_HOME]]") if(BOT_BLOCKED) - dat += "[mode_name[BOT_BLOCKED]]" + dat += span_average("[mode_name[BOT_BLOCKED]]") if(BOT_NAV,BOT_WAIT_FOR_NAV) - dat += "[mode_name[BOT_NAV]]" + dat += span_average("[mode_name[BOT_NAV]]") if(BOT_NO_ROUTE) - dat += "[mode_name[BOT_NO_ROUTE]]" + dat += span_bad("[mode_name[BOT_NO_ROUTE]]") dat += "
" dat += "Current Load: [load ? load.name : "none"]
" @@ -319,13 +319,13 @@ /mob/living/simple_animal/bot/mulebot/proc/buzz(type) switch(type) if(SIGH) - audible_message("[src] makes a sighing buzz.") + audible_message(span_hear("[src] makes a sighing buzz.")) playsound(loc, 'sound/blank.ogg', 50, FALSE) if(ANNOYED) - audible_message("[src] makes an annoyed buzzing sound.") + audible_message(span_hear("[src] makes an annoyed buzzing sound.")) playsound(loc, 'sound/blank.ogg', 50, FALSE) if(DELIGHT) - audible_message("[src] makes a delighted ping!") + audible_message(span_hear("[src] makes a delighted ping!")) playsound(loc, 'sound/blank.ogg', 50, FALSE) @@ -593,14 +593,14 @@ /mob/living/simple_animal/bot/mulebot/proc/at_target() if(!reached_target) radio_channel = RADIO_CHANNEL_SUPPLY //Supply channel - audible_message("[src] makes a chiming sound!") + audible_message(span_hear("[src] makes a chiming sound!")) playsound(loc, 'sound/blank.ogg', 50, FALSE) reached_target = 1 if(pathset) //The AI called us here, so notify it of our arrival. loaddir = dir //The MULE will attempt to load a crate in whatever direction the MULE is "facing". if(calling_ai) - to_chat(calling_ai, "[icon2html(src, calling_ai)] [src] wirelessly plays a chiming sound!") + to_chat(calling_ai, span_notice("[icon2html(src, calling_ai)] [src] wirelessly plays a chiming sound!")) playsound(calling_ai, 'sound/blank.ogg',40, FALSE) calling_ai = null radio_channel = RADIO_CHANNEL_AI_PRIVATE //Report on AI Private instead if the AI is controlling us. @@ -641,11 +641,11 @@ if(isliving(obs)) var/mob/living/L = obs if(iscyborg(L)) - visible_message("[src] bumps into [L]!") + visible_message(span_danger("[src] bumps into [L]!")) else if(!paicard) log_combat(src, L, "knocked down") - visible_message("[src] knocks over [L]!") + visible_message(span_danger("[src] knocks over [L]!")) L.Paralyze(160) return ..() @@ -653,8 +653,8 @@ // when mulebot is in the same loc /mob/living/simple_animal/bot/mulebot/proc/RunOver(mob/living/carbon/human/H) log_combat(src, H, "run over", null, "(DAMTYPE: [uppertext(BRUTE)])") - H.visible_message("[src] drives over [H]!", \ - "[src] drives over you!") + H.visible_message(span_danger("[src] drives over [H]!"), \ + span_danger("[src] drives over you!")) playsound(loc, 'sound/blank.ogg', 50, TRUE) var/damage = rand(5,15) @@ -708,7 +708,7 @@ /mob/living/simple_animal/bot/mulebot/explode() - visible_message("[src] blows apart!") + visible_message(span_boldannounce("[src] blows apart!")) var/atom/Tsec = drop_location() new /obj/item/assembly/prox_sensor(Tsec) @@ -744,7 +744,7 @@ /mob/living/simple_animal/bot/mulebot/insertpai(mob/user, obj/item/paicard/card) if(..()) - visible_message("[src] safeties are locked on.") + visible_message(span_notice("[src] safeties are locked on.")) /mob/living/simple_animal/bot/mulebot/paranormal//allows ghosts only unless hacked to actually be useful name = "paranormal MULEbot" @@ -804,7 +804,7 @@ /mob/living/simple_animal/bot/mulebot/paranormal/update_icon() if(load && isobserver(load) && isnull(ghost_overlay))//there are issues with adding a ghost as an overlay, and this prevents metagaming to see who is dead ghost_rider = TRUE - visible_message("A ghostly figure appears on [src]!") + visible_message(span_warning("A ghostly figure appears on [src]!")) ghost_overlay = ghost_overlay || mutable_appearance('icons/mob/mob.dmi') ghost_overlay.icon_state = "ghost" ghost_overlay.pixel_y = 9 @@ -823,7 +823,7 @@ return /mob/living/simple_animal/bot/mulebot/paranormal/proc/ghostmoved(atom/movable/AM, OldLoc, Dir, Forced) - visible_message("The ghostly figure vanishes...") + visible_message(span_notice("The ghostly figure vanishes...")) UnregisterSignal(AM, COMSIG_MOVABLE_MOVED) ghost_rider = FALSE cut_overlays() diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 085485d2d..00d194133 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -112,7 +112,7 @@ base_speed += 3 addtimer(VARSET_CALLBACK(src, base_speed, base_speed - 3), 60) playsound(src, 'sound/blank.ogg', 50) - visible_message("[src] shakes and speeds up!") + visible_message(span_warning("[src] shakes and speeds up!")) /mob/living/simple_animal/bot/secbot/set_custom_texts() text_hack = "You overload [name]'s target identification system." @@ -216,9 +216,9 @@ Auto Patrol: []"}, ..() if(emagged == 2) if(user) - to_chat(user, "I short out [src]'s target assessment circuits.") + to_chat(user, span_danger("I short out [src]'s target assessment circuits.")) oldtarget_name = user.name - audible_message("[src] buzzes oddly!") + audible_message(span_danger("[src] buzzes oddly!")) declare_arrests = FALSE update_icon() @@ -255,8 +255,8 @@ Auto Patrol: []"}, /mob/living/simple_animal/bot/secbot/proc/cuff(mob/living/carbon/C) mode = BOT_ARREST playsound(src, 'sound/blank.ogg', 30, TRUE, -2) - C.visible_message("[src] is trying to put zipties on [C]!",\ - "[src] is trying to put zipties on you!") + C.visible_message(span_danger("[src] is trying to put zipties on [C]!"),\ + span_danger("[src] is trying to put zipties on you!")) addtimer(CALLBACK(src, PROC_REF(attempt_handcuff), C), 60) /mob/living/simple_animal/bot/secbot/proc/attempt_handcuff(mob/living/carbon/C) @@ -291,8 +291,8 @@ Auto Patrol: []"}, if(declare_arrests) var/area/location = get_area(src) speak("[arrest_type ? "Detaining" : "Arresting"] level [threat] scumbag [C] in [location].", radio_channel) - C.visible_message("[src] has stunned [C]!",\ - "[src] has stunned you!") + C.visible_message(span_danger("[src] has stunned [C]!"),\ + span_danger("[src] has stunned you!")) /mob/living/simple_animal/bot/secbot/handle_automated_action() if(!..()) @@ -441,7 +441,7 @@ Auto Patrol: []"}, /mob/living/simple_animal/bot/secbot/explode() walk_to(src,0) - visible_message("[src] blows apart!") + visible_message(span_boldannounce("[src] blows apart!")) var/atom/Tsec = drop_location() if(ranged) var/obj/item/bot_assembly/ed209/Sa = new (Tsec) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 0258af1ea..fac3fd43b 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -76,9 +76,9 @@ . = list("*---------*\nThis is [icon2html(src, user)] \a [src]!\n[desc]") if(health < maxHealth) if(health >= maxHealth/2) - . += "[t_He] look[t_s] slightly dented." + . += span_warning("[t_He] look[t_s] slightly dented.") else - . += "[t_He] look[t_s] severely dented!" + . += span_warning("[t_He] look[t_s] severely dented!") . += "*---------*" /mob/living/simple_animal/hostile/construct/attack_animal(mob/living/simple_animal/M) @@ -92,16 +92,16 @@ adjustHealth(-5) if(src != M) Beam(M,icon_state="sendbeam",time=4) - M.visible_message("[M] repairs some of \the [src]'s dents.", \ - "I repair some of [src]'s dents, leaving [src] at [health]/[maxHealth] health.") + M.visible_message(span_danger("[M] repairs some of \the [src]'s dents."), \ + span_cult("I repair some of [src]'s dents, leaving [src] at [health]/[maxHealth] health.")) else - M.visible_message("[M] repairs some of [p_their()] own dents.", \ - "I repair some of your own dents, leaving you at [M.health]/[M.maxHealth] health.") + M.visible_message(span_danger("[M] repairs some of [p_their()] own dents."), \ + span_cult("I repair some of your own dents, leaving you at [M.health]/[M.maxHealth] health.")) else if(src != M) - to_chat(M, "I cannot repair [src]'s dents, as [p_they()] [p_have()] none!") + to_chat(M, span_cult("I cannot repair [src]'s dents, as [p_they()] [p_have()] none!")) else - to_chat(M, "I cannot repair your own dents, as you have none!") + to_chat(M, span_cult("I cannot repair your own dents, as you have none!")) else if(src != M) return ..() @@ -154,8 +154,8 @@ var/reflectchance = 40 - round(P.damage/3) if(prob(reflectchance)) apply_damage(P.damage * 0.5, P.damage_type) - visible_message("The [P.name] is reflected by [src]'s armored shell!", \ - "The [P.name] is reflected by your armored shell!") + visible_message(span_danger("The [P.name] is reflected by [src]'s armored shell!"), \ + span_danger("The [P.name] is reflected by your armored shell!")) // Find a turf near or on the original location to bounce to if(P.starting) @@ -388,8 +388,8 @@ if(undismembermerable_limbs) //they have limbs we can't remove, and no parts we can, attack! return ..() C.Paralyze(60) - visible_message("[src] knocks [C] down!") - to_chat(src, "\"Bring [C.p_them()] to me.\"") + visible_message(span_danger("[src] knocks [C] down!")) + to_chat(src, span_cultlarge("\"Bring [C.p_them()] to me.\"")) return FALSE do_attack_animation(C) var/obj/item/bodypart/BP = pick(parts) @@ -429,18 +429,18 @@ the_construct.master = C.cult_team.blood_target if(!the_construct.master) - to_chat(the_construct, "I have no master to seek!") + to_chat(the_construct, span_cultitalic("I have no master to seek!")) the_construct.seeking = FALSE return if(tracking) tracking = FALSE the_construct.seeking = FALSE - to_chat(the_construct, "I are no longer tracking your master.") + to_chat(the_construct, span_cultitalic("I are no longer tracking your master.")) return else tracking = TRUE the_construct.seeking = TRUE - to_chat(the_construct, "I are now tracking your master.") + to_chat(the_construct, span_cultitalic("I are now tracking your master.")) /datum/action/innate/seek_prey @@ -463,15 +463,15 @@ desc = "" button_icon_state = "cult_mark" the_construct.seeking = FALSE - to_chat(the_construct, "I are now tracking Nar'Sie, return to reap the harvest!") + to_chat(the_construct, span_cultitalic("I are now tracking Nar'Sie, return to reap the harvest!")) return else if(LAZYLEN(GLOB.cult_narsie.souls_needed)) the_construct.master = pick(GLOB.cult_narsie.souls_needed) var/mob/living/real_target = the_construct.master //We can typecast this way because Narsie only allows /mob/living into the souls list - to_chat(the_construct, "I are now tracking your prey, [real_target.real_name] - harvest [real_target.p_them()]!") + to_chat(the_construct, span_cultitalic("I are now tracking your prey, [real_target.real_name] - harvest [real_target.p_them()]!")) else - to_chat(the_construct, "Nar'Sie has completed her harvest!") + to_chat(the_construct, span_cultitalic("Nar'Sie has completed her harvest!")) return desc = "" button_icon_state = "sintouch" diff --git a/code/modules/mob/living/simple_animal/examine.dm b/code/modules/mob/living/simple_animal/examine.dm index baef9c209..813b9c01b 100644 --- a/code/modules/mob/living/simple_animal/examine.dm +++ b/code/modules/mob/living/simple_animal/examine.dm @@ -29,20 +29,20 @@ if(50 to 100) msg += "[m1] severely wounded." if(100 to INFINITY) - msg += "[m1] gravely wounded." + msg += span_danger("[m1] gravely wounded.") var/has_simple_wounds = HAS_TRAIT(src, TRAIT_SIMPLE_WOUNDS) if(has_simple_wounds) // Blood volume switch(blood_volume) if(-INFINITY to BLOOD_VOLUME_SURVIVE) - msg += "[m1] extremely pale and sickly." + msg += span_artery("[m1] extremely pale and sickly.") if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD) - msg += "[m1] very pale." + msg += span_artery("[m1] very pale.") if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY) - msg += "[m1] pale." + msg += span_artery("[m1] pale.") if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE) - msg += "[m1] a little pale." + msg += span_artery("[m1] a little pale.") // Bleeding if(bleed_rate) @@ -57,9 +57,9 @@ if(10 to INFINITY) bleed_wording = "bleeding profusely" if(bleed_rate >= 5) - msg += "[m1] [bleed_wording]!" + msg += span_bloody("[m1] [bleed_wording]!") else - msg += "[m1] [bleed_wording]!" + msg += span_bloody("[m1] [bleed_wording]!") //Fire/water stacks if(fire_stacks > 0) @@ -75,7 +75,7 @@ msg += "[m1] unconscious." if(length(msg)) - . += "[msg.Join("\n")]" + . += span_warning("[msg.Join("\n")]") if((user != src) && isliving(user)) var/mob/living/L = user @@ -85,15 +85,15 @@ var/strength_diff = final_str - L.STASTR switch(strength_diff) if(5 to INFINITY) - . += "[t_He] look[p_s()] much stronger than I." + . += span_warning("[t_He] look[p_s()] much stronger than I.") if(1 to 5) - . += "[t_He] look[p_s()] stronger than I." + . += span_warning("[t_He] look[p_s()] stronger than I.") if(0) . += "[t_He] look[p_s()] about as strong as I." if(-5 to -1) - . += "[t_He] look[p_s()] weaker than I." + . += span_warning("[t_He] look[p_s()] weaker than I.") if(-INFINITY to -5) - . += "[t_He] look[p_s()] much weaker than I." + . += span_warning("[t_He] look[p_s()] much weaker than I.") if(Adjacent(user)) if(has_simple_wounds) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index af5761aa4..7963dde11 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -277,7 +277,7 @@ free cake to the station!") var/new_name = stripped_input(src, "Enter my name, or press \"Cancel\" to stick with Keeki.", "Name Change") if(new_name) - to_chat(src, "My name is now \"new_name\"!") + to_chat(src, span_notice("My name is now \"new_name\"!")) name = new_name /mob/living/simple_animal/pet/cat/cak/Life() diff --git a/code/modules/mob/living/simple_animal/friendly/cockroach.dm b/code/modules/mob/living/simple_animal/friendly/cockroach.dm index 520886d33..8c7be5eae 100644 --- a/code/modules/mob/living/simple_animal/friendly/cockroach.dm +++ b/code/modules/mob/living/simple_animal/friendly/cockroach.dm @@ -42,19 +42,19 @@ if(ishuman(A)) var/mob/living/carbon/human/H = A if(HAS_TRAIT(H, TRAIT_PACIFISM)) - H.visible_message("[src] avoids getting crushed.", "I avoid crushing [src]!") + H.visible_message(span_notice("[src] avoids getting crushed."), span_warning("I avoid crushing [src]!")) return - A.visible_message("[A] crushes [src].", "I crushed [src].") + A.visible_message(span_notice("[A] crushes [src]."), span_notice("I crushed [src].")) adjustBruteLoss(1) //kills a normal cockroach else - visible_message("[src] avoids getting crushed.") + visible_message(span_notice("[src] avoids getting crushed.")) else if(isstructure(AM)) if(prob(squish_chance)) - AM.visible_message("[src] was crushed under [AM].") + AM.visible_message(span_notice("[src] was crushed under [AM].")) adjustBruteLoss(1) else - visible_message("[src] avoids getting crushed.") + visible_message(span_notice("[src] avoids getting crushed.")) /mob/living/simple_animal/cockroach/ex_act() //Explosions are a terrible way to handle a cockroach. return diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 3c735019b..098b25739 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -187,14 +187,14 @@ /mob/living/simple_animal/pet/dog/corgi/attackby(obj/item/O, mob/user, params) if (istype(O, /obj/item/razor)) if (shaved) - to_chat(user, "I can't shave this corgi, it's already been shaved!") + to_chat(user, span_warning("I can't shave this corgi, it's already been shaved!")) return if (nofur) - to_chat(user, "I can't shave this corgi, it doesn't have a fur coat!") + to_chat(user, span_warning("I can't shave this corgi, it doesn't have a fur coat!")) return - user.visible_message("[user] starts to shave [src] using \the [O].", "I start to shave [src] using \the [O]...") + user.visible_message(span_notice("[user] starts to shave [src] using \the [O]."), span_notice("I start to shave [src] using \the [O]...")) if(do_after(user, 50, target = src)) - user.visible_message("[user] shaves [src]'s hair using \the [O].") + user.visible_message(span_notice("[user] shaves [src]'s hair using \the [O].")) playsound(loc, 'sound/blank.ogg', 20, TRUE) shaved = TRUE icon_living = "[initial(icon_living)]_shaved" @@ -212,7 +212,7 @@ if(!L.put_in_hands(holder)) qdel(holder) else - L.visible_message("[L] scoops up [src]!") + L.visible_message(span_warning("[L] scoops up [src]!")) /mob/living/simple_animal/pet/dog/corgi/Topic(href, href_list) if(!(iscarbon(usr) || iscyborg(usr)) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) @@ -231,7 +231,7 @@ update_corgi_fluff() regenerate_icons() else - to_chat(usr, "There is nothing to remove from its [remove_from]!") + to_chat(usr, span_warning("There is nothing to remove from its [remove_from]!")) return if("back") if(inventory_back) @@ -240,7 +240,7 @@ update_corgi_fluff() regenerate_icons() else - to_chat(usr, "There is nothing to remove from its [remove_from]!") + to_chat(usr, span_warning("There is nothing to remove from its [remove_from]!")) return if("collar") if(pcollar) @@ -265,17 +265,17 @@ if("back") if(inventory_back) - to_chat(usr, "It's already wearing something!") + to_chat(usr, span_warning("It's already wearing something!")) return else var/obj/item/item_to_add = usr.get_active_held_item() if(!item_to_add) - usr.visible_message("[usr] pets [src].", "I rest your hand on [src]'s back for a moment.") + usr.visible_message(span_notice("[usr] pets [src]."), span_notice("I rest your hand on [src]'s back for a moment.")) return if(!usr.temporarilyRemoveItemFromInventory(item_to_add)) - to_chat(usr, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!") + to_chat(usr, span_warning("\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!")) return if(istype(item_to_add, /obj/item/grenade/c4)) // last thing he ever wears, I guess @@ -288,7 +288,7 @@ allowed = TRUE if(!allowed) - to_chat(usr, "I set [item_to_add] on [src]'s back, but it falls off!") + to_chat(usr, span_warning("I set [item_to_add] on [src]'s back, but it falls off!")) item_to_add.forceMove(drop_location()) if(prob(25)) step_rand(item_to_add) @@ -317,17 +317,17 @@ if(inventory_head) if(user) - to_chat(user, "I can't put more than one hat on [src]!") + to_chat(user, span_warning("I can't put more than one hat on [src]!")) return if(!item_to_add) - user.visible_message("[user] pets [src].", "I rest your hand on [src]'s head for a moment.") + user.visible_message(span_notice("[user] pets [src]."), span_notice("I rest your hand on [src]'s head for a moment.")) if(flags_1 & HOLOGRAM_1) return SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, src, /datum/mood_event/pet_animal, src) return if(user && !user.temporarilyRemoveItemFromInventory(item_to_add)) - to_chat(user, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!") + to_chat(user, span_warning("\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!")) return 0 var/valid = FALSE @@ -338,17 +338,17 @@ if(valid) if(health <= 0) - to_chat(user, "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on [p_them()].") + to_chat(user, span_notice("There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on [p_them()].")) else if(user) - user.visible_message("[user] puts [item_to_add] on [real_name]'s head. [src] looks at [user] and barks once.", - "I put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags [p_their()] tail once and barks.", - "I hear a friendly-sounding bark.") + user.visible_message(span_notice("[user] puts [item_to_add] on [real_name]'s head. [src] looks at [user] and barks once."), + span_notice("I put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags [p_their()] tail once and barks."), + span_hear("I hear a friendly-sounding bark.")) item_to_add.forceMove(src) src.inventory_head = item_to_add update_corgi_fluff() regenerate_icons() else - to_chat(user, "I set [item_to_add] on [src]'s head, but it falls off!") + to_chat(user, span_warning("I set [item_to_add] on [src]'s head, but it falls off!")) item_to_add.forceMove(drop_location()) if(prob(25)) step_rand(item_to_add) @@ -491,15 +491,15 @@ ..() for(var/mob/living/simple_animal/pet/P in range(1, src)) if(P != src && !istype(P,/mob/living/simple_animal/pet/dog/corgi/narsie)) - visible_message("[src] devours [P]!", \ - "DELICIOUS SOULS") + visible_message(span_warning("[src] devours [P]!"), \ + span_cultbigbold("DELICIOUS SOULS")) playsound(src, 'sound/blank.ogg', 75, TRUE) narsie_act() if(P.mind) if(P.mind.hasSoul) P.mind.hasSoul = FALSE //Nars-Ian ate your soul; you don't have one anymore else - visible_message("... Aw, someone beat me to this one.") + visible_message(span_cultbigbold("... Aw, someone beat me to this one.")) P.gib() /mob/living/simple_animal/pet/dog/corgi/narsie/update_corgi_fluff() @@ -573,7 +573,7 @@ //puppies cannot wear anything. /mob/living/simple_animal/pet/dog/corgi/puppy/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - to_chat(usr, "I can't fit this on [src]!") + to_chat(usr, span_warning("I can't fit this on [src]!")) return ..() @@ -616,7 +616,7 @@ //Lisa already has a cute bow! /mob/living/simple_animal/pet/dog/corgi/Lisa/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - to_chat(usr, "[src] already has a cute bow!") + to_chat(usr, span_warning("[src] already has a cute bow!")) return ..() diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index cc3e18a0d..ac286894f 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -3,8 +3,8 @@ #define DRONE_HEAD_LAYER 2 #define DRONE_TOTAL_LAYERS 2 -#define DRONE_NET_CONNECT "DRONE NETWORK: [name] connected." -#define DRONE_NET_DISCONNECT "DRONE NETWORK: [name] is not responding." +#define DRONE_NET_CONNECT span_notice("DRONE NETWORK: [name] connected.") +#define DRONE_NET_DISCONNECT span_danger("DRONE NETWORK: [name] is not responding.") #define MAINTDRONE "drone_maint" #define REPAIRDRONE "drone_repair" @@ -77,7 +77,7 @@ " - Interacting with living beings (communication, attacking, healing, etc.)\n"+\ " - Interacting with non-living beings (dragging bodies, looting bodies, etc.)\n"+\ "These rules are at admin discretion and will be heavily enforced.\n"+\ - "If you do not have the regular drone laws, follow your laws to the best of your ability." + span_warning("If you do not have the regular drone laws, follow your laws to the best of your ability.") /mob/living/simple_animal/drone/Initialize() . = ..() @@ -175,21 +175,21 @@ //Hacked if(hacked) - . += "Its display is glowing red!" + . += span_warning("Its display is glowing red!") //Damaged if(health != maxHealth) if(health > maxHealth * 0.33) //Between maxHealth and about a third of maxHealth, between 30 and 10 for normal drones - . += "Its screws are slightly loose." + . += span_warning("Its screws are slightly loose.") else //otherwise, below about 33% - . += "Its screws are very loose!" + . += span_boldwarning("Its screws are very loose!") //Dead if(stat == DEAD) if(client) - . += "A message repeatedly flashes on its display: \"REBOOT -- REQUIRED\"." + . += span_deadsay("A message repeatedly flashes on its display: \"REBOOT -- REQUIRED\".") else - . += "A message repeatedly flashes on its display: \"ERROR -- OFFLINE\"." + . += span_deadsay("A message repeatedly flashes on its display: \"ERROR -- OFFLINE\".") . += "*---------*
" @@ -202,10 +202,10 @@ if(. & EMP_PROTECT_SELF) return Stun(100) - to_chat(src, "ER@%R: MME^RY CO#RU9T! R&$b@0tin)...") + to_chat(src, span_danger("ER@%R: MME^RY CO#RU9T! R&$b@0tin)...")) if(severity == 1) adjustBruteLoss(heavy_emp_damage) - to_chat(src, "HeAV% DA%^MMA+G TO I/O CIR!%UUT!") + to_chat(src, span_danger("HeAV% DA%^MMA+G TO I/O CIR!%UUT!")) /mob/living/simple_animal/drone/proc/triggerAlarm(class, area/A, O, obj/alarmsource) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm index eb141a89e..96f492364 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm @@ -34,6 +34,6 @@ if(!isnum(user.client.player_age)) //apparently what happens when there's no DB connected. just don't let anybody be a drone without admin intervention return if(user.client.player_age < DRONE_MINIMUM_AGE) - to_chat(user, "You're too new to play as a drone! Please try again in [DRONE_MINIMUM_AGE - user.client.player_age] days.") + to_chat(user, span_danger("You're too new to play as a drone! Please try again in [DRONE_MINIMUM_AGE - user.client.player_age] days.")) return . = ..() diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index 6311feae1..297526386 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -38,7 +38,7 @@ /mob/living/simple_animal/drone/syndrone/Login() ..() - to_chat(src, "I can kill and eat other drones to increase your health!" ) + to_chat(src, span_notice("I can kill and eat other drones to increase your health!") ) /mob/living/simple_animal/drone/syndrone/badass name = "Badass Syndrone" @@ -123,4 +123,4 @@ " - Going to the main station in search of materials.\n"+\ " - Interacting with non-drone players outside KS13, dead or alive.\n"+\ "These rules are at admin discretion and will be heavily enforced.\n"+\ - "If you do not have the regular drone laws, follow your laws to the best of your ability." + span_warning("If you do not have the regular drone laws, follow your laws to the best of your ability.") diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm index 91a528455..084a64801 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm @@ -16,16 +16,16 @@ if("Cannibalize") if(D.health < D.maxHealth) - D.visible_message("[D] begins to cannibalize parts from [src].", "I begin to cannibalize parts from [src]...") + D.visible_message(span_notice("[D] begins to cannibalize parts from [src]."), span_notice("I begin to cannibalize parts from [src]...")) if(do_after(D, 60, 0, target = src)) - D.visible_message("[D] repairs itself using [src]'s remains!", "I repair myself using [src]'s remains.") + D.visible_message(span_notice("[D] repairs itself using [src]'s remains!"), span_notice("I repair myself using [src]'s remains.")) D.adjustBruteLoss(-src.maxHealth) new /obj/effect/decal/cleanable/oil/streak(get_turf(src)) qdel(src) else - to_chat(D, "I need to remain still to cannibalize [src]!") + to_chat(D, span_warning("I need to remain still to cannibalize [src]!")) else - to_chat(D, "You're already in perfect condition!") + to_chat(D, span_warning("You're already in perfect condition!")) if("Nothing") return @@ -36,18 +36,18 @@ ..() return if(user.get_active_held_item()) - to_chat(user, "My hands are full!") + to_chat(user, span_warning("My hands are full!")) return - visible_message("[user] starts picking up [src].", \ - "[user] starts picking you up!") + visible_message(span_warning("[user] starts picking up [src]."), \ + span_danger("[user] starts picking you up!")) if(!do_after(user, 20, target = src)) return - visible_message("[user] picks up [src]!", \ - "[user] picks you up!") + visible_message(span_warning("[user] picks up [src]!"), \ + span_danger("[user] picks you up!")) if(buckled) - to_chat(user, "[src] is buckled to [buckled] and cannot be picked up!") + to_chat(user, span_warning("[src] is buckled to [buckled] and cannot be picked up!")) return - to_chat(user, "I pick [src] up.") + to_chat(user, span_notice("I pick [src] up.")) drop_all_held_items() var/obj/item/clothing/head/mob_holder/drone/DH = new(get_turf(src), src) user.put_in_hands(DH) @@ -64,37 +64,37 @@ "can't tell if their ethernet detour is moving or not", "won't be able to reseed enough"+\ " kernels to function properly","can't start their neurotube console") - to_chat(user, "I can't seem to find the [pick(faux_gadgets)]! Without it, [src] [pick(faux_problems)].") + to_chat(user, span_warning("I can't seem to find the [pick(faux_gadgets)]! Without it, [src] [pick(faux_problems)].")) return - user.visible_message("[user] begins to reactivate [src].", "I begin to reactivate [src]...") + user.visible_message(span_notice("[user] begins to reactivate [src]."), span_notice("I begin to reactivate [src]...")) if(do_after(user, 30, 1, target = src)) revive(full_heal = TRUE, admin_revive = FALSE) - user.visible_message("[user] reactivates [src]!", "I reactivate [src].") + user.visible_message(span_notice("[user] reactivates [src]!"), span_notice("I reactivate [src].")) alert_drones(DRONE_NET_CONNECT) if(G) - to_chat(G, "You([name]) were reactivated by [user]!") + to_chat(G, span_ghostalert("You([name]) were reactivated by [user]!")) else - to_chat(user, "I need to remain still to reactivate [src]!") + to_chat(user, span_warning("I need to remain still to reactivate [src]!")) /mob/living/simple_animal/drone/attackby(obj/item/I, mob/user) if(I.tool_behaviour == TOOL_SCREWDRIVER && stat != DEAD) if(health < maxHealth) - to_chat(user, "I start to tighten loose screws on [src]...") + to_chat(user, span_notice("I start to tighten loose screws on [src]...")) if(I.use_tool(src, user, 80)) adjustBruteLoss(-getBruteLoss()) - visible_message("[user] tightens [src == user ? "[user.p_their()]" : "[src]'s"] loose screws!", "I tighten [src == user ? "your" : "[src]'s"] loose screws.") + visible_message(span_notice("[user] tightens [src == user ? "[user.p_their()]" : "[src]'s"] loose screws!"), span_notice("I tighten [src == user ? "your" : "[src]'s"] loose screws.")) else - to_chat(user, "I need to remain still to tighten [src]'s screws!") + to_chat(user, span_warning("I need to remain still to tighten [src]'s screws!")) else - to_chat(user, "[src]'s screws can't get any tighter!") + to_chat(user, span_warning("[src]'s screws can't get any tighter!")) return //This used to not exist and drones who repaired themselves also stabbed the shit out of themselves. else if(I.tool_behaviour == TOOL_WRENCH && user != src) //They aren't required to be hacked, because laws can change in other ways (i.e. admins) - user.visible_message("[user] starts resetting [src]...", \ - "I press down on [src]'s factory reset control...") + user.visible_message(span_notice("[user] starts resetting [src]..."), \ + span_notice("I press down on [src]'s factory reset control...")) if(I.use_tool(src, user, 50, volume=50)) - user.visible_message("[user] resets [src]!", \ - "I reset [src]'s directives to factory defaults!") + user.visible_message(span_notice("[user] resets [src]!"), \ + span_notice("I reset [src]'s directives to factory defaults!")) update_drone_hack(FALSE) return else @@ -117,9 +117,9 @@ if(hacked) return Stun(40) - visible_message("[src]'s display glows a vicious red!", \ - "ERROR: LAW OVERRIDE DETECTED") - to_chat(src, "From now on, these are my laws:") + visible_message(span_warning("[src]'s display glows a vicious red!"), \ + span_danger("ERROR: LAW OVERRIDE DETECTED")) + to_chat(src, span_boldannounce("From now on, these are my laws:")) laws = \ "1. You must always involve myself in the matters of other beings, even if such matters conflict with Law Two or Law Three.\n"+\ "2. You may harm any being, regardless of intent or circumstance.\n"+\ @@ -135,9 +135,9 @@ if(!hacked) return Stun(40) - visible_message("[src]'s display glows a content blue!", \ + visible_message(span_info("[src]'s display glows a content blue!"), \ "ERROR: LAW OVERRIDE DETECTED") - to_chat(src, "From now on, these are my laws:") + to_chat(src, span_info("From now on, these are my laws:")) laws = initial(laws) to_chat(src, laws) to_chat(src, "Having been restored, my onboard antivirus reports the all-clear and you are able to perform all actions again.") diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm index 1c02593c0..465b65bcd 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm @@ -70,7 +70,7 @@ internal_storage = I update_inv_internal_storage() else - to_chat(src, "I are trying to equip this item to an unsupported inventory slot. Report this to a coder!") + to_chat(src, span_danger("I are trying to equip this item to an unsupported inventory slot. Report this to a coder!")) return //Call back for item being equipped to drone diff --git a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm index 0f0d4dea7..d09c91fb5 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm @@ -21,5 +21,5 @@ var/area/A = get_area(loc) if(alert_s && A && stat != DEAD) - var/msg = "DRONE PING: [name]: [alert_s] priority alert in [A.name]!" + var/msg = span_boldnotice("DRONE PING: [name]: [alert_s] priority alert in [A.name]!") alert_drones(msg) 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 465b4b2a9..abe40d1de 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -57,7 +57,7 @@ if(enemies.len && prob(10)) enemies = list() LoseTarget() - src.visible_message("[src] calms down.") + src.visible_message(span_notice("[src] calms down.")) if(stat == CONSCIOUS) udder.generateMilk() eat_plants() @@ -70,7 +70,7 @@ /mob/living/simple_animal/hostile/retaliate/goat/Retaliate() ..() - src.visible_message("[src] gets an evil-looking gleam in [p_their()] eye.") + src.visible_message(span_danger("[src] gets an evil-looking gleam in [p_their()] eye.")) /mob/living/simple_animal/hostile/retaliate/goat/attackby(obj/item/O, mob/user, params) if(stat == CONSCIOUS && istype(O, /obj/item/reagent_containers/glass)) @@ -86,8 +86,8 @@ var/mob/living/carbon/human/H = target if(istype(H.dna.species, /datum/species/pod)) var/obj/item/bodypart/NB = pick(H.bodyparts) - H.visible_message("[src] takes a big chomp out of [H]!", \ - "[src] takes a big chomp out of your [NB]!") + H.visible_message(span_warning("[src] takes a big chomp out of [H]!"), \ + span_danger("[src] takes a big chomp out of your [NB]!")) NB.dismember() //cow /mob/living/simple_animal/cow @@ -163,9 +163,9 @@ /mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M) if(gender == FEMALE && !stat && M.used_intent.type == INTENT_DISARM && icon_state != "[initial(icon_state)]_tip") - M.visible_message("[M] tips over [src].", - "I tip over [src].") - to_chat(src, "I am tipped over by [M]!") + M.visible_message(span_warning("[M] tips over [src]."), + span_notice("I tip over [src].")) + to_chat(src, span_danger("I am tipped over by [M]!")) Paralyze(60, ignore_canstun = TRUE) icon_state = "[initial(icon_state)]_tip" spawn(rand(20,50)) @@ -182,8 +182,8 @@ if(4) external = "[src] seems resigned to its fate." internal = "You resign myself to your fate." - visible_message("[external]", - "[internal]") + visible_message(span_notice("[external]"), + span_revennotice("[internal]")) else ..() @@ -308,7 +308,7 @@ qdel(O) eggsleft += rand(1, 4) else - to_chat(user, "[name] doesn't seem hungry!") + to_chat(user, span_warning("[name] doesn't seem hungry!")) else ..() @@ -317,7 +317,7 @@ if(!.) return if((!stat && prob(3) && eggsleft > 0) && egg_type) - visible_message("[src] [pick(layMessage)]") + visible_message(span_alertalien("[src] [pick(layMessage)]")) eggsleft-- var/obj/item/E = new egg_type(get_turf(src)) E.pixel_x = rand(-6,6) @@ -333,7 +333,7 @@ if(isturf(loc)) amount_grown += rand(1,2) if(amount_grown >= 100) - visible_message("[src] hatches with a quiet cracking sound.") + visible_message(span_notice("[src] hatches with a quiet cracking sound.")) new /mob/living/simple_animal/chick(get_turf(src)) STOP_PROCESSING(SSobj, src) qdel(src) @@ -353,14 +353,14 @@ /obj/item/udder/proc/milkAnimal(obj/O, mob/user) var/obj/item/reagent_containers/glass/G = O if(G.reagents.total_volume >= G.volume) - to_chat(user, "[O] is full.") + to_chat(user, span_warning("[O] is full.")) return if(!do_after(user, 20, target = src)) var/transfered = reagents.trans_to(O, rand(5,10)) if(transfered) - user.visible_message("[user] milks [src] using \the [O].", "I milk [src] using \the [O].") + user.visible_message(span_notice("[user] milks [src] using \the [O]."), span_notice("I milk [src] using \the [O].")) else - to_chat(user, "The udder is dry. Wait a bit longer...") + to_chat(user, span_warning("The udder is dry. Wait a bit longer...")) //grenchensnacker diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index 0d54824be..a93fc43ee 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -37,7 +37,7 @@ /mob/living/simple_animal/hostile/lizard/AttackingTarget() if(is_type_in_typecache(target,edibles)) //Makes sure player lizards only consume edibles. - visible_message("[name] consumes [target] in a single gulp.", "I consume [target] in a single gulp.") + visible_message(span_notice("[name] consumes [target] in a single gulp."), span_notice("I consume [target] in a single gulp.")) QDEL_NULL(target) //Nom adjustBruteLoss(-2) return TRUE diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 780856a58..45874753d 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -62,7 +62,7 @@ if( ishuman(AM) ) if(!stat) var/mob/M = AM - to_chat(M, "[icon2html(src, M)] Squeak!") + to_chat(M, span_notice("[icon2html(src, M)] Squeak!")) ..() /mob/living/simple_animal/mouse/handle_automated_action() @@ -72,13 +72,13 @@ var/obj/structure/cable/C = locate() in F if(C && prob(15)) if(C.avail()) - visible_message("[src] chews through the [C]. It's toast!") + visible_message(span_warning("[src] chews through the [C]. It's toast!")) playsound(src, 'sound/blank.ogg', 100, TRUE) C.deconstruct() death(toast=1) else C.deconstruct() - visible_message("[src] chews through the [C].") + visible_message(span_warning("[src] chews through the [C].")) /* * Mouse types @@ -122,16 +122,16 @@ /obj/item/reagent_containers/food/snacks/deadmouse/examine(mob/user) . = ..() if (reagents?.has_reagent(/datum/reagent/yuck) || reagents?.has_reagent(/datum/reagent/fuel)) - . += "It's dripping with fuel and smells terrible." + . += span_warning("It's dripping with fuel and smells terrible.") /obj/item/reagent_containers/food/snacks/deadmouse/attackby(obj/item/I, mob/user, params) if(I.get_sharpness() && user.used_intent.type == INTENT_HARM) if(isturf(loc)) new /obj/item/reagent_containers/food/snacks/meat/slab/mouse(loc) - to_chat(user, "I butcher [src].") + to_chat(user, span_notice("I butcher [src].")) qdel(src) else - to_chat(user, "I need to put [src] on a surface to butcher it!") + to_chat(user, span_warning("I need to put [src] on a surface to butcher it!")) else return ..() @@ -141,10 +141,10 @@ var/datum/reagents/target_reagents = target.reagents var/trans_amount = reagents.maximum_volume - reagents.total_volume * (4 / 3) if(target_reagents.has_reagent(/datum/reagent/fuel) && target_reagents.trans_to(src, trans_amount)) - to_chat(user, "I dip [src] into [target].") + to_chat(user, span_notice("I dip [src] into [target].")) reagents.trans_to(target, reagents.total_volume) else - to_chat(user, "That's a terrible idea.") + to_chat(user, span_warning("That's a terrible idea.")) else return ..() diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm index 297af1a21..ebe0d2089 100644 --- a/code/modules/mob/living/simple_animal/friendly/pet.dm +++ b/code/modules/mob/living/simple_animal/friendly/pet.dm @@ -19,7 +19,7 @@ return pcollar = P regenerate_icons() - to_chat(user, "I put the [P] around [src]'s neck.") + to_chat(user, span_notice("I put the [P] around [src]'s neck.")) if(P.tagname && !unique_pet) fully_replace_character_name(null, "\proper [P.tagname]") @@ -30,7 +30,7 @@ if(istype(O, /obj/item/newspaper)) if(!stat) - user.visible_message("[user] baps [name] on the nose with the rolled up [O].") + user.visible_message(span_notice("[user] baps [name] on the nose with the rolled up [O].")) dance_rotate(src) else ..() diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/friendly/snake.dm index 682160e97..713de418d 100644 --- a/code/modules/mob/living/simple_animal/friendly/snake.dm +++ b/code/modules/mob/living/simple_animal/friendly/snake.dm @@ -59,7 +59,7 @@ /mob/living/simple_animal/hostile/retaliate/poison/snake/AttackingTarget() if(istype(target, /mob/living/simple_animal/mouse)) - visible_message("[name] consumes [target] in a single gulp!", "I consume [target] in a single gulp!") + visible_message(span_notice("[name] consumes [target] in a single gulp!"), span_notice("I consume [target] in a single gulp!")) QDEL_NULL(target) adjustBruteLoss(-2) else diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 5b8e46d9d..b70934395 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -51,10 +51,10 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/range = 10 //how far from the user the spirit can be var/toggle_button_type = /atom/movable/screen/guardian/ToggleMode/Inactive //what sort of toggle button the hud uses var/datum/guardianname/namedatum = new/datum/guardianname() - var/playstyle_string = "I are a standard Guardian. You shouldn't exist!" - var/magic_fluff_string = "I draw the Coder, symbolizing bugs and errors. This shouldn't happen! Submit a bug report!" - var/tech_fluff_string = "BOOT SEQUENCE COMPLETE. ERROR MODULE LOADED. THIS SHOULDN'T HAPPEN. Submit a bug report!" - var/carp_fluff_string = "CARP CARP CARP SOME SORT OF HORRIFIC BUG BLAME THE CODERS CARP CARP CARP" + var/playstyle_string = span_holoparasitebold("I are a standard Guardian. You shouldn't exist!") + var/magic_fluff_string = span_holoparasite("I draw the Coder, symbolizing bugs and errors. This shouldn't happen! Submit a bug report!") + var/tech_fluff_string = span_holoparasite("BOOT SEQUENCE COMPLETE. ERROR MODULE LOADED. THIS SHOULDN'T HAPPEN. Submit a bug report!") + var/carp_fluff_string = span_holoparasite("CARP CARP CARP SOME SORT OF HORRIFIC BUG BLAME THE CODERS CARP CARP CARP") /mob/living/simple_animal/hostile/guardian/Initialize(mapload, theme) GLOB.parasites += src @@ -124,11 +124,11 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(mind) mind.name = "[real_name]" if(!summoner) - to_chat(src, "For some reason, somehow, you have no summoner. Please report this bug immediately.") + to_chat(src, span_holoparasitebold("For some reason, somehow, you have no summoner. Please report this bug immediately.")) return - to_chat(src, "I are [real_name], bound to serve [summoner.real_name].") - to_chat(src, "I are capable of manifesting or recalling to my master with the buttons on my HUD. You will also find a button to communicate with [summoner.p_them()] privately there.") - to_chat(src, "While personally invincible, you will die if [summoner.real_name] does, and any damage dealt to you will have a portion passed on to [summoner.p_them()] as you feed upon [summoner.p_them()] to sustain myself.") + to_chat(src, span_holoparasite("I are [real_name], bound to serve [summoner.real_name].")) + to_chat(src, span_holoparasite("I are capable of manifesting or recalling to my master with the buttons on my HUD. You will also find a button to communicate with [summoner.p_them()] privately there.")) + to_chat(src, span_holoparasite("While personally invincible, you will die if [summoner.real_name] does, and any damage dealt to you will have a portion passed on to [summoner.p_them()] as you feed upon [summoner.p_them()] to sustain myself.")) to_chat(src, playstyle_string) /mob/living/simple_animal/hostile/guardian/Life() //Dies if the summoner dies @@ -139,9 +139,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(!QDELETED(summoner)) if(summoner.stat == DEAD) forceMove(summoner.loc) - to_chat(src, "My summoner has died!") - visible_message("\The [src] dies along with its user!") - summoner.visible_message("[summoner]'s body is completely consumed by the strain of sustaining [src]!") + to_chat(src, span_danger("My summoner has died!")) + visible_message(span_danger("\The [src] dies along with its user!")) + summoner.visible_message(span_danger("[summoner]'s body is completely consumed by the strain of sustaining [src]!")) for(var/obj/item/W in summoner) if(!summoner.dropItemToGround(W)) qdel(W) @@ -149,8 +149,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians death(TRUE) qdel(src) else - to_chat(src, "My summoner has died!") - visible_message("[src] dies along with its user!") + to_chat(src, span_danger("My summoner has died!")) + visible_message(span_danger("[src] dies along with its user!")) death(TRUE) qdel(src) snapback() @@ -177,8 +177,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(get_dist(get_turf(summoner),get_turf(src)) <= range) return else - to_chat(src, "I moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]!") - visible_message("\The [src] jumps back to its user.") + to_chat(src, span_holoparasite("I moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]!")) + visible_message(span_danger("\The [src] jumps back to its user.")) if(istype(summoner.loc, /obj/effect)) Recall(TRUE) else @@ -223,7 +223,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians summoner.adjustBruteLoss(amount) if(amount > 0) to_chat(summoner, "My [name] is under attack! You take damage!") - summoner.visible_message("Blood sprays from [summoner] as [src] takes damage!") + summoner.visible_message(span_danger("Blood sprays from [summoner] as [src] takes damage!")) if(summoner.stat == UNCONSCIOUS) to_chat(summoner, "My body can't take the strain of sustaining [src] in this condition, it begins to fall apart!") summoner.adjustCloneLoss(amount * 0.5) //dying hosts take 50% bonus damage as cloneloss @@ -337,10 +337,10 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians /mob/living/simple_animal/hostile/guardian/proc/ToggleLight() if(light_range<3) - to_chat(src, "I activate my light.") + to_chat(src, span_notice("I activate my light.")) set_light(3) else - to_chat(src, "I deactivate my light.") + to_chat(src, span_notice("I deactivate my light.")) set_light(0) /mob/living/simple_animal/hostile/guardian/verb/ShowType() @@ -358,7 +358,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(sender_key != key || !input) //guardian got reset, or did not enter anything return - var/preliminary_message = "[input]" //apply basic color/bolding + var/preliminary_message = span_holoparasitebold("[input]") //apply basic color/bolding var/my_message = "[src]: [preliminary_message]" //add source, color source with the guardian's color to_chat(summoner, my_message) @@ -379,8 +379,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(!input) return - var/preliminary_message = "[input]" //apply basic color/bolding - var/my_message = "[src]: [preliminary_message]" //add source, color source with default grey... + var/preliminary_message = span_holoparasitebold("[input]") //apply basic color/bolding + var/my_message = span_holoparasitebold("[src]: [preliminary_message]") //add source, color source with default grey... to_chat(src, my_message) var/list/guardians = hasparasites() @@ -417,12 +417,12 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(guardians.len) var/mob/living/simple_animal/hostile/guardian/G = input(src, "Pick the guardian you wish to reset", "Guardian Reset") as null|anything in sortNames(guardians) if(G) - to_chat(src, "I attempt to reset [G.real_name]'s personality...") + to_chat(src, span_holoparasite("I attempt to reset [G.real_name]'s personality...")) var/list/mob/candidates = pollGhostCandidates("Do you want to play as [src.real_name]'s [G.real_name]?", ROLE_PAI, null, FALSE, 100) if(LAZYLEN(candidates)) var/mob/C = pick(candidates) - to_chat(G, "My user reset you, and my body was taken over by a ghost. Looks like they weren't happy with my performance.") - to_chat(src, "My [G.real_name] has been successfully reset.") + to_chat(G, span_holoparasite("My user reset you, and my body was taken over by a ghost. Looks like they weren't happy with my performance.")) + to_chat(src, span_holoparasitebold("My [G.real_name] has been successfully reset.")) message_admins("[key_name_admin(C)] has taken control of ([ADMIN_LOOKUPFLW(G)])") G.ghostize(0) G.setthemename(G.namedatum.theme) //give it a new color, to show it's a new person @@ -430,16 +430,16 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians G.reset = 1 switch(G.namedatum.theme) if("tech") - to_chat(src, "[G.real_name] is now online!") + to_chat(src, span_holoparasite("[G.real_name] is now online!")) if("magic") - to_chat(src, "[G.real_name] has been summoned!") + to_chat(src, span_holoparasite("[G.real_name] has been summoned!")) guardians -= G if(!guardians.len) verbs -= /mob/living/proc/guardian_reset else - to_chat(src, "There were no ghosts willing to take control of [G.real_name]. Looks like you're stuck with it for now.") + to_chat(src, span_holoparasite("There were no ghosts willing to take control of [G.real_name]. Looks like you're stuck with it for now.")) else - to_chat(src, "I decide not to reset [guardians.len > 1 ? "any of my guardians":"your guardian"].") + to_chat(src, span_holoparasite("I decide not to reset [guardians.len > 1 ? "any of my guardians":"your guardian"].")) else verbs -= /mob/living/proc/guardian_reset @@ -466,10 +466,10 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/used = FALSE var/theme = "magic" var/mob_name = "Guardian Spirit" - var/use_message = "I shuffle the deck..." - var/used_message = "All the cards seem to be blank now." - var/failure_message = "..And draw a card! It's...blank? Maybe you should try again later." - var/ling_failure = "The deck refuses to respond to a souless creature such as you." + var/use_message = span_holoparasite("I shuffle the deck...") + var/used_message = span_holoparasite("All the cards seem to be blank now.") + var/failure_message = span_holoparasitebold("..And draw a card! It's...blank? Maybe you should try again later.") + var/ling_failure = span_holoparasitebold("The deck refuses to respond to a souless creature such as you.") var/list/possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support", "Gravitokinetic") var/random = TRUE var/allowmultiple = FALSE @@ -478,11 +478,11 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians /obj/item/guardiancreator/attack_self(mob/living/user) if(isguardian(user) && !allowguardian) - to_chat(user, "[mob_name] chains are not allowed.") + to_chat(user, span_holoparasite("[mob_name] chains are not allowed.")) return var/list/guardians = user.hasparasites() if(guardians.len && !allowmultiple) - to_chat(user, "I already have a [mob_name]!") + to_chat(user, span_holoparasite("I already have a [mob_name]!")) return if(user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling) && !allowling) to_chat(user, "[ling_failure]") @@ -550,7 +550,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/list/guardians = user.hasparasites() if(guardians.len && !allowmultiple) - to_chat(user, "I already have a [mob_name]!" ) + to_chat(user, span_holoparasite("I already have a [mob_name]!") ) used = FALSE return var/mob/living/simple_animal/hostile/guardian/G = new pickedtype(user, theme) @@ -561,13 +561,13 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians switch(theme) if("tech") to_chat(user, "[G.tech_fluff_string]") - to_chat(user, "[G.real_name] is now online!") + to_chat(user, span_holoparasite("[G.real_name] is now online!")) if("magic") to_chat(user, "[G.magic_fluff_string]") - to_chat(user, "[G.real_name] has been summoned!") + to_chat(user, span_holoparasite("[G.real_name] has been summoned!")) if("carp") to_chat(user, "[G.carp_fluff_string]") - to_chat(user, "[G.real_name] has been caught!") + to_chat(user, span_holoparasite("[G.real_name] has been caught!")) user.verbs += /mob/living/proc/guardian_comm user.verbs += /mob/living/proc/guardian_recall user.verbs += /mob/living/proc/guardian_reset @@ -589,10 +589,10 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians icon_state = "combat_hypo" theme = "tech" mob_name = "Holoparasite" - use_message = "I start to power on the injector..." - used_message = "The injector has already been used." - failure_message = "...ERROR. BOOT SEQUENCE ABORTED. AI FAILED TO INTIALIZE. PLEASE CONTACT SUPPORT OR TRY AGAIN LATER." - ling_failure = "The holoparasites recoil in horror. They want nothing to do with a creature like you." + use_message = span_holoparasite("I start to power on the injector...") + used_message = span_holoparasite("The injector has already been used.") + failure_message = span_holoparasitebold("...ERROR. BOOT SEQUENCE ABORTED. AI FAILED TO INTIALIZE. PLEASE CONTACT SUPPORT OR TRY AGAIN LATER.") + ling_failure = span_holoparasitebold("The holoparasites recoil in horror. They want nothing to do with a creature like you.") /obj/item/guardiancreator/tech/choose/traitor possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support", "Gravitokinetic") @@ -674,10 +674,10 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians icon_state = "fishfingers" theme = "carp" mob_name = "Holocarp" - use_message = "I put the fishsticks in my mouth..." - used_message = "Someone's already taken a bite out of these fishsticks! Ew." - failure_message = "I couldn't catch any carp spirits from the seas of Lake Carp. Maybe there are none, maybe you fucked up." - ling_failure = "Carp'sie is fine with changelings, so you shouldn't be seeing this message." + use_message = span_holoparasite("I put the fishsticks in my mouth...") + used_message = span_holoparasite("Someone's already taken a bite out of these fishsticks! Ew.") + failure_message = span_holoparasitebold("I couldn't catch any carp spirits from the seas of Lake Carp. Maybe there are none, maybe you fucked up.") + ling_failure = span_holoparasitebold("Carp'sie is fine with changelings, so you shouldn't be seeing this message.") allowmultiple = TRUE allowling = TRUE random = TRUE diff --git a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm index ee5f27e8b..7b64d225a 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm @@ -6,10 +6,10 @@ attack_verb_simple = "slash" attack_sound = 'sound/blank.ogg' damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1) - playstyle_string = "As an assassin type you do medium damage and have no damage resistance, but can enter stealth, massively increasing the damage of your next attack and causing it to ignore armor. Stealth is broken when you attack or take damage." - magic_fluff_string = "..And draw the Space Ninja, a lethal, invisible assassin." - tech_fluff_string = "Boot sequence complete. Assassin modules loaded. Holoparasite swarm online." - carp_fluff_string = "CARP CARP CARP! Caught one! It's an assassin carp! Just when you thought it was safe to go back to the water... which is unhelpful, because we're in space." + playstyle_string = span_holoparasite("As an assassin type you do medium damage and have no damage resistance, but can enter stealth, massively increasing the damage of your next attack and causing it to ignore armor. Stealth is broken when you attack or take damage.") + magic_fluff_string = span_holoparasite("..And draw the Space Ninja, a lethal, invisible assassin.") + tech_fluff_string = span_holoparasite("Boot sequence complete. Assassin modules loaded. Holoparasite swarm online.") + carp_fluff_string = span_holoparasite("CARP CARP CARP! Caught one! It's an assassin carp! Just when you thought it was safe to go back to the water... which is unhelpful, because we're in space.") toggle_button_type = /atom/movable/screen/guardian/ToggleMode/Assassin var/toggle = FALSE @@ -59,7 +59,7 @@ if(!forced) to_chat(src, "I exit stealth.") else - visible_message("\The [src] suddenly appears!") + visible_message(span_danger("\The [src] suddenly appears!")) stealthcooldown = world.time + initial(stealthcooldown) //we were forced out of stealth and go on cooldown cooldown = world.time + 40 //can't recall for 4 seconds updatestealthalert() diff --git a/code/modules/mob/living/simple_animal/guardian/types/charger.dm b/code/modules/mob/living/simple_animal/guardian/types/charger.dm index 659291f29..86cfaeb88 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/charger.dm @@ -7,10 +7,10 @@ ranged_cooldown_time = 40 speed = -1 damage_coeff = list(BRUTE = 0.6, BURN = 0.6, TOX = 0.6, CLONE = 0.6, STAMINA = 0, OXY = 0.6) - playstyle_string = "As a charger type you do medium damage, have medium damage resistance, move very fast, and can charge at a location, damaging any target hit and forcing them to drop any items they are holding." - magic_fluff_string = "..And draw the Hunter, an alien master of rapid assault." - tech_fluff_string = "Boot sequence complete. Charge modules loaded. Holoparasite swarm online." - carp_fluff_string = "CARP CARP CARP! Caught one! It's a charger carp, that likes running at people. But it doesn't have any legs..." + playstyle_string = span_holoparasite("As a charger type you do medium damage, have medium damage resistance, move very fast, and can charge at a location, damaging any target hit and forcing them to drop any items they are holding.") + magic_fluff_string = span_holoparasite("..And draw the Hunter, an alien master of rapid assault.") + tech_fluff_string = span_holoparasite("Boot sequence complete. Charge modules loaded. Holoparasite swarm online.") + carp_fluff_string = span_holoparasite("CARP CARP CARP! Caught one! It's a charger carp, that likes running at people. But it doesn't have any legs...") var/charging = 0 var/atom/movable/screen/alert/chargealert @@ -25,7 +25,7 @@ /mob/living/simple_animal/hostile/guardian/charger/OpenFire(atom/A) if(!charging) - visible_message("[src] [ranged_message] at [A]!") + visible_message(span_danger("[src] [ranged_message] at [A]!")) ranged_cooldown = world.time + ranged_cooldown_time clear_alert("charge") chargealert = null @@ -63,7 +63,7 @@ blocked = TRUE if(!blocked) L.drop_all_held_items() - L.visible_message("[src] slams into [L]!", "[src] slams into you!") + L.visible_message(span_danger("[src] slams into [L]!"), span_danger("[src] slams into you!")) L.apply_damage(20, BRUTE) playsound(get_turf(L), 'sound/blank.ogg', 100, TRUE) shake_camera(L, 4, 3) diff --git a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm index d750cdf99..083509c2e 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm @@ -3,10 +3,10 @@ melee_damage_lower = 10 melee_damage_upper = 10 damage_coeff = list(BRUTE = 0.75, BURN = 0.75, TOX = 0.75, CLONE = 0.75, STAMINA = 0, OXY = 0.75) - playstyle_string = "As a dextrous type you can hold items, store an item within yourself, and have medium damage resistance, but do low damage on attacks. Recalling and leashing will force you to drop unstored items!" - magic_fluff_string = "..And draw the Drone, a dextrous master of construction and repair." - tech_fluff_string = "Boot sequence complete. Dextrous combat modules loaded. Holoparasite swarm online." - carp_fluff_string = "CARP CARP CARP! You caught one! It can hold stuff in its fins, sort of." + playstyle_string = span_holoparasite("As a dextrous type you can hold items, store an item within yourself, and have medium damage resistance, but do low damage on attacks. Recalling and leashing will force you to drop unstored items!") + magic_fluff_string = span_holoparasite("..And draw the Drone, a dextrous master of construction and repair.") + tech_fluff_string = span_holoparasite("Boot sequence complete. Dextrous combat modules loaded. Holoparasite swarm online.") + carp_fluff_string = span_holoparasite("CARP CARP CARP! You caught one! It can hold stuff in its fins, sort of.") dextrous = TRUE held_items = list(null, null) var/obj/item/internal_storage //what we're storing within ourself @@ -66,7 +66,7 @@ internal_storage = I update_inv_internal_storage() else - to_chat(src, "I are trying to equip this item to an unsupported inventory slot. Report this to a coder!") + to_chat(src, span_danger("I are trying to equip this item to an unsupported inventory slot. Report this to a coder!")) /mob/living/simple_animal/hostile/guardian/dextrous/getBackSlot() return SLOT_GENERC_DEXTROUS_STORAGE diff --git a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm index f85834b38..6fdc8f8ef 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm @@ -10,10 +10,10 @@ melee_damage_upper = 15 damage_coeff = list(BRUTE = 0.6, BURN = 0.6, TOX = 0.6, CLONE = 0.6, STAMINA = 0, OXY = 0.6) range = 13 - playstyle_string = "As an explosive type, you have moderate close combat abilities, may explosively teleport targets on attack, and are capable of converting nearby items and objects into disguised bombs via alt click." - magic_fluff_string = "..And draw the Scientist, master of explosive death." - tech_fluff_string = "Boot sequence complete. Explosive modules active. Holoparasite swarm online." - carp_fluff_string = "CARP CARP CARP! Caught one! It's an explosive carp! Boom goes the fishy." + playstyle_string = span_holoparasite("As an explosive type, you have moderate close combat abilities, may explosively teleport targets on attack, and are capable of converting nearby items and objects into disguised bombs via alt click.") + magic_fluff_string = span_holoparasite("..And draw the Scientist, master of explosive death.") + tech_fluff_string = span_holoparasite("Boot sequence complete. Explosive modules active. Holoparasite swarm online.") + carp_fluff_string = span_holoparasite("CARP CARP CARP! Caught one! It's an explosive carp! Boom goes the fishy.") var/bomb_cooldown = 0 var/static/list/boom_signals = list(COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_BUMPED, COMSIG_ATOM_ATTACK_HAND) @@ -41,25 +41,25 @@ if(!istype(A)) return if(loc == summoner) - to_chat(src, "I must be manifested to create bombs!") + to_chat(src, span_danger("I must be manifested to create bombs!")) return if(isobj(A) && Adjacent(A)) if(bomb_cooldown <= world.time && !stat) - to_chat(src, "Success! Bomb armed!") + to_chat(src, span_danger("Success! Bomb armed!")) bomb_cooldown = world.time + 200 RegisterSignal(A, COMSIG_PARENT_EXAMINE, PROC_REF(display_examine)) RegisterSignal(A, boom_signals, PROC_REF(kaboom)) addtimer(CALLBACK(src, PROC_REF(disable), A), 600, TIMER_UNIQUE|TIMER_OVERRIDE) else - to_chat(src, "My powers are on cooldown! You must wait 20 seconds between bombs.") + to_chat(src, span_danger("My powers are on cooldown! You must wait 20 seconds between bombs.")) /mob/living/simple_animal/hostile/guardian/bomb/proc/kaboom(atom/source, mob/living/explodee) if(!istype(explodee)) return if(explodee == src || explodee == summoner || hasmatchingsummoner(explodee)) return - to_chat(explodee, "[source] was boobytrapped!") - to_chat(src, "Success! Your trap caught [explodee]") + to_chat(explodee, span_danger("[source] was boobytrapped!")) + to_chat(src, span_danger("Success! Your trap caught [explodee]")) var/turf/T = get_turf(source) playsound(T,'sound/blank.ogg', 200, TRUE) new /obj/effect/temp_visual/explosion(T) @@ -67,10 +67,10 @@ UNREGISTER_BOMB_SIGNALS(source) /mob/living/simple_animal/hostile/guardian/bomb/proc/disable(atom/A) - to_chat(src, "Failure! Your trap didn't catch anyone this time.") + to_chat(src, span_danger("Failure! Your trap didn't catch anyone this time.")) UNREGISTER_BOMB_SIGNALS(A) /mob/living/simple_animal/hostile/guardian/bomb/proc/display_examine(datum/source, mob/user, text) - text += "It glows with a strange light!" + text += span_holoparasite("It glows with a strange light!") #undef UNREGISTER_BOMB_SIGNALS diff --git a/code/modules/mob/living/simple_animal/guardian/types/fire.dm b/code/modules/mob/living/simple_animal/guardian/types/fire.dm index a8d9a9cbc..443781d86 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/fire.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/fire.dm @@ -8,10 +8,10 @@ attack_verb_simple = "ignite" damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7) range = 7 - playstyle_string = "As a chaos type, you have only light damage resistance, but will ignite any enemy you bump into. In addition, your melee attacks will cause human targets to see everyone as you." - magic_fluff_string = "..And draw the Wizard, bringer of endless chaos!" - tech_fluff_string = "Boot sequence complete. Crowd control modules activated. Holoparasite swarm online." - carp_fluff_string = "CARP CARP CARP! You caught one! OH GOD, EVERYTHING'S ON FIRE. Except you and the fish." + playstyle_string = span_holoparasite("As a chaos type, you have only light damage resistance, but will ignite any enemy you bump into. In addition, your melee attacks will cause human targets to see everyone as you.") + magic_fluff_string = span_holoparasite("..And draw the Wizard, bringer of endless chaos!") + tech_fluff_string = span_holoparasite("Boot sequence complete. Crowd control modules activated. Holoparasite swarm online.") + carp_fluff_string = span_holoparasite("CARP CARP CARP! You caught one! OH GOD, EVERYTHING'S ON FIRE. Except you and the fish.") /mob/living/simple_animal/hostile/guardian/fire/Life() . = ..() diff --git a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm index eb978f6a1..82af6cb9e 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm @@ -3,10 +3,10 @@ melee_damage_lower = 15 melee_damage_upper = 15 damage_coeff = list(BRUTE = 0.75, BURN = 0.75, TOX = 0.75, CLONE = 0.75, STAMINA = 0, OXY = 0.75) - playstyle_string = "As a gravitokinetic type, you can alt click to make the gravity on the ground stronger, and punching applies this effect to a target." - magic_fluff_string = "..And draw the Singularity, an anomalous force of terror." - tech_fluff_string = "Boot sequence complete. Gravitokinetic modules loaded. Holoparasite swarm online." - carp_fluff_string = "CARP CARP CARP! Caught one! It's a gravitokinetic carp! Now do you understand the gravity of the situation?" + playstyle_string = span_holoparasite("As a gravitokinetic type, you can alt click to make the gravity on the ground stronger, and punching applies this effect to a target.") + magic_fluff_string = span_holoparasite("..And draw the Singularity, an anomalous force of terror.") + tech_fluff_string = span_holoparasite("Boot sequence complete. Gravitokinetic modules loaded. Holoparasite swarm online.") + carp_fluff_string = span_holoparasite("CARP CARP CARP! Caught one! It's a gravitokinetic carp! Now do you understand the gravity of the situation?") var/list/gravito_targets = list() var/gravity_power_range = 10 //how close the stand must stay to the target to keep the heavy gravity @@ -21,15 +21,15 @@ if(isliving(target) && target != src) to_chat(src, "My punch has applied heavy gravity to [target]!") add_gravity(target, 2) - to_chat(target, "Everything feels really heavy!") + to_chat(target, span_danger("Everything feels really heavy!")) /mob/living/simple_animal/hostile/guardian/gravitokinetic/AltClickOn(atom/A) if(isopenturf(A) && is_deployed() && stat != DEAD && in_range(src, A) && !incapacitated()) var/turf/T = A if(isspaceturf(T)) - to_chat(src, "I cannot add gravity to space!") + to_chat(src, span_warning("I cannot add gravity to space!")) return - visible_message("[src] slams their fist into the [T]!", "I modify the gravity of the [T].") + visible_message(span_danger("[src] slams their fist into the [T]!"), span_notice("I modify the gravity of the [T].")) do_attack_animation(T) add_gravity(T, 4) return diff --git a/code/modules/mob/living/simple_animal/guardian/types/lightning.dm b/code/modules/mob/living/simple_animal/guardian/types/lightning.dm index 134419d41..cfd93a1b5 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/lightning.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/lightning.dm @@ -12,10 +12,10 @@ attack_sound = 'sound/blank.ogg' damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7) range = 7 - playstyle_string = "As a lightning type, you will apply lightning chains to targets on attack and have a lightning chain to your summoner. Lightning chains will shock anyone near them." - magic_fluff_string = "..And draw the Tesla, a shocking, lethal source of power." - tech_fluff_string = "Boot sequence complete. Lightning modules active. Holoparasite swarm online." - carp_fluff_string = "CARP CARP CARP! Caught one! It's a lightning carp! Everyone else goes zap zap." + playstyle_string = span_holoparasite("As a lightning type, you will apply lightning chains to targets on attack and have a lightning chain to your summoner. Lightning chains will shock anyone near them.") + magic_fluff_string = span_holoparasite("..And draw the Tesla, a shocking, lethal source of power.") + tech_fluff_string = span_holoparasite("Boot sequence complete. Lightning modules active. Holoparasite swarm online.") + carp_fluff_string = span_holoparasite("CARP CARP CARP! Caught one! It's a lightning carp! Everyone else goes zap zap.") var/datum/beam/summonerchain var/list/enemychains = list() var/successfulshocks = 0 @@ -104,9 +104,9 @@ if(successfulshocks > 4) L.electrocute_act(0) L.visible_message( - "[L] was shocked by the lightning chain!", \ - "I are shocked by the lightning chain!", \ - "I hear a heavy electrical crack." \ + span_danger("[L] was shocked by the lightning chain!"), \ + span_danger("I are shocked by the lightning chain!"), \ + span_hear("I hear a heavy electrical crack.") \ ) L.adjustFireLoss(1.2) //adds up very rapidly . = 1 diff --git a/code/modules/mob/living/simple_animal/guardian/types/protector.dm b/code/modules/mob/living/simple_animal/guardian/types/protector.dm index 2d94e34df..f83189d78 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/protector.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/protector.dm @@ -4,10 +4,10 @@ melee_damage_upper = 15 range = 15 //worse for it due to how it leashes damage_coeff = list(BRUTE = 0.4, BURN = 0.4, TOX = 0.4, CLONE = 0.4, STAMINA = 0, OXY = 0.4) - playstyle_string = "As a protector type you cause your summoner to leash to you instead of you leashing to them and have two modes; Combat Mode, where you do and take medium damage, and Protection Mode, where you do and take almost no damage, but move slightly slower." - magic_fluff_string = "..And draw the Guardian, a stalwart protector that never leaves the side of its charge." - tech_fluff_string = "Boot sequence complete. Protector modules loaded. Holoparasite swarm online." - carp_fluff_string = "CARP CARP CARP! You caught one! Wait, no... it caught you! The fisher has become the fishy." + playstyle_string = span_holoparasite("As a protector type you cause your summoner to leash to you instead of you leashing to them and have two modes; Combat Mode, where you do and take medium damage, and Protection Mode, where you do and take almost no damage, but move slightly slower.") + magic_fluff_string = span_holoparasite("..And draw the Guardian, a stalwart protector that never leaves the side of its charge.") + tech_fluff_string = span_holoparasite("Boot sequence complete. Protector modules loaded. Holoparasite swarm online.") + carp_fluff_string = span_holoparasite("CARP CARP CARP! You caught one! Wait, no... it caught you! The fisher has become the fishy.") toggle_button_type = /atom/movable/screen/guardian/ToggleMode var/toggle = FALSE @@ -17,7 +17,7 @@ else ..() if(toggle) - visible_message("The explosion glances off [src]'s energy shielding!") + visible_message(span_danger("The explosion glances off [src]'s energy shielding!")) /mob/living/simple_animal/hostile/guardian/protector/adjustHealth(amount, updating_health = TRUE, forced = FALSE) . = ..() @@ -57,12 +57,12 @@ return else if(istype(summoner.loc, /obj/effect)) - to_chat(src, "I moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]!") - visible_message("\The [src] jumps back to its user.") + to_chat(src, span_holoparasite("I moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]!")) + visible_message(span_danger("\The [src] jumps back to its user.")) Recall(TRUE) else - to_chat(summoner, "I moved out of range, and were pulled back! You can only move [range] meters from [real_name]!") - summoner.visible_message("\The [summoner] jumps back to [summoner.p_their()] protector.") + to_chat(summoner, span_holoparasite("I moved out of range, and were pulled back! You can only move [range] meters from [real_name]!")) + summoner.visible_message(span_danger("\The [summoner] jumps back to [summoner.p_their()] protector.")) new /obj/effect/temp_visual/guardian/phase/out(get_turf(summoner)) summoner.forceMove(get_turf(src)) new /obj/effect/temp_visual/guardian/phase(get_turf(summoner)) diff --git a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm index 8e70aaa9a..52850b003 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm @@ -18,10 +18,10 @@ projectilesound = 'sound/blank.ogg' ranged = 1 range = 13 - playstyle_string = "As a ranged type, you have only light damage resistance, but are capable of spraying shards of crystal at incredibly high speed. You can also deploy surveillance snares to monitor enemy movement. Finally, you can switch to scout mode, in which you can't attack, but can move without limit." - magic_fluff_string = "..And draw the Sentinel, an alien master of ranged combat." - tech_fluff_string = "Boot sequence complete. Ranged combat modules active. Holoparasite swarm online." - carp_fluff_string = "CARP CARP CARP! Caught one, it's a ranged carp. This fishy can watch people pee in the ocean." + playstyle_string = span_holoparasite("As a ranged type, you have only light damage resistance, but are capable of spraying shards of crystal at incredibly high speed. You can also deploy surveillance snares to monitor enemy movement. Finally, you can switch to scout mode, in which you can't attack, but can move without limit.") + magic_fluff_string = span_holoparasite("..And draw the Sentinel, an alien master of ranged combat.") + tech_fluff_string = span_holoparasite("Boot sequence complete. Ranged combat modules active. Holoparasite swarm online.") + carp_fluff_string = span_holoparasite("CARP CARP CARP! Caught one, it's a ranged carp. This fishy can watch people pee in the ocean.") see_invisible = SEE_INVISIBLE_LIVING see_in_dark = 8 toggle_button_type = /atom/movable/screen/guardian/ToggleMode @@ -76,7 +76,7 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE msg = "You deactivate your night vision." - to_chat(src, "[msg]") + to_chat(src, span_notice("[msg]")) /mob/living/simple_animal/hostile/guardian/ranged/verb/Snare() diff --git a/code/modules/mob/living/simple_animal/guardian/types/standard.dm b/code/modules/mob/living/simple_animal/guardian/types/standard.dm index b04655e27..72b56327e 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/standard.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/standard.dm @@ -5,10 +5,10 @@ obj_damage = 80 next_move_modifier = 0.8 //attacks 20% faster environment_smash = ENVIRONMENT_SMASH_WALLS - playstyle_string = "As a standard type you have no special abilities, but have a high damage resistance and a powerful attack capable of smashing through walls." - magic_fluff_string = "..And draw the Assistant, faceless and generic, but never to be underestimated." - tech_fluff_string = "Boot sequence complete. Standard combat modules loaded. Holoparasite swarm online." - carp_fluff_string = "CARP CARP CARP! You caught one! It's really boring and standard. Better punch some walls to ease the tension." + playstyle_string = span_holoparasite("As a standard type you have no special abilities, but have a high damage resistance and a powerful attack capable of smashing through walls.") + magic_fluff_string = span_holoparasite("..And draw the Assistant, faceless and generic, but never to be underestimated.") + tech_fluff_string = span_holoparasite("Boot sequence complete. Standard combat modules loaded. Holoparasite swarm online.") + carp_fluff_string = span_holoparasite("CARP CARP CARP! You caught one! It's really boring and standard. Better punch some walls to ease the tension.") var/battlecry = "AT" /mob/living/simple_animal/hostile/guardian/punch/verb/Battlecry() diff --git a/code/modules/mob/living/simple_animal/guardian/types/support.dm b/code/modules/mob/living/simple_animal/guardian/types/support.dm index edcafe841..13eb7f6f8 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/support.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/support.dm @@ -7,10 +7,10 @@ damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7) melee_damage_lower = 15 melee_damage_upper = 15 - playstyle_string = "As a support type, you may toggle my basic attacks to a healing mode. In addition, Alt-Clicking on an adjacent object or mob will warp them to my bluespace beacon after a short delay." - magic_fluff_string = "..And draw the CMO, a potent force of life... and death." - carp_fluff_string = "CARP CARP CARP! You caught a support carp. It's a kleptocarp!" - tech_fluff_string = "Boot sequence complete. Support modules active. Holoparasite swarm online." + playstyle_string = span_holoparasite("As a support type, you may toggle my basic attacks to a healing mode. In addition, Alt-Clicking on an adjacent object or mob will warp them to my bluespace beacon after a short delay.") + magic_fluff_string = span_holoparasite("..And draw the CMO, a potent force of life... and death.") + carp_fluff_string = span_holoparasite("CARP CARP CARP! You caught a support carp. It's a kleptocarp!") + tech_fluff_string = span_holoparasite("Boot sequence complete. Support modules active. Holoparasite swarm online.") toggle_button_type = /atom/movable/screen/guardian/ToggleMode var/obj/structure/receiving_pad/beacon var/beacon_cooldown = 0 @@ -104,7 +104,7 @@ add_atom_colour(G.namedatum.colour, FIXED_COLOUR_PRIORITY) /obj/structure/receiving_pad/proc/disappear() - visible_message("[src] vanishes!") + visible_message(span_notice("[src] vanishes!")) qdel(src) /mob/living/simple_animal/hostile/guardian/healer/AltClickOn(atom/movable/A) @@ -129,8 +129,8 @@ return to_chat(src, "I begin to warp [A].") - A.visible_message("[A] starts to glow faintly!", \ - "I start to faintly glow, and you feel strangely weightless!") + A.visible_message(span_danger("[A] starts to glow faintly!"), \ + span_danger("I start to faintly glow, and you feel strangely weightless!")) do_attack_animation(A) if(!do_mob(src, A, 60)) //now start the channel @@ -141,7 +141,7 @@ if(isliving(A)) var/mob/living/L = A L.flash_act() - A.visible_message("[A] disappears in a flash of light!", \ - "My vision is obscured by a flash of light!") + A.visible_message(span_danger("[A] disappears in a flash of light!"), \ + span_danger("My vision is obscured by a flash of light!")) do_teleport(A, beacon, 0, channel = TELEPORT_CHANNEL_BLUESPACE) new /obj/effect/temp_visual/guardian/phase(get_turf(A)) diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 9106a3a26..58f7b0342 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -115,7 +115,7 @@ return if(locate(/obj/structure/alien/weeds/node) in get_turf(src)) return - visible_message("[src] has planted some alien weeds!") + visible_message(span_alertalien("[src] has planted some alien weeds!")) new /obj/structure/alien/weeds/node(loc) /mob/living/simple_animal/hostile/alien/proc/LayEggs() @@ -123,7 +123,7 @@ return if(locate(/obj/structure/alien/egg) in get_turf(src)) return - visible_message("[src] has laid an egg!") + visible_message(span_alertalien("[src] has laid an egg!")) new /obj/structure/alien/egg(loc) /mob/living/simple_animal/hostile/alien/queen/large @@ -174,10 +174,10 @@ /mob/living/simple_animal/hostile/alien/maid/AttackingTarget() if(ismovableatom(target)) if(istype(target, /obj/effect/decal/cleanable)) - visible_message("[src] cleans up \the [target].") + visible_message(span_notice("[src] cleans up \the [target].")) qdel(target) return TRUE var/atom/movable/M = target SEND_SIGNAL(M, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD) - visible_message("[src] polishes \the [target].") + visible_message(span_notice("[src] polishes \the [target].")) return TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index e6745a592..1ec3aaa9e 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -90,7 +90,7 @@ if(istype(target, /mob/living/simple_animal/hostile/bear) && proximity_flag) var/mob/living/simple_animal/hostile/bear/A = target if(A.armored) - to_chat(user, "[A] has already been armored up!") + to_chat(user, span_warning("[A] has already been armored up!")) return A.armored = TRUE A.maxHealth += 60 @@ -99,7 +99,7 @@ A.melee_damage_lower += 5 A.melee_damage_upper += 5 A.update_icons() - to_chat(user, "I strap the armor plating to [A] and sharpen [A.p_their()] claws with the nail filer. This was a great idea.") + to_chat(user, span_info("I strap the armor plating to [A] and sharpen [A.p_their()] claws with the nail filer. This was a great idea.")) qdel(src) mob/living/simple_animal/hostile/bear/butter //The mighty companion to Cak. Several functions used from it. @@ -144,7 +144,7 @@ mob/living/simple_animal/hostile/bear/butter //The mighty companion to Cak. Seve free butter to the station!") var/new_name = stripped_input(src, "Enter my name, or press \"Cancel\" to stick with Terrygold.", "Name Change") if(new_name) - to_chat(src, "My name is now \"new_name\"!") + to_chat(src, span_notice("My name is now \"new_name\"!")) name = new_name mob/living/simple_animal/hostile/bear/butter/AttackingTarget() //Makes some attacks by the butter bear slip those who dare cross its path. @@ -153,4 +153,4 @@ mob/living/simple_animal/hostile/bear/butter/AttackingTarget() //Makes some atta if((L.mobility_flags & MOBILITY_STAND)) L.Knockdown(20) playsound(loc, 'sound/blank.ogg', 15) - L.visible_message("[L] slips on butter!") + L.visible_message(span_danger("[L] slips on butter!")) diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 9e957a119..94e34d98d 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -84,7 +84,7 @@ . = ..() if(!beehome) - . += "This bee is homeless!" + . += span_warning("This bee is homeless!") /mob/living/simple_animal/hostile/poison/bees/ListTargets() // Bee processing is expessive, so we override them finding targets here. if(!search_objects) //In case we want to have purely hostile bees @@ -277,18 +277,18 @@ if(queen && queen.beegent) qb.queen.assign_reagent(queen.beegent) //Bees use the global singleton instances of reagents, so we don't need to worry about one bee being deleted and her copies losing their reagents. user.put_in_active_hand(qb) - user.visible_message("[user] injects [src] with royal bee jelly, causing it to split into two bees, MORE BEES!","I inject [src] with royal bee jelly, causing it to split into two bees, MORE BEES!") + user.visible_message(span_notice("[user] injects [src] with royal bee jelly, causing it to split into two bees, MORE BEES!"),span_warning("I inject [src] with royal bee jelly, causing it to split into two bees, MORE BEES!")) else - to_chat(user, "I don't have enough royal bee jelly to split a bee in two!") + to_chat(user, span_warning("I don't have enough royal bee jelly to split a bee in two!")) else var/datum/reagent/R = GLOB.chemical_reagents_list[S.reagents.get_master_reagent_id()] if(R && S.reagents.has_reagent(R.type, 5)) S.reagents.remove_reagent(R.type,5) queen.assign_reagent(R) - user.visible_message("[user] injects [src]'s genome with [R.name], mutating its DNA!","I inject [src]'s genome with [R.name], mutating its DNA!") + user.visible_message(span_warning("[user] injects [src]'s genome with [R.name], mutating its DNA!"),span_warning("I inject [src]'s genome with [R.name], mutating its DNA!")) name = queen.name else - to_chat(user, "I don't have enough units of that chemical to modify the bee's DNA!") + to_chat(user, span_warning("I don't have enough units of that chemical to modify the bee's DNA!")) ..() diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm index bdcef7c0c..760625b03 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm @@ -156,7 +156,7 @@ /obj/effect/temp_visual/paperwiz_dying/Initialize() . = ..() - visible_message("The wizard cries out in pain as a gate appears behind him, sucking him in!") + visible_message(span_boldannounce("The wizard cries out in pain as a gate appears behind him, sucking him in!")) playsound(get_turf(src),'sound/blank.ogg', 50, TRUE, TRUE) playsound(get_turf(src),'sound/blank.ogg', 50, TRUE, TRUE) diff --git a/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm b/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm index 99b52323f..c5a6064fb 100644 --- a/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm +++ b/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm @@ -35,7 +35,7 @@ var/mob/living/carbon/human/L = target var/obj/item/organ/tail/cat/tail = L.getorgan(/obj/item/organ/tail/cat) if(!QDELETED(tail)) - visible_message("[src] severs [L]'s tail in one swift swipe!", "I sever [L]'s tail in one swift swipe.") + visible_message(span_notice("[src] severs [L]'s tail in one swift swipe!"), span_notice("I sever [L]'s tail in one swift swipe.")) tail.Remove(L) var/obj/item/organ/tail/cat/dropped_tail = new(target.drop_location()) dropped_tail.color = L.hair_color diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm index cbe06840d..a179568de 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithless.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm @@ -41,5 +41,5 @@ if(. && prob(12) && iscarbon(target)) var/mob/living/carbon/C = target C.Paralyze(60) - C.visible_message("\The [src] knocks down \the [C]!", \ - "\The [src] knocks you down!") + C.visible_message(span_danger("\The [src] knocks down \the [C]!"), \ + span_danger("\The [src] knocks you down!")) diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 03f967484..81e6e4c9e 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -72,10 +72,10 @@ /mob/living/simple_animal/hostile/poison/giant_spider/Login() ..() if(directive) - to_chat(src, "My mother left you a directive! Follow it at all costs.") - to_chat(src, "[directive]") + to_chat(src, span_spider("My mother left you a directive! Follow it at all costs.")) + to_chat(src, span_spider("[directive]")) if(mind) - mind.store_memory("[directive]") + mind.store_memory(span_spider("[directive]")) /mob/living/simple_animal/hostile/poison/giant_spider/attack_ghost(mob/user) . = ..() @@ -90,7 +90,7 @@ if(spider_ask == "No" || !src || QDELETED(src)) return 1 if(key) - to_chat(user, "Someone else already took this spider!") + to_chat(user, span_warning("Someone else already took this spider!")) return 1 key = user.key if(directive) @@ -308,19 +308,19 @@ /mob/living/simple_animal/hostile/poison/giant_spider/nurse/proc/cocoon() if(stat != DEAD && cocoon_target && !cocoon_target.anchored) if(cocoon_target == src) - to_chat(src, "I can't wrap yourself!") + to_chat(src, span_warning("I can't wrap yourself!")) return if(istype(cocoon_target, /mob/living/simple_animal/hostile/poison/giant_spider)) - to_chat(src, "I can't wrap other spiders!") + to_chat(src, span_warning("I can't wrap other spiders!")) return if(!Adjacent(cocoon_target)) - to_chat(src, "I can't reach [cocoon_target]!") + to_chat(src, span_warning("I can't reach [cocoon_target]!")) return if(busy == SPINNING_COCOON) - to_chat(src, "You're already spinning a cocoon!") + to_chat(src, span_warning("You're already spinning a cocoon!")) return //we're already doing this, don't cancel out or anything busy = SPINNING_COCOON - visible_message("[src] begins to secrete a sticky substance around [cocoon_target].","I begin wrapping [cocoon_target] into a cocoon.") + visible_message(span_notice("[src] begins to secrete a sticky substance around [cocoon_target]."),span_notice("I begin wrapping [cocoon_target] into a cocoon.")) stop_automated_movement = TRUE walk(src,0) if(do_after(src, 50, target = cocoon_target)) @@ -332,10 +332,10 @@ consumed_mobs[L.tag] = TRUE fed++ lay_eggs.UpdateButtonIcon(TRUE) - visible_message("[src] sticks a proboscis into [L] and sucks a viscous substance out.","I suck the nutriment out of [L], feeding you enough to lay a cluster of eggs.") + visible_message(span_danger("[src] sticks a proboscis into [L] and sucks a viscous substance out."),span_notice("I suck the nutriment out of [L], feeding you enough to lay a cluster of eggs.")) L.death() //you just ate them, they're dead. else - to_chat(src, "[L] cannot sate my hunger!") + to_chat(src, span_warning("[L] cannot sate my hunger!")) cocoon_target.forceMove(C) if(cocoon_target.density || ismob(cocoon_target)) @@ -365,12 +365,12 @@ var/obj/structure/spider/stickyweb/W = locate() in T if(W) - to_chat(S, "There's already a web here!") + to_chat(S, span_warning("There's already a web here!")) return if(S.busy != SPINNING_WEB) S.busy = SPINNING_WEB - S.visible_message("[S] begins to secrete a sticky substance.","I begin to lay a web.") + S.visible_message(span_notice("[S] begins to secrete a sticky substance."),span_notice("I begin to lay a web.")) S.stop_automated_movement = TRUE if(do_after(S, 40, target = T)) if(S.busy == SPINNING_WEB && S.loc == T) @@ -378,7 +378,7 @@ S.busy = SPIDER_IDLE S.stop_automated_movement = FALSE else - to_chat(S, "You're already spinning a web!") + to_chat(S, span_warning("You're already spinning a web!")) /obj/effect/proc_holder/wrap name = "Wrap" @@ -409,10 +409,10 @@ /obj/effect/proc_holder/wrap/proc/activate(mob/living/user) var/message if(active) - message = "I no longer prepare to wrap something in a cocoon." + message = span_notice("I no longer prepare to wrap something in a cocoon.") remove_ranged_ability(message) else - message = "I prepare to wrap something in a cocoon. Left-click my target to start wrapping!" + message = span_notice("I prepare to wrap something in a cocoon. Left-click my target to start wrapping!") add_ranged_ability(user, message, TRUE) return 1 @@ -459,12 +459,12 @@ var/obj/structure/spider/eggcluster/E = locate() in get_turf(S) if(E) - to_chat(S, "There is already a cluster of eggs here!") + to_chat(S, span_warning("There is already a cluster of eggs here!")) else if(!S.fed) - to_chat(S, "I are too hungry to do this!") + to_chat(S, span_warning("I are too hungry to do this!")) else if(S.busy != LAYING_EGGS) S.busy = LAYING_EGGS - S.visible_message("[S] begins to lay a cluster of eggs.","I begin to lay a cluster of eggs.") + S.visible_message(span_notice("[S] begins to lay a cluster of eggs."),span_notice("I begin to lay a cluster of eggs.")) S.stop_automated_movement = TRUE if(do_after(S, 50, target = get_turf(S))) if(S.busy == LAYING_EGGS) @@ -535,7 +535,7 @@ if(!message) return var/my_message - my_message = "Command from [user]: [message]" + my_message = span_spider("Command from [user]: [message]") for(var/mob/living/simple_animal/hostile/poison/giant_spider/M in GLOB.spidermobs) to_chat(M, my_message) for(var/M in GLOB.dead_mob_list) diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm index dff1107a5..ff6febb1c 100644 --- a/code/modules/mob/living/simple_animal/hostile/goose.dm +++ b/code/modules/mob/living/simple_animal/hostile/goose.dm @@ -79,7 +79,7 @@ /mob/living/simple_animal/hostile/retaliate/goose/vomit/examine(user) . = ..() - . += "Somehow, it still looks hungry." + . += span_notice("Somehow, it still looks hungry.") /mob/living/simple_animal/hostile/retaliate/goose/vomit/attacked_by(obj/item/O, mob/user) . = ..() @@ -91,18 +91,18 @@ return if (contents.len > GOOSE_SATIATED) if(message_cooldown < world.time) - visible_message("[src] looks too full to eat \the [tasty]!") + visible_message(span_notice("[src] looks too full to eat \the [tasty]!")) message_cooldown = world.time + 5 SECONDS return if (tasty.foodtype & GROSS) - visible_message("[src] hungrily gobbles up \the [tasty]!") + visible_message(span_notice("[src] hungrily gobbles up \the [tasty]!")) tasty.forceMove(src) playsound(src,'sound/blank.ogg', 70, TRUE) vomitCoefficient += 3 vomitTimeBonus += 2 else if(message_cooldown < world.time) - visible_message("[src] refuses to eat \the [tasty].") + visible_message(span_notice("[src] refuses to eat \the [tasty].")) message_cooldown = world.time + 5 SECONDS /mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/vomit() diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm index ed33bed5e..b3465b210 100644 --- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm +++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm @@ -75,7 +75,7 @@ L.throw_at(throw_target, rand(1,2), 7, src) else L.Paralyze(20) - visible_message("[src] knocks [L] down!") + visible_message(span_danger("[src] knocks [L] down!")) /mob/living/simple_animal/hostile/gorilla/CanAttack(atom/the_target) var/list/parts = target_bodyparts(target) @@ -101,7 +101,7 @@ ..() /mob/living/simple_animal/hostile/gorilla/can_use_guns(obj/item/G) - to_chat(src, "My meaty finger is much too large for the trigger guard!") + to_chat(src, span_warning("My meaty finger is much too large for the trigger guard!")) return FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index 0f4c1b383..46479b3cc 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -33,8 +33,8 @@ egg.origin = mind for(var/obj/item/organ/I in src) I.forceMove(egg) - visible_message("[src] plants something in [victim]'s flesh!", \ - "We inject our egg into [victim]'s body!") + visible_message(span_warning("[src] plants something in [victim]'s flesh!"), \ + span_danger("We inject our egg into [victim]'s body!")) egg_lain = 1 /mob/living/simple_animal/hostile/headcrab/AttackingTarget() @@ -44,10 +44,10 @@ var/mob/living/carbon/C = target if(C.stat == DEAD) if(HAS_TRAIT(C, TRAIT_XENO_HOST)) - to_chat(src, "A foreign presence repels us from this body. Perhaps we should try to infest another?") + to_chat(src, span_danger("A foreign presence repels us from this body. Perhaps we should try to infest another?")) return Infect(target) - to_chat(src, "With our egg laid, our death approaches rapidly...") + to_chat(src, span_danger("With our egg laid, our death approaches rapidly...")) addtimer(CALLBACK(src, PROC_REF(death)), 100) /obj/item/organ/body_egg/changeling_egg diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index e9809afbd..88c287c54 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -429,7 +429,7 @@ /mob/living/simple_animal/hostile/proc/OpenFire(atom/A) if(CheckFriendlyFire(A)) return - visible_message("[src] [ranged_message] at [A]!") + visible_message(span_danger("[src] [ranged_message] at [A]!")) if(rapid > 1) diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm index 0c3514311..76cb72973 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm @@ -240,7 +240,7 @@ throw_dir = pick(GLOB.alldirs) var/throwtarget = get_edge_target_turf(src, throw_dir) L.throw_at(throwtarget, 3, 1) - visible_message("[L] is thrown clear of [src]!") + visible_message(span_warning("[L] is thrown clear of [src]!")) if(ckey)//Lessens ability to chain stun as a player ranged_cooldown = ranged_cooldown_time + world.time update_icons() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index e0d41c8cc..36ab06fa9 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -69,21 +69,21 @@ Difficulty: Medium name = "Dash To Target" icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "sniper_zoom" - chosen_message = "I are now dashing to your target." + chosen_message = span_colossus("I are now dashing to your target.") chosen_attack_num = 1 /datum/action/innate/megafauna_attack/kinetic_accelerator name = "Fire Kinetic Accelerator" icon_icon = 'icons/obj/guns/energy.dmi' button_icon_state = "kineticgun" - chosen_message = "I are now shooting your kinetic accelerator." + chosen_message = span_colossus("I are now shooting your kinetic accelerator.") chosen_attack_num = 2 /datum/action/innate/megafauna_attack/transform_weapon name = "Transform Weapon" icon_icon = 'icons/obj/lavaland/artefacts.dmi' button_icon_state = "cleaving_saw" - chosen_message = "I are now transforming your weapon." + chosen_message = span_colossus("I are now transforming your weapon.") chosen_attack_num = 3 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/OpenFire() @@ -153,8 +153,8 @@ Difficulty: Medium if(isliving(target)) var/mob/living/L = target if(L.stat == DEAD) - visible_message("[src] butchers [L]!", - "I butcher [L], restoring your health!") + visible_message(span_danger("[src] butchers [L]!"), + span_danger("I butcher [L], restoring your health!")) if(!is_station_level(z) || client) //NPC monsters won't heal while on station if(guidance) adjustHealth(-L.maxHealth) @@ -186,7 +186,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/shoot_ka() if(ranged_cooldown <= world.time && get_dist(src, target) <= MINER_DASH_RANGE && !Adjacent(target)) ranged_cooldown = world.time + ranged_cooldown_time - visible_message("[src] fires the proto-kinetic accelerator!") + visible_message(span_danger("[src] fires the proto-kinetic accelerator!")) face_atom(target) new /obj/effect/temp_visual/dir_setting/firing_effect(loc, dir) Shoot(target) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 72f7f2ba0..6353212e6 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -78,28 +78,28 @@ Difficulty: Hard name = "Triple Charge" icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "sniper_zoom" - chosen_message = "I are now triple charging at the target you click on." + chosen_message = span_colossus("I are now triple charging at the target you click on.") chosen_attack_num = 1 /datum/action/innate/megafauna_attack/hallucination_charge name = "Hallucination Charge" icon_icon = 'icons/effects/bubblegum.dmi' button_icon_state = "smack ya one" - chosen_message = "I are now charging with hallucinations at the target you click on." + chosen_message = span_colossus("I are now charging with hallucinations at the target you click on.") chosen_attack_num = 2 /datum/action/innate/megafauna_attack/hallucination_surround name = "Surround Target" icon_icon = 'icons/turf/walls/wall.dmi' button_icon_state = "wall" - chosen_message = "I are now surrounding the target you click on with hallucinations." + chosen_message = span_colossus("I are now surrounding the target you click on with hallucinations.") chosen_attack_num = 3 /datum/action/innate/megafauna_attack/blood_warp name = "Blood Warp" icon_icon = 'icons/effects/blood.dmi' button_icon_state = "floor1" - chosen_message = "I are now warping to blood around your clicked position." + chosen_message = span_colossus("I are now warping to blood around your clicked position.") chosen_attack_num = 4 /mob/living/simple_animal/hostile/megafauna/bubblegum/OpenFire() @@ -241,7 +241,7 @@ Difficulty: Hard SLEEP_CHECK_DEATH(4) for(var/mob/living/L in T) if(!faction_check_mob(L)) - to_chat(L, "[src] rends you!") + to_chat(L, span_danger("[src] rends you!")) playsound(T, attack_sound, 100, TRUE, -1) var/limb_to_hit = L.get_bodypart(pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG)) L.apply_damage(10, BRUTE, limb_to_hit, L.run_armor_check(limb_to_hit, "slash", null, null, armor_penetration)) @@ -258,7 +258,7 @@ Difficulty: Hard for(var/mob/living/L in T) if(!faction_check_mob(L)) if(L.stat != CONSCIOUS) - to_chat(L, "[src] drags you through the blood!") + to_chat(L, span_danger("[src] drags you through the blood!")) playsound(T, 'sound/blank.ogg', 100, TRUE, -1) var/turf/targetturf = get_step(src, dir) L.forceMove(targetturf) @@ -295,11 +295,11 @@ Difficulty: Hard shuffle_inplace(pools) found_bloodpool = pick(pools) if(found_bloodpool) - visible_message("[src] sinks into the blood...") + visible_message(span_danger("[src] sinks into the blood...")) playsound(get_turf(src), 'sound/blank.ogg', 100, TRUE, -1) forceMove(get_turf(found_bloodpool)) playsound(get_turf(src), 'sound/blank.ogg', 100, TRUE, -1) - visible_message("And springs back out!") + visible_message(span_danger("And springs back out!")) blood_enrage() return TRUE return FALSE @@ -416,7 +416,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/bullet_act(obj/projectile/P) if(BUBBLEGUM_IS_ENRAGED) - visible_message("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons while enraged!", "I deflect the projectile!") + visible_message(span_danger("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons while enraged!"), span_danger("I deflect the projectile!")) playsound(src, pick('sound/blank.ogg'), 300, TRUE) return BULLET_ACT_BLOCK return ..() @@ -464,7 +464,7 @@ Difficulty: Hard DestroySurroundings() if(isliving(A)) var/mob/living/L = A - L.visible_message("[src] slams into [L]!", "[src] tramples you into the ground!") + L.visible_message(span_danger("[src] slams into [L]!"), span_danger("[src] tramples you into the ground!")) src.forceMove(get_turf(L)) L.apply_damage(istype(src, /mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination) ? 15 : 30, BRUTE) playsound(get_turf(L), 'sound/blank.ogg', 100, TRUE) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index f3f808436..7d45bd062 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -62,28 +62,28 @@ Difficulty: Very Hard name = "Spiral Shots" icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "sniper_zoom" - chosen_message = "I are now firing in a spiral." + chosen_message = span_colossus("I are now firing in a spiral.") chosen_attack_num = 1 /datum/action/innate/megafauna_attack/aoe_attack name = "All Directions" icon_icon = 'icons/effects/effects.dmi' button_icon_state = "at_shield2" - chosen_message = "I are now firing in all directions." + chosen_message = span_colossus("I are now firing in all directions.") chosen_attack_num = 2 /datum/action/innate/megafauna_attack/shotgun name = "Shotgun Fire" icon_icon = 'icons/obj/guns/projectile.dmi' button_icon_state = "shotgun" - chosen_message = "I are now firing shotgun shots where you aim." + chosen_message = span_colossus("I are now firing shotgun shots where you aim.") chosen_attack_num = 3 /datum/action/innate/megafauna_attack/alternating_cardinals name = "Alternating Shots" icon_icon = 'icons/obj/guns/projectile.dmi' button_icon_state = "pistol" - chosen_message = "I are now firing in alternating cardinal directions." + chosen_message = span_colossus("I are now firing in alternating cardinal directions.") chosen_attack_num = 4 /mob/living/simple_animal/hostile/megafauna/colossus/OpenFire() @@ -104,7 +104,7 @@ Difficulty: Very Hard if(enrage(target)) if(move_to_delay == initial(move_to_delay)) - visible_message("\"I can't dodge.\"") + visible_message(span_colossus("\"I can't dodge.\"")) ranged_cooldown = world.time + 30 telegraph() dir_shots(GLOB.alldirs) @@ -144,11 +144,11 @@ Difficulty: Very Hard telegraph() if(health < maxHealth/3) return double_spiral() - visible_message("\"Judgement.\"") + visible_message(span_colossus("\"Judgement.\"")) return spiral_shoot() /mob/living/simple_animal/hostile/megafauna/colossus/proc/double_spiral() - visible_message("\"Die.\"") + visible_message(span_colossus("\"Die.\"")) SLEEP_CHECK_DEATH(10) INVOKE_ASYNC(src, PROC_REF(spiral_shoot), FALSE) @@ -218,7 +218,7 @@ Difficulty: Very Hard /mob/living/simple_animal/hostile/megafauna/colossus/devour(mob/living/L) - visible_message("[src] disintegrates [L]!") + visible_message(span_colossus("[src] disintegrates [L]!")) L.dust() /obj/effect/temp_visual/at_shield @@ -286,7 +286,7 @@ Difficulty: Very Hard if(!istype(O)) return FALSE if(blacklist[O]) - visible_message("[src] ripples as it rejects [O]. The device will not accept items that have been removed from it.") + visible_message(span_boldwarning("[src] ripples as it rejects [O]. The device will not accept items that have been removed from it.")) return FALSE return TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 4081a53fa..cbd851a5f 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -75,28 +75,28 @@ Difficulty: Medium name = "Fire Cone" icon_icon = 'icons/obj/wizard.dmi' button_icon_state = "fireball" - chosen_message = "I are now shooting fire at your target." + chosen_message = span_colossus("I are now shooting fire at your target.") chosen_attack_num = 1 /datum/action/innate/megafauna_attack/fire_cone_meteors name = "Fire Cone With Meteors" icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "sniper_zoom" - chosen_message = "I are now shooting fire at your target and raining fire around you." + chosen_message = span_colossus("I are now shooting fire at your target and raining fire around you.") chosen_attack_num = 2 /datum/action/innate/megafauna_attack/mass_fire name = "Mass Fire Attack" icon_icon = 'icons/effects/fire.dmi' button_icon_state = "1" - chosen_message = "I are now shooting mass fire at your target." + chosen_message = span_colossus("I are now shooting mass fire at your target.") chosen_attack_num = 3 /datum/action/innate/megafauna_attack/lava_swoop name = "Lava Swoop" icon_icon = 'icons/effects/effects.dmi' button_icon_state = "lavastaff_warn" - chosen_message = "I are now swooping and raining lava at your target." + chosen_message = span_colossus("I are now swooping and raining lava at your target.") chosen_attack_num = 4 /mob/living/simple_animal/hostile/megafauna/dragon/OpenFire() @@ -135,7 +135,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_rain() if(!target) return - target.visible_message("Fire rains from the sky!") + target.visible_message(span_boldwarning("Fire rains from the sky!")) for(var/turf/turf in range(9,get_turf(target))) if(prob(11)) new /obj/effect/temp_visual/target(turf) @@ -143,7 +143,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/dragon/proc/lava_pools(amount, delay = 0.8) if(!target) return - target.visible_message("Lava starts to pool up around you!") + target.visible_message(span_boldwarning("Lava starts to pool up around you!")) while(amount > 0) if(QDELETED(target)) break @@ -181,7 +181,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/dragon/proc/lava_arena() if(!target) return - target.visible_message("[src] encases you in an arena of fire!") + target.visible_message(span_boldwarning("[src] encases you in an arena of fire!")) var/amount = 3 var/turf/center = get_turf(target) var/list/walled = RANGE_TURFS(3, center) - RANGE_TURFS(2, center) @@ -226,7 +226,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/dragon/proc/arena_escape_enrage() // you ran somehow / teleported away from my arena attack now i'm mad fucker SLEEP_CHECK_DEATH(0) SetRecoveryTime(80) - visible_message("[src] starts to glow vibrantly as its wounds close up!") + visible_message(span_boldwarning("[src] starts to glow vibrantly as its wounds close up!")) adjustBruteLoss(-250) // yeah you're gonna pay for that, don't run nerd add_atom_colour(rgb(255, 255, 0), TEMPORARY_COLOUR_PRIORITY) move_to_delay = move_to_delay / 2 @@ -280,7 +280,7 @@ Difficulty: Medium continue hit_list += L L.adjustFireLoss(20) - to_chat(L, "You're hit by [source]'s fire breath!") + to_chat(L, span_danger("You're hit by [source]'s fire breath!")) // deals damage to mechs for(var/obj/mecha/M in T.contents) @@ -301,7 +301,7 @@ Difficulty: Medium swooping |= SWOOP_DAMAGEABLE density = FALSE icon_state = "shadow" - visible_message("[src] swoops up high!") + visible_message(span_boldwarning("[src] swoops up high!")) var/negative var/initial_x = x @@ -359,7 +359,7 @@ Difficulty: Medium playsound(loc, 'sound/blank.ogg', 200, TRUE) for(var/mob/living/L in orange(1, src)) if(L.stat) - visible_message("[src] slams down on [L], crushing [L.p_them()]!") + visible_message(span_warning("[src] slams down on [L], crushing [L.p_them()]!")) L.gib() else L.adjustBruteLoss(75) @@ -369,7 +369,7 @@ Difficulty: Medium throw_dir = pick(GLOB.alldirs) var/throwtarget = get_edge_target_turf(src, throw_dir) L.throw_at(throwtarget, 3) - visible_message("[L] is thrown clear of [src]!") + visible_message(span_warning("[L] is thrown clear of [src]!")) for(var/obj/mecha/M in orange(1, src)) M.take_damage(75, BRUTE, "blunt", 1) @@ -439,7 +439,7 @@ Difficulty: Medium if(istype(L, /mob/living/simple_animal/hostile/megafauna/dragon)) continue L.adjustFireLoss(10) - to_chat(L, "I fall directly into the pool of lava!") + to_chat(L, span_danger("I fall directly into the pool of lava!")) // deals damage to mechs for(var/obj/mecha/M in T.contents) @@ -562,7 +562,7 @@ obj/effect/temp_visual/fireball continue if(islist(flame_hit) && !flame_hit[L]) L.adjustFireLoss(40) - to_chat(L, "You're hit by the drake's fire breath!") + to_chat(L, span_danger("You're hit by the drake's fire breath!")) flame_hit[L] = TRUE else L.adjustFireLoss(10) //if we've already hit them, do way less damage @@ -586,7 +586,7 @@ obj/effect/temp_visual/fireball if(!istype(A)) return if(player_cooldown >= world.time) - to_chat(src, "I need to wait [(player_cooldown - world.time) / 10] seconds before swooping again!") + to_chat(src, span_warning("I need to wait [(player_cooldown - world.time) / 10] seconds before swooping again!")) return swoop_attack(FALSE, A) lava_pools(10, 2) // less pools but longer delay before spawns diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 547f549fc..39669fa5e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -93,28 +93,28 @@ Difficulty: Hard name = "Blink To Target" icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "sniper_zoom" - chosen_message = "I are now blinking to my target." + chosen_message = span_colossus("I are now blinking to my target.") chosen_attack_num = 1 /datum/action/innate/megafauna_attack/chaser_swarm name = "Chaser Swarm" icon_icon = 'icons/effects/effects.dmi' button_icon_state = "hierophant_squares_indefinite" - chosen_message = "I are firing a chaser swarm at my target." + chosen_message = span_colossus("I are firing a chaser swarm at my target.") chosen_attack_num = 2 /datum/action/innate/megafauna_attack/cross_blasts name = "Cross Blasts" icon_icon = 'icons/effects/effects.dmi' button_icon_state = "hierophant_blast_indefinite" - chosen_message = "I are now firing cross blasts at my target." + chosen_message = span_colossus("I are now firing cross blasts at my target.") chosen_attack_num = 3 /datum/action/innate/megafauna_attack/blink_spam name = "Blink Chase" icon_icon = 'icons/obj/lavaland/artefacts.dmi' button_icon_state = "hierophant_club_ready_beacon" - chosen_message = "I are now repeatedly blinking at my target." + chosen_message = span_colossus("I are now repeatedly blinking at my target.") chosen_attack_num = 4 /mob/living/simple_animal/hostile/megafauna/hierophant/OpenFire() @@ -199,7 +199,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/hierophant/proc/blink_spam(blink_counter, target_slowness, cross_counter) ranged_cooldown = world.time + max(5, major_attack_cooldown - anger_modifier * 0.75) if(health < maxHealth * 0.5 && blink_counter > 1) - visible_message("\"Mx ampp rsx iwgeti.\"") + visible_message(span_hierophant("\"Mx ampp rsx iwgeti.\"")) var/oldcolor = color animate(src, color = "#660099", time = 6) SLEEP_CHECK_DEATH(6) @@ -220,7 +220,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/hierophant/proc/cross_blast_spam(blink_counter, target_slowness, cross_counter) ranged_cooldown = world.time + max(5, major_attack_cooldown - anger_modifier * 0.75) - visible_message("\"Piezi mx rsalivi xs vyr.\"") + visible_message(span_hierophant("\"Piezi mx rsalivi xs vyr.\"")) blinking = TRUE var/oldcolor = color animate(src, color = "#660099", time = 6) @@ -240,7 +240,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/hierophant/proc/chaser_swarm(blink_counter, target_slowness, cross_counter) ranged_cooldown = world.time + max(5, major_attack_cooldown - anger_modifier * 0.75) - visible_message("\"Mx gerrsx lmhi.\"") + visible_message(span_hierophant("\"Mx gerrsx lmhi.\"")) blinking = TRUE var/oldcolor = color animate(src, color = "#660099", time = 6) @@ -321,7 +321,7 @@ Difficulty: Hard B.damage = 30 animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out SLEEP_CHECK_DEATH(1) - visible_message("[src] fades out!") + visible_message(span_hierophant_warning("[src] fades out!")) density = FALSE SLEEP_CHECK_DEATH(2) forceMove(T) @@ -329,7 +329,7 @@ Difficulty: Hard animate(src, alpha = 255, time = 2, easing = EASE_IN) //fade IN SLEEP_CHECK_DEATH(1) density = TRUE - visible_message("[src] fades in!") + visible_message(span_hierophant_warning("[src] fades in!")) SLEEP_CHECK_DEATH(1) //at this point the blasts we made detonate blinking = FALSE @@ -371,14 +371,14 @@ Difficulty: Hard timeout_time-- if(timeout_time <= 0 && !did_reset) did_reset = TRUE - visible_message("\"Vixyvrmrk xs fewi...\"") + visible_message(span_hierophant_warning("\"Vixyvrmrk xs fewi...\"")) blink(spawned_beacon) adjustHealth(min((health - maxHealth) * 0.5, -250)) //heal for 50% of our missing health, minimum 10% of maximum health wander = FALSE if(health > maxHealth * 0.9) - visible_message("\"Vitemvw gsqtpixi. Stivexmrk ex qebmqyq ijjmgmirgc.\"") + visible_message(span_hierophant("\"Vitemvw gsqtpixi. Stivexmrk ex qebmqyq ijjmgmirgc.\"")) else - visible_message("\"Vitemvw gsqtpixi. Stivexmsrep ijjmgmirgc gsqtvsqmwih.\"") + visible_message(span_hierophant("\"Vitemvw gsqtpixi. Stivexmsrep ijjmgmirgc gsqtvsqmwih.\"")) /mob/living/simple_animal/hostile/megafauna/hierophant/death() if(health > 0 || stat == DEAD) @@ -386,8 +386,8 @@ Difficulty: Hard else stat = DEAD blinking = TRUE //we do a fancy animation, release a huge burst(), and leave our staff. - visible_message("\"Mrmxmexmrk wipj-hiwxvygx wiuyirgi...\"") - visible_message("[src] shrinks, releasing a massive burst of energy!") + visible_message(span_hierophant("\"Mrmxmexmrk wipj-hiwxvygx wiuyirgi...\"")) + visible_message(span_hierophant_warning("[src] shrinks, releasing a massive burst of energy!")) for(var/mob/living/L in view(7,src)) stored_nearby += L // store the people to grant the achievements to once we die hierophant_burst(null, get_turf(src), 10) @@ -402,8 +402,8 @@ Difficulty: Hard for(var/obj/item/W in L) if(!L.dropItemToGround(W)) qdel(W) - visible_message("\"[pick(kill_phrases)]\"") - visible_message("[src] annihilates [L]!","I annihilate [L], restoring my health!") + visible_message(span_hierophant_warning("\"[pick(kill_phrases)]\"")) + visible_message(span_hierophant_warning("[src] annihilates [L]!"),span_danger("I annihilate [L], restoring my health!")) adjustHealth(-L.maxHealth*0.5) L.dust() @@ -416,7 +416,7 @@ Difficulty: Hard var/targets_the_same = (new_target == target) . = ..() if(. && target && !targets_the_same) - visible_message("\"[pick(target_phrases)]\"") + visible_message(span_hierophant_warning("\"[pick(target_phrases)]\"")) /mob/living/simple_animal/hostile/megafauna/hierophant/adjustHealth(amount, updating_health = TRUE, forced = FALSE) . = ..() @@ -653,7 +653,7 @@ Difficulty: Hard if(L.client) flash_color(L.client, "#660099", 1) playsound(L,'sound/blank.ogg', 50, TRUE, -4) - to_chat(L, "You're struck by a [name]!") + to_chat(L, span_danger("You're struck by a [name]!")) var/limb_to_hit = L.get_bodypart(pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG)) var/armor = L.run_armor_check(limb_to_hit, "blunt", "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 50, "Your armor was penetrated by [src]!") L.apply_damage(damage, BURN, limb_to_hit, armor) @@ -674,7 +674,7 @@ Difficulty: Hard if(M.occupant) if(friendly_fire_check && caster && caster.faction_check_mob(M.occupant)) continue - to_chat(M.occupant, "My [M.name] is struck by a [name]!") + to_chat(M.occupant, span_danger("My [M.name] is struck by a [name]!")) playsound(M,'sound/blank.ogg', 50, TRUE, -4) M.take_damage(damage, BURN, 0, 0) @@ -696,13 +696,13 @@ Difficulty: Hard if(H.timer > world.time) return if(H.beacon == src) - to_chat(user, "I start removing my hierophant beacon...") + to_chat(user, span_notice("I start removing my hierophant beacon...")) H.timer = world.time + 51 INVOKE_ASYNC(H, TYPE_PROC_REF(/obj/item/hierophant_club, prepare_icon_update)) if(do_after(user, 50, target = src)) playsound(src,'sound/blank.ogg', 200, TRUE, -4) new /obj/effect/temp_visual/hierophant/telegraph/teleport(get_turf(src), user) - to_chat(user, "I collect [src], reattaching it to the club!") + to_chat(user, span_hierophant_warning("I collect [src], reattaching it to the club!")) H.beacon = null user.update_action_buttons_icon() qdel(src) @@ -710,6 +710,6 @@ Difficulty: Hard H.timer = world.time INVOKE_ASYNC(H, TYPE_PROC_REF(/obj/item/hierophant_club, prepare_icon_update)) else - to_chat(user, "I touch the beacon with the club, but nothing happens.") + to_chat(user, span_hierophant_warning("I touch the beacon with the club, but nothing happens.")) else return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 6a0d50642..879b427f7 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -60,21 +60,21 @@ name = "Create Legion Skull" icon_icon = 'icons/mob/lavaland/lavaland_monsters.dmi' button_icon_state = "legion_head" - chosen_message = "I are now creating legion skulls." + chosen_message = span_colossus("I are now creating legion skulls.") chosen_attack_num = 1 /datum/action/innate/megafauna_attack/charge_target name = "Charge Target" icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "sniper_zoom" - chosen_message = "I are now charging at your target." + chosen_message = span_colossus("I are now charging at your target.") chosen_attack_num = 2 /datum/action/innate/megafauna_attack/create_turrets name = "Create Sentinels" icon_icon = 'icons/mob/lavaland/lavaland_monsters.dmi' button_icon_state = "legion_turret" - chosen_message = "I are now creating legion sentinels." + chosen_message = span_colossus("I are now creating legion sentinels.") chosen_attack_num = 3 /mob/living/simple_animal/hostile/megafauna/legion/OpenFire(the_target) @@ -113,7 +113,7 @@ ///Attack proc. Gives legion some movespeed buffs and switches the AI to melee. At lower sizes, this also throws the skull at the player. /mob/living/simple_animal/hostile/megafauna/legion/proc/charge_target() - visible_message("[src] charges!") + visible_message(span_warning("[src] charges!")) SpinAnimation(speed = 20, loops = 3, parallel = FALSE) ranged = FALSE retreat_distance = 0 @@ -226,7 +226,7 @@ pixel_y = 0 maxHealth = 200 adjustHealth(0) //Make the health HUD look correct. - visible_message("This is getting out of hands. Now there are three of them!") + visible_message(span_boldannounce("This is getting out of hands. Now there are three of them!")) for(var/i in 1 to 2) //Create three skulls in total var/mob/living/simple_animal/hostile/megafauna/legion/L = new(loc) L.setVarsAfterSplit(src) @@ -262,13 +262,13 @@ /obj/item/staff/storm/attack_self(mob/user) if(storm_cooldown > world.time) - to_chat(user, "The staff is still recharging!") + to_chat(user, span_warning("The staff is still recharging!")) return var/area/user_area = get_area(user) var/turf/user_turf = get_turf(user) if(!user_area || !user_turf || (user_area.type in excluded_areas)) - to_chat(user, "Something is preventing you from using the staff here.") + to_chat(user, span_warning("Something is preventing you from using the staff here.")) return var/datum/weather/A for(var/V in SSweather.curweathers) @@ -280,10 +280,10 @@ if(A) if(A.stage != END_STAGE) if(A.stage == WIND_DOWN_STAGE) - to_chat(user, "The storm is already ending! It would be a waste to use the staff now.") + to_chat(user, span_warning("The storm is already ending! It would be a waste to use the staff now.")) return - user.visible_message("[user] holds [src] skywards as an orange beam travels into the sky!", \ - "I hold [src] skyward, dispelling the storm!") + user.visible_message(span_warning("[user] holds [src] skywards as an orange beam travels into the sky!"), \ + span_notice("I hold [src] skyward, dispelling the storm!")) playsound(user, 'sound/blank.ogg', 200, FALSE) A.wind_down() log_game("[user] ([key_name(user)]) has dispelled a storm at [AREACOORD(user_turf)]") @@ -298,8 +298,8 @@ A.telegraph_duration = 100 A.end_duration = 100 - user.visible_message("[user] holds [src] skywards as red lightning crackles into the sky!", \ - "I hold [src] skyward, calling down a terrible storm!") + user.visible_message(span_warning("[user] holds [src] skywards as red lightning crackles into the sky!"), \ + span_notice("I hold [src] skyward, calling down a terrible storm!")) playsound(user, 'sound/blank.ogg', 200, FALSE) A.telegraph() storm_cooldown = world.time + 200 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index b71beae38..69fab28ec 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -115,8 +115,8 @@ if(!L) return FALSE visible_message( - "[src] devours [L]!", - "I feast on [L], restoring your health!") + span_danger("[src] devours [L]!"), + span_danger("I feast on [L], restoring your health!")) if(!is_station_level(z) || client) //NPC monsters won't heal while on station adjustBruteLoss(-L.maxHealth/2) L.gib() diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 923674f7a..486fa5176 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -71,8 +71,8 @@ if(prob(15) && iscarbon(target)) var/mob/living/carbon/C = target C.Paralyze(40) - C.visible_message("\The [src] knocks down \the [C]!", \ - "\The [src] knocks you down!") + C.visible_message(span_danger("\The [src] knocks down \the [C]!"), \ + span_danger("\The [src] knocks you down!")) /mob/living/simple_animal/hostile/mimic/crate/proc/trigger() if(!attempt_open) @@ -181,8 +181,8 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca if(knockdown_people && . && prob(15) && iscarbon(target)) var/mob/living/carbon/C = target C.Paralyze(40) - C.visible_message("\The [src] knocks down \the [C]!", \ - "\The [src] knocks you down!") + C.visible_message(span_danger("\The [src] knocks down \the [C]!"), \ + span_danger("\The [src] knocks you down!")) /mob/living/simple_animal/hostile/mimic/copy/machine speak = list("HUMANS ARE IMPERFECT!", "YOU SHALL BE ASSIMILATED!", "YOU ARE HARMING YOURSELF", "You have been deemed hazardous. Will you comply?", \ @@ -255,7 +255,7 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca Pewgun.chambered.update_icon() ..() else - visible_message("The [src] clears a jam!") + visible_message(span_danger("The [src] clears a jam!")) Pewgun.chambered.forceMove(loc) //rip revolver immersions, blame shotgun snowflake procs Pewgun.chambered = null if(Pewgun.magazine && Pewgun.magazine.stored_ammo.len) @@ -265,7 +265,7 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca else if(Pewgun.magazine && Pewgun.magazine.stored_ammo.len) //only true for pumpguns i think Pewgun.chambered = Pewgun.magazine.get_round(0) Pewgun.chambered.forceMove(Pewgun) - visible_message("The [src] cocks itself!") + visible_message(span_danger("The [src] cocks itself!")) else ranged = 0 //BANZAIIII retreat_distance = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index 943539958..e3ab05586 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -145,7 +145,7 @@ While using this makes the system rely on OnFire, it still gives options for tim switch(activity) if(TUMOR_PASSIVE) activity = TUMOR_ACTIVE - visible_message("[src] convulses as my arm enters its radius. Your instincts tell you to step back.") + visible_message(span_boldwarning("[src] convulses as my arm enters its radius. Your instincts tell you to step back.")) activator = user if(boosted) mychild.playsound_local(get_turf(mychild), 'sound/blank.ogg', 40, 0) @@ -155,21 +155,21 @@ While using this makes the system rely on OnFire, it still gives options for tim if(TUMOR_INACTIVE) activity = TUMOR_ACTIVE var/mob/dead/observer/elitemind = null - visible_message("[src] begins to convulse. Your instincts tell you to step back.") + visible_message(span_boldwarning("[src] begins to convulse. Your instincts tell you to step back.")) activator = user if(!boosted) addtimer(CALLBACK(src, PROC_REF(spawn_elite)), 30) return - visible_message("Something within [src] stirs...") + visible_message(span_boldwarning("Something within [src] stirs...")) var/list/candidates = pollCandidatesForMob("Do you want to play as a lavaland elite?", ROLE_SENTIENCE, null, ROLE_SENTIENCE, 50, src, POLL_IGNORE_SENTIENCE_POTION) if(candidates.len) - audible_message("The stirring sounds increase in volume!") + audible_message(span_boldwarning("The stirring sounds increase in volume!")) elitemind = pick(candidates) elitemind.playsound_local(get_turf(elitemind), 'sound/blank.ogg', 40, 0) to_chat(elitemind, "I have been chosen to play as a Lavaland Elite.\nIn a few seconds, you will be summoned on Lavaland as a monster to fight my activator, in a fight to the death.\nYour attacks can be switched using the buttons on the top left of the HUD, and used by clicking on targets or tiles similar to a gun.\nWhile the opponent might have an upper hand with powerful mining equipment and tools, you have great power normally limited by AI mobs.\nIf you want to win, you'll have to use my powers in creative ways to ensure the kill. It's suggested you try using them all as soon as possible.\nShould you win, you'll receive extra information regarding what to do after. Good luck!") addtimer(CALLBACK(src, PROC_REF(spawn_elite), elitemind), 100) else - visible_message("The stirring stops, and nothing emerges. Perhaps try again later.") + visible_message(span_boldwarning("The stirring stops, and nothing emerges. Perhaps try again later.")) activity = TUMOR_INACTIVE activator = null @@ -177,7 +177,7 @@ While using this makes the system rely on OnFire, it still gives options for tim obj/structure/elite_tumor/proc/spawn_elite(var/mob/dead/observer/elitemind) var/selectedspawn = pick(potentialspawns) mychild = new selectedspawn(loc) - visible_message("[mychild] emerges from [src]!") + visible_message(span_boldwarning("[mychild] emerges from [src]!")) playsound(loc,'sound/blank.ogg', 200, 0, 50, TRUE, TRUE) if(boosted) mychild.key = elitemind.key @@ -187,7 +187,7 @@ obj/structure/elite_tumor/proc/spawn_elite(var/mob/dead/observer/elitemind) obj/structure/elite_tumor/proc/return_elite() mychild.forceMove(loc) - visible_message("[mychild] emerges from [src]!") + visible_message(span_boldwarning("[mychild] emerges from [src]!")) playsound(loc,'sound/blank.ogg', 200, 0, 50, TRUE, TRUE) mychild.revive(full_heal = TRUE, admin_revive = TRUE) if(boosted) @@ -219,7 +219,7 @@ obj/structure/elite_tumor/proc/return_elite() var/obj/item/organ/regenerative_core/core = I if(!core.preserved) return - visible_message("As [user] drops the core into [src], [src] appears to swell.") + visible_message(span_boldwarning("As [user] drops the core into [src], [src] appears to swell.")) icon_state = "advanced_tumor" boosted = TRUE light_range = 6 @@ -255,17 +255,17 @@ obj/structure/elite_tumor/proc/return_elite() /obj/structure/elite_tumor/proc/border_check() if(activator != null && get_dist(src, activator) >= 12) activator.forceMove(loc) - visible_message("[activator] suddenly reappears above [src]!") + visible_message(span_boldwarning("[activator] suddenly reappears above [src]!")) playsound(loc,'sound/blank.ogg', 200, 0, 50, TRUE, TRUE) if(mychild != null && get_dist(src, mychild) >= 12) mychild.forceMove(loc) - visible_message("[mychild] suddenly reappears above [src]!") + visible_message(span_boldwarning("[mychild] suddenly reappears above [src]!")) playsound(loc,'sound/blank.ogg', 200, 0, 50, TRUE, TRUE) obj/structure/elite_tumor/proc/onEliteLoss() playsound(loc,'sound/blank.ogg', 200, 0, 50, TRUE, TRUE) - visible_message("[src] begins to convulse violently before beginning to dissipate.") - visible_message("As [src] closes, something is forced up from down below.") + visible_message(span_boldwarning("[src] begins to convulse violently before beginning to dissipate.")) + visible_message(span_boldwarning("As [src] closes, something is forced up from down below.")) var/obj/structure/closet/crate/necropolis/tendril/lootbox = new /obj/structure/closet/crate/necropolis/tendril(loc) if(!boosted) mychild = null @@ -291,9 +291,9 @@ obj/structure/elite_tumor/proc/onEliteWon() mychild.health = mychild.maxHealth if(times_won == 1) mychild.playsound_local(get_turf(mychild), 'sound/blank.ogg', 40, 0) - to_chat(mychild, "As the life in the activator's eyes fade, the forcefield around you dies out and you feel my power subside.\nDespite this inferno being my home, you feel as if you aren't welcome here anymore.\nWithout any guidance, my purpose is now for you to decide.") + to_chat(mychild, span_boldwarning("As the life in the activator's eyes fade, the forcefield around you dies out and you feel my power subside.\nDespite this inferno being my home, you feel as if you aren't welcome here anymore.\nWithout any guidance, my purpose is now for you to decide.")) to_chat(mychild, "My max health has been halved, but can now heal by standing on my tumor. Note, it's my only way to heal.\nBear in mind, if anyone interacts with my tumor, you'll be resummoned here to carry out another fight. In such a case, you will regain my full max health.\nAlso, be weary of my fellow inhabitants, they likely won't be happy to see you!") - to_chat(mychild, "Note that you are a lavaland monster, and thus not allied to the station. You should not cooperate or act friendly with any station crew unless under extreme circumstances!") + to_chat(mychild, span_bigbold("Note that you are a lavaland monster, and thus not allied to the station. You should not cooperate or act friendly with any station crew unless under extreme circumstances!")) /obj/item/tumor_shard name = "tumor shard" @@ -313,21 +313,21 @@ obj/structure/elite_tumor/proc/onEliteWon() if(istype(target, /mob/living/simple_animal/hostile/asteroid/elite) && proximity_flag) var/mob/living/simple_animal/hostile/asteroid/elite/E = target if(E.stat != DEAD || E.sentience_type != SENTIENCE_BOSS || !E.key) - user.visible_message("It appears [E] is unable to be revived right now. Perhaps try again later.") + user.visible_message(span_notice("It appears [E] is unable to be revived right now. Perhaps try again later.")) return E.faction = list("neutral") E.revive(full_heal = TRUE, admin_revive = TRUE) - user.visible_message("[user] stabs [E] with [src], reviving it.") + user.visible_message(span_notice("[user] stabs [E] with [src], reviving it.")) E.playsound_local(get_turf(E), 'sound/blank.ogg', 40, 0) to_chat(E, "I have been revived by [user]. While you can't speak to them, you owe [user] a great debt. Assist [user.p_them()] in achieving [user.p_their()] goals, regardless of risk.Note that you now share the loyalties of [user]. You are expected not to intentionally sabotage their faction unless commanded to!") + to_chat(E, span_bigbold("Note that you now share the loyalties of [user]. You are expected not to intentionally sabotage their faction unless commanded to!")) E.maxHealth = E.maxHealth * 0.5 E.health = E.maxHealth E.desc = "" E.sentience_type = SENTIENCE_ORGANIC qdel(src) else - to_chat(user, "[src] only works on the corpse of a sentient lavaland elite.") + to_chat(user, span_info("[src] only works on the corpse of a sentient lavaland elite.")) /obj/effect/temp_visual/elite_tumor_wall name = "magic wall" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm index 25880f180..9858bfbb7 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm @@ -52,25 +52,25 @@ /datum/action/innate/elite_attack/tentacle_patch name = "Tentacle Patch" button_icon_state = "tentacle_patch" - chosen_message = "I are now attacking with a patch of tentacles." + chosen_message = span_boldwarning("I are now attacking with a patch of tentacles.") chosen_attack_num = TENTACLE_PATCH /datum/action/innate/elite_attack/spawn_children name = "Spawn Children" button_icon_state = "spawn_children" - chosen_message = "I will spawn two children at your location to assist you in combat. You can have up to 8." + chosen_message = span_boldwarning("I will spawn two children at your location to assist you in combat. You can have up to 8.") chosen_attack_num = SPAWN_CHILDREN /datum/action/innate/elite_attack/rage name = "Rage" button_icon_state = "rage" - chosen_message = "I will temporarily increase your movement speed." + chosen_message = span_boldwarning("I will temporarily increase your movement speed.") chosen_attack_num = RAGE /datum/action/innate/elite_attack/call_children name = "Call Children" button_icon_state = "call_children" - chosen_message = "I will summon your children to your location." + chosen_message = span_boldwarning("I will summon your children to your location.") chosen_attack_num = CALL_CHILDREN /mob/living/simple_animal/hostile/asteroid/elite/broodmother/OpenFire() @@ -113,26 +113,26 @@ var/tturf = get_turf(target) if(!isturf(tturf)) return - visible_message("[src] digs its tentacles under [target]!") + visible_message(span_warning("[src] digs its tentacles under [target]!")) new /obj/effect/temp_visual/goliath_tentacle/broodmother/patch(tturf, src) /mob/living/simple_animal/hostile/asteroid/elite/broodmother/proc/spawn_children(target) ranged_cooldown = world.time + 40 - visible_message("The ground churns behind [src]!") + visible_message(span_boldwarning("The ground churns behind [src]!")) for(var/i in 1 to 2) if(children_list.len >= 8) return var/mob/living/simple_animal/hostile/asteroid/elite/broodmother_child/newchild = new /mob/living/simple_animal/hostile/asteroid/elite/broodmother_child(loc) newchild.GiveTarget(target) newchild.faction = faction.Copy() - visible_message("[newchild] appears below [src]!") + visible_message(span_boldwarning("[newchild] appears below [src]!")) newchild.mother = src children_list += newchild /mob/living/simple_animal/hostile/asteroid/elite/broodmother/proc/rage() ranged_cooldown = world.time + 70 playsound(src,'sound/blank.ogg', 200, 1) - visible_message("[src] starts picking up speed!") + visible_message(span_warning("[src] starts picking up speed!")) color = "#FF0000" set_varspeed(0) move_to_delay = 3 @@ -145,7 +145,7 @@ /mob/living/simple_animal/hostile/asteroid/elite/broodmother/proc/call_children() ranged_cooldown = world.time + 60 - visible_message("The ground shakes near [src]!") + visible_message(span_warning("The ground shakes near [src]!")) var/list/directions = GLOB.cardinals.Copy() + GLOB.diagonals.Copy() for(var/mob/child in children_list) var/spawndir = pick_n_take(directions) @@ -188,14 +188,14 @@ if(!isturf(tturf)) return if(get_dist(src, target) <= 7)//Screen range check, so it can't attack people off-screen - visible_message("[src] digs one of its tentacles under [target]!") + visible_message(span_warning("[src] digs one of its tentacles under [target]!")) new /obj/effect/temp_visual/goliath_tentacle/broodmother(tturf, src) /mob/living/simple_animal/hostile/asteroid/elite/broodmother_child/death() . = ..() if(mother != null) mother.children_list -= src - visible_message("[src] explodes!") + visible_message(span_warning("[src] explodes!")) explosion(get_turf(loc),0,0,0,flame_range = 3, adminlog = FALSE) gib() @@ -205,7 +205,7 @@ for(var/mob/living/L in loc) if((!QDELETED(spawner) && spawner.faction_check_mob(L)) || L.stat == DEAD) continue - visible_message("[src] grabs hold of [L]!") + visible_message(span_danger("[src] grabs hold of [L]!")) L.Stun(10) L.adjustBruteLoss(rand(30,35)) latched = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm index e4c1d8ff4..464145246 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm @@ -66,25 +66,25 @@ /datum/action/innate/elite_attack/herald_trishot name = "Triple Shot" button_icon_state = "herald_trishot" - chosen_message = "I are now firing three shots in your chosen direction." + chosen_message = span_boldwarning("I are now firing three shots in your chosen direction.") chosen_attack_num = HERALD_TRISHOT /datum/action/innate/elite_attack/herald_directionalshot name = "Circular Shot" button_icon_state = "herald_directionalshot" - chosen_message = "I are firing projectiles in all directions." + chosen_message = span_boldwarning("I are firing projectiles in all directions.") chosen_attack_num = HERALD_DIRECTIONALSHOT /datum/action/innate/elite_attack/herald_teleshot name = "Teleport Shot" button_icon_state = "herald_teleshot" - chosen_message = "I will now fire a shot which teleports you where it lands." + chosen_message = span_boldwarning("I will now fire a shot which teleports you where it lands.") chosen_attack_num = HERALD_TELESHOT /datum/action/innate/elite_attack/herald_mirror name = "Summon Mirror" button_icon_state = "herald_mirror" - chosen_message = "I will spawn a mirror which duplicates your attacks." + chosen_message = span_boldwarning("I will spawn a mirror which duplicates your attacks.") chosen_attack_num = HERALD_MIRROR /mob/living/simple_animal/hostile/asteroid/elite/herald/OpenFire() @@ -268,7 +268,7 @@ . = ..() if(!rand(1,100) <= hit_reaction_chance) return - owner.visible_message("[owner]'s [src] emits a loud noise as [owner] is struck!") + owner.visible_message(span_danger("[owner]'s [src] emits a loud noise as [owner] is struck!")) var/static/list/directional_shot_angles = list(0, 45, 90, 135, 180, 225, 270, 315) playsound(get_turf(owner), 'sound/blank.ogg', 20, TRUE) addtimer(CALLBACK(src, PROC_REF(reactionshot), owner), 10) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm index bb16c3a91..d3c51bbbc 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm @@ -51,25 +51,25 @@ /datum/action/innate/elite_attack/legionnaire_charge name = "Legionnaire Charge" button_icon_state = "legionnaire_charge" - chosen_message = "I will attempt to grab my opponent and throw them." + chosen_message = span_boldwarning("I will attempt to grab my opponent and throw them.") chosen_attack_num = LEGIONNAIRE_CHARGE /datum/action/innate/elite_attack/head_detach name = "Release Head" button_icon_state = "head_detach" - chosen_message = "I will now detach my head or kill it if it is already released." + chosen_message = span_boldwarning("I will now detach my head or kill it if it is already released.") chosen_attack_num = HEAD_DETACH /datum/action/innate/elite_attack/bonfire_teleport name = "Bonfire Teleport" button_icon_state = "bonfire_teleport" - chosen_message = "I will leave a bonfire. Second use will let you swap positions with it indefintiely. Using this move on the same tile as my active bonfire removes it." + chosen_message = span_boldwarning("I will leave a bonfire. Second use will let you swap positions with it indefintiely. Using this move on the same tile as my active bonfire removes it.") chosen_attack_num = BONFIRE_TELEPORT /datum/action/innate/elite_attack/spew_smoke name = "Spew Smoke" button_icon_state = "spew_smoke" - chosen_message = "My head will spew smoke in an area, wherever it may be." + chosen_message = span_boldwarning("My head will spew smoke in an area, wherever it may be.") chosen_attack_num = SPEW_SMOKE /mob/living/simple_animal/hostile/asteroid/elite/legionnaire/OpenFire() @@ -103,7 +103,7 @@ new /obj/effect/temp_visual/dragon_swoop/legionnaire(T) T = get_step(T, dir_to_target) playsound(src,'sound/blank.ogg', 200, 1) - visible_message("[src] prepares to charge!") + visible_message(span_boldwarning("[src] prepares to charge!")) addtimer(CALLBACK(src, PROC_REF(legionnaire_charge_2), dir_to_target, 0), 5) /mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/legionnaire_charge_2(move_dir, times_ran) @@ -127,8 +127,8 @@ if(faction_check_mob(L)) return hit_things += L - visible_message("[src] attacks [L] with much force!") - to_chat(L, "[src] grabs you and throws you with much force!") + visible_message(span_boldwarning("[src] attacks [L] with much force!")) + to_chat(L, span_danger("[src] grabs you and throws you with much force!")) L.safe_throw_at(throwtarget, 10, 1, src) L.Paralyze(20) L.adjustBruteLoss(50) @@ -144,7 +144,7 @@ icon_state = "legionnaire_headless" icon_living = "legionnaire_headless" icon_aggro = "legionnaire_headless" - visible_message("[src]'s head flies off!") + visible_message(span_boldwarning("[src]'s head flies off!")) var/mob/living/simple_animal/hostile/asteroid/elite/legionnairehead/newhead = new /mob/living/simple_animal/hostile/asteroid/elite/legionnairehead(loc) newhead.flags_1 |= (flags_1 & ADMIN_SPAWNED_1) newhead.GiveTarget(target) @@ -169,7 +169,7 @@ icon_state = "legionnaire" icon_living = "legionnaire" icon_aggro = "legionnaire" - visible_message("The top of [src]'s spine leaks a black liquid, forming into a skull!") + visible_message(span_boldwarning("The top of [src]'s spine leaks a black liquid, forming into a skull!")) /mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/bonfire_teleport() ranged_cooldown = world.time + 5 @@ -178,7 +178,7 @@ mypile = newpile mypile.myowner = src playsound(get_turf(src),'sound/blank.ogg', 200, 1) - visible_message("[src] summons a bonfire on [get_turf(src)]!") + visible_message(span_boldwarning("[src] summons a bonfire on [get_turf(src)]!")) return else var/turf/legionturf = get_turf(src) @@ -189,9 +189,9 @@ return playsound(pileturf,'sound/blank.ogg', 200, 1) playsound(legionturf,'sound/blank.ogg', 200, 1) - visible_message("[src] melts down into a burning pile of bones!") + visible_message(span_boldwarning("[src] melts down into a burning pile of bones!")) forceMove(pileturf) - visible_message("[src] forms from the bonfire!") + visible_message(span_boldwarning("[src] forms from the bonfire!")) mypile.forceMove(legionturf) /mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/spew_smoke() @@ -202,11 +202,11 @@ else T = get_turf(src) if(myhead != null) - myhead.visible_message("[myhead] spews smoke from its maw!") + myhead.visible_message(span_boldwarning("[myhead] spews smoke from its maw!")) else if(!has_head) - visible_message("[src] spews smoke from the tip of their spine!") + visible_message(span_boldwarning("[src] spews smoke from the tip of their spine!")) else - visible_message("[src] spews smoke from its maw!") + visible_message(span_boldwarning("[src] spews smoke from its maw!")) var/datum/effect_system/smoke_spread/smoke = new smoke.set_up(2, T) smoke.start() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm index 782d9dacc..28293f782 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm @@ -50,25 +50,25 @@ /datum/action/innate/elite_attack/singular_shot name = "Singular Shot" button_icon_state = "singular_shot" - chosen_message = "I are now creating a single linear magic square." + chosen_message = span_boldwarning("I are now creating a single linear magic square.") chosen_attack_num = SINGULAR_SHOT /datum/action/innate/elite_attack/magic_box name = "Magic Box" button_icon_state = "magic_box" - chosen_message = "I are now attacking with a box of magic squares." + chosen_message = span_boldwarning("I are now attacking with a box of magic squares.") chosen_attack_num = MAGIC_BOX /datum/action/innate/elite_attack/pandora_teleport name = "Line Teleport" button_icon_state = "pandora_teleport" - chosen_message = "I will now teleport to my target." + chosen_message = span_boldwarning("I will now teleport to my target.") chosen_attack_num = PANDORA_TELEPORT /datum/action/innate/elite_attack/aoe_squares name = "AOE Blast" button_icon_state = "aoe_squares" - chosen_message = "My attacks will spawn an AOE blast at my target location." + chosen_message = span_boldwarning("My attacks will spawn an AOE blast at my target location.") chosen_attack_num = AOE_SQUARES /mob/living/simple_animal/hostile/asteroid/elite/pandora/OpenFire() @@ -143,7 +143,7 @@ for(var/t in RANGE_TURFS(1, source)) new /obj/effect/temp_visual/hierophant/blast/pandora(t, src) animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out - visible_message("[src] fades out!") + visible_message(span_hierophant_warning("[src] fades out!")) density = FALSE addtimer(CALLBACK(src, PROC_REF(pandora_teleport_3), T), 2) @@ -151,7 +151,7 @@ forceMove(T) animate(src, alpha = 255, time = 2, easing = EASE_IN) //fade IN density = TRUE - visible_message("[src] fades in!") + visible_message(span_hierophant_warning("[src] fades in!")) /mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/aoe_squares(target) ranged_cooldown = world.time + cooldown_time diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm index 90448e245..9db6ae5f3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm @@ -45,10 +45,10 @@ target = new_target if(target != null) if(istype(target, /obj/item/stack/ore) && loot.len < 10) - visible_message("The [name] looks at [target.name] with hungry eyes.") + visible_message(span_notice("The [name] looks at [target.name] with hungry eyes.")) else if(isliving(target)) Aggro() - visible_message("The [name] tries to flee from [target.name]!") + visible_message(span_danger("The [name] tries to flee from [target.name]!")) retreat_distance = 10 minimum_distance = 10 if(will_burrow) @@ -67,15 +67,15 @@ for(var/i in 1 to using) loot += O.type O.use(using) - visible_message("The ore was swallowed whole!") + visible_message(span_notice("The ore was swallowed whole!")) /mob/living/simple_animal/hostile/asteroid/goldgrub/proc/Burrow()//Begin the chase to kill the goldgrub in time if(!stat) - visible_message("The [name] buries into the ground, vanishing from sight!") + visible_message(span_danger("The [name] buries into the ground, vanishing from sight!")) qdel(src) /mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(obj/projectile/P) - visible_message("The [P.name] was repelled by [name]'s girth!") + visible_message(span_danger("The [P.name] was repelled by [name]'s girth!")) return BULLET_ACT_BLOCK /mob/living/simple_animal/hostile/asteroid/goldgrub/adjustHealth(amount, updating_health = TRUE, forced = FALSE) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm index e9dd0d6aa..0de7d49a9 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -65,7 +65,7 @@ if(!isturf(tturf)) return if(get_dist(src, target) <= 7)//Screen range check, so you can't get tentacle'd offscreen - visible_message("[src] digs its tentacles under [target]!") + visible_message(span_warning("[src] digs its tentacles under [target]!")) new /obj/effect/temp_visual/goliath_tentacle/original(tturf, src) ranged_cooldown = world.time + ranged_cooldown_time icon_state = icon_aggro @@ -188,7 +188,7 @@ for(var/mob/living/L in loc) if((!QDELETED(spawner) && spawner.faction_check_mob(L)) || L.stat == DEAD) continue - visible_message("[src] grabs hold of [L]!") + visible_message(span_danger("[src] grabs hold of [L]!")) L.Stun(100) L.adjustBruteLoss(rand(10,15)) latched = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm index 3095b6a95..0af0239b4 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm @@ -93,7 +93,7 @@ if(is_type_in_typecache(target,wanted_objects)) //we eats udder.generateMilk() regenerate_icons() - visible_message("[src] slurps up [target].") + visible_message(span_notice("[src] slurps up [target].")) qdel(target) return ..() @@ -153,7 +153,7 @@ L.faction = faction L.setDir(dir) L.Stun(20, ignore_canstun = TRUE) - visible_message("[src] grows up into [L].") + visible_message(span_notice("[src] grows up into [L].")) Destroy() //Gutlunch udder diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 8c1d0d9f0..12bbd3264 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -142,7 +142,7 @@ dwarf_mob = TRUE /mob/living/simple_animal/hostile/asteroid/hivelord/legion/death(gibbed) - visible_message("The skulls on [src] wail in anger as they flee from their dying host!") + visible_message(span_warning("The skulls on [src] wail in anger as they flee from their dying host!")) var/turf/T = get_turf(src) if(T) if(stored_mob) @@ -195,13 +195,13 @@ ..() /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H) - visible_message("[name] burrows into the flesh of [H]!") + visible_message(span_warning("[name] burrows into the flesh of [H]!")) var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L if(H.dna.check_mutation(DWARFISM)) //dwarf legions aren't just fluff! L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(H.loc) else L = new(H.loc) - visible_message("[L] staggers to [L.p_their()] feet!") + visible_message(span_warning("[L] staggers to [L.p_their()] feet!")) H.death() H.adjustBruteLoss(1000) L.stored_mob = H diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm index 48bea8895..4941fba68 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm @@ -41,7 +41,7 @@ Aggro() if(P.damage < 30 && P.damage_type != BRUTE) P.damage = (P.damage / 3) - visible_message("[P] has a reduced effect on [src]!") + visible_message(span_danger("[P] has a reduced effect on [src]!")) ..() /mob/living/simple_animal/hostile/asteroid/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum, d_type = "blunt") //No floor tiling them to death, wiseguy @@ -50,7 +50,7 @@ if(!stat) Aggro() if(T.throwforce <= 20) - visible_message("The [T.name] [throw_message] [src.name]!") + visible_message(span_notice("The [T.name] [throw_message] [src.name]!")) return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 2a448af95..9ff5ce768 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -44,9 +44,9 @@ /mob/living/simple_animal/hostile/mushroom/examine(mob/user) . = ..() if(health >= maxHealth) - . += "It looks healthy." + . += span_info("It looks healthy.") else - . += "It looks like it's been roughed up." + . += span_info("It looks like it's been roughed up.") /mob/living/simple_animal/hostile/mushroom/Life() ..() @@ -98,10 +98,10 @@ if(istype(L, /mob/living/simple_animal/hostile/mushroom) && stat == DEAD) var/mob/living/simple_animal/hostile/mushroom/M = L if(faint_ticker < 2) - M.visible_message("[M] chews a bit on [src].") + M.visible_message(span_notice("[M] chews a bit on [src].")) faint_ticker++ return TRUE - M.visible_message("[M] devours [src]!") + M.visible_message(span_warning("[M] devours [src]!")) var/level_gain = (powerlevel - M.powerlevel) if(level_gain >= -1 && !bruised && !M.ckey)//Player shrooms can't level up to become robust gods. if(level_gain < 1)//So we still gain a level if two mushrooms were the same level @@ -132,7 +132,7 @@ add_overlay(cap_living) /mob/living/simple_animal/hostile/mushroom/proc/Recover() - visible_message("[src] slowly begins to recover.") + visible_message(span_notice("[src] slowly begins to recover.")) faint_ticker = 0 revive(full_heal = TRUE, admin_revive = FALSE) UpdateMushroomCap() @@ -154,7 +154,7 @@ /mob/living/simple_animal/hostile/mushroom/proc/Bruise() if(!bruised && !stat) - src.visible_message("The [src.name] was bruised!") + src.visible_message(span_notice("The [src.name] was bruised!")) bruised = 1 /mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I, mob/user, params) @@ -163,7 +163,7 @@ Recover() qdel(I) else - to_chat(user, "[src] won't eat it!") + to_chat(user, span_warning("[src] won't eat it!")) return if(I.force) Bruise() diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm index 297a24e19..fbc12b859 100644 --- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm +++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm @@ -92,10 +92,10 @@ /obj/structure/spawner/nether/attack_hand(mob/user) . = ..() if(isskeleton(user) || iszombie(user)) - to_chat(user, "I don't feel like going home yet...") + to_chat(user, span_notice("I don't feel like going home yet...")) else - user.visible_message("[user] is violently pulled into the link!", \ - "Touching the portal, you are quickly pulled through into a world of unimaginable horror!") + user.visible_message(span_warning("[user] is violently pulled into the link!"), \ + span_danger("Touching the portal, you are quickly pulled through into a world of unimaginable horror!")) contents.Add(user) /obj/structure/spawner/nether/process() @@ -109,5 +109,5 @@ blank = new(loc) blank.name = "[M]" blank.desc = "" - src.visible_message("[M] reemerges from the link!") + src.visible_message(span_warning("[M] reemerges from the link!")) qdel(M) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm index 36c7341b1..22997541d 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm @@ -50,11 +50,11 @@ set name = "Move Up" if(zMove(UP, TRUE)) - to_chat(src, "I fly upwards.") + to_chat(src, span_notice("I fly upwards.")) /mob/living/simple_animal/hostile/retaliate/bat/proc/bat_down() set category = "Bat Form" set name = "Move Down" if(zMove(DOWN, TRUE)) - to_chat(src, "I fly down.") + to_chat(src, span_notice("I fly down.")) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm index ce25ca56e..b089b3794 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm @@ -7,7 +7,7 @@ if(enemies.len) if(tame) enemies = list() - src.visible_message("[src] calms down.") + src.visible_message(span_notice("[src] calms down.")) LoseTarget() /mob/living/simple_animal/hostile/retaliate diff --git a/code/modules/mob/living/simple_animal/hostile/roguetown/crow.dm b/code/modules/mob/living/simple_animal/hostile/roguetown/crow.dm index d600c5f8d..0f3476714 100644 --- a/code/modules/mob/living/simple_animal/hostile/roguetown/crow.dm +++ b/code/modules/mob/living/simple_animal/hostile/roguetown/crow.dm @@ -64,7 +64,7 @@ ..() else if(isturf(loc)) - to_chat(user, "I fail to snatch [src]!") + to_chat(user, span_warning("I fail to snatch [src]!")) playsound(src, 'sound/vo/mobs/bird/birdfly.ogg', 100, TRUE, -1) qdel(src) return @@ -103,7 +103,7 @@ if(prob(L.STASPD * 2)) ..() else - to_chat(user, "[src] gets away!") + to_chat(user, span_warning("[src] gets away!")) playsound(src, 'sound/vo/mobs/bird/birdfly.ogg', 100, TRUE, -1) qdel(src) return diff --git a/code/modules/mob/living/simple_animal/hostile/roguetown/haunt.dm b/code/modules/mob/living/simple_animal/hostile/roguetown/haunt.dm index ddb861d51..08d853e6f 100644 --- a/code/modules/mob/living/simple_animal/hostile/roguetown/haunt.dm +++ b/code/modules/mob/living/simple_animal/hostile/roguetown/haunt.dm @@ -223,8 +223,8 @@ if(. && prob(8) && iscarbon(target)) var/mob/living/carbon/C = target C.Immobilize(50) - C.visible_message("\The [src] paralyzes \the [C] in fear!", \ - "\The [src] paralyzes me!") + C.visible_message(span_danger("\The [src] paralyzes \the [C] in fear!"), \ + span_danger("\The [src] paralyzes me!")) emote("laugh") /datum/intent/simple/slash diff --git a/code/modules/mob/living/simple_animal/hostile/roguetown/smallrat.dm b/code/modules/mob/living/simple_animal/hostile/roguetown/smallrat.dm index c67bb3941..b4781be58 100644 --- a/code/modules/mob/living/simple_animal/hostile/roguetown/smallrat.dm +++ b/code/modules/mob/living/simple_animal/hostile/roguetown/smallrat.dm @@ -20,12 +20,12 @@ if(loc == user) if(user.mind && user.mind.has_antag_datum(/datum/antagonist/vampirelord)) if(dead) - to_chat(user, "It's dead.") + to_chat(user, span_warning("It's dead.")) return var/datum/antagonist/vampirelord/VD = user.mind.has_antag_datum(/datum/antagonist/vampirelord) if(do_after(user, 30, target = src)) - user.visible_message("[user] drinks from [src]!",\ - "I drink from [src]!") + user.visible_message(span_warning("[user] drinks from [src]!"),\ + span_warning("I drink from [src]!")) playsound(user.loc, 'sound/misc/drink_blood.ogg', 100, FALSE, -4) VD.handle_vitae(50) dead = TRUE @@ -97,7 +97,7 @@ else dir = pick(GLOB.cardinals) step(src, dir) - to_chat(user, "I fail to snatch it by the tail!") + to_chat(user, span_warning("I fail to snatch it by the tail!")) playsound(src, pick('sound/vo/mobs/rat/rat_life.ogg','sound/vo/mobs/rat/rat_life2.ogg','sound/vo/mobs/rat/rat_life3.ogg'), 100, TRUE, -1) return ..() @@ -145,7 +145,7 @@ if(isturf(loc)) dir = pick(GLOB.cardinals) step(src, dir) - to_chat(user, "The vermin dodges my attack.") + to_chat(user, span_warning("The vermin dodges my attack.")) playsound(src, pick('sound/vo/mobs/rat/rat_life.ogg','sound/vo/mobs/rat/rat_life2.ogg','sound/vo/mobs/rat/rat_life3.ogg'), 100, TRUE, -1) return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index bb7b9396f..68ca242bf 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -78,7 +78,7 @@ /mob/living/simple_animal/hostile/statue/Move(turf/NewLoc) if(can_be_seen(NewLoc)) if(client) - to_chat(src, "I cannot move, there are eyes on you!") + to_chat(src, span_warning("I cannot move, there are eyes on you!")) return 0 return ..() @@ -96,7 +96,7 @@ /mob/living/simple_animal/hostile/statue/AttackingTarget() if(can_be_seen(get_turf(loc))) if(client) - to_chat(src, "I cannot attack, there are eyes on you!") + to_chat(src, span_warning("I cannot attack, there are eyes on you!")) return FALSE else return ..() @@ -185,7 +185,7 @@ name = "Blindness" desc = "" - message = "I glare your eyes." + message = span_notice("I glare your eyes.") charge_max = 600 clothes_req = 0 range = 10 @@ -205,7 +205,7 @@ charge_max = 10 clothes_req = 0 - message = "I toggle your night vision!" + message = span_notice("I toggle your night vision!") range = -1 include_user = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index d0bb3b818..9454cca71 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -132,7 +132,7 @@ /mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/projectile/Proj) if(prob(projectile_deflect_chance)) - visible_message("[src] blocks [Proj] with its shield!") + visible_message(span_danger("[src] blocks [Proj] with its shield!")) return BULLET_ACT_BLOCK return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index b04786944..6f9ff0062 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -59,8 +59,8 @@ var/mob/living/carbon/C = target if(prob(15)) C.Paralyze(60) - C.visible_message("\The [src] knocks down \the [C]!", \ - "\The [src] knocks you down!") + C.visible_message(span_danger("\The [src] knocks down \the [C]!"), \ + span_danger("\The [src] knocks you down!")) /mob/living/simple_animal/hostile/tree/festivus name = "festivus pole" diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index 44b7a9df9..3e8836b72 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -26,7 +26,7 @@ addtimer(CALLBACK(src, PROC_REF(bear_fruit)), growth_time) /obj/structure/alien/resin/flower_bud_enemy/proc/bear_fruit() - visible_message("the plant has borne fruit!") + visible_message(span_danger("the plant has borne fruit!")) new /mob/living/simple_animal/hostile/venus_human_trap(get_turf(src)) qdel(src) @@ -42,7 +42,7 @@ var/mob/living/L = AM if(!("vines" in L.faction)) L.adjustBruteLoss(5) - to_chat(L, "I cut myself on the thorny vines.") + to_chat(L, span_alert("I cut myself on the thorny vines.")) @@ -111,7 +111,7 @@ if(O.density) continue grasping if(prob(grasp_chance)) - to_chat(L, "\The [src] has you entangled!") + to_chat(L, span_danger("\The [src] has you entangled!")) grasping[L] = Beam(L, "vine", time=INFINITY, maxdistance=5, beam_type=/obj/effect/ebeam/vine) tethers += list(L.AddComponent(/datum/component/tether, src, grasp_range+1, /obj/effect/ebeam/vine), AddComponent(/datum/component/tether, L, grasp_range+1, /obj/effect/ebeam/vine)) break //only take 1 new victim per cycle diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm index 8f388f9a3..dd4196958 100644 --- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -72,13 +72,13 @@ /datum/action/innate/fugu/expand/Activate() var/mob/living/simple_animal/hostile/asteroid/fugu/F = owner if(F.wumbo) - to_chat(F, "YOU'RE ALREADY WUMBO!") + to_chat(F, span_warning("YOU'RE ALREADY WUMBO!")) return if(F.inflate_cooldown) - to_chat(F, "I need time to gather your strength!") + to_chat(F, span_warning("I need time to gather your strength!")) return if(F.buffed) - to_chat(F, "Something is interfering with your growth!") + to_chat(F, span_warning("Something is interfering with your growth!")) return F.wumbo = 1 F.icon_state = "Fugu1" @@ -132,7 +132,7 @@ if(proximity_flag && isanimal(target)) var/mob/living/simple_animal/A = target if(A.buffed || (A.type in banned_mobs) || A.stat) - to_chat(user, "Something's interfering with [src]'s effects. It's no use.") + to_chat(user, span_warning("Something's interfering with [src]'s effects. It's no use.")) return A.buffed++ A.maxHealth *= 1.5 @@ -141,5 +141,5 @@ A.melee_damage_upper = max((A.melee_damage_upper * 2), 10) A.transform *= 2 A.environment_smash |= ENVIRONMENT_SMASH_STRUCTURES | ENVIRONMENT_SMASH_RWALLS - to_chat(user, "I increase the size of [A], giving it a surge of strength!") + to_chat(user, span_info("I increase the size of [A], giving it a surge of strength!")) qdel(src) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 62beb7635..f48324697 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -206,7 +206,7 @@ switch(remove_from) if("ears") if(!ears) - to_chat(usr, "There is nothing to remove from its [remove_from]!") + to_chat(usr, span_warning("There is nothing to remove from its [remove_from]!")) return if(!stat) say("[available_channels.len ? "[pick(available_channels)] " : null]BAWWWWWK LEAVE THE HEADSET BAWKKKKK!") @@ -220,12 +220,12 @@ else if(href_list["add_inv"]) var/add_to = href_list["add_inv"] if(!usr.get_active_held_item()) - to_chat(usr, "I have nothing in your hand to put on its [add_to]!") + to_chat(usr, span_warning("I have nothing in your hand to put on its [add_to]!")) return switch(add_to) if("ears") if(ears) - to_chat(usr, "It's already wearing something!") + to_chat(usr, span_warning("It's already wearing something!")) return else var/obj/item/item_to_add = usr.get_active_held_item() @@ -233,7 +233,7 @@ return if( !istype(item_to_add, /obj/item/radio/headset) ) - to_chat(usr, "This object won't fit!") + to_chat(usr, span_warning("This object won't fit!")) return var/obj/item/radio/headset/headset_to_add = item_to_add @@ -241,7 +241,7 @@ if(!usr.transferItemToLoc(headset_to_add, src)) return ears = headset_to_add - to_chat(usr, "I fit the headset onto [src].") + to_chat(usr, span_notice("I fit the headset onto [src].")) clearlist(available_channels) for(var/ch in headset_to_add.channels) @@ -336,7 +336,7 @@ adjustBruteLoss(-10) speak_chance *= 1.27 // 20 crackers to go from 1% to 100% speech_shuffle_rate += 10 - to_chat(user, "[src] eagerly devours the cracker.") + to_chat(user, span_notice("[src] eagerly devours the cracker.")) ..() return @@ -503,7 +503,7 @@ if(!parrot_perch || parrot_interest.loc != parrot_perch.loc) held_item = parrot_interest parrot_interest.forceMove(src) - visible_message("[src] grabs [held_item]!", "I grab [held_item]!", "I hear the sounds of wings flapping furiously.") + visible_message(span_notice("[src] grabs [held_item]!"), span_notice("I grab [held_item]!"), span_hear("I hear the sounds of wings flapping furiously.")) parrot_interest = null parrot_state = PARROT_SWOOP | PARROT_RETURN @@ -683,7 +683,7 @@ return -1 if(held_item) - to_chat(src, "I are already holding [held_item]!") + to_chat(src, span_warning("I are already holding [held_item]!")) return 1 for(var/obj/item/I in view(1,src)) @@ -696,10 +696,10 @@ held_item = I I.forceMove(src) - visible_message("[src] grabs [held_item]!", "I grab [held_item]!", "I hear the sounds of wings flapping furiously.") + visible_message(span_notice("[src] grabs [held_item]!"), span_notice("I grab [held_item]!"), span_hear("I hear the sounds of wings flapping furiously.")) return held_item - to_chat(src, "There is nothing of interest to take!") + to_chat(src, span_warning("There is nothing of interest to take!")) return 0 /mob/living/simple_animal/parrot/proc/steal_from_mob() @@ -711,7 +711,7 @@ return -1 if(held_item) - to_chat(src, "I are already holding [held_item]!") + to_chat(src, span_warning("I are already holding [held_item]!")) return 1 var/obj/item/stolen_item = null @@ -725,10 +725,10 @@ if(stolen_item) C.transferItemToLoc(stolen_item, src, TRUE) held_item = stolen_item - visible_message("[src] grabs [held_item] out of [C]'s hand!", "I snag [held_item] out of [C]'s hand!", "I hear the sounds of wings flapping furiously.") + visible_message(span_notice("[src] grabs [held_item] out of [C]'s hand!"), span_notice("I snag [held_item] out of [C]'s hand!"), span_hear("I hear the sounds of wings flapping furiously.")) return held_item - to_chat(src, "There is nothing of interest to take!") + to_chat(src, span_warning("There is nothing of interest to take!")) return 0 /mob/living/simple_animal/parrot/verb/drop_held_item_player() @@ -753,7 +753,7 @@ if(!held_item) if(src == usr) //So that other mobs wont make this message appear when they're bludgeoning you. - to_chat(src, "I have nothing to drop!") + to_chat(src, span_warning("I have nothing to drop!")) return 0 @@ -772,11 +772,11 @@ var/obj/item/grenade/G = held_item G.forceMove(drop_location()) G.prime() - to_chat(src, "I let go of [held_item]!") + to_chat(src, span_danger("I let go of [held_item]!")) held_item = null return 1 - to_chat(src, "I drop [held_item].") + to_chat(src, span_notice("I drop [held_item].")) held_item.forceMove(drop_location()) held_item = null @@ -798,7 +798,7 @@ icon_state = icon_sit parrot_state = PARROT_PERCH return - to_chat(src, "There is no perch nearby to sit on!") + to_chat(src, span_warning("There is no perch nearby to sit on!")) return /mob/living/simple_animal/parrot/Moved(oldLoc, dir) @@ -823,12 +823,12 @@ continue perch_on_human(H) return - to_chat(src, "There is nobody nearby that you can sit on!") + to_chat(src, span_warning("There is nobody nearby that you can sit on!")) else icon_state = icon_living parrot_state = PARROT_WANDER if(buckled) - to_chat(src, "I are no longer sitting on [buckled]'s shoulder.") + to_chat(src, span_notice("I are no longer sitting on [buckled]'s shoulder.")) buckled.unbuckle_mob(src, TRUE) buckled = null pixel_x = initial(pixel_x) @@ -845,7 +845,7 @@ pixel_x = pick(-8,8) //pick left or right shoulder icon_state = icon_sit parrot_state = PARROT_PERCH - to_chat(src, "I sit on [H]'s shoulder.") + to_chat(src, span_notice("I sit on [H]'s shoulder.")) /mob/living/simple_animal/parrot/proc/toggle_mode() @@ -862,7 +862,7 @@ else melee_damage_upper = parrot_damage_upper a_intent = INTENT_HARM - to_chat(src, "I will now [a_intent] others.") + to_chat(src, span_notice("I will now [a_intent] others.")) return /* @@ -994,4 +994,4 @@ forceMove(H) H.ForceContractDisease(P) parrot_interest = null - H.visible_message("[src] dive bombs into [H]'s chest and vanishes!", "[src] dive bombs into your chest, vanishing! This can't be good!") + H.visible_message(span_danger("[src] dive bombs into [H]'s chest and vanishes!"), span_danger("[src] dive bombs into your chest, vanishing! This can't be good!")) diff --git a/code/modules/mob/living/simple_animal/rogue/creacher/honeyspider.dm b/code/modules/mob/living/simple_animal/rogue/creacher/honeyspider.dm index b91c0993e..48a37acb7 100644 --- a/code/modules/mob/living/simple_animal/rogue/creacher/honeyspider.dm +++ b/code/modules/mob/living/simple_animal/rogue/creacher/honeyspider.dm @@ -108,7 +108,7 @@ if(!target) if(production >= 100) production = 0 - visible_message("[src] creates some honey.") + visible_message(span_alertalien("[src] creates some honey.")) var/turf/T = get_turf(src) playsound(T, pick('sound/vo/mobs/spider/speak (1).ogg','sound/vo/mobs/spider/speak (2).ogg','sound/vo/mobs/spider/speak (3).ogg','sound/vo/mobs/spider/speak (4).ogg'), 100, TRUE, -1) new /obj/item/reagent_containers/food/snacks/rogue/honey(T) diff --git a/code/modules/mob/living/simple_animal/rogue/farm/chicken.dm b/code/modules/mob/living/simple_animal/rogue/farm/chicken.dm index c8aec32db..ffbdbf103 100644 --- a/code/modules/mob/living/simple_animal/rogue/farm/chicken.dm +++ b/code/modules/mob/living/simple_animal/rogue/farm/chicken.dm @@ -110,7 +110,7 @@ if(!stat && (production > 29) && egg_type && isturf(loc) && !enemies.len) testing("laying egg with [production] production") if(locate(/obj/structure/fluff/nest) in loc) - visible_message("[src] [pick(layMessage)]") + visible_message(span_alertalien("[src] [pick(layMessage)]")) production = max(production - 30, 0) var/obj/item/reagent_containers/food/snacks/egg/E = new egg_type(get_turf(src)) E.pixel_x = rand(-6,6) @@ -130,13 +130,13 @@ if(CH) qdel(CH) new /obj/structure/fluff/nest(loc) - visible_message("[src] builds a nest.") + visible_message(span_notice("[src] builds a nest.")) else CH = locate(/obj/item/grown/log/tree/stick) in loc if(CH) qdel(CH) new /obj/structure/fluff/nest(loc) - visible_message("[src] builds a nest.") + visible_message(span_notice("[src] builds a nest.")) //if cant find, look for chaff in view and move to it var/list/foundchaff = list() for(var/obj/item/natural/fibers/C in oview(src)) diff --git a/code/modules/mob/living/simple_animal/rogue/farm/cow.dm b/code/modules/mob/living/simple_animal/rogue/farm/cow.dm index d78a5cddd..382306163 100644 --- a/code/modules/mob/living/simple_animal/rogue/farm/cow.dm +++ b/code/modules/mob/living/simple_animal/rogue/farm/cow.dm @@ -122,9 +122,9 @@ /mob/living/simple_animal/hostile/retaliate/rogue/cow/attack_hand(mob/living/carbon/M) if(!stat && M.used_intent.type == INTENT_DISARM && icon_state != icon_dead && !has_buckled_mobs()) - M.visible_message("[M] tips over [src].", - "I tip over [src].") - to_chat(src, "I am tipped over by [M]!") + M.visible_message(span_warning("[M] tips over [src]."), + span_notice("I tip over [src].")) + to_chat(src, span_danger("I am tipped over by [M]!")) Paralyze(60, ignore_canstun = TRUE) icon_state = "[initial(icon_state)]_tip" spawn(60) diff --git a/code/modules/mob/living/simple_animal/rogue/rogueanimals.dm b/code/modules/mob/living/simple_animal/rogue/rogueanimals.dm index fd51830c2..8b3bb0e66 100644 --- a/code/modules/mob/living/simple_animal/rogue/rogueanimals.dm +++ b/code/modules/mob/living/simple_animal/rogue/rogueanimals.dm @@ -120,7 +120,7 @@ if(attack_sound) playsound(src, pick(attack_sound), 100, TRUE, -1) face_atom(C) - src.visible_message("[src] starts to rip apart [C]!") + src.visible_message(span_danger("[src] starts to rip apart [C]!")) if(do_after(src,100, target = L)) var/obj/item/bodypart/limb var/list/limb_list = list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) @@ -141,7 +141,7 @@ else if(attack_sound) playsound(src, pick(attack_sound), 100, TRUE, -1) - src.visible_message("[src] starts to rip apart [L]!") + src.visible_message(span_danger("[src] starts to rip apart [L]!")) if(do_after(src,100, target = L)) L.gib() return TRUE @@ -170,7 +170,7 @@ if(enemies.len) if(prob(23)) enemies = list() - src.visible_message("[src] calms down.") + src.visible_message(span_notice("[src] calms down.")) LoseTarget() else return @@ -191,7 +191,7 @@ if(mob_timers["aggro_time"]) if(world.time > mob_timers["aggro_time"] + 30 SECONDS) enemies = list() - src.visible_message("[src] calms down.") + src.visible_message(span_info("[src] calms down.")) LoseTarget() else mob_timers["aggro_time"] = world.time @@ -223,7 +223,7 @@ /mob/living/simple_animal/hostile/retaliate/rogue/Retaliate() // if(!enemies.len && message) -// src.visible_message("[src] panics!") +// src.visible_message(span_warning("[src] panics!")) // if(flee) // retreat_distance = 10 // minimum_distance = 10 diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 2ccf7ac9a..55a119d70 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -52,10 +52,10 @@ if(health < maxHealth) adjustHealth(-25) Beam(M,icon_state="sendbeam",time=4) - M.visible_message("[M] heals \the [src].", \ - "I heal [src], leaving [src] at [health]/[maxHealth] health.") + M.visible_message(span_danger("[M] heals \the [src]."), \ + span_cult("I heal [src], leaving [src] at [health]/[maxHealth] health.")) else - to_chat(M, "I cannot heal [src], as [p_theyre()] unharmed!") + to_chat(M, span_cult("I cannot heal [src], as [p_theyre()] unharmed!")) else if(src != M) return ..() diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index dd7ae72dc..c909f07e3 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -210,7 +210,7 @@ GLOBAL_VAR_INIT(farm_animals, FALSE) return else if(!stat) - user.visible_message("[user] hand-feeds [O] to [src].", "I hand-feed [O] to [src].") + user.visible_message(span_info("[user] hand-feeds [O] to [src]."), span_notice("I hand-feed [O] to [src].")) playsound(loc,'sound/misc/eat.ogg', rand(30,60), TRUE) qdel(O) food = min(food + 30, 100) @@ -235,7 +235,7 @@ GLOBAL_VAR_INIT(farm_animals, FALSE) //mob/living/simple_animal/examine(mob/user) // . = ..() // if(stat == DEAD) -// . += "Upon closer examination, [p_they()] appear[p_s()] to be dead." +// . += span_deadsay("Upon closer examination, [p_they()] appear[p_s()] to be dead.") /mob/living/simple_animal/updatehealth() ..() @@ -590,19 +590,19 @@ mob/living/simple_animal/handle_fire() var/turf/target = get_turf(loc) if(target) return new childspawn(target) -// visible_message("[src] finally gives birth.") +// visible_message(span_warning("[src] finally gives birth.")) playsound(src, 'sound/foley/gross.ogg', 100, FALSE) breedchildren-- /mob/living/simple_animal/canUseTopic(atom/movable/M, be_close=FALSE, no_dexterity=FALSE, no_tk=FALSE) if(incapacitated()) - to_chat(src, "I can't do that right now!") + to_chat(src, span_warning("I can't do that right now!")) return FALSE if(be_close && !in_range(M, src)) - to_chat(src, "I are too far away!") + to_chat(src, span_warning("I are too far away!")) return FALSE if(!(no_dexterity || dextrous)) - to_chat(src, "I don't have the dexterity to do this!") + to_chat(src, span_warning("I don't have the dexterity to do this!")) return FALSE return TRUE @@ -705,7 +705,7 @@ mob/living/simple_animal/handle_fire() if(istype(held_item, /obj/item/twohanded)) var/obj/item/twohanded/T = held_item if(T.wielded == 1) - to_chat(usr, "My other hand is too busy holding [T].") + to_chat(usr, span_warning("My other hand is too busy holding [T].")) return FALSE var/oindex = active_hand_index active_hand_index = hand_index @@ -757,7 +757,7 @@ mob/living/simple_animal/handle_fire() M.Paralyze(50) M.Stun(50) playsound(src.loc, 'sound/foley/zfall.ogg', 100, FALSE) - M.visible_message("[M] falls off [src]!") + M.visible_message(span_danger("[M] falls off [src]!")) ..() update_icon() @@ -832,7 +832,7 @@ mob/living/simple_animal/handle_fire() L.Paralyze(50) L.Stun(50) playsound(L.loc, 'sound/foley/zfall.ogg', 100, FALSE) - L.visible_message("[L] falls off [src]!") + L.visible_message(span_danger("[L] falls off [src]!")) /mob/living/simple_animal/buckle_mob(mob/living/buckled_mob, force = 0, check_loc = 1) . = ..() diff --git a/code/modules/mob/living/simple_animal/simple_animal_topic.dm b/code/modules/mob/living/simple_animal/simple_animal_topic.dm index 6703deacb..953e0cb65 100644 --- a/code/modules/mob/living/simple_animal/simple_animal_topic.dm +++ b/code/modules/mob/living/simple_animal/simple_animal_topic.dm @@ -13,7 +13,7 @@ for(var/obj/item/embedded in simple_embedded_objects) msg += "[embedded.name]" - to_chat(usr, "[msg.Join("\n")]") + to_chat(usr, span_info("[msg.Join("\n")]")) if(href_list["embedded_object"] && usr.canUseTopic(src, BE_CLOSE, NO_DEXTERITY)) var/obj/item/I = locate(href_list["embedded_object"]) in simple_embedded_objects @@ -22,6 +22,6 @@ usr.put_in_hands(I) playsound(loc, 'sound/foley/flesh_rem.ogg', 100, TRUE, -2) if(usr == src) - usr.visible_message("[usr] rips [I] out of [usr.p_them()]self!", "I remove [I] from myself.") + usr.visible_message(span_notice("[usr] rips [I] out of [usr.p_them()]self!"), span_notice("I remove [I] from myself.")) else - usr.visible_message("[usr] rips [I] out of [src]!", "I rip [I] from [src].") + usr.visible_message(span_notice("[usr] rips [I] out of [src]!"), span_notice("I rip [I] from [src].")) diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 67ca7a8a2..b9556fe9a 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -137,14 +137,14 @@ var/stasis = (bz_percentage >= 0.05 && bodytemperature < (T0C + 100)) || force_stasis if(stat == CONSCIOUS && stasis) - to_chat(src, "Nerve gas in the air has put you in stasis!") + to_chat(src, span_danger("Nerve gas in the air has put you in stasis!")) stat = UNCONSCIOUS powerlevel = 0 rabid = 0 update_mobility() regenerate_icons() else if(stat == UNCONSCIOUS && !stasis) - to_chat(src, "I wake up from the stasis.") + to_chat(src, span_notice("I wake up from the stasis.")) stat = CONSCIOUS update_mobility() regenerate_icons() diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm index 25457d009..3be2143a1 100644 --- a/code/modules/mob/living/simple_animal/slime/powers.dm +++ b/code/modules/mob/living/simple_animal/slime/powers.dm @@ -73,31 +73,31 @@ if(isslime(M)) if(silent) return FALSE - to_chat(src, "I can't latch onto another slime...") + to_chat(src, span_warning("I can't latch onto another slime...")) return FALSE if(docile) if(silent) return FALSE - to_chat(src, "I'm not hungry anymore...") + to_chat(src, span_notice("I'm not hungry anymore...")) return FALSE if(stat) if(silent) return FALSE - to_chat(src, "I must be conscious to do this...") + to_chat(src, span_warning("I must be conscious to do this...")) return FALSE if(M.stat == DEAD) if(silent) return FALSE - to_chat(src, "This subject does not have a strong enough life energy...") + to_chat(src, span_warning("This subject does not have a strong enough life energy...")) return FALSE if(locate(/mob/living/simple_animal/slime) in M.buckled_mobs) if(silent) return FALSE - to_chat(src, "Another slime is already feeding on this subject...") + to_chat(src, span_warning("Another slime is already feeding on this subject...")) return FALSE return TRUE @@ -105,10 +105,10 @@ M.unbuckle_all_mobs(force=1) //Slimes rip other mobs (eg: shoulder parrots) off (Slimes Vs Slimes is already handled in CanFeedon()) if(M.buckle_mob(src, force=TRUE)) layer = M.layer+0.01 //appear above the target mob - M.visible_message("[name] has latched onto [M]!", \ - "[name] has latched onto [M]!") + M.visible_message(span_danger("[name] has latched onto [M]!"), \ + span_danger("[name] has latched onto [M]!")) else - to_chat(src, "I have failed to latch onto the subject!") + to_chat(src, span_warning("I have failed to latch onto the subject!")) /mob/living/simple_animal/slime/proc/Feedstop(silent = FALSE, living=1) if(buckled) @@ -118,8 +118,8 @@ "I am not satisified", "I can not feed from this subject", \ "I do not feel nourished", "This subject is not food")]!
") if(!silent) - visible_message("[src] has let go of [buckled]!", \ - "I stopped feeding.") + visible_message(span_warning("[src] has let go of [buckled]!"), \ + span_notice("I stopped feeding.")) layer = initial(layer) buckled.unbuckle_mob(src,force=TRUE) diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index eaeece980..08655d1e2 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -292,8 +292,8 @@ return if(buckled) Feedstop(silent = TRUE) - visible_message("[M] pulls [src] off!", \ - "I pull [src] off!") + visible_message(span_danger("[M] pulls [src] off!"), \ + span_danger("I pull [src] off!")) return attacked += 5 if(nutrition >= 100) //steal some nutrition. negval handled in life() @@ -328,26 +328,26 @@ M.do_attack_animation(src, ATTACK_EFFECT_DISARM) if(buckled == M) if(prob(60)) - M.visible_message("[M] attempts to wrestle \the [name] off!", \ - "I attempt to wrestle \the [name] off!") + M.visible_message(span_warning("[M] attempts to wrestle \the [name] off!"), \ + span_danger("I attempt to wrestle \the [name] off!")) playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) else - M.visible_message("[M] manages to wrestle \the [name] off!", \ - "I manage to wrestle \the [name] off!") + M.visible_message(span_warning("[M] manages to wrestle \the [name] off!"), \ + span_notice("I manage to wrestle \the [name] off!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) discipline_slime(M) else if(prob(30)) - buckled.visible_message("[M] attempts to wrestle \the [name] off of [buckled]!", \ - "[M] attempts to wrestle \the [name] off of you!") + buckled.visible_message(span_warning("[M] attempts to wrestle \the [name] off of [buckled]!"), \ + span_warning("[M] attempts to wrestle \the [name] off of you!")) playsound(loc, 'sound/blank.ogg', 25, TRUE, -1) else - buckled.visible_message("[M] manages to wrestle \the [name] off of [buckled]!", \ - "[M] manage to wrestle \the [name] off of you!") + buckled.visible_message(span_warning("[M] manages to wrestle \the [name] off of [buckled]!"), \ + span_notice("[M] manage to wrestle \the [name] off of you!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) discipline_slime(M) @@ -406,7 +406,7 @@ ++Friends[user] else Friends[user] = 1 - to_chat(user, "I feed the slime the plasma. It chirps happily.") + to_chat(user, span_notice("I feed the slime the plasma. It chirps happily.")) var/obj/item/stack/sheet/mineral/plasma/S = W S.use(1) return @@ -415,7 +415,7 @@ if(prob(25)) user.do_attack_animation(src) user.changeNext_move(CLICK_CD_MELEE) - to_chat(user, "[W] passes right through [src]!") + to_chat(user, span_danger("[W] passes right through [src]!")) return if(Discipline && prob(50)) // wow, buddy, why am I getting attacked?? Discipline = 0 @@ -428,7 +428,7 @@ if(istype(W, /obj/item/storage/bag/bio)) var/obj/item/storage/P = W if(!effectmod) - to_chat(user, "The slime is not currently being mutated.") + to_chat(user, span_warning("The slime is not currently being mutated.")) return var/hasOutput = FALSE //Have we outputted text? var/hasFound = FALSE //Have we found an extract to be added? @@ -439,23 +439,23 @@ applied++ hasFound = TRUE if(applied >= SLIME_EXTRACT_CROSSING_REQUIRED) - to_chat(user, "I feed the slime as many of the extracts from the bag as you can, and it mutates!") + to_chat(user, span_notice("I feed the slime as many of the extracts from the bag as you can, and it mutates!")) playsound(src, 'sound/blank.ogg', 50, TRUE) spawn_corecross() hasOutput = TRUE break if(!hasOutput) if(!hasFound) - to_chat(user, "There are no extracts in the bag that this slime will accept!") + to_chat(user, span_warning("There are no extracts in the bag that this slime will accept!")) else - to_chat(user, "I feed the slime some extracts from the bag.") + to_chat(user, span_notice("I feed the slime some extracts from the bag.")) playsound(src, 'sound/blank.ogg', 50, TRUE) return ..() /mob/living/simple_animal/slime/proc/spawn_corecross() var/static/list/crossbreeds = subtypesof(/obj/item/slimecross) - visible_message("[src] shudders, its mutated core consuming the rest of its body!") + visible_message(span_danger("[src] shudders, its mutated core consuming the rest of its body!")) playsound(src, 'sound/blank.ogg', 50, TRUE) var/crosspath for(var/X in crossbreeds) @@ -466,7 +466,7 @@ if(crosspath) new crosspath(loc) else - visible_message("The mutated core shudders, and collapses into a puddle, unable to maintain its form.") + visible_message(span_warning("The mutated core shudders, and collapses into a puddle, unable to maintain its form.")) qdel(src) /mob/living/simple_animal/slime/proc/apply_water() @@ -480,10 +480,10 @@ /mob/living/simple_animal/slime/examine(mob/user) . = list("*---------*\nThis is [icon2html(src, user)] \a [src]!") if (stat == DEAD) - . += "It is limp and unresponsive." + . += span_deadsay("It is limp and unresponsive.") else if (stat == UNCONSCIOUS) // Slime stasis - . += "It appears to be alive but unresponsive." + . += span_deadsay("It appears to be alive but unresponsive.") if (getBruteLoss()) . += "" if (getBruteLoss() < 40) @@ -500,10 +500,10 @@ . += "It is glowing gently with moderate levels of electrical activity." if(6 to 9) - . += "It is glowing brightly with high levels of electrical activity." + . += span_warning("It is glowing brightly with high levels of electrical activity.") if(10) - . += "It is radiating with massive levels of electrical activity!" + . += span_warning("It is radiating with massive levels of electrical activity!") . += "*---------*" diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 3d74c19f4..a2c6f795a 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -410,11 +410,11 @@ if(amount) //don't spam up the chat for continuous stuns if(priority_absorb_key["visible_message"] || priority_absorb_key["self_message"]) if(priority_absorb_key["visible_message"] && priority_absorb_key["self_message"]) - visible_message("[src][priority_absorb_key["visible_message"]]", "[priority_absorb_key["self_message"]]") + visible_message(span_warning("[src][priority_absorb_key["visible_message"]]"), span_boldwarning("[priority_absorb_key["self_message"]]")) else if(priority_absorb_key["visible_message"]) - visible_message("[src][priority_absorb_key["visible_message"]]") + visible_message(span_warning("[src][priority_absorb_key["visible_message"]]")) else if(priority_absorb_key["self_message"]) - to_chat(src, "[priority_absorb_key["self_message"]]") + to_chat(src, span_boldwarning("[priority_absorb_key["self_message"]]")) priority_absorb_key["stuns_absorbed"] += amount return TRUE diff --git a/code/modules/mob/living/taste.dm b/code/modules/mob/living/taste.dm index 4923e8dfe..148f09eb2 100644 --- a/code/modules/mob/living/taste.dm +++ b/code/modules/mob/living/taste.dm @@ -26,7 +26,7 @@ "defeat","pain","bliss","revenge","poison","time","space","death","life","truth","lies","justice","memory",\ "regrets","your soul","suffering","music","noise","blood","hunger","the american way") if(text_output != last_taste_text || last_taste_time + 100 < world.time) - to_chat(src, "I can taste [text_output].") + to_chat(src, span_info("I can taste [text_output].")) // "something indescribable" -> too many tastes, not enough flavor. last_taste_time = world.time diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm index 52b723ea1..f6f8a073f 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -9,19 +9,19 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list( if(!ventcrawler || !Adjacent(A)) return if(stat) - to_chat(src, "I must be conscious to do this!") + to_chat(src, span_warning("I must be conscious to do this!")) return if(IsStun() || IsParalyzed()) - to_chat(src, "I can't vent crawl while you're stunned!") + to_chat(src, span_warning("I can't vent crawl while you're stunned!")) return if(restrained()) - to_chat(src, "I can't vent crawl while you're restrained!") + to_chat(src, span_warning("I can't vent crawl while you're restrained!")) return if(has_buckled_mobs()) - to_chat(src, "I can't vent crawl with other creatures on you!") + to_chat(src, span_warning("I can't vent crawl with other creatures on you!")) return if(buckled) - to_chat(src, "I can't vent crawl while buckled!") + to_chat(src, span_warning("I can't vent crawl while buckled!")) return var/obj/machinery/atmospherics/components/unary/vent_found @@ -47,7 +47,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list( if(vent_found) var/datum/pipeline/vent_found_parent = vent_found.parents[1] if(vent_found_parent && (vent_found_parent.members.len || vent_found_parent.other_atmosmch)) - visible_message("[src] begins climbing into the ventilation system..." ,"I begin climbing into the ventilation system...") + visible_message(span_notice("[src] begins climbing into the ventilation system...") ,span_notice("I begin climbing into the ventilation system...")) if(!do_after(src, 25, target = vent_found)) return @@ -64,13 +64,13 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list( failed = 1 break if(failed) - to_chat(src, "I can't crawl around in the ventilation ducts with items!") + to_chat(src, span_warning("I can't crawl around in the ventilation ducts with items!")) return - visible_message("[src] scrambles into the ventilation ducts!","I climb into the ventilation ducts.") + visible_message(span_notice("[src] scrambles into the ventilation ducts!"),span_notice("I climb into the ventilation ducts.")) forceMove(vent_found) else - to_chat(src, "This ventilation duct is not connected to anything!") + to_chat(src, span_warning("This ventilation duct is not connected to anything!")) /mob/living/simple_animal/slime/handle_ventcrawl(atom/A) if(buckled) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 61b562c1c..f44d06daf 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -124,12 +124,12 @@ GLOBAL_VAR_INIT(mobids, 1) var/datum/gas_mixture/environment = loc.return_air() - var/t = "Coordinates: [x],[y] \n" - t += "Temperature: [environment.temperature] \n" + var/t = span_notice("Coordinates: [x],[y] \n") + t += span_danger("Temperature: [environment.temperature] \n") for(var/id in environment.gases) var/gas = environment.gases[id] if(gas[MOLES]) - t+="[gas[GAS_META][META_GAS_NAME]]: [gas[MOLES]] \n" + t+=span_notice("[gas[GAS_META][META_GAS_NAME]]: [gas[MOLES]] \n") to_chat(usr, t) @@ -308,7 +308,7 @@ GLOBAL_VAR_INIT(mobids, 1) qdel(W) else if(!disable_warning) - to_chat(src, "I couldn't equip that.") + to_chat(src, span_warning("I couldn't equip that.")) return FALSE equip_to_slot(W, slot, redraw_mob, initial) //This proc should not ever fail. update_a_intents() @@ -425,12 +425,12 @@ GLOBAL_VAR_INIT(mobids, 1) return if(is_blind(src)) - to_chat(src, "Something is there but I can't see it!") + to_chat(src, span_warning("Something is there but I can't see it!")) return if(isturf(A.loc) && isliving(src)) face_atom(A) - visible_message("[src] looks at [A].") + visible_message(span_emote("[src] looks at [A].")) var/list/result = A.examine(src) if(result) to_chat(src, result.Join("\n")) @@ -487,9 +487,9 @@ GLOBAL_VAR_INIT(mobids, 1) lastpoint = world.time var/obj/I = get_active_held_item() if(I) - src.visible_message("[src] points [I] at [A].", "I point [I] at [A].") + src.visible_message(span_info("[src] points [I] at [A]."), span_info("I point [I] at [A].")) else - src.visible_message("[src] points at [A].", "I point at [A].") + src.visible_message(span_info("[src] points at [A]."), span_info("I point at [A].")) return TRUE @@ -593,12 +593,12 @@ GLOBAL_VAR_INIT(mobids, 1) if (CONFIG_GET(flag/norespawn)) return if ((stat != DEAD || !( SSticker ))) - to_chat(usr, "I must be dead to use this!") + to_chat(usr, span_boldnotice("I must be dead to use this!")) return log_game("[key_name(usr)] used abandon mob.") - to_chat(src, "Returned to lobby successfully.") + to_chat(src, span_info("Returned to lobby successfully.")) if(!client) log_game("[key_name(usr)] AM failed due to disconnect.") @@ -1180,11 +1180,11 @@ GLOBAL_VAR_INIT(mobids, 1) /mob/proc/can_read(obj/O, silent = FALSE) if(is_blind(src) || eye_blurry) if(!silent) - to_chat(src, "I'm too blind to read.") + to_chat(src, span_warning("I'm too blind to read.")) return if(!is_literate()) if(!silent) - to_chat(src, "I can't make sense of these verba.") + to_chat(src, span_warning("I can't make sense of these verba.")) return return TRUE diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index aacad2ae7..04ec45c91 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -786,7 +786,7 @@ var/orbit_link if (source && action == NOTIFY_ORBIT) orbit_link = " (Orbit)" - to_chat(O, "[message][(enter_link) ? " [enter_link]" : ""][orbit_link]") + to_chat(O, span_ghostalert("[message][(enter_link) ? " [enter_link]" : ""][orbit_link]")) if(ghost_sound) SEND_SOUND(O, sound(ghost_sound, volume = notify_volume)) if(flashwindow) @@ -821,11 +821,11 @@ if((brute_heal > 0 && affecting.brute_dam > 0) || (burn_heal > 0 && affecting.burn_dam > 0)) if(affecting.heal_damage(brute_heal, burn_heal, 0, BODYPART_ROBOTIC)) H.update_damage_overlays() - user.visible_message("[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.name].", \ - "I fix some of the [dam ? "dents on" : "burnt wires in"] [H == user ? "your" : "[H]'s"] [affecting.name].") + user.visible_message(span_notice("[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.name]."), \ + span_notice("I fix some of the [dam ? "dents on" : "burnt wires in"] [H == user ? "your" : "[H]'s"] [affecting.name].")) return 1 //successful heal else - to_chat(user, "[affecting] is already in good condition!") + to_chat(user, span_warning("[affecting] is already in good condition!")) ///Is the passed in mob an admin ghost /proc/IsAdminGhost(mob/user) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 6786a6eb7..ec05cd1e4 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -103,7 +103,7 @@ mob.ghostize() else if(!world.time%5) - to_chat(src, "My spirit hasn't manifested yet.") + to_chat(src, span_warning("My spirit hasn't manifested yet.")) return FALSE if(mob.force_moving) return FALSE @@ -189,11 +189,11 @@ if(P.facepull) mob.setDir(turn(mob.dir, 180)) if(mob.used_intent?.movement_interrupt && mob.atkswinging == "left" && charging) - to_chat(src, "I lost my concentration!") + to_chat(src, span_warning("I lost my concentration!")) mob.stop_attack(FALSE) mob.changeNext_move(CLICK_CD_MELEE) if(mob.mmb_intent?.movement_interrupt && mob.atkswinging == "middle" && charging) - to_chat(src, "I lost my concentration!") + to_chat(src, span_warning("I lost my concentration!")) mob.stop_attack(FALSE) mob.changeNext_move(CLICK_CD_MELEE) @@ -215,20 +215,20 @@ return FALSE if(mob.pulledby == mob.pulling) //Don't autoresist grabs if we're grabbing them too. move_delay = world.time + 10 - to_chat(src, "I can't move!") + to_chat(src, span_warning("I can't move!")) return TRUE else if(mob.incapacitated(ignore_restraints = 1)) move_delay = world.time + 10 - to_chat(src, "I can't move!") + to_chat(src, span_warning("I can't move!")) return TRUE else if(mob.restrained(ignore_grab = 1)) move_delay = world.time + 10 - to_chat(src, "I'm restrained! I can't move!") + to_chat(src, span_warning("I'm restrained! I can't move!")) return TRUE else // return mob.resist_grab(1) move_delay = world.time + 10 - to_chat(src, "I can't move!") + to_chat(src, span_warning("I can't move!")) return TRUE /** @@ -301,17 +301,17 @@ var/turf/open/floor/stepTurf = get_step(L, direct) if(stepTurf) for(var/obj/effect/decal/cleanable/food/salt/S in stepTurf) - to_chat(L, "[S] bars your passage!") + to_chat(L, span_warning("[S] bars your passage!")) if(isrevenant(L)) var/mob/living/simple_animal/revenant/R = L R.reveal(20) R.stun(20) return if(stepTurf.flags_1 & NOJAUNT_1) - to_chat(L, "Some strange aura is blocking the way.") + to_chat(L, span_warning("Some strange aura is blocking the way.")) return if (locate(/obj/effect/blessing, stepTurf)) - to_chat(L, "Holy energies block your path!") + to_chat(L, span_warning("Holy energies block your path!")) return L.forceMove(stepTurf) @@ -335,7 +335,7 @@ if(backup) if(istype(backup) && movement_dir && !backup.anchored) if(backup.newtonian_move(turn(movement_dir, 180))) //You're pushing off something movable, so it moves - to_chat(src, "I push off of [backup] to propel myself.") + to_chat(src, span_info("I push off of [backup] to propel myself.")) return TRUE return FALSE @@ -706,19 +706,19 @@ prefs.chat_toggles ^= CHAT_GHOSTWHISPER prefs.save_preferences() if(prefs.chat_toggles & CHAT_GHOSTEARS) - to_chat(src, "I will hear all now.") + to_chat(src, span_notice("I will hear all now.")) else - to_chat(src, "I will hear like a mortal.") + to_chat(src, span_info("I will hear like a mortal.")) ///Moves a mob upwards in z level /mob/proc/ghost_up() if(zMove(UP, TRUE)) - to_chat(src, "I move upwards.") + to_chat(src, span_notice("I move upwards.")) ///Moves a mob down a z level /mob/proc/ghost_down() if(zMove(DOWN, TRUE)) - to_chat(src, "I move down.") + to_chat(src, span_notice("I move down.")) ///Move a mob between z levels, if it's valid to move z's on this turf /mob/proc/zMove(dir, feedback = FALSE) @@ -727,11 +727,11 @@ var/turf/target = get_step_multiz(src, dir) if(!target) if(feedback) - to_chat(src, "There's nothing in that direction!") + to_chat(src, span_warning("There's nothing in that direction!")) return FALSE if(!canZMove(dir, target)) if(feedback) - to_chat(src, "I couldn't move there!") + to_chat(src, span_warning("I couldn't move there!")) return FALSE forceMove(target) return TRUE diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm index 5e5995ca6..1217b49a9 100644 --- a/code/modules/mob/mob_transformation_simple.dm +++ b/code/modules/mob/mob_transformation_simple.dm @@ -5,7 +5,7 @@ /mob/proc/change_mob_type(new_type = null, turf/location = null, new_name = null as text, delete_old_mob = FALSE) if(isnewplayer(src)) - to_chat(usr, "Cannot convert players who have not entered yet.") + to_chat(usr, span_danger("Cannot convert players who have not entered yet.")) return if(!new_type) @@ -19,7 +19,7 @@ return if(ispath(new_type, /mob/dead/new_player)) - to_chat(usr, "Cannot convert into a new_player mob type.") + to_chat(usr, span_danger("Cannot convert into a new_player mob type.")) return var/mob/M diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 688baf967..252918833 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -12,7 +12,7 @@ if(!length(message)) return if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, span_danger("Speech is currently admin-disabled.")) return if(message) set_typing_indicator(FALSE) @@ -25,7 +25,7 @@ set hidden = 1 if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, span_danger("Speech is currently admin-disabled.")) return whisper(message) @@ -42,11 +42,11 @@ return #endif // if(!client.whitelisted()) -// to_chat(usr, "I can't do custom emotes. (NOT WHITELISTED)") +// to_chat(usr, span_warning("I can't do custom emotes. (NOT WHITELISTED)")) // return if(client) if(get_playerquality(client.ckey) <= -10) - to_chat(usr, "I can't use custom emotes. (LOW PQ)") + to_chat(usr, span_warning("I can't use custom emotes. (LOW PQ)")) return var/message = input(usr, "", "me") as text|null // If they don't type anything just drop the message. @@ -54,7 +54,7 @@ if(!length(message)) return if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, span_danger("Speech is currently admin-disabled.")) return message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) usr.emote("me",1,message,TRUE) @@ -67,7 +67,7 @@ return if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, span_danger("Speech is currently admin-disabled.")) return var/jb = is_banned_from(ckey, "Deadchat") @@ -75,14 +75,14 @@ return if(jb) - to_chat(src, "I have been banned from deadchat.") + to_chat(src, span_danger("I have been banned from deadchat.")) return if (src.client) if(src.client.prefs.muted & MUTE_DEADCHAT) - to_chat(src, "I cannot talk in deadchat (muted).") + to_chat(src, span_danger("I cannot talk in deadchat (muted).")) return if(src.client.handle_spam_prevention(message,MUTE_DEADCHAT)) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 50c764479..e8f6d6b69 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -555,7 +555,7 @@ var/mobpath = input("Which type of mob should [src] turn into?", "Choose a type") in sortList(mobtypes, GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!safe_animal(mobpath)) - to_chat(usr, "Sorry but this mob type is currently unavailable.") + to_chat(usr, span_danger("Sorry but this mob type is currently unavailable.")) return if(notransform) @@ -579,7 +579,7 @@ new_mob.a_intent = INTENT_HARM - to_chat(new_mob, "I suddenly feel more... animalistic.") + to_chat(new_mob, span_boldnotice("I suddenly feel more... animalistic.")) . = new_mob qdel(src) @@ -589,14 +589,14 @@ var/mobpath = input("Which type of mob should [src] turn into?", "Choose a type") in sortList(mobtypes, GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!safe_animal(mobpath)) - to_chat(usr, "Sorry but this mob type is currently unavailable.") + to_chat(usr, span_danger("Sorry but this mob type is currently unavailable.")) return var/mob/new_mob = new mobpath(src.loc) new_mob.key = key new_mob.a_intent = INTENT_HARM - to_chat(new_mob, "I feel more... animalistic.") + to_chat(new_mob, span_boldnotice("I feel more... animalistic.")) . = new_mob qdel(src) diff --git a/code/modules/modular_computers/computers/_modular_computer_shared.dm b/code/modules/modular_computers/computers/_modular_computer_shared.dm index 8ca93e834..61e214893 100644 --- a/code/modules/modular_computers/computers/_modular_computer_shared.dm +++ b/code/modules/modular_computers/computers/_modular_computer_shared.dm @@ -39,7 +39,7 @@ . += "It has a slot installed for an intelliCard which contains: [ai_slot.stored_card.name]" else . += "It has a slot installed for an intelliCard, which appears to be occupied." - . += "Alt-click to eject the intelliCard." + . += span_info("Alt-click to eject the intelliCard.") else . += "It has a slot installed for an intelliCard." @@ -53,7 +53,7 @@ . += "It has two slots for identification cards installed[multiple_cards ? " which contain [first_ID] and [second_ID]" : ", one of which contains [first_ID ? first_ID : second_ID]"]." else . += "It has two slots for identification cards installed, [multiple_cards ? "both of which appear" : "and one of them appears"] to be occupied." - . += "Alt-click [src] to eject the identification card[multiple_cards ? "s":""]." + . += span_info("Alt-click [src] to eject the identification card[multiple_cards ? "s":""].") else . += "It has two slots installed for identification cards." diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 9ccd03aba..b79f72932 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -193,19 +193,19 @@ /obj/item/modular_computer/emag_act(mob/user) if(obj_flags & EMAGGED) - to_chat(user, "\The [src] was already emagged.") + to_chat(user, span_warning("\The [src] was already emagged.")) return 0 else obj_flags |= EMAGGED - to_chat(user, "I emag \the [src]. It's screen briefly shows a \"OVERRIDE ACCEPTED: New software downloads available.\" message.") + to_chat(user, span_notice("I emag \the [src]. It's screen briefly shows a \"OVERRIDE ACCEPTED: New software downloads available.\" message.")) return 1 /obj/item/modular_computer/examine(mob/user) . = ..() if(obj_integrity <= integrity_failure * max_integrity) - . += "It is heavily damaged!" + . += span_danger("It is heavily damaged!") else if(obj_integrity < max_integrity) - . += "It is damaged." + . += span_warning("It is damaged.") . += get_modular_computer_parts_examine(user) @@ -236,9 +236,9 @@ var/issynth = issilicon(user) // Robots and AIs get different activation messages. if(obj_integrity <= integrity_failure * max_integrity) if(issynth) - to_chat(user, "I send an activation signal to \the [src], but it responds with an error code. It must be damaged.") + to_chat(user, span_warning("I send an activation signal to \the [src], but it responds with an error code. It must be damaged.")) else - to_chat(user, "I press the power button, but the computer fails to boot up, displaying variety of errors before shutting down again.") + to_chat(user, span_warning("I press the power button, but the computer fails to boot up, displaying variety of errors before shutting down again.")) return // If we have a recharger, enable it automatically. Lets computer without a battery work. @@ -248,17 +248,17 @@ if(all_components[MC_CPU] && use_power()) // use_power() checks if the PC is powered if(issynth) - to_chat(user, "I send an activation signal to \the [src], turning it on.") + to_chat(user, span_notice("I send an activation signal to \the [src], turning it on.")) else - to_chat(user, "I press the power button and start up \the [src].") + to_chat(user, span_notice("I press the power button and start up \the [src].")) enabled = 1 update_icon() ui_interact(user) else // Unpowered if(issynth) - to_chat(user, "I send an activation signal to \the [src] but it does not respond.") + to_chat(user, span_warning("I send an activation signal to \the [src] but it does not respond.")) else - to_chat(user, "I press the power button but \the [src] does not respond.") + to_chat(user, span_warning("I press the power button but \the [src] does not respond.")) // Process currently calls handle_power(), may be expanded in future if more things are added. /obj/item/modular_computer/process() @@ -384,7 +384,7 @@ P.kill_program(forced = TRUE) idle_threads.Remove(P) if(loud) - physical.visible_message("\The [src] shuts down.") + physical.visible_message(span_notice("\The [src] shuts down.")) enabled = 0 update_icon() @@ -403,31 +403,31 @@ if(W.tool_behaviour == TOOL_WRENCH) if(all_components.len) - to_chat(user, "Remove all components from \the [src] before disassembling it.") + to_chat(user, span_warning("Remove all components from \the [src] before disassembling it.")) return new /obj/item/stack/sheet/metal( get_turf(src.loc), steel_sheet_cost ) - physical.visible_message("\The [src] has been disassembled by [user].") + physical.visible_message(span_notice("\The [src] has been disassembled by [user].")) relay_qdel() qdel(src) return if(W.tool_behaviour == TOOL_WELDER) if(obj_integrity == max_integrity) - to_chat(user, "\The [src] does not require repairs.") + to_chat(user, span_warning("\The [src] does not require repairs.")) return if(!W.tool_start_check(user, amount=1)) return - to_chat(user, "I begin repairing damage to \the [src]...") + to_chat(user, span_notice("I begin repairing damage to \the [src]...")) if(W.use_tool(src, user, 20, volume=50, amount=1)) obj_integrity = max_integrity - to_chat(user, "I repair \the [src].") + to_chat(user, span_notice("I repair \the [src].")) return if(W.tool_behaviour == TOOL_SCREWDRIVER) if(!all_components.len) - to_chat(user, "This device doesn't have any components installed.") + to_chat(user, span_warning("This device doesn't have any components installed.")) return var/list/component_names = list() for(var/h in all_components) diff --git a/code/modules/modular_computers/computers/item/computer_components.dm b/code/modules/modular_computers/computers/item/computer_components.dm index 468a26d73..0bd7a8042 100644 --- a/code/modules/modular_computers/computers/item/computer_components.dm +++ b/code/modules/modular_computers/computers/item/computer_components.dm @@ -3,11 +3,11 @@ return FALSE if(H.w_class > max_hardware_size) - to_chat(user, "This component is too large for \the [src]!") + to_chat(user, span_warning("This component is too large for \the [src]!")) return FALSE if(all_components[H.device_type]) - to_chat(user, "This computer's hardware slot is already occupied by \the [all_components[H.device_type]].") + to_chat(user, span_warning("This computer's hardware slot is already occupied by \the [all_components[H.device_type]].")) return FALSE return TRUE @@ -22,7 +22,7 @@ all_components[H.device_type] = H - to_chat(user, "I install \the [H] into \the [src].") + to_chat(user, span_notice("I install \the [H] into \the [src].")) H.holder = src H.forceMove(src) H.on_install(src, user) @@ -35,7 +35,7 @@ all_components.Remove(H.device_type) - to_chat(user, "I remove \the [H] from \the [src].") + to_chat(user, span_notice("I remove \the [H] from \the [src].")) H.forceMove(get_turf(src)) H.holder = null diff --git a/code/modules/modular_computers/computers/item/computer_damage.dm b/code/modules/modular_computers/computers/item/computer_damage.dm index 6039abeb9..07ee2ce68 100644 --- a/code/modules/modular_computers/computers/item/computer_damage.dm +++ b/code/modules/modular_computers/computers/item/computer_damage.dm @@ -18,7 +18,7 @@ /obj/item/modular_computer/proc/break_apart() if(!(flags_1 & NODECONSTRUCT_1)) - physical.visible_message("\The [src] breaks apart!") + physical.visible_message(span_notice("\The [src] breaks apart!")) var/turf/newloc = get_turf(src) new /obj/item/stack/sheet/metal(newloc, round(steel_sheet_cost/2)) for(var/C in all_components) diff --git a/code/modules/modular_computers/computers/item/computer_ui.dm b/code/modules/modular_computers/computers/item/computer_ui.dm index 18c6d7a5a..e6800ec5d 100644 --- a/code/modules/modular_computers/computers/item/computer_ui.dm +++ b/code/modules/modular_computers/computers/item/computer_ui.dm @@ -30,7 +30,7 @@ // This screen simply lists available programs and user may select them. var/obj/item/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD] if(!hard_drive || !hard_drive.stored_files || !hard_drive.stored_files.len) - to_chat(user, "\The [src] beeps three times, it's screen displaying a \"DISK ERROR\" warning.") + to_chat(user, span_danger("\The [src] beeps three times, it's screen displaying a \"DISK ERROR\" warning.")) return // No HDD, No HDD files list or no stored files. Something is very broken. ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) @@ -96,7 +96,7 @@ return P.kill_program(forced = TRUE) - to_chat(user, "Program [P.filename].[P.filetype] with PID [rand(100,999)] has been killed.") + to_chat(user, span_notice("Program [P.filename].[P.filetype] with PID [rand(100,999)] has been killed.")) if("PC_runprogram") var/prog = params["name"] @@ -106,7 +106,7 @@ P = hard_drive.find_file_by_name(prog) if(!P || !istype(P)) // Program not found or it's not executable program. - to_chat(user, "\The [src]'s screen shows \"I/O ERROR - Unable to run program\" warning.") + to_chat(user, span_danger("\The [src]'s screen shows \"I/O ERROR - Unable to run program\" warning.")) return P.computer = src @@ -125,11 +125,11 @@ var/obj/item/computer_hardware/processor_unit/PU = all_components[MC_CPU] if(idle_threads.len > PU.max_idle_programs) - to_chat(user, "\The [src] displays a \"Maximal CPU load reached. Unable to run another program.\" error.") + to_chat(user, span_danger("\The [src] displays a \"Maximal CPU load reached. Unable to run another program.\" error.")) return if(P.requires_ntnet && !get_ntnet_status(P.requires_ntnet_feature)) // The program requires NTNet connection, but we are not connected to NTNet. - to_chat(user, "\The [src]'s screen shows \"Unable to connect to NTNet. Please retry. If problem persists contact your system administrator.\" warning.") + to_chat(user, span_danger("\The [src]'s screen shows \"Unable to connect to NTNet. Please retry. If problem persists contact your system administrator.\" warning.")) return if(P.run_program(user)) active_program = P @@ -152,7 +152,7 @@ if(!new_color) return if(color_hex2num(new_color) < 200) //Colors too dark are rejected - to_chat(user, "That color is too dark! Choose a lighter one.") + to_chat(user, span_warning("That color is too dark! Choose a lighter one.")) new_color = null comp_light_color = new_color light_color = new_color diff --git a/code/modules/modular_computers/computers/item/laptop.dm b/code/modules/modular_computers/computers/item/laptop.dm index ddeb5d4fd..d7388f593 100644 --- a/code/modules/modular_computers/computers/item/laptop.dm +++ b/code/modules/modular_computers/computers/item/laptop.dm @@ -24,7 +24,7 @@ /obj/item/modular_computer/laptop/examine(mob/user) . = ..() if(screen_on) - . += "Alt-click to close it." + . += span_notice("Alt-click to close it.") /obj/item/modular_computer/laptop/Initialize() . = ..() @@ -91,11 +91,11 @@ /obj/item/modular_computer/laptop/proc/toggle_open(mob/living/user=null) if(screen_on) - to_chat(user, "I close \the [src].") + to_chat(user, span_notice("I close \the [src].")) slowdown = initial(slowdown) w_class = initial(w_class) else - to_chat(user, "I open \the [src].") + to_chat(user, span_notice("I open \the [src].")) slowdown = slowdown_open w_class = w_class_open diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm index d336758e1..d3096de2f 100644 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm @@ -118,7 +118,7 @@ /obj/machinery/modular_computer/proc/power_failure(malfunction = 0) var/obj/item/computer_hardware/battery/battery_module = cpu.all_components[MC_CELL] if(cpu && cpu.enabled) // Shut down the computer - visible_message("\The [src]'s screen flickers [battery_module ? "\"BATTERY [malfunction ? "MALFUNCTION" : "CRITICAL"]\"" : "\"EXTERNAL POWER LOSS\""] warning as it shuts down unexpectedly.") + visible_message(span_danger("\The [src]'s screen flickers [battery_module ? "\"BATTERY [malfunction ? "MALFUNCTION" : "CRITICAL"]\"" : "\"EXTERNAL POWER LOSS\""] warning as it shuts down unexpectedly.")) if(cpu) cpu.shutdown_computer(0) stat |= NOPOWER diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index 1fbae3640..e7e780dd7 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -55,7 +55,7 @@ /datum/computer_file/program/proc/is_supported_by_hardware(hardware_flag = 0, loud = 0, mob/user = null) if(!(hardware_flag & usage_flags)) if(loud && computer && user) - to_chat(user, "\The [computer] flashes an \"Hardware Error - Incompatible software\" warning.") + to_chat(user, span_danger("\The [computer] flashes an \"Hardware Error - Incompatible software\" warning.")) return 0 return 1 @@ -101,7 +101,7 @@ if(!I && !D) if(loud) - to_chat(user, "\The [computer] flashes an \"RFID Error - Unable to scan ID\" warning.") + to_chat(user, span_danger("\The [computer] flashes an \"RFID Error - Unable to scan ID\" warning.")) return 0 if(I) @@ -111,7 +111,7 @@ if(access_to_check in D.GetAccess()) return 1 if(loud) - to_chat(user, "\The [computer] flashes an \"Access Denied\" warning.") + to_chat(user, span_danger("\The [computer] flashes an \"Access Denied\" warning.")) return 0 // This attempts to retrieve header data for UIs. If implementing completely new device of different type than existing ones diff --git a/code/modules/modular_computers/file_system/program_events.dm b/code/modules/modular_computers/file_system/program_events.dm index 279d646cf..f1d1ad0bd 100644 --- a/code/modules/modular_computers/file_system/program_events.dm +++ b/code/modules/modular_computers/file_system/program_events.dm @@ -13,6 +13,6 @@ /datum/computer_file/program/proc/event_networkfailure(background) kill_program(forced = TRUE) if(background) - computer.visible_message("\The [computer]'s screen displays an \"Process [filename].[filetype] (PID [rand(100,999)]) terminated - Network Error\" error") + computer.visible_message(span_danger("\The [computer]'s screen displays an \"Process [filename].[filetype] (PID [rand(100,999)]) terminated - Network Error\" error")) else - computer.visible_message("\The [computer]'s screen briefly freezes and then shows \"NETWORK ERROR - NTNet connection lost. Please retry. If problem persists contact your system administrator.\" error.") + computer.visible_message(span_danger("\The [computer]'s screen briefly freezes and then shows \"NETWORK ERROR - NTNet connection lost. Please retry. If problem persists contact your system administrator.\" error.")) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm b/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm index 6533ecea6..a04d4823c 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm @@ -89,9 +89,9 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.put_in_hands(crystals)) - to_chat(H, "My payment materializes into my hands!") + to_chat(H, span_notice("My payment materializes into my hands!")) else - to_chat(user, "My payment materializes onto the floor.") + to_chat(user, span_notice("My payment materializes onto the floor.")) hard_drive.traitor_data.contractor_hub.contract_TC_payed_out += hard_drive.traitor_data.contractor_hub.contract_TC_to_redeem hard_drive.traitor_data.contractor_hub.contract_TC_to_redeem = 0 diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm index 39cf5f781..a7e0cc9db 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm @@ -21,7 +21,7 @@ /datum/computer_file/program/revelation/proc/activate() if(computer) - computer.visible_message("\The [computer]'s screen brightly flashes and loud electrical buzzing is heard.") + computer.visible_message(span_notice("\The [computer]'s screen brightly flashes and loud electrical buzzing is heard.")) computer.enabled = 0 computer.update_icon() var/obj/item/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] @@ -31,13 +31,13 @@ computer.take_damage(25, BRUTE, 0, 0) if(battery_module && prob(25)) qdel(battery_module) - computer.visible_message("\The [computer]'s battery explodes in rain of sparks.") + computer.visible_message(span_notice("\The [computer]'s battery explodes in rain of sparks.")) var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread spark_system.start() if(recharger && prob(50)) qdel(recharger) - computer.visible_message("\The [computer]'s recharger explodes in rain of sparks.") + computer.visible_message(span_notice("\The [computer]'s recharger explodes in rain of sparks.")) var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread spark_system.start() diff --git a/code/modules/modular_computers/file_system/programs/card.dm b/code/modules/modular_computers/file_system/programs/card.dm index 8e8cbac81..9067521b3 100644 --- a/code/modules/modular_computers/file_system/programs/card.dm +++ b/code/modules/modular_computers/file_system/programs/card.dm @@ -150,20 +150,20 @@ contents += " [get_access_desc(A)]" if(!printer.print_text(contents,"access report")) - to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") + to_chat(usr, span_notice("Hardware error: Printer was unable to print the file. It may be out of paper.")) return else - computer.visible_message("\The [computer] prints out paper.") + computer.visible_message(span_notice("\The [computer] prints out paper.")) else var/contents = {"

Crew Manifest


[GLOB.data_core ? GLOB.data_core.get_manifest(0) : ""] "} if(!printer.print_text(contents,text("crew manifest ([])", station_time_timestamp()))) - to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") + to_chat(usr, span_notice("Hardware error: Printer was unable to print the file. It may be out of paper.")) return else - computer.visible_message("\The [computer] prints out paper.") + computer.visible_message(span_notice("\The [computer] prints out paper.")) if("PRG_eject") if(computer && card_slot) var/select = params["target"] @@ -207,7 +207,7 @@ id_card.registered_name = temp_name id_card.update_label() else - computer.visible_message("[computer] buzzes rudely.") + computer.visible_message(span_notice("[computer] buzzes rudely.")) //else if(params["account"]) // var/account_num = text2num(input("Enter account number.", "Account", id_card.associated_account_number)) // id_card.associated_account_number = account_num @@ -231,7 +231,7 @@ jobdatum = J break if(!jobdatum) - to_chat(usr, "No log exists for this job: [t1]") + to_chat(usr, span_warning("No log exists for this job: [t1]")) return access = jobdatum.get_access() diff --git a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm index b2e5eb146..f091fca2e 100644 --- a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm @@ -128,9 +128,9 @@ CRASH("Var computer is null!") return 1 if(!hard_drive) - computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.") + computer.visible_message(span_warning("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.")) else // In 99.9% cases this will mean our HDD is full - computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive may be full. Please free some space and try again. Required space: [logfile.size]GQ\" warning.") + computer.visible_message(span_warning("\The [computer] shows an \"I/O Error - Hard drive may be full. Please free some space and try again. Required space: [logfile.size]GQ\" warning.")) if("PRG_renamechannel") . = 1 if(!operator_mode || !channel) diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm index a5e667da0..8e6b819dc 100644 --- a/code/modules/modular_computers/hardware/_hardware.dm +++ b/code/modules/modular_computers/hardware/_hardware.dm @@ -36,10 +36,10 @@ if(istype(I, /obj/item/stack/cable_coil)) var/obj/item/stack/S = I if(obj_integrity == max_integrity) - to_chat(user, "\The [src] doesn't seem to require repairs.") + to_chat(user, span_warning("\The [src] doesn't seem to require repairs.")) return 1 if(S.use(1)) - to_chat(user, "I patch up \the [src] with a bit of \the [I].") + to_chat(user, span_notice("I patch up \the [src] with a bit of \the [I].")) obj_integrity = min(obj_integrity + 10, max_integrity) return 1 @@ -76,11 +76,11 @@ /obj/item/computer_hardware/examine(mob/user) . = ..() if(damage > damage_failure) - . += "It seems to be severely damaged!" + . += span_danger("It seems to be severely damaged!") else if(damage > damage_malfunction) - . += "It seems to be damaged!" + . += span_warning("It seems to be damaged!") else if(damage) - . += "It seems to be slightly damaged." + . += span_notice("It seems to be slightly damaged.") // Component-side compatibility check. /obj/item/computer_hardware/proc/can_install(obj/item/modular_computer/M, mob/living/user = null) diff --git a/code/modules/modular_computers/hardware/ai_slot.dm b/code/modules/modular_computers/hardware/ai_slot.dm index 94a762ec2..db9cb42e6 100644 --- a/code/modules/modular_computers/hardware/ai_slot.dm +++ b/code/modules/modular_computers/hardware/ai_slot.dm @@ -33,28 +33,28 @@ return FALSE if(stored_card) - to_chat(user, "I try to insert \the [I] into \the [src], but the slot is occupied.") + to_chat(user, span_warning("I try to insert \the [I] into \the [src], but the slot is occupied.")) return FALSE if(user && !user.transferItemToLoc(I, src)) return FALSE stored_card = I - to_chat(user, "I insert \the [I] into \the [src].") + to_chat(user, span_notice("I insert \the [I] into \the [src].")) return TRUE /obj/item/computer_hardware/ai_slot/try_eject(slot=0,mob/living/user = null,forced = 0) if(!stored_card) - to_chat(user, "There is no card in \the [src].") + to_chat(user, span_warning("There is no card in \the [src].")) return FALSE if(locked && !forced) - to_chat(user, "Safeties prevent you from removing the card until reconstruction is complete...") + to_chat(user, span_warning("Safeties prevent you from removing the card until reconstruction is complete...")) return FALSE if(stored_card) - to_chat(user, "I remove [stored_card] from [src].") + to_chat(user, span_notice("I remove [stored_card] from [src].")) locked = FALSE if(user) user.put_in_hands(stored_card) @@ -69,6 +69,6 @@ if(..()) return if(I.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "I press down on the manual eject button with \the [I].") + to_chat(user, span_notice("I press down on the manual eject button with \the [I].")) try_eject(,user,1) return diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm index 1b449bad7..6f58f5f3f 100644 --- a/code/modules/modular_computers/hardware/battery_module.dm +++ b/code/modules/modular_computers/hardware/battery_module.dm @@ -29,32 +29,32 @@ return FALSE if(battery) - to_chat(user, "I try to connect \the [I] to \the [src], but its connectors are occupied.") + to_chat(user, span_warning("I try to connect \the [I] to \the [src], but its connectors are occupied.")) return FALSE if(I.w_class > holder.max_hardware_size) - to_chat(user, "This power cell is too large for \the [holder]!") + to_chat(user, span_warning("This power cell is too large for \the [holder]!")) return FALSE if(user && !user.transferItemToLoc(I, src)) return FALSE battery = I - to_chat(user, "I connect \the [I] to \the [src].") + to_chat(user, span_notice("I connect \the [I] to \the [src].")) return TRUE /obj/item/computer_hardware/battery/try_eject(slot=0, mob/living/user = null, forced = 0) if(!battery) - to_chat(user, "There is no power cell connected to \the [src].") + to_chat(user, span_warning("There is no power cell connected to \the [src].")) return FALSE else if(user) user.put_in_hands(battery) else battery.forceMove(drop_location()) - to_chat(user, "I detach \the [battery] from \the [src].") + to_chat(user, span_notice("I detach \the [battery] from \the [src].")) battery = null if(holder) diff --git a/code/modules/modular_computers/hardware/card_slot.dm b/code/modules/modular_computers/hardware/card_slot.dm index 1feeae720..85a39cf65 100644 --- a/code/modules/modular_computers/hardware/card_slot.dm +++ b/code/modules/modular_computers/hardware/card_slot.dm @@ -61,7 +61,7 @@ return FALSE if(stored_card && stored_card2) - to_chat(user, "I try to insert \the [I] into \the [src], but its slots are occupied.") + to_chat(user, span_warning("I try to insert \the [I] into \the [src], but its slots are occupied.")) return FALSE if(user) if(!user.transferItemToLoc(I, src)) @@ -73,7 +73,7 @@ stored_card = I else stored_card2 = I - to_chat(user, "I insert \the [I] into \the [src].") + to_chat(user, span_notice("I insert \the [I] into \the [src].")) playsound(src, 'sound/blank.ogg', 50, FALSE) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -84,7 +84,7 @@ /obj/item/computer_hardware/card_slot/try_eject(slot=0, mob/living/user = null, forced = 0) if(!stored_card && !stored_card2) - to_chat(user, "There are no cards in \the [src].") + to_chat(user, span_warning("There are no cards in \the [src].")) return FALSE var/ejected = 0 @@ -115,7 +115,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user H.sec_hud_set_ID() - to_chat(user, "I remove the card[ejected>1 ? "s" : ""] from \the [src].") + to_chat(user, span_notice("I remove the card[ejected>1 ? "s" : ""] from \the [src].")) playsound(src, 'sound/blank.ogg', 50, FALSE) return TRUE return FALSE @@ -124,7 +124,7 @@ if(..()) return if(I.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "I press down on the manual eject button with \the [I].") + to_chat(user, span_notice("I press down on the manual eject button with \the [I].")) try_eject(0,user) return diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm index bfbfc1af4..5e9ba049f 100644 --- a/code/modules/modular_computers/hardware/hard_drive.dm +++ b/code/modules/modular_computers/hardware/hard_drive.dm @@ -20,7 +20,7 @@ /obj/item/computer_hardware/hard_drive/examine(user) . = ..() - . += "It has [max_capacity] GQ of storage capacity." + . += span_notice("It has [max_capacity] GQ of storage capacity.") /obj/item/computer_hardware/hard_drive/diagnostics(mob/user) ..() diff --git a/code/modules/modular_computers/hardware/printer.dm b/code/modules/modular_computers/hardware/printer.dm index 5c0725044..eec4a818a 100644 --- a/code/modules/modular_computers/hardware/printer.dm +++ b/code/modules/modular_computers/hardware/printer.dm @@ -10,11 +10,11 @@ /obj/item/computer_hardware/printer/diagnostics(mob/living/user) ..() - to_chat(user, "Paper level: [stored_paper]/[max_paper].") + to_chat(user, span_notice("Paper level: [stored_paper]/[max_paper].")) /obj/item/computer_hardware/printer/examine(mob/user) . = ..() - . += "Paper level: [stored_paper]/[max_paper]." + . += span_notice("Paper level: [stored_paper]/[max_paper].") /obj/item/computer_hardware/printer/proc/print_text(text_to_print, paper_title = "") @@ -41,12 +41,12 @@ /obj/item/computer_hardware/printer/try_insert(obj/item/I, mob/living/user = null) if(istype(I, /obj/item/paper)) if(stored_paper >= max_paper) - to_chat(user, "I try to add \the [I] into [src], but its paper bin is full!") + to_chat(user, span_warning("I try to add \the [I] into [src], but its paper bin is full!")) return FALSE if(user && !user.temporarilyRemoveItemFromInventory(I)) return FALSE - to_chat(user, "I insert \the [I] into [src]'s paper recycler.") + to_chat(user, span_notice("I insert \the [I] into [src]'s paper recycler.")) qdel(I) stored_paper++ return TRUE diff --git a/code/modules/modular_computers/hardware/recharger.dm b/code/modules/modular_computers/hardware/recharger.dm index 17cdae4e0..a378cf832 100644 --- a/code/modules/modular_computers/hardware/recharger.dm +++ b/code/modules/modular_computers/hardware/recharger.dm @@ -55,7 +55,7 @@ /obj/item/computer_hardware/recharger/wired/can_install(obj/item/modular_computer/M, mob/living/user = null) if(ismachinery(M.physical) && M.physical.anchored) return ..() - to_chat(user, "\The [src] is incompatible with portable computers!") + to_chat(user, span_warning("\The [src] is incompatible with portable computers!")) return 0 /obj/item/computer_hardware/recharger/wired/use_power(amount, charging=0) diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 12c6a2e84..00d771d47 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -241,13 +241,13 @@ if(!user.temporarilyRemoveItemFromInventory(c)) return credits += c.value - visible_message("[user] inserts [c.value] credits into [src].") + visible_message(span_info("[user] inserts [c.value] credits into [src].")) qdel(c) return else if(istype(I, /obj/item/holochip)) var/obj/item/holochip/HC = I credits += HC.credits - visible_message("[user] inserts a $[HC.credits] holocredit chip into [src].") + visible_message(span_info("[user] inserts a $[HC.credits] holocredit chip into [src].")) qdel(HC) return else if(istype(I, /obj/item/card/id)) diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 5a2a0ea52..ecbf3edb3 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -29,7 +29,7 @@ /obj/item/energy_katana/attack_self(mob/user) dash_toggled = !dash_toggled - to_chat(user, "I [dash_toggled ? "enable" : "disable"] the dash function on [src].") + to_chat(user, span_notice("I [dash_toggled ? "enable" : "disable"] the dash function on [src].")) /obj/item/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters) . = ..() @@ -91,7 +91,7 @@ msg = "Your Energy Katana lands at your feet!" if(msg) - to_chat(user, "[msg]") + to_chat(user, span_notice("[msg]")) /obj/item/energy_katana/Destroy() diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm index efd52c322..c1345b318 100644 --- a/code/modules/ninja/suit/gloves.dm +++ b/code/modules/ninja/suit/gloves.dm @@ -63,16 +63,16 @@ if(isnum(.)) //Numerical values of drained handle their feedback here, Alpha values handle it themselves (Research hacking) if(.) - to_chat(H, "Gained [DisplayEnergy(.)] of energy from [A].") + to_chat(H, span_notice("Gained [DisplayEnergy(.)] of energy from [A].")) else - to_chat(H, "\The [A] has run dry of energy, you must find another source!") + to_chat(H, span_danger("\The [A] has run dry of energy, you must find another source!")) else . = FALSE //as to not cancel attack_hand() /obj/item/clothing/gloves/space_ninja/proc/toggledrain() var/mob/living/carbon/human/U = loc - to_chat(U, "I [candrain?"disable":"enable"] special interaction.") + to_chat(U, span_notice("I [candrain?"disable":"enable"] special interaction.")) candrain=!candrain /obj/item/clothing/gloves/space_ninja/examine(mob/user) diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm index 7bfa02cf0..437682287 100644 --- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm +++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm @@ -34,7 +34,7 @@ It is possible to destroy the net by the occupant or someone else. /obj/structure/energy_net/Destroy() if(!success) if(!QDELETED(affecting)) - affecting.visible_message("[affecting.name] was recovered from the energy net!", "I were recovered from the energy net!", "I hear a grunt.") + affecting.visible_message(span_notice("[affecting.name] was recovered from the energy net!"), span_notice("I were recovered from the energy net!"), span_hear("I hear a grunt.")) if(!QDELETED(master))//As long as they still exist. to_chat(master, "ERROR: unable to initiate transport protocol. Procedure terminated.") return ..() @@ -65,12 +65,12 @@ It is possible to destroy the net by the occupant or someone else. playsound(affecting, 'sound/blank.ogg', 50, TRUE) new /obj/effect/temp_visual/dir_setting/ninja/phase/out(affecting.drop_location(), affecting.dir) - visible_message("[affecting] suddenly vanishes!") + visible_message(span_notice("[affecting] suddenly vanishes!")) affecting.forceMove(pick(GLOB.holdingfacility)) //Throw mob in to the holding facility. - to_chat(affecting, "I appear in a strange place!") + to_chat(affecting, span_danger("I appear in a strange place!")) if(!QDELETED(master))//As long as they still exist. - to_chat(master, "SUCCESS: transport procedure of [affecting] complete.") + to_chat(master, span_notice("SUCCESS: transport procedure of [affecting] complete.")) do_sparks(5, FALSE, affecting) playsound(affecting, 'sound/blank.ogg', 25, TRUE) playsound(affecting, 'sound/blank.ogg', 50, TRUE) diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm index b87eb8542..fa4d3ffd8 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm @@ -16,11 +16,11 @@ H.reagents.add_reagent(/datum/reagent/medicine/stimulants, 5) H.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"), forced = "ninjaboost") a_boost-- - to_chat(H, "There are [a_boost] adrenaline boosts remaining.") + to_chat(H, span_notice("There are [a_boost] adrenaline boosts remaining.")) s_coold = 3 addtimer(CALLBACK(src, PROC_REF(ninjaboost_after)), 70) /obj/item/clothing/suit/space/space_ninja/proc/ninjaboost_after() var/mob/living/carbon/human/H = affecting H.reagents.add_reagent(/datum/reagent/uranium/radium, a_transfer) - to_chat(H, "I are beginning to feel the after-effect of the injection.") + to_chat(H, span_danger("I are beginning to feel the after-effect of the injection.")) diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_cost_check.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_cost_check.dm index 30d70053a..5b4f7b602 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_cost_check.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_cost_check.dm @@ -5,7 +5,7 @@ var/mob/living/carbon/human/H = affecting var/actualCost = cost*10 if(cost && cell.charge < actualCost) - to_chat(H, "Not enough energy!") + to_chat(H, span_warning("Not enough energy!")) return 1 else //This shit used to be handled individually on every proc.. why even bother with a universal check proc then? @@ -16,10 +16,10 @@ cancel_stealth()//Get rid of it. if(N_SMOKE_BOMB) if(!s_bombs) - to_chat(H, "There are no more smoke bombs remaining!") + to_chat(H, span_warning("There are no more smoke bombs remaining!")) return 1 if(N_ADRENALINE) if(!a_boost) - to_chat(H, "I do not have any more adrenaline boosters!") + to_chat(H, span_warning("I do not have any more adrenaline boosters!")) return 1 return (s_coold)//Returns the value of the variable which counts down to zero. diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm index 758a0266d..67e26a247 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm @@ -8,14 +8,14 @@ return 0 if(!C.client)//Monkeys without a client can still step_to() and bypass the net. Also, netting inactive people is lame. - to_chat(H, "[C.p_they(TRUE)] will bring no honor to your Clan!") + to_chat(H, span_warning("[C.p_they(TRUE)] will bring no honor to your Clan!")) return if(locate(/obj/structure/energy_net) in get_turf(C))//Check if they are already being affected by an energy net. - to_chat(H, "[C.p_they(TRUE)] are already trapped inside an energy net!") + to_chat(H, span_warning("[C.p_they(TRUE)] are already trapped inside an energy net!")) return for(var/turf/T in getline(get_turf(H), get_turf(C))) if(T.density)//Don't want them shooting nets through walls. It's kind of cheesy. - to_chat(H, "I may not use an energy net through solid obstacles!") + to_chat(H, span_warning("I may not use an energy net through solid obstacles!")) return if(!ninjacost(200,N_STEALTH_CANCEL)) H.Beam(C,"n_beam",time=15) @@ -23,7 +23,7 @@ var/obj/structure/energy_net/E = new /obj/structure/energy_net(C.drop_location()) E.affecting = C E.master = H - H.visible_message("[H] caught [C] with an energy net!","I caught [C] with an energy net!") + H.visible_message(span_danger("[H] caught [C] with an energy net!"),span_notice("I caught [C] with an energy net!")) if(C.buckled) C.buckled.unbuckle_mob(affecting,TRUE) diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm index bc7286315..77cb8cb96 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm @@ -10,5 +10,5 @@ smoke.start() playsound(H.loc, 'sound/blank.ogg', 50, 2) s_bombs-- - to_chat(H, "There are [s_bombs] smoke bombs remaining.") + to_chat(H, span_notice("There are [s_bombs] smoke bombs remaining.")) s_coold = 1 diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm index 31ac62d9f..64f9de0bc 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm @@ -6,7 +6,7 @@ var/mob/living/carbon/human/H = affecting var/obj/item/throwing_star/ninja/N = new(H) if(H.put_in_hands(N)) - to_chat(H, "A throwing star has been created in your hand!") + to_chat(H, span_notice("A throwing star has been created in your hand!")) else qdel(N) H.throw_mode_on() //So they can quickly throw it. diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm index e4a654d88..f1abbde54 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm @@ -15,12 +15,12 @@ Contents: cancel_stealth() else if(cell.charge <= 0) - to_chat(U, "I don't have enough power to enable Stealth!") + to_chat(U, span_warning("I don't have enough power to enable Stealth!")) return stealth = !stealth animate(U, alpha = 50,time = 15) - U.visible_message("[U.name] vanishes into thin air!", \ - "I are now mostly invisible to normal detection.") + U.visible_message(span_warning("[U.name] vanishes into thin air!"), \ + span_notice("I are now mostly invisible to normal detection.")) /obj/item/clothing/suit/space/space_ninja/proc/cancel_stealth() @@ -30,8 +30,8 @@ Contents: if(stealth) stealth = !stealth animate(U, alpha = 255, time = 15) - U.visible_message("[U.name] appears from thin air!", \ - "I are now visible.") + U.visible_message(span_warning("[U.name] appears from thin air!"), \ + span_notice("I are now visible.")) return 1 return 0 @@ -40,4 +40,4 @@ Contents: if(!s_busy) toggle_stealth() else - to_chat(affecting, "Stealth does not appear to work!") + to_chat(affecting, span_danger("Stealth does not appear to work!")) diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm index 6948354c8..6b5437501 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm @@ -6,7 +6,7 @@ var/inview = 1 if(!energyKatana) - to_chat(H, "Could not locate Energy Katana!") + to_chat(H, span_warning("Could not locate Energy Katana!")) return if(energyKatana in H) @@ -29,7 +29,7 @@ if(inview) //If we can see the katana, throw it towards ourselves, damaging people as we go. energyKatana.spark_system.start() playsound(H, "sparks", 50, TRUE) - H.visible_message("\the [energyKatana] flies towards [H]!","I hold out your hand and \the [energyKatana] flies towards you!") + H.visible_message(span_danger("\the [energyKatana] flies towards [H]!"),span_warning("I hold out your hand and \the [energyKatana] flies towards you!")) energyKatana.throw_at(H, distance+1, energyKatana.throw_speed,H) else //Else just TP it to us. diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm index a7bc1559a..8f63f8f69 100644 --- a/code/modules/ninja/suit/ninjaDrainAct.dm +++ b/code/modules/ninja/suit/ninjaDrainAct.dm @@ -127,14 +127,14 @@ They *could* go in their appropriate files, but this is supposed to be modular . = DRAIN_RD_HACK_FAILED - to_chat(H, "Hacking \the [src]...") + to_chat(H, span_notice("Hacking \the [src]...")) AI_notify_hack() if(stored_research) - to_chat(H, "Copying files...") + to_chat(H, span_notice("Copying files...")) if(do_after(H, S.s_delay, target = src) && G.candrain && src) stored_research.copy_research_to(S.stored_research) - to_chat(H, "Data analyzed. Process finished.") + to_chat(H, span_notice("Data analyzed. Process finished.")) //RD SERVER// //Shamelessly copypasted from above, since these two used to be the same proc, but with MANY colon operators @@ -144,14 +144,14 @@ They *could* go in their appropriate files, but this is supposed to be modular . = DRAIN_RD_HACK_FAILED - to_chat(H, "Hacking \the [src]...") + to_chat(H, span_notice("Hacking \the [src]...")) AI_notify_hack() if(stored_research) - to_chat(H, "Copying files...") + to_chat(H, span_notice("Copying files...")) if(do_after(H, S.s_delay, target = src) && G.candrain && src) stored_research.copy_research_to(S.stored_research) - to_chat(H, "Data analyzed. Process finished.") + to_chat(H, span_notice("Data analyzed. Process finished.")) //WIRE// @@ -199,7 +199,7 @@ They *could* go in their appropriate files, but this is supposed to be modular var/drain = 0 //Drain amount . = 0 - occupant_message("Warning: Unauthorized access through sub-route 4, block H, detected.") + occupant_message(span_danger("Warning: Unauthorized access through sub-route 4, block H, detected.")) if(get_charge()) while(G.candrain && cell.charge > 0 && !maxcapacity) drain = rand(G.mindrain,G.maxdrain) @@ -226,7 +226,7 @@ They *could* go in their appropriate files, but this is supposed to be modular var/drain = 0 //Drain amount . = 0 - to_chat(src, "Warning: Unauthorized access through sub-route 12, block C, detected.") + to_chat(src, span_danger("Warning: Unauthorized access through sub-route 12, block C, detected.")) if(cell && cell.charge) while(G.candrain && cell.charge > 0 && !maxcapacity) @@ -260,5 +260,5 @@ They *could* go in their appropriate files, but this is supposed to be modular var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread() spark_system.set_up(5, 0, loc) playsound(src, "sparks", 50, TRUE) - visible_message("[H] electrocutes [src] with [H.p_their()] touch!", "[H] electrocutes you with [H.p_their()] touch!") + visible_message(span_danger("[H] electrocutes [src] with [H.p_their()] touch!"), span_danger("[H] electrocutes you with [H.p_their()] touch!")) electrocute_act(25, H) diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index f2b30e26d..930cc9173 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -98,7 +98,7 @@ Contents: if(!istype(H)) return FALSE if(!is_ninja(H)) - to_chat(H, "fÄTaL ÈÈRRoR: 382200-*#00CÖDE RED\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR...") + to_chat(H, span_danger("fÄTaL ÈÈRRoR: 382200-*#00CÖDE RED\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR...")) H.gib() return FALSE if(!istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja)) @@ -161,7 +161,7 @@ Contents: toggle_on_off() return TRUE if(!s_initialized) - to_chat(user, "ERROR: suit offline. Please activate suit.") + to_chat(user, span_warning("ERROR: suit offline. Please activate suit.")) return FALSE if(istype(action, /datum/action/item_action/ninjasmoke)) ninjasmoke() diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm index 14cfc31f5..9253458e4 100644 --- a/code/modules/ninja/suit/suit_attackby.dm +++ b/code/modules/ninja/suit/suit_attackby.dm @@ -8,19 +8,19 @@ if(I.reagents.has_reagent(/datum/reagent/uranium/radium, a_transfer) && a_boost < a_maxamount) I.reagents.remove_reagent(/datum/reagent/uranium/radium, a_transfer) a_boost++; - to_chat(U, "There are now [a_boost] adrenaline boosts remaining.") + to_chat(U, span_notice("There are now [a_boost] adrenaline boosts remaining.")) return if(I.reagents.has_reagent(/datum/reagent/smoke_powder, a_transfer) && s_bombs < s_maxamount) I.reagents.remove_reagent(/datum/reagent/smoke_powder, a_transfer) s_bombs++; - to_chat(U, "There are now [s_bombs] smoke bombs remaining.") + to_chat(U, span_notice("There are now [s_bombs] smoke bombs remaining.")) return else if(istype(I, /obj/item/stock_parts/cell)) var/obj/item/stock_parts/cell/CELL = I if(CELL.maxcharge > cell.maxcharge && n_gloves && n_gloves.candrain) - to_chat(U, "Higher maximum capacity detected.\nUpgrading...") + to_chat(U, span_notice("Higher maximum capacity detected.\nUpgrading...")) if (n_gloves && n_gloves.candrain && do_after(U,s_delay, target = src)) U.transferItemToLoc(CELL, src) CELL.charge = min(CELL.charge+cell.charge, CELL.maxcharge) @@ -31,22 +31,22 @@ old_cell.corrupt() old_cell.update_icon() cell = CELL - to_chat(U, "Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%") + to_chat(U, span_notice("Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%")) else - to_chat(U, "Procedure interrupted. Protocol terminated.") + to_chat(U, span_danger("Procedure interrupted. Protocol terminated.")) return else if(istype(I, /obj/item/disk/tech_disk))//If it's a data disk, we want to copy the research on to the suit. var/obj/item/disk/tech_disk/TD = I var/has_research = 0 if(has_research)//If it has something on it. - to_chat(U, "Research information detected, processing...") + to_chat(U, span_notice("Research information detected, processing...")) if(do_after(U,s_delay, target = src)) TD.stored_research.copy_research_to(stored_research) - to_chat(U, "Data analyzed and updated. Disk erased.") + to_chat(U, span_notice("Data analyzed and updated. Disk erased.")) else to_chat(U, "ERROR: Procedure interrupted. Process terminated.") else - to_chat(U, "No research information detected.") + to_chat(U, span_notice("No research information detected.")) return return ..() diff --git a/code/modules/ninja/suit/suit_initialisation.dm b/code/modules/ninja/suit/suit_initialisation.dm index 20118ea48..65aca9305 100644 --- a/code/modules/ninja/suit/suit_initialisation.dm +++ b/code/modules/ninja/suit/suit_initialisation.dm @@ -12,41 +12,41 @@ if(!U.mind) return //Not sure how this could happen. s_busy = TRUE - to_chat(U, "Now initializing...") + to_chat(U, span_notice("Now initializing...")) addtimer(CALLBACK(src, PROC_REF(ninitialize_two), delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/ninitialize_two(delay, mob/living/carbon/human/U) if(!lock_suit(U))//To lock the suit onto wearer. s_busy = FALSE return - to_chat(U, "Securing external locking mechanism...\nNeural-net established.") + to_chat(U, span_notice("Securing external locking mechanism...\nNeural-net established.")) addtimer(CALLBACK(src, PROC_REF(ninitialize_three), delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/ninitialize_three(delay, mob/living/carbon/human/U) - to_chat(U, "Extending neural-net interface...\nNow monitoring brain wave pattern...") + to_chat(U, span_notice("Extending neural-net interface...\nNow monitoring brain wave pattern...")) addtimer(CALLBACK(src, PROC_REF(ninitialize_four), delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/ninitialize_four(delay, mob/living/carbon/human/U) if(U.stat == DEAD|| U.health <= 0) - to_chat(U, "FĆAL �Rr�R: 344--93#�&&21 BR��N |/|/aV� PATT$RN RED\nA-A-aB�rT�NG...") + to_chat(U, span_danger("FĆAL �Rr�R: 344--93#�&&21 BR��N |/|/aV� PATT$RN RED\nA-A-aB�rT�NG...")) unlock_suit() s_busy = FALSE return lockIcons(U)//Check for icons. U.regenerate_icons() - to_chat(U, "Linking neural-net interface...\nPattern\green GREEN, continuing operation.") + to_chat(U, span_notice("Linking neural-net interface...\nPattern
\green GREEN, continuing operation.")) addtimer(CALLBACK(src, PROC_REF(ninitialize_five), delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/ninitialize_five(delay, mob/living/carbon/human/U) - to_chat(U, "VOID-shift device status: ONLINE.\nCLOAK-tech device status: ONLINE.") + to_chat(U, span_notice("VOID-shift device status: ONLINE.\nCLOAK-tech device status: ONLINE.")) addtimer(CALLBACK(src, PROC_REF(ninitialize_six), delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/ninitialize_six(delay, mob/living/carbon/human/U) - to_chat(U, "Primary system status: ONLINE.\nBackup system status: ONLINE.\nCurrent energy capacity: [DisplayEnergy(cell.charge)].") + to_chat(U, span_notice("Primary system status: ONLINE.\nBackup system status: ONLINE.\nCurrent energy capacity: [DisplayEnergy(cell.charge)].")) addtimer(CALLBACK(src, PROC_REF(ninitialize_seven), delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/ninitialize_seven(delay, mob/living/carbon/human/U) - to_chat(U, "All systems operational. Welcome to SpiderOS, [U.real_name].") + to_chat(U, span_notice("All systems operational. Welcome to SpiderOS, [U.real_name].")) s_initialized = TRUE ntick() s_busy = FALSE @@ -62,32 +62,32 @@ addtimer(CALLBACK(src, PROC_REF(deinitialize_two), delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/deinitialize_two(delay, mob/living/carbon/human/U) - to_chat(U, "Now de-initializing...") + to_chat(U, span_notice("Now de-initializing...")) addtimer(CALLBACK(src, PROC_REF(deinitialize_three), delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/deinitialize_three(delay, mob/living/carbon/human/U) - to_chat(U, "Logging off, [U.real_name]. Shutting down SpiderOS.") + to_chat(U, span_notice("Logging off, [U.real_name]. Shutting down SpiderOS.")) addtimer(CALLBACK(src, PROC_REF(deinitialize_four), delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/deinitialize_four(delay, mob/living/carbon/human/U) - to_chat(U, "Primary system status: OFFLINE.\nBackup system status: OFFLINE.") + to_chat(U, span_notice("Primary system status: OFFLINE.\nBackup system status: OFFLINE.")) addtimer(CALLBACK(src, PROC_REF(deinitialize_five), delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/deinitialize_five(delay, mob/living/carbon/human/U) - to_chat(U, "VOID-shift device status: OFFLINE.\nCLOAK-tech device status: OFFLINE.") + to_chat(U, span_notice("VOID-shift device status: OFFLINE.\nCLOAK-tech device status: OFFLINE.")) cancel_stealth()//Shutdowns stealth. addtimer(CALLBACK(src, PROC_REF(deinitialize_six), delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/deinitialize_six(delay, mob/living/carbon/human/U) - to_chat(U, "Disconnecting neural-net interface...\greenSuccess.") + to_chat(U, span_notice("Disconnecting neural-net interface...\greenSuccess.")) addtimer(CALLBACK(src, PROC_REF(deinitialize_seven), delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/deinitialize_seven(delay, mob/living/carbon/human/U) - to_chat(U, "Disengaging neural-net interface...\greenSuccess.") + to_chat(U, span_notice("Disengaging neural-net interface...\greenSuccess.")) addtimer(CALLBACK(src, PROC_REF(deinitialize_eight), delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/deinitialize_eight(delay, mob/living/carbon/human/U) - to_chat(U, "Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: FINISHED.") + to_chat(U, span_notice("Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: FINISHED.")) unlock_suit() U.regenerate_icons() s_initialized = FALSE diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm index 9fd997d25..8b5a4fb91 100644 --- a/code/modules/paperwork/carbonpaper.dm +++ b/code/modules/paperwork/carbonpaper.dm @@ -29,14 +29,14 @@ Copy.name = "Copy - [C.name]" Copy.fields = C.fields Copy.updateinfolinks() - to_chat(user, "I tear off the carbon-copy!") + to_chat(user, span_notice("I tear off the carbon-copy!")) C.copied = TRUE Copy.iscopy = TRUE Copy.update_icon_state() C.update_icon_state() user.put_in_hands(Copy) else - to_chat(user, "There are no more carbon copies attached to this paper!") + to_chat(user, span_notice("There are no more carbon copies attached to this paper!")) /obj/item/paper/carbon/attack_hand(mob/living/user) if(loc == user && user.is_holding(src)) diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 9c7605407..0d2d9b6b0 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -13,7 +13,7 @@ resistance_flags = FLAMMABLE /obj/item/clipboard/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins putting [user.p_their()] head into the clip of \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins putting [user.p_their()] head into the clip of \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS//the clipboard's clip is very strong. industrial duty. can kill a man easily. /obj/item/clipboard/Initialize() @@ -42,7 +42,7 @@ if(!user.transferItemToLoc(W, src)) return toppaper = W - to_chat(user, "I clip the paper onto \the [src].") + to_chat(user, span_notice("I clip the paper onto \the [src].")) update_icon() else if(toppaper) toppaper.attackby(user.get_active_held_item(), user) @@ -91,7 +91,7 @@ if(!usr.transferItemToLoc(W, src)) return haspen = W - to_chat(usr, "I slot [W] into [src].") + to_chat(usr, span_notice("I slot [W] into [src].")) if(href_list["write"]) var/obj/item/P = locate(href_list["write"]) in src @@ -121,7 +121,7 @@ var/obj/item/P = locate(href_list["top"]) in src if(istype(P)) toppaper = P - to_chat(usr, "I move [P.name] to the top.") + to_chat(usr, span_notice("I move [P.name] to the top.")) //Update everything attack_self(usr) diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index 32680c1c5..199acd09d 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -41,12 +41,12 @@ else deconvert = prob (5) if(deconvert) - M.visible_message("[user] reminds [M] that [M]'s soul was already purchased by Nanotrasen!") - to_chat(M, "I feel that my soul has returned to its rightful owner, Nanotrasen.") + M.visible_message(span_notice("[user] reminds [M] that [M]'s soul was already purchased by Nanotrasen!")) + to_chat(M, span_boldnotice("I feel that my soul has returned to its rightful owner, Nanotrasen.")) M.return_soul() else - M.visible_message("[user] beats [M] over the head with [src]!", \ - "[user] beats [M] over the head with [src]!") + M.visible_message(span_danger("[user] beats [M] over the head with [src]!"), \ + span_danger("[user] beats [M] over the head with [src]!")) return ..() @@ -101,7 +101,7 @@ if(signed && (user == target.current) && istype(user, /mob/living/carbon/human/)) var/mob/living/carbon/human/H = user H.say("OH GREAT INFERNO! I DEMAND YOU COLLECT YOUR BOUNTY IMMEDIATELY!", forced = "infernal contract suicide") - H.visible_message("[H] holds up a contract claiming [user.p_their()] soul, then immediately catches fire. It looks like [user.p_theyre()] trying to commit suicide!") + H.visible_message(span_suicide("[H] holds up a contract claiming [user.p_their()] soul, then immediately catches fire. It looks like [user.p_theyre()] trying to commit suicide!")) H.adjust_fire_stacks(20) H.IgniteMob() return(FIRELOSS) @@ -172,47 +172,47 @@ if(istype(P, /obj/item/pen) || istype(P, /obj/item/toy/crayon)) attempt_signature(user) else if(istype(P, /obj/item/stamp)) - to_chat(user, "I stamp the paper with my rubber stamp, however the ink ignites as you release the stamp.") + to_chat(user, span_notice("I stamp the paper with my rubber stamp, however the ink ignites as you release the stamp.")) else if(P.get_temperature()) - user.visible_message("[user] brings [P] next to [src], but [src] does not catch fire!", "[src] refuses to ignite!") + user.visible_message(span_danger("[user] brings [P] next to [src], but [src] does not catch fire!"), span_danger("[src] refuses to ignite!")) else return ..() /obj/item/paper/contract/infernal/attack(mob/M, mob/living/user) add_fingerprint(user) if(M == user && target == M.mind && M.mind.soulOwner != owner && attempt_signature(user, 1)) - user.visible_message("[user] slices [user.p_their()] wrist with [src], and scrawls [user.p_their()] name in blood.", "I slice my wrist open and scrawl my name in blood.") + user.visible_message(span_danger("[user] slices [user.p_their()] wrist with [src], and scrawls [user.p_their()] name in blood."), span_danger("I slice my wrist open and scrawl my name in blood.")) user.blood_volume = max(user.blood_volume - 100, 0) else return ..() /obj/item/paper/contract/infernal/proc/attempt_signature(mob/living/carbon/human/user, blood = 0) if(!user.IsAdvancedToolUser() || !user.is_literate()) - to_chat(user, "I don't know how to read or write!") + to_chat(user, span_warning("I don't know how to read or write!")) return 0 if(user.mind != target) - to_chat(user, "My signature simply slides off the sheet, it seems this contract is not meant for you to sign!") + to_chat(user, span_warning("My signature simply slides off the sheet, it seems this contract is not meant for you to sign!")) return 0 if(user.mind.soulOwner == owner) - to_chat(user, "This devil already owns my soul, you may not sell it to [owner.p_them()] again!") + to_chat(user, span_warning("This devil already owns my soul, you may not sell it to [owner.p_them()] again!")) return 0 if(signed) - to_chat(user, "This contract has already been signed! It may not be signed again.") + to_chat(user, span_warning("This contract has already been signed! It may not be signed again.")) return 0 if(!user.mind.hasSoul) - to_chat(user, "I do not possess a soul.") + to_chat(user, span_warning("I do not possess a soul.")) return 0 if(HAS_TRAIT(user, TRAIT_DUMB)) - to_chat(user, "I quickly scrawl 'your name' on the contract.") + to_chat(user, span_notice("I quickly scrawl 'your name' on the contract.")) signIncorrectly() return 0 if (contractType == CONTRACT_REVIVE) - to_chat(user, "I are already alive, this contract would do nothing.") + to_chat(user, span_warning("I are already alive, this contract would do nothing.")) return 0 else - to_chat(user, "I quickly scrawl my name on the contract.") + to_chat(user, span_notice("I quickly scrawl my name on the contract.")) if(fulfillContract(target.current, blood)<=0) - to_chat(user, "But it seemed to have no effect, perhaps even Hell itself cannot grant this boon?") + to_chat(user, span_notice("But it seemed to have no effect, perhaps even Hell itself cannot grant this boon?")) return 1 @@ -220,7 +220,7 @@ /obj/item/paper/contract/infernal/revive/attack(mob/M, mob/living/user) if (target == M.mind && M.stat == DEAD && M.mind.soulOwner == M.mind) if (cooldown) - to_chat(user, "Give [M] a chance to think through the contract, don't rush [M.p_them()]!") + to_chat(user, span_warning("Give [M] a chance to think through the contract, don't rush [M.p_them()]!")) return 0 cooldown = TRUE var/mob/living/carbon/human/H = M @@ -236,7 +236,7 @@ if(response == "Yes") H.revive(full_heal = TRUE, admin_revive = FALSE) log_combat(user, H, "infernally revived via contract") - user.visible_message("With a sudden blaze, [H] stands back up.") + user.visible_message(span_notice("With a sudden blaze, [H] stands back up.")) H.fakefire() fulfillContract(H, TRUE)//Revival contracts are always signed in blood addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, fakefireextinguish)), 5, TIMER_UNIQUE) @@ -259,8 +259,8 @@ var/datum/antagonist/devil/devilInfo = owner.has_antag_datum(/datum/antagonist/devil) devilInfo.add_soul(user.mind) update_text(user.real_name, blood) - to_chat(user, "A profound emptiness washes over you as you lose ownership of my soul.") - to_chat(user, "This does NOT make you an antagonist if you were not already.") + to_chat(user, span_notice("A profound emptiness washes over you as you lose ownership of my soul.")) + to_chat(user, span_boldnotice("This does NOT make you an antagonist if you were not already.")) SSblackbox.record_feedback("tally", "infernal contract", 1, contractType) return TRUE diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 9308c8f34..dfee4d056 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -49,18 +49,18 @@ if(istype(P, /obj/item/paper) || istype(P, /obj/item/folder) || istype(P, /obj/item/photo) || istype(P, /obj/item/documents)) if(!user.transferItemToLoc(P, src)) return - to_chat(user, "I put [P] in [src].") + to_chat(user, span_notice("I put [P] in [src].")) icon_state = "[initial(icon_state)]-open" sleep(5) icon_state = initial(icon_state) updateUsrDialog() else if(P.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I begin to [anchored ? "unwrench" : "wrench"] [src].") + to_chat(user, span_notice("I begin to [anchored ? "unwrench" : "wrench"] [src].")) if(P.use_tool(src, user, 20, volume=50)) - to_chat(user, "I successfully [anchored ? "unwrench" : "wrench"] [src].") + to_chat(user, span_notice("I successfully [anchored ? "unwrench" : "wrench"] [src].")) anchored = !anchored else if(user.used_intent.type != INTENT_HARM) - to_chat(user, "I can't put [P] in [src]!") + to_chat(user, span_warning("I can't put [P] in [src]!")) else return ..() @@ -68,7 +68,7 @@ /obj/structure/filingcabinet/ui_interact(mob/user) . = ..() if(contents.len <= 0) - to_chat(user, "[src] is empty.") + to_chat(user, span_notice("[src] is empty.")) return var/dat = "
" @@ -92,9 +92,9 @@ I.forceMove(loc) if(prob(25)) step_rand(I) - to_chat(user, "I pull \a [I] out of [src] at random.") + to_chat(user, span_notice("I pull \a [I] out of [src] at random.")) return - to_chat(user, "I find nothing in [src].") + to_chat(user, span_notice("I find nothing in [src].")) /obj/structure/filingcabinet/Topic(href, href_list) if(!usr.canUseTopic(src, BE_CLOSE, ismonkey(usr))) @@ -219,5 +219,5 @@ GLOBAL_LIST_EMPTY(employmentCabinets) // prevents the devil from just instantly emptying the cabinet, ensuring an easy win. addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10 SECONDS) else - to_chat(user, "[src] is jammed, give it a few seconds.") + to_chat(user, span_warning("[src] is jammed, give it a few seconds.")) ..() diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 4917eb8ab..246007c91 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -8,7 +8,7 @@ resistance_flags = FLAMMABLE /obj/item/folder/suicide_act(mob/living/user) - user.visible_message("[user] begins filing an imaginary death warrant! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins filing an imaginary death warrant! It looks like [user.p_theyre()] trying to commit suicide!")) return OXYLOSS /obj/item/folder/blue @@ -38,11 +38,11 @@ if(istype(W, /obj/item/paper) || istype(W, /obj/item/photo) || istype(W, /obj/item/documents)) if(!user.transferItemToLoc(W, src)) return - to_chat(user, "I put [W] into [src].") + to_chat(user, span_notice("I put [W] into [src].")) update_icon() else if(istype(W, /obj/item/pen)) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on the cover of [src]!") + to_chat(user, span_notice("I scribble illegibly on the cover of [src]!")) return var/inputvalue = input(user, "What would you like to label the folder?", "Folder Labelling", null) as text|null diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 6abedd398..a96f240c2 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -9,7 +9,7 @@ var/mode = 0 /obj/item/hand_labeler/suicide_act(mob/user) - user.visible_message("[user] is pointing [src] at [user.p_them()]self. [user.p_theyre(TRUE)] going to label [user.p_them()]self as a suicide!") + user.visible_message(span_suicide("[user] is pointing [src] at [user.p_them()]self. [user.p_theyre(TRUE)] going to label [user.p_them()]self as a suicide!")) labels_left = max(labels_left - 1, 0) var/old_real_name = user.real_name @@ -43,46 +43,46 @@ return if(!labels_left) - to_chat(user, "No labels left!") + to_chat(user, span_warning("No labels left!")) return if(!label || !length(label)) - to_chat(user, "No text set!") + to_chat(user, span_warning("No text set!")) return if(length(A.name) + length(label) > 64) - to_chat(user, "Label too big!") + to_chat(user, span_warning("Label too big!")) return if(ismob(A)) - to_chat(user, "I can't label creatures!") // use a collar + to_chat(user, span_warning("I can't label creatures!")) // use a collar return - user.visible_message("[user] labels [A] as [label].", \ - "I label [A] as [label].") + user.visible_message(span_notice("[user] labels [A] as [label]."), \ + span_notice("I label [A] as [label].")) A.name = "[A.name] ([label])" labels_left-- /obj/item/hand_labeler/attack_self(mob/user) if(!user.IsAdvancedToolUser()) - to_chat(user, "I don't have the dexterity to use [src]!") + to_chat(user, span_warning("I don't have the dexterity to use [src]!")) return mode = !mode icon_state = "labeler[mode]" if(mode) - to_chat(user, "I turn on [src].") + to_chat(user, span_notice("I turn on [src].")) //Now let them chose the text. var/str = copytext(reject_bad_text(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN) if(!str || !length(str)) - to_chat(user, "Invalid text!") + to_chat(user, span_warning("Invalid text!")) return label = str - to_chat(user, "I set the text to '[str]'.") + to_chat(user, span_notice("I set the text to '[str]'.")) else - to_chat(user, "I turn off [src].") + to_chat(user, span_notice("I turn off [src].")) /obj/item/hand_labeler/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/hand_labeler_refill)) - to_chat(user, "I insert [I] into [src].") + to_chat(user, span_notice("I insert [I] into [src].")) qdel(I) labels_left = initial(labels_left) //Yes, it's capped at its initial value diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index fc64e0327..452c221bf 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -154,7 +154,7 @@ // var/atom/movable/screen/read/R = user.hud_used.reads format_browse(info, user) else - return "I'm too far away to read it." + return span_warning("I'm too far away to read it.") /* if(in_range(user, src) || isobserver(user)) @@ -165,7 +165,7 @@ user << browse("[name][extra_headers][stars(info)]
", "window=paper[md5(name)]") onclose(user, "paper[md5(name)]") else - return "You're too far away to read it." + return span_warning("You're too far away to read it.") */ /obj/item/paper/verb/rename() set name = "Rename paper" @@ -177,7 +177,7 @@ if(ishuman(usr)) var/mob/living/carbon/human/H = usr if(HAS_TRAIT(H, TRAIT_CLUMSY) && prob(25)) - to_chat(H, "I cut myself on the paper! Ahhhh! Ahhhhh!") + to_chat(H, span_warning("I cut myself on the paper! Ahhhh! Ahhhhh!")) H.damageoverlaytemp = 9001 H.update_damage_hud() return @@ -188,7 +188,7 @@ /obj/item/paper/suicide_act(mob/user) - user.visible_message("[user] scratches a grid on [user.p_their()] wrist with the paper! It looks like [user.p_theyre()] trying to commit sudoku...") + user.visible_message(span_suicide("[user] scratches a grid on [user.p_their()] wrist with the paper! It looks like [user.p_theyre()] trying to commit sudoku...")) return (BRUTELOSS) /obj/item/paper/proc/reset_spamflag() @@ -196,7 +196,7 @@ /obj/item/paper/attack_self(mob/user) if(mailer) - user.visible_message("[user] opens the letter from [mailer].") + user.visible_message(span_notice("[user] opens the letter from [mailer].")) cached_mailer = mailer cached_mailedto = mailedto mailer = null @@ -387,7 +387,7 @@ if(t != null) //No input from the user means nothing needs to be added if((length(info) + length(t)) > maxlen) - to_chat(usr, "Too long. Try again.") + to_chat(usr, span_warning("Too long. Try again.")) return if(id!="end") addtofield(text2num(id), t) // He wants to edit a field, let him. @@ -422,14 +422,14 @@ if(istype(P, /obj/item/pen) || istype(P, /obj/item/natural/thorn)|| istype(P, /obj/item/natural/feather)) if(length(info) > maxlen) - to_chat(user, "[src] is full of verba.") + to_chat(user, span_warning("[src] is full of verba.")) return if(user.can_read(src)) format_browse(info_links, user) update_icon_state() return else - to_chat(user, "I can't write.") + to_chat(user, span_warning("I can't write.")) return return @@ -451,7 +451,7 @@ if(!P.can_be_package_wrapped()) return ..() - to_chat(user, "I start to wrap [P] in [src]...") + to_chat(user, span_info("I start to wrap [P] in [src]...")) if(do_after(user, 30, 0, target = src)) if(user.is_holding(P)) if(!user.dropItemToGround(P)) @@ -486,12 +486,12 @@ LAZYADD(stamped, P.icon_state) add_overlay(stampoverlay) - to_chat(user, "I stamp the paper with your rubber stamp.") + to_chat(user, span_notice("I stamp the paper with your rubber stamp.")) if(P.get_temperature()) if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10)) - user.visible_message("[user] accidentally ignites [user.p_them()]self!", \ - "I miss the paper and accidentally light myself on fire!") + user.visible_message(span_warning("[user] accidentally ignites [user.p_them()]self!"), \ + span_danger("I miss the paper and accidentally light myself on fire!")) user.dropItemToGround(P) user.adjust_fire_stacks(1) user.IgniteMob() @@ -501,7 +501,7 @@ return user.dropItemToGround(src) - user.visible_message("[user] lights [src] ablaze with [P]!", "I light [src] on fire!") + user.visible_message(span_danger("[user] lights [src] ablaze with [P]!"), span_danger("I light [src] on fire!")) fire_act()*/ add_fingerprint(user) diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm index 91ff1a658..d886ba190 100644 --- a/code/modules/paperwork/paper_cutter.dm +++ b/code/modules/paperwork/paper_cutter.dm @@ -20,7 +20,7 @@ /obj/item/papercutter/suicide_act(mob/user) if(storedcutter) - user.visible_message("[user] is beheading [user.p_them()]self with [src.name]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is beheading [user.p_them()]self with [src.name]! It looks like [user.p_theyre()] trying to commit suicide!")) if(iscarbon(user)) var/mob/living/carbon/C = user var/obj/item/bodypart/BP = C.get_bodypart(BODY_ZONE_HEAD) @@ -29,7 +29,7 @@ playsound(loc, "desceration" ,50, TRUE, -1) return (BRUTELOSS) else - user.visible_message("[user] repeatedly bashes [src.name] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] repeatedly bashes [src.name] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(loc, 'sound/blank.ogg', 50, TRUE, -1) return (BRUTELOSS) @@ -47,21 +47,21 @@ if(!user.transferItemToLoc(P, src)) return playsound(loc, "pageturn", 60, TRUE) - to_chat(user, "I place [P] in [src].") + to_chat(user, span_notice("I place [P] in [src].")) storedpaper = P update_icon() return if(istype(P, /obj/item/hatchet/cutterblade) && !storedcutter) if(!user.transferItemToLoc(P, src)) return - to_chat(user, "I replace [src]'s [P].") + to_chat(user, span_notice("I replace [src]'s [P].")) P.forceMove(src) storedcutter = P update_icon() return if(P.tool_behaviour == TOOL_SCREWDRIVER && storedcutter) P.play_tool_sound(src) - to_chat(user, "[storedcutter] has been [cuttersecured ? "unsecured" : "secured"].") + to_chat(user, span_notice("[storedcutter] has been [cuttersecured ? "unsecured" : "secured"].")) cuttersecured = !cuttersecured return ..() @@ -72,18 +72,18 @@ return add_fingerprint(user) if(!storedcutter) - to_chat(user, "The cutting blade is gone! You can't use [src] now.") + to_chat(user, span_warning("The cutting blade is gone! You can't use [src] now.")) return if(!cuttersecured) - to_chat(user, "I remove [src]'s [storedcutter].") + to_chat(user, span_notice("I remove [src]'s [storedcutter].")) user.put_in_hands(storedcutter) storedcutter = null update_icon() if(storedpaper) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I neatly cut [storedpaper].") + to_chat(user, span_notice("I neatly cut [storedpaper].")) storedpaper = null qdel(storedpaper) new /obj/item/paperslip(get_turf(src)) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 0124f98b4..4027d7fbb 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -70,7 +70,7 @@ P.add_fingerprint(user) P.forceMove(user.loc) user.put_in_hands(P) - to_chat(user, "I take [P] out of \the [src].") + to_chat(user, span_notice("I take [P] out of \the [src].")) bin_pen = null update_icon() else if(total_paper >= 1) @@ -92,9 +92,9 @@ P.add_fingerprint(user) P.forceMove(user.loc) user.put_in_hands(P) - to_chat(user, "I take [P] out of \the [src].") + to_chat(user, span_notice("I take [P] out of \the [src].")) else - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) add_fingerprint(user) return ..() @@ -103,7 +103,7 @@ var/obj/item/paper/P = I if(!user.transferItemToLoc(P, src)) return - to_chat(user, "I put [P] in [src].") + to_chat(user, span_notice("I put [P] in [src].")) papers.Add(P) total_paper++ update_icon() @@ -111,7 +111,7 @@ var/obj/item/pen/P = I if(!user.transferItemToLoc(P, src)) return - to_chat(user, "I put [P] in [src].") + to_chat(user, span_notice("I put [P] in [src].")) bin_pen = P update_icon() else @@ -157,7 +157,7 @@ /obj/item/paper_bin/bundlenatural/attackby(obj/item/W, mob/user) if(W.get_sharpness()) - to_chat(user, "I snip \the [src], spilling paper everywhere.") + to_chat(user, span_notice("I snip \the [src], spilling paper everywhere.")) var/turf/T = get_turf(src.loc) while(total_paper > 0) total_paper-- diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index 6ea3aa689..79ac126ea 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -52,7 +52,7 @@ /obj/item/paperplane/suicide_act(mob/living/user) var/obj/item/organ/eyes/eyes = user.getorganslot(ORGAN_SLOT_EYES) user.Stun(200) - user.visible_message("[user] jams [src] in [user.p_their()] nose. It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] jams [src] in [user.p_their()] nose. It looks like [user.p_theyre()] trying to commit suicide!")) user.adjust_blurriness(6) if(eyes) eyes.applyOrganDamage(rand(6,8)) @@ -67,7 +67,7 @@ add_overlay("paperplane_[S]") /obj/item/paperplane/attack_self(mob/user) - to_chat(user, "I unfold [src].") + to_chat(user, span_notice("I unfold [src].")) var/obj/item/paper/internal_paper_tmp = internalPaper internal_paper_tmp.forceMove(loc) internalPaper = null @@ -77,7 +77,7 @@ /obj/item/paperplane/attackby(obj/item/P, mob/living/carbon/human/user, params) ..() if(istype(P, /obj/item/pen) || istype(P, /obj/item/toy/crayon)) - to_chat(user, "I should unfold [src] before changing it!") + to_chat(user, span_warning("I should unfold [src] before changing it!")) return else if(istype(P, /obj/item/stamp)) //we don't randomize stamps on a paperplane @@ -86,8 +86,8 @@ else if(P.get_temperature()) if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10)) - user.visible_message("[user] accidentally ignites [user.p_them()]self!", \ - "I miss [src] and accidentally light myself on fire!") + user.visible_message(span_warning("[user] accidentally ignites [user.p_them()]self!"), \ + span_danger("I miss [src] and accidentally light myself on fire!")) user.dropItemToGround(P) user.adjust_fire_stacks(1) user.IgniteMob() @@ -96,7 +96,7 @@ if(!(in_range(user, src))) //to prevent issues as a result of telepathically lighting a paper return user.dropItemToGround(src) - user.visible_message("[user] lights [src] ablaze with [P]!", "I light [src] on fire!") + user.visible_message(span_danger("[user] lights [src] ablaze with [P]!"), span_danger("I light [src] on fire!")) fire_act() add_fingerprint(user) @@ -120,7 +120,7 @@ if(prob(hit_probability)) if(H.is_eyes_covered()) return - visible_message("\The [src] hits [H] in the eye[eyes ? "" : " socket"]!") + visible_message(span_danger("\The [src] hits [H] in the eye[eyes ? "" : " socket"]!")) H.adjust_blurriness(6) eyes?.applyOrganDamage(rand(6,8)) H.Paralyze(40) @@ -128,7 +128,7 @@ /* /obj/item/paper/examine(mob/user) . = ..() -// . += "Alt-click [src] to fold it into a paper plane." +// . += span_notice("Alt-click [src] to fold it into a paper plane.") /obj/item/paper/AltClick(mob/living/carbon/user, obj/item/I) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) @@ -136,9 +136,9 @@ if(istype(src, /obj/item/paper/carbon)) var/obj/item/paper/carbon/Carbon = src if(!Carbon.iscopy && !Carbon.copied) - to_chat(user, "Take off the carbon copy first.") + to_chat(user, span_notice("Take off the carbon copy first.")) return - to_chat(user, "I fold [src] into the shape of a plane!") + to_chat(user, span_notice("I fold [src] into the shape of a plane!")) user.temporarilyRemoveItemFromInventory(src) var/obj/item/paperplane/plane_type = /obj/item/paperplane //Origami Master diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index f2b92a6df..b43f05cfc 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -29,7 +29,7 @@ var/font = PEN_FONT /obj/item/pen/suicide_act(mob/user) - user.visible_message("[user] is scribbling numbers all over [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit sudoku...") + user.visible_message(span_suicide("[user] is scribbling numbers all over [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit sudoku...")) return(BRUTELOSS) /obj/item/pen/blue @@ -62,7 +62,7 @@ colour = "blue" else colour = "black" - to_chat(user, "\The [src] will now write in [colour].") + to_chat(user, span_notice("\The [src] will now write in [colour].")) desc = "" /obj/item/pen/fountain @@ -102,7 +102,7 @@ // var/deg = input(user, "What angle would you like to rotate the pen head to? (1-360)", "Rotate Pen Head") as null|num // if(deg && (deg > 0 && deg <= 360)) // degrees = deg -// to_chat(user, "I rotate the top of the pen to [degrees] degrees.") +// to_chat(user, span_notice("I rotate the top of the pen to [degrees] degrees.")) // SEND_SIGNAL(src, COMSIG_PEN_ROTATED, deg, user) return @@ -112,9 +112,9 @@ if(!force) if(M.can_inject(user, 1)) - to_chat(user, "I stab [M] with the pen.") + to_chat(user, span_warning("I stab [M] with the pen.")) if(!stealth) - to_chat(M, "I feel a tiny prick!") + to_chat(M, span_danger("I feel a tiny prick!")) . = 1 log_combat(user, M, "stabbed", src) @@ -135,10 +135,10 @@ if(QDELETED(O) || !user.canUseTopic(O, BE_CLOSE)) return if(oldname == input) - to_chat(user, "I changed \the [O.name] to... well... \the [O.name].") + to_chat(user, span_notice("I changed \the [O.name] to... well... \the [O.name].")) else O.name = input - to_chat(user, "\The [oldname] has been successfully been renamed to \the [input].") + to_chat(user, span_notice("\The [oldname] has been successfully been renamed to \the [input].")) O.renamedByPlayer = TRUE if(penchoice == "Change description") @@ -146,7 +146,7 @@ if(QDELETED(O) || !user.canUseTopic(O, BE_CLOSE)) return O.desc = input - to_chat(user, "I have successfully changed \the [O.name]'s description.") + to_chat(user, span_notice("I have successfully changed \the [O.name]'s description.")) /* * Sleepypens @@ -188,9 +188,9 @@ /obj/item/pen/edagger/suicide_act(mob/user) . = BRUTELOSS if(on) - user.visible_message("[user] forcefully rams the pen into their mouth!") + user.visible_message(span_suicide("[user] forcefully rams the pen into their mouth!")) else - user.visible_message("[user] is holding a pen up to their mouth! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is holding a pen up to their mouth! It looks like [user.p_theyre()] trying to commit suicide!")) attack_self(user) /obj/item/pen/edagger/attack_self(mob/living/user) @@ -204,7 +204,7 @@ embedding = embedding.setRating(embed_chance = EMBED_CHANCE) throwforce = initial(throwforce) playsound(user, 'sound/blank.ogg', 5, TRUE) - to_chat(user, "[src] can now be concealed.") + to_chat(user, span_warning("[src] can now be concealed.")) else on = TRUE force = 18 @@ -215,7 +215,7 @@ embedding = embedding.setRating(embed_chance = 100) //rule of cool throwforce = 35 playsound(user, 'sound/blank.ogg', 5, TRUE) - to_chat(user, "[src] is now active.") + to_chat(user, span_warning("[src] is now active.")) update_icon() /obj/item/pen/edagger/update_icon() diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 090248b92..c5ed328bc 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -112,7 +112,7 @@ for(var/i = 0, i < copies, i++) var/icon/temp_img if(ishuman(ass) && (ass.get_item_by_slot(SLOT_PANTS) || ass.get_item_by_slot(SLOT_ARMOR))) - to_chat(usr, "I feel kind of silly, copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "[ass.p_their()]"] clothes on." ) + to_chat(usr, span_notice("I feel kind of silly, copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "[ass.p_their()]"] clothes on.") ) break else if(toner >= 5 && !busy && check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on. if(isalienadult(ass) || istype(ass, /mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro. @@ -148,7 +148,7 @@ remove_photocopy(doccopy, usr) doccopy = null else if(check_ass()) - to_chat(ass, "I feel a slight pressure on your ass.") + to_chat(ass, span_notice("I feel a slight pressure on your ass.")) updateUsrDialog() else if(href_list["min"]) if(copies > 1) @@ -164,7 +164,7 @@ if(toner >= 5 && !busy) var/mob/living/silicon/ai/tempAI = usr if(tempAI.aicamera.stored.len == 0) - to_chat(usr, "No images saved") + to_chat(usr, span_boldannounce("No images saved")) return var/datum/picture/selection = tempAI.aicamera.selectpicture(usr) var/obj/item/photo/photo = new(loc, selection) @@ -187,7 +187,7 @@ /obj/machinery/photocopier/proc/do_insertion(obj/item/O, mob/user) O.forceMove(src) - to_chat(user, "I insert [O] into [src].") + to_chat(user, span_notice("I insert [O] into [src].")) flick("photocopier1", src) updateUsrDialog() @@ -197,7 +197,7 @@ user.put_in_hands(O) else O.forceMove(drop_location()) - to_chat(user, "I take [O] out of [src].") + to_chat(user, span_notice("I take [O] out of [src].")) /obj/machinery/photocopier/attackby(obj/item/O, mob/user, params) if(default_unfasten_wrench(user, O)) @@ -206,7 +206,7 @@ else if(istype(O, /obj/item/paper)) if(copier_empty()) if(istype(O, /obj/item/paper/contract/infernal)) - to_chat(user, "[src] smokes, smelling of brimstone!") + to_chat(user, span_warning("[src] smokes, smelling of brimstone!")) resistance_flags |= FLAMMABLE fire_act() else @@ -215,7 +215,7 @@ copy = O do_insertion(O, user) else - to_chat(user, "There is already something in [src]!") + to_chat(user, span_warning("There is already something in [src]!")) else if(istype(O, /obj/item/photo)) if(copier_empty()) @@ -224,7 +224,7 @@ photocopy = O do_insertion(O, user) else - to_chat(user, "There is already something in [src]!") + to_chat(user, span_warning("There is already something in [src]!")) else if(istype(O, /obj/item/documents)) if(copier_empty()) @@ -233,7 +233,7 @@ doccopy = O do_insertion(O, user) else - to_chat(user, "There is already something in [src]!") + to_chat(user, span_warning("There is already something in [src]!")) else if(istype(O, /obj/item/toner)) if(toner <= 0) @@ -241,13 +241,13 @@ return qdel(O) toner = 40 - to_chat(user, "I insert [O] into [src].") + to_chat(user, span_notice("I insert [O] into [src].")) updateUsrDialog() else - to_chat(user, "This cartridge is not yet ready for replacement! Use up the rest of the toner.") + to_chat(user, span_warning("This cartridge is not yet ready for replacement! Use up the rest of the toner.")) else if(istype(O, /obj/item/areaeditor/blueprints)) - to_chat(user, "The Blueprint is too large to put into the copier. You need to find something else to record the document") + to_chat(user, span_warning("The Blueprint is too large to put into the copier. You need to find something else to record the document")) else return ..() @@ -264,30 +264,30 @@ return src.add_fingerprint(user) if(target == user) - user.visible_message("[user] starts climbing onto the photocopier!", "I start climbing onto the photocopier...") + user.visible_message(span_notice("[user] starts climbing onto the photocopier!"), span_notice("I start climbing onto the photocopier...")) else - user.visible_message("[user] starts putting [target] onto the photocopier!", "I start putting [target] onto the photocopier...") + user.visible_message(span_warning("[user] starts putting [target] onto the photocopier!"), span_notice("I start putting [target] onto the photocopier...")) if(do_after(user, 20, target = src)) if(!target || QDELETED(target) || QDELETED(src) || !Adjacent(target)) //check if the photocopier/target still exists. return if(target == user) - user.visible_message("[user] climbs onto the photocopier!", "I climb onto the photocopier.") + user.visible_message(span_notice("[user] climbs onto the photocopier!"), span_notice("I climb onto the photocopier.")) else - user.visible_message("[user] puts [target] onto the photocopier!", "I put [target] onto the photocopier.") + user.visible_message(span_warning("[user] puts [target] onto the photocopier!"), span_notice("I put [target] onto the photocopier.")) target.forceMove(drop_location()) ass = target if(photocopy) photocopy.forceMove(drop_location()) - visible_message("[photocopy] is shoved out of the way by [ass]!") + visible_message(span_warning("[photocopy] is shoved out of the way by [ass]!")) photocopy = null else if(copy) copy.forceMove(drop_location()) - visible_message("[copy] is shoved out of the way by [ass]!") + visible_message(span_warning("[copy] is shoved out of the way by [ass]!")) copy = null updateUsrDialog() diff --git a/code/modules/paperwork/rogue.dm b/code/modules/paperwork/rogue.dm index 4ded7fb54..5878d0b61 100644 --- a/code/modules/paperwork/rogue.dm +++ b/code/modules/paperwork/rogue.dm @@ -14,7 +14,7 @@ /obj/item/paper/scroll/attackby(obj/item/P, mob/living/carbon/human/user, params) if(istype(P, /obj/item/pen) || istype(P, /obj/item/natural/thorn) || istype(P, /obj/item/natural/feather)) if(!open) - to_chat(user, "Open me.") + to_chat(user, span_warning("Open me.")) return ..() @@ -36,7 +36,7 @@ /obj/item/paper/scroll/attack_self(mob/user) if(mailer) - user.visible_message("[user] opens the missive from [mailer].") + user.visible_message(span_notice("[user] opens the missive from [mailer].")) mailer = null mailedto = null update_icon() @@ -49,7 +49,7 @@ /obj/item/paper/scroll/read(mob/user) if(!open) - to_chat(user, "Open me.") + to_chat(user, span_info("Open me.")) return if(!user.client || !user.hud_used) return @@ -70,7 +70,7 @@ user << browse(dat, "window=reading;size=460x300;can_close=0;can_minimize=0;can_maximize=0;can_resize=0;titlebar=0") onclose(user, "reading", src) else - return "I'm too far away to read it." + return span_warning("I'm too far away to read it.") /obj/item/paper/scroll/Initialize() open = FALSE @@ -149,7 +149,7 @@ if(istype(P, /obj/item/natural/feather)) if(user.is_literate() && open) if(signedname) - to_chat(user, "[signedname]") + to_chat(user, span_warning("[signedname]")) return switch(alert("Sign your name?",,"Yes","No")) if("Yes") @@ -158,7 +158,7 @@ signedname = user.real_name signedjob = user.mind.assigned_role icon_state = "contractsigned" - user.visible_message("[user] signs the [src].") + user.visible_message(span_notice("[user] signs the [src].")) update_icon_state() playsound(src, 'sound/items/write.ogg', 100, FALSE) rebuild_info() @@ -207,10 +207,10 @@ if(signed) return ..() if(!M.get_bleed_rate()) - to_chat(user, "No. The sinner must be bleeding.") + to_chat(user, span_warning("No. The sinner must be bleeding.")) return if(!M.stat) - to_chat(user, "I courteously offer the confession to [M].") + to_chat(user, span_info("I courteously offer the confession to [M].")) if(alert(M, "Sign the confession with your blood?", "CONFESSION OF SIN", "Yes", "No") != "Yes") return if(M.stat) diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 1526e89c6..89a6465ff 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -13,7 +13,7 @@ attack_verb = list("stamped") /obj/item/stamp/suicide_act(mob/user) - user.visible_message("[user] stamps 'VOID' on [user.p_their()] forehead, then promptly falls over, dead.") + user.visible_message(span_suicide("[user] stamps 'VOID' on [user.p_their()] forehead, then promptly falls over, dead.")) return (OXYLOSS) /obj/item/stamp/qm diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm index 8b011752f..c0c529aee 100644 --- a/code/modules/paperwork/ticketmachine.dm +++ b/code/modules/paperwork/ticketmachine.dm @@ -26,19 +26,19 @@ return var/obj/item/multitool/M = I M.buffer = src - to_chat(user, "I store linkage information in [I]'s buffer.") + to_chat(user, span_notice("I store linkage information in [I]'s buffer.")) return TRUE /obj/machinery/ticket_machine/emag_act(mob/user) //Emag the ticket machine to dispense burning tickets, as well as randomize its number to destroy the HoP's mind. if(obj_flags & EMAGGED) return - to_chat(user, "I overload [src]'s bureaucratic logic circuitry to its MAXIMUM setting.") + to_chat(user, span_warning("I overload [src]'s bureaucratic logic circuitry to its MAXIMUM setting.")) ticket_number = rand(0,max_number) current_number = ticket_number obj_flags |= EMAGGED if(tickets.len) for(var/obj/item/ticket_machine_ticket/ticket in tickets) - ticket.audible_message("\the [ticket] disperses!") + ticket.audible_message(span_notice("\the [ticket] disperses!")) qdel(ticket) tickets.Cut() update_icon() @@ -51,14 +51,14 @@ if(current_number > ticket_number) return if(current_number && !(obj_flags & EMAGGED) && tickets[current_number]) - tickets[current_number].audible_message("\the [tickets[current_number]] disperses!") + tickets[current_number].audible_message(span_notice("\the [tickets[current_number]] disperses!")) qdel(tickets[current_number]) if(current_number < ticket_number) current_number ++ //Increment the one we're serving. playsound(src, 'sound/blank.ogg', 50, FALSE) say("Now serving ticket #[current_number]!") if(!(obj_flags & EMAGGED) && tickets[current_number]) - tickets[current_number].audible_message("\the [tickets[current_number]] vibrates!") + tickets[current_number].audible_message(span_notice("\the [tickets[current_number]] vibrates!")) update_icon() //Update our icon here rather than when they take a ticket to show the current ticket number being served /obj/machinery/button/ticket_machine @@ -84,7 +84,7 @@ controller.linked = M.buffer id = null controller.id = null - to_chat(user, "You've linked [src] to [controller.linked].") + to_chat(user, span_warning("You've linked [src] to [controller.linked].")) /obj/item/assembly/control/ticket_machine name = "ticket machine controller" @@ -140,17 +140,17 @@ ..() if(istype(I, /obj/item/hand_labeler_refill)) if(!(ticket_number >= max_number)) - to_chat(user, "[src] refuses [I]! There [max_number-ticket_number==1 ? "is" : "are"] still [max_number-ticket_number] ticket\s left!") + to_chat(user, span_notice("[src] refuses [I]! There [max_number-ticket_number==1 ? "is" : "are"] still [max_number-ticket_number] ticket\s left!")) return - to_chat(user, "I start to refill [src]'s ticket holder (doing this will reset its ticket count!).") + to_chat(user, span_notice("I start to refill [src]'s ticket holder (doing this will reset its ticket count!).")) if(do_after(user, 30, target = src)) - to_chat(user, "I insert [I] into [src] as it whirs nondescriptly.") + to_chat(user, span_notice("I insert [I] into [src] as it whirs nondescriptly.")) qdel(I) ticket_number = 0 current_number = 0 if(tickets.len) for(var/obj/item/ticket_machine_ticket/ticket in tickets) - ticket.audible_message("\the [ticket] disperses!") + ticket.audible_message(span_notice("\the [ticket] disperses!")) qdel(ticket) tickets.Cut() max_number = initial(max_number) @@ -163,17 +163,17 @@ /obj/machinery/ticket_machine/attack_hand(mob/living/carbon/user) . = ..() if(!ready) - to_chat(user,"I press the button, but nothing happens...") + to_chat(user,span_warning("I press the button, but nothing happens...")) return if(ticket_number >= max_number) - to_chat(user,"Ticket supply depleted, please refill this unit with a hand labeller refill cartridge!") + to_chat(user,span_warning("Ticket supply depleted, please refill this unit with a hand labeller refill cartridge!")) return if((user in ticket_holders) && !(obj_flags & EMAGGED)) - to_chat(user, "I already have a ticket!") + to_chat(user, span_warning("I already have a ticket!")) return playsound(src, 'sound/blank.ogg', 100, FALSE) ticket_number ++ - to_chat(user, "I take a ticket from [src], looks like you're ticket number #[ticket_number]...") + to_chat(user, span_notice("I take a ticket from [src], looks like you're ticket number #[ticket_number]...")) var/obj/item/ticket_machine_ticket/theirticket = new /obj/item/ticket_machine_ticket(get_turf(src)) theirticket.name = "Ticket #[ticket_number]" theirticket.maptext = "[ticket_number]" @@ -216,13 +216,13 @@ ..() if(P.get_temperature()) if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10)) - user.visible_message("[user] accidentally ignites [user.p_them()]self!", \ - "I miss the paper and accidentally light myself on fire!") + user.visible_message(span_warning("[user] accidentally ignites [user.p_them()]self!"), \ + span_danger("I miss the paper and accidentally light myself on fire!")) user.dropItemToGround(P) user.adjust_fire_stacks(1) user.IgniteMob() return - user.visible_message("[user] lights [src] ablaze with [P]!", "I light [src] on fire!") + user.visible_message(span_danger("[user] lights [src] ablaze with [P]!"), span_danger("I light [src] on fire!")) fire_act() /obj/item/paper/extinguish() diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index 47f06a356..92878f779 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -40,13 +40,13 @@ /obj/item/camera/attack_self(mob/user) if(!disk) return - to_chat(user, "I eject [disk] out the back of [src].") + to_chat(user, span_notice("I eject [disk] out the back of [src].")) user.put_in_hands(disk) disk = null /obj/item/camera/examine(mob/user) . = ..() - . += "Alt-click to change its focusing, allowing you to set how big of an area it will capture." + . += span_notice("Alt-click to change its focusing, allowing you to set how big of an area it will capture.") /obj/item/camera/proc/adjust_zoom(mob/user) var/desired_x = input(user, "How high do you want the camera to shoot, between [picture_size_x_min] and [picture_size_x_max]?", "Zoom", picture_size_x) as num|null @@ -73,23 +73,23 @@ /obj/item/camera/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/camera_film)) if(pictures_left) - to_chat(user, "[src] still has some film in it!") + to_chat(user, span_notice("[src] still has some film in it!")) return if(!user.temporarilyRemoveItemFromInventory(I)) return - to_chat(user, "I insert [I] into [src].") + to_chat(user, span_notice("I insert [I] into [src].")) qdel(I) pictures_left = pictures_max return if(istype(I, /obj/item/disk/holodisk)) if (!disk) if(!user.transferItemToLoc(I, src)) - to_chat(user, "[I] is stuck to your hand!") + to_chat(user, span_warning("[I] is stuck to your hand!")) return TRUE - to_chat(user, "I slide [I] into the back of [src].") + to_chat(user, span_notice("I slide [I] into the back of [src].")) disk = I else - to_chat(user, "There's already a disk inside [src].") + to_chat(user, span_warning("There's already a disk inside [src].")) return TRUE //no afterattack ..() @@ -127,7 +127,7 @@ disk.record.caller_name = M.name disk.record.set_caller_image(M) else - to_chat(user, "Invalid holodisk target.") + to_chat(user, span_warning("Invalid holodisk target.")) return if(!can_target(target, user, flag)) @@ -215,7 +215,7 @@ if(in_range(src, user)) //needed because of TK user.put_in_hands(p) pictures_left-- - to_chat(user, "[pictures_left] photos left.") + to_chat(user, span_notice("[pictures_left] photos left.")) var/customise = "No" if(can_customise) customise = alert(user, "Do you want to customize the photo?", "Customization", "Yes", "No") diff --git a/code/modules/photography/camera/silicon_camera.dm b/code/modules/photography/camera/silicon_camera.dm index d38945455..9c1cfe391 100644 --- a/code/modules/photography/camera/silicon_camera.dm +++ b/code/modules/photography/camera/silicon_camera.dm @@ -26,7 +26,7 @@ var/list/nametemp = list() var/find if(!stored.len) - to_chat(usr, "No images saved") + to_chat(usr, span_boldannounce("No images saved")) return var/list/temp = list() for(var/i in stored) @@ -47,7 +47,7 @@ var/number = stored.len picture.picture_name = "Image [number] (taken by [loc.name])" stored[picture] = TRUE - to_chat(usr, "Image recorded") + to_chat(usr, span_unconscious("Image recorded")) /obj/item/camera/siliconcam/robot_camera name = "Cyborg photo camera" @@ -59,12 +59,12 @@ var/number = C.connected_ai.aicamera.stored.len picture.picture_name = "Image [number] (taken by [loc.name])" C.connected_ai.aicamera.stored[picture] = TRUE - to_chat(usr, "Image recorded and saved to remote database") + to_chat(usr, span_unconscious("Image recorded and saved to remote database")) else var/number = stored.len picture.picture_name = "Image [number] (taken by [loc.name])" stored[picture] = TRUE - to_chat(usr, "Image recorded and saved to local storage. Upload will happen automatically if unit is lawsynced.") + to_chat(usr, span_unconscious("Image recorded and saved to local storage. Upload will happen automatically if unit is lawsynced.")) /obj/item/camera/siliconcam/robot_camera/selectpicture(mob/user) var/mob/living/silicon/robot/R = loc @@ -85,15 +85,15 @@ /obj/item/camera/siliconcam/robot_camera/proc/borgprint(mob/user) var/mob/living/silicon/robot/C = loc if(!istype(C) || C.toner < 20) - to_chat(user, "Insufficent toner to print image.") + to_chat(user, span_warning("Insufficent toner to print image.")) return var/datum/picture/selection = selectpicture(user) if(!istype(selection)) - to_chat(user, "Invalid Image.") + to_chat(user, span_warning("Invalid Image.")) return var/obj/item/photo/p = new /obj/item/photo(C.loc, selection) p.pixel_x = rand(-10, 10) p.pixel_y = rand(-10, 10) C.toner -= printcost //All fun allowed. - visible_message("[C.name] spits out a photograph from a narrow slot on its chassis.") - to_chat(usr, "I print a photograph.") + visible_message(span_notice("[C.name] spits out a photograph from a narrow slot on its chassis.")) + to_chat(usr, span_notice("I print a photograph.")) diff --git a/code/modules/photography/photos/frame.dm b/code/modules/photography/photos/frame.dm index dac652524..a0dda3163 100644 --- a/code/modules/photography/photos/frame.dm +++ b/code/modules/photography/photos/frame.dm @@ -29,7 +29,7 @@ if(contents.len) var/obj/item/I = pick(contents) user.put_in_hands(I) - to_chat(user, "I carefully remove the photo from \the [src].") + to_chat(user, span_notice("I carefully remove the photo from \the [src].")) displayed = null update_icon() return ..() @@ -117,16 +117,16 @@ /obj/structure/sign/picture_frame/attackby(obj/item/I, mob/user, params) if(can_decon && (I.tool_behaviour == TOOL_SCREWDRIVER || I.tool_behaviour == TOOL_WRENCH)) - to_chat(user, "I start unsecuring [name]...") + to_chat(user, span_notice("I start unsecuring [name]...")) if(I.use_tool(src, user, 30, volume=50)) playsound(loc, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I unsecure [name].") + to_chat(user, span_notice("I unsecure [name].")) deconstruct() else if(I.tool_behaviour == TOOL_WIRECUTTER && framed) framed.forceMove(drop_location()) framed = null - user.visible_message("[user] cuts away [framed] from [src]!") + user.visible_message(span_warning("[user] cuts away [framed] from [src]!")) return else if(istype(I, /obj/item/photo)) diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm index 05abccfae..8d3f61177 100644 --- a/code/modules/photography/photos/photo.dm +++ b/code/modules/photography/photos/photo.dm @@ -40,7 +40,7 @@ icon = I /obj/item/photo/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is taking one last look at \the [src]! It looks like [user.p_theyre()] giving in to death!")//when you wanna look at photo of waifu one last time before you die... + user.visible_message(span_suicide("[user] is taking one last look at \the [src]! It looks like [user.p_theyre()] giving in to death!"))//when you wanna look at photo of waifu one last time before you die... if (user.gender == MALE) playsound(user, 'sound/blank.ogg', 50, TRUE)//EVERY TIME I DO IT MAKES ME LAUGH else if (user.gender == FEMALE) @@ -53,7 +53,7 @@ /obj/item/photo/attackby(obj/item/P, mob/user, params) if(istype(P, /obj/item/pen) || istype(P, /obj/item/toy/crayon)) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on [src]!") + to_chat(user, span_notice("I scribble illegibly on [src]!")) return var/txt = sanitize(input(user, "What would you like to write on the back?", "Photo Writing", null) as text) txt = copytext(txt, 1, 128) @@ -67,11 +67,11 @@ if(in_range(src, user) || isobserver(user)) show(user) else - . += "I need to get closer to get a good look at this photo!" + . += span_warning("I need to get closer to get a good look at this photo!") /obj/item/photo/proc/show(mob/user) if(!istype(picture) || !picture.picture_image) - to_chat(user, "[src] seems to be blank...") + to_chat(user, span_warning("[src] seems to be blank...")) return user << browse_rsc(picture.picture_image, "tmp_photo.png") user << browse("[name]" \ diff --git a/code/modules/plumbing/ducts.dm b/code/modules/plumbing/ducts.dm index 5cf8b4990..49af02ecd 100644 --- a/code/modules/plumbing/ducts.dm +++ b/code/modules/plumbing/ducts.dm @@ -257,16 +257,16 @@ All the important duct code: if(anchored) user.visible_message( \ "[user] unfastens \the [src].", \ - "I unfasten \the [src].", \ - "I hear ratcheting.") + span_notice("I unfasten \the [src]."), \ + span_hear("I hear ratcheting.")) disconnect_duct() else if(can_anchor()) anchored = TRUE active = TRUE user.visible_message( \ "[user] fastens \the [src].", \ - "I fasten \the [src].", \ - "I hear ratcheting.") + span_notice("I fasten \the [src]."), \ + span_hear("I hear ratcheting.")) attempt_connect() return TRUE ///collection of all the sanity checks to prevent us from stacking ducts that shouldnt be stacked @@ -296,7 +296,7 @@ All the important duct code: var/obj/machinery/duct/D = A var/obj/item/I = user.get_active_held_item() if(I?.tool_behaviour != TOOL_WRENCH) - to_chat(user, "I need to be holding a wrench in your active hand to do that!") + to_chat(user, span_warning("I need to be holding a wrench in your active hand to do that!")) return if(get_dist(src, D) != 1) return @@ -377,7 +377,7 @@ All the important duct code: /obj/item/stack/ducts/examine(mob/user) . = ..() - . += "It's current color and layer are [duct_color] and [duct_layer]. Use in-hand to change." + . += span_notice("It's current color and layer are [duct_color] and [duct_layer]. Use in-hand to change.") /obj/item/stack/ducts/attack_self(mob/user) var/new_layer = input("Select a layer", "Layer") as null|anything in layers diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm index 46d8b4000..93936c539 100644 --- a/code/modules/plumbing/plumbers/_plumb_machinery.dm +++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm @@ -30,7 +30,7 @@ /obj/machinery/plumbing/examine(mob/user) . = ..() - . += "The maximum volume display reads: [reagents.maximum_volume] units." + . += span_notice("The maximum volume display reads: [reagents.maximum_volume] units.") /obj/machinery/plumbing/wrench_act(mob/living/user, obj/item/I) ..() diff --git a/code/modules/plumbing/plumbers/filter.dm b/code/modules/plumbing/plumbers/filter.dm index ff9f226c5..52f4ae682 100644 --- a/code/modules/plumbing/plumbers/filter.dm +++ b/code/modules/plumbing/plumbers/filter.dm @@ -51,7 +51,7 @@ english_right += new_chem_name right += chem_id else - to_chat(usr, "No such known reagent exists!") + to_chat(usr, span_warning("No such known reagent exists!")) if("remove") var/chem_name = params["reagent"] diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm index e4dd3b338..e05e04fca 100644 --- a/code/modules/plumbing/plumbers/pill_press.dm +++ b/code/modules/plumbing/plumbers/pill_press.dm @@ -25,7 +25,7 @@ /obj/machinery/plumbing/pill_press/examine(mob/user) . = ..() - . += "The [name] currently has [stored_pills.len] stored. There needs to be less than [max_floor_pills] on the floor to continue dispensing." + . += span_notice("The [name] currently has [stored_pills.len] stored. There needs to be less than [max_floor_pills] on the floor to continue dispensing.") /obj/machinery/plumbing/pill_press/Initialize(mapload, bolt) . = ..() diff --git a/code/modules/plumbing/plumbers/pumps.dm b/code/modules/plumbing/plumbers/pumps.dm index 313c4a143..2e8627eea 100644 --- a/code/modules/plumbing/plumbers/pumps.dm +++ b/code/modules/plumbing/plumbers/pumps.dm @@ -56,7 +56,7 @@ if(!geyser) //we didnt find one, abort anchored = FALSE geyserless = TRUE - visible_message("The [name] makes a sad beep!") + visible_message(span_warning("The [name] makes a sad beep!")) playsound(src, 'sound/blank.ogg', 50) return diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 6fc5a4594..2cc3cb43c 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -273,10 +273,10 @@ else . += "The cover is closed." - . += "Alt-Click the APC to [ locked ? "unlock" : "lock"] the interface." + . += span_notice("Alt-Click the APC to [ locked ? "unlock" : "lock"] the interface.") if(issilicon(user)) - . += "Ctrl-Click the APC to switch the breaker [ operating ? "off" : "on"]." + . += span_notice("Ctrl-Click the APC to switch the breaker [ operating ? "off" : "on"].") // update the APC icon to show the three base states // also add overlays for indicator lights @@ -423,32 +423,32 @@ if (opened) if (has_electronics == APC_ELECTRONICS_INSTALLED) if (terminal) - to_chat(user, "Disconnect the wires first!") + to_chat(user, span_warning("Disconnect the wires first!")) return W.play_tool_sound(src) - to_chat(user, "I attempt to remove the power control board..." ) + to_chat(user, span_notice("I attempt to remove the power control board...") ) if(W.use_tool(src, user, 50)) if (has_electronics == APC_ELECTRONICS_INSTALLED) has_electronics = APC_ELECTRONICS_MISSING if (stat & BROKEN) - user.visible_message("[user.name] has broken the power control board inside [src.name]!",\ - "I break the charred power control board and remove the remains.", - "I hear a crack.") + user.visible_message(span_notice("[user.name] has broken the power control board inside [src.name]!"),\ + span_notice("I break the charred power control board and remove the remains."), + span_hear("I hear a crack.")) return else if (obj_flags & EMAGGED) obj_flags &= ~EMAGGED - user.visible_message("[user.name] has discarded an emagged power control board from [src.name]!",\ - "I discard the emagged power control board.") + user.visible_message(span_notice("[user.name] has discarded an emagged power control board from [src.name]!"),\ + span_notice("I discard the emagged power control board.")) return else if (malfhack) - user.visible_message("[user.name] has discarded a strangely programmed power control board from [src.name]!",\ - "I discard the strangely programmed board.") + user.visible_message(span_notice("[user.name] has discarded a strangely programmed power control board from [src.name]!"),\ + span_notice("I discard the strangely programmed board.")) malfai = null malfhack = 0 return else - user.visible_message("[user.name] has removed the power control board from [src.name]!",\ - "I remove the power control board.") + user.visible_message(span_notice("[user.name] has removed the power control board from [src.name]!"),\ + span_notice("I remove the power control board.")) new /obj/item/electronics/apc(loc) return else if (opened!=APC_COVER_REMOVED) @@ -458,10 +458,10 @@ return else if (!(stat & BROKEN)) if(coverlocked && !(stat & MAINT)) // locked... - to_chat(user, "The cover is locked and cannot be opened!") + to_chat(user, span_warning("The cover is locked and cannot be opened!")) return else if (panel_open) - to_chat(user, "Exposed wires prevents you from opening it!") + to_chat(user, span_warning("Exposed wires prevents you from opening it!")) return else opened = APC_COVER_OPENED @@ -474,7 +474,7 @@ . = TRUE if(opened) if(cell) - user.visible_message("[user] removes \the [cell] from [src]!", "I remove \the [cell].") + user.visible_message(span_notice("[user] removes \the [cell] from [src]!"), span_notice("I remove \the [cell].")) var/turf/T = get_turf(user) cell.forceMove(T) cell.update_icon() @@ -488,22 +488,22 @@ has_electronics = APC_ELECTRONICS_SECURED stat &= ~MAINT W.play_tool_sound(src) - to_chat(user, "I screw the circuit electronics into place.") + to_chat(user, span_notice("I screw the circuit electronics into place.")) if (APC_ELECTRONICS_SECURED) has_electronics = APC_ELECTRONICS_INSTALLED stat |= MAINT W.play_tool_sound(src) - to_chat(user, "I unfasten the electronics.") + to_chat(user, span_notice("I unfasten the electronics.")) else - to_chat(user, "There is nothing to secure!") + to_chat(user, span_warning("There is nothing to secure!")) return update_icon() else if(obj_flags & EMAGGED) - to_chat(user, "The interface is broken!") + to_chat(user, span_warning("The interface is broken!")) return else panel_open = !panel_open - to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"].") + to_chat(user, span_notice("The wires have been [panel_open ? "exposed" : "unexposed"].")) update_icon() /obj/machinery/power/apc/wirecutter_act(mob/living/user, obj/item/W) @@ -518,18 +518,18 @@ if (opened && !has_electronics && !terminal) if(!W.tool_start_check(user, amount=3)) return - user.visible_message("[user.name] welds [src].", \ - "I start welding the APC frame...", \ - "I hear welding.") + user.visible_message(span_notice("[user.name] welds [src]."), \ + span_notice("I start welding the APC frame..."), \ + span_hear("I hear welding.")) if(W.use_tool(src, user, 50, volume=50, amount=3)) if ((stat & BROKEN) || opened==APC_COVER_REMOVED) new /obj/item/stack/sheet/metal(loc) - user.visible_message("[user.name] has cut [src] apart with [W].",\ - "I disassembled the broken APC frame.") + user.visible_message(span_notice("[user.name] has cut [src] apart with [W]."),\ + span_notice("I disassembled the broken APC frame.")) else new /obj/item/wallframe/apc(loc) - user.visible_message("[user.name] has cut [src] from the wall with [W].",\ - "I cut the APC frame from the wall.") + user.visible_message(span_notice("[user.name] has cut [src] from the wall with [W]."),\ + span_notice("I cut the APC frame from the wall.")) qdel(src) return TRUE @@ -540,17 +540,17 @@ if (istype(W, /obj/item/stock_parts/cell) && opened) if(cell) - to_chat(user, "There is a power cell already installed!") + to_chat(user, span_warning("There is a power cell already installed!")) return else if (stat & MAINT) - to_chat(user, "There is no connector for my power cell!") + to_chat(user, span_warning("There is no connector for my power cell!")) return if(!user.transferItemToLoc(W, src)) return cell = W - user.visible_message("[user.name] has inserted the power cell to [src.name]!",\ - "I insert the power cell.") + user.visible_message(span_notice("[user.name] has inserted the power cell to [src.name]!"),\ + span_notice("I insert the power cell.")) chargecount = 0 update_icon() else if (W.GetID()) @@ -561,21 +561,21 @@ CRASH("attackby on APC when it's not on a turf") return if (host_turf.intact) - to_chat(user, "I must remove the floor plating in front of the APC first!") + to_chat(user, span_warning("I must remove the floor plating in front of the APC first!")) return else if (terminal) - to_chat(user, "This APC is already wired!") + to_chat(user, span_warning("This APC is already wired!")) return else if (!has_electronics) - to_chat(user, "There is nothing to wire!") + to_chat(user, span_warning("There is nothing to wire!")) return var/obj/item/stack/cable_coil/C = W if(C.get_amount() < 10) - to_chat(user, "I need ten lengths of cable for APC!") + to_chat(user, span_warning("I need ten lengths of cable for APC!")) return - user.visible_message("[user.name] adds cables to the APC frame.", \ - "I start adding cables to the APC frame...") + user.visible_message(span_notice("[user.name] adds cables to the APC frame."), \ + span_notice("I start adding cables to the APC frame...")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) if(do_after(user, 20, target = src)) if (C.get_amount() < 10 || !C) @@ -587,41 +587,41 @@ do_sparks(5, TRUE, src) return C.use(10) - to_chat(user, "I add cables to the APC frame.") + to_chat(user, span_notice("I add cables to the APC frame.")) make_terminal() terminal.connect_to_network() else if (istype(W, /obj/item/electronics/apc) && opened) if (has_electronics) - to_chat(user, "There is already a board inside the [src]!") + to_chat(user, span_warning("There is already a board inside the [src]!")) return else if (stat & BROKEN) - to_chat(user, "I cannot put the board inside, the frame is damaged!") + to_chat(user, span_warning("I cannot put the board inside, the frame is damaged!")) return - user.visible_message("[user.name] inserts the power control board into [src].", \ - "I start to insert the power control board into the frame...") + user.visible_message(span_notice("[user.name] inserts the power control board into [src]."), \ + span_notice("I start to insert the power control board into the frame...")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) if(do_after(user, 10, target = src)) if(!has_electronics) has_electronics = APC_ELECTRONICS_INSTALLED locked = FALSE - to_chat(user, "I place the power control board inside the frame.") + to_chat(user, span_notice("I place the power control board inside the frame.")) qdel(W) else if(istype(W, /obj/item/electroadaptive_pseudocircuit) && opened) var/obj/item/electroadaptive_pseudocircuit/P = W if(!has_electronics) if(stat & BROKEN) - to_chat(user, "[src]'s frame is too damaged to support a circuit.") + to_chat(user, span_warning("[src]'s frame is too damaged to support a circuit.")) return if(!P.adapt_circuit(user, 50)) return - user.visible_message("[user] fabricates a circuit and places it into [src].", \ - "I adapt a power control board and click it into place in [src]'s guts.") + user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ + span_notice("I adapt a power control board and click it into place in [src]'s guts.")) has_electronics = APC_ELECTRONICS_INSTALLED locked = FALSE else if(!cell) if(stat & MAINT) - to_chat(user, "There's no connector for a power cell.") + to_chat(user, span_warning("There's no connector for a power cell.")) return if(!P.adapt_circuit(user, 500)) return @@ -629,32 +629,32 @@ C.forceMove(src) cell = C chargecount = 0 - user.visible_message("[user] fabricates a weak power cell and places it into [src].", \ - "My [P.name] whirrs with strain as you create a weak power cell and place it into [src]!") + user.visible_message(span_notice("[user] fabricates a weak power cell and places it into [src]."), \ + span_warning("My [P.name] whirrs with strain as you create a weak power cell and place it into [src]!")) update_icon() else - to_chat(user, "[src] has both electronics and a cell.") + to_chat(user, span_warning("[src] has both electronics and a cell.")) return else if (istype(W, /obj/item/wallframe/apc) && opened) if (!(stat & BROKEN || opened==APC_COVER_REMOVED || obj_integrity < max_integrity)) // There is nothing to repair - to_chat(user, "I found no reason for repairing this APC!") + to_chat(user, span_warning("I found no reason for repairing this APC!")) return if (!(stat & BROKEN) && opened==APC_COVER_REMOVED) // Cover is the only thing broken, we do not need to remove elctronicks to replace cover - user.visible_message("[user.name] replaces missing APC's cover.", \ - "I begin to replace APC's cover...") + user.visible_message(span_notice("[user.name] replaces missing APC's cover."), \ + span_notice("I begin to replace APC's cover...")) if(do_after(user, 20, target = src)) // replacing cover is quicker than replacing whole frame - to_chat(user, "I replace missing APC's cover.") + to_chat(user, span_notice("I replace missing APC's cover.")) qdel(W) opened = APC_COVER_OPENED update_icon() return if (has_electronics) - to_chat(user, "I cannot repair this APC until you remove the electronics still inside!") + to_chat(user, span_warning("I cannot repair this APC until you remove the electronics still inside!")) return - user.visible_message("[user.name] replaces the damaged APC frame with a new one.", \ - "I begin to replace the damaged APC frame...") + user.visible_message(span_notice("[user.name] replaces the damaged APC frame with a new one."), \ + span_notice("I begin to replace the damaged APC frame...")) if(do_after(user, 50, target = src)) - to_chat(user, "I replace the damaged APC frame with a new one.") + to_chat(user, span_notice("I replace the damaged APC frame with a new one.")) qdel(W) stat &= ~BROKEN obj_integrity = max_integrity @@ -671,16 +671,16 @@ if(the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS) if(!has_electronics) if(stat & BROKEN) - to_chat(user, "[src]'s frame is too damaged to support a circuit.") + to_chat(user, span_warning("[src]'s frame is too damaged to support a circuit.")) return FALSE return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1) else if(!cell) if(stat & MAINT) - to_chat(user, "There's no connector for a power cell.") + to_chat(user, span_warning("There's no connector for a power cell.")) return FALSE return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 50, "cost" = 10) //16 for a wall else - to_chat(user, "[src] has both electronics and a cell.") + to_chat(user, span_warning("[src] has both electronics and a cell.")) return FALSE return FALSE @@ -689,27 +689,27 @@ if(RCD_UPGRADE_SIMPLE_CIRCUITS) if(!has_electronics) if(stat & BROKEN) - to_chat(user, "[src]'s frame is too damaged to support a circuit.") + to_chat(user, span_warning("[src]'s frame is too damaged to support a circuit.")) return - user.visible_message("[user] fabricates a circuit and places it into [src].", \ - "I adapt a power control board and click it into place in [src]'s guts.") + user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ + span_notice("I adapt a power control board and click it into place in [src]'s guts.")) has_electronics = TRUE locked = TRUE return TRUE else if(!cell) if(stat & MAINT) - to_chat(user, "There's no connector for a power cell.") + to_chat(user, span_warning("There's no connector for a power cell.")) return FALSE var/obj/item/stock_parts/cell/crap/empty/C = new(src) C.forceMove(src) cell = C chargecount = 0 - user.visible_message("[user] fabricates a weak power cell and places it into [src].", \ - "My [the_rcd.name] whirrs with strain as you create a weak power cell and place it into [src]!") + user.visible_message(span_notice("[user] fabricates a weak power cell and places it into [src]."), \ + span_warning("My [the_rcd.name] whirrs with strain as you create a weak power cell and place it into [src]!")) update_icon() return TRUE else - to_chat(user, "[src] has both electronics and a cell.") + to_chat(user, span_warning("[src] has both electronics and a cell.")) return FALSE return FALSE @@ -722,25 +722,25 @@ /obj/machinery/power/apc/proc/togglelock(mob/living/user) if(obj_flags & EMAGGED) - to_chat(user, "The interface is broken!") + to_chat(user, span_warning("The interface is broken!")) else if(opened) - to_chat(user, "I must close the cover to swipe an ID card!") + to_chat(user, span_warning("I must close the cover to swipe an ID card!")) else if(panel_open) - to_chat(user, "I must close the panel!") + to_chat(user, span_warning("I must close the panel!")) else if(stat & (BROKEN|MAINT)) - to_chat(user, "Nothing happens!") + to_chat(user, span_warning("Nothing happens!")) else if(allowed(usr) && !wires.is_cut(WIRE_IDSCAN) && !malfhack) locked = !locked - to_chat(user, "I [ locked ? "lock" : "unlock"] the APC interface.") + to_chat(user, span_notice("I [ locked ? "lock" : "unlock"] the APC interface.")) update_icon() updateUsrDialog() else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) /obj/machinery/power/apc/proc/toggle_nightshift_lights(mob/living/user) if(last_nightshift_switch > world.time - 100) //~10 seconds between each toggle to prevent spamming - to_chat(usr, "[src]'s night lighting circuit breaker is still cycling!") + to_chat(usr, span_warning("[src]'s night lighting circuit breaker is still cycling!")) return last_nightshift_switch = world.time set_nightshift(!nightshift_lights) @@ -762,23 +762,23 @@ if(opened != APC_COVER_REMOVED) opened = APC_COVER_REMOVED coverlocked = FALSE - visible_message("The APC cover is knocked down!") + visible_message(span_warning("The APC cover is knocked down!")) update_icon() /obj/machinery/power/apc/emag_act(mob/user) if(!(obj_flags & EMAGGED) && !malfhack) if(opened) - to_chat(user, "I must close the cover to swipe an ID card!") + to_chat(user, span_warning("I must close the cover to swipe an ID card!")) else if(panel_open) - to_chat(user, "I must close the panel first!") + to_chat(user, span_warning("I must close the panel first!")) else if(stat & (BROKEN|MAINT)) - to_chat(user, "Nothing happens!") + to_chat(user, span_warning("Nothing happens!")) else flick("apc-spark", src) playsound(src, "sparks", 75, TRUE) obj_flags |= EMAGGED locked = FALSE - to_chat(user, "I emag the APC interface.") + to_chat(user, span_notice("I emag the APC interface.")) update_icon() @@ -790,7 +790,7 @@ return if(opened && (!issilicon(user))) if(cell) - user.visible_message("[user] removes \the [cell] from [src]!", "I remove \the [cell].") + user.visible_message(span_notice("[user] removes \the [cell] from [src]!"), span_notice("I remove \the [cell].")) user.put_in_hands(cell) cell.update_icon() src.cell = null @@ -903,7 +903,7 @@ ) \ ) if(!loud) - to_chat(user, "\The [src] has eee disabled!") + to_chat(user, span_danger("\The [src] has eee disabled!")) return FALSE return TRUE @@ -924,7 +924,7 @@ if("lock") if(usr.has_unlimited_silicon_privilege) if((obj_flags & EMAGGED) || (stat & (BROKEN|MAINT))) - to_chat(usr, "The APC does not respond to the command!") + to_chat(usr, span_warning("The APC does not respond to the command!")) else locked = !locked update_icon() @@ -999,9 +999,9 @@ if(get_malf_status(malf) != 1) return if(malf.malfhacking) - to_chat(malf, "I are already hacking an APC!") + to_chat(malf, span_warning("I are already hacking an APC!")) return - to_chat(malf, "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.") + to_chat(malf, span_notice("Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.")) malf.malfhack = src malf.malfhacking = addtimer(CALLBACK(malf, TYPE_PROC_REF(/mob/living/silicon/ai, malfhacked), src), 600, TIMER_STOPPABLE) @@ -1013,10 +1013,10 @@ if(!istype(malf)) return if(istype(malf.loc, /obj/machinery/power/apc)) // Already in an APC - to_chat(malf, "I must evacuate my current APC first!") + to_chat(malf, span_warning("I must evacuate my current APC first!")) return if(!malf.can_shunt) - to_chat(malf, "I cannot shunt!") + to_chat(malf, span_warning("I cannot shunt!")) return if(!is_station_level(z)) return @@ -1047,7 +1047,7 @@ occupier.parent.verbs -= /mob/living/silicon/ai/proc/corereturn qdel(occupier) else - to_chat(occupier, "Primary core damaged, unable to return core processes.") + to_chat(occupier, span_danger("Primary core damaged, unable to return core processes.")) if(forced) occupier.forceMove(drop_location()) occupier.death() @@ -1058,19 +1058,19 @@ /obj/machinery/power/apc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card) if(card.AI) - to_chat(user, "[card] is already occupied!") + to_chat(user, span_warning("[card] is already occupied!")) return if(!occupier) - to_chat(user, "There's nothing in [src] to transfer!") + to_chat(user, span_warning("There's nothing in [src] to transfer!")) return if(!occupier.mind || !occupier.client) - to_chat(user, "[occupier] is either inactive or destroyed!") + to_chat(user, span_warning("[occupier] is either inactive or destroyed!")) return if(!occupier.parent.stat) - to_chat(user, "[occupier] is refusing all attempts at transfer!" ) + to_chat(user, span_warning("[occupier] is refusing all attempts at transfer!") ) return if(transfer_in_progress) - to_chat(user, "There's already a transfer in progress!") + to_chat(user, span_warning("There's already a transfer in progress!")) return if(interaction != AI_TRANS_TO_CARD || occupier.stat) return @@ -1078,30 +1078,30 @@ if(!T) return transfer_in_progress = TRUE - user.visible_message("[user] slots [card] into [src]...", "Transfer process initiated. Sending request for AI approval...") + user.visible_message(span_notice("[user] slots [card] into [src]..."), span_notice("Transfer process initiated. Sending request for AI approval...")) playsound(src, 'sound/blank.ogg', 50, TRUE) SEND_SOUND(occupier, sound('sound/misc/thiefobj.ogg')) //To alert the AI that someone's trying to card them if they're tabbed out if(alert(occupier, "[user] is attempting to transfer you to \a [card.name]. Do you consent to this?", "APC Transfer", "Yes - Transfer Me", "No - Keep Me Here") == "No - Keep Me Here") - to_chat(user, "AI denied transfer request. Process terminated.") + to_chat(user, span_danger("AI denied transfer request. Process terminated.")) playsound(src, 'sound/blank.ogg', 50, TRUE) transfer_in_progress = FALSE return if(user.loc != T) - to_chat(user, "Location changed. Process terminated.") - to_chat(occupier, "[user] moved away! Transfer canceled.") + to_chat(user, span_danger("Location changed. Process terminated.")) + to_chat(occupier, span_warning("[user] moved away! Transfer canceled.")) transfer_in_progress = FALSE return - to_chat(user, "AI accepted request. Transferring stored intelligence to [card]...") - to_chat(occupier, "Transfer starting. You will be moved to [card] shortly.") + to_chat(user, span_notice("AI accepted request. Transferring stored intelligence to [card]...")) + to_chat(occupier, span_notice("Transfer starting. You will be moved to [card] shortly.")) if(!do_after(user, 50, target = src)) - to_chat(occupier, "[user] was interrupted! Transfer canceled.") + to_chat(occupier, span_warning("[user] was interrupted! Transfer canceled.")) transfer_in_progress = FALSE return if(!occupier || !card) transfer_in_progress = FALSE return - user.visible_message("[user] transfers [occupier] to [card]!", "Transfer complete! [occupier] is now stored in [card].") - to_chat(occupier, "Transfer complete! You've been stored in [user]'s [card.name].") + user.visible_message(span_notice("[user] transfers [occupier] to [card]!"), span_notice("Transfer complete! [occupier] is now stored in [card].")) + to_chat(occupier, span_notice("Transfer complete! You've been stored in [user]'s [card.name].")) occupier.forceMove(card) card.AI = occupier occupier.parent.shunted = FALSE diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 3557ffa2e..41c4756ed 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -151,16 +151,16 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri if(W.tool_behaviour == TOOL_WIRECUTTER) if (shock(user, 50)) return - user.visible_message("[user] cuts the cable.", "I cut the cable.") + user.visible_message(span_notice("[user] cuts the cable."), span_notice("I cut the cable.")) investigate_log("was cut by [key_name(usr)] in [AREACOORD(src)]", INVESTIGATE_WIRES) deconstruct() return else if(W.tool_behaviour == TOOL_MULTITOOL) if(powernet && (powernet.avail > 0)) // is it powered? - to_chat(user, "Total power: [DisplayPower(powernet.avail)]\nLoad: [DisplayPower(powernet.load)]\nExcess power: [DisplayPower(surplus())]") + to_chat(user, span_danger("Total power: [DisplayPower(powernet.avail)]\nLoad: [DisplayPower(powernet.load)]\nExcess power: [DisplayPower(surplus())]")) else - to_chat(user, "The cable is not powered.") + to_chat(user, span_danger("The cable is not powered.")) shock(user, 5, 0.2) add_fingerprint(user) @@ -421,9 +421,9 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list(new/datum/stack_recipe("cable restrain /obj/item/stack/cable_coil/suicide_act(mob/user) if(locate(/obj/structure/chair/stool) in get_turf(user)) - user.visible_message("[user] is making a noose with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is making a noose with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) else - user.visible_message("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return(OXYLOSS) /obj/item/stack/cable_coil/proc/check_menu(mob/living/user) @@ -467,7 +467,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list(new/datum/stack_recipe("cable restrain var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) if(affecting && affecting.status == BODYPART_ROBOTIC) if(user == H) - user.visible_message("[user] starts to fix some of the wires in [H]'s [affecting.name].", "I start fixing some of the wires in [H == user ? "your" : "[H]'s"] [affecting.name].") + user.visible_message(span_notice("[user] starts to fix some of the wires in [H]'s [affecting.name]."), span_notice("I start fixing some of the wires in [H == user ? "your" : "[H]'s"] [affecting.name].")) if(!do_mob(user, H, 50)) return if(item_heal_robotic(H, user, 0, 15)) @@ -500,20 +500,20 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list(new/datum/stack_recipe("cable restrain return if(!isturf(T) || T.intact || !T.can_have_cabling()) - to_chat(user, "I can only lay cables on catwalks and plating!") + to_chat(user, span_warning("I can only lay cables on catwalks and plating!")) return if(get_amount() < 1) // Out of cable - to_chat(user, "There is no cable left!") + to_chat(user, span_warning("There is no cable left!")) return if(get_dist(T,user) > 1) // Too far - to_chat(user, "I can't lay cable at a place that far away!") + to_chat(user, span_warning("I can't lay cable at a place that far away!")) return for(var/obj/structure/cable/C in T) if(target_type == C.type) - to_chat(user, "There's already a cable at that position!") + to_chat(user, span_warning("There's already a cable at that position!")) return var/obj/structure/cable/C = new target_type(T) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 422b79f01..bcf5e3f2e 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -94,12 +94,12 @@ /obj/item/stock_parts/cell/examine(mob/user) . = ..() if(rigged) - . += "This power cell seems to be faulty!" + . += span_danger("This power cell seems to be faulty!") else . += "The charge meter reads [round(src.percent() )]%." /obj/item/stock_parts/cell/suicide_act(mob/user) - user.visible_message("[user] is licking the electrodes of [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is licking the electrodes of [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return (FIRELOSS) /obj/item/stock_parts/cell/on_reagent_change(changetype) diff --git a/code/modules/power/floodlight.dm b/code/modules/power/floodlight.dm index ed0b9b84b..c3b61ffe8 100644 --- a/code/modules/power/floodlight.dm +++ b/code/modules/power/floodlight.dm @@ -10,25 +10,25 @@ /obj/structure/floodlight_frame/attackby(obj/item/O, mob/user, params) if(O.tool_behaviour == TOOL_WRENCH && (state == FLOODLIGHT_NEEDS_WRENCHING)) - to_chat(user, "I secure [src].") + to_chat(user, span_notice("I secure [src].")) anchored = TRUE state = FLOODLIGHT_NEEDS_WIRES desc = "" else if(istype(O, /obj/item/stack/cable_coil) && (state == FLOODLIGHT_NEEDS_WIRES)) var/obj/item/stack/S = O if(S.use(5)) - to_chat(user, "I wire [src].") + to_chat(user, span_notice("I wire [src].")) name = "wired [name]" desc = "" icon_state = "floodlight_c2" state = FLOODLIGHT_NEEDS_SECURING else if(istype(O, /obj/item/light/tube) && (state == FLOODLIGHT_NEEDS_LIGHTS)) if(user.transferItemToLoc(O)) - to_chat(user, "I put lights in [src].") + to_chat(user, span_notice("I put lights in [src].")) new /obj/machinery/power/floodlight(src.loc) qdel(src) else if(O.tool_behaviour == TOOL_SCREWDRIVER && (state == FLOODLIGHT_NEEDS_SECURING)) - to_chat(user, "I fasten the wiring and electronics in [src].") + to_chat(user, span_notice("I fasten the wiring and electronics in [src].")) name = "secured [name]" desc = "" icon_state = "floodlight_c3" @@ -80,7 +80,7 @@ if(4) setting_text = "high power" if(user) - to_chat(user, "I set [src] to [setting_text].") + to_chat(user, span_notice("I set [src] to [setting_text].")) /obj/machinery/power/floodlight/attackby(obj/item/O, mob/user, params) if(O.tool_behaviour == TOOL_WRENCH) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index f7cc60873..3d1e5a93c 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -106,7 +106,7 @@ /obj/machinery/power/generator/proc/get_menu(include_link = TRUE) var/t = "" if(!powernet) - t += "Unable to connect to the power network!" + t += span_bad("Unable to connect to the power network!") else if(cold_circ && hot_circ) var/datum/gas_mixture/cold_circ_air1 = cold_circ.airs[1] var/datum/gas_mixture/cold_circ_air2 = cold_circ.airs[2] @@ -129,11 +129,11 @@ t += "" else if(!hot_circ && cold_circ) - t += "Unable to locate hot circulator!" + t += span_bad("Unable to locate hot circulator!") else if(hot_circ && !cold_circ) - t += "Unable to locate cold circulator!" + t += span_bad("Unable to locate cold circulator!") else - t += "Unable to locate any parts!" + t += span_bad("Unable to locate any parts!") if(include_link) t += "
Close" @@ -198,7 +198,7 @@ if(!anchored) kill_circs() connect_to_network() - to_chat(user, "I [anchored?"secure":"unsecure"] [src].") + to_chat(user, span_notice("I [anchored?"secure":"unsecure"] [src].")) return TRUE /obj/machinery/power/generator/multitool_act(mob/living/user, obj/item/I) @@ -206,7 +206,7 @@ if(!anchored) return find_circs() - to_chat(user, "I update [src]'s circulator links.") + to_chat(user, span_notice("I update [src]'s circulator links.")) return TRUE /obj/machinery/power/generator/screwdriver_act(mob/user, obj/item/I) @@ -214,7 +214,7 @@ return TRUE panel_open = !panel_open I.play_tool_sound(src) - to_chat(user, "I [panel_open?"open":"close"] the panel on [src].") + to_chat(user, span_notice("I [panel_open?"open":"close"] the panel on [src].")) return TRUE /obj/machinery/power/generator/crowbar_act(mob/user, obj/item/I) diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index f582c3410..ebf3a3748 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -188,7 +188,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne switch(broken_state) if(GRAV_NEEDS_SCREWDRIVER) if(I.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "I secure the screws of the framework.") + to_chat(user, span_notice("I secure the screws of the framework.")) I.play_tool_sound(src) broken_state++ update_icon() @@ -196,7 +196,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne if(GRAV_NEEDS_WELDING) if(I.tool_behaviour == TOOL_WELDER) if(I.use_tool(src, user, 0, volume=50, amount=1)) - to_chat(user, "I mend the damaged framework.") + to_chat(user, span_notice("I mend the damaged framework.")) broken_state++ update_icon() return @@ -205,16 +205,16 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne var/obj/item/stack/sheet/plasteel/PS = I if(PS.get_amount() >= 10) PS.use(10) - to_chat(user, "I add the plating to the framework.") + to_chat(user, span_notice("I add the plating to the framework.")) playsound(src.loc, 'sound/blank.ogg', 75, TRUE) broken_state++ update_icon() else - to_chat(user, "I need 10 sheets of plasteel!") + to_chat(user, span_warning("I need 10 sheets of plasteel!")) return if(GRAV_NEEDS_WRENCH) if(I.tool_behaviour == TOOL_WRENCH) - to_chat(user, "I secure the plating to the framework.") + to_chat(user, span_notice("I secure the plating to the framework.")) I.play_tool_sound(src) set_fix() return diff --git a/code/modules/power/lanternpost.dm b/code/modules/power/lanternpost.dm index f8feceeb2..11be330b3 100644 --- a/code/modules/power/lanternpost.dm +++ b/code/modules/power/lanternpost.dm @@ -74,11 +74,11 @@ if(torchy) if(LR.on && !on) if(torchy.fuel <= 0) - to_chat(user, "The mounted lantern is burned out.") + to_chat(user, span_warning("The mounted lantern is burned out.")) return else torchy.spark_act() - user.visible_message("[user] lights [src].") + user.visible_message(span_info("[user] lights [src].")) playsound(src.loc, 'sound/items/firelight.ogg', 100) on = TRUE update() @@ -88,7 +88,7 @@ if(!LR.on && on) if(LR.fuel > 0) LR.spark_act() - user.visible_message("[user] lights [LR] in [src].") + user.visible_message(span_info("[user] lights [LR] in [src].")) user.update_inv_hands() else if(LR.on) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 959b95561..1c5db64c6 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -31,7 +31,7 @@ return var/area/A = get_area(user) if(!IS_DYNAMIC_LIGHTING(A)) - to_chat(user, "I cannot place [src] in this area!") + to_chat(user, span_warning("I cannot place [src] in this area!")) return return TRUE @@ -81,11 +81,11 @@ else . += "The casing has no power cell for backup power." else - . += "This casing doesn't support power cells for backup power." + . += span_danger("This casing doesn't support power cells for backup power.") /obj/structure/light_construct/attack_hand(mob/user) if(cell) - user.visible_message("[user] removes [cell] from [src]!", "I remove [cell].") + user.visible_message(span_notice("[user] removes [cell] from [src]!"), span_notice("I remove [cell].")) user.put_in_hands(cell) cell.update_icon() cell = null @@ -93,7 +93,7 @@ /obj/structure/light_construct/attack_tk(mob/user) if(cell) - to_chat(user, "I telekinetically remove [cell].") + to_chat(user, span_notice("I telekinetically remove [cell].")) cell.forceMove(drop_location()) cell.attack_tk(user) cell = null @@ -102,16 +102,16 @@ add_fingerprint(user) if(istype(W, /obj/item/stock_parts/cell)) if(!cell_connectors) - to_chat(user, "This [name] can't support a power cell!") + to_chat(user, span_warning("This [name] can't support a power cell!")) return if(HAS_TRAIT(W, TRAIT_NODROP)) - to_chat(user, "[W] is stuck to your hand!") + to_chat(user, span_warning("[W] is stuck to your hand!")) return if(cell) - to_chat(user, "There is a power cell already installed!") + to_chat(user, span_warning("There is a power cell already installed!")) else if(user.temporarilyRemoveItemFromInventory(W)) - user.visible_message("[user] hooks up [W] to [src].", \ - "I add [W] to [src].") + user.visible_message(span_notice("[user] hooks up [W] to [src]."), \ + span_notice("I add [W] to [src].")) playsound(src, 'sound/blank.ogg', 50, TRUE) W.forceMove(src) cell = W @@ -121,14 +121,14 @@ if(1) if(W.tool_behaviour == TOOL_WRENCH) if(cell) - to_chat(user, "I have to remove the cell first!") + to_chat(user, span_warning("I have to remove the cell first!")) return else - to_chat(user, "I begin deconstructing [src]...") + to_chat(user, span_notice("I begin deconstructing [src]...")) if (W.use_tool(src, user, 30, volume=50)) new /obj/item/stack/sheet/metal(drop_location(), sheets_refunded) - user.visible_message("[user.name] deconstructs [src].", \ - "I deconstruct [src].", "I hear a ratchet.") + user.visible_message(span_notice("[user.name] deconstructs [src]."), \ + span_notice("I deconstruct [src]."), span_hear("I hear a ratchet.")) playsound(src, 'sound/blank.ogg', 75, TRUE) qdel(src) return @@ -138,28 +138,28 @@ if(coil.use(1)) icon_state = "[fixture_type]-construct-stage2" stage = 2 - user.visible_message("[user.name] adds wires to [src].", \ - "I add wires to [src].") + user.visible_message(span_notice("[user.name] adds wires to [src]."), \ + span_notice("I add wires to [src].")) else - to_chat(user, "I need one length of cable to wire [src]!") + to_chat(user, span_warning("I need one length of cable to wire [src]!")) return if(2) if(W.tool_behaviour == TOOL_WRENCH) - to_chat(usr, "I have to remove the wires first!") + to_chat(usr, span_warning("I have to remove the wires first!")) return if(W.tool_behaviour == TOOL_WIRECUTTER) stage = 1 icon_state = "[fixture_type]-construct-stage1" new /obj/item/stack/cable_coil(drop_location(), 1, "red") - user.visible_message("[user.name] removes the wiring from [src].", \ - "I remove the wiring from [src].", "I hear clicking.") + user.visible_message(span_notice("[user.name] removes the wiring from [src]."), \ + span_notice("I remove the wiring from [src]."), span_hear("I hear clicking.")) W.play_tool_sound(src, 100) return if(W.tool_behaviour == TOOL_SCREWDRIVER) - user.visible_message("[user.name] closes [src]'s casing.", \ - "I close [src]'s casing.", "I hear screwing.") + user.visible_message(span_notice("[user.name] closes [src]'s casing."), \ + span_notice("I close [src]'s casing."), span_hear("I hear screwing.")) W.play_tool_sound(src, 75) switch(fixture_type) if("tube") @@ -496,7 +496,7 @@ // attempt to insert light else if(istype(W, /obj/item/light)) if(status == LIGHT_OK) - to_chat(user, "There is a [fitting] already inserted!") + to_chat(user, span_warning("There is a [fitting] already inserted!")) else src.add_fingerprint(user) var/obj/item/light/L = W @@ -507,9 +507,9 @@ src.add_fingerprint(user) if(status != LIGHT_EMPTY) drop_light_tube(user) - to_chat(user, "I replace [L].") + to_chat(user, span_notice("I replace [L].")) else - to_chat(user, "I insert [L].") + to_chat(user, span_notice("I insert [L].")) status = L.status switchcount = L.switchcount rigged = L.rigged @@ -522,17 +522,17 @@ if(on && rigged) explode() else - to_chat(user, "This type of light requires a [fitting]!") + to_chat(user, span_warning("This type of light requires a [fitting]!")) // attempt to stick weapon into light socket else if(status == LIGHT_EMPTY) if(W.tool_behaviour == TOOL_SCREWDRIVER) //If it's a screwdriver open it. W.play_tool_sound(src, 75) - user.visible_message("[user.name] opens [src]'s casing.", \ - "I open [src]'s casing.", "I hear a noise.") + user.visible_message(span_notice("[user.name] opens [src]'s casing."), \ + span_notice("I open [src]'s casing."), span_hear("I hear a noise.")) deconstruct() else - to_chat(user, "I stick \the [W] into the light socket!") + to_chat(user, span_danger("I stick \the [W] into the light socket!")) if(has_power() && (W.flags_1 & CONDUCT_1)) do_sparks(3, TRUE, src) if (prob(75)) @@ -624,7 +624,7 @@ if(!has_emergency_power(pwr)) return FALSE if(cell.charge > 300) //it's meant to handle 120 W, ya doofus - visible_message("[src] short-circuits from too powerful of a power cell!") + visible_message(span_warning("[src] short-circuits from too powerful of a power cell!")) burn_out() return FALSE cell.use(pwr) @@ -652,7 +652,7 @@ /obj/machinery/light/attack_ai(mob/user) no_emergency = !no_emergency - to_chat(user, "Emergency lights for this fixture have been [no_emergency ? "disabled" : "enabled"].") + to_chat(user, span_notice("Emergency lights for this fixture have been [no_emergency ? "disabled" : "enabled"].")) update(FALSE) return @@ -690,10 +690,10 @@ /obj/machinery/light/attack_tk(mob/user) if(status == LIGHT_EMPTY) - to_chat(user, "There is no [fitting] in this light!") + to_chat(user, span_warning("There is no [fitting] in this light!")) return - to_chat(user, "I telekinetically remove the light [fitting].") + to_chat(user, span_notice("I telekinetically remove the light [fitting].")) // create a light tube/bulb item and put it in the user's hand var/obj/item/light/L = drop_light_tube() L.attack_tk(user) @@ -770,10 +770,10 @@ /obj/item/light/suicide_act(mob/living/carbon/user) if (status == LIGHT_BROKEN) - user.visible_message("[user] begins to stab [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins to stab [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS else - user.visible_message("[user] begins to eat \the [src]! It looks like [user.p_theyre()] not very bright!") + user.visible_message(span_suicide("[user] begins to eat \the [src]! It looks like [user.p_theyre()] not very bright!")) shatter() return BRUTELOSS @@ -841,7 +841,7 @@ if(istype(I, /obj/item/reagent_containers/syringe)) var/obj/item/reagent_containers/syringe/S = I - to_chat(user, "I inject the solution into \the [src].") + to_chat(user, span_notice("I inject the solution into \the [src].")) if(S.reagents.has_reagent(/datum/reagent/toxin/plasma, 5)) @@ -862,7 +862,7 @@ /obj/item/light/proc/shatter() if(status == LIGHT_OK || status == LIGHT_BURNED) - visible_message("[src] shatters.","I hear a small glass object shatter.") + visible_message(span_danger("[src] shatters."),span_hear("I hear a small glass object shatter.")) status = LIGHT_BROKEN force = 5 playsound(src.loc, 'sound/blank.ogg', 75, TRUE) diff --git a/code/modules/power/monitor.dm b/code/modules/power/monitor.dm index 3d256225c..b2adba785 100644 --- a/code/modules/power/monitor.dm +++ b/code/modules/power/monitor.dm @@ -32,7 +32,7 @@ /obj/machinery/computer/monitor/secret/examine(mob/user) . = ..() - . += "It's operating system seems quite outdated... It doesn't seem like it'd be compatible with the latest remote NTOS monitoring systems." + . += span_notice("It's operating system seems quite outdated... It doesn't seem like it'd be compatible with the latest remote NTOS monitoring systems.") /obj/machinery/computer/monitor/Initialize() . = ..() diff --git a/code/modules/power/multiz.dm b/code/modules/power/multiz.dm index 222902ebc..88f45e525 100644 --- a/code/modules/power/multiz.dm +++ b/code/modules/power/multiz.dm @@ -33,10 +33,10 @@ ///Allows you to scan the relay with a multitool to see stats. /obj/machinery/power/deck_relay/multitool_act(mob/user, obj/item/I) if(powernet && (powernet.avail > 0)) // is it powered? - to_chat(user, "Total power: [DisplayPower(powernet.avail)]\nLoad: [DisplayPower(powernet.load)]\nExcess power: [DisplayPower(surplus())]") + to_chat(user, span_danger("Total power: [DisplayPower(powernet.avail)]\nLoad: [DisplayPower(powernet.load)]\nExcess power: [DisplayPower(surplus())]")) if(!powernet || below.powernet != powernet) icon_state = "cablerelay-off" - to_chat(user, "Powernet connection lost. Attempting to re-establish. Ensure the relays below this one are connected too.") + to_chat(user, span_danger("Powernet connection lost. Attempting to re-establish. Ensure the relays below this one are connected too.")) find_relays() addtimer(CALLBACK(src, PROC_REF(refresh)), 20) //Wait a bit so we can find the one below, then get powering return TRUE diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm index c3f1516d8..09c497383 100644 --- a/code/modules/power/pipecleaners.dm +++ b/code/modules/power/pipecleaners.dm @@ -137,14 +137,14 @@ By design, d1 is the smallest direction and d2 is the highest else if(istype(W, /obj/item/stack/pipe_cleaner_coil)) var/obj/item/stack/pipe_cleaner_coil/coil = W if (coil.get_amount() < 1) - to_chat(user, "Not enough pipe cleaner!") + to_chat(user, span_warning("Not enough pipe cleaner!")) return coil.pipe_cleaner_join(src, user) add_fingerprint(user) /obj/structure/pipe_cleaner/proc/cut_pipe_cleaner(mob/user) - user.visible_message("[user] pulls up the pipe cleaner.", "I pull up the pipe cleaner.") + user.visible_message(span_notice("[user] pulls up the pipe cleaner."), span_notice("I pull up the pipe cleaner.")) stored.add_fingerprint(user) investigate_log("was pulled up by [key_name(usr)] in [AREACOORD(src)]", INVESTIGATE_WIRES) deconstruct() @@ -215,9 +215,9 @@ By design, d1 is the smallest direction and d2 is the highest /obj/item/stack/pipe_cleaner_coil/suicide_act(mob/user) if(locate(/obj/structure/chair/stool) in get_turf(user)) - user.visible_message("[user] is making a noose with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is making a noose with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) else - user.visible_message("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return(OXYLOSS) /obj/item/stack/pipe_cleaner_coil/Initialize(mapload, new_amount = null, param_color = null) @@ -276,15 +276,15 @@ By design, d1 is the smallest direction and d2 is the highest return if(!isturf(T) || !T.can_have_cabling()) - to_chat(user, "I can only lay pipe cleaners on a solid floor!") + to_chat(user, span_warning("I can only lay pipe cleaners on a solid floor!")) return if(get_amount() < 1) // Out of pipe_cleaner - to_chat(user, "There is no pipe cleaner left!") + to_chat(user, span_warning("There is no pipe cleaner left!")) return if(get_dist(T,user) > 1) // Too far - to_chat(user, "I can't lay pipe cleaner at a place that far away!") + to_chat(user, span_warning("I can't lay pipe cleaner at a place that far away!")) return var/dirn @@ -298,7 +298,7 @@ By design, d1 is the smallest direction and d2 is the highest for(var/obj/structure/pipe_cleaner/LC in T) if(LC.d2 == dirn && LC.d1 == 0) - to_chat(user, "There's already a pipe leaner at that position!") + to_chat(user, span_warning("There's already a pipe leaner at that position!")) return var/obj/structure/pipe_cleaner/C = get_new_pipe_cleaner(T) @@ -326,7 +326,7 @@ By design, d1 is the smallest direction and d2 is the highest return if(get_dist(C, user) > 1) // make sure it's close enough - to_chat(user, "I can't lay pipe cleaner at a place that far away!") + to_chat(user, span_warning("I can't lay pipe cleaner at a place that far away!")) return @@ -342,7 +342,7 @@ By design, d1 is the smallest direction and d2 is the highest if((C.d1 == dirn || C.d2 == dirn) && !forceddir) if(!U.can_have_cabling()) //checking if it's a plating or catwalk if (showerror) - to_chat(user, "I can only lay pipe cleaners on catwalks and plating!") + to_chat(user, span_warning("I can only lay pipe cleaners on catwalks and plating!")) return else // pipe_cleaner is pointing at us, we're standing on an open tile @@ -353,7 +353,7 @@ By design, d1 is the smallest direction and d2 is the highest for(var/obj/structure/pipe_cleaner/LC in U) // check to make sure there's not a pipe_cleaner there already if(LC.d1 == fdirn || LC.d2 == fdirn) if (showerror) - to_chat(user, "There's already a pipe cleaner at that position!") + to_chat(user, span_warning("There's already a pipe cleaner at that position!")) return var/obj/structure/pipe_cleaner/NC = get_new_pipe_cleaner(U) @@ -384,7 +384,7 @@ By design, d1 is the smallest direction and d2 is the highest continue if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no pipe_cleaner matches either direction if (showerror) - to_chat(user, "There's already a pipe cleaner at that position!") + to_chat(user, span_warning("There's already a pipe cleaner at that position!")) return diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index b91b44ac2..474f1ccca 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -120,11 +120,11 @@ /obj/machinery/power/port_gen/pacman/examine(mob/user) . = ..() - . += "The generator has [sheets] units of [sheet_name] fuel left, producing [DisplayPower(power_gen)] per cycle." + . += span_notice("The generator has [sheets] units of [sheet_name] fuel left, producing [DisplayPower(power_gen)] per cycle.") if(anchored) - . += "It is anchored to the ground." + . += span_notice("It is anchored to the ground.") if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Fuel efficiency increased by [(consumption*100)-100]%." + . += span_notice("The status display reads: Fuel efficiency increased by [(consumption*100)-100]%.") /obj/machinery/power/port_gen/pacman/HasFuel() if(sheets >= 1 / (time_per_sheet / power_output) - sheet_left) @@ -179,9 +179,9 @@ var/obj/item/stack/addstack = O var/amount = min((max_sheets - sheets), addstack.amount) if(amount < 1) - to_chat(user, "The [src.name] is full!") + to_chat(user, span_notice("The [src.name] is full!")) return - to_chat(user, "I add [amount] sheets to the [src.name].") + to_chat(user, span_notice("I add [amount] sheets to the [src.name].")) sheets += amount addstack.use(amount) return @@ -190,11 +190,11 @@ if(!anchored && !isinspace()) anchored = TRUE connect_to_network() - to_chat(user, "I secure the generator to the floor.") + to_chat(user, span_notice("I secure the generator to the floor.")) else if(anchored) anchored = FALSE disconnect_from_network() - to_chat(user, "I unsecure the generator from the floor.") + to_chat(user, span_notice("I unsecure the generator from the floor.")) playsound(src, 'sound/blank.ogg', 50, TRUE) return @@ -202,9 +202,9 @@ panel_open = !panel_open O.play_tool_sound(src) if(panel_open) - to_chat(user, "I open the access panel.") + to_chat(user, span_notice("I open the access panel.")) else - to_chat(user, "I close the access panel.") + to_chat(user, span_notice("I close the access panel.")) return else if(default_deconstruction_crowbar(O)) return diff --git a/code/modules/power/roguelighting.dm b/code/modules/power/roguelighting.dm index a0e4ea369..cfea548ab 100644 --- a/code/modules/power/roguelighting.dm +++ b/code/modules/power/roguelighting.dm @@ -185,10 +185,10 @@ minsleft = "less than a minute" else minsleft = "[round(minsleft)] minutes" - . += "The fire will last for [minsleft]." + . += span_info("The fire will last for [minsleft].") else if(initial(fueluse) > 0) - . += "The fire is burned out and hungry..." + . += span_warning("The fire is burned out and hungry...") /obj/machinery/light/rogue/extinguish() if(on) @@ -257,7 +257,7 @@ if(cookonme) if(istype(W, /obj/item/reagent_containers/food/snacks)) if(istype(W, /obj/item/reagent_containers/food/snacks/egg)) - to_chat(user, "I wouldn't be able to cook this over the fire...") + to_chat(user, span_warning("I wouldn't be able to cook this over the fire...")) return FALSE var/obj/item/A = user.get_inactive_held_item() if(A) @@ -271,15 +271,15 @@ var/prob2spoil = 33 if(user.mind.get_skill_level(/datum/skill/craft/cooking)) prob2spoil = 1 - user.visible_message("[user] starts to cook [W] over [src].") + user.visible_message(span_notice("[user] starts to cook [W] over [src].")) for(var/i in 1 to 6) if(do_after(user, 30, target = src)) var/obj/item/reagent_containers/food/snacks/S = W var/obj/item/C if(prob(prob2spoil)) - user.visible_message("[user] burns [S].") + user.visible_message(span_warning("[user] burns [S].")) if(user.client?.prefs.showrolls) - to_chat(user, "Cooking fail... [prob2spoil]%.") + to_chat(user, span_warning("Cooking fail... [prob2spoil]%.")) C = S.cooking(1000, null) else C = S.cooking(S.cooktime/4, src) @@ -295,7 +295,7 @@ if(W.firefuel) if(initial(fueluse)) if(fueluse > initial(fueluse) - 5 SECONDS) - to_chat(user, "The fire is fully fueled.") + to_chat(user, span_warning("The fire is fully fueled.")) return else if(!on) @@ -303,7 +303,7 @@ if (alert(usr, "Feed [W] to the fire?", "ROGUETOWN", "Yes", "No") != "Yes") return qdel(W) - user.visible_message("[user] feeds [W] to [src].") + user.visible_message(span_warning("[user] feeds [W] to [src].")) if(initial(fueluse)) fueluse = fueluse + W.firefuel if(fueluse > initial(fueluse)) //keep it at the max @@ -318,7 +318,7 @@ set_light(0) update_icon() qdel(W) - src.visible_message("[user] snuffs the fire.") + src.visible_message(span_warning("[user] snuffs the fire.")) return if(user.used_intent?.type != INTENT_SPLASH) W.spark_act() @@ -369,19 +369,19 @@ var/mob/living/carbon/human/H = user if(istype(H)) - H.visible_message("[H] warms \his hand over the fire.") + H.visible_message(span_info("[H] warms \his hand over the fire.")) if(do_after(H, 15, target = src)) var/obj/item/bodypart/affecting = H.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") - to_chat(H, "HOT!") + to_chat(H, span_warning("HOT!")) if(affecting && affecting.receive_damage( 0, 5 )) // 5 burn damage H.update_damage_overlays() return TRUE //fires that are on always have this interaction with lmb unless its a torch else if(icon_state == "[base_state]over") - user.visible_message("[user] starts to pick up [src]...", \ - "I start to pick up [src]...") + user.visible_message(span_notice("[user] starts to pick up [src]..."), \ + span_notice("I start to pick up [src]...")) if(do_after(user, 30, target = src)) icon_state = "[base_state]0" return @@ -421,19 +421,19 @@ var/mob/living/L = user if(icon_state == "[base_state]over") playsound(src, 'sound/combat/hits/onwood/woodimpact (1).ogg', 100) - user.visible_message("[user] kicks [src]!", \ - "I kick [src]!") + user.visible_message(span_warning("[user] kicks [src]!"), \ + span_warning("I kick [src]!")) return if(prob(L.STASTR * 8)) playsound(src, 'sound/combat/hits/onwood/woodimpact (1).ogg', 100) - user.visible_message("[user] kicks over [src]!", \ - "I kick over [src]!") + user.visible_message(span_warning("[user] kicks over [src]!"), \ + span_warning("I kick over [src]!")) burn_out() knock_over() else playsound(src, 'sound/combat/hits/onwood/woodimpact (1).ogg', 100) - user.visible_message("[user] kicks [src]!", \ - "I kick [src]!") + user.visible_message(span_warning("[user] kicks [src]!"), \ + span_warning("I kick [src]!")) /obj/machinery/light/rogue/wallfire name = "fireplace" @@ -455,7 +455,7 @@ /obj/machinery/light/rogue/wallfire/candle/attack_hand(mob/user) if(isliving(user) && on) - user.visible_message("[user] snuffs [src].") + user.visible_message(span_warning("[user] snuffs [src].")) burn_out() return TRUE //fires that are on always have this interaction with lmb unless its a torch . = ..() @@ -573,11 +573,11 @@ if(torchy) if(LR.on && !on) if(torchy.fuel <= 0) - to_chat(user, "The mounted torch is burned out.") + to_chat(user, span_warning("The mounted torch is burned out.")) return else torchy.spark_act() - user.visible_message("[user] lights [src].") + user.visible_message(span_info("[user] lights [src].")) playsound(src.loc, 'sound/items/firelight.ogg', 100) on = TRUE update() @@ -587,7 +587,7 @@ if(!LR.on && on) if(LR.fuel > 0) LR.spark_act() - user.visible_message("[user] lights [LR] in [src].") + user.visible_message(span_info("[user] lights [LR] in [src].")) user.update_inv_hands() else if(LR.on) @@ -624,7 +624,7 @@ /obj/machinery/light/rogue/chand/attack_hand(mob/user) if(isliving(user) && on) - user.visible_message("[user] snuffs [src].") + user.visible_message(span_warning("[user] snuffs [src].")) burn_out() return TRUE //fires that are on always have this interaction with lmb unless its a torch . = ..() @@ -667,7 +667,7 @@ var/obj/item/reagent_containers/glass/pot = attachment if(W.type in subtypesof(/obj/item/reagent_containers/food/snacks) || W.type == /obj/item/reagent_containers/powder/flour) if(pot.reagents.chem_temp < 374) - to_chat(user, "[pot] isn't boiling!") + to_chat(user, span_warning("[pot] isn't boiling!")) return var/nutrimentamount = W.reagents.get_reagent_amount(/datum/reagent/consumable/nutriment) if(W.type in subtypesof(/obj/item/reagent_containers/food/snacks)) @@ -678,9 +678,9 @@ nutrimentamount += 2 //Boiling is a way of cooking grain without baking if(nutrimentamount > 0) if(nutrimentamount + pot.reagents.total_volume > pot.volume) - to_chat(user, "[attachment] is full!") + to_chat(user, span_warning("[attachment] is full!")) return - user.visible_message("[user] places [W] into the pot.") + user.visible_message(span_info("[user] places [W] into the pot.")) pot.reagents.add_reagent(/datum/reagent/consumable/nutriment, nutrimentamount) qdel(W) return @@ -728,10 +728,10 @@ if(on) var/mob/living/carbon/human/H = user if(istype(H)) - H.visible_message("[H] warms \his hand over the embers.") + H.visible_message(span_info("[H] warms \his hand over the embers.")) if(do_after(H, 50, target = src)) var/obj/item/bodypart/affecting = H.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") - to_chat(H, "HOT!") + to_chat(H, span_warning("HOT!")) if(affecting && affecting.receive_damage( 0, 5 )) // 5 burn damage H.update_damage_overlays() return TRUE @@ -766,7 +766,7 @@ /obj/machinery/light/rogue/hearth/onkick(mob/user) if(isliving(user) && on) - user.visible_message("[user] snuffs [src].") + user.visible_message(span_warning("[user] snuffs [src].")) burn_out() /obj/machinery/light/rogue/hearth/Destroy() @@ -796,7 +796,7 @@ /obj/machinery/light/rogue/campfire/onkick(mob/user) if(isliving(user) && on) var/mob/living/L = user - L.visible_message("[L] snuffs [src].") + L.visible_message(span_info("[L] snuffs [src].")) burn_out() /obj/machinery/light/rogue/campfire/attack_hand(mob/user) @@ -808,11 +808,11 @@ var/mob/living/carbon/human/H = user if(istype(H)) - H.visible_message("[H] warms \his hand near the fire.") + H.visible_message(span_info("[H] warms \his hand near the fire.")) if(do_after(H, 100, target = src)) var/obj/item/bodypart/affecting = H.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") - to_chat(H, "HOT!") + to_chat(H, span_warning("HOT!")) if(affecting && affecting.receive_damage( 0, 5 )) // 5 burn damage H.update_damage_overlays() return TRUE //fires that are on always have this interaction with lmb unless its a torch diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm index cc0c294b2..2ab0ecf9f 100644 --- a/code/modules/power/rtg.dm +++ b/code/modules/power/rtg.dm @@ -39,7 +39,7 @@ /obj/machinery/power/rtg/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Power generation now at [power_gen*0.001]kW." + . += span_notice("The status display reads: Power generation now at [power_gen*0.001]kW.") /obj/machinery/power/rtg/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-open", initial(icon_state), I)) @@ -72,8 +72,8 @@ if(going_kaboom) return going_kaboom = TRUE - visible_message("\The [src] lets out a shower of sparks as it starts to lose stability!",\ - "I hear a loud electrical crack!") + visible_message(span_danger("\The [src] lets out a shower of sparks as it starts to lose stability!"),\ + span_hear("I hear a loud electrical crack!")) playsound(src.loc, 'sound/blank.ogg', 100, TRUE, extrarange = 5) tesla_zap(src, 5, power_gen * 0.05) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(explosion), get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion. diff --git a/code/modules/power/singularity/boh_tear.dm b/code/modules/power/singularity/boh_tear.dm index a3679401b..d5c2b1b77 100644 --- a/code/modules/power/singularity/boh_tear.dm +++ b/code/modules/power/singularity/boh_tear.dm @@ -36,7 +36,7 @@ /obj/singularity/boh_tear/attack_tk(mob/living/user) if(!istype(user)) return - to_chat(user, "I don't feel like you are real anymore.") + to_chat(user, span_danger("I don't feel like you are real anymore.")) user.dust_animation() user.spawn_dust() addtimer(CALLBACK(src, PROC_REF(consume), user), 5) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index d51b30160..c14c480ac 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -85,8 +85,8 @@ if(anchored) if(!src.locked) toggle_power() - user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \ - "I turn the [src.name] [active? "on":"off"].") + user.visible_message(span_notice("[user.name] turns the [src.name] [active? "on":"off"]."), \ + span_notice("I turn the [src.name] [active? "on":"off"].")) var/fuel if(loaded_tank) fuel = loaded_tank.air_contents.gases[/datum/gas/plasma] @@ -94,13 +94,13 @@ investigate_log("turned [active?"on":"off"] by [key_name(user)]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"It is empty"].", INVESTIGATE_SINGULO) return else - to_chat(user, "The controls are locked!") + to_chat(user, span_warning("The controls are locked!")) return /obj/machinery/power/rad_collector/can_be_unfasten_wrench(mob/user, silent) if(loaded_tank) if(!silent) - to_chat(user, "Remove the plasma tank first!") + to_chat(user, span_warning("Remove the plasma tank first!")) return FAILED_UNFASTEN return ..() @@ -115,13 +115,13 @@ /obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/tank/internals/plasma)) if(!anchored) - to_chat(user, "[src] needs to be secured to the floor first!") + to_chat(user, span_warning("[src] needs to be secured to the floor first!")) return TRUE if(loaded_tank) - to_chat(user, "There's already a plasma tank loaded!") + to_chat(user, span_warning("There's already a plasma tank loaded!")) return TRUE if(panel_open) - to_chat(user, "Close the maintenance panel first!") + to_chat(user, span_warning("Close the maintenance panel first!")) return TRUE if(!user.transferItemToLoc(W, src)) return @@ -131,11 +131,11 @@ if(allowed(user)) if(active) locked = !locked - to_chat(user, "I [locked ? "lock" : "unlock"] the controls.") + to_chat(user, span_notice("I [locked ? "lock" : "unlock"] the controls.")) else - to_chat(user, "The controls can only be locked when \the [src] is active!") + to_chat(user, span_warning("The controls can only be locked when \the [src] is active!")) else - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) return TRUE else return ..() @@ -155,7 +155,7 @@ if(..()) return TRUE if(loaded_tank) - to_chat(user, "Remove the plasma tank first!") + to_chat(user, span_warning("Remove the plasma tank first!")) else default_deconstruction_screwdriver(user, icon_state, icon_state, I) return TRUE @@ -163,27 +163,27 @@ /obj/machinery/power/rad_collector/crowbar_act(mob/living/user, obj/item/I) if(loaded_tank) if(locked) - to_chat(user, "The controls are locked!") + to_chat(user, span_warning("The controls are locked!")) return TRUE eject() return TRUE if(default_deconstruction_crowbar(I)) return TRUE - to_chat(user, "There isn't a tank loaded!") + to_chat(user, span_warning("There isn't a tank loaded!")) return TRUE /obj/machinery/power/rad_collector/multitool_act(mob/living/user, obj/item/I) if(!is_station_level(z) && !SSresearch.science_tech) - to_chat(user, "[src] isn't linked to a research system!") + to_chat(user, span_warning("[src] isn't linked to a research system!")) return TRUE if(locked) - to_chat(user, "[src] is locked!") + to_chat(user, span_warning("[src] is locked!")) return TRUE if(active) - to_chat(user, "[src] is currently active, producing [bitcoinmining ? "research points":"power"].") + to_chat(user, span_warning("[src] is currently active, producing [bitcoinmining ? "research points":"power"].")) return TRUE bitcoinmining = !bitcoinmining - to_chat(user, "I [bitcoinmining ? "enable":"disable"] the research point production feature of [src].") + to_chat(user, span_warning("I [bitcoinmining ? "enable":"disable"] the research point production feature of [src].")) return TRUE /obj/machinery/power/rad_collector/return_analyzable_air() @@ -200,14 +200,14 @@ // Therefore, its units are joules per SSmachines.wait * 0.1 seconds. // So joules = stored_energy * SSmachines.wait * 0.1 var/joules = stored_energy * SSmachines.wait * 0.1 - . += "[src]'s display states that it has stored [DisplayJoules(joules)], and is processing [DisplayPower(RAD_COLLECTOR_OUTPUT)]." + . += span_notice("[src]'s display states that it has stored [DisplayJoules(joules)], and is processing [DisplayPower(RAD_COLLECTOR_OUTPUT)].") else - . += "[src]'s display states that it has made a total of [stored_research], and is producing [RAD_COLLECTOR_OUTPUT*RAD_COLLECTOR_MINING_CONVERSION_RATE] research points per minute." + . += span_notice("[src]'s display states that it has made a total of [stored_research], and is producing [RAD_COLLECTOR_OUTPUT*RAD_COLLECTOR_MINING_CONVERSION_RATE] research points per minute.") else if(!bitcoinmining) - . += "[src]'s display displays the words: \"Power production mode. Please insert Plasma. Use a multitool to change production modes.\"" + . += span_notice("[src]'s display displays the words: \"Power production mode. Please insert Plasma. Use a multitool to change production modes.\"") else - . += "[src]'s display displays the words: \"Research point production mode. Please insert Tritium and Oxygen. Use a multitool to change production modes.\"" + . += span_notice("[src]'s display displays the words: \"Research point production mode. Please insert Tritium and Oxygen. Use a multitool to change production modes.\"") /obj/machinery/power/rad_collector/obj_break(damage_flag) . = ..() diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 5d239f6ee..90f3c2e68 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -58,7 +58,7 @@ qdel(src) return if(ismegafauna(M)) - M.visible_message("[M] glows fiercely as the containment field flickers out!") + M.visible_message(span_warning("[M] glows fiercely as the containment field flickers out!")) FG1.calc_power(INFINITY) //rip that 'containment' field M.adjustHealth(-M.obj_damage) else @@ -122,9 +122,9 @@ if(prob(20)) user.Stun(40) user.take_overall_damage(0, shock_damage) - user.visible_message("[user.name] was shocked by the [src.name]!", \ - "Energy pulse detected, system damaged!", \ - "I hear an electrical crack.") + user.visible_message(span_danger("[user.name] was shocked by the [src.name]!"), \ + span_danger("Energy pulse detected, system damaged!"), \ + span_hear("I hear an electrical crack.")) user.updatehealth() bump_field(user) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 0e0bb6293..db6ff242e 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -92,7 +92,7 @@ /obj/machinery/power/emitter/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Emitting one beam each [fire_delay*0.1] seconds.
Power consumption at [active_power_usage]W.
" + . += span_notice("The status display reads: Emitting one beam each [fire_delay*0.1] seconds.
Power consumption at [active_power_usage]W.") /obj/machinery/power/emitter/ComponentInitialize() . = ..() @@ -100,7 +100,7 @@ /obj/machinery/power/emitter/proc/can_be_rotated(mob/user,rotation_type) if (anchored) - to_chat(user, "It is fastened to the floor!") + to_chat(user, span_warning("It is fastened to the floor!")) return FALSE return TRUE @@ -128,15 +128,15 @@ add_fingerprint(user) if(state == EMITTER_WELDED) if(!powernet) - to_chat(user, "\The [src] isn't connected to a wire!") + to_chat(user, span_warning("\The [src] isn't connected to a wire!")) return TRUE if(!locked && allow_switch_interact) if(active == TRUE) active = FALSE - to_chat(user, "I turn off [src].") + to_chat(user, span_notice("I turn off [src].")) else active = TRUE - to_chat(user, "I turn on [src].") + to_chat(user, span_notice("I turn on [src].")) shot_number = 0 fire_delay = maximum_fire_delay @@ -147,16 +147,16 @@ update_icon() else - to_chat(user, "The controls are locked!") + to_chat(user, span_warning("The controls are locked!")) else - to_chat(user, "[src] needs to be firmly secured to the floor first!") + to_chat(user, span_warning("[src] needs to be firmly secured to the floor first!")) return TRUE /obj/machinery/power/emitter/attack_animal(mob/living/simple_animal/M) if(ismegafauna(M) && anchored) state = EMITTER_UNWRENCHED anchored = FALSE - M.visible_message("[M] rips [src] free from its moorings!") + M.visible_message(span_warning("[M] rips [src] free from its moorings!")) else ..() if(!anchored) @@ -229,12 +229,12 @@ /obj/machinery/power/emitter/can_be_unfasten_wrench(mob/user, silent) if(active) if(!silent) - to_chat(user, "Turn \the [src] off first!") + to_chat(user, span_warning("Turn \the [src] off first!")) return FAILED_UNFASTEN else if(state == EMITTER_WELDED) if(!silent) - to_chat(user, "[src] is welded to the floor!") + to_chat(user, span_warning("[src] is welded to the floor!")) return FAILED_UNFASTEN return ..() @@ -255,32 +255,32 @@ /obj/machinery/power/emitter/welder_act(mob/living/user, obj/item/I) . = ..() if(active) - to_chat(user, "Turn \the [src] off first!") + to_chat(user, span_warning("Turn \the [src] off first!")) return TRUE switch(state) if(EMITTER_UNWRENCHED) - to_chat(user, "The [src.name] needs to be wrenched to the floor!") + to_chat(user, span_warning("The [src.name] needs to be wrenched to the floor!")) if(EMITTER_WRENCHED) if(!I.tool_start_check(user, amount=0)) return TRUE - user.visible_message("[user.name] starts to weld the [name] to the floor.", \ - "I start to weld \the [src] to the floor...", \ - "I hear welding.") + user.visible_message(span_notice("[user.name] starts to weld the [name] to the floor."), \ + span_notice("I start to weld \the [src] to the floor..."), \ + span_hear("I hear welding.")) if(I.use_tool(src, user, 20, volume=50) && state == EMITTER_WRENCHED) state = EMITTER_WELDED - to_chat(user, "I weld \the [src] to the floor.") + to_chat(user, span_notice("I weld \the [src] to the floor.")) connect_to_network() update_cable_icons_on_turf(get_turf(src)) if(EMITTER_WELDED) if(!I.tool_start_check(user, amount=0)) return TRUE - user.visible_message("[user.name] starts to cut the [name] free from the floor.", \ - "I start to cut \the [src] free from the floor...", \ - "I hear welding.") + user.visible_message(span_notice("[user.name] starts to cut the [name] free from the floor."), \ + span_notice("I start to cut \the [src] free from the floor..."), \ + span_hear("I hear welding.")) if(I.use_tool(src, user, 20, volume=50) && state == EMITTER_WELDED) state = EMITTER_WRENCHED - to_chat(user, "I cut \the [src] free from the floor.") + to_chat(user, span_notice("I cut \the [src] free from the floor.")) disconnect_from_network() update_cable_icons_on_turf(get_turf(src)) @@ -302,16 +302,16 @@ /obj/machinery/power/emitter/attackby(obj/item/I, mob/user, params) if(I.GetID()) if(obj_flags & EMAGGED) - to_chat(user, "The lock seems to be broken!") + to_chat(user, span_warning("The lock seems to be broken!")) return if(allowed(user)) if(active) locked = !locked - to_chat(user, "I [src.locked ? "lock" : "unlock"] the controls.") + to_chat(user, span_notice("I [src.locked ? "lock" : "unlock"] the controls.")) else - to_chat(user, "The controls can only be locked when \the [src] is online!") + to_chat(user, span_warning("The controls can only be locked when \the [src] is online!")) else - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) return else if(is_wire_tool(I) && panel_open) @@ -359,7 +359,7 @@ locked = FALSE obj_flags |= EMAGGED if(user) - user.visible_message("[user.name] emags [src].", "I short out the lock.") + user.visible_message(span_warning("[user.name] emags [src]."), span_notice("I short out the lock.")) /obj/machinery/power/emitter/prototype diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 07f8b13e1..d7a82c1c4 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -72,28 +72,28 @@ field_generator power level display if(state == FG_WELDED) if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on if(active >= FG_CHARGING) - to_chat(user, "I are unable to turn off [src] once it is online!") + to_chat(user, span_warning("I are unable to turn off [src] once it is online!")) return 1 else - user.visible_message("[user] turns on [src].", \ - "I turn on [src].", \ - "I hear heavy droning.") + user.visible_message(span_notice("[user] turns on [src]."), \ + span_notice("I turn on [src]."), \ + span_hear("I hear heavy droning.")) turn_on() investigate_log("activated by [key_name(user)].", INVESTIGATE_SINGULO) add_fingerprint(user) else - to_chat(user, "[src] needs to be firmly secured to the floor first!") + to_chat(user, span_warning("[src] needs to be firmly secured to the floor first!")) /obj/machinery/field/generator/can_be_unfasten_wrench(mob/user, silent) if(active) if(!silent) - to_chat(user, "Turn \the [src] off first!") + to_chat(user, span_warning("Turn \the [src] off first!")) return FAILED_UNFASTEN else if(state == FG_WELDED) if(!silent) - to_chat(user, "[src] is welded to the floor!") + to_chat(user, span_warning("[src] is welded to the floor!")) return FAILED_UNFASTEN return ..() @@ -114,32 +114,32 @@ field_generator power level display /obj/machinery/field/generator/welder_act(mob/living/user, obj/item/I) . = ..() if(active) - to_chat(user, "[src] needs to be off!") + to_chat(user, span_warning("[src] needs to be off!")) return TRUE switch(state) if(FG_UNSECURED) - to_chat(user, "[src] needs to be wrenched to the floor!") + to_chat(user, span_warning("[src] needs to be wrenched to the floor!")) if(FG_SECURED) if(!I.tool_start_check(user, amount=0)) return TRUE - user.visible_message("[user] starts to weld [src] to the floor.", \ - "I start to weld \the [src] to the floor...", \ - "I hear welding.") + user.visible_message(span_notice("[user] starts to weld [src] to the floor."), \ + span_notice("I start to weld \the [src] to the floor..."), \ + span_hear("I hear welding.")) if(I.use_tool(src, user, 20, volume=50) && state == FG_SECURED) state = FG_WELDED - to_chat(user, "I weld the field generator to the floor.") + to_chat(user, span_notice("I weld the field generator to the floor.")) if(FG_WELDED) if(!I.tool_start_check(user, amount=0)) return TRUE - user.visible_message("[user] starts to cut [src] free from the floor.", \ - "I start to cut \the [src] free from the floor...", \ - "I hear welding.") + user.visible_message(span_notice("[user] starts to cut [src] free from the floor."), \ + span_notice("I start to cut \the [src] free from the floor..."), \ + span_hear("I hear welding.")) if(I.use_tool(src, user, 20, volume=50) && state == FG_WELDED) state = FG_SECURED - to_chat(user, "I cut \the [src] free from the floor.") + to_chat(user, span_notice("I cut \the [src] free from the floor.")) return TRUE @@ -148,7 +148,7 @@ field_generator power level display if(M.environment_smash & ENVIRONMENT_SMASH_RWALLS && active == FG_OFFLINE && state != FG_UNSECURED) state = FG_UNSECURED anchored = FALSE - M.visible_message("[M] rips [src] free from its moorings!") + M.visible_message(span_warning("[M] rips [src] free from its moorings!")) else ..() if(!anchored) @@ -216,7 +216,7 @@ field_generator power level display check_power_level() return 1 else - visible_message("The [name] shuts down!", "I hear something shutting down.") + visible_message(span_danger("The [name] shuts down!"), span_hear("I hear something shutting down.")) turn_off() investigate_log("ran out of power and deactivated", INVESTIGATE_SINGULO) power = 0 diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index 02ce96ecf..c44a7a07c 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -28,7 +28,7 @@ /obj/singularity/narsie/large/Initialize() . = ..() - send_to_playing_players("NAR'SIE HAS RISEN") + send_to_playing_players(span_narsie("NAR'SIE HAS RISEN")) sound_to_playing_players('sound/blank.ogg') var/area/A = get_area(src) @@ -120,7 +120,7 @@ for(var/mob/living/carbon/M in viewers(consume_range, src)) if(M.stat == CONSCIOUS) if(!iscultist(M)) - to_chat(M, "I feel conscious thought crumble away in an instant as you gaze upon [src.name]...") + to_chat(M, span_cultsmall("I feel conscious thought crumble away in an instant as you gaze upon [src.name]...")) M.apply_effect(60, EFFECT_STUN) @@ -169,12 +169,12 @@ /obj/singularity/narsie/proc/acquire(atom/food) if(food == target) return - to_chat(target, "NAR'SIE HAS LOST INTEREST IN YOU.") + to_chat(target, span_cultsmall("NAR'SIE HAS LOST INTEREST IN YOU.")) target = food if(ishuman(target)) - to_chat(target, "NAR'SIE HUNGERS FOR YOUR SOUL.") + to_chat(target, span_cult("NAR'SIE HUNGERS FOR YOUR SOUL.")) else - to_chat(target, "NAR'SIE HAS CHOSEN YOU TO LEAD HER TO HER NEXT MEAL.") + to_chat(target, span_cult("NAR'SIE HAS CHOSEN YOU TO LEAD HER TO HER NEXT MEAL.")) //Wizard narsie /obj/singularity/narsie/wizard diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 0299794c8..0821b0ce9 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -67,40 +67,40 @@ if(W.tool_behaviour == TOOL_WRENCH && !isinspace()) W.play_tool_sound(src, 75) anchored = TRUE - user.visible_message("[user.name] secures the [name] to the floor.", \ - "I secure the external bolts.") + user.visible_message(span_notice("[user.name] secures the [name] to the floor."), \ + span_notice("I secure the external bolts.")) construction_state = PA_CONSTRUCTION_UNWIRED did_something = TRUE if(PA_CONSTRUCTION_UNWIRED) if(W.tool_behaviour == TOOL_WRENCH) W.play_tool_sound(src, 75) anchored = FALSE - user.visible_message("[user.name] detaches the [name] from the floor.", \ - "I remove the external bolts.") + user.visible_message(span_notice("[user.name] detaches the [name] from the floor."), \ + span_notice("I remove the external bolts.")) construction_state = PA_CONSTRUCTION_UNSECURED did_something = TRUE else if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if(CC.use(1)) - user.visible_message("[user.name] adds wires to the [name].", \ - "I add some wires.") + user.visible_message(span_notice("[user.name] adds wires to the [name]."), \ + span_notice("I add some wires.")) construction_state = PA_CONSTRUCTION_PANEL_OPEN did_something = TRUE if(PA_CONSTRUCTION_PANEL_OPEN) if(W.tool_behaviour == TOOL_WIRECUTTER)//TODO:Shock user if its on? - user.visible_message("[user.name] removes some wires from the [name].", \ - "I remove some wires.") + user.visible_message(span_notice("[user.name] removes some wires from the [name]."), \ + span_notice("I remove some wires.")) construction_state = PA_CONSTRUCTION_UNWIRED did_something = TRUE else if(W.tool_behaviour == TOOL_SCREWDRIVER) - user.visible_message("[user.name] closes the [name]'s access panel.", \ - "I close the access panel.") + user.visible_message(span_notice("[user.name] closes the [name]'s access panel."), \ + span_notice("I close the access panel.")) construction_state = PA_CONSTRUCTION_COMPLETE did_something = TRUE if(PA_CONSTRUCTION_COMPLETE) if(W.tool_behaviour == TOOL_SCREWDRIVER) - user.visible_message("[user.name] opens the [name]'s access panel.", \ - "I open the access panel.") + user.visible_message(span_notice("[user.name] opens the [name]'s access panel."), \ + span_notice("I open the access panel.")) construction_state = PA_CONSTRUCTION_PANEL_OPEN did_something = TRUE diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 514afa28d..34c6f27c4 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -80,7 +80,7 @@ return if(!interface_control) - to_chat(usr, "ERROR: Request timed out. Check wire contacts.") + to_chat(usr, span_alert("ERROR: Request timed out. Check wire contacts.")) return if(href_list["close"]) @@ -279,40 +279,40 @@ if(W.tool_behaviour == TOOL_WRENCH && !isinspace()) W.play_tool_sound(src, 75) anchored = TRUE - user.visible_message("[user.name] secures the [name] to the floor.", \ - "I secure the external bolts.") + user.visible_message(span_notice("[user.name] secures the [name] to the floor."), \ + span_notice("I secure the external bolts.")) construction_state = PA_CONSTRUCTION_UNWIRED did_something = TRUE if(PA_CONSTRUCTION_UNWIRED) if(W.tool_behaviour == TOOL_WRENCH) W.play_tool_sound(src, 75) anchored = FALSE - user.visible_message("[user.name] detaches the [name] from the floor.", \ - "I remove the external bolts.") + user.visible_message(span_notice("[user.name] detaches the [name] from the floor."), \ + span_notice("I remove the external bolts.")) construction_state = PA_CONSTRUCTION_UNSECURED did_something = TRUE else if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if(CC.use(1)) - user.visible_message("[user.name] adds wires to the [name].", \ - "I add some wires.") + user.visible_message(span_notice("[user.name] adds wires to the [name]."), \ + span_notice("I add some wires.")) construction_state = PA_CONSTRUCTION_PANEL_OPEN did_something = TRUE if(PA_CONSTRUCTION_PANEL_OPEN) if(W.tool_behaviour == TOOL_WIRECUTTER)//TODO:Shock user if its on? - user.visible_message("[user.name] removes some wires from the [name].", \ - "I remove some wires.") + user.visible_message(span_notice("[user.name] removes some wires from the [name]."), \ + span_notice("I remove some wires.")) construction_state = PA_CONSTRUCTION_UNWIRED did_something = TRUE else if(W.tool_behaviour == TOOL_SCREWDRIVER) - user.visible_message("[user.name] closes the [name]'s access panel.", \ - "I close the access panel.") + user.visible_message(span_notice("[user.name] closes the [name]'s access panel."), \ + span_notice("I close the access panel.")) construction_state = PA_CONSTRUCTION_COMPLETE did_something = TRUE if(PA_CONSTRUCTION_COMPLETE) if(W.tool_behaviour == TOOL_SCREWDRIVER) - user.visible_message("[user.name] opens the [name]'s access panel.", \ - "I open the access panel.") + user.visible_message(span_notice("[user.name] opens the [name]'s access panel."), \ + span_notice("I open the access panel.")) construction_state = PA_CONSTRUCTION_PANEL_OPEN did_something = TRUE diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 145a54188..adb294858 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -86,7 +86,7 @@ /obj/singularity/attack_tk(mob/user) if(iscarbon(user)) var/mob/living/carbon/C = user - C.visible_message("[C]'s head begins to collapse in on itself!", "My head feels like it's collapsing in on itself! This was really not a good idea!", "I hear something crack and explode in gore.") + C.visible_message(span_danger("[C]'s head begins to collapse in on itself!"), span_danger("My head feels like it's collapsing in on itself! This was really not a good idea!"), span_hear("I hear something crack and explode in gore.")) var/turf/T = get_turf(C) for(var/i in 1 to 3) C.apply_damage(30, BRUTE, BODY_ZONE_HEAD) @@ -410,8 +410,8 @@ /obj/singularity/proc/combust_mobs() for(var/mob/living/carbon/C in urange(20, src, 1)) - C.visible_message("[C]'s skin bursts into flame!", \ - "I feel an inner fire as my skin bursts into flames!") + C.visible_message(span_warning("[C]'s skin bursts into flame!"), \ + span_danger("I feel an inner fire as my skin bursts into flames!")) C.adjust_fire_stacks(5) C.IgniteMob() return @@ -428,12 +428,12 @@ if(istype(H.glasses, /obj/item/clothing/glasses/meson)) var/obj/item/clothing/glasses/meson/MS = H.glasses if(MS.vision_flags == SEE_TURFS) - to_chat(H, "I look directly into the [src.name], good thing you had my protective eyewear on!") + to_chat(H, span_notice("I look directly into the [src.name], good thing you had my protective eyewear on!")) return M.apply_effect(60, EFFECT_STUN) - M.visible_message("[M] stares blankly at the [src.name]!", \ - "I look directly into the [src.name] and feel weak.") + M.visible_message(span_danger("[M] stares blankly at the [src.name]!"), \ + span_danger("I look directly into the [src.name] and feel weak.")) return diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 23418e12d..2d78491f8 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -44,7 +44,7 @@ /obj/machinery/power/smes/examine(user) . = ..() if(!terminal) - . += "This SMES has no power terminal!" + . += span_warning("This SMES has no power terminal!") /obj/machinery/power/smes/Initialize() . = ..() @@ -94,10 +94,10 @@ if(term && term.dir == turn(dir, 180)) terminal = term terminal.master = src - to_chat(user, "Terminal found.") + to_chat(user, span_notice("Terminal found.")) break if(!terminal) - to_chat(user, "No power terminal found.") + to_chat(user, span_alert("No power terminal found.")) return stat &= ~BROKEN update_icon() @@ -110,25 +110,25 @@ return if(terminal) //is there already a terminal ? - to_chat(user, "This SMES already has a power terminal!") + to_chat(user, span_warning("This SMES already has a power terminal!")) return if(!panel_open) //is the panel open ? - to_chat(user, "I must open the maintenance panel first!") + to_chat(user, span_warning("I must open the maintenance panel first!")) return var/turf/T = get_turf(user) if (T.intact) //is the floor plating removed ? - to_chat(user, "I must first remove the floor plating!") + to_chat(user, span_warning("I must first remove the floor plating!")) return var/obj/item/stack/cable_coil/C = I if(C.get_amount() < 10) - to_chat(user, "I need more wires!") + to_chat(user, span_warning("I need more wires!")) return - to_chat(user, "I start building the power terminal...") + to_chat(user, span_notice("I start building the power terminal...")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) if(do_after(user, 20, target = src)) @@ -140,8 +140,8 @@ return if(!terminal) C.use(10) - user.visible_message("[user.name] has built a power terminal.",\ - "I build the power terminal.") + user.visible_message(span_notice("[user.name] has built a power terminal."),\ + span_notice("I build the power terminal.")) //build the terminal and link it to the network make_terminal(T) @@ -171,7 +171,7 @@ /obj/machinery/power/smes/default_deconstruction_crowbar(obj/item/crowbar/C) if(istype(C) && terminal) - to_chat(usr, "I must first remove the power terminal!") + to_chat(usr, span_warning("I must first remove the power terminal!")) return FALSE return ..() diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 4336b03f8..65a964dd1 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -61,10 +61,10 @@ /obj/machinery/power/solar/crowbar_act(mob/user, obj/item/I) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] begins to take the glass off [src].", "I begin to take the glass off [src]...") + user.visible_message(span_notice("[user] begins to take the glass off [src]."), span_notice("I begin to take the glass off [src]...")) if(I.use_tool(src, user, 50)) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] takes the glass off [src].", "I take the glass off [src].") + user.visible_message(span_notice("[user] takes the glass off [src]."), span_notice("I take the glass off [src].")) deconstruct(TRUE) return TRUE @@ -205,32 +205,32 @@ /obj/item/solar_assembly/attackby(obj/item/W, mob/user, params) if(W.tool_behaviour == TOOL_WRENCH && isturf(loc)) if(isinspace()) - to_chat(user, "I can't secure [src] here.") + to_chat(user, span_warning("I can't secure [src] here.")) return anchored = !anchored if(anchored) - user.visible_message("[user] wrenches the solar assembly into place.", "I wrench the solar assembly into place.") + user.visible_message(span_notice("[user] wrenches the solar assembly into place."), span_notice("I wrench the solar assembly into place.")) W.play_tool_sound(src, 75) else - user.visible_message("[user] unwrenches the solar assembly from its place.", "I unwrench the solar assembly from its place.") + user.visible_message(span_notice("[user] unwrenches the solar assembly from its place."), span_notice("I unwrench the solar assembly from its place.")) W.play_tool_sound(src, 75) return 1 if(istype(W, /obj/item/stack/sheet/glass) || istype(W, /obj/item/stack/sheet/rglass)) if(!anchored) - to_chat(user, "I need to secure the assembly before you can add glass.") + to_chat(user, span_warning("I need to secure the assembly before you can add glass.")) return var/obj/item/stack/sheet/S = W if(S.use(2)) glass_type = W.type playsound(src.loc, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] places the glass on the solar assembly.", "I place the glass on the solar assembly.") + user.visible_message(span_notice("[user] places the glass on the solar assembly."), span_notice("I place the glass on the solar assembly.")) if(tracker) new /obj/machinery/power/tracker(get_turf(src), src) else new /obj/machinery/power/solar(get_turf(src), src) else - to_chat(user, "I need two sheets of glass to put them into a solar panel!") + to_chat(user, span_warning("I need two sheets of glass to put them into a solar panel!")) return return 1 @@ -240,13 +240,13 @@ return tracker = 1 qdel(W) - user.visible_message("[user] inserts the electronics into the solar assembly.", "I insert the electronics into the solar assembly.") + user.visible_message(span_notice("[user] inserts the electronics into the solar assembly."), span_notice("I insert the electronics into the solar assembly.")) return 1 else if(W.tool_behaviour == TOOL_CROWBAR) new /obj/item/electronics/tracker(src.loc) tracker = 0 - user.visible_message("[user] takes out the electronics from the solar assembly.", "I take out the electronics from the solar assembly.") + user.visible_message(span_notice("[user] takes out the electronics from the solar assembly."), span_notice("I take out the electronics from the solar assembly.")) return 1 return ..() @@ -412,7 +412,7 @@ if(I.tool_behaviour == TOOL_SCREWDRIVER) if(I.use_tool(src, user, 20, volume=50)) if (src.stat & BROKEN) - to_chat(user, "The broken glass falls out.") + to_chat(user, span_notice("The broken glass falls out.")) var/obj/structure/frame/computer/A = new /obj/structure/frame/computer( src.loc ) new /obj/item/shard( src.loc ) var/obj/item/circuitboard/computer/solar_control/M = new /obj/item/circuitboard/computer/solar_control( A ) @@ -424,7 +424,7 @@ A.anchored = TRUE qdel(src) else - to_chat(user, "I disconnect the monitor.") + to_chat(user, span_notice("I disconnect the monitor.")) var/obj/structure/frame/computer/A = new /obj/structure/frame/computer( src.loc ) var/obj/item/circuitboard/computer/solar_control/M = new /obj/item/circuitboard/computer/solar_control( A ) for (var/obj/C in src) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 932746a21..e1bd94e09 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -200,7 +200,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) if (istype(user, /mob/living/carbon)) var/mob/living/carbon/C = user if (!istype(C.glasses, /obj/item/clothing/glasses/meson) && (get_dist(user, src) < HALLUCINATION_RANGE(power))) - . += "I get headaches just from looking at it." + . += span_danger("I get headaches just from looking at it.") /obj/machinery/power/supermatter_crystal/proc/get_status() var/turf/T = get_turf(src) @@ -292,7 +292,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) for(var/mob/M in GLOB.player_list) if(M.z == z) SEND_SOUND(M, 'sound/blank.ogg') - to_chat(M, "I feel reality distort for a moment...") + to_chat(M, span_boldannounce("I feel reality distort for a moment...")) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "delam", /datum/mood_event/delam) if(combined_gas > MOLE_PENALTY_THRESHOLD) investigate_log("has collapsed into a singularity.", INVESTIGATE_SUPERMATTER) @@ -325,7 +325,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) if(isclosedturf(T)) var/turf/did_it_melt = T.Melt() if(!isclosedturf(did_it_melt)) //In case some joker finds way to place these on indestructible walls - visible_message("[src] melts through [T]!") + visible_message(span_warning("[src] melts through [T]!")) return if(power) @@ -541,11 +541,11 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) var/gain = 100 investigate_log("Supermatter shard consumed by singularity.", INVESTIGATE_SINGULO) message_admins("Singularity has consumed a supermatter shard and can now become stage six.") - visible_message("[src] is consumed by the singularity!") + visible_message(span_danger("[src] is consumed by the singularity!")) for(var/mob/M in GLOB.player_list) if(M.z == z) SEND_SOUND(M, 'sound/blank.ogg') //everyone goan know bout this - to_chat(M, "A horrible screeching fills your ears, and a wave of dread washes over you...") + to_chat(M, span_boldannounce("A horrible screeching fills your ears, and a wave of dread washes over you...")) qdel(src) return gain @@ -554,18 +554,18 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) damage += B.obj_integrity * 0.5 //take damage equal to 50% of remaining blob health before it tried to eat us if(B.obj_integrity > 100) - B.visible_message("\The [B] strikes at \the [src] and flinches away!",\ - "I hear a loud crack as you are washed with a wave of heat.") + B.visible_message(span_danger("\The [B] strikes at \the [src] and flinches away!"),\ + span_hear("I hear a loud crack as you are washed with a wave of heat.")) B.take_damage(100, BURN) else - B.visible_message("\The [B] strikes at \the [src] and rapidly flashes to ash.",\ - "I hear a loud crack as you are washed with a wave of heat.") + B.visible_message(span_danger("\The [B] strikes at \the [src] and rapidly flashes to ash."),\ + span_hear("I hear a loud crack as you are washed with a wave of heat.")) Consume(B) /obj/machinery/power/supermatter_crystal/attack_tk(mob/user) if(iscarbon(user)) var/mob/living/carbon/C = user - to_chat(C, "That was a really dense idea.") + to_chat(C, span_danger("That was a really dense idea.")) C.ghostize() var/obj/item/organ/brain/rip_u = locate(/obj/item/organ/brain) in C.internal_organs rip_u.Remove(C) @@ -584,8 +584,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) else murder = S.attack_verb_continuous dust_mob(S, \ - "[S] unwisely [murder] [src], and [S.p_their()] body burns brilliantly before flashing into ash!", \ - "I unwisely touch [src], and your vision glows brightly as your body crumbles to dust. Oops.", \ + span_danger("[S] unwisely [murder] [src], and [S.p_their()] body burns brilliantly before flashing into ash!"), \ + span_danger("I unwisely touch [src], and your vision glows brightly as your body crumbles to dust. Oops."), \ "simple animal attack") /obj/machinery/power/supermatter_crystal/attack_robot(mob/user) @@ -605,12 +605,12 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) if(nom.incorporeal_move || nom.status_flags & GODMODE) return if(!vis_msg) - vis_msg = "[nom] reaches out and touches [src], inducing a resonance... [nom.p_their()] body starts to glow and burst into flames before flashing into dust!" + vis_msg = span_danger("[nom] reaches out and touches [src], inducing a resonance... [nom.p_their()] body starts to glow and burst into flames before flashing into dust!") if(!mob_msg) - mob_msg = "I reach out and touch [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"" + mob_msg = span_danger("I reach out and touch [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"") if(!cause) cause = "contact" - nom.visible_message(vis_msg, mob_msg, "I hear an unearthly noise as a wave of heat washes over you.") + nom.visible_message(vis_msg, mob_msg, span_hear("I hear an unearthly noise as a wave of heat washes over you.")) investigate_log("has been attacked ([cause]) by [key_name(nom)]", INVESTIGATE_SUPERMATTER) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) Consume(nom) @@ -629,42 +629,42 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) which_hand = BODY_ZONE_R_ARM var/obj/item/bodypart/dust_arm = user.get_bodypart(which_hand) dust_arm.dismember() - user.visible_message("The [W] flashes out of existence on contact with \the [src], resonating with a horrible sound...",\ - "Oops! The [W] flashes out of existence on contact with \the [src], taking your arm with it! That was clumsy of you!") + user.visible_message(span_danger("The [W] flashes out of existence on contact with \the [src], resonating with a horrible sound..."),\ + span_danger("Oops! The [W] flashes out of existence on contact with \the [src], taking your arm with it! That was clumsy of you!")) playsound(src, 'sound/blank.ogg', 150, TRUE) Consume(dust_arm) qdel(W) return if(cig.lit || user.used_intent.type != INTENT_HELP) - user.visible_message("A hideous sound echoes as [W] is ashed out on contact with \the [src]. That didn't seem like a good idea...") + user.visible_message(span_danger("A hideous sound echoes as [W] is ashed out on contact with \the [src]. That didn't seem like a good idea...")) playsound(src, 'sound/blank.ogg', 150, TRUE) Consume(W) radiation_pulse(src, 150, 4) return ..() else cig.light() - user.visible_message("As [user] lights \their [W] on \the [src], silence fills the room...",\ - "Time seems to slow to a crawl as you touch \the [src] with \the [W].\n\The [W] flashes alight with an eerie energy as you nonchalantly lift your hand away from \the [src]. Damn.") + user.visible_message(span_danger("As [user] lights \their [W] on \the [src], silence fills the room..."),\ + span_danger("Time seems to slow to a crawl as you touch \the [src] with \the [W].\n\The [W] flashes alight with an eerie energy as you nonchalantly lift your hand away from \the [src]. Damn.")) playsound(src, 'sound/blank.ogg', 50, TRUE) radiation_pulse(src, 50, 3) return if(istype(W, /obj/item/scalpel/supermatter)) var/obj/item/scalpel/supermatter/scalpel = W - to_chat(user, "I carefully begin to scrape \the [src] with \the [W]...") + to_chat(user, span_notice("I carefully begin to scrape \the [src] with \the [W]...")) if(W.use_tool(src, user, 60, volume=100)) if (scalpel.usesLeft) - to_chat(user, "I extract a sliver from \the [src]. \The [src] begins to react violently!") + to_chat(user, span_danger("I extract a sliver from \the [src]. \The [src] begins to react violently!")) new /obj/item/nuke_core/supermatter_sliver(drop_location()) matter_power += 800 scalpel.usesLeft-- if (!scalpel.usesLeft) - to_chat(user, "A tiny piece of \the [W] falls off, rendering it useless!") + to_chat(user, span_notice("A tiny piece of \the [W] falls off, rendering it useless!")) else - to_chat(user, "I fail to extract a sliver from \The [src]! \the [W] isn't sharp enough anymore.") + to_chat(user, span_warning("I fail to extract a sliver from \The [src]! \the [W] isn't sharp enough anymore.")) else if(user.dropItemToGround(W)) - user.visible_message("As [user] touches \the [src] with \a [W], silence fills the room...",\ - "I touch \the [src] with \the [W], and everything suddenly goes silent.\n\The [W] flashes into dust as you flinch away from \the [src].",\ - "Everything suddenly goes silent.") + user.visible_message(span_danger("As [user] touches \the [src] with \a [W], silence fills the room..."),\ + span_danger("I touch \the [src] with \the [W], and everything suddenly goes silent.\n\The [W] flashes into dust as you flinch away from \the [src]."),\ + span_hear("Everything suddenly goes silent.")) investigate_log("has been attacked ([W]) by [key_name(user)]", INVESTIGATE_SUPERMATTER) Consume(W) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) @@ -679,12 +679,12 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) /obj/machinery/power/supermatter_crystal/Bumped(atom/movable/AM) if(isliving(AM)) - AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... [AM.p_their()] body starts to glow and burst into flames before flashing into dust!",\ - "I slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\ - "I hear an unearthly noise as a wave of heat washes over you.") + AM.visible_message(span_danger("\The [AM] slams into \the [src] inducing a resonance... [AM.p_their()] body starts to glow and burst into flames before flashing into dust!"),\ + span_danger("I slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\""),\ + span_hear("I hear an unearthly noise as a wave of heat washes over you.")) else if(isobj(AM) && !iseffect(AM)) - AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.", null,\ - "I hear a loud crack as you are washed with a wave of heat.") + AM.visible_message(span_danger("\The [AM] smacks into \the [src] and rapidly flashes to ash."), null,\ + span_hear("I hear a loud crack as you are washed with a wave of heat.")) else return @@ -724,10 +724,10 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) for(var/mob/living/L in range(10)) investigate_log("has irradiated [key_name(L)] after consuming [AM].", INVESTIGATE_SUPERMATTER) if(L in view()) - L.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", MSG_VISUAL,\ - "The unearthly ringing subsides and you notice you have new radiation burns.", MSG_AUDIBLE) + L.show_message(span_danger("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns."), MSG_VISUAL,\ + span_danger("The unearthly ringing subsides and you notice you have new radiation burns."), MSG_AUDIBLE) else - L.show_message("I hear an unearthly ringing and notice your skin is covered in fresh radiation burns.", MSG_AUDIBLE) + L.show_message(span_hear("I hear an unearthly ringing and notice your skin is covered in fresh radiation burns."), MSG_AUDIBLE) //Do not blow up our internal radio /obj/machinery/power/supermatter_crystal/contents_explosion(severity, target) return @@ -775,9 +775,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) var/mob/living/carbon/human/H = P if(H.incapacitated() || !(H.mobility_flags & MOBILITY_STAND) || H.mob_negates_gravity()) return //You can't knock down someone who is already knocked down or has immunity to gravity - H.visible_message("[H] is suddenly knocked down, as if [H.p_their()] [(H.get_num_legs() == 1) ? "leg had" : "legs have"] been pulled out from underneath [H.p_them()]!",\ - "A sudden gravitational pulse knocks you down!",\ - "I hear a thud.") + H.visible_message(span_danger("[H] is suddenly knocked down, as if [H.p_their()] [(H.get_num_legs() == 1) ? "leg had" : "legs have"] been pulled out from underneath [H.p_them()]!"),\ + span_danger("A sudden gravitational pulse knocks you down!"),\ + span_hear("I hear a thud.")) H.apply_effect(40, EFFECT_PARALYZE, 0) else //you're not human so you get sucked in step_towards(P,center) diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index d0fc7c559..dc9e7b482 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -54,14 +54,14 @@ if(isturf(loc)) var/turf/T = loc if(T.intact) - to_chat(user, "I must first expose the power terminal!") + to_chat(user, span_warning("I must first expose the power terminal!")) return if(master && !master.can_terminal_dismantle()) return - user.visible_message("[user.name] dismantles the power terminal from [master].", - "I begin to cut the cables...") + user.visible_message(span_notice("[user.name] dismantles the power terminal from [master]."), + span_notice("I begin to cut the cables...")) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) if(I.use_tool(src, user, 50)) @@ -73,7 +73,7 @@ return new /obj/item/stack/cable_coil(drop_location(), 10) - to_chat(user, "I cut the cables and dismantle the power terminal.") + to_chat(user, span_notice("I cut the cables and dismantle the power terminal.")) qdel(src) /obj/machinery/power/terminal/wirecutter_act(mob/living/user, obj/item/I) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 393af06a4..3992aa385 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -43,7 +43,7 @@ /obj/machinery/power/tesla_coil/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Power generation at [input_power_multiplier*100]%.
Shock interval at [zap_cooldown*0.1] seconds.
" + . += span_notice("The status display reads: Power generation at [input_power_multiplier*100]%.
Shock interval at [zap_cooldown*0.1] seconds.") /obj/machinery/power/tesla_coil/on_construction() if(anchored) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 31d59e69f..ba0dc292d 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -132,7 +132,7 @@ /obj/singularity/energy_ball/attack_tk(mob/user) if(iscarbon(user)) var/mob/living/carbon/C = user - to_chat(C, "That was a shockingly dumb idea.") + to_chat(C, span_danger("That was a shockingly dumb idea.")) var/obj/item/organ/brain/rip_u = locate(/obj/item/organ/brain) in C.internal_organs C.ghostize(0) qdel(rip_u) diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index fafa82e4d..798bcec3d 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -61,10 +61,10 @@ /obj/machinery/power/tracker/crowbar_act(mob/user, obj/item/I) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] begins to take the glass off [src].", "I begin to take the glass off [src]...") + user.visible_message(span_notice("[user] begins to take the glass off [src]."), span_notice("I begin to take the glass off [src]...")) if(I.use_tool(src, user, 50)) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] takes the glass off [src].", "I take the glass off [src].") + user.visible_message(span_notice("[user] takes the glass off [src]."), span_notice("I take the glass off [src].")) deconstruct(TRUE) return TRUE diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 3e0c85212..7a26ced9b 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -102,7 +102,7 @@ /obj/machinery/power/compressor/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Efficiency at [efficiency*100]%." + . += span_notice("The status display reads: Efficiency at [efficiency*100]%.") /obj/machinery/power/compressor/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, initial(icon_state), initial(icon_state), I)) @@ -113,10 +113,10 @@ inturf = get_step(src, dir) locate_machinery() if(turbine) - to_chat(user, "Turbine connected.") + to_chat(user, span_notice("Turbine connected.")) stat &= ~BROKEN else - to_chat(user, "Turbine not connected.") + to_chat(user, span_alert("Turbine not connected.")) obj_break() return @@ -191,7 +191,7 @@ /obj/machinery/power/turbine/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Productivity at [productivity*100]%." + . += span_notice("The status display reads: Productivity at [productivity*100]%.") /obj/machinery/power/turbine/locate_machinery() if(compressor) @@ -248,10 +248,10 @@ outturf = get_step(src, dir) locate_machinery() if(compressor) - to_chat(user, "Compressor connected.") + to_chat(user, span_notice("Compressor connected.")) stat &= ~BROKEN else - to_chat(user, "Compressor not connected.") + to_chat(user, span_alert("Compressor not connected.")) obj_break() return diff --git a/code/modules/projectiles/ammunition/_ammunition.dm b/code/modules/projectiles/ammunition/_ammunition.dm index 38d02e853..724e0fcb1 100644 --- a/code/modules/projectiles/ammunition/_ammunition.dm +++ b/code/modules/projectiles/ammunition/_ammunition.dm @@ -66,9 +66,9 @@ continue if (boolets > 0) box.update_icon() - to_chat(user, "I collect [boolets] shell\s. [box] now contains [box.stored_ammo.len] shell\s.") + to_chat(user, span_notice("I collect [boolets] shell\s. [box] now contains [box.stored_ammo.len] shell\s.")) else - to_chat(user, "I fail to collect anything!") + to_chat(user, span_warning("I fail to collect anything!")) else return ..() diff --git a/code/modules/projectiles/ammunition/caseless/foam.dm b/code/modules/projectiles/ammunition/caseless/foam.dm index c9182edaa..1903942cd 100644 --- a/code/modules/projectiles/ammunition/caseless/foam.dm +++ b/code/modules/projectiles/ammunition/caseless/foam.dm @@ -29,7 +29,7 @@ modified = TRUE FD.modified = TRUE FD.damage_type = BRUTE - to_chat(user, "I pop the safety cap off [src].") + to_chat(user, span_notice("I pop the safety cap off [src].")) update_icon() else if (istype(A, /obj/item/pen)) if(modified) @@ -40,11 +40,11 @@ FD.pen = A FD.damage = 5 FD.nodamage = FALSE - to_chat(user, "I insert [A] into [src].") + to_chat(user, span_notice("I insert [A] into [src].")) else - to_chat(user, "There's already something in [src].") + to_chat(user, span_warning("There's already something in [src].")) else - to_chat(user, "The safety cap prevents you from inserting [A] into [src].") + to_chat(user, span_warning("The safety cap prevents you from inserting [A] into [src].")) else return ..() @@ -54,7 +54,7 @@ FD.damage = initial(FD.damage) FD.nodamage = initial(FD.nodamage) user.put_in_hands(FD.pen) - to_chat(user, "I remove [FD.pen] from [src].") + to_chat(user, span_notice("I remove [FD.pen] from [src].")) FD.pen = null /obj/item/ammo_casing/caseless/foam_dart/riot diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 3e3b91747..9959ef00e 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -106,7 +106,7 @@ if(num_loaded) if(!silent) - to_chat(user, "I load [num_loaded] shell\s into \the [src]!") + to_chat(user, span_notice("I load [num_loaded] shell\s into \the [src]!")) playsound(src, 'sound/blank.ogg', 60, TRUE) A.update_icon() update_icon() @@ -119,7 +119,7 @@ if(!user.is_holding(src) || !user.put_in_hands(A)) //incase they're using TK A.bounce_away(FALSE, NONE) playsound(src, 'sound/blank.ogg', 60, TRUE) - to_chat(user, "I remove a round from [src]!") + to_chat(user, span_notice("I remove a round from [src]!")) update_icon() /obj/item/ammo_box/update_icon() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 6c5c4d018..4451098f1 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -114,7 +114,7 @@ if(G) G.forceMove(loc) QDEL_NULL(G.pin) - visible_message("[G] can now fit a new pin, but the old one was destroyed in the process.", null, null, 3) + visible_message(span_notice("[G] can now fit a new pin, but the old one was destroyed in the process."), null, null, 3) qdel(src) /obj/item/gun/examine(mob/user) @@ -127,14 +127,14 @@ // if(gun_light) // . += "It has \a [gun_light] [can_flashlight ? "" : "permanently "]mounted on it." // if(can_flashlight) //if it has a light and this is false, the light is permanent. -// . += "[gun_light] looks like it can be unscrewed from [src]." +// . += span_info("[gun_light] looks like it can be unscrewed from [src].") // else if(can_flashlight) // . += "It has a mounting point for a seclite." // if(bayonet) // . += "It has \a [bayonet] [can_bayonet ? "" : "permanently "]affixed to it." // if(can_bayonet) //if it has a bayonet and this is false, the bayonet is permanent. -// . += "[bayonet] looks like it can be unscrewed from [src]." +// . += span_info("[bayonet] looks like it can be unscrewed from [src].") // else if(can_bayonet) // . += "It has a bayonet lug on it." @@ -153,7 +153,7 @@ return TRUE /obj/item/gun/proc/shoot_with_empty_chamber(mob/living/user as mob|obj) - to_chat(user, "*click*") + to_chat(user, span_danger("*click*")) playsound(src, dry_fire_sound, 30, TRUE) @@ -167,17 +167,17 @@ playsound(user, fire_sound, fire_sound_volume, vary_fire_sound) if(message) /* if(pointblank) - user.visible_message("[user] shoots [src] point blank at [pbtarget]!", \ - "I shoot [src] point blank at [pbtarget]!", \ + user.visible_message(span_danger("[user] shoots [src] point blank at [pbtarget]!"), \ + span_danger("I shoot [src] point blank at [pbtarget]!"), \ COMBAT_MESSAGE_RANGE, pbtarget) - to_chat(pbtarget, "[user] shoots [src] point blank at me!") + to_chat(pbtarget, span_danger("[user] shoots [src] point blank at me!")) if(pb_knockback > 0) var/atom/throw_target = get_edge_target_turf(pbtarget, user.dir) pbtarget.throw_at(throw_target, pb_knockback, 2) else*/ - user.visible_message("[user] shoots [src]!", \ - "I shoot [src]!", \ + user.visible_message(span_danger("[user] shoots [src]!"), \ + span_danger("I shoot [src]!"), \ COMBAT_MESSAGE_RANGE) /obj/item/gun/emp_act(severity) @@ -226,14 +226,14 @@ if(clumsy_check) if(istype(user)) if (HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40)) - to_chat(user, "I shoot myself in the foot with [src]!") + to_chat(user, span_danger("I shoot myself in the foot with [src]!")) var/shot_leg = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) process_fire(user, user, FALSE, params, shot_leg) user.dropItemToGround(src, TRUE) return var/obj/item/bodypart/other_hand = user.has_hand_for_held_index(user.get_inactive_hand_index()) //returns non-disabled inactive hands if(weapon_weight == WEAPON_HEAVY && (user.get_inactive_held_item() || !other_hand)) - to_chat(user, "I need two hands to fire \the [src]!") + to_chat(user, span_warning("I need two hands to fire \the [src]!")) return //DUAL (or more!) WIELDING var/bonus_spread = 0 @@ -265,7 +265,7 @@ pin.auth_fail(user) return FALSE else - to_chat(user, "[src]'s trigger is locked. This weapon doesn't have a firing pin installed!") + to_chat(user, span_warning("[src]'s trigger is locked. This weapon doesn't have a firing pin installed!")) return FALSE /obj/item/gun/proc/recharge_newshot() @@ -282,7 +282,7 @@ if(chambered && chambered.BB) if(HAS_TRAIT(user, TRAIT_PACIFISM)) // If the user has the pacifist trait, then they won't be able to fire [src] if the round chambered inside of [src] is lethal. if(chambered.harmful) // Is the bullet chambered harmful? - to_chat(user, "[src] is lethally chambered! You don't want to risk harming anyone...") + to_chat(user, span_warning("[src] is lethally chambered! You don't want to risk harming anyone...")) return if(randomspread) sprd = round((rand() - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (randomized_gun_spread + randomized_bonus_spread)) @@ -331,7 +331,7 @@ if(chambered) if(HAS_TRAIT(user, TRAIT_PACIFISM)) // If the user has the pacifist trait, then they won't be able to fire [src] if the round chambered inside of [src] is lethal. if(chambered.harmful) // Is the bullet chambered harmful? - to_chat(user, "[src] is lethally chambered! You don't want to risk harming anyone...") + to_chat(user, span_warning("[src] is lethally chambered! You don't want to risk harming anyone...")) return sprd = round((rand() - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (randomized_gun_spread + randomized_bonus_spread)) before_firing(target,user) @@ -391,7 +391,7 @@ if(!gun_light) if(!user.transferItemToLoc(I, src)) return - to_chat(user, "I click [S] into place on [src].") + to_chat(user, span_notice("I click [S] into place on [src].")) if(S.on) set_light(0) gun_light = S @@ -405,7 +405,7 @@ return ..() if(!user.transferItemToLoc(I, src)) return - to_chat(user, "I attach [K] to [src]'s bayonet lug.") + to_chat(user, span_notice("I attach [K] to [src]'s bayonet lug.")) bayonet = K var/state = "bayonet" //Generic state. if(bayonet.icon_state in icon_states('icons/obj/guns/bayonets.dmi')) //Snowflake state? @@ -440,7 +440,7 @@ /obj/item/gun/proc/remove_gun_attachment(mob/living/user, obj/item/tool_item, obj/item/item_to_remove, removal_verb) if(tool_item) tool_item.play_tool_sound(src) - to_chat(user, "I [removal_verb ? removal_verb : "remove"] [item_to_remove] from [src].") + to_chat(user, span_notice("I [removal_verb ? removal_verb : "remove"] [item_to_remove] from [src].")) item_to_remove.forceMove(drop_location()) if(Adjacent(user) && !issilicon(user)) @@ -482,7 +482,7 @@ var/mob/living/carbon/human/user = usr gun_light.on = !gun_light.on - to_chat(user, "I toggle the gunlight [gun_light.on ? "on":"off"].") + to_chat(user, span_notice("I toggle the gunlight [gun_light.on ? "on":"off"].")) playsound(user, 'sound/blank.ogg', 100, TRUE) update_gunlight() @@ -531,26 +531,26 @@ return if(user == target) - target.visible_message("[user] sticks [src] in [user.p_their()] mouth, ready to pull the trigger...", \ - "I stick [src] in your mouth, ready to pull the trigger...") + target.visible_message(span_warning("[user] sticks [src] in [user.p_their()] mouth, ready to pull the trigger..."), \ + span_danger("I stick [src] in your mouth, ready to pull the trigger...")) else - target.visible_message("[user] points [src] at [target]'s head, ready to pull the trigger...", \ - "[user] points [src] at your head, ready to pull the trigger...") + target.visible_message(span_warning("[user] points [src] at [target]'s head, ready to pull the trigger..."), \ + span_danger("[user] points [src] at your head, ready to pull the trigger...")) semicd = TRUE if(!bypass_timer && (!do_mob(user, target, 120) || user.zone_selected != BODY_ZONE_PRECISE_MOUTH)) if(user) if(user == target) - user.visible_message("[user] decided not to shoot.") + user.visible_message(span_notice("[user] decided not to shoot.")) else if(target && target.Adjacent(user)) - target.visible_message("[user] has decided to spare [target]", "[user] has decided to spare your life!") + target.visible_message(span_notice("[user] has decided to spare [target]"), span_notice("[user] has decided to spare your life!")) semicd = FALSE return semicd = FALSE - target.visible_message("[user] pulls the trigger!", "[(user == target) ? "You pull" : "[user] pulls"] the trigger!") + target.visible_message(span_warning("[user] pulls the trigger!"), span_danger("[(user == target) ? "You pull" : "[user] pulls"] the trigger!")) if(chambered && chambered.BB) chambered.BB.damage *= 5 diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 314ae86f0..4f7b0d29b 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -168,11 +168,11 @@ if (bolt_type == BOLT_TYPE_OPEN) if(!bolt_locked) //If it's an open bolt, racking again would do nothing if (user) - to_chat(user, "\The [src]'s [bolt_wording] is already cocked!") + to_chat(user, span_notice("\The [src]'s [bolt_wording] is already cocked!")) return bolt_locked = FALSE if (user) - to_chat(user, "I rack the [bolt_wording] of \the [src].") + to_chat(user, span_notice("I rack the [bolt_wording] of \the [src].")) process_chamber(!chambered, FALSE) if (bolt_type == BOLT_TYPE_LOCKING && !chambered) bolt_locked = TRUE @@ -185,7 +185,7 @@ /obj/item/gun/ballistic/proc/drop_bolt(mob/user = null) playsound(src, bolt_drop_sound, bolt_drop_sound_volume, FALSE) if (user) - to_chat(user, "I drop the [bolt_wording] of \the [src].") + to_chat(user, span_notice("I drop the [bolt_wording] of \the [src].")) chamber_round() bolt_locked = FALSE update_icon() @@ -193,19 +193,19 @@ ///Handles all the logic needed for magazine insertion /obj/item/gun/ballistic/proc/insert_magazine(mob/user, obj/item/ammo_box/magazine/AM, display_message = TRUE) if(!istype(AM, mag_type)) - to_chat(user, "\The [AM] doesn't seem to fit into \the [src]...") + to_chat(user, span_warning("\The [AM] doesn't seem to fit into \the [src]...")) return FALSE if(user.transferItemToLoc(AM, src)) magazine = AM if (display_message) - to_chat(user, "I load a new [magazine_wording] into \the [src].") + to_chat(user, span_notice("I load a new [magazine_wording] into \the [src].")) playsound(src, load_empty_sound, load_sound_volume, load_sound_vary) if (bolt_type == BOLT_TYPE_OPEN && !bolt_locked) chamber_round(TRUE) update_icon() return TRUE else - to_chat(user, "I cannot seem to get \the [src] out of your hands!") + to_chat(user, span_warning("I cannot seem to get \the [src] out of your hands!")) return FALSE ///Handles all the logic of magazine ejection, if tac_load is set that magazine will be tacloaded in the place of the old eject @@ -220,16 +220,16 @@ var/obj/item/ammo_box/magazine/old_mag = magazine if (tac_load) if (insert_magazine(user, tac_load, FALSE)) - to_chat(user, "I perform a tactical reload on \the [src].") + to_chat(user, span_notice("I perform a tactical reload on \the [src].")) else - to_chat(user, "I dropped the old [magazine_wording], but the new one doesn't fit. How embarassing.") + to_chat(user, span_warning("I dropped the old [magazine_wording], but the new one doesn't fit. How embarassing.")) magazine = null else magazine = null user.put_in_hands(old_mag) old_mag.update_icon() if (display_message) - to_chat(user, "I pull the [magazine_wording] out of \the [src].") + to_chat(user, span_notice("I pull the [magazine_wording] out of \the [src].")) update_icon() /obj/item/gun/ballistic/can_shoot() @@ -247,7 +247,7 @@ if (tac_reloads) eject_magazine(user, FALSE, AM) else - to_chat(user, "There's already a [magazine_wording] in \the [src].") + to_chat(user, span_notice("There's already a [magazine_wording] in \the [src].")) return if (istype(A, /obj/item/ammo_casing) || istype(A, /obj/item/ammo_box)) if (bolt_type == BOLT_TYPE_NO_BOLT || internal_magazine) @@ -256,7 +256,7 @@ chambered = null var/num_loaded = magazine.attackby(A, user, params, TRUE) if (num_loaded) - to_chat(user, "I [verbage] [num_loaded] [cartridge_wording]\s on \the [src].") + to_chat(user, span_notice("I [verbage] [num_loaded] [cartridge_wording]\s on \the [src].")) playsound(src, load_sound, load_sound_volume, load_sound_vary) if (chambered == null && bolt_type == BOLT_TYPE_NO_BOLT) chamber_round() @@ -266,16 +266,16 @@ if(istype(A, /obj/item/suppressor)) var/obj/item/suppressor/S = A if(!can_suppress) - to_chat(user, "I can't seem to figure out how to fit [S] on [src]!") + to_chat(user, span_warning("I can't seem to figure out how to fit [S] on [src]!")) return if(!user.is_holding(src)) - to_chat(user, "I need be holding [src] to fit [S] to it!") + to_chat(user, span_warning("I need be holding [src] to fit [S] to it!")) return if(suppressed) - to_chat(user, "[src] already has a suppressor!") + to_chat(user, span_warning("[src] already has a suppressor!")) return if(user.transferItemToLoc(A, src)) - to_chat(user, "I screw \the [S] onto \the [src].") + to_chat(user, span_notice("I screw \the [S] onto \the [src].")) install_suppressor(A) return if (can_be_sawn_off) @@ -303,7 +303,7 @@ var/obj/item/suppressor/S = suppressed if(!user.is_holding(src)) return ..() - to_chat(user, "I unscrew \the [suppressed] from \the [src].") + to_chat(user, span_notice("I unscrew \the [suppressed] from \the [src].")) user.put_in_hands(suppressed) w_class -= S.w_class suppressed = null @@ -356,11 +356,11 @@ if(T && is_station_level(T.z)) SSblackbox.record_feedback("tally", "station_mess_created", 1, CB.name) if (num_unloaded) - to_chat(user, "I remove [(num_unloaded == 1) ? "the" : "[num_unloaded]"] [cartridge_wording]\s from [src].") + to_chat(user, span_notice("I remove [(num_unloaded == 1) ? "the" : "[num_unloaded]"] [cartridge_wording]\s from [src].")) playsound(user, eject_sound, eject_sound_volume, eject_sound_vary) update_icon() else - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return if(bolt_type == BOLT_TYPE_LOCKING && bolt_locked) drop_bolt(user) @@ -407,12 +407,12 @@ /obj/item/gun/ballistic/suicide_act(mob/user) var/obj/item/organ/brain/B = user.getorganslot(ORGAN_SLOT_BRAIN) if (B && chambered && chambered.BB && can_trigger_gun(user) && !chambered.BB.nodamage) - user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!")) sleep(25) if(user.is_holding(src)) var/turf/T = get_turf(user) process_fire(user, user, FALSE, null, BODY_ZONE_HEAD) - user.visible_message("[user] blows [user.p_their()] brain[user.p_s()] out with [src]!") + user.visible_message(span_suicide("[user] blows [user.p_their()] brain[user.p_s()] out with [src]!")) var/turf/target = get_ranged_target_turf(user, turn(user.dir, 180), BRAINS_BLOWN_THROW_RANGE) B.Remove(user) B.forceMove(T) @@ -420,10 +420,10 @@ B.throw_at(target, BRAINS_BLOWN_THROW_RANGE, BRAINS_BLOWN_THROW_SPEED, callback=gibspawner) return(BRUTELOSS) else - user.visible_message("[user] panics and starts choking to death!") + user.visible_message(span_suicide("[user] panics and starts choking to death!")) return(OXYLOSS) else - user.visible_message("[user] is pretending to blow [user.p_their()] brain[user.p_s()] out with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is pretending to blow [user.p_their()] brain[user.p_s()] out with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(src, dry_fire_sound, 30, TRUE) return (OXYLOSS) #undef BRAINS_BLOWN_THROW_SPEED @@ -439,23 +439,23 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list( if(!saw.get_sharpness() || !is_type_in_typecache(saw, GLOB.gun_saw_types) && !saw.tool_behaviour == TOOL_SAW) //needs to be sharp. Otherwise turned off eswords can cut this. return if(sawn_off) - to_chat(user, "\The [src] is already shortened!") + to_chat(user, span_warning("\The [src] is already shortened!")) return if(bayonet) - to_chat(user, "I cannot saw-off \the [src] with \the [bayonet] attached!") + to_chat(user, span_warning("I cannot saw-off \the [src] with \the [bayonet] attached!")) return user.changeNext_move(CLICK_CD_MELEE) - user.visible_message("[user] begins to shorten \the [src].", "I begin to shorten \the [src]...") + user.visible_message(span_notice("[user] begins to shorten \the [src]."), span_notice("I begin to shorten \the [src]...")) //if there's any live ammo inside the gun, makes it go off if(blow_up(user)) - user.visible_message("\The [src] goes off!", "\The [src] goes off in your face!") + user.visible_message(span_danger("\The [src] goes off!"), span_danger("\The [src] goes off in your face!")) return if(do_after(user, 30, target = src)) if(sawn_off) return - user.visible_message("[user] shortens \the [src]!", "I shorten \the [src].") + user.visible_message(span_notice("[user] shortens \the [src]!"), span_notice("I shorten \the [src].")) name = "sawn-off [src.name]" desc = sawn_desc w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 6b2bd1bb3..b56084321 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -43,11 +43,11 @@ if(!select) burst_size = 1 fire_delay = 0 - to_chat(user, "I switch to semi-automatic.") + to_chat(user, span_notice("I switch to semi-automatic.")) else burst_size = initial(burst_size) fire_delay = initial(fire_delay) - to_chat(user, "I switch to [burst_size]-rnd burst.") + to_chat(user, span_notice("I switch to [burst_size]-rnd burst.")) playsound(user, 'sound/blank.ogg', 100, TRUE) update_icon() @@ -165,15 +165,15 @@ select = 1 burst_size = initial(burst_size) fire_delay = initial(fire_delay) - to_chat(user, "I switch to [burst_size]-rnd burst.") + to_chat(user, span_notice("I switch to [burst_size]-rnd burst.")) if(1) select = 2 - to_chat(user, "I switch to grenades.") + to_chat(user, span_notice("I switch to grenades.")) if(2) select = 0 burst_size = 1 fire_delay = 0 - to_chat(user, "I switch to semi-auto.") + to_chat(user, span_notice("I switch to semi-auto.")) playsound(user, 'sound/blank.ogg', 100, TRUE) update_icon() return @@ -236,12 +236,12 @@ . = ..() . += "alt + click to [cover_open ? "close" : "open"] the dust cover." if(cover_open && magazine) - . += "It seems like you could use an empty hand to remove the magazine." + . += span_notice("It seems like you could use an empty hand to remove the magazine.") /obj/item/gun/ballistic/automatic/l6_saw/AltClick(mob/user) cover_open = !cover_open - to_chat(user, "I [cover_open ? "open" : "close"] [src]'s cover.") + to_chat(user, span_notice("I [cover_open ? "open" : "close"] [src]'s cover.")) playsound(user, 'sound/blank.ogg', 60, TRUE) update_icon() @@ -253,7 +253,7 @@ /obj/item/gun/ballistic/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) if(cover_open) - to_chat(user, "[src]'s cover is open! Close it before firing!") + to_chat(user, span_warning("[src]'s cover is open! Close it before firing!")) return else . = ..() @@ -265,13 +265,13 @@ ..() return if (!cover_open) - to_chat(user, "[src]'s cover is closed! Open it before trying to remove the magazine!") + to_chat(user, span_warning("[src]'s cover is closed! Open it before trying to remove the magazine!")) return ..() /obj/item/gun/ballistic/automatic/l6_saw/attackby(obj/item/A, mob/user, params) if(!cover_open && istype(A, mag_type)) - to_chat(user, "[src]'s dust cover prevents a magazine from being fit.") + to_chat(user, span_warning("[src]'s dust cover prevents a magazine from being fit.")) return ..() diff --git a/code/modules/projectiles/guns/ballistic/laser_gatling.dm b/code/modules/projectiles/guns/ballistic/laser_gatling.dm index 00a1be8dc..b4a73eab5 100644 --- a/code/modules/projectiles/guns/ballistic/laser_gatling.dm +++ b/code/modules/projectiles/guns/ballistic/laser_gatling.dm @@ -37,12 +37,12 @@ armed = 1 if(!user.put_in_hands(gun)) armed = 0 - to_chat(user, "I need a free hand to hold the gun!") + to_chat(user, span_warning("I need a free hand to hold the gun!")) return update_icon() user.update_inv_back() else - to_chat(user, "I are already holding the gun!") + to_chat(user, span_warning("I are already holding the gun!")) else ..() @@ -86,9 +86,9 @@ gun.forceMove(src) armed = 0 if(user) - to_chat(user, "I attach the [gun.name] to the [name].") + to_chat(user, span_notice("I attach the [gun.name] to the [name].")) else - src.visible_message("The [gun.name] snaps back onto the [name]!") + src.visible_message(span_warning("The [gun.name] snaps back onto the [name]!")) update_icon() user.update_inv_back() @@ -139,9 +139,9 @@ ammo_pack.overheat += burst_size ..() else - to_chat(user, "The gun's heat sensor locked the trigger to prevent lens damage!") + to_chat(user, span_warning("The gun's heat sensor locked the trigger to prevent lens damage!")) /obj/item/gun/ballistic/minigun/afterattack(atom/target, mob/living/user, flag, params) if(!ammo_pack || ammo_pack.loc != user) - to_chat(user, "I need the backpack power source to fire the gun!") + to_chat(user, span_warning("I need the backpack power source to fire the gun!")) . = ..() diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index d5c892562..8d9b15a47 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -73,8 +73,8 @@ return //too difficult to remove the rocket with TK /obj/item/gun/ballistic/rocketlauncher/suicide_act(mob/living/user) - user.visible_message("[user] aims [src] at the ground! It looks like [user.p_theyre()] performing a sick rocket jump!", \ - "I aim [src] at the ground to perform a bisnasty rocket jump...") + user.visible_message(span_warning("[user] aims [src] at the ground! It looks like [user.p_theyre()] performing a sick rocket jump!"), \ + span_danger("I aim [src] at the ground to perform a bisnasty rocket jump...")) if(can_shoot()) user.notransform = TRUE playsound(src, 'sound/blank.ogg', 80, TRUE, 5) @@ -91,8 +91,8 @@ sleep(5) shoot_with_empty_chamber(user) sleep(20) - user.visible_message("[user] looks about the room realizing [user.p_theyre()] still there. [user.p_they(TRUE)] proceed to shove [src] down their throat and choke [user.p_them()]self with it!", \ - "I look around after realizing you're still here, then proceed to choke myself to death with [src]!") + user.visible_message(span_warning("[user] looks about the room realizing [user.p_theyre()] still there. [user.p_they(TRUE)] proceed to shove [src] down their throat and choke [user.p_them()]self with it!"), \ + span_danger("I look around after realizing you're still here, then proceed to choke myself to death with [src]!")) sleep(20) return OXYLOSS diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 5be741690..ff67869af 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -87,12 +87,12 @@ /obj/item/gun/ballistic/automatic/pistol/stickman/pickup(mob/living/user) SHOULD_CALL_PARENT(FALSE) - to_chat(user, "As you try to pick up [src], it slips out of your grip..") + to_chat(user, span_notice("As you try to pick up [src], it slips out of your grip..")) if(prob(50)) - to_chat(user, "..and vanishes from your vision! Where the hell did it go?") + to_chat(user, span_notice("..and vanishes from your vision! Where the hell did it go?")) qdel(src) user.update_icons() else - to_chat(user, "..and falls into view. Whew, that was a close one.") + to_chat(user, span_notice("..and falls into view. Whew, that was a close one.")) user.dropItemToGround(src) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index a5f6502f8..b95bbf680 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -46,7 +46,7 @@ if(do_spin()) playsound(usr, "revolver_spin", 30, FALSE) - usr.visible_message("[usr] spins [src]'s chamber.", "I spin [src]'s chamber.") + usr.visible_message(span_notice("[usr] spins [src]'s chamber."), span_notice("I spin [src]'s chamber.")) else verbs -= /obj/item/gun/ballistic/revolver/verb/spin @@ -94,7 +94,7 @@ if(magazine.caliber != initial(magazine.caliber)) if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60 playsound(user, fire_sound, fire_sound_volume, vary_fire_sound) - to_chat(user, "[src] blows up in your face!") + to_chat(user, span_danger("[src] blows up in your face!")) user.take_bodypart_damage(0,20) user.dropItemToGround(src) return 0 @@ -104,33 +104,33 @@ if(..()) return TRUE if(magazine.caliber == "38") - to_chat(user, "I begin to reinforce the barrel of [src]...") + to_chat(user, span_notice("I begin to reinforce the barrel of [src]...")) if(magazine.ammo_count()) afterattack(user, user) //you know the drill - user.visible_message("[src] goes off!", "[src] goes off in your face!") + user.visible_message(span_danger("[src] goes off!"), span_danger("[src] goes off in your face!")) return TRUE if(I.use_tool(src, user, 30)) if(magazine.ammo_count()) - to_chat(user, "I can't modify it!") + to_chat(user, span_warning("I can't modify it!")) return TRUE magazine.caliber = "357" fire_sound = 'sound/blank.ogg' desc = "" - to_chat(user, "I reinforce the barrel of [src]. Now it will fire .357 rounds.") + to_chat(user, span_notice("I reinforce the barrel of [src]. Now it will fire .357 rounds.")) else - to_chat(user, "I begin to revert the modifications to [src]...") + to_chat(user, span_notice("I begin to revert the modifications to [src]...")) if(magazine.ammo_count()) afterattack(user, user) //and again - user.visible_message("[src] goes off!", "[src] goes off in your face!") + user.visible_message(span_danger("[src] goes off!"), span_danger("[src] goes off in your face!")) return TRUE if(I.use_tool(src, user, 30)) if(magazine.ammo_count()) - to_chat(user, "I can't modify it!") + to_chat(user, span_warning("I can't modify it!")) return magazine.caliber = "38" fire_sound = 'sound/blank.ogg' desc = initial(desc) - to_chat(user, "I remove the modifications on [src]. Now it will fire .38 rounds.") + to_chat(user, span_notice("I remove the modifications on [src]. Now it will fire .38 rounds.")) return TRUE @@ -199,13 +199,13 @@ return if(target != user) if(ismob(target)) - to_chat(user, "A mechanism prevents you from shooting anyone but yourself!") + to_chat(user, span_warning("A mechanism prevents you from shooting anyone but yourself!")) return if(ishuman(user)) var/mob/living/carbon/human/H = user if(!spun) - to_chat(user, "I need to spin \the [src]'s chamber first!") + to_chat(user, span_warning("I need to spin \the [src]'s chamber first!")) return spun = FALSE @@ -219,21 +219,21 @@ if(zone == BODY_ZONE_HEAD || zone == BODY_ZONE_PRECISE_R_EYE || zone == BODY_ZONE_PRECISE_MOUTH) shoot_self(user, affecting) else - user.visible_message("[user.name] cowardly fires [src] at [user.p_their()] [affecting.name]!", "I cowardly fire [src] at your [affecting.name]!", "I hear a gunshot!") + user.visible_message(span_danger("[user.name] cowardly fires [src] at [user.p_their()] [affecting.name]!"), span_danger("I cowardly fire [src] at your [affecting.name]!"), span_hear("I hear a gunshot!")) chambered = null return - user.visible_message("*click*") + user.visible_message(span_danger("*click*")) playsound(src, dry_fire_sound, 30, TRUE) /obj/item/gun/ballistic/revolver/russian/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) add_fingerprint(user) playsound(src, dry_fire_sound, 30, TRUE) - user.visible_message("[user.name] tries to fire \the [src] at the same time, but only succeeds at looking like an idiot.", "\The [src]'s anti-combat mechanism prevents you from firing it at the same time!") + user.visible_message(span_danger("[user.name] tries to fire \the [src] at the same time, but only succeeds at looking like an idiot."), span_danger("\The [src]'s anti-combat mechanism prevents you from firing it at the same time!")) /obj/item/gun/ballistic/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = BODY_ZONE_HEAD) user.apply_damage(300, BRUTE, affecting) - user.visible_message("[user.name] fires [src] at [user.p_their()] head!", "I fire [src] at your head!", "I hear a gunshot!") + user.visible_message(span_danger("[user.name] fires [src] at [user.p_their()] head!"), span_danger("I fire [src] at your head!"), span_hear("I hear a gunshot!")) /obj/item/gun/ballistic/revolver/russian/soul name = "cursed Russian revolver" @@ -245,7 +245,7 @@ if(!SS.transfer_soul("FORCE", user)) //Something went wrong qdel(SS) return - user.visible_message("[user.name]'s soul is captured by \the [src]!", "You've lost the gamble! Your soul is forfeit!") + user.visible_message(span_danger("[user.name]'s soul is captured by \the [src]!"), span_danger("You've lost the gamble! Your soul is forfeit!")) /obj/item/gun/ballistic/revolver/reverse //Fires directly at its user... unless the user is a clown, of course. clumsy_check = 0 @@ -254,7 +254,7 @@ if((HAS_TRAIT(user, TRAIT_CLUMSY)) || (user.mind && user.mind.assigned_role == "Clown")) return ..() if(process_fire(user, user, FALSE, null, BODY_ZONE_HEAD)) - user.visible_message("[user] somehow manages to shoot [user.p_them()]self in the face!", "I somehow shoot myself in the face! How the hell?!") + user.visible_message(span_warning("[user] somehow manages to shoot [user.p_them()]self in the face!"), span_danger("I somehow shoot myself in the face! How the hell?!")) user.emote("scream") user.drop_all_held_items() user.Paralyze(80) diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm index 86d5cee8f..c0879a830 100644 --- a/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/code/modules/projectiles/guns/ballistic/rifle.dm @@ -21,7 +21,7 @@ obj/item/gun/ballistic/rifle/update_icon() obj/item/gun/ballistic/rifle/rack(mob/user = null) if (bolt_locked == FALSE) - to_chat(user, "I open the bolt of \the [src].") + to_chat(user, span_notice("I open the bolt of \the [src].")) playsound(src, rack_sound, rack_sound_volume, rack_sound_vary) process_chamber(FALSE, FALSE, FALSE) bolt_locked = TRUE @@ -36,7 +36,7 @@ obj/item/gun/ballistic/rifle/can_shoot() obj/item/gun/ballistic/rifle/attackby(obj/item/A, mob/user, params) if (!bolt_locked) - to_chat(user, "The bolt is closed!") + to_chat(user, span_notice("The bolt is closed!")) return return ..() diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 0d8c66405..757f82cc8 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -85,7 +85,7 @@ /obj/item/gun/ballistic/shotgun/automatic/dual_tube/examine(mob/user) . = ..() - . += "Alt-click to pump it." + . += span_notice("Alt-click to pump it.") /obj/item/gun/ballistic/shotgun/automatic/dual_tube/Initialize() . = ..() @@ -105,9 +105,9 @@ alternate_magazine = current_mag toggled = !toggled if(toggled) - to_chat(user, "I switch to tube B.") + to_chat(user, span_notice("I switch to tube B.")) else - to_chat(user, "I switch to tube A.") + to_chat(user, span_notice("I switch to tube A.")) /obj/item/gun/ballistic/shotgun/automatic/dual_tube/AltClick(mob/living/user) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) @@ -206,11 +206,11 @@ var/obj/item/stack/cable_coil/C = A if(C.use(10)) slot_flags = ITEM_SLOT_BACK - to_chat(user, "I tie the lengths of cable to the shotgun, making a sling.") + to_chat(user, span_notice("I tie the lengths of cable to the shotgun, making a sling.")) slung = TRUE update_icon() else - to_chat(user, "I need at least ten lengths of cable if you want to make a sling!") + to_chat(user, span_warning("I need at least ten lengths of cable if you want to make a sling!")) /obj/item/gun/ballistic/shotgun/doublebarrel/improvised/update_icon() ..() @@ -259,19 +259,19 @@ if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return if(toggled) - to_chat(user,"I switch to the shotgun.") + to_chat(user,span_notice("I switch to the shotgun.")) fire_sound = initial(fire_sound) else - to_chat(user,"I switch to the hook.") + to_chat(user,span_notice("I switch to the hook.")) fire_sound = 'sound/blank.ogg' toggled = !toggled /obj/item/gun/ballistic/shotgun/doublebarrel/hook/examine(mob/user) . = ..() if(toggled) - . += "Alt-click to switch to the shotgun." + . += span_notice("Alt-click to switch to the shotgun.") else - . += "Alt-click to switch to the hook." + . += span_notice("Alt-click to switch to the hook.") /obj/item/gun/ballistic/shotgun/doublebarrel/hook/afterattack(atom/target, mob/living/user, flag, params) if(toggled) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 0e6d65691..25df9eab7 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -124,7 +124,7 @@ fire_sound = shot.fire_sound fire_delay = shot.delay if (shot.select_name) - to_chat(user, "[src] is now set to [shot.select_name].") + to_chat(user, span_notice("[src] is now set to [shot.select_name].")) chambered = null recharge_newshot(TRUE) update_icon(TRUE) @@ -168,20 +168,20 @@ /obj/item/gun/energy/suicide_act(mob/living/user) if (istype(user) && can_shoot() && can_trigger_gun(user) && user.get_bodypart(BODY_ZONE_HEAD)) - user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!")) sleep(25) if(user.is_holding(src)) - user.visible_message("[user] melts [user.p_their()] face off with [src]!") + user.visible_message(span_suicide("[user] melts [user.p_their()] face off with [src]!")) playsound(loc, fire_sound, 50, TRUE, -1) var/obj/item/ammo_casing/energy/shot = ammo_type[select] cell.use(shot.e_cost) update_icon() return(FIRELOSS) else - user.visible_message("[user] panics and starts choking to death!") + user.visible_message(span_suicide("[user] panics and starts choking to death!")) return(OXYLOSS) else - user.visible_message("[user] is pretending to melt [user.p_their()] face off with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is pretending to melt [user.p_their()] face off with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(src, dry_fire_sound, 30, TRUE) return (OXYLOSS) @@ -206,13 +206,13 @@ if(!BB) . = "" else if(BB.nodamage || !BB.damage || BB.damage_type == STAMINA) - user.visible_message("[user] tries to light [user.p_their()] [A.name] with [src], but it doesn't do anything. Dumbass.") + user.visible_message(span_danger("[user] tries to light [user.p_their()] [A.name] with [src], but it doesn't do anything. Dumbass.")) playsound(user, E.fire_sound, 50, TRUE) playsound(user, pick(BB.hitsound), 50, TRUE) cell.use(E.e_cost) . = "" else if(BB.damage_type != BURN) - user.visible_message("[user] tries to light [user.p_their()] [A.name] with [src], but only succeeds in utterly destroying it. Dumbass.") + user.visible_message(span_danger("[user] tries to light [user.p_their()] [A.name] with [src], but only succeeds in utterly destroying it. Dumbass.")) playsound(user, E.fire_sound, 50, TRUE) playsound(user, pick(BB.hitsound), 50, TRUE) cell.use(E.e_cost) @@ -222,4 +222,4 @@ playsound(user, E.fire_sound, 50, TRUE) playsound(user, pick(BB.hitsound), 50, TRUE) cell.use(E.e_cost) - . = "[user] casually lights their [A.name] with [src]. Damn." + . = span_danger("[user] casually lights their [A.name] with [src]. Damn.") diff --git a/code/modules/projectiles/guns/energy/dueling.dm b/code/modules/projectiles/guns/energy/dueling.dm index 6d6f8fca0..6712e1c78 100644 --- a/code/modules/projectiles/guns/energy/dueling.dm +++ b/code/modules/projectiles/guns/energy/dueling.dm @@ -24,7 +24,7 @@ var/mob/living/A = get_duelist(gun_A) var/mob/living/B = get_duelist(gun_B) if(!A || !B) - message_duelists("To begin the duel, both participants need to be holding paired dueling pistols.") + message_duelists(span_warning("To begin the duel, both participants need to be holding paired dueling pistols.")) return begin() @@ -34,7 +34,7 @@ fired.Cut() countdown_step = countdown_length - message_duelists("Set your gun setting and move [required_distance] steps away from your opponent.") + message_duelists(span_notice("Set your gun setting and move [required_distance] steps away from your opponent.")) START_PROCESSING(SSobj,src) @@ -56,7 +56,7 @@ return G == gun_A ? gun_B : gun_A /datum/duel/proc/end() - message_duelists("Duel finished. Re-engaging safety.") + message_duelists(span_notice("Duel finished. Re-engaging safety.")) STOP_PROCESSING(SSobj,src) state = DUEL_IDLE @@ -83,26 +83,26 @@ /datum/duel/proc/back_to_prep() - message_duelists("Positions invalid. Please move to valid positions [required_distance] steps aways from each other to continue.") + message_duelists(span_notice("Positions invalid. Please move to valid positions [required_distance] steps aways from each other to continue.")) state = DUEL_PREPARATION confirmations.Cut() countdown_step = countdown_length /datum/duel/proc/confirm_positioning() - message_duelists("Position confirmed. Confirm readiness by pulling the trigger once.") + message_duelists(span_notice("Position confirmed. Confirm readiness by pulling the trigger once.")) state = DUEL_READY /datum/duel/proc/confirm_ready() - message_duelists("Readiness confirmed. Starting countdown. Commence firing at zero mark.") + message_duelists(span_notice("Readiness confirmed. Starting countdown. Commence firing at zero mark.")) state = DUEL_COUNTDOWN /datum/duel/proc/countdown_step() countdown_step-- if(countdown_step == 0) state = DUEL_FIRING - message_duelists("Fire!") + message_duelists(span_danger("Fire!")) else - message_duelists("[countdown_step]!") + message_duelists(span_danger("[countdown_step]!")) /datum/duel/proc/check_fired() if(fired.len == 2) @@ -172,7 +172,7 @@ setting = DUEL_SETTING_C if(DUEL_SETTING_C) setting = DUEL_SETTING_A - to_chat(user,"I switch [src] setting to [setting] mode.") + to_chat(user,span_notice("I switch [src] setting to [setting] mode.")) update_icon() /obj/item/gun/energy/dueling/update_icon(force_update) @@ -198,7 +198,7 @@ if(DUEL_READY) return . else - to_chat(user,"[src] is locked. Wait for FIRE signal before shooting.") + to_chat(user,span_warning("[src] is locked. Wait for FIRE signal before shooting.")) return FALSE /obj/item/gun/energy/dueling/proc/is_duelist(mob/living/L) @@ -211,10 +211,10 @@ /obj/item/gun/energy/dueling/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread) if(duel.state == DUEL_READY) duel.confirmations[src] = TRUE - to_chat(user,"I confirm your readiness.") + to_chat(user,span_notice("I confirm your readiness.")) return else if(!is_duelist(target)) //I kinda want to leave this out just to see someone shoot a bystander or missing. - to_chat(user,"[src] safety system prevents shooting anyone but your designated opponent.") + to_chat(user,span_warning("[src] safety system prevents shooting anyone but your designated opponent.")) return else duel.fired[src] = TRUE diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm index b3d93e720..cdc7cf381 100644 --- a/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/code/modules/projectiles/guns/energy/energy_gun.dm @@ -120,12 +120,12 @@ if(0 to 200) fail_tick += (2*(fail_chance)) M.rad_act(40) - to_chat(M, "My [name] feels warmer.") + to_chat(M, span_danger("My [name] feels warmer.")) if(201 to INFINITY) SSobj.processing.Remove(src) M.rad_act(80) reactor_overloaded = TRUE - to_chat(M, "My [name]'s reactor overloads!") + to_chat(M, span_danger("My [name]'s reactor overloads!")) /obj/item/gun/energy/e_gun/nuclear/emp_act(severity) . = ..() diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 07c78850b..317e1f9c9 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -31,20 +31,20 @@ . = ..() if(max_mod_capacity) . += "[get_remaining_mod_capacity()]% mod capacity remaining." - . += "I can use a crowbar to remove modules." + . += span_info("I can use a crowbar to remove modules.") for(var/A in get_modkits()) var/obj/item/borg/upgrade/modkit/M = A - . += "There is \a [M] installed, using [M.cost]% capacity." + . += span_notice("There is \a [M] installed, using [M.cost]% capacity.") /obj/item/gun/energy/kinetic_accelerator/crowbar_act(mob/living/user, obj/item/I) . = TRUE if(modkits.len) - to_chat(user, "I pry the modifications out.") + to_chat(user, span_notice("I pry the modifications out.")) I.play_tool_sound(src, 100) for(var/obj/item/borg/upgrade/modkit/M in modkits) M.uninstall(src) else - to_chat(user, "There are no modifications currently installed.") + to_chat(user, span_notice("There are no modifications currently installed.")) /obj/item/gun/energy/kinetic_accelerator/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/borg/upgrade/modkit)) @@ -151,7 +151,7 @@ if(!suppressed) playsound(src.loc, 'sound/blank.ogg', 60, TRUE) else - to_chat(loc, "[src] silently charges up.") + to_chat(loc, span_warning("[src] silently charges up.")) update_icon() overheat = FALSE @@ -248,7 +248,7 @@ /obj/item/borg/upgrade/modkit/examine(mob/user) . = ..() - . += "Occupies [cost]% of mod capacity." + . += span_notice("Occupies [cost]% of mod capacity.") /obj/item/borg/upgrade/modkit/attackby(obj/item/A, mob/user) if(istype(A, /obj/item/gun/energy/kinetic_accelerator) && !issilicon(user)) @@ -266,10 +266,10 @@ . = TRUE if(minebot_upgrade) if(minebot_exclusive && !istype(KA.loc, /mob/living/simple_animal/hostile/mining_drone)) - to_chat(user, "The modkit you're trying to install is only rated for minebot use.") + to_chat(user, span_notice("The modkit you're trying to install is only rated for minebot use.")) return FALSE else if(istype(KA.loc, /mob/living/simple_animal/hostile/mining_drone)) - to_chat(user, "The modkit you're trying to install is not rated for minebot use.") + to_chat(user, span_notice("The modkit you're trying to install is not rated for minebot use.")) return FALSE if(denied_type) var/number_of_denied = 0 @@ -284,13 +284,13 @@ if(.) if(!user.transferItemToLoc(src, KA)) return - to_chat(user, "I install the modkit.") + to_chat(user, span_notice("I install the modkit.")) playsound(loc, 'sound/blank.ogg', 100, TRUE) KA.modkits += src else - to_chat(user, "The modkit you're trying to install would conflict with an already installed modkit. Use a crowbar to remove existing modkits.") + to_chat(user, span_notice("The modkit you're trying to install would conflict with an already installed modkit. Use a crowbar to remove existing modkits.")) else - to_chat(user, "I don't have room([KA.get_remaining_mod_capacity()]% remaining, [cost]% needed) to install this modkit. Use a crowbar to remove existing modkits.") + to_chat(user, span_notice("I don't have room([KA.get_remaining_mod_capacity()]% remaining, [cost]% needed) to install this modkit. Use a crowbar to remove existing modkits.")) . = FALSE /obj/item/borg/upgrade/modkit/deactivate(mob/living/silicon/robot/R, user = usr) @@ -403,7 +403,7 @@ for(var/mob/living/L in range(1, target_turf) - K.firer - target) var/armor = L.run_armor_check(K.def_zone, K.flag, "", "", K.armor_penetration) L.apply_damage(K.damage*modifier, K.damage_type, K.def_zone, armor) - to_chat(L, "You're struck by a [K.name]!") + to_chat(L, span_danger("You're struck by a [K.name]!")) /obj/item/borg/upgrade/modkit/aoe/turfs name = "mining explosion" diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index 4092d6456..b6a6908ef 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -68,7 +68,7 @@ ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse) /obj/item/gun/energy/pulse/destroyer/attack_self(mob/living/user) - to_chat(user, "[src.name] has three settings, and they are all DESTROY.") + to_chat(user, span_danger("[src.name] has three settings, and they are all DESTROY.")) /obj/item/gun/energy/pulse/pistol/m1911 name = "\improper M1911-P" diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 9fff3b133..611ac622c 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -145,7 +145,7 @@ /obj/item/gun/energy/plasmacutter/examine(mob/user) . = ..() if(cell) - . += "[src] is [round(cell.percent())]% charged." + . += span_notice("[src] is [round(cell.percent())]% charged.") /obj/item/gun/energy/plasmacutter/attackby(obj/item/I, mob/user) var/charge_multiplier = 0 //2 = Refined stack, 1 = Ore @@ -155,11 +155,11 @@ charge_multiplier = 1 if(charge_multiplier) if(cell.charge == cell.maxcharge) - to_chat(user, "I try to insert [I] into [src], but it's fully charged.") //my cell is round and full + to_chat(user, span_notice("I try to insert [I] into [src], but it's fully charged.")) //my cell is round and full return I.use(1) cell.give(500*charge_multiplier) - to_chat(user, "I insert [I] in [src], recharging it.") + to_chat(user, span_notice("I insert [I] in [src], recharging it.")) else ..() @@ -174,13 +174,13 @@ // Amount cannot be defaulted to 1: most of the code specifies 0 in the call. /obj/item/gun/energy/plasmacutter/tool_use_check(mob/living/user, amount) if(QDELETED(cell)) - to_chat(user, "[src] does not have a cell, and cannot be used!") + to_chat(user, span_warning("[src] does not have a cell, and cannot be used!")) return FALSE // Amount cannot be used if drain is made continuous, e.g. amount = 5, charge_weld = 25 // Then it'll drain 125 at first and 25 periodically, but fail if charge dips below 125 even though it still can finish action // Alternately it'll need to drain amount*charge_weld every period, which is either obscene or makes it free for other uses if(amount ? cell.charge < charge_weld * amount : cell.charge < charge_weld) - to_chat(user, "I need more charge to complete this task!") + to_chat(user, span_warning("I need more charge to complete this task!")) return FALSE return TRUE diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index bdf1047f1..b36a09e4e 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -26,13 +26,13 @@ var/area/A = get_area(user) if(istype(A, /area/wizard_station)) add_fingerprint(user) - to_chat(user, "I know better than to violate the security of The Den, best wait until you leave to use [src].") + to_chat(user, span_warning("I know better than to violate the security of The Den, best wait until you leave to use [src].")) return else no_den_usage = 0 if(checks_antimagic && user.anti_magic_check(TRUE, FALSE, FALSE, 0, TRUE)) add_fingerprint(user) - to_chat(user, "Something is interfering with [src].") + to_chat(user, span_warning("Something is interfering with [src].")) return . = ..() @@ -76,10 +76,10 @@ return /obj/item/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj) - to_chat(user, "The [name] whizzles quietly.") + to_chat(user, span_warning("The [name] whizzles quietly.")) /obj/item/gun/magic/suicide_act(mob/user) - user.visible_message("[user] is twisting [src] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is twisting [src] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(loc, fire_sound, 50, TRUE, -1) return (FIRELOSS) diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index cb9d57ed6..b56d5c8a9 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -37,7 +37,7 @@ if(no_den_usage) var/area/A = get_area(user) if(istype(A, /area/wizard_station)) - to_chat(user, "I know better than to violate the security of The Den, best wait until you leave to use [src].") + to_chat(user, span_warning("I know better than to violate the security of The Den, best wait until you leave to use [src].")) return else no_den_usage = 0 @@ -48,7 +48,7 @@ /obj/item/gun/magic/wand/proc/zap_self(mob/living/user) - user.visible_message("[user] zaps [user.p_them()]self with [src].") + user.visible_message(span_danger("[user] zaps [user.p_them()]self with [src].")) playsound(user, fire_sound, 50, TRUE) user.log_message("zapped [user.p_them()]self with a [src]", LOG_ATTACK) @@ -69,13 +69,13 @@ ..() charges-- if(user.anti_magic_check()) - user.visible_message("[src] has no effect on [user]!") + user.visible_message(span_warning("[src] has no effect on [user]!")) return if(isliving(user)) var/mob/living/L = user if(L.mob_biotypes & MOB_UNDEAD) //negative energy heals the undead user.revive(full_heal = TRUE, admin_revive = TRUE) - to_chat(user, "I feel great!") + to_chat(user, span_notice("I feel great!")) return to_chat(user, "I irradiate myself with pure negative energy! \ [pick("Do not pass go. Do not collect 200 zorkmids.","You feel more confident in your spell casting skills.","You Die...","Do you want your possessions identified?")]\ @@ -106,7 +106,7 @@ ..() charges-- if(user.anti_magic_check()) - user.visible_message("[src] has no effect on [user]!") + user.visible_message(span_warning("[src] has no effect on [user]!")) return if(isliving(user)) var/mob/living/L = user @@ -117,7 +117,7 @@ user.death(0) return user.revive(full_heal = TRUE, admin_revive = TRUE) - to_chat(user, "I feel great!") + to_chat(user, span_notice("I feel great!")) /obj/item/gun/magic/wand/resurrection/debug //for testing desc = "" @@ -206,7 +206,7 @@ no_den_usage = 1 /obj/item/gun/magic/wand/door/zap_self(mob/living/user) - to_chat(user, "I feel vaguely more open with your feelings.") + to_chat(user, span_notice("I feel vaguely more open with your feelings.")) charges-- ..() diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm index bf8811d5b..984a684b6 100644 --- a/code/modules/projectiles/guns/misc/beam_rifle.dm +++ b/code/modules/projectiles/guns/misc/beam_rifle.dm @@ -102,13 +102,13 @@ zoom_lock = 0 switch(zoom_lock) if(ZOOM_LOCK_AUTOZOOM_FREEMOVE) - to_chat(user, "I switch [src]'s zooming processor to free directional.") + to_chat(user, span_boldnotice("I switch [src]'s zooming processor to free directional.")) if(ZOOM_LOCK_AUTOZOOM_ANGLELOCK) - to_chat(user, "I switch [src]'s zooming processor to locked directional.") + to_chat(user, span_boldnotice("I switch [src]'s zooming processor to locked directional.")) if(ZOOM_LOCK_CENTER_VIEW) - to_chat(user, "I switch [src]'s zooming processor to center mode.") + to_chat(user, span_boldnotice("I switch [src]'s zooming processor to center mode.")) if(ZOOM_LOCK_OFF) - to_chat(user, "I disable [src]'s zooming system.") + to_chat(user, span_boldnotice("I disable [src]'s zooming system.")) reset_zooming() else ..() @@ -158,7 +158,7 @@ /obj/item/gun/energy/beam_rifle/attack_self(mob/user) projectile_setting_pierce = !projectile_setting_pierce - to_chat(user, "I set \the [src] to [projectile_setting_pierce? "pierce":"impact"] mode.") + to_chat(user, span_boldnotice("I set \the [src] to [projectile_setting_pierce? "pierce":"impact"] mode.")) aiming_beam() /obj/item/gun/energy/beam_rifle/proc/update_slowdown() @@ -449,7 +449,7 @@ new /obj/effect/temp_visual/explosion/fast(epicenter) for(var/mob/living/L in range(aoe_mob_range, epicenter)) //handle aoe mob damage L.adjustFireLoss(aoe_mob_damage) - to_chat(L, "\The [src] sears you!") + to_chat(L, span_danger("\The [src] sears you!")) for(var/turf/T in range(aoe_fire_range, epicenter)) //handle aoe fire if(prob(aoe_fire_chance)) new /obj/effect/hotspot(T) diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm index 9e11e19ad..2fd0f6b2a 100644 --- a/code/modules/projectiles/guns/misc/blastcannon.dm +++ b/code/modules/projectiles/guns/misc/blastcannon.dm @@ -39,7 +39,7 @@ if(bomb) bomb.forceMove(user.loc) user.put_in_hands(bomb) - user.visible_message("[user] detaches [bomb] from [src].") + user.visible_message(span_warning("[user] detaches [bomb] from [src].")) bomb = null update_icon() return ..() @@ -58,12 +58,12 @@ if(istype(O, /obj/item/transfer_valve)) var/obj/item/transfer_valve/T = O if(!T.tank_one || !T.tank_two) - to_chat(user, "What good would an incomplete bomb do?") + to_chat(user, span_warning("What good would an incomplete bomb do?")) return FALSE if(!user.transferItemToLoc(T, src)) - to_chat(user, "[T] seems to be stuck to your hand!") + to_chat(user, span_warning("[T] seems to be stuck to your hand!")) return FALSE - user.visible_message("[user] attaches [T] to [src]!") + user.visible_message(span_warning("[user] attaches [T] to [src]!")) bomb = T update_icon() return TRUE @@ -98,7 +98,7 @@ var/heavy = power * 0.25 var/medium = power * 0.5 var/light = power - user.visible_message("[user] opens [bomb] on [user.p_their()] [name] and fires a blast wave at [target]!","I open [bomb] on your [name] and fire a blast wave at [target]!") + user.visible_message(span_danger("[user] opens [bomb] on [user.p_their()] [name] and fires a blast wave at [target]!"),span_danger("I open [bomb] on your [name] and fire a blast wave at [target]!")) playsound(user, "explosion", 100, TRUE) var/turf/starting = get_turf(user) var/turf/targturf = get_turf(target) diff --git a/code/modules/projectiles/guns/misc/chem_gun.dm b/code/modules/projectiles/guns/misc/chem_gun.dm index c7203c7f1..c77d2ee72 100644 --- a/code/modules/projectiles/guns/misc/chem_gun.dm +++ b/code/modules/projectiles/guns/misc/chem_gun.dm @@ -39,7 +39,7 @@ return if(world.time < last_synth+time_per_syringe) return - to_chat(loc, "I hear a click as [src] synthesizes a new dart.") + to_chat(loc, span_warning("I hear a click as [src] synthesizes a new dart.")) syringes_left++ if(chambered && !chambered.BB) chambered.newshot() diff --git a/code/modules/projectiles/guns/misc/grenade_launcher.dm b/code/modules/projectiles/guns/misc/grenade_launcher.dm index 5966dffe1..3e3edb1a0 100644 --- a/code/modules/projectiles/guns/misc/grenade_launcher.dm +++ b/code/modules/projectiles/guns/misc/grenade_launcher.dm @@ -23,17 +23,17 @@ if(!user.transferItemToLoc(I, src)) return grenades += I - to_chat(user, "I put the grenade in the grenade launcher.") - to_chat(user, "[grenades.len] / [max_grenades] Grenades.") + to_chat(user, span_notice("I put the grenade in the grenade launcher.")) + to_chat(user, span_notice("[grenades.len] / [max_grenades] Grenades.")) else - to_chat(usr, "The grenade launcher cannot hold more grenades!") + to_chat(usr, span_warning("The grenade launcher cannot hold more grenades!")) /obj/item/gun/grenadelauncher/can_shoot() return grenades.len /obj/item/gun/grenadelauncher/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) - user.visible_message("[user] fired a grenade!", \ - "I fire the grenade launcher!") + user.visible_message(span_danger("[user] fired a grenade!"), \ + span_danger("I fire the grenade launcher!")) var/obj/item/grenade/F = grenades[1] //Now with less copypasta! grenades -= F F.forceMove(user.loc) diff --git a/code/modules/projectiles/guns/misc/medbeam.dm b/code/modules/projectiles/guns/misc/medbeam.dm index e76cad800..8241c6445 100644 --- a/code/modules/projectiles/guns/misc/medbeam.dm +++ b/code/modules/projectiles/guns/misc/medbeam.dm @@ -76,7 +76,7 @@ if(get_dist(source, current_target)>max_range || !los_check(source, current_target)) LoseTarget() if(isliving(source)) - to_chat(source, "I lose control of the beam!") + to_chat(source, span_warning("I lose control of the beam!")) return if(current_target) diff --git a/code/modules/projectiles/guns/misc/syringe_gun.dm b/code/modules/projectiles/guns/misc/syringe_gun.dm index 0720d34d5..fe6455743 100644 --- a/code/modules/projectiles/guns/misc/syringe_gun.dm +++ b/code/modules/projectiles/guns/misc/syringe_gun.dm @@ -40,7 +40,7 @@ /obj/item/gun/syringe/attack_self(mob/living/user) if(!syringes.len) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return 0 var/obj/item/reagent_containers/syringe/S = syringes[syringes.len] @@ -50,7 +50,7 @@ user.put_in_hands(S) syringes.Remove(S) - to_chat(user, "I unload [S] from \the [src].") + to_chat(user, span_notice("I unload [S] from \the [src].")) return 1 @@ -59,12 +59,12 @@ if(syringes.len < max_syringes) if(!user.transferItemToLoc(A, src)) return FALSE - to_chat(user, "I load [A] into \the [src].") + to_chat(user, span_notice("I load [A] into \the [src].")) syringes += A recharge_newshot() return TRUE else - to_chat(user, "[src] cannot hold more syringes!") + to_chat(user, span_warning("[src] cannot hold more syringes!")) return FALSE /obj/item/gun/syringe/rapidsyringe @@ -95,17 +95,17 @@ if(istype(A, /obj/item/dnainjector)) var/obj/item/dnainjector/D = A if(D.used) - to_chat(user, "This injector is used up!") + to_chat(user, span_warning("This injector is used up!")) return if(syringes.len < max_syringes) if(!user.transferItemToLoc(D, src)) return FALSE - to_chat(user, "I load \the [D] into \the [src].") + to_chat(user, span_notice("I load \the [D] into \the [src].")) syringes += D recharge_newshot() return TRUE else - to_chat(user, "[src] cannot hold more syringes!") + to_chat(user, span_warning("[src] cannot hold more syringes!")) return FALSE /obj/item/gun/syringe/blowgun @@ -116,7 +116,7 @@ fire_sound = 'sound/blank.ogg' /obj/item/gun/syringe/blowgun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) - visible_message("[user] starts aiming with a blowgun!") + visible_message(span_danger("[user] starts aiming with a blowgun!")) if(do_after(user, 25, target = src)) user.adjustStaminaLoss(20) user.adjustOxyLoss(20) diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index 9197a169b..fc832afbc 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -7,7 +7,7 @@ flags_1 = CONDUCT_1 w_class = WEIGHT_CLASS_TINY attack_verb = list("poked") - var/fail_message = "INVALID USER." + var/fail_message = span_warning("INVALID USER.") var/selfdestruct = 0 // Explode when user check is failed. var/force_replace = 0 // Can forcefully replace other pins. var/pin_removeable = 0 // Can be replaced by any pin. @@ -26,21 +26,21 @@ if(G.pin && (force_replace || G.pin.pin_removeable)) G.pin.forceMove(get_turf(G)) G.pin.gun_remove(user) - to_chat(user, "I remove [G]'s old pin.") + to_chat(user, span_notice("I remove [G]'s old pin.")) if(!G.pin) if(!user.temporarilyRemoveItemFromInventory(src)) return gun_insert(user, G) - to_chat(user, "I insert [src] into [G].") + to_chat(user, span_notice("I insert [src] into [G].")) else - to_chat(user, "This firearm already has a firing pin installed.") + to_chat(user, span_notice("This firearm already has a firing pin installed.")) /obj/item/firing_pin/emag_act(mob/user) if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - to_chat(user, "I override the authentication mechanism.") + to_chat(user, span_notice("I override the authentication mechanism.")) /obj/item/firing_pin/proc/gun_insert(mob/living/user, obj/item/gun/G) gun = G @@ -62,7 +62,7 @@ if(selfdestruct) if(user) user.show_message("SELF-DESTRUCTING...
", MSG_VISUAL) - to_chat(user, "[gun] explodes!") + to_chat(user, span_danger("[gun] explodes!")) explosion(get_turf(gun), -1, 0, 2, 3) if(gun) qdel(gun) @@ -77,7 +77,7 @@ /obj/item/firing_pin/test_range name = "test-range firing pin" desc = "" - fail_message = "TEST RANGE CHECK FAILED." + fail_message = span_warning("TEST RANGE CHECK FAILED.") pin_removeable = TRUE /obj/item/firing_pin/test_range/pin_auth(mob/living/user) @@ -92,7 +92,7 @@ /obj/item/firing_pin/implant name = "implant-keyed firing pin" desc = "" - fail_message = "IMPLANT CHECK FAILED." + fail_message = span_warning("IMPLANT CHECK FAILED.") var/obj/item/implant/req_implant = null /obj/item/firing_pin/implant/pin_auth(mob/living/user) @@ -121,7 +121,7 @@ name = "hilarious firing pin" desc = "" color = "#FFFF00" - fail_message = "HONK!" + fail_message = span_warning("HONK!") force_replace = TRUE /obj/item/firing_pin/clown/pin_auth(mob/living/user) @@ -156,7 +156,7 @@ name = "DNA-keyed firing pin" desc = "" icon_state = "firing_pin_dna" - fail_message = "DNA CHECK FAILED." + fail_message = span_warning("DNA CHECK FAILED.") var/unique_enzymes = null /obj/item/firing_pin/dna/afterattack(atom/target, mob/user, proximity_flag) @@ -165,7 +165,7 @@ var/mob/living/carbon/M = target if(M.dna && M.dna.unique_enzymes) unique_enzymes = M.dna.unique_enzymes - to_chat(user, "DNA-LOCK SET.") + to_chat(user, span_notice("DNA-LOCK SET.")) /obj/item/firing_pin/dna/pin_auth(mob/living/carbon/user) if(user && user.dna && user.dna.unique_enzymes) @@ -177,7 +177,7 @@ if(!unique_enzymes) if(user && user.dna && user.dna.unique_enzymes) unique_enzymes = user.dna.unique_enzymes - to_chat(user, "DNA-LOCK SET.") + to_chat(user, span_notice("DNA-LOCK SET.")) else ..() @@ -201,24 +201,24 @@ /obj/item/firing_pin/paywall/attack_self(mob/user) multi_payment = !multi_payment - to_chat(user, "I set the pin to [( multi_payment ) ? "process payment for every shot" : "one-time license payment"].") + to_chat(user, span_notice("I set the pin to [( multi_payment ) ? "process payment for every shot" : "one-time license payment"].")) /obj/item/firing_pin/paywall/examine(mob/user) . = ..() if(pin_owner) - . += "This firing pin is currently authorized to pay into the account of [pin_owner.registered_name]." + . += span_notice("This firing pin is currently authorized to pay into the account of [pin_owner.registered_name].") /obj/item/firing_pin/paywall/gun_insert(mob/living/user, obj/item/gun/G) if(!pin_owner) - to_chat(user, "ERROR: Please swipe valid identification card before installing firing pin!") + to_chat(user, span_warning("ERROR: Please swipe valid identification card before installing firing pin!")) return gun = G forceMove(gun) gun.pin = src if(multi_payment) - gun.desc += " This [gun.name] has a per-shot cost of [payment_amount] credit[( payment_amount > 1 ) ? "s" : ""]." + gun.desc += span_notice(" This [gun.name] has a per-shot cost of [payment_amount] credit[( payment_amount > 1 ) ? "s" : ""].") return - gun.desc += " This [gun.name] has a license permit cost of [payment_amount] credit[( payment_amount > 1 ) ? "s" : ""]." + gun.desc += span_notice(" This [gun.name] has a license permit cost of [payment_amount] credit[( payment_amount > 1 ) ? "s" : ""].") return @@ -230,20 +230,20 @@ if(istype(M, /obj/item/card/id)) var/obj/item/card/id/id = M if(!id.registered_account) - to_chat(user, "ERROR: Identification card lacks registered bank account!") + to_chat(user, span_warning("ERROR: Identification card lacks registered bank account!")) return if(id != pin_owner && owned) - to_chat(user, "ERROR: This firing pin has already been authorized!") + to_chat(user, span_warning("ERROR: This firing pin has already been authorized!")) return if(id == pin_owner) - to_chat(user, "I unlink the card from the firing pin.") + to_chat(user, span_notice("I unlink the card from the firing pin.")) gun_owners -= user pin_owner = null owned = FALSE return var/transaction_amount = input(user, "Insert valid deposit amount for gun purchase", "Money Deposit") as null|num if(transaction_amount < 1) - to_chat(user, "ERROR: Invalid amount designated.") + to_chat(user, span_warning("ERROR: Invalid amount designated.")) return if(!transaction_amount) return @@ -251,7 +251,7 @@ owned = TRUE payment_amount = transaction_amount gun_owners += user - to_chat(user, "I link the card to the firing pin.") + to_chat(user, span_notice("I link the card to the firing pin.")) /obj/item/firing_pin/paywall/pin_auth(mob/living/user) if(!istype(user))//nice try commie @@ -266,7 +266,7 @@ if(credit_card_details.adjust_money(-payment_amount)) pin_owner.registered_account.adjust_money(payment_amount) return TRUE - to_chat(user, "ERROR: User balance insufficent for successful transaction!") + to_chat(user, span_warning("ERROR: User balance insufficent for successful transaction!")) return FALSE return TRUE if(credit_card_details && !active_prompt) @@ -280,22 +280,22 @@ if(credit_card_details.adjust_money(-payment_amount)) pin_owner.registered_account.adjust_money(payment_amount) gun_owners += H - to_chat(user, "Gun license purchased, have a secure day!") + to_chat(user, span_notice("Gun license purchased, have a secure day!")) active_prompt = FALSE return FALSE //we return false here so you don't click initially to fire, get the prompt, accept the prompt, and THEN the gun - to_chat(user, "ERROR: User balance insufficent for successful transaction!") + to_chat(user, span_warning("ERROR: User balance insufficent for successful transaction!")) return FALSE if("No") - to_chat(user, "ERROR: User has declined to purchase gun license!") + to_chat(user, span_warning("ERROR: User has declined to purchase gun license!")) return FALSE - to_chat(user, "ERROR: User has no valid bank account to substract neccesary funds from!") + to_chat(user, span_warning("ERROR: User has no valid bank account to substract neccesary funds from!")) return FALSE // Laser tag pins /obj/item/firing_pin/tag name = "laser tag firing pin" desc = "" - fail_message = "SUIT CHECK FAILED." + fail_message = span_warning("SUIT CHECK FAILED.") var/obj/item/clothing/suit/suit_requirement = null var/tagcolor = "" @@ -304,7 +304,7 @@ var/mob/living/carbon/human/M = user if(istype(M.wear_armor, suit_requirement)) return TRUE - to_chat(user, "I need to be wearing [tagcolor] laser tag armor!") + to_chat(user, span_warning("I need to be wearing [tagcolor] laser tag armor!")) return FALSE /obj/item/firing_pin/tag/red diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index d32cafd99..3d6143ab7 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -185,7 +185,7 @@ . = ..() if(iscarbon(target)) var/mob/living/carbon/M = target - M.visible_message("[M] explodes into a shower of gibs!") + M.visible_message(span_danger("[M] explodes into a shower of gibs!")) M.gib() //a shrink ray that shrinks stuff, which grows back after a short while. diff --git a/code/modules/projectiles/projectile/bullets/dart_syringe.dm b/code/modules/projectiles/projectile/bullets/dart_syringe.dm index e3918dc66..9adb3d4c8 100644 --- a/code/modules/projectiles/projectile/bullets/dart_syringe.dm +++ b/code/modules/projectiles/projectile/bullets/dart_syringe.dm @@ -19,8 +19,8 @@ return BULLET_ACT_HIT else blocked = 100 - target.visible_message("\The [src] was deflected!", \ - "I were protected against \the [src]!") + target.visible_message(span_danger("\The [src] was deflected!"), \ + span_danger("I were protected against \the [src]!")) ..(target, blocked) DISABLE_BITFIELD(reagents.flags, NO_REACT) diff --git a/code/modules/projectiles/projectile/bullets/dnainjector.dm b/code/modules/projectiles/projectile/bullets/dnainjector.dm index 449d4286c..842b9cd76 100644 --- a/code/modules/projectiles/projectile/bullets/dnainjector.dm +++ b/code/modules/projectiles/projectile/bullets/dnainjector.dm @@ -15,8 +15,8 @@ return BULLET_ACT_HIT else blocked = 100 - target.visible_message("\The [src] was deflected!", \ - "I were protected against \the [src]!") + target.visible_message(span_danger("\The [src] was deflected!"), \ + span_danger("I were protected against \the [src]!")) return ..() /obj/projectile/bullet/dnainjector/Destroy() diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index f261c1270..819da85a5 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -18,7 +18,7 @@ if(ismob(target)) var/mob/M = target if(M.anti_magic_check()) - M.visible_message("[src] vanishes on contact with [target]!") + M.visible_message(span_warning("[src] vanishes on contact with [target]!")) return BULLET_ACT_BLOCK if(isliving(M)) var/mob/living/L = M @@ -27,9 +27,9 @@ return BULLET_ACT_BLOCK if(L.revive(full_heal = TRUE, admin_revive = TRUE)) L.grab_ghost(force = TRUE) // even suicides - to_chat(L, "I rise with a start, you're undead!!!") + to_chat(L, span_notice("I rise with a start, you're undead!!!")) else if(L.stat != DEAD) - to_chat(L, "I feel great!") + to_chat(L, span_notice("I feel great!")) else L.death(0) else @@ -46,7 +46,7 @@ . = ..() if(isliving(target)) if(target.anti_magic_check()) - target.visible_message("[src] vanishes on contact with [target]!") + target.visible_message(span_warning("[src] vanishes on contact with [target]!")) return BULLET_ACT_BLOCK if(target.mob_biotypes & MOB_UNDEAD) //positive energy harms the undead target.death(0) @@ -55,9 +55,9 @@ return BULLET_ACT_BLOCK if(target.revive(full_heal = TRUE, admin_revive = TRUE)) target.grab_ghost(force = TRUE) // even suicides - to_chat(target, "I rise with a start, you're alive!!!") + to_chat(target, span_notice("I rise with a start, you're alive!!!")) else if(target.stat != DEAD) - to_chat(target, "I feel great!") + to_chat(target, span_notice("I feel great!")) /obj/projectile/magic/teleport name = "bolt of teleportation" @@ -73,7 +73,7 @@ if(ismob(target)) var/mob/M = target if(M.anti_magic_check()) - M.visible_message("[src] fizzles on contact with [target]!") + M.visible_message(span_warning("[src] fizzles on contact with [target]!")) return BULLET_ACT_BLOCK var/teleammount = 0 var/teleloc = target @@ -99,7 +99,7 @@ if(ismob(target)) var/mob/M = target if(M.anti_magic_check()) - M.visible_message("[src] fizzles on contact with [target]!") + M.visible_message(span_warning("[src] fizzles on contact with [target]!")) return BULLET_ACT_BLOCK if(isturf(target)) return BULLET_ACT_HIT @@ -154,7 +154,7 @@ if(ismob(change)) var/mob/M = change if(M.anti_magic_check()) - M.visible_message("[src] fizzles on contact with [M]!") + M.visible_message(span_warning("[src] fizzles on contact with [M]!")) qdel(src) return BULLET_ACT_BLOCK wabbajack(change) @@ -290,7 +290,7 @@ M.wabbajack_act(new_mob) - to_chat(new_mob, "My form morphs into that of a [randomize].") + to_chat(new_mob, span_warning("My form morphs into that of a [randomize].")) var/poly_msg = get_policy(POLICY_POLYMORPH) if(poly_msg) @@ -330,7 +330,7 @@ if(L.mind) L.mind.transfer_to(S) if(owner) - to_chat(S, "I are an animate statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved! Do not harm [owner], my creator.") + to_chat(S, span_danger("I are an animate statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved! Do not harm [owner], my creator.")) P.forceMove(S) return else @@ -359,7 +359,7 @@ if(ismob(target)) var/mob/M = target if(M.anti_magic_check()) - M.visible_message("[src] vanishes on contact with [target]!") + M.visible_message(span_warning("[src] vanishes on contact with [target]!")) qdel(src) return BULLET_ACT_BLOCK . = ..() @@ -378,7 +378,7 @@ if(ismob(target)) var/mob/M = target if(M.anti_magic_check()) - M.visible_message("[src] vanishes on contact with [target]!") + M.visible_message(span_warning("[src] vanishes on contact with [target]!")) qdel(src) return BULLET_ACT_BLOCK . = ..() @@ -402,7 +402,7 @@ if(isliving(A) && locker_suck) var/mob/living/M = A if(M.anti_magic_check()) - M.visible_message("[src] vanishes on contact with [A]!") + M.visible_message(span_warning("[src] vanishes on contact with [A]!")) qdel(src) return if(!locker_temp_instance.insertion_allowed(M)) @@ -478,7 +478,7 @@ if(isliving(target)) var/mob/living/L = target if(L.anti_magic_check()) - L.visible_message("[src] vanishes on contact with [target]!") + L.visible_message(span_warning("[src] vanishes on contact with [target]!")) return BULLET_ACT_BLOCK var/atom/throw_target = get_edge_target_turf(L, angle2dir(Angle)) L.throw_at(throw_target, 200, 4) @@ -492,7 +492,7 @@ if(isliving(target)) var/mob/living/L = target if(L.anti_magic_check() || !firer) - L.visible_message("[src] vanishes on contact with [target]!") + L.visible_message(span_warning("[src] vanishes on contact with [target]!")) return BULLET_ACT_BLOCK L.apply_status_effect(STATUS_EFFECT_BOUNTY, firer) @@ -505,7 +505,7 @@ if(isliving(target)) var/mob/living/L = target if(L.anti_magic_check()) - L.visible_message("[src] vanishes on contact with [target]!") + L.visible_message(span_warning("[src] vanishes on contact with [target]!")) return BULLET_ACT_BLOCK L.apply_status_effect(STATUS_EFFECT_ANTIMAGIC) @@ -520,7 +520,7 @@ if(isliving(target)) var/mob/living/L = target if(L.anti_magic_check() || !firer) - L.visible_message("[src] vanishes on contact with [target]!") + L.visible_message(span_warning("[src] vanishes on contact with [target]!")) return BULLET_ACT_BLOCK L.throw_at(throw_target, 200, 4) else @@ -551,7 +551,7 @@ if(ismob(target)) var/mob/M = target if(M.anti_magic_check()) - M.visible_message("[src] vanishes on contact with [target]!") + M.visible_message(span_warning("[src] vanishes on contact with [target]!")) return BULLET_ACT_BLOCK SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, src, /datum/mood_event/sapped) @@ -564,13 +564,13 @@ if(isliving(target)) var/mob/living/L = target if(L.anti_magic_check() || !L.mind || !L.mind.hasSoul) - L.visible_message("[src] vanishes on contact with [target]!") + L.visible_message(span_warning("[src] vanishes on contact with [target]!")) return BULLET_ACT_BLOCK - to_chat(L, "My body feels drained and there is a burning pain in my chest.") + to_chat(L, span_danger("My body feels drained and there is a burning pain in my chest.")) L.maxHealth -= 20 L.health = min(L.health, L.maxHealth) if(L.maxHealth <= 0) - to_chat(L, "My weakened soul is completely consumed by the [src]!") + to_chat(L, span_danger("My weakened soul is completely consumed by the [src]!")) L.mind.hasSoul = FALSE for(var/obj/effect/proc_holder/spell/spell in L.mind.spell_list) spell.charge_counter = spell.charge_max @@ -586,13 +586,13 @@ if(iscarbon(target)) var/mob/living/carbon/M = target if(M.anti_magic_check()) - M.visible_message("[src] vanishes on contact with [target]!") + M.visible_message(span_warning("[src] vanishes on contact with [target]!")) return BULLET_ACT_BLOCK for(var/x in M.get_traumas())//checks to see if the victim is already going through possession if(istype(x, /datum/brain_trauma/special/imaginary_friend/trapped_owner)) - M.visible_message("[src] vanishes on contact with [target]!") + M.visible_message(span_warning("[src] vanishes on contact with [target]!")) return BULLET_ACT_BLOCK - to_chat(M, "My mind has been opened to possession!") + to_chat(M, span_warning("My mind has been opened to possession!")) possession_test(M) return BULLET_ACT_HIT @@ -612,7 +612,7 @@ return if(LAZYLEN(candidates)) var/mob/dead/observer/C = pick(candidates) - to_chat(M, "I have been noticed by a ghost and it has possessed you!") + to_chat(M, span_boldnotice("I have been noticed by a ghost and it has possessed you!")) var/oldkey = M.key M.ghostize(0) M.key = C.key @@ -621,7 +621,7 @@ trauma.friend.Show() trauma.friend_initialized = TRUE else - to_chat(M, "My mind has managed to go unnoticed in the spirit world.") + to_chat(M, span_notice("My mind has managed to go unnoticed in the spirit world.")) qdel(trauma) /obj/projectile/magic/aoe @@ -664,7 +664,7 @@ if(ismob(target)) var/mob/M = target if(M.anti_magic_check()) - visible_message("[src] fizzles on contact with [target]!") + visible_message(span_warning("[src] fizzles on contact with [target]!")) qdel(src) return BULLET_ACT_BLOCK tesla_zap(src, tesla_range, tesla_power, tesla_flags) @@ -694,7 +694,7 @@ if(ismob(target)) var/mob/living/M = target if(M.anti_magic_check()) - visible_message("[src] vanishes into smoke on contact with [target]!") + visible_message(span_warning("[src] vanishes into smoke on contact with [target]!")) return BULLET_ACT_BLOCK M.adjust_fire_stacks(6) // M.take_overall_damage(0,10) //between this 10 burn, the 10 brute, the explosion brute, and the onfire burn, my at about 65 damage if you stop drop and roll immediately diff --git a/code/modules/projectiles/projectile/special/hallucination.dm b/code/modules/projectiles/projectile/special/hallucination.dm index 0acb9503c..927604d27 100644 --- a/code/modules/projectiles/projectile/special/hallucination.dm +++ b/code/modules/projectiles/projectile/special/hallucination.dm @@ -48,10 +48,10 @@ /obj/projectile/hallucination/proc/target_on_hit(mob/M) if(M == hal_target) - to_chat(hal_target, "[M] is hit by \a [src] in the chest!") + to_chat(hal_target, span_danger("[M] is hit by \a [src] in the chest!")) hal_apply_effect() else if(M in view(hal_target)) - to_chat(hal_target, "[M] is hit by \a [src] in the chest!!") + to_chat(hal_target, span_danger("[M] is hit by \a [src] in the chest!!")) if(damage_type == BRUTE) var/splatter_dir = dir if(starting) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index b20e060f2..e9a8f34fc 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -378,7 +378,7 @@ update_total() /datum/reagents/proc/remove_addiction(datum/reagent/R) - to_chat(my_atom, "I feel like you've gotten over your need for [R.name].") + to_chat(my_atom, span_notice("I feel like you've gotten over your need for [R.name].")) SEND_SIGNAL(my_atom, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose") addiction_list.Remove(R) qdel(R) @@ -514,14 +514,14 @@ if(selected_reaction.mix_message) for(var/mob/M in seen) - to_chat(M, "[iconhtml] [selected_reaction.mix_message]") + to_chat(M, span_notice("[iconhtml] [selected_reaction.mix_message]")) if(istype(cached_my_atom, /obj/item/slime_extract)) var/obj/item/slime_extract/ME2 = my_atom ME2.Uses-- if(ME2.Uses <= 0) // give the notification that the slime core is dead for(var/mob/M in seen) - to_chat(M, "[iconhtml] \The [my_atom]'s power is consumed in the reaction.") + to_chat(M, span_notice("[iconhtml] \The [my_atom]'s power is consumed in the reaction.")) ME2.name = "used slime extract" ME2.desc = "" diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index c642fb5d5..b513ccce0 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -102,7 +102,7 @@ /obj/machinery/chem_dispenser/examine(mob/user) . = ..() if(panel_open) - . += "[src]'s maintenance hatch is open!" + . += span_notice("[src]'s maintenance hatch is open!") if(in_range(user, src) || isobserver(user)) . += "The status display reads:\n\ Recharging [recharge_amount] power units per interval.\n\ @@ -143,9 +143,9 @@ /obj/machinery/chem_dispenser/emag_act(mob/user) if(obj_flags & EMAGGED) - to_chat(user, "[src] has no functional safeties to emag.") + to_chat(user, span_warning("[src] has no functional safeties to emag.")) return - to_chat(user, "I short out [src]'s safeties.") + to_chat(user, span_notice("I short out [src]'s safeties.")) dispensable_reagents |= emagged_reagents//add the emagged reagents to the dispensable ones obj_flags |= EMAGGED @@ -307,7 +307,7 @@ for(var/reagent in recording_recipe) var/reagent_id = GLOB.name2reagent[translate_legacy_chem_id(reagent)] if(!dispensable_reagents.Find(reagent_id)) - visible_message("[src] buzzes.", "I hear a faint buzz.") + visible_message(span_warning("[src] buzzes."), span_hear("I hear a faint buzz.")) to_chat(usr, "[src] cannot find [reagent]!") playsound(src, 'sound/blank.ogg', 50, TRUE) return @@ -334,11 +334,11 @@ if(!user.transferItemToLoc(B, src)) return replace_beaker(user, B) - to_chat(user, "I add [B] to [src].") + to_chat(user, span_notice("I add [B] to [src].")) updateUsrDialog() update_icon() else if(user.used_intent.type != INTENT_HARM && !istype(I, /obj/item/card/emag)) - to_chat(user, "I can't load [I] into [src]!") + to_chat(user, span_warning("I can't load [I] into [src]!")) return ..() else return ..() @@ -364,7 +364,7 @@ cell.use(total/powerefficiency) cell.emp_act(severity) work_animation() - visible_message("[src] malfunctions, spraying chemicals everywhere!") + visible_message(span_danger("[src] malfunctions, spraying chemicals everywhere!")) /obj/machinery/chem_dispenser/RefreshParts() recharge_amount = initial(recharge_amount) diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index 04f73fff7..d6c22239d 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -57,7 +57,7 @@ /obj/machinery/chem_heater/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Heating reagents at [heater_coefficient*1000]% speed." + . += span_notice("The status display reads: Heating reagents at [heater_coefficient*1000]% speed.") /obj/machinery/chem_heater/process() ..() @@ -82,7 +82,7 @@ if(!user.transferItemToLoc(B, src)) return replace_beaker(user, B) - to_chat(user, "I add [B] to [src].") + to_chat(user, span_notice("I add [B] to [src].")) updateUsrDialog() update_icon() return diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 6a2b1c076..2ff40a872 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -91,24 +91,24 @@ if(istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container()) . = TRUE // no afterattack if(panel_open) - to_chat(user, "I can't use the [src.name] while its panel is opened!") + to_chat(user, span_warning("I can't use the [src.name] while its panel is opened!")) return var/obj/item/reagent_containers/B = I . = TRUE // no afterattack if(!user.transferItemToLoc(B, src)) return replace_beaker(user, B) - to_chat(user, "I add [B] to [src].") + to_chat(user, span_notice("I add [B] to [src].")) updateUsrDialog() update_icon() else if(!condi && istype(I, /obj/item/storage/pill_bottle)) if(bottle) - to_chat(user, "A pill bottle is already loaded into [src]!") + to_chat(user, span_warning("A pill bottle is already loaded into [src]!")) return if(!user.transferItemToLoc(I, src)) return bottle = I - to_chat(user, "I add [I] into the dispenser slot.") + to_chat(user, span_notice("I add [I] into the dispenser slot.")) updateUsrDialog() else return ..() diff --git a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm index 3ab7cf916..d04d8f79c 100644 --- a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm +++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm @@ -55,7 +55,7 @@ if(beaker) return beaker = new /obj/item/reagent_containers/glass/beaker/bluespace(src) - visible_message("[src] dispenses a bluespace beaker.") + visible_message(span_notice("[src] dispenses a bluespace beaker.")) if("amount") var/input = text2num(params["amount"]) if(input) diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index 1199bf840..a7208fdbd 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -36,7 +36,7 @@ is_close = TRUE else . += "It has a beaker inside it." - . += "Alt-click to eject [is_close ? beaker : "the beaker"]." + . += span_info("Alt-click to eject [is_close ? beaker : "the beaker"].") /obj/machinery/computer/pandemic/AltClick(mob/user) . = ..() @@ -212,7 +212,7 @@ var/id = get_virus_id_by_index(text2num(params["index"])) var/datum/disease/advance/A = SSdisease.archive_diseases[id] if(!istype(A) || !A.mutable) - to_chat(usr, "ERROR: Cannot replicate virus strain.") + to_chat(usr, span_warning("ERROR: Cannot replicate virus strain.")) return A = A.Copy() var/list/data = list("viruses" = list(A)) @@ -258,13 +258,13 @@ if(stat & (NOPOWER|BROKEN)) return if(beaker) - to_chat(user, "A container is already loaded into [src]!") + to_chat(user, span_warning("A container is already loaded into [src]!")) return if(!user.transferItemToLoc(I, src)) return beaker = I - to_chat(user, "I insert [I] into [src].") + to_chat(user, span_notice("I insert [I] into [src].")) update_icon() else return ..() diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 8be16aa83..9475f00cb 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -54,27 +54,27 @@ /obj/machinery/reagentgrinder/examine(mob/user) . = ..() if(!in_range(user, src) && !issilicon(user) && !isobserver(user)) - . += "You're too far away to examine [src]'s contents and display!" + . += span_warning("You're too far away to examine [src]'s contents and display!") return if(operating) - . += "\The [src] is operating." + . += span_warning("\The [src] is operating.") return if(beaker || length(holdingitems)) - . += "\The [src] contains:" + . += span_notice("\The [src] contains:") if(beaker) - . += "- \A [beaker]." + . += span_notice("- \A [beaker].") for(var/i in holdingitems) var/obj/item/O = i - . += "- \A [O.name]." + . += span_notice("- \A [O.name].") if(!(stat & (NOPOWER|BROKEN))) . += "The status display reads:\n"+\ - "- Grinding reagents at [speed*100]%." + span_notice("- Grinding reagents at [speed*100]%.") if(beaker) for(var/datum/reagent/R in beaker.reagents.reagent_list) - . += "- [R.volume] units of [R.name]." + . += span_notice("- [R.volume] units of [R.name].") /obj/machinery/reagentgrinder/handle_atom_del(atom/A) . = ..() @@ -128,12 +128,12 @@ if(!user.transferItemToLoc(B, src)) return replace_beaker(user, B) - to_chat(user, "I add [B] to [src].") + to_chat(user, span_notice("I add [B] to [src].")) update_icon() return TRUE //no afterattack if(holdingitems.len >= limit) - to_chat(user, "[src] is filled to capacity!") + to_chat(user, span_warning("[src] is filled to capacity!")) return TRUE //Fill machine with a bag! @@ -143,23 +143,23 @@ for(var/i in inserted) holdingitems[i] = TRUE if(!I.contents.len) - to_chat(user, "I empty [I] into [src].") + to_chat(user, span_notice("I empty [I] into [src].")) else - to_chat(user, "I fill [src] to the brim.") + to_chat(user, span_notice("I fill [src] to the brim.")) return TRUE if(!I.grind_results && !I.juice_results) if(user.used_intent.type == INTENT_HARM) return ..() else - to_chat(user, "I cannot grind [I] into reagents!") + to_chat(user, span_warning("I cannot grind [I] into reagents!")) return TRUE if(!I.grind_requirements(src)) //Error messages should be in the objects' definitions return if(user.transferItemToLoc(I, src)) - to_chat(user, "I add [I] to [src].") + to_chat(user, span_notice("I add [I] to [src].")) holdingitems[I] = TRUE return FALSE @@ -262,7 +262,7 @@ /obj/machinery/reagentgrinder/proc/juice_item(obj/item/I) //Juicing results can be found in respective object definitions if(I.on_juice(src) == -1) - to_chat(usr, "[src] shorts out as it tries to juice up [I], and transfers it back to storage.") + to_chat(usr, span_danger("[src] shorts out as it tries to juice up [I], and transfers it back to storage.")) return beaker.reagents.add_reagent_list(I.juice_results) remove_object(I) @@ -282,7 +282,7 @@ /obj/machinery/reagentgrinder/proc/grind_item(obj/item/I, mob/user) //Grind results can be found in respective object definitions if(I.on_grind(src) == -1) //Call on_grind() to change amount as needed, and stop grinding the item if it returns -1 - to_chat(usr, "[src] shorts out as it tries to grind up [I], and transfers it back to storage.") + to_chat(usr, span_danger("[src] shorts out as it tries to grind up [I], and transfers it back to storage.")) return beaker.reagents.add_reagent_list(I.grind_results) if(I.reagents) diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm index dcfd6da1c..f59207242 100644 --- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm +++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm @@ -88,7 +88,7 @@ var/obj/item/reagent_containers/RC = I var/units = RC.reagents.trans_to(src, RC.amount_per_transfer_from_this, transfered_by = user) if(units) - to_chat(user, "I transfer [units] units of the solution to [src].") + to_chat(user, span_notice("I transfer [units] units of the solution to [src].")) return if(default_unfasten_wrench(user, I, 40)) on = FALSE diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index 0020502bd..6e4db2450 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -116,32 +116,32 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent()) return /datum/reagent/proc/overdose_start(mob/living/M) - to_chat(M, "I feel like you took too much of [name]!") + to_chat(M, span_danger("I feel like you took too much of [name]!")) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/overdose, name) return /datum/reagent/proc/addiction_act_stage1(mob/living/M) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_light, name) if(prob(30)) - to_chat(M, "I feel like having some [name] right about now.") + to_chat(M, span_notice("I feel like having some [name] right about now.")) return /datum/reagent/proc/addiction_act_stage2(mob/living/M) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_medium, name) if(prob(30)) - to_chat(M, "I feel like you need [name]. You just can't get enough.") + to_chat(M, span_notice("I feel like you need [name]. You just can't get enough.")) return /datum/reagent/proc/addiction_act_stage3(mob/living/M) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_severe, name) if(prob(30)) - to_chat(M, "I have an intense craving for [name].") + to_chat(M, span_danger("I have an intense craving for [name].")) return /datum/reagent/proc/addiction_act_stage4(mob/living/M) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_critical, name) if(prob(30)) - to_chat(M, "You're not feeling good at all! You really need some [name].") + to_chat(M, span_boldannounce("You're not feeling good at all! You really need some [name].")) return /proc/pretty_string_from_reagent_list(list/reagent_list) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 8b7963632..2d8fa52c2 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -52,14 +52,14 @@ All effects don't start immediately, but rather get worse over time; the rate is if(istype(O, /obj/item/paper)) var/obj/item/paper/paperaffected = O paperaffected.clearpaper() - to_chat(usr, "[paperaffected]'s ink washes away.") + to_chat(usr, span_notice("[paperaffected]'s ink washes away.")) if(istype(O, /obj/item/book)) if(reac_volume >= 5) var/obj/item/book/affectedbook = O affectedbook.dat = null - O.visible_message("[O]'s writing is washed away by [name]!") + O.visible_message(span_notice("[O]'s writing is washed away by [name]!")) else - O.visible_message("[O]'s ink is smeared by [name], but doesn't wash away!") + O.visible_message(span_warning("[O]'s ink is smeared by [name], but doesn't wash away!")) return /datum/reagent/consumable/ethanol/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with ethanol isn't quite as good as fuel. @@ -174,7 +174,7 @@ All effects don't start immediately, but rather get worse over time; the rate is return ..() /datum/reagent/consumable/ethanol/thirteenloko/overdose_start(mob/living/M) - to_chat(M, "My entire body violently jitters as you start to feel queasy. You really shouldn't have drank all of that [name]!") + to_chat(M, span_danger("My entire body violently jitters as you start to feel queasy. You really shouldn't have drank all of that [name]!")) M.Jitter(20) M.Stun(15) @@ -183,11 +183,11 @@ All effects don't start immediately, but rather get worse over time; the rate is var/obj/item/I = M.get_active_held_item() if(I) M.dropItemToGround(I) - to_chat(M, "My hands jitter and you drop what you were holding!") + to_chat(M, span_notice("My hands jitter and you drop what you were holding!")) M.Jitter(10) if(prob(7)) - to_chat(M, "[pick("You have a really bad headache.", "Your eyes hurt.", "You find it hard to stay still.", "You feel my heart practically beating out of my chest.")]") + to_chat(M, span_notice("[pick("You have a really bad headache.", "Your eyes hurt.", "You find it hard to stay still.", "You feel my heart practically beating out of my chest.")]")) if(prob(5) && iscarbon(M)) var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES) @@ -195,23 +195,23 @@ All effects don't start immediately, but rather get worse over time; the rate is if(istype(eyes)) eyes.Remove(M) eyes.forceMove(get_turf(M)) - to_chat(M, "I double over in pain as you feel my eyeballs liquify in my head!") + to_chat(M, span_danger("I double over in pain as you feel my eyeballs liquify in my head!")) M.emote("scream") M.adjustBruteLoss(15) else - to_chat(M, "I scream in terror as you go blind!") + to_chat(M, span_danger("I scream in terror as you go blind!")) eyes.applyOrganDamage(eyes.maxHealth) M.emote("scream") if(prob(3) && iscarbon(M)) - M.visible_message("[M] starts having a seizure!", "I have a seizure!") + M.visible_message(span_danger("[M] starts having a seizure!"), span_danger("I have a seizure!")) M.Unconscious(100) M.Jitter(350) if(prob(1) && iscarbon(M)) var/datum/disease/D = new /datum/disease/heart_failure M.ForceContractDisease(D) - to_chat(M, "You're pretty sure you just felt my heart stop for a second there..") + to_chat(M, span_danger("You're pretty sure you just felt my heart stop for a second there..")) M.playsound_local(M, 'sound/blank.ogg', 100, 0) /datum/reagent/consumable/ethanol/vodka @@ -553,12 +553,12 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/brave_bull/on_mob_metabolize(mob/living/M) tough_text = pick("brawny", "tenacious", "tough", "hardy", "sturdy") //Tuff stuff - to_chat(M, "I feel [tough_text]!") + to_chat(M, span_notice("I feel [tough_text]!")) M.maxHealth += 10 //Brave Bull makes you sturdier, and thus capable of withstanding a tiny bit more punishment. M.health += 10 /datum/reagent/consumable/ethanol/brave_bull/on_mob_end_metabolize(mob/living/M) - to_chat(M, "I no longer feel [tough_text].") + to_chat(M, span_notice("I no longer feel [tough_text].")) M.maxHealth -= 10 M.health = min(M.health - 10, M.maxHealth) //This can indeed crit you if you're alive solely based on alchol ingestion @@ -575,7 +575,7 @@ All effects don't start immediately, but rather get worse over time; the rate is var/obj/effect/light_holder /datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_metabolize(mob/living/M) - to_chat(M, "I feel gentle warmth spread through my body!") + to_chat(M, span_notice("I feel gentle warmth spread through my body!")) light_holder = new(M) light_holder.set_light(3, 0.7, "#FFCC00") //Tequila Sunrise makes you radiate dim light, like a sunrise! @@ -587,7 +587,7 @@ All effects don't start immediately, but rather get worse over time; the rate is return ..() /datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_end_metabolize(mob/living/M) - to_chat(M, "The warmth in my body fades.") + to_chat(M, span_notice("The warmth in my body fades.")) QDEL_NULL(light_holder) /datum/reagent/consumable/ethanol/toxins_special @@ -675,7 +675,7 @@ All effects don't start immediately, but rather get worse over time; the rate is if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.dna.check_mutation(DWARFISM) || HAS_TRAIT(H, TRAIT_ALCOHOL_TOLERANCE)) - to_chat(H, "Now THAT is MANLY!") + to_chat(H, span_notice("Now THAT is MANLY!")) boozepwr = 5 //We've had worse in the mines dorf_mode = TRUE @@ -1299,7 +1299,7 @@ All effects don't start immediately, but rather get worse over time; the rate is if(prob(20)) M.adjustStaminaLoss(10) M.drop_all_held_items() - to_chat(M, "I cant feel my hands!") + to_chat(M, span_notice("I cant feel my hands!")) if(current_cycle > 5) if(prob(20)) var/t = pickt() @@ -1311,7 +1311,7 @@ All effects don't start immediately, but rather get worse over time; the rate is if(!M.undergoing_cardiac_arrest() && M.can_heartattack()) M.set_heartattack(TRUE) if(M.stat == CONSCIOUS) - M.visible_message("[M] clutches at [M.p_their()] chest as if [M.p_their()] heart stopped!") + M.visible_message(span_danger("[M] clutches at [M.p_their()] chest as if [M.p_their()] heart stopped!")) . = 1 ..() @@ -1513,9 +1513,9 @@ All effects don't start immediately, but rather get worse over time; the rate is L.adjustToxLoss(-1) L.adjustOxyLoss(-1) L.adjustStaminaLoss(-1) - L.visible_message("[L] shivers with renewed vigor!", "One taste of [lowertext(name)] fills you with energy!") + L.visible_message(span_warning("[L] shivers with renewed vigor!"), span_notice("One taste of [lowertext(name)] fills you with energy!")) if(!L.stat && heal_points == 20) //brought us out of softcrit - L.visible_message("[L] lurches to [L.p_their()] feet!", "Up and at 'em, kid.") + L.visible_message(span_danger("[L] lurches to [L.p_their()] feet!"), span_boldnotice("Up and at 'em, kid.")) /datum/reagent/consumable/ethanol/bastion_bourbon/on_mob_life(mob/living/L) if(L.health > 0) @@ -1630,7 +1630,7 @@ All effects don't start immediately, but rather get worse over time; the rate is for(var/obj/item/shield/theshield in thehuman.contents) mighty_shield = theshield mighty_shield.block_chance += 10 - to_chat(thehuman, "[theshield] appears polished, although you don't recall polishing it.") + to_chat(thehuman, span_notice("[theshield] appears polished, although you don't recall polishing it.")) return TRUE /datum/reagent/consumable/ethanol/alexander/on_mob_life(mob/living/L) @@ -1641,7 +1641,7 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/alexander/on_mob_end_metabolize(mob/living/L) if(mighty_shield) mighty_shield.block_chance -= 10 - to_chat(L,"I notice [mighty_shield] looks worn again. Weird.") + to_chat(L,span_notice("I notice [mighty_shield] looks worn again. Weird.")) ..() /datum/reagent/consumable/ethanol/sidecar @@ -1993,7 +1993,7 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/turbo/on_mob_life(mob/living/carbon/M) if(prob(4)) - to_chat(M, "[pick("You feel disregard for the rule of law.", "You feel pumped!", "Your head is pounding.", "Your thoughts are racing..")]") + to_chat(M, span_notice("[pick("You feel disregard for the rule of law.", "You feel pumped!", "Your head is pounding.", "Your thoughts are racing..")]")) M.adjustStaminaLoss(-M.drunkenness * 0.25) return ..() @@ -2024,7 +2024,7 @@ All effects don't start immediately, but rather get worse over time; the rate is N.update_hair() if(N.age > 969) //Best not let people get older than this or i might incur G-ds wrath - M.visible_message("[M] becomes older than any man should be.. and crumbles into dust!") + M.visible_message(span_notice("[M] becomes older than any man should be.. and crumbles into dust!")) M.dust(0,1,0) return ..() diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index 71f8d4eb0..82a787393 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -36,26 +36,26 @@ var/list/RockPaperScissors = list("rock" = "paper", "paper" = "scissors", "scissors" = "rock") //choice = loses to if(M.apply_status_effect(/datum/status_effect/necropolis_curse,CURSE_BLINDING)) helbent = TRUE - to_chat(M, "Malevolent spirits appear before you, bartering your life in a 'friendly' game of rock, paper, scissors. Which do you choose?") + to_chat(M, span_hierophant("Malevolent spirits appear before you, bartering your life in a 'friendly' game of rock, paper, scissors. Which do you choose?")) var/timeisticking = world.time var/RPSchoice = input(M, "Janken Time! You have 60 Seconds to Choose!", "Rock Paper Scissors",null) as null|anything in RockPaperScissors if(QDELETED(M) || (timeisticking+(1.1 MINUTES) < world.time)) reaping = FALSE return //good job, you ruined it if(!RPSchoice) - to_chat(M, "I decide to not press your luck, but the spirits remain... hopefully they'll go away soon.") + to_chat(M, span_hierophant("I decide to not press your luck, but the spirits remain... hopefully they'll go away soon.")) reaping = FALSE return var/grim = pick(RockPaperScissors) if(grim == RPSchoice) //You Tied! - to_chat(M, "I tie, and the malevolent spirits disappear... for now.") + to_chat(M, span_hierophant("I tie, and the malevolent spirits disappear... for now.")) reaping = FALSE else if(RockPaperScissors[RPSchoice] == grim) //You lost! - to_chat(M, "I lose, and the malevolent spirits smirk eerily as they surround your body.") + to_chat(M, span_hierophant("I lose, and the malevolent spirits smirk eerily as they surround your body.")) M.dust() return else //VICTORY ROYALE - to_chat(M, "I win, and the malevolent spirits fade away as well as your wounds.") + to_chat(M, span_hierophant("I win, and the malevolent spirits fade away as well as your wounds.")) M.client.give_award(/datum/award/achievement/misc/helbitaljanken, M) M.revive(full_heal = TRUE, admin_revive = FALSE) M.reagents.del_reagent(type) @@ -339,7 +339,7 @@ var/burnies = min(Carbies.getFireLoss(),Carbies.adjustFireLoss(-1.25 * reac_volume)*-1) Carbies.adjustToxLoss((harmies+burnies)*0.66) if(show_message) - to_chat(Carbies, "I feel your burns and bruises healing! It stings like hell!") + to_chat(Carbies, span_danger("I feel your burns and bruises healing! It stings like hell!")) SEND_SIGNAL(Carbies, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) ..() return TRUE diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index a89e00bb8..2a50c877d 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -169,7 +169,7 @@ /datum/reagent/consumable/superlaughter/on_mob_life(mob/living/carbon/M) if(prob(30)) - M.visible_message("[M] bursts out into a fit of uncontrollable laughter!", "I burst out in a fit of uncontrollable laughter!") + M.visible_message(span_danger("[M] bursts out into a fit of uncontrollable laughter!"), span_danger("I burst out in a fit of uncontrollable laughter!")) M.Stun(5) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "chemical_laughter", /datum/mood_event/chemical_superlaughter) ..() @@ -313,7 +313,7 @@ /datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/carbon/M) if(prob(5)) - to_chat(M, "[pick("You remember to square your shoulders.","You remember to keep your head down.","You can't decide between squaring your shoulders and keeping your head down.","You remember to relax.","You think about how someday you'll get two strokes off your golf game.")]") + to_chat(M, span_notice("[pick("You remember to square your shoulders.","You remember to keep your head down.","You can't decide between squaring your shoulders and keeping your head down.","You remember to relax.","You think about how someday you'll get two strokes off your golf game.")]")) ..() . = 1 diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 729a19263..dcb3c23e3 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -60,7 +60,7 @@ filters += filter(type="angular_blur",x=5,y=5,size=1) /datum/reagent/drug/space_drugs/overdose_start(mob/living/M) - to_chat(M, "I start tripping hard!") + to_chat(M, span_danger("I start tripping hard!")) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/overdose, name) /datum/reagent/drug/space_drugs/overdose_process(mob/living/M) @@ -91,7 +91,7 @@ /datum/reagent/drug/nicotine/on_mob_life(mob/living/carbon/M) /* if(prob(1)) var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert.","You feel rugged.") - to_chat(M, "[smoke_message]") + to_chat(M, span_notice("[smoke_message]")) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "smoked", /datum/mood_event/smoked, name) M.AdjustStun(-5, FALSE) M.AdjustKnockdown(-5, FALSE) @@ -120,7 +120,7 @@ /datum/reagent/drug/crank/on_mob_life(mob/living/carbon/M) if(prob(5)) var/high_message = pick("You feel jittery.", "You feel like you gotta go fast.", "You feel like you need to step it up.") - to_chat(M, "[high_message]") + to_chat(M, span_notice("[high_message]")) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "tweaking", /datum/mood_event/stimulant_medium, name) M.AdjustStun(-20, FALSE) M.AdjustKnockdown(-20, FALSE) @@ -170,7 +170,7 @@ /datum/reagent/drug/krokodil/on_mob_life(mob/living/carbon/M) var/high_message = pick("You feel calm.", "You feel collected.", "You feel like you need to relax.") if(prob(5)) - to_chat(M, "[high_message]") + to_chat(M, span_notice("[high_message]")) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "smacked out", /datum/mood_event/narcotic_heavy, name) ..() @@ -188,12 +188,12 @@ /datum/reagent/drug/krokodil/addiction_act_stage2(mob/living/M) if(prob(25)) - to_chat(M, "My skin feels loose...") + to_chat(M, span_danger("My skin feels loose...")) ..() /datum/reagent/drug/krokodil/addiction_act_stage3(mob/living/M) if(prob(25)) - to_chat(M, "My skin starts to peel away...") + to_chat(M, span_danger("My skin starts to peel away...")) M.adjustBruteLoss(3*REM, 0) ..() . = 1 @@ -201,7 +201,7 @@ /datum/reagent/drug/krokodil/addiction_act_stage4(mob/living/carbon/human/M) CHECK_DNA_AND_SPECIES(M) if(!istype(M.dna.species, /datum/species/krokodil_addict)) - to_chat(M, "My skin falls off easily!") + to_chat(M, span_danger("My skin falls off easily!")) M.adjustBruteLoss(50*REM, 0) // holy shit my skin just FELL THE FUCK OFF M.set_species(/datum/species/krokodil_addict) else @@ -229,7 +229,7 @@ /datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/M) var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.") if(prob(5)) - to_chat(M, "[high_message]") + to_chat(M, span_notice("[high_message]")) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "tweaking", /datum/mood_event/stimulant_medium, name) M.AdjustStun(-40, FALSE) M.AdjustKnockdown(-40, FALSE) @@ -251,7 +251,7 @@ if(prob(20)) M.emote("laugh") if(prob(33)) - M.visible_message("[M]'s hands flip out and flail everywhere!") + M.visible_message(span_danger("[M]'s hands flip out and flail everywhere!")) M.drop_all_held_items() ..() M.adjustToxLoss(1, 0) @@ -322,7 +322,7 @@ /datum/reagent/drug/bath_salts/on_mob_life(mob/living/carbon/M) var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.") if(prob(5)) - to_chat(M, "[high_message]") + to_chat(M, span_notice("[high_message]")) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "salted", /datum/mood_event/stimulant_heavy, name) M.adjustStaminaLoss(-5, 0) M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 4) @@ -402,7 +402,7 @@ /datum/reagent/drug/aranesp/on_mob_life(mob/living/carbon/M) var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.") if(prob(5)) - to_chat(M, "[high_message]") + to_chat(M, span_notice("[high_message]")) M.adjustStaminaLoss(-18, 0) M.adjustToxLoss(0.5, 0) if(prob(50)) @@ -507,7 +507,7 @@ M.Jitter(5) if(prob(5)) - to_chat(M, "[pick("Go! Go! GO!", "You feel ready...", "You feel invincible...")]") + to_chat(M, span_notice("[pick("Go! Go! GO!", "You feel ready...", "You feel invincible...")]")) if(prob(15)) M.losebreath++ M.adjustToxLoss(2, 0) @@ -515,7 +515,7 @@ . = 1 /datum/reagent/drug/pumpup/overdose_start(mob/living/M) - to_chat(M, "I can't stop shaking, my heart beats faster and faster...") + to_chat(M, span_danger("I can't stop shaking, my heart beats faster and faster...")) /datum/reagent/drug/pumpup/overdose_process(mob/living/M) M.Jitter(5) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 5258d6518..d7676e4ad 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -115,7 +115,7 @@ /datum/reagent/consumable/cooking_oil/reaction_obj(obj/O, reac_volume) if(holder && holder.chem_temp >= fry_temperature) if(isitem(O) && !istype(O, /obj/item/reagent_containers/food/snacks/deepfryholder)) - O.loc.visible_message("[O] rapidly fries as it's splashed with hot oil! Somehow.") + O.loc.visible_message(span_warning("[O] rapidly fries as it's splashed with hot oil! Somehow.")) var/obj/item/reagent_containers/food/snacks/deepfryholder/F = new(O.drop_location(), O) F.fry(volume) F.reagents.add_reagent(/datum/reagent/consumable/cooking_oil, reac_volume) @@ -135,8 +135,8 @@ oil_damage *= 1 - M.get_permeability_protection() var/FryLoss = round(min(38, oil_damage * reac_volume)) if(!HAS_TRAIT(M, TRAIT_OIL_FRIED)) - M.visible_message("The boiling oil sizzles as it covers [M]!", \ - "You're covered in boiling oil!") + M.visible_message(span_warning("The boiling oil sizzles as it covers [M]!"), \ + span_danger("You're covered in boiling oil!")) if(FryLoss) M.emote("scream") playsound(M, 'sound/blank.ogg', 25, TRUE) @@ -166,7 +166,7 @@ taste_description = "sweetness" /datum/reagent/consumable/sugar/overdose_start(mob/living/M) - to_chat(M, "I go into hyperglycaemic shock! Lay off the twinkies!") + to_chat(M, span_danger("I go into hyperglycaemic shock! Lay off the twinkies!")) M.AdjustSleeping(600, FALSE) . = 1 @@ -301,7 +301,7 @@ /datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/carbon/M) if(prob(5)) - M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]") + M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]")) ..() /datum/reagent/consumable/sodiumchloride @@ -393,7 +393,7 @@ /datum/reagent/consumable/garlic/on_mob_life(mob/living/carbon/M) if(isvampire(M)) //incapacitating but not lethal. Unfortunately, vampires cannot vomit. if(prob(min(25,current_cycle))) - to_chat(M, "I can't get the scent of garlic out of my nose! You can barely think...") + to_chat(M, span_danger("I can't get the scent of garlic out of my nose! You can barely think...")) M.Paralyze(10) M.Jitter(10) else if(ishuman(M)) @@ -579,10 +579,10 @@ unprotected = TRUE if(unprotected) if(!M.getorganslot(ORGAN_SLOT_EYES)) //can't blind somebody with no eyes - to_chat(M, "My eye sockets feel wet.") + to_chat(M, span_notice("My eye sockets feel wet.")) else if(!M.eye_blurry) - to_chat(M, "Tears well up in my eyes!") + to_chat(M, span_warning("Tears well up in my eyes!")) M.blind_eyes(2) M.blur_eyes(5) ..() @@ -592,7 +592,7 @@ if(M.eye_blurry) //Don't worsen vision if it was otherwise fine M.blur_eyes(4) if(prob(10)) - to_chat(M, "My eyes sting!") + to_chat(M, span_warning("My eyes sting!")) M.blind_eyes(2) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 5cd76d505..2972965a4 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -257,11 +257,11 @@ /datum/reagent/medicine/salglu_solution/overdose_process(mob/living/M) if(prob(3)) - to_chat(M, "I feel salty.") + to_chat(M, span_warning("I feel salty.")) holder.add_reagent(/datum/reagent/consumable/sodiumchloride, 1) holder.remove_reagent(/datum/reagent/medicine/salglu_solution, 0.5) else if(prob(3)) - to_chat(M, "I feel sweet.") + to_chat(M, span_warning("I feel sweet.")) holder.add_reagent(/datum/reagent/consumable/sugar, 1) holder.remove_reagent(/datum/reagent/medicine/salglu_solution, 0.5) if(prob(33)) @@ -289,10 +289,10 @@ if(method in list(INGEST, VAPOR, INJECT)) M.adjust_nutrition(-5) if(show_message) - to_chat(M, "My stomach feels empty and cramps!") + to_chat(M, span_warning("My stomach feels empty and cramps!")) else if(show_message) - to_chat(M, "I feel my wounds fade away to nothing!" ) + to_chat(M, span_danger("I feel my wounds fade away to nothing!") ) ..() /datum/reagent/medicine/mine_salve/on_mob_end_metabolize(mob/living/M) @@ -429,7 +429,7 @@ if(prob(20) && iscarbon(M)) var/obj/item/I = M.get_active_held_item() if(I && M.dropItemToGround(I)) - to_chat(M, "My hands spaz out and you drop what you were holding!") + to_chat(M, span_notice("My hands spaz out and you drop what you were holding!")) M.Jitter(10) M.AdjustAllImmobility(-20, FALSE) @@ -441,11 +441,11 @@ if(prob(2) && iscarbon(M)) var/datum/disease/D = new /datum/disease/heart_failure M.ForceContractDisease(D) - to_chat(M, "You're pretty sure you just felt my heart stop for a second there..") + to_chat(M, span_danger("You're pretty sure you just felt my heart stop for a second there..")) M.playsound_local(M, 'sound/blank.ogg', 100, 0) if(prob(7)) - to_chat(M, "[pick("Your head pounds.", "You feel a tight pain in my chest.", "You find it hard to stay still.", "You feel my heart practically beating out of my chest.")]") + to_chat(M, span_notice("[pick("Your head pounds.", "You feel a tight pain in my chest.", "You find it hard to stay still.", "You feel my heart practically beating out of my chest.")]")) if(prob(33)) M.adjustToxLoss(1*REM, 0) @@ -455,7 +455,7 @@ /datum/reagent/medicine/ephedrine/addiction_act_stage1(mob/living/M) if(prob(3) && iscarbon(M)) - M.visible_message("[M] starts having a seizure!", "I have a seizure!") + M.visible_message(span_danger("[M] starts having a seizure!"), span_danger("I have a seizure!")) M.Unconscious(100) M.Jitter(350) @@ -467,7 +467,7 @@ /datum/reagent/medicine/ephedrine/addiction_act_stage2(mob/living/M) if(prob(6) && iscarbon(M)) - M.visible_message("[M] starts having a seizure!", "I have a seizure!") + M.visible_message(span_danger("[M] starts having a seizure!"), span_danger("I have a seizure!")) M.Unconscious(100) M.Jitter(350) @@ -479,7 +479,7 @@ /datum/reagent/medicine/ephedrine/addiction_act_stage3(mob/living/M) if(prob(12) && iscarbon(M)) - M.visible_message("[M] starts having a seizure!", "I have a seizure!") + M.visible_message(span_danger("[M] starts having a seizure!"), span_danger("I have a seizure!")) M.Unconscious(100) M.Jitter(350) @@ -491,7 +491,7 @@ /datum/reagent/medicine/ephedrine/addiction_act_stage4(mob/living/M) if(prob(24) && iscarbon(M)) - M.visible_message("[M] starts having a seizure!", "I have a seizure!") + M.visible_message(span_danger("[M] starts having a seizure!"), span_danger("I have a seizure!")) M.Unconscious(100) M.Jitter(350) @@ -537,7 +537,7 @@ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "numb", /datum/mood_event/narcotic_medium, name) switch(current_cycle) if(11) - to_chat(M, "I start to feel tired..." ) + to_chat(M, span_warning("I start to feel tired...") ) if(12 to 24) M.drowsyness += 1 if(24 to INFINITY) @@ -600,13 +600,13 @@ eyes.applyOrganDamage(-2) if(HAS_TRAIT_FROM(M, TRAIT_BLIND, EYE_DAMAGE)) if(prob(20)) - to_chat(M, "My vision slowly returns...") + to_chat(M, span_warning("My vision slowly returns...")) M.cure_blind(EYE_DAMAGE) M.cure_nearsighted(EYE_DAMAGE) M.blur_eyes(35) else if(HAS_TRAIT_FROM(M, TRAIT_NEARSIGHT, EYE_DAMAGE)) - to_chat(M, "The blackness in my peripheral vision fades.") + to_chat(M, span_warning("The blackness in my peripheral vision fades.")) M.cure_nearsighted(EYE_DAMAGE) M.blur_eyes(10) else if(M.eye_blind || M.eye_blurry) @@ -702,14 +702,14 @@ /datum/reagent/medicine/strange_reagent/reaction_mob(mob/living/M, method=TOUCH, reac_volume) if(M.stat == DEAD) if(M.suiciding || M.hellbound) //they are never coming back - M.visible_message("[M]'s body does not react...") + M.visible_message(span_warning("[M]'s body does not react...")) return if(M.getBruteLoss() >= 100 || M.getFireLoss() >= 100 || HAS_TRAIT(M, TRAIT_HUSK)) //body is too damaged to be revived - M.visible_message("[M]'s body convulses a bit, and then falls still once more.") + M.visible_message(span_warning("[M]'s body convulses a bit, and then falls still once more.")) M.do_jitter_animation(10) return else - M.visible_message("[M]'s body starts convulsing!") + M.visible_message(span_warning("[M]'s body starts convulsing!")) M.notify_ghost_cloning(source = M) M.do_jitter_animation(10) addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 10), 40) //jitter immediately, then again after 4 and 8 seconds @@ -1115,7 +1115,7 @@ ..() /datum/reagent/medicine/modafinil/overdose_start(mob/living/M) - to_chat(M, "I feel awfully out of breath and jittery!") + to_chat(M, span_danger("I feel awfully out of breath and jittery!")) metabolization_rate = 0.025 * REAGENTS_METABOLISM // sets metabolism to 0.01 per tick on overdose /datum/reagent/medicine/modafinil/overdose_process(mob/living/M) @@ -1136,11 +1136,11 @@ if(prob(50)) M.losebreath++ if(prob(20)) - to_chat(M, "I have a sudden fit!") + to_chat(M, span_danger("I have a sudden fit!")) M.emote("moan") M.Paralyze(20, 1, 0) // you should be in a bad spot at this point unless epipen has been used if(81) - to_chat(M, "I feel too exhausted to continue!") // at this point you will eventually die unless you get charcoal + to_chat(M, span_danger("I feel too exhausted to continue!")) // at this point you will eventually die unless you get charcoal M.adjustOxyLoss(0.1*REM, 0) M.adjustStaminaLoss(0.1*REM, 0) if(82 to INFINITY) @@ -1335,7 +1335,7 @@ if(prob(30) && iscarbon(M)) var/obj/item/I = M.get_active_held_item() if(I && M.dropItemToGround(I)) - to_chat(M, "My hands spaz out and you drop what you were holding!") + to_chat(M, span_notice("My hands spaz out and you drop what you were holding!")) if(prob(33)) M.losebreath++ M.adjustOxyLoss(1, 0) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 73b11e24b..fd1abdabb 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -289,7 +289,7 @@ /datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume) if(iscultist(M)) - to_chat(M, "A vile holiness begins to spread its shining tendrils through my mind, purging the Geometer of Blood's influence!") + to_chat(M, span_danger("A vile holiness begins to spread its shining tendrils through my mind, purging the Geometer of Blood's influence!")) ..() /datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M) @@ -303,7 +303,7 @@ M.jitteriness = min(M.jitteriness+4,10) if(iscultist(M)) for(var/datum/action/innate/cult/blood_magic/BM in M.actions) - to_chat(M, "My blood rites falter as holy water scours my body!") + to_chat(M, span_cultlarge("My blood rites falter as holy water scours my body!")) for(var/datum/action/innate/cult/blood_spell/BS in BM.spells) qdel(BS) if(data >= 25) // 10 units, 45 seconds @ metabolism 0.4 units & tick rate 1.8 sec @@ -314,7 +314,7 @@ if(iscultist(M) && prob(20)) M.say(pick("Av'te Nar'Sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","R'ge Na'sie","Diabo us Vo'iscum","Eld' Mon Nobis"), forced = "holy water") if(prob(10)) - M.visible_message("[M] starts having a seizure!", "I have a seizure!") + M.visible_message(span_danger("[M] starts having a seizure!"), span_danger("I have a seizure!")) M.Unconscious(120) to_chat(M, "[pick("Your blood is my bond - you are nothing without it", "Do not forget my place", \ "All that power, and you still fail?", "If you cannot scour this poison, I shall scour my meager life!")].") @@ -501,7 +501,7 @@ if(method == INGEST) if(show_message) - to_chat(M, "That tasted horrible.") + to_chat(M, span_notice("That tasted horrible.")) ..() @@ -569,13 +569,13 @@ for(var/i in mutationtexts) if(mutationtexts[i] == filter) pick_ur_fav += i - to_chat(H, "[pick(pick_ur_fav)]") + to_chat(H, span_warning("[pick(pick_ur_fav)]")) if(current_cycle >= cycles_to_turn) var/datum/species/species_type = race H.set_species(species_type) H.reagents.del_reagent(type) - to_chat(H, "You've become \a [lowertext(initial(species_type.name))]!") + to_chat(H, span_warning("You've become \a [lowertext(initial(species_type.name))]!")) ..() /datum/reagent/mutationtoxin/classic //The one from plasma on green slimes @@ -627,7 +627,7 @@ /datum/reagent/mutationtoxin/jelly/on_mob_life(mob/living/carbon/human/H) if(isjellyperson(H)) - to_chat(H, "My jelly shifts and morphs, turning you into another subspecies!") + to_chat(H, span_warning("My jelly shifts and morphs, turning you into another subspecies!")) var/species_type = pick(subtypesof(/datum/species/jelly)) H.set_species(species_type) H.reagents.del_reagent(type) @@ -636,7 +636,7 @@ var/datum/species/species_type = pick(subtypesof(race)) H.set_species(species_type) H.reagents.del_reagent(type) - to_chat(H, "You've become \a [initial(species_type.name)]!") + to_chat(H, span_warning("You've become \a [initial(species_type.name)]!")) return TRUE return ..() @@ -713,7 +713,7 @@ ..() if (!istype(H)) return - to_chat(H, "I grit my teeth in pain as my body rapidly mutates!") + to_chat(H, span_warning("I grit my teeth in pain as my body rapidly mutates!")) H.visible_message("[H] suddenly transforms!") randomize_human(H) @@ -994,7 +994,7 @@ /datum/reagent/bluespace/on_mob_life(mob/living/carbon/M) if(current_cycle > 10 && prob(15)) - to_chat(M, "I feel unstable...") + to_chat(M, span_warning("I feel unstable...")) M.Jitter(2) current_cycle = 1 addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living, bluespace_shuffle)), 30) @@ -2039,7 +2039,7 @@ var/dread = pick("Something is moving in my stomach...", \ "A wet growl echoes from my stomach...", \ "For a moment you feel like my surroundings are moving, but it's my stomach...") - to_chat(C, "[dread]") + to_chat(C, span_danger("[dread]")) yuck_cycle = current_cycle else var/yuck_cycles = current_cycle - yuck_cycle diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index bfa948135..2fc66ac18 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -125,7 +125,7 @@ /datum/reagent/toxin/slimejelly/on_mob_life(mob/living/carbon/M) if(prob(10)) - to_chat(M, "My insides are burning!") + to_chat(M, span_danger("My insides are burning!")) M.adjustToxLoss(rand(20,60)*REM, 0) . = 1 else if(prob(40)) @@ -399,7 +399,7 @@ if(prob(50)) switch(pick(1, 2, 3, 4)) if(1) - to_chat(M, "I can barely see!") + to_chat(M, span_danger("I can barely see!")) M.blur_eyes(3) if(2) M.emote("cough") @@ -407,7 +407,7 @@ M.emote("sneeze") if(4) if(prob(75)) - to_chat(M, "I scratch at an itch.") + to_chat(M, span_danger("I scratch at an itch.")) M.adjustBruteLoss(2*REM, 0) . = 1 ..() @@ -523,15 +523,15 @@ /datum/reagent/toxin/itching_powder/on_mob_life(mob/living/carbon/M) if(prob(15)) - to_chat(M, "I scratch at my head.") + to_chat(M, span_danger("I scratch at my head.")) M.adjustBruteLoss(0.2*REM, 0) . = 1 if(prob(15)) - to_chat(M, "I scratch at my leg.") + to_chat(M, span_danger("I scratch at my leg.")) M.adjustBruteLoss(0.2*REM, 0) . = 1 if(prob(15)) - to_chat(M, "I scratch at my arm.") + to_chat(M, span_danger("I scratch at my arm.")) M.adjustBruteLoss(0.2*REM, 0) . = 1 if(prob(3)) @@ -564,7 +564,7 @@ if(!C.undergoing_cardiac_arrest() && C.can_heartattack()) C.set_heartattack(TRUE) if(C.stat == CONSCIOUS) - C.visible_message("[C] clutches at [C.p_their()] chest as if [C.p_their()] heart stopped!") + C.visible_message(span_danger("[C] clutches at [C.p_their()] chest as if [C.p_their()] heart stopped!")) else C.losebreath += 10 C.adjustOxyLoss(rand(5,25), 0) @@ -686,7 +686,7 @@ if(current_cycle >=33 && prob(15)) C.spew_organ() C.vomit(0, TRUE, TRUE, 4) - to_chat(C, "I feel something lumpy come up as you vomit.") + to_chat(C, span_danger("I feel something lumpy come up as you vomit.")) /datum/reagent/toxin/curare name = "Curare" @@ -883,7 +883,7 @@ if(2) M.emote("me", 1, pick("oofs silently.", "looks like their bones hurt.", "grimaces, as though their bones hurt.")) if(3) - to_chat(M, "My bones hurt!") + to_chat(M, span_warning("My bones hurt!")) return ..() /datum/reagent/toxin/bonehurtingjuice/overdose_process(mob/living/carbon/M) @@ -892,11 +892,11 @@ var/obj/item/bodypart/bp = M.get_bodypart(selected_part) if(bp) playsound(M, get_sfx("desceration"), 50, TRUE, -1) - M.visible_message("[M]'s bones hurt too much!!", "My bones hurt too much!!") + M.visible_message(span_warning("[M]'s bones hurt too much!!"), span_danger("My bones hurt too much!!")) M.say("OOF!!", forced = /datum/reagent/toxin/bonehurtingjuice) bp.receive_damage(0, 0, 200) else //SUCH A LUST FOR REVENGE!!! - to_chat(M, "A phantom limb hurts!") + to_chat(M, span_warning("A phantom limb hurts!")) M.say("Why are we still here, just to suffer?", forced = /datum/reagent/toxin/bonehurtingjuice) return ..() @@ -914,6 +914,6 @@ M.confused = M.dizziness //add a tertiary effect here if this is isn't an effective poison. if(current_cycle >= 12 && prob(8)) var/tox_message = pick("You feel my heart spasm in my chest.", "You feel faint.","You feel you need to catch my breath.","You feel a prickle of pain in my chest.") - to_chat(M, "[tox_message]") + to_chat(M, span_notice("[tox_message]")) . = 1 ..() diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 071d8682e..9bb82e952 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -354,7 +354,7 @@ mob_react = FALSE /datum/chemical_reaction/foam/on_reaction(datum/reagents/holder, created_volume) - holder.create_foam(/datum/effect_system/foam_spread,2*created_volume,notification="The solution spews out foam!") + holder.create_foam(/datum/effect_system/foam_spread,2*created_volume,notification=span_danger("The solution spews out foam!")) /datum/chemical_reaction/metalfoam name = "Metal Foam" @@ -363,7 +363,7 @@ mob_react = FALSE /datum/chemical_reaction/metalfoam/on_reaction(datum/reagents/holder, created_volume) - holder.create_foam(/datum/effect_system/foam_spread/metal,5*created_volume,1,"The solution spews out a metallic foam!") + holder.create_foam(/datum/effect_system/foam_spread/metal,5*created_volume,1,span_danger("The solution spews out a metallic foam!")) /datum/chemical_reaction/smart_foam name = "Smart Metal Foam" @@ -372,7 +372,7 @@ mob_react = TRUE /datum/chemical_reaction/smart_foam/on_reaction(datum/reagents/holder, created_volume) - holder.create_foam(/datum/effect_system/foam_spread/metal/smart,5*created_volume,1,"The solution spews out metallic foam!") + holder.create_foam(/datum/effect_system/foam_spread/metal/smart,5*created_volume,1,span_danger("The solution spews out metallic foam!")) /datum/chemical_reaction/ironfoam name = "Iron Foam" @@ -381,7 +381,7 @@ mob_react = FALSE /datum/chemical_reaction/ironfoam/on_reaction(datum/reagents/holder, created_volume) - holder.create_foam(/datum/effect_system/foam_spread/metal,5*created_volume,2,"The solution spews out a metallic foam!") + holder.create_foam(/datum/effect_system/foam_spread/metal,5*created_volume,2,span_danger("The solution spews out a metallic foam!")) /datum/chemical_reaction/foaming_agent name = "Foaming Agent" diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 61edf8ca3..2fddca6a0 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -159,14 +159,14 @@ deity = GLOB.deity else deity = "Christ" - to_chat(R, "The power of [deity] compels you!") + to_chat(R, span_danger("The power of [deity] compels you!")) R.stun(20) R.reveal(100) R.adjustHealth(50) sleep(20) for(var/mob/living/carbon/C in get_hearers_in_view(round(created_volume/48,1),get_turf(holder.my_atom))) if(iscultist(C)) - to_chat(C, "The divine explosion sears you!") + to_chat(C, span_danger("The divine explosion sears you!")) C.Paralyze(40) C.adjust_fire_stacks(5) C.IgniteMob() @@ -186,7 +186,7 @@ required_temp = 474 strengthdiv = 6 modifier = 1 - mix_message = "Sparks start flying around the gunpowder!" + mix_message = span_boldannounce("Sparks start flying around the gunpowder!") /datum/chemical_reaction/reagent_explosion/gunpowder_explosion/on_reaction(datum/reagents/holder, created_volume) sleep(rand(50,100)) @@ -500,7 +500,7 @@ id = /datum/reagent/teslium results = list(/datum/reagent/teslium = 3) required_reagents = list(/datum/reagent/stable_plasma = 1, /datum/reagent/silver = 1, /datum/reagent/gunpowder = 1) - mix_message = "A jet of sparks flies from the mixture as it merges into a flickering slurry." + mix_message = span_danger("A jet of sparks flies from the mixture as it merges into a flickering slurry.") required_temp = 400 /datum/chemical_reaction/energized_jelly @@ -508,7 +508,7 @@ id = /datum/reagent/teslium/energized_jelly results = list(/datum/reagent/teslium/energized_jelly = 2) required_reagents = list(/datum/reagent/toxin/slimejelly = 1, /datum/reagent/teslium = 1) - mix_message = "The slime jelly starts glowing intermittently." + mix_message = span_danger("The slime jelly starts glowing intermittently.") /datum/chemical_reaction/reagent_explosion/teslium_lightning name = "Teslium Destabilization" @@ -516,7 +516,7 @@ required_reagents = list(/datum/reagent/teslium = 1, /datum/reagent/water = 1) strengthdiv = 100 modifier = -100 - mix_message = "The teslium starts to spark as electricity arcs away from it!" + mix_message = span_boldannounce("The teslium starts to spark as electricity arcs away from it!") mix_sound = 'sound/blank.ogg' var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE | TESLA_MOB_STUN diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index f2df3fc5c..71a45fecd 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -22,7 +22,7 @@ /datum/chemical_reaction/slime/slimespawn/on_reaction(datum/reagents/holder) var/mob/living/simple_animal/slime/S = new(get_turf(holder.my_atom), "grey") - S.visible_message("Infused with plasma, the core begins to quiver and grow, and a new baby slime emerges from it!") + S.visible_message(span_danger("Infused with plasma, the core begins to quiver and grow, and a new baby slime emerges from it!")) ..() /datum/chemical_reaction/slime/slimeinaprov @@ -115,7 +115,7 @@ M.qdel_timer = addtimer(CALLBACK(src, PROC_REF(delete_extract), holder), 55, TIMER_STOPPABLE) /datum/chemical_reaction/slime/slimemobspawn/proc/summon_mobs(datum/reagents/holder, turf/T) - T.visible_message("The slime extract begins to vibrate violently!") + T.visible_message(span_danger("The slime extract begins to vibrate violently!")) addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 5, "Gold Slime", HOSTILE_SPAWN), 50) /datum/chemical_reaction/slime/slimemobspawn/lesser @@ -124,7 +124,7 @@ required_reagents = list(/datum/reagent/blood = 1) /datum/chemical_reaction/slime/slimemobspawn/lesser/summon_mobs(datum/reagents/holder, turf/T) - T.visible_message("The slime extract begins to vibrate violently!") + T.visible_message(span_danger("The slime extract begins to vibrate violently!")) addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 3, "Lesser Gold Slime", HOSTILE_SPAWN, "neutral"), 50) /datum/chemical_reaction/slime/slimemobspawn/friendly @@ -133,7 +133,7 @@ required_reagents = list(/datum/reagent/water = 1) /datum/chemical_reaction/slime/slimemobspawn/friendly/summon_mobs(datum/reagents/holder, turf/T) - T.visible_message("The slime extract begins to vibrate adorably!") + T.visible_message(span_danger("The slime extract begins to vibrate adorably!")) addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 1, "Friendly Gold Slime", FRIENDLY_SPAWN, "neutral"), 50) /datum/chemical_reaction/slime/slimemobspawn/spider @@ -142,7 +142,7 @@ required_reagents = list(/datum/reagent/spider_extract = 1) /datum/chemical_reaction/slime/slimemobspawn/spider/summon_mobs(datum/reagents/holder, turf/T) - T.visible_message("The slime extract begins to vibrate crikey-ingly!") + T.visible_message(span_danger("The slime extract begins to vibrate crikey-ingly!")) addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 3, "Traitor Spider Slime", /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife, "neutral", FALSE), 50) @@ -215,7 +215,7 @@ required_other = TRUE /datum/chemical_reaction/slime/slimefoam/on_reaction(datum/reagents/holder) - holder.create_foam(/datum/effect_system/foam_spread,80, "[src] spews out foam!") + holder.create_foam(/datum/effect_system/foam_spread,80, span_danger("[src] spews out foam!")) //Dark Blue /datum/chemical_reaction/slime/slimefreeze @@ -228,7 +228,7 @@ /datum/chemical_reaction/slime/slimefreeze/on_reaction(datum/reagents/holder) var/turf/T = get_turf(holder.my_atom) - T.visible_message("The slime extract starts to feel extremely cold!") + T.visible_message(span_danger("The slime extract starts to feel extremely cold!")) addtimer(CALLBACK(src, PROC_REF(freeze), holder), 50) var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) @@ -272,7 +272,7 @@ /datum/chemical_reaction/slime/slimefire/on_reaction(datum/reagents/holder) var/turf/T = get_turf(holder.my_atom) - T.visible_message("The slime extract begins to vibrate adorably!") + T.visible_message(span_danger("The slime extract begins to vibrate adorably!")) addtimer(CALLBACK(src, PROC_REF(slime_burn), holder), 50) var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) @@ -326,7 +326,7 @@ /datum/chemical_reaction/slime/slimeglow/on_reaction(datum/reagents/holder) var/turf/T = get_turf(holder.my_atom) - T.visible_message("The slime begins to emit a soft light. Squeezing it will cause it to grow brightly.") + T.visible_message(span_danger("The slime begins to emit a soft light. Squeezing it will cause it to grow brightly.")) new /obj/item/flashlight/slime(T) ..() @@ -384,12 +384,12 @@ /datum/chemical_reaction/slime/slimebloodlust/on_reaction(datum/reagents/holder) for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(holder.my_atom), null)) if(slime.docile) //Undoes docility, but doesn't make rabid. - slime.visible_message("[slime] forgets its training, becoming wild once again!") + slime.visible_message(span_danger("[slime] forgets its training, becoming wild once again!")) slime.docile = FALSE slime.update_name() continue slime.rabid = 1 - slime.visible_message("The [slime] is driven into a frenzy!") + slime.visible_message(span_danger("The [slime] is driven into a frenzy!")) ..() /datum/chemical_reaction/slime/slimespeed @@ -453,7 +453,7 @@ touch_msg = "[ADMIN_LOOKUPFLW(toucher)]." message_admins("Slime Explosion reaction started at [ADMIN_VERBOSEJMP(T)]. Last Fingerprint: [touch_msg]") log_game("Slime Explosion reaction started at [AREACOORD(T)]. Last Fingerprint: [lastkey ? lastkey : "N/A"].") - T.visible_message("The slime extract begins to vibrate violently !") + T.visible_message(span_danger("The slime extract begins to vibrate violently !")) addtimer(CALLBACK(src, PROC_REF(boom), holder), 50) var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) @@ -531,7 +531,7 @@ /datum/chemical_reaction/slime/slimecrystal/on_reaction(datum/reagents/holder, created_volume) var/obj/item/stack/ore/bluespace_crystal/BC = new (get_turf(holder.my_atom)) - BC.visible_message("The [BC.name] appears out of thin air!") + BC.visible_message(span_notice("The [BC.name] appears out of thin air!")) ..() /datum/chemical_reaction/slime/slimeradio @@ -648,13 +648,13 @@ /datum/chemical_reaction/slime/slimeRNG/on_reaction(datum/reagents/holder, created_volume) if(created_volume >= 5) var/obj/item/grenade/clusterbuster/slime/S = new (get_turf(holder.my_atom)) - S.visible_message("Infused with plasma, the core begins to expand uncontrollably!") + S.visible_message(span_danger("Infused with plasma, the core begins to expand uncontrollably!")) S.icon_state = "[S.base_state]_active" S.active = TRUE addtimer(CALLBACK(S, TYPE_PROC_REF(/obj/item/grenade, prime)), rand(15,60)) else var/mob/living/simple_animal/slime/random/S = new (get_turf(holder.my_atom)) - S.visible_message("Infused with plasma, the core begins to quiver and grow, and a new baby slime emerges from it!") + S.visible_message(span_danger("Infused with plasma, the core begins to quiver and grow, and a new baby slime emerges from it!")) ..() /datum/chemical_reaction/slime/slimebomb @@ -667,7 +667,7 @@ /datum/chemical_reaction/slime/slimebomb/on_reaction(datum/reagents/holder, created_volume) var/turf/T = get_turf(holder.my_atom) var/obj/item/grenade/clusterbuster/slime/volatile/S = new (T) - S.visible_message("Infused with slime jelly, the core begins to expand uncontrollably!") + S.visible_message(span_danger("Infused with slime jelly, the core begins to expand uncontrollably!")) S.icon_state = "[S.base_state]_active" S.active = TRUE addtimer(CALLBACK(S, TYPE_PROC_REF(/obj/item/grenade, prime)), rand(15,60)) diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm index 2e64c5b41..29ae71d88 100644 --- a/code/modules/reagents/chemistry/recipes/toxins.dm +++ b/code/modules/reagents/chemistry/recipes/toxins.dm @@ -99,14 +99,14 @@ id = "Heparin" results = list(/datum/reagent/toxin/heparin = 4) required_reagents = list(/datum/reagent/toxin/formaldehyde = 1, /datum/reagent/sodium = 1, /datum/reagent/chlorine = 1, /datum/reagent/lithium = 1) - mix_message = "The mixture thins and loses all color." + mix_message = span_danger("The mixture thins and loses all color.") /datum/chemical_reaction/rotatium name = "Rotatium" id = "Rotatium" results = list(/datum/reagent/toxin/rotatium = 3) required_reagents = list(/datum/reagent/toxin/mindbreaker = 1, /datum/reagent/teslium = 1, /datum/reagent/toxin/fentanyl = 1) - mix_message = "After sparks, fire, and the smell of mindbreaker, the mix is constantly spinning with no stop in sight." + mix_message = span_danger("After sparks, fire, and the smell of mindbreaker, the mix is constantly spinning with no stop in sight.") /datum/chemical_reaction/anacea name = "Anacea" @@ -125,4 +125,4 @@ id = /datum/reagent/toxin/bonehurtingjuice results = list(/datum/reagent/toxin/bonehurtingjuice = 5) required_reagents = list(/datum/reagent/toxin/mutagen = 1, /datum/reagent/toxin/itching_powder = 3, /datum/reagent/consumable/milk = 1) - mix_message = "The mixture suddenly becomes clear and looks a lot like water. You feel a strong urge to drink it." + mix_message = span_danger("The mixture suddenly becomes clear and looks a lot like water. You feel a strong urge to drink it.") diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index a48ac3fdb..b3ea55fe8 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -48,7 +48,7 @@ amount_per_transfer_from_this = possible_transfer_amounts[i+1] else amount_per_transfer_from_this = possible_transfer_amounts[1] - to_chat(user, "[src]'s transfer amount is now [amount_per_transfer_from_this] units.") + to_chat(user, span_notice("[src]'s transfer amount is now [amount_per_transfer_from_this] units.")) return*/ /obj/item/reagent_containers/attack(mob/M, mob/user, def_zone) @@ -66,12 +66,12 @@ if(C != user) if(C.mobility_flags & MOBILITY_STAND) if(get_dir(eater, user) != eater.dir) - to_chat(user, "I must stand in front of [C.p_them()].") + to_chat(user, span_warning("I must stand in front of [C.p_them()].")) return 0 if(covered) if(!silent) var/who = (isnull(user) || eater == user) ? "your" : "[eater.p_their()]" - to_chat(user, "I have to remove [who] [covered] first!") + to_chat(user, span_warning("I have to remove [who] [covered] first!")) return 0 return 1 @@ -104,8 +104,8 @@ reagents.total_volume *= rand(5,10) * 0.1 //Not all of it makes contact with the target var/mob/M = target var/R - target.visible_message("[M] has been splashed with something!", \ - "[M] has been splashed with something!") + target.visible_message(span_danger("[M] has been splashed with something!"), \ + span_danger("[M] has been splashed with something!")) for(var/datum/reagent/A in reagents.reagent_list) R += "[A.type] ([num2text(A.volume)])," @@ -114,7 +114,7 @@ reagents.reaction(target, TOUCH) else if(bartender_check(target) && thrown) - visible_message("[src] lands onto the [target.name] without spilling a single drop.") + visible_message(span_notice("[src] lands onto the [target.name] without spilling a single drop.")) return else @@ -122,7 +122,7 @@ log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]", "in [AREACOORD(target)]") log_game("[key_name(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] in [AREACOORD(target)].") message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] in [ADMIN_VERBOSEJMP(target)].") - visible_message("[src] spills its contents all over [target].") + visible_message(span_notice("[src] spills its contents all over [target].")) reagents.reaction(target, TOUCH) if(QDELETED(src)) return diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 8b93d7516..e875feacc 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -71,7 +71,7 @@ /obj/item/reagent_containers/blood/attackby(obj/item/I, mob/user, params) if (istype(I, /obj/item/pen) || istype(I, /obj/item/toy/crayon)) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on the label of [src]!") + to_chat(user, span_notice("I scribble illegibly on the label of [src]!")) return var/t = stripped_input(user, "What would you like to label the blood pack?", name, null, 53) if(!user.canUseTopic(src, BE_CLOSE)) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 87758f966..a35ed64d2 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -106,16 +106,16 @@ Borg Hypospray /obj/item/reagent_containers/borghypo/attack(mob/living/carbon/M, mob/user) var/datum/reagents/R = reagent_list[mode] if(!R.total_volume) - to_chat(user, "The injector is empty!") + to_chat(user, span_warning("The injector is empty!")) return if(!istype(M)) return if(R.total_volume && M.can_inject(user, 1, user.zone_selected,bypass_protection)) - to_chat(M, "I feel a tiny prick!") - to_chat(user, "I inject [M] with the injector.") + to_chat(M, span_warning("I feel a tiny prick!")) + to_chat(user, span_notice("I inject [M] with the injector.")) if(M.reagents) var/trans = R.trans_to(M, amount_per_transfer_from_this, transfered_by = user, method = INJECT) - to_chat(user, "[trans] unit\s injected. [R.total_volume] unit\s remaining.") + to_chat(user, span_notice("[trans] unit\s injected. [R.total_volume] unit\s remaining.")) var/list/injected = list() for(var/datum/reagent/RG in R.reagent_list) @@ -129,7 +129,7 @@ Borg Hypospray mode = chosen_reagent playsound(loc, 'sound/blank.ogg', 50, FALSE) var/datum/reagent/R = GLOB.chemical_reagents_list[reagent_ids[mode]] - to_chat(user, "[src] is now dispensing '[R.name]'.") + to_chat(user, span_notice("[src] is now dispensing '[R.name]'.")) return /obj/item/reagent_containers/borghypo/examine(mob/user) @@ -137,7 +137,7 @@ Borg Hypospray . += DescribeContents() //Because using the standardized reagents datum was just too cool for whatever fuckwit wrote this var/datum/reagent/loaded = modes[mode] . += "Currently loaded: [initial(loaded.name)]. [initial(loaded.description)]" - . += "Alt+Click to change transfer amount. Currently set to [amount_per_transfer_from_this == 5 ? "dose normally (5u)" : "microdose (2u)"]." + . += span_notice("Alt+Click to change transfer amount. Currently set to [amount_per_transfer_from_this == 5 ? "dose normally (5u)" : "microdose (2u)"].") /obj/item/reagent_containers/borghypo/proc/DescribeContents() . = list() @@ -146,11 +146,11 @@ Borg Hypospray for(var/datum/reagents/RS in reagent_list) var/datum/reagent/R = locate() in RS.reagent_list if(R) - . += "It currently has [R.volume] unit\s of [R.name] stored." + . += span_notice("It currently has [R.volume] unit\s of [R.name] stored.") empty = FALSE if(empty) - . += "It is currently empty! Allow some time for the internal synthesizer to produce more." + . += span_warning("It is currently empty! Allow some time for the internal synthesizer to produce more.") /obj/item/reagent_containers/borghypo/AltClick(mob/living/user) . = ..() @@ -160,7 +160,7 @@ Borg Hypospray amount_per_transfer_from_this = 2 else amount_per_transfer_from_this = 5 - to_chat(user,"[src] is now set to [amount_per_transfer_from_this == 5 ? "dose normally" : "microdose"].") + to_chat(user,span_notice("[src] is now set to [amount_per_transfer_from_this == 5 ? "dose normally" : "microdose"].")) /obj/item/reagent_containers/borghypo/hacked icon_state = "borghypo_s" @@ -240,23 +240,23 @@ Borg Shaker else if(target.is_refillable()) var/datum/reagents/R = reagent_list[mode] if(!R.total_volume) - to_chat(user, "[src] is currently out of this ingredient! Please allow some time for the synthesizer to produce more.") + to_chat(user, span_warning("[src] is currently out of this ingredient! Please allow some time for the synthesizer to produce more.")) return if(target.reagents.total_volume >= target.reagents.maximum_volume) - to_chat(user, "[target] is full.") + to_chat(user, span_notice("[target] is full.")) return var/trans = R.trans_to(target, amount_per_transfer_from_this, transfered_by = user) - to_chat(user, "I transfer [trans] unit\s of the solution to [target].") + to_chat(user, span_notice("I transfer [trans] unit\s of the solution to [target].")) /obj/item/reagent_containers/borghypo/borgshaker/DescribeContents() var/datum/reagents/RS = reagent_list[mode] var/datum/reagent/R = locate() in RS.reagent_list if(R) - return "It currently has [R.volume] unit\s of [R.name] stored." + return span_notice("It currently has [R.volume] unit\s of [R.name] stored.") else - return "It is currently empty! Please allow some time for the synthesizer to produce more." + return span_warning("It is currently empty! Please allow some time for the synthesizer to produce more.") /obj/item/reagent_containers/borghypo/borgshaker/hacked name = "cyborg shaker" diff --git a/code/modules/reagents/reagent_containers/chem_pack.dm b/code/modules/reagents/reagent_containers/chem_pack.dm index 3008cc57c..d1f5fa4a0 100644 --- a/code/modules/reagents/reagent_containers/chem_pack.dm +++ b/code/modules/reagents/reagent_containers/chem_pack.dm @@ -14,7 +14,7 @@ /obj/item/reagent_containers/chem_pack/AltClick(mob/living/user) if(user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY) && !sealed) if(iscarbon(user) && (HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))) - to_chat(user, "Uh... whoops! You accidentally spill the content of the bag onto myself.") + to_chat(user, span_warning("Uh... whoops! You accidentally spill the content of the bag onto myself.")) SplashReagents(user) return @@ -23,14 +23,14 @@ reagents.flags = reagent_flags spillable = FALSE sealed = TRUE - to_chat(user, "I seal the bag.") + to_chat(user, span_notice("I seal the bag.")) /obj/item/reagent_containers/chem_pack/examine() . = ..() if(sealed) - . += "The bag is sealed shut." + . += span_notice("The bag is sealed shut.") else - . += "Alt-click to seal it." + . += span_notice("Alt-click to seal it.") obj/item/reagent_containers/chem_pack/attack_self(mob/user) diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 145742414..9bef2d049 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -17,11 +17,11 @@ if(reagents.total_volume > 0) if(target.reagents.total_volume >= target.reagents.maximum_volume) - to_chat(user, "[target] is full.") + to_chat(user, span_notice("[target] is full.")) return if(!target.is_injectable(user)) - to_chat(user, "I cannot transfer reagents to [target]!") + to_chat(user, span_warning("I cannot transfer reagents to [target]!")) return var/trans = 0 @@ -39,18 +39,18 @@ trans = reagents.trans_to(safe_thing, amount_per_transfer_from_this, transfered_by = user, method = TOUCH) - target.visible_message("[user] tries to squirt something into [target]'s eyes, but fails!", \ - "[user] tries to squirt something into your eyes, but fails!") + target.visible_message(span_danger("[user] tries to squirt something into [target]'s eyes, but fails!"), \ + span_danger("[user] tries to squirt something into your eyes, but fails!")) - to_chat(user, "I transfer [trans] unit\s of the solution.") + to_chat(user, span_notice("I transfer [trans] unit\s of the solution.")) update_icon() return else if(isalien(target)) //hiss-hiss has no eyes! - to_chat(target, "[target] does not seem to have any eyes!") + to_chat(target, span_danger("[target] does not seem to have any eyes!")) return - target.visible_message("[user] squirts something into [target]'s eyes!", \ - "[user] squirts something into your eyes!") + target.visible_message(span_danger("[user] squirts something into [target]'s eyes!"), \ + span_danger("[user] squirts something into your eyes!")) reagents.reaction(target, TOUCH, fraction) var/mob/M = target @@ -62,22 +62,22 @@ log_combat(user, M, "squirted", R) trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user) - to_chat(user, "I transfer [trans] unit\s of the solution.") + to_chat(user, span_notice("I transfer [trans] unit\s of the solution.")) update_icon() else if(!target.is_drawable(user, FALSE)) //No drawing from mobs here - to_chat(user, "I cannot directly remove reagents from [target]!") + to_chat(user, span_warning("I cannot directly remove reagents from [target]!")) return if(!target.reagents.total_volume) - to_chat(user, "[target] is empty!") + to_chat(user, span_warning("[target] is empty!")) return var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transfered_by = user) - to_chat(user, "I fill [src] with [trans] unit\s of the solution.") + to_chat(user, span_notice("I fill [src] with [trans] unit\s of the solution.")) update_icon() diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 1ff5b7921..39f909d82 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -45,12 +45,12 @@ return if(!reagents || !reagents.total_volume) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return if(user.used_intent.type == INTENT_SPLASH) var/R - M.visible_message("[user] splashes the contents of [src] onto [M]!", \ - "[user] splashes the contents of [src] onto you!") + M.visible_message(span_danger("[user] splashes the contents of [src] onto [M]!"), \ + span_danger("[user] splashes the contents of [src] onto you!")) if(reagents) for(var/datum/reagent/A in reagents.reagent_list) R += "[A] ([num2text(A.volume)])," @@ -66,17 +66,17 @@ if(!canconsume(M, user)) return if(M != user) - M.visible_message("[user] attempts to feed [M] something.", \ - "[user] attempts to feed you something.") + M.visible_message(span_danger("[user] attempts to feed [M] something."), \ + span_danger("[user] attempts to feed you something.")) if(!do_mob(user, M)) return if(!reagents || !reagents.total_volume) return // The drink might be empty after the delay, such as by spam-feeding - M.visible_message("[user] feeds [M] something.", \ - "[user] feeds you something.") + M.visible_message(span_danger("[user] feeds [M] something."), \ + span_danger("[user] feeds you something.")) log_combat(user, M, "fed", reagents.log_list()) else - to_chat(user, "I swallow a gulp of [src].") + to_chat(user, span_notice("I swallow a gulp of [src].")) addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, trans_to), M, min(amount_per_transfer_from_this,5), TRUE, TRUE, FALSE, user, FALSE, INGEST), 5) playsound(M.loc,pick(drinksounds), 100, TRUE) return @@ -93,14 +93,14 @@ if(target.is_refillable() && (user.used_intent.type == INTENT_POUR)) //Something like a glass. Player probably wants to transfer TO it. testing("attackobj2") if(!reagents.total_volume) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return if(target.reagents.holder_full()) - to_chat(user, "[target] is full.") + to_chat(user, span_warning("[target] is full.")) return - user.visible_message("[user] pours [src] into [target].", \ - "I pour [src] into [target].") + user.visible_message(span_notice("[user] pours [src] into [target]."), \ + span_notice("I pour [src] into [target].")) if(user.m_intent != MOVE_INTENT_SNEAK) if(poursounds) playsound(user.loc,pick(poursounds), 100, TRUE) @@ -119,17 +119,17 @@ if(target.is_drainable() && (user.used_intent.type == /datum/intent/fill)) //A dispenser. Transfer FROM it TO us. testing("attackobj3") if(!target.reagents.total_volume) - to_chat(user, "[target] is empty!") + to_chat(user, span_warning("[target] is empty!")) return if(reagents.holder_full()) - to_chat(user, "[src] is full.") + to_chat(user, span_warning("[src] is full.")) return if(user.m_intent != MOVE_INTENT_SNEAK) if(fillsounds) playsound(user.loc,pick(fillsounds), 100, TRUE) - user.visible_message("[user] fills [src] with [target].", \ - "I fill [src] with [target].") + user.visible_message(span_notice("[user] fills [src] with [target]."), \ + span_notice("I fill [src] with [target].")) for(var/i in 1 to 10) if(do_after(user, 8, target = target)) if(reagents.holder_full()) @@ -145,18 +145,18 @@ if(istype(target, /obj/machinery/crop)) if(!reagents.total_volume) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return var/obj/machinery/crop/C = target C.water = 100 reagents.clear_reagents() - user.visible_message("[user] waters [target].", \ - "I water [target].") + user.visible_message(span_notice("[user] waters [target]."), \ + span_notice("I water [target].")) return if(reagents.total_volume && user.used_intent.type == INTENT_SPLASH) - user.visible_message("[user] splashes the contents of [src] onto [target]!", \ - "I splash the contents of [src] onto [target].") + user.visible_message(span_danger("[user] splashes the contents of [src] onto [target]!"), \ + span_notice("I splash the contents of [src] onto [target].")) reagents.reaction(target, TOUCH) reagents.clear_reagents() return @@ -173,8 +173,8 @@ if(isturf(target)) if(reagents.total_volume && user.used_intent.type == INTENT_SPLASH) - user.visible_message("[user] splashes the contents of [src] onto [target]!", \ - "I splash the contents of [src] onto [target].") + user.visible_message(span_danger("[user] splashes the contents of [src] onto [target]!"), \ + span_notice("I splash the contents of [src] onto [target].")) reagents.reaction(target, TOUCH) reagents.clear_reagents() return @@ -183,15 +183,15 @@ var/hotness = I.get_temperature() if(hotness && reagents) reagents.expose_temperature(hotness) - to_chat(user, "I heat [name] with [I]!") + to_chat(user, span_notice("I heat [name] with [I]!")) if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs var/obj/item/reagent_containers/food/snacks/egg/E = I if(reagents) if(reagents.total_volume >= reagents.maximum_volume) - to_chat(user, "[src] is full.") + to_chat(user, span_notice("[src] is full.")) else - to_chat(user, "I break [E] in [src].") + to_chat(user, span_notice("I break [E] in [src].")) E.reagents.trans_to(src, E.reagents.total_volume, transfered_by = user) qdel(E) return @@ -355,12 +355,12 @@ if(!reagents.has_reagent(/datum/reagent/water, 5)) removereg = /datum/reagent/water/gross if(!reagents.has_reagent(/datum/reagent/water/gross, 5)) - to_chat(user, "No water to soak in.") + to_chat(user, span_warning("No water to soak in.")) return wash_atom(T) playsound(src, pick('sound/foley/waterwash (1).ogg','sound/foley/waterwash (2).ogg'), 100, FALSE) reagents.remove_reagent(removereg, 5) - user.visible_message("[user] soaks [T] in [src].") + user.visible_message(span_info("[user] soaks [T] in [src].")) return ..() @@ -390,7 +390,7 @@ ..() if (slot == SLOT_HEAD) if(reagents.total_volume) - to_chat(user, "[src]'s contents spill all over you!") + to_chat(user, span_danger("[src]'s contents spill all over you!")) reagents.reaction(user, TOUCH) reagents.clear_reagents() reagents.flags = NONE @@ -437,16 +437,16 @@ /obj/item/reagent_containers/glass/waterbottle/examine(mob/user) . = ..() if(cap_lost) - . += "The cap seems to be missing." + . += span_notice("The cap seems to be missing.") else if(cap_on) - . += "The cap is firmly on to prevent spilling. Alt-click to remove the cap." + . += span_notice("The cap is firmly on to prevent spilling. Alt-click to remove the cap.") else - . += "The cap has been taken off. Alt-click to put a cap on." + . += span_notice("The cap has been taken off. Alt-click to put a cap on.") /obj/item/reagent_containers/glass/waterbottle/AltClick(mob/user) . = ..() if(cap_lost) - to_chat(user, "The cap seems to be missing! Where did it go?") + to_chat(user, span_warning("The cap seems to be missing! Where did it go?")) return var/fumbled = HAS_TRAIT(user, TRAIT_CLUMSY) && prob(5) @@ -456,15 +456,15 @@ cut_overlay(cap_overlay, TRUE) animate(src, transform = null, time = 2, loop = 0) if(fumbled) - to_chat(user, "I fumble with [src]'s cap! The cap falls onto the ground and simply vanishes. Where the hell did it go?") + to_chat(user, span_warning("I fumble with [src]'s cap! The cap falls onto the ground and simply vanishes. Where the hell did it go?")) cap_lost = TRUE else - to_chat(user, "I remove the cap from [src].") + to_chat(user, span_notice("I remove the cap from [src].")) else cap_on = TRUE spillable = FALSE add_overlay(cap_overlay, TRUE) - to_chat(user, "I put the cap on [src].") + to_chat(user, span_notice("I put the cap on [src].")) update_icon() /obj/item/reagent_containers/glass/waterbottle/is_refillable() @@ -479,19 +479,19 @@ /obj/item/reagent_containers/glass/waterbottle/attack(mob/M, mob/user, obj/target) if(cap_on && reagents.total_volume && istype(M)) - to_chat(user, "I must remove the cap before you can do that!") + to_chat(user, span_warning("I must remove the cap before you can do that!")) return . = ..() /obj/item/reagent_containers/glass/waterbottle/afterattack(obj/target, mob/user, proximity) if(cap_on && (target.is_refillable() || target.is_drainable() || (reagents.total_volume && user.used_intent.type == INTENT_HARM))) - to_chat(user, "I must remove the cap before you can do that!") + to_chat(user, span_warning("I must remove the cap before you can do that!")) return else if(istype(target, /obj/item/reagent_containers/glass/waterbottle)) var/obj/item/reagent_containers/glass/waterbottle/WB = target if(WB.cap_on) - to_chat(user, "[WB] has a cap firmly twisted on!") + to_chat(user, span_warning("[WB] has a cap firmly twisted on!")) . = ..() // heehoo bottle flipping @@ -499,7 +499,7 @@ . = ..() if(cap_on && reagents.total_volume) if(prob(flip_chance)) // landed upright - src.visible_message("[src] lands upright!") + src.visible_message(span_notice("[src] lands upright!")) SEND_SIGNAL(throwingdatum.thrower, COMSIG_ADD_MOOD_EVENT, "bottle_flip", /datum/mood_event/bottle_flip) else // landed on it's side animate(src, transform = matrix(prob(50)? 90 : -90, MATRIX_ROTATE), time = 3, loop = 0) @@ -535,7 +535,7 @@ var/datum/reagent/random_reagent = get_random_reagent_id() list_reagents = list(random_reagent = 50) . = ..() - desc += "The writing reads '[random_reagent.name]'." + desc += span_notice("The writing reads '[random_reagent.name]'.") /obj/item/pestle name = "pestle" @@ -561,46 +561,46 @@ if(grinded) grinded.forceMove(drop_location()) grinded = null - to_chat(user, "I eject the item inside.") + to_chat(user, span_notice("I eject the item inside.")) /obj/item/reagent_containers/glass/mortar/attackby(obj/item/I, mob/living/carbon/human/user) ..() if(istype(I,/obj/item/pestle)) if(grinded) - to_chat(user, "I start grinding...") + to_chat(user, span_notice("I start grinding...")) if((do_after(user, 25, target = src)) && grinded) if(grinded.juice_results) //prioritize juicing grinded.on_juice() reagents.add_reagent_list(grinded.juice_results) - to_chat(user, "I juice [grinded] into a fine liquid.") + to_chat(user, span_notice("I juice [grinded] into a fine liquid.")) if(grinded.reagents) //food and pills grinded.reagents.trans_to(src, grinded.reagents.total_volume, transfered_by = user) QDEL_NULL(grinded) return grinded.on_grind() reagents.add_reagent_list(grinded.grind_results) - to_chat(user, "I break [grinded] into powder.") + to_chat(user, span_notice("I break [grinded] into powder.")) QDEL_NULL(grinded) return return else - to_chat(user, "There is nothing to grind!") + to_chat(user, span_warning("There is nothing to grind!")) return if(grinded) - to_chat(user, "There is something inside already!") + to_chat(user, span_warning("There is something inside already!")) return if(istype(I ,/obj/item/reagent_containers/glass)) if(user.used_intent.type == INTENT_POUR) //Something like a glass. Player probably wants to transfer TO it. testing("attackobj2") if(!I.reagents.total_volume) - to_chat(user, "[I] is empty!") + to_chat(user, span_warning("[I] is empty!")) return if(reagents.holder_full()) - to_chat(user, "[src] is full.") + to_chat(user, span_warning("[src] is full.")) return - user.visible_message("[user] pours [I] into [src].", \ - "I pour I] into [src].") + user.visible_message(span_notice("[user] pours [I] into [src]."), \ + span_notice("I pour I] into [src].")) if(user.m_intent != MOVE_INTENT_SNEAK) if(poursounds) playsound(user.loc,pick(poursounds), 100, TRUE) @@ -619,17 +619,17 @@ if(is_drainable() && (user.used_intent.type == /datum/intent/fill)) //A dispenser. Transfer FROM it TO us. testing("attackobj3") if(!reagents.total_volume) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return if(I.reagents.holder_full()) - to_chat(user, "[I] is full.") + to_chat(user, span_warning("[I] is full.")) return if(user.m_intent != MOVE_INTENT_SNEAK) if(fillsounds) playsound(user.loc,pick(fillsounds), 100, TRUE) - user.visible_message("[user] fills [I] with [src].", \ - "I fill [I] with [src].") + user.visible_message(span_notice("[user] fills [I] with [src]."), \ + span_notice("I fill [I] with [src].")) for(var/i in 1 to 10) if(do_after(user, 8, target = src)) if(I.reagents.holder_full()) @@ -645,7 +645,7 @@ I.forceMove(src) grinded = I return - to_chat(user, "I can't grind this!") + to_chat(user, span_warning("I can't grind this!")) /obj/item/reagent_containers/glass/saline name = "saline canister" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 79acedb65..cdc89b4c8 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -24,7 +24,7 @@ ///Handles all injection checks, injection and logging. /obj/item/reagent_containers/hypospray/proc/inject(mob/living/M, mob/user) if(!reagents.total_volume) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return FALSE if(!iscarbon(M)) return FALSE @@ -37,8 +37,8 @@ log_combat(user, M, "attempted to inject", src, "([contained])") if(reagents.total_volume && (ignore_flags || M.can_inject(user, 1))) // Ignore flag should be checked first or there will be an error message. - to_chat(M, "I feel a tiny prick!") - to_chat(user, "I inject [M] with [src].") + to_chat(M, span_warning("I feel a tiny prick!")) + to_chat(user, span_notice("I inject [M] with [src].")) var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1) reagents.reaction(M, INJECT, fraction) @@ -48,7 +48,7 @@ trans = reagents.trans_to(M, amount_per_transfer_from_this, transfered_by = user) else trans = reagents.copy_to(M, amount_per_transfer_from_this) - to_chat(user, "[trans] unit\s injected. [reagents.total_volume] unit\s remaining in [src].") + to_chat(user, span_notice("[trans] unit\s injected. [reagents.total_volume] unit\s remaining in [src].")) log_combat(user, M, "injected", src, "([contained])") return TRUE return FALSE @@ -111,7 +111,7 @@ custom_price = 40 /obj/item/reagent_containers/hypospray/medipen/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins to choke on \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins to choke on \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return OXYLOSS//ironic. he could save others from oxyloss, but not himself. /obj/item/reagent_containers/hypospray/medipen/inject(mob/living/M, mob/user) @@ -134,9 +134,9 @@ /obj/item/reagent_containers/hypospray/medipen/examine() . = ..() if(reagents && reagents.reagent_list.len) - . += "It is currently loaded." + . += span_notice("It is currently loaded.") else - . += "It is spent." + . += span_notice("It is spent.") /obj/item/reagent_containers/hypospray/medipen/stimpack //goliath kiting name = "stimpack medipen" diff --git a/code/modules/reagents/reagent_containers/medigel.dm b/code/modules/reagents/reagent_containers/medigel.dm index 1469ace39..476d4724d 100644 --- a/code/modules/reagents/reagent_containers/medigel.dm +++ b/code/modules/reagents/reagent_containers/medigel.dm @@ -30,32 +30,32 @@ amount_per_transfer_from_this = squirt_amount else amount_per_transfer_from_this = initial(amount_per_transfer_from_this) - to_chat(user, "I will now apply the medigel's contents in [squirt_mode ? "short bursts":"extended sprays"]. You'll now use [amount_per_transfer_from_this] units per use.") + to_chat(user, span_notice("I will now apply the medigel's contents in [squirt_mode ? "short bursts":"extended sprays"]. You'll now use [amount_per_transfer_from_this] units per use.")) /obj/item/reagent_containers/medigel/attack(mob/M, mob/user, def_zone) if(!reagents || !reagents.total_volume) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return if(M == user) - M.visible_message("[user] attempts to [apply_method] [src] on [user.p_them()]self.") + M.visible_message(span_notice("[user] attempts to [apply_method] [src] on [user.p_them()]self.")) if(self_delay) if(!do_mob(user, M, self_delay)) return if(!reagents || !reagents.total_volume) return - to_chat(M, "I [apply_method] myself with [src].") + to_chat(M, span_notice("I [apply_method] myself with [src].")) else log_combat(user, M, "attempted to apply", src, reagents.log_list()) - M.visible_message("[user] attempts to [apply_method] [src] on [M].", \ - "[user] attempts to [apply_method] [src] on you.") + M.visible_message(span_danger("[user] attempts to [apply_method] [src] on [M]."), \ + span_danger("[user] attempts to [apply_method] [src] on you.")) if(!do_mob(user, M)) return if(!reagents || !reagents.total_volume) return - M.visible_message("[user] [apply_method]s [M] down with [src].", \ - "[user] [apply_method]s you down with [src].") + M.visible_message(span_danger("[user] [apply_method]s [M] down with [src]."), \ + span_danger("[user] [apply_method]s you down with [src].")) if(!reagents || !reagents.total_volume) return diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index a7254c1f8..1623670c2 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -15,10 +15,10 @@ if(ishuman(L)) var/obj/item/bodypart/affecting = L.get_bodypart(check_zone(user.zone_selected)) if(!affecting) - to_chat(user, "The limb is missing!") + to_chat(user, span_warning("The limb is missing!")) return if(affecting.status != BODYPART_ORGANIC) - to_chat(user, "Medicine won't work on a robotic limb!") + to_chat(user, span_notice("Medicine won't work on a robotic limb!")) return ..() diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 3da872c68..da049b86b 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -32,22 +32,22 @@ return FALSE if(M == user) - M.visible_message("[user] attempts to [apply_method] [src].") + M.visible_message(span_notice("[user] attempts to [apply_method] [src].")) if(self_delay) if(!do_mob(user, M, self_delay)) return FALSE - to_chat(M, "I [apply_method] [src].") + to_chat(M, span_notice("I [apply_method] [src].")) else - M.visible_message("[user] attempts to force [M] to [apply_method] [src].", \ - "[user] attempts to force you to [apply_method] [src].") + M.visible_message(span_danger("[user] attempts to force [M] to [apply_method] [src]."), \ + span_danger("[user] attempts to force you to [apply_method] [src].")) if(!do_mob(user, M)) return FALSE - M.visible_message("[user] forces [M] to [apply_method] [src].", \ - "[user] forces you to [apply_method] [src].") + M.visible_message(span_danger("[user] forces [M] to [apply_method] [src]."), \ + span_danger("[user] forces you to [apply_method] [src].")) if(icon_state == "pill4" && prob(5)) //you take the red pill - you stay in Wonderland, and I show you how deep the rabbit hole goes - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), M, "[pick(strings(REDPILL_FILE, "redpill_questions"))]"), 50) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), M, span_notice("[pick(strings(REDPILL_FILE, "redpill_questions"))]")), 50) if(reagents.total_volume) reagents.trans_to(M, reagents.total_volume, transfered_by = user, method = apply_type) @@ -62,14 +62,14 @@ if(!dissolvable || !target.is_refillable()) return if(target.is_drainable() && !target.reagents.total_volume) - to_chat(user, "[target] is empty! There's nothing to dissolve [src] in.") + to_chat(user, span_warning("[target] is empty! There's nothing to dissolve [src] in.")) return if(target.reagents.holder_full()) - to_chat(user, "[target] is full.") + to_chat(user, span_warning("[target] is full.")) return - user.visible_message("[user] slips something into [target]!", "I dissolve [src] in [target].", null, 2) + user.visible_message(span_warning("[user] slips something into [target]!"), span_notice("I dissolve [src] in [target]."), null, 2) reagents.trans_to(target, reagents.total_volume, transfered_by = user) qdel(src) diff --git a/code/modules/reagents/reagent_containers/powderspice.dm b/code/modules/reagents/reagent_containers/powderspice.dm index b273ff10f..51d00e278 100644 --- a/code/modules/reagents/reagent_containers/powderspice.dm +++ b/code/modules/reagents/reagent_containers/powderspice.dm @@ -42,7 +42,7 @@ show_when_dead = FALSE /datum/reagent/druqks/overdose_start(mob/living/M) - M.visible_message("Blood runs from [M]'s nose.") + M.visible_message(span_warning("Blood runs from [M]'s nose.")) /datum/reagent/druqks/overdose_process(mob/living/M) M.adjustToxLoss(10, 0) @@ -89,18 +89,18 @@ return FALSE if(M == user) - M.visible_message("[user] sniffs [src].") + M.visible_message(span_notice("[user] sniffs [src].")) else if(iscarbon(M)) var/mob/living/carbon/C = M var/obj/item/bodypart/CH = C.get_bodypart(BODY_ZONE_HEAD) if(!CH) - to_chat(user, "[C.p_theyre(TRUE)] missing something.") - user.visible_message("[user] attempts to force [C] to inhale [src].", \ - "[user] attempts to force me to inhale [src]!") + to_chat(user, span_warning("[C.p_theyre(TRUE)] missing something.")) + user.visible_message(span_danger("[user] attempts to force [C] to inhale [src]."), \ + span_danger("[user] attempts to force me to inhale [src]!")) if(C.cmode) if(!CH.grabbedby) - to_chat(user, "[C.p_they(TRUE)] steals [C.p_their()] face from it.") + to_chat(user, span_info("[C.p_they(TRUE)] steals [C.p_their()] face from it.")) return FALSE if(!do_mob(user, M, 10)) return FALSE @@ -120,14 +120,14 @@ if(!dissolvable || !target.is_refillable()) return if(target.is_drainable() && !target.reagents.total_volume) - to_chat(user, "[target] is empty! There's nothing to dissolve [src] in.") + to_chat(user, span_warning("[target] is empty! There's nothing to dissolve [src] in.")) return if(target.reagents.holder_full()) - to_chat(user, "[target] is full.") + to_chat(user, span_warning("[target] is full.")) return - user.visible_message("[user] slips something into [target]!", "I dissolve [src] in [target].", null, 2) + user.visible_message(span_warning("[user] slips something into [target]!"), span_notice("I dissolve [src] in [target]."), null, 2) reagents.trans_to(target, reagents.total_volume, transfered_by = user) qdel(src) */ @@ -193,7 +193,7 @@ /datum/reagent/ozium/overdose_start(mob/living/M) M.playsound_local(M, 'sound/misc/heroin_rush.ogg', 100, FALSE) - M.visible_message("Blood runs from [M]'s nose.") + M.visible_message(span_warning("Blood runs from [M]'s nose.")) /datum/reagent/ozium/overdose_process(mob/living/M) M.adjustToxLoss(10, 0) @@ -233,7 +233,7 @@ /datum/reagent/moondust/overdose_start(mob/living/M) M.playsound_local(M, 'sound/misc/heroin_rush.ogg', 100, FALSE) - M.visible_message("Blood runs from [M]'s nose.") + M.visible_message(span_warning("Blood runs from [M]'s nose.")) /datum/reagent/moondust/overdose_process(mob/living/M) M.adjustToxLoss(10, 0) @@ -283,7 +283,7 @@ /datum/reagent/moondust_purest/overdose_start(mob/living/M) M.playsound_local(M, 'sound/misc/heroin_rush.ogg', 100, FALSE) - M.visible_message("Blood runs from [M]'s nose.") + M.visible_message(span_warning("Blood runs from [M]'s nose.")) /datum/reagent/moondust_purest/overdose_process(mob/living/M) M.adjustToxLoss(10, 0) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 76e79e163..5cddf0d4c 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -30,19 +30,19 @@ if((A.is_drainable() && !A.is_refillable()) && get_dist(src,A) <= 1 && can_fill_from_container) if(!A.reagents.total_volume) - to_chat(user, "[A] is empty.") + to_chat(user, span_warning("[A] is empty.")) return if(reagents.holder_full()) - to_chat(user, "[src] is full.") + to_chat(user, span_warning("[src] is full.")) return var/trans = A.reagents.trans_to(src, 50, transfered_by = user) //transfer 50u , using the spray's transfer amount would take too long to refill - to_chat(user, "I fill \the [src] with [trans] units of the contents of \the [A].") + to_chat(user, span_notice("I fill \the [src] with [trans] units of the contents of \the [A].")) return if(reagents.total_volume < amount_per_transfer_from_this) - to_chat(user, "Not enough left!") + to_chat(user, span_warning("Not enough left!")) return spray(A, user) @@ -121,13 +121,13 @@ else amount_per_transfer_from_this = initial(amount_per_transfer_from_this) current_range = spray_range - to_chat(user, "I switch the nozzle setting to [stream_mode ? "\"stream\"":"\"spray\""]. You'll now use [amount_per_transfer_from_this] units per use.") + to_chat(user, span_notice("I switch the nozzle setting to [stream_mode ? "\"stream\"":"\"spray\""]. You'll now use [amount_per_transfer_from_this] units per use.")) /obj/item/reagent_containers/spray/attackby(obj/item/I, mob/user, params) var/hotness = I.get_temperature() if(hotness && reagents) reagents.expose_temperature(hotness) - to_chat(user, "I heat [name] with [I]!") + to_chat(user, span_notice("I heat [name] with [I]!")) return ..() /obj/item/reagent_containers/spray/verb/empty() @@ -139,7 +139,7 @@ if (alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", "Yes", "No") != "Yes") return if(isturf(usr.loc) && src.loc == usr) - to_chat(usr, "I empty \the [src] onto the floor.") + to_chat(usr, span_notice("I empty \the [src] onto the floor.")) reagents.reaction(usr.loc) src.reagents.clear_reagents() @@ -169,17 +169,17 @@ stream_amount = 5 /obj/item/reagent_containers/spray/cleaner/suicide_act(mob/user) - user.visible_message("[user] is putting the nozzle of \the [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is putting the nozzle of \the [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!")) if(do_mob(user,user,30)) if(reagents.total_volume >= amount_per_transfer_from_this)//if not empty - user.visible_message("[user] pulls the trigger!") + user.visible_message(span_suicide("[user] pulls the trigger!")) src.spray(user) return BRUTELOSS else - user.visible_message("[user] pulls the trigger...but \the [src] is empty!") + user.visible_message(span_suicide("[user] pulls the trigger...but \the [src] is empty!")) return SHAME else - user.visible_message("[user] decided life was worth living.") + user.visible_message(span_suicide("[user] decided life was worth living.")) return //spray tan @@ -208,7 +208,7 @@ list_reagents = null /obj/item/reagent_containers/spray/pepper/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins huffing \the [src]! It looks like [user.p_theyre()] getting a dirty high!") + user.visible_message(span_suicide("[user] begins huffing \the [src]! It looks like [user.p_theyre()] getting a dirty high!")) return OXYLOSS // Fix pepperspraying yourself @@ -274,7 +274,7 @@ generate_reagents() /obj/item/reagent_containers/spray/waterflower/cyborg/empty() - to_chat(usr, "I can not empty this!") + to_chat(usr, span_warning("I can not empty this!")) return /obj/item/reagent_containers/spray/waterflower/cyborg/proc/generate_reagents() diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 8e62ea335..ef9a9cdd9 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -72,14 +72,14 @@ if(SYRINGE_DRAW) if(reagents.total_volume >= reagents.maximum_volume) - to_chat(user, "The syringe is full.") + to_chat(user, span_notice("The syringe is full.")) return if(L) //living mob var/drawn_amount = reagents.maximum_volume - reagents.total_volume if(target != user) - target.visible_message("[user] is trying to take a blood sample from [target]!", \ - "[user] is trying to take a blood sample from you!") + target.visible_message(span_danger("[user] is trying to take a blood sample from [target]!"), \ + span_danger("[user] is trying to take a blood sample from you!")) busy = TRUE if(!do_mob(user, target, extra_checks=CALLBACK(L, TYPE_PROC_REF(/mob/living, can_inject), user, TRUE))) busy = FALSE @@ -88,22 +88,22 @@ return busy = FALSE if(L.transfer_blood_to(src, drawn_amount)) - user.visible_message("[user] takes a blood sample from [L].") + user.visible_message(span_notice("[user] takes a blood sample from [L].")) else - to_chat(user, "I are unable to draw any blood from [L]!") + to_chat(user, span_warning("I are unable to draw any blood from [L]!")) else //if not mob if(!target.reagents.total_volume) - to_chat(user, "[target] is empty!") + to_chat(user, span_warning("[target] is empty!")) return if(!target.is_drawable(user)) - to_chat(user, "I cannot directly remove reagents from [target]!") + to_chat(user, span_warning("I cannot directly remove reagents from [target]!")) return var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transfered_by = user) // transfer from, transfer to - who cares? - to_chat(user, "I fill [src] with [trans] units of the solution. It now contains [reagents.total_volume] units.") + to_chat(user, span_notice("I fill [src] with [trans] units of the solution. It now contains [reagents.total_volume] units.")) if (reagents.total_volume >= reagents.maximum_volume) mode=!mode update_icon() @@ -114,38 +114,38 @@ log_combat(user, target, "attempted to inject", src, addition="which had [contained]") if(!reagents.total_volume) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return if(!L && !target.is_injectable(user)) //only checks on non-living mobs, due to how can_inject() handles - to_chat(user, "I cannot directly fill [target]!") + to_chat(user, span_warning("I cannot directly fill [target]!")) return if(target.reagents.total_volume >= target.reagents.maximum_volume) - to_chat(user, "[target] is full.") + to_chat(user, span_notice("[target] is full.")) return if(L) //living mob if(!L.can_inject(user, TRUE)) return if(L != user) - L.visible_message("[user] is trying to inject [L]!", \ - "[user] is trying to inject you!") + L.visible_message(span_danger("[user] is trying to inject [L]!"), \ + span_danger("[user] is trying to inject you!")) if(!do_mob(user, L, extra_checks=CALLBACK(L, TYPE_PROC_REF(/mob/living, can_inject), user, TRUE))) return if(!reagents.total_volume) return if(L.reagents.total_volume >= L.reagents.maximum_volume) return - L.visible_message("[user] injects [L] with the syringe!", \ - "[user] injects you with the syringe!") + L.visible_message(span_danger("[user] injects [L] with the syringe!"), \ + span_danger("[user] injects you with the syringe!")) if(L != user) log_combat(user, L, "injected", src, addition="which had [contained]") else L.log_message("injected themselves ([contained]) with [src.name]", LOG_ATTACK, color="orange") reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user, method = INJECT) - to_chat(user, "I inject [amount_per_transfer_from_this] units of the solution. The syringe now contains [reagents.total_volume] units.") + to_chat(user, span_notice("I inject [amount_per_transfer_from_this] units of the solution. The syringe now contains [reagents.total_volume] units.")) if (reagents.total_volume <= 0 && mode==SYRINGE_INJECT) mode = SYRINGE_DRAW update_icon() diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index eb1c00373..ba6901986 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -29,7 +29,7 @@ . = ..() /obj/structure/reagent_dispensers/proc/boom() - visible_message("\The [src] ruptures!") + visible_message(span_danger("\The [src] ruptures!")) chem_splash(loc, 5, list(reagents)) qdel(src) @@ -91,19 +91,19 @@ /obj/structure/reagent_dispensers/fueltank/attackby(obj/item/I, mob/living/user, params) if(I.tool_behaviour == TOOL_WELDER) if(!reagents.has_reagent(/datum/reagent/fuel)) - to_chat(user, "[src] is out of fuel!") + to_chat(user, span_warning("[src] is out of fuel!")) return var/obj/item/weldingtool/W = I if(!W.welding) if(W.reagents.has_reagent(/datum/reagent/fuel, W.max_fuel)) - to_chat(user, "My [W.name] is already full!") + to_chat(user, span_warning("My [W.name] is already full!")) return reagents.trans_to(W, W.max_fuel, transfered_by = user) - user.visible_message("[user] refills [user.p_their()] [W.name].", "I refill [W].") + user.visible_message(span_notice("[user] refills [user.p_their()] [W.name]."), span_notice("I refill [W].")) playsound(src, 'sound/blank.ogg', 50, TRUE) W.update_icon() else - user.visible_message("[user] catastrophically fails at refilling [user.p_their()] [W.name]!", "That was stupid of you.") + user.visible_message(span_warning("[user] catastrophically fails at refilling [user.p_their()] [W.name]!"), span_danger("That was stupid of you.")) log_bomber(user, "detonated a", src, "via welding tool") @@ -149,9 +149,9 @@ if(.) return if(!paper_cups) - to_chat(user, "There aren't any cups left!") + to_chat(user, span_warning("There aren't any cups left!")) return - user.visible_message("[user] takes a cup from [src].", "I take a paper cup from [src].") + user.visible_message(span_notice("[user] takes a cup from [src]."), span_notice("I take a paper cup from [src].")) var/obj/item/reagent_containers/food/drinks/sillycup/S = new(get_turf(src)) user.put_in_hands(S) paper_cups-- diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 91c404aaf..2daf62c4b 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -141,14 +141,14 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) // attack with item, place item on conveyor /obj/machinery/conveyor/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_CROWBAR) - user.visible_message("[user] struggles to pry up \the [src] with \the [I].", \ - "I struggle to pry up \the [src] with \the [I].") + user.visible_message(span_notice("[user] struggles to pry up \the [src] with \the [I]."), \ + span_notice("I struggle to pry up \the [src] with \the [I].")) if(I.use_tool(src, user, 40, volume=40)) if(!(stat & BROKEN)) var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc) C.id = id transfer_fingerprints_to(C) - to_chat(user, "I remove the conveyor belt.") + to_chat(user, span_notice("I remove the conveyor belt.")) qdel(src) else if(I.tool_behaviour == TOOL_WRENCH) @@ -156,13 +156,13 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) I.play_tool_sound(src) setDir(turn(dir,-45)) update_move_direction() - to_chat(user, "I rotate [src].") + to_chat(user, span_notice("I rotate [src].")) else if(I.tool_behaviour == TOOL_SCREWDRIVER) if(!(stat & BROKEN)) verted = verted * -1 update_move_direction() - to_chat(user, "I reverse [src]'s direction.") + to_chat(user, span_notice("I reverse [src]'s direction.")) else if(user.used_intent.type != INTENT_HARM) user.transferItemToLoc(I, drop_location()) @@ -310,7 +310,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc) C.id = id transfer_fingerprints_to(C) - to_chat(user, "I detach the conveyor switch.") + to_chat(user, span_notice("I detach the conveyor switch.")) qdel(src) /obj/machinery/conveyor_switch/oneway @@ -338,7 +338,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) /obj/item/conveyor_construct/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/conveyor_switch_construct)) - to_chat(user, "I link the switch to the conveyor belt assembly.") + to_chat(user, span_notice("I link the switch to the conveyor belt assembly.")) var/obj/item/conveyor_switch_construct/C = I id = C.id @@ -348,7 +348,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) return var/cdir = get_dir(A, user) if(A == user.loc) - to_chat(user, "I cannot place a conveyor belt under yourself!") + to_chat(user, span_warning("I cannot place a conveyor belt under yourself!")) return var/obj/machinery/conveyor/C = new/obj/machinery/conveyor(A, cdir, id) transfer_fingerprints_to(C) @@ -369,7 +369,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) /obj/item/conveyor_switch_construct/attack_self(mob/user) for(var/obj/item/conveyor_construct/C in view()) C.id = id - to_chat(user, "I have linked all nearby conveyor belt assemblies to this switch.") + to_chat(user, span_notice("I have linked all nearby conveyor belt assemblies to this switch.")) /obj/item/conveyor_switch_construct/afterattack(atom/A, mob/user, proximity) . = ..() diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index cc82ced5e..eba0a6452 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -83,15 +83,15 @@ if(I.tool_behaviour == TOOL_SCREWDRIVER) panel_open = !panel_open I.play_tool_sound(src) - to_chat(user, "I [panel_open ? "remove":"attach"] the screws around the power connection.") + to_chat(user, span_notice("I [panel_open ? "remove":"attach"] the screws around the power connection.")) return else if(I.tool_behaviour == TOOL_WELDER && panel_open) if(!I.tool_start_check(user, amount=0)) return - to_chat(user, "I start slicing the floorweld off \the [src]...") + to_chat(user, span_notice("I start slicing the floorweld off \the [src]...")) if(I.use_tool(src, user, 20, volume=100) && panel_open) - to_chat(user, "I slice the floorweld off \the [src].") + to_chat(user, span_notice("I slice the floorweld off \the [src].")) deconstruct() return @@ -106,7 +106,7 @@ /obj/machinery/disposal/proc/place_item_in_disposal(obj/item/I, mob/user) I.forceMove(src) - user.visible_message("[user.name] places \the [I] into \the [src].", "I place \the [I] into \the [src].") + user.visible_message(span_notice("[user.name] places \the [I] into \the [src]."), span_notice("I place \the [I] into \the [src].")) //mouse drop another mob or self /obj/machinery/disposal/MouseDrop_T(mob/living/target, mob/living/user) @@ -126,21 +126,21 @@ if(target.buckled || target.has_buckled_mobs()) return if(target.mob_size > MOB_SIZE_HUMAN) - to_chat(user, "[target] doesn't fit inside [src]!") + to_chat(user, span_warning("[target] doesn't fit inside [src]!")) return add_fingerprint(user) if(user == target) - user.visible_message("[user] starts climbing into [src].", "I start climbing into [src]...") + user.visible_message(span_warning("[user] starts climbing into [src]."), span_notice("I start climbing into [src]...")) else - target.visible_message("[user] starts putting [target] into [src].", "[user] starts putting you into [src]!") + target.visible_message(span_danger("[user] starts putting [target] into [src]."), span_danger("[user] starts putting you into [src]!")) if(do_mob(user, target, 20)) if (!loc) return target.forceMove(src) if(user == target) - user.visible_message("[user] climbs into [src].", "I climb into [src].") + user.visible_message(span_warning("[user] climbs into [src]."), span_notice("I climb into [src].")) else - target.visible_message("[user] has placed [target] in [src].", "[user] has placed you in [src].") + target.visible_message(span_danger("[user] has placed [target] in [src]."), span_danger("[user] has placed you in [src].")) log_combat(user, target, "stuffed", addition="into [src]") target.LAssailant = user update_icon() @@ -273,7 +273,7 @@ if(istype(I, /obj/item/storage/bag/trash)) //Not doing component overrides because this is a specific type. var/obj/item/storage/bag/trash/T = I var/datum/component/storage/STR = T.GetComponent(/datum/component/storage) - to_chat(user, "I empty the bag.") + to_chat(user, span_warning("I empty the bag.")) for(var/obj/item/O in T.contents) STR.remove_from_storage(O,src) T.update_icon() @@ -335,10 +335,10 @@ if(isitem(AM) && AM.CanEnterDisposals()) if(prob(75)) AM.forceMove(src) - visible_message("[AM] lands in [src].") + visible_message(span_notice("[AM] lands in [src].")) update_icon() else - visible_message("[AM] bounces off of [src]'s rim!") + visible_message(span_notice("[AM] bounces off of [src]'s rim!")) return ..() else return ..() @@ -475,7 +475,7 @@ else if(ismob(AM)) var/mob/M = AM if(prob(2)) // to prevent mobs being stuck in infinite loops - to_chat(M, "I hit the edge of the chute.") + to_chat(M, span_warning("I hit the edge of the chute.")) return M.forceMove(src) flush() diff --git a/code/modules/recycling/disposal/construction.dm b/code/modules/recycling/disposal/construction.dm index ee813f9d2..16547c79e 100644 --- a/code/modules/recycling/disposal/construction.dm +++ b/code/modules/recycling/disposal/construction.dm @@ -102,7 +102,7 @@ /obj/structure/disposalconstruct/proc/can_be_rotated(mob/user,rotation_type) if(anchored) - to_chat(user, "I must unfasten the pipe before rotating it!") + to_chat(user, span_warning("I must unfasten the pipe before rotating it!")) return FALSE return TRUE @@ -114,17 +114,17 @@ if(anchored) anchored = FALSE density = FALSE - to_chat(user, "I detach the [pipename] from the underfloor.") + to_chat(user, span_notice("I detach the [pipename] from the underfloor.")) else var/ispipe = is_pipe() // Indicates if we should change the level of this pipe var/turf/T = get_turf(src) if(T.intact && isfloorturf(T)) - to_chat(user, "I can only attach the [pipename] if the floor plating is removed!") + to_chat(user, span_warning("I can only attach the [pipename] if the floor plating is removed!")) return TRUE if(!ispipe && iswallturf(T)) - to_chat(user, "I can't build [pipename]s on walls, only disposal pipes!") + to_chat(user, span_warning("I can't build [pipename]s on walls, only disposal pipes!")) return TRUE if(ispipe) @@ -134,7 +134,7 @@ if(istype(CP, /obj/structure/disposalpipe/broken)) pdir = CP.dir if(pdir & dpdir) - to_chat(user, "There is already a disposal pipe at that location!") + to_chat(user, span_warning("There is already a disposal pipe at that location!")) return TRUE else // Disposal or outlet @@ -145,12 +145,12 @@ break if(!found_trunk) - to_chat(user, "The [pipename] requires a trunk underneath it in order to work!") + to_chat(user, span_warning("The [pipename] requires a trunk underneath it in order to work!")) return TRUE anchored = TRUE density = initial(pipe_type.density) - to_chat(user, "I attach the [pipename] to the underfloor.") + to_chat(user, span_notice("I attach the [pipename] to the underfloor.")) I.play_tool_sound(src, 100) update_icon() return TRUE @@ -161,14 +161,14 @@ if(!I.tool_start_check(user, amount=0)) return TRUE - to_chat(user, "I start welding the [pipename] in place...") + to_chat(user, span_notice("I start welding the [pipename] in place...")) if(I.use_tool(src, user, 8, volume=50)) - to_chat(user, "The [pipename] has been welded in place.") + to_chat(user, span_notice("The [pipename] has been welded in place.")) var/obj/O = new pipe_type(loc, src) transfer_fingerprints_to(O) else - to_chat(user, "I need to attach it to the plating first!") + to_chat(user, span_warning("I need to attach it to the plating first!")) return TRUE /obj/structure/disposalconstruct/proc/is_pipe() diff --git a/code/modules/recycling/disposal/outlet.dm b/code/modules/recycling/disposal/outlet.dm index eccb39f7c..6cd898620 100644 --- a/code/modules/recycling/disposal/outlet.dm +++ b/code/modules/recycling/disposal/outlet.dm @@ -72,9 +72,9 @@ return TRUE playsound(src, 'sound/blank.ogg', 100, TRUE) - to_chat(user, "I start slicing the floorweld off [src]...") + to_chat(user, span_notice("I start slicing the floorweld off [src]...")) if(I.use_tool(src, user, 20)) - to_chat(user, "I slice the floorweld off [src].") + to_chat(user, span_notice("I slice the floorweld off [src].")) stored.forceMove(loc) transfer_fingerprints_to(stored) stored = null diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm index 96dbef503..c25a6da32 100644 --- a/code/modules/recycling/disposal/pipe.dm +++ b/code/modules/recycling/disposal/pipe.dm @@ -142,10 +142,10 @@ if(!I.tool_start_check(user, amount=0)) return TRUE - to_chat(user, "I start slicing [src]...") + to_chat(user, span_notice("I start slicing [src]...")) if(I.use_tool(src, user, 30, volume=50)) deconstruct() - to_chat(user, "I slice [src].") + to_chat(user, span_notice("I slice [src].")) return TRUE //checks if something is blocking the deconstruction (e.g. trunk with a bin still linked to it) @@ -257,7 +257,7 @@ /obj/structure/disposalpipe/trunk/can_be_deconstructed(mob/user) if(linked) - to_chat(user, "I need to deconstruct disposal machinery above this pipe!") + to_chat(user, span_warning("I need to deconstruct disposal machinery above this pipe!")) return FALSE return TRUE diff --git a/code/modules/recycling/disposal/pipe_sorting.dm b/code/modules/recycling/disposal/pipe_sorting.dm index 6eca2d747..feef34157 100644 --- a/code/modules/recycling/disposal/pipe_sorting.dm +++ b/code/modules/recycling/disposal/pipe_sorting.dm @@ -64,10 +64,10 @@ if(O.currTag)// Tagger has a tag set if(O.currTag in sortTypes) sortTypes -= O.currTag - to_chat(user, "Removed \"[GLOB.TAGGERLOCATIONS[O.currTag]]\" filter.") + to_chat(user, span_notice("Removed \"[GLOB.TAGGERLOCATIONS[O.currTag]]\" filter.")) else sortTypes |= O.currTag - to_chat(user, "Added \"[GLOB.TAGGERLOCATIONS[O.currTag]]\" filter.") + to_chat(user, span_notice("Added \"[GLOB.TAGGERLOCATIONS[O.currTag]]\" filter.")) playsound(src, 'sound/blank.ogg', 100, TRUE) else return ..() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index e78b5749d..98b001e52 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -38,40 +38,40 @@ if(sortTag != O.currTag) var/tag = uppertext(GLOB.TAGGERLOCATIONS[O.currTag]) - to_chat(user, "*[tag]*") + to_chat(user, span_notice("*[tag]*")) sortTag = O.currTag playsound(loc, 'sound/blank.ogg', 100, TRUE) else if(istype(W, /obj/item/pen)) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on the side of [src]!") + to_chat(user, span_notice("I scribble illegibly on the side of [src]!")) return var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN) if(!user.canUseTopic(src, BE_CLOSE)) return if(!str || !length(str)) - to_chat(user, "Invalid text!") + to_chat(user, span_warning("Invalid text!")) return - user.visible_message("[user] labels [src] as [str].") + user.visible_message(span_notice("[user] labels [src] as [str].")) name = "[name] ([str])" else if(istype(W, /obj/item/stack/wrapping_paper) && !giftwrapped) var/obj/item/stack/wrapping_paper/WP = W if(WP.use(3)) - user.visible_message("[user] wraps the package in festive paper!") + user.visible_message(span_notice("[user] wraps the package in festive paper!")) giftwrapped = TRUE icon_state = "gift[icon_state]" else - to_chat(user, "I need more paper!") + to_chat(user, span_warning("I need more paper!")) else if(istype(W, /obj/item/paper)) if(note) - to_chat(user, "This package already has a note attached!") + to_chat(user, span_warning("This package already has a note attached!")) return if(!user.transferItemToLoc(W, src)) - to_chat(user, "For some reason, you can't attach [W]!") + to_chat(user, span_warning("For some reason, you can't attach [W]!")) return - user.visible_message("[user] attaches [W] to [src].", "I attach [W] to [src].") + user.visible_message(span_notice("[user] attaches [W] to [src]."), span_notice("I attach [W] to [src].")) note = W if(giftwrapped) add_overlay(copytext("[icon_state]_note",5)) @@ -86,17 +86,17 @@ var/atom/movable/AM = loc //can't unwrap the wrapped container if it's inside something. AM.relay_container_resist(user, O) return - to_chat(user, "I lean on the back of [O] and start pushing to rip the wrapping around it.") + to_chat(user, span_notice("I lean on the back of [O] and start pushing to rip the wrapping around it.")) if(do_after(user, 50, target = O)) if(!user || user.stat != CONSCIOUS || user.loc != O || O.loc != src ) return - to_chat(user, "I successfully removed [O]'s wrapping !") + to_chat(user, span_notice("I successfully removed [O]'s wrapping !")) O.forceMove(loc) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) qdel(src) else if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded. - to_chat(user, "I fail to remove [O]'s wrapping!") + to_chat(user, span_warning("I fail to remove [O]'s wrapping!")) /obj/item/smallDelivery @@ -119,7 +119,7 @@ var/atom/movable/AM = X user.put_in_hands(AM) playsound(src.loc, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] opens [src].") + user.visible_message(span_warning("[user] opens [src].")) qdel(src) /obj/item/smallDelivery/attack_self_tk(mob/user) @@ -153,21 +153,21 @@ if(sortTag != O.currTag) var/tag = uppertext(GLOB.TAGGERLOCATIONS[O.currTag]) - to_chat(user, "*[tag]*") + to_chat(user, span_notice("*[tag]*")) sortTag = O.currTag playsound(loc, 'sound/blank.ogg', 100, TRUE) else if(istype(W, /obj/item/pen)) if(!user.is_literate()) - to_chat(user, "I scribble illegibly on the side of [src]!") + to_chat(user, span_notice("I scribble illegibly on the side of [src]!")) return var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN) if(!user.canUseTopic(src, BE_CLOSE)) return if(!str || !length(str)) - to_chat(user, "Invalid text!") + to_chat(user, span_warning("Invalid text!")) return - user.visible_message("[user] labels [src] as [str].") + user.visible_message(span_notice("[user] labels [src] as [str].")) name = "[name] ([str])" else if(istype(W, /obj/item/stack/wrapping_paper) && !giftwrapped) @@ -175,18 +175,18 @@ if(WP.use(1)) icon_state = "gift[icon_state]" giftwrapped = 1 - user.visible_message("[user] wraps the package in festive paper!") + user.visible_message(span_notice("[user] wraps the package in festive paper!")) else - to_chat(user, "I need more paper!") + to_chat(user, span_warning("I need more paper!")) /* else if(istype(W, /obj/item/paper)) if(note) - to_chat(user, "This package already has a note attached!") + to_chat(user, span_warning("This package already has a note attached!")) return if(!user.transferItemToLoc(W, src)) - to_chat(user, "For some reason, you can't attach [W]!") + to_chat(user, span_warning("For some reason, you can't attach [W]!")) return - user.visible_message("[user] attaches [W] to [src].", "I attach [W] to [src].") + user.visible_message(span_notice("[user] attaches [W] to [src]."), span_notice("I attach [W] to [src].")) note = W if(giftwrapped) add_overlay(copytext("[icon_state]_note",5)) @@ -212,11 +212,11 @@ desc = "" /obj/item/destTagger/suicide_act(mob/living/user) - user.visible_message("[user] begins tagging [user.p_their()] final destination! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins tagging [user.p_their()] final destination! It looks like [user.p_theyre()] trying to commit suicide!")) if (islizard(user)) - to_chat(user, "*HELL*")//lizard nerf + to_chat(user, span_notice("*HELL*"))//lizard nerf else - to_chat(user, "*HEAVEN*") + to_chat(user, span_notice("*HEAVEN*")) playsound(src, 'sound/blank.ogg', 100, TRUE) return BRUTELOSS diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index a1539d435..7999fdd9d 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -37,11 +37,11 @@ Note: Must be placed within 3 tiles of the R&D Console if(!is_insertion_ready(user)) return if(!user.transferItemToLoc(O, src)) - to_chat(user, "\The [O] is stuck to your hand, you cannot put it in the [src.name]!") + to_chat(user, span_warning("\The [O] is stuck to your hand, you cannot put it in the [src.name]!")) return busy = TRUE loaded_item = O - to_chat(user, "I add the [O.name] to the [src.name]!") + to_chat(user, span_notice("I add the [O.name] to the [src.name]!")) flick("d_analyzer_la", src) addtimer(CALLBACK(src, PROC_REF(finish_loading)), 10) if (linked_console) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index a562e4730..81cd3691d 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -97,7 +97,7 @@ /obj/machinery/rnd/experimentor/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Malfunction probability reduced by [badThingCoeff]%.
Cooldown interval between experiments at [resetTime*0.1] seconds.
" + . += span_notice("The status display reads: Malfunction probability reduced by [badThingCoeff]%.
Cooldown interval between experiments at [resetTime*0.1] seconds.") /obj/machinery/rnd/experimentor/proc/checkCircumstances(obj/item/O) //snowflake check to only take "made" bombs @@ -115,7 +115,7 @@ if(!user.transferItemToLoc(O, src)) return loaded_item = O - to_chat(user, "I add [O] to the machine.") + to_chat(user, span_notice("I add [O] to the machine.")) flick("h_lathe_load", src) /obj/machinery/rnd/experimentor/default_deconstruction_crowbar(obj/item/O) @@ -185,11 +185,11 @@ updateUsrDialog() else if(recentlyExperimented) - to_chat(usr, "[src] has been used too recently!") + to_chat(usr, span_warning("[src] has been used too recently!")) else if(!loaded_item) - to_chat(usr, "[src] is not currently loaded!") + to_chat(usr, span_warning("[src] is not currently loaded!")) else if(!process || process != loaded_item) //Interface exploit protection (such as hrefs or swapping items with interface set to old item) - to_chat(usr, "Interface failure detected in [src]. Please try again.") + to_chat(usr, span_danger("Interface failure detected in [src]. Please try again.")) else var/dotype if(text2num(scantype) == SCANTYPE_DISCOVER) @@ -222,7 +222,7 @@ /obj/machinery/rnd/experimentor/proc/ejectItem(delete=FALSE) if(loaded_item) if(cloneMode) - visible_message("A duplicate [loaded_item] pops out!") + visible_message(span_notice("A duplicate [loaded_item] pops out!")) var/type_to_make = loaded_item.type new type_to_make(get_turf(pick(oview(1,src)))) cloneMode = FALSE @@ -248,21 +248,21 @@ var/criticalReaction = is_type_in_typecache(exp_on, critical_items_typecache) //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_POKE) - visible_message("[src] prods at [exp_on] with mechanical arms.") + visible_message(span_notice("[src] prods at [exp_on] with mechanical arms.")) if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[exp_on] is gripped in just the right way, enhancing its focus.") + visible_message(span_notice("[exp_on] is gripped in just the right way, enhancing its focus.")) badThingCoeff++ else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src] malfunctions and destroys [exp_on], lashing its arms out at nearby people!") + visible_message(span_danger("[src] malfunctions and destroys [exp_on], lashing its arms out at nearby people!")) for(var/mob/living/m in oview(1, src)) m.apply_damage(15, BRUTE, pick(BODY_ZONE_HEAD,BODY_ZONE_CHEST,BODY_ZONE_PRECISE_GROIN)) investigate_log("Experimentor dealt minor brute to [m].", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) else if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions!") + visible_message(span_warning("[src] malfunctions!")) exp = SCANTYPE_OBLITERATE else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] malfunctions, throwing the [exp_on]!") + visible_message(span_danger("[src] malfunctions, throwing the [exp_on]!")) var/mob/living/target = locate(/mob/living) in oview(7,src) if(target) var/obj/item/throwing = loaded_item @@ -272,18 +272,18 @@ throwing.throw_at(target, 10, 1) //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_IRRADIATE) - visible_message("[src] reflects radioactive rays at [exp_on]!") + visible_message(span_danger("[src] reflects radioactive rays at [exp_on]!")) if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[exp_on] has activated an unknown subroutine!") + visible_message(span_notice("[exp_on] has activated an unknown subroutine!")) cloneMode = TRUE investigate_log("Experimentor has made a clone of [exp_on]", INVESTIGATE_EXPERIMENTOR) ejectItem() else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src] malfunctions, melting [exp_on] and leaking radiation!") + visible_message(span_danger("[src] malfunctions, melting [exp_on] and leaking radiation!")) radiation_pulse(src, 500) ejectItem(TRUE) else if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions, spewing toxic waste!") + visible_message(span_warning("[src] malfunctions, spewing toxic waste!")) for(var/turf/T in oview(1, src)) if(!T.density) if(prob(EFFECT_PROB_VERYHIGH) && !(locate(/obj/effect/decal/cleanable/greenglow) in T)) @@ -294,7 +294,7 @@ ejectItem(TRUE) var/newPath = text2path(pickweight(valid_items)) loaded_item = new newPath(src) - visible_message("[src] malfunctions, transforming [savedName] into [loaded_item]!") + visible_message(span_warning("[src] malfunctions, transforming [savedName] into [loaded_item]!")) investigate_log("Experimentor has transformed [savedName] into [loaded_item]", INVESTIGATE_EXPERIMENTOR) if(istype(loaded_item, /obj/item/grenade/chem_grenade)) var/obj/item/grenade/chem_grenade/CG = loaded_item @@ -302,12 +302,12 @@ ejectItem() //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_GAS) - visible_message("[src] fills its chamber with gas, [exp_on] included.") + visible_message(span_warning("[src] fills its chamber with gas, [exp_on] included.")) if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[exp_on] achieves the perfect mix!") + visible_message(span_notice("[exp_on] achieves the perfect mix!")) new /obj/item/stack/sheet/mineral/plasma(get_turf(pick(oview(1,src)))) else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src] destroys [exp_on], leaking dangerous gas!") + visible_message(span_danger("[src] destroys [exp_on], leaking dangerous gas!")) chosenchem = pick(/datum/reagent/carbon,/datum/reagent/uranium/radium,/datum/reagent/toxin,/datum/reagent/consumable/condensedcapsaicin,/datum/reagent/drug/mushroomhallucinogen,/datum/reagent/drug/space_drugs,/datum/reagent/consumable/ethanol,/datum/reagent/consumable/ethanol/beepsky_smash) var/datum/reagents/R = new/datum/reagents(50) R.my_atom = src @@ -320,7 +320,7 @@ qdel(R) ejectItem(TRUE) else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src]'s chemical chamber has sprung a leak!") + visible_message(span_danger("[src]'s chemical chamber has sprung a leak!")) chosenchem = pick(/datum/reagent/mutationtoxin/classic,/datum/reagent/nanomachines,/datum/reagent/toxin/acid) var/datum/reagents/R = new/datum/reagents(50) R.my_atom = src @@ -334,18 +334,18 @@ warn_admins(usr, "[chosenchem] smoke") investigate_log("Experimentor has released [chosenchem] smoke!", INVESTIGATE_EXPERIMENTOR) else if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions, spewing harmless gas.") + visible_message(span_warning("[src] malfunctions, spewing harmless gas.")) throwSmoke(loc) else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] melts [exp_on], ionizing the air around it!") + visible_message(span_warning("[src] melts [exp_on], ionizing the air around it!")) empulse(loc, 4, 6) investigate_log("Experimentor has generated an Electromagnetic Pulse.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_HEAT) - visible_message("[src] raises [exp_on]'s temperature.") + visible_message(span_notice("[src] raises [exp_on]'s temperature.")) if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[src]'s emergency coolant system gives off a small ding!") + visible_message(span_warning("[src]'s emergency coolant system gives off a small ding!")) playsound(src, 'sound/blank.ogg', 50, TRUE) var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src)))) chosenchem = pick(/datum/reagent/toxin/plasma,/datum/reagent/consumable/capsaicin,/datum/reagent/consumable/ethanol) @@ -359,18 +359,18 @@ var/mob/M = locate(/mob/living) in view(src, 3) var/turf/MT = get_turf(M) if(MT) - visible_message("[src] dangerously overheats, launching a flaming fuel orb!") + visible_message(span_danger("[src] dangerously overheats, launching a flaming fuel orb!")) investigate_log("Experimentor has launched a fireball at [M]!", INVESTIGATE_EXPERIMENTOR) var/obj/projectile/magic/aoe/fireball/FB = new /obj/projectile/magic/aoe/fireball(start) FB.preparePixelProjectile(MT, start) FB.fire() else if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions, melting [exp_on] and releasing a burst of flame!") + visible_message(span_danger("[src] malfunctions, melting [exp_on] and releasing a burst of flame!")) explosion(loc, -1, 0, 0, 0, 0, flame_range = 2) investigate_log("Experimentor started a fire.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] malfunctions, melting [exp_on] and leaking hot air!") + visible_message(span_warning("[src] malfunctions, melting [exp_on] and leaking hot air!")) var/datum/gas_mixture/env = loc.return_air() var/transfer_moles = 0.25 * env.total_moles() var/datum/gas_mixture/removed = env.remove(transfer_moles) @@ -384,7 +384,7 @@ investigate_log("Experimentor has released hot air.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] malfunctions, activating its emergency coolant systems!") + visible_message(span_warning("[src] malfunctions, activating its emergency coolant systems!")) throwSmoke(loc) for(var/mob/living/m in oview(1, src)) m.apply_damage(5, BURN, pick(BODY_ZONE_HEAD,BODY_ZONE_CHEST,BODY_ZONE_PRECISE_GROIN)) @@ -392,9 +392,9 @@ ejectItem() //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_COLD) - visible_message("[src] lowers [exp_on]'s temperature.") + visible_message(span_notice("[src] lowers [exp_on]'s temperature.")) if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[src]'s emergency coolant system gives off a small ding!") + visible_message(span_warning("[src]'s emergency coolant system gives off a small ding!")) var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src)))) playsound(src, 'sound/blank.ogg', 50, TRUE) //Ding! Your death coffee is ready! chosenchem = pick(/datum/reagent/uranium,/datum/reagent/consumable/frostoil,/datum/reagent/medicine/ephedrine) @@ -404,7 +404,7 @@ C.desc = "" investigate_log("Experimentor has made a cup of [chosenchem] coffee.", INVESTIGATE_EXPERIMENTOR) else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!") + visible_message(span_danger("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!")) var/datum/reagents/R = new/datum/reagents(50) R.my_atom = src R.add_reagent(/datum/reagent/consumable/frostoil , 50) @@ -416,7 +416,7 @@ qdel(R) ejectItem(TRUE) else if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions, shattering [exp_on] and leaking cold air!") + visible_message(span_warning("[src] malfunctions, shattering [exp_on] and leaking cold air!")) var/datum/gas_mixture/env = loc.return_air() var/transfer_moles = 0.25 * env.total_moles() var/datum/gas_mixture/removed = env.remove(transfer_moles) @@ -430,30 +430,30 @@ investigate_log("Experimentor has released cold air.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!") + visible_message(span_warning("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!")) var/datum/effect_system/smoke_spread/smoke = new smoke.set_up(0, loc) smoke.start() ejectItem() //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_OBLITERATE) - visible_message("[exp_on] activates the crushing mechanism, [exp_on] is destroyed!") + visible_message(span_warning("[exp_on] activates the crushing mechanism, [exp_on] is destroyed!")) if(linked_console.linked_lathe) var/datum/component/material_container/linked_materials = linked_console.linked_lathe.GetComponent(/datum/component/material_container) for(var/material in exp_on.custom_materials) linked_materials.insert_amount_mat( min((linked_materials.max_amount - linked_materials.total_amount), (exp_on.custom_materials[material])), material) if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!") + visible_message(span_warning("[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!")) new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src)))) else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src]'s crusher goes way too many levels too high, crushing right through space-time!") + visible_message(span_danger("[src]'s crusher goes way too many levels too high, crushing right through space-time!")) playsound(src, 'sound/blank.ogg', 50, TRUE, -3) investigate_log("Experimentor has triggered the 'throw things' reaction.", INVESTIGATE_EXPERIMENTOR) for(var/atom/movable/AM in oview(7,src)) if(!AM.anchored) AM.throw_at(src,10,1) else if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src]'s crusher goes one level too high, crushing right into space-time!") + visible_message(span_danger("[src]'s crusher goes one level too high, crushing right into space-time!")) playsound(src, 'sound/blank.ogg', 50, TRUE, -3) investigate_log("Experimentor has triggered the 'minor throw things' reaction.", INVESTIGATE_EXPERIMENTOR) var/list/throwAt = list() @@ -468,16 +468,16 @@ if(exp == FAIL) var/a = pick("rumbles","shakes","vibrates","shudders") var/b = pick("crushes","spins","viscerates","smashes","insults") - visible_message("[exp_on] [a], and [b], the experiment was a failure.") + visible_message(span_warning("[exp_on] [a], and [b], the experiment was a failure.")) if(exp == SCANTYPE_DISCOVER) - visible_message("[src] scans the [exp_on], revealing its true nature!") + visible_message(span_notice("[src] scans the [exp_on], revealing its true nature!")) playsound(src, 'sound/blank.ogg', 50, 3, -1) var/obj/item/relic/R = loaded_item if (!R.revealed) var/points = rand(2500,2750) // discovery reward SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = points)) - visible_message(" This discovery netted [points] points for research.") + visible_message(span_notice(" This discovery netted [points] points for research.")) R.reveal() investigate_log("Experimentor has revealed a relic with [R.realProc] effect.", INVESTIGATE_EXPERIMENTOR) ejectItem() @@ -486,11 +486,11 @@ if(prob(EFFECT_PROB_VERYLOW-badThingCoeff) && loaded_item) var/globalMalf = rand(1,100) if(globalMalf < 15) - visible_message("[src]'s onboard detection system has malfunctioned!") + visible_message(span_warning("[src]'s onboard detection system has malfunctioned!")) item_reactions["[exp_on.type]"] = pick(SCANTYPE_POKE,SCANTYPE_IRRADIATE,SCANTYPE_GAS,SCANTYPE_HEAT,SCANTYPE_COLD,SCANTYPE_OBLITERATE) ejectItem() if(globalMalf > 16 && globalMalf < 35) - visible_message("[src] melts [exp_on], ian-izing the air around it!") + visible_message(span_warning("[src] melts [exp_on], ian-izing the air around it!")) throwSmoke(loc) if(trackedIan) throwSmoke(trackedIan.loc) @@ -501,13 +501,13 @@ investigate_log("Experimentor has spawned a new corgi.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) if(globalMalf > 36 && globalMalf < 50) - visible_message("Experimentor draws the life essence of those nearby!") + visible_message(span_warning("Experimentor draws the life essence of those nearby!")) for(var/mob/living/m in view(4,src)) - to_chat(m, "I feel your flesh being torn from you, mists of blood drifting to [src]!") + to_chat(m, span_danger("I feel your flesh being torn from you, mists of blood drifting to [src]!")) m.apply_damage(50, BRUTE, BODY_ZONE_CHEST) investigate_log("Experimentor has taken 50 brute a blood sacrifice from [m]", INVESTIGATE_EXPERIMENTOR) if(globalMalf > 51 && globalMalf < 75) - visible_message("[src] encounters a run-time error!") + visible_message(span_warning("[src] encounters a run-time error!")) throwSmoke(loc) if(trackedRuntime) throwSmoke(trackedRuntime.loc) @@ -518,7 +518,7 @@ investigate_log("Experimentor failed to steal runtime, and instead spawned a new cat.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) if(globalMalf > 76) - visible_message("[src] begins to smoke and hiss, shaking violently!") + visible_message(span_warning("[src] begins to smoke and hiss, shaking violently!")) use_power(500000) investigate_log("Experimentor has drained power from its APC", INVESTIGATE_EXPERIMENTOR) @@ -582,14 +582,14 @@ /obj/item/relic/attack_self(mob/user) if(revealed) if(cooldown) - to_chat(user, "[src] does not react!") + to_chat(user, span_warning("[src] does not react!")) return else if(loc == user) cooldown = TRUE call(src,realProc)(user) addtimer(CALLBACK(src, PROC_REF(cd)), cooldownMax) else - to_chat(user, "I aren't quite sure what to do with this yet.") + to_chat(user, span_notice("I aren't quite sure what to do with this yet.")) /obj/item/relic/proc/cd() cooldown = FALSE @@ -620,7 +620,7 @@ warn_admins(user, "Flash") /obj/item/relic/proc/petSpray(mob/user) - var/message = "[src] begins to shake, and in the distance the sound of rampaging animals arises!" + var/message = span_danger("[src] begins to shake, and in the distance the sound of rampaging animals arises!") visible_message(message) to_chat(user, message) var/animals = rand(1,25) @@ -631,7 +631,7 @@ new mobType(get_turf(src)) warn_admins(user, "Mass Mob Spawn") if(prob(60)) - to_chat(user, "[src] falls apart!") + to_chat(user, span_warning("[src] falls apart!")) qdel(src) /obj/item/relic/proc/rapidDupe(mob/user) @@ -653,24 +653,24 @@ warn_admins(user, "Rapid duplicator", 0) /obj/item/relic/proc/explode(mob/user) - to_chat(user, "[src] begins to heat up!") + to_chat(user, span_danger("[src] begins to heat up!")) addtimer(CALLBACK(src, PROC_REF(do_explode), user), rand(35, 100)) /obj/item/relic/proc/do_explode(mob/user) if(loc == user) - visible_message("\The [src]'s top opens, releasing a powerful blast!") + visible_message(span_notice("\The [src]'s top opens, releasing a powerful blast!")) explosion(user.loc, 0, rand(1,5), rand(1,5), rand(1,5), rand(1,5), flame_range = 2) warn_admins(user, "Explosion") qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!! /obj/item/relic/proc/teleport(mob/user) - to_chat(user, "[src] begins to vibrate!") + to_chat(user, span_notice("[src] begins to vibrate!")) addtimer(CALLBACK(src, PROC_REF(do_the_teleport), user), rand(10, 30)) /obj/item/relic/proc/do_the_teleport(mob/user) var/turf/userturf = get_turf(user) if(loc == user && !is_centcom_level(userturf.z)) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you! - visible_message("[src] twists and bends, relocating itself!") + visible_message(span_notice("[src] twists and bends, relocating itself!")) throwSmoke(userturf) do_teleport(user, userturf, 8, asoundin = 'sound/blank.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) throwSmoke(get_turf(user)) diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 16fbd6f6c..1285d8e8c 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -265,7 +265,7 @@ t = check_mat(D, M) temp_material += " | " if (t < 1) - temp_material += "[all_materials[M]/coeff] [CallMaterialName(M)]" + temp_material += span_bad("[all_materials[M]/coeff] [CallMaterialName(M)]") else temp_material += " [all_materials[M]/coeff] [CallMaterialName(M)]" c = min(c,t) diff --git a/code/modules/research/nanites/nanite_chamber.dm b/code/modules/research/nanites/nanite_chamber.dm index a28eb24c7..03ad7e224 100644 --- a/code/modules/research/nanites/nanite_chamber.dm +++ b/code/modules/research/nanites/nanite_chamber.dm @@ -32,7 +32,7 @@ /obj/machinery/nanite_chamber/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Scanning module has been upgraded to level [scan_level]." + . += span_notice("The status display reads: Scanning module has been upgraded to level [scan_level].") /obj/machinery/nanite_chamber/proc/set_busy(status, message, working_icon) busy = status @@ -131,7 +131,7 @@ /obj/machinery/nanite_chamber/proc/toggle_open(mob/user) if(panel_open) - to_chat(user, "Close the maintenance panel first.") + to_chat(user, span_notice("Close the maintenance panel first.")) return if(state_open) @@ -139,7 +139,7 @@ return else if(locked) - to_chat(user, "The bolts are locked down, securing the door shut.") + to_chat(user, span_notice("The bolts are locked down, securing the door shut.")) return open_machine() @@ -152,15 +152,15 @@ return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user.visible_message("I see [user] kicking against the door of [src]!", \ - "I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "I hear a metallic creaking from [src].") + user.visible_message(span_notice("I see [user] kicking against the door of [src]!"), \ + span_notice("I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_hear("I hear a metallic creaking from [src].")) if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src || state_open || !locked || busy) return locked = FALSE - user.visible_message("[user] successfully broke out of [src]!", \ - "I successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("I successfully break out of [src]!")) open_machine() /obj/machinery/nanite_chamber/close_machine(mob/living/carbon/user) @@ -182,7 +182,7 @@ if(user.stat || locked) if(message_cooldown <= world.time) message_cooldown = world.time + 50 - to_chat(user, "[src]'s door won't budge!") + to_chat(user, span_warning("[src]'s door won't budge!")) return open_machine() diff --git a/code/modules/research/nanites/nanite_cloud_controller.dm b/code/modules/research/nanites/nanite_cloud_controller.dm index 8ab9c2338..fd450a119 100644 --- a/code/modules/research/nanites/nanite_cloud_controller.dm +++ b/code/modules/research/nanites/nanite_cloud_controller.dm @@ -22,7 +22,7 @@ if(disk) eject(user) if(user.transferItemToLoc(N, src)) - to_chat(user, "I insert [N] into [src].") + to_chat(user, span_notice("I insert [N] into [src].")) playsound(src, 'sound/blank.ogg', 50, FALSE) disk = N else @@ -43,7 +43,7 @@ /obj/machinery/computer/nanite_cloud_controller/proc/generate_backup(cloud_id, mob/user) if(SSnanites.get_cloud_backup(cloud_id, TRUE)) - to_chat(user, "Cloud ID already registered.") + to_chat(user, span_warning("Cloud ID already registered.")) return var/datum/nanite_cloud_backup/backup = new(src) diff --git a/code/modules/research/nanites/nanite_hijacker.dm b/code/modules/research/nanites/nanite_hijacker.dm index 8ac6cf13c..1f26b4935 100644 --- a/code/modules/research/nanites/nanite_hijacker.dm +++ b/code/modules/research/nanites/nanite_hijacker.dm @@ -18,7 +18,7 @@ /obj/item/nanite_hijacker/examine(mob/user) . = ..() if(disk) - . += "Alt-click [src] to eject the disk." + . += span_notice("Alt-click [src] to eject the disk.") /obj/item/nanite_hijacker/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/disk/nanite_program)) @@ -26,7 +26,7 @@ if(disk) eject() if(user.transferItemToLoc(N, src)) - to_chat(user, "I insert [N] into [src].") + to_chat(user, span_notice("I insert [N] into [src].")) disk = N program = N.program else @@ -47,11 +47,11 @@ var/success = SEND_SIGNAL(target, COMSIG_NANITE_ADD_PROGRAM, program.copy()) switch(success) if(NONE) - to_chat(user, "I don't detect any nanites in [target].") + to_chat(user, span_notice("I don't detect any nanites in [target].")) if(COMPONENT_PROGRAM_INSTALLED) - to_chat(user, "I insert the currently loaded program into [target]'s nanites.") + to_chat(user, span_notice("I insert the currently loaded program into [target]'s nanites.")) if(COMPONENT_PROGRAM_NOT_INSTALLED) - to_chat(user, "I try to insert the currently loaded program into [target]'s nanites, but the installation fails.") + to_chat(user, span_warning("I try to insert the currently loaded program into [target]'s nanites, but the installation fails.")) //Same UI as the nanite programmer, as it pretty much does the same /obj/item/nanite_hijacker/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state) diff --git a/code/modules/research/nanites/nanite_program_hub.dm b/code/modules/research/nanites/nanite_program_hub.dm index 0997e34f6..06067f5a0 100644 --- a/code/modules/research/nanites/nanite_program_hub.dm +++ b/code/modules/research/nanites/nanite_program_hub.dm @@ -33,7 +33,7 @@ if(disk) eject(user) if(user.transferItemToLoc(N, src)) - to_chat(user, "I insert [N] into [src].") + to_chat(user, span_notice("I insert [N] into [src].")) playsound(src, 'sound/blank.ogg', 50, FALSE) disk = N else diff --git a/code/modules/research/nanites/nanite_programmer.dm b/code/modules/research/nanites/nanite_programmer.dm index 950da58cd..564ab29f7 100644 --- a/code/modules/research/nanites/nanite_programmer.dm +++ b/code/modules/research/nanites/nanite_programmer.dm @@ -18,7 +18,7 @@ if(disk) eject(user) if(user.transferItemToLoc(N, src)) - to_chat(user, "I insert [N] into [src]") + to_chat(user, span_notice("I insert [N] into [src]")) playsound(src, 'sound/blank.ogg', 50, FALSE) disk = N program = N.program diff --git a/code/modules/research/nanites/nanite_programs/buffing.dm b/code/modules/research/nanites/nanite_programs/buffing.dm index ec3f4d2ad..f9ef08020 100644 --- a/code/modules/research/nanites/nanite_programs/buffing.dm +++ b/code/modules/research/nanites/nanite_programs/buffing.dm @@ -28,7 +28,7 @@ /datum/nanite_program/triggered/adrenaline/trigger() if(!..()) return - to_chat(host_mob, "I feel a sudden surge of energy!") + to_chat(host_mob, span_notice("I feel a sudden surge of energy!")) host_mob.set_resting(FALSE) host_mob.reagents.add_reagent(/datum/reagent/medicine/badstims, 3) diff --git a/code/modules/research/nanites/nanite_programs/rogue.dm b/code/modules/research/nanites/nanite_programs/rogue.dm index f71c98b4f..6e7e17afd 100644 --- a/code/modules/research/nanites/nanite_programs/rogue.dm +++ b/code/modules/research/nanites/nanite_programs/rogue.dm @@ -20,7 +20,7 @@ /datum/nanite_program/necrotic/active_effect() host_mob.adjustBruteLoss(0.75, TRUE) if(prob(1)) - to_chat(host_mob, "I feel a mild ache from somewhere inside you.") + to_chat(host_mob, span_warning("I feel a mild ache from somewhere inside you.")) //Programs that don't directly interact with the body will decay into this /datum/nanite_program/toxic @@ -33,7 +33,7 @@ /datum/nanite_program/toxic/active_effect() host_mob.adjustToxLoss(0.5) if(prob(1)) - to_chat(host_mob, "I feel a bit sick.") + to_chat(host_mob, span_warning("I feel a bit sick.")) //Generic blood-affecting programs will decay into this /datum/nanite_program/suffocating @@ -46,7 +46,7 @@ /datum/nanite_program/suffocating/active_effect() host_mob.adjustOxyLoss(3, 0) if(prob(1)) - to_chat(host_mob, "I feel short of breath.") + to_chat(host_mob, span_warning("I feel short of breath.")) //Generic brain-affecting programs will decay into this /datum/nanite_program/brain_decay @@ -96,8 +96,8 @@ var/obj/item/bodypart/bodypart = host_mob.get_bodypart(picked_bodypart) var/can_scratch = !host_mob.incapacitated() && get_location_accessible(host_mob, picked_bodypart) - host_mob.visible_message("[can_scratch ? "[host_mob] scratches [host_mob.p_their()] [bodypart.name]." : ""]",\ - "My [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]") + host_mob.visible_message("[can_scratch ? span_warning("[host_mob] scratches [host_mob.p_their()] [bodypart.name].") : ""]",\ + span_warning("My [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]")) //Generic nerve-affecting programs will decay into this /datum/nanite_program/nerve_decay @@ -109,11 +109,11 @@ /datum/nanite_program/nerve_decay/active_effect() if(prob(5)) - to_chat(host_mob, "I feel unbalanced!") + to_chat(host_mob, span_warning("I feel unbalanced!")) host_mob.confused += 10 else if(prob(4)) - to_chat(host_mob, "I can't feel my hands!") + to_chat(host_mob, span_warning("I can't feel my hands!")) host_mob.drop_all_held_items() else if(prob(4)) - to_chat(host_mob, "I can't feel my legs!") + to_chat(host_mob, span_warning("I can't feel my legs!")) host_mob.Paralyze(30) diff --git a/code/modules/research/nanites/nanite_programs/suppression.dm b/code/modules/research/nanites/nanite_programs/suppression.dm index 51eb0eb09..824286be5 100644 --- a/code/modules/research/nanites/nanite_programs/suppression.dm +++ b/code/modules/research/nanites/nanite_programs/suppression.dm @@ -10,7 +10,7 @@ /datum/nanite_program/triggered/sleepy/trigger() if(!..()) return - to_chat(host_mob, "I start to feel very sleepy...") + to_chat(host_mob, span_warning("I start to feel very sleepy...")) host_mob.drowsyness += 20 addtimer(CALLBACK(host_mob, TYPE_PROC_REF(/mob/living, Sleeping), 200), rand(60,200)) @@ -25,11 +25,11 @@ /datum/nanite_program/paralyzing/enable_passive_effect() . = ..() - to_chat(host_mob, "My muscles seize! You can't move!") + to_chat(host_mob, span_warning("My muscles seize! You can't move!")) /datum/nanite_program/paralyzing/disable_passive_effect() . = ..() - to_chat(host_mob, "My muscles relax, and you can move again.") + to_chat(host_mob, span_notice("My muscles relax, and you can move again.")) /datum/nanite_program/triggered/shocking name = "Electric Shock" @@ -169,7 +169,7 @@ sent_message = sentence if(host_mob.stat == DEAD) return - to_chat(host_mob, "I feel compelled to speak...") + to_chat(host_mob, span_warning("I feel compelled to speak...")) host_mob.say(sent_message, forced = "nanite speech") /datum/nanite_program/triggered/comm/voice diff --git a/code/modules/research/nanites/nanite_programs/utility.dm b/code/modules/research/nanites/nanite_programs/utility.dm index 5174f1018..0c92a6ada 100644 --- a/code/modules/research/nanites/nanite_programs/utility.dm +++ b/code/modules/research/nanites/nanite_programs/utility.dm @@ -341,7 +341,7 @@ infectee.AddComponent(/datum/component/nanites, 5) SEND_SIGNAL(infectee, COMSIG_NANITE_SYNC, nanites) infectee.investigate_log("was infected by a nanite cluster by [key_name(host_mob)] at [AREACOORD(infectee)].", INVESTIGATE_NANITES) - to_chat(infectee, "I feel a tiny prick.") + to_chat(infectee, span_warning("I feel a tiny prick.")) /datum/nanite_program/mitosis name = "Mitosis" @@ -427,8 +427,8 @@ /datum/nanite_program/dermal_button/proc/press() if(activated) - host_mob.visible_message("[host_mob] presses a button on [host_mob.p_their()] forearm.", - "I press the nanite button on your forearm.", null, 2) + host_mob.visible_message(span_notice("[host_mob] presses a button on [host_mob.p_their()] forearm."), + span_notice("I press the nanite button on your forearm."), null, 2) SEND_SIGNAL(host_mob, COMSIG_NANITE_SIGNAL, sent_code, "a [name] program") /datum/action/innate/nanite_button diff --git a/code/modules/research/nanites/nanite_programs/weapon.dm b/code/modules/research/nanites/nanite_programs/weapon.dm index fef75ebe3..16ca7a6dd 100644 --- a/code/modules/research/nanites/nanite_programs/weapon.dm +++ b/code/modules/research/nanites/nanite_programs/weapon.dm @@ -14,7 +14,7 @@ else host_mob.adjustBruteLoss(1, TRUE) if(prob(3)) - to_chat(host_mob, "I feel a stab of pain from somewhere inside you.") + to_chat(host_mob, span_warning("I feel a stab of pain from somewhere inside you.")) /datum/nanite_program/poison name = "Poisoning" @@ -25,7 +25,7 @@ /datum/nanite_program/poison/active_effect() host_mob.adjustToxLoss(1) if(prob(2)) - to_chat(host_mob, "I feel nauseous.") + to_chat(host_mob, span_warning("I feel nauseous.")) if(iscarbon(host_mob)) var/mob/living/carbon/C = host_mob C.vomit(20) @@ -66,12 +66,12 @@ /datum/nanite_program/meltdown/enable_passive_effect() . = ..() - to_chat(host_mob, "My blood is burning!") + to_chat(host_mob, span_danger("My blood is burning!")) nanites.safety_threshold = 0 /datum/nanite_program/meltdown/disable_passive_effect() . = ..() - to_chat(host_mob, "My blood cools down, and the pain gradually fades.") + to_chat(host_mob, span_warning("My blood cools down, and the pain gradually fades.")) /datum/nanite_program/triggered/explosive name = "Chain Detonation" @@ -83,8 +83,8 @@ /datum/nanite_program/triggered/explosive/trigger() if(!..()) return - host_mob.visible_message("[host_mob] starts emitting a high-pitched buzzing, and [host_mob.p_their()] skin begins to glow...",\ - "I start emitting a high-pitched buzzing, and my skin begins to glow...") + host_mob.visible_message(span_warning("[host_mob] starts emitting a high-pitched buzzing, and [host_mob.p_their()] skin begins to glow..."),\ + span_danger("I start emitting a high-pitched buzzing, and my skin begins to glow...")) addtimer(CALLBACK(src, PROC_REF(boom)), CLAMP((nanites.nanite_volume * 0.35), 25, 150)) /datum/nanite_program/triggered/explosive/proc/boom() diff --git a/code/modules/research/nanites/nanite_remote.dm b/code/modules/research/nanites/nanite_remote.dm index 92910b9d3..adebade63 100644 --- a/code/modules/research/nanites/nanite_remote.dm +++ b/code/modules/research/nanites/nanite_remote.dm @@ -22,7 +22,7 @@ /obj/item/nanite_remote/examine(mob/user) . = ..() if(locked) - . += "Alt-click to unlock." + . += span_notice("Alt-click to unlock.") /obj/item/nanite_remote/AltClick(mob/user) . = ..() @@ -30,16 +30,16 @@ return if(locked) if(allowed(user)) - to_chat(user, "I unlock [src].") + to_chat(user, span_notice("I unlock [src].")) locked = FALSE update_icon() else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) /obj/item/nanite_remote/emag_act(mob/user) if(obj_flags & EMAGGED) return - to_chat(user, "I override [src]'s ID lock.") + to_chat(user, span_warning("I override [src]'s ID lock.")) obj_flags |= EMAGGED if(locked) locked = FALSE @@ -58,18 +58,18 @@ if(REMOTE_MODE_OFF) return if(REMOTE_MODE_SELF) - to_chat(user, "I activate [src], signaling the nanites in your bloodstream.") + to_chat(user, span_notice("I activate [src], signaling the nanites in your bloodstream.")) signal_mob(user, code, key_name(user)) if(REMOTE_MODE_TARGET) if(isliving(target) && (get_dist(target, get_turf(src)) <= 7)) - to_chat(user, "I activate [src], signaling the nanites inside [target].") + to_chat(user, span_notice("I activate [src], signaling the nanites inside [target].")) signal_mob(target, code, key_name(user)) if(REMOTE_MODE_AOE) - to_chat(user, "I activate [src], signaling the nanites inside every host around you.") + to_chat(user, span_notice("I activate [src], signaling the nanites inside every host around you.")) for(var/mob/living/L in view(user, 7)) signal_mob(L, code, key_name(user)) if(REMOTE_MODE_RELAY) - to_chat(user, "I activate [src], signaling all connected relay nanites.") + to_chat(user, span_notice("I activate [src], signaling all connected relay nanites.")) signal_relay(code, relay_code, key_name(user)) /obj/item/nanite_remote/proc/signal_mob(mob/living/M, code, source) @@ -177,18 +177,18 @@ if(REMOTE_MODE_OFF) return if(REMOTE_MODE_SELF) - to_chat(user, "I activate [src], signaling the nanites in your bloodstream.") + to_chat(user, span_notice("I activate [src], signaling the nanites in your bloodstream.")) signal_mob(user, comm_code, comm_message) if(REMOTE_MODE_TARGET) if(isliving(target) && (get_dist(target, get_turf(src)) <= 7)) - to_chat(user, "I activate [src], signaling the nanites inside [target].") + to_chat(user, span_notice("I activate [src], signaling the nanites inside [target].")) signal_mob(target, code, comm_message, key_name(user)) if(REMOTE_MODE_AOE) - to_chat(user, "I activate [src], signaling the nanites inside every host around you.") + to_chat(user, span_notice("I activate [src], signaling the nanites inside every host around you.")) for(var/mob/living/L in view(user, 7)) signal_mob(L, code, comm_message, key_name(user)) if(REMOTE_MODE_RELAY) - to_chat(user, "I activate [src], signaling all connected relay nanites.") + to_chat(user, span_notice("I activate [src], signaling all connected relay nanites.")) signal_relay(code, relay_code, comm_message, key_name(user)) /obj/item/nanite_remote/comm/signal_mob(mob/living/M, code, source) diff --git a/code/modules/research/nanites/public_chamber.dm b/code/modules/research/nanites/public_chamber.dm index 3dd60be2f..5346d6b22 100644 --- a/code/modules/research/nanites/public_chamber.dm +++ b/code/modules/research/nanites/public_chamber.dm @@ -114,7 +114,7 @@ /obj/machinery/public_nanite_chamber/proc/toggle_open(mob/user) if(panel_open) - to_chat(user, "Close the maintenance panel first.") + to_chat(user, span_notice("Close the maintenance panel first.")) return if(state_open) @@ -122,7 +122,7 @@ return else if(locked) - to_chat(user, "The bolts are locked down, securing the door shut.") + to_chat(user, span_notice("The bolts are locked down, securing the door shut.")) return open_machine() @@ -135,15 +135,15 @@ return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user.visible_message("I see [user] kicking against the door of [src]!", \ - "I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "I hear a metallic creaking from [src].") + user.visible_message(span_notice("I see [user] kicking against the door of [src]!"), \ + span_notice("I lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_hear("I hear a metallic creaking from [src].")) if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src || state_open || !locked || busy) return locked = FALSE - user.visible_message("[user] successfully broke out of [src]!", \ - "I successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("I successfully break out of [src]!")) open_machine() /obj/machinery/public_nanite_chamber/close_machine(mob/living/carbon/user, mob/living/attacker) @@ -179,7 +179,7 @@ if(user.stat || locked) if(message_cooldown <= world.time) message_cooldown = world.time + 50 - to_chat(user, "[src]'s door won't budge!") + to_chat(user, span_warning("[src]'s door won't budge!")) return open_machine() diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index a601ad9f1..b51d2cf8a 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -123,24 +123,24 @@ Nothing else in the console has ID requirements. if(istype(D, /obj/item/disk)) if(istype(D, /obj/item/disk/tech_disk)) if(t_disk) - to_chat(user, "A technology disk is already loaded!") + to_chat(user, span_warning("A technology disk is already loaded!")) return if(!user.transferItemToLoc(D, src)) - to_chat(user, "[D] is stuck to your hand!") + to_chat(user, span_warning("[D] is stuck to your hand!")) return t_disk = D else if (istype(D, /obj/item/disk/design_disk)) if(d_disk) - to_chat(user, "A design disk is already loaded!") + to_chat(user, span_warning("A design disk is already loaded!")) return if(!user.transferItemToLoc(D, src)) - to_chat(user, "[D] is stuck to your hand!") + to_chat(user, span_warning("[D] is stuck to your hand!")) return d_disk = D else - to_chat(user, "Machine cannot accept disks in that format.") + to_chat(user, span_warning("Machine cannot accept disks in that format.")) return - to_chat(user, "I insert [D] into \the [src]!") + to_chat(user, span_notice("I insert [D] into \the [src]!")) else if(!(linked_destroy && linked_destroy.busy) && !(linked_lathe && linked_lathe.busy) && !(linked_imprinter && linked_imprinter.busy)) . = ..() @@ -197,7 +197,7 @@ Nothing else in the console has ID requirements. /obj/machinery/computer/rdconsole/emag_act(mob/user) if(!(obj_flags & EMAGGED)) - to_chat(user, "I disable the security protocols[locked? " and unlock the console":""].") + to_chat(user, span_notice("I disable the security protocols[locked? " and unlock the console":""].")) playsound(src, "sparks", 75, TRUE) obj_flags |= EMAGGED locked = FALSE @@ -235,7 +235,7 @@ Nothing else in the console has ID requirements. l += "Available points:
[techweb_point_display_rdconsole(stored_research.research_points, stored_research.last_bitcoins)]" l += "Security protocols: [obj_flags & EMAGGED ? "Disabled" : "Enabled"]" l += "Main Menu | Back[RDSCREEN_NOBREAK]" - l += "[ui_mode == 1? "Normal View" : "Normal View"] | [ui_mode == 2? "Expert View" : "Expert View"] | [ui_mode == 3? "List View" : "List View"]" + l += "[ui_mode == 1? span_linkon("Normal View") : "Normal View"] | [ui_mode == 2? span_linkon("Expert View") : "Expert View"] | [ui_mode == 3? span_linkon("List View") : "List View"]" return l /obj/machinery/computer/rdconsole/proc/ui_main_menu() @@ -309,7 +309,7 @@ Nothing else in the console has ID requirements. var/t = linked_lathe.check_mat(D, M) temp_material += " | " if (t < 1) - temp_material += "[all_materials[M]/coeff] [CallMaterialName(M)]" + temp_material += span_bad("[all_materials[M]/coeff] [CallMaterialName(M)]") else temp_material += " [all_materials[M]/coeff] [CallMaterialName(M)]" c = min(c,t) @@ -362,7 +362,7 @@ Nothing else in the console has ID requirements. var/t = linked_lathe.check_mat(D, M) temp_material += " | " if (t < 1) - temp_material += "[all_materials[M]/coeff] [CallMaterialName(M)]" + temp_material += span_bad("[all_materials[M]/coeff] [CallMaterialName(M)]") else temp_material += " [all_materials[M]/coeff] [CallMaterialName(M)]" c = min(c,t) @@ -596,14 +596,14 @@ Nothing else in the console has ID requirements. l += "
[RDSCREEN_NOBREAK]" if (stored_research.researched_nodes[N.id]) // already researched - l += "[N.display_name]" + l += span_linkoff("[N.display_name]") l += "This node has already been researched." else if(!length(worth)) // reveal only if (stored_research.hidden_nodes[N.id]) l += "[N.display_name]" l += "This node will be revealed." else - l += "[N.display_name]" + l += span_linkoff("[N.display_name]") l += "This node has already been revealed." else // boost by the difference var/list/differences = list() @@ -617,7 +617,7 @@ Nothing else in the console has ID requirements. l += "[N.display_name]" l += "This node will be boosted with the following:
[techweb_point_display_generic(differences)]" else - l += "[N.display_name]" + l += span_linkoff("[N.display_name]") l += "This node has already been boosted." l += "
[RDSCREEN_NOBREAK]" @@ -627,7 +627,7 @@ Nothing else in the console has ID requirements. anything = TRUE l += "
[RDSCREEN_NOBREAK]" if (stored_research.deconstructed_items[linked_destroy.loaded_item.type]) - l += "Point Deconstruction" + l += span_linkoff("Point Deconstruction") l += "This item's points have already been claimed." else l += "Point Deconstruction" @@ -686,7 +686,7 @@ Nothing else in the console has ID requirements. for(var/datum/techweb_node/N in avail) var/not_unlocked = (stored_research.available_nodes[N.id] && !stored_research.researched_nodes[N.id]) var/has_points = (stored_research.can_afford(N.get_price(stored_research))) - var/research_href = not_unlocked? (has_points? "Research" : "Not Enough Points") : null + var/research_href = not_unlocked? (has_points? "Research" : span_linkoffbad("Not Enough Points")) : null l += "[N.display_name][research_href]" l += "

Locked Nodes:

" for(var/datum/techweb_node/N in unavail) @@ -712,7 +712,7 @@ Nothing else in the console has ID requirements. l += "
[node.description]" else if(stored_research.researched_nodes[node.id]) - l += "Researched" + l += span_linkoff("Researched") else if(stored_research.available_nodes[node.id]) if(stored_research.can_afford(node.get_price(stored_research))) l += "
[node.price_display(stored_research)]" @@ -865,17 +865,17 @@ Nothing else in the console has ID requirements. ui_mode = text2num(ls["ui_mode"]) if(ls["lock_console"]) if(obj_flags & EMAGGED) - to_chat(usr, "Security protocol error: Unable to lock.") + to_chat(usr, span_boldwarning("Security protocol error: Unable to lock.")) return if(allowed(usr)) lock_console(usr) else - to_chat(usr, "Unauthorized Access.") + to_chat(usr, span_boldwarning("Unauthorized Access.")) if(ls["unlock_console"]) if(allowed(usr)) unlock_console(usr) else - to_chat(usr, "Unauthorized Access.") + to_chat(usr, span_boldwarning("Unauthorized Access.")) if(ls["find_device"]) SyncRDevices() say("Resynced with nearby devices.") @@ -1049,7 +1049,7 @@ Nothing else in the console has ID requirements. say("No Destructive Analyzer Linked!") return if(linked_destroy.busy) - to_chat(usr, "The destructive analyzer is busy at the moment.") + to_chat(usr, span_danger("The destructive analyzer is busy at the moment.")) else if(linked_destroy.loaded_item) linked_destroy.unload_item() screen = RDSCREEN_MENU diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 0dc56cd5b..39aacf541 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -65,25 +65,25 @@ //whether the machine can have an item inserted in its current state. /obj/machinery/rnd/proc/is_insertion_ready(mob/user) if(panel_open) - to_chat(user, "I can't load [src] while it's opened!") + to_chat(user, span_warning("I can't load [src] while it's opened!")) return FALSE if(disabled) - to_chat(user, "The insertion belts of [src] won't engage!") + to_chat(user, span_warning("The insertion belts of [src] won't engage!")) return FALSE if(requires_console && !linked_console) - to_chat(user, "[src] must be linked to an R&D console first!") + to_chat(user, span_warning("[src] must be linked to an R&D console first!")) return FALSE if(busy) - to_chat(user, "[src] is busy right now.") + to_chat(user, span_warning("[src] is busy right now.")) return FALSE if(stat & BROKEN) - to_chat(user, "[src] is broken.") + to_chat(user, span_warning("[src] is broken.")) return FALSE if(stat & NOPOWER) - to_chat(user, "[src] has no power.") + to_chat(user, span_warning("[src] has no power.")) return FALSE if(loaded_item) - to_chat(user, "[src] is already loaded.") + to_chat(user, span_warning("[src] is already loaded.")) return FALSE return TRUE diff --git a/code/modules/research/research_disk.dm b/code/modules/research/research_disk.dm index 49c9b39b5..7a911cc22 100644 --- a/code/modules/research/research_disk.dm +++ b/code/modules/research/research_disk.dm @@ -45,7 +45,7 @@ /obj/item/research_notes/examine(mob/user) . = ..() - . += "It is worth [value] research points." + . += span_notice("It is worth [value] research points.") /// proc that changes name and icon depending on value /obj/item/research_notes/proc/change_vol() diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index b0f9371dd..270d55bfc 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -154,7 +154,7 @@ var/obj/machinery/rnd/server/S = locate(href_list["toggle"]) in SSresearch.servers S.toggle_disable() else - to_chat(usr, "Access Denied.") + to_chat(usr, span_danger("Access Denied.")) updateUsrDialog() return @@ -199,4 +199,4 @@ return playsound(src, "sparks", 75, TRUE) obj_flags |= EMAGGED - to_chat(user, "I disable the security protocols.") + to_chat(user, span_notice("I disable the security protocols.")) diff --git a/code/modules/research/xenobiology/crossbreeding/__corecross.dm b/code/modules/research/xenobiology/crossbreeding/__corecross.dm index de7fb7db0..b675edbb6 100644 --- a/code/modules/research/xenobiology/crossbreeding/__corecross.dm +++ b/code/modules/research/xenobiology/crossbreeding/__corecross.dm @@ -41,7 +41,7 @@ To add a crossbreed: /obj/item/slimecross/examine(mob/user) . = ..() if(effect_desc) - . += "[effect_desc]" + . += span_notice("[effect_desc]") /obj/item/slimecross/Initialize() . = ..() @@ -113,7 +113,7 @@ To add a crossbreed: /obj/item/slimecrossbeaker/process() if(!reagents.total_volume) - visible_message("[src] has been drained completely, and melts away.") + visible_message(span_notice("[src] has been drained completely, and melts away.")) qdel(src) /obj/item/slimecrossbeaker/bloodpack //Pack of 50u blood. Deletes on empty. @@ -144,22 +144,22 @@ To add a crossbreed: /obj/item/slimecrossbeaker/autoinjector/attack(mob/living/M, mob/user) if(!reagents.total_volume) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return if(!iscarbon(M)) return if(self_use_only && M != user) - to_chat(user, "This can only be used on myself.") + to_chat(user, span_warning("This can only be used on myself.")) return if(reagents.total_volume && (ignore_flags || M.can_inject(user, 1))) reagents.trans_to(M, reagents.total_volume, transfered_by = user) if(user != M) - to_chat(M, "[user] presses [src] against you!") - to_chat(user, "I press [src] against [M], injecting [M.p_them()].") + to_chat(M, span_warning("[user] presses [src] against you!")) + to_chat(user, span_notice("I press [src] against [M], injecting [M.p_them()].")) else - to_chat(user, "I press [src] against yourself, and it flattens against you!") + to_chat(user, span_notice("I press [src] against yourself, and it flattens against you!")) else - to_chat(user, "There's no place to stick [src]!") + to_chat(user, span_warning("There's no place to stick [src]!")) /obj/item/slimecrossbeaker/autoinjector/regenpack ignore_flags = TRUE //It is, after all, intended to heal. diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm index b1493ff5a..c27d1e8c2 100644 --- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm +++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm @@ -58,7 +58,7 @@ Slimecrossing Armor set_light(5) /obj/structure/light_prism/attack_hand(mob/user) - to_chat(user, "I dispel [src].") + to_chat(user, span_notice("I dispel [src].")) qdel(src) /datum/action/item_action/change_prism_colour @@ -85,13 +85,13 @@ Slimecrossing Armor return var/obj/item/clothing/glasses/prism_glasses/glasses = target if(locate(/obj/structure/light_prism) in get_turf(owner)) - to_chat(owner, "There isn't enough ambient energy to fabricate another light prism here.") + to_chat(owner, span_warning("There isn't enough ambient energy to fabricate another light prism here.")) return if(istype(glasses)) if(!glasses.glasses_color) - to_chat(owner, "The lens is oddly opaque...") + to_chat(owner, span_warning("The lens is oddly opaque...")) return - to_chat(owner, "I channel nearby light into a glowing, ethereal prism.") + to_chat(owner, span_notice("I channel nearby light into a glowing, ethereal prism.")) new /obj/structure/light_prism(get_turf(owner), glasses.glasses_color) /obj/item/clothing/head/peaceflower @@ -122,7 +122,7 @@ Slimecrossing Armor if(iscarbon(user)) var/mob/living/carbon/C = user if(src == C.head) - to_chat(user, "I feel at peace. Why would you want anything else?") + to_chat(user, span_warning("I feel at peace. Why would you want anything else?")) return return ..() diff --git a/code/modules/research/xenobiology/crossbreeding/_misc.dm b/code/modules/research/xenobiology/crossbreeding/_misc.dm index edb2a4bf1..69c7a6a4a 100644 --- a/code/modules/research/xenobiology/crossbreeding/_misc.dm +++ b/code/modules/research/xenobiology/crossbreeding/_misc.dm @@ -108,11 +108,11 @@ Slimecrossing Items /obj/item/barriercube/attack_self(mob/user) if(locate(/obj/structure/barricade/slime) in get_turf(loc)) - to_chat(user, "I can't fit more than one barrier in the same space!") + to_chat(user, span_warning("I can't fit more than one barrier in the same space!")) return - to_chat(user, "I squeeze [src].") + to_chat(user, span_notice("I squeeze [src].")) var/obj/B = new /obj/structure/barricade/slime(get_turf(loc)) - B.visible_message("[src] suddenly grows into a large, gelatinous barrier!") + B.visible_message(span_warning("[src] suddenly grows into a large, gelatinous barrier!")) qdel(src) //Slime barricade - Chilling Grey @@ -157,7 +157,7 @@ Slimecrossing Items if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.mind && !HAS_TRAIT(H, TRAIT_AGEUSIA)) - to_chat(H,"That didn't taste very good...") //No disgust, though. It's just not good tasting. + to_chat(H,span_notice("That didn't taste very good...")) //No disgust, though. It's just not good tasting. SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food) last_check_time = world.time return @@ -193,37 +193,37 @@ Slimecrossing Items /obj/item/capturedevice/attack(mob/living/M, mob/user) if(length(contents)) - to_chat(user, "The device already has something inside.") + to_chat(user, span_warning("The device already has something inside.")) return if(!isanimal(M)) - to_chat(user, "The capture device only works on simple creatures.") + to_chat(user, span_warning("The capture device only works on simple creatures.")) return if(M.mind) - to_chat(user, "I offer the device to [M].") + to_chat(user, span_notice("I offer the device to [M].")) if(alert(M, "Would you like to enter [user]'s capture device?", "Gold Capture Device", "Yes", "No") == "Yes") if(user.canUseTopic(src, BE_CLOSE) && user.canUseTopic(M, BE_CLOSE)) - to_chat(user, "I store [M] in the capture device.") - to_chat(M, "The world warps around you, and you're suddenly in an endless void, with a window to the outside floating in front of you.") + to_chat(user, span_notice("I store [M] in the capture device.")) + to_chat(M, span_notice("The world warps around you, and you're suddenly in an endless void, with a window to the outside floating in front of you.")) store(M, user) else - to_chat(user, "I were too far away from [M].") - to_chat(M, "I were too far away from [user].") + to_chat(user, span_warning("I were too far away from [M].")) + to_chat(M, span_warning("I were too far away from [user].")) else - to_chat(user, "[M] refused to enter the device.") + to_chat(user, span_warning("[M] refused to enter the device.")) return else if(istype(M, /mob/living/simple_animal/hostile) && !("neutral" in M.faction)) - to_chat(user, "This creature is too aggressive to capture.") + to_chat(user, span_warning("This creature is too aggressive to capture.")) return - to_chat(user, "I store [M] in the capture device.") + to_chat(user, span_notice("I store [M] in the capture device.")) store(M) /obj/item/capturedevice/attack_self(mob/user) if(contents.len) - to_chat(user, "I open the capture device!") + to_chat(user, span_notice("I open the capture device!")) release() else - to_chat(user, "The device is empty...") + to_chat(user, span_warning("The device is empty...")) /obj/item/capturedevice/proc/store(mob/living/M) M.forceMove(src) diff --git a/code/modules/research/xenobiology/crossbreeding/_mobs.dm b/code/modules/research/xenobiology/crossbreeding/_mobs.dm index 57c50f933..9691133e2 100644 --- a/code/modules/research/xenobiology/crossbreeding/_mobs.dm +++ b/code/modules/research/xenobiology/crossbreeding/_mobs.dm @@ -27,7 +27,7 @@ Slimecrossing Mobs /mob/living/simple_animal/slime/transformedslime /mob/living/simple_animal/slime/transformedslime/Reproduce() //Just in case. - to_chat(src, "I can't reproduce...") + to_chat(src, span_warning("I can't reproduce...")) return //Slime corgi - Chilling Pink diff --git a/code/modules/research/xenobiology/crossbreeding/_potions.dm b/code/modules/research/xenobiology/crossbreeding/_potions.dm index 875261014..37a91d9f9 100644 --- a/code/modules/research/xenobiology/crossbreeding/_potions.dm +++ b/code/modules/research/xenobiology/crossbreeding/_potions.dm @@ -17,18 +17,18 @@ Slimecrossing Potions if(istype(target, /obj/item/reagent_containers)) return ..(target, user, proximity) if(istype(target, /obj/item/slimecross)) - to_chat(user, "[target] is too complex for the potion to clone!") + to_chat(user, span_warning("[target] is too complex for the potion to clone!")) return if(!istype(target, /obj/item/slime_extract)) return var/obj/item/slime_extract/S = target if(S.recurring) - to_chat(user, "[target] is too complex for the potion to clone!") + to_chat(user, span_warning("[target] is too complex for the potion to clone!")) return var/path = S.type var/obj/item/slime_extract/C = new path(get_turf(target)) C.Uses = S.Uses - to_chat(user, "I pour the potion onto [target], and the fluid solidifies into a copy of it!") + to_chat(user, span_notice("I pour the potion onto [target], and the fluid solidifies into a copy of it!")) qdel(src) return @@ -41,24 +41,24 @@ Slimecrossing Potions /obj/item/slimepotion/peacepotion/attack(mob/living/M, mob/user) if(!isliving(M) || M.stat == DEAD) - to_chat(user, "The pacification potion only works on the living.") + to_chat(user, span_warning("The pacification potion only works on the living.")) return ..() if(istype(M, /mob/living/simple_animal/hostile/megafauna)) - to_chat(user, "The pacification potion does not work on beings of pure evil!") + to_chat(user, span_warning("The pacification potion does not work on beings of pure evil!")) return ..() if(M != user) - M.visible_message("[user] starts to feed [M] a pacification potion!", - "[user] starts to feed you a pacification!") + M.visible_message(span_danger("[user] starts to feed [M] a pacification potion!"), + span_danger("[user] starts to feed you a pacification!")) else - M.visible_message("[user] starts to drink the pacification potion!", - "I start to drink the pacification potion!") + M.visible_message(span_danger("[user] starts to drink the pacification potion!"), + span_danger("I start to drink the pacification potion!")) if(!do_after(user, 100, target = M)) return if(M != user) - to_chat(user, "I feed [M] the pacification potion!") + to_chat(user, span_notice("I feed [M] the pacification potion!")) else - to_chat(user, "I drink the pacification potion!") + to_chat(user, span_warning("I drink the pacification potion!")) if(isanimal(M)) ADD_TRAIT(M, TRAIT_PACIFISM, MAGIC_TRAIT) else if(iscarbon(M)) @@ -75,25 +75,25 @@ Slimecrossing Potions /obj/item/slimepotion/lovepotion/attack(mob/living/M, mob/user) if(!isliving(M) || M.stat == DEAD) - to_chat(user, "The love potion only works on living things, sicko!") + to_chat(user, span_warning("The love potion only works on living things, sicko!")) return ..() if(istype(M, /mob/living/simple_animal/hostile/megafauna)) - to_chat(user, "The love potion does not work on beings of pure evil!") + to_chat(user, span_warning("The love potion does not work on beings of pure evil!")) return ..() if(user == M) - to_chat(user, "I can't drink the love potion. What are you, a narcissist?") + to_chat(user, span_warning("I can't drink the love potion. What are you, a narcissist?")) return ..() if(M.has_status_effect(STATUS_EFFECT_INLOVE)) - to_chat(user, "[M] is already lovestruck!") + to_chat(user, span_warning("[M] is already lovestruck!")) return ..() - M.visible_message("[user] starts to feed [M] a love potion!", - "[user] starts to feed you a love potion!") + M.visible_message(span_danger("[user] starts to feed [M] a love potion!"), + span_danger("[user] starts to feed you a love potion!")) if(!do_after(user, 50, target = M)) return - to_chat(user, "I feed [M] the love potion!") - to_chat(M, "I develop feelings for [user], and anyone [user.p_they()] like.") + to_chat(user, span_notice("I feed [M] the love potion!")) + to_chat(M, span_notice("I develop feelings for [user], and anyone [user.p_they()] like.")) if(M.mind) M.mind.store_memory("You are in love with [user].") M.faction |= "[REF(user)]" @@ -116,12 +116,12 @@ Slimecrossing Potions if(!proximity) return if(!istype(C)) - to_chat(user, "The potion can only be used on clothing!") + to_chat(user, span_warning("The potion can only be used on clothing!")) return if(C.min_cold_protection_temperature == SPACE_SUIT_MIN_TEMP_PROTECT && C.clothing_flags & STOPSPRESSUREDAMAGE) - to_chat(user, "The [C] is already pressure-resistant!") + to_chat(user, span_warning("The [C] is already pressure-resistant!")) return ..() - to_chat(user, "I slather the blue gunk over the [C], making it airtight.") + to_chat(user, span_notice("I slather the blue gunk over the [C], making it airtight.")) C.name = "pressure-resistant [C.name]" C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) C.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY) @@ -156,9 +156,9 @@ Slimecrossing Potions if(!proximity) return ..() if(!istype(C)) - to_chat(user, "I can't coat this with lavaproofing fluid!") + to_chat(user, span_warning("I can't coat this with lavaproofing fluid!")) return ..() - to_chat(user, "I slather the red gunk over the [C], making it lavaproof.") + to_chat(user, span_notice("I slather the red gunk over the [C], making it lavaproof.")) C.name = "lavaproof [C.name]" C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) C.add_atom_colour("#800000", FIXED_COLOUR_PRIORITY) @@ -179,16 +179,16 @@ Slimecrossing Potions /obj/item/slimepotion/slime_reviver/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M)) - to_chat(user, "The potion only works on slimes!") + to_chat(user, span_warning("The potion only works on slimes!")) return ..() if(M.stat != DEAD) - to_chat(user, "The slime is still alive!") + to_chat(user, span_warning("The slime is still alive!")) return if(M.maxHealth <= 0) - to_chat(user, "The slime is too unstable to return!") + to_chat(user, span_warning("The slime is too unstable to return!")) M.revive(full_heal = TRUE, admin_revive = FALSE) M.stat = CONSCIOUS - M.visible_message("[M] is filled with renewed vigor and blinks awake!") + M.visible_message(span_notice("[M] is filled with renewed vigor and blinks awake!")) M.maxHealth -= 10 //Revival isn't healthy. M.health -= 10 M.regenerate_icons() @@ -203,15 +203,15 @@ Slimecrossing Potions /obj/item/slimepotion/slime/chargedstabilizer/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M)) - to_chat(user, "The stabilizer only works on slimes!") + to_chat(user, span_warning("The stabilizer only works on slimes!")) return ..() if(M.stat) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return if(M.mutation_chance == 0) - to_chat(user, "The slime already has no chance of mutating!") + to_chat(user, span_warning("The slime already has no chance of mutating!")) return - to_chat(user, "I feed the slime the omnistabilizer. It will not mutate this cycle!") + to_chat(user, span_notice("I feed the slime the omnistabilizer. It will not mutate this cycle!")) M.mutation_chance = 0 qdel(src) diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 1b6182181..49c5d2e0f 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -12,8 +12,8 @@ /datum/status_effect/rainbow_protection/on_apply() owner.status_flags |= GODMODE ADD_TRAIT(owner, TRAIT_PACIFISM, /datum/status_effect/rainbow_protection) - owner.visible_message("[owner] shines with a brilliant rainbow light.", - "I feel protected by an unknown force!") + owner.visible_message(span_warning("[owner] shines with a brilliant rainbow light."), + span_notice("I feel protected by an unknown force!")) originalcolor = owner.color return ..() @@ -25,8 +25,8 @@ owner.status_flags &= ~GODMODE owner.color = originalcolor REMOVE_TRAIT(owner, TRAIT_PACIFISM, /datum/status_effect/rainbow_protection) - owner.visible_message("[owner] stops glowing, the rainbow light fading away.", - "I no longer feel protected...") + owner.visible_message(span_notice("[owner] stops glowing, the rainbow light fading away."), + span_warning("I no longer feel protected...")) /atom/movable/screen/alert/status_effect/slimeskin name = "Adamantine Slimeskin" @@ -45,8 +45,8 @@ if(ishuman(owner)) var/mob/living/carbon/human/H = owner H.physiology.damage_resistance += 10 - owner.visible_message("[owner] is suddenly covered in a strange, blue-ish gel!", - "I are covered in a thick, rubbery gel.") + owner.visible_message(span_warning("[owner] is suddenly covered in a strange, blue-ish gel!"), + span_notice("I are covered in a thick, rubbery gel.")) return ..() /datum/status_effect/slimeskin/on_remove() @@ -54,8 +54,8 @@ if(ishuman(owner)) var/mob/living/carbon/human/H = owner H.physiology.damage_resistance -= 10 - owner.visible_message("[owner]'s gel coating liquefies and dissolves away.", - "My gel second-skin dissolves!") + owner.visible_message(span_warning("[owner]'s gel coating liquefies and dissolves away."), + span_notice("My gel second-skin dissolves!")) /datum/status_effect/slimerecall id = "slime_recall" @@ -67,8 +67,8 @@ /datum/status_effect/slimerecall/on_apply() RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(resistField)) - to_chat(owner, "I feel a sudden tug from an unknown force, and feel a pull to bluespace!") - to_chat(owner, "Resist if you wish avoid the force!") + to_chat(owner, span_danger("I feel a sudden tug from an unknown force, and feel a pull to bluespace!")) + to_chat(owner, span_notice("Resist if you wish avoid the force!")) bluespace = icon('icons/effects/effects.dmi',"chronofield") owner.add_overlay(bluespace) return ..() @@ -80,10 +80,10 @@ UnregisterSignal(owner, COMSIG_LIVING_RESIST) owner.cut_overlay(bluespace) if(interrupted || !ismob(target)) - to_chat(owner, "The bluespace tug fades away, and you feel that the force has passed you by.") + to_chat(owner, span_warning("The bluespace tug fades away, and you feel that the force has passed you by.")) return - owner.visible_message("[owner] disappears in a flurry of sparks!", - "The unknown force snatches briefly you from reality, and deposits you next to [target]!") + owner.visible_message(span_warning("[owner] disappears in a flurry of sparks!"), + span_warning("The unknown force snatches briefly you from reality, and deposits you next to [target]!")) do_sparks(3, TRUE, owner) owner.forceMove(target.loc) @@ -346,7 +346,7 @@ datum/status_effect/rebreathing/tick() huggables += L if(length(huggables)) var/mob/living/carbon/hugged = pick(huggables) - owner.visible_message("[owner] hugs [hugged]!", "I hug [hugged]!") + owner.visible_message(span_notice("[owner] hugs [hugged]!"), span_notice("I hug [hugged]!")) /datum/status_effect/tarcookie id = "tarcookie" @@ -462,7 +462,7 @@ datum/status_effect/rebreathing/tick() /datum/status_effect/stabilized/grey/tick() for(var/mob/living/simple_animal/slime/S in range(1, get_turf(owner))) if(!(owner in S.Friends)) - to_chat(owner, "[linked_extract] pulses gently as it communicates with [S].") + to_chat(owner, span_notice("[linked_extract] pulses gently as it communicates with [S].")) S.Friends[owner] = 1 return ..() @@ -491,7 +491,7 @@ datum/status_effect/rebreathing/tick() owner.adjustToxLoss(-0.2, forced = TRUE) //Slimepeople should also get healed. is_healing = TRUE if(is_healing) - examine_text = "SUBJECTPRONOUN is regenerating slowly, purplish goo filling in small injuries!" + examine_text = span_warning("SUBJECTPRONOUN is regenerating slowly, purplish goo filling in small injuries!") new /obj/effect/temp_visual/heal(get_turf(owner), "#FF0000") else examine_text = null @@ -527,7 +527,7 @@ datum/status_effect/stabilized/blue/on_remove() if(sheets.len > 0) var/obj/item/stack/sheet/S = pick(sheets) S.amount++ - to_chat(owner, "[linked_extract] adds a layer of slime to [S], which metamorphosizes into another sheet of material!") + to_chat(owner, span_notice("[linked_extract] adds a layer of slime to [S], which metamorphosizes into another sheet of material!")) return ..() @@ -536,7 +536,7 @@ datum/status_effect/stabilized/blue/on_remove() colour = "yellow" var/cooldown = 10 var/max_cooldown = 10 - examine_text = "Nearby electronics seem just a little more charged wherever SUBJECTPRONOUN goes." + examine_text = span_warning("Nearby electronics seem just a little more charged wherever SUBJECTPRONOUN goes.") /datum/status_effect/stabilized/yellow/tick() if(cooldown > 0) @@ -550,7 +550,7 @@ datum/status_effect/stabilized/blue/on_remove() if(batteries.len) var/obj/item/stock_parts/cell/ToCharge = pick(batteries) ToCharge.charge += min(ToCharge.maxcharge - ToCharge.charge, ToCharge.maxcharge/10) //10% of the cell, or to maximum. - to_chat(owner, "[linked_extract] discharges some energy into a device you have.") + to_chat(owner, span_notice("[linked_extract] discharges some energy into a device you have.")) return ..() /obj/item/hothands @@ -564,7 +564,7 @@ datum/status_effect/stabilized/blue/on_remove() id = "stabilizeddarkpurple" colour = "dark purple" var/obj/item/hothands/fire - examine_text = "Their fingertips burn brightly!" + examine_text = span_notice("Their fingertips burn brightly!") /datum/status_effect/stabilized/darkpurple/on_apply() ADD_TRAIT(owner, TRAIT_RESISTHEATHANDS, "slimestatus") @@ -576,7 +576,7 @@ datum/status_effect/stabilized/blue/on_remove() var/obj/item/reagent_containers/food/snacks/F = I if(istype(F)) if(F.cooked_type) - to_chat(owner, "[linked_extract] flares up brightly, and my hands alone are enough cook [F]!") + to_chat(owner, span_warning("[linked_extract] flares up brightly, and my hands alone are enough cook [F]!")) var/obj/item/result = F.microwave_act() if(istype(result)) owner.put_in_hands(result) @@ -596,25 +596,25 @@ datum/status_effect/stabilized/blue/on_remove() if(owner.fire_stacks > 0 && prob(80)) owner.fire_stacks-- if(owner.fire_stacks <= 0) - to_chat(owner, "[linked_extract] coats you in a watery goo, extinguishing the flames.") + to_chat(owner, span_notice("[linked_extract] coats you in a watery goo, extinguishing the flames.")) var/obj/O = owner.get_active_held_item() if(O) O.extinguish() //All shamelessly copied from water's reaction_obj, since I didn't seem to be able to get it here for some reason. O.acid_level = 0 // Monkey cube if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube)) - to_chat(owner, "[linked_extract] kept my hands wet! It makes [O] expand!") + to_chat(owner, span_warning("[linked_extract] kept my hands wet! It makes [O] expand!")) var/obj/item/reagent_containers/food/snacks/monkeycube/cube = O cube.Expand() // Dehydrated carp else if(istype(O, /obj/item/toy/plush/carpplushie/dehy_carp)) - to_chat(owner, "[linked_extract] kept my hands wet! It makes [O] expand!") + to_chat(owner, span_warning("[linked_extract] kept my hands wet! It makes [O] expand!")) var/obj/item/toy/plush/carpplushie/dehy_carp/dehy = O dehy.Swell() // Makes a carp else if(istype(O, /obj/item/stack/sheet/hairlesshide)) - to_chat(owner, "[linked_extract] kept my hands wet! It wets [O]!") + to_chat(owner, span_warning("[linked_extract] kept my hands wet! It wets [O]!")) var/obj/item/stack/sheet/hairlesshide/HH = O new /obj/item/stack/sheet/wetleather(get_turf(HH), HH.amount) qdel(HH) @@ -662,7 +662,7 @@ datum/status_effect/stabilized/blue/on_remove() linked_alert.icon_state = "slime_bluespace_on" if(healthcheck && (healthcheck - owner.health) > 5) - owner.visible_message("[linked_extract] notices the sudden change in [owner]'s physical health, and activates!") + owner.visible_message(span_warning("[linked_extract] notices the sudden change in [owner]'s physical health, and activates!")) do_sparks(5,FALSE,owner) var/F = find_safe_turf(zlevels = owner.z, extended_safety_checks = TRUE) var/range = 0 @@ -670,7 +670,7 @@ datum/status_effect/stabilized/blue/on_remove() F = get_turf(owner) range = 50 if(do_teleport(owner, F, range, channel = TELEPORT_CHANNEL_BLUESPACE)) - to_chat(owner, "[linked_extract] will take some time to re-align you on the bluespace axis.") + to_chat(owner, span_notice("[linked_extract] will take some time to re-align you on the bluespace axis.")) do_sparks(5,FALSE,owner) owner.apply_status_effect(/datum/status_effect/bluespacestabilization) healthcheck = owner.health @@ -713,20 +713,20 @@ datum/status_effect/stabilized/blue/on_remove() /datum/status_effect/stabilized/cerulean/tick() if(owner.stat == DEAD) if(clone && clone.stat != DEAD) - owner.visible_message("[owner] blazes with brilliant light, [linked_extract] whisking [owner.p_their()] soul away.", - "I feel a warm glow from [linked_extract], and you open my eyes... elsewhere.") + owner.visible_message(span_warning("[owner] blazes with brilliant light, [linked_extract] whisking [owner.p_their()] soul away."), + span_notice("I feel a warm glow from [linked_extract], and you open my eyes... elsewhere.")) if(owner.mind) owner.mind.transfer_to(clone) clone = null qdel(linked_extract) if(!clone || clone.stat == DEAD) - to_chat(owner, "[linked_extract] desperately tries to move my soul to a living body, but can't find one!") + to_chat(owner, span_notice("[linked_extract] desperately tries to move my soul to a living body, but can't find one!")) qdel(linked_extract) ..() /datum/status_effect/stabilized/cerulean/on_remove() if(clone) - clone.visible_message("[clone] dissolves into a puddle of goo!") + clone.visible_message(span_warning("[clone] dissolves into a puddle of goo!")) clone.unequip_everything() qdel(clone) @@ -764,7 +764,7 @@ datum/status_effect/stabilized/blue/on_remove() var/originalname /datum/status_effect/stabilized/green/on_apply() - to_chat(owner, "I feel different...") + to_chat(owner, span_warning("I feel different...")) if(ishuman(owner)) var/mob/living/carbon/human/H = owner originalDNA = new H.dna.type @@ -775,13 +775,13 @@ datum/status_effect/stabilized/blue/on_remove() /datum/status_effect/stabilized/green/tick() //Only occasionally give examiners a warning. if(prob(50)) - examine_text = "SUBJECTPRONOUN looks a bit green and gooey..." + examine_text = span_warning("SUBJECTPRONOUN looks a bit green and gooey...") else examine_text = null return ..() /datum/status_effect/stabilized/green/on_remove() - to_chat(owner, "I feel more like myself.") + to_chat(owner, span_notice("I feel more like myself.")) if(ishuman(owner)) var/mob/living/carbon/human/H = owner originalDNA.transfer_identity(H) @@ -837,9 +837,9 @@ datum/status_effect/stabilized/blue/on_remove() if(HasFaction && owner.has_status_effect(/datum/status_effect/brokenpeace)) owner.faction -= faction_name - to_chat(owner, "The peace has been broken! Hostile creatures will now react to you!") + to_chat(owner, span_danger("The peace has been broken! Hostile creatures will now react to you!")) if(!HasFaction && !owner.has_status_effect(/datum/status_effect/brokenpeace)) - to_chat(owner, "[linked_extract] pulses, generating a fragile aura of peace.") + to_chat(owner, span_notice("[linked_extract] pulses, generating a fragile aura of peace.")) owner.faction |= faction_name return ..() @@ -854,7 +854,7 @@ datum/status_effect/stabilized/blue/on_remove() /datum/status_effect/stabilized/oil id = "stabilizedoil" colour = "oil" - examine_text = "SUBJECTPRONOUN smells of sulfer and oil!" + examine_text = span_warning("SUBJECTPRONOUN smells of sulfer and oil!") /datum/status_effect/stabilized/oil/tick() if(owner.stat == DEAD) @@ -873,10 +873,10 @@ datum/status_effect/stabilized/blue/on_remove() if(M.stat == DEAD) return if(!messagedelivered) - to_chat(owner,"I feel my hands melt around [M]'s neck and start to drain [M.p_them()] of life.") - to_chat(owner.pulling, "[owner]'s hands melt around my neck, and you can feel my life starting to drain away!") + to_chat(owner,span_notice("I feel my hands melt around [M]'s neck and start to drain [M.p_them()] of life.")) + to_chat(owner.pulling, span_danger("[owner]'s hands melt around my neck, and you can feel my life starting to drain away!")) messagedelivered = TRUE - examine_text = "SUBJECTPRONOUN is draining health from [owner.pulling]!" + examine_text = span_warning("SUBJECTPRONOUN is draining health from [owner.pulling]!") var/list/healing_types = list() if(owner.getBruteLoss() > 0) healing_types += BRUTE @@ -916,7 +916,7 @@ datum/status_effect/stabilized/blue/on_remove() /datum/status_effect/stabilized/adamantine id = "stabilizedadamantine" colour = "adamantine" - examine_text = "SUBJECTPRONOUN has a strange metallic coating on their skin." + examine_text = span_warning("SUBJECTPRONOUN has a strange metallic coating on their skin.") /datum/status_effect/stabilized/gold id = "stabilizedgold" @@ -964,7 +964,7 @@ datum/status_effect/stabilized/blue/on_remove() if(X.regencore) X.regencore.afterattack(owner,owner,TRUE) X.regencore = null - owner.visible_message("[owner] flashes a rainbow of colors, and [owner.p_their()] skin is coated in a milky regenerative goo!") + owner.visible_message(span_warning("[owner] flashes a rainbow of colors, and [owner.p_their()] skin is coated in a milky regenerative goo!")) qdel(src) qdel(linked_extract) return ..() diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm index 02316e519..d822cb295 100644 --- a/code/modules/research/xenobiology/crossbreeding/burning.dm +++ b/code/modules/research/xenobiology/crossbreeding/burning.dm @@ -15,10 +15,10 @@ Burning extracts: /obj/item/slimecross/burning/attack_self(mob/user) if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10)) - to_chat(user, "This extract needs to be full of plasma to activate!") + to_chat(user, span_warning("This extract needs to be full of plasma to activate!")) return reagents.remove_reagent(/datum/reagent/toxin/plasma,10) - to_chat(user, "I squeeze the extract, and it absorbs the plasma!") + to_chat(user, span_notice("I squeeze the extract, and it absorbs the plasma!")) playsound(src, 'sound/blank.ogg', 50, TRUE) playsound(src, 'sound/blank.ogg', 50, TRUE) do_effect(user) @@ -33,7 +33,7 @@ Burning extracts: /obj/item/slimecross/burning/grey/do_effect(mob/user) var/mob/living/simple_animal/slime/S = new(get_turf(user),"grey") - S.visible_message("A baby slime emerges from [src], and it nuzzles [user] before burbling hungrily!") + S.visible_message(span_danger("A baby slime emerges from [src], and it nuzzles [user] before burbling hungrily!")) S.Friends[user] = 20 //Gas, gas, gas S.bodytemperature = T0C + 400 //We gonna step on the gas. S.set_nutrition(S.get_hunger_nutrition()) //Tonight, we fight! @@ -44,7 +44,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/orange/do_effect(mob/user) - user.visible_message("[src] boils over with a caustic gas!") + user.visible_message(span_danger("[src] boils over with a caustic gas!")) var/datum/reagents/R = new/datum/reagents(100) R.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 100) @@ -58,7 +58,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/purple/do_effect(mob/user) - user.visible_message("[src] fills with a bubbling liquid!") + user.visible_message(span_notice("[src] fills with a bubbling liquid!")) new /obj/item/slimecrossbeaker/autoinjector/slimestimulant(get_turf(user)) ..() @@ -67,13 +67,13 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/blue/do_effect(mob/user) - user.visible_message("[src] flash-freezes the area!") + user.visible_message(span_danger("[src] flash-freezes the area!")) for(var/turf/open/T in range(3, get_turf(user))) T.MakeSlippery(TURF_WET_PERMAFROST, min_wet_time = 10, wet_time_to_add = 5) for(var/mob/living/carbon/M in range(5, get_turf(user))) if(M != user) M.bodytemperature = BODYTEMP_COLD_DAMAGE_LIMIT + 10 //Not quite cold enough to hurt. - to_chat(M, "I feel a chill run down your spine, and the floor feels a bit slippery with frost...") + to_chat(M, span_danger("I feel a chill run down your spine, and the floor feels a bit slippery with frost...")) ..() /obj/item/slimecross/burning/metal @@ -84,7 +84,7 @@ Burning extracts: for(var/turf/closed/wall/W in range(1,get_turf(user))) W.dismantle_wall(1) playsound(W, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[src] pulses violently, and shatters the walls around it!") + user.visible_message(span_danger("[src] pulses violently, and shatters the walls around it!")) ..() /obj/item/slimecross/burning/yellow @@ -92,7 +92,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/yellow/do_effect(mob/user) - user.visible_message("[src] explodes into an electrical field!") + user.visible_message(span_danger("[src] explodes into an electrical field!")) playsound(get_turf(src), 'sound/blank.ogg', 50, TRUE) for(var/mob/living/M in range(4,get_turf(user))) if(M != user) @@ -101,7 +101,7 @@ Burning extracts: C.electrocute_act(25,src) else M.adjustFireLoss(25) - to_chat(M, "I feel a sharp electrical pulse!") + to_chat(M, span_danger("I feel a sharp electrical pulse!")) ..() /obj/item/slimecross/burning/darkpurple @@ -109,7 +109,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/darkpurple/do_effect(mob/user) - user.visible_message("[src] sublimates into a cloud of plasma!") + user.visible_message(span_danger("[src] sublimates into a cloud of plasma!")) var/turf/T = get_turf(user) T.atmos_spawn_air("plasma=60") ..() @@ -119,7 +119,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/darkblue/do_effect(mob/user) - user.visible_message("[src] releases a burst of chilling smoke!") + user.visible_message(span_danger("[src] releases a burst of chilling smoke!")) var/datum/reagents/R = new/datum/reagents(100) R.add_reagent(/datum/reagent/consumable/frostoil, 40) user.reagents.add_reagent(/datum/reagent/medicine/cryoxadone,10) @@ -143,7 +143,7 @@ Burning extracts: O.reagents.add_reagent(/datum/reagent/toxin/slimejelly,5) //Oh god it burns if(prob(50)) O.desc += " It smells strange..." - user.visible_message("[src] produces a few pieces of food!") + user.visible_message(span_danger("[src] produces a few pieces of food!")) ..() /obj/item/slimecross/burning/bluespace @@ -151,7 +151,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/bluespace/do_effect(mob/user) - user.visible_message("[src] sparks, and lets off a shockwave of bluespace energy!") + user.visible_message(span_danger("[src] sparks, and lets off a shockwave of bluespace energy!")) for(var/mob/living/L in range(1, get_turf(user))) if(L != user) do_teleport(L, get_turf(L), 6, asoundin = 'sound/blank.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) //Somewhere between the effectiveness of fake and real BS crystal @@ -164,7 +164,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/sepia/do_effect(mob/user) - user.visible_message("[src] shapes itself into a camera!") + user.visible_message(span_notice("[src] shapes itself into a camera!")) new /obj/item/camera/rewind(get_turf(user)) ..() @@ -173,7 +173,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/cerulean/do_effect(mob/user) - user.visible_message("[src] produces a potion!") + user.visible_message(span_notice("[src] produces a potion!")) new /obj/item/slimepotion/extract_cloner(get_turf(user)) ..() @@ -182,7 +182,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/pyrite/do_effect(mob/user) - user.visible_message("[src] releases a colorful wave of energy, which shatters the lights!") + user.visible_message(span_danger("[src] releases a colorful wave of energy, which shatters the lights!")) var/area/A = get_area(user.loc) for(var/obj/machinery/light/L in A) //Shamelessly copied from the APC effect. L.on = TRUE @@ -196,7 +196,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/red/do_effect(mob/user) - user.visible_message("[src] pulses a hazy red aura for a moment, which wraps around [user]!") + user.visible_message(span_danger("[src] pulses a hazy red aura for a moment, which wraps around [user]!")) for(var/mob/living/simple_animal/slime/S in view(7, get_turf(user))) if(user in S.Friends) var/friendliness = S.Friends[user] @@ -205,7 +205,7 @@ Burning extracts: else S.Friends = list() S.rabid = 1 - S.visible_message("The [S] is driven into a dangerous frenzy!") + S.visible_message(span_danger("The [S] is driven into a dangerous frenzy!")) ..() /obj/item/slimecross/burning/green @@ -224,9 +224,9 @@ Burning extracts: var/obj/item/melee/arm_blade/slime/blade = new(user) if(!L.put_in_hands(blade)) qdel(blade) - user.visible_message("[src] melts onto [user]'s arm, boiling the flesh horribly!") + user.visible_message(span_warning("[src] melts onto [user]'s arm, boiling the flesh horribly!")) else - user.visible_message("[src] sublimates the flesh around [user]'s arm, transforming the bone into a gruesome blade!") + user.visible_message(span_danger("[src] sublimates the flesh around [user]'s arm, transforming the bone into a gruesome blade!")) user.emote("scream") L.apply_damage(30,BURN,which_hand) ..() @@ -236,7 +236,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/pink/do_effect(mob/user) - user.visible_message("[src] shrinks into a small, gel-filled pellet!") + user.visible_message(span_notice("[src] shrinks into a small, gel-filled pellet!")) new /obj/item/slimecrossbeaker/pax(get_turf(user)) ..() @@ -245,7 +245,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/gold/do_effect(mob/user) - user.visible_message("[src] shudders violently, and summons an army for [user]!") + user.visible_message(span_danger("[src] shudders violently, and summons an army for [user]!")) for(var/i in 1 to 3) //Less than gold normally does, since it's safer and faster. var/mob/living/simple_animal/S = create_random_mob(get_turf(user), HOSTILE_SPAWN) S.faction |= "[REF(user)]" @@ -259,7 +259,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/oil/do_effect(mob/user) - user.visible_message("[user] activates [src]. It's going to explode!", "I activate [src]. It crackles in anticipation") + user.visible_message(span_warning("[user] activates [src]. It's going to explode!"), span_danger("I activate [src]. It crackles in anticipation")) addtimer(CALLBACK(src, PROC_REF(boom)), 50) /obj/item/slimecross/burning/oil/proc/boom() @@ -278,7 +278,7 @@ Burning extracts: var/mob/living/L = user if(!istype(L)) return - user.visible_message("[src] absorbs [user], transforming [user.p_them()] into a slime!") + user.visible_message(span_danger("[src] absorbs [user], transforming [user.p_them()] into a slime!")) var/obj/effect/proc_holder/spell/targeted/shapeshift/slimeform/S = new() S.remove_on_restore = TRUE user.mind.AddSpell(S) @@ -290,7 +290,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/lightpink/do_effect(mob/user) - user.visible_message("[src] lets off a hypnotizing pink glow!") + user.visible_message(span_danger("[src] lets off a hypnotizing pink glow!")) for(var/mob/living/carbon/C in view(7, get_turf(user))) C.reagents.add_reagent(/datum/reagent/pax,5) ..() @@ -300,7 +300,7 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/adamantine/do_effect(mob/user) - user.visible_message("[src] crystallizes into a large shield!") + user.visible_message(span_notice("[src] crystallizes into a large shield!")) new /obj/item/twohanded/required/adamantineshield(get_turf(user)) ..() @@ -309,6 +309,6 @@ Burning extracts: effect_desc = "" /obj/item/slimecross/burning/rainbow/do_effect(mob/user) - user.visible_message("[src] flattens into a glowing rainbow blade.") + user.visible_message(span_notice("[src] flattens into a glowing rainbow blade.")) new /obj/item/kitchen/knife/rainbowknife(get_turf(user)) ..() diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm index 07c589943..7fd0962be 100644 --- a/code/modules/research/xenobiology/crossbreeding/charged.dm +++ b/code/modules/research/xenobiology/crossbreeding/charged.dm @@ -16,10 +16,10 @@ Charged extracts: /obj/item/slimecross/charged/attack_self(mob/user) if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10)) - to_chat(user, "This extract needs to be full of plasma to activate!") + to_chat(user, span_warning("This extract needs to be full of plasma to activate!")) return reagents.remove_reagent(/datum/reagent/toxin/plasma,10) - to_chat(user, "I squeeze the extract, and it absorbs the plasma!") + to_chat(user, span_notice("I squeeze the extract, and it absorbs the plasma!")) playsound(src, 'sound/blank.ogg', 50, TRUE) playsound(src, 'sound/blank.ogg', 50, TRUE) do_effect(user) @@ -34,7 +34,7 @@ Charged extracts: /obj/item/slimecross/charged/grey/do_effect(mob/user) new /obj/item/slimepotion/slime_reviver(get_turf(user)) - user.visible_message("[src] distills into a potion!") + user.visible_message(span_notice("[src] distills into a potion!")) ..() /obj/item/slimecross/charged/orange @@ -53,7 +53,7 @@ Charged extracts: /obj/item/slimecross/charged/purple/do_effect(mob/user) new /obj/item/slimecrossbeaker/omnizine(get_turf(user)) - user.visible_message("[src] sparks, and floods with a regenerative solution!") + user.visible_message(span_notice("[src] sparks, and floods with a regenerative solution!")) ..() /obj/item/slimecross/charged/blue @@ -62,7 +62,7 @@ Charged extracts: /obj/item/slimecross/charged/blue/do_effect(mob/user) new /obj/item/slimepotion/slime/chargedstabilizer(get_turf(user)) - user.visible_message("[src] distills into a potion!") + user.visible_message(span_notice("[src] distills into a potion!")) ..() /obj/item/slimecross/charged/metal @@ -72,7 +72,7 @@ Charged extracts: /obj/item/slimecross/charged/metal/do_effect(mob/user) new /obj/item/stack/sheet/metal(get_turf(user), 25) new /obj/item/stack/sheet/plasteel(get_turf(user), 10) - user.visible_message("[src] grows into a plethora of metals!") + user.visible_message(span_notice("[src] grows into a plethora of metals!")) ..() /obj/item/slimecross/charged/yellow @@ -81,7 +81,7 @@ Charged extracts: /obj/item/slimecross/charged/yellow/do_effect(mob/user) new /obj/item/stock_parts/cell/high/slime/hypercharged(get_turf(user)) - user.visible_message("[src] sparks violently, and swells with electric power!") + user.visible_message(span_notice("[src] sparks violently, and swells with electric power!")) ..() /obj/item/slimecross/charged/darkpurple @@ -90,7 +90,7 @@ Charged extracts: /obj/item/slimecross/charged/darkpurple/do_effect(mob/user) new /obj/item/stack/sheet/mineral/plasma(get_turf(user), 10) - user.visible_message("[src] produces a large amount of plasma!") + user.visible_message(span_notice("[src] produces a large amount of plasma!")) ..() /obj/item/slimecross/charged/darkblue @@ -99,7 +99,7 @@ Charged extracts: /obj/item/slimecross/charged/darkblue/do_effect(mob/user) new /obj/item/slimepotion/spaceproof(get_turf(user)) - user.visible_message("[src] distills into a potion!") + user.visible_message(span_notice("[src] distills into a potion!")) ..() /obj/item/slimecross/charged/silver @@ -111,7 +111,7 @@ Charged extracts: for(var/i in 1 to 10) var/drink_type = get_random_drink() new drink_type(get_turf(user)) - user.visible_message("[src] produces a party's worth of cake and drinks!") + user.visible_message(span_notice("[src] produces a party's worth of cake and drinks!")) ..() /obj/item/slimecross/charged/bluespace @@ -120,7 +120,7 @@ Charged extracts: /obj/item/slimecross/charged/bluespace/do_effect(mob/user) new /obj/item/stack/sheet/bluespace_crystal(get_turf(user), 10) - user.visible_message("[src] produces several sheets of polycrystal!") + user.visible_message(span_notice("[src] produces several sheets of polycrystal!")) ..() /obj/item/slimecross/charged/sepia @@ -129,7 +129,7 @@ Charged extracts: /obj/item/slimecross/charged/sepia/do_effect(mob/user) new /obj/item/camera/spooky(get_turf(user)) - user.visible_message("[src] flickers in a strange, ethereal manner, and produces a camera!") + user.visible_message(span_notice("[src] flickers in a strange, ethereal manner, and produces a camera!")) ..() /obj/item/slimecross/charged/cerulean @@ -138,7 +138,7 @@ Charged extracts: /obj/item/slimecross/charged/cerulean/do_effect(mob/user) new /obj/item/slimepotion/enhancer/max(get_turf(user)) - user.visible_message("[src] distills into a potion!") + user.visible_message(span_notice("[src] distills into a potion!")) ..() /obj/item/slimecross/charged/pyrite @@ -147,7 +147,7 @@ Charged extracts: /obj/item/slimecross/charged/pyrite/do_effect(mob/user) new /obj/item/stack/sheet/mineral/bananium(get_turf(user), 10) - user.visible_message("[src] solidifies with a horrifying banana stench!") + user.visible_message(span_warning("[src] solidifies with a horrifying banana stench!")) ..() /obj/item/slimecross/charged/red @@ -156,7 +156,7 @@ Charged extracts: /obj/item/slimecross/charged/red/do_effect(mob/user) new /obj/item/slimepotion/lavaproof(get_turf(user)) - user.visible_message("[src] distills into a potion!") + user.visible_message(span_notice("[src] distills into a potion!")) ..() /obj/item/slimecross/charged/green @@ -166,16 +166,16 @@ Charged extracts: /obj/item/slimecross/charged/green/do_effect(mob/user) var/mob/living/carbon/human/H = user if(!istype(H)) - to_chat(user, "I must be a humanoid to use this!") + to_chat(user, span_warning("I must be a humanoid to use this!")) return var/racechoice = input(H, "Choose your slime subspecies.", "Slime Selection") as null|anything in sortList(subtypesof(/datum/species/jelly), GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!racechoice) - to_chat(user, "I decide not to become a slime for now.") + to_chat(user, span_notice("I decide not to become a slime for now.")) return if(!user.canUseTopic(src, BE_CLOSE)) return H.set_species(racechoice, icon_update=1) - H.visible_message("[H] suddenly shifts form as [src] dissolves into [H.p_their()] skin!") + H.visible_message(span_warning("[H] suddenly shifts form as [src] dissolves into [H.p_their()] skin!")) ..() /obj/item/slimecross/charged/pink @@ -184,7 +184,7 @@ Charged extracts: /obj/item/slimecross/charged/pink/do_effect(mob/user) new /obj/item/slimepotion/lovepotion(get_turf(user)) - user.visible_message("[src] distills into a potion!") + user.visible_message(span_notice("[src] distills into a potion!")) ..() /obj/item/slimecross/charged/gold @@ -194,20 +194,20 @@ Charged extracts: var/spawned = 0 /obj/item/slimecross/charged/gold/do_effect(mob/user) - user.visible_message("[src] starts shuddering violently!") + user.visible_message(span_warning("[src] starts shuddering violently!")) addtimer(CALLBACK(src, PROC_REF(startTimer)), 50) /obj/item/slimecross/charged/gold/proc/startTimer() START_PROCESSING(SSobj, src) /obj/item/slimecross/charged/gold/process() - visible_message("[src] lets off a spark, and produces a living creature!") + visible_message(span_warning("[src] lets off a spark, and produces a living creature!")) new /obj/effect/particle_effect/sparks(get_turf(src)) playsound(get_turf(src), "sparks", 50, TRUE) create_random_mob(get_turf(src), HOSTILE_SPAWN) spawned++ if(spawned >= max_spawn) - visible_message("[src] collapses into a puddle of goo.") + visible_message(span_warning("[src] collapses into a puddle of goo.")) qdel(src) /obj/item/slimecross/charged/gold/Destroy() @@ -219,7 +219,7 @@ Charged extracts: effect_desc = "" /obj/item/slimecross/charged/oil/do_effect(mob/user) - user.visible_message("[src] begins to shake with rapidly increasing force!") + user.visible_message(span_danger("[src] begins to shake with rapidly increasing force!")) addtimer(CALLBACK(src, PROC_REF(boom)), 50) /obj/item/slimecross/charged/oil/proc/boom() @@ -233,7 +233,7 @@ Charged extracts: /obj/item/slimecross/charged/black/do_effect(mob/user) var/mob/living/carbon/human/H = user if(!istype(H)) - to_chat(user, "I have to be able to have a species to get your species changed.") + to_chat(user, span_warning("I have to be able to have a species to get your species changed.")) return var/list/allowed_species = list() for(var/stype in subtypesof(/datum/species)) @@ -244,7 +244,7 @@ Charged extracts: var/datum/species/changed = pick(allowed_species) if(changed) H.set_species(changed, icon_update = 1) - to_chat(H, "I feel very different!") + to_chat(H, span_danger("I feel very different!")) ..() /obj/item/slimecross/charged/lightpink @@ -253,7 +253,7 @@ Charged extracts: /obj/item/slimecross/charged/lightpink/do_effect(mob/user) new /obj/item/slimepotion/peacepotion(get_turf(user)) - user.visible_message("[src] distills into a potion!") + user.visible_message(span_notice("[src] distills into a potion!")) ..() /obj/item/slimecross/charged/adamantine @@ -261,7 +261,7 @@ Charged extracts: effect_desc = "" /obj/item/slimecross/charged/adamantine/do_effect(mob/user) - user.visible_message("[src] produces a fully formed golem shell!") + user.visible_message(span_notice("[src] produces a fully formed golem shell!")) new /obj/effect/mob_spawn/human/golem/servant(get_turf(src), /datum/species/golem/adamantine, user) ..() @@ -270,7 +270,7 @@ Charged extracts: effect_desc = "" /obj/item/slimecross/charged/rainbow/do_effect(mob/user) - user.visible_message("[src] swells and splits into three new slimes!") + user.visible_message(span_warning("[src] swells and splits into three new slimes!")) for(var/i in 1 to 3) var/mob/living/simple_animal/slime/S = new(get_turf(user)) S.random_colour() diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm index 4ba81b0ba..d522371f2 100644 --- a/code/modules/research/xenobiology/crossbreeding/chilling.dm +++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm @@ -15,10 +15,10 @@ Chilling extracts: /obj/item/slimecross/chilling/attack_self(mob/user) if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10)) - to_chat(user, "This extract needs to be full of plasma to activate!") + to_chat(user, span_warning("This extract needs to be full of plasma to activate!")) return reagents.remove_reagent(/datum/reagent/toxin/plasma,10) - to_chat(user, "I squeeze the extract, and it absorbs the plasma!") + to_chat(user, span_notice("I squeeze the extract, and it absorbs the plasma!")) playsound(src, 'sound/blank.ogg', 50, TRUE) playsound(src, 'sound/blank.ogg', 50, TRUE) do_effect(user) @@ -32,7 +32,7 @@ Chilling extracts: effect_desc = "" /obj/item/slimecross/chilling/grey/do_effect(mob/user) - user.visible_message("[src] produces a few small, grey cubes") + user.visible_message(span_notice("[src] produces a few small, grey cubes")) for(var/i in 1 to 3) new /obj/item/barriercube(get_turf(user)) ..() @@ -42,7 +42,7 @@ Chilling extracts: effect_desc = "" /obj/item/slimecross/chilling/orange/do_effect(mob/user) - user.visible_message("[src] shatters, and lets out a jet of heat!") + user.visible_message(span_danger("[src] shatters, and lets out a jet of heat!")) for(var/turf/T in orange(get_turf(user),2)) if(get_dist(get_turf(user), T) > 1) new /obj/effect/hotspot(T) @@ -55,9 +55,9 @@ Chilling extracts: /obj/item/slimecross/chilling/purple/do_effect(mob/user) var/area/A = get_area(get_turf(user)) if(A.outdoors) - to_chat(user, "[src] can't affect such a large area.") + to_chat(user, span_warning("[src] can't affect such a large area.")) return - user.visible_message("[src] shatters, and a healing aura fills the room briefly.") + user.visible_message(span_notice("[src] shatters, and a healing aura fills the room briefly.")) for(var/mob/living/carbon/C in A) C.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10) ..() @@ -67,7 +67,7 @@ Chilling extracts: effect_desc = "" /obj/item/slimecross/chilling/blue/do_effect(mob/user) - user.visible_message("[src] cracks, and spills out a liquid goo, which reforms into a mask!") + user.visible_message(span_notice("[src] cracks, and spills out a liquid goo, which reforms into a mask!")) new /obj/item/clothing/mask/nobreath(get_turf(user)) ..() @@ -76,7 +76,7 @@ Chilling extracts: effect_desc = "" /obj/item/slimecross/chilling/metal/do_effect(mob/user) - user.visible_message("[src] melts like quicksilver, and surrounds [user] in a wall!") + user.visible_message(span_danger("[src] melts like quicksilver, and surrounds [user] in a wall!")) for(var/turf/T in orange(get_turf(user),1)) if(get_dist(get_turf(user), T) > 0) new /obj/effect/forcefield/slimewall(T) @@ -88,7 +88,7 @@ Chilling extracts: /obj/item/slimecross/chilling/yellow/do_effect(mob/user) var/area/A = get_area(get_turf(user)) - user.visible_message("[src] shatters, and a the air suddenly feels charged for a moment.") + user.visible_message(span_notice("[src] shatters, and a the air suddenly feels charged for a moment.")) for(var/obj/machinery/power/apc/C in A) if(C.cell) C.cell.charge = min(C.cell.charge + C.cell.maxcharge/2, C.cell.maxcharge) @@ -101,7 +101,7 @@ Chilling extracts: /obj/item/slimecross/chilling/darkpurple/do_effect(mob/user) var/area/A = get_area(get_turf(user)) if(A.outdoors) - to_chat(user, "[src] can't affect such a large area.") + to_chat(user, span_warning("[src] can't affect such a large area.")) return var/filtered = FALSE for(var/turf/open/T in A) @@ -113,9 +113,9 @@ Chilling extracts: G.garbage_collect() T.air_update_turf() if(filtered) - user.visible_message("Cracks spread throughout [src], and some air is sucked in!") + user.visible_message(span_notice("Cracks spread throughout [src], and some air is sucked in!")) else - user.visible_message("[src] cracks, but nothing happens.") + user.visible_message(span_notice("[src] cracks, but nothing happens.")) ..() /obj/item/slimecross/chilling/darkblue @@ -124,7 +124,7 @@ Chilling extracts: /obj/item/slimecross/chilling/darkblue/do_effect(mob/user) if(isliving(user)) - user.visible_message("[src] freezes over [user]'s entire body!") + user.visible_message(span_notice("[src] freezes over [user]'s entire body!")) var/mob/living/M = user M.apply_status_effect(/datum/status_effect/frozenstasis) ..() @@ -134,7 +134,7 @@ Chilling extracts: effect_desc = "" /obj/item/slimecross/chilling/silver/do_effect(mob/user) - user.visible_message("[src] crumbles into icy powder, leaving behind several emergency food supplies!") + user.visible_message(span_notice("[src] crumbles into icy powder, leaving behind several emergency food supplies!")) var/amount = rand(5, 10) for(var/i in 1 to amount) new /obj/item/reagent_containers/food/snacks/rationpack(get_turf(user)) @@ -151,28 +151,28 @@ Chilling extracts: return if(target in allies) allies -= target - to_chat(user, "I unlink [src] with [target].") + to_chat(user, span_notice("I unlink [src] with [target].")) else allies |= target - to_chat(user, "I link [src] with [target].") + to_chat(user, span_notice("I link [src] with [target].")) return /obj/item/slimecross/chilling/bluespace/do_effect(mob/user) if(allies.len <= 0) - to_chat(user, "[src] is not linked to anyone!") + to_chat(user, span_warning("[src] is not linked to anyone!")) return - to_chat(user, "I feel [src] pulse as it begins charging bluespace energies...") + to_chat(user, span_notice("I feel [src] pulse as it begins charging bluespace energies...")) active = TRUE for(var/mob/living/M in allies) var/datum/status_effect/slimerecall/S = M.apply_status_effect(/datum/status_effect/slimerecall) S.target = user if(do_after(user, 100, target=src)) - to_chat(user, "[src] shatters as it tears a hole in reality, snatching the linked individuals from the void!") + to_chat(user, span_notice("[src] shatters as it tears a hole in reality, snatching the linked individuals from the void!")) for(var/mob/living/M in allies) var/datum/status_effect/slimerecall/S = M.has_status_effect(/datum/status_effect/slimerecall) M.remove_status_effect(S) else - to_chat(user, "[src] falls dark, dissolving into nothing as the energies fade away.") + to_chat(user, span_warning("[src] falls dark, dissolving into nothing as the energies fade away.")) for(var/mob/living/M in allies) var/datum/status_effect/slimerecall/S = M.has_status_effect(/datum/status_effect/slimerecall) if(istype(S)) @@ -190,14 +190,14 @@ Chilling extracts: return if(target in allies) allies -= target - to_chat(user, "I unlink [src] with [target].") + to_chat(user, span_notice("I unlink [src] with [target].")) else allies |= target - to_chat(user, "I link [src] with [target].") + to_chat(user, span_notice("I link [src] with [target].")) return /obj/item/slimecross/chilling/sepia/do_effect(mob/user) - user.visible_message("[src] shatters, freezing time itself!") + user.visible_message(span_warning("[src] shatters, freezing time itself!")) allies -= user //support class new /obj/effect/timestop(get_turf(user), 2, 300, allies) ..() @@ -208,7 +208,7 @@ Chilling extracts: /obj/item/slimecross/chilling/cerulean/do_effect(mob/user) if(isliving(user)) - user.visible_message("[src] creaks and shifts into a clone of [user]!") + user.visible_message(span_warning("[src] creaks and shifts into a clone of [user]!")) var/mob/living/M = user M.apply_status_effect(/datum/status_effect/slime_clone) ..() @@ -218,7 +218,7 @@ Chilling extracts: effect_desc = "" /obj/item/slimecross/chilling/pyrite/do_effect(mob/user) - user.visible_message("[src] crystallizes into a pair of spectacles!") + user.visible_message(span_notice("[src] crystallizes into a pair of spectacles!")) new /obj/item/clothing/glasses/prism_glasses(get_turf(user)) ..() @@ -232,9 +232,9 @@ Chilling extracts: slimesfound = TRUE S.docile = TRUE if(slimesfound) - user.visible_message("[src] lets out a peaceful ring as it shatters, and nearby slimes seem calm.") + user.visible_message(span_notice("[src] lets out a peaceful ring as it shatters, and nearby slimes seem calm.")) else - user.visible_message("[src] lets out a peaceful ring as it shatters, but nothing happens...") + user.visible_message(span_notice("[src] lets out a peaceful ring as it shatters, but nothing happens...")) ..() /obj/item/slimecross/chilling/green @@ -253,9 +253,9 @@ Chilling extracts: var/obj/item/gun/magic/bloodchill/gun = new(user) if(!L.put_in_hands(gun)) qdel(gun) - user.visible_message("[src] flash-freezes [user]'s arm, cracking the flesh horribly!") + user.visible_message(span_warning("[src] flash-freezes [user]'s arm, cracking the flesh horribly!")) else - user.visible_message("[src] chills and snaps off the front of the bone on [user]'s arm, leaving behind a strange, gun-like structure!") + user.visible_message(span_danger("[src] chills and snaps off the front of the bone on [user]'s arm, leaving behind a strange, gun-like structure!")) user.emote("scream") L.apply_damage(30,BURN,which_hand) ..() @@ -265,7 +265,7 @@ Chilling extracts: effect_desc = "" /obj/item/slimecross/chilling/pink/do_effect(mob/user) - user.visible_message("[src] cracks like an egg, and an adorable puppy comes tumbling out!") + user.visible_message(span_notice("[src] cracks like an egg, and an adorable puppy comes tumbling out!")) new /mob/living/simple_animal/pet/dog/corgi/puppy/slime(get_turf(user)) ..() @@ -274,7 +274,7 @@ Chilling extracts: effect_desc = "" /obj/item/slimecross/chilling/gold/do_effect(mob/user) - user.visible_message("[src] lets off golden light as it melts and reforms into an egg-like device!") + user.visible_message(span_notice("[src] lets off golden light as it melts and reforms into an egg-like device!")) new /obj/item/capturedevice(get_turf(user)) ..() @@ -283,7 +283,7 @@ Chilling extracts: effect_desc = "" /obj/item/slimecross/chilling/oil/do_effect(mob/user) - user.visible_message("[src] begins to shake with muted intensity!") + user.visible_message(span_danger("[src] begins to shake with muted intensity!")) addtimer(CALLBACK(src, PROC_REF(boom)), 50) /obj/item/slimecross/chilling/oil/proc/boom() @@ -296,7 +296,7 @@ Chilling extracts: /obj/item/slimecross/chilling/black/do_effect(mob/user) if(ishuman(user)) - user.visible_message("[src] crystallizes along [user]'s skin, turning into metallic scales!") + user.visible_message(span_notice("[src] crystallizes along [user]'s skin, turning into metallic scales!")) var/mob/living/carbon/human/H = user H.set_species(/datum/species/golem/random) ..() @@ -306,7 +306,7 @@ Chilling extracts: effect_desc = "" /obj/item/slimecross/chilling/lightpink/do_effect(mob/user) - user.visible_message("[src] blooms into a beautiful flower!") + user.visible_message(span_notice("[src] blooms into a beautiful flower!")) new /obj/item/clothing/head/peaceflower(get_turf(user)) ..() @@ -315,7 +315,7 @@ Chilling extracts: effect_desc = "" /obj/item/slimecross/chilling/adamantine/do_effect(mob/user) - user.visible_message("[src] creaks and breaks as it shifts into a heavy set of armor!") + user.visible_message(span_notice("[src] creaks and breaks as it shifts into a heavy set of armor!")) new /obj/item/clothing/suit/armor/heavy/adamantine(get_turf(user)) ..() @@ -326,9 +326,9 @@ Chilling extracts: /obj/item/slimecross/chilling/rainbow/do_effect(mob/user) var/area/area = get_area(user) if(area.outdoors) - to_chat(user, "[src] can't affect such a large area.") + to_chat(user, span_warning("[src] can't affect such a large area.")) return - user.visible_message("[src] reflects an array of dazzling colors and light, energy rushing to nearby doors!") + user.visible_message(span_warning("[src] reflects an array of dazzling colors and light, energy rushing to nearby doors!")) for(var/obj/machinery/door/airlock/door in area) new /obj/effect/forcefield/slimewall/rainbow(door.loc) return ..() diff --git a/code/modules/research/xenobiology/crossbreeding/consuming.dm b/code/modules/research/xenobiology/crossbreeding/consuming.dm index 0c627cf9f..4bfa30d75 100644 --- a/code/modules/research/xenobiology/crossbreeding/consuming.dm +++ b/code/modules/research/xenobiology/crossbreeding/consuming.dm @@ -18,19 +18,19 @@ Consuming extracts: /obj/item/slimecross/consuming/attackby(obj/item/O, mob/user) if(istype(O,/obj/item/reagent_containers/food/snacks)) if(last_produced + cooldown > world.time) - to_chat(user, "[src] is still digesting after its last meal!") + to_chat(user, span_warning("[src] is still digesting after its last meal!")) return var/datum/reagent/N = O.reagents.has_reagent(/datum/reagent/consumable/nutriment) if(N) nutriment_eaten += N.volume - to_chat(user, "[src] opens up and swallows [O] whole!") + to_chat(user, span_notice("[src] opens up and swallows [O] whole!")) qdel(O) playsound(src, 'sound/blank.ogg', 20, TRUE) else - to_chat(user, "[src] burbles unhappily at the offering.") + to_chat(user, span_warning("[src] burbles unhappily at the offering.")) if(nutriment_eaten >= nutriment_required) nutriment_eaten = 0 - user.visible_message("[src] swells up and produces a small pile of cookies!") + user.visible_message(span_notice("[src] swells up and produces a small pile of cookies!")) playsound(src, 'sound/blank.ogg', 40, TRUE) last_produced = world.time for(var/i in 1 to cookies) @@ -62,18 +62,18 @@ Consuming extracts: /obj/item/slime_cookie/attack(mob/living/M, mob/user) var/fed = FALSE if(M == user) - M.visible_message("[user] eats [src]!", "I eat [src].") + M.visible_message(span_notice("[user] eats [src]!"), span_notice("I eat [src].")) fed = TRUE else - M.visible_message("[user] tries to force [M] to eat [src]!", "[user] tries to force you to eat [src]!") + M.visible_message(span_danger("[user] tries to force [M] to eat [src]!"), span_danger("[user] tries to force you to eat [src]!")) if(do_after(user, 20, target = M)) fed = TRUE - M.visible_message("[user] forces [M] to eat [src]!", "[user] forces you to eat [src].") + M.visible_message(span_danger("[user] forces [M] to eat [src]!"), span_warning("[user] forces you to eat [src].")) if(fed) var/mob/living/carbon/human/H = M if(!istype(H) || !HAS_TRAIT(H, TRAIT_AGEUSIA)) - to_chat(M, "Tastes like [taste].") + to_chat(M, span_notice("Tastes like [taste].")) playsound(get_turf(M), 'sound/blank.ogg', 20, TRUE) if(nutrition) M.reagents.add_reagent(/datum/reagent/consumable/nutriment,nutrition) @@ -277,7 +277,7 @@ Consuming extracts: /obj/item/slime_cookie/cerulean/do_effect(mob/living/M, mob/user) if(prob(50)) - to_chat(M, "A piece of [src] breaks off while you chew, and falls to the ground.") + to_chat(M, span_notice("A piece of [src] breaks off while you chew, and falls to the ground.")) var/obj/item/slime_cookie/cerulean/C = new(get_turf(M)) C.taste = taste + " and a sugar cookie" diff --git a/code/modules/research/xenobiology/crossbreeding/recurring.dm b/code/modules/research/xenobiology/crossbreeding/recurring.dm index 968bcb5c3..02849a34e 100644 --- a/code/modules/research/xenobiology/crossbreeding/recurring.dm +++ b/code/modules/research/xenobiology/crossbreeding/recurring.dm @@ -16,7 +16,7 @@ Recurring extracts: /obj/item/slimecross/recurring/Initialize() . = ..() extract = new extract_type(src.loc) - visible_message("[src] wraps a layer of goo around itself!") + visible_message(span_notice("[src] wraps a layer of goo around itself!")) extract.name = name extract.desc = desc extract.icon = icon @@ -33,7 +33,7 @@ Recurring extracts: extract.Uses++ cooldown = max_cooldown else if(extract.Uses <= 0) - extract.visible_message("The light inside [extract] flickers and dies out.") + extract.visible_message(span_warning("The light inside [extract] flickers and dies out.")) extract.desc = "" extract.icon_state = "prismatic" qdel(src) diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm index fb9ae6984..f381f230b 100644 --- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm +++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm @@ -20,14 +20,14 @@ Regenerative extracts: return var/mob/living/H = target if(H.stat == DEAD) - to_chat(user, "[src] will not work on the dead!") + to_chat(user, span_warning("[src] will not work on the dead!")) return if(H != user) - user.visible_message("[user] crushes the [src] over [H], the milky goo quickly regenerating all of [H.p_their()] injuries!", - "I squeeze the [src], and it bursts over [H], the milky goo regenerating [H.p_their()] injuries.") + user.visible_message(span_notice("[user] crushes the [src] over [H], the milky goo quickly regenerating all of [H.p_their()] injuries!"), + span_notice("I squeeze the [src], and it bursts over [H], the milky goo regenerating [H.p_their()] injuries.")) else - user.visible_message("[user] crushes the [src] over [user.p_them()]self, the milky goo quickly regenerating all of [user.p_their()] injuries!", - "I squeeze the [src], and it bursts in your hand, splashing you with milky goo which quickly regenerates your injuries!") + user.visible_message(span_notice("[user] crushes the [src] over [user.p_them()]self, the milky goo quickly regenerating all of [user.p_their()] injuries!"), + span_notice("I squeeze the [src], and it bursts in your hand, splashing you with milky goo which quickly regenerates your injuries!")) core_effect_before(H, user) H.revive(full_heal = TRUE, admin_revive = FALSE) core_effect(H, user) @@ -42,7 +42,7 @@ Regenerative extracts: colour = "orange" /obj/item/slimecross/regenerative/orange/core_effect_before(mob/living/target, mob/user) - target.visible_message("The [src] boils over!") + target.visible_message(span_warning("The [src] boils over!")) for(var/turf/turf in range(1,target)) if(!locate(/obj/effect/hotspot) in turf) new /obj/effect/hotspot(turf) @@ -62,14 +62,14 @@ Regenerative extracts: if(isturf(target.loc)) var/turf/open/T = get_turf(target) T.MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = 5) - target.visible_message("The milky goo in the extract gets all over the floor!") + target.visible_message(span_warning("The milky goo in the extract gets all over the floor!")) /obj/item/slimecross/regenerative/metal colour = "metal" effect_desc = "" /obj/item/slimecross/regenerative/metal/core_effect(mob/living/target, mob/user) - target.visible_message("The milky goo hardens and reshapes itself, encasing [target]!") + target.visible_message(span_warning("The milky goo hardens and reshapes itself, encasing [target]!")) var/obj/structure/closet/C = new /obj/structure/closet(target.loc) C.name = "slimy closet" C.desc = "" @@ -87,7 +87,7 @@ Regenerative extracts: if(batteries.len) var/obj/item/stock_parts/cell/ToCharge = pick(batteries) ToCharge.charge = ToCharge.maxcharge - to_chat(target, "I feel a strange electrical pulse, and one of your electrical items was recharged.") + to_chat(target, span_notice("I feel a strange electrical pulse, and one of your electrical items was recharged.")) /obj/item/slimecross/regenerative/darkpurple colour = "dark purple" @@ -100,7 +100,7 @@ Regenerative extracts: equipped += target.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/purple(null), SLOT_GLOVES) equipped += target.equip_to_slot_or_del(new /obj/item/clothing/head/soft/purple(null), SLOT_HEAD) if(equipped > 0) - target.visible_message("The milky goo congeals into clothing!") + target.visible_message(span_notice("The milky goo congeals into clothing!")) /obj/item/slimecross/regenerative/darkblue colour = "dark blue" @@ -120,7 +120,7 @@ Regenerative extracts: var/obj/item/clothing/C = H.get_item_by_slot(SLOT_HEAD) fireproof(C) if(fireproofed) - target.visible_message("Some of [target]'s clothing gets coated in the goo, and turns blue!") + target.visible_message(span_notice("Some of [target]'s clothing gets coated in the goo, and turns blue!")) /obj/item/slimecross/regenerative/darkblue/proc/fireproof(obj/item/clothing/C) C.name = "fireproofed [C.name]" @@ -136,7 +136,7 @@ Regenerative extracts: /obj/item/slimecross/regenerative/silver/core_effect(mob/living/target, mob/user) target.set_nutrition(NUTRITION_LEVEL_FULL - 1) - to_chat(target, "I feel satiated.") + to_chat(target, span_notice("I feel satiated.")) /obj/item/slimecross/regenerative/bluespace colour = "bluespace" @@ -144,7 +144,7 @@ Regenerative extracts: var/turf/open/T /obj/item/slimecross/regenerative/bluespace/core_effect(mob/living/target, mob/user) - target.visible_message("[src] disappears in a shower of sparks!","The milky goo teleports you somewhere it remembers!") + target.visible_message(span_warning("[src] disappears in a shower of sparks!"),span_danger("The milky goo teleports you somewhere it remembers!")) do_sparks(5,FALSE,target) target.forceMove(T) do_sparks(5,FALSE,target) @@ -171,14 +171,14 @@ Regenerative extracts: X.name = name X.desc = desc user.put_in_active_hand(X) - to_chat(user, "Some of the milky goo congeals in your hand!") + to_chat(user, span_notice("Some of the milky goo congeals in your hand!")) /obj/item/slimecross/regenerative/pyrite colour = "pyrite" effect_desc = "" /obj/item/slimecross/regenerative/pyrite/core_effect(mob/living/target, mob/user) - target.visible_message("The milky goo coating [target] leaves [target.p_them()] a different color!") + target.visible_message(span_warning("The milky goo coating [target] leaves [target.p_them()] a different color!")) target.add_atom_colour(rgb(rand(0,255),rand(0,255),rand(0,255)),WASHABLE_COLOUR_PRIORITY) /obj/item/slimecross/regenerative/red @@ -186,7 +186,7 @@ Regenerative extracts: effect_desc = "" /obj/item/slimecross/regenerative/red/core_effect(mob/living/target, mob/user) - to_chat(target, "I feel... faster.") + to_chat(target, span_notice("I feel... faster.")) target.reagents.add_reagent(/datum/reagent/medicine/ephedrine,3) /obj/item/slimecross/regenerative/green @@ -195,7 +195,7 @@ Regenerative extracts: /obj/item/slimecross/regenerative/green/core_effect(mob/living/target, mob/user) if(isslime(target)) - target.visible_message("The [target] suddenly changes color!") + target.visible_message(span_warning("The [target] suddenly changes color!")) var/mob/living/simple_animal/slime/S = target S.random_colour() if(isjellyperson(target)) @@ -207,7 +207,7 @@ Regenerative extracts: effect_desc = "" /obj/item/slimecross/regenerative/pink/core_effect(mob/living/target, mob/user) - to_chat(target, "I feel more calm.") + to_chat(target, span_notice("I feel more calm.")) target.reagents.add_reagent(/datum/reagent/drug/krokodil,4) /obj/item/slimecross/regenerative/gold @@ -236,7 +236,7 @@ Regenerative extracts: /obj/item/slimecross/regenerative/black/core_effect_before(mob/living/target, mob/user) var/dummytype = target.type var/mob/living/dummy = new dummytype(target.loc) - to_chat(target, "The milky goo flows from your skin, forming an imperfect copy of you.") + to_chat(target, span_notice("The milky goo flows from your skin, forming an imperfect copy of you.")) if(iscarbon(target)) var/mob/living/carbon/T = target var/mob/living/carbon/D = dummy @@ -259,7 +259,7 @@ Regenerative extracts: return var/mob/living/U = user U.revive(full_heal = TRUE, admin_revive = FALSE) - to_chat(U, "Some of the milky goo sprays onto you, as well!") + to_chat(U, span_notice("Some of the milky goo sprays onto you, as well!")) /obj/item/slimecross/regenerative/adamantine colour = "adamantine" diff --git a/code/modules/research/xenobiology/crossbreeding/reproductive.dm b/code/modules/research/xenobiology/crossbreeding/reproductive.dm index 9e6770ce3..c8be5f75a 100644 --- a/code/modules/research/xenobiology/crossbreeding/reproductive.dm +++ b/code/modules/research/xenobiology/crossbreeding/reproductive.dm @@ -16,7 +16,7 @@ Reproductive extracts: /obj/item/slimecross/reproductive/attackby(obj/item/O, mob/user) if((last_produce + cooldown) > world.time) - to_chat(user, "[src] is still digesting!") + to_chat(user, span_warning("[src] is still digesting!")) return if(istype(O, /obj/item/storage/bag/bio)) var/list/inserted = list() @@ -26,12 +26,12 @@ Reproductive extracts: if(istype(M)) eat_cube(M, user) else - to_chat(user, "There are no monkey cubes in the bio bag!") + to_chat(user, span_warning("There are no monkey cubes in the bio bag!")) if(istype(O,/obj/item/reagent_containers/food/snacks/monkeycube)) eat_cube(O, user) if(cubes_eaten >= 3) var/cores = rand(1,4) - visible_message("[src] briefly swells to a massive size, and expels [cores] extract[cores > 1 ? "s":""]!") + visible_message(span_notice("[src] briefly swells to a massive size, and expels [cores] extract[cores > 1 ? "s":""]!")) playsound(src, 'sound/blank.ogg', 40, TRUE) last_produce = world.time for(var/i = 0, i < cores, i++) @@ -41,7 +41,7 @@ Reproductive extracts: /obj/item/slimecross/reproductive/proc/eat_cube(obj/item/reagent_containers/food/snacks/monkeycube, mob/user) qdel(monkeycube) cubes_eaten++ - to_chat(user, "I feed [monkeycube] to [src], and it pulses gently.") + to_chat(user, span_notice("I feed [monkeycube] to [src], and it pulses gently.")) playsound(src, 'sound/blank.ogg', 20, TRUE) /obj/item/slimecross/reproductive/grey diff --git a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm index d3f8a4772..0484ca20c 100644 --- a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm +++ b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm @@ -17,7 +17,7 @@ Self-sustaining extracts: //Just divides into the actual item. /obj/item/slimecross/selfsustaining/Initialize() ..() - visible_message("The [src] shudders, and splits into four smaller extracts.") + visible_message(span_warning("The [src] shudders, and splits into four smaller extracts.")) for(var/i = 0, i < 4, i++) var/obj/item/autoslime/A = new /obj/item/autoslime(src.loc) var/obj/item/slime_extract/X = new extract_type(A) @@ -56,7 +56,7 @@ Self-sustaining extracts: /obj/item/autoslime/examine(mob/user) . = ..() if(effect_desc) - . += "[effect_desc]" + . += span_notice("[effect_desc]") //Different types. diff --git a/code/modules/research/xenobiology/crossbreeding/stabilized.dm b/code/modules/research/xenobiology/crossbreeding/stabilized.dm index 59350bf8c..d71199577 100644 --- a/code/modules/research/xenobiology/crossbreeding/stabilized.dm +++ b/code/modules/research/xenobiology/crossbreeding/stabilized.dm @@ -142,21 +142,21 @@ Stabilized extracts: if(L.has_status_effect(/datum/status_effect/stabilized/gold)) L.remove_status_effect(/datum/status_effect/stabilized/gold) if(choice == "Familiar Location") - to_chat(user, "I prod [src], and it shudders slightly.") + to_chat(user, span_notice("I prod [src], and it shudders slightly.")) START_PROCESSING(SSobj, src) if(choice == "Familiar Species") - to_chat(user, "I squeeze [src], and a shape seems to shift around inside.") + to_chat(user, span_notice("I squeeze [src], and a shape seems to shift around inside.")) generate_mobtype() START_PROCESSING(SSobj, src) if(choice == "Familiar Sentience") - to_chat(user, "I poke [src], and it lets out a glowing pulse.") + to_chat(user, span_notice("I poke [src], and it lets out a glowing pulse.")) saved_mind = null START_PROCESSING(SSobj, src) if(choice == "Familiar Name") var/newname = copytext(sanitize_name(input(user, "Would you like to change the name of [mob_name]", "Name change", mob_name) as null|text),1,MAX_NAME_LEN) if(newname) mob_name = newname - to_chat(user, "I speak softly into [src], and it shakes slightly in response.") + to_chat(user, span_notice("I speak softly into [src], and it shakes slightly in response.")) START_PROCESSING(SSobj, src) /obj/item/slimecross/stabilized/oil @@ -183,7 +183,7 @@ Stabilized extracts: /obj/item/slimecross/stabilized/rainbow/attackby(obj/item/O, mob/user) var/obj/item/slimecross/regenerative/regen = O if(istype(regen) && !regencore) - to_chat(user, "I place [O] in [src], prepping the extract for automatic application!") + to_chat(user, span_notice("I place [O] in [src], prepping the extract for automatic application!")) regencore = regen regen.forceMove(src) return diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 9a955d1b7..9b01c8c47 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -145,7 +145,7 @@ /obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube)) monkeys++ - to_chat(user, "I feed [O] to [src]. It now has [monkeys] monkey cubes stored.") + to_chat(user, span_notice("I feed [O] to [src]. It now has [monkeys] monkey cubes stored.")) qdel(O) return else if(istype(O, /obj/item/storage/bag)) @@ -157,7 +157,7 @@ monkeys++ qdel(G) if(loaded) - to_chat(user, "I fill [src] with the monkey cubes stored in [O]. [src] now has [monkeys] monkey cubes stored.") + to_chat(user, span_notice("I fill [src] with the monkey cubes stored in [O]. [src] now has [monkeys] monkey cubes stored.")) return else if(istype(O, /obj/item/slimepotion/slime)) var/replaced = FALSE @@ -167,14 +167,14 @@ current_potion.forceMove(drop_location()) replaced = TRUE current_potion = O - to_chat(user, "I load [O] in the console's potion slot[replaced ? ", replacing the one that was there before" : ""].") + to_chat(user, span_notice("I load [O] in the console's potion slot[replaced ? ", replacing the one that was there before" : ""].")) return ..() /obj/machinery/computer/camera_advanced/xenobio/multitool_act(mob/living/user, obj/item/multitool/I) . = ..() if (istype(I) && istype(I.buffer,/obj/machinery/monkey_recycler)) - to_chat(user, "I link [src] with [I.buffer] in [I] buffer.") + to_chat(user, span_notice("I link [src] with [I.buffer] in [I] buffer.")) connected_recycler = I.buffer connected_recycler.connected += src return TRUE @@ -194,10 +194,10 @@ if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) for(var/mob/living/simple_animal/slime/S in X.stored_slimes) S.forceMove(remote_eye.loc) - S.visible_message("[S] warps in!") + S.visible_message(span_notice("[S] warps in!")) X.stored_slimes -= S else - to_chat(owner, "Target is not near a camera. Cannot proceed.") + to_chat(owner, span_warning("Target is not near a camera. Cannot proceed.")) /datum/action/innate/slime_pick_up name = "Pick up Slime" @@ -218,11 +218,11 @@ if(!S.ckey) if(S.buckled) S.Feedstop(silent = TRUE) - S.visible_message("[S] vanishes in a flash of light!") + S.visible_message(span_notice("[S] vanishes in a flash of light!")) S.forceMove(X) X.stored_slimes += S else - to_chat(owner, "Target is not near a camera. Cannot proceed.") + to_chat(owner, span_warning("Target is not near a camera. Cannot proceed.")) /datum/action/innate/feed_slime @@ -244,11 +244,11 @@ food.LAssailant = C X.monkeys-- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors - to_chat(owner, "[X] now has [X.monkeys] monkeys stored.") + to_chat(owner, span_notice("[X] now has [X.monkeys] monkeys stored.")) else - to_chat(owner, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.") + to_chat(owner, span_warning("[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.")) else - to_chat(owner, "Target is not near a camera. Cannot proceed.") + to_chat(owner, span_warning("Target is not near a camera. Cannot proceed.")) /datum/action/innate/monkey_recycle @@ -265,19 +265,19 @@ var/obj/machinery/monkey_recycler/recycler = X.connected_recycler if(!recycler) - to_chat(owner, "There is no connected monkey recycler. Use a multitool to link one.") + to_chat(owner, span_warning("There is no connected monkey recycler. Use a multitool to link one.")) return if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) for(var/mob/living/carbon/monkey/M in remote_eye.loc) if(M.stat) - M.visible_message("[M] vanishes as [M.p_theyre()] reclaimed for recycling!") + M.visible_message(span_notice("[M] vanishes as [M.p_theyre()] reclaimed for recycling!")) recycler.use_power(500) X.monkeys += recycler.cube_production X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors qdel(M) - to_chat(owner, "[X] now has [X.monkeys] monkeys available.") + to_chat(owner, span_notice("[X] now has [X.monkeys] monkeys available.")) else - to_chat(owner, "Target is not near a camera. Cannot proceed.") + to_chat(owner, span_warning("Target is not near a camera. Cannot proceed.")) /datum/action/innate/slime_scan name = "Scan Slime" @@ -294,7 +294,7 @@ for(var/mob/living/simple_animal/slime/S in remote_eye.loc) slime_scan(S, C) else - to_chat(owner, "Target is not near a camera. Cannot proceed.") + to_chat(owner, span_warning("Target is not near a camera. Cannot proceed.")) /datum/action/innate/feed_potion name = "Apply Potion" @@ -310,7 +310,7 @@ var/obj/machinery/computer/camera_advanced/xenobio/X = target if(QDELETED(X.current_potion)) - to_chat(owner, "No potion loaded.") + to_chat(owner, span_warning("No potion loaded.")) return if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) @@ -318,7 +318,7 @@ X.current_potion.attack(S, C) break else - to_chat(owner, "Target is not near a camera. Cannot proceed.") + to_chat(owner, span_warning("Target is not near a camera. Cannot proceed.")) /datum/action/innate/hotkey_help name = "Hotkey Help" @@ -370,7 +370,7 @@ // Scans slime /obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickCtrl(mob/living/user, mob/living/simple_animal/slime/S) if(!GLOB.cameranet.checkTurfVis(S.loc)) - to_chat(user, "Target is not near a camera. Cannot proceed.") + to_chat(user, span_warning("Target is not near a camera. Cannot proceed.")) return var/mob/living/C = user var/mob/camera/aiEye/remote/xenobio/E = C.remote_control @@ -381,14 +381,14 @@ //Feeds a potion to slime /obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickAlt(mob/living/user, mob/living/simple_animal/slime/S) if(!GLOB.cameranet.checkTurfVis(S.loc)) - to_chat(user, "Target is not near a camera. Cannot proceed.") + to_chat(user, span_warning("Target is not near a camera. Cannot proceed.")) return var/mob/living/C = user var/mob/camera/aiEye/remote/xenobio/E = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin var/area/mobarea = get_area(S.loc) if(QDELETED(X.current_potion)) - to_chat(C, "No potion loaded.") + to_chat(C, span_warning("No potion loaded.")) return if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) X.current_potion.attack(S, C) @@ -396,7 +396,7 @@ //Picks up slime /obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickShift(mob/living/user, mob/living/simple_animal/slime/S) if(!GLOB.cameranet.checkTurfVis(S.loc)) - to_chat(user, "Target is not near a camera. Cannot proceed.") + to_chat(user, span_warning("Target is not near a camera. Cannot proceed.")) return var/mob/living/C = user var/mob/camera/aiEye/remote/xenobio/E = C.remote_control @@ -404,21 +404,21 @@ var/area/mobarea = get_area(S.loc) if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) if(X.stored_slimes.len >= X.max_slimes) - to_chat(C, "Slime storage is full.") + to_chat(C, span_warning("Slime storage is full.")) return if(S.ckey) - to_chat(C, "The slime wiggled free!") + to_chat(C, span_warning("The slime wiggled free!")) return if(S.buckled) S.Feedstop(silent = TRUE) - S.visible_message("[S] vanishes in a flash of light!") + S.visible_message(span_notice("[S] vanishes in a flash of light!")) S.forceMove(X) X.stored_slimes += S //Place slimes /obj/machinery/computer/camera_advanced/xenobio/proc/XenoTurfClickShift(mob/living/user, turf/open/T) if(!GLOB.cameranet.checkTurfVis(T)) - to_chat(user, "Target is not near a camera. Cannot proceed.") + to_chat(user, span_warning("Target is not near a camera. Cannot proceed.")) return var/mob/living/C = user var/mob/camera/aiEye/remote/xenobio/E = C.remote_control @@ -427,13 +427,13 @@ if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible) for(var/mob/living/simple_animal/slime/S in X.stored_slimes) S.forceMove(T) - S.visible_message("[S] warps in!") + S.visible_message(span_notice("[S] warps in!")) X.stored_slimes -= S //Place monkey /obj/machinery/computer/camera_advanced/xenobio/proc/XenoTurfClickCtrl(mob/living/user, turf/open/T) if(!GLOB.cameranet.checkTurfVis(T)) - to_chat(user, "Target is not near a camera. Cannot proceed.") + to_chat(user, span_warning("Target is not near a camera. Cannot proceed.")) return var/mob/living/C = user var/mob/camera/aiEye/remote/xenobio/E = C.remote_control @@ -446,28 +446,28 @@ food.LAssailant = C X.monkeys-- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors - to_chat(C, "[X] now has [X.monkeys] monkeys stored.") + to_chat(C, span_notice("[X] now has [X.monkeys] monkeys stored.")) else - to_chat(C, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.") + to_chat(C, span_warning("[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.")) //Pick up monkey /obj/machinery/computer/camera_advanced/xenobio/proc/XenoMonkeyClickCtrl(mob/living/user, mob/living/carbon/monkey/M) if(!GLOB.cameranet.checkTurfVis(M.loc)) - to_chat(user, "Target is not near a camera. Cannot proceed.") + to_chat(user, span_warning("Target is not near a camera. Cannot proceed.")) return var/mob/living/C = user var/mob/camera/aiEye/remote/xenobio/E = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin var/area/mobarea = get_area(M.loc) if(!X.connected_recycler) - to_chat(C, "There is no connected monkey recycler. Use a multitool to link one.") + to_chat(C, span_warning("There is no connected monkey recycler. Use a multitool to link one.")) return if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible) if(!M.stat) return - M.visible_message("[M] vanishes as [p_theyre()] reclaimed for recycling!") + M.visible_message(span_notice("[M] vanishes as [p_theyre()] reclaimed for recycling!")) X.connected_recycler.use_power(500) X.monkeys += connected_recycler.cube_production X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors qdel(M) - to_chat(C, "[X] now has [X.monkeys] monkeys available.") + to_chat(C, span_notice("[X] now has [X.monkeys] monkeys available.")) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 1f7d252e8..bb24be87c 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -25,13 +25,13 @@ /obj/item/slime_extract/attackby(obj/item/O, mob/user) if(istype(O, /obj/item/slimepotion/enhancer)) if(Uses >= 5 || recurring) - to_chat(user, "I cannot enhance this extract further!") + to_chat(user, span_warning("I cannot enhance this extract further!")) return ..() if(O.type == /obj/item/slimepotion/enhancer) //Seriously, why is this defined here...? - to_chat(user, "I apply the enhancer to the slime extract. It may now be reused one more time.") + to_chat(user, span_notice("I apply the enhancer to the slime extract. It may now be reused one more time.")) Uses++ if(O.type == /obj/item/slimepotion/enhancer/max) - to_chat(user, "I dump the maximizer on the slime extract. It can now be used a total of 5 times!") + to_chat(user, span_notice("I dump the maximizer on the slime extract. It can now be used a total of 5 times!")) Uses = 5 qdel(O) ..() @@ -46,7 +46,7 @@ //Effect when activated by a Luminescent. Separated into a minor and major effect. Returns cooldown in deciseconds. /obj/item/slime_extract/proc/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type) - to_chat(user, "Nothing happened... This slime extract cannot be activated this way.") + to_chat(user, span_warning("Nothing happened... This slime extract cannot be activated this way.")) return 0 //Core-crossing: Feeding adult slimes extracts to obtain a much more powerful, single extract. @@ -54,13 +54,13 @@ if(!isslime(M)) return ..() if(M.stat) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return if(!M.is_adult) - to_chat(user, "The slime must be an adult to cross its core!") + to_chat(user, span_warning("The slime must be an adult to cross its core!")) return if(M.effectmod && M.effectmod != effectmod) - to_chat(user, "The slime is already being crossed with a different extract!") + to_chat(user, span_warning("The slime is already being crossed with a different extract!")) return if(!M.effectmod) @@ -68,7 +68,7 @@ M.applied++ qdel(src) - to_chat(user, "I feed the slime [src], [M.applied == 1 ? "starting to mutate its core." : "further mutating its core."]") + to_chat(user, span_notice("I feed the slime [src], [M.applied == 1 ? "starting to mutate its core." : "further mutating its core."]")) playsound(M, 'sound/blank.ogg', 50, TRUE) if(M.applied >= SLIME_EXTRACT_CROSSING_REQUIRED) @@ -87,14 +87,14 @@ if(!user.put_in_active_hand(M)) M.forceMove(user.drop_location()) playsound(user, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I spit out a monkey cube.") + to_chat(user, span_notice("I spit out a monkey cube.")) return 120 if(SLIME_ACTIVATE_MAJOR) - to_chat(user, "My [name] starts pulsing...") + to_chat(user, span_notice("My [name] starts pulsing...")) if(do_after(user, 40, target = user)) var/mob/living/simple_animal/slime/S = new(get_turf(user), "grey") playsound(user, 'sound/blank.ogg', 50, TRUE) - to_chat(user, "I spit out [S].") + to_chat(user, span_notice("I spit out [S].")) return 350 else return 0 @@ -108,16 +108,16 @@ /obj/item/slime_extract/gold/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type) switch(activation_type) if(SLIME_ACTIVATE_MINOR) - user.visible_message("[user] starts shaking!","My [name] starts pulsing gently...") + user.visible_message(span_warning("[user] starts shaking!"),span_notice("My [name] starts pulsing gently...")) if(do_after(user, 40, target = user)) var/mob/living/simple_animal/S = create_random_mob(user.drop_location(), FRIENDLY_SPAWN) S.faction |= "neutral" playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] spits out [S]!", "I spit out [S]!") + user.visible_message(span_warning("[user] spits out [S]!"), span_notice("I spit out [S]!")) return 300 if(SLIME_ACTIVATE_MAJOR) - user.visible_message("[user] starts shaking violently!","My [name] starts pulsing violently...") + user.visible_message(span_warning("[user] starts shaking violently!"),span_warning("My [name] starts pulsing violently...")) if(do_after(user, 50, target = user)) var/mob/living/simple_animal/S = create_random_mob(user.drop_location(), HOSTILE_SPAWN) if(user.used_intent.type != INTENT_HARM) @@ -125,7 +125,7 @@ else S.faction |= "slime" playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] spits out [S]!", "I spit out [S]!") + user.visible_message(span_warning("[user] spits out [S]!"), span_warning("I spit out [S]!")) return 600 /obj/item/slime_extract/silver @@ -142,7 +142,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] spits out [O]!", "I spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("I spit out [O]!")) return 200 if(SLIME_ACTIVATE_MAJOR) var/drink_type = get_random_drink() @@ -150,7 +150,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] spits out [O]!", "I spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("I spit out [O]!")) return 200 /obj/item/slime_extract/metal @@ -166,7 +166,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] spits out [O]!", "I spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("I spit out [O]!")) return 150 if(SLIME_ACTIVATE_MAJOR) @@ -174,7 +174,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] spits out [O]!", "I spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("I spit out [O]!")) return 200 /obj/item/slime_extract/purple @@ -188,11 +188,11 @@ if(SLIME_ACTIVATE_MINOR) user.adjust_nutrition(50) user.blood_volume += 50 - to_chat(user, "I activate [src], and my body is refilled with fresh slime jelly!") + to_chat(user, span_notice("I activate [src], and my body is refilled with fresh slime jelly!")) return 150 if(SLIME_ACTIVATE_MAJOR) - to_chat(user, "I activate [src], and it releases regenerative chemicals!") + to_chat(user, span_notice("I activate [src], and it releases regenerative chemicals!")) user.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10) return 600 @@ -209,14 +209,14 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] spits out [O]!", "I spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("I spit out [O]!")) return 150 if(SLIME_ACTIVATE_MAJOR) var/turf/open/T = get_turf(user) if(istype(T)) T.atmos_spawn_air("plasma=20") - to_chat(user, "I activate [src], and a cloud of plasma bursts out of my skin!") + to_chat(user, span_warning("I activate [src], and a cloud of plasma bursts out of my skin!")) return 900 /obj/item/slime_extract/orange @@ -228,7 +228,7 @@ /obj/item/slime_extract/orange/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type) switch(activation_type) if(SLIME_ACTIVATE_MINOR) - to_chat(user, "I activate [src]. You start feeling hot!") + to_chat(user, span_notice("I activate [src]. You start feeling hot!")) user.reagents.add_reagent(/datum/reagent/consumable/capsaicin,10) return 150 @@ -236,7 +236,7 @@ user.reagents.add_reagent(/datum/reagent/phosphorus,5)// user.reagents.add_reagent(/datum/reagent/potassium,5) // = smoke, along with any reagents inside mr. slime user.reagents.add_reagent(/datum/reagent/consumable/sugar,5) // - to_chat(user, "I activate [src], and a cloud of smoke bursts out of my skin!") + to_chat(user, span_warning("I activate [src], and a cloud of smoke bursts out of my skin!")) return 450 /obj/item/slime_extract/yellow @@ -249,17 +249,17 @@ switch(activation_type) if(SLIME_ACTIVATE_MINOR) if(species.glow_intensity != LUMINESCENT_DEFAULT_GLOW) - to_chat(user, "My glow is already enhanced!") + to_chat(user, span_warning("My glow is already enhanced!")) return species.update_glow(user, 5) addtimer(CALLBACK(species, TYPE_PROC_REF(/datum/species/jelly/luminescent, update_glow), user, LUMINESCENT_DEFAULT_GLOW), 600) - to_chat(user, "I start glowing brighter.") + to_chat(user, span_notice("I start glowing brighter.")) if(SLIME_ACTIVATE_MAJOR) - user.visible_message("[user]'s skin starts flashing intermittently...", "My skin starts flashing intermittently...") + user.visible_message(span_warning("[user]'s skin starts flashing intermittently..."), span_warning("My skin starts flashing intermittently...")) if(do_after(user, 25, target = user)) empulse(user, 1, 2) - user.visible_message("[user]'s skin flashes!", "My skin flashes as you emit an electromagnetic pulse!") + user.visible_message(span_warning("[user]'s skin flashes!"), span_warning("My skin flashes as you emit an electromagnetic pulse!")) return 600 /obj/item/slime_extract/red @@ -271,15 +271,15 @@ /obj/item/slime_extract/red/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type) switch(activation_type) if(SLIME_ACTIVATE_MINOR) - to_chat(user, "I activate [src]. You start feeling fast!") + to_chat(user, span_notice("I activate [src]. You start feeling fast!")) user.reagents.add_reagent(/datum/reagent/medicine/ephedrine,5) return 450 if(SLIME_ACTIVATE_MAJOR) - user.visible_message("[user]'s skin flashes red for a moment...", "My skin flashes red as you emit rage-inducing pheromones...") + user.visible_message(span_warning("[user]'s skin flashes red for a moment..."), span_warning("My skin flashes red as you emit rage-inducing pheromones...")) for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(user), null)) slime.rabid = TRUE - slime.visible_message("The [slime] is driven into a frenzy!") + slime.visible_message(span_danger("The [slime] is driven into a frenzy!")) return 600 /obj/item/slime_extract/blue @@ -291,7 +291,7 @@ /obj/item/slime_extract/blue/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type) switch(activation_type) if(SLIME_ACTIVATE_MINOR) - to_chat(user, "I activate [src]. Your genome feels more stable!") + to_chat(user, span_notice("I activate [src]. Your genome feels more stable!")) user.adjustCloneLoss(-15) user.reagents.add_reagent(/datum/reagent/medicine/mutadone, 10) user.reagents.add_reagent(/datum/reagent/medicine/potass_iodide, 10) @@ -299,7 +299,7 @@ if(SLIME_ACTIVATE_MAJOR) user.reagents.create_foam(/datum/effect_system/foam_spread,20) - user.visible_message("Foam spews out from [user]'s skin!", "I activate [src], and foam bursts out of my skin!") + user.visible_message(span_danger("Foam spews out from [user]'s skin!"), span_warning("I activate [src], and foam bursts out of my skin!")) return 600 /obj/item/slime_extract/darkblue @@ -311,7 +311,7 @@ /obj/item/slime_extract/darkblue/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type) switch(activation_type) if(SLIME_ACTIVATE_MINOR) - to_chat(user, "I activate [src]. You start feeling colder!") + to_chat(user, span_notice("I activate [src]. You start feeling colder!")) user.ExtinguishMob() user.adjust_fire_stacks(-20) user.reagents.add_reagent(/datum/reagent/consumable/frostoil,4) @@ -322,7 +322,7 @@ var/turf/open/T = get_turf(user) if(istype(T)) T.atmos_spawn_air("nitrogen=40;TEMP=2.7") - to_chat(user, "I activate [src], and icy air bursts out of my skin!") + to_chat(user, span_warning("I activate [src], and icy air bursts out of my skin!")) return 900 /obj/item/slime_extract/pink @@ -335,19 +335,19 @@ switch(activation_type) if(SLIME_ACTIVATE_MINOR) if(user.gender != MALE && user.gender != FEMALE) - to_chat(user, "I can't swap my gender!") + to_chat(user, span_warning("I can't swap my gender!")) return if(user.gender == MALE) user.gender = FEMALE - user.visible_message("[user] suddenly looks more feminine!", "I suddenly feel more feminine!") + user.visible_message(span_boldnotice("[user] suddenly looks more feminine!"), span_boldwarning("I suddenly feel more feminine!")) else user.gender = MALE - user.visible_message("[user] suddenly looks more masculine!", "I suddenly feel more masculine!") + user.visible_message(span_boldnotice("[user] suddenly looks more masculine!"), span_boldwarning("I suddenly feel more masculine!")) return 100 if(SLIME_ACTIVATE_MAJOR) - user.visible_message("[user]'s skin starts flashing hypnotically...", "My skin starts forming odd patterns, pacifying creatures around you.") + user.visible_message(span_warning("[user]'s skin starts flashing hypnotically..."), span_notice("My skin starts forming odd patterns, pacifying creatures around you.")) for(var/mob/living/carbon/C in viewers(user, null)) if(C != user) C.reagents.add_reagent(/datum/reagent/pax,2) @@ -362,20 +362,20 @@ /obj/item/slime_extract/green/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type) switch(activation_type) if(SLIME_ACTIVATE_MINOR) - to_chat(user, "I feel myself reverting to human form...") + to_chat(user, span_warning("I feel myself reverting to human form...")) if(do_after(user, 120, target = user)) - to_chat(user, "I feel human again!") + to_chat(user, span_warning("I feel human again!")) user.set_species(/datum/species/human) return - to_chat(user, "I stop the transformation.") + to_chat(user, span_notice("I stop the transformation.")) if(SLIME_ACTIVATE_MAJOR) - to_chat(user, "I feel myself radically changing my slime type...") + to_chat(user, span_warning("I feel myself radically changing my slime type...")) if(do_after(user, 120, target = user)) - to_chat(user, "I feel different!") + to_chat(user, span_warning("I feel different!")) user.set_species(pick(/datum/species/jelly/slime, /datum/species/jelly/stargazer)) return - to_chat(user, "I stop the transformation.") + to_chat(user, span_notice("I stop the transformation.")) /obj/item/slime_extract/lightpink name = "light pink slime extract" @@ -390,7 +390,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] spits out [O]!", "I spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("I spit out [O]!")) return 150 if(SLIME_ACTIVATE_MAJOR) @@ -398,7 +398,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] spits out [O]!", "I spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("I spit out [O]!")) return 450 /obj/item/slime_extract/black @@ -410,17 +410,17 @@ /obj/item/slime_extract/black/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type) switch(activation_type) if(SLIME_ACTIVATE_MINOR) - to_chat(user, "I feel something wrong inside you...") + to_chat(user, span_danger("I feel something wrong inside you...")) user.ForceContractDisease(new /datum/disease/transformation/slime(), FALSE, TRUE) return 100 if(SLIME_ACTIVATE_MAJOR) - to_chat(user, "I feel my own light turning dark...") + to_chat(user, span_warning("I feel my own light turning dark...")) if(do_after(user, 120, target = user)) - to_chat(user, "I feel a longing for darkness.") + to_chat(user, span_warning("I feel a longing for darkness.")) user.set_species(pick(/datum/species/shadow)) return - to_chat(user, "I stop feeding [src].") + to_chat(user, span_notice("I stop feeding [src].")) /obj/item/slime_extract/oil name = "oil slime extract" @@ -431,19 +431,19 @@ /obj/item/slime_extract/oil/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type) switch(activation_type) if(SLIME_ACTIVATE_MINOR) - to_chat(user, "I vomit slippery oil.") + to_chat(user, span_warning("I vomit slippery oil.")) playsound(user, 'sound/blank.ogg', 50, TRUE) new /obj/effect/decal/cleanable/oil/slippery(get_turf(user)) return 450 if(SLIME_ACTIVATE_MAJOR) - user.visible_message("[user]'s skin starts pulsing and glowing ominously...", "I feel unstable...") + user.visible_message(span_warning("[user]'s skin starts pulsing and glowing ominously..."), span_danger("I feel unstable...")) if(do_after(user, 60, target = user)) - to_chat(user, "I explode!") + to_chat(user, span_danger("I explode!")) explosion(get_turf(user), 1 ,3, 6) user.gib() return - to_chat(user, "I stop feeding [src], and the feeling passes.") + to_chat(user, span_notice("I stop feeding [src], and the feeling passes.")) /obj/item/slime_extract/adamantine name = "adamantine slime extract" @@ -455,20 +455,20 @@ switch(activation_type) if(SLIME_ACTIVATE_MINOR) if(species.armor > 0) - to_chat(user, "My skin is already hardened!") + to_chat(user, span_warning("My skin is already hardened!")) return - to_chat(user, "I feel my skin harden and become more resistant.") + to_chat(user, span_notice("I feel my skin harden and become more resistant.")) species.armor += 25 addtimer(CALLBACK(src, PROC_REF(reset_armor), species), 1200) return 450 if(SLIME_ACTIVATE_MAJOR) - to_chat(user, "I feel my body rapidly crystallizing...") + to_chat(user, span_warning("I feel my body rapidly crystallizing...")) if(do_after(user, 120, target = user)) - to_chat(user, "I feel solid.") + to_chat(user, span_warning("I feel solid.")) user.set_species(pick(/datum/species/golem/adamantine)) return - to_chat(user, "I stop feeding [src], and my body returns to its slimelike state.") + to_chat(user, span_notice("I stop feeding [src], and my body returns to its slimelike state.")) /obj/item/slime_extract/adamantine/proc/reset_armor(datum/species/jelly/luminescent/species) if(istype(species)) @@ -487,15 +487,15 @@ /obj/item/slime_extract/bluespace/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type) switch(activation_type) if(SLIME_ACTIVATE_MINOR) - to_chat(user, "I feel my body vibrating...") + to_chat(user, span_warning("I feel my body vibrating...")) if(do_after(user, 25, target = user)) - to_chat(user, "I teleport!") + to_chat(user, span_warning("I teleport!")) do_teleport(user, get_turf(user), 6, asoundin = 'sound/blank.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) return 300 if(SLIME_ACTIVATE_MAJOR) if(!teleport_ready) - to_chat(user, "I feel myself anchoring to this spot...") + to_chat(user, span_notice("I feel myself anchoring to this spot...")) var/turf/T = get_turf(user) teleport_x = T.x teleport_y = T.y @@ -505,7 +505,7 @@ teleport_ready = FALSE if(teleport_x && teleport_y && teleport_z) var/turf/T = locate(teleport_x, teleport_y, teleport_z) - to_chat(user, "I snap back to my anchor point!") + to_chat(user, span_notice("I snap back to my anchor point!")) do_teleport(user, T, asoundin = 'sound/blank.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) return 450 @@ -524,7 +524,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] spits out [O]!", "I spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("I spit out [O]!")) return 150 if(SLIME_ACTIVATE_MAJOR) @@ -534,7 +534,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] spits out [O]!", "I spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("I spit out [O]!")) return 250 /obj/item/slime_extract/cerulean @@ -547,14 +547,14 @@ switch(activation_type) if(SLIME_ACTIVATE_MINOR) user.reagents.add_reagent(/datum/reagent/medicine/salbutamol,15) - to_chat(user, "I feel like you don't need to breathe!") + to_chat(user, span_notice("I feel like you don't need to breathe!")) return 150 if(SLIME_ACTIVATE_MAJOR) var/turf/open/T = get_turf(user) if(istype(T)) T.atmos_spawn_air("o2=11;n2=41;TEMP=293.15") - to_chat(user, "I activate [src], and fresh air bursts out of my skin!") + to_chat(user, span_warning("I activate [src], and fresh air bursts out of my skin!")) return 600 /obj/item/slime_extract/sepia @@ -570,11 +570,11 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] spits out [O]!", "I spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("I spit out [O]!")) return 150 if(SLIME_ACTIVATE_MAJOR) - to_chat(user, "I feel time slow down...") + to_chat(user, span_warning("I feel time slow down...")) if(do_after(user, 30, target = user)) new /obj/effect/timestop(get_turf(user), 2, 50, list(user)) return 900 @@ -591,7 +591,7 @@ user.dna.features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F") user.updateappearance(mutcolor_update=1) species.update_glow(user) - to_chat(user, "I feel different...") + to_chat(user, span_notice("I feel different...")) return 100 if(SLIME_ACTIVATE_MAJOR) @@ -600,7 +600,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/blank.ogg', 50, TRUE) - user.visible_message("[user] spits out [O]!", "I spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("I spit out [O]!")) return 150 ////Slime-derived potions/// @@ -615,7 +615,7 @@ if(!proximity) return if (istype(target)) - to_chat(user, "I cannot transfer [src] to [target]! It appears the potion must be given directly to a slime to absorb." ) + to_chat(user, span_warning("I cannot transfer [src] to [target]! It appears the potion must be given directly to a slime to absorb.") ) return /obj/item/slimepotion/slime/docility @@ -626,21 +626,21 @@ /obj/item/slimepotion/slime/docility/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M)) - to_chat(user, "The potion only works on slimes!") + to_chat(user, span_warning("The potion only works on slimes!")) return ..() if(M.stat) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return if(M.rabid) //Stops being rabid, but doesn't become truly docile. - to_chat(M, "I absorb the potion, and my rabid hunger finally settles to a normal desire to feed.") - to_chat(user, "I feed the slime the potion, calming its rabid rage.") + to_chat(M, span_warning("I absorb the potion, and my rabid hunger finally settles to a normal desire to feed.")) + to_chat(user, span_notice("I feed the slime the potion, calming its rabid rage.")) M.rabid = FALSE qdel(src) return M.docile = 1 M.set_nutrition(700) - to_chat(M, "I absorb the potion and feel my intense desire to feed melt away.") - to_chat(user, "I feed the slime the potion, removing its hunger and calming it.") + to_chat(M, span_warning("I absorb the potion and feel my intense desire to feed melt away.")) + to_chat(user, span_notice("I feed the slime the potion, removing its hunger and calming it.")) var/newname = copytext(sanitize_name(input(user, "Would you like to give the slime a name?", "Name my new pet", "pet slime") as null|text),1,MAX_NAME_LEN) if (!newname) @@ -662,17 +662,17 @@ if(being_used || !ismob(M)) return if(!isanimal(M) || M.ckey) //only works on animals that aren't player controlled - to_chat(user, "[M] is already too intelligent for this to work!") + to_chat(user, span_warning("[M] is already too intelligent for this to work!")) return if(M.stat) - to_chat(user, "[M] is dead!") + to_chat(user, span_warning("[M] is dead!")) return var/mob/living/simple_animal/SM = M if(SM.sentience_type != sentience_type) - to_chat(user, "[src] won't work on [SM].") + to_chat(user, span_warning("[src] won't work on [SM].")) return - to_chat(user, "I offer [src] to [SM]...") + to_chat(user, span_notice("I offer [src] to [SM]...")) being_used = TRUE var/list/candidates = pollCandidatesForMob("Do you want to play as [SM.name]?", ROLE_SENTIENCE, null, ROLE_SENTIENCE, 50, SM, POLL_IGNORE_SENTIENCE_POTION) // see poll_ignore.dm @@ -681,16 +681,16 @@ SM.key = C.key SM.mind.enslave_mind_to_creator(user) SM.sentience_act() - to_chat(SM, "All at once it makes sense: you know what you are and who you are! Self awareness is yours!") - to_chat(SM, "I are grateful to be self aware and owe [user.real_name] a great debt. Serve [user.real_name], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.") + to_chat(SM, span_warning("All at once it makes sense: you know what you are and who you are! Self awareness is yours!")) + to_chat(SM, span_danger("I are grateful to be self aware and owe [user.real_name] a great debt. Serve [user.real_name], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.")) if(SM.flags_1 & HOLOGRAM_1) //Check to see if it's a holodeck creature - to_chat(SM, "I also become depressingly aware that you are not a real creature, but instead a holoform. Your existence is limited to the parameters of the holodeck.") - to_chat(user, "[SM] accepts [src] and suddenly becomes attentive and aware. It worked!") + to_chat(SM, span_danger("I also become depressingly aware that you are not a real creature, but instead a holoform. Your existence is limited to the parameters of the holodeck.")) + to_chat(user, span_notice("[SM] accepts [src] and suddenly becomes attentive and aware. It worked!")) SM.copy_known_languages_from(user, FALSE) after_success(user, SM) qdel(src) else - to_chat(user, "[SM] looks interested for a moment, but then looks back down. Maybe you should try again later.") + to_chat(user, span_notice("[SM] looks interested for a moment, but then looks back down. Maybe you should try again later.")) being_used = FALSE ..() @@ -722,21 +722,21 @@ if(prompted || !ismob(M)) return if(!isanimal(M) || M.ckey) //much like sentience, these will not work on something that is already player controlled - to_chat(user, "[M] already has a higher consciousness!") + to_chat(user, span_warning("[M] already has a higher consciousness!")) return ..() if(M.stat) - to_chat(user, "[M] is dead!") + to_chat(user, span_warning("[M] is dead!")) return ..() var/mob/living/simple_animal/SM = M if(SM.sentience_type != animal_type) - to_chat(user, "I cannot transfer my consciousness to [SM]." ) + to_chat(user, span_warning("I cannot transfer my consciousness to [SM].") ) return ..() var/jb = is_banned_from(user.ckey, ROLE_MIND_TRANSFER) if(QDELETED(src) || QDELETED(M) || QDELETED(user)) return if(jb) - to_chat(user, "My mind goes blank as you attempt to use the potion.") + to_chat(user, span_warning("My mind goes blank as you attempt to use the potion.")) return prompted = 1 @@ -744,15 +744,15 @@ prompted = 0 return - to_chat(user, "I drink the potion then place my hands on [SM]...") + to_chat(user, span_notice("I drink the potion then place my hands on [SM]...")) user.mind.transfer_to(SM) SM.faction = user.faction.Copy() SM.sentience_act() //Same deal here as with sentience user.death() - to_chat(SM, "In a quick flash, you feel my consciousness flow into [SM]!") - to_chat(SM, "I are now [SM]. Your allegiances, alliances, and role is still the same as it was prior to consciousness transfer!") + to_chat(SM, span_notice("In a quick flash, you feel my consciousness flow into [SM]!")) + to_chat(SM, span_warning("I are now [SM]. Your allegiances, alliances, and role is still the same as it was prior to consciousness transfer!")) SM.name = "[user.real_name]" qdel(src) @@ -764,19 +764,19 @@ /obj/item/slimepotion/slime/steroid/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M))//If target is not a slime. - to_chat(user, "The steroid only works on baby slimes!") + to_chat(user, span_warning("The steroid only works on baby slimes!")) return ..() if(M.is_adult) //Can't steroidify adults - to_chat(user, "Only baby slimes can use the steroid!") + to_chat(user, span_warning("Only baby slimes can use the steroid!")) return if(M.stat) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return if(M.cores >= 5) - to_chat(user, "The slime already has the maximum amount of extract!") + to_chat(user, span_warning("The slime already has the maximum amount of extract!")) return - to_chat(user, "I feed the slime the steroid. It will now produce one more extract.") + to_chat(user, span_notice("I feed the slime the steroid. It will now produce one more extract.")) M.cores++ qdel(src) @@ -794,16 +794,16 @@ /obj/item/slimepotion/slime/stabilizer/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M)) - to_chat(user, "The stabilizer only works on slimes!") + to_chat(user, span_warning("The stabilizer only works on slimes!")) return ..() if(M.stat) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return if(M.mutation_chance == 0) - to_chat(user, "The slime already has no chance of mutating!") + to_chat(user, span_warning("The slime already has no chance of mutating!")) return - to_chat(user, "I feed the slime the stabilizer. It is now less likely to mutate.") + to_chat(user, span_notice("I feed the slime the stabilizer. It is now less likely to mutate.")) M.mutation_chance = CLAMP(M.mutation_chance-15,0,100) qdel(src) @@ -815,19 +815,19 @@ /obj/item/slimepotion/slime/mutator/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M)) - to_chat(user, "The mutator only works on slimes!") + to_chat(user, span_warning("The mutator only works on slimes!")) return ..() if(M.stat) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return if(M.mutator_used) - to_chat(user, "This slime has already consumed a mutator, any more would be far too unstable!") + to_chat(user, span_warning("This slime has already consumed a mutator, any more would be far too unstable!")) return if(M.mutation_chance == 100) - to_chat(user, "The slime is already guaranteed to mutate!") + to_chat(user, span_warning("The slime is already guaranteed to mutate!")) return - to_chat(user, "I feed the slime the mutator. It is now more likely to mutate.") + to_chat(user, span_notice("I feed the slime the mutator. It is now more likely to mutate.")) M.mutation_chance = CLAMP(M.mutation_chance+12,0,100) M.mutator_used = TRUE qdel(src) @@ -843,12 +843,12 @@ if(!proximity) return if(!istype(C)) - to_chat(user, "The potion can only be used on items or vehicles!") + to_chat(user, span_warning("The potion can only be used on items or vehicles!")) return if(isitem(C)) var/obj/item/I = C if(I.slowdown <= 0 || I.obj_flags & IMMUTABLE_SLOW) - to_chat(user, "The [C] can't be made any faster!") + to_chat(user, span_warning("The [C] can't be made any faster!")) return ..() I.slowdown = 0 @@ -858,11 +858,11 @@ if(R) var/vehicle_speed_mod = round(CONFIG_GET(number/movedelay/run_delay) * 0.85, 0.01) if(R.vehicle_move_delay <= vehicle_speed_mod) - to_chat(user, "The [C] can't be made any faster!") + to_chat(user, span_warning("The [C] can't be made any faster!")) return ..() R.vehicle_move_delay = vehicle_speed_mod - to_chat(user, "I slather the red gunk over the [C], making it faster.") + to_chat(user, span_notice("I slather the red gunk over the [C], making it faster.")) C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) C.add_atom_colour("#FF0000", FIXED_COLOUR_PRIORITY) qdel(src) @@ -883,12 +883,12 @@ qdel(src) return if(!istype(C)) - to_chat(user, "The potion can only be used on clothing!") + to_chat(user, span_warning("The potion can only be used on clothing!")) return if(C.max_heat_protection_temperature >= FIRE_IMMUNITY_MAX_TEMP_PROTECT) - to_chat(user, "The [C] is already fireproof!") + to_chat(user, span_warning("The [C] is already fireproof!")) return ..() - to_chat(user, "I slather the blue gunk over the [C], fireproofing it.") + to_chat(user, span_notice("I slather the blue gunk over the [C], fireproofing it.")) C.name = "fireproofed [C.name]" C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) C.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY) @@ -907,19 +907,19 @@ /obj/item/slimepotion/genderchange/attack(mob/living/L, mob/user) if(!istype(L) || L.stat == DEAD) - to_chat(user, "The potion can only be used on living things!") + to_chat(user, span_warning("The potion can only be used on living things!")) return if(L.gender != MALE && L.gender != FEMALE) - to_chat(user, "The potion can only be used on gendered things!") + to_chat(user, span_warning("The potion can only be used on gendered things!")) return if(L.gender == MALE) L.gender = FEMALE - L.visible_message("[L] suddenly looks more feminine!", "I suddenly feel more feminine!") + L.visible_message(span_boldnotice("[L] suddenly looks more feminine!"), span_boldwarning("I suddenly feel more feminine!")) else L.gender = MALE - L.visible_message("[L] suddenly looks more masculine!", "I suddenly feel more masculine!") + L.visible_message(span_boldnotice("[L] suddenly looks more masculine!"), span_boldwarning("I suddenly feel more masculine!")) L.regenerate_icons() qdel(src) @@ -935,12 +935,12 @@ if(being_used || !ismob(M)) return if(!M.ckey) //only works on animals that aren't player controlled - to_chat(user, "[M] is not self aware, and cannot pick its own name.") + to_chat(user, span_warning("[M] is not self aware, and cannot pick its own name.")) return being_used = TRUE - to_chat(user, "I offer [src] to [user]...") + to_chat(user, span_notice("I offer [src] to [user]...")) var/new_name = stripped_input(M, "What would you like my name to be?", "Input a name", M.real_name, MAX_NAME_LEN) @@ -948,7 +948,7 @@ being_used = FALSE return - M.visible_message("[M] has a new name, [new_name].", "My old name of [M.real_name] fades away, and my new name [new_name] anchors itself in my mind.") + M.visible_message(span_notice("[M] has a new name, [new_name]."), span_notice("My old name of [M.real_name] fades away, and my new name [new_name] anchors itself in my mind.")) message_admins("[ADMIN_LOOKUPFLW(user)] used [src] on [ADMIN_LOOKUPFLW(M)], letting them rename themselves into [new_name].") // pass null as first arg to not update records or ID/PDA @@ -966,14 +966,14 @@ if(!ismob(M)) return if(!isanimal(M)) - to_chat(user, "[M] is too complex for the potion!") + to_chat(user, span_warning("[M] is too complex for the potion!")) return if(M.stat) - to_chat(user, "[M] is dead!") + to_chat(user, span_warning("[M] is dead!")) return - to_chat(user, "I feed the potion to [M].") - to_chat(M, "My mind tingles as you are fed the potion. You can hear radio waves now!") + to_chat(user, span_notice("I feed the potion to [M].")) + to_chat(M, span_notice("My mind tingles as you are fed the potion. You can hear radio waves now!")) var/obj/item/implant/radio/slime/imp = new(src) imp.implant(M, user) qdel(src) diff --git a/code/modules/roguetown/roguejobs/blacksmith/anvil.dm b/code/modules/roguetown/roguejobs/blacksmith/anvil.dm index e3a951ab0..06ebcbe90 100644 --- a/code/modules/roguetown/roguejobs/blacksmith/anvil.dm +++ b/code/modules/roguetown/roguejobs/blacksmith/anvil.dm @@ -18,7 +18,7 @@ /obj/machinery/anvil/examine(mob/user) . = ..() if(hingot && hott) - . += "[hingot] is too hot to touch." + . += span_warning("[hingot] is too hot to touch.") /obj/machinery/anvil/attackby(obj/item/W, mob/living/user, params) if(istype(W, /obj/item/rogueweapon/tongs)) @@ -61,7 +61,7 @@ if(!hingot) return if(!hott) - to_chat(user, "It's too cold.") + to_chat(user, span_warning("It's too cold.")) return if(!hingot.currecipe) if(!choose_recipe(user)) @@ -116,7 +116,7 @@ return if(W.anvilrepair) - user.visible_message("[user] places [W] on the anvil.") + user.visible_message(span_info("[user] places [W] on the anvil.")) W.forceMove(src.loc) return ..() @@ -164,7 +164,7 @@ /obj/machinery/anvil/attack_hand(mob/user, params) if(hingot) if(hott) - to_chat(user, "It's too hot.") + to_chat(user, span_warning("It's too hot.")) return else var/obj/item/I = hingot diff --git a/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/_anvil_recipe.dm b/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/_anvil_recipe.dm index a67d53059..cdacd55d6 100644 --- a/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/_anvil_recipe.dm +++ b/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/_anvil_recipe.dm @@ -22,12 +22,12 @@ /datum/anvil_recipe/proc/advance(mob/user, breakthrough = FALSE) if(progress == 100) - to_chat(user, "It's ready.") - user.visible_message("[user] strikes the bar!") + to_chat(user, span_info("It's ready.")) + user.visible_message(span_warning("[user] strikes the bar!")) return FALSE if(needed_item) - to_chat(user, "Now it's time to add a [needed_item_text].") - user.visible_message("[user] strikes the bar!") + to_chat(user, span_info("Now it's time to add a [needed_item_text].")) + user.visible_message(span_warning("[user] strikes the bar!")) return FALSE var/moveup = 1 var/proab = 3 @@ -50,13 +50,13 @@ progress = 0 if(!moveup) if(prob(round(proab/2))) - user.visible_message("[user] spoils the bar!") + user.visible_message(span_warning("[user] spoils the bar!")) if(parent) var/obj/item/P = parent qdel(P) return FALSE else - user.visible_message("[user] fumbles with the bar!") + user.visible_message(span_warning("[user] fumbles with the bar!")) return FALSE else if(user.mind && isliving(user)) @@ -68,14 +68,14 @@ if(amt2raise > 0) user.mind.adjust_experience(appro_skill, amt2raise * boon, FALSE) if(breakthrough) - user.visible_message("[user] strikes the bar!") + user.visible_message(span_warning("[user] strikes the bar!")) else - user.visible_message("[user] strikes the bar!") + user.visible_message(span_info("[user] strikes the bar!")) return TRUE /datum/anvil_recipe/proc/item_added(mob/user) needed_item = null - user.visible_message("[user] adds [needed_item_text]") + user.visible_message(span_info("[user] adds [needed_item_text]")) needed_item_text = null /datum/anvil_recipe/proc/handle_creation(obj/item/I) diff --git a/code/modules/roguetown/roguejobs/blacksmith/forge.dm b/code/modules/roguetown/roguejobs/blacksmith/forge.dm index 84e76354f..aa429032f 100644 --- a/code/modules/roguetown/roguejobs/blacksmith/forge.dm +++ b/code/modules/roguetown/roguejobs/blacksmith/forge.dm @@ -19,6 +19,6 @@ T.hott = tyme addtimer(CALLBACK(T, TYPE_PROC_REF(/obj/item/rogueweapon/tongs, make_unhot), tyme), 100) T.update_icon() - user.visible_message("[user] heats the bar.") + user.visible_message(span_info("[user] heats the bar.")) return return ..() diff --git a/code/modules/roguetown/roguejobs/blacksmith/items.dm b/code/modules/roguetown/roguejobs/blacksmith/items.dm index 34d9d8f84..339229aec 100644 --- a/code/modules/roguetown/roguejobs/blacksmith/items.dm +++ b/code/modules/roguetown/roguejobs/blacksmith/items.dm @@ -81,7 +81,7 @@ /obj/item/roguegear/attack_self(mob/user) if(linking) linking = null - to_chat(user, "Linking halted.") + to_chat(user, span_warning("Linking halted.")) return /obj/item/roguegear/attack_obj(obj/O, mob/living/user) @@ -90,19 +90,19 @@ var/obj/structure/S = O if(linking) if(linking == O) - to_chat(user, "You cannot link me to myself.") + to_chat(user, span_warning("You cannot link me to myself.")) return if(linking in S.redstone_attached) - to_chat(user, "Already linked.") + to_chat(user, span_warning("Already linked.")) linking = null return S.redstone_attached |= linking linking.redstone_attached |= S linking = null - to_chat(user, "Link complete.") + to_chat(user, span_notice("Link complete.")) return else linking = S - to_chat(user, "Link beginning...") + to_chat(user, span_info("Link beginning...")) return ..() diff --git a/code/modules/roguetown/roguejobs/blacksmith/smelter.dm b/code/modules/roguetown/roguejobs/blacksmith/smelter.dm index 76b657811..4c01ec29e 100644 --- a/code/modules/roguetown/roguejobs/blacksmith/smelter.dm +++ b/code/modules/roguetown/roguejobs/blacksmith/smelter.dm @@ -35,7 +35,7 @@ //i feel like leveling up takes forever regardless, this would just make it faster if(amt2raise > 0) user.mind.adjust_experience(/datum/skill/craft/smelting, amt2raise * boon, FALSE) - user.visible_message("[user] retrieves [I] from [src].") + user.visible_message(span_info("[user] retrieves [I] from [src].")) if(on) var/tyme = world.time T.hott = tyme @@ -56,26 +56,26 @@ var/datum/mind/smelter_mind = user.mind var/smelter_exp = smelter_mind.get_skill_level(/datum/skill/craft/smelting) ore[W] = floor(rand(smelter_exp*15, max(63, smelter_exp*25))/25) // (0-25 spoil, 25-50 poor, 50-75, normal, 75-onwards good) no skill = 0, 63, novice = 15, 63, apprentice = 30, 63, skilled = 45, 75, expert = 60, 100, master = 75, 125, legendary = 100, 150, (may want to add a tier above good) - user.visible_message("[user] puts something in the smelter.") + user.visible_message(span_warning("[user] puts something in the smelter.")) cooking = 0 return else - to_chat(user, "[W.name] can be smelted, but [src] is full.") + to_chat(user, span_warning("[W.name] can be smelted, but [src] is full.")) else - to_chat(user, "[W.name] cannot be smelted.") + to_chat(user, span_warning("[W.name] cannot be smelted.")) return ..() /obj/machinery/light/rogue/smelter/attack_hand(mob/user, params) if(on) - to_chat(user, "It's too hot.") + to_chat(user, span_warning("It's too hot.")) return if(ore.len) var/obj/item/I = ore[ore.len] ore -= I I.loc = user.loc user.put_in_active_hand(I) - user.visible_message("[user] retrieves [I] from [src].") + user.visible_message(span_info("[user] retrieves [I] from [src].")) else return ..() @@ -155,5 +155,5 @@ ore += R qdel(I) playsound(src,'sound/misc/smelter_fin.ogg', 100, FALSE) - visible_message("[src] is finished.") + visible_message(span_notice("[src] is finished.")) cooking = 31 diff --git a/code/modules/roguetown/roguejobs/blacksmith/tools.dm b/code/modules/roguetown/roguejobs/blacksmith/tools.dm index 22ef428f8..2f850b94d 100644 --- a/code/modules/roguetown/roguejobs/blacksmith/tools.dm +++ b/code/modules/roguetown/roguejobs/blacksmith/tools.dm @@ -28,7 +28,7 @@ if(!attacked_item.anvilrepair || (attacked_item.obj_integrity >= attacked_item.max_integrity) || !isturf(attacked_item.loc)) return if(attacked_item.obj_integrity <= 0) - user.visible_message("[attacked_item] is broken! I cannot fix it...") + user.visible_message(span_warning("[attacked_item] is broken! I cannot fix it...")) return if(blacksmith_mind.get_skill_level(attacked_item.anvilrepair) <= 0) @@ -45,13 +45,13 @@ exp_gained = min(attacked_item.obj_integrity + repair_percent, attacked_item.max_integrity) - attacked_item.obj_integrity attacked_item.obj_integrity = min(attacked_item.obj_integrity + repair_percent, attacked_item.max_integrity) if(repair_percent == 0.01) // If an inexperienced repair attempt has been successful - to_chat(user, "You fumble your way into slightly repairing [attacked_item].") + to_chat(user, span_warning("You fumble your way into slightly repairing [attacked_item].")) else - user.visible_message("[user] repairs [attacked_item]!") + user.visible_message(span_info("[user] repairs [attacked_item]!")) blacksmith_mind.adjust_experience(attacked_item.anvilrepair, exp_gained/2) //We gain as much exp as we fix divided by 2 return else - user.visible_message("[user] damages [attacked_item]!") + user.visible_message(span_warning("[user] damages [attacked_item]!")) attacked_item.take_damage(5, BRUTE, "blunt") return @@ -60,14 +60,14 @@ if(!attacked_structure.hammer_repair || !attacked_structure.max_integrity) return if(blacksmith_mind.get_skill_level(attacked_structure.hammer_repair) <= 0) - to_chat(user, "I don't know how to repair this..") + to_chat(user, span_warning("I don't know how to repair this..")) return repair_percent *= blacksmith_mind.get_skill_level(attacked_structure.hammer_repair) * attacked_structure.max_integrity exp_gained = min(attacked_structure.obj_integrity + repair_percent, attacked_structure.max_integrity) - attacked_structure.obj_integrity attacked_structure.obj_integrity = min(attacked_structure.obj_integrity + repair_percent, attacked_structure.max_integrity) blacksmith_mind.adjust_experience(attacked_structure.hammer_repair, exp_gained) //We gain as much exp as we fix playsound(src,'sound/items/bsmithfail.ogg', 100, FALSE) - user.visible_message("[user] repairs [attacked_structure]!") + user.visible_message(span_info("[user] repairs [attacked_structure]!")) return . = ..() @@ -82,13 +82,13 @@ var/repair_percent = 0.05 if(user.mind) if(user.mind.get_skill_level(I.hammer_repair) <= 0) - to_chat(user, "I don't know how to repair this..") + to_chat(user, span_warning("I don't know how to repair this..")) return repair_percent = max(user.mind.get_skill_level(I.hammer_repair) * 0.05, 0.05) repair_percent = repair_percent * I.max_integrity I.obj_integrity = min(obj_integrity+repair_percent, I.max_integrity) playsound(src,'sound/items/bsmithfail.ogg', 100, FALSE) - user.visible_message("[user] repairs [I]!") + user.visible_message(span_info("[user] repairs [I]!")) return ..() */ @@ -143,7 +143,7 @@ /obj/item/rogueweapon/tongs/examine(mob/user) . = ..() if(hott) - . += "The tip is hot to the touch." + . += span_warning("The tip is hot to the touch.") /obj/item/rogueweapon/tongs/get_temperature() if(hott) diff --git a/code/modules/roguetown/roguejobs/cook/recipes/pies.dm b/code/modules/roguetown/roguejobs/cook/recipes/pies.dm index 71e3304d5..0324f388b 100644 --- a/code/modules/roguetown/roguejobs/cook/recipes/pies.dm +++ b/code/modules/roguetown/roguejobs/cook/recipes/pies.dm @@ -41,7 +41,7 @@ if(stunning) L.Paralyze(20) //splat! L.adjust_blurriness(1) - L.visible_message("[L] is hit by [src]!", "I'm hit by [src]!") + L.visible_message(span_warning("[L] is hit by [src]!"), span_danger("I'm hit by [src]!")) if(is_type_in_typecache(hit_atom, GLOB.creamable)) hit_atom.AddComponent(/datum/component/creamed, src) qdel(src) diff --git a/code/modules/roguetown/roguejobs/cook/tools/oven.dm b/code/modules/roguetown/roguejobs/cook/tools/oven.dm index d2df9eb0b..c7fb00e54 100644 --- a/code/modules/roguetown/roguejobs/cook/tools/oven.dm +++ b/code/modules/roguetown/roguejobs/cook/tools/oven.dm @@ -33,7 +33,7 @@ donefoods = FALSE W.forceMove(src) food += W - user.visible_message("[user] puts something in the oven.") + user.visible_message(span_warning("[user] puts something in the oven.")) need_underlay_update = TRUE update_icon() return @@ -49,7 +49,7 @@ food -= I qdel(I) food += C - visible_message("Something smells good!") + visible_message(span_notice("Something smells good!")) need_underlay_update = TRUE update_icon() diff --git a/code/modules/roguetown/roguejobs/farmer/chaff.dm b/code/modules/roguetown/roguejobs/farmer/chaff.dm index a9fe50c11..691c5d3ba 100644 --- a/code/modules/roguetown/roguejobs/farmer/chaff.dm +++ b/code/modules/roguetown/roguejobs/farmer/chaff.dm @@ -10,10 +10,10 @@ /obj/item/natural/chaff/attack_right(mob/user) if(foodextracted && !user.get_active_held_item()) - to_chat(user, "I start to shuck [src]...") + to_chat(user, span_warning("I start to shuck [src]...")) if(move_after(user,40, target = src)) //ROGTODO make this based on farming skill and speed - user.visible_message("[user] shucks [src].", \ - "I shuck [src].") + user.visible_message(span_notice("[user] shucks [src]."), \ + span_notice("I shuck [src].")) testing("1") var/obj/item/G = new foodextracted(get_turf(src)) user.put_in_active_hand(G) @@ -40,9 +40,9 @@ W.forked += R stuff++ if(stuff) - to_chat(user, "I pick up the stalks with the pitchfork.") + to_chat(user, span_notice("I pick up the stalks with the pitchfork.")) else - to_chat(user, "I'm carrying enough with the pitchfork.") + to_chat(user, span_warning("I'm carrying enough with the pitchfork.")) W.update_icon() return @@ -54,8 +54,8 @@ continue if(prob(threshchance)) C.thresh() - user.visible_message("[user] threshes the stalks!", \ - "I thresh the stalks.") + user.visible_message(span_notice("[user] threshes the stalks!"), \ + span_notice("I thresh the stalks.")) user.changeNext_move(CLICK_CD_MELEE) playsound(loc,"plantcross", 100, FALSE) playsound(loc,"smashlimb", 50, FALSE) diff --git a/code/modules/roguetown/roguejobs/farmer/plantedcrops.dm b/code/modules/roguetown/roguejobs/farmer/plantedcrops.dm index 749c1d865..33c066cad 100644 --- a/code/modules/roguetown/roguejobs/farmer/plantedcrops.dm +++ b/code/modules/roguetown/roguejobs/farmer/plantedcrops.dm @@ -37,15 +37,15 @@ /obj/machinery/crop/examine(mob/user) . = ..() if(growth >= 100) - . += "[src] is ready for harvest!" + . += span_notice("[src] is ready for harvest!") if(water < 25) - . += "The ground is thirsty." + . += span_info("The ground is thirsty.") if(food < 25) - . += "The ground is hungry." + . += span_info("The ground is hungry.") if(weeds >= 25) - . += "Weeds!" + . += span_warning("Weeds!") if(plant_hp <= 25) - . += "Brown and dying..." + . += span_warning("Brown and dying...") /obj/machinery/crop/process() if(QDELETED(src)) @@ -173,19 +173,19 @@ var/exp_gained = 0 if(istype(attacking_item, /obj/item/seeds)) - to_chat(user, "Something is already growing here.") + to_chat(user, span_warning("Something is already growing here.")) return if(istype(attacking_item, /obj/item/rogueweapon/sickle)) if(!myseed) return if(plant_hp <= 0) - to_chat(user, "This crop has perished.") + to_chat(user, span_warning("This crop has perished.")) return if(growth < 100) - to_chat(user, "This crop is not ready to harvest.") + to_chat(user, span_warning("This crop is not ready to harvest.")) return - user.visible_message("[user] harvests [src] with [attacking_item].") + user.visible_message(span_notice("[user] harvests [src] with [attacking_item].")) for(var/i in 1 to myseed.yield) if(plant_hp <= 0) return @@ -218,14 +218,14 @@ if(plant_hp <= 0) playsound(src,'sound/items/seed.ogg', 100, FALSE) new /obj/item/natural/fibers(src.loc) - user.visible_message("[user] rips out [src] with [attacking_item].") + user.visible_message(span_notice("[user] rips out [src] with [attacking_item].")) exp_gained = current_farmer.STAINT farmer_mind.adjust_experience(/datum/skill/labor/farming, exp_gained) qdel(src) return else if(weeds > 0) playsound(src,'sound/items/seed.ogg', 100, FALSE) - user.visible_message("[user] rips out some weeds with [attacking_item].") + user.visible_message(span_notice("[user] rips out some weeds with [attacking_item].")) weeds = max(weeds - rand(1,50), 0) update_seed_icon() exp_gained = current_farmer.STAINT @@ -235,7 +235,7 @@ //Following 3 are fertilizers if(istype(attacking_item, /obj/item/natural/poo)) playsound(src,'sound/items/seed.ogg', 100, FALSE) - visible_message("[user] confidently fertilizes the soil with [attacking_item].") + visible_message(span_notice("[user] confidently fertilizes the soil with [attacking_item].")) qdel(attacking_item) user.update_inv_hands() food = 100 @@ -244,7 +244,7 @@ return if(istype(attacking_item, /obj/item/ash) || istype(attacking_item, /obj/item/trash/applecore)) playsound(src,'sound/items/seed.ogg', 100, FALSE) - visible_message("[user] confidently fertilizes the soil with [attacking_item].") + visible_message(span_notice("[user] confidently fertilizes the soil with [attacking_item].")) food = min(food + 50, 100) qdel(attacking_item) user.update_inv_hands() @@ -256,7 +256,7 @@ if(!S.fertamount) return playsound(src,'sound/items/seed.ogg', 100, FALSE) - visible_message("[user] confidently fertilizes the soil with [attacking_item].") + visible_message(span_notice("[user] confidently fertilizes the soil with [attacking_item].")) food = min(food + S.fertamount, 100) qdel(attacking_item) user.update_inv_hands() @@ -283,7 +283,7 @@ exp_gained = current_farmer.STAINT farmer_mind.adjust_experience(/datum/skill/labor/farming, exp_gained) playsound(src,"plantcross", 100, FALSE) - user.visible_message("[user] pulls out [src].") + user.visible_message(span_notice("[user] pulls out [src].")) new /obj/item/natural/fibers(src.loc) qdel(src) name = initial(name) @@ -313,9 +313,9 @@ success_chance = 100 if(prob(success_chance)) new myseed.product(src.loc) - user.visible_message("[user] harvests something from [src].") + user.visible_message(span_info("[user] harvests something from [src].")) else - user.visible_message("[user] spoils something from [src]!") + user.visible_message(span_warning("[user] spoils something from [src]!")) exp_gained = round(current_farmer.STAINT / initial(myseed.yield)) //So we don't gain a fuck ton of EXP if our plant happens to have multiple crops farmer_mind.adjust_experience(/datum/skill/labor/farming, exp_gained) if(myseed.yield <= 0) @@ -350,7 +350,7 @@ if(weeds <= 0 || !do_after(user, deweed_time, target = src)) return playsound(src,"plantcross", 100, FALSE) - user.visible_message("[user] rips out some weeds.") + user.visible_message(span_notice("[user] rips out some weeds.")) weeds = max(weeds - rand(1,30), 0) exp_gained = current_farmer.STAINT farmer_mind.adjust_experience(/datum/skill/labor/farming, exp_gained) diff --git a/code/modules/roguetown/roguejobs/farmer/tools.dm b/code/modules/roguetown/roguejobs/farmer/tools.dm index 66bf95055..6bfe7ee1c 100644 --- a/code/modules/roguetown/roguejobs/farmer/tools.dm +++ b/code/modules/roguetown/roguejobs/farmer/tools.dm @@ -88,8 +88,8 @@ if(found) playsound(loc,"plantcross", 100, FALSE) playsound(loc,"smashlimb", 50, FALSE) - user.visible_message("[user] threshes the stalks!", \ - "I thresh the stalks.") + user.visible_message(span_notice("[user] threshes the stalks!"), \ + span_notice("I thresh the stalks.")) return ..() @@ -252,14 +252,14 @@ if(istype(target, /turf/open/floor/rogue/dirt)) var/obj/machinery/crop/R = locate() in target if(R) - to_chat(user,"There's already a mound here.") + to_chat(user,span_warning("There's already a mound here.")) return if(prob(10)) //ROGTODO make this farming skill based maybe a stat too - user.visible_message("[user] tills the soil!", \ - "I till the soil.") + user.visible_message(span_notice("[user] tills the soil!"), \ + span_notice("I till the soil.")) new /obj/machinery/crop(target) else - to_chat(user,"I till the soil.") + to_chat(user,span_warning("I till the soil.")) return ..() */ @@ -352,7 +352,7 @@ for(var/obj/item/I in forked) I.forceMove(target) forked -= I - to_chat(user, "I dump the stalks.") + to_chat(user, span_warning("I dump the stalks.")) update_icon() return ..() diff --git a/code/modules/roguetown/roguejobs/fisher/fish.dm b/code/modules/roguetown/roguejobs/fisher/fish.dm index f244842ed..8072bdd53 100644 --- a/code/modules/roguetown/roguejobs/fisher/fish.dm +++ b/code/modules/roguetown/roguejobs/fisher/fish.dm @@ -48,7 +48,7 @@ else if(isturf(user.loc)) src.forceMove(user.loc) - to_chat(user, "Too slippery!") + to_chat(user, span_warning("Too slippery!")) return /obj/item/reagent_containers/food/snacks/fish/process() diff --git a/code/modules/roguetown/roguejobs/fisher/leeches.dm b/code/modules/roguetown/roguejobs/fisher/leeches.dm index a32a15690..0764f876b 100644 --- a/code/modules/roguetown/roguejobs/fisher/leeches.dm +++ b/code/modules/roguetown/roguejobs/fisher/leeches.dm @@ -47,17 +47,17 @@ . = ..() switch(blood_storage/blood_maximum) if(0.8 to INFINITY) - . += "[p_theyre(TRUE)] fat and engorged with blood." + . += span_bloody("[p_theyre(TRUE)] fat and engorged with blood.") if(0.5 to 0.8) - . += "[p_theyre(TRUE)] well fed." + . += span_bloody("[p_theyre(TRUE)] well fed.") if(0.1 to 0.5) - . += "[p_they(TRUE)] want[p_s()] a meal." + . += span_warning("[p_they(TRUE)] want[p_s()] a meal.") if(-INFINITY to 0.1) - . += "[p_theyre(TRUE)] starved." + . += span_dead("[p_theyre(TRUE)] starved.") if(!giving) - . += "[p_theyre(TRUE)] [pick("slurping", "sucking", "inhaling")]." + . += span_warning("[p_theyre(TRUE)] [pick("slurping", "sucking", "inhaling")].") else - . += "[p_theyre(TRUE)] [pick("vomiting", "gorfing", "exhaling")]." + . += span_notice("[p_theyre(TRUE)] [pick("vomiting", "gorfing", "exhaling")].") if(drainage) START_PROCESSING(SSobj, src) @@ -68,7 +68,7 @@ if(!affecting) return if(!get_location_accessible(H, check_zone(user.zone_selected))) - to_chat(user, "Something in the way.") + to_chat(user, span_warning("Something in the way.")) return var/used_time = (70 - (H.mind.get_skill_level(/datum/skill/misc/medicine) * 10))/2 if(!do_mob(user, H, used_time)) @@ -79,9 +79,9 @@ src.forceMove(H) affecting.add_embedded_object(src, silent = TRUE, crit_message = FALSE) if(M == user) - user.visible_message("[user] places [src] on [user.p_their()] [affecting].", "I place a leech on my [affecting].") + user.visible_message(span_notice("[user] places [src] on [user.p_their()] [affecting]."), span_notice("I place a leech on my [affecting].")) else - user.visible_message("[user] places [src] on [M]'s [affecting].", "I place a leech on [M]'s [affecting].") + user.visible_message(span_notice("[user] places [src] on [M]'s [affecting]."), span_notice("I place a leech on [M]'s [affecting].")) return return ..() @@ -155,14 +155,14 @@ if(MAX_LEECH_EVILNESS to INFINITY) //maximized evilness holy shit color = "#ff0000" adjectives += pick("evil", "malevolent", "misanthropic") - descs += "This one is bursting with hatred!" + descs += span_danger("This one is bursting with hatred!") if(5) //this leech is painfully average, it gets no adjectives if(prob(3)) adjectives += pick("average", "ordinary", "boring") descs += "This one is extremely boring to look at." if(-INFINITY to 1) //this leech is pretty terrible at being a leech adjectives += pick("pitiful", "pathetic", "depressing") - descs += "This one yearns for nothing but death." + descs += span_dead("This one yearns for nothing but death.") else var/adjective_amount = 1 if(prob(5)) @@ -201,10 +201,10 @@ . = ..() giving = !giving if(giving) - user.visible_message("[user] squeezes [src].",\ - "I squeeze [src]. It will now infuse blood.") + user.visible_message(span_notice("[user] squeezes [src]."),\ + span_notice("I squeeze [src]. It will now infuse blood.")) else - user.visible_message("[user] squeezes [src].",\ - "I squeeze [src]. It will now extract blood.") + user.visible_message(span_notice("[user] squeezes [src]."),\ + span_notice("I squeeze [src]. It will now extract blood.")) #undef MAX_LEECH_EVILNESS diff --git a/code/modules/roguetown/roguejobs/fisher/rod.dm b/code/modules/roguetown/roguejobs/fisher/rod.dm index 67ff9ed6d..911943ec7 100644 --- a/code/modules/roguetown/roguejobs/fisher/rod.dm +++ b/code/modules/roguetown/roguejobs/fisher/rod.dm @@ -29,8 +29,8 @@ /obj/item/fishingrod/attackby(obj/item/I, mob/user, params) if(I.baitchance && !baited) - user.visible_message("[user] hooks something to the line.", \ - "I hook [I] to my line.") + user.visible_message(span_notice("[user] hooks something to the line."), \ + span_notice("I hook [I] to my line.")) playsound(src.loc, 'sound/foley/pierce.ogg', 50, FALSE) I.forceMove(src) baited = I @@ -59,8 +59,8 @@ return ..() var/mob/living/current_fisherman = user - current_fisherman.visible_message("[current_fisherman] casts a line!", \ - "I cast a line.") + current_fisherman.visible_message(span_warning("[current_fisherman] casts a line!"), \ + span_notice("I cast a line.")) playsound(loc, 'sound/items/fishing_plouf.ogg', 100, TRUE) var/amt2raise = 0 //How much exp we gain on catch @@ -76,19 +76,19 @@ if(!do_after(current_fisherman, casting_time, target = target)) return if(!baited) - to_chat(current_fisherman, "This seems pointless.") + to_chat(current_fisherman, span_warning("This seems pointless.")) return if(!prob(baited.baitchance)) - to_chat(current_fisherman, "Damn, got away...") + to_chat(current_fisherman, span_warning("Damn, got away...")) QDEL_NULL(baited) update_icon() return - to_chat(current_fisherman, "Something tugs the line!") + to_chat(current_fisherman, span_notice("Something tugs the line!")) playsound(loc, 'sound/items/fishing_plouf.ogg', 100, TRUE) if(!do_after(current_fisherman, fishing_time, target = target)) - to_chat(current_fisherman, "Damn, got away...") + to_chat(current_fisherman, span_warning("Damn, got away...")) QDEL_NULL(baited) update_icon() return diff --git a/code/modules/roguetown/roguejobs/gravedigger/gravemarker.dm b/code/modules/roguetown/roguejobs/gravedigger/gravemarker.dm index 278e69a78..cdbb275f5 100644 --- a/code/modules/roguetown/roguejobs/gravedigger/gravemarker.dm +++ b/code/modules/roguetown/roguejobs/gravedigger/gravemarker.dm @@ -11,14 +11,14 @@ /datum/crafting_recipe/roguetown/gravemarker/TurfCheck(mob/user, turf/T) if(!(locate(/obj/structure/closet/dirthole) in T)) - to_chat(user, "There is no grave here.") + to_chat(user, span_warning("There is no grave here.")) return FALSE for(var/obj/structure/closet/dirthole/D in T) if(D.stage != 4) - to_chat(user, "I can't.") + to_chat(user, span_warning("I can't.")) return FALSE if(locate(/obj/structure/gravemarker) in T) - to_chat(user, "This grave is already hallowed.") + to_chat(user, span_warning("This grave is already hallowed.")) return FALSE return TRUE diff --git a/code/modules/roguetown/roguejobs/gravedigger/hole.dm b/code/modules/roguetown/roguejobs/gravedigger/hole.dm index 1d1c83bf1..0249ab607 100644 --- a/code/modules/roguetown/roguejobs/gravedigger/hole.dm +++ b/code/modules/roguetown/roguejobs/gravedigger/hole.dm @@ -55,7 +55,7 @@ . = ..() if(HAS_TRAIT(user, TRAIT_SOUL_EXAMINE)) if(lootroll == 1) - . += "Better let this one sleep." + . += span_warning("Better let this one sleep.") /obj/structure/closet/dirthole/insertion_allowed(atom/movable/AM) if(istype(AM, /obj/structure/closet/crate/chest) || istype(AM, /obj/structure/closet/burial_shroud)) @@ -122,7 +122,7 @@ // playsound(mastert,'sound/items/dig_shovel.ogg', 100, TRUE) // mastert.ChangeTurf(T.type, flags = CHANGETURF_INHERIT_AIR) // return - to_chat(user, "I can't dig myself any deeper.") + to_chat(user, span_warning("I can't dig myself any deeper.")) return var/used_str = 10 if(iscarbon(user)) @@ -189,14 +189,14 @@ return var/list/targets = list(O, src) add_fingerprint(user) - user.visible_message("[user] [actuallyismob ? "tries to ":""]stuff [O] into [src].", \ - "I [actuallyismob ? "try to ":""]stuff [O] into [src].", \ - "I hear clanging.") + user.visible_message(span_warning("[user] [actuallyismob ? "tries to ":""]stuff [O] into [src]."), \ + span_warning("I [actuallyismob ? "try to ":""]stuff [O] into [src]."), \ + span_hear("I hear clanging.")) if(actuallyismob) if(do_after_mob(user, targets, 40)) - user.visible_message("[user] stuffs [O] into [src].", \ - "I stuff [O] into [src].", \ - "I hear a loud bang.") + user.visible_message(span_notice("[user] stuffs [O] into [src]."), \ + span_notice("I stuff [O] into [src]."), \ + span_hear("I hear a loud bang.")) var/mob/living/L = O if(!issilicon(L)) L.Paralyze(40) diff --git a/code/modules/roguetown/roguejobs/gravedigger/tools.dm b/code/modules/roguetown/roguejobs/gravedigger/tools.dm index 9817032cc..d66f3f2cd 100644 --- a/code/modules/roguetown/roguejobs/gravedigger/tools.dm +++ b/code/modules/roguetown/roguejobs/gravedigger/tools.dm @@ -97,7 +97,7 @@ update_icon() return if(istype(T, /turf/open/floor/rogue/grass)) - to_chat(user, "There is grass in the way.") + to_chat(user, span_warning("There is grass in the way.")) return return . = ..() @@ -239,9 +239,9 @@ if(!ishuman(usr)) return if(contents.len) - to_chat(usr, "There are too many things inside of [src] to fold it up!") + to_chat(usr, span_warning("There are too many things inside of [src] to fold it up!")) return - visible_message("[usr] folds up [src].") + visible_message(span_notice("[usr] folds up [src].")) var/obj/item/bodybag/B = foldedbag_instance || new foldedbag_path usr.put_in_hands(B) qdel(src) diff --git a/code/modules/roguetown/roguejobs/tailor/loom.dm b/code/modules/roguetown/roguejobs/tailor/loom.dm index 3d82fe92e..cde9e18be 100644 --- a/code/modules/roguetown/roguejobs/tailor/loom.dm +++ b/code/modules/roguetown/roguejobs/tailor/loom.dm @@ -61,5 +61,5 @@ weaver.mind.adjust_experience(/datum/skill/misc/sewing, (weaver.STAINT*0.5))//you get less exp from using the loom /obj/machinery/loom/examine(mob/user) - to_chat(user, "There are [storedfiber] strands of fiber strung on [src].") + to_chat(user, span_notice("There are [storedfiber] strands of fiber strung on [src].")) . = ..() diff --git a/code/modules/roguetown/roguemachine/ATM.dm b/code/modules/roguetown/roguemachine/ATM.dm index 05773e9be..910ae427b 100644 --- a/code/modules/roguetown/roguemachine/ATM.dm +++ b/code/modules/roguetown/roguemachine/ATM.dm @@ -49,7 +49,7 @@ return budget2change(coin_amt*mod, user, selection) else - to_chat(user, "The machine bites my finger.") + to_chat(user, span_warning("The machine bites my finger.")) icon_state = "atm-b" H.flash_fullscreen("redflash3") playsound(H, 'sound/combat/hits/bladed/genstab (1).ogg', 100, FALSE, -1) @@ -85,5 +85,5 @@ /obj/structure/roguemachine/atm/examine(mob/user) . += ..() - . += "The current tax rate on deposits is [SStreasury.tax_value * 100] percent. Nobles exempt." + . += span_info("The current tax rate on deposits is [SStreasury.tax_value * 100] percent. Nobles exempt.") diff --git a/code/modules/roguetown/roguemachine/bounty.dm b/code/modules/roguetown/roguemachine/bounty.dm index 9b76b5b27..97316c985 100644 --- a/code/modules/roguetown/roguemachine/bounty.dm +++ b/code/modules/roguetown/roguemachine/bounty.dm @@ -135,7 +135,7 @@ for(var/guys_name in user.mind.known_people) eligible_players += guys_name else - to_chat(user, "I don't know anyone.") + to_chat(user, span_warning("I don't know anyone.")) return var/target = input(user, "Whose name shall be etched on the wanted list?", src) as null|anything in eligible_players if(isnull(target)) diff --git a/code/modules/roguetown/roguemachine/drugmachine.dm b/code/modules/roguetown/roguemachine/drugmachine.dm index 39e15ac23..51f6e8981 100644 --- a/code/modules/roguetown/roguemachine/drugmachine.dm +++ b/code/modules/roguetown/roguemachine/drugmachine.dm @@ -32,7 +32,7 @@ update_icon() return attack_hand(user) else - to_chat(user, "Wrong key.") + to_chat(user, span_warning("Wrong key.")) return if(istype(P, /obj/item/keyring)) var/obj/item/keyring/K = P diff --git a/code/modules/roguetown/roguemachine/mail.dm b/code/modules/roguetown/roguemachine/mail.dm index 748f19245..a9de0f40b 100644 --- a/code/modules/roguetown/roguemachine/mail.dm +++ b/code/modules/roguetown/roguemachine/mail.dm @@ -32,7 +32,7 @@ return user.changeNext_move(CLICK_CD_MELEE) if(!coin_loaded) - to_chat(user, "The machine doesn't respond. It needs a coin.") + to_chat(user, span_warning("The machine doesn't respond. It needs a coin.")) return var/send2place = input(user, "Where to? (Person or #number)", "ROGUETOWN", null) if(!send2place) @@ -43,7 +43,7 @@ var/t = stripped_multiline_input("Write Your Letter", "ROGUETOWN", no_trim=TRUE) if(t) if(length(t) > 2000) - to_chat(user, "Too long. Try again.") + to_chat(user, span_warning("Too long. Try again.")) return if(!coin_loaded) return @@ -68,14 +68,14 @@ playsound(X, 'sound/misc/mail.ogg', 100, FALSE, -1) break if(found) - visible_message("[user] sends something.") + visible_message(span_warning("[user] sends something.")) playsound(loc, 'sound/misc/disposalflush.ogg', 100, FALSE, -1) SStreasury.give_money_treasury(coin_loaded, "Mail Income") coin_loaded = FALSE update_icon() return else - to_chat(user, "Failed to send it. Bad number?") + to_chat(user, span_warning("Failed to send it. Bad number?")) else if(!send2place) return @@ -91,9 +91,9 @@ X.update_icon() send_ooc_note("New letter from [sentfrom].", name = send2place) else - to_chat(user, "The master of mails has perished?") + to_chat(user, span_warning("The master of mails has perished?")) return - visible_message("[user] sends something.") + visible_message(span_warning("[user] sends something.")) playsound(loc, 'sound/misc/disposalflush.ogg', 100, FALSE, -1) SStreasury.give_money_treasury(coin_loaded, "Mail") coin_loaded = FALSE @@ -116,7 +116,7 @@ else GLOB.confessors += "[C.signed]" qdel(C) - visible_message("[user] sends something.") + visible_message(span_warning("[user] sends something.")) send_ooc_note("Confessions: [GLOB.confessors.len]/5", job = list("confessor", "inquisitor", "priest")) playsound(loc, 'sound/magic/hallelujah.ogg', 100, FALSE, -1) playsound(loc, 'sound/misc/disposalflush.ogg', 100, FALSE, -1) @@ -145,11 +145,11 @@ playsound(src.loc, 'sound/misc/hiss.ogg', 100, FALSE, -1) break if(found) - visible_message("[user] sends something.") + visible_message(span_warning("[user] sends something.")) playsound(loc, 'sound/misc/disposalflush.ogg', 100, FALSE, -1) return else - to_chat(user, "Cannot send it. Bad number?") + to_chat(user, span_warning("Cannot send it. Bad number?")) else if(!send2place) return @@ -167,9 +167,9 @@ X.update_icon() playsound(src.loc, 'sound/misc/hiss.ogg', 100, FALSE, -1) if(!findmaster) - to_chat(user, "The master of mails has perished?") + to_chat(user, span_warning("The master of mails has perished?")) else - visible_message("[user] sends something.") + visible_message(span_warning("[user] sends something.")) playsound(loc, 'sound/misc/disposalflush.ogg', 100, FALSE, -1) send_ooc_note("New letter from [sentfrom].", name = send2place) return @@ -268,7 +268,7 @@ PA.cached_mailer = null PA.cached_mailedto = null PA.update_icon() - to_chat(user, "I carefully re-seal the letter and place it back in the machine, no one will know.") + to_chat(user, span_warning("I carefully re-seal the letter and place it back in the machine, no one will know.")) P.forceMove(loc) var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.handle_item_insertion(P, prevent_warning=TRUE) diff --git a/code/modules/roguetown/roguemachine/merchant.dm b/code/modules/roguetown/roguemachine/merchant.dm index 9ddf20b75..b7e39e092 100644 --- a/code/modules/roguetown/roguemachine/merchant.dm +++ b/code/modules/roguetown/roguemachine/merchant.dm @@ -85,7 +85,7 @@ if(prize >= 1) play_sound=TRUE budgie += prize - I.visible_message("[I] is sucked into the air!") + I.visible_message(span_warning("[I] is sucked into the air!")) qdel(I) budgie = round(budgie) if(budgie > 0) @@ -144,7 +144,7 @@ update_icon() return attack_hand(user) else - to_chat(user, "Wrong key.") + to_chat(user, span_warning("Wrong key.")) return if(istype(P, /obj/item/keyring)) var/obj/item/keyring/K = P @@ -260,7 +260,7 @@ if(!ishuman(user)) return if(locked) - to_chat(user, "It's locked. Of course.") + to_chat(user, span_warning("It's locked. Of course.")) return user.changeNext_move(CLICK_CD_MELEE) playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1) diff --git a/code/modules/roguetown/roguemachine/money.dm b/code/modules/roguetown/roguemachine/money.dm index c63977b56..8f00ed207 100644 --- a/code/modules/roguetown/roguemachine/money.dm +++ b/code/modules/roguetown/roguemachine/money.dm @@ -78,7 +78,7 @@ GLOBAL_VAR(moneymaster) /obj/structure/roguemachine/money/attack_hand(mob/living/user) . = ..() user.changeNext_move(CLICK_CD_MELEE) - to_chat(user, "I rub the machine clockwise.") + to_chat(user, span_info("I rub the machine clockwise.")) if(budget > 0) say("[budget] MAMMON ARE MINE...") playsound(src, 'sound/misc/machinetalk.ogg', 100, FALSE, -1) @@ -92,7 +92,7 @@ GLOBAL_VAR(moneymaster) user.changeNext_move(CLICK_CD_MELEE) var/inputt = alert(user,"Gold, Silver, or Bronze?",,"BRONZE","SILVER","GOLD") if(inputt && Adjacent(user)) - to_chat(user, "I pull on the [inputt] tongue.") + to_chat(user, span_info("I pull on the [inputt] tongue.")) if(inputt == "BRONZE" && budget >= 50) budget2change(budget, user, inputt) budget = 0 @@ -101,7 +101,7 @@ GLOBAL_VAR(moneymaster) L.emote("scream") L.Paralyze(50) L.Stun(50) - L.visible_message("[user] is buried under a mountain of coins!") + L.visible_message(span_danger("[user] is buried under a mountain of coins!")) else budget2change(budget, user, inputt) switch(inputt) @@ -179,7 +179,7 @@ GLOBAL_VAR(moneymaster) user.changeNext_move(CLICK_CD_MELEE) playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1) speaking = !speaking - to_chat(user, "I press the right eye.") + to_chat(user, span_info("I press the right eye.")) update_icon() */ /obj/structure/roguemachine/money/obj_break(damage_flag) diff --git a/code/modules/roguetown/roguemachine/scomm.dm b/code/modules/roguetown/roguemachine/scomm.dm index f4ed203fc..7f7246da5 100644 --- a/code/modules/roguetown/roguemachine/scomm.dm +++ b/code/modules/roguetown/roguemachine/scomm.dm @@ -27,13 +27,13 @@ . = ..() . += "THE LAWS OF THE LAND:" if(!length(GLOB.laws_of_the_land)) - . += "The land has no laws! We are doomed!" + . += span_danger("The land has no laws! We are doomed!") return if(!user.is_literate()) - . += "Uhhh... I can't read them..." + . += span_warning("Uhhh... I can't read them...") return for(var/i in 1 to length(GLOB.laws_of_the_land)) - . += "[i]. [GLOB.laws_of_the_land[i]]" + . += span_small("[i]. [GLOB.laws_of_the_land[i]]") /obj/structure/roguemachine/scomm/process() if(world.time > next_decree) @@ -49,7 +49,7 @@ playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1) listening = !listening speaking = !speaking - to_chat(user, "I [speaking ? "unmute" : "mute"] the SCOM.") + to_chat(user, span_info("I [speaking ? "unmute" : "mute"] the SCOM.")) update_icon() /obj/structure/roguemachine/scomm/attack_right(mob/user) @@ -198,7 +198,7 @@ playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1) listening = !listening speaking = !speaking - to_chat(user, "I [speaking ? "unmute" : "mute"] the scomstone.") + to_chat(user, span_info("I [speaking ? "unmute" : "mute"] the scomstone.")) update_icon() /obj/item/scomstone/Destroy() @@ -294,7 +294,7 @@ playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1) listening = !listening speaking = !speaking - to_chat(user, "I [speaking ? "unmute" : "mute"] the scomstone.") + to_chat(user, span_info("I [speaking ? "unmute" : "mute"] the scomstone.")) update_icon() if(listening) icon_state = "listenstone" diff --git a/code/modules/roguetown/roguemachine/steward.dm b/code/modules/roguetown/roguemachine/steward.dm index 0685d4ea6..ffe22a86a 100644 --- a/code/modules/roguetown/roguemachine/steward.dm +++ b/code/modules/roguetown/roguemachine/steward.dm @@ -29,7 +29,7 @@ update_icon() return else - to_chat(user, "Wrong key.") + to_chat(user, span_warning("Wrong key.")) return if(istype(P, /obj/item/keyring)) var/obj/item/keyring/K = P @@ -39,7 +39,7 @@ playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1) update_icon() return - to_chat(user, "Wrong key.") + to_chat(user, span_warning("Wrong key.")) return return ..() @@ -217,7 +217,7 @@ if(.) return if(locked) - to_chat(user, "It's locked. Of course.") + to_chat(user, span_warning("It's locked. Of course.")) return user.changeNext_move(CLICK_CD_MELEE) playsound(loc, 'sound/misc/keyboard_enter.ogg', 100, FALSE, -1) diff --git a/code/modules/roguetown/roguemachine/titan.dm b/code/modules/roguetown/roguemachine/titan.dm index a8e30de2b..d0cdd5df0 100644 --- a/code/modules/roguetown/roguemachine/titan.dm +++ b/code/modules/roguetown/roguemachine/titan.dm @@ -221,7 +221,7 @@ GLOBAL_LIST_INIT(laws_of_the_land, initialize_laws_of_the_land()) if(istype(C)) if(P.rev_team) if(P.rev_team.members.len < 3) - to_chat(user, "I need more folk on my side to declare victory.") + to_chat(user, span_warning("I need more folk on my side to declare victory.")) else for(var/datum/objective/prebel/obj in user.mind.get_all_objectives()) obj.completed = TRUE @@ -240,7 +240,7 @@ GLOBAL_LIST_INIT(laws_of_the_land, initialize_laws_of_the_land()) if(istype(C)) if(P.rev_team) if(P.rev_team.members.len < 3) - to_chat(user, "I need more folk on my side to declare victory.") + to_chat(user, span_warning("I need more folk on my side to declare victory.")) else for(var/datum/objective/prebel/obj in user.mind.get_all_objectives()) obj.completed = TRUE diff --git a/code/modules/roguetown/roguemachine/vendor.dm b/code/modules/roguetown/roguemachine/vendor.dm index 2900bd36f..4928126fe 100644 --- a/code/modules/roguetown/roguemachine/vendor.dm +++ b/code/modules/roguetown/roguemachine/vendor.dm @@ -26,7 +26,7 @@ update_icon() return attack_hand(user) else - to_chat(user, "Wrong key.") + to_chat(user, span_warning("Wrong key.")) return if(istype(P, /obj/item/keyring)) var/obj/item/keyring/K = P @@ -53,7 +53,7 @@ playsound(loc, 'sound/misc/machinevomit.ogg', 100, TRUE, -1) return attack_hand(user) else - to_chat(user, "Full.") + to_chat(user, span_warning("Full.")) return ..() diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 21c9e4835..4a43f9e6c 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -93,13 +93,13 @@ var/species = golem_shell_species_types[O.merge_type] if(species) if(O.use(10)) - to_chat(user, "I finish up the golem shell with ten sheets of [O].") + to_chat(user, span_notice("I finish up the golem shell with ten sheets of [O].")) new shell_type(get_turf(src), species, user) qdel(src) else - to_chat(user, "I need at least ten sheets to finish a golem!") + to_chat(user, span_warning("I need at least ten sheets to finish a golem!")) else - to_chat(user, "I can't build a golem out of this kind of material!") + to_chat(user, span_warning("I can't build a golem out of this kind of material!")) //made with xenobiology, the golem obeys its creator /obj/item/golem_shell/servant diff --git a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm index 4a60ab0b0..f2fdcd504 100644 --- a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm @@ -76,7 +76,7 @@ /obj/structure/sink/oil_well/attack_hand(mob/M) flick("puddle-oil-splash",src) reagents.reaction(M, TOUCH, 20) //Covers target in 20u of oil. - to_chat(M, "I touch the pool of oil, only to get oil all over myself. It would be wise to wash this off with water.") + to_chat(M, span_notice("I touch the pool of oil, only to get oil all over myself. It would be wise to wash this off with water.")) /obj/structure/sink/oil_well/attackby(obj/item/O, mob/user, params) flick("puddle-oil-splash",src) @@ -90,12 +90,12 @@ if(RG.is_refillable()) if(!RG.reagents.holder_full()) RG.reagents.add_reagent(dispensedreagent, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) - to_chat(user, "I fill [RG] from [src].") + to_chat(user, span_notice("I fill [RG] from [src].")) return TRUE - to_chat(user, "\The [RG] is full.") + to_chat(user, span_notice("\The [RG] is full.")) return FALSE if(user.used_intent.type != INTENT_HARM) - to_chat(user, "I won't have any luck getting \the [O] out if you drop it in the oil.") + to_chat(user, span_notice("I won't have any luck getting \the [O] out if you drop it in the oil.")) return 1 else return ..() @@ -149,15 +149,15 @@ /obj/structure/closet/crate/grave/open(mob/living/user, obj/item/S) if(!opened) - to_chat(user, "The ground here is too hard to dig up with your bare hands. You'll need a shovel.") + to_chat(user, span_notice("The ground here is too hard to dig up with your bare hands. You'll need a shovel.")) else - to_chat(user, "The grave has already been dug up.") + to_chat(user, span_notice("The grave has already been dug up.")) /obj/structure/closet/crate/grave/tool_interact(obj/item/S, mob/living/carbon/user) if(user.used_intent.type == INTENT_HELP) //checks to attempt to dig the grave, must be done on help intent only. if(!opened) if(istype(S,cutting_tool) && S.tool_behaviour == TOOL_SHOVEL) - to_chat(user, "I start start to dig open \the [src] with \the [S]...") + to_chat(user, span_notice("I start start to dig open \the [src] with \the [S]...")) if (do_after(user,20, target = src)) opened = TRUE locked = TRUE @@ -166,22 +166,22 @@ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "graverobbing", /datum/mood_event/graverobbing) if(lead_tomb == TRUE && first_open == TRUE) user.gain_trauma(/datum/brain_trauma/magic/stalker) - to_chat(user, "Oh no, no no no, THEY'RE EVERYWHERE! EVERY ONE OF THEM IS EVERYWHERE!") + to_chat(user, span_boldwarning("Oh no, no no no, THEY'RE EVERYWHERE! EVERY ONE OF THEM IS EVERYWHERE!")) first_open = FALSE return 1 return 1 else - to_chat(user, "I can't dig up a grave with \the [S.name].") + to_chat(user, span_notice("I can't dig up a grave with \the [S.name].")) return 1 else - to_chat(user, "The grave has already been dug up.") + to_chat(user, span_notice("The grave has already been dug up.")) return 1 else if((user.used_intent.type != INTENT_HELP) && opened) //checks to attempt to remove the grave entirely. if(istype(S,cutting_tool) && S.tool_behaviour == TOOL_SHOVEL) - to_chat(user, "I start to remove \the [src] with \the [S].") + to_chat(user, span_notice("I start to remove \the [src] with \the [S].")) if (do_after(user,15, target = src)) - to_chat(user, "I remove \the [src] completely.") + to_chat(user, span_notice("I remove \the [src] completely.")) SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "graverobbing", /datum/mood_event/graverobbing) deconstruct(TRUE) return 1 diff --git a/code/modules/ruins/lavalandruin_code/puzzle.dm b/code/modules/ruins/lavalandruin_code/puzzle.dm index 3a84f62d4..d59fa35a2 100644 --- a/code/modules/ruins/lavalandruin_code/puzzle.dm +++ b/code/modules/ruins/lavalandruin_code/puzzle.dm @@ -282,7 +282,7 @@ /obj/effect/sliding_puzzle/prison/Destroy() if(prisoner) - to_chat(prisoner,"With the cube broken by force, you can feel your body falling apart.") + to_chat(prisoner,span_danger("With the cube broken by force, you can feel your body falling apart.")) prisoner.death() qdel(prisoner) . = ..() @@ -314,12 +314,12 @@ //Handcuffed or unconcious if(istype(carbon_victim) && carbon_victim.handcuffed || victim.stat != CONSCIOUS) if(!puzzle_imprison(target)) - to_chat(user,"[src] does nothing.") + to_chat(user,span_warning("[src] does nothing.")) return - to_chat(user,"I trap [victim] in the prison cube!") + to_chat(user,span_warning("I trap [victim] in the prison cube!")) qdel(src) else - to_chat(user,"[src] only accepts restrained or unconcious prisoners.") + to_chat(user,span_notice("[src] only accepts restrained or unconcious prisoners.")) /proc/puzzle_imprison(mob/living/prisoner) var/turf/T = get_turf(prisoner) @@ -331,7 +331,7 @@ //First grab the prisoner and move them temporarily into the generator so they won't get thrown around. prisoner.notransform = TRUE prisoner.forceMove(cube) - to_chat(prisoner,"You're trapped by the prison cube! You will remain trapped until someone solves it.") + to_chat(prisoner,span_danger("You're trapped by the prison cube! You will remain trapped until someone solves it.")) //Clear the area from objects (and cube user) var/list/things_to_throw = list() diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm index e7efbf4f2..f24aa5c83 100644 --- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm @@ -38,7 +38,7 @@ /obj/structure/lavaland/ash_walker/proc/consume() for(var/mob/living/H in view(src, 1)) //Only for corpse right next to/on same tile if(H.stat) - visible_message("Serrated tendrils eagerly pull [H] to [src], tearing the body apart as its blood seeps over the eggs.") + visible_message(span_warning("Serrated tendrils eagerly pull [H] to [src], tearing the body apart as its blood seeps over the eggs.")) playsound(get_turf(src),'sound/blank.ogg', 100, TRUE) for(var/obj/item/W in H) if(!H.dropItemToGround(W)) @@ -58,5 +58,5 @@ /obj/structure/lavaland/ash_walker/proc/spawn_mob() if(meat_counter >= ASH_WALKER_SPAWN_THRESHOLD) new /obj/effect/mob_spawn/human/ash_walker(get_step(loc, pick(GLOB.alldirs)), ashies) - visible_message("One of the eggs swells to an unnatural size and tumbles free. It's ready to hatch!") + visible_message(span_danger("One of the eggs swells to an unnatural size and tumbles free. It's ready to hatch!")) meat_counter -= ASH_WALKER_SPAWN_THRESHOLD diff --git a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm index b6c518505..b31743444 100644 --- a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm +++ b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm @@ -88,7 +88,7 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/structure/necropolis_gate/attack_hand(mob/user) if(locked) - to_chat(user, "It's [open ? "stuck open":"locked"].") + to_chat(user, span_boldannounce("It's [open ? "stuck open":"locked"].")) return toggle_the_gate(user) return ..() @@ -100,7 +100,7 @@ var/turf/T = get_turf(src) if(open) new /obj/effect/temp_visual/necropolis(T) - visible_message("The door slams closed!") + visible_message(span_boldwarning("The door slams closed!")) sleep(1) playsound(T, 'sound/blank.ogg', 300, TRUE, frequency = 80000) sleep(1) @@ -123,7 +123,7 @@ cut_overlay(door_overlay) new /obj/effect/temp_visual/necropolis/open(T) sleep(2) - visible_message("The door starts to grind open...") + visible_message(span_warning("The door starts to grind open...")) playsound(T, 'sound/blank.ogg', 300, TRUE, frequency = 20000) sleep(22) sight_blocker.forceMove(src) @@ -160,7 +160,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) var/safety = alert(user, "You think this might be a bad idea...", "Knock on the door?", "Proceed", "Abort") if(safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated()) return - user.visible_message("[user] knocks on [src]...", "I tentatively knock on [src]...") + user.visible_message(span_warning("[user] knocks on [src]..."), span_boldannounce("I tentatively knock on [src]...")) playsound(user.loc, 'sound/blank.ogg', 100, TRUE) sleep(50) return ..() @@ -172,7 +172,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) if(.) locked = TRUE var/turf/T = get_turf(src) - visible_message("Something horrible emerges from the Necropolis!") + visible_message(span_danger("Something horrible emerges from the Necropolis!")) if(legion_damaged) message_admins("Legion took damage while the necropolis gate was closed, and has released itself!") log_game("Legion took damage while the necropolis gate was closed and released itself.") @@ -183,7 +183,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) var/sound/legion_sound = sound('sound/blank.ogg') for(var/mob/M in GLOB.player_list) if(M.z == z) - to_chat(M, "Discordant whispers flood your mind in a thousand voices. Each one speaks your name, over and over. Something horrible has been released.") + to_chat(M, span_danger("Discordant whispers flood your mind in a thousand voices. Each one speaks your name, over and over. Something horrible has been released.")) M.playsound_local(T, null, 100, FALSE, 0, FALSE, pressure_affected = FALSE, S = legion_sound) flash_color(M, flash_color = "#FF0000", flash_time = 50) var/mutable_appearance/release_overlay = mutable_appearance('icons/effects/effects.dmi', "legiondoor") diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index 7f07ea769..a09ccea3e 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -17,10 +17,10 @@ obj_flags |= IN_USE user.adjustCloneLoss(20) if(user.stat) - to_chat(user, "No... just one more try...") + to_chat(user, span_danger("No... just one more try...")) user.gib() else - user.visible_message("[user] pulls [src]'s lever with a glint in [user.p_their()] eyes!", "I feel a draining as you pull the lever, but you \ + user.visible_message(span_warning("[user] pulls [src]'s lever with a glint in [user.p_their()] eyes!"), "I feel a draining as you pull the lever, but you \ know it'll be worth it.") icon_state = "slots2" playsound(src, 'sound/blank.ogg', 50, FALSE) @@ -33,11 +33,11 @@ playsound(src, 'sound/blank.ogg', 50, FALSE) new/obj/structure/cursed_money(get_turf(src)) if(user) - to_chat(user, "You've hit jackpot. Laughter echoes around you as your reward appears in the machine's place.") + to_chat(user, span_boldwarning("You've hit jackpot. Laughter echoes around you as your reward appears in the machine's place.")) qdel(src) else if(user) - to_chat(user, "Fucking machine! Must be rigged. Still... one more try couldn't hurt, right?") + to_chat(user, span_boldwarning("Fucking machine! Must be rigged. Still... one more try couldn't hurt, right?")) /obj/structure/cursed_money @@ -84,10 +84,10 @@ if(ishuman(mover)) var/mob/living/carbon/human/H = mover if(H.nutrition >= NUTRITION_LEVEL_FAT) - H.visible_message("[H] pushes through [src]!", "You've seen and eaten worse than this.") + H.visible_message(span_warning("[H] pushes through [src]!"), span_notice("You've seen and eaten worse than this.")) return TRUE else - to_chat(H, "You're repulsed by even looking at [src]. Only a pig could force themselves to go through it.") + to_chat(H, span_warning("You're repulsed by even looking at [src]. Only a pig could force themselves to go through it.")) if(istype(mover, /mob/living/simple_animal/hostile/morph)) return TRUE else @@ -106,8 +106,8 @@ ..() /obj/structure/mirror/magic/pride/curse(mob/user) - user.visible_message("The ground splits beneath [user] as [user.p_their()] hand leaves the mirror!", \ - "Perfect. Much better! Now nobody will be able to resist yo-") + user.visible_message(span_danger("The ground splits beneath [user] as [user.p_their()] hand leaves the mirror!"), \ + span_notice("Perfect. Much better! Now nobody will be able to resist yo-")) var/turf/T = get_turf(user) var/list/levels = SSmapping.levels_by_trait(ZTRAIT_SPACE_RUINS) @@ -148,5 +148,5 @@ H.dna.transfer_identity(user, transfer_SE=1) user.updateappearance(mutcolor_update=1) user.domutcheck() - user.visible_message("[user]'s appearance shifts into [H]'s!", \ - "[H.p_they(TRUE)] think[H.p_s()] [H.p_theyre()] sooo much better than you. Not anymore, [H.p_they()] won't.") + user.visible_message(span_warning("[user]'s appearance shifts into [H]'s!"), \ + span_boldannounce("[H.p_they(TRUE)] think[H.p_s()] [H.p_theyre()] sooo much better than you. Not anymore, [H.p_they()] won't.")) diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index 62d8c97f8..b2a5e30fe 100644 --- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm @@ -33,10 +33,10 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) /obj/item/hilbertshotel/attack(mob/living/M, mob/living/user) if(M.mind) - to_chat(user, "I invite [M] to the hotel.") + to_chat(user, span_notice("I invite [M] to the hotel.")) promptAndCheckIn(M) else - to_chat(user, "[M] is not intelligent enough to understand how to use this device!") + to_chat(user, span_warning("[M] is not intelligent enough to understand how to use this device!")) /obj/item/hilbertshotel/attack_self(mob/user) . = ..() @@ -47,10 +47,10 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) if(!chosenRoomNumber) return if(chosenRoomNumber > SHORT_REAL_LIMIT) - to_chat(user, "I have to check out the first [SHORT_REAL_LIMIT] rooms before you can go to a higher numbered one!") + to_chat(user, span_warning("I have to check out the first [SHORT_REAL_LIMIT] rooms before you can go to a higher numbered one!")) return if((chosenRoomNumber < 1) || (chosenRoomNumber != round(chosenRoomNumber))) - to_chat(user, "That is not a valid room number!") + to_chat(user, span_warning("That is not a valid room number!")) return if(ismob(loc)) if(user == loc) //Not always the same as user @@ -140,7 +140,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) if(ismob(A)) var/mob/M = A if(M.mind) - to_chat(M, "As the sphere breaks apart, you're suddenly ejected into the depths of space!") + to_chat(M, span_warning("As the sphere breaks apart, you're suddenly ejected into the depths of space!")) var/max = world.maxx-TRANSITIONEDGE var/min = 1+TRANSITIONEDGE var/list/possible_transtitons = list() @@ -237,7 +237,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) if(!user.mind) return if(!parentSphere) - to_chat(user, "The door seems to be malfunctioning and refuses to operate!") + to_chat(user, span_warning("The door seems to be malfunctioning and refuses to operate!")) return if(alert(user, "Hilbert's Hotel would like to remind you that while we will do everything we can to protect the belongings you leave behind, we make no guarantees of their safety while you're gone, especially that of the health of any living creatures. With that in mind, are you ready to leave?", "Exit", "Leave", "Stay") == "Leave") if(!(user.mobility_flags & MOBILITY_MOVE) || (get_dist(get_turf(src), get_turf(user)) > 1)) //no teleporting around if they're dead or moved away during the prompt. @@ -279,7 +279,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) /turf/closed/indestructible/hoteldoor/AltClick(mob/user) . = ..() if(get_dist(get_turf(src), get_turf(user)) <= 1) - to_chat(user, "I peak through the door's bluespace peephole...") + to_chat(user, span_notice("I peak through the door's bluespace peephole...")) user.reset_perspective(parentSphere) user.set_machine(src) var/datum/action/peepholeCancel/PHC = new @@ -299,7 +299,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) /datum/action/peepholeCancel/Trigger() . = ..() - to_chat(owner, "I move away from the peephole.") + to_chat(owner, span_warning("I move away from the peephole.")) owner.reset_perspective() owner.clear_fullscreen("remote_view", 0) qdel(src) @@ -343,7 +343,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) log_game("[H] entered itself. Moving it to [loc_name(targetturf)].") message_admins("[H] entered itself. Moving it to [ADMIN_VERBOSEJMP(targetturf)].") for(var/mob/M in A) - to_chat(M, "[H] almost implodes in upon itself, but quickly rebounds, shooting off into a random point in space!") + to_chat(M, span_danger("[H] almost implodes in upon itself, but quickly rebounds, shooting off into a random point in space!")) H.forceMove(targetturf) /area/hilbertshotel/Exited(atom/movable/AM) @@ -423,7 +423,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) . = ..() if(istype(target, /obj/item/hilbertshotel)) if(!proximity) - to_chat(user, "It's to far away to scan!") + to_chat(user, span_warning("It's to far away to scan!")) return var/obj/item/hilbertshotel/sphere = target if(sphere.activeRooms.len) diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index 9a573be60..ff57ca3f5 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -53,7 +53,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) if(isanimal(user)) var/mob/living/simple_animal/A = user if(!A.dextrous) - to_chat(user, "I are too primitive to use this device!") + to_chat(user, span_warning("I are too primitive to use this device!")) return UI_CLOSE return ..() @@ -105,10 +105,10 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) message_admins("[ADMIN_LOOKUPFLW(triggerer)] triggered and [ADMIN_LOOKUPFLW(confirmer)] confirmed event [event]") var/area/A1 = get_area(triggerer) - deadchat_broadcast(" triggered [event] at [A1.name].", "[triggerer]", triggerer) + deadchat_broadcast(" triggered [event] at [A1.name].", span_name("[triggerer]"), triggerer) var/area/A2 = get_area(confirmer) - deadchat_broadcast(" confirmed [event] at [A2.name].", "[confirmer]", confirmer) + deadchat_broadcast(" confirmed [event] at [A2.name].", span_name("[confirmer]"), confirmer) switch(event) if(KEYCARD_RED_ALERT) set_security_level(SEC_LEVEL_RED) diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm index b541ab59b..8c7b376d0 100644 --- a/code/modules/security_levels/security_levels.dm +++ b/code/modules/security_levels/security_levels.dm @@ -77,7 +77,7 @@ GLOBAL_VAR_INIT(security_level, SEC_LEVEL_GREEN) if(level >= SEC_LEVEL_RED) for(var/obj/machinery/door/D in GLOB.machines) if(D.red_alert_access) - D.visible_message("[D] whirrs as it automatically lifts access requirements!") + D.visible_message(span_notice("[D] whirrs as it automatically lifts access requirements!")) playsound(D, 'sound/blank.ogg', 50, TRUE) SSblackbox.record_feedback("tally", "security_level_changes", 1, get_security_level()) SSnightshift.check_nightshift() diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index 29de97c99..a85676ea4 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -186,7 +186,7 @@ Launch(TRUE) - to_chat(user, "Calling your shuttle. One moment...") + to_chat(user, span_notice("Calling your shuttle. One moment...")) while(mode != SHUTTLE_CALL && !damaged) stoplag() diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm index 4e08b5221..15dadb01f 100644 --- a/code/modules/shuttle/assault_pod.dm +++ b/code/modules/shuttle/assault_pod.dm @@ -58,6 +58,6 @@ if(S.shuttleId == shuttle_id) S.possible_destinations = "[landing_zone.id]" - to_chat(user, "Landing zone set.") + to_chat(user, span_notice("Landing zone set.")) qdel(src) diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index a78ef8e5c..97949a4b9 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -42,20 +42,20 @@ usr.set_machine(src) src.add_fingerprint(usr) if(!allowed(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, span_danger("Access denied.")) return if(href_list["move"]) var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId) if(M.launch_status == ENDGAME_LAUNCHED) - to_chat(usr, "You've already escaped. Never going back to that place again!") + to_chat(usr, span_warning("You've already escaped. Never going back to that place again!")) return if(no_destination_swap) if(M.mode == SHUTTLE_RECHARGING) - to_chat(usr, "Shuttle engines are not ready for use.") + to_chat(usr, span_warning("Shuttle engines are not ready for use.")) return if(M.mode != SHUTTLE_IDLE) - to_chat(usr, "Shuttle already in transit.") + to_chat(usr, span_warning("Shuttle already in transit.")) return if(!(href_list["move"] in params2list(possible_destinations))) log_admin("[usr] attempted to href dock exploit on [src] with target location \"[href_list["move"]]\"") @@ -65,16 +65,16 @@ if(0) say("Shuttle departing. Please stand away from the doors.") if(1) - to_chat(usr, "Invalid shuttle requested.") + to_chat(usr, span_warning("Invalid shuttle requested.")) else - to_chat(usr, "Unable to comply.") + to_chat(usr, span_warning("Unable to comply.")) /obj/machinery/computer/shuttle/emag_act(mob/user) if(obj_flags & EMAGGED) return req_access = list() obj_flags |= EMAGGED - to_chat(user, "I fried the consoles ID checking system.") + to_chat(user, span_notice("I fried the consoles ID checking system.")) /obj/machinery/computer/shuttle/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE) if(port && (shuttleId == initial(shuttleId) || override)) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 6baf78fc5..c1341372a 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -62,11 +62,11 @@ var/obj/item/card/id/ID = user.get_idcard(TRUE) if(!ID) - to_chat(user, "I don't have an ID.") + to_chat(user, span_warning("I don't have an ID.")) return if(!(ACCESS_HEADS in ID.access)) - to_chat(user, "The access level of your card is not high enough.") + to_chat(user, span_warning("The access level of your card is not high enough.")) return var/old_len = authorized.len @@ -141,7 +141,7 @@ return if(CHECK_BITFIELD(obj_flags, EMAGGED) || ENGINES_STARTED) //SYSTEM ERROR: THE SHUTTLE WILL LA-SYSTEM ERROR: THE SHUTTLE WILL LA-SYSTEM ERROR: THE SHUTTLE WILL LAUNCH IN 10 SECONDS - to_chat(user, "The shuttle is already about to launch!") + to_chat(user, span_warning("The shuttle is already about to launch!")) return var/time = TIME_LEFT @@ -469,7 +469,7 @@ launch_status = EARLY_LAUNCHED return ..() else - to_chat(usr, "Escape pods will only launch during \"Code Red\" security alert.") + to_chat(usr, span_warning("Escape pods will only launch during \"Code Red\" security alert.")) return TRUE /obj/docking_port/mobile/pod/cancel() @@ -491,7 +491,7 @@ if(obj_flags & EMAGGED) return ENABLE_BITFIELD(obj_flags, EMAGGED) - to_chat(user, "I fry the pod's alert level checking system.") + to_chat(user, span_warning("I fry the pod's alert level checking system.")) /obj/machinery/computer/shuttle/pod/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE) . = ..() diff --git a/code/modules/shuttle/ferry.dm b/code/modules/shuttle/ferry.dm index 83bbf0d57..65b3e80ba 100644 --- a/code/modules/shuttle/ferry.dm +++ b/code/modules/shuttle/ferry.dm @@ -11,7 +11,7 @@ /obj/machinery/computer/shuttle/ferry/emag_act(mob/user) if(!allow_emag) - to_chat(user, "[src]'s security firewall is far too powerful for you to bypass.") + to_chat(user, span_warning("[src]'s security firewall is far too powerful for you to bypass.")) return FALSE return ..() @@ -36,5 +36,5 @@ if(last_request && (last_request + cooldown > world.time)) return last_request = world.time - to_chat(usr, "My request has been received by CentCom.") + to_chat(usr, span_notice("My request has been received by CentCom.")) to_chat(GLOB.admins, "FERRY: [ADMIN_LOOKUPFLW(usr)] (Move Ferry) is requesting to move the transport ferry to CentCom.") diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm index 81d88e258..0683ee97c 100644 --- a/code/modules/shuttle/navigation_computer.dm +++ b/code/modules/shuttle/navigation_computer.dm @@ -37,10 +37,10 @@ /obj/machinery/computer/camera_advanced/shuttle_docker/attack_hand(mob/user) if(jammed) - to_chat(user, "The Syndicate is jamming the console!") + to_chat(user, span_warning("The Syndicate is jamming the console!")) return if(!shuttle_port && !SSshuttle.getShuttle(shuttleId)) - to_chat(user,"Warning: Shuttle connection severed!") + to_chat(user,span_warning("Warning: Shuttle connection severed!")) return return ..() @@ -116,23 +116,23 @@ var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj var/landing_clear = checkLandingSpot() if(designate_time && (landing_clear != SHUTTLE_DOCKER_BLOCKED)) - to_chat(current_user, "Targeting transit location, please wait [DisplayTimeText(designate_time)]...") + to_chat(current_user, span_warning("Targeting transit location, please wait [DisplayTimeText(designate_time)]...")) designating_target_loc = the_eye.loc var/wait_completed = do_after(current_user, designate_time, FALSE, designating_target_loc, TRUE, CALLBACK(src, TYPE_PROC_REF(/obj/machinery/computer/camera_advanced/shuttle_docker, canDesignateTarget))) designating_target_loc = null if(!current_user) return if(!wait_completed) - to_chat(current_user, "Operation aborted.") + to_chat(current_user, span_warning("Operation aborted.")) return landing_clear = checkLandingSpot() if(landing_clear != SHUTTLE_DOCKER_LANDING_CLEAR) switch(landing_clear) if(SHUTTLE_DOCKER_BLOCKED) - to_chat(current_user, "Invalid transit location.") + to_chat(current_user, span_warning("Invalid transit location.")) if(SHUTTLE_DOCKER_BLOCKED_BY_HIDDEN_PORT) - to_chat(current_user, "Unknown object detected in landing zone. Please designate another location.") + to_chat(current_user, span_warning("Unknown object detected in landing zone. Please designate another location.")) return ///Make one use port that deleted after fly off, to don't lose info that need on to properly fly off. @@ -170,7 +170,7 @@ if(current_user.client) current_user.client.images += the_eye.placed_images - to_chat(current_user, "Transit location designated.") + to_chat(current_user, span_notice("Transit location designated.")) return TRUE /obj/machinery/computer/camera_advanced/shuttle_docker/proc/canDesignateTarget() @@ -362,7 +362,7 @@ if(T) playsound(console, 'sound/blank.ogg', 25, FALSE) remote_eye.setLoc(T) - to_chat(target, "Jumped to [selected].") + to_chat(target, span_notice("Jumped to [selected].")) C.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash/static) C.clear_fullscreen("flash", 3) else diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index ddbfab933..e179e34d6 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -31,7 +31,7 @@ All ShuttleMove procs go here if(M.pulledby) M.pulledby.stop_pulling() M.stop_pulling() - M.visible_message("[M] is [pick("unmade","unsewn","strewn")] by the teleportation!") + M.visible_message(span_warning("[M] is [pick("unmade","unsewn","strewn")] by the teleportation!")) SSblackbox.record_feedback("tally", "shuttle_gib", 1, M.type) M.gib() diff --git a/code/modules/shuttle/spaceship_navigation_beacon.dm b/code/modules/shuttle/spaceship_navigation_beacon.dm index 10dc758cf..a83ef4545 100644 --- a/code/modules/shuttle/spaceship_navigation_beacon.dm +++ b/code/modules/shuttle/spaceship_navigation_beacon.dm @@ -41,15 +41,18 @@ obj/machinery/spaceship_navigation_beacon/emp_act() var/new_name = "Beacon_[input("Enter the custom name for this beacon", "It be Beacon ..your input..") as text|null]" if(new_name && Adjacent(user)) name = new_name - to_chat(user, "I change beacon name to [name].") + to_chat(user, span_notice("I change beacon name to [name].")) else locked =!locked - to_chat(user, "I [locked ? "" : "un"]lock [src].") + to_chat(user, span_notice("I [locked ? "" : "un"]lock [src].")) return TRUE /obj/machinery/spaceship_navigation_beacon/examine() .=..() - . += "Status: [locked ? "LOCKED" : "Stable"] " + if(locked) + . += span_warning("Status: LOCKED") + else + . += span_nicegreen("Status: Stable") /obj/machinery/spaceship_navigation_beacon/attackby(obj/item/W, mob/user, params) if(default_deconstruction_screwdriver(user, "core-open", "core", W)) diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm index 80b2f6d0e..fda777f7b 100644 --- a/code/modules/shuttle/special.dm +++ b/code/modules/shuttle/special.dm @@ -91,8 +91,8 @@ for(var/i in found - sleepers) var/mob/living/L = i L.add_atom_colour("#800080", TEMPORARY_COLOUR_PRIORITY) - L.visible_message("A strange purple glow wraps itself around [L] as [L.p_they()] suddenly fall[L.p_s()] unconscious.", - "[desc]") + L.visible_message(span_revennotice("A strange purple glow wraps itself around [L] as [L.p_they()] suddenly fall[L.p_s()] unconscious."), + span_revendanger("[desc]")) // Don't let them sit suround unconscious forever addtimer(CALLBACK(src, PROC_REF(sleeper_dreams), L), 100) @@ -121,7 +121,7 @@ /obj/structure/table/abductor/wabbajack/proc/sleeper_dreams(mob/living/sleeper) if(sleeper in sleepers) - to_chat(sleeper, "While you slumber, you have the strangest dream, like you can see myself from the outside.") + to_chat(sleeper, span_revennotice("While you slumber, you have the strangest dream, like you can see myself from the outside.")) sleeper.ghostize(TRUE) /obj/structure/table/abductor/wabbajack/left @@ -196,7 +196,7 @@ var/throwtarget = get_edge_target_turf(src, boot_dir) M.Paralyze(40) M.throw_at(throwtarget, 5, 1) - to_chat(M, "No climbing on the bar please.") + to_chat(M, span_notice("No climbing on the bar please.")) else . = ..() @@ -243,7 +243,7 @@ if(I.registered_account) account = I.registered_account else if(!check_times[AM] || check_times[AM] < world.time) //Let's not spam the message - to_chat(AM, "This ID card doesn't have an owner associated with it!") + to_chat(AM, span_notice("This ID card doesn't have an owner associated with it!")) check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN else if(ishuman(AM)) var/mob/living/carbon/human/H = AM @@ -304,7 +304,7 @@ if(armless) if(!AM.pulling || !iscash(AM.pulling) && !istype(AM.pulling, /obj/item/card/id)) if(!check_times[AM] || check_times[AM] < world.time) //Let's not spam the message - to_chat(AM, "Try pulling a valid ID, space cash, holochip or coin into \the [src]!") + to_chat(AM, span_notice("Try pulling a valid ID, space cash, holochip or coin into \the [src]!")) check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN if(payees[AM] >= threshold) @@ -326,7 +326,7 @@ AM.pulling = HC payees[AM] -= payees[AM] - say("Welcome aboard, [AM]![change ? " Here is your change." : ""]") + say(span_robot("Welcome aboard, [AM]![change ? " Here is your change." : ""]")) approved_passengers += AM check_times -= AM @@ -335,7 +335,7 @@ for(var/obj/I in counted_money) qdel(I) if(!check_times[AM] || check_times[AM] < world.time) //Let's not spam the message - to_chat(AM, "$[payees[AM]] received. You need $[threshold-payees[AM]] more.") + to_chat(AM, span_notice("$[payees[AM]] received. You need $[threshold-payees[AM]] more.")) check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN return ..() else diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index 1eea15897..d50fe966d 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -22,7 +22,7 @@ if(href_list["move"]) var/obj/item/circuitboard/computer/syndicate_shuttle/board = circuit if(board.challenge && world.time < SYNDICATE_CHALLENGE_TIMER) - to_chat(usr, "You've issued a combat challenge to the station! You've got to give them at least [DisplayTimeText(SYNDICATE_CHALLENGE_TIMER - world.time)] more to allow them to prepare.") + to_chat(usr, span_warning("You've issued a combat challenge to the station! You've got to give them at least [DisplayTimeText(SYNDICATE_CHALLENGE_TIMER - world.time)] more to allow them to prepare.")) return 0 board.moved = TRUE ..() @@ -45,7 +45,7 @@ /obj/machinery/computer/shuttle/syndicate/drop_pod/Topic(href, href_list) if(href_list["move"]) if(!is_centcom_level(z)) - to_chat(usr, "Pods are one way!") + to_chat(usr, span_warning("Pods are one way!")) return 0 ..() diff --git a/code/modules/spells/roguetown/acolyte/astrata.dm b/code/modules/spells/roguetown/acolyte/astrata.dm index 2d61e8739..de9977a94 100644 --- a/code/modules/spells/roguetown/acolyte/astrata.dm +++ b/code/modules/spells/roguetown/acolyte/astrata.dm @@ -37,7 +37,7 @@ user.visible_message("[user] points at [O], igniting it with sacred flames!") return TRUE else - to_chat(user, "You point at [O], but it fails to catch fire.") + to_chat(user, span_warning("You point at [O], but it fails to catch fire.")) return FALSE return FALSE @@ -70,18 +70,18 @@ if(target == user) return FALSE if(target.stat < DEAD) - to_chat(user, "Nothing happens.") + to_chat(user, span_warning("Nothing happens.")) return FALSE if(GLOB.tod == "night") - to_chat(user, "Let there be light.") + to_chat(user, span_warning("Let there be light.")) for(var/obj/structure/fluff/psycross/S in oview(5, user)) S.AOE_flash(user, range = 8) if(target.mob_biotypes & MOB_UNDEAD) //positive energy harms the undead - target.visible_message("[target] is unmade by holy light!", "I'm unmade by holy light!") + target.visible_message(span_danger("[target] is unmade by holy light!"), span_userdanger("I'm unmade by holy light!")) target.gib() return TRUE if(!target.revive(full_heal = FALSE)) - to_chat(user, "Nothing happens.") + to_chat(user, span_warning("Nothing happens.")) return FALSE testing("revived2") var/mob/living/carbon/spirit/underworld_spirit = target.get_spirit() @@ -94,7 +94,7 @@ target.emote("breathgasp") target.Jitter(100) target.update_body() - target.visible_message("[target] is revived by holy light!", "I awake from the void.") + target.visible_message(span_notice("[target] is revived by holy light!"), span_green("I awake from the void.")) if(target.mind) if(revive_pq && !HAS_TRAIT(target, TRAIT_IWASREVIVED) && user?.ckey) adjust_playerquality(revive_pq, user.ckey) @@ -110,6 +110,6 @@ for(var/obj/structure/fluff/psycross/S in oview(5, user)) found = S if(!found) - to_chat(user, "I need a holy cross.") + to_chat(user, span_warning("I need a holy cross.")) return FALSE return TRUE diff --git a/code/modules/spells/roguetown/acolyte/dendor.dm b/code/modules/spells/roguetown/acolyte/dendor.dm index eb86382fc..0aa6edebd 100644 --- a/code/modules/spells/roguetown/acolyte/dendor.dm +++ b/code/modules/spells/roguetown/acolyte/dendor.dm @@ -17,7 +17,7 @@ /obj/effect/proc_holder/spell/targeted/blesscrop/cast(list/targets,mob/user = usr) . = ..() - visible_message("[usr] blesses the crop with Dendor's Favour!") + visible_message(span_green("[usr] blesses the crop with Dendor's Favour!")) var/growed = FALSE for(var/obj/machinery/crop/C in view(5)) growed = TRUE @@ -44,7 +44,7 @@ /obj/effect/proc_holder/spell/targeted/beasttame/cast(list/targets,mob/user = usr) . = ..() - visible_message("[usr] soothes the beastblood with Dendor's whisper.") + visible_message(span_green("[usr] soothes the beastblood with Dendor's whisper.")) var/tamed = FALSE for(var/mob/living/simple_animal/hostile/retaliate/B in oview(2)) if(B.aggressive) diff --git a/code/modules/spells/roguetown/acolyte/general.dm b/code/modules/spells/roguetown/acolyte/general.dm index 18ba90a36..99a548fb4 100644 --- a/code/modules/spells/roguetown/acolyte/general.dm +++ b/code/modules/spells/roguetown/acolyte/general.dm @@ -21,7 +21,7 @@ if(isliving(targets[1])) var/mob/living/target = targets[1] if(user.patron?.undead_hater && (target.mob_biotypes & MOB_UNDEAD)) //positive energy harms the undead - target.visible_message("[target] is burned by holy light!", "I'm burned by holy light!") + target.visible_message(span_danger("[target] is burned by holy light!"), span_userdanger("I'm burned by holy light!")) target.adjustFireLoss(50) target.Paralyze(30) target.fire_act(1,5) @@ -29,37 +29,37 @@ //this if chain is stupid, replace with variables on /datum/patron when possible? switch(user.patron.type) if(/datum/patron/old_god) - target.visible_message("A strange stirring feeling pours from [target]!", "Sentimental thoughts drive away my pains!") + target.visible_message(span_info("A strange stirring feeling pours from [target]!"), span_notice("Sentimental thoughts drive away my pains!")) if(/datum/patron/divine/astrata) - target.visible_message("A wreath of gentle light passes over [target]!", "I'm bathed in holy light!") + target.visible_message(span_info("A wreath of gentle light passes over [target]!"), span_notice("I'm bathed in holy light!")) if(/datum/patron/divine/noc) - target.visible_message("A shroud of soft moonlight falls upon [target]!", "I'm shrouded in gentle moonlight!") + target.visible_message(span_info("A shroud of soft moonlight falls upon [target]!"), span_notice("I'm shrouded in gentle moonlight!")) if(/datum/patron/divine/dendor) - target.visible_message("A rush of primal energy spirals about [target]!", "I'm infused with primal energies!") + target.visible_message(span_info("A rush of primal energy spirals about [target]!"), span_notice("I'm infused with primal energies!")) if(/datum/patron/divine/abyssor) - target.visible_message("A mist of salt-scented vapour settles on [target]!", "I'm invigorated by healing vapours!") + target.visible_message(span_info("A mist of salt-scented vapour settles on [target]!"), span_notice("I'm invigorated by healing vapours!")) if(/datum/patron/divine/ravox) - target.visible_message("An air of righteous defiance rises near [target]!", "I'm filled with an urge to fight on!") + target.visible_message(span_info("An air of righteous defiance rises near [target]!"), span_notice("I'm filled with an urge to fight on!")) if(/datum/patron/divine/necra) - target.visible_message("A sense of quiet respite radiates from [target]!", "I feel the Undermaiden's gaze turn from me for now!") + target.visible_message(span_info("A sense of quiet respite radiates from [target]!"), span_notice("I feel the Undermaiden's gaze turn from me for now!")) if(/datum/patron/divine/xylix) - target.visible_message("A fugue seems to manifest briefly across [target]!", "My wounds vanish as if they had never been there! ") + target.visible_message(span_info("A fugue seems to manifest briefly across [target]!"), span_notice("My wounds vanish as if they had never been there! ")) if(/datum/patron/divine/pestra) - target.visible_message("A aura of clinical care encompasses [target]!", "I'm sewn back together by sacred medicine!") + target.visible_message(span_info("A aura of clinical care encompasses [target]!"), span_notice("I'm sewn back together by sacred medicine!")) if(/datum/patron/divine/malum) - target.visible_message("A tempering heat is discharged out of [target]!", "I feel the heat of a forge soothing my pains!") + target.visible_message(span_info("A tempering heat is discharged out of [target]!"), span_notice("I feel the heat of a forge soothing my pains!")) if(/datum/patron/inhumen/eora) - target.visible_message("A heady heat flushes the flesh of [target] and potent scents hit you!", "My ills drift away in a rush of narcotic pleasure!") + target.visible_message(span_info("A heady heat flushes the flesh of [target] and potent scents hit you!"), span_notice("My ills drift away in a rush of narcotic pleasure!")) if(/datum/patron/inhumen/zizo) - target.visible_message("Vital energies are sapped towards [target]!", "The life around me pales as I am restored!") + target.visible_message(span_info("Vital energies are sapped towards [target]!"), span_notice("The life around me pales as I am restored!")) if(/datum/patron/inhumen/graggar) - target.visible_message("Foul fumes billow outward as [target] is restored!", "A noxious scent burns my nostrils, but I feel better!") + target.visible_message(span_info("Foul fumes billow outward as [target] is restored!"), span_notice("A noxious scent burns my nostrils, but I feel better!")) if(/datum/patron/inhumen/matthios) - target.visible_message("A wreath of strange light passes over [target]!", "I'm bathed in strange holy light?") + target.visible_message(span_info("A wreath of strange light passes over [target]!"), span_notice("I'm bathed in strange holy light?")) if(/datum/patron/godless) - target.visible_message("Without any particular cause or reason, [target] is healed!", "My wounds close without cause.") + target.visible_message(span_info("Without any particular cause or reason, [target] is healed!"), span_notice("My wounds close without cause.")) else - target.visible_message("A choral sound comes from above and [target] is healed!", "I am bathed in healing choral hymns!") + target.visible_message(span_info("A choral sound comes from above and [target] is healed!"), span_notice("I am bathed in healing choral hymns!")) if(iscarbon(target)) var/mob/living/carbon/C = target var/obj/item/bodypart/affecting = C.get_bodypart(check_zone(user.zone_selected)) @@ -103,12 +103,12 @@ if(isliving(targets[1])) var/mob/living/target = targets[1] if(user.patron?.undead_hater && (target.mob_biotypes & MOB_UNDEAD)) //positive energy harms the undead - target.visible_message("[target] is burned by holy light!", "I'm burned by holy light!") + target.visible_message(span_danger("[target] is burned by holy light!"), span_userdanger("I'm burned by holy light!")) target.adjustFireLoss(100) target.Paralyze(50) target.fire_act(1,5) return TRUE - target.visible_message("A wreath of gentle light passes over [target]!", "I'm bathed in holy light!") + target.visible_message(span_info("A wreath of gentle light passes over [target]!"), span_notice("I'm bathed in holy light!")) if(iscarbon(target)) var/mob/living/carbon/C = target var/obj/item/bodypart/affecting = C.get_bodypart(check_zone(user.zone_selected)) diff --git a/code/modules/spells/roguetown/acolyte/necra.dm b/code/modules/spells/roguetown/acolyte/necra.dm index 98245fc41..db1b85c14 100644 --- a/code/modules/spells/roguetown/acolyte/necra.dm +++ b/code/modules/spells/roguetown/acolyte/necra.dm @@ -28,7 +28,7 @@ if(success) user.visible_message("My funeral rites have been performed on [hole]!", "[user] consecrates [hole]!") return - to_chat(user, "I failed to perform the rites.") + to_chat(user, span_red("I failed to perform the rites.")) /obj/effect/proc_holder/spell/targeted/churn name = "Churn Undead" @@ -65,12 +65,12 @@ if(L.mind.has_antag_datum(/datum/antagonist/zombie)) iszombie = TRUE if(L.mind.special_role == "Vampire Lord") - user.visible_message("[L] overpowers being churned!", "[L] is too strong, I am churned!") + user.visible_message(span_warning("[L] overpowers being churned!"), span_userdanger("[L] is too strong, I am churned!")) user.Stun(50) user.throw_at(get_ranged_target_turf(user, get_dir(user,L), 7), 7, 1, L, spin = FALSE) return if((L.mob_biotypes & MOB_UNDEAD) || isvampire || iszombie) -// L.visible_message("[L] is unmade by PSYDON!", "I'm unmade by PSYDON!") +// L.visible_message(span_warning("[L] is unmade by PSYDON!"), span_danger("I'm unmade by PSYDON!")) var/vamp_prob = prob2explode if(isvampire) vamp_prob -= 59 @@ -79,7 +79,7 @@ L.Stun(50) // L.throw_at(get_ranged_target_turf(L, get_dir(user,L), 7), 7, 1, L, spin = FALSE) else - L.visible_message("[L] resists being churned!", "I resist being churned!") + L.visible_message(span_warning("[L] resists being churned!"), span_userdanger("I resist being churned!")) ..() return TRUE diff --git a/code/modules/spells/roguetown/acolyte/noc.dm b/code/modules/spells/roguetown/acolyte/noc.dm index 7ea44f7f1..4e0d28087 100644 --- a/code/modules/spells/roguetown/acolyte/noc.dm +++ b/code/modules/spells/roguetown/acolyte/noc.dm @@ -22,7 +22,7 @@ var/mob/living/target = targets[1] if(target.anti_magic_check(TRUE, TRUE)) return FALSE - target.visible_message("[user] points at [target]'s eyes!","My eyes are covered in darkness!") + target.visible_message(span_warning("[user] points at [target]'s eyes!"),span_warning("My eyes are covered in darkness!")) target.blind_eyes(2) return TRUE @@ -49,9 +49,9 @@ var/mob/living/target = targets[1] if(target.anti_magic_check(TRUE, TRUE)) return FALSE - target.visible_message("[target] starts to fade into thin air!", "You start to become invisible!") + target.visible_message(span_warning("[target] starts to fade into thin air!"), span_notice("You start to become invisible!")) animate(target, alpha = 0, time = 1 SECONDS, easing = EASE_IN) target.mob_timers[MT_INVISIBILITY] = world.time + 15 SECONDS addtimer(CALLBACK(target, TYPE_PROC_REF(/mob/living, update_sneak_invis), TRUE), 15 SECONDS) - addtimer(CALLBACK(target, TYPE_PROC_REF(/atom/movable, visible_message), "[target] fades back into view.", "You become visible again."), 15 SECONDS) + addtimer(CALLBACK(target, TYPE_PROC_REF(/atom/movable, visible_message), span_warning("[target] fades back into view."), span_notice("You become visible again.")), 15 SECONDS) return FALSE diff --git a/code/modules/spells/roguetown/acolyte/pestra.dm b/code/modules/spells/roguetown/acolyte/pestra.dm index ec07355c4..701386d45 100644 --- a/code/modules/spells/roguetown/acolyte/pestra.dm +++ b/code/modules/spells/roguetown/acolyte/pestra.dm @@ -106,13 +106,13 @@ for(var/obj/item/bodypart/limb as anything in get_limbs(human_target, user)) if(human_target.get_bodypart(limb.body_zone) || !limb.attach_limb(human_target)) continue - human_target.visible_message("\The [limb] attaches itself to [human_target]!", \ - "\The [limb] attaches itself to me!") + human_target.visible_message(span_info("\The [limb] attaches itself to [human_target]!"), \ + span_notice("\The [limb] attaches itself to me!")) for(var/obj/item/organ/organ as anything in get_organs(human_target, user)) if(human_target.getorganslot(organ.slot) || !organ.Insert(human_target)) continue - human_target.visible_message("\The [organ] attaches itself to [human_target]!", \ - "\The [organ] attaches itself to me!") + human_target.visible_message(span_info("\The [organ] attaches itself to [human_target]!"), \ + span_notice("\The [organ] attaches itself to me!")) if(!(human_target.mob_biotypes & MOB_UNDEAD)) for(var/obj/item/bodypart/limb as anything in human_target.bodyparts) limb.rotted = FALSE @@ -158,10 +158,10 @@ has_rot = TRUE break if(!has_rot) - to_chat(user, "Nothing happens.") + to_chat(user, span_warning("Nothing happens.")) return FALSE if(GLOB.tod == "night") - to_chat(user, "Let there be light.") + to_chat(user, span_warning("Let there be light.")) for(var/obj/structure/fluff/psycross/S in oview(5, user)) S.AOE_flash(user, range = 8) testing("curerot2") @@ -187,9 +187,9 @@ rotty.update_disabled() target.update_body() if(!HAS_TRAIT(target, TRAIT_ROTMAN)) - target.visible_message("The rot leaves [target]'s body!", "I feel the rot leave my body!") + target.visible_message(span_notice("The rot leaves [target]'s body!"), span_green("I feel the rot leave my body!")) else - target.visible_message("The rot fails to leave [target]'s body!", "I feel no different...") + target.visible_message(span_warning("The rot fails to leave [target]'s body!"), span_warning("I feel no different...")) return TRUE return FALSE @@ -200,6 +200,6 @@ for(var/obj/structure/fluff/psycross/S in oview(5, user)) found = S if(!found) - to_chat(user, "I need a holy cross.") + to_chat(user, span_warning("I need a holy cross.")) return FALSE return TRUE diff --git a/code/modules/spells/roguetown/necromancer.dm b/code/modules/spells/roguetown/necromancer.dm index 163c5a85f..5295ad020 100644 --- a/code/modules/spells/roguetown/necromancer.dm +++ b/code/modules/spells/roguetown/necromancer.dm @@ -24,9 +24,9 @@ target.update_damage_overlays() if(affecting.heal_wounds(50)) target.update_damage_overlays() - target.visible_message("[target] reforms under the vile energy!", "I'm remade by dark magic!") + target.visible_message(span_danger("[target] reforms under the vile energy!"), span_notice("I'm remade by dark magic!")) return TRUE - target.visible_message("Necrotic energy floods over [target]!", "I feel colder as the dark energy floods into me!") + target.visible_message(span_info("Necrotic energy floods over [target]!"), span_userdanger("I feel colder as the dark energy floods into me!")) if(iscarbon(target)) target.Paralyze(50) else @@ -54,7 +54,7 @@ . = ..() if(isliving(targets[1])) var/mob/living/carbon/target = targets[1] - target.visible_message("A loud crunching sound has come from [target]!", "I feel arcane teeth biting into my eyes!") + target.visible_message(span_info("A loud crunching sound has come from [target]!"), span_userdanger("I feel arcane teeth biting into my eyes!")) target.adjustBruteLoss(30) target.blind_eyes(2) target.blur_eyes(10) @@ -83,7 +83,7 @@ if(isopenturf(T)) new /mob/living/carbon/human/species/skeleton/npc/no_equipment(T) return TRUE - to_chat(user, "The targeted location is blocked. My summon fails to come forth.") + to_chat(user, span_warning("The targeted location is blocked. My summon fails to come forth.")) return FALSE /obj/effect/proc_holder/spell/invoked/projectile/sickness diff --git a/code/modules/spells/roguetown/wizard.dm b/code/modules/spells/roguetown/wizard.dm index 1b31638f8..341eb5af5 100644 --- a/code/modules/spells/roguetown/wizard.dm +++ b/code/modules/spells/roguetown/wizard.dm @@ -39,7 +39,7 @@ if(ismob(target)) var/mob/M = target if(M.anti_magic_check()) - visible_message("[src] fizzles on contact with [target]!") + visible_message(span_warning("[src] fizzles on contact with [target]!")) playsound(get_turf(target), 'sound/magic/magic_nulled.ogg', 100) qdel(src) return BULLET_ACT_BLOCK @@ -87,7 +87,7 @@ if(ismob(target)) var/mob/M = target if(M.anti_magic_check()) - visible_message("[src] fizzles on contact with [target]!") + visible_message(span_warning("[src] fizzles on contact with [target]!")) playsound(get_turf(target), 'sound/magic/magic_nulled.ogg', 100) qdel(src) return BULLET_ACT_BLOCK @@ -136,7 +136,7 @@ if(ismob(target)) var/mob/M = target if(M.anti_magic_check()) - visible_message("[src] fizzles on contact with [target]!") + visible_message(span_warning("[src] fizzles on contact with [target]!")) playsound(get_turf(target), 'sound/magic/magic_nulled.ogg', 100) qdel(src) return BULLET_ACT_BLOCK @@ -145,8 +145,9 @@ var/datum/antagonist/vampirelord/VDrinker = sender.mind.has_antag_datum(/datum/antagonist/vampirelord) H.blood_volume = max(H.blood_volume-45, 0) H.handle_blood() - H.visible_message("[target] has their blood ripped from their body!!", \ - "My blood erupts from my body!", "...", COMBAT_MESSAGE_RANGE, target) + H.visible_message(span_danger("[target] has their blood ripped from their body!!"), \ + span_userdanger("My blood erupts from my body!"), \ + span_hear("..."), COMBAT_MESSAGE_RANGE, target) new /obj/effect/decal/cleanable/blood/puddle(H.loc) VDrinker.handle_vitae(400) qdel(src) @@ -193,7 +194,7 @@ if(ismob(target)) var/mob/M = target if(M.anti_magic_check()) - visible_message("[src] fizzles on contact with [target]!") + visible_message(span_warning("[src] fizzles on contact with [target]!")) playsound(get_turf(target), 'sound/magic/magic_nulled.ogg', 100) qdel(src) return BULLET_ACT_BLOCK @@ -248,7 +249,7 @@ if(ismob(target)) var/mob/M = target if(M.anti_magic_check()) - visible_message("[target] repells the fetch!") + visible_message(span_warning("[target] repells the fetch!")) playsound(get_turf(target), 'sound/magic/magic_nulled.ogg', 100) qdel(src) return BULLET_ACT_BLOCK diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index 5c2b73001..b31406597 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -74,7 +74,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th /obj/effect/proc_holder/proc/InterceptClickOn(mob/living/caller, params, atom/A) if(caller.ranged_ability != src || ranged_ability_user != caller) //I'm not actually sure how these would trigger, but, uh, safety, I guess? - to_chat(caller, "[caller.ranged_ability.name] has been disabled.") + to_chat(caller, span_info("[caller.ranged_ability.name] has been disabled.")) caller.ranged_ability.remove_ranged_ability() return TRUE //TRUE for failed, FALSE for passed. if(ranged_clickcd_override >= 0) @@ -89,7 +89,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th return if(user.ranged_ability && user.ranged_ability != src) if(forced) -// to_chat(user, "[user.ranged_ability.name] has been replaced by [name].") +// to_chat(user, span_info("[user.ranged_ability.name] has been replaced by [name].")) user.ranged_ability.deactivate(user) else return @@ -134,7 +134,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th var/charge_max = 50 //recharge time in deciseconds if charge_type = "recharge" or starting charges if charge_type = "charges" var/charge_counter = 0 //can only cast spells if it equals recharge, ++ each decisecond if charge_type = "recharge" or -- each cast if charge_type = "charges" - var/still_recharging_msg = "The spell is still recharging." + var/still_recharging_msg = span_notice("The spell is still recharging.") var/recharging = TRUE var/cast_without_targets = FALSE @@ -228,7 +228,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th /obj/effect/proc_holder/spell/proc/cast_check(skipcharge = 0, mob/user = usr) //checks if the spell can be cast based on its settings; skipcharge is used when an additional cast_check is called inside the spell if(player_lock) if(!user.mind || !(src in user.mind.spell_list) && !(src in user.mob_spell_list)) - to_chat(user, "I shouldn't have this spell! Something's wrong...") + to_chat(user, span_warning("I shouldn't have this spell! Something's wrong...")) return FALSE else if(!(src in user.mob_spell_list)) @@ -237,7 +237,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th var/turf/T = get_turf(user) if(is_centcom_level(T.z) && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel - to_chat(user, "I can't cast this spell here!") + to_chat(user, span_warning("I can't cast this spell here!")) return FALSE if(!skipcharge) @@ -246,30 +246,30 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th return FALSE if(user.stat && !stat_allowed) - to_chat(user, "Not when I am incapacitated!") + to_chat(user, span_warning("Not when I am incapacitated!")) return FALSE if(!ignore_cockblock && HAS_TRAIT(user, TRAIT_SPELLCOCKBLOCK)) - to_chat(user, "I can't cast spells!") + to_chat(user, span_warning("I can't cast spells!")) return FALSE if(!antimagic_allowed) var/antimagic = user.anti_magic_check(TRUE, FALSE, FALSE, 0, TRUE) if(antimagic) if(isatom(antimagic)) - to_chat(user, "[antimagic] is interfering with my magic.") + to_chat(user, span_notice("[antimagic] is interfering with my magic.")) else - to_chat(user, "Magic seems to flee from you, you can't gather enough power to cast this spell.") + to_chat(user, span_warning("Magic seems to flee from you, you can't gather enough power to cast this spell.")) return FALSE if(!phase_allowed && istype(user.loc, /obj/effect/dummy)) - to_chat(user, "[name] cannot be cast unless I am completely manifested in the material plane!") + to_chat(user, span_warning("[name] cannot be cast unless I am completely manifested in the material plane!")) return FALSE if(ishuman(user)) var/mob/living/carbon/human/H = user if((invocation_type == "whisper" || invocation_type == "shout") && !H.can_speak_vocal()) - to_chat(user, "I can't get the words out!") + to_chat(user, span_warning("I can't get the words out!")) return FALSE var/list/casting_clothes = typecacheof(list(/obj/item/clothing/suit/wizrobe, @@ -281,27 +281,27 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th if(clothes_req) //clothes check if(!is_type_in_typecache(H.wear_armor, casting_clothes)) - to_chat(H, "I don't feel strong enough without your robe!") + to_chat(H, span_warning("I don't feel strong enough without your robe!")) return FALSE if(!is_type_in_typecache(H.head, casting_clothes)) - to_chat(H, "I don't feel strong enough without your hat!") + to_chat(H, span_warning("I don't feel strong enough without your hat!")) return FALSE if(cult_req) //CULT_REQ CLOTHES CHECK if(!istype(H.wear_armor, /obj/item/clothing/suit/magusred) && !istype(H.wear_armor, /obj/item/clothing/suit/space/hardsuit/cult)) - to_chat(H, "I don't feel strong enough without your armor.") + to_chat(H, span_warning("I don't feel strong enough without your armor.")) return FALSE if(!istype(H.head, /obj/item/clothing/head/magus) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/cult)) - to_chat(H, "I don't feel strong enough without your helmet.") + to_chat(H, span_warning("I don't feel strong enough without your helmet.")) return FALSE if(miracle && !H.devotion?.check_devotion(src)) - to_chat(H, "I don't have enough devotion!") + to_chat(H, span_warning("I don't have enough devotion!")) return FALSE else if(clothes_req || human_req) - to_chat(user, "This spell can only be cast by humans!") + to_chat(user, span_warning("This spell can only be cast by humans!")) return FALSE if(nonabstract_req && (isbrain(user) || ispAI(user))) - to_chat(user, "This spell can only be cast by physical beings!") + to_chat(user, span_warning("This spell can only be cast by physical beings!")) return FALSE if(req_items.len) @@ -314,12 +314,12 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th confirmed_items += IN continue if(confirmed_items.len != req_items.len) - to_chat(user, "I'm missing something to cast this.") + to_chat(user, span_warning("I'm missing something to cast this.")) return FALSE if(req_inhand) if(!istype(user.get_active_held_item(), req_inhand)) - to_chat(user, "I'm missing something to cast this.") + to_chat(user, span_warning("I'm missing something to cast this.")) return FALSE if(!skipcharge) @@ -344,7 +344,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th if("charges") if(!charge_counter) if(!silent) - to_chat(user, "[name] has no charges left!") + to_chat(user, span_warning("[name] has no charges left!")) return FALSE return TRUE @@ -375,7 +375,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th . = ..() START_PROCESSING(SSfastprocess, src) - still_recharging_msg = "[name] is still recharging!" + still_recharging_msg = span_warning("[name] is still recharging!") charge_counter = charge_max /obj/effect/proc_holder/spell/Destroy() @@ -409,7 +409,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th before_cast(targets, user = user) invocation(user) if(user && user.ckey) - user.log_message("cast the spell [name].", LOG_ATTACK) + user.log_message(span_danger("cast the spell [name]."), LOG_ATTACK) if(recharge) recharging = TRUE if(cast(targets, user = user)) @@ -677,6 +677,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th /obj/effect/proc_holder/spell/self/basic_heal/cast(mob/living/carbon/human/user) //Note the lack of "list/targets" here. Instead, use a "user" var depending on mob requirements. //Also, notice the lack of a "for()" statement that looks through the targets. This is, again, because the spell can only have a single target. - user.visible_message("A wreath of gentle light passes over [user]!", "I wreath myself in healing light!") + user.visible_message(span_warning("A wreath of gentle light passes over [user]!"), span_notice("I wreath myself in healing light!")) user.adjustBruteLoss(-10) user.adjustFireLoss(-10) diff --git a/code/modules/spells/spell_types/aimed.dm b/code/modules/spells/spell_types/aimed.dm index 8a9972b08..48f64bc7c 100644 --- a/code/modules/spells/spell_types/aimed.dm +++ b/code/modules/spells/spell_types/aimed.dm @@ -22,12 +22,12 @@ return var/msg if(!can_cast(user)) - msg = "I can no longer cast [name]!" + msg = span_warning("I can no longer cast [name]!") remove_ranged_ability(msg) return if(active) if(deactive_msg) - msg = "[deactive_msg]" + msg = span_notice("[deactive_msg]") if(charge_type == "recharge") var/refund_percent = current_amount/projectile_amount charge_counter = charge_max * refund_percent @@ -37,7 +37,7 @@ on_deactivation(user) else if(active_msg) - msg = "[active_msg] Left-click to shoot it at a target!" + msg = span_notice("[active_msg] Left-click to shoot it at a target!") current_amount = projectile_amount active = TRUE add_ranged_ability(user, msg, TRUE) diff --git a/code/modules/spells/spell_types/area_teleport.dm b/code/modules/spells/spell_types/area_teleport.dm index c7ca962a1..efefa60cc 100644 --- a/code/modules/spells/spell_types/area_teleport.dm +++ b/code/modules/spells/spell_types/area_teleport.dm @@ -49,7 +49,7 @@ L+=T if(!L.len) - to_chat(usr, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.") + to_chat(usr, span_warning("The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.")) return if(target && target.buckled) diff --git a/code/modules/spells/spell_types/barnyard.dm b/code/modules/spells/spell_types/barnyard.dm index 5dd009f88..13924d7cf 100644 --- a/code/modules/spells/spell_types/barnyard.dm +++ b/code/modules/spells/spell_types/barnyard.dm @@ -18,32 +18,32 @@ /obj/effect/proc_holder/spell/targeted/barnyardcurse/cast(list/targets, mob/user = usr) if(!targets.len) - to_chat(user, "No target found in range!") + to_chat(user, span_warning("No target found in range!")) return var/mob/living/carbon/target = targets[1] if(!is_type_in_typecache(target, compatible_mobs_typecache)) - to_chat(user, "I are unable to curse [target]'s head!") + to_chat(user, span_warning("I are unable to curse [target]'s head!")) return if(!(target in oview(range))) - to_chat(user, "[target.p_theyre(TRUE)] too far away!") + to_chat(user, span_warning("[target.p_theyre(TRUE)] too far away!")) return if(target.anti_magic_check()) - to_chat(user, "The spell had no effect!") - target.visible_message("[target]'s face bursts into flames, which instantly burst outward, leaving [target] unharmed!", \ - "My face starts burning up, but the flames are repulsed by my anti-magic protection!") + to_chat(user, span_warning("The spell had no effect!")) + target.visible_message(span_danger("[target]'s face bursts into flames, which instantly burst outward, leaving [target] unharmed!"), \ + span_danger("My face starts burning up, but the flames are repulsed by my anti-magic protection!")) return var/list/masks = list(/obj/item/clothing/mask/pig/cursed, /obj/item/clothing/mask/cowmask/cursed, /obj/item/clothing/mask/horsehead/cursed) var/choice = pick(masks) var/obj/item/clothing/mask/magichead = new choice(get_turf(target)) - target.visible_message("[target]'s face bursts into flames, and a barnyard animal's head takes its place!", \ - "My face burns up, and shortly after the fire you realise you have the face of a barnyard animal!") + target.visible_message(span_danger("[target]'s face bursts into flames, and a barnyard animal's head takes its place!"), \ + span_danger("My face burns up, and shortly after the fire you realise you have the face of a barnyard animal!")) if(!target.dropItemToGround(target.wear_mask)) qdel(target.wear_mask) target.equip_to_slot_if_possible(magichead, SLOT_WEAR_MASK, 1, 1) diff --git a/code/modules/spells/spell_types/bloodcrawl.dm b/code/modules/spells/spell_types/bloodcrawl.dm index c83a93a87..810645e5e 100644 --- a/code/modules/spells/spell_types/bloodcrawl.dm +++ b/code/modules/spells/spell_types/bloodcrawl.dm @@ -20,7 +20,7 @@ perform(target) return revert_cast() - to_chat(user, "There must be a nearby source of blood!") + to_chat(user, span_warning("There must be a nearby source of blood!")) /obj/effect/proc_holder/spell/bloodcrawl/perform(obj/effect/decal/cleanable/target, recharge = 1, mob/living/user = usr) if(istype(user)) @@ -33,4 +33,4 @@ start_recharge() return revert_cast() - to_chat(user, "I are unable to blood crawl!") + to_chat(user, span_warning("I are unable to blood crawl!")) diff --git a/code/modules/spells/spell_types/charge.dm b/code/modules/spells/spell_types/charge.dm index ba27c4c00..039a2257c 100644 --- a/code/modules/spells/spell_types/charge.dm +++ b/code/modules/spells/spell_types/charge.dm @@ -26,26 +26,26 @@ if(M.mind) for(var/obj/effect/proc_holder/spell/S in M.mind.spell_list) S.charge_counter = S.charge_max - to_chat(M, "I feel raw magic flowing through you. It feels good!") + to_chat(M, span_notice("I feel raw magic flowing through you. It feels good!")) else - to_chat(M, "I feel very strange for a moment, but then it passes.") + to_chat(M, span_notice("I feel very strange for a moment, but then it passes.")) burnt_out = TRUE charged_item = M break for(var/obj/item in hand_items) if(istype(item, /obj/item/spellbook)) - to_chat(L, "Glowing red letters appear on the front cover...") - to_chat(L, "[pick("NICE TRY BUT NO!","CLEVER BUT NOT CLEVER ENOUGH!", "SUCH FLAGRANT CHEESING IS WHY WE ACCEPTED YOUR APPLICATION!", "CUTE! VERY CUTE!", "YOU DIDN'T THINK IT'D BE THAT EASY, DID YOU?")]") + to_chat(L, span_danger("Glowing red letters appear on the front cover...")) + to_chat(L, span_warning("[pick("NICE TRY BUT NO!","CLEVER BUT NOT CLEVER ENOUGH!", "SUCH FLAGRANT CHEESING IS WHY WE ACCEPTED YOUR APPLICATION!", "CUTE! VERY CUTE!", "YOU DIDN'T THINK IT'D BE THAT EASY, DID YOU?")]")) burnt_out = TRUE else if(istype(item, /obj/item/book/granter/spell)) var/obj/item/book/granter/spell/I = item if(!I.oneuse) - to_chat(L, "This book is infinite use and can't be recharged, yet the magic has improved the book somehow...") + to_chat(L, span_notice("This book is infinite use and can't be recharged, yet the magic has improved the book somehow...")) burnt_out = TRUE I.pages_to_mastery-- break if(prob(80)) - L.visible_message("[I] catches fire!") + L.visible_message(span_warning("[I] catches fire!")) qdel(I) else I.used = FALSE @@ -95,9 +95,9 @@ charged_item = item break if(!charged_item) - to_chat(L, "I feel magical power surging through your hands, but the feeling rapidly fades...") + to_chat(L, span_notice("I feel magical power surging through your hands, but the feeling rapidly fades...")) else if(burnt_out) - to_chat(L, "[charged_item] doesn't seem to be reacting to the spell!") + to_chat(L, span_warning("[charged_item] doesn't seem to be reacting to the spell!")) else playsound(get_turf(L), 'sound/blank.ogg', 50, TRUE) - to_chat(L, "[charged_item] suddenly feels very warm!") + to_chat(L, span_notice("[charged_item] suddenly feels very warm!")) diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm index fd548d1dc..b557f6539 100644 --- a/code/modules/spells/spell_types/construct_spells.dm +++ b/code/modules/spells/spell_types/construct_spells.dm @@ -197,22 +197,22 @@ /obj/effect/proc_holder/spell/targeted/abyssal_gaze/cast(list/targets, mob/user = usr) if(!LAZYLEN(targets)) - to_chat(user, "No target found in range!") + to_chat(user, span_warning("No target found in range!")) revert_cast() return var/mob/living/carbon/target = targets[1] if(!(target in oview(range))) - to_chat(user, "[target] is too far away!") + to_chat(user, span_warning("[target] is too far away!")) revert_cast() return if(target.anti_magic_check(TRUE, TRUE)) - to_chat(target, "I feel a freezing darkness closing in on you, but it rapidly dissipates.") + to_chat(target, span_warning("I feel a freezing darkness closing in on you, but it rapidly dissipates.")) return - to_chat(target, "A freezing darkness surrounds you...") + to_chat(target, span_danger("A freezing darkness surrounds you...")) target.playsound_local(get_turf(target), 'sound/blank.ogg', 50, 1) user.playsound_local(get_turf(user), 'sound/blank.ogg', 50, 1) target.become_blind(ABYSSAL_GAZE_BLIND) @@ -244,29 +244,29 @@ /obj/effect/proc_holder/spell/targeted/dominate/cast(list/targets, mob/user = usr) if(!LAZYLEN(targets)) - to_chat(user, "No target found in range.") + to_chat(user, span_notice("No target found in range.")) revert_cast() return var/mob/living/simple_animal/S = targets[1] if(S.ckey) - to_chat(user, "[S] is too intelligent to dominate!") + to_chat(user, span_warning("[S] is too intelligent to dominate!")) revert_cast() return if(S.stat) - to_chat(user, "[S] is dead!") + to_chat(user, span_warning("[S] is dead!")) revert_cast() return if(S.sentience_type != SENTIENCE_ORGANIC) - to_chat(user, "[S] cannot be dominated!") + to_chat(user, span_warning("[S] cannot be dominated!")) revert_cast() return if(!(S in oview(range))) - to_chat(user, "[S] is too far away!") + to_chat(user, span_warning("[S] is too far away!")) revert_cast() return diff --git a/code/modules/spells/spell_types/curse.dm b/code/modules/spells/spell_types/curse.dm index 5d52bb328..08597666c 100644 --- a/code/modules/spells/spell_types/curse.dm +++ b/code/modules/spells/spell_types/curse.dm @@ -2,7 +2,7 @@ GLOBAL_VAR_INIT(curse_of_madness_triggered, FALSE) /proc/curse_of_madness(mob/user, message) if(user) //in this case either someone holding a spellbook or a badmin - to_chat(user, "I sent a curse of madness with the message \"[message]\"!") + to_chat(user, span_warning("I sent a curse of madness with the message \"[message]\"!")) message_admins("[ADMIN_LOOKUPFLW(user)] sent a curse of madness with the message \"[message]\"!") log_game("[key_name(user)] sent a curse of madness with the message \"[message]\"!") @@ -17,14 +17,14 @@ GLOBAL_VAR_INIT(curse_of_madness_triggered, FALSE) if(T && !is_station_level(T.z)) continue if(H.anti_magic_check(TRUE, FALSE, TRUE)) - to_chat(H, "I have a strange feeling for a moment, but then it passes.") + to_chat(H, span_notice("I have a strange feeling for a moment, but then it passes.")) continue give_madness(H, message) /proc/give_madness(mob/living/carbon/human/H, message) H.playsound_local(H,'sound/blank.ogg',40,1) - to_chat(H, "[message]") - to_chat(H, "My mind shatters!") + to_chat(H, span_reallybighypnophrase("[message]")) + to_chat(H, span_warning("My mind shatters!")) switch(rand(1,10)) if(1 to 3) H.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_LOBOTOMY) diff --git a/code/modules/spells/spell_types/devil.dm b/code/modules/spells/spell_types/devil.dm index 3879b3e50..b76bab8c0 100644 --- a/code/modules/spells/spell_types/devil.dm +++ b/code/modules/spells/spell_types/devil.dm @@ -70,7 +70,7 @@ contract = new /obj/item/paper/contract/infernal/friend(C.loc, C.mind, user.mind) C.put_in_hands(contract) else - to_chat(user, "[C] seems to not be sentient. You cannot summon a contract for [C.p_them()].") + to_chat(user, span_warning("[C] seems to not be sentient. You cannot summon a contract for [C.p_them()].")) /obj/effect/proc_holder/spell/aimed/fireball/hellish @@ -106,25 +106,25 @@ if(istype(user)) if(istype(user.loc, /obj/effect/dummy/phased_mob/slaughter/)) if(valid_location(user)) - to_chat(user, "I are now phasing in.") + to_chat(user, span_warning("I are now phasing in.")) if(do_mob(user,user,150)) if(valid_location(user)) user.infernalphasein() else - to_chat(user, "I are no longer near a potential signer.") + to_chat(user, span_warning("I are no longer near a potential signer.")) else - to_chat(user, "I can only re-appear near a potential signer.") + to_chat(user, span_warning("I can only re-appear near a potential signer.")) revert_cast() return ..() else user.notransform = TRUE user.fakefire() - to_chat(src, "I begin to phase back into sinful flames.") + to_chat(src, span_warning("I begin to phase back into sinful flames.")) if(do_mob(user,user,150)) user.infernalphaseout() else - to_chat(user, "I must remain still while exiting.") + to_chat(user, span_warning("I must remain still while exiting.")) user.notransform = FALSE user.fakefireextinguish() start_recharge() @@ -143,7 +143,7 @@ /mob/living/proc/infernalphaseout() dust_animation() spawn_dust() - visible_message("[src] disappears in a flashfire!") + visible_message(span_warning("[src] disappears in a flashfire!")) playsound(get_turf(src), 'sound/blank.ogg', 100, TRUE, -1) var/obj/effect/dummy/phased_mob/slaughter/holder = new /obj/effect/dummy/phased_mob/slaughter(loc) ExtinguishMob() @@ -154,12 +154,12 @@ /mob/living/proc/infernalphasein() if(notransform) - to_chat(src, "You're too busy to jaunt in.") + to_chat(src, span_warning("You're too busy to jaunt in.")) return FALSE fakefire() forceMove(drop_location()) client.eye = src - visible_message("[src] appears in a fiery blaze!") + visible_message(span_warning("[src] appears in a fiery blaze!")) playsound(get_turf(src), 'sound/blank.ogg', 100, TRUE, -1) addtimer(CALLBACK(src, PROC_REF(fakefireextinguish)), 15, TIMER_UNIQUE) @@ -238,7 +238,7 @@ else var/list/funky_turfs = RANGE_TURFS(1, user) for(var/turf/closed/solid in funky_turfs) - to_chat(user, "You're too close to a wall.") + to_chat(user, span_warning("You're too close to a wall.")) return dancefloor_exists = TRUE var/i = 1 diff --git a/code/modules/spells/spell_types/devil_boons.dm b/code/modules/spells/spell_types/devil_boons.dm index 8ca60811f..f6b299a6f 100644 --- a/code/modules/spells/spell_types/devil_boons.dm +++ b/code/modules/spells/spell_types/devil_boons.dm @@ -61,7 +61,7 @@ /obj/effect/proc_holder/spell/targeted/summon_friend/cast(list/targets, mob/user = usr) if(!QDELETED(friend)) - to_chat(friend, "My master has deemed you a poor friend. Your durance in hell will now resume.") + to_chat(friend, span_danger("My master has deemed you a poor friend. Your durance in hell will now resume.")) friend.dust(TRUE) qdel(friendShell) return diff --git a/code/modules/spells/spell_types/ethereal_jaunt.dm b/code/modules/spells/spell_types/ethereal_jaunt.dm index 6661c76ba..2f69fdb17 100644 --- a/code/modules/spells/spell_types/ethereal_jaunt.dm +++ b/code/modules/spells/spell_types/ethereal_jaunt.dm @@ -89,10 +89,10 @@ movedelay = world.time + movespeed if(newLoc.flags_1 & NOJAUNT_1) - to_chat(user, "Some strange aura is blocking the way.") + to_chat(user, span_warning("Some strange aura is blocking the way.")) return if (locate(/obj/effect/blessing, newLoc)) - to_chat(user, "Holy energies block your path!") + to_chat(user, span_warning("Holy energies block your path!")) return forceMove(newLoc) diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index 38b29dd09..6090005bb 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -25,7 +25,7 @@ if(!iscarbon(user)) //Look ma, no hands return if(!(user.mobility_flags & MOBILITY_USE)) - to_chat(user, "I can't reach out!") + to_chat(user, span_warning("I can't reach out!")) return ..() @@ -56,7 +56,7 @@ if(!proximity || target == user || !ismob(target) || !iscarbon(user) || !(user.mobility_flags & MOBILITY_USE)) //exploding after touching myself would be bad return if(!user.can_speak_vocal()) - to_chat(user, "I can't get the words out!") + to_chat(user, span_warning("I can't get the words out!")) return var/mob/M = target do_sparks(4, FALSE, M.loc) @@ -66,8 +66,8 @@ var/atom/A = M.anti_magic_check() if(A) if(isitem(A)) - target.visible_message("[target]'s [A] glows brightly as it wards off the spell!") - user.visible_message("The feedback blows [user]'s arm off!","The spell bounces from [M]'s skin back into your arm!") + target.visible_message(span_warning("[target]'s [A] glows brightly as it wards off the spell!")) + user.visible_message(span_warning("The feedback blows [user]'s arm off!"),span_danger("The spell bounces from [M]'s skin back into your arm!")) user.flash_act() var/obj/item/bodypart/part = user.get_holding_bodypart_of_item(src) if(part) @@ -75,7 +75,7 @@ return ..() var/obj/item/clothing/suit/hooded/bloated_human/suit = M.get_item_by_slot(SLOT_ARMOR) if(istype(suit)) - M.visible_message("[M]'s [suit] explodes off of them into a puddle of gore!") + M.visible_message(span_danger("[M]'s [suit] explodes off of them into a puddle of gore!")) M.dropItemToGround(suit) qdel(suit) new /obj/effect/gibspawner(M.loc) @@ -95,15 +95,15 @@ if(!proximity || target == user || !isliving(target) || !iscarbon(user)) //getting hard after touching myself would also be bad return if(!(user.mobility_flags & MOBILITY_USE)) - to_chat(user, "I can't reach out!") + to_chat(user, span_warning("I can't reach out!")) return if(!user.can_speak_vocal()) - to_chat(user, "I can't get the words out!") + to_chat(user, span_warning("I can't get the words out!")) return var/mob/living/M = target if(M.anti_magic_check()) - to_chat(user, "The spell can't seem to affect [M]!") - to_chat(M, "I feel your flesh turn to stone for a moment, then revert back!") + to_chat(user, span_warning("The spell can't seem to affect [M]!")) + to_chat(M, span_warning("I feel your flesh turn to stone for a moment, then revert back!")) ..() return M.Stun(40) diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm index ee6aa7eab..4c7599899 100644 --- a/code/modules/spells/spell_types/lichdom.dm +++ b/code/modules/spells/spell_types/lichdom.dm @@ -26,10 +26,10 @@ if(iscarbon(M)) hand_items = list(M.get_active_held_item(),M.get_inactive_held_item()) if(!hand_items.len) - to_chat(M, "I must hold an item you wish to make my phylactery!") + to_chat(M, span_warning("I must hold an item you wish to make my phylactery!")) return if(!M.mind.hasSoul) - to_chat(user, "I do not possess a soul!") + to_chat(user, span_warning("I do not possess a soul!")) return var/obj/item/marked_item @@ -40,17 +40,17 @@ if((item.item_flags & ABSTRACT) || HAS_TRAIT(item, TRAIT_NODROP) || SEND_SIGNAL(item, COMSIG_ITEM_IMBUE_SOUL, user)) continue marked_item = item - to_chat(M, "I begin to focus my very being into [item]...") + to_chat(M, span_warning("I begin to focus my very being into [item]...")) break if(!marked_item) - to_chat(M, "None of the items you hold are suitable for emplacement of my fragile soul.") + to_chat(M, span_warning("None of the items you hold are suitable for emplacement of my fragile soul.")) return playsound(user, 'sound/blank.ogg', 100) if(!do_after(M, 50, needhand=FALSE, target=marked_item)) - to_chat(M, "My soul snaps back to my body as you stop ensouling [marked_item]!") + to_chat(M, span_warning("My soul snaps back to my body as you stop ensouling [marked_item]!")) return marked_item.name = "ensouled [marked_item.name]" @@ -59,7 +59,7 @@ new /obj/item/phylactery(marked_item, M.mind) - to_chat(M, "With a hideous feeling of emptiness you watch in horrified fascination as skin sloughs off bone! Blood boils, nerves disintegrate, eyes boil in their sockets! As my organs crumble to dust in my fleshless chest you come to terms with my choice. You're a lich!") + to_chat(M, span_danger("With a hideous feeling of emptiness you watch in horrified fascination as skin sloughs off bone! Blood boils, nerves disintegrate, eyes boil in their sockets! As my organs crumble to dust in my fleshless chest you come to terms with my choice. You're a lich!")) M.mind.hasSoul = FALSE M.set_species(/datum/species/skeleton) if(ishuman(M)) @@ -137,7 +137,7 @@ mind.transfer_to(lich) mind.grab_ghost(force=TRUE) lich.hardset_dna(null,null,lich.real_name,null, new /datum/species/skeleton) - to_chat(lich, "My bones clatter and shudder as you are pulled back into this world!") + to_chat(lich, span_warning("My bones clatter and shudder as you are pulled back into this world!")) var/turf/body_turf = get_turf(old_body) lich.Paralyze(200 + 200*resurrections) resurrections++ @@ -152,7 +152,7 @@ I.forceMove(body_turf) var/wheres_wizdo = dir2text(get_dir(body_turf, item_turf)) if(wheres_wizdo) - old_body.visible_message("Suddenly [old_body.name]'s corpse falls to pieces! You see a strange energy rise from the remains, and speed off towards the [wheres_wizdo]!") + old_body.visible_message(span_warning("Suddenly [old_body.name]'s corpse falls to pieces! You see a strange energy rise from the remains, and speed off towards the [wheres_wizdo]!")) body_turf.Beam(item_turf,icon_state="lichbeam",time=10+10*resurrections,maxdistance=INFINITY) old_body.dust() diff --git a/code/modules/spells/spell_types/lightning.dm b/code/modules/spells/spell_types/lightning.dm index 5121575c6..f8448c695 100644 --- a/code/modules/spells/spell_types/lightning.dm +++ b/code/modules/spells/spell_types/lightning.dm @@ -23,7 +23,7 @@ /obj/effect/proc_holder/spell/targeted/tesla/proc/StartChargeup(mob/user = usr) ready = TRUE - to_chat(user, "I start gathering the power.") + to_chat(user, span_notice("I start gathering the power.")) Snd = new/sound('sound/blank.ogg',channel = 7) halo = halo || mutable_appearance('icons/effects/effects.dmi', "electricity", EFFECTS_LAYER) user.add_overlay(halo) @@ -42,7 +42,7 @@ /obj/effect/proc_holder/spell/targeted/tesla/revert_cast(mob/user = usr, message = 1) if(message) - to_chat(user, "No target found in range.") + to_chat(user, span_notice("No target found in range.")) Reset(user) ..() @@ -52,7 +52,7 @@ Snd=sound(null, repeat = 0, wait = 1, channel = Snd.channel) //byond, why you suck? playsound(get_turf(user),Snd,50,FALSE)// Sorry MrPerson, but the other ways just didn't do it the way i needed to work, this is the only way. if(get_dist(user,target)>range) - to_chat(user, "[target.p_theyre(TRUE)] too far away!") + to_chat(user, span_warning("[target.p_theyre(TRUE)] too far away!")) Reset(user) return @@ -67,7 +67,7 @@ var/mob/living/carbon/current = target if(current.anti_magic_check()) playsound(get_turf(current), 'sound/blank.ogg', 50, TRUE, -1) - current.visible_message("[current] absorbs the spell, remaining unharmed!", "I absorb the spell, remaining unharmed!") + current.visible_message(span_warning("[current] absorbs the spell, remaining unharmed!"), span_danger("I absorb the spell, remaining unharmed!")) else if(bounces < 1) current.electrocute_act(bolt_energy,"Lightning Bolt",flags = SHOCK_NOGLOVES) playsound(get_turf(current), 'sound/blank.ogg', 50, TRUE, -1) diff --git a/code/modules/spells/spell_types/mime.dm b/code/modules/spells/spell_types/mime.dm index e763d78cc..eda6a41bb 100644 --- a/code/modules/spells/spell_types/mime.dm +++ b/code/modules/spells/spell_types/mime.dm @@ -5,7 +5,7 @@ panel = "Mime" summon_type = list(/obj/effect/forcefield/mime) invocation_type = "emote" - invocation_emote_self = "I form a wall in front of myself." + invocation_emote_self = span_notice("I form a wall in front of myself.") summon_lifespan = 300 charge_max = 300 clothes_req = FALSE @@ -21,7 +21,7 @@ /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_wall/Click() if(usr && usr.mind) if(!usr.mind.miming) - to_chat(usr, "I must dedicate myself to silence first!") + to_chat(usr, span_warning("I must dedicate myself to silence first!")) return invocation = "[usr.real_name] looks as if a wall is in front of [usr.p_them()]." else @@ -35,7 +35,7 @@ panel = "Mime" summon_type = list(/obj/structure/chair/mime) invocation_type = "emote" - invocation_emote_self = "I conjure an invisible chair and sit down." + invocation_emote_self = span_notice("I conjure an invisible chair and sit down.") summon_lifespan = 250 charge_max = 300 clothes_req = FALSE @@ -51,7 +51,7 @@ /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_chair/Click() if(usr && usr.mind) if(!usr.mind.miming) - to_chat(usr, "I must dedicate myself to silence first!") + to_chat(usr, span_warning("I must dedicate myself to silence first!")) return invocation = "[usr.real_name] pulls out an invisible chair and sits down." else @@ -73,7 +73,7 @@ panel = "Mime" summon_type = list(/obj/item/storage/box/mime) invocation_type = "emote" - invocation_emote_self = "I conjure up an invisible box, large enough to store a few things." + invocation_emote_self = span_notice("I conjure up an invisible box, large enough to store a few things.") summon_lifespan = 500 charge_max = 300 clothes_req = FALSE @@ -97,7 +97,7 @@ /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_box/Click() if(usr && usr.mind) if(!usr.mind.miming) - to_chat(usr, "I must dedicate myself to silence first!") + to_chat(usr, span_warning("I must dedicate myself to silence first!")) return invocation = "[usr.real_name] moves [usr.p_their()] hands in the shape of a cube, pressing a box out of the air." else @@ -128,20 +128,20 @@ return var/mob/living/carbon/human/H = usr if(H.mind.miming) - still_recharging_msg = "I can't break your vow of silence that fast!" + still_recharging_msg = span_warning("I can't break your vow of silence that fast!") else - still_recharging_msg = "You'll have to wait before you can give your vow of silence again!" + still_recharging_msg = span_warning("You'll have to wait before you can give your vow of silence again!") ..() /obj/effect/proc_holder/spell/targeted/mime/speak/cast(list/targets,mob/user = usr) for(var/mob/living/carbon/human/H in targets) H.mind.miming=!H.mind.miming if(H.mind.miming) - to_chat(H, "I make a vow of silence.") + to_chat(H, span_notice("I make a vow of silence.")) SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "vow") else SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "vow", /datum/mood_event/broken_vow) - to_chat(H, "I break your vow of silence.") + to_chat(H, span_notice("I break your vow of silence.")) // These spells can only be gotten from the "Guide for Advanced Mimery series" for Mime Traitors. @@ -152,7 +152,7 @@ panel = "Mime" wall_type = /obj/effect/forcefield/mime/advanced invocation_type = "emote" - invocation_emote_self = "I form a blockade in front of myself." + invocation_emote_self = span_notice("I form a blockade in front of myself.") charge_max = 600 sound = null clothes_req = FALSE @@ -167,7 +167,7 @@ /obj/effect/proc_holder/spell/targeted/forcewall/mime/Click() if(usr && usr.mind) if(!usr.mind.miming) - to_chat(usr, "I must dedicate myself to silence first!") + to_chat(usr, span_warning("I must dedicate myself to silence first!")) return invocation = "[usr.real_name] looks as if a blockade is in front of [usr.p_them()]." else @@ -183,7 +183,7 @@ clothes_req = FALSE antimagic_allowed = TRUE invocation_type = "emote" - invocation_emote_self = "I fire your finger gun!" + invocation_emote_self = span_danger("I fire your finger gun!") range = 20 projectile_type = /obj/projectile/bullet/mime projectile_amount = 3 @@ -201,11 +201,11 @@ /obj/effect/proc_holder/spell/aimed/finger_guns/Click() var/mob/living/carbon/human/owner = usr if(owner.incapacitated()) - to_chat(owner, "I can't properly point your fingers while incapacitated.") + to_chat(owner, span_warning("I can't properly point your fingers while incapacitated.")) return if(usr && usr.mind) if(!usr.mind.miming) - to_chat(usr, "I must dedicate myself to silence first!") + to_chat(usr, span_warning("I must dedicate myself to silence first!")) return invocation = "[usr.real_name] fires [usr.p_their()] finger gun!" else @@ -214,7 +214,7 @@ /obj/effect/proc_holder/spell/aimed/finger_guns/InterceptClickOn(mob/living/caller, params, atom/target) if(caller.incapacitated()) - to_chat(caller, "I can't properly point your fingers while incapacitated.") + to_chat(caller, span_warning("I can't properly point your fingers while incapacitated.")) if(charge_type == "recharge") var/refund_percent = current_amount/projectile_amount charge_counter = charge_max * refund_percent diff --git a/code/modules/spells/spell_types/mind_transfer.dm b/code/modules/spells/spell_types/mind_transfer.dm index ee5fdf695..2f7a31401 100644 --- a/code/modules/spells/spell_types/mind_transfer.dm +++ b/code/modules/spells/spell_types/mind_transfer.dm @@ -22,12 +22,12 @@ Also, you never added distance checking after target is selected. I've went ahea /obj/effect/proc_holder/spell/targeted/mind_transfer/cast(list/targets, mob/living/user = usr, distanceoverride, silent = FALSE) if(!targets.len) if(!silent) - to_chat(user, "No mind found!") + to_chat(user, span_warning("No mind found!")) return if(targets.len > 1) if(!silent) - to_chat(user, "Too many minds! You're not a hive damnit!") + to_chat(user, span_warning("Too many minds! You're not a hive damnit!")) return var/mob/living/target = targets[1] @@ -37,33 +37,33 @@ Also, you never added distance checking after target is selected. I've went ahea if(!(target in oview(range)) && !distanceoverride)//If they are not in overview after selection. Do note that !() is necessary for in to work because ! takes precedence over it. if(!silent) - to_chat(user, "[t_He] [t_is] too far away!") + to_chat(user, span_warning("[t_He] [t_is] too far away!")) return if(ismegafauna(target)) if(!silent) - to_chat(user, "This creature is too powerful to control!") + to_chat(user, span_warning("This creature is too powerful to control!")) return if(target.stat == DEAD) if(!silent) - to_chat(user, "I don't particularly want to be dead!") + to_chat(user, span_warning("I don't particularly want to be dead!")) return if(!target.key || !target.mind) if(!silent) - to_chat(user, "[t_He] appear[target.p_s()] to be catatonic! Not even magic can affect [target.p_their()] vacant mind.") + to_chat(user, span_warning("[t_He] appear[target.p_s()] to be catatonic! Not even magic can affect [target.p_their()] vacant mind.")) return if(user.suiciding) if(!silent) - to_chat(user, "You're killing yourself! You can't concentrate enough to do this!") + to_chat(user, span_warning("You're killing yourself! You can't concentrate enough to do this!")) return var/datum/mind/TM = target.mind if((target.anti_magic_check(TRUE, FALSE) || TM.has_antag_datum(/datum/antagonist/wizard) || TM.has_antag_datum(/datum/antagonist/cult) || TM.has_antag_datum(/datum/antagonist/changeling) || TM.has_antag_datum(/datum/antagonist/rev)) || cmptext(copytext(target.key,1,2),"@")) if(!silent) - to_chat(user, "[target.p_their(TRUE)] mind is resisting your spell!") + to_chat(user, span_warning("[target.p_their(TRUE)] mind is resisting your spell!")) return if(istype(target, /mob/living/simple_animal/hostile/guardian)) @@ -71,7 +71,7 @@ Also, you never added distance checking after target is selected. I've went ahea if(stand.summoner) if(stand.summoner == user) if(!silent) - to_chat(user, "Swapping minds with your own guardian would just put you back into your own head!") + to_chat(user, span_warning("Swapping minds with your own guardian would just put you back into your own head!")) return else target = stand.summoner diff --git a/code/modules/spells/spell_types/personality_commune.dm b/code/modules/spells/spell_types/personality_commune.dm index 3c342381b..a6b9cc063 100644 --- a/code/modules/spells/spell_types/personality_commune.dm +++ b/code/modules/spells/spell_types/personality_commune.dm @@ -17,14 +17,14 @@ // Pillaged and adapted from telepathy code /obj/effect/proc_holder/spell/targeted/personality_commune/cast(list/targets, mob/user) if(!istype(trauma)) - to_chat(user, "Something is wrong; Either due a bug or admemes, you are trying to cast this spell without a split personality!") + to_chat(user, span_warning("Something is wrong; Either due a bug or admemes, you are trying to cast this spell without a split personality!")) return var/msg = stripped_input(usr, "What would you like to tell your other self?", null , "") if(!msg) charge_counter = charge_max return - to_chat(user, "I concentrate and send thoughts to your other self: [msg]") - to_chat(trauma.owner, "[flufftext] [msg]") + to_chat(user, span_boldnotice("I concentrate and send thoughts to your other self: [msg]")) + to_chat(trauma.owner, span_boldnotice("[flufftext] [msg]")) log_directed_talk(user, trauma.owner, msg, LOG_SAY ,"[name]") for(var/ded in GLOB.dead_mob_list) if(!isobserver(ded)) diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm index 32a836ca5..90209bb3b 100644 --- a/code/modules/spells/spell_types/rightandwrong.dm +++ b/code/modules/spells/spell_types/rightandwrong.dm @@ -124,7 +124,7 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE) var/in_hand = H.put_in_hands(G) // not always successful - to_chat(H, "\A [G] appears [in_hand ? "in your hand" : "at your feet"]!") + to_chat(H, span_warning("\A [G] appears [in_hand ? "in your hand" : "at your feet"]!")) /proc/give_magic(mob/living/carbon/human/H) if(H.stat == DEAD || !(H.client)) @@ -148,14 +148,14 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE) var/in_hand = H.put_in_hands(M) - to_chat(H, "\A [M] appears [in_hand ? "in your hand" : "at your feet"]!") + to_chat(H, span_warning("\A [M] appears [in_hand ? "in your hand" : "at your feet"]!")) if(lucky) - to_chat(H, "I feel incredibly lucky.") + to_chat(H, span_notice("I feel incredibly lucky.")) /proc/rightandwrong(summon_type, mob/user, survivor_probability) if(user) //in this case either someone holding a spellbook or a badmin - to_chat(user, "I summoned [summon_type]!") + to_chat(user, span_warning("I summoned [summon_type]!")) message_admins("[ADMIN_LOOKUPFLW(user)] summoned [summon_type]!") log_game("[key_name(user)] summoned [summon_type]!") diff --git a/code/modules/spells/spell_types/rod_form.dm b/code/modules/spells/spell_types/rod_form.dm index 71392a5ec..567377dbc 100644 --- a/code/modules/spells/spell_types/rod_form.dm +++ b/code/modules/spells/spell_types/rod_form.dm @@ -14,7 +14,7 @@ /obj/effect/proc_holder/spell/targeted/rod_form/cast(list/targets,mob/user = usr) var/area/A = get_area(user) if(istype(A, /area/wizard_station)) - to_chat(user, "I know better than to trash Wizard Federation property. Best wait until you leave to use [src].") + to_chat(user, span_warning("I know better than to trash Wizard Federation property. Best wait until you leave to use [src].")) return for(var/mob/living/M in targets) var/turf/start = get_turf(M) @@ -49,8 +49,8 @@ /obj/effect/immovablerod/wizard/penetrate(mob/living/L) if(L.anti_magic_check()) - L.visible_message("[src] hits [L], but it bounces back, then vanishes!" , "[src] hits you... but it bounces back, then vanishes!" , "I hear a weak, sad, CLANG.") + L.visible_message(span_danger("[src] hits [L], but it bounces back, then vanishes!") , span_danger("[src] hits you... but it bounces back, then vanishes!") , span_danger("I hear a weak, sad, CLANG.")) qdel(src) return - L.visible_message("[L] is penetrated by an immovable rod!" , "The rod penetrates you!" , "I hear a CLANG!") + L.visible_message(span_danger("[L] is penetrated by an immovable rod!") , span_danger("The rod penetrates you!") , span_danger("I hear a CLANG!")) L.adjustBruteLoss(70 + damage_bonus) diff --git a/code/modules/spells/spell_types/shadow_walk.dm b/code/modules/spells/spell_types/shadow_walk.dm index 25bb63805..1650d82b9 100644 --- a/code/modules/spells/spell_types/shadow_walk.dm +++ b/code/modules/spells/spell_types/shadow_walk.dm @@ -25,14 +25,14 @@ var/light_amount = T.get_lumcount() if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE, -1) - visible_message("[user] melts into the shadows!") + visible_message(span_boldwarning("[user] melts into the shadows!")) user.SetAllImmobility(0) user.setStaminaLoss(0, 0) var/obj/effect/dummy/phased_mob/shadow/S2 = new(get_turf(user.loc)) user.forceMove(S2) S2.jaunter = user else - to_chat(user, "It isn't dark enough here!") + to_chat(user, span_warning("It isn't dark enough here!")) /obj/effect/dummy/phased_mob/shadow name = "darkness" @@ -48,7 +48,7 @@ /obj/effect/dummy/phased_mob/shadow/relaymove(mob/user, direction) var/turf/newLoc = get_step(src,direction) if(isspaceturf(newLoc)) - to_chat(user, "It really would not be wise to go into space.") + to_chat(user, span_warning("It really would not be wise to go into space.")) return forceMove(newLoc) check_light_level() @@ -64,9 +64,9 @@ /obj/effect/dummy/phased_mob/shadow/proc/end_jaunt(forced = FALSE) if(jaunter) if(forced) - visible_message("[jaunter] is revealed by the light!") + visible_message(span_boldwarning("[jaunter] is revealed by the light!")) else - visible_message("[jaunter] emerges from the darkness!") + visible_message(span_boldwarning("[jaunter] emerges from the darkness!")) jaunter.forceMove(get_turf(src)) playsound(get_turf(jaunter), 'sound/blank.ogg', 50, TRUE, -1) jaunter = null diff --git a/code/modules/spells/spell_types/shapeshift.dm b/code/modules/spells/spell_types/shapeshift.dm index 71220837c..8cc1f2129 100644 --- a/code/modules/spells/spell_types/shapeshift.dm +++ b/code/modules/spells/spell_types/shapeshift.dm @@ -56,7 +56,7 @@ /obj/effect/proc_holder/spell/targeted/shapeshift/proc/Shapeshift(mob/living/caster) var/obj/shapeshift_holder/H = locate() in caster if(H) - to_chat(caster, "You're already shapeshifted!") + to_chat(caster, span_warning("You're already shapeshifted!")) return var/mob/living/shape = new shapeshift_type(caster.loc) diff --git a/code/modules/spells/spell_types/soultap.dm b/code/modules/spells/spell_types/soultap.dm index f4eb0a9ed..aab5d5b87 100644 --- a/code/modules/spells/spell_types/soultap.dm +++ b/code/modules/spells/spell_types/soultap.dm @@ -19,13 +19,13 @@ /obj/effect/proc_holder/spell/self/tap/cast(mob/living/user = usr) if(!user.mind.hasSoul) - to_chat(user, "I do not possess a soul to tap into!") + to_chat(user, span_warning("I do not possess a soul to tap into!")) return - to_chat(user, "My body feels drained and there is a burning pain in my chest.") + to_chat(user, span_danger("My body feels drained and there is a burning pain in my chest.")) user.maxHealth -= HEALTH_LOST_PER_SOUL_TAP user.health = min(user.health, user.maxHealth) if(user.maxHealth <= 0) - to_chat(user, "My weakened soul is completely consumed by the tap!") + to_chat(user, span_danger("My weakened soul is completely consumed by the tap!")) user.mind.hasSoul = FALSE for(var/obj/effect/proc_holder/spell/spell in user.mind.spell_list) spell.charge_counter = spell.charge_max diff --git a/code/modules/spells/spell_types/summonitem.dm b/code/modules/spells/spell_types/summonitem.dm index 1fe45e8a1..961f7db62 100644 --- a/code/modules/spells/spell_types/summonitem.dm +++ b/code/modules/spells/spell_types/summonitem.dm @@ -36,17 +36,17 @@ if(!marked_item) if(hand_items) - message = "I aren't holding anything that can be marked for recall!" + message = span_warning("I aren't holding anything that can be marked for recall!") else - message = "I must hold the desired item in your hands to mark it for recall!" + message = span_warning("I must hold the desired item in your hands to mark it for recall!") else if(marked_item && marked_item in hand_items) //unlinking item to the spell - message = "I remove the mark on [marked_item] to use elsewhere." + message = span_notice("I remove the mark on [marked_item] to use elsewhere.") name = "Instant Summons" marked_item = null else if(marked_item && QDELETED(marked_item)) //the item was destroyed at some point - message = "I sense your marked item has been destroyed!" + message = span_warning("I sense your marked item has been destroyed!") name = "Instant Summons" marked_item = null @@ -71,9 +71,9 @@ var/mob/M = item_to_retrieve.loc if(issilicon(M)) //Items in silicons warp the whole silicon - M.loc.visible_message("[M] suddenly disappears!") + M.loc.visible_message(span_warning("[M] suddenly disappears!")) M.forceMove(L.loc) - M.loc.visible_message("[M] suddenly appears!") + M.loc.visible_message(span_warning("[M] suddenly appears!")) item_to_retrieve = null break M.dropItemToGround(item_to_retrieve) @@ -84,7 +84,7 @@ var/obj/item/bodypart/part = X if(item_to_retrieve in part.embedded_objects) part.remove_embedded_object(item_to_retrieve) - to_chat(C, "The [item_to_retrieve] that was embedded in your [L] has mysteriously vanished. How fortunate!") + to_chat(C, span_warning("The [item_to_retrieve] that was embedded in your [L] has mysteriously vanished. How fortunate!")) break else @@ -101,13 +101,13 @@ return if(item_to_retrieve.loc) - item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly disappears!") + item_to_retrieve.loc.visible_message(span_warning("The [item_to_retrieve.name] suddenly disappears!")) if(!L.put_in_hands(item_to_retrieve)) item_to_retrieve.forceMove(L.drop_location()) - item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly appears!") + item_to_retrieve.loc.visible_message(span_warning("The [item_to_retrieve.name] suddenly appears!")) playsound(get_turf(L), 'sound/blank.ogg', 50, TRUE) else - item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly appears in [L]'s hand!") + item_to_retrieve.loc.visible_message(span_warning("The [item_to_retrieve.name] suddenly appears in [L]'s hand!")) playsound(get_turf(L), 'sound/blank.ogg', 50, TRUE) diff --git a/code/modules/spells/spell_types/telepathy.dm b/code/modules/spells/spell_types/telepathy.dm index 5c12dbd8a..9b6e191b5 100644 --- a/code/modules/spells/spell_types/telepathy.dm +++ b/code/modules/spells/spell_types/telepathy.dm @@ -21,9 +21,9 @@ charge_counter = charge_max return log_directed_talk(user, M, msg, LOG_SAY, "[name]") - to_chat(user, "I transmit to [M]: [msg]") + to_chat(user, span_notice(span_boldnotice("I transmit to [M]:") + "[msg]")) if(!M.anti_magic_check(magic_check, holy_check, tinfoil_check, 0)) //hear no evil - to_chat(M, "I hear something behind you talking... [msg]") + to_chat(M, span_notice(span_boldnotice("I hear something behind you talking...") + "[msg]")) for(var/ded in GLOB.dead_mob_list) if(!isobserver(ded)) continue diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm index af375ade2..74ee68ce4 100644 --- a/code/modules/spells/spell_types/touch_attacks.dm +++ b/code/modules/spells/spell_types/touch_attacks.dm @@ -9,7 +9,7 @@ /obj/effect/proc_holder/spell/targeted/touch/Destroy() remove_hand() - to_chat(usr, "The power of the spell dissipates from my hand.") + to_chat(usr, span_notice("The power of the spell dissipates from my hand.")) ..() /obj/effect/proc_holder/spell/targeted/touch/proc/remove_hand(recharge = FALSE) @@ -28,7 +28,7 @@ /obj/effect/proc_holder/spell/targeted/touch/cast(list/targets,mob/user = usr) if(!QDELETED(attached_hand)) remove_hand(TRUE) - to_chat(user, "[dropmessage]") + to_chat(user, span_notice("[dropmessage]")) return for(var/mob/living/carbon/C in targets) @@ -49,11 +49,11 @@ if(!user.put_in_hands(attached_hand)) remove_hand(TRUE) if (user.get_num_arms() <= 0) - to_chat(user, "I dont have any usable hands!") + to_chat(user, span_warning("I dont have any usable hands!")) else - to_chat(user, "My hands are full!") + to_chat(user, span_warning("My hands are full!")) return FALSE - to_chat(user, "[drawmessage]") + to_chat(user, span_notice("[drawmessage]")) return TRUE diff --git a/code/modules/spells/spell_types/voice_of_god.dm b/code/modules/spells/spell_types/voice_of_god.dm index 031cfbb20..8c83162f2 100644 --- a/code/modules/spells/spell_types/voice_of_god.dm +++ b/code/modules/spells/spell_types/voice_of_god.dm @@ -16,7 +16,7 @@ /obj/effect/proc_holder/spell/voice_of_god/can_cast(mob/user = usr) if(!user.can_speak()) - to_chat(user, "I are unable to speak!") + to_chat(user, span_warning("I are unable to speak!")) return FALSE return TRUE diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm index aff55b5a3..763482242 100644 --- a/code/modules/spells/spell_types/wizard.dm +++ b/code/modules/spells/spell_types/wizard.dm @@ -34,7 +34,7 @@ if(ismob(target)) var/mob/M = target if(M.anti_magic_check()) - M.visible_message("[src] vanishes on contact with [target]!") + M.visible_message(span_warning("[src] vanishes on contact with [target]!")) return BULLET_ACT_BLOCK /obj/effect/proc_holder/spell/targeted/genetic/mutate @@ -236,7 +236,7 @@ clothes_req = FALSE invocation = "STI KALY" invocation_type = "whisper" - message = "My eyes cry out in pain!" + message = span_notice("My eyes cry out in pain!") cooldown_min = 50 //12 deciseconds reduction per rank starting_spells = list("/obj/effect/proc_holder/spell/targeted/inflict_handler/blind","/obj/effect/proc_holder/spell/targeted/genetic/blind") @@ -306,13 +306,13 @@ var/mob/living/M = AM M.Paralyze(100) M.adjustBruteLoss(5) - to_chat(M, "You're slammed into the floor by [user]!") + to_chat(M, span_danger("You're slammed into the floor by [user]!")) else new sparkle_path(get_turf(AM), get_dir(user, AM)) //created sparkles will disappear on their own if(isliving(AM)) var/mob/living/M = AM M.Paralyze(stun_amt) - to_chat(M, "You're thrown back by [user]!") + to_chat(M, span_danger("You're thrown back by [user]!")) AM.safe_throw_at(throwtarget, ((CLAMP((maxthrow - (CLAMP(distfromcaster - 2, 0, distfromcaster))), 3, maxthrow))), 1,user, force = repulse_force)//So stuff gets tossed around at the same time. /obj/effect/proc_holder/spell/aoe_turf/repulse/xeno //i fixed conflicts only to find out that this is in the WIZARD file instead of the xeno file?! diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 7f7e5c6b5..8049d8c69 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -45,7 +45,7 @@ return var/obj/item/multitool/M = I M.buffer = src - to_chat(user, "I store linkage information in [I]'s buffer.") + to_chat(user, span_notice("I store linkage information in [I]'s buffer.")) return TRUE /obj/machinery/bsa/front @@ -58,7 +58,7 @@ return var/obj/item/multitool/M = I M.buffer = src - to_chat(user, "I store linkage information in [I]'s buffer.") + to_chat(user, span_notice("I store linkage information in [I]'s buffer.")) return TRUE /obj/machinery/bsa/middle @@ -76,13 +76,13 @@ if(istype(M.buffer, /obj/machinery/bsa/back)) back = M.buffer M.buffer = null - to_chat(user, "I link [src] with [back].") + to_chat(user, span_notice("I link [src] with [back].")) else if(istype(M.buffer, /obj/machinery/bsa/front)) front = M.buffer M.buffer = null - to_chat(user, "I link [src] with [front].") + to_chat(user, span_notice("I link [src] with [front].")) else - to_chat(user, "[I]'s data buffer is empty!") + to_chat(user, span_warning("[I]'s data buffer is empty!")) return TRUE /obj/machinery/bsa/middle/proc/check_completion() diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index 3f3920174..79931a768 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -87,13 +87,13 @@ if(!H.myseed) return if(!H.harvest)// So it's bit harder. - to_chat(user, "Plant needs to be ready to harvest to perform full data scan.") //Because space dna is actually magic + to_chat(user, span_alert("Plant needs to be ready to harvest to perform full data scan.")) //Because space dna is actually magic return if(plants[H.myseed.type]) - to_chat(user, "Plant data already present in local storage.") + to_chat(user, span_notice("Plant data already present in local storage.")) return plants[H.myseed.type] = 1 - to_chat(user, "Plant data added to local storage.") + to_chat(user, span_notice("Plant data added to local storage.")) //animals var/static/list/non_simple_animals = typecacheof(list(/mob/living/carbon/monkey, /mob/living/carbon/alien)) @@ -101,22 +101,22 @@ if(isanimal(target)) var/mob/living/simple_animal/A = target if(!A.healable)//simple approximation of being animal not a robot or similar - to_chat(user, "No compatible DNA detected.") + to_chat(user, span_alert("No compatible DNA detected.")) return if(animals[target.type]) - to_chat(user, "Animal data already present in local storage.") + to_chat(user, span_alert("Animal data already present in local storage.")) return animals[target.type] = 1 - to_chat(user, "Animal data added to local storage.") + to_chat(user, span_notice("Animal data added to local storage.")) //humans if(ishuman(target)) var/mob/living/carbon/human/H = target if(dna[H.dna.uni_identity]) - to_chat(user, "Humanoid data already present in local storage.") + to_chat(user, span_notice("Humanoid data already present in local storage.")) return dna[H.dna.uni_identity] = 1 - to_chat(user, "Humanoid data added to local storage.") + to_chat(user, span_notice("Humanoid data added to local storage.")) /obj/machinery/dna_vault name = "DNA Vault" @@ -244,7 +244,7 @@ uploaded++ dna[ui] = 1 check_goal() - to_chat(user, "[uploaded] new datapoints uploaded.") + to_chat(user, span_notice("[uploaded] new datapoints uploaded.")) else return ..() @@ -256,31 +256,31 @@ var/datum/species/S = H.dna.species switch(upgrade_type) if(VAULT_TOXIN) - to_chat(H, "I feel resistant to airborne toxins.") + to_chat(H, span_notice("I feel resistant to airborne toxins.")) if(locate(/obj/item/organ/lungs) in H.internal_organs) var/obj/item/organ/lungs/L = H.internal_organs_slot[ORGAN_SLOT_LUNGS] L.tox_breath_dam_min = 0 L.tox_breath_dam_max = 0 ADD_TRAIT(H, TRAIT_VIRUSIMMUNE, "dna_vault") if(VAULT_NOBREATH) - to_chat(H, "My lungs feel great.") + to_chat(H, span_notice("My lungs feel great.")) ADD_TRAIT(H, TRAIT_NOBREATH, "dna_vault") if(VAULT_FIREPROOF) - to_chat(H, "I feel fireproof.") + to_chat(H, span_notice("I feel fireproof.")) S.burnmod = 0.5 ADD_TRAIT(H, TRAIT_RESISTHEAT, "dna_vault") ADD_TRAIT(H, TRAIT_NOFIRE, "dna_vault") if(VAULT_STUNTIME) - to_chat(H, "Nothing can keep you down for long.") + to_chat(H, span_notice("Nothing can keep you down for long.")) S.stunmod = 0.5 if(VAULT_ARMOUR) - to_chat(H, "I feel tough.") + to_chat(H, span_notice("I feel tough.")) S.armor = 30 ADD_TRAIT(H, TRAIT_PIERCEIMMUNE, "dna_vault") if(VAULT_SPEED) - to_chat(H, "My legs feel faster.") + to_chat(H, span_notice("My legs feel faster.")) H.add_movespeed_modifier(MOVESPEED_ID_DNA_VAULT, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING)) if(VAULT_QUICK) - to_chat(H, "My arms move as fast as lightning.") + to_chat(H, span_notice("My arms move as fast as lightning.")) H.next_move_modifier = 0.5 power_lottery[H] = list() diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm index fd67a1c40..93085351d 100644 --- a/code/modules/station_goals/shield.dm +++ b/code/modules/station_goals/shield.dm @@ -108,10 +108,10 @@ /obj/machinery/satellite/proc/toggle(mob/user) if(!active && !isinspace()) if(user) - to_chat(user, "I can only activate [src] in space.") + to_chat(user, span_warning("I can only activate [src] in space.")) return FALSE if(user) - to_chat(user, "I [active ? "deactivate": "activate"] [src].") + to_chat(user, span_notice("I [active ? "deactivate": "activate"] [src].")) active = !active if(active) animate(src, pixel_y = 2, time = 10, loop = -1) @@ -126,7 +126,7 @@ /obj/machinery/satellite/multitool_act(mob/living/user, obj/item/I) ..() - to_chat(user, "// NTSAT-[id] // Mode : [active ? "PRIMARY" : "STANDBY"] //[(obj_flags & EMAGGED) ? "DEBUG_MODE //" : ""]") + to_chat(user, span_notice("// NTSAT-[id] // Mode : [active ? "PRIMARY" : "STANDBY"] //[(obj_flags & EMAGGED) ? "DEBUG_MODE //" : ""]")) return TRUE /obj/machinery/satellite/meteor_shield @@ -177,6 +177,6 @@ if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - to_chat(user, "I access the satellite's debug mode, increasing the chance of meteor strikes.") + to_chat(user, span_notice("I access the satellite's debug mode, increasing the chance of meteor strikes.")) if(active) change_meteor_chance(2) diff --git a/code/modules/surgery/_surgery_step.dm b/code/modules/surgery/_surgery_step.dm index 3445c6027..18e9e7eab 100644 --- a/code/modules/surgery/_surgery_step.dm +++ b/code/modules/surgery/_surgery_step.dm @@ -318,29 +318,29 @@ else if(failure(user, target, target_zone, tool, intent, success_prob)) if(user.client?.prefs.showrolls) if(try_to_fail) - to_chat(user, "Intentional surgery fail... [success_prob]%") + to_chat(user, span_warning("Intentional surgery fail... [success_prob]%")) else - to_chat(user, "Surgery fail... [success_prob]%") + to_chat(user, span_warning("Surgery fail... [success_prob]%")) return FALSE return FALSE /datum/surgery_step/proc/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I begin to perform surgery on [target]...", - "[user] begins to perform surgery on [target].", - "[user] begins to perform surgery on [target].") + display_results(user, target, span_notice("I begin to perform surgery on [target]..."), + span_notice("[user] begins to perform surgery on [target]."), + span_notice("[user] begins to perform surgery on [target].")) return TRUE /datum/surgery_step/proc/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I succeed.", - "[user] succeeds!", - "[user] finishes.") + display_results(user, target, span_notice("I succeed."), + span_notice("[user] succeeds!"), + span_notice("[user] finishes.")) return TRUE /datum/surgery_step/proc/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent, success_prob) - display_results(user, target, "I screw up!", - "[user] screws up!", - "[user] finishes.", TRUE) //By default the patient will notice if the wrong thing has been cut + display_results(user, target, span_warning("I screw up!"), + span_warning("[user] screws up!"), + span_notice("[user] finishes."), TRUE) //By default the patient will notice if the wrong thing has been cut return TRUE /// Replaces visible_message during operations so only people looking over the surgeon can tell what they're doing, allowing for shenanigans. diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 3a3b0b987..c1cc34e36 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -109,8 +109,8 @@ /obj/item/bodypart/onbite(mob/living/carbon/human/user) if((user.mind && user.mind.has_antag_datum(/datum/antagonist/zombie)) || istype(user.dna.species, /datum/species/werewolf)) if(do_after(user, 50, target = src)) - user.visible_message("[user] consumes [src]!",\ - "I consume [src]!") + user.visible_message(span_warning("[user] consumes [src]!"),\ + span_notice("I consume [src]!")) playsound(get_turf(user), pick(dismemsound), 100, FALSE, -1) new /obj/effect/gibspawner/generic(get_turf(src), user) user.fully_heal() @@ -124,11 +124,11 @@ if(HAS_TRAIT(C, TRAIT_LIMBATTACHMENT)) if(!H.get_bodypart(body_zone) && !animal_origin) if(H == user) - H.visible_message("[H] jams [src] into [H.p_their()] empty socket!",\ - "I force [src] into my empty socket, and it locks into place!") + H.visible_message(span_warning("[H] jams [src] into [H.p_their()] empty socket!"),\ + span_notice("I force [src] into my empty socket, and it locks into place!")) else - H.visible_message("[user] jams [src] into [H]'s empty socket!",\ - "[user] forces [src] into my empty socket, and it locks into place!") + H.visible_message(span_warning("[user] jams [src] into [H]'s empty socket!"),\ + span_notice("[user] forces [src] into my empty socket, and it locks into place!")) user.temporarilyRemoveItemFromInventory(src, TRUE) attach_limb(C) return @@ -138,12 +138,12 @@ if(length(contents) && I.get_sharpness() && !user.cmode) add_fingerprint(user) playsound(loc, 'sound/combat/hits/bladed/genstab (1).ogg', 60, vary = FALSE) - user.visible_message("[user] begins to cut open [src].",\ - "You begin to cut open [src]...") + user.visible_message(span_warning("[user] begins to cut open [src]."),\ + span_notice("You begin to cut open [src]...")) if(do_after(user, 5 SECONDS, target = src)) drop_organs(user) - user.visible_message("[user] cuts [src] open!",\ - "You finish cutting [src] open.") + user.visible_message(span_danger("[user] cuts [src] open!"),\ + span_notice("You finish cutting [src] open.")) return return ..() @@ -562,7 +562,7 @@ return if(disabled == BODYPART_DISABLED_DAMAGE || disabled == BODYPART_DISABLED_WOUND) if(owner.stat < DEAD) - to_chat(owner, "I feel a sharp pain in my back!") + to_chat(owner, span_warning("I feel a sharp pain in my back!")) /obj/item/bodypart/chest/Destroy() QDEL_NULL(cavity_item) @@ -630,12 +630,12 @@ return if(disabled == BODYPART_DISABLED_DAMAGE || disabled == BODYPART_DISABLED_WOUND) if(owner.stat < DEAD) - to_chat(owner, "I can no longer move my [name]!") + to_chat(owner, span_boldwarning("I can no longer move my [name]!")) if(held_index) owner.dropItemToGround(owner.get_item_for_held_index(held_index)) else if(disabled == BODYPART_DISABLED_PARALYSIS) if(owner.stat < DEAD) - to_chat(owner, "I can no longer feel my [name].") + to_chat(owner, span_danger("I can no longer feel my [name].")) if(held_index) owner.dropItemToGround(owner.get_item_for_held_index(held_index)) if(owner.hud_used) @@ -696,12 +696,12 @@ return if(disabled == BODYPART_DISABLED_DAMAGE || disabled == BODYPART_DISABLED_WOUND) if(owner.stat < DEAD) - to_chat(owner, "I can no longer move my [name]!") + to_chat(owner, span_danger("I can no longer move my [name]!")) if(held_index) owner.dropItemToGround(owner.get_item_for_held_index(held_index)) else if(disabled == BODYPART_DISABLED_PARALYSIS) if(owner.stat < DEAD) - to_chat(owner, "I can no longer feel my [name].") + to_chat(owner, span_danger("I can no longer feel my [name].")) if(held_index) owner.dropItemToGround(owner.get_item_for_held_index(held_index)) if(owner.hud_used) @@ -759,10 +759,10 @@ return if(disabled == BODYPART_DISABLED_DAMAGE || disabled == BODYPART_DISABLED_WOUND) if(owner.stat < DEAD) - to_chat(owner, "I can no longer move my [name]!") + to_chat(owner, span_danger("I can no longer move my [name]!")) else if(disabled == BODYPART_DISABLED_PARALYSIS) if(owner.stat < DEAD) - to_chat(owner, "I can no longer feel my [name].") + to_chat(owner, span_danger("I can no longer feel my [name].")) /obj/item/bodypart/l_leg/digitigrade name = "left digitigrade leg" @@ -818,10 +818,10 @@ return if(disabled == BODYPART_DISABLED_DAMAGE || disabled == BODYPART_DISABLED_WOUND) if(owner.stat < DEAD) - to_chat(owner, "I can no longer move my [name]!") + to_chat(owner, span_danger("I can no longer move my [name]!")) else if(disabled == BODYPART_DISABLED_PARALYSIS) if(owner.stat < DEAD) - to_chat(owner, "I can no longer feel my [name].") + to_chat(owner, span_danger("I can no longer feel my [name].")) /obj/item/bodypart/r_leg/digitigrade name = "right digitigrade leg" diff --git a/code/modules/surgery/bodyparts/bodypart_dismemberment.dm b/code/modules/surgery/bodyparts/bodypart_dismemberment.dm index 54563a744..9768895fd 100644 --- a/code/modules/surgery/bodyparts/bodypart_dismemberment.dm +++ b/code/modules/surgery/bodyparts/bodypart_dismemberment.dm @@ -38,9 +38,9 @@ affecting.add_wound(dismember_wound) playsound(C, pick(dismemsound), 50, FALSE, -1) if(body_zone == BODY_ZONE_HEAD) - C.visible_message("[C] is [pick("BRUTALLY","VIOLENTLY","BLOODILY","MESSILY")] DECAPITATED!") + C.visible_message(span_danger("[C] is [pick("BRUTALLY","VIOLENTLY","BLOODILY","MESSILY")] DECAPITATED!")) else - C.visible_message("The [src.name] is [pick("torn off", "sundered", "severed", "seperated", "unsewn")]!") + C.visible_message(span_danger("The [src.name] is [pick("torn off", "sundered", "severed", "seperated", "unsewn")]!")) C.emote("painscream") src.add_mob_blood(C) SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered) diff --git a/code/modules/surgery/bodyparts/bodypart_examine.dm b/code/modules/surgery/bodyparts/bodypart_examine.dm index 646928b9b..02c9d7070 100644 --- a/code/modules/surgery/bodyparts/bodypart_examine.dm +++ b/code/modules/surgery/bodyparts/bodypart_examine.dm @@ -8,31 +8,31 @@ return var/list/head_status = list() if(!brain) - head_status += "The brain is missing." + head_status += span_dead("The brain is missing.") /* else if(brain.suicided || brainmob?.suiciding) - . += "There's a pretty dumb expression on [real_name]'s face; they must have really hated life. There is no hope of recovery." + . += span_info("There's a pretty dumb expression on [real_name]'s face; they must have really hated life. There is no hope of recovery.") else if(brain.brain_death || brainmob?.health <= HEALTH_THRESHOLD_DEAD) - . += "" + . += span_info("") else if(brainmob) if(brainmob.get_ghost(FALSE, TRUE)) - . += "Its muscles are still twitching slightly... It still seems to have a bit of life left to it." + . += span_info("Its muscles are still twitching slightly... It still seems to have a bit of life left to it.") else - . += "It seems seems particularly lifeless. Perhaps there'll be a chance for them later." + . += span_info("It seems seems particularly lifeless. Perhaps there'll be a chance for them later.") else if(brain?.decoy_override) - . += "It seems particularly lifeless. Perhaps there'll be a chance for them later." + . += span_info("It seems particularly lifeless. Perhaps there'll be a chance for them later.") else - . += "It seems completely devoid of life." + . += span_info("It seems completely devoid of life.") */ if(!eyes) - head_status += "The eyes appear to be missing." + head_status += span_warning("The eyes appear to be missing.") if(!ears) - head_status += "The ears appear to be missing." + head_status += span_warning("The ears appear to be missing.") if(!tongue) - head_status += "The tongue appears to be missing." + head_status += span_warning("The tongue appears to be missing.") if(length(head_status)) . += "Organs:" @@ -122,7 +122,7 @@ var/list/status = get_injury_status(user, advanced) if(!length(status)) - examination += "OK" + examination += span_green("OK") else examination += status.Join(" | ") @@ -142,38 +142,38 @@ if(advanced) if(brute) - status += "[brute] BRUTE" + status += brute >= 10 ? span_danger("[brute] BRUTE") : span_warning("[brute] BRUTE") if(burn) - status += "[burn] BURN" + status += burn >= 10 ? span_danger("[burn] BURN") : span_warning("[burn] BURN") else if(brute >= DAMAGE_PRECISION) switch(brute/max_damage) if(0.75 to INFINITY) - status += "[heavy_brute_msg]" + status += span_userdanger("[heavy_brute_msg]") if(0.5 to 0.75) - status += "[heavy_brute_msg]" + status += span_userdanger("[heavy_brute_msg]") if(0.25 to 0.5) - status += "[medium_brute_msg]" + status += span_danger("[medium_brute_msg]") else - status += "[light_brute_msg]" + status += span_warning("[light_brute_msg]") if(burn >= DAMAGE_PRECISION) switch(burn/max_damage) if(0.75 to INFINITY) - status += "[heavy_burn_msg]" + status += span_userdanger("[heavy_burn_msg]") if(0.5 to 0.75) - status += "[medium_burn_msg]" + status += span_userdanger("[medium_burn_msg]") if(0.25 to 0.5) - status += "[medium_burn_msg]" + status += span_danger("[medium_burn_msg]") else - status += "[light_burn_msg]" + status += span_warning("[light_burn_msg]") var/bleed_rate = get_bleed_rate() if(bleed_rate) if(bleed_rate > 1) //Totally arbitrary value - status += "BLEEDING" + status += span_bloody("BLEEDING") else - status += "BLEEDING" + status += span_bloody("BLEEDING") var/crazy_infection = FALSE var/list/wound_strings = list() @@ -185,12 +185,12 @@ status += wound_strings if(crazy_infection) - status += "INFECTION" + status += span_infection("INFECTION") if(skeletonized) - status += "SKELETON" + status += span_dead("SKELETON") else if(rotted) - status += "NECROSIS" + status += span_necrosis("NECROSIS") var/owner_ref = owner ? REF(owner) : REF(src) for(var/obj/item/embedded as anything in embedded_objects) @@ -206,7 +206,7 @@ status += "[uppertext(bandage.name)]" if(disabled) - status += "CRIPPLED" + status += span_deadsay("CRIPPLED") return status @@ -265,45 +265,45 @@ to_chat(src, "\t There is \a [I] in my [name]!") for(var/t in missing) - to_chat(src, "My [parse_zone(t)] is missing!") + to_chat(src, span_boldannounce("My [parse_zone(t)] is missing!")) if(bleed_rate) - to_chat(src, "I am bleeding!") + to_chat(src, span_danger("I am bleeding!")) if(getStaminaLoss()) if(getStaminaLoss() > 30) - to_chat(src, "You're completely exhausted.") + to_chat(src, span_info("You're completely exhausted.")) else - to_chat(src, "I feel fatigued.") + to_chat(src, span_info("I feel fatigued.")) if(HAS_TRAIT(src, TRAIT_SELF_AWARE)) if(toxloss) if(toxloss > 10) - to_chat(src, "I feel sick.") + to_chat(src, span_danger("I feel sick.")) else if(toxloss > 20) - to_chat(src, "I feel nauseated.") + to_chat(src, span_danger("I feel nauseated.")) else if(toxloss > 40) - to_chat(src, "I feel very unwell!") + to_chat(src, span_danger("I feel very unwell!")) if(oxyloss) if(oxyloss > 10) - to_chat(src, "I feel lightheaded.") + to_chat(src, span_danger("I feel lightheaded.")) else if(oxyloss > 20) - to_chat(src, "My thinking is clouded and distant.") + to_chat(src, span_danger("My thinking is clouded and distant.")) else if(oxyloss > 30) - to_chat(src, "You're choking!") + to_chat(src, span_danger("You're choking!")) if(!HAS_TRAIT(src, TRAIT_NOHUNGER)) switch(nutrition) if(NUTRITION_LEVEL_FULL to INFINITY) - to_chat(src, "You're completely stuffed!") + to_chat(src, span_info("You're completely stuffed!")) if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL) - to_chat(src, "You're well fed!") + to_chat(src, span_info("You're well fed!")) if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED) - to_chat(src, "You're not hungry.") + to_chat(src, span_info("You're not hungry.")) if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED) - to_chat(src, "I could use a bite to eat.") + to_chat(src, span_info("I could use a bite to eat.")) if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY) - to_chat(src, "I feel quite hungry.") + to_chat(src, span_info("I feel quite hungry.")) if(0 to NUTRITION_LEVEL_STARVING) - to_chat(src, "You're starving!") + to_chat(src, span_danger("You're starving!")) //Compiles then shows the list of damaged organs and broken organs var/list/broken = list() @@ -335,7 +335,7 @@ //Put the items in that list into a string of text for(var/B in broken) broken_message += B - to_chat(src, "My [broken_message] [broken_plural ? "are" : "is"] non-functional!") + to_chat(src, span_warning("My [broken_message] [broken_plural ? "are" : "is"] non-functional!")) if(damaged.len) if(damaged.len > 1) damaged.Insert(damaged.len, "and ") @@ -346,7 +346,7 @@ damaged_plural = TRUE for(var/D in damaged) damaged_message += D - to_chat(src, "My [damaged_message] [damaged_plural ? "are" : "is"] hurt.") + to_chat(src, span_info("My [damaged_message] [damaged_plural ? "are" : "is"] hurt.")) var/max_damage = FB.max_damage diff --git a/code/modules/surgery/bodyparts/bodypart_wounds.dm b/code/modules/surgery/bodyparts/bodypart_wounds.dm index 82f1c6ce0..9ec4c084d 100644 --- a/code/modules/surgery/bodyparts/bodypart_wounds.dm +++ b/code/modules/surgery/bodyparts/bodypart_wounds.dm @@ -451,7 +451,7 @@ if(!bandage) return FALSE if(owner.stat != DEAD) - to_chat(owner, "Blood soaks through the bandage on my [name].") + to_chat(owner, span_warning("Blood soaks through the bandage on my [name].")) return bandage.add_mob_blood(owner) /obj/item/bodypart/proc/remove_bandage() diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 08ad10ffe..99cd7f93b 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -100,14 +100,14 @@ for(var/obj/item/I in src) if(I == brain) if(user) - user.visible_message("[user] saws [src] open and pulls out a brain!", "I saw [src] open and pull out a brain.") + user.visible_message(span_warning("[user] saws [src] open and pulls out a brain!"), span_notice("I saw [src] open and pull out a brain.")) if(brainmob) brainmob.container = null brainmob.forceMove(brain) brain.brainmob = brainmob brainmob = null if(violent_removal && prob(rand(80, 100))) //ghetto surgery can damage the brain. - to_chat(user, "[brain] was damaged in the process!") + to_chat(user, span_warning("[brain] was damaged in the process!")) brain.setOrganDamage(brain.maxHealth) brain.forceMove(T) brain = null diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm index fb608ca5c..93736a4a0 100644 --- a/code/modules/surgery/bodyparts/robot_bodyparts.dm +++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm @@ -130,23 +130,23 @@ /obj/item/bodypart/chest/robot/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stock_parts/cell)) if(cell) - to_chat(user, "I have already inserted a cell!") + to_chat(user, span_warning("I have already inserted a cell!")) return else if(!user.transferItemToLoc(W, src)) return cell = W - to_chat(user, "I insert the cell.") + to_chat(user, span_notice("I insert the cell.")) else if(istype(W, /obj/item/stack/cable_coil)) if(wired) - to_chat(user, "I have already inserted wire!") + to_chat(user, span_warning("I have already inserted wire!")) return var/obj/item/stack/cable_coil/coil = W if (coil.use(1)) wired = TRUE - to_chat(user, "I insert the wire.") + to_chat(user, span_notice("I insert the wire.")) else - to_chat(user, "I need one length of coil to wire it!") + to_chat(user, span_warning("I need one length of coil to wire it!")) else return ..() @@ -156,7 +156,7 @@ return . = TRUE I.play_tool_sound(src) - to_chat(user, "I cut the wires out of [src].") + to_chat(user, span_notice("I cut the wires out of [src].")) new /obj/item/stack/cable_coil(drop_location(), 1) wired = FALSE @@ -164,10 +164,10 @@ ..() . = TRUE if(!cell) - to_chat(user, "There's no power cell installed in [src]!") + to_chat(user, span_warning("There's no power cell installed in [src]!")) return I.play_tool_sound(src) - to_chat(user, "Remove [cell] from [src].") + to_chat(user, span_notice("Remove [cell] from [src].")) cell.forceMove(drop_location()) cell = null @@ -178,12 +178,12 @@ . += {"It has a [cell] inserted.\n I can use a screwdriver to remove [cell]."} else - . += "It has an empty port for a power cell." + . += span_info("It has an empty port for a power cell.") if(wired) . += "Its all wired up[cell ? " and ready for usage" : ""].\n"+\ - "I can use wirecutters to remove the wiring." + span_info("I can use wirecutters to remove the wiring.") else - . += "It has a couple spots that still need to be wired." + . += span_info("It has a couple spots that still need to be wired.") /obj/item/bodypart/chest/robot/drop_organs(mob/user, violent_removal) if(wired) @@ -234,7 +234,7 @@ /obj/item/bodypart/head/robot/examine(mob/user) . = ..() if(!flash1 && !flash2) - . += "It has two empty eye sockets for flashes." + . += span_info("It has two empty eye sockets for flashes.") else var/single_flash = FALSE if(!flash1 || !flash2) @@ -243,16 +243,16 @@ It has an empty eye socket for another flash."} else . += "It has two eye sockets occupied by flashes." - . += "I can remove the seated flash[single_flash ? "":"es"] with a crowbar." + . += span_notice("I can remove the seated flash[single_flash ? "":"es"] with a crowbar.") /obj/item/bodypart/head/robot/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/assembly/flash/handheld)) var/obj/item/assembly/flash/handheld/F = W if(flash1 && flash2) - to_chat(user, "I have already inserted the eyes!") + to_chat(user, span_warning("I have already inserted the eyes!")) return else if(F.burnt_out) - to_chat(user, "I can't use a broken flash!") + to_chat(user, span_warning("I can't use a broken flash!")) return else if(!user.transferItemToLoc(F, src)) @@ -261,7 +261,7 @@ flash2 = F else flash1 = F - to_chat(user, "I insert the flash into the eye socket.") + to_chat(user, span_notice("I insert the flash into the eye socket.")) return return ..() @@ -269,7 +269,7 @@ ..() if(flash1 || flash2) I.play_tool_sound(src) - to_chat(user, "I remove the flash from [src].") + to_chat(user, span_notice("I remove the flash from [src].")) if(flash1) flash1.forceMove(drop_location()) flash1 = null @@ -277,7 +277,7 @@ flash2.forceMove(drop_location()) flash2 = null else - to_chat(user, "There is no flash to remove from [src].") + to_chat(user, span_warning("There is no flash to remove from [src].")) return TRUE diff --git a/code/modules/surgery/organs/appendix.dm b/code/modules/surgery/organs/appendix.dm index 23d3a2ceb..10945f953 100644 --- a/code/modules/surgery/organs/appendix.dm +++ b/code/modules/surgery/organs/appendix.dm @@ -7,8 +7,8 @@ healing_factor = STANDARD_ORGAN_HEALING decay_factor = STANDARD_ORGAN_DECAY - now_failing = "An explosion of pain erupts in your lower right abdomen!" - now_fixed = "The pain in your abdomen has subsided." + now_failing = span_warning("An explosion of pain erupts in your lower right abdomen!") + now_fixed = span_info("The pain in your abdomen has subsided.") var/inflamed diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 1a0283997..69fdfa7d0 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -39,7 +39,7 @@ /obj/item/organ/cyberimp/arm/examine(mob/user) . = ..() - . += "[src] is assembled in the [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm configuration. You can use a screwdriver to reassemble it." + . += span_info("[src] is assembled in the [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm configuration. You can use a screwdriver to reassemble it.") /obj/item/organ/cyberimp/arm/screwdriver_act(mob/living/user, obj/item/I) . = ..() @@ -51,7 +51,7 @@ else zone = BODY_ZONE_R_ARM SetSlotFromZone() - to_chat(user, "I modify [src] to be installed on the [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm.") + to_chat(user, span_notice("I modify [src] to be installed on the [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm.")) update_icon() /obj/item/organ/cyberimp/arm/Remove(mob/living/carbon/M, special = 0) @@ -63,7 +63,7 @@ if(. & EMP_PROTECT_SELF) return if(prob(15/severity) && owner) - to_chat(owner, "[src] is hit by EMP!") + to_chat(owner, span_warning("[src] is hit by EMP!")) // give the owner an idea about why his implant is glitching Retract() @@ -71,9 +71,9 @@ if(!holder || (holder in src)) return - owner.visible_message("[owner] retracts [holder] back into [owner.p_their()] [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm.", - "[holder] snaps back into my [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm.", - "I hear a short mechanical noise.") + owner.visible_message(span_notice("[owner] retracts [holder] back into [owner.p_their()] [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm."), + span_notice("[holder] snaps back into my [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm."), + span_hear("I hear a short mechanical noise.")) if(istype(holder, /obj/item/assembly/flash/armimplant)) var/obj/item/assembly/flash/F = holder @@ -109,23 +109,23 @@ for(var/i in 1 to hand_items.len) //Can't just use *in* here. var/I = hand_items[i] if(!owner.dropItemToGround(I)) - failure_message += "My [I] interferes with [src]!" + failure_message += span_warning("My [I] interferes with [src]!") continue - to_chat(owner, "I drop [I] to activate [src]!") + to_chat(owner, span_notice("I drop [I] to activate [src]!")) success = owner.put_in_hand(holder, owner.get_empty_held_index_for_side(side)) break if(!success) for(var/i in failure_message) to_chat(owner, i) return - owner.visible_message("[owner] extends [holder] from [owner.p_their()] [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm.", - "I extend [holder] from my [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm.", - "I hear a short mechanical noise.") + owner.visible_message(span_notice("[owner] extends [holder] from [owner.p_their()] [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm."), + span_notice("I extend [holder] from my [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm."), + span_hear("I hear a short mechanical noise.")) playsound(get_turf(owner), 'sound/blank.ogg', 50, TRUE) /obj/item/organ/cyberimp/arm/ui_action_click() if((organ_flags & ORGAN_FAILING) || (!holder && !contents.len)) - to_chat(owner, "The implant doesn't respond. It seems to be broken...") + to_chat(owner, span_warning("The implant doesn't respond. It seems to be broken...")) return if(!holder || (holder in src)) @@ -150,9 +150,9 @@ return if(prob(30/severity) && owner && !(organ_flags & ORGAN_FAILING)) Retract() - owner.visible_message("A loud bang comes from [owner]\'s [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm!") + owner.visible_message(span_danger("A loud bang comes from [owner]\'s [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm!")) playsound(get_turf(owner), 'sound/blank.ogg', 100, TRUE) - to_chat(owner, "I feel an explosion erupt inside my [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm as my implant breaks!") + to_chat(owner, span_danger("I feel an explosion erupt inside my [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm as my implant breaks!")) owner.adjust_fire_stacks(20) owner.IgniteMob() owner.adjustFireLoss(25) @@ -189,7 +189,7 @@ /obj/item/organ/cyberimp/arm/toolset/emag_act() if(!(locate(/obj/item/kitchen/knife/combat/cyborg) in items_list)) - to_chat(usr, "I unlock [src]'s integrated knife!") + to_chat(usr, span_notice("I unlock [src]'s integrated knife!")) items_list += new /obj/item/kitchen/knife/combat/cyborg(src) return 1 return 0 diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm index 11f6dae89..0c437b235 100644 --- a/code/modules/surgery/organs/augments_chest.dm +++ b/code/modules/surgery/organs/augments_chest.dm @@ -21,7 +21,7 @@ if(owner.nutrition <= hunger_threshold) synthesizing = TRUE - to_chat(owner, "I feel less hungry...") + to_chat(owner, span_notice("I feel less hungry...")) owner.adjust_nutrition(50) addtimer(CALLBACK(src, PROC_REF(synth_cool)), 50) @@ -33,7 +33,7 @@ if(!owner || . & EMP_PROTECT_SELF) return owner.reagents.add_reagent(/datum/reagent/toxin/bad_food, poison_amount / severity) - to_chat(owner, "I feel like my insides are burning.") + to_chat(owner, span_warning("I feel like my insides are burning.")) /obj/item/organ/cyberimp/chest/nutriment/plus @@ -61,7 +61,7 @@ else cooldown = revive_cost + world.time reviving = FALSE - to_chat(owner, "My reviver implant shuts down and starts recharging. It will be ready again in [DisplayTimeText(revive_cost)].") + to_chat(owner, span_notice("My reviver implant shuts down and starts recharging. It will be ready again in [DisplayTimeText(revive_cost)].")) return if(cooldown > world.time) @@ -73,7 +73,7 @@ revive_cost = 0 reviving = TRUE - to_chat(owner, "I feel a faint buzzing as my reviver implant starts patching my wounds...") + to_chat(owner, span_notice("I feel a faint buzzing as my reviver implant starts patching my wounds...")) /obj/item/organ/cyberimp/chest/reviver/proc/heal() if(owner.getOxyLoss()) @@ -103,7 +103,7 @@ var/mob/living/carbon/human/H = owner if(H.stat != DEAD && prob(50 / severity) && H.can_heartattack()) H.set_heartattack(TRUE) - to_chat(H, "I feel a horrible agony in my chest!") + to_chat(H, span_danger("I feel a horrible agony in my chest!")) addtimer(CALLBACK(src, PROC_REF(undo_heart_attack)), 600 / severity) /obj/item/organ/cyberimp/chest/reviver/proc/undo_heart_attack() @@ -112,7 +112,7 @@ return H.set_heartattack(FALSE) if(H.stat == CONSCIOUS) - to_chat(H, "I feel my heart beating again!") + to_chat(H, span_notice("I feel my heart beating again!")) /obj/item/organ/cyberimp/chest/thrusters @@ -146,7 +146,7 @@ if(!on) if((organ_flags & ORGAN_FAILING)) if(!silent) - to_chat(owner, "My thrusters set seems to be broken!") + to_chat(owner, span_warning("My thrusters set seems to be broken!")) return 0 on = TRUE if(allow_thrust(0.01)) @@ -154,13 +154,13 @@ RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(move_react)) owner.add_movespeed_modifier(MOVESPEED_ID_CYBER_THRUSTER, priority=100, multiplicative_slowdown=-2, movetypes=FLOATING, conflict=MOVE_CONFLICT_JETPACK) if(!silent) - to_chat(owner, "I turn my thrusters set on.") + to_chat(owner, span_notice("I turn my thrusters set on.")) else ion_trail.stop() UnregisterSignal(owner, COMSIG_MOVABLE_MOVED) owner.remove_movespeed_modifier(MOVESPEED_ID_CYBER_THRUSTER) if(!silent) - to_chat(owner, "I turn my thrusters set off.") + to_chat(owner, span_notice("I turn my thrusters set off.")) on = FALSE update_icon() diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index e6ea9d50b..4a70ea2f1 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -35,7 +35,7 @@ return var/stun_amount = 200/severity owner.Stun(stun_amount) - to_chat(owner, "My body seizes up!") + to_chat(owner, span_warning("My body seizes up!")) /obj/item/organ/cyberimp/brain/anti_drop @@ -55,17 +55,17 @@ var/list/L = owner.get_empty_held_indexes() if(LAZYLEN(L) == owner.held_items.len) - to_chat(owner, "I are not holding any items, my hands relax...") + to_chat(owner, span_notice("I are not holding any items, my hands relax...")) active = 0 stored_items = list() else for(var/obj/item/I in stored_items) - to_chat(owner, "My [owner.get_held_index_name(owner.get_held_index_of_item(I))]'s grip tightens.") + to_chat(owner, span_notice("My [owner.get_held_index_name(owner.get_held_index_of_item(I))]'s grip tightens.")) ADD_TRAIT(I, TRAIT_NODROP, ANTI_DROP_IMPLANT_TRAIT) else release_items() - to_chat(owner, "My hands relax...") + to_chat(owner, span_notice("My hands relax...")) /obj/item/organ/cyberimp/brain/anti_drop/emp_act(severity) @@ -79,7 +79,7 @@ for(var/obj/item/I in stored_items) A = pick(oview(range)) I.throw_at(A, range, 2) - to_chat(owner, "My [owner.get_held_index_name(owner.get_held_index_of_item(I))] spasms and throws the [I.name]!") + to_chat(owner, span_warning("My [owner.get_held_index_name(owner.get_held_index_of_item(I))] spasms and throws the [I.name]!")) stored_items = list() @@ -154,7 +154,7 @@ if(!owner || . & EMP_PROTECT_SELF) return if(prob(60/severity)) - to_chat(owner, "My breathing tube suddenly closes!") + to_chat(owner, span_warning("My breathing tube suddenly closes!")) owner.losebreath += 2 //BOX O' IMPLANTS diff --git a/code/modules/surgery/organs/autosurgeon.dm b/code/modules/surgery/organs/autosurgeon.dm index 0571e2bc0..49e13b470 100644 --- a/code/modules/surgery/organs/autosurgeon.dm +++ b/code/modules/surgery/organs/autosurgeon.dm @@ -24,13 +24,13 @@ /obj/item/autosurgeon/attack_self(mob/user)//when the object it used... if(!uses) - to_chat(user, "[src] has already been used. The tools are dull and won't reactivate.") + to_chat(user, span_alert("[src] has already been used. The tools are dull and won't reactivate.")) return else if(!storedorgan) - to_chat(user, "[src] currently has no implant stored.") + to_chat(user, span_alert("[src] currently has no implant stored.")) return storedorgan.Insert(user)//insert stored organ into the user - user.visible_message("[user] presses a button on [src], and you hear a short mechanical noise.", "I feel a sharp sting as [src] plunges into my body.") + user.visible_message(span_notice("[user] presses a button on [src], and you hear a short mechanical noise."), span_notice("I feel a sharp sting as [src] plunges into my body.")) playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE) storedorgan = null name = initial(name) @@ -45,15 +45,15 @@ /obj/item/autosurgeon/attackby(obj/item/I, mob/user, params) if(istype(I, organ_type)) if(storedorgan) - to_chat(user, "[src] already has an implant stored.") + to_chat(user, span_alert("[src] already has an implant stored.")) return else if(!uses) - to_chat(user, "[src] has already been used up.") + to_chat(user, span_alert("[src] has already been used up.")) return if(!user.transferItemToLoc(I, src)) return storedorgan = I - to_chat(user, "I insert the [I] into [src].") + to_chat(user, span_notice("I insert the [I] into [src].")) else return ..() @@ -61,14 +61,14 @@ if(..()) return TRUE if(!storedorgan) - to_chat(user, "There's no implant in [src] for you to remove!") + to_chat(user, span_warning("There's no implant in [src] for you to remove!")) else var/atom/drop_loc = user.drop_location() for(var/J in src) var/atom/movable/AM = J AM.forceMove(drop_loc) - to_chat(user, "I remove the [storedorgan] from [src].") + to_chat(user, span_notice("I remove the [storedorgan] from [src].")) I.play_tool_sound(src) storedorgan = null if(uses != INFINITE) diff --git a/code/modules/surgery/organs/brain.dm b/code/modules/surgery/organs/brain.dm index 04c7bd1cc..77b57f1db 100644 --- a/code/modules/surgery/organs/brain.dm +++ b/code/modules/surgery/organs/brain.dm @@ -97,7 +97,7 @@ brainmob.set_species(ZI.old_species) //For if the brain is cloned if(L.mind?.current) L.mind.transfer_to(brainmob) -// to_chat(brainmob, "I feel slightly disoriented. That's normal when you're just a brain.") +// to_chat(brainmob, span_notice("I feel slightly disoriented. That's normal when you're just a brain.")) /obj/item/organ/brain/attackby(obj/item/O, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) @@ -108,19 +108,19 @@ if((organ_flags & ORGAN_FAILING) && O.is_drainable() && O.reagents.has_reagent(/datum/reagent/medicine/mannitol)) //attempt to heal the brain . = TRUE //don't do attack animation. if(brain_death || brainmob?.health <= HEALTH_THRESHOLD_DEAD) //if the brain is fucked anyway, do nothing - to_chat(user, "[src] is far too damaged, there's nothing else we can do for it!") + to_chat(user, span_warning("[src] is far too damaged, there's nothing else we can do for it!")) return if(!O.reagents.has_reagent(/datum/reagent/medicine/mannitol, 10)) - to_chat(user, "There's not enough mannitol in [O] to restore [src]!") + to_chat(user, span_warning("There's not enough mannitol in [O] to restore [src]!")) return - user.visible_message("[user] starts to pour the contents of [O] onto [src].", "I start to slowly pour the contents of [O] onto [src].") + user.visible_message(span_notice("[user] starts to pour the contents of [O] onto [src]."), span_notice("I start to slowly pour the contents of [O] onto [src].")) if(!do_after(user, 60, TRUE, src)) - to_chat(user, "I failed to pour [O] onto [src]!") + to_chat(user, span_warning("I failed to pour [O] onto [src]!")) return - user.visible_message("[user] pours the contents of [O] onto [src], causing it to reform its original shape and turn a slightly brighter shade of pink.", "I pour the contents of [O] onto [src], causing it to reform its original shape and turn a slightly brighter shade of pink.") + user.visible_message(span_notice("[user] pours the contents of [O] onto [src], causing it to reform its original shape and turn a slightly brighter shade of pink."), span_notice("I pour the contents of [O] onto [src], causing it to reform its original shape and turn a slightly brighter shade of pink.")) setOrganDamage(damage - (0.05 * maxHealth)) //heals a small amount, and by using "setorgandamage", we clear the failing variable if that was up O.reagents.clear_reagents() return @@ -135,27 +135,27 @@ . = ..() if(suicided) - . += "It's started turning slightly grey. They must not have been able to handle the stress of it all." + . += span_info("It's started turning slightly grey. They must not have been able to handle the stress of it all.") else if(brainmob) if(brainmob.get_ghost(FALSE, TRUE)) if(brain_death || brainmob.health <= HEALTH_THRESHOLD_DEAD) - . += "It's lifeless and severely damaged." + . += span_info("It's lifeless and severely damaged.") else if(organ_flags & ORGAN_FAILING) - . += "It seems to still have a bit of energy within it, but it's rather damaged... You may be able to restore it with some mannitol." + . += span_info("It seems to still have a bit of energy within it, but it's rather damaged... You may be able to restore it with some mannitol.") else - . += "I can feel the small spark of life still left in this one." + . += span_info("I can feel the small spark of life still left in this one.") else if(organ_flags & ORGAN_FAILING) - . += "It seems particularly lifeless and is rather damaged... You may be able to restore it with some mannitol incase it becomes functional again later." + . += span_info("It seems particularly lifeless and is rather damaged... You may be able to restore it with some mannitol incase it becomes functional again later.") else - . += "This one seems particularly lifeless. Perhaps it will regain some of its luster later." + . += span_info("This one seems particularly lifeless. Perhaps it will regain some of its luster later.") else if(decoy_override) if(organ_flags & ORGAN_FAILING) - . += "It seems particularly lifeless and is rather damaged... You may be able to restore it with some mannitol incase it becomes functional again later." + . += span_info("It seems particularly lifeless and is rather damaged... You may be able to restore it with some mannitol incase it becomes functional again later.") else - . += "This one seems particularly lifeless. Perhaps it will regain some of its luster later." + . += span_info("This one seems particularly lifeless. Perhaps it will regain some of its luster later.") else - . += "This one is completely devoid of life." + . += span_info("This one is completely devoid of life.") /obj/item/organ/brain/attack(mob/living/carbon/C, mob/user) if(!istype(C)) @@ -169,7 +169,7 @@ var/target_has_brain = C.getorgan(/obj/item/organ/brain) if(!target_has_brain && C.is_eyes_covered()) - to_chat(user, "You're going to need to remove [C.p_their()] head cover first!") + to_chat(user, span_warning("You're going to need to remove [C.p_their()] head cover first!")) return //since these people will be dead M != usr @@ -181,14 +181,14 @@ if(C == user) msg = "[user] inserts [src] into [user.p_their()] head!" - C.visible_message("[msg]", - "[msg]") + C.visible_message(span_danger("[msg]"), + span_danger("[msg]")) if(C != user) - to_chat(C, "[user] inserts [src] into your head.") - to_chat(user, "I insert [src] into [C]'s head.") + to_chat(C, span_notice("[user] inserts [src] into your head.")) + to_chat(user, span_notice("I insert [src] into [C]'s head.")) else - to_chat(user, "I insert [src] into your head." ) + to_chat(user, span_notice("I insert [src] into your head.") ) Insert(C) else @@ -202,7 +202,7 @@ /obj/item/organ/brain/on_life() if(damage >= BRAIN_DAMAGE_DEATH) //rip - to_chat(owner, "The last spark of life in your brain fizzles out...") + to_chat(owner, span_danger("The last spark of life in your brain fizzles out...")) owner.death() brain_death = TRUE @@ -226,11 +226,11 @@ if(owner.stat < UNCONSCIOUS) //conscious or soft-crit var/brain_message if(prev_damage < BRAIN_DAMAGE_MILD && damage >= BRAIN_DAMAGE_MILD) - brain_message = "I feel lightheaded." + brain_message = span_warning("I feel lightheaded.") else if(prev_damage < BRAIN_DAMAGE_SEVERE && damage >= BRAIN_DAMAGE_SEVERE) - brain_message = "I feel less in control of your thoughts." + brain_message = span_warning("I feel less in control of your thoughts.") else if(prev_damage < (BRAIN_DAMAGE_DEATH - 20) && damage >= (BRAIN_DAMAGE_DEATH - 20)) - brain_message = "I can feel your mind flickering on and off..." + brain_message = span_warning("I can feel your mind flickering on and off...") if(.) . += "\n[brain_message]" diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm index 4b5deee17..dc5dc6288 100644 --- a/code/modules/surgery/organs/ears.dm +++ b/code/modules/surgery/organs/ears.dm @@ -10,10 +10,10 @@ healing_factor = STANDARD_ORGAN_HEALING decay_factor = STANDARD_ORGAN_DECAY - low_threshold_passed = "My ears begin to resonate with an internal ring sometimes." - now_failing = "I are unable to hear at all!" - now_fixed = "Noise slowly begins filling my ears once more." - low_threshold_cleared = "The ringing in my ears has died down." + low_threshold_passed = span_info("My ears begin to resonate with an internal ring sometimes.") + now_failing = span_warning("I are unable to hear at all!") + now_fixed = span_info("Noise slowly begins filling my ears once more.") + low_threshold_cleared = span_info("The ringing in my ears has died down.") // `deaf` measures "ticks" of deafness. While > 0, the person is unable // to hear anything. @@ -48,7 +48,7 @@ if(prob(damage / 20) && (damage > low_threshold)) adjustEarDamage(0, 4) SEND_SOUND(C, sound('sound/blank.ogg')) - to_chat(C, "The ringing in my ears grows louder, blocking out any external noises for a moment.") + to_chat(C, span_warning("The ringing in my ears grows louder, blocking out any external noises for a moment.")) else if((organ_flags & ORGAN_FAILING) && (deaf == 0)) deaf = 1 //stop being not deaf you deaf idiot @@ -125,13 +125,13 @@ /obj/item/organ/ears/penguin/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) . = ..() if(istype(H)) - to_chat(H, "I suddenly feel like you've lost my balance.") + to_chat(H, span_notice("I suddenly feel like you've lost my balance.")) waddle = H.AddComponent(/datum/component/waddling) /obj/item/organ/ears/penguin/Remove(mob/living/carbon/human/H, special = 0) . = ..() if(istype(H)) - to_chat(H, "My sense of balance comes back to you.") + to_chat(H, span_notice("My sense of balance comes back to you.")) QDEL_NULL(waddle) /obj/item/organ/ears/bronze diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 1cad02e25..84527dd0b 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -12,12 +12,12 @@ high_threshold = 0.3 * STANDARD_ORGAN_THRESHOLD //threshold at 30 low_threshold = 0.2 * STANDARD_ORGAN_THRESHOLD //threshold at 20 - low_threshold_passed = "Distant objects become somewhat less tangible." - high_threshold_passed = "Everything starts to look a lot less clear." - now_failing = "Darkness envelopes you, as my eyes go blind!" - now_fixed = "Color and shapes are once again perceivable." - high_threshold_cleared = "My vision functions passably once more." - low_threshold_cleared = "My vision is cleared of any ailment." + low_threshold_passed = span_info("Distant objects become somewhat less tangible.") + high_threshold_passed = span_info("Everything starts to look a lot less clear.") + now_failing = span_warning("Darkness envelopes you, as my eyes go blind!") + now_fixed = span_info("Color and shapes are once again perceivable.") + high_threshold_cleared = span_info("My vision functions passably once more.") + low_threshold_cleared = span_info("My vision is cleared of any ailment.") var/sight_flags = 0 var/see_in_dark = 8 @@ -175,7 +175,7 @@ return if(prob(10 * severity)) return - to_chat(owner, "Static obfuscates my vision!") + to_chat(owner, span_warning("Static obfuscates my vision!")) owner.flash_act(visual = 1) /obj/item/organ/eyes/robotic/xray @@ -333,14 +333,14 @@ /obj/item/organ/eyes/robotic/glow/proc/activate(silent = FALSE) start_visuals() if(!silent) - to_chat(owner, "My [src] clicks and makes a whining noise, before shooting out a beam of light!") + to_chat(owner, span_warning("My [src] clicks and makes a whining noise, before shooting out a beam of light!")) active = TRUE cycle_mob_overlay() /obj/item/organ/eyes/robotic/glow/proc/deactivate(silent = FALSE) clear_visuals() if(!silent) - to_chat(owner, "My [src] shuts off!") + to_chat(owner, span_warning("My [src] shuts off!")) active = FALSE remove_mob_overlay() diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 63d9fc6da..6cfc16d33 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -8,10 +8,10 @@ healing_factor = STANDARD_ORGAN_HEALING decay_factor = 5 * STANDARD_ORGAN_DECAY //designed to fail about 5 minutes after death - low_threshold_passed = "Prickles of pain appear then die out from within my chest..." - high_threshold_passed = "Something inside my chest hurts, and the pain isn't subsiding. You notice myself breathing far faster than before." - now_fixed = "My heart begins to beat again." - high_threshold_cleared = "The pain in my chest has died down, and my breathing becomes more relaxed." + low_threshold_passed = span_info("Prickles of pain appear then die out from within my chest...") + high_threshold_passed = span_warning("Something inside my chest hurts, and the pain isn't subsiding. You notice myself breathing far faster than before.") + now_fixed = span_info("My heart begins to beat again.") + high_threshold_cleared = span_info("The pain in my chest has died down, and my breathing becomes more relaxed.") // Heart attack code is in code/modules/mob/living/carbon/human/life.dm var/beating = 1 @@ -58,7 +58,7 @@ ..() if(!beating) user.visible_message("[user] squeezes [src] to \ - make it beat again!","I squeeze [src] to make it beat again!") + make it beat again!",span_notice("I squeeze [src] to make it beat again!")) Restart() addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 80) @@ -101,7 +101,7 @@ if(H.health <= H.crit_threshold && beat != BEAT_SLOW) beat = BEAT_SLOW H.playsound_local(get_turf(H), slowbeat,40,0, channel = CHANNEL_HEARTBEAT) -// to_chat(owner, "I feel my heart slow down...") +// to_chat(owner, span_notice("I feel my heart slow down...")) if(beat == BEAT_SLOW && H.health > H.crit_threshold) H.stop_sound_channel(CHANNEL_HEARTBEAT) beat = BEAT_NONE @@ -116,8 +116,8 @@ if(organ_flags & ORGAN_FAILING) //heart broke, stopped beating, death imminent if(owner.stat == CONSCIOUS) - owner.visible_message("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!", \ - "I feel a terrible pain in my chest, as if my heart has stopped!") + owner.visible_message(span_danger("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!"), \ + span_danger("I feel a terrible pain in my chest, as if my heart has stopped!")) owner.set_heartattack(TRUE) failed = TRUE @@ -153,7 +153,7 @@ var/mob/living/carbon/human/H = owner if(H.dna && !(NOBLOOD in H.dna.species.species_traits)) H.blood_volume = max(H.blood_volume - blood_loss, 0) - to_chat(H, "I have to keep pumping my blood!") + to_chat(H, span_danger("I have to keep pumping my blood!")) if(add_colour) H.add_client_colour(/datum/client_colour/cursed_heart_blood) //bloody screen so real add_colour = FALSE @@ -163,7 +163,7 @@ /obj/item/organ/heart/cursed/Insert(mob/living/carbon/M, special = 0) ..() if(owner) - to_chat(owner, "My heart has been replaced with a cursed one, you have to pump this one manually otherwise you'll die!") + to_chat(owner, span_danger("My heart has been replaced with a cursed one, you have to pump this one manually otherwise you'll die!")) /obj/item/organ/heart/cursed/Remove(mob/living/carbon/M, special = 0) ..() @@ -179,12 +179,12 @@ var/obj/item/organ/heart/cursed/cursed_heart = target if(world.time < (cursed_heart.last_pump + (cursed_heart.pump_delay-10))) //no spam - to_chat(owner, "Too soon!") + to_chat(owner, span_danger("Too soon!")) return cursed_heart.last_pump = world.time playsound(owner,'sound/blank.ogg',40,TRUE) - to_chat(owner, "My heart beats.") + to_chat(owner, span_notice("My heart beats.")) var/mob/living/carbon/human/H = owner if(istype(H)) @@ -249,7 +249,7 @@ . = ..() if(owner.health < 5 && world.time > min_next_adrenaline) min_next_adrenaline = world.time + rand(250, 600) //anywhere from 4.5 to 10 minutes - to_chat(owner, "I feel myself dying, but you refuse to give up!") + to_chat(owner, span_danger("I feel myself dying, but you refuse to give up!")) owner.heal_overall_damage(15, 15, 0, BODYPART_ORGANIC) if(owner.reagents.get_reagent_amount(/datum/reagent/medicine/ephedrine) < 20) owner.reagents.add_reagent(/datum/reagent/medicine/ephedrine, 10) diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index c58ee446a..4c878e421 100644 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -44,7 +44,7 @@ C.reagents.metabolize(C, can_overdose=TRUE) if(provide_pain_message && damage > 10 && prob(damage/3))//the higher the damage the higher the probability - to_chat(C, "I feel a dull pain in my abdomen.") + to_chat(C, span_warning("I feel a dull pain in my abdomen.")) else //for when our liver's failing C.liver_failure() diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 7079be2a6..54720367f 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -11,9 +11,9 @@ healing_factor = STANDARD_ORGAN_HEALING decay_factor = STANDARD_ORGAN_DECAY - high_threshold_passed = "I feel some sort of constriction around my chest as my breathing becomes shallow and rapid." - now_fixed = "My lungs seem to once again be able to hold air." - high_threshold_cleared = "The constriction around my chest loosens as my breathing calms down." + high_threshold_passed = span_warning("I feel some sort of constriction around my chest as my breathing becomes shallow and rapid.") + now_fixed = span_warning("My lungs seem to once again be able to hold air.") + high_threshold_cleared = span_info("The constriction around my chest loosens as my breathing calms down.") //Breath damage @@ -269,12 +269,12 @@ // Nitryl var/nitryl_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/nitryl][MOLES]) if (prob(nitryl_pp)) - to_chat(H, "My mouth feels like it's burning!") + to_chat(H, span_alert("My mouth feels like it's burning!")) if (nitryl_pp >40) H.emote("breathgasp") H.adjustFireLoss(10) if (prob(nitryl_pp/2)) - to_chat(H, "My throat closes up!") + to_chat(H, span_alert("My throat closes up!")) H.silent = max(H.silent, 3) else H.adjustFireLoss(nitryl_pp/4) @@ -308,22 +308,22 @@ // At lower pp, give out a little warning SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "smell") if(prob(5)) - to_chat(owner, "There is an unpleasant smell in the air.") + to_chat(owner, span_notice("There is an unpleasant smell in the air.")) if(5 to 15) //At somewhat higher pp, warning becomes more obvious if(prob(15)) - to_chat(owner, "I smell something horribly decayed inside this room.") + to_chat(owner, span_warning("I smell something horribly decayed inside this room.")) SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/bad_smell) if(15 to 30) //Small chance to vomit. By now, people have internals on anyway if(prob(5)) - to_chat(owner, "The stench of rotting carcasses is unbearable!") + to_chat(owner, span_warning("The stench of rotting carcasses is unbearable!")) SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/nauseating_stench) owner.vomit() if(30 to INFINITY) //Higher chance to vomit. Let the horror start if(prob(15)) - to_chat(owner, "The stench of rotting carcasses is unbearable!") + to_chat(owner, span_warning("The stench of rotting carcasses is unbearable!")) SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/nauseating_stench) owner.vomit() else @@ -374,7 +374,7 @@ H.apply_damage_type(cold_level_1_damage*cold_modifier, cold_damage_type) if(breath_temperature < cold_level_1_threshold) if(prob(20)) - to_chat(H, "I feel [cold_message] in my [name]!") + to_chat(H, span_warning("I feel [cold_message] in my [name]!")) if(!HAS_TRAIT(H, TRAIT_RESISTHEAT)) // HEAT DAMAGE var/heat_modifier = H.dna.species.heatmod @@ -386,14 +386,14 @@ H.apply_damage_type(heat_level_3_damage*heat_modifier, heat_damage_type) if(breath_temperature > heat_level_1_threshold) if(prob(20)) - to_chat(H, "I feel [hot_message] in my [name]!") + to_chat(H, span_warning("I feel [hot_message] in my [name]!")) /obj/item/organ/lungs/on_life() ..() if((!failed) && ((organ_flags & ORGAN_FAILING))) if(owner.stat == CONSCIOUS) - owner.visible_message("[owner] grabs [owner.p_their()] throat, struggling for breath!", \ - "I suddenly feel like you can't breathe!") + owner.visible_message(span_danger("[owner] grabs [owner.p_their()] throat, struggling for breath!"), \ + span_danger("I suddenly feel like you can't breathe!")) failed = TRUE else if(!(organ_flags & ORGAN_FAILING)) failed = FALSE diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 647095917..2c83ac292 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -88,12 +88,12 @@ . = ..() if(organ_flags & ORGAN_FAILING) if(status == ORGAN_ROBOTIC) - . += "[src] seems to be broken!" + . += span_warning("[src] seems to be broken!") return - . += "[src] has decayed for too long, and has turned a sickly color! It doesn't look like it will work anymore!" + . += span_warning("[src] has decayed for too long, and has turned a sickly color! It doesn't look like it will work anymore!") return if(damage > high_threshold) - . += "[src] is starting to look discolored." + . += span_warning("[src] is starting to look discolored.") /obj/item/organ/proc/prepare_eat(mob/living/carbon/human/user) diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index 85bad4c1c..6204f884f 100644 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -10,10 +10,10 @@ healing_factor = STANDARD_ORGAN_HEALING decay_factor = STANDARD_ORGAN_DECAY - low_threshold_passed = "My stomach flashes with pain before subsiding. Food doesn't seem like a good idea right now." - high_threshold_passed = "My stomach flares up with constant pain- you can hardly stomach the idea of food right now!" - high_threshold_cleared = "The pain in my stomach dies down for now, but food still seems unappealing." - low_threshold_cleared = "The last bouts of pain in my stomach have died out." + low_threshold_passed = span_info("My stomach flashes with pain before subsiding. Food doesn't seem like a good idea right now.") + high_threshold_passed = span_warning("My stomach flares up with constant pain- you can hardly stomach the idea of food right now!") + high_threshold_cleared = span_info("The pain in my stomach dies down for now, but food still seems unappealing.") + low_threshold_cleared = span_info("The last bouts of pain in my stomach have died out.") var/disgust_metabolism = 1 @@ -35,12 +35,12 @@ if(Nutri) if(prob((damage/40) * Nutri.volume * Nutri.volume)) H.vomit(damage) - to_chat(H, "My stomach reels in pain as you're incapable of holding down all that food!") + to_chat(H, span_warning("My stomach reels in pain as you're incapable of holding down all that food!")) else if(Nutri && damage > high_threshold) if(prob((damage/10) * Nutri.volume * Nutri.volume)) H.vomit(damage) - to_chat(H, "My stomach reels in pain as you're incapable of holding down all that food!") + to_chat(H, span_warning("My stomach reels in pain as you're incapable of holding down all that food!")) /obj/item/organ/stomach/proc/handle_disgust(mob/living/carbon/human/H) if(H.disgust) @@ -50,7 +50,7 @@ H.stuttering += 1 H.confused += 2 if(prob(10) && !H.stat) - to_chat(H, "I feel kind of iffy...") + to_chat(H, span_warning("I feel kind of iffy...")) H.jitteriness = max(H.jitteriness - 3, 0) if(H.disgust >= DISGUST_LEVEL_VERYGROSS) if(prob(pukeprob)) //iT hAndLeS mOrE ThaN PukInG @@ -121,7 +121,7 @@ if(flags & SHOCK_ILLUSION) return adjust_charge(shock_damage * siemens_coeff * 2) - to_chat(owner, "I absorb some of the shock into my body!") + to_chat(owner, span_notice("I absorb some of the shock into my body!")) /obj/item/organ/stomach/ethereal/proc/adjust_charge(amount) crystal_charge = CLAMP(crystal_charge + amount, ETHEREAL_CHARGE_NONE, ETHEREAL_CHARGE_FULL) diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 7cfc72110..12d369294 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -97,26 +97,26 @@ return if(T.mothership == mothership) - to_chat(H, "[src] is already attuned to the same channel as my own.") + to_chat(H, span_notice("[src] is already attuned to the same channel as my own.")) - H.visible_message("[H] holds [src] in their hands, and concentrates for a moment.", "I attempt to modify the attunation of [src].") + H.visible_message(span_notice("[H] holds [src] in their hands, and concentrates for a moment."), span_notice("I attempt to modify the attunation of [src].")) if(do_after(H, delay=15, target=src)) - to_chat(H, "I attune [src] to my own channel.") + to_chat(H, span_notice("I attune [src] to my own channel.")) mothership = T.mothership /obj/item/organ/tongue/abductor/examine(mob/M) . = ..() if(HAS_TRAIT(M, TRAIT_ABDUCTOR_TRAINING) || HAS_TRAIT(M.mind, TRAIT_ABDUCTOR_TRAINING) || isobserver(M)) if(!mothership) - . += "It is not attuned to a specific mothership." + . += span_notice("It is not attuned to a specific mothership.") else - . += "It is attuned to [mothership]." + . += span_notice("It is attuned to [mothership].") /obj/item/organ/tongue/abductor/handle_speech(datum/source, list/speech_args) //Hacks var/message = speech_args[SPEECH_MESSAGE] var/mob/living/carbon/human/user = usr - var/rendered = "[user.real_name]: [message]" + var/rendered = span_abductor("[user.real_name]: [message]") user.log_talk(message, LOG_SAY, tag="abductor") for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) var/obj/item/organ/tongue/abductor/T = H.getorganslot(ORGAN_SLOT_TONGUE) diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 9405e2b5b..b2ef87fad 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -44,7 +44,7 @@ owner.say(".x[message]") /obj/item/organ/vocal_cords/adamantine/handle_speech(message) - var/msg = "[owner.real_name] resonates, \"[message]\"" + var/msg = span_resonate("[owner.real_name] resonates, \"[message]\"") for(var/m in GLOB.player_list) if(iscarbon(m)) var/mob/living/carbon/C = m @@ -89,7 +89,7 @@ . = ..() if(!IsAvailable()) if(world.time < cords.next_command) - to_chat(owner, "I must wait [DisplayTimeText(cords.next_command - world.time)] before Speaking again.") + to_chat(owner, span_notice("I must wait [DisplayTimeText(cords.next_command - world.time)] before Speaking again.")) return var/command = input(owner, "Speak with the Voice of God", "Command") if(QDELETED(src) || QDELETED(owner)) @@ -100,12 +100,12 @@ /obj/item/organ/vocal_cords/colossus/can_speak_with() if(world.time < next_command) - to_chat(owner, "I must wait [DisplayTimeText(next_command - world.time)] before Speaking again.") + to_chat(owner, span_notice("I must wait [DisplayTimeText(next_command - world.time)] before Speaking again.")) return FALSE if(!owner) return FALSE if(!owner.can_speak()) - to_chat(owner, "I are unable to speak!") + to_chat(owner, span_warning("I are unable to speak!")) return FALSE return TRUE diff --git a/code/modules/surgery/surgeries/amputation.dm b/code/modules/surgery/surgeries/amputation.dm index a0fdb3b9b..38485eacf 100644 --- a/code/modules/surgery/surgeries/amputation.dm +++ b/code/modules/surgery/surgeries/amputation.dm @@ -38,15 +38,15 @@ skill_median = SKILL_LEVEL_JOURNEYMAN /datum/surgery_step/amputate/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I begin to sever [target]'s [parse_zone(target_zone)]...", - "[user] begins to sever [target]'s [parse_zone(target_zone)]!", - "[user] begins to sever [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("I begin to sever [target]'s [parse_zone(target_zone)]..."), + span_notice("[user] begins to sever [target]'s [parse_zone(target_zone)]!"), + span_notice("[user] begins to sever [target]'s [parse_zone(target_zone)]!")) return TRUE /datum/surgery_step/amputate/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I sever [target]'s [parse_zone(target_zone)].", - "[user] severs [target]'s [parse_zone(target_zone)]!", - "[user] severs [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("I sever [target]'s [parse_zone(target_zone)]."), + span_notice("[user] severs [target]'s [parse_zone(target_zone)]!"), + span_notice("[user] severs [target]'s [parse_zone(target_zone)]!")) var/obj/item/bodypart/target_limb = target.get_bodypart(check_zone(target_zone)) target_limb?.drop_limb() return TRUE diff --git a/code/modules/surgery/surgeries/dislocation.dm b/code/modules/surgery/surgeries/dislocation.dm index 8b1b99f8e..8d1b17ee4 100644 --- a/code/modules/surgery/surgeries/dislocation.dm +++ b/code/modules/surgery/surgeries/dislocation.dm @@ -44,15 +44,15 @@ return bodypart.has_wound(/datum/wound/dislocation) /datum/surgery_step/relocate_bone/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I begin to set the bone in [target]'s [parse_zone(target_zone)]...", - "[user] begins to relocate the bone in [target]'s [parse_zone(target_zone)].", - "[user] begins to relocate the bone in [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I begin to set the bone in [target]'s [parse_zone(target_zone)]..."), + span_notice("[user] begins to relocate the bone in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] begins to relocate the bone in [target]'s [parse_zone(target_zone)].")) return TRUE /datum/surgery_step/relocate_bone/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I successfully relocate the bone in [target]'s [parse_zone(target_zone)].", - "[user] successfully relocate the bone in [target]'s [parse_zone(target_zone)]!", - "[user] successfully relocate the bone in [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("I successfully relocate the bone in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] successfully relocate the bone in [target]'s [parse_zone(target_zone)]!"), + span_notice("[user] successfully relocate the bone in [target]'s [parse_zone(target_zone)]!")) var/obj/item/bodypart/bodypart = target.get_bodypart(check_zone(target_zone)) if(bodypart) for(var/datum/wound/dislocation/bone in bodypart.wounds) diff --git a/code/modules/surgery/surgeries/fracture.dm b/code/modules/surgery/surgeries/fracture.dm index ce37eb34d..d95edda3c 100644 --- a/code/modules/surgery/surgeries/fracture.dm +++ b/code/modules/surgery/surgeries/fracture.dm @@ -43,15 +43,15 @@ return bodypart.has_wound(/datum/wound/fracture) /datum/surgery_step/set_bone/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I begin to set the bone in [target]'s [parse_zone(target_zone)]...", - "[user] begins to set the bone in [target]'s [parse_zone(target_zone)].", - "[user] begins to set the bone in [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I begin to set the bone in [target]'s [parse_zone(target_zone)]..."), + span_notice("[user] begins to set the bone in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] begins to set the bone in [target]'s [parse_zone(target_zone)].")) return TRUE /datum/surgery_step/set_bone/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I successfully set the bone in [target]'s [parse_zone(target_zone)].", - "[user] successfully sets the bone in [target]'s [parse_zone(target_zone)]!", - "[user] successfully sets the bone in [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("I successfully set the bone in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] successfully sets the bone in [target]'s [parse_zone(target_zone)]!"), + span_notice("[user] successfully sets the bone in [target]'s [parse_zone(target_zone)]!")) var/obj/item/bodypart/bodypart = target.get_bodypart(check_zone(target_zone)) if(bodypart) for(var/datum/wound/fracture/bone in bodypart.wounds) diff --git a/code/modules/surgery/surgeries/healing.dm b/code/modules/surgery/surgeries/healing.dm index 3a8d5bc5f..c1c97686f 100644 --- a/code/modules/surgery/surgeries/healing.dm +++ b/code/modules/surgery/surgeries/healing.dm @@ -54,9 +54,9 @@ woundtype = "bruises" else //why are you trying to 0,0...? woundtype = "burns" - display_results(user, target, "I attempt to patch some of [target]'s [woundtype].", - "[user] attempts to patch some of [target]'s [woundtype].", - "[user] attempts to patch some of [target]'s [woundtype].") + display_results(user, target, span_notice("I attempt to patch some of [target]'s [woundtype]."), + span_notice("[user] attempts to patch some of [target]'s [woundtype]."), + span_notice("[user] attempts to patch some of [target]'s [woundtype].")) return TRUE /datum/surgery_step/heal/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) @@ -77,15 +77,15 @@ umsg += " as best as you can while they have clothing on" tmsg += " as best as they can while [target] has clothing on" target.heal_bodypart_damage(urhealedamt_brute,urhealedamt_burn) - display_results(user, target, "[umsg].", + display_results(user, target, span_notice("[umsg]."), "[tmsg].", "[tmsg].") return TRUE /datum/surgery_step/heal/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent, success_prob) - display_results(user, target, "I screwed up!", - "[user] screws up!", - "[user] fixes some of [target]'s wounds.", TRUE) + display_results(user, target, span_warning("I screwed up!"), + span_warning("[user] screws up!"), + span_notice("[user] fixes some of [target]'s wounds."), TRUE) var/urdamageamt_burn = brutehealing * 0.8 var/urdamageamt_brute = burnhealing * 0.8 if(missinghpbonus) @@ -165,8 +165,8 @@ replaced_by = null /datum/surgery_step/heal/combo/upgraded/femto/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent, success_prob) - display_results(user, target, "I screwed up!", - "[user] screws up!", - "[user] fixes some of [target]'s wounds.", TRUE) + display_results(user, target, span_warning("I screwed up!"), + span_warning("[user] screws up!"), + span_notice("[user] fixes some of [target]'s wounds."), TRUE) target.take_bodypart_damage(5,5) return TRUE diff --git a/code/modules/surgery/surgeries/limb_replacement.dm b/code/modules/surgery/surgeries/limb_replacement.dm index 790738cc2..d738ba6d1 100644 --- a/code/modules/surgery/surgeries/limb_replacement.dm +++ b/code/modules/surgery/surgeries/limb_replacement.dm @@ -25,19 +25,19 @@ tool = tool.contents[1] var/obj/item/bodypart/aug = tool if(!istype(aug) || aug.status != BODYPART_ROBOTIC) - to_chat(user, "That's not an augment, silly!") + to_chat(user, span_warning("That's not an augment, silly!")) return FALSE if(aug.body_zone != target_zone) - to_chat(user, "[tool] isn't the right type for [parse_zone(target_zone)].") + to_chat(user, span_warning("[tool] isn't the right type for [parse_zone(target_zone)].")) return FALSE var/obj/item/bodypart/existing = target.get_bodypart(check_zone(target_zone)) if(!existing) - user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", - "I look for [target]'s [parse_zone(user.zone_selected)]...") + user.visible_message(span_notice("[user] looks for [target]'s [parse_zone(user.zone_selected)]."), + span_notice("I look for [target]'s [parse_zone(user.zone_selected)]...")) return FALSE - display_results(user, target, "I begin to augment [target]'s [parse_zone(user.zone_selected)]...", - "[user] begins to augment [target]'s [parse_zone(user.zone_selected)] with [aug].", - "[user] begins to augment [target]'s [parse_zone(user.zone_selected)].") + display_results(user, target, span_notice("I begin to augment [target]'s [parse_zone(user.zone_selected)]..."), + span_notice("[user] begins to augment [target]'s [parse_zone(user.zone_selected)] with [aug]."), + span_notice("[user] begins to augment [target]'s [parse_zone(user.zone_selected)].")) return TRUE /datum/surgery_step/replace_limb/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -52,10 +52,10 @@ if(istype(bodypart) && user.temporarilyRemoveItemFromInventory(bodypart)) if(bodypart.replace_limb(target, special = TRUE) && bodypart.attach_wound) bodypart.add_wound(bodypart.attach_wound) - display_results(user, target, "I successfully augment [target]'s [parse_zone(target_zone)].", - "[user] successfully augments [target]'s [parse_zone(target_zone)] with [bodypart]!", - "[user] successfully augments [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("I successfully augment [target]'s [parse_zone(target_zone)]."), + span_notice("[user] successfully augments [target]'s [parse_zone(target_zone)] with [bodypart]!"), + span_notice("[user] successfully augments [target]'s [parse_zone(target_zone)]!")) log_combat(user, target, "augmented", addition="by giving him new [parse_zone(target_zone)] INTENT: [uppertext(user.a_intent?.name)]") else - to_chat(user, "[target] has no organic [parse_zone(target_zone)] there!") + to_chat(user, span_warning("[target] has no organic [parse_zone(target_zone)] there!")) return TRUE diff --git a/code/modules/surgery/surgeries/organ_manipulation.dm b/code/modules/surgery/surgeries/organ_manipulation.dm index f0b596703..5f6607273 100644 --- a/code/modules/surgery/surgeries/organ_manipulation.dm +++ b/code/modules/surgery/surgeries/organ_manipulation.dm @@ -73,35 +73,35 @@ /datum/surgery_step/manipulate_organs/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) if(istype(tool, /obj/item/reagent_containers/food/snacks/organ)) - to_chat(user, "[tool] was bitten by someone! It's too damaged to use!") + to_chat(user, span_warning("[tool] was bitten by someone! It's too damaged to use!")) return FALSE if(istype(tool, /obj/item/organ_storage)) if(!length(tool.contents)) - to_chat(user, "There is nothing inside [tool]!") + to_chat(user, span_warning("There is nothing inside [tool]!")) return FALSE tool = tool.contents[1] if(!isorgan(tool)) - to_chat(user, "I cannot put [tool] inside [target]'s [parse_zone(target_zone)]!") + to_chat(user, span_warning("I cannot put [tool] inside [target]'s [parse_zone(target_zone)]!")) return FALSE var/obj/item/organ/organ_tool = tool if(istype(organ_tool)) if(target_zone != organ_tool.zone) - to_chat(user, "[organ_tool] does not belong in [target]'s [parse_zone(target_zone)]!") + to_chat(user, span_warning("[organ_tool] does not belong in [target]'s [parse_zone(target_zone)]!")) return FALSE else if(target.getorganslot(organ_tool.slot)) - to_chat(user, "[target] already has [parse_organ_slot(organ_tool.slot)]!") + to_chat(user, span_warning("[target] already has [parse_organ_slot(organ_tool.slot)]!")) return FALSE user.select_organ_slot(organ_tool.slot) - display_results(user, target, "I begin to insert [tool] into [target]'s [parse_zone(target_zone)]...", - "[user] begins to insert [tool] into [target]'s [parse_zone(target_zone)].", - "[user] begins to insert something into [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I begin to insert [tool] into [target]'s [parse_zone(target_zone)]..."), + span_notice("[user] begins to insert [tool] into [target]'s [parse_zone(target_zone)]."), + span_notice("[user] begins to insert something into [target]'s [parse_zone(target_zone)].")) else var/list/organs = target.getorganszone(target_zone, subzones = FALSE) if(!length(organs)) - to_chat(user, "There are no removable organs in [target]'s [parse_zone(target_zone)]!") + to_chat(user, span_warning("There are no removable organs in [target]'s [parse_zone(target_zone)]!")) return FALSE for(var/obj/item/organ/found_organ as anything in organs) found_organ.on_find(user) @@ -116,9 +116,9 @@ return FALSE user.select_organ_slot(final_organ.slot) - display_results(user, target, "I begin to extract [final_organ] from [target]'s [parse_zone(target_zone)]...", - "[user] begins to extract [final_organ] from [target]'s [parse_zone(target_zone)].", - "[user] begins to extract something from [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I begin to extract [final_organ] from [target]'s [parse_zone(target_zone)]..."), + span_notice("[user] begins to extract [final_organ] from [target]'s [parse_zone(target_zone)]."), + span_notice("[user] begins to extract something from [target]'s [parse_zone(target_zone)].")) return TRUE @@ -134,19 +134,19 @@ var/obj/item/organ/organ_tool = tool if(istype(organ_tool) && user.temporarilyRemoveItemFromInventory(organ_tool)) organ_tool.Insert(target) - display_results(user, target, "I insert [tool] into [target]'s [parse_zone(target_zone)].", - "[user] inserts [tool] into [target]'s [parse_zone(target_zone)]!", - "[user] inserts something into [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("I insert [tool] into [target]'s [parse_zone(target_zone)]."), + span_notice("[user] inserts [tool] into [target]'s [parse_zone(target_zone)]!"), + span_notice("[user] inserts something into [target]'s [parse_zone(target_zone)]!")) return TRUE var/obj/item/organ/selected_organ = target.getorganslot(user.organ_slot_selected) if(QDELETED(selected_organ) || (selected_organ.owner != target)) - display_results(user, target, "I can't extract anything from [target]'s [parse_zone(target_zone)]!", - "[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!", - "[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_warning("I can't extract anything from [target]'s [parse_zone(target_zone)]!"), + span_notice("[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!"), + span_notice("[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!")) return FALSE - display_results(user, target, "I successfully extract [selected_organ] from [target]'s [parse_zone(target_zone)].", - "[user] successfully extracts [selected_organ] from [target]'s [parse_zone(target_zone)]!", - "[user] successfully extracts something from [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("I successfully extract [selected_organ] from [target]'s [parse_zone(target_zone)]."), + span_notice("[user] successfully extracts [selected_organ] from [target]'s [parse_zone(target_zone)]!"), + span_notice("[user] successfully extracts something from [target]'s [parse_zone(target_zone)]!")) log_combat(user, target, "surgically removed [selected_organ.name] from") selected_organ.Remove(target) selected_organ.forceMove(target.drop_location()) diff --git a/code/modules/surgery/surgeries/organic_steps.dm b/code/modules/surgery/surgeries/organic_steps.dm index af9a20ae8..74159ea88 100644 --- a/code/modules/surgery/surgeries/organic_steps.dm +++ b/code/modules/surgery/surgeries/organic_steps.dm @@ -15,14 +15,14 @@ skill_median = SKILL_LEVEL_APPRENTICE /datum/surgery_step/incise/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I begin to make an incision in [target]'s [parse_zone(target_zone)]...", - "[user] begins to make an incision in [target]'s [parse_zone(target_zone)].", - "[user] begins to make an incision in [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I begin to make an incision in [target]'s [parse_zone(target_zone)]..."), + span_notice("[user] begins to make an incision in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] begins to make an incision in [target]'s [parse_zone(target_zone)].")) return TRUE /datum/surgery_step/incise/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "Blood pools around the incision in [target]'s [parse_zone(target_zone)].", - "Blood pools around the incision in [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("Blood pools around the incision in [target]'s [parse_zone(target_zone)]."), + span_notice("Blood pools around the incision in [target]'s [parse_zone(target_zone)].")) var/obj/item/bodypart/gotten_part = target.get_bodypart(check_zone(target_zone)) if(gotten_part) gotten_part.add_wound(/datum/wound/slash/incision) @@ -41,15 +41,15 @@ skill_median = SKILL_LEVEL_JOURNEYMAN /datum/surgery_step/clamp/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I begin to clamp bleeders in [target]'s [parse_zone(target_zone)]...", - "[user] begins to clamp bleeders in [target]'s [parse_zone(target_zone)].", - "[user] begins to clamp bleeders in [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I begin to clamp bleeders in [target]'s [parse_zone(target_zone)]..."), + span_notice("[user] begins to clamp bleeders in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] begins to clamp bleeders in [target]'s [parse_zone(target_zone)].")) return TRUE /datum/surgery_step/clamp/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I clamp the bleeders in [target]'s [parse_zone(target_zone)].", - "[user] clamps the bleeders in [target]'s [parse_zone(target_zone)].", - "[user] clamps the bleeders in [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I clamp the bleeders in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] clamps the bleeders in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] clamps the bleeders in [target]'s [parse_zone(target_zone)].")) var/obj/item/bodypart/bodypart = target.get_bodypart(check_zone(target_zone)) bodypart?.add_embedded_object(tool, crit_message = FALSE) return TRUE @@ -68,15 +68,15 @@ skill_median = SKILL_LEVEL_JOURNEYMAN /datum/surgery_step/retract/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I begin to retract [target]'s [parse_zone(target_zone)]...", - "[user] begins to retract [target]'s [parse_zone(target_zone)].", - "[user] begins to retract [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I begin to retract [target]'s [parse_zone(target_zone)]..."), + span_notice("[user] begins to retract [target]'s [parse_zone(target_zone)]."), + span_notice("[user] begins to retract [target]'s [parse_zone(target_zone)].")) return TRUE /datum/surgery_step/retract/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I retract [target]'s [parse_zone(target_zone)].", - "[user] retract [target]'s [parse_zone(target_zone)].", - "[user] retract [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I retract [target]'s [parse_zone(target_zone)]."), + span_notice("[user] retract [target]'s [parse_zone(target_zone)]."), + span_notice("[user] retract [target]'s [parse_zone(target_zone)].")) var/obj/item/bodypart/bodypart = target.get_bodypart(check_zone(target_zone)) bodypart?.add_embedded_object(tool, crit_message = FALSE) return TRUE @@ -101,15 +101,15 @@ return length(bodypart.wounds) /datum/surgery_step/cauterize/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I begin to cauterize the wounds on [target]'s [parse_zone(target_zone)]...", - "[user] begins to cauterize the wounds on [target]'s [parse_zone(target_zone)].", - "[user] begins to cauterize the wounds on [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I begin to cauterize the wounds on [target]'s [parse_zone(target_zone)]..."), + span_notice("[user] begins to cauterize the wounds on [target]'s [parse_zone(target_zone)]."), + span_notice("[user] begins to cauterize the wounds on [target]'s [parse_zone(target_zone)].")) return TRUE /datum/surgery_step/cauterize/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I cauterize the wounds on [target]'s [parse_zone(target_zone)].", - "[user] cauterizes the wounds on [target]'s [parse_zone(target_zone)].", - "[user] cauterizes the wounds on [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I cauterize the wounds on [target]'s [parse_zone(target_zone)]."), + span_notice("[user] cauterizes the wounds on [target]'s [parse_zone(target_zone)]."), + span_notice("[user] cauterizes the wounds on [target]'s [parse_zone(target_zone)].")) var/obj/item/bodypart/bodypart = target.get_bodypart(check_zone(target_zone)) if(bodypart) for(var/datum/wound/bleeder in bodypart.wounds) @@ -148,15 +148,15 @@ skill_median = SKILL_LEVEL_EXPERT /datum/surgery_step/saw/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I begin to saw through the bone in [target]'s [parse_zone(target_zone)]...", - "[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)].", - "[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I begin to saw through the bone in [target]'s [parse_zone(target_zone)]..."), + span_notice("[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)].")) return TRUE /datum/surgery_step/saw/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I saw [target]'s [parse_zone(target_zone)] open.", - "[user] saws [target]'s [parse_zone(target_zone)] open!", - "[user] saws [target]'s [parse_zone(target_zone)] open!") + display_results(user, target, span_notice("I saw [target]'s [parse_zone(target_zone)] open."), + span_notice("[user] saws [target]'s [parse_zone(target_zone)] open!"), + span_notice("[user] saws [target]'s [parse_zone(target_zone)] open!")) var/obj/item/bodypart/bodypart = target.get_bodypart(check_zone(target_zone)) if(bodypart) var/fracture_type = /datum/wound/fracture @@ -188,15 +188,15 @@ skill_median = SKILL_LEVEL_EXPERT /datum/surgery_step/drill/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "I begin to drill into [target]'s [parse_zone(target_zone)]...", - "[user] begins to drill into [target]'s [parse_zone(target_zone)].", - "[user] begins to drill into [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I begin to drill into [target]'s [parse_zone(target_zone)]..."), + span_notice("[user] begins to drill into [target]'s [parse_zone(target_zone)]."), + span_notice("[user] begins to drill into [target]'s [parse_zone(target_zone)].")) return TRUE /datum/surgery_step/drill/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "I drill into [target]'s [parse_zone(target_zone)].", - "[user] drills into [target]'s [parse_zone(target_zone)]!", - "[user] drills into [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("I drill into [target]'s [parse_zone(target_zone)]."), + span_notice("[user] drills into [target]'s [parse_zone(target_zone)]!"), + span_notice("[user] drills into [target]'s [parse_zone(target_zone)]!")) var/obj/item/bodypart/bodypart = target.get_bodypart(check_zone(target_zone)) bodypart?.add_wound(/datum/wound/puncture/drilling) target.emote("scream") diff --git a/code/modules/surgery/surgeries/plastic_surgery.dm b/code/modules/surgery/surgeries/plastic_surgery.dm index 447503595..6de35a4fb 100644 --- a/code/modules/surgery/surgeries/plastic_surgery.dm +++ b/code/modules/surgery/surgeries/plastic_surgery.dm @@ -24,18 +24,18 @@ skill_median = SKILL_LEVEL_EXPERT /datum/surgery_step/reshape_face/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - user.visible_message("[user] begins to alter [target]'s appearance.", "I begin to alter [target]'s appearance...") - display_results(user, target, "I begin to alter [target]'s appearance...", - "[user] begins to alter [target]'s appearance.", - "[user] begins to make an incision in [target]'s face.") + user.visible_message(span_notice("[user] begins to alter [target]'s appearance."), span_notice("I begin to alter [target]'s appearance...")) + display_results(user, target, span_notice("I begin to alter [target]'s appearance..."), + span_notice("[user] begins to alter [target]'s appearance."), + span_notice("[user] begins to make an incision in [target]'s face.")) return TRUE /datum/surgery_step/reshape_face/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) var/obj/item/bodypart/bodypart = target.get_bodypart(check_zone(target_zone)) if(bodypart?.has_wound(/datum/wound/facial/disfigurement)) - display_results(user, target, "I successfully restore [target]'s appearance.", - "[user] successfully restores [target]'s appearance!", - "[user] finishes the operation on [target]'s face.") + display_results(user, target, span_notice("I successfully restore [target]'s appearance."), + span_notice("[user] successfully restores [target]'s appearance!"), + span_notice("[user] finishes the operation on [target]'s face.")) bodypart.remove_wound(/datum/wound/facial/disfigurement) else var/list/names = list("Custom...") @@ -57,18 +57,18 @@ return var/oldname = target.real_name target.real_name = chosen_name - display_results(user, target, "I alter [oldname]'s appearance completely, [target.p_they()] is now [target.real_name].", - "[user] alters [oldname]'s appearance completely, [target.p_they()] is now [target.real_name]!", - "[user] finishes the operation on [target]'s face.") + display_results(user, target, span_notice("I alter [oldname]'s appearance completely, [target.p_they()] is now [target.real_name]."), + span_notice("[user] alters [oldname]'s appearance completely, [target.p_they()] is now [target.real_name]!"), + span_notice("[user] finishes the operation on [target]'s face.")) if(ishuman(target)) var/mob/living/carbon/human/human_target = target human_target.sec_hud_set_ID() return TRUE /datum/surgery_step/reshape_face/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent, success_prob) - display_results(user, target, "I screw up, leaving [target]'s appearance disfigured!", - "[user] screws up, disfiguring [target]'s appearance!", - "[user] finishes the operation on [target]'s face.") + display_results(user, target, span_warning("I screw up, leaving [target]'s appearance disfigured!"), + span_notice("[user] screws up, disfiguring [target]'s appearance!"), + span_notice("[user] finishes the operation on [target]'s face.")) var/obj/item/bodypart/bodypart = target.get_bodypart(check_zone(target_zone)) bodypart?.add_wound(/datum/wound/facial/disfigurement) target.emote("scream") diff --git a/code/modules/surgery/surgeries/prosthetic_replacement.dm b/code/modules/surgery/surgeries/prosthetic_replacement.dm index 7824cc080..d80d23c4a 100644 --- a/code/modules/surgery/surgeries/prosthetic_replacement.dm +++ b/code/modules/surgery/surgeries/prosthetic_replacement.dm @@ -39,28 +39,28 @@ /datum/surgery_step/add_prosthetic/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) if(istype(tool, /obj/item/organ_storage)) if(!length(tool.contents)) - to_chat(user, "There is nothing inside [tool]!") + to_chat(user, span_warning("There is nothing inside [tool]!")) return FALSE tool = tool.contents[1] if(!isbodypart(tool)) - to_chat(user, "[tool] cannot be attached!") + to_chat(user, span_warning("[tool] cannot be attached!")) return FALSE var/obj/item/bodypart/bodypart = tool if(ismonkey(target) && bodypart.animal_origin != MONKEY_BODYPART) - to_chat(user, "[bodypart] doesn't match the patient's morphology.") + to_chat(user, span_warning("[bodypart] doesn't match the patient's morphology.")) return FALSE else if(bodypart.animal_origin) - to_chat(user, "[bodypart] doesn't match the patient's morphology.") + to_chat(user, span_warning("[bodypart] doesn't match the patient's morphology.")) return FALSE if(target_zone != bodypart.body_zone) //so we can't replace a leg with an arm, or a human arm with a monkey arm. - to_chat(user, "[tool] isn't the right type for [parse_zone(target_zone)].") + to_chat(user, span_warning("[tool] isn't the right type for [parse_zone(target_zone)].")) return FALSE - display_results(user, target, "I begin to replace [target]'s [parse_zone(target_zone)] with [tool]...", - "[user] begins to replace [target]'s [parse_zone(target_zone)] with [tool].", - "[user] begins to replace [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("I begin to replace [target]'s [parse_zone(target_zone)] with [tool]..."), + span_notice("[user] begins to replace [target]'s [parse_zone(target_zone)] with [tool]."), + span_notice("[user] begins to replace [target]'s [parse_zone(target_zone)].")) return TRUE /datum/surgery_step/add_prosthetic/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) @@ -75,7 +75,7 @@ var/obj/item/bodypart/bodypart = tool if(bodypart.attach_limb(target) && bodypart.attach_wound) bodypart.add_wound(bodypart.attach_wound) - display_results(user, target, "I succeed transplanting [target]'s [parse_zone(target_zone)].", - "[user] successfully transplants [target]'s [parse_zone(target_zone)] with [tool]!", - "[user] successfully transplants [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("I succeed transplanting [target]'s [parse_zone(target_zone)]."), + span_notice("[user] successfully transplants [target]'s [parse_zone(target_zone)] with [tool]!"), + span_notice("[user] successfully transplants [target]'s [parse_zone(target_zone)]!")) return TRUE diff --git a/code/modules/surgery/surgeries/remove_embedded_object.dm b/code/modules/surgery/surgeries/remove_embedded_object.dm index f7db96ec3..c2d5202dc 100644 --- a/code/modules/surgery/surgeries/remove_embedded_object.dm +++ b/code/modules/surgery/surgeries/remove_embedded_object.dm @@ -31,9 +31,9 @@ return length(target.get_embedded_objects()) /datum/surgery_step/remove_object/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) - display_results(user, target, "I look for objects embedded in [target]'s [parse_zone(user.zone_selected)]...", - "[user] looks for objects embedded in [target]'s [parse_zone(user.zone_selected)].", - "[user] looks for something in [target]'s [parse_zone(user.zone_selected)].") + display_results(user, target, span_notice("I look for objects embedded in [target]'s [parse_zone(user.zone_selected)]..."), + span_notice("[user] looks for objects embedded in [target]'s [parse_zone(user.zone_selected)]."), + span_notice("[user] looks for something in [target]'s [parse_zone(user.zone_selected)].")) return TRUE /datum/surgery_step/remove_object/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/intent/intent) @@ -49,11 +49,11 @@ var/s = (objects > 1 ? "s" : "") if(objects > 0) - display_results(user, target, "I successfully remove [objects] object[s] from [target]'s [bodypart].", - "[user] successfully removes [objects] object[s] from [target]'s [bodypart]!", - "[user] successfully removes [objects] object[s] from [target]'s [bodypart]!") + display_results(user, target, span_notice("I successfully remove [objects] object[s] from [target]'s [bodypart]."), + span_notice("[user] successfully removes [objects] object[s] from [target]'s [bodypart]!"), + span_notice("[user] successfully removes [objects] object[s] from [target]'s [bodypart]!")) else if(bodypart) - to_chat(user, "I find no objects embedded in [target]'s [bodypart]!") + to_chat(user, span_warning("I find no objects embedded in [target]'s [bodypart]!")) else - to_chat(user, "I find no objects embedded in [target]!") + to_chat(user, span_warning("I find no objects embedded in [target]!")) return TRUE diff --git a/code/modules/surgery/surgery_helpers.dm b/code/modules/surgery/surgery_helpers.dm index b056b9d82..df65de793 100644 --- a/code/modules/surgery/surgery_helpers.dm +++ b/code/modules/surgery/surgery_helpers.dm @@ -70,12 +70,12 @@ if(S.ignore_clothes || get_location_accessible(M, selected_zone)) var/datum/surgery/procedure = new S.type(M, selected_zone, affecting) - user.visible_message("[user] drapes [I] over [M]'s [parse_zone(selected_zone)] to prepare for surgery.", \ - "I drape [I] over [M]'s [parse_zone(selected_zone)] to prepare for \an [procedure.name].") + user.visible_message(span_notice("[user] drapes [I] over [M]'s [parse_zone(selected_zone)] to prepare for surgery."), \ + span_notice("I drape [I] over [M]'s [parse_zone(selected_zone)] to prepare for \an [procedure.name].")) log_combat(user, M, "operated on", null, "(OPERATION TYPE: [procedure.name]) (TARGET AREA: [selected_zone])") else - to_chat(user, "I need to expose [M]'s [parse_zone(selected_zone)] first!") + to_chat(user, span_warning("I need to expose [M]'s [parse_zone(selected_zone)] first!")) else if(!current_surgery.step_in_progress) attempt_cancel_surgery(current_surgery, I, M, user) @@ -86,8 +86,8 @@ var/selected_zone = user.zone_selected if(S.status == 1) M.surgeries -= S - user.visible_message("[user] removes [I] from [M]'s [parse_zone(selected_zone)].", \ - "I remove [I] from [M]'s [parse_zone(selected_zone)].") + user.visible_message(span_notice("[user] removes [I] from [M]'s [parse_zone(selected_zone)]."), \ + span_notice("I remove [I] from [M]'s [parse_zone(selected_zone)].")) qdel(S) else if(S.can_cancel) var/required_tool_type = TOOL_CAUTERY @@ -100,11 +100,11 @@ var/mob/living/carbon/human/H = M H.bleed_rate = max( (H.bleed_rate - 3), 0) M.surgeries -= S - user.visible_message("[user] closes [M]'s [parse_zone(selected_zone)] with [close_tool] and removes [I].", \ - "I close [M]'s [parse_zone(selected_zone)] with [close_tool] and remove [I].") + user.visible_message(span_notice("[user] closes [M]'s [parse_zone(selected_zone)] with [close_tool] and removes [I]."), \ + span_notice("I close [M]'s [parse_zone(selected_zone)] with [close_tool] and remove [I].")) qdel(S) else - to_chat(user, "I need to hold a [is_robotic ? "screwdriver" : "cautery"] in your inactive hand to stop [M]'s surgery!") + to_chat(user, span_warning("I need to hold a [is_robotic ? "screwdriver" : "cautery"] in your inactive hand to stop [M]'s surgery!")) */ /proc/get_location_accessible(mob/victim, location = BODY_ZONE_CHEST, grabs = FALSE, skipundies = TRUE) diff --git a/code/modules/surgery/surgery_tools.dm b/code/modules/surgery/surgery_tools.dm index 93b661a49..c82d4f1ca 100644 --- a/code/modules/surgery/surgery_tools.dm +++ b/code/modules/surgery/surgery_tools.dm @@ -116,7 +116,7 @@ toolspeed = 0.5 /obj/item/scalpel/suicide_act(mob/user) - user.visible_message("[user] is slitting [user.p_their()] [pick("wrists", "throat", "stomach")] with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is slitting [user.p_their()] [pick("wrists", "throat", "stomach")] with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return (BRUTELOSS) @@ -179,13 +179,13 @@ if(!proximity) return if(contents.len) - to_chat(user, "[src] already has something inside it!") + to_chat(user, span_warning("[src] already has something inside it!")) return if(!isorgan(I) && !isbodypart(I)) - to_chat(user, "[src] can only hold body parts!") + to_chat(user, span_warning("[src] can only hold body parts!")) return - user.visible_message("[user] puts [I] into [src].", "I put [I] inside [src].") + user.visible_message(span_notice("[user] puts [I] into [src]."), span_notice("I put [I] inside [src].")) icon_state = "evidence" var/xx = I.pixel_x var/yy = I.pixel_y @@ -204,13 +204,13 @@ /obj/item/organ_storage/attack_self(mob/user) if(contents.len) var/obj/item/I = contents[1] - user.visible_message("[user] dumps [I] from [src].", "I dump [I] from [src].") + user.visible_message(span_notice("[user] dumps [I] from [src]."), span_notice("I dump [I] from [src].")) cut_overlays() I.forceMove(get_turf(src)) icon_state = "evidenceobj" desc = "" else - to_chat(user, "[src] is empty.") + to_chat(user, span_notice("[src] is empty.")) return /obj/item/surgical_processor //allows medical cyborgs to scan and initiate advanced surgeries @@ -226,13 +226,13 @@ if(!proximity) return if(istype(O, /obj/item/disk/surgery)) - to_chat(user, "I load the surgery protocol from [O] into [src].") + to_chat(user, span_notice("I load the surgery protocol from [O] into [src].")) var/obj/item/disk/surgery/D = O if(do_after(user, 10, target = O)) advanced_surgery_steps |= D.surgery_steps return TRUE if(istype(O, /obj/machinery/computer/operating)) - to_chat(user, "I copy surgery protocols from [O] into [src].") + to_chat(user, span_notice("I copy surgery protocols from [O] into [src].")) var/obj/machinery/computer/operating/OC = O if(do_after(user, 10, target = O)) advanced_surgery_steps |= OC.advanced_surgery_steps @@ -258,13 +258,13 @@ playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE) if(tool_behaviour == TOOL_SCALPEL) tool_behaviour = TOOL_SAW - to_chat(user, "I increase the power of [src], now it can cut bones.") + to_chat(user, span_notice("I increase the power of [src], now it can cut bones.")) set_light(2) force += 1 //we don't want to ruin sharpened stuff icon_state = "saw_a" else tool_behaviour = TOOL_SCALPEL - to_chat(user, "I lower the power of [src], it can no longer cut bones.") + to_chat(user, span_notice("I lower the power of [src], it can no longer cut bones.")) set_light(1) force -= 1 icon_state = "scalpel_a" @@ -284,11 +284,11 @@ playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE) if(tool_behaviour == TOOL_RETRACTOR) tool_behaviour = TOOL_HEMOSTAT - to_chat(user, "I configure the gears of [src], they are now in hemostat mode.") + to_chat(user, span_notice("I configure the gears of [src], they are now in hemostat mode.")) icon_state = "hemostat_a" else tool_behaviour = TOOL_RETRACTOR - to_chat(user, "I configure the gears of [src], they are now in retractor mode.") + to_chat(user, span_notice("I configure the gears of [src], they are now in retractor mode.")) icon_state = "retractor_a" /obj/item/retractor/advanced/examine() @@ -312,11 +312,11 @@ playsound(get_turf(user), 'sound/blank.ogg', 50, TRUE) if(tool_behaviour == TOOL_DRILL) tool_behaviour = TOOL_CAUTERY - to_chat(user, "I focus the lenses of [src], it is now in mending mode.") + to_chat(user, span_notice("I focus the lenses of [src], it is now in mending mode.")) icon_state = "cautery_a" else tool_behaviour = TOOL_DRILL - to_chat(user, "I dilate the lenses of [src], it is now in drilling mode.") + to_chat(user, span_notice("I dilate the lenses of [src], it is now in drilling mode.")) icon_state = "surgicaldrill_a" /obj/item/surgicaldrill/advanced/examine() diff --git a/code/modules/surgery/surgery_tools_rogue.dm b/code/modules/surgery/surgery_tools_rogue.dm index a437bde15..e37fa2182 100644 --- a/code/modules/surgery/surgery_tools_rogue.dm +++ b/code/modules/surgery/surgery_tools_rogue.dm @@ -112,7 +112,7 @@ /obj/item/rogueweapon/surgery/cautery/examine(mob/user) . = ..() if(heated) - . += "The tip is hot to the touch." + . += span_warning("The tip is hot to the touch.") /obj/item/rogueweapon/surgery/cautery/update_icon_state() . = ..() @@ -129,7 +129,7 @@ if(forge.on) heating = 20 if(heating) - user.visible_message("[user] heats [src].") + user.visible_message(span_info("[user] heats [src].")) fire_act(heating) return TRUE return ..() diff --git a/code/modules/underworld/demon.dm b/code/modules/underworld/demon.dm index ac85757a0..dda446e71 100644 --- a/code/modules/underworld/demon.dm +++ b/code/modules/underworld/demon.dm @@ -146,8 +146,8 @@ if(. && prob(8) && iscarbon(target)) var/mob/living/carbon/C = target C.Immobilize(50) - C.visible_message("\The [src] paralyzes \the [C] in fear!", \ - "\The [src] paralyzes me!") + C.visible_message(span_danger("\The [src] paralyzes \the [C] in fear!"), \ + span_danger("\The [src] paralyzes me!")) emote("laugh") /datum/intent/simple/slash diff --git a/code/modules/underworld/underworld.dm b/code/modules/underworld/underworld.dm index 622647c1e..90aed8dac 100644 --- a/code/modules/underworld/underworld.dm +++ b/code/modules/underworld/underworld.dm @@ -269,8 +269,8 @@ GLOBAL_VAR_INIT(underworld_coins, 0) if(. && prob(8) && iscarbon(target)) var/mob/living/carbon/C = target C.Immobilize(50) - C.visible_message("\The [src] paralyzes \the [C] in fear!", \ - "\The [src] paralyzes me!") + C.visible_message(span_danger("\The [src] paralyzes \the [C] in fear!"), \ + span_danger("\The [src] paralyzes me!")) emote("laugh") /obj/effect/landmark/underworldsafe/Crossed(atom/movable/AM, oldloc) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index d6806ef28..5533a540e 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -125,9 +125,9 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) if(ishuman(user) && istype(A, /obj/item)) var/mob/living/carbon/human/H = user if(H.put_in_hands(A)) - to_chat(H, "[A] materializes into your hands!") + to_chat(H, span_boldnotice("[A] materializes into your hands!")) return A - to_chat(user, "[A] materializes onto the floor!") + to_chat(user, span_boldnotice("[A] materializes onto the floor!")) return A //Discounts (dynamically filled above) @@ -1338,7 +1338,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) return U.failsafe_code = U.generate_code() var/code = "[islist(U.failsafe_code) ? english_list(U.failsafe_code) : U.failsafe_code]" - to_chat(user, "The new failsafe code for this uplink is now : [code].") + to_chat(user, span_warning("The new failsafe code for this uplink is now : [code].")) if(user.mind) user.mind.store_memory("Failsafe code for [U.parent] : [code]") return U.parent //For log icon diff --git a/code/modules/uplink/uplink_purchase_log.dm b/code/modules/uplink/uplink_purchase_log.dm index 293191b17..61f9bb386 100644 --- a/code/modules/uplink/uplink_purchase_log.dm +++ b/code/modules/uplink/uplink_purchase_log.dm @@ -43,7 +43,7 @@ GLOBAL_LIST(uplink_purchase_logs_by_key) //assoc key = /datum/uplink_purchase_lo . = "" for(var/hash in purchase_log) var/datum/uplink_purchase_entry/UPE = purchase_log[hash] - . += "\[[UPE.icon_b64][show_key?"([owner])":""][UPE.name]
[UPE.spent_cost ? "[UPE.spent_cost] TC" : "[UPE.base_cost] TC
(Surplus)"]
[UPE.desc]
[(UPE.amount_purchased > 1) ? "x[UPE.amount_purchased]" : ""]\]
" + . += span_tooltip_container("\[[UPE.icon_b64][show_key?"([owner])":""][UPE.name]
[UPE.spent_cost ? "[UPE.spent_cost] TC" : "[UPE.base_cost] TC
(Surplus)"]
[UPE.desc]
[(UPE.amount_purchased > 1) ? "x[UPE.amount_purchased]" : ""]\]") /datum/uplink_purchase_log/proc/LogPurchase(atom/A, datum/uplink_item/uplink_item, spent_cost) var/datum/uplink_purchase_entry/UPE diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm index 78df4c5f9..56c9b2dd1 100644 --- a/code/modules/vehicles/_vehicle.dm +++ b/code/modules/vehicles/_vehicle.dm @@ -35,7 +35,7 @@ /obj/vehicle/examine(mob/user) . = ..() if(resistance_flags & ON_FIRE) - . += "It's on fire!" + . += span_warning("It's on fire!") var/healthpercent = obj_integrity/max_integrity * 100 switch(healthpercent) if(50 to 99) @@ -43,7 +43,7 @@ if(25 to 50) . += "It appears heavily damaged." if(0 to 25) - . += "It's falling apart!" + . += span_warning("It's falling apart!") /obj/vehicle/proc/is_key(obj/item/I) return I? (key_type_exact? (I.type == key_type) : istype(I, key_type)) : FALSE @@ -114,7 +114,7 @@ /obj/vehicle/proc/driver_move(mob/user, direction) if(key_type && !is_key(inserted_key)) - to_chat(user, "[src] has no key inserted!") + to_chat(user, span_warning("[src] has no key inserted!")) return FALSE if(!default_driver_move) return diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm index 109b8b9d9..b2d17044b 100644 --- a/code/modules/vehicles/atv.dm +++ b/code/modules/vehicles/atv.dm @@ -68,10 +68,10 @@ if(W.tool_behaviour == TOOL_WELDER && user.used_intent.type != INTENT_HARM) if(obj_integrity < max_integrity) if(W.use_tool(src, user, 0, volume=50, amount=1)) - user.visible_message("[user] repairs some damage to [name].", "I repair some damage to \the [src].") + user.visible_message(span_notice("[user] repairs some damage to [name]."), span_notice("I repair some damage to \the [src].")) obj_integrity += min(10, max_integrity-obj_integrity) if(obj_integrity == max_integrity) - to_chat(user, "It looks to be fully repaired now.") + to_chat(user, span_notice("It looks to be fully repaired now.")) return TRUE return ..() diff --git a/code/modules/vehicles/cars/car.dm b/code/modules/vehicles/cars/car.dm index edda57a30..a1d3d56e9 100644 --- a/code/modules/vehicles/cars/car.dm +++ b/code/modules/vehicles/cars/car.dm @@ -22,7 +22,7 @@ /obj/vehicle/sealed/car/driver_move(mob/user, direction) if(key_type && !is_key(inserted_key)) - to_chat(user, "[src] has no key inserted!") + to_chat(user, span_warning("[src] has no key inserted!")) return FALSE var/datum/component/riding/R = GetComponent(/datum/component/riding) R.handle_ride(user, direction) @@ -37,16 +37,16 @@ return FALSE if((car_traits & CAN_KIDNAP) && isliving(dropping) && M != dropping) var/mob/living/L = dropping - L.visible_message("[M] starts forcing [L] into [src]!") + L.visible_message(span_warning("[M] starts forcing [L] into [src]!")) mob_try_forced_enter(M, L) return ..() /obj/vehicle/sealed/car/mob_try_exit(mob/M, mob/user, silent = FALSE) if(M == user && (occupants[M] & VEHICLE_CONTROL_KIDNAPPED)) - to_chat(user, "I push against the back of \the [src]'s trunk to try and get out.") + to_chat(user, span_notice("I push against the back of \the [src]'s trunk to try and get out.")) if(!do_after(user, escape_time, target = src)) return FALSE - to_chat(user,"[user] gets out of [src].") + to_chat(user,span_danger("[user] gets out of [src].")) mob_exit(M, silent) return TRUE mob_exit(M, silent) @@ -56,7 +56,7 @@ if(!I.force) return if(occupants[user]) - to_chat(user, "My attack bounces off \the [src]'s padded interior.") + to_chat(user, span_notice("My attack bounces off \the [src]'s padded interior.")) return return ..() @@ -66,13 +66,13 @@ return if(occupants[user]) return - to_chat(user, "I start opening [src]'s trunk.") + to_chat(user, span_notice("I start opening [src]'s trunk.")) if(do_after(user, 30)) if(return_amount_of_controllers_with_flag(VEHICLE_CONTROL_KIDNAPPED)) - to_chat(user, "The people stuck in [src]'s trunk all come tumbling out.") + to_chat(user, span_notice("The people stuck in [src]'s trunk all come tumbling out.")) DumpSpecificMobs(VEHICLE_CONTROL_KIDNAPPED) else - to_chat(user, "It seems [src]'s trunk was empty.") + to_chat(user, span_notice("It seems [src]'s trunk was empty.")) /obj/vehicle/sealed/car/proc/mob_try_forced_enter(mob/forcer, mob/M, silent = FALSE) if(!istype(M)) @@ -90,6 +90,6 @@ /obj/vehicle/sealed/car/proc/mob_forced_enter(mob/M, silent = FALSE) if(!silent) - M.visible_message("[M] is forced into \the [src]!") + M.visible_message(span_warning("[M] is forced into \the [src]!")) M.forceMove(src) add_occupant(M, VEHICLE_CONTROL_KIDNAPPED) diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 489e4cd6d..aef296514 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -54,7 +54,7 @@ /obj/vehicle/sealed/car/clowncar/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() if(prob(33)) - visible_message("[src] spews out a ton of space lube!") + visible_message(span_danger("[src] spews out a ton of space lube!")) new /obj/effect/particle_effect/foam(loc) //YEET /obj/vehicle/sealed/car/clowncar/attacked_by(obj/item/I, mob/living/user) @@ -62,7 +62,7 @@ if(istype(I, /obj/item/reagent_containers/food/snacks/grown/banana)) var/obj/item/reagent_containers/food/snacks/grown/banana/banana = I obj_integrity += min(banana.seed.potency, max_integrity-obj_integrity) - to_chat(user, "I use the [banana] to repair the [src]!") + to_chat(user, span_danger("I use the [banana] to repair the [src]!")) qdel(banana) /obj/vehicle/sealed/car/clowncar/Bump(atom/movable/M) @@ -74,12 +74,12 @@ if(iscarbon(L)) var/mob/living/carbon/C = L C.Paralyze(40) //I play to make sprites go horizontal - L.visible_message("[src] rams into [L] and sucks [L.p_them()] up!") //fuck off shezza this isn't ERP. + L.visible_message(span_warning("[src] rams into [L] and sucks [L.p_them()] up!")) //fuck off shezza this isn't ERP. mob_forced_enter(L) playsound(src, pick('sound/blank.ogg'), 75) log_combat(src, M, "sucked up") else if(istype(M, /turf/closed)) - visible_message("[src] rams into [M] and crashes!") + visible_message(span_warning("[src] rams into [M] and crashes!")) playsound(src, pick('sound/blank.ogg'), 75) playsound(src, 'sound/blank.ogg', 75) DumpMobs(TRUE) @@ -89,7 +89,7 @@ if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - to_chat(user, "I scramble \the [src]'s child safety lock, and a panel with six colorful buttons appears!") + to_chat(user, span_danger("I scramble \the [src]'s child safety lock, and a panel with six colorful buttons appears!")) initialize_controller_action_type(/datum/action/vehicle/sealed/RollTheDice, VEHICLE_CONTROL_DRIVE) initialize_controller_action_type(/datum/action/vehicle/sealed/Cannon, VEHICLE_CONTROL_DRIVE) AddComponent(/datum/component/waddling) @@ -105,16 +105,16 @@ /obj/vehicle/sealed/car/clowncar/proc/RollTheDice(mob/user) if(world.time - lastRTDtime < RTDcooldown) - to_chat(user, "The button panel is currently recharging.") + to_chat(user, span_notice("The button panel is currently recharging.")) return lastRTDtime = world.time var/randomnum = rand(1,6) switch(randomnum) if(1) - visible_message("[user] presses one of the colorful buttons on [src], and a special banana peel drops out of it.") + visible_message(span_danger("[user] presses one of the colorful buttons on [src], and a special banana peel drops out of it.")) new /obj/item/grown/bananapeel/specialpeel(loc) if(2) - visible_message("[user] presses one of the colorful buttons on [src], and unknown chemicals flood out of it.") + visible_message(span_danger("[user] presses one of the colorful buttons on [src], and unknown chemicals flood out of it.")) var/datum/reagents/R = new/datum/reagents(300) R.my_atom = src R.add_reagent(get_random_reagent_id(), 100) @@ -122,12 +122,12 @@ foam.set_up(200, loc, R) foam.start() if(3) - visible_message("[user] presses one of the colorful buttons on [src], and the clown car turns on its singularity disguise system.") + visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car turns on its singularity disguise system.")) icon = 'icons/obj/singularity.dmi' icon_state = "singularity_s1" addtimer(CALLBACK(src, PROC_REF(ResetIcon)), 100) if(4) - visible_message("[user] presses one of the colorful buttons on [src], and the clown car spews out a cloud of laughing gas.") + visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car spews out a cloud of laughing gas.")) var/datum/reagents/R = new/datum/reagents(300) R.my_atom = src R.add_reagent(/datum/reagent/consumable/superlaughter, 50) @@ -136,11 +136,11 @@ smoke.attach(src) smoke.start() if(5) - visible_message("[user] presses one of the colorful buttons on [src], and the clown car starts dropping an oil trail.") + visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car starts dropping an oil trail.")) droppingoil = TRUE addtimer(CALLBACK(src, PROC_REF(StopDroppingOil)), 30) if(6) - visible_message("[user] presses one of the colorful buttons on [src], and the clown car lets out a comedic toot.") + visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car lets out a comedic toot.")) playsound(src, 'sound/blank.ogg', 100) for(var/mob/living/L in orange(loc, 6)) L.emote("laughs") @@ -162,12 +162,12 @@ icon_state = "clowncar" addtimer(CALLBACK(src, PROC_REF(LeaveCannonMode)), 20) playsound(src, 'sound/blank.ogg', 75) - visible_message("The [src] starts going back into mobile mode.") + visible_message(span_danger("The [src] starts going back into mobile mode.")) else canmove = FALSE flick("clowncar_tofire", src) icon_state = "clowncar_fire" - visible_message("The [src] opens up and reveals a large cannon.") + visible_message(span_danger("The [src] opens up and reveals a large cannon.")) addtimer(CALLBACK(src, PROC_REF(EnterCannonMode)), 20) playsound(src, 'sound/blank.ogg', 75) diff --git a/code/modules/vehicles/lavaboat.dm b/code/modules/vehicles/lavaboat.dm index 867ae70c5..0207a30de 100644 --- a/code/modules/vehicles/lavaboat.dm +++ b/code/modules/vehicles/lavaboat.dm @@ -54,7 +54,7 @@ icon_state = "ship_bottle" /obj/item/ship_in_a_bottle/attack_self(mob/user) - to_chat(user, "You're not sure how they get the ships in these things, but you're pretty sure you know how to get it out.") + to_chat(user, span_notice("You're not sure how they get the ships in these things, but you're pretty sure you know how to get it out.")) playsound(user.loc, 'sound/blank.ogg', 100, TRUE) new /obj/vehicle/ridden/lavaboat/dragon(get_turf(src)) qdel(src) diff --git a/code/modules/vehicles/motorized_wheelchair.dm b/code/modules/vehicles/motorized_wheelchair.dm index 55aeb3207..a669a56ae 100644 --- a/code/modules/vehicles/motorized_wheelchair.dm +++ b/code/modules/vehicles/motorized_wheelchair.dm @@ -38,17 +38,17 @@ if(!canmove) return FALSE if(!power_cell) - to_chat(user, "There seems to be no cell installed in [src].") + to_chat(user, span_warning("There seems to be no cell installed in [src].")) canmove = FALSE addtimer(VARSET_CALLBACK(src, canmove, TRUE), 20) return FALSE if(power_cell.charge < power_usage / max(power_efficiency, 1)) - to_chat(user, "The display on [src] blinks 'Out of Power'.") + to_chat(user, span_warning("The display on [src] blinks 'Out of Power'.")) canmove = FALSE addtimer(VARSET_CALLBACK(src, canmove, TRUE), 20) return FALSE if(user.get_num_arms() < arms_required) - to_chat(user, "I don't have enough arms to operate the motor controller!") + to_chat(user, span_warning("I don't have enough arms to operate the motor controller!")) canmove = FALSE addtimer(VARSET_CALLBACK(src, canmove, TRUE), 20) return FALSE @@ -71,7 +71,7 @@ power_cell.update_icon() user.put_in_hands(power_cell) power_cell = null - to_chat(user, "I remove the power cell from [src].") + to_chat(user, span_notice("I remove the power cell from [src].")) return return ..() @@ -79,16 +79,16 @@ if(I.tool_behaviour == TOOL_SCREWDRIVER) I.play_tool_sound(src) panel_open = !panel_open - user.visible_message("[user] [panel_open ? "opens" : "closes"] the maintenance panel on [src].", "I [panel_open ? "open" : "close"] the maintenance panel.") + user.visible_message(span_notice("[user] [panel_open ? "opens" : "closes"] the maintenance panel on [src]."), span_notice("I [panel_open ? "open" : "close"] the maintenance panel.")) return if(panel_open) if(istype(I, /obj/item/stock_parts/cell)) if(power_cell) - to_chat(user, "There is a power cell already installed.") + to_chat(user, span_warning("There is a power cell already installed.")) else I.forceMove(src) power_cell = I - to_chat(user, "I install the [I].") + to_chat(user, span_notice("I install the [I].")) refresh_parts() return if(istype(I, /obj/item/stock_parts)) @@ -103,16 +103,16 @@ if(B.get_part_rating() > A.get_part_rating()) B.forceMove(src) user.put_in_hands(A) - user.visible_message("[user] replaces [A] with [B] in [src].", "I replace [A] with [B].") + user.visible_message(span_notice("[user] replaces [A] with [B] in [src]."), span_notice("I replace [A] with [B].")) break refresh_parts() return return ..() /obj/vehicle/ridden/wheelchair/motorized/wrench_act(mob/living/user, obj/item/I) - to_chat(user, "I begin to detach the wheels...") + to_chat(user, span_notice("I begin to detach the wheels...")) if(I.use_tool(src, user, 40, volume=50)) - to_chat(user, "I detach the wheels and deconstruct the chair.") + to_chat(user, span_notice("I detach the wheels and deconstruct the chair.")) new /obj/item/stack/rods(drop_location(), 8) new /obj/item/stack/sheet/metal(drop_location(), 10) var/turf/T = get_turf(src) @@ -140,7 +140,7 @@ // Here is the shitty emag functionality. if(obj_flags & EMAGGED && (istype(M, /turf/closed) || isliving(M))) explosion(src, -1, 1, 3, 2, 0) - visible_message("[src] explodes!!") + visible_message(span_boldwarning("[src] explodes!!")) return // If the speed is higher than delay_multiplier throw the person on the wheelchair away if(M.density && speed > delay_multiplier && has_buckled_mobs()) @@ -156,13 +156,13 @@ D.throw_at(throw_target, 2, 3) D.Knockdown(80) D.adjustStaminaLoss(35) - visible_message("[src] crashes into [M], sending [H] and [D] flying!") + visible_message(span_danger("[src] crashes into [M], sending [H] and [D] flying!")) else - visible_message("[src] crashes into [M], sending [H] flying!") + visible_message(span_danger("[src] crashes into [M], sending [H] flying!")) playsound(src, 'sound/blank.ogg', 50, 1) /obj/vehicle/ridden/wheelchair/motorized/emag_act(mob/user) if((obj_flags & EMAGGED) || !panel_open) return - to_chat(user, "A bomb appears in [src], what the fuck?") + to_chat(user, span_warning("A bomb appears in [src], what the fuck?")) obj_flags |= EMAGGED diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm index e437ef33d..3d3ad4b3e 100644 --- a/code/modules/vehicles/pimpin_ride.dm +++ b/code/modules/vehicles/pimpin_ride.dm @@ -36,20 +36,20 @@ /obj/vehicle/ridden/janicart/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/storage/bag/trash)) if(mybag) - to_chat(user, "[src] already has a trashbag hooked!") + to_chat(user, span_warning("[src] already has a trashbag hooked!")) return if(!user.transferItemToLoc(I, src)) return - to_chat(user, "I hook the trashbag onto [src].") + to_chat(user, span_notice("I hook the trashbag onto [src].")) mybag = I update_icon() else if(istype(I, /obj/item/janiupgrade)) if(floorbuffer) - to_chat(user, "[src] already has a floor buffer!") + to_chat(user, span_warning("[src] already has a floor buffer!")) return floorbuffer = TRUE qdel(I) - to_chat(user, "I upgrade [src] with the floor buffer.") + to_chat(user, span_notice("I upgrade [src] with the floor buffer.")) AddElement(/datum/element/cleaning) update_icon() else diff --git a/code/modules/vehicles/ridden.dm b/code/modules/vehicles/ridden.dm index 5c4f6db97..671049c97 100644 --- a/code/modules/vehicles/ridden.dm +++ b/code/modules/vehicles/ridden.dm @@ -17,9 +17,9 @@ . = ..() if(key_type) if(!inserted_key) - . += "Put a key inside it by clicking it with the key." + . += span_notice("Put a key inside it by clicking it with the key.") else - . += "Alt-click [src] to remove the key." + . += span_notice("Alt-click [src] to remove the key.") /obj/vehicle/ridden/generate_action_type(actiontype) var/datum/action/vehicle/ridden/A = ..() @@ -38,21 +38,21 @@ /obj/vehicle/ridden/attackby(obj/item/I, mob/user, params) if(key_type && !is_key(inserted_key) && is_key(I)) if(user.transferItemToLoc(I, src)) - to_chat(user, "I insert \the [I] into \the [src].") + to_chat(user, span_notice("I insert \the [I] into \the [src].")) if(inserted_key) //just in case there's an invalid key inserted_key.forceMove(drop_location()) inserted_key = I else - to_chat(user, "[I] seems to be stuck to my hand!") + to_chat(user, span_warning("[I] seems to be stuck to my hand!")) return return ..() /obj/vehicle/ridden/AltClick(mob/user) if(inserted_key && user.canUseTopic(src, BE_CLOSE, ismonkey(user))) if(!is_occupant(user)) - to_chat(user, "I must be riding the [src] to remove [src]'s key!") + to_chat(user, span_warning("I must be riding the [src] to remove [src]'s key!")) return - to_chat(user, "I remove \the [inserted_key] from \the [src].") + to_chat(user, span_notice("I remove \the [inserted_key] from \the [src].")) inserted_key.forceMove(drop_location()) user.put_in_hands(inserted_key) inserted_key = null @@ -61,14 +61,14 @@ /obj/vehicle/ridden/driver_move(mob/user, direction) if(key_type && !is_key(inserted_key)) if(message_cooldown < world.time) - to_chat(user, "[src] has no key inserted!") + to_chat(user, span_warning("[src] has no key inserted!")) message_cooldown = world.time + 5 SECONDS return FALSE if(legs_required) var/how_many_legs = user.get_num_legs() if(how_many_legs < legs_required) if(message_cooldown < world.time) - to_chat(user, "I can't seem to manage that with[how_many_legs ? " my leg[how_many_legs > 1 ? "s" : null]" : "out legs"]...") + to_chat(user, span_warning("I can't seem to manage that with[how_many_legs ? " my leg[how_many_legs > 1 ? "s" : null]" : "out legs"]...")) message_cooldown = world.time + 5 SECONDS return FALSE if(arms_required) @@ -76,15 +76,15 @@ if(how_many_arms < arms_required) if(fall_off_if_missing_arms) unbuckle_mob(user, TRUE) - user.visible_message("[user] falls off \the [src].",\ - "I fall off \the [src] while trying to operate it without [arms_required ? "both arms":"an arm"]!") + user.visible_message(span_danger("[user] falls off \the [src]."),\ + span_danger("I fall off \the [src] while trying to operate it without [arms_required ? "both arms":"an arm"]!")) if(isliving(user)) var/mob/living/L = user L.Stun(30) return FALSE if(message_cooldown < world.time) - to_chat(user, "I can't seem to manage that with[how_many_arms ? " my arm[how_many_arms > 1 ? "s" : null]" : "out arms"]...") + to_chat(user, span_warning("I can't seem to manage that with[how_many_arms ? " my arm[how_many_arms > 1 ? "s" : null]" : "out arms"]...")) message_cooldown = world.time + 5 SECONDS return FALSE var/datum/component/riding/R = GetComponent(/datum/component/riding) diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index 751b3393f..1a05808c4 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -13,11 +13,11 @@ /obj/vehicle/ridden/scooter/wrench_act(mob/living/user, obj/item/I) ..() - to_chat(user, "I begin to remove the handlebars...") + to_chat(user, span_notice("I begin to remove the handlebars...")) if(I.use_tool(src, user, 40, volume=50)) var/obj/vehicle/ridden/scooter/skateboard/S = new(drop_location()) new /obj/item/stack/rods(drop_location(), 2) - to_chat(user, "I remove the handlebars from [src].") + to_chat(user, span_notice("I remove the handlebars from [src].")) if(has_buckled_mobs()) var/mob/living/carbon/H = buckled_mobs[1] unbuckle_mob(H) @@ -38,7 +38,7 @@ if(!istype(M)) return FALSE if(M.get_num_legs() < legs_required && M.get_num_arms() < arms_required) - to_chat(M, "I don't think it'd be a good idea trying to ride \the [src]...") + to_chat(M, span_warning("I don't think it'd be a good idea trying to ride \the [src]...")) return FALSE return ..() @@ -110,7 +110,7 @@ if(!head_slot || !(istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/hardhat))) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5) H.updatehealth() - visible_message("[src] crashes into [A], sending [H] flying!") + visible_message(span_danger("[src] crashes into [A], sending [H] flying!")) H.Paralyze(80) else var/backdir = turn(dir, 180) @@ -129,7 +129,7 @@ unbuckle_mob(L) var/atom/throw_target = get_edge_target_turf(src, pick(GLOB.cardinals)) L.throw_at(throw_target, 2, 2) - visible_message("[L] loses [L.p_their()] footing and slams on the ground!") + visible_message(span_danger("[L] loses [L.p_their()] footing and slams on the ground!")) L.Paralyze(40) grinding = FALSE icon_state = board_icon @@ -153,7 +153,7 @@ if(!istype(M) || M.incapacitated() || !Adjacent(M)) return if(has_buckled_mobs() && over_object == M) - to_chat(M, "I can't lift this up when somebody's on it.") + to_chat(M, span_warning("I can't lift this up when somebody's on it.")) return if(over_object == M) var/board = new board_item_type(get_turf(M)) @@ -205,9 +205,9 @@ if(istype(I, /obj/item/stack/sheet/metal)) if(!I.tool_start_check(user, amount=5)) return - to_chat(user, "I begin to add wheels to [src].") + to_chat(user, span_notice("I begin to add wheels to [src].")) if(I.use_tool(src, user, 80, volume=50, amount=5)) - to_chat(user, "I finish making wheels for [src].") + to_chat(user, span_notice("I finish making wheels for [src].")) new /obj/vehicle/ridden/scooter/skateboard(user.loc) qdel(src) else @@ -215,7 +215,7 @@ /obj/item/scooter_frame/wrench_act(mob/living/user, obj/item/I) ..() - to_chat(user, "I deconstruct [src].") + to_chat(user, span_notice("I deconstruct [src].")) new /obj/item/stack/rods(drop_location(), 10) I.play_tool_sound(src) qdel(src) @@ -225,9 +225,9 @@ if(istype(I, /obj/item/stack/rods)) if(!I.tool_start_check(user, amount=2)) return - to_chat(user, "I begin making handlebars for [src].") + to_chat(user, span_notice("I begin making handlebars for [src].")) if(I.use_tool(src, user, 25, volume=50, amount=2)) - to_chat(user, "I add the rods to [src], creating handlebars.") + to_chat(user, span_notice("I add the rods to [src], creating handlebars.")) var/obj/vehicle/ridden/scooter/S = new(loc) if(has_buckled_mobs()) var/mob/living/carbon/H = buckled_mobs[1] @@ -240,9 +240,9 @@ /obj/vehicle/ridden/scooter/skateboard/screwdriver_act(mob/living/user, obj/item/I) if(..()) return TRUE - to_chat(user, "I begin to deconstruct and remove the wheels on [src]...") + to_chat(user, span_notice("I begin to deconstruct and remove the wheels on [src]...")) if(I.use_tool(src, user, 20, volume=50)) - to_chat(user, "I deconstruct the wheels on [src].") + to_chat(user, span_notice("I deconstruct the wheels on [src].")) new /obj/item/stack/sheet/metal(drop_location(), 5) new /obj/item/scooter_frame(drop_location()) if(has_buckled_mobs()) @@ -272,12 +272,12 @@ /obj/vehicle/ridden/scooter/wheelys/post_unbuckle_mob(mob/living/M) if(!has_buckled_mobs()) - to_chat(M, "I pop the Wheely-Heels' wheels back into place.") + to_chat(M, span_notice("I pop the Wheely-Heels' wheels back into place.")) moveToNullspace() return ..() /obj/vehicle/ridden/scooter/wheelys/post_buckle_mob(mob/living/M) - to_chat(M, "I pop out the Wheely-Heels' wheels.") + to_chat(M, span_notice("I pop out the Wheely-Heels' wheels.")) return ..() /obj/vehicle/ridden/scooter/wheelys/Bump(atom/A) @@ -293,5 +293,5 @@ if(!head_slot || !(istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/hardhat))) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1) H.updatehealth() - visible_message("[src] crashes into [A], sending [H] flying!") + visible_message(span_danger("[src] crashes into [A], sending [H] flying!")) playsound(src, 'sound/blank.ogg', 50, TRUE) diff --git a/code/modules/vehicles/sealed.dm b/code/modules/vehicles/sealed.dm index 072dc0fe3..e18ff8813 100644 --- a/code/modules/vehicles/sealed.dm +++ b/code/modules/vehicles/sealed.dm @@ -41,7 +41,7 @@ if(!istype(M)) return FALSE if(!silent) - M.visible_message("[M] climbs into \the [src]!") + M.visible_message(span_notice("[M] climbs into \the [src]!")) M.forceMove(src) add_occupant(M) return TRUE @@ -59,7 +59,7 @@ M.throw_at(target_turf, 5, 10) if(!silent) - M.visible_message("[M] drops out of \the [src]!") + M.visible_message(span_notice("[M] drops out of \the [src]!")) return TRUE /obj/vehicle/sealed/proc/exit_location(M) @@ -68,23 +68,23 @@ /obj/vehicle/sealed/attackby(obj/item/I, mob/user, params) if(key_type && !is_key(inserted_key) && is_key(I)) if(user.transferItemToLoc(I, src)) - to_chat(user, "I insert [I] into [src].") + to_chat(user, span_notice("I insert [I] into [src].")) if(inserted_key) //just in case there's an invalid key inserted_key.forceMove(drop_location()) inserted_key = I else - to_chat(user, "[I] seems to be stuck to my hand!") + to_chat(user, span_warning("[I] seems to be stuck to my hand!")) return return ..() /obj/vehicle/sealed/proc/remove_key(mob/user) if(!inserted_key) - to_chat(user, "There is no key in [src]!") + to_chat(user, span_warning("There is no key in [src]!")) return if(!is_occupant(user) || !(occupants[user] & VEHICLE_CONTROL_DRIVE)) - to_chat(user, "I must be driving [src] to remove [src]'s key!") + to_chat(user, span_warning("I must be driving [src] to remove [src]'s key!")) return - to_chat(user, "I remove [inserted_key] from [src].") + to_chat(user, span_notice("I remove [inserted_key] from [src].")) inserted_key.forceMove(drop_location()) user.put_in_hands(inserted_key) inserted_key = null diff --git a/code/modules/vehicles/secway.dm b/code/modules/vehicles/secway.dm index b4a8a10d7..301df42fd 100644 --- a/code/modules/vehicles/secway.dm +++ b/code/modules/vehicles/secway.dm @@ -31,10 +31,10 @@ if(W.tool_behaviour == TOOL_WELDER && user.used_intent.type != INTENT_HARM) if(obj_integrity < max_integrity) if(W.use_tool(src, user, 0, volume = 50, amount = 1)) - user.visible_message("[user] repairs some damage to [name].", "I repair some damage to \the [src].") + user.visible_message(span_notice("[user] repairs some damage to [name]."), span_notice("I repair some damage to \the [src].")) obj_integrity += min(10, max_integrity-obj_integrity) if(obj_integrity == max_integrity) - to_chat(user, "It looks to be fully repaired now.") + to_chat(user, span_notice("It looks to be fully repaired now.")) return TRUE return ..() diff --git a/code/modules/vehicles/speedbike.dm b/code/modules/vehicles/speedbike.dm index c4d7a4d02..ce4cf30af 100644 --- a/code/modules/vehicles/speedbike.dm +++ b/code/modules/vehicles/speedbike.dm @@ -73,7 +73,7 @@ var/atom/throw_target = get_edge_target_turf(A, dir) if(crash_all) A.throw_at(throw_target, 4, 3) - visible_message("[src] crashes into [A]!") + visible_message(span_danger("[src] crashes into [A]!")) playsound(src, 'sound/blank.ogg', 50, TRUE) if(ishuman(A)) var/mob/living/carbon/human/H = A @@ -82,7 +82,7 @@ H.apply_damage(rand(20,35), BRUTE) if(!crash_all) H.throw_at(throw_target, 4, 3) - visible_message("[src] crashes into [H]!") + visible_message(span_danger("[src] crashes into [H]!")) playsound(src, 'sound/blank.ogg', 50, TRUE) /obj/vehicle/ridden/space/speedwagon/Moved() diff --git a/code/modules/vehicles/vehicle_actions.dm b/code/modules/vehicles/vehicle_actions.dm index f2de97759..c8d89aca3 100644 --- a/code/modules/vehicles/vehicle_actions.dm +++ b/code/modules/vehicles/vehicle_actions.dm @@ -130,15 +130,15 @@ /datum/action/vehicle/sealed/horn/Trigger() if(world.time - last_honk_time > 20) - vehicle_entered_target.visible_message("[vehicle_entered_target] loudly honks!") - to_chat(owner, "I press the vehicle's horn.") + vehicle_entered_target.visible_message(span_danger("[vehicle_entered_target] loudly honks!")) + to_chat(owner, span_notice("I press the vehicle's horn.")) playsound(vehicle_entered_target, hornsound, 75) last_honk_time = world.time /datum/action/vehicle/sealed/horn/clowncar/Trigger() if(world.time - last_honk_time > 20) - vehicle_entered_target.visible_message("[vehicle_entered_target] loudly honks!") - to_chat(owner, "I press the vehicle's horn.") + vehicle_entered_target.visible_message(span_danger("[vehicle_entered_target] loudly honks!")) + to_chat(owner, span_notice("I press the vehicle's horn.")) last_honk_time = world.time if(vehicle_target.inserted_key) vehicle_target.inserted_key.attack_self(owner) //The key plays a sound @@ -151,7 +151,7 @@ button_icon_state = "car_dump" /datum/action/vehicle/sealed/DumpKidnappedMobs/Trigger() - vehicle_entered_target.visible_message("[vehicle_entered_target] starts dumping the people inside of it.") + vehicle_entered_target.visible_message(span_danger("[vehicle_entered_target] starts dumping the people inside of it.")) vehicle_entered_target.DumpSpecificMobs(VEHICLE_CONTROL_KIDNAPPED) @@ -174,7 +174,7 @@ if(istype(vehicle_entered_target, /obj/vehicle/sealed/car/clowncar)) var/obj/vehicle/sealed/car/clowncar/C = vehicle_entered_target if(C.cannonbusy) - to_chat(owner, "Please wait for the vehicle to finish its current action first.") + to_chat(owner, span_notice("Please wait for the vehicle to finish its current action first.")) C.ToggleCannon() /datum/action/vehicle/sealed/Thank @@ -212,7 +212,7 @@ V.unbuckle_mob(L) L.throw_at(landing_turf, 2, 2) L.Paralyze(40) - V.visible_message("[L] misses the landing and falls on [L.p_their()] face!") + V.visible_message(span_danger("[L] misses the landing and falls on [L.p_their()] face!")) else L.spin(4, 1) animate(L, pixel_y = -6, time = 4) diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index e0f428c79..6ece1bd7c 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -39,7 +39,7 @@ /obj/vehicle/ridden/wheelchair/driver_move(mob/living/user, direction) if(istype(user)) if(canmove && (user.get_num_arms() < arms_required)) - to_chat(user, "I don't have enough arms to operate the wheels!") + to_chat(user, span_warning("I don't have enough arms to operate the wheels!")) canmove = FALSE addtimer(VARSET_CALLBACK(src, canmove, TRUE), 20) return FALSE @@ -74,9 +74,9 @@ /obj/vehicle/ridden/wheelchair/wrench_act(mob/living/user, obj/item/I) //Attackby should stop it attacking the wheelchair after moving away during decon ..() - to_chat(user, "I begin to detach the wheels...") + to_chat(user, span_notice("I begin to detach the wheels...")) if(I.use_tool(src, user, 40, volume=50)) - to_chat(user, "I detach the wheels and deconstruct the chair.") + to_chat(user, span_notice("I detach the wheels and deconstruct the chair.")) new /obj/item/stack/rods(drop_location(), 6) new /obj/item/stack/sheet/metal(drop_location(), 4) qdel(src) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 34475aee8..f6697e646 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -374,7 +374,7 @@ GLOBAL_LIST_EMPTY(vending_products) add_overlay("[initial(icon_state)]-panel") updateUsrDialog() else - to_chat(user, "I must first secure [src].") + to_chat(user, span_warning("I must first secure [src].")) return TRUE /obj/machinery/vending/attackby(obj/item/I, mob/user, params) @@ -384,21 +384,21 @@ GLOBAL_LIST_EMPTY(vending_products) if(refill_canister && istype(I, refill_canister)) if (!panel_open) - to_chat(user, "I should probably unscrew the service panel first!") + to_chat(user, span_warning("I should probably unscrew the service panel first!")) else if (stat & (BROKEN|NOPOWER)) - to_chat(user, "[src] does not respond.") + to_chat(user, span_notice("[src] does not respond.")) else //if the panel is open we attempt to refill the machine var/obj/item/vending_refill/canister = I if(canister.get_part_rating() == 0) - to_chat(user, "[canister] is empty!") + to_chat(user, span_warning("[canister] is empty!")) else // instantiate canister if needed var/transferred = restock(canister) if(transferred) - to_chat(user, "I loaded [transferred] items in [src].") + to_chat(user, span_notice("I loaded [transferred] items in [src].")) else - to_chat(user, "There's nothing to restock!") + to_chat(user, span_warning("There's nothing to restock!")) return if(compartmentLoadAccessCheck(user)) if(canLoadItem(I)) @@ -411,7 +411,7 @@ GLOBAL_LIST_EMPTY(vending_products) var/denied_items = 0 for(var/obj/item/the_item in T.contents) if(contents.len >= MAX_VENDING_INPUT_AMOUNT) // no more than 30 item can fit inside, legacy from snack vending although not sure why it exists - to_chat(user, "[src]'s compartment is full.") + to_chat(user, span_warning("[src]'s compartment is full.")) break if(canLoadItem(the_item) && loadingAttempt(the_item,user)) SEND_SIGNAL(T, COMSIG_TRY_STORAGE_TAKE, the_item, src, TRUE) @@ -419,9 +419,9 @@ GLOBAL_LIST_EMPTY(vending_products) else denied_items++ if(denied_items) - to_chat(user, "[src] refuses some items!") + to_chat(user, span_warning("[src] refuses some items!")) if(loaded) - to_chat(user, "I insert [loaded] dishes into [src]'s compartment.") + to_chat(user, span_notice("I insert [loaded] dishes into [src]'s compartment.")) updateUsrDialog() else @@ -435,7 +435,7 @@ GLOBAL_LIST_EMPTY(vending_products) vending_machine_input[format_text(I.name)]++ else vending_machine_input[format_text(I.name)] = 1 - to_chat(user, "I insert [I] into [src]'s input compartment.") + to_chat(user, span_notice("I insert [I] into [src]'s input compartment.")) loaded_items++ /** @@ -461,7 +461,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(do_you_have_access) return TRUE else - to_chat(user, "[src]'s input compartment blinks red: Access denied.") + to_chat(user, span_warning("[src]'s input compartment blinks red: Access denied.")) return FALSE /obj/machinery/vending/exchange_parts(mob/user, obj/item/storage/part_replacer/W) @@ -482,7 +482,7 @@ GLOBAL_LIST_EMPTY(vending_products) else display_parts(user) if(moved) - to_chat(user, "[moved] items restocked.") + to_chat(user, span_notice("[moved] items restocked.")) W.play_rped_sound() return TRUE @@ -494,7 +494,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - to_chat(user, "I short out the product lock on [src].") + to_chat(user, span_notice("I short out the product lock on [src].")) /obj/machinery/vending/_try_interact(mob/user) if(seconds_electrified && !(stat & NOPOWER)) @@ -587,7 +587,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(vending_machine_input[N] <= 0) // Sanity check, there are probably ways to press the button when it shouldn't be possible. return if(panel_open) - to_chat(usr, "The vending machine cannot dispense products while its service panel is open!") + to_chat(usr, span_warning("The vending machine cannot dispense products while its service panel is open!")) return vend_ready = FALSE @@ -641,7 +641,7 @@ GLOBAL_LIST_EMPTY(vending_products) if((href_list["vend"]) && (vend_ready)) if(panel_open) - to_chat(usr, "The vending machine cannot dispense products while its service panel is open!") + to_chat(usr, span_warning("The vending machine cannot dispense products while its service panel is open!")) return vend_ready = FALSE //One thing at a time!! @@ -781,7 +781,7 @@ GLOBAL_LIST_EMPTY(vending_products) pre_throw(throw_item) throw_item.throw_at(target, 16, 3) - visible_message("[src] launches [throw_item] at [target]!") + visible_message(span_danger("[src] launches [throw_item] at [target]!")) return 1 /** * A callback called before an item is tossed out @@ -1019,7 +1019,7 @@ GLOBAL_LIST_EMPTY(vending_products) /obj/item/price_tagger/attack_self(mob/user) price = max(1, round(input(user,"set price","price") as num|null, 1)) - to_chat(user, " The [src] will now give things an $[price] tag.") + to_chat(user, span_notice(" The [src] will now give things an $[price] tag.")) /obj/item/price_tagger/afterattack(atom/target, mob/user, proximity) . = ..() @@ -1028,4 +1028,4 @@ GLOBAL_LIST_EMPTY(vending_products) if(isitem(target)) var/obj/item/I = target I.custom_price = price - to_chat(user, "I set the price of [I] to $[price].") + to_chat(user, span_notice("I set the price of [I] to $[price].")) diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm index 6bccf67ea..102905fa3 100644 --- a/code/modules/zombie/items.dm +++ b/code/modules/zombie/items.dm @@ -54,7 +54,7 @@ /obj/item/zombie_hand/suicide_act(mob/user) - user.visible_message("[user] is ripping [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is ripping [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!")) if(isliving(user)) var/mob/living/L = user var/obj/item/bodypart/O = L.get_bodypart(BODY_ZONE_HEAD) diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index b606b3419..dc7a0eb9c 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -50,7 +50,7 @@ if (causes_damage && !iszombie(owner) && owner.stat != DEAD) owner.adjustToxLoss(1) if (prob(10)) - to_chat(owner, "I feel sick...") + to_chat(owner, span_danger("I feel sick...")) if(timer_id) return if(owner.suiciding) @@ -88,11 +88,11 @@ return owner.grab_ghost() - owner.visible_message("[owner] suddenly convulses, as [owner.p_they()][stand_up ? " stagger to [owner.p_their()] feet and" : ""] gain a ravenous hunger in [owner.p_their()] eyes!", "I HUNGER!") + owner.visible_message(span_danger("[owner] suddenly convulses, as [owner.p_they()][stand_up ? " stagger to [owner.p_their()] feet and" : ""] gain a ravenous hunger in [owner.p_their()] eyes!"), span_alien("I HUNGER!")) playsound(owner.loc, 'sound/blank.ogg', 50, TRUE) owner.do_jitter_animation(living_transformation_time) owner.Stun(living_transformation_time) - to_chat(owner, "I are now a zombie! Do not seek to be cured, do not help any non-zombies in any way, do not harm my zombie brethren and spread the disease by killing others. You are a creature of hunger and violence.") + to_chat(owner, span_alertalien("I are now a zombie! Do not seek to be cured, do not help any non-zombies in any way, do not harm my zombie brethren and spread the disease by killing others. You are a creature of hunger and violence.")) /obj/item/organ/zombie_infection/nodamage causes_damage = FALSE diff --git a/interface/interface.dm b/interface/interface.dm index 96fa46ad2..a4035ec2b 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -11,7 +11,7 @@ else if (query != null) src << link(wikiurl) else - to_chat(src, "The wiki URL is not set in the server configuration.") + to_chat(src, span_danger("The wiki URL is not set in the server configuration.")) return /client/verb/discord() @@ -24,7 +24,7 @@ return src << link(discordurl) else - to_chat(src, "The forum URL is not set in the server configuration.") + to_chat(src, span_danger("The forum URL is not set in the server configuration.")) return /client/verb/rules() @@ -37,7 +37,7 @@ return src << link(rulesurl) else - to_chat(src, "The rules URL is not set in the server configuration.") + to_chat(src, span_danger("The rules URL is not set in the server configuration.")) return /client/verb/github() @@ -50,7 +50,7 @@ return src << link(githuburl) else - to_chat(src, "The Github URL is not set in the server configuration.") + to_chat(src, span_danger("The Github URL is not set in the server configuration.")) return /client/verb/mentorhelp() @@ -62,7 +62,7 @@ if(msg) mob.schizohelp(msg) else - to_chat(src, "You can't currently use Mentorhelp in the main menu.") + to_chat(src, span_danger("You can't currently use Mentorhelp in the main menu.")) /client/verb/reportissue() set name = "report-issue" @@ -83,7 +83,7 @@ url_params = "Issue reported from [GLOB.round_id ? " Round ID: [GLOB.round_id][servername ? " ([servername])" : ""]" : servername]\n\n[url_params]" DIRECT_OUTPUT(src, link("[githuburl]/issues/new?body=[url_encode(url_params)]")) else - to_chat(src, "The Github URL is not set in the server configuration.") + to_chat(src, span_danger("The Github URL is not set in the server configuration.")) return /client/verb/changelog() diff --git a/roguetown.dme b/roguetown.dme index 90507e5d4..5b0e08fc2 100644 --- a/roguetown.dme +++ b/roguetown.dme @@ -103,6 +103,7 @@ #include "code\__DEFINES\skills.dm" #include "code\__DEFINES\sound.dm" #include "code\__DEFINES\spaceman_dmm.dm" +#include "code\__DEFINES\spans.dm" #include "code\__DEFINES\stat.dm" #include "code\__DEFINES\stat_tracking.dm" #include "code\__DEFINES\status_effects.dm" diff --git a/tools/replace_spans.py b/tools/replace_spans.py new file mode 100644 index 000000000..e71fcae96 --- /dev/null +++ b/tools/replace_spans.py @@ -0,0 +1,31 @@ +import re +import os + +def replace_spans_in_file(file_path): + with open(file_path, 'r', encoding='utf-8') as file: + content = file.read() + + pattern = re.compile(r'"(.*?)<\/span>"') + + def replace_span(match): + class_names = match.group(1).replace(' ', '') + span_content = match.group(2) + return f'span_{class_names}("{span_content}")' + + result = pattern.sub(replace_span, content) + + with open(file_path, 'w', encoding='utf-8') as file: + file.write(result) + +def process_dm_files_in_directory(directory_path): + for root, _, files in os.walk(directory_path): + for file_name in files: + if file_name.endswith('.dm'): + file_path = os.path.join(root, file_name) + replace_spans_in_file(file_path) + print(f"Processed {file_path}") + +# Uncomment to run :) +# directory_path = '.' +# process_dm_files_in_directory(directory_path) +# print("All .dm files have been processed successfully.")