From 8c80056f57fcb4f9ce73c6f1b8241613df2a2bb8 Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Thu, 2 Sep 2021 15:06:26 -0500 Subject: [PATCH 1/7] Steals tg's span macros --- code/__DEFINES/span.dm | 152 +++++ code/__DEFINES/tgs.config.dm | 2 +- code/__HELPERS/areas.dm | 10 +- code/__HELPERS/game.dm | 8 +- code/__HELPERS/roundend.dm | 16 +- code/_onclick/ai.dm | 2 +- code/_onclick/hud/action_button.dm | 14 +- code/_onclick/hud/alert.dm | 2 +- code/_onclick/hud/pai.dm | 2 +- code/_onclick/hud/robot.dm | 2 +- code/_onclick/hud/screen_objects.dm | 22 +- code/_onclick/item_attack.dm | 14 +- code/_onclick/other_mobs.dm | 14 +- code/_onclick/telekinesis.dm | 4 +- code/controllers/failsafe.dm | 12 +- code/controllers/master.dm | 8 +- code/controllers/subsystem.dm | 2 +- code/controllers/subsystem/achievements.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 | 2 +- code/controllers/subsystem/mapping.dm | 16 +- code/controllers/subsystem/pai.dm | 4 +- code/controllers/subsystem/server_maint.dm | 2 +- code/controllers/subsystem/shuttle.dm | 6 +- code/controllers/subsystem/ticker.dm | 28 +- code/controllers/subsystem/vote.dm | 4 +- code/datums/achievements/viewer.dm | 2 +- code/datums/action.dm | 6 +- 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 | 6 +- code/datums/brain_damage/imaginary_friend.dm | 12 +- code/datums/brain_damage/magic.dm | 18 +- code/datums/brain_damage/mild.dm | 14 +- code/datums/brain_damage/mrat.dm | 18 +- code/datums/brain_damage/phobia.dm | 20 +- code/datums/brain_damage/severe.dm | 34 +- code/datums/brain_damage/special.dm | 36 +- code/datums/brain_damage/split_personality.dm | 18 +- code/datums/browser.dm | 2 +- code/datums/components/archaeology.dm | 6 +- code/datums/components/armor_plate.dm | 18 +- code/datums/components/art.dm | 2 +- code/datums/components/butchering.dm | 6 +- code/datums/components/caltrop.dm | 8 +- code/datums/components/chasm.dm | 10 +- code/datums/components/cleaning.dm | 2 +- code/datums/components/crafting/crafting.dm | 4 +- code/datums/components/gunpoint.dm | 36 +- code/datums/components/heirloom.dm | 6 +- code/datums/components/jousting.dm | 2 +- code/datums/components/knockoff.dm | 2 +- code/datums/components/material_container.dm | 14 +- code/datums/components/mood.dm | 6 +- code/datums/components/nanites.dm | 18 +- code/datums/components/orbiter.dm | 2 +- code/datums/components/paintable.dm | 4 +- code/datums/components/religious_tool.dm | 4 +- code/datums/components/remote_materials.dm | 4 +- code/datums/components/riding.dm | 12 +- code/datums/components/rotation.dm | 4 +- code/datums/components/spawner.dm | 2 +- code/datums/components/spooky.dm | 2 +- code/datums/components/stationloving.dm | 2 +- .../storage/concrete/bag_of_holding.dm | 8 +- .../components/storage/concrete/pockets.dm | 4 +- .../components/storage/concrete/rped.dm | 4 +- code/datums/components/storage/storage.dm | 50 +- code/datums/components/summoning.dm | 2 +- code/datums/components/tether.dm | 4 +- code/datums/components/uplink.dm | 6 +- code/datums/dash_weapon.dm | 2 +- code/datums/datumvars.dm | 24 +- .../datums/diseases/advance/symptoms/beard.dm | 2 +- .../diseases/advance/symptoms/choking.dm | 12 +- .../diseases/advance/symptoms/confusion.dm | 4 +- .../diseases/advance/symptoms/deafness.dm | 6 +- .../datums/diseases/advance/symptoms/dizzy.dm | 4 +- .../datums/diseases/advance/symptoms/fever.dm | 4 +- code/datums/diseases/advance/symptoms/fire.dm | 14 +- .../diseases/advance/symptoms/flesh_eating.dm | 8 +- .../diseases/advance/symptoms/hallucigen.dm | 10 +- .../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 | 10 +- .../diseases/advance/symptoms/necropolis.dm | 8 +- .../diseases/advance/symptoms/oxygen.dm | 2 +- .../diseases/advance/symptoms/radiation.dm | 10 +- .../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 | 6 +- .../diseases/advance/symptoms/vision.dm | 8 +- .../diseases/advance/symptoms/voice_change.dm | 2 +- .../datums/diseases/advance/symptoms/vomit.dm | 2 +- .../diseases/advance/symptoms/weight.dm | 2 +- .../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 | 10 +- code/datums/diseases/cold.dm | 16 +- 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 | 12 +- code/datums/diseases/jitters.dm | 6 +- code/datums/diseases/magnitis.dm | 10 +- code/datums/diseases/parrotpossession.dm | 2 +- code/datums/diseases/pierrot_throat.dm | 4 +- code/datums/diseases/retrovirus.dm | 20 +- code/datums/diseases/rhumba_beat.dm | 10 +- code/datums/diseases/sleepy.dm | 20 +- code/datums/diseases/transformation.dm | 62 +- code/datums/diseases/tuberculosis.dm | 20 +- code/datums/diseases/wizarditis.dm | 6 +- code/datums/dna.dm | 32 +- code/datums/emotes.dm | 10 +- code/datums/helper_datums/teleport.dm | 2 +- code/datums/holocall.dm | 4 +- code/datums/martial.dm | 12 +- code/datums/martial/boxing.dm | 16 +- code/datums/martial/cqc.dm | 54 +- code/datums/martial/flying_fang.dm | 38 +- code/datums/martial/knifeboxing.dm | 12 +- code/datums/martial/krav_maga.dm | 42 +- code/datums/martial/mushpunch.dm | 10 +- code/datums/martial/plasma_fist.dm | 8 +- code/datums/martial/psychotic_brawl.dm | 12 +- code/datums/martial/sleeping_carp.dm | 44 +- code/datums/martial/wrestling.dm | 24 +- code/datums/mind.dm | 8 +- .../mood_events/generic_positive_events.dm | 2 +- code/datums/mutations/actions.dm | 34 +- code/datums/mutations/antenna.dm | 26 +- code/datums/mutations/body.dm | 70 +-- code/datums/mutations/chameleon.dm | 4 +- code/datums/mutations/cold.dm | 4 +- code/datums/mutations/heat_adaptation.dm | 2 +- code/datums/mutations/hulk.dm | 10 +- code/datums/mutations/radioactive.dm | 2 +- code/datums/mutations/sight.dm | 10 +- 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 | 12 +- code/datums/status_effects/buffs.dm | 44 +- code/datums/status_effects/debuffs.dm | 58 +- code/datums/status_effects/gas.dm | 2 +- code/datums/status_effects/neutral.dm | 16 +- code/datums/traits/_quirk.dm | 4 +- code/datums/traits/good.dm | 52 +- code/datums/traits/negative.dm | 96 ++-- code/datums/traits/neutral.dm | 22 +- code/datums/voice_announcements.dm | 2 +- code/datums/weather/weather.dm | 6 +- .../datums/weather/weather_types/acid_rain.dm | 4 +- .../datums/weather/weather_types/ash_storm.dm | 8 +- .../weather/weather_types/floor_is_lava.dm | 6 +- .../weather/weather_types/radiation_storm.dm | 4 +- .../weather/weather_types/snow_storm.dm | 4 +- code/datums/wires/_wires.dm | 6 +- code/datums/wires/mulebot.dm | 10 +- code/datums/wires/syndicatebomb.dm | 26 +- code/datums/world_topic.dm | 2 +- code/game/area/Space_Station_13_areas.dm | 2 +- code/game/area/areas.dm | 2 +- code/game/area/areas/ruins/icemoon.dm | 2 +- code/game/atoms.dm | 12 +- code/game/atoms_movable.dm | 6 +- code/game/gamemodes/clock_cult/clock_cult.dm | 6 +- .../game/gamemodes/clown_ops/clown_weapons.dm | 4 +- code/game/gamemodes/clown_ops/honkmother.dm | 4 +- code/game/gamemodes/cult/cult.dm | 12 +- .../game/gamemodes/dynamic/ruleset_picking.dm | 4 +- code/game/gamemodes/game_mode.dm | 6 +- code/game/gamemodes/hivemind/radar.dm | 2 +- code/game/gamemodes/meteor/meteor.dm | 6 +- code/game/gamemodes/meteor/meteors.dm | 2 +- code/game/gamemodes/objective.dm | 4 +- code/game/golf/golf.dm | 16 +- code/game/machinery/PDApainter.dm | 14 +- code/game/machinery/Sleeper.dm | 16 +- code/game/machinery/_machinery.dm | 30 +- code/game/machinery/ai_slipper.dm | 4 +- code/game/machinery/airlock_cycle_control.dm | 32 +- code/game/machinery/announcement_system.dm | 8 +- code/game/machinery/aug_manipulator.dm | 18 +- code/game/machinery/autolathe.dm | 4 +- code/game/machinery/bank_machine.dm | 2 +- code/game/machinery/bounty_board.dm | 6 +- code/game/machinery/buttons.dm | 30 +- code/game/machinery/camera/camera.dm | 38 +- code/game/machinery/camera/camera_assembly.dm | 34 +- code/game/machinery/camera/motion.dm | 2 +- code/game/machinery/camera/tracking.dm | 8 +- code/game/machinery/cell_charger.dm | 14 +- code/game/machinery/cloning.dm | 14 +- code/game/machinery/computer/_computer.dm | 6 +- code/game/machinery/computer/aifixer.dm | 10 +- code/game/machinery/computer/apc_control.dm | 2 +- code/game/machinery/computer/arcade.dm | 52 +- code/game/machinery/computer/atmos_control.dm | 2 +- .../game/machinery/computer/buildandrepair.dm | 38 +- .../machinery/computer/camera_advanced.dm | 8 +- code/game/machinery/computer/card.dm | 18 +- code/game/machinery/computer/cloning.dm | 8 +- .../game/machinery/computer/communications.dm | 36 +- code/game/machinery/computer/dna_console.dm | 56 +- .../machinery/computer/gulag_teleporter.dm | 8 +- .../machinery/computer/launchpad_control.dm | 10 +- code/game/machinery/computer/law.dm | 6 +- code/game/machinery/computer/medical.dm | 2 +- code/game/machinery/computer/pod.dm | 2 +- code/game/machinery/computer/prisoner.dm | 4 +- code/game/machinery/computer/robot.dm | 14 +- code/game/machinery/computer/security.dm | 2 +- code/game/machinery/computer/teleporter.dm | 2 +- code/game/machinery/computer/warrant.dm | 8 +- code/game/machinery/constructable_frame.dm | 46 +- code/game/machinery/cryopod.dm | 40 +- code/game/machinery/dance_machine.dm | 14 +- code/game/machinery/defibrillator_mount.dm | 44 +- code/game/machinery/deployable.dm | 18 +- code/game/machinery/dish_drive.dm | 16 +- code/game/machinery/dna_scanner.dm | 16 +- code/game/machinery/doors/airlock.dm | 202 +++---- code/game/machinery/doors/airlock_types.dm | 16 +- code/game/machinery/doors/brigdoors.dm | 2 +- code/game/machinery/doors/door.dm | 8 +- code/game/machinery/doors/firedoor.dm | 122 ++-- code/game/machinery/doors/poddoor.dm | 26 +- code/game/machinery/doors/windowdoor.dm | 14 +- code/game/machinery/doppler_array.dm | 8 +- code/game/machinery/droneDispenser.dm | 22 +- code/game/machinery/electrolyzer.dm | 10 +- .../embedded_controller/access_controller.dm | 6 +- code/game/machinery/exp_cloner.dm | 4 +- code/game/machinery/fat_sucker.dm | 30 +- code/game/machinery/firealarm.dm | 40 +- code/game/machinery/flasher.dm | 20 +- code/game/machinery/gulag_item_reclaimer.dm | 6 +- code/game/machinery/gulag_processor.dm | 16 +- code/game/machinery/gulag_teleporter.dm | 16 +- code/game/machinery/harvester.dm | 20 +- code/game/machinery/hologram.dm | 14 +- code/game/machinery/igniter.dm | 6 +- code/game/machinery/iv_drip.dm | 26 +- code/game/machinery/launch_pad.dm | 22 +- code/game/machinery/lightswitch.dm | 8 +- code/game/machinery/limbgrower.dm | 4 +- code/game/machinery/mass_driver.dm | 2 +- code/game/machinery/navbeacon.dm | 10 +- code/game/machinery/newscaster.dm | 28 +- code/game/machinery/pipe/construction.dm | 18 +- code/game/machinery/pipe/pipe_dispenser.dm | 6 +- .../machinery/porta_turret/portable_turret.dm | 34 +- .../porta_turret/portable_turret_construct.dm | 40 +- .../porta_turret/portable_turret_cover.dm | 12 +- code/game/machinery/quantum_pad.dm | 30 +- code/game/machinery/recharger.dm | 12 +- code/game/machinery/recycler.dm | 2 +- code/game/machinery/requests_console.dm | 14 +- code/game/machinery/scan_gate.dm | 12 +- code/game/machinery/sci_bombardment.dm | 14 +- code/game/machinery/shieldgen.dm | 74 +-- code/game/machinery/slotmachine.dm | 24 +- code/game/machinery/spaceheater.dm | 10 +- code/game/machinery/stasis.dm | 10 +- code/game/machinery/suit_storage_unit.dm | 54 +- code/game/machinery/syndicatebeacon.dm | 18 +- code/game/machinery/syndicatebomb.dm | 46 +- .../telecomms/computers/logbrowser.dm | 2 +- .../machinery/telecomms/computers/message.dm | 38 +- .../telecomms/machine_interactions.dm | 6 +- .../telecomms/machines/message_server.dm | 12 +- .../machinery/telecomms/telecomunications.dm | 2 +- code/game/machinery/teleporter.dm | 18 +- code/game/machinery/washing_machine.dm | 16 +- code/game/mecha/equipment/mecha_equipment.dm | 6 +- .../mecha/equipment/tools/medical_tools.dm | 16 +- .../mecha/equipment/tools/mining_tools.dm | 12 +- .../game/mecha/equipment/tools/other_tools.dm | 2 +- code/game/mecha/equipment/tools/weapon_bay.dm | 4 +- code/game/mecha/equipment/tools/work_tools.dm | 50 +- .../mecha/equipment/weapons/mecha_ammo.dm | 4 +- code/game/mecha/mech_fabricator.dm | 8 +- code/game/mecha/mecha.dm | 112 ++-- code/game/mecha/mecha_actions.dm | 8 +- code/game/mecha/mecha_construction_paths.dm | 528 +++++++++--------- code/game/mecha/mecha_control_console.dm | 2 +- code/game/mecha/mecha_defense.dm | 42 +- code/game/mecha/mecha_parts.dm | 4 +- code/game/mecha/mecha_topic.dm | 28 +- code/game/mecha/mecha_wreckage.dm | 20 +- code/game/mecha/working/ripley.dm | 8 +- code/game/objects/buckling.dm | 28 +- code/game/objects/effects/alien_acid.dm | 12 +- code/game/objects/effects/anomalies.dm | 8 +- code/game/objects/effects/contraband.dm | 28 +- code/game/objects/effects/custom_portals.dm | 2 +- code/game/objects/effects/decals/cleanable.dm | 10 +- .../objects/effects/decals/cleanable/food.dm | 8 +- .../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 | 2 +- code/game/objects/effects/mines.dm | 26 +- code/game/objects/effects/spiders.dm | 12 +- code/game/objects/effects/step_triggers.dm | 2 +- code/game/objects/items.dm | 36 +- code/game/objects/items/AI_modules.dm | 30 +- code/game/objects/items/RCD.dm | 54 +- code/game/objects/items/RCL.dm | 18 +- code/game/objects/items/RPD.dm | 40 +- code/game/objects/items/RSF.dm | 30 +- code/game/objects/items/airlock_painter.dm | 22 +- code/game/objects/items/apc_frame.dm | 20 +- code/game/objects/items/armor_polish.dm | 10 +- 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 | 12 +- code/game/objects/items/cards_ids.dm | 54 +- code/game/objects/items/chrono_eraser.dm | 2 +- code/game/objects/items/cigs_lighters.dm | 94 ++-- .../items/circuitboards/circuitboard.dm | 2 +- .../circuitboards/computer_circuitboards.dm | 22 +- .../circuitboards/machine_circuitboards.dm | 22 +- code/game/objects/items/clown_items.dm | 26 +- code/game/objects/items/cosmetics.dm | 84 +-- code/game/objects/items/courtroom.dm | 4 +- code/game/objects/items/crab17.dm | 10 +- code/game/objects/items/crayons.dm | 38 +- code/game/objects/items/credit_holochip.dm | 6 +- code/game/objects/items/defib.dm | 120 ++-- code/game/objects/items/dehy_carp.dm | 10 +- code/game/objects/items/devices/PDA/PDA.dm | 84 +-- .../objects/items/devices/PDA/virus_cart.dm | 18 +- code/game/objects/items/devices/aicard.dm | 2 +- .../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 +- code/game/objects/items/devices/doorCharge.dm | 2 +- .../devices/electroadaptive_pseudocircuit.dm | 10 +- code/game/objects/items/devices/flashlight.dm | 78 +-- .../items/devices/forcefieldprojector.dm | 14 +- .../objects/items/devices/geiger_counter.dm | 46 +- code/game/objects/items/devices/gps.dm | 2 +- .../objects/items/devices/laserpointer.dm | 44 +- .../objects/items/devices/lightreplacer.dm | 24 +- code/game/objects/items/devices/megaphone.dm | 8 +- 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 | 20 +- .../objects/items/devices/pressureplates.dm | 12 +- .../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 | 16 +- .../game/objects/items/devices/radio/radio.dm | 18 +- .../items/devices/reverse_bear_trap.dm | 30 +- code/game/objects/items/devices/scanners.dm | 142 ++--- .../objects/items/devices/taperecorder.dm | 26 +- .../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 | 16 +- 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 | 20 +- code/game/objects/items/flamethrower.dm | 16 +- code/game/objects/items/gift.dm | 8 +- code/game/objects/items/granters.dm | 72 +-- .../objects/items/grenades/atmos_grenades.dm | 2 +- .../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 | 14 +- code/game/objects/items/grenades/plastic.dm | 12 +- code/game/objects/items/handcuffs.dm | 38 +- code/game/objects/items/his_grace.dm | 30 +- code/game/objects/items/holosign_creator.dm | 22 +- code/game/objects/items/holy_weapons.dm | 12 +- 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 +- .../items/implants/implant_greytide.dm | 12 +- .../items/implants/implant_mindshield.dm | 14 +- .../items/implants/implant_mindshieldtot.dm | 14 +- .../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 | 28 +- code/game/objects/items/kitchen.dm | 20 +- 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 | 46 +- code/game/objects/items/melee/transforming.dm | 4 +- code/game/objects/items/miscellaneous.dm | 4 +- code/game/objects/items/mop.dm | 10 +- 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 | 60 +- code/game/objects/items/pneumaticCannon.dm | 42 +- code/game/objects/items/powerfist.dm | 34 +- code/game/objects/items/puzzle_pieces.dm | 8 +- code/game/objects/items/religion.dm | 8 +- code/game/objects/items/robot/ai_upgrades.dm | 12 +- code/game/objects/items/robot/robot_items.dm | 122 ++-- code/game/objects/items/robot/robot_parts.dm | 62 +- .../objects/items/robot/robot_upgrades.dm | 56 +- code/game/objects/items/sharpener.dm | 18 +- code/game/objects/items/shields.dm | 26 +- code/game/objects/items/shooting_range.dm | 4 +- code/game/objects/items/signs.dm | 2 +- code/game/objects/items/singularityhammer.dm | 6 +- code/game/objects/items/stacks/bscrystal.dm | 10 +- code/game/objects/items/stacks/medical.dm | 50 +- code/game/objects/items/stacks/rods.dm | 12 +- .../game/objects/items/stacks/sheets/glass.dm | 22 +- .../objects/items/stacks/sheets/hot_ice.dm | 2 +- .../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 | 12 +- 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 | 6 +- code/game/objects/items/storage/book.dm | 56 +- code/game/objects/items/storage/boxes.dm | 28 +- 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 | 6 +- code/game/objects/items/storage/toolbox.dm | 8 +- .../game/objects/items/storage/uplink_kits.dm | 4 +- code/game/objects/items/stunbaton.dm | 40 +- .../objects/items/supermatter_delaminator.dm | 28 +- .../objects/items/syndicateReverseCard.dm | 6 +- code/game/objects/items/tanks/jetpack.dm | 14 +- code/game/objects/items/tanks/tanks.dm | 18 +- code/game/objects/items/tanks/watertank.dm | 24 +- 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 | 2 +- code/game/objects/items/tools/screwdriver.dm | 4 +- 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 | 154 ++--- code/game/objects/items/twohanded.dm | 68 +-- code/game/objects/items/weaponry.dm | 76 +-- code/game/objects/obj_defense.dm | 6 +- code/game/objects/objs.dm | 6 +- code/game/objects/structures.dm | 18 +- code/game/objects/structures/ai_core.dm | 54 +- code/game/objects/structures/aliens.dm | 8 +- code/game/objects/structures/artstuff.dm | 10 +- code/game/objects/structures/barsigns.dm | 16 +- .../structures/beds_chairs/alien_nest.dm | 22 +- .../objects/structures/beds_chairs/bed.dm | 18 +- .../objects/structures/beds_chairs/chair.dm | 26 +- code/game/objects/structures/bedsheet_bin.dm | 26 +- .../structures/crates_lockers/closets.dm | 84 +-- .../closets/bluespace_locker.dm | 10 +- .../crates_lockers/closets/bodybag.dm | 14 +- .../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 | 8 +- .../crates_lockers/crates/secure.dm | 14 +- .../structures/destructible_structures.dm | 2 +- code/game/objects/structures/displaycase.dm | 68 +-- code/game/objects/structures/divine.dm | 6 +- code/game/objects/structures/door_assembly.dm | 60 +- 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 | 14 +- code/game/objects/structures/fence.dm | 22 +- code/game/objects/structures/fireaxe.dm | 34 +- code/game/objects/structures/fireplace.dm | 6 +- code/game/objects/structures/flora.dm | 12 +- code/game/objects/structures/fluff.dm | 4 +- .../objects/structures/ghost_role_spawners.dm | 4 +- code/game/objects/structures/girders.dm | 116 ++-- code/game/objects/structures/grille.dm | 26 +- code/game/objects/structures/guillotine.dm | 28 +- 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 | 2 +- code/game/objects/structures/janicart.dm | 30 +- code/game/objects/structures/kitchen_spike.dm | 32 +- code/game/objects/structures/ladders.dm | 8 +- code/game/objects/structures/lattice.dm | 4 +- .../structures/lavaland/necropolis_tendril.dm | 6 +- code/game/objects/structures/life_candle.dm | 4 +- code/game/objects/structures/loom.dm | 6 +- code/game/objects/structures/mineral_doors.dm | 20 +- code/game/objects/structures/mirror.dm | 10 +- code/game/objects/structures/mop_bucket.dm | 6 +- code/game/objects/structures/morgue.dm | 28 +- code/game/objects/structures/noticeboard.dm | 8 +- .../objects/structures/petrified_statue.dm | 8 +- code/game/objects/structures/plasticflaps.dm | 8 +- code/game/objects/structures/railings.dm | 16 +- code/game/objects/structures/reflector.dm | 36 +- 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 | 4 +- code/game/objects/structures/table_frames.dm | 14 +- code/game/objects/structures/tables_racks.dm | 48 +- .../game/objects/structures/tank_dispenser.dm | 6 +- code/game/objects/structures/target_stake.dm | 6 +- .../structures/transit_tubes/station.dm | 8 +- .../structures/transit_tubes/transit_tube.dm | 6 +- .../transit_tubes/transit_tube_cargo_pod.dm | 2 +- .../transit_tube_construction.dm | 4 +- .../transit_tubes/transit_tube_pod.dm | 8 +- code/game/objects/structures/traps.dm | 4 +- code/game/objects/structures/watercloset.dm | 94 ++-- .../objects/structures/windoor_assembly.dm | 54 +- code/game/objects/structures/window.dm | 100 ++-- code/game/shuttle_engines.dm | 16 +- code/game/turfs/open.dm | 6 +- code/game/turfs/openspace/openspace.dm | 16 +- code/game/turfs/simulated/chasm.dm | 12 +- code/game/turfs/simulated/floor.dm | 16 +- .../game/turfs/simulated/floor/fancy_floor.dm | 8 +- .../game/turfs/simulated/floor/light_floor.dm | 4 +- code/game/turfs/simulated/floor/misc_floor.dm | 4 +- code/game/turfs/simulated/floor/plating.dm | 24 +- .../turfs/simulated/floor/plating/asteroid.dm | 8 +- .../game/turfs/simulated/floor/reinf_floor.dm | 2 +- code/game/turfs/simulated/lava.dm | 2 +- code/game/turfs/simulated/minerals.dm | 16 +- code/game/turfs/simulated/wall/misc_walls.dm | 8 +- code/game/turfs/simulated/wall/reinf_walls.dm | 50 +- code/game/turfs/simulated/walls.dm | 18 +- code/game/turfs/space/space.dm | 18 +- code/game/turfs/turf.dm | 6 +- code/game/world.dm | 6 +- code/modules/VR/vr_human.dm | 8 +- code/modules/VR/vr_sleeper.dm | 14 +- code/modules/admin/IsBanned.dm | 10 +- code/modules/admin/admin.dm | 12 +- code/modules/admin/admin_investigate.dm | 2 +- code/modules/admin/admin_verbs.dm | 32 +- code/modules/admin/antag_panel.dm | 10 +- code/modules/admin/antag_token.dm | 14 +- code/modules/admin/create_poll.dm | 2 +- code/modules/admin/fun_balloon.dm | 2 +- code/modules/admin/outfits.dm | 8 +- code/modules/admin/permissionedit.dm | 12 +- code/modules/admin/secrets.dm | 22 +- code/modules/admin/sound_emitter.dm | 14 +- code/modules/admin/sql_ban_system.dm | 24 +- code/modules/admin/sql_message_system.dm | 16 +- code/modules/admin/stickyban.dm | 64 +-- code/modules/admin/topic.dm | 84 +-- code/modules/admin/verbs/SDQL2/SDQL_2.dm | 30 +- .../admin/verbs/SDQL2/SDQL_2_parser.dm | 2 +- code/modules/admin/verbs/adminhelp.dm | 16 +- code/modules/admin/verbs/adminpm.dm | 28 +- code/modules/admin/verbs/borgpanel.dm | 4 +- code/modules/admin/verbs/deadsay.dm | 2 +- code/modules/admin/verbs/debug.dm | 52 +- code/modules/admin/verbs/diagnostics.dm | 2 +- code/modules/admin/verbs/fps.dm | 2 +- .../admin/verbs/map_template_loadverb.dm | 10 +- code/modules/admin/verbs/onlyone.dm | 6 +- code/modules/admin/verbs/panicbunker.dm | 2 +- code/modules/admin/verbs/playsound.dm | 22 +- code/modules/admin/verbs/pray.dm | 6 +- code/modules/admin/verbs/randomverbs.dm | 40 +- .../admin/verbs/reestablish_db_connection.dm | 2 +- code/modules/admin/verbs/tripAI.dm | 4 +- .../antagonists/_common/antag_spawner.dm | 22 +- .../modules/antagonists/_common/antag_team.dm | 8 +- code/modules/antagonists/abductor/abductor.dm | 12 +- .../abductor/equipment/abduction_gear.dm | 130 ++--- .../abductor/equipment/abduction_surgery.dm | 6 +- .../antagonists/abductor/equipment/gland.dm | 50 +- .../antagonists/abductor/machinery/console.dm | 10 +- .../abductor/machinery/experiment.dm | 18 +- .../antagonists/abductor/machinery/pad.dm | 4 +- 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 | 2 +- code/modules/antagonists/blob/overmind.dm | 2 +- code/modules/antagonists/blob/powers.dm | 58 +- .../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 | 34 +- .../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 | 32 +- .../changeling/powers/mimic_voice.dm | 4 +- .../changeling/powers/mutations.dm | 54 +- .../antagonists/changeling/powers/panacea.dm | 2 +- .../changeling/powers/pheromone_receptors.dm | 4 +- .../changeling/powers/strained_muscles.dm | 10 +- .../changeling/powers/tiny_prick.dm | 24 +- .../changeling/powers/transform.dm | 16 +- .../clock_effects/city_of_cogs_rift.dm | 18 +- .../clockcult/clock_effects/clock_sigils.dm | 52 +- .../clock_effects/servant_blocker.dm | 2 +- .../clock_effects/spatial_gateway.dm | 42 +- .../clock_helpers/clock_powerdrain.dm | 4 +- .../clock_helpers/fabrication_helpers.dm | 26 +- .../clockcult/clock_helpers/slab_abilities.dm | 52 +- .../clockcult/clock_items/clock_components.dm | 8 +- .../clock_items/clock_weapons/_call_weapon.dm | 12 +- .../clock_weapons/ratvarian_spear.dm | 12 +- .../clockcult/clock_items/clockwork_armor.dm | 16 +- .../clockcult/clock_items/clockwork_slab.dm | 16 +- .../clock_items/construct_chassis.dm | 12 +- .../clockcult/clock_items/judicial_visor.dm | 20 +- .../clock_items/replica_fabricator.dm | 36 +- .../clockcult/clock_items/soul_vessel.dm | 38 +- .../clock_items/wraith_spectacles.dm | 4 +- .../clockcult/clock_mobs/_eminence.dm | 24 +- .../clock_mobs/clockwork_marauder.dm | 14 +- .../antagonists/clockcult/clock_scripture.dm | 18 +- .../scripture_applications.dm | 16 +- .../clock_scriptures/scripture_cyborg.dm | 2 +- .../clock_scriptures/scripture_drivers.dm | 18 +- .../clock_scriptures/scripture_scripts.dm | 26 +- .../antagonists/clockcult/clock_structure.dm | 14 +- .../clock_structures/_trap_object.dm | 14 +- .../ark_of_the_clockwork_justicar.dm | 22 +- .../clock_structures/clockwork_obelisk.dm | 24 +- .../clock_structures/eminence_spire.dm | 22 +- .../clock_structures/heralds_beacon.dm | 6 +- .../clockcult/clock_structures/mania_motor.dm | 6 +- .../clock_structures/ocular_warden.dm | 14 +- .../ratvar_the_clockwork_justicar.dm | 4 +- .../clock_structures/trap_triggers/lever.dm | 2 +- .../trap_triggers/pressure_sensor.dm | 2 +- .../trap_triggers/repeater.dm | 4 +- .../clock_structures/traps/brass_skewer.dm | 32 +- .../clock_structures/traps/steam_vent.dm | 2 +- .../clockcult/clock_structures/wall_gear.dm | 20 +- .../antagonists/clockcult/clockcult.dm | 16 +- code/modules/antagonists/creep/creep.dm | 14 +- code/modules/antagonists/cult/blood_magic.dm | 150 ++--- code/modules/antagonists/cult/cult.dm | 20 +- code/modules/antagonists/cult/cult_comms.dm | 38 +- code/modules/antagonists/cult/cult_items.dm | 90 +-- .../antagonists/cult/cult_structures.dm | 42 +- code/modules/antagonists/cult/ritual.dm | 40 +- .../antagonists/cult/rune_spawn_action.dm | 6 +- code/modules/antagonists/cult/runes.dm | 114 ++-- code/modules/antagonists/devil/devil.dm | 46 +- .../antagonists/devil/devil_helpers.dm | 6 +- code/modules/antagonists/devil/imp/imp.dm | 2 +- .../devil/true_devil/_true_devil.dm | 32 +- .../antagonists/disease/disease_abilities.dm | 12 +- .../antagonists/disease/disease_datum.dm | 8 +- .../antagonists/disease/disease_mob.dm | 18 +- .../eldritch_cult/eldritch_antag.dm | 14 +- .../eldritch_cult/eldritch_book.dm | 8 +- .../eldritch_cult/eldritch_effects.dm | 16 +- .../eldritch_cult/eldritch_items.dm | 18 +- .../eldritch_cult/eldritch_knowledge.dm | 2 +- .../eldritch_cult/eldritch_magic.dm | 44 +- .../eldritch_cult/eldritch_monster_antag.dm | 6 +- .../eldritch_cult/eldritch_transmutations.dm | 12 +- .../eldritch_cult/knowledge/flesh_lore.dm | 8 +- .../transmutations/flesh_transmutations.dm | 2 +- code/modules/antagonists/fugitive/fugitive.dm | 20 +- .../antagonists/fugitive/fugitive_ship.dm | 6 +- code/modules/antagonists/fugitive/hunter.dm | 12 +- code/modules/antagonists/fugitive/old_god.dm | 12 +- code/modules/antagonists/hivemind/hivemind.dm | 8 +- code/modules/antagonists/hivemind/vessel.dm | 4 +- code/modules/antagonists/monkey/monkey.dm | 4 +- code/modules/antagonists/morph/morph.dm | 26 +- code/modules/antagonists/ninja/ninja.dm | 2 +- .../nukeop/equipment/borgchameleon.dm | 16 +- .../nukeop/equipment/nuclear_challenge.dm | 4 +- .../nukeop/equipment/nuclearbomb.dm | 48 +- .../nukeop/equipment/pinpointer.dm | 4 +- code/modules/antagonists/nukeop/nukeop.dm | 6 +- .../antagonists/overthrow/overthrow.dm | 2 +- .../overthrow/overthrow_converter.dm | 16 +- code/modules/antagonists/pirate/pirate.dm | 4 +- code/modules/antagonists/revenant/revenant.dm | 54 +- .../revenant/revenant_abilities.dm | 64 +-- .../antagonists/revenant/revenant_blight.dm | 8 +- .../antagonists/revolution/revolution.dm | 24 +- code/modules/antagonists/santa/santa.dm | 2 +- .../antagonists/separatist/separatist.dm | 4 +- .../antagonists/slaughter/slaughter.dm | 12 +- code/modules/antagonists/swarmer/swarmer.dm | 2 +- .../traitor/IAA/internal_affairs.dm | 26 +- .../antagonists/traitor/datum_traitor.dm | 16 +- .../traitor/equipment/Malf_Modules.dm | 98 ++-- .../traitor/equipment/contractor.dm | 8 +- .../antagonists/traitor/syndicate_contract.dm | 10 +- .../antagonists/valentines/valentine.dm | 4 +- .../antagonists/wizard/equipment/artefact.dm | 42 +- .../antagonists/wizard/equipment/soulstone.dm | 32 +- .../antagonists/wizard/equipment/spellbook.dm | 30 +- code/modules/antagonists/wizard/wizard.dm | 12 +- .../antagonists/zombie/abilities/acid.dm | 8 +- .../zombie/abilities/necromance.dm | 4 +- .../antagonists/zombie/abilities/spit.dm | 6 +- .../antagonists/zombie/abilities/tank.dm | 2 +- code/modules/antagonists/zombie/zombie.dm | 22 +- code/modules/assembly/assembly.dm | 12 +- code/modules/assembly/bomb.dm | 12 +- code/modules/assembly/doorcontrol.dm | 2 +- code/modules/assembly/flash.dm | 60 +- 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 | 40 +- .../atmospherics/machinery/atmosmachinery.dm | 18 +- .../components/binary_devices/circulator.dm | 18 +- .../components/binary_devices/passive_gate.dm | 2 +- .../binary_devices/pressure_valve.dm | 2 +- .../components/binary_devices/pump.dm | 2 +- .../binary_devices/temperature_gate.dm | 8 +- .../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 | 20 +- .../unary_devices/outlet_injector.dm | 2 +- .../unary_devices/portables_connector.dm | 2 +- .../components/unary_devices/thermomachine.dm | 2 +- .../components/unary_devices/vent_pump.dm | 8 +- .../components/unary_devices/vent_scrubber.dm | 4 +- .../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 | 16 +- code/modules/awaymissions/corpse.dm | 8 +- code/modules/awaymissions/gateway.dm | 6 +- .../awaymissions/mission_code/Academy.dm | 50 +- .../awaymissions/mission_code/runner.dm | 8 +- .../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/buildmode.dm | 4 +- code/modules/buildmode/submodes/advanced.dm | 22 +- code/modules/buildmode/submodes/area_edit.dm | 12 +- code/modules/buildmode/submodes/basic.dm | 16 +- code/modules/buildmode/submodes/boom.dm | 8 +- code/modules/buildmode/submodes/copy.dm | 10 +- code/modules/buildmode/submodes/delete.dm | 4 +- code/modules/buildmode/submodes/fill.dm | 12 +- code/modules/buildmode/submodes/mapgen.dm | 12 +- code/modules/buildmode/submodes/outfit.dm | 2 +- 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 | 10 +- code/modules/cargo/expressconsole.dm | 10 +- code/modules/cargo/gondolapod.dm | 4 +- code/modules/cargo/supplypod.dm | 2 +- code/modules/cargo/supplypod_beacon.dm | 8 +- code/modules/client/client_procs.dm | 42 +- code/modules/client/preferences.dm | 18 +- code/modules/client/preferences_toggles.dm | 4 +- code/modules/client/verbs/etips.dm | 4 +- code/modules/client/verbs/linkforum.dm | 4 +- code/modules/client/verbs/ooc.dm | 22 +- code/modules/client/verbs/ping.dm | 2 +- code/modules/client/verbs/suicide.dm | 40 +- code/modules/client/verbs/who.dm | 2 +- code/modules/clothing/chameleon.dm | 6 +- code/modules/clothing/clothing.dm | 24 +- code/modules/clothing/ears/_ears.dm | 2 +- code/modules/clothing/glasses/_glasses.dm | 12 +- .../clothing/glasses/engine_goggles.dm | 2 +- code/modules/clothing/glasses/hud.dm | 2 +- code/modules/clothing/gloves/_gloves.dm | 2 +- code/modules/clothing/gloves/color.dm | 6 +- code/modules/clothing/gloves/miscellaneous.dm | 2 +- code/modules/clothing/head/helmet.dm | 10 +- code/modules/clothing/head/jobs.dm | 16 +- code/modules/clothing/head/misc.dm | 2 +- code/modules/clothing/head/misc_special.dm | 14 +- 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 | 4 +- code/modules/clothing/masks/hailer.dm | 20 +- code/modules/clothing/masks/miscellaneous.dm | 12 +- code/modules/clothing/neck/_neck.dm | 18 +- code/modules/clothing/neck/bodycamera.dm | 16 +- 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 | 18 +- .../modules/clothing/spacesuits/chronosuit.dm | 6 +- code/modules/clothing/spacesuits/hardsuit.dm | 20 +- .../clothing/spacesuits/miscellaneous.dm | 2 +- code/modules/clothing/spacesuits/plasmamen.dm | 4 +- code/modules/clothing/suits/cloaks.dm | 2 +- .../modules/clothing/suits/reactive_armour.dm | 28 +- code/modules/clothing/suits/toggles.dm | 14 +- code/modules/clothing/suits/wiz_robe.dm | 10 +- code/modules/clothing/under/_under.dm | 12 +- code/modules/clothing/under/accessories.dm | 20 +- .../under/jobs/Plasmaman/civilian_service.dm | 2 +- code/modules/clothing/under/miscellaneous.dm | 10 +- code/modules/detectivework/evidence.dm | 14 +- .../detectivework/footprints_and_rag.dm | 10 +- code/modules/detectivework/scanner.dm | 28 +- code/modules/economy/pay_stand.dm | 22 +- code/modules/events/_event.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 | 16 +- code/modules/events/sentience.dm | 2 +- code/modules/events/spacevine.dm | 8 +- 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/peaceborg_dampener.dm | 2 +- code/modules/flufftext/Hallucination.dm | 44 +- code/modules/food_and_drinks/drinks/drinks.dm | 32 +- .../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 | 36 +- .../food_and_drinks/food/customizables.dm | 14 +- code/modules/food_and_drinks/food/snacks.dm | 44 +- .../food_and_drinks/food/snacks/dough.dm | 8 +- .../food_and_drinks/food/snacks_burgers.dm | 2 +- .../food_and_drinks/food/snacks_cheese.dm | 4 +- .../food_and_drinks/food/snacks_egg.dm | 12 +- .../food_and_drinks/food/snacks_meat.dm | 16 +- .../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 | 18 +- .../kitchen_machinery/grill.dm | 14 +- .../kitchen_machinery/icecream_vat.dm | 16 +- .../kitchen_machinery/microwave.dm | 52 +- .../kitchen_machinery/monkeyrecycler.dm | 16 +- .../kitchen_machinery/processor.dm | 22 +- .../kitchen_machinery/smartfridge.dm | 32 +- code/modules/food_and_drinks/pizzabox.dm | 36 +- .../food_and_drinks/recipes/drinks_recipes.dm | 2 +- code/modules/games/cas.dm | 18 +- code/modules/games/wizoff.dm | 2 +- code/modules/goals/station_goals/bsa.dm | 10 +- code/modules/goals/station_goals/dna_vault.dm | 32 +- code/modules/goals/station_goals/shield.dm | 8 +- code/modules/holiday/easter.dm | 2 +- code/modules/holiday/halloween.dm | 4 +- code/modules/holodeck/computer.dm | 2 +- code/modules/holodeck/items.dm | 22 +- code/modules/hydroponics/beekeeping/beebox.dm | 40 +- code/modules/hydroponics/biogenerator.dm | 30 +- code/modules/hydroponics/fermenting_barrel.dm | 12 +- code/modules/hydroponics/gene_modder.dm | 18 +- code/modules/hydroponics/grown.dm | 6 +- 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 | 10 +- code/modules/hydroponics/grown/nettle.dm | 8 +- 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 | 12 +- code/modules/hydroponics/hydroitemdefines.dm | 10 +- code/modules/hydroponics/hydroponics.dm | 84 +-- code/modules/hydroponics/plant_genes.dm | 16 +- code/modules/hydroponics/seed_extractor.dm | 14 +- code/modules/hydroponics/seeds.dm | 4 +- code/modules/instruments/items.dm | 6 +- code/modules/instruments/songs/_song.dm | 4 +- code/modules/jobs/job_exp.dm | 16 +- code/modules/jobs/job_types/bartender.dm | 2 +- code/modules/jobs/job_types/mime.dm | 2 +- code/modules/keybindings/bindings_human.dm | 16 +- code/modules/keybindings/bindings_mob.dm | 4 +- code/modules/language/codespeak.dm | 12 +- code/modules/library/lib_codex_gigas.dm | 4 +- code/modules/library/lib_items.dm | 28 +- code/modules/library/lib_machines.dm | 8 +- code/modules/library/soapstone.dm | 16 +- code/modules/mapping/minimap.dm | 10 +- code/modules/mining/abandoned_crates.dm | 16 +- code/modules/mining/aux_base.dm | 46 +- code/modules/mining/aux_base_camera.dm | 18 +- .../modules/mining/equipment/explorer_gear.dm | 6 +- .../mining/equipment/kinetic_crusher.dm | 12 +- .../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 | 20 +- code/modules/mining/equipment/resonator.dm | 6 +- code/modules/mining/equipment/survival_pod.dm | 14 +- .../mining/equipment/wormhole_jaunter.dm | 8 +- code/modules/mining/fulton.dm | 8 +- code/modules/mining/laborcamp/laborshuttle.dm | 4 +- code/modules/mining/laborcamp/laborstacker.dm | 24 +- code/modules/mining/lavaland/ash_flora.dm | 10 +- .../mining/lavaland/necropolis_chests.dm | 124 ++-- code/modules/mining/machine_redemption.dm | 18 +- code/modules/mining/machine_silo.dm | 14 +- code/modules/mining/machine_stacking.dm | 12 +- code/modules/mining/machine_vending.dm | 12 +- code/modules/mining/mine_items.dm | 2 +- code/modules/mining/minebot.dm | 28 +- code/modules/mining/mint.dm | 2 +- code/modules/mining/ores_coins.dm | 36 +- code/modules/mining/satchel_ore_boxdm.dm | 8 +- code/modules/mob/dead/dead.dm | 4 +- .../modules/mob/dead/new_player/new_player.dm | 54 +- code/modules/mob/dead/new_player/poll.dm | 32 +- code/modules/mob/dead/observer/observer.dm | 30 +- code/modules/mob/emote.dm | 4 +- code/modules/mob/inventory.dm | 8 +- code/modules/mob/living/blood.dm | 8 +- code/modules/mob/living/bloodcrawl.dm | 24 +- code/modules/mob/living/brain/MMI.dm | 28 +- code/modules/mob/living/brain/brain_item.dm | 44 +- code/modules/mob/living/brain/death.dm | 4 +- code/modules/mob/living/brain/posibrain.dm | 22 +- code/modules/mob/living/carbon/alien/alien.dm | 4 +- .../mob/living/carbon/alien/alien_defense.dm | 8 +- .../carbon/alien/humanoid/alien_powers.dm | 42 +- .../carbon/alien/humanoid/caste/drone.dm | 10 +- .../carbon/alien/humanoid/caste/hunter.dm | 6 +- .../carbon/alien/humanoid/caste/praetorian.dm | 6 +- .../living/carbon/alien/humanoid/humanoid.dm | 6 +- .../carbon/alien/humanoid/humanoid_defense.dm | 28 +- .../mob/living/carbon/alien/humanoid/queen.dm | 26 +- .../mob/living/carbon/alien/larva/larva.dm | 4 +- .../carbon/alien/larva/larva_defense.dm | 8 +- .../mob/living/carbon/alien/larva/powers.dm | 18 +- .../modules/mob/living/carbon/alien/organs.dm | 8 +- .../carbon/alien/special/alien_embryo.dm | 16 +- .../living/carbon/alien/special/facehugger.dm | 28 +- code/modules/mob/living/carbon/carbon.dm | 66 +-- .../mob/living/carbon/carbon_defense.dm | 54 +- code/modules/mob/living/carbon/death.dm | 2 +- code/modules/mob/living/carbon/examine.dm | 6 +- .../mob/living/carbon/human/examine.dm | 22 +- code/modules/mob/living/carbon/human/human.dm | 86 +-- .../mob/living/carbon/human/human_defense.dm | 110 ++-- .../mob/living/carbon/human/human_helpers.dm | 6 +- .../mob/living/carbon/human/inventory.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 4 +- .../mob/living/carbon/human/species.dm | 102 ++-- .../carbon/human/species_types/ethereal.dm | 10 +- .../carbon/human/species_types/flypeople.dm | 4 +- .../carbon/human/species_types/golems.dm | 78 +-- .../carbon/human/species_types/jellypeople.dm | 64 +-- .../carbon/human/species_types/mothmen.dm | 2 +- .../carbon/human/species_types/plasmamen.dm | 2 +- .../carbon/human/species_types/podpeople.dm | 4 +- .../human/species_types/shadowpeople.dm | 24 +- .../carbon/human/species_types/vampire.dm | 28 +- .../carbon/human/species_types/zombies.dm | 4 +- code/modules/mob/living/carbon/inventory.dm | 12 +- code/modules/mob/living/carbon/life.dm | 18 +- .../mob/living/carbon/monkey/combat.dm | 4 +- code/modules/mob/living/carbon/monkey/life.dm | 4 +- .../mob/living/carbon/monkey/monkey.dm | 2 +- .../living/carbon/monkey/monkey_defense.dm | 40 +- .../modules/mob/living/carbon/status_procs.dm | 2 +- code/modules/mob/living/emote.dm | 12 +- code/modules/mob/living/inhand_holder.dm | 6 +- code/modules/mob/living/living.dm | 58 +- code/modules/mob/living/living_defense.dm | 96 ++-- code/modules/mob/living/login.dm | 2 +- code/modules/mob/living/say.dm | 6 +- code/modules/mob/living/silicon/ai/ai.dm | 48 +- .../living/silicon/ai/ai_portrait_picker.dm | 6 +- code/modules/mob/living/silicon/ai/examine.dm | 6 +- code/modules/mob/living/silicon/ai/life.dm | 2 +- .../modules/mob/living/silicon/ai/multicam.dm | 14 +- .../mob/living/silicon/ai/robot_control.dm | 6 +- code/modules/mob/living/silicon/ai/say.dm | 12 +- code/modules/mob/living/silicon/pai/pai.dm | 4 +- .../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 | 8 +- .../modules/mob/living/silicon/robot/emote.dm | 2 +- .../mob/living/silicon/robot/examine.dm | 20 +- .../mob/living/silicon/robot/inventory.dm | 20 +- .../modules/mob/living/silicon/robot/robot.dm | 118 ++-- .../mob/living/silicon/robot/robot_defense.dm | 46 +- code/modules/mob/living/silicon/say.dm | 4 +- code/modules/mob/living/silicon/silicon.dm | 4 +- .../mob/living/silicon/silicon_defense.dm | 30 +- .../living/simple_animal/animal_defense.dm | 38 +- .../living/simple_animal/bot/SuperBeepsky.dm | 2 +- .../mob/living/simple_animal/bot/bot.dm | 74 +-- .../mob/living/simple_animal/bot/cleanbot.dm | 22 +- .../living/simple_animal/bot/construction.dm | 72 +-- .../mob/living/simple_animal/bot/ed209bot.dm | 14 +- .../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 | 34 +- .../mob/living/simple_animal/bot/mulebot.dm | 48 +- .../mob/living/simple_animal/bot/secbot.dm | 14 +- .../mob/living/simple_animal/constructs.dm | 18 +- .../living/simple_animal/eldritch_demons.dm | 4 +- .../living/simple_animal/friendly/cheese.dm | 14 +- .../simple_animal/friendly/cockroach.dm | 8 +- .../mob/living/simple_animal/friendly/dog.dm | 44 +- .../simple_animal/friendly/drone/_drone.dm | 16 +- .../friendly/drone/drones_as_items.dm | 2 +- .../friendly/drone/extra_drone_types.dm | 6 +- .../friendly/drone/interaction.dm | 56 +- .../simple_animal/friendly/drone/inventory.dm | 2 +- .../simple_animal/friendly/drone/say.dm | 2 +- .../simple_animal/friendly/drone/verbs.dm | 4 +- .../simple_animal/friendly/farm_animals.dm | 36 +- .../living/simple_animal/friendly/lizard.dm | 2 +- .../living/simple_animal/friendly/mouse.dm | 26 +- .../mob/living/simple_animal/friendly/pet.dm | 2 +- .../living/simple_animal/friendly/snake.dm | 2 +- .../living/simple_animal/guardian/guardian.dm | 44 +- .../simple_animal/guardian/types/assassin.dm | 8 +- .../simple_animal/guardian/types/charger.dm | 8 +- .../simple_animal/guardian/types/dextrous.dm | 8 +- .../simple_animal/guardian/types/explosive.dm | 6 +- .../simple_animal/guardian/types/fire.dm | 6 +- .../guardian/types/gravitokinetic.dm | 12 +- .../simple_animal/guardian/types/lightning.dm | 12 +- .../simple_animal/guardian/types/protector.dm | 14 +- .../simple_animal/guardian/types/ranged.dm | 8 +- .../simple_animal/guardian/types/standard.dm | 6 +- .../simple_animal/guardian/types/support.dm | 16 +- .../mob/living/simple_animal/hostile/alien.dm | 6 +- .../mob/living/simple_animal/hostile/bear.dm | 4 +- .../mob/living/simple_animal/hostile/bees.dm | 10 +- .../hostile/bosses/paperwizard.dm | 4 +- .../simple_animal/hostile/cat_butcher.dm | 2 +- .../living/simple_animal/hostile/faithless.dm | 4 +- .../simple_animal/hostile/giant_spider.dm | 32 +- .../simple_animal/hostile/glockroach.dm | 8 +- .../mob/living/simple_animal/hostile/goose.dm | 8 +- .../simple_animal/hostile/gorilla/gorilla.dm | 4 +- .../living/simple_animal/hostile/headcrab.dm | 8 +- .../simple_animal/hostile/jungle/leaper.dm | 2 +- .../hostile/megafauna/blood_drunk_miner.dm | 12 +- .../hostile/megafauna/bubblegum.dm | 20 +- .../hostile/megafauna/colossus.dm | 12 +- .../hostile/megafauna/demonic_frost_miner.dm | 12 +- .../simple_animal/hostile/megafauna/drake.dm | 30 +- .../hostile/megafauna/hierophant.dm | 28 +- .../simple_animal/hostile/megafauna/legion.dm | 20 +- .../hostile/megafauna/megafauna.dm | 4 +- .../hostile/megafauna/stalwart.dm | 4 +- .../mob/living/simple_animal/hostile/mimic.dm | 8 +- .../hostile/mining_mobs/drakeling.dm | 18 +- .../hostile/mining_mobs/elites/elite.dm | 32 +- .../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 | 8 +- .../hostile/mining_mobs/goldgrub.dm | 12 +- .../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 +- .../hostile/mining_mobs/polarbear.dm | 2 +- .../simple_animal/hostile/mining_mobs/wolf.dm | 2 +- .../living/simple_animal/hostile/mushroom.dm | 8 +- .../simple_animal/hostile/netherworld.dm | 8 +- .../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 | 10 +- .../simple_animal/hostile/wumborian_fugu.dm | 10 +- .../mob/living/simple_animal/parrot.dm | 38 +- .../mob/living/simple_animal/simple_animal.dm | 10 +- .../mob/living/simple_animal/slime/life.dm | 4 +- .../mob/living/simple_animal/slime/powers.dm | 6 +- .../mob/living/simple_animal/slime/slime.dm | 32 +- code/modules/mob/living/status_procs.dm | 6 +- code/modules/mob/living/taste.dm | 2 +- code/modules/mob/living/ventcrawling.dm | 8 +- code/modules/mob/mob.dm | 28 +- code/modules/mob/mob_helpers.dm | 6 +- code/modules/mob/mob_movement.dm | 18 +- code/modules/mob/mob_transformation_simple.dm | 4 +- code/modules/mob/say.dm | 12 +- code/modules/mob/transform_procs.dm | 4 +- .../computers/_modular_computer_shared.dm | 4 +- .../computers/item/computer.dm | 32 +- .../computers/item/computer_components.dm | 8 +- .../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/arcade.dm | 10 +- .../file_system/programs/card.dm | 6 +- .../file_system/programs/crewmanifest.dm | 4 +- .../file_system/programs/ntnrc_client.dm | 4 +- .../file_system/programs/portrait_printer.dm | 6 +- .../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 | 6 +- .../modular_computers/hardware/recharger.dm | 2 +- .../modular_computers/laptop_vendor.dm | 2 +- code/modules/ninja/energy_katana.dm | 4 +- code/modules/ninja/suit/gloves.dm | 2 +- .../suit/n_suit_verbs/energy_net_nets.dm | 4 +- .../suit/n_suit_verbs/ninja_adrenaline.dm | 2 +- .../suit/n_suit_verbs/ninja_cost_check.dm | 6 +- .../ninja/suit/n_suit_verbs/ninja_net.dm | 10 +- .../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_attackby.dm | 12 +- .../modules/ninja/suit/suit_initialisation.dm | 8 +- code/modules/paperwork/clipboard.dm | 8 +- code/modules/paperwork/contract.dm | 42 +- code/modules/paperwork/filingcabinet.dm | 16 +- code/modules/paperwork/folders.dm | 10 +- code/modules/paperwork/handlabeler.dm | 24 +- code/modules/paperwork/paper.dm | 16 +- code/modules/paperwork/paper_cutter.dm | 16 +- code/modules/paperwork/paperbin.dm | 12 +- code/modules/paperwork/paperplane.dm | 18 +- code/modules/paperwork/pen.dm | 18 +- code/modules/paperwork/photocopier.dm | 34 +- code/modules/paperwork/stamps.dm | 2 +- code/modules/paperwork/ticketmachine.dm | 26 +- code/modules/photography/camera/camera.dm | 22 +- .../photography/camera/silicon_camera.dm | 14 +- code/modules/photography/photos/frame.dm | 8 +- code/modules/photography/photos/photo.dm | 8 +- code/modules/plumbing/ducts.dm | 10 +- code/modules/plumbing/plumbers/pumps.dm | 6 +- code/modules/power/apc.dm | 200 +++---- code/modules/power/cable.dm | 32 +- code/modules/power/cell.dm | 4 +- code/modules/power/energyharvester.dm | 10 +- code/modules/power/floodlight.dm | 8 +- code/modules/power/generator.dm | 34 +- code/modules/power/gravitygenerator.dm | 10 +- code/modules/power/lighting.dm | 76 +-- code/modules/power/monitor.dm | 2 +- code/modules/power/port_gen.dm | 16 +- code/modules/power/rtg.dm | 4 +- code/modules/power/singularity/collector.dm | 32 +- .../power/singularity/containment_field.dm | 8 +- code/modules/power/singularity/emitter.dm | 42 +- .../power/singularity/field_generator.dm | 32 +- code/modules/power/singularity/narsie.dm | 6 +- .../particle_accelerator/particle_control.dm | 2 +- code/modules/power/singularity/singularity.dm | 14 +- code/modules/power/smes.dm | 20 +- code/modules/power/solar.dm | 24 +- code/modules/power/supermatter/supermatter.dm | 72 +-- code/modules/power/terminal.dm | 6 +- code/modules/power/tesla/energy_ball.dm | 2 +- code/modules/power/tracker.dm | 4 +- code/modules/power/turbine.dm | 8 +- .../projectiles/ammunition/_ammunition.dm | 4 +- .../projectiles/ammunition/caseless/foam.dm | 10 +- .../boxes_magazines/_box_magazine.dm | 4 +- code/modules/projectiles/gun.dm | 38 +- code/modules/projectiles/guns/ballistic.dm | 52 +- .../projectiles/guns/ballistic/automatic.dm | 18 +- .../guns/ballistic/laser_gatling.dm | 8 +- .../projectiles/guns/ballistic/launchers.dm | 6 +- .../projectiles/guns/ballistic/minigun.dm | 8 +- .../projectiles/guns/ballistic/pistol.dm | 6 +- .../projectiles/guns/ballistic/revolver.dm | 36 +- .../projectiles/guns/ballistic/rifle.dm | 6 +- .../projectiles/guns/ballistic/shotgun.dm | 8 +- code/modules/projectiles/guns/energy.dm | 14 +- .../projectiles/guns/energy/dueling.dm | 24 +- .../projectiles/guns/energy/energy_gun.dm | 14 +- .../guns/energy/kinetic_accelerator.dm | 16 +- code/modules/projectiles/guns/energy/pulse.dm | 2 +- .../projectiles/guns/energy/special.dm | 12 +- code/modules/projectiles/guns/magic.dm | 8 +- code/modules/projectiles/guns/magic/wand.dm | 10 +- .../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 | 8 +- .../projectiles/guns/misc/syringe_gun.dm | 16 +- code/modules/projectiles/pins.dm | 22 +- code/modules/projectiles/projectile.dm | 6 +- code/modules/projectiles/projectile/beams.dm | 2 +- .../projectile/bullets/dart_syringe.dm | 4 +- .../projectile/bullets/dnainjector.dm | 4 +- .../projectiles/projectile/energy/stun.dm | 2 +- code/modules/projectiles/projectile/magic.dm | 26 +- .../projectile/special/hallucination.dm | 4 +- code/modules/reagents/chemistry/holder.dm | 6 +- .../chemistry/machinery/chem_dispenser.dm | 14 +- .../chemistry/machinery/chem_heater.dm | 2 +- .../chemistry/machinery/chem_master.dm | 8 +- .../chemistry/machinery/chem_synthesizer.dm | 2 +- .../reagents/chemistry/machinery/pandemic.dm | 8 +- .../chemistry/machinery/reagentgrinder.dm | 28 +- .../chemistry/machinery/smoke_machine.dm | 2 +- code/modules/reagents/chemistry/reagents.dm | 10 +- .../chemistry/reagents/alcohol_reagents.dm | 44 +- .../reagents/cat2_medicine_reagents.dm | 2 +- .../chemistry/reagents/drink_reagents.dm | 2 +- .../chemistry/reagents/drug_reagents.dm | 28 +- .../chemistry/reagents/food_reagents.dm | 12 +- .../chemistry/reagents/medicine_reagents.dm | 44 +- .../chemistry/reagents/other_reagents.dm | 66 +-- .../chemistry/reagents/toxin_reagents.dm | 18 +- .../reagents/chemistry/recipes/others.dm | 8 +- .../chemistry/recipes/pyrotechnics.dm | 12 +- .../chemistry/recipes/slime_extracts.dm | 30 +- .../reagents/chemistry/recipes/toxins.dm | 6 +- code/modules/reagents/reagent_containers.dm | 12 +- .../reagents/reagent_containers/blood_pack.dm | 2 +- .../reagents/reagent_containers/borghypo.dm | 24 +- .../reagents/reagent_containers/dropper.dm | 24 +- .../reagents/reagent_containers/glass.dm | 52 +- .../reagents/reagent_containers/hypospray.dm | 16 +- .../reagents/reagent_containers/medspray.dm | 18 +- .../reagents/reagent_containers/patch.dm | 6 +- .../reagents/reagent_containers/pill.dm | 20 +- .../reagents/reagent_containers/spray.dm | 26 +- .../reagents/reagent_containers/syringes.dm | 28 +- code/modules/reagents/reagent_dispenser.dm | 18 +- code/modules/recycling/conveyor2.dm | 28 +- code/modules/recycling/disposal/bin.dm | 28 +- .../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 | 28 +- code/modules/religion/religion_sects.dm | 46 +- code/modules/religion/religion_structures.dm | 6 +- code/modules/religion/rites.dm | 58 +- code/modules/research/destructive_analyzer.dm | 4 +- code/modules/research/experimentor.dm | 88 +-- .../modules/research/machinery/_production.dm | 2 +- .../research/nanites/nanite_chamber.dm | 16 +- .../nanites/nanite_chamber_computer.dm | 4 +- .../nanites/nanite_cloud_controller.dm | 6 +- .../research/nanites/nanite_hijacker.dm | 10 +- .../research/nanites/nanite_program_hub.dm | 4 +- .../research/nanites/nanite_programmer.dm | 4 +- .../research/nanites/nanite_programs/rogue.dm | 16 +- .../nanites/nanite_programs/suppression.dm | 8 +- .../nanites/nanite_programs/utility.dm | 4 +- .../nanites/nanite_programs/weapon.dm | 12 +- .../modules/research/nanites/nanite_remote.dm | 24 +- .../research/nanites/public_chamber.dm | 16 +- code/modules/research/rdconsole.dm | 38 +- code/modules/research/rdmachines.dm | 12 +- code/modules/research/server.dm | 4 +- .../xenobiology/crossbreeding/__corecross.dm | 16 +- .../xenobiology/crossbreeding/_clothing.dm | 8 +- .../xenobiology/crossbreeding/_misc.dm | 32 +- .../xenobiology/crossbreeding/_mobs.dm | 2 +- .../xenobiology/crossbreeding/_potions.dm | 58 +- .../crossbreeding/_status_effects.dm | 84 +-- .../xenobiology/crossbreeding/_structures.dm | 8 +- .../xenobiology/crossbreeding/burning.dm | 56 +- .../xenobiology/crossbreeding/charged.dm | 56 +- .../xenobiology/crossbreeding/chilling.dm | 74 +-- .../xenobiology/crossbreeding/consuming.dm | 14 +- .../xenobiology/crossbreeding/crystalized.dm | 2 +- .../xenobiology/crossbreeding/recurring.dm | 4 +- .../xenobiology/crossbreeding/regenerative.dm | 38 +- .../xenobiology/crossbreeding/reproductive.dm | 8 +- .../crossbreeding/selfsustaining.dm | 4 +- .../xenobiology/crossbreeding/stabilized.dm | 10 +- .../research/xenobiology/xenobio_camera.dm | 44 +- .../research/xenobiology/xenobiology.dm | 260 ++++----- .../ruins/icemoonruin_code/hotsprings.dm | 2 +- .../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 | 14 +- .../ruins/spaceruin_code/hilbertshotel.dm | 20 +- .../security_levels/keycard_authentication.dm | 10 +- .../security_levels/security_levels.dm | 4 +- code/modules/shuttle/arrivals.dm | 2 +- code/modules/shuttle/computer.dm | 18 +- code/modules/shuttle/emergency.dm | 14 +- code/modules/shuttle/ferry.dm | 2 +- code/modules/shuttle/navigation_computer.dm | 16 +- code/modules/shuttle/on_move.dm | 2 +- code/modules/shuttle/special.dm | 16 +- code/modules/shuttle/syndicate.dm | 4 +- code/modules/spells/spell.dm | 36 +- code/modules/spells/spell_types/aimed.dm | 4 +- 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 | 6 +- code/modules/spells/spell_types/devil.dm | 18 +- .../modules/spells/spell_types/devil_boons.dm | 2 +- .../spells/spell_types/ethereal_jaunt.dm | 4 +- code/modules/spells/spell_types/godhand.dm | 30 +- code/modules/spells/spell_types/hivemind.dm | 170 +++--- code/modules/spells/spell_types/lichdom.dm | 16 +- code/modules/spells/spell_types/lightning.dm | 8 +- code/modules/spells/spell_types/mime.dm | 30 +- .../spells/spell_types/mind_transfer.dm | 18 +- .../spells/spell_types/pointed/blind.dm | 4 +- .../spells/spell_types/pointed/pointed.dm | 8 +- code/modules/spells/spell_types/projectile.dm | 2 +- code/modules/spells/spell_types/rod_form.dm | 4 +- .../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 +- .../spells/spell_types/touch_attacks.dm | 8 +- .../spells/spell_types/voice_of_god.dm | 2 +- code/modules/spells/spell_types/wizard.dm | 6 +- .../surgery/advanced/bioware/ligament_hook.dm | 4 +- .../bioware/ligament_reinforcement.dm | 4 +- .../surgery/advanced/bioware/muscled_veins.dm | 4 +- .../advanced/bioware/nerve_grounding.dm | 4 +- .../advanced/bioware/nerve_splicing.dm | 4 +- .../advanced/bioware/vein_threading.dm | 4 +- code/modules/surgery/advanced/brainwashing.dm | 16 +- code/modules/surgery/advanced/dna_recovery.dm | 4 +- code/modules/surgery/advanced/lobotomy.dm | 8 +- .../surgery/advanced/necrotic_revival.dm | 4 +- code/modules/surgery/advanced/pacification.dm | 8 +- code/modules/surgery/advanced/revival.dm | 12 +- .../modules/surgery/advanced/viral_bonding.dm | 4 +- code/modules/surgery/amputation.dm | 8 +- code/modules/surgery/bodyparts/bodyparts.dm | 34 +- code/modules/surgery/bodyparts/head.dm | 24 +- .../surgery/bodyparts/robot_bodyparts.dm | 26 +- code/modules/surgery/brain_surgery.dm | 10 +- code/modules/surgery/cavity_implant.dm | 12 +- code/modules/surgery/core_removal.dm | 6 +- code/modules/surgery/coronary_bypass.dm | 20 +- code/modules/surgery/dental_implant.dm | 6 +- .../surgery/experimental_dissection.dm | 6 +- code/modules/surgery/eye_surgery.dm | 18 +- code/modules/surgery/healing.dm | 24 +- code/modules/surgery/helpers.dm | 10 +- code/modules/surgery/implant_removal.dm | 10 +- code/modules/surgery/limb_augmentation.dm | 8 +- code/modules/surgery/lipoplasty.dm | 10 +- code/modules/surgery/lobectomy.dm | 10 +- code/modules/surgery/mechanic_steps.dm | 12 +- code/modules/surgery/organ_manipulation.dm | 20 +- code/modules/surgery/organic_steps.dm | 18 +- code/modules/surgery/organs/appendix.dm | 8 +- code/modules/surgery/organs/augments_arms.dm | 32 +- 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/ears.dm | 14 +- code/modules/surgery/organs/eyes.dm | 18 +- code/modules/surgery/organs/heart.dm | 18 +- code/modules/surgery/organs/liver.dm | 4 +- code/modules/surgery/organs/lungs.dm | 28 +- code/modules/surgery/organs/organ_internal.dm | 6 +- code/modules/surgery/organs/stomach.dm | 34 +- code/modules/surgery/organs/tongue.dm | 10 +- code/modules/surgery/organs/vocal_cords.dm | 6 +- code/modules/surgery/plastic_surgery.dm | 10 +- .../modules/surgery/prosthetic_replacement.dm | 20 +- .../modules/surgery/remove_embedded_object.dm | 12 +- code/modules/surgery/surgery.dm | 2 +- code/modules/surgery/surgery_step.dm | 12 +- code/modules/surgery/tools.dm | 28 +- code/modules/swarmers/swarmer.dm | 34 +- code/modules/swarmers/swarmer_act.dm | 54 +- code/modules/uplink/uplink_items.dm | 2 +- code/modules/vehicles/_vehicle.dm | 6 +- code/modules/vehicles/cars/car.dm | 18 +- code/modules/vehicles/cars/clowncar.dm | 28 +- code/modules/vehicles/pimpin_ride.dm | 8 +- code/modules/vehicles/ridden.dm | 20 +- code/modules/vehicles/scooter.dm | 32 +- code/modules/vehicles/sealed.dm | 14 +- code/modules/vehicles/speedbike.dm | 4 +- code/modules/vehicles/vehicle_actions.dm | 14 +- code/modules/vehicles/wheelchair.dm | 6 +- code/modules/vending/_vending.dm | 28 +- code/modules/zombie/items.dm | 2 +- code/modules/zombie/organs.dm | 10 +- interface/interface.dm | 12 +- yogstation.dme | 1 + yogstation/code/_onclick/click.dm | 2 +- .../code/controllers/subsystem/ticker.dm | 8 +- yogstation/code/datums/antagonists/vampire.dm | 42 +- yogstation/code/datums/components/crawl.dm | 62 +- .../code/datums/components/radioactive.dm | 4 +- .../code/datums/components/randomcrits.dm | 2 +- .../code/datums/components/storage/storage.dm | 8 +- yogstation/code/datums/components/uplink.dm | 2 +- yogstation/code/datums/components/walks.dm | 6 +- .../diseases/advance/symptoms/confusion.dm | 2 +- .../datums/diseases/advance/symptoms/heal.dm | 8 +- .../code/datums/diseases/cluwnification.dm | 22 +- yogstation/code/datums/mind.dm | 2 +- yogstation/code/datums/mutations.dm | 6 +- yogstation/code/datums/mutations/alcohol.dm | 8 +- .../code/datums/mutations/extendoarm.dm | 4 +- .../changeling/powers/abomination_powers.dm | 2 +- .../game/gamemodes/darkspawn/darkspawn.dm | 2 +- .../code/game/gamemodes/darkspawn/veil.dm | 8 +- .../code/game/gamemodes/gangs/dominator.dm | 16 +- .../code/game/gamemodes/gangs/gang_items.dm | 6 +- .../code/game/gamemodes/gangs/gang_pen.dm | 12 +- .../code/game/gamemodes/gangs/gangtool.dm | 28 +- .../game/gamemodes/shadowling/shadowling.dm | 4 +- .../game/gamemodes/traitor/double_agents.dm | 2 +- .../game/gamemodes/vampire/grave_fever.dm | 4 +- .../game/gamemodes/vampire/vampire_bat.dm | 2 +- .../game/gamemodes/vampire/vampire_bite.dm | 8 +- .../game/gamemodes/vampire/vampire_other.dm | 2 +- .../game/gamemodes/vampire/vampire_powers.dm | 116 ++-- .../code/game/machinery/computer/arcade.dm | 6 +- .../code/game/machinery/doors/airlock.dm | 8 +- .../telecomms/computers/traffic_control.dm | 6 +- .../machinery/telecomms/machines/server.dm | 2 +- .../code/game/mecha/makeshift/lockermech.dm | 8 +- yogstation/code/game/objects/items/bandage.dm | 14 +- yogstation/code/game/objects/items/brace.dm | 10 +- .../code/game/objects/items/cards_ids.dm | 4 +- yogstation/code/game/objects/items/crayons.dm | 12 +- .../game/objects/items/devices/scanners.dm | 4 +- .../code/game/objects/items/extinguisher.dm | 6 +- .../objects/items/grenades/glitterbombs.dm | 2 +- .../game/objects/items/holotool/holotool.dm | 6 +- .../objects/items/implants/implant_gang.dm | 2 +- .../items/implants/implant_mindslave.dm | 12 +- yogstation/code/game/objects/items/plushes.dm | 16 +- .../game/objects/items/robot/robot_items.dm | 8 +- .../game/objects/items/robot/robot_parts.dm | 6 +- yogstation/code/game/objects/items/shields.dm | 2 +- .../objects/items/stacks/dilithiumcrystal.dm | 8 +- .../game/objects/items/storage/backpack.dm | 22 +- .../code/game/objects/items/storage/bags.dm | 2 +- yogstation/code/game/objects/items/tools.dm | 30 +- .../code/game/objects/items/weaponry.dm | 6 +- .../structures/beds_chairs/electric_bed.dm | 4 +- .../code/game/objects/structures/fireaxe.dm | 24 +- .../objects/structures/ghost_role_spawners.dm | 6 +- .../game/objects/structures/table_frames.dm | 4 +- yogstation/code/modules/admin/admin_verbs.dm | 4 +- yogstation/code/modules/admin/moja.dm | 20 +- .../code/modules/admin/sql_message_system.dm | 14 +- yogstation/code/modules/admin/topic.dm | 10 +- .../code/modules/admin/verbs/adminhelp.dm | 24 +- .../code/modules/admin/verbs/adminvox.dm | 4 +- yogstation/code/modules/admin/verbs/debug.dm | 4 +- yogstation/code/modules/admin/verbs/queue.dm | 2 +- .../code/modules/admin/verbs/shuttle_verbs.dm | 2 +- .../antagonists/blob/blob/blobs/core.dm | 2 +- .../antagonists/darkspawn/crawling_shadows.dm | 14 +- .../antagonists/darkspawn/darkspawn.dm | 28 +- .../darkspawn/darkspawn_abilities/_divulge.dm | 30 +- .../darkspawn_abilities/_sacrament.dm | 16 +- .../darkspawn_abilities/crawling_shadows.dm | 2 +- .../darkspawn/darkspawn_abilities/creep.dm | 4 +- .../darkspawn_abilities/demented_outburst.dm | 10 +- .../darkspawn_abilities/devour_will.dm | 4 +- .../darkspawn/darkspawn_abilities/pass.dm | 8 +- .../darkspawn_abilities/silver_tongue.dm | 10 +- .../darkspawn_abilities/simulacrum.dm | 6 +- .../darkspawn/darkspawn_abilities/tagalong.dm | 4 +- .../darkspawn_abilities/time_dilation.dm | 2 +- .../darkspawn_abilities/veil_mind.dm | 10 +- .../darkspawn/darkspawn_objects/dark_bead.dm | 22 +- .../darkspawn_objects/psionic_barrier.dm | 2 +- .../darkspawn_objects/umbral_tendrils.dm | 34 +- .../darkspawn/darkspawn_progenitor.dm | 8 +- .../code/modules/antagonists/gang/gang.dm | 22 +- .../antagonists/shadowling/shadowling.dm | 10 +- .../shadowling/shadowling_abilities.dm | 234 ++++---- .../special_shadowling_abilities.dm | 36 +- .../modules/antagonists/shadowling/thrall.dm | 16 +- .../antagonists/slaughter/slaughter.dm | 12 +- .../atmospherics/machinery/pipes/bluespace.dm | 2 +- .../atmospherics/unary_devices/vent_pump.dm | 12 +- .../modules/client/preferences_savefile.dm | 6 +- yogstation/code/modules/client/verbs/afk.dm | 4 +- .../code/modules/client/verbs/antag_token.dm | 12 +- yogstation/code/modules/client/verbs/looc.dm | 20 +- yogstation/code/modules/client/verbs/ooc.dm | 4 +- yogstation/code/modules/clothing/clothing.dm | 2 +- yogstation/code/modules/clothing/mask.dm | 4 +- .../code/modules/clothing/masks/hailer.dm | 2 +- .../code/modules/clothing/neck/shawls.dm | 2 +- .../modules/donor/unique_donator_items.dm | 2 +- yogstation/code/modules/events/bad_wizard.dm | 2 +- .../code/modules/events/immovable_duck.dm | 4 +- .../modules/food_and_drinks/food/condiment.dm | 2 +- .../modules/guardian/abilities/_ability.dm | 4 +- .../guardian/abilities/major/assassin.dm | 2 +- .../guardian/abilities/major/gravity.dm | 6 +- .../guardian/abilities/major/predator.dm | 8 +- .../guardian/abilities/minor/teleport.dm | 8 +- .../guardian/abilities/special/pocket.dm | 8 +- yogstation/code/modules/guardian/guardian.dm | 24 +- .../code/modules/guardian/guardianbuilder.dm | 22 +- .../code/modules/guardian/standarrow.dm | 16 +- .../modules/keybindings/bindings_human.dm | 24 +- .../code/modules/keybindings/bindings_mob.dm | 4 +- yogstation/code/modules/mentor/follow.dm | 2 +- yogstation/code/modules/mentor/mentor_memo.dm | 6 +- .../code/modules/mentor/mentor_verbs.dm | 16 +- yogstation/code/modules/mentor/mentorhelp.dm | 2 +- yogstation/code/modules/mentor/mentorpm.dm | 2 +- yogstation/code/modules/mentor/mentorsay.dm | 2 +- .../carbon/alien/humanoid/alienpowers.dm | 2 +- .../code/modules/mob/living/carbon/carbon.dm | 16 +- .../carbon/human/species_types/darkspawn.dm | 4 +- .../carbon/human/species_types/lizard.dm | 4 +- .../carbon/human/species_types/plantpeople.dm | 18 +- .../species_types/preternis/power_suck.dm | 50 +- .../species_types/preternis/preternis.dm | 16 +- yogstation/code/modules/mob/living/emote.dm | 4 +- .../modules/mob/living/silicon/robot/robot.dm | 10 +- .../simple_animal/hostile/floor_cluwne.dm | 28 +- .../hostile/mining_mobs/marrow_weaver.dm | 10 +- .../hostile/retaliate/king_of_goats.dm | 26 +- .../code/modules/mob/new_player/poll.dm | 6 +- .../code/modules/power/antimatter/control.dm | 16 +- .../modules/power/antimatter/shielding.dm | 4 +- yogstation/code/modules/power/hugbox.dm | 24 +- .../particle_accelerator/particle_control.dm | 2 +- .../code/modules/power/stationarybike.dm | 14 +- yogstation/code/modules/power/validhunter.dm | 22 +- .../chemistry/reagents/alcohol_reagents.dm | 8 +- .../chemistry/reagents/other_reagents.dm | 2 +- .../recycling/disposal/pipe_sorting.dm | 2 +- yogstation/code/modules/scripting/IDE.dm | 12 +- .../code/modules/spacepods/construction.dm | 8 +- .../code/modules/spacepods/equipment.dm | 26 +- yogstation/code/modules/spacepods/parts.dm | 8 +- yogstation/code/modules/spacepods/physics.dm | 8 +- yogstation/code/modules/spacepods/spacepod.dm | 92 +-- yogstation/code/modules/spells/cauterize.dm | 2 +- yogstation/code/modules/spells/cluwnecurse.dm | 6 +- .../code/modules/stock_market/computer.dm | 24 +- .../modules/surgery/gender_reassignment.dm | 10 +- .../code/modules/surgery/healing_surgeries.dm | 8 +- .../surgery/organs/shadowling_organs.dm | 8 +- yogstation/interface/interface.dm | 2 +- 1642 files changed, 13618 insertions(+), 13465 deletions(-) create mode 100644 code/__DEFINES/span.dm diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm new file mode 100644 index 000000000000..e6b58fd9bddd --- /dev/null +++ b/code/__DEFINES/span.dm @@ -0,0 +1,152 @@ +// Sorted alphabetically +#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_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_big(str) ("" + str + "") +#define span_bigicon(str) ("" + str + "") +#define span_binarysay(str) ("" + str + "") +#define span_blue(str) ("" + str + "") +#define span_blueteamradio(str) ("" + str + "") +#define span_bold(str) ("" + str + "") +#define span_boldannounce(str) ("" + str + "") +#define span_boldnotice(str) ("" + str + "") +#define span_boldwarning(str) ("" + str + "") +#define span_centcomradio(str) ("" + str + "") +#define span_changeling(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_cult(str) ("" + str + "") +#define span_cultbold(str) ("" + str + "") +#define span_cultboldtalic(str) ("" + str + "") +#define span_cultitalic(str) ("" + str + "") +#define span_cultlarge(str) ("" + str + "") +#define span_danger(str) ("" + str + "") +#define span_deadsay(str) ("" + str + "") +#define span_deconversion_message(str) ("" + str + "") +#define span_drone(str) ("" + str + "") +#define span_engradio(str) ("" + str + "") +#define span_extremelybig(str) ("" + str + "") +#define span_ghostalert(str) ("" + str + "") +#define span_green(str) ("" + str + "") +#define span_greenannounce(str) ("" + str + "") +#define span_greenteamradio(str) ("" + str + "") +#define span_greentext(str) ("" + str + "") +#define span_hear(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_hypnophrase(str) ("" + str + "") +#define span_icon(str) ("" + str + "") +#define span_info(str) ("" + str + "") +#define span_interface(str) ("" + str + "") +#define span_looc(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_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_red(str) ("" + str + "") +#define span_redteamradio(str) ("" + str + "") +#define span_redtext(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_rose(str) ("" + str + "") +#define span_sans(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_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_unconscious(str) ("" + str + "") +#define span_userdanger(str) ("" + str + "") +#define span_warning(str) ("" + str + "") +#define span_yell(str) ("" + str + "") +#define span_yellowteamradio(str) ("" + str + "") +#define span_italics(str) ("" + str + "") +#define span_marooned(str) ("" + str + "") +#define span_header(str) ("" + str + "") +#define span_robotic(str) ("" + str + "") +#define span_brass(str) ("" + str + "") +#define span_velvet(str) ("" + str + "") +#define span_assimilator(str) ("" + str + "") +#define span_neutraltext(str) ("" + str + "") +#define span_linkOff(str) ("" + str + "") +#define span_linkOn(str) ("" + str + "") +#define span_caution(str) ("" + str + "") +#define span_error(str) ("" + str + "") +#define span_surrender(str) ("" + str + "") +#define span_bad(str) ("" + str + "") +#define span_good(str) ("" + str + "") +#define span_nzcrentr(str) ("" + str + "") +#define span_nezbere(str) ("" + str + "") +#define span_neovgre(str) ("" + str + "") +#define span_shadowling(str) ("" + str + "") +#define span_bigassimilator(str) ("" + str + "") +#define span_dark(str) ("" + str + "") +#define span_dronesay(str) ("" + str + "") +#define span_reallybigphobia(str) ("" + str + "") +#define span_unclaimed(str) ("" + str + "") +#define span_alloy(str) ("" + str + "") +#define span_average(str) ("" + str + "") +#define span_disarm(str) ("" + str + "") +#define span_cultsmall(str) ("" + str + "") +#define span_inathneq(str) ("" + str + "") +#define span_alertealien(str) ("" + str + "") +#define span_sevtug(str) ("" + str + "") +#define span_ratvar(str) ("" + str + "") +#define span_nopositions(str) ("" + str + "") +#define span_maptext(str) ("" + str + "") +#define span_usernotice(str) ("" + str + "") +#define span_warner(str) ("" + str + "") +#define span_dangers(str) ("" + str + "") +#define span_vampirewarning(str) ("" + str + "") \ No newline at end of file diff --git a/code/__DEFINES/tgs.config.dm b/code/__DEFINES/tgs.config.dm index c3ccb342e10a..c07fefb4856f 100644 --- a/code/__DEFINES/tgs.config.dm +++ b/code/__DEFINES/tgs.config.dm @@ -3,7 +3,7 @@ #define TGS_DEFINE_AND_SET_GLOBAL(Name, Value) GLOBAL_VAR_INIT(##Name, ##Value); GLOBAL_PROTECT(##Name) #define TGS_READ_GLOBAL(Name) GLOB.##Name #define TGS_WRITE_GLOBAL(Name, Value) GLOB.##Name = ##Value -#define TGS_WORLD_ANNOUNCE(message) to_chat(world, "[html_encode(##message)]") +#define TGS_WORLD_ANNOUNCE(message) to_chat(world, span_boldannounce("[html_encode(##message)]")) #define TGS_INFO_LOG(message) log_world("TGS: Info: [##message]") #define TGS_WARNING_LOG(message) log_world("TGS: Warning: [##message]") #define TGS_ERROR_LOG(message) log_world("TGS: Error: [##message]") diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index d34cfec682ca..a0e7899de430 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -54,10 +54,10 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(list(/area/engin )) 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) @@ -71,7 +71,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(list(/area/engin 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)) @@ -80,7 +80,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(list(/area/engin 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) @@ -102,7 +102,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(list(/area/engin var/obj/machinery/door/firedoor/FD = door FD.CalculateAffectingAreas() - to_chat(creator, "You 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("You 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 1f27f82227b3..fb09e732c2a7 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -440,22 +440,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/machines/buzz-sigh.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/roundend.dm b/code/__HELPERS/roundend.dm index d627b80da8a3..e2d0896929a1 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -199,7 +199,7 @@ if(length(CONFIG_GET(keyed_list/cross_server))) send_news_report() - set_observer_default_invisibility(0, "The round is over! You are now visible to the living.") + set_observer_default_invisibility(0, span_warning("The round is over! You are now visible to the living.")) CHECK_TICK @@ -296,7 +296,7 @@ parts += "[GLOB.TAB]Round ID: [info]" parts += "[GLOB.TAB]Gamemode: [SSticker.mode.name]" parts += "[GLOB.TAB]Shift Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]" - parts += "[GLOB.TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[popcount["station_integrity"]]%"]" + parts += "[GLOB.TAB]Station Integrity: [mode.station_was_nuked ? span_redtext("Destroyed") : "[popcount["station_integrity"]]%"]" var/total_players = GLOB.joined_player_list.len if(total_players) parts+= "[GLOB.TAB]Total Population: [total_players]" @@ -351,13 +351,13 @@ if(EMERGENCY_ESCAPED_OR_ENDGAMED) if(!M.onCentCom() && !M.onSyndieBase()) parts += "
" - parts += "You managed to survive, but were marooned on [station_name()]..." + parts += span_marooned("You managed to survive, but were marooned on [station_name()]...") else parts += "
" - parts += "You managed to survive the events on [station_name()] as [M.real_name]." + parts += span_greentext("You managed to survive the events on [station_name()] as [M.real_name].") else parts += "
" - parts += "You managed to survive the events on [station_name()] as [M.real_name]." + parts += span_greentext("You managed to survive the events on [station_name()] as [M.real_name].") if(M.mind.assigned_role in GLOB.engineering_positions) // We don't actually need to even really do a check to see if assigned_role is set to anything. SSachievements.unlock_achievement(/datum/achievement/engineering, C) else if(M.mind.assigned_role in GLOB.supply_positions) // We don't actually need to even really do a check to see if assigned_role is set to anything. @@ -366,7 +366,7 @@ else parts += "
" - parts += "You did not survive the events on [station_name()]..." + parts += span_redtext("You did not survive the events on [station_name()]...") else parts += "
" parts += "
" @@ -467,7 +467,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("
")]
" @@ -476,7 +476,7 @@ /datum/controller/subsystem/ticker/proc/mouse_report() if(GLOB.mouse_food_eaten) var/list/parts = list() - parts += "Mouse stats:" + parts += span_header("Mouse stats:") parts += "Mice Born: [GLOB.mouse_spawned]" parts += "Mice Killed: [GLOB.mouse_killed]" parts += "Trash Eaten: [GLOB.mouse_food_eaten]" diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index 9aa097bcab16..8cb7b26f771f 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -45,7 +45,7 @@ return //So there's no point messaging admins message_admins("[ADMIN_LOOKUPFLW(src)] was kicked because they failed can_see on AI click of [A] (Turf Loc: [ADMIN_VERBOSEJMP(pixel_turf)]))") log_admin("[key_name(src)] was kicked because they failed can_see on AI click of [A] (Turf Loc: [AREACOORD(pixel_turf)])") - to_chat(src, "You have been automatically kicked because you clicked a turf you shouldn't have been able to see as an AI. You should reconnect automatically. If you do not, you can reconnect using the File --> Reconnect button.") + to_chat(src, span_reallybig("You have been automatically kicked because you clicked a turf you shouldn't have been able to see as an AI. You should reconnect automatically. If you do not, you can reconnect using the File --> Reconnect button.")) winset(usr, null, "command=.reconnect") QDEL_IN(client, 3 SECONDS) //fallback if the reconnection doesnt work return diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index b0185dfde80b..4bed9d06daee 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -25,7 +25,7 @@ return if((istype(over_object, /obj/screen/movable/action_button) && !istype(over_object, /obj/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/obj/screen/movable/action_button/B = over_object var/list/actions = usr.actions @@ -45,14 +45,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 @@ -84,14 +84,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 @@ -108,7 +108,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 @@ -128,7 +128,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.")) /obj/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 8be77ff4b2c7..470d45e9ed83 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -292,7 +292,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." RegisterSignal(taker, COMSIG_MOVABLE_MOVED, /obj/screen/alert/give/.proc/removeAlert) /obj/screen/alert/give/proc/removeAlert() - to_chat(mob_viewer, "You moved out of range of [giver]!") + to_chat(mob_viewer, span_warning("You moved out of range of [giver]!")) mob_viewer.clear_alert("[giver]") /obj/screen/alert/give/Click(location, control, params) diff --git a/code/_onclick/hud/pai.dm b/code/_onclick/hud/pai.dm index c045223d9838..266061bec9d3 100644 --- a/code/_onclick/hud/pai.dm +++ b/code/_onclick/hud/pai.dm @@ -1,4 +1,4 @@ -#define PAI_MISSING_SOFTWARE_MESSAGE "You must download the required software to use this." +#define PAI_MISSING_SOFTWARE_MESSAGE span_warning("You must download the required software to use this.") /obj/screen/pai icon = 'icons/mob/screen_pai.dmi' diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index ee18f1476807..496f0a5bfb77 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -207,7 +207,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_danger("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 e5121049b15e..6f02824a50da 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -77,7 +77,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) @@ -293,49 +293,49 @@ if(C.internal) C.internal = null - to_chat(C, "You are no longer running on internals.") + to_chat(C, span_notice("You 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, "You are not wearing an internals mask!") + to_chat(C, span_warning("You 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, "You are not wearing an internals mask!") + to_chat(C, span_warning("You 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, "You 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("You 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, "You are now running on internals from [H.s_store] on your [H.wear_suit.name].") + to_chat(H, span_notice("You are now running on internals from [H.s_store] on your [H.wear_suit.name].")) H.internal = H.s_store else if(istype(H.belt, /obj/item/tank)) - to_chat(H, "You are now running on internals from [H.belt] on your belt.") + to_chat(H, span_notice("You 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, "You are now running on internals from [H.l_store] in your left pocket.") + to_chat(H, span_notice("You 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, "You are now running on internals from [H.r_store] in your right pocket.") + to_chat(H, span_notice("You 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, "You are now running on internals from [C.back] on your back.") + to_chat(C, span_notice("You 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, "You don't have an oxygen tank!") + to_chat(C, span_warning("You don't have an oxygen tank!")) return C.update_action_buttons_icon() diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index db1abd0a5e4c..2716245a2d61 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -22,7 +22,7 @@ // Called when the item is in the active hand, and clicked; alternately, there is an 'activate held object' verb or you can hit pagedown. /obj/item/proc/attack_self(mob/user) if(HAS_TRAIT(user, TRAIT_NOINTERACT)) //sorry no using grenades - to_chat(user, "You can't use things!") + to_chat(user, span_notice("You can't use things!")) return if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_SELF, user) & COMPONENT_NO_INTERACT) return @@ -50,7 +50,7 @@ if(user.a_intent == INTENT_HARM && stat == DEAD && (butcher_results || guaranteed_butcher_results)) //can we butcher it? var/datum/component/butchering/butchering = I.GetComponent(/datum/component/butchering) if(butchering && butchering.butchering_enabled) - to_chat(user, "You begin to butcher [src]...") + to_chat(user, span_notice("You begin to butcher [src]...")) playsound(loc, butchering.butcher_sound, 50, TRUE, -1) if(do_mob(user, src, butchering.speed) && Adjacent(I)) butchering.Butcher(user, src) @@ -69,11 +69,11 @@ return if(force && HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "You don't want to harm other living beings!") + to_chat(user, span_warning("You don't want to harm other living beings!")) return TRUE if((item_flags & SURGICAL_TOOL) && (user.a_intent != INTENT_HARM)) // checks for if harm intent with surgery tool - to_chat(user, "You aren't doing surgery!") //yells at you + to_chat(user, span_warning("You aren't doing surgery!")) //yells at you return TRUE if(!force) @@ -106,7 +106,7 @@ /obj/attacked_by(obj/item/I, mob/living/user) if(I.force) - visible_message("[user] has hit [src] with [I]!", null, null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[user] has hit [src] with [I]!"), null, null, COMBAT_MESSAGE_RANGE) //only witnesses close by and the victim see a hit message. log_combat(user, src, "attacked", I) take_damage(I.force, I.damtype, "melee", 1) @@ -156,6 +156,6 @@ var/attack_message = "[src] has been [message_verb][message_hit_area] with [I]." if(user in viewers(src, null)) attack_message = "[user] has [message_verb] [src][message_hit_area] with [I]!" - visible_message("[attack_message]",\ - "[attack_message]", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[attack_message]"),\ + span_userdanger("[attack_message]"), null, COMBAT_MESSAGE_RANGE) return 1 diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 36c80e15b0a6..65e721e354e8 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -7,11 +7,11 @@ /mob/living/carbon/human/UnarmedAttack(atom/A, proximity) if(HAS_TRAIT(A, TRAIT_NOINTERACT)) - to_chat(A, "You can't touch things!") + to_chat(A, span_notice("You can't touch things!")) return if(!has_active_hand()) //can't attack without a hand. - to_chat(src, "You look at your arm and sigh.") + to_chat(src, span_notice("You look at your arm and sigh.")) return // Special glove functions: @@ -54,12 +54,12 @@ if(!user.can_interact_with(src)) return FALSE if((interaction_flags_atom & INTERACT_ATOM_REQUIRES_DEXTERITY) && !user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You 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 if(HAS_TRAIT(user, TRAIT_NOINTERACT)) - to_chat(user, "You can't touch things!") + to_chat(user, span_notice("You can't touch things!")) return FALSE return TRUE @@ -153,15 +153,15 @@ var/armor = ML.run_armor_check(affecting, "melee") if(prob(75)) ML.apply_damage(rand(1,3), BRUTE, affecting, armor) - ML.visible_message("[name] bites [ML]!", \ - "[name] bites [ML]!") + ML.visible_message(span_danger("[name] bites [ML]!"), \ + span_userdanger("[name] bites [ML]!")) if(armor >= 2) return for(var/thing in diseases) var/datum/disease/D = thing ML.ForceContractDisease(D) else - ML.visible_message("[src] has attempted to bite [ML]!") + ML.visible_message(span_danger("[src] has attempted to bite [ML]!")) /* Aliens diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 799c118ba29b..5d26a03f702f 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -14,7 +14,7 @@ /atom/proc/attack_tk(mob/user) if(HAS_TRAIT(user, TRAIT_NOINTERACT)) - to_chat(user, "You can't touch things, even with your mind!") + to_chat(user, span_notice("You can't touch things, even with your mind!")) return if(user.stat || !tkMaxRangeCheck(user, src)) return @@ -195,7 +195,7 @@ focus.plane = old_plane /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 148822cdd15b..3f5a2bc15f3d 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 8fe8aec1b3f8..73730a57e992 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -152,7 +152,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)) @@ -162,7 +162,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) @@ -180,7 +180,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new if(init_sss) init_subtypes(/datum/controller/subsystem, subsystems) - to_chat(world, "Initializing subsystems...") + to_chat(world, span_boldannounce("Initializing subsystems...")) // Sort subsystems by init_order, so they initialize in the correct order. sortTim(subsystems, /proc/cmp_subsystem_init) @@ -197,7 +197,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/time = (REALTIMEOFDAY - start_timeofday) / 10 var/msg = "Initializations complete within [time] second[time == 1 ? "" : "s"]!" - to_chat(world, "[msg]") + to_chat(world, span_boldannounce("[msg]")) log_world(msg) //yogs start - webhook support var/list/webhookData = list(\ diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index cbeb56cb4c58..8c0a290d279d 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -165,7 +165,7 @@ SEND_SIGNAL(src, COMSIG_SUBSYSTEM_POST_INITIALIZE, start_timeofday) var/time = (REALTIMEOFDAY - start_timeofday) / 10 var/msg = "Initialized [name] subsystem within [time] second[time == 1 ? "" : "s"]!" - to_chat(world, "[msg]") + to_chat(world, span_boldannounce("[msg]")) log_world(msg) return time diff --git a/code/controllers/subsystem/achievements.dm b/code/controllers/subsystem/achievements.dm index cd18c9e1c998..3cda6a07e82f 100644 --- a/code/controllers/subsystem/achievements.dm +++ b/code/controllers/subsystem/achievements.dm @@ -130,7 +130,7 @@ SUBSYSTEM_DEF(achievements) qdel(medalQuery) cached_achievements[C.ckey] += achievement achievementsEarned[C.ckey] += list(achievement) // Apparently adding a list to a nullvar just makes the var the list. Neat! - to_chat(C, "You have unlocked the \"[achievement.name]\" achievement!") + to_chat(C, span_greentext("You have unlocked the \"[achievement.name]\" achievement!")) return TRUE /** diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 3904143392f7..af1b5fc55645 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -392,7 +392,7 @@ SUBSYSTEM_DEF(air) CHECK_TICK*/ var/msg = "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 53c86004a6a4..ce8a531dc106 100644 --- a/code/controllers/subsystem/augury.dm +++ b/code/controllers/subsystem/augury.dm @@ -67,13 +67,13 @@ SUBSYSTEM_DEF(augury) /datum/action/innate/augury/Activate() SSaugury.watchers += owner - to_chat(owner, "You are now auto-following debris.") + to_chat(owner, span_notice("You are now auto-following debris.")) active = TRUE UpdateButtonIcon() /datum/action/innate/augury/Deactivate() SSaugury.watchers -= owner - to_chat(owner, "You are no longer auto-following debris.") + to_chat(owner, span_notice("You are no longer auto-following debris.")) active = FALSE UpdateButtonIcon() diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index fcc3c9dce312..82dd6cae6aad 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -324,7 +324,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 5dafdac0c3f9..58cd8423138e 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) 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) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 67e19fb3db14..fd9be0af713a 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -58,7 +58,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() @@ -80,9 +80,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 @@ -212,7 +212,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 @@ -371,7 +371,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(var/datum/map_config/VM) if(!VM.MakeNextMap()) @@ -471,13 +471,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 @@ -569,7 +569,7 @@ GLOBAL_LIST_EMPTY(the_station_areas) reserve_turfs(clearing) /datum/controller/subsystem/mapping/proc/build_minimaps() - to_chat(world, "Building minimaps...") + to_chat(world, span_boldannounce("Building minimaps...")) for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION)) station_minimaps += new /datum/minimap(z) diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index dc7a60918661..fd82007f6587 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -145,7 +145,7 @@ SUBSYSTEM_DEF(pai) /datum/controller/subsystem/pai/proc/findPAI(obj/item/paicard/p, mob/user) if(!(GLOB.ghost_role_flags & GHOSTROLE_SILICONS)) - to_chat(user, "Due to growing incidents of SELF corrupted independent artificial intelligences, freeform personality devices have been temporarily banned in this sector.") + to_chat(user, span_warning("Due to growing incidents of SELF corrupted independent artificial intelligences, freeform personality devices have been temporarily banned in this sector.")) return if(!ghost_spam) ghost_spam = TRUE @@ -154,7 +154,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 yourself as one.") + to_chat(G, span_ghostalert("[user] is requesting a pAI personality! Use the pAI button to submit yourself as one.")) addtimer(CALLBACK(src, .proc/spam_again), spam_delay) var/list/available = list() for(var/datum/paiCandidate/c in SSpai.candidates) diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index 1e8e9ae19648..fb6a16e8e5bf 100644 --- a/code/controllers/subsystem/server_maint.dm +++ b/code/controllers/subsystem/server_maint.dm @@ -76,7 +76,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 8f0bafeca1da..95b55bc2cc91 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -208,7 +208,7 @@ SUBSYSTEM_DEF(shuttle) var/can_evac_or_fail_reason = SSshuttle.canEvac(user) if(can_evac_or_fail_reason != TRUE) - to_chat(user, "[can_evac_or_fail_reason]") + to_chat(user, span_alert("[can_evac_or_fail_reason]")) return switch(emergency.mode) @@ -257,7 +257,7 @@ SUBSYSTEM_DEF(shuttle) var/area/A = get_area(user) log_game("[key_name(user)] has called the shuttle.") - deadchat_broadcast(" has called the shuttle at [A.name].", "[user.real_name]", user) + deadchat_broadcast(" has called the shuttle 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]") @@ -295,7 +295,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/ticker.dm b/code/controllers/subsystem/ticker.dm index b534e44da916..7b594c1b3653 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -117,7 +117,7 @@ SUBSYSTEM_DEF(ticker) login_music = choose_lobby_music() if(!login_music) - to_chat(world, "Could not load lobby music.") //yogs end + to_chat(world, span_boldwarning("Could not load lobby music.")) //yogs end if(!GLOB.syndicate_code_phrase) GLOB.syndicate_code_phrase = generate_code_phrase(return_list=TRUE) @@ -154,7 +154,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 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 @@ -212,7 +212,7 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/setup() - to_chat(world, "Starting game...") + to_chat(world, span_boldannounce("Starting game...")) var/init_start = world.timeofday //Create and announce mode var/list/datum/game_mode/runnable_modes @@ -226,14 +226,14 @@ SUBSYSTEM_DEF(ticker) if(runnable_modes.len) 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 if(!mode) if(!runnable_modes.len) mode = new /datum/game_mode/extended() - message_admins("Unable to choose any non-extended gamemode, running extended.") + message_admins(span_notice("Unable to choose any non-extended gamemode, running extended.")) else mode = pickweight(runnable_modes) if(!mode) //too few roundtypes all run too recently @@ -264,7 +264,7 @@ SUBSYSTEM_DEF(ticker) SSjob.ResetOccupations() return 0 else - message_admins("DEBUG: Bypassing prestart checks...") + message_admins(span_notice("DEBUG: Bypassing prestart checks...")) CHECK_TICK if(hide_mode) @@ -305,7 +305,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()]

") @@ -487,7 +487,7 @@ SUBSYSTEM_DEF(ticker) 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 @@ -658,20 +658,20 @@ SUBSYSTEM_DEF(ticker) var/skip_delay = check_rights() if(delay_end && !skip_delay) - to_chat(world, "An admin has delayed the round end.") + to_chat(world, span_boldannounce("An admin has delayed the round end.")) return //yogs start - yogs tickets if(GLOB.ahelp_tickets && GLOB.ahelp_tickets.ticketAmount) var/list/adm = get_admin_counts(R_BAN) var/list/activemins = adm["present"] if(activemins.len > 0) - to_chat(world, "Not all tickets have been resolved. Server restart delayed.") + to_chat(world, span_boldannounce("Not all tickets have been resolved. Server restart delayed.")) return else - to_chat(world, "Round ended, but there were still active tickets. Please submit a player complaint if you did not receive a response.") + to_chat(world, span_boldannounce("Round ended, but there were still active tickets. Please submit a player complaint if you did not receive a response.")) //yogs end - yogs tickets - to_chat(world, "Rebooting World in [DisplayTimeText(delay)]. [reason]") + to_chat(world, span_boldannounce("Rebooting World in [DisplayTimeText(delay)]. [reason]")) webhook_send_roundstatus("endgame") //yogs - webhook support var/start_wait = world.time @@ -679,7 +679,7 @@ SUBSYSTEM_DEF(ticker) 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 @@ -691,7 +691,7 @@ SUBSYSTEM_DEF(ticker) else if(gamelogloc) to_chat(world, "Round logs can be located at this website!") - log_game("Rebooting World. [reason]") + log_game(span_boldannounce("Rebooting World. [reason]")) world.Reboot() diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index c0593ea912f7..ce43d30d7bd5 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -166,7 +166,7 @@ SUBSYSTEM_DEF(vote) if(started_time) 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/lower_admin = FALSE @@ -175,7 +175,7 @@ SUBSYSTEM_DEF(vote) lower_admin = TRUE if(next_allowed_time > world.time && !lower_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/viewer.dm b/code/datums/achievements/viewer.dm index 295c5a4ccf13..5aab5e38c25a 100644 --- a/code/datums/achievements/viewer.dm +++ b/code/datums/achievements/viewer.dm @@ -84,7 +84,7 @@ set desc = "See all of your achivements" if(!SSachievements.initialized) - to_chat(src, "SSachievements has not initialized yet, please wait.") + to_chat(src, span_warning("SSachievements has not initialized yet, please wait.")) return var/datum/achievement_browser/achievement_browser = SSachievements.get_browser(src) diff --git a/code/datums/action.dm b/code/datums/action.dm index 079d7cff0547..543992c13814 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -432,7 +432,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) @@ -499,9 +499,9 @@ I.attack_self(owner) else if (owner.get_num_arms() <= 0) - to_chat(owner, "You dont have any usable hands!") + to_chat(owner, span_warning("You dont have any usable hands!")) else - to_chat(owner, "Your hands are full!") + to_chat(owner, span_warning("Your hands are full!")) /datum/action/item_action/agent_box name = "Deploy Box" diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 801ba80767d6..d84e42b9f500 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -224,7 +224,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 1aa1341c9cf9..5026080a843f 100644 --- a/code/datums/brain_damage/brain_trauma.dm +++ b/code/datums/brain_damage/brain_trauma.dm @@ -9,8 +9,8 @@ var/scan_desc = "generic brain trauma" //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 = "You feel traumatized." - var/lose_text = "You no longer feel traumatized." + var/gain_text = span_notice("You feel traumatized.") + var/lose_text = span_notice("You 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 d8ba6f8d6527..0c406e7bc4ff 100644 --- a/code/datums/brain_damage/creepy_trauma.dm +++ b/code/datums/brain_damage/creepy_trauma.dm @@ -3,7 +3,7 @@ desc = "Patient has a subtype of delusional disorder, becoming irrationally attached to someone." scan_desc = "psychotic schizophrenic delusions" 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 @@ -27,7 +27,7 @@ qdel(src) return obsessedmind = obsession.mind - gain_text = "You hear a sickening, raspy voice in your head. It wants one small task of you..." + gain_text = span_warning("You 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 @@ -95,11 +95,11 @@ owner.dizziness += 10 fail = TRUE if(3) - to_chat(owner, "You feel your heart lurching in your chest...") + to_chat(owner, span_userdanger("You feel your heart lurching in your chest...")) owner.Stun(20) shake_camera(owner, 15, 1) if(4) - to_chat(owner, "You faint.") + to_chat(owner, span_warning("You 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 bf24fb6dc418..c1e0baa6321e 100644 --- a/code/datums/brain_damage/hypnosis.dm +++ b/code/datums/brain_damage/hypnosis.dm @@ -42,7 +42,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, "You suddenly snap out of your hypnosis. The phrase '[hypnotic_phrase]' no longer feels important to you.") + to_chat(owner, span_userdanger("You suddenly snap out of your hypnosis. The phrase '[hypnotic_phrase]' no longer feels important to you.")) owner.clear_alert("hypnosis") ..() @@ -53,7 +53,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 0640c8fa3978..3d6f75f8c91d 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 = "Patient can see and hear an imaginary person." scan_desc = "partial schizophrenia" - gain_text = "You feel in good company, for some reason." - lose_text = "You feel lonely again." + gain_text = span_notice("You feel in good company, for some reason.") + lose_text = span_warning("You feel lonely again.") var/mob/camera/imaginary_friend/friend var/friend_initialized = FALSE @@ -81,8 +81,8 @@ /mob/camera/imaginary_friend/proc/greet() to_chat(src, "You are the imaginary friend of [owner]!") - to_chat(src, "You are absolutely loyal to your friend, no matter what.") - to_chat(src, "You cannot directly influence the world around you, but you can see what [owner] cannot.") + to_chat(src, span_notice("You are absolutely loyal to your friend, no matter what.")) + to_chat(src, span_notice("You cannot directly influence the world around you, but you can see what [owner] cannot.")) /mob/camera/imaginary_friend/Initialize(mapload, _trauma) . = ..() @@ -263,8 +263,8 @@ /mob/camera/imaginary_friend/trapped/greet() to_chat(src, "You 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, "You cannot directly influence the world around you, but you can see what the host cannot.") + 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("You 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 1af6f91d5885..d9feac3bf742 100644 --- a/code/datums/brain_damage/magic.dm +++ b/code/datums/brain_damage/magic.dm @@ -9,8 +9,8 @@ name = "Lumiphobia" desc = "Patient has an inexplicable adverse reaction to light." scan_desc = "light hypersensitivity" - gain_text = "You feel a craving for darkness." - lose_text = "Light no longer bothers you." + gain_text = span_warning("You 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() @@ -28,8 +28,8 @@ name = "Poltergeist" desc = "Patient appears to be targeted by a violent invisible entity." scan_desc = "paranormal activity" - gain_text = "You feel a hateful presence close to you." - lose_text = "You feel the hateful presence fade away." + gain_text = span_warning("You feel a hateful presence close to you.") + lose_text = span_notice("You feel the hateful presence fade away.") /datum/brain_trauma/magic/poltergeist/on_life() ..() @@ -49,8 +49,8 @@ name = "Athaumasia" desc = "Patient is completely inert to magical forces." scan_desc = "thaumic blank" - gain_text = "You realize that magic cannot be real." - lose_text = "You realize that magic might be real." + gain_text = span_notice("You realize that magic cannot be real.") + lose_text = span_notice("You 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 = "Patient is stalked by a phantom only they can see." scan_desc = "extra-sensory paranoia" - gain_text = "You feel like something wants to kill you..." - lose_text = "You no longer feel eyes on your back." + gain_text = span_warning("You feel like something wants to kill you...") + lose_text = span_notice("You 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/magic/demon_attack1.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_userdanger("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 0c4ccfde1c48..8a3aba23a4a8 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -95,10 +95,10 @@ if(6 to 9) owner.slurring += 30 if(10) - to_chat(owner, "You forget for a moment what you were doing.") + to_chat(owner, span_notice("You forget for a moment what you were doing.")) owner.Stun(20) if(11) - to_chat(owner, "You faint.") + to_chat(owner, span_warning("You faint.")) owner.Unconscious(80) ..() @@ -135,7 +135,7 @@ if(owner.m_intent == MOVE_INTENT_RUN) fall_chance += 2 if(prob(fall_chance) && (owner.mobility_flags & MOBILITY_STAND)) - to_chat(owner, "Your leg gives out!") + to_chat(owner, span_warning("Your 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, "You drop [I]!") + to_chat(owner, span_warning("You drop [I]!")) else if(prob(3)) - to_chat(owner, "You feel a sudden weakness in your muscles!") + to_chat(owner, span_warning("You feel a sudden weakness in your muscles!")) owner.adjustStaminaLoss(50) ..() @@ -169,8 +169,8 @@ name = "Nervous Cough" desc = "Patient feels a constant need to cough." scan_desc = "nervous cough" - gain_text = "Your throat itches incessantly..." - lose_text = "Your throat stops itching." + gain_text = span_warning("Your throat itches incessantly...") + lose_text = span_notice("Your throat stops itching.") /datum/brain_trauma/mild/nervous_cough/on_life() if(prob(12) && !HAS_TRAIT(owner, TRAIT_SOOTHED_THROAT)) diff --git a/code/datums/brain_damage/mrat.dm b/code/datums/brain_damage/mrat.dm index 81e30abcefeb..fcffe49a2221 100644 --- a/code/datums/brain_damage/mrat.dm +++ b/code/datums/brain_damage/mrat.dm @@ -2,7 +2,7 @@ name = "Epistemania" desc = "Patient suffers from a manic pursuit of knowlewdge." scan_desc = "epistemania" - gain_text = "Requesting mentor..." + gain_text = span_notice("Requesting mentor...") lose_text = "" random_gain = FALSE resilience = TRAUMA_RESILIENCE_ABSOLUTE @@ -23,9 +23,9 @@ I.Costume() friend_initialized = TRUE - to_chat(owner, "You have acquired the mentor rat [friend.key], ask them any question you like. They will leave your presence when they are done.") + to_chat(owner, span_notice("You have acquired the mentor rat [friend.key], ask them any question you like. They will leave your presence when they are done.")) else - to_chat(owner, "No mentor responded to your request. Try again later.") + to_chat(owner, span_warning("No mentor responded to your request. Try again later.")) qdel(src) /mob/camera/imaginary_friend/mrat @@ -101,9 +101,9 @@ /mob/camera/imaginary_friend/mrat/greet() to_chat(src, "You are the mentor rat of [owner]!") - to_chat(src, "Do not give [owner] any OOC information from your time as a ghost.") - to_chat(src, "Your job is to answer [owner]'s question(s) and you are given this form to assist in that.") - to_chat(src, "Don't be stupid with this or you will face the consequences.") + to_chat(src, span_notice("Do not give [owner] any OOC information from your time as a ghost.")) + to_chat(src, span_notice("Your job is to answer [owner]'s question(s) and you are given this form to assist in that.")) + to_chat(src, span_notice("Don't be stupid with this or you will face the consequences.")) /mob/camera/imaginary_friend/mrat/Initialize(mapload, _trauma) . = ..() @@ -136,13 +136,13 @@ /datum/action/innate/mrat_leave/Activate() var/mob/camera/imaginary_friend/I = owner - to_chat(I, "You have ejected yourself from [I.owner].") - to_chat(I.owner, "Your mentor has left.") + to_chat(I, span_warning("You have ejected yourself from [I.owner].")) + to_chat(I.owner, span_warning("Your mentor has left.")) qdel(I.trauma) /mob/camera/imaginary_friend/mrat/pointed(atom/A as mob|obj|turf in view()) if(!..()) return FALSE to_chat(owner, "[src] points at [A].") - to_chat(src, "You point at [A].") + to_chat(src, span_notice("You point at [A].")) return TRUE diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm index 034f2baaaf00..26c1a73a82f4 100644 --- a/code/datums/brain_damage/phobia.dm +++ b/code/datums/brain_damage/phobia.dm @@ -2,8 +2,8 @@ name = "Phobia" desc = "Patient is unreasonably afraid of something." scan_desc = "phobia" - gain_text = "You start finding default values very unnerving..." - lose_text = "You no longer feel afraid of default values." + gain_text = span_warning("You start finding default values very unnerving...") + lose_text = span_notice("You 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 = "You start finding [phobia_type] very unnerving..." - lose_text = "You no longer feel afraid of [phobia_type]." + gain_text = span_warning("You start finding [phobia_type] very unnerving...") + lose_text = span_notice("You 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/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) @@ -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_userdanger("Seeing [reason] [message]!")) else if(trigger_word) - to_chat(owner, "Hearing \"[trigger_word]\" [message]!") + to_chat(owner, span_userdanger("Hearing \"[trigger_word]\" [message]!")) else - to_chat(owner, "Something [message]!") + to_chat(owner, span_userdanger("Something [message]!")) var/reaction = rand(1,4) switch(reaction) if(1) - to_chat(owner, "You are paralyzed with fear!") + to_chat(owner, span_warning("You 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, "You shut your eyes in terror!") + to_chat(owner, span_warning("You 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 475b12b820ce..9a7d0679c1e2 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -41,8 +41,8 @@ name = "Cerebral Blindness" desc = "Patient's brain is no longer connected to its eyes." scan_desc = "extensive damage to the brain's occipital lobe" - gain_text = "You can't see!" - lose_text = "Your vision returns." + gain_text = span_warning("You can't see!") + lose_text = span_notice("Your vision returns.") /datum/brain_trauma/severe/blindness/on_gain() owner.become_blind(TRAUMA_TRAIT) @@ -97,8 +97,8 @@ subject = "your left leg" paralysis_traits = list(TRAIT_PARALYSIS_L_LEG) - gain_text = "You can't feel [subject] anymore!" - lose_text = "You can feel [subject] again!" + gain_text = span_warning("You can't feel [subject] anymore!") + lose_text = span_notice("You can feel [subject] again!") /datum/brain_trauma/severe/paralysis/on_gain() ..() @@ -134,10 +134,10 @@ if(owner.drowsyness) sleep_chance += 3 if(prob(sleep_chance)) - to_chat(owner, "You fall asleep.") + to_chat(owner, span_warning("You fall asleep.")) owner.Sleeping(60) else if(!owner.drowsyness && prob(sleep_chance * 2)) - to_chat(owner, "You feel tired...") + to_chat(owner, span_warning("You feel tired...")) owner.drowsyness += 10 /datum/brain_trauma/severe/monophobia @@ -151,9 +151,9 @@ /datum/brain_trauma/severe/monophobia/on_gain() ..() if(check_alone()) - to_chat(owner, "You feel really lonely...") + to_chat(owner, span_warning("You feel really lonely...")) else - to_chat(owner, "You feel safe, as long as you have people around you.") + to_chat(owner, span_notice("You feel safe, as long as you have people around you.")) /datum/brain_trauma/severe/monophobia/on_life() ..() @@ -182,18 +182,18 @@ switch(rand(1,6)) if(1) if(!high_stress) - to_chat(owner, "You feel sick...") + to_chat(owner, span_warning("You feel sick...")) else - to_chat(owner, "You feel really sick at the thought of being alone!") + to_chat(owner, span_warning("You feel really sick at the thought of being alone!")) addtimer(CALLBACK(owner, /mob/living/carbon.proc/vomit, high_stress), 50) //blood vomit if high stress if(2) if(!high_stress) - to_chat(owner, "You can't stop shaking...") + to_chat(owner, span_warning("You can't stop shaking...")) owner.dizziness += 20 owner.confused += 20 owner.Jitter(20) else - to_chat(owner, "You feel weak and scared! If only you weren't alone...") + to_chat(owner, span_warning("You feel weak and scared! If only you weren't alone...")) owner.dizziness += 20 owner.confused += 20 owner.Jitter(20) @@ -201,22 +201,22 @@ if(3, 4) if(!high_stress) - to_chat(owner, "You feel really lonely...") + to_chat(owner, span_warning("You 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, "Your heart skips a beat.") + to_chat(owner, span_warning("Your 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, "You feel a stabbing pain in your heart!") + to_chat(H, span_userdanger("You feel a stabbing pain in your heart!")) else - to_chat(owner, "You feel your heart lurching in your chest...") + to_chat(owner, span_userdanger("You feel your heart lurching in your chest...")) owner.adjustOxyLoss(8) /datum/brain_trauma/severe/discoordination diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm index b2056200e123..fdb2ad2d3ecc 100644 --- a/code/datums/brain_damage/special.dm +++ b/code/datums/brain_damage/special.dm @@ -7,8 +7,8 @@ name = "Godwoken Syndrome" desc = "Patient occasionally and uncontrollably channels an eldritch god when speaking." scan_desc = "god delusion" - gain_text = "You feel a higher power inside your mind..." - lose_text = "The divine presence leaves your head, no longer interested." + gain_text = span_notice("You 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 = "Patient can sense the bob and weave of bluespace around them, showing them passageways no one else can see." scan_desc = "bluespace attunement" - gain_text = "You feel the bluespace pulsing around you..." - lose_text = "The faint pulsing of bluespace fades into silence." + gain_text = span_notice("You 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() @@ -114,27 +114,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, "You try to align with the bluespace stream...") + to_chat(user, span_notice("You 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 = "Patient fights in unpredictable ways, ranging from helping his target to hitting them with brutal strength." scan_desc = "violent psychosis" - gain_text = "You feel unhinged..." - lose_text = "You feel more balanced." + gain_text = span_warning("You feel unhinged...") + lose_text = span_notice("You 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() @@ -149,8 +149,8 @@ name = "Tenacity" desc = "Patient is psychologically unaffected by pain and injuries, and can remain standing far longer than a normal person." scan_desc = "traumatic neuropathy" - gain_text = "You suddenly stop feeling pain." - lose_text = "You realize you can feel pain again." + gain_text = span_warning("You suddenly stop feeling pain.") + lose_text = span_warning("You realize you can feel pain again.") /datum/brain_trauma/special/tenacity/on_gain() ADD_TRAIT(owner, TRAIT_NOSOFTCRIT, TRAUMA_TRAIT) @@ -168,8 +168,8 @@ name = "Functional Cerebral Necrosis" desc = "Patient's brain is stuck in a functional near-death state, causing occasional moments of lucid hallucinations, which are often interpreted as the voices of the dead." scan_desc = "chronic functional necrosis" - gain_text = "You feel dead inside." - lose_text = "You feel alive again." + gain_text = span_warning("You feel dead inside.") + lose_text = span_notice("You feel alive again.") var/active = FALSE /datum/brain_trauma/special/death_whispers/on_life() @@ -195,8 +195,8 @@ name = "Criminal" desc = "Patient seems to be a criminal." scan_desc = "criminal mind" - gain_text = "Justice is coming for you." - lose_text = "You were absolved for your crimes." + gain_text = span_warning("Justice is coming for you.") + lose_text = span_notice("You were absolved for your crimes.") random_gain = FALSE var/obj/effect/hallucination/simple/securitron/beepsky @@ -229,7 +229,7 @@ return if(get_dist(owner, beepsky) <= 1) owner.playsound_local(owner, 'sound/weapons/egloves.ogg', 50) - owner.visible_message("[owner]'s body jerks as if it was shocked.", "You feel the fist of the LAW.") + owner.visible_message(span_warning("[owner]'s body jerks as if it was shocked."), span_userdanger("You 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) @@ -252,7 +252,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, "[name] exclaims, \"" + span_robotic("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 2ea66e8de8c2..9ce8a838149e 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 = "Patient's brain is split into two personalities, which randomly switch control of the body." scan_desc = "complete lobe separation" - gain_text = "You feel like your mind was split in two." - lose_text = "You feel alone again." + gain_text = span_warning("You feel like your mind was split in two.") + lose_text = span_notice("You 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 @@ -62,8 +62,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, "You feel your control being taken away... your other personality is in charge now!") - to_chat(current_backseat, "You manage to take control of your body!") + to_chat(owner, span_userdanger("You feel your control being taken away... your other personality is in charge now!")) + to_chat(current_backseat, span_userdanger("You manage to take control of your body!")) //Body to backseat @@ -135,11 +135,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 your body, switching places with the current personality.") + to_chat(src, span_notice("As a split personality, you cannot do anything but observe. However, you will eventually gain control of your 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.") /mob/living/split_personality/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) - to_chat(src, "You cannot speak, your other self is controlling your body!") + to_chat(src, span_warning("You cannot speak, your other self is controlling your body!")) return FALSE /mob/living/split_personality/emote(act, m_type = null, message = null, intentional = FALSE) @@ -152,7 +152,7 @@ desc = "Patient's brain is split into two personalities, which randomly switch control of the body." scan_desc = "complete lobe separation" gain_text = "" - lose_text = "You are free of your brainwashing." + lose_text = span_notice("You are free of your brainwashing.") can_gain = FALSE var/codeword var/objective @@ -196,7 +196,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, /datum/brain_trauma/severe/split_personality.proc/switch_personalities), 10) /datum/brain_trauma/severe/split_personality/brainwashing/handle_speech(datum/source, list/speech_args) @@ -211,7 +211,7 @@ /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 your body if you hear the special codeword, switching places with the current personality.") + to_chat(src, span_notice("As a brainwashed personality, you cannot do anything yet but observe. However, you may gain control of your body if you hear the special codeword, switching places with the current personality.")) to_chat(src, "Your activation codeword is: [codeword]") if(objective) to_chat(src, "Your master left you an objective: [objective]. Follow it at all costs when in control.") diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 8f73eb365804..437141855a31 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -95,7 +95,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_userdanger("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/components/archaeology.dm b/code/datums/components/archaeology.dm index b5740650e9f0..42ca87c7f7e9 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_notice("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 6f1ba6a8392e..4f65d379f331 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, "You can't improve [parent] any further!") + to_chat(user, span_warning("You 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, "You strengthen [R], improving its resistance against melee, bullet and laser damage.") + to_chat(user, span_info("You strengthen [R], improving its resistance against melee, bullet and laser damage.")) else - to_chat(user, "You strengthen [O], improving its resistance against melee attacks.") + to_chat(user, span_info("You 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 2a72218aa22c..7ca4b80ceb3a 100644 --- a/code/datums/components/art.dm +++ b/code/datums/components/art.dm @@ -18,7 +18,7 @@ /datum/component/art/proc/apply_moodlet(mob/M, impress) M.visible_message("[M] stops to admire [parent].", \ - "You take in [parent], admiring the fine craftsmanship.") + span_notice("You take in [parent], admiring the fine craftsmanship.")) switch(impress) if(GREAT_ART to INFINITY) 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 372fa8e283e6..587e986da296 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -27,10 +27,10 @@ for(var/_i in 1 to amount) if(!prob(final_effectiveness)) if(butcher) - to_chat(butcher, "You fail to harvest some of the [initial(bones.name)] from [meat].") + to_chat(butcher, span_warning("You fail to harvest some of the [initial(bones.name)] from [meat].")) else if(prob(bonus_chance)) if(butcher) - to_chat(butcher, "You harvest some extra [initial(bones.name)] from [meat]!") + to_chat(butcher, span_info("You harvest some extra [initial(bones.name)] from [meat]!")) for(var/i in 1 to 2) new bones (T) else @@ -43,7 +43,7 @@ new sinew (T) meat.guaranteed_butcher_results.Remove(sinew) if(butcher) - meat.visible_message("[butcher] butchers [meat].") + meat.visible_message(span_notice("[butcher] butchers [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 d6804564cb78..0ca91c8159fc 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].", \ - "You step on [A]!") + H.visible_message(span_danger("[H] steps on [A]."), \ + span_userdanger("You step on [A]!")) else - H.visible_message("[H] slides on [A]!", \ - "You slide on [A]!") + H.visible_message(span_danger("[H] slides on [A]!"), \ + span_userdanger("You slide on [A]!")) cooldown = world.time H.Paralyze(60) diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm index c38e9d3b5aec..e124f491e4ce 100644 --- a/code/datums/components/chasm.dm +++ b/code/datums/components/chasm.dm @@ -82,7 +82,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 @@ -96,8 +96,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_userdanger("[fall_message]")) + T.visible_message(span_boldwarning("[AM] falls from above!")) AM.forceMove(T) if(isliving(AM)) var/mob/living/L = AM @@ -107,7 +107,7 @@ else // send to oblivion - AM.visible_message("[AM] falls into [parent]!", "[oblivion_message]") + AM.visible_message(span_boldwarning("[AM] falls into [parent]!"), span_userdanger("[oblivion_message]")) if (isliving(AM)) var/mob/living/L = AM L.notransform = TRUE @@ -137,7 +137,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/cleaning.dm b/code/datums/components/cleaning.dm index 256d4385421e..9693e4ebfd3f 100644 --- a/code/datums/components/cleaning.dm +++ b/code/datums/components/cleaning.dm @@ -25,4 +25,4 @@ if(!(cleaned_human.mobility_flags & MOBILITY_STAND)) cleaned_human.wash(CLEAN_WASH) 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/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index b54d2d7bc2cd..f8b148232aa0 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -378,9 +378,9 @@ ui_interact(usr) var/fail_msg = construct_item(usr, TR) if(!fail_msg) - to_chat(usr, "[TR.name] constructed.") + to_chat(usr, span_notice("[TR.name] constructed.")) else - to_chat(usr, "Construction failed[fail_msg]") + to_chat(usr, span_warning("Construction failed[fail_msg]")) busy = FALSE if("toggle_recipes") display_craftable_only = !display_craftable_only diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm index 279d7635f8a8..582ae8308deb 100644 --- a/code/datums/components/gunpoint.dm +++ b/code/datums/components/gunpoint.dm @@ -33,9 +33,9 @@ RegisterSignal(targ, COMSIG_MOVABLE_MOVED, .proc/trigger_reaction) //except this one RegisterSignal(weapon, list(COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED), .proc/cancel) - shooter.visible_message("[shooter] aims [weapon] point blank at [target]!", \ - "You aim [weapon] point blank at [target]!", target) - to_chat(target, "[shooter] aims [weapon] point blank at you!") + shooter.visible_message(span_danger("[shooter] aims [weapon] point blank at [target]!"), \ + span_danger("You aim [weapon] point blank at [target]!"), target) + to_chat(target, span_userdanger("[shooter] aims [weapon] point blank at you!")) if(!target.has_status_effect(STATUS_EFFECT_NOTSCARED)) target.Immobilize(10) //short immobilize to let them know they're getting shot at target.apply_status_effect(STATUS_EFFECT_NOTSCARED)//this can only trigger once per minute so you can't use it to meme people a bunch in a fight @@ -68,13 +68,13 @@ /datum/component/gunpoint/proc/update_stage(new_stage) stage = new_stage if(stage == 2) - to_chat(parent, "You steady [weapon] on [target].") - to_chat(target, "[parent] has steadied [weapon] on you!") + to_chat(parent, span_danger("You steady [weapon] on [target].")) + to_chat(target, span_userdanger("[parent] has steadied [weapon] on you!")) damage_mult = GUNPOINT_MULT_STAGE_2 addtimer(CALLBACK(src, .proc/update_stage, 3), GUNPOINT_DELAY_STAGE_3) else if(stage == 3) - to_chat(parent, "You have fully steadied [weapon] on [target].") - to_chat(target, "[parent] has fully steadied [weapon] on you!") + to_chat(parent, span_danger("You have fully steadied [weapon] on [target].")) + to_chat(target, span_userdanger("[parent] has fully steadied [weapon] on you!")) damage_mult = GUNPOINT_MULT_STAGE_3 /datum/component/gunpoint/proc/check_deescalate() @@ -93,9 +93,9 @@ point_of_no_return = TRUE if(!weapon.can_shoot() || !weapon.can_trigger_gun(shooter) || (weapon.weapon_weight == WEAPON_HEAVY && shooter.get_inactive_held_item())) - shooter.visible_message("[shooter] fumbles [weapon]!", \ - "You fumble [weapon] and fail to fire at [target]!", target) - to_chat(target, "[shooter] fumbles [weapon] and fails to fire at you!") + shooter.visible_message(span_danger("[shooter] fumbles [weapon]!"), \ + span_danger("You fumble [weapon] and fail to fire at [target]!"), target) + to_chat(target, span_userdanger("[shooter] fumbles [weapon] and fails to fire at you!")) qdel(src) return if(weapon.check_botched(shooter)) @@ -111,16 +111,16 @@ if(!disrupted) disrupted = TRUE addtimer(CALLBACK(src, .proc/reshooted), 5) - to_chat(parent, "You lose your aim for a second, try not to bump into things or throw stuff.") + to_chat(parent, span_boldwarning("You lose your aim for a second, try not to bump into things or throw stuff.")) /datum/component/gunpoint/proc/reshooted() disrupted = FALSE /datum/component/gunpoint/proc/cancel() var/mob/living/shooter = parent - shooter.visible_message("[shooter] breaks [shooter.p_their()] aim on [target]!", \ - "You are no longer aiming [weapon] at [target].", target) - to_chat(target, "[shooter] breaks [shooter.p_their()] aim on you!") + shooter.visible_message(span_danger("[shooter] breaks [shooter.p_their()] aim on [target]!"), \ + span_danger("You are no longer aiming [weapon] at [target]."), target) + to_chat(target, span_userdanger("[shooter] breaks [shooter.p_their()] aim on you!")) qdel(src) /datum/component/gunpoint/proc/flinch(damage, damagetype, def_zone) @@ -136,8 +136,8 @@ flinch_chance = 80 if(prob(flinch_chance)) - shooter.visible_message("[shooter] flinches!", \ - "You flinch!") + shooter.visible_message(span_danger("[shooter] flinches!"), \ + span_danger("You flinch!")) trigger_reaction(TRUE) //flinching will always result in firing at the target /datum/component/gunpoint/proc/flinch_disarm(attacker,zone_targeted) @@ -153,8 +153,8 @@ flinch_chance = 80 if(prob(flinch_chance)) - shooter.visible_message("[shooter] flinches!", \ - "You flinch!") + shooter.visible_message(span_danger("[shooter] flinches!"), \ + span_danger("You flinch!")) trigger_reaction(TRUE) //flinching will always result in firing at the target #undef GUNPOINT_SHOOTER_STRAY_RANGE diff --git a/code/datums/components/heirloom.dm b/code/datums/components/heirloom.dm index 72b28b125dd6..fcc56ab05100 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 ae96fcb4d0b0..ac725967be87 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 a36169e6dfd3..699db4a7bdef 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_userdanger("[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 f4f07d2a5be0..32333a428fa5 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 amounts of metal or glass to be accepted by [parent].") + to_chat(user, span_warning("[I] does not contain sufficient amounts of metal or glass to be accepted by [parent].")) return if(!has_space(material_amount)) - to_chat(user, "[parent] is full. Please remove metal or glass from [parent] in order to insert more.") + to_chat(user, span_warning("[parent] is full. Please remove metal or glass from [parent] in order to insert more.")) return user_insert(I, user) @@ -92,18 +92,18 @@ 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) if(istype(I, /obj/item/stack)) var/obj/item/stack/S = I - to_chat(user, "You insert [inserted] [S.singular_name][inserted>1 ? "s" : ""] into [parent].") + to_chat(user, span_notice("You insert [inserted] [S.singular_name][inserted>1 ? "s" : ""] into [parent].")) if(!QDELETED(I) && I == active_held && !user.put_in_hands(I)) stack_trace("Warning: User could not put object back in hand during material container insertion, line [__LINE__]! This can lead to issues.") I.forceMove(user.drop_location()) else - to_chat(user, "You insert a material total of [inserted] into [parent].") + to_chat(user, span_notice("You insert a material total of [inserted] into [parent].")) qdel(I) if(after_insert) after_insert.Invoke(I.type, last_inserted_id, inserted) diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index 240d651aab7a..2eeb7373f0b7 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -36,7 +36,7 @@ /datum/component/mood/proc/print_mood(mob/user) var/msg = "*---------*\nYour 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" @@ -51,7 +51,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" @@ -72,7 +72,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 458753d44c07..83d447bd43ae 100644 --- a/code/datums/components/nanites.dm +++ b/code/datums/components/nanites.dm @@ -270,18 +270,18 @@ if(!full_scan) if(!stealth) to_chat(user, "Nanites Detected") - to_chat(user, "Saturation: [nanite_volume]/[max_nanites]") + 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 : "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 : "Disabled"]")) + to_chat(user, span_info("================")) + to_chat(user, span_info("Program List:")) if(stealth) - to_chat(user, "%#$ENCRYPTED&^@") + to_chat(user, span_alert("%#$ENCRYPTED&^@")) else for(var/X in programs) var/datum/nanite_program/NP = X diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm index 9ba5f5fa29ad..0ddcfd94b9d0 100644 --- a/code/datums/components/orbiter.dm +++ b/code/datums/components/orbiter.dm @@ -90,7 +90,7 @@ //we stack the orbits up client side, so we can assign this back to normal server side without it breaking the orbit 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 756c42aa9dab..eb284f004638 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/effects/spray.ogg', 5, 1, 5) - to_chat(user, "You spray [spraycan] on [A], painting it.") + to_chat(user, span_notice("You spray [spraycan] on [A], painting it.")) diff --git a/code/datums/components/religious_tool.dm b/code/datums/components/religious_tool.dm index d55e83896b95..2483fa1c0ed5 100644 --- a/code/datums/components/religious_tool.dm +++ b/code/datums/components/religious_tool.dm @@ -138,10 +138,10 @@ return if(!easy_access_sect) if(operation_flags & RELIGION_TOOL_SECTSELECT) - examine_list += "This looks like it can be used to select a sect." + examine_list += span_notice("This looks like it can be used to select a sect.") return - examine_list += "The sect currently has [round(easy_access_sect.favor)] favor with [GLOB.deity].[(operation_flags & RELIGION_TOOL_SACRIFICE) ? "Desired items can be used on this to increase favor." : ""]" + examine_list += span_notice("The sect currently has [round(easy_access_sect.favor)] favor with [GLOB.deity].[(operation_flags & RELIGION_TOOL_SACRIFICE) ? "Desired items can be used on this to increase favor." : ""]") if(!easy_access_sect.rites_list) return //if we dont have rites it doesnt do us much good if the object can be used to invoke them! if(operation_flags & RELIGION_TOOL_INVOKE) diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/remote_materials.dm index 08d452017412..5eea6e8e5f59 100644 --- a/code/datums/components/remote_materials.dm +++ b/code/datums/components/remote_materials.dm @@ -80,7 +80,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_notice("[parent] is already connected to [silo].")) return COMPONENT_NO_AFTERATTACK if (silo) silo.connected -= src @@ -92,7 +92,7 @@ handles linking back and forth. silo.connected += src silo.updateUsrDialog() mat_container = silo.GetComponent(/datum/component/material_container) - to_chat(user, "You connect [parent] to [silo] from the multitool's buffer.") + to_chat(user, span_notice("You connect [parent] to [silo] from the multitool's buffer.")) return COMPONENT_NO_AFTERATTACK else if (silo && istype(I, /obj/item/stack)) diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm index 8ea36096a58d..e967ab5677fc 100644 --- a/code/datums/components/riding.dm +++ b/code/datums/components/riding.dm @@ -69,7 +69,7 @@ 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))) - AM.visible_message("[M] falls off of [AM]!") + AM.visible_message(span_warning("[M] falls off of [AM]!")) AM.unbuckle_mob(M) return TRUE @@ -192,7 +192,7 @@ handle_vehicle_layer(direction) handle_vehicle_offsets() else - to_chat(user, "You'll need the keys in one of your hands to [drive_verb] [AM].") + to_chat(user, span_notice("You'll need the keys in one of your hands to [drive_verb] [AM].")) /datum/component/riding/proc/Unbuckle(atom/movable/M) addtimer(CALLBACK(parent, /atom/movable/.proc/unbuckle_mob, M), 0, TIMER_UNIQUE) @@ -263,7 +263,7 @@ var/atom/movable/AM = parent AM.unbuckle_mob(user) user.Knockdown(60) - user.visible_message("[AM] pushes [user] off of [AM.p_them()]!") + user.visible_message(span_warning("[AM] pushes [user] off of [AM.p_them()]!")) /datum/component/riding/cyborg del_on_unbuckle_all = TRUE @@ -277,14 +277,14 @@ if(R.module && R.module.ride_allow_incapacitated) kick = FALSE if(kick) - to_chat(user, "You fall off of [AM]!") + to_chat(user, span_userdanger("You 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, "You can't grab onto [AM] with no hands!") + to_chat(user, span_userdanger("You can't grab onto [AM] with no hands!")) return /datum/component/riding/cyborg/handle_vehicle_layer(dir) @@ -323,7 +323,7 @@ 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]!") + M.visible_message(span_warning("[M] is thrown clear of [AM]!")) M.throw_at(target, 14, 5, AM) M.Paralyze(60) S.throwcooldown = TRUE diff --git a/code/datums/components/rotation.dm b/code/datums/components/rotation.dm index afec8fee998e..436f00c280b2 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)) @@ -137,7 +137,7 @@ return !AM.anchored /datum/component/simple_rotation/proc/default_after_rotation(mob/user, rotation_type) - to_chat(user,"You [rotation_type == ROTATION_FLIP ? "flip" : "rotate"] [parent].") + to_chat(user,span_notice("You [rotation_type == ROTATION_FLIP ? "flip" : "rotate"] [parent].")) /atom/movable/proc/simple_rotate_clockwise() set name = "Rotate Clockwise" diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm index d03ed7cd7222..0769e90523d2 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 cb7eea70a42b..b1dd475a367b 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)) diff --git a/code/datums/components/stationloving.dm b/code/datums/components/stationloving.dm index 377609c26a6e..deb32f0c7c54 100644 --- a/code/datums/components/stationloving.dm +++ b/code/datums/components/stationloving.dm @@ -33,7 +33,7 @@ var/atom/movable/AM = parent AM.forceMove(targetturf) - to_chat(get(parent, /mob), "You can't help but feel that you just lost something back there...") + to_chat(get(parent, /mob), span_danger("You 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 7eb3d2ec7495..33141290e6da 100644 --- a/code/datums/components/storage/concrete/bag_of_holding.dm +++ b/code/datums/components/storage/concrete/bag_of_holding.dm @@ -16,12 +16,12 @@ return var/turf/loccheck = get_turf(A) if(is_reebe(loccheck.z)) - user.visible_message("An unseen force knocks [user] to the ground!", "\"I think not!\"") + user.visible_message(span_warning("An unseen force knocks [user] to the ground!"), "\"I think not!\"") user.Paralyze(60) return if(istype(loccheck.loc, /area/fabric_of_reality)) - to_chat(user, "You can't do that here!") - to_chat(user, "The Bluespace interfaces of the two devices catastrophically malfunction!") + to_chat(user, span_danger("You can't do that here!")) + to_chat(user, span_danger("The Bluespace interfaces of the two devices catastrophically malfunction!")) qdel(W) playsound(loccheck,'sound/effects/supermatter.ogg', 200, 1) @@ -40,7 +40,7 @@ var/mob/living/M = AT M.take_overall_damage(85) if(M.movement_type & FLYING) - M.visible_message("The bluespace collapse crushes the air towards it, pulling [M] towards the ground...") + M.visible_message(span_danger("The bluespace collapse crushes the air towards it, pulling [M] towards the ground...")) M.Paralyze(5, TRUE, TRUE) //Overrides stun absorbs. T.TerraformTurf(/turf/open/chasm/magic, /turf/open/chasm/magic) for(var/fabricarea in get_areas(/area/fabric_of_reality)) diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index 24770008d157..73b7c131dd13 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, "You discreetly slip [I] into [parent]. Alt-click [parent] to remove it.") + to_chat(user, span_notice("You discreetly slip [I] into [parent]. Alt-click [parent] to remove it.")) else - to_chat(user, "You discreetly slip [I] into [parent].") + to_chat(user, span_notice("You discreetly slip [I] into [parent].")) /datum/component/storage/concrete/pockets max_w_class = WEIGHT_CLASS_NORMAL diff --git a/code/datums/components/storage/concrete/rped.dm b/code/datums/components/storage/concrete/rped.dm index 455eb985f090..a6ffb79e93af 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/storage.dm b/code/datums/components/storage/storage.dm index b7af031d8b7d..922dd2854aaa 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -187,7 +187,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) @@ -197,7 +197,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) @@ -211,14 +211,14 @@ things = typecache_filter_list(things, typecacheof(I.type)) var/len = length(things) if(!len) - to_chat(M, "You failed to pick up anything with [parent].") + to_chat(M, span_notice("You failed to pick up anything with [parent].")) return var/datum/progressbar/progress = new(M, len, I.loc) var/list/rejections = list() while(do_after(M, 10, TRUE, parent, FALSE, CALLBACK(src, .proc/handle_mass_pickup, things, I.loc, rejections, progress))) stoplag(1) qdel(progress) - to_chat(M, "You put everything you could [insert_preposition] [parent].") + to_chat(M, span_notice("You put everything you 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() @@ -266,10 +266,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, "You start dumping out [parent].") + to_chat(M, span_notice("You start dumping out [parent].")) var/turf/T = get_turf(A) var/list/things = contents() var/datum/progressbar/progress = new(M, length(things), T) @@ -481,7 +481,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, 1, -5) @@ -529,7 +529,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 @@ -563,7 +563,7 @@ return FALSE A.add_fingerprint(M) if(locked && !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) @@ -591,46 +591,46 @@ 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/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(HAS_TRAIT(I, TRAIT_NO_STORAGE)) if(!stop_messages) - to_chat(M, "\the [I] can't seem to fit in \the [host]!") + to_chat(M, span_warning("\the [I] can't seem to fit in \the [host]!")) 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)) @@ -661,11 +661,11 @@ playsound(parent, "rustle", 50, 1, -5) for(var/mob/viewing in viewers(user, null)) if(M == viewing) - to_chat(usr, "You put [I] [insert_preposition]to [parent].") + to_chat(usr, span_notice("You put [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] puts [I] [insert_preposition]to [parent].", MSG_VISUAL) + viewing.show_message(span_notice("[M] puts [I] [insert_preposition]to [parent]."), MSG_VISUAL) else if(I && I.w_class >= 3) //Otherwise they can only see large or normal items from a distance... - viewing.show_message("[M] puts [I] [insert_preposition]to [parent].", MSG_VISUAL) + viewing.show_message(span_notice("[M] puts [I] [insert_preposition]to [parent]."), MSG_VISUAL) /datum/component/storage/proc/update_icon() if(isobj(parent)) @@ -751,7 +751,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!")) else show_to(user) @@ -780,7 +780,7 @@ if(locked) if(istype(parent, /obj/item/storage/lockbox)) return - to_chat(user, "[parent] seems to be locked!") + to_chat(user, span_warning("[parent] seems to be locked!")) return var/atom/A = parent @@ -797,9 +797,9 @@ A.add_fingerprint(user) remove_from_storage(I, get_turf(user)) if(!user.put_in_hands(I)) - to_chat(user, "You fumble for [I] and it falls on the floor.") + to_chat(user, span_notice("You fumble for [I] and it falls on the floor.")) return - user.visible_message("[user] draws [I] from [parent]!", "You draw [I] from [parent].") + user.visible_message(span_warning("[user] draws [I] from [parent]!"), span_notice("You draw [I] from [parent].")) return /datum/component/storage/proc/action_trigger(datum/signal_source, datum/action/source) diff --git a/code/datums/components/summoning.dm b/code/datums/components/summoning.dm index 2eaceb257ed5..8228f465de5e 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/on_spawned_death) // so we can remove them from the list, etc (for mobs with corpses) playsound(spawn_location,spawn_sound, 50, 1) - 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 \ No newline at end of file diff --git a/code/datums/components/tether.dm b/code/datums/components/tether.dm index faa6182208af..05c6343b7dea 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_userdanger("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_userdanger("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 13a17a0fecf4..8b347e9a3946 100644 --- a/code/datums/components/uplink.dm +++ b/code/datums/components/uplink.dm @@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(uplinks) /datum/component/uplink/proc/LoadTC(mob/user, obj/item/stack/telecrystal/TC, silent = FALSE) if(!silent) - to_chat(user, "You slot [TC] into [parent] and charge its internal uplink.") + to_chat(user, span_notice("You slot [TC] into [parent] and charge its internal uplink.")) var/amt = TC.amount telecrystals += amt TC.use(amt) @@ -118,7 +118,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) /datum/component/uplink/proc/interact(datum/source, mob/user) @@ -301,7 +301,7 @@ GLOBAL_LIST_EMPTY(uplinks) previous_attempts.Cut() master.degrees = 0 interact(null, user) - to_chat(user, "Your pen makes a clicking noise, before quickly rotating back to 0 degrees!") + to_chat(user, span_warning("Your 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 3cdb7b569339..c7e338ca2f6a 100644 --- a/code/datums/dash_weapon.dm +++ b/code/datums/dash_weapon.dm @@ -51,4 +51,4 @@ holder.update_action_buttons_icon() if(recharge_sound) playsound(dashing_item, recharge_sound, 50, 1) - 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/datumvars.dm b/code/datums/datumvars.dm index 03367dc214eb..df6b7470e5d9 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -43,7 +43,7 @@ var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round. if(!usr.client || !usr.client.holder) //The usr vs src abuse in this proc is intentional and must not be changed - to_chat(usr, "You need to be an administrator to access this.") + to_chat(usr, span_danger("You need to be an administrator to access this.")) return if(!D) @@ -937,7 +937,7 @@ fire = text2num(result["values"]["fire"]),\ acid = text2num(result["values"]["acid"])) log_admin("[key_name(usr)] modified the armor on [O] ([O.type]) to melee: [O.armor.melee], bullet: [O.armor.bullet], laser: [O.armor.laser], energy: [O.armor.energy], bomb: [O.armor.bomb], bio: [O.armor.bio], rad: [O.armor.rad], fire: [O.armor.fire], acid: [O.armor.acid]") - message_admins("[key_name_admin(usr)] modified the armor on [O] ([O.type]) to melee: [O.armor.melee], bullet: [O.armor.bullet], laser: [O.armor.laser], energy: [O.armor.energy], bomb: [O.armor.bomb], bio: [O.armor.bio], rad: [O.armor.rad], fire: [O.armor.fire], acid: [O.armor.acid]") + message_admins(span_notice("[key_name_admin(usr)] modified the armor on [O] ([O.type]) to melee: [O.armor.melee], bullet: [O.armor.bullet], laser: [O.armor.laser], energy: [O.armor.energy], bomb: [O.armor.bomb], bio: [O.armor.bio], rad: [O.armor.rad], fire: [O.armor.fire], acid: [O.armor.acid]")) else return @@ -973,7 +973,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) @@ -985,7 +985,7 @@ 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) ")) else if(href_list["addreagent"]) if(!check_rights(NONE)) @@ -1012,7 +1012,7 @@ if(ID == chosen_id) valid_id = 1 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 ID") chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in reagent_options if(chosen_id) @@ -1020,7 +1020,7 @@ if(amount) A.reagents.add_reagent(chosen_id, amount) log_admin("[key_name(usr)] has added [amount] units of [chosen_id] to \the [A]") - message_admins("[key_name(usr)] has added [amount] units of [chosen_id] to \the [A]") + message_admins(span_notice("[key_name(usr)] has added [amount] units of [chosen_id] to \the [A]")) else if(href_list["explode"]) if(!check_rights(R_FUN)) @@ -1131,7 +1131,7 @@ var/datum/martial_art/MA = new chosenart MA.teach(C) log_admin("[key_name(usr)] has taught [MA] to [key_name(C)].") - message_admins("[key_name_admin(usr)] has taught [MA] to [key_name_admin(C)].") + message_admins(span_notice("[key_name_admin(usr)] has taught [MA] to [key_name_admin(C)].")) else if(href_list["givetrauma"]) if(!check_rights(NONE)) @@ -1156,7 +1156,7 @@ var/datum/brain_trauma/BT = C.gain_trauma(result) if(BT) log_admin("[key_name(usr)] has traumatized [key_name(C)] with [BT.name]") - message_admins("[key_name_admin(usr)] has traumatized [key_name_admin(C)] with [BT.name].") + message_admins(span_notice("[key_name_admin(usr)] has traumatized [key_name_admin(C)] with [BT.name].")) else if(href_list["curetraumas"]) if(!check_rights(NONE)) @@ -1169,7 +1169,7 @@ C.cure_all_traumas(TRAUMA_RESILIENCE_ABSOLUTE) log_admin("[key_name(usr)] has cured all traumas from [key_name(C)].") - message_admins("[key_name_admin(usr)] has cured all traumas from [key_name_admin(C)].") + message_admins(span_notice("[key_name_admin(usr)] has cured all traumas from [key_name_admin(C)].")) else if(href_list["hallucinate"]) if(!check_rights(NONE)) @@ -1399,7 +1399,7 @@ to_chat(usr, "Mob doesn't exist anymore") return H.cluwneify() - message_admins("[key_name(usr)] has made [key_name(H)] into a Cluwne.") + message_admins(span_notice("[key_name(usr)] has made [key_name(H)] into a Cluwne.")) return // yogs end else if(href_list["makepacman"]) @@ -1508,7 +1508,7 @@ var/mob/user = usr if(!P.persistence_id || !P.C) - to_chat(user,"This is not a persistent painting.") + to_chat(user,span_warning("This is not a persistent painting.")) return var/md5 = md5(P.C.get_data_string()) var/author = P.C.author_ckey @@ -1523,4 +1523,4 @@ if(PA.C && md5(PA.C.get_data_string()) == md5) QDEL_NULL(PA.C) log_admin("[key_name(user)] has deleted a persistent painting made by [author].") - message_admins("[key_name_admin(user)] has deleted persistent painting made by [author].") + message_admins(span_notice("[key_name_admin(user)] has deleted persistent painting made by [author].")) diff --git a/code/datums/diseases/advance/symptoms/beard.dm b/code/datums/diseases/advance/symptoms/beard.dm index 533c57a67c36..a01ea5cd10d5 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_hair_style)+1, A.stage-1), beard_order.len) if(index > 0 && H.facial_hair_style != beard_order[index]) - to_chat(H, "Your chin itches.") + to_chat(H, span_warning("Your chin itches.")) H.facial_hair_style = 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 631a63ca83c6..d66edc45dca4 100644 --- a/code/datums/diseases/advance/symptoms/choking.dm +++ b/code/datums/diseases/advance/symptoms/choking.dm @@ -51,16 +51,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, "You feel very [pick("dizzy","woozy","faint")].") //fake bloodloss messages + to_chat(M, span_warning("You feel very [pick("dizzy","woozy","faint")].")) //fake bloodloss messages Choke_stage_3_4(M, A) M.emote("gasp") else - to_chat(M, "[pick("You're choking!", "You can't breathe!")]") + to_chat(M, span_userdanger("[pick("You're choking!", "You can't breathe!")]")) Choke(M, A) M.emote("gasp") @@ -129,11 +129,11 @@ Bonus Asphyxiate_stage_3_4(M, A) M.emote("gasp") if(5) - to_chat(M, "[pick("Your lungs hurt!", "It hurts to breathe!")]") + to_chat(M, span_userdanger("[pick("Your lungs hurt!", "It hurts to breathe!")]")) Asphyxiate(M, A) M.emote("gasp") 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 316eae1c7e31..dafa7e688fc1 100644 --- a/code/datums/diseases/advance/symptoms/confusion.dm +++ b/code/datums/diseases/advance/symptoms/confusion.dm @@ -54,9 +54,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, "You can't think straight!") + to_chat(M, span_userdanger("You can't think straight!")) M.confused = min(100 * power, M.confused + 8) if(brain_damage) M.adjustOrganLoss(ORGAN_SLOT_BRAIN,3 * power, 80) diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index 92aa51d2f853..049bbb68e897 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -49,14 +49,14 @@ Bonus switch(A.stage) if(3, 4) if(prob(base_message_chance) && !suppress_warning) - to_chat(M, "[pick("You hear a ringing in your ear.", "Your ears pop.")]") + to_chat(M, span_warning("[pick("You hear a ringing in your 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, "Your ears pop painfully and start bleeding!") + to_chat(M, span_userdanger("Your ears pop painfully and start bleeding!")) ears.damage = max(ears.damage, ears.maxHealth) M.emote("scream") else - to_chat(M, "Your ears pop and begin ringing loudly!") + to_chat(M, span_userdanger("Your ears pop and begin ringing loudly!")) M.minimumDeafTicks(20) diff --git a/code/datums/diseases/advance/symptoms/dizzy.dm b/code/datums/diseases/advance/symptoms/dizzy.dm index 965d5f372746..8fa08acc78bc 100644 --- a/code/datums/diseases/advance/symptoms/dizzy.dm +++ b/code/datums/diseases/advance/symptoms/dizzy.dm @@ -49,9 +49,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_userdanger("A wave of dizziness washes over you!")) M.Dizzy(5) if(power >= 2) M.set_drugginess(5) diff --git a/code/datums/diseases/advance/symptoms/fever.dm b/code/datums/diseases/advance/symptoms/fever.dm index a5a56e867536..ad8c4fdfa45b 100644 --- a/code/datums/diseases/advance/symptoms/fever.dm +++ b/code/datums/diseases/advance/symptoms/fever.dm @@ -49,9 +49,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_userdanger("[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 aa902d919eac..1a1c6aed2b54 100644 --- a/code/datums/diseases/advance/symptoms/fire.dm +++ b/code/datums/diseases/advance/symptoms/fire.dm @@ -57,16 +57,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, "Your skin bursts into flames!") + to_chat(M, span_userdanger("Your skin bursts into flames!")) M.emote("scream") if(5) Firestacks_stage_5(M, A) M.IgniteMob() - to_chat(M, "Your skin erupts into an inferno!") + to_chat(M, span_userdanger("Your skin erupts into an inferno!")) M.emote("scream") /datum/symptom/fire/proc/Firestacks_stage_4(mob/living/M, datum/disease/advance/A) @@ -143,19 +143,19 @@ 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) Alkali_fire_stage_4(M, A) M.IgniteMob() - to_chat(M, "Your sweat bursts into flames!") + to_chat(M, span_userdanger("Your sweat bursts into flames!")) M.emote("scream") if(5) Alkali_fire_stage_5(M, A) M.IgniteMob() - to_chat(M, "Your skin erupts into an inferno!") + to_chat(M, span_userdanger("Your skin erupts into an inferno!")) M.emote("scream") 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),0,0,2 * explosion_power) Alkali_fire_stage_5(M, A) diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index b180b72f4e7f..c0b0b61de132 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_userdanger("[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_userdanger("[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/hallucigen.dm b/code/datums/diseases/advance/symptoms/hallucigen.dm index c3c58092d7e2..20e6bfd8961f 100644 --- a/code/datums/diseases/advance/symptoms/hallucigen.dm +++ b/code/datums/diseases/advance/symptoms/hallucigen.dm @@ -54,16 +54,16 @@ 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)) - to_chat(M, "[pick("Oh, your head...", "Your head pounds.", "They're everywhere! Run!", "Something in the shadows...")]") + to_chat(M, span_userdanger("[pick("Oh, your head...", "Your head pounds.", "They're everywhere! Run!", "Something in the shadows...")]")) M.hallucination += (45 * power) diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm index 6541639d055e..d9d25962dc0b 100644 --- a/code/datums/diseases/advance/symptoms/headache.dm +++ b/code/datums/diseases/advance/symptoms/headache.dm @@ -55,10 +55,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_userdanger("[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 00acb17cfb55..bd8b4ff37956 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -56,7 +56,7 @@ stage_speed = 0 transmittable = 1 level = 6 - passive_message = "You miss the feeling of starlight on your skin." + passive_message = span_notice("You miss the feeling of starlight on your skin.") var/nearspace_penalty = 0.3 threshold_descs = list( "Stage Speed 6" = "Increases healing speed.", @@ -84,7 +84,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, "Your skin tingles as the starlight seems to heal you.") + to_chat(M, span_notice("Your skin tingles as the starlight seems to heal you.")) M.adjustToxLoss(-(4 * heal_amt)) //most effective on toxins @@ -132,7 +132,7 @@ if(food_conversion) M.adjust_nutrition(0.3) if(prob(2)) - to_chat(M, "You feel a mild warmth as your blood purifies itself.") + to_chat(M, span_notice("You feel a mild warmth as your blood purifies itself.")) return 1 @@ -172,7 +172,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, "You feel an odd gurgle in your stomach, as if it was working much faster than normal.") + to_chat(C, span_notice("You feel an odd gurgle in your stomach, as if it was working much faster than normal.")) return 1 /datum/symptom/heal/darkness @@ -183,7 +183,7 @@ stage_speed = -2 transmittable = -1 level = 6 - passive_message = "You feel tingling on your skin as light passes over it." + passive_message = span_notice("You feel tingling on your skin as light passes over it.") threshold_descs = list( "Stage Speed 8" = "Doubles healing speed.", ) @@ -213,7 +213,7 @@ return if(prob(5)) - to_chat(M, "The darkness soothes and mends your wounds.") + to_chat(M, span_notice("The darkness soothes and mends your 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 @@ -233,7 +233,7 @@ stage_speed = -3 transmittable = -2 level = 8 - passive_message = "The pain from your wounds makes you feel oddly sleepy..." + passive_message = span_notice("The pain from your wounds makes you feel oddly sleepy...") var/deathgasp = FALSE var/active_coma = FALSE //to prevent multiple coma procs threshold_descs = list( @@ -262,7 +262,7 @@ else if(M.IsSleeping()) return power * 0.25 else if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma) - to_chat(M, "You feel yourself slip into a regenerative coma...") + to_chat(M, span_warning("You feel yourself slip into a regenerative coma...")) active_coma = TRUE addtimer(CALLBACK(src, .proc/coma, M), 60) @@ -312,7 +312,7 @@ stage_speed = 0 transmittable = 1 level = 6 - passive_message = "Your skin feels oddly dry..." + passive_message = span_notice("Your skin feels oddly dry...") var/absorption_coeff = 1 threshold_descs = list( "Resistance 5" = "Water is consumed at a much slower rate.", @@ -350,7 +350,7 @@ return if(prob(5)) - to_chat(M, "You feel yourself absorbing the water around you to soothe your damaged skin.") + to_chat(M, span_notice("You feel yourself absorbing the water around you to soothe your 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)) @@ -371,7 +371,7 @@ stage_speed = -2 transmittable = -2 level = 8 - passive_message = "You feel an odd attraction to plasma." + passive_message = span_notice("You feel an odd attraction to plasma.") var/temp_rate = 1 threshold_descs = list( "Transmission 6" = "Increases temperature adjustment rate.", @@ -405,16 +405,16 @@ var/heal_amt = 4 * actual_power if(prob(5)) - to_chat(M, "You feel yourself absorbing plasma inside and around you...") + to_chat(M, span_notice("You feel yourself 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, "You feel less hot.") + to_chat(M, span_notice("You 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, "You feel warmer.") + to_chat(M, span_notice("You feel warmer.")) M.adjustToxLoss(-heal_amt) @@ -422,7 +422,7 @@ if(!parts.len) return if(prob(5)) - to_chat(M, "The pain from your wounds fades rapidly.") + to_chat(M, span_notice("The pain from your 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() @@ -439,7 +439,7 @@ level = 6 symptom_delay_min = 1 symptom_delay_max = 1 - passive_message = "Your skin glows faintly for a moment." + passive_message = span_notice("Your skin glows faintly for a moment.") var/cellular_damage = FALSE threshold_descs = list( "Transmission 6" = "Additionally heals cellular damage.", @@ -485,7 +485,7 @@ return if(prob(4)) - to_chat(M, "Your skin glows faintly, and you feel your wounds mending themselves.") + to_chat(M, span_notice("Your skin glows faintly, and you feel your 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 f88497bfbcf3..c146ae316aa2 100644 --- a/code/datums/diseases/advance/symptoms/itching.dm +++ b/code/datums/diseases/advance/symptoms/itching.dm @@ -53,6 +53,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 var/can_scratch = scratch && !M.incapacitated() && get_location_accessible(M, picked_bodypart) - M.visible_message("[can_scratch ? "[M] scratches [M.p_their()] [bodypart.name]." : ""]", "Your [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]") + M.visible_message("[can_scratch ? span_warning("[M] scratches [M.p_their()] [bodypart.name].") : ""]", span_warning("Your [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 73daf3e7120a..322bed7af642 100644 --- a/code/datums/diseases/advance/symptoms/narcolepsy.dm +++ b/code/datums/diseases/advance/symptoms/narcolepsy.dm @@ -65,28 +65,28 @@ Bonus switch(A.stage) if(1) if(prob(10)) - to_chat(M, "You feel tired.") + to_chat(M, span_warning("You feel tired.")) if(2) if(prob(10)) - to_chat(M, "You feel very tired.") + to_chat(M, span_warning("You feel very tired.")) sleepy_ticks += rand(10,14) if(stamina) M.adjustStaminaLoss(10) if(3) if(prob(15)) - to_chat(M, "You try to focus on staying awake.") + to_chat(M, span_warning("You try to focus on staying awake.")) sleepy_ticks += rand(10,14) if(stamina) M.adjustStaminaLoss(15) if(4) if(prob(20)) - to_chat(M, "You nod off for a moment.") + to_chat(M, span_warning("You nod off for a moment.")) sleepy_ticks += rand(10,14) if(stamina) M.adjustStaminaLoss(20) if(5) if(prob(25)) - 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.")]")) M.drowsyness = max(M.drowsyness, 2) sleepy_ticks += rand(10,14) if(stamina) diff --git a/code/datums/diseases/advance/symptoms/necropolis.dm b/code/datums/diseases/advance/symptoms/necropolis.dm index 413f22b2a7f4..ba7849270486 100644 --- a/code/datums/diseases/advance/symptoms/necropolis.dm +++ b/code/datums/diseases/advance/symptoms/necropolis.dm @@ -40,12 +40,12 @@ if(tendrils) tendril(A) if(prob(base_message_chance)) - to_chat(M, "Your skin feels scaly") + to_chat(M, span_notice("Your skin feels scaly")) if(3, 4) if(tendrils) tendril(A) if(prob(base_message_chance)) - to_chat(M, "[pick("Your skin is hard.", "You feel stronger.", "You feel powerful.")]") + to_chat(M, span_notice("[pick("Your skin is hard.", "You feel stronger.", "You feel powerful.")]")) if(5) if(tendrils) tendril(A) @@ -64,7 +64,7 @@ M.weather_immunities |= "lava" else if(prob(base_message_chance)) - to_chat(M, "[pick("Your skin has become a hardened carapace", "Your strength is superhuman.", "You feel invincible.")]") + to_chat(M, span_notice("[pick("Your skin has become a hardened carapace", "Your strength is superhuman.", "You feel invincible.")]")) if(tendrils) tendril(A) return @@ -91,7 +91,7 @@ if(!.) return var/mob/living/carbon/M = A.affected_mob - to_chat(M, "You feel weakened as the necropolis' blessing leaves your body.") + to_chat(M, span_danger("You feel weakened as the necropolis' blessing leaves your body.")) M.remove_movespeed_modifier(MOVESPEED_ID_NECRO_VIRUS_SLOWDOWN) M.dna.species.punchdamagelow = initial(M.dna.species.punchdamagelow) M.dna.species.punchdamagehigh = initial(M.dna.species.punchdamagehigh) diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm index 7e7ba9fffeb3..07ca376b2097 100644 --- a/code/datums/diseases/advance/symptoms/oxygen.dm +++ b/code/datums/diseases/advance/symptoms/oxygen.dm @@ -52,7 +52,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(new_stage, datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/radiation.dm b/code/datums/diseases/advance/symptoms/radiation.dm index ee0723be3e3f..e2af3edc46f9 100644 --- a/code/datums/diseases/advance/symptoms/radiation.dm +++ b/code/datums/diseases/advance/symptoms/radiation.dm @@ -33,10 +33,10 @@ switch(A.stage) if(1) if(prob(10)) - to_chat(M, "You feel off...") + to_chat(M, span_notice("You feel off...")) if(2, 3) if(prob(10)) - to_chat(M, "You feel like the atoms inside you are beginning to split...") + to_chat(M, span_danger("You feel like the atoms inside you are beginning to split...")) if(4, 5) if(fastrads) radiate(M, 3) @@ -44,12 +44,12 @@ radiate(M, 10) if(radothers && A.stage == 5) if(prob(5)) - M.visible_message("[M] glows green for a moment!", \ - "You feel a massive wave of pain flow through you!") + M.visible_message(span_danger("[M] glows green for a moment!"), \ + span_userdanger("You feel a massive wave of pain flow through you!")) radiation_pulse(M, 20) /datum/symptom/radiation/proc/radiate(mob/living/carbon/M, chance) if(prob(chance)) - to_chat(M, "You feel a wave of pain throughout your body!") + to_chat(M, span_danger("You feel a wave of pain throughout your body!")) M.radiation += 4 diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index eaeebd0c4668..2118dd5f6612 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -92,13 +92,13 @@ if(HAS_TRAIT_FROM(M, TRAIT_BLIND, EYE_DAMAGE)) if(prob(20)) - to_chat(M, "Your vision slowly returns...") + to_chat(M, span_notice("Your 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, "You can finally focus your eyes on distant objects.") + to_chat(M, span_notice("You can finally focus your eyes on distant objects.")) M.cure_nearsighted(EYE_DAMAGE) M.blur_eyes(10) @@ -109,4 +109,4 @@ eyes.applyOrganDamage(-1) else if(prob(base_message_chance)) - to_chat(M, "[pick("Your eyes feel great.","You feel like your 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 your 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 fd06d093f269..e758205063aa 100644 --- a/code/datums/diseases/advance/symptoms/shedding.dm +++ b/code/datums/diseases/advance/symptoms/shedding.dm @@ -34,17 +34,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.hair_style == "Bald") && !(H.hair_style == "Balding Hair")) - to_chat(H, "Your hair starts to fall out in clumps...") + to_chat(H, span_warning("Your hair starts to fall out in clumps...")) addtimer(CALLBACK(src, .proc/Shed, H, FALSE), 50) if(5) if(!(H.facial_hair_style == "Shaved") || !(H.hair_style == "Bald")) - to_chat(H, "Your hair starts to fall out in clumps...") + to_chat(H, span_warning("Your hair starts to fall out in clumps...")) addtimer(CALLBACK(src, .proc/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 2c19ad69c1c3..ea2bbb43ad7a 100644 --- a/code/datums/diseases/advance/symptoms/shivering.dm +++ b/code/datums/diseases/advance/symptoms/shivering.dm @@ -48,9 +48,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_userdanger("[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 bd166b0e8888..22972ce9e44d 100644 --- a/code/datums/diseases/advance/symptoms/skin.dm +++ b/code/datums/diseases/advance/symptoms/skin.dm @@ -53,7 +53,7 @@ BONUS H.dna.features["mcolor"] = "EEE" //pure white. H.regenerate_icons() else - H.visible_message("[H] looks a bit pale...", "Your skin suddenly appears lighter...") + H.visible_message(span_warning("[H] looks a bit pale..."), span_notice("Your skin suddenly appears lighter...")) /datum/symptom/vitiligo/End(datum/disease/advance/A) . = ..() @@ -120,7 +120,7 @@ BONUS H.dna.features["mcolor"] = "000" //pure black. H.regenerate_icons() else - H.visible_message("[H] looks a bit dark...", "Your skin suddenly appears darker...") + H.visible_message(span_warning("[H] looks a bit dark..."), span_notice("Your skin suddenly appears darker...")) /datum/symptom/revitiligo/End(datum/disease/advance/A) . = ..() @@ -171,4 +171,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 74c332e0a5a7..9fb69f1fe218 100644 --- a/code/datums/diseases/advance/symptoms/vision.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -53,7 +53,7 @@ Bonus switch(A.stage) if(1, 2) if(prob(base_message_chance) && !suppress_warning) - to_chat(M, "Your eyes itch.") + to_chat(M, span_warning("Your eyes itch.")) if(3, 4) to_chat(M, "Your eyes burn!") M.blur_eyes(10) @@ -66,11 +66,11 @@ Bonus if(prob(eyes.damage - 10 + 1)) if(!remove_eyes) if(!HAS_TRAIT(M, TRAIT_BLIND)) - to_chat(M, "You go blind!") + to_chat(M, span_userdanger("You go blind!")) eyes.applyOrganDamage(eyes.maxHealth) else - M.visible_message("[M]'s eyes fall out of their sockets!", "Your eyes fall out of their sockets!") + M.visible_message(span_warning("[M]'s eyes fall out of their sockets!"), span_userdanger("Your eyes fall out of their sockets!")) eyes.Remove(M) eyes.forceMove(get_turf(M)) else - to_chat(M, "Your eyes burn horrifically!") + to_chat(M, span_userdanger("Your eyes burn horrifically!")) diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm index 1026388aa0d4..6d570ed2b8ba 100644 --- a/code/datums/diseases/advance/symptoms/voice_change.dm +++ b/code/datums/diseases/advance/symptoms/voice_change.dm @@ -57,7 +57,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 4077aef5e74f..660ed4d1f0ff 100644 --- a/code/datums/diseases/advance/symptoms/vomit.dm +++ b/code/datums/diseases/advance/symptoms/vomit.dm @@ -59,7 +59,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 6e11f043868d..7409b4c7e743 100644 --- a/code/datums/diseases/advance/symptoms/weight.dm +++ b/code/datums/diseases/advance/symptoms/weight.dm @@ -48,7 +48,7 @@ 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...")]") M.overeatduration = max(M.overeatduration - 100, 0) diff --git a/code/datums/diseases/advance/symptoms/youth.dm b/code/datums/diseases/advance/symptoms/youth.dm index da10b8331718..16c2aeffd9a3 100644 --- a/code/datums/diseases/advance/symptoms/youth.dm +++ b/code/datums/diseases/advance/symptoms/youth.dm @@ -40,20 +40,20 @@ BONUS if(1) if(H.age > 41) H.age = 41 - to_chat(H, "You haven't had this much energy in years!") + to_chat(H, span_notice("You 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, "You begin to feel more lithe.") + to_chat(H, span_notice("You begin to feel more lithe.")) if(4) if(H.age > 26) H.age = 26 - to_chat(H, "You feel reinvigorated.") + to_chat(H, span_notice("You feel reinvigorated.")) if(5) if(H.age > 21) H.age = 21 - to_chat(H, "You feel like you can take on the world!") + to_chat(H, span_notice("You feel like you can take on the world!")) diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm index 20ecceb224c2..22a453894f1a 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, "You feel anxious.") + to_chat(affected_mob, span_notice("You feel anxious.")) if(3) if(prob(10)) - to_chat(affected_mob, "Your stomach flutters.") + to_chat(affected_mob, span_notice("Your stomach flutters.")) if(prob(5)) - to_chat(affected_mob, "You feel panicky.") + to_chat(affected_mob, span_notice("You 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, "You feel butterflies in your stomach.") + to_chat(affected_mob, span_danger("You feel butterflies in your stomach.")) if(prob(5)) - affected_mob.visible_message("[affected_mob] stumbles around in a panic.", \ - "You have a panic attack!") + affected_mob.visible_message(span_danger("[affected_mob] stumbles around in a panic."), \ + span_userdanger("You 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!", \ - "You cough up butterflies!") + affected_mob.visible_message(span_danger("[affected_mob] coughs up butterflies!"), \ + span_userdanger("You cough up butterflies!")) new /mob/living/simple_animal/butterfly(affected_mob.loc) new /mob/living/simple_animal/butterfly(affected_mob.loc) return \ No newline at end of file diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index 31f102efd511..b73182fece91 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -27,7 +27,7 @@ A.inflamed = 1 A.update_icon() if(prob(3)) - to_chat(affected_mob, "You feel a stabbing pain in your abdomen!") + to_chat(affected_mob, span_warning("You 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 074bda0560f8..6d944640415e 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, "You taste honey in your mouth.") + to_chat(affected_mob, span_notice("You taste honey in your mouth.")) if(3) if(prob(10)) - to_chat(affected_mob, "Your stomach rumbles.") + to_chat(affected_mob, span_notice("Your stomach rumbles.")) if(prob(2)) - to_chat(affected_mob, "Your stomach stings painfully.") + to_chat(affected_mob, span_danger("Your 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.", \ - "Your stomach buzzes violently!") + affected_mob.visible_message(span_danger("[affected_mob] buzzes."), \ + span_userdanger("Your stomach buzzes violently!")) if(prob(5)) - to_chat(affected_mob, "You feel something moving in your throat.") + to_chat(affected_mob, span_danger("You feel something moving in your throat.")) if(prob(1)) - affected_mob.visible_message("[affected_mob] coughs up a swarm of bees!", \ - "You cough up a swarm of bees!") + affected_mob.visible_message(span_danger("[affected_mob] coughs up a swarm of bees!"), \ + span_userdanger("You cough up a swarm of bees!")) new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc) return \ No newline at end of file diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm index 57628efe3627..cbeb91cce3fa 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, "You don't feel like yourself.") + to_chat(affected_mob, span_danger("You don't feel like yourself.")) 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, "Your try to remember something important...but can't.") + to_chat(affected_mob, span_danger("Your try to remember something important...but can't.")) if(4) if(prob(2)) @@ -46,10 +46,10 @@ affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 170) affected_mob.updatehealth() if(prob(2)) - to_chat(affected_mob, "Strange buzzing fills your head, removing all thoughts.") + to_chat(affected_mob, span_danger("Strange buzzing fills your head, removing all thoughts.")) if(prob(3)) - to_chat(affected_mob, "You lose consciousness...") - affected_mob.visible_message("[affected_mob] suddenly collapses") + to_chat(affected_mob, span_danger("You lose consciousness...")) + affected_mob.visible_message(span_warning("[affected_mob] suddenly collapses")) 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 7115a570591a..8e04f4663ab5 100644 --- a/code/datums/diseases/cold.dm +++ b/code/datums/diseases/cold.dm @@ -15,11 +15,11 @@ switch(stage) if(2) if(!(affected_mob.mobility_flags & MOBILITY_STAND) && prob(40)) //changed FROM prob(10) until sleeping is fixed - to_chat(affected_mob, "You feel better.") + to_chat(affected_mob, span_notice("You feel better.")) cure() return if(prob(1) && prob(5)) - to_chat(affected_mob, "You feel better.") + to_chat(affected_mob, span_notice("You feel better.")) cure() return if(prob(1)) @@ -27,16 +27,16 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - to_chat(affected_mob, "Your throat feels sore.") + to_chat(affected_mob, span_danger("Your throat feels sore.")) if(prob(1)) - to_chat(affected_mob, "Mucous runs down the back of your throat.") + to_chat(affected_mob, span_danger("Mucous runs down the back of your throat.")) if(3) if(!(affected_mob.mobility_flags & MOBILITY_STAND) && prob(25)) //changed FROM prob(5) until sleeping is fixed - to_chat(affected_mob, "You feel better.") + to_chat(affected_mob, span_notice("You feel better.")) cure() return if(prob(1) && prob(1)) - to_chat(affected_mob, "You feel better.") + to_chat(affected_mob, span_notice("You feel better.")) cure() return if(prob(1)) @@ -44,9 +44,9 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - to_chat(affected_mob, "Your throat feels sore.") + to_chat(affected_mob, span_danger("Your throat feels sore.")) if(prob(1)) - to_chat(affected_mob, "Mucous runs down the back of your throat.") + to_chat(affected_mob, span_danger("Mucous runs down the back of your 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 47f391ecf78d..049c3c98876c 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, "You feel better.") + to_chat(affected_mob, span_notice("You 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, "Your throat feels sore.") + to_chat(affected_mob, span_danger("Your throat feels sore.")) if(prob(5)) - to_chat(affected_mob, "You feel stiff.") + to_chat(affected_mob, span_danger("You 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, "Your throat feels sore.") + to_chat(affected_mob, span_danger("Your throat feels sore.")) if(prob(10)) - to_chat(affected_mob, "You feel stiff.") \ No newline at end of file + to_chat(affected_mob, span_danger("You feel stiff.")) \ No newline at end of file diff --git a/code/datums/diseases/decloning.dm b/code/datums/diseases/decloning.dm index d6522dda3aea..1ee7e82204c4 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, "Your skin feels strange.") + to_chat(affected_mob, span_danger("Your 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, "Your skin starts degrading!") + to_chat(affected_mob, span_danger("Your 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!", "Your skin turns to dust!") + affected_mob.visible_message(span_danger("[affected_mob] skin turns to dust!"), "Your skin turns to dust!") affected_mob.dust() \ No newline at end of file diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index 3a67230d36ec..1d469c79bcfc 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, "Your muscles ache.") + to_chat(affected_mob, span_danger("Your muscles ache.")) if(prob(20)) affected_mob.take_bodypart_damage(1) if(prob(1)) - to_chat(affected_mob, "Your stomach hurts.") + to_chat(affected_mob, span_danger("Your 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, "You don't feel like yourself..") + to_chat(affected_mob, span_danger("You don't feel like yourself..")) 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, "You feel more like yourself.") + to_chat(affected_mob, span_notice("You feel more like yourself.")) return ..() diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm index 37628a5502f1..a5450165029f 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("gasp") 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 62bb3de8df41..2a650b355e37 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, "You feel better.") + to_chat(affected_mob, span_notice("You 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, "Your muscles ache.") + to_chat(affected_mob, span_danger("Your muscles ache.")) if(prob(20)) affected_mob.take_bodypart_damage(1) if(prob(1)) - to_chat(affected_mob, "Your stomach hurts.") + to_chat(affected_mob, span_danger("Your 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, "You feel better.") + to_chat(affected_mob, span_notice("You 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, "Your muscles ache.") + to_chat(affected_mob, span_danger("Your muscles ache.")) if(prob(20)) affected_mob.take_bodypart_damage(1) if(prob(1)) - to_chat(affected_mob, "Your stomach hurts.") + to_chat(affected_mob, span_danger("Your 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 3297877fe910..8a4e3edf4e38 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 b4b51258424f..9f1ba1be626d 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!", \ - "You 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_userdanger("You 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!", \ - "You 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_userdanger("You 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, "You feel your speech slow down") + to_chat(affected_mob, span_userdanger("You 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!", \ - "You 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("You 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 8ac199685570..f9adaf149974 100644 --- a/code/datums/diseases/gbs.dm +++ b/code/datums/diseases/gbs.dm @@ -22,9 +22,9 @@ if(prob(5)) affected_mob.emote("gasp") if(prob(10)) - to_chat(affected_mob, "Your body hurts all over!") + to_chat(affected_mob, span_danger("Your body hurts all over!")) if(4) - to_chat(affected_mob, "Your body feels as if it's trying to rip itself apart!") + to_chat(affected_mob, span_userdanger("Your 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 68cadb44cbef..f48ec0702b2b 100644 --- a/code/datums/diseases/heart_failure.dm +++ b/code/datums/diseases/heart_failure.dm @@ -30,25 +30,25 @@ switch(stage) if(1 to 2) if(prob(2)) - to_chat(H, "You feel [pick("discomfort", "pressure", "a burning sensation", "pain")] in your chest.") + to_chat(H, span_warning("You feel [pick("discomfort", "pressure", "a burning sensation", "pain")] in your chest.")) if(prob(2)) - to_chat(H, "You feel dizzy.") + to_chat(H, span_warning("You feel dizzy.")) H.confused += 6 if(prob(3)) - to_chat(H, "You feel [pick("full", "nauseated", "sweaty", "weak", "tired", "short on breath", "uneasy")].") + to_chat(H, span_warning("You feel [pick("full", "nauseated", "sweaty", "weak", "tired", "short on breath", "uneasy")].")) if(3 to 4) if(!sound) H.playsound_local(H, 'sound/health/slowbeat.ogg',40,0, channel = CHANNEL_HEARTBEAT) sound = TRUE if(prob(3)) - to_chat(H, "You feel a sharp pain in your chest!") + to_chat(H, span_danger("You 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, "You feel very weak and dizzy...") + to_chat(H, span_danger("You feel very weak and dizzy...")) H.confused += 8 H.adjustStaminaLoss(40) H.emote("cough") @@ -56,7 +56,7 @@ H.stop_sound_channel(CHANNEL_HEARTBEAT) H.playsound_local(H, 'sound/effects/singlebeat.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!") + H.visible_message(span_userdanger("[H] clutches at [H.p_their()] chest as if [H.p_their()] heart is stopping!")) H.adjustStaminaLoss(60) H.set_heartattack(TRUE) H.reagents.add_reagent(/datum/reagent/medicine/corazone, 3) // To give the victim a final chance to shock their heart before losing consciousness diff --git a/code/datums/diseases/jitters.dm b/code/datums/diseases/jitters.dm index 3096c138f785..3dc80b31ec09 100644 --- a/code/datums/diseases/jitters.dm +++ b/code/datums/diseases/jitters.dm @@ -22,13 +22,13 @@ if(prob(20)) affected_mob.Jitter(2) if(prob(10)) - to_chat(affected_mob, "You feel ants in your legs.") + to_chat(affected_mob, span_notice("You feel ants in your legs.")) if(3) if(prob(40)) affected_mob.Jitter(2) if(prob(20)) - to_chat(affected_mob, "You feel a million pricks on your legs!") + to_chat(affected_mob, span_danger("You feel a million pricks on your legs!")) if((affected_mob.mobility_flags & MOBILITY_MOVE) && prob(15)) affected_mob.throw_at(target, 4, 3, spin = FALSE, diagonals_first = TRUE) playsound(affected_mob, 'sound/weapons/fwoosh.ogg', 50, 1, 1) - affected_mob.visible_message("[affected_mob] uncontrollably leaps forward!") + affected_mob.visible_message(span_warning("[affected_mob] uncontrollably leaps forward!")) diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm index 29e6657e1313..bb79356abb39 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, "You feel a slight shock course through your body.") + to_chat(affected_mob, span_danger("You 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, "You feel a strong shock course through your body.") + to_chat(affected_mob, span_danger("You feel a strong shock course through your body.")) if(prob(2)) - to_chat(affected_mob, "You feel like clowning around.") + to_chat(affected_mob, span_danger("You 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, "You feel a powerful shock course through your body.") + to_chat(affected_mob, span_danger("You feel a powerful shock course through your body.")) if(prob(2)) - to_chat(affected_mob, "You query upon the nature of miracles.") + to_chat(affected_mob, span_danger("You 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 68e962055aa4..7598d9444e0f 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_userdanger("[parrot] bursts out of your chest!")) ..() diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index 24ccf6d7f847..6c787423ae3d 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -16,10 +16,10 @@ switch(stage) if(1) if(prob(10)) - to_chat(affected_mob, "You feel a little silly.") + to_chat(affected_mob, span_danger("You feel a little silly.")) if(2) if(prob(10)) - to_chat(affected_mob, "You start seeing rainbows.") + to_chat(affected_mob, span_danger("You start seeing rainbows.")) if(3) if(prob(10)) to_chat(affected_mob, "Your thoughts are interrupted by a loud HONK!") diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm index c8ffe012981d..81cb105cda5e 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, "You feel better.") + to_chat(affected_mob, span_notice("You feel better.")) cure() return if (prob(8)) - to_chat(affected_mob, "Your head hurts.") + to_chat(affected_mob, span_danger("Your head hurts.")) if (prob(9)) to_chat(affected_mob, "You feel a tingling sensation in your chest.") if (prob(9)) - to_chat(affected_mob, "You feel angry.") + to_chat(affected_mob, span_danger("You feel angry.")) if(2) if(restcure) if(!(affected_mob.mobility_flags & MOBILITY_STAND) && prob(20)) - to_chat(affected_mob, "You feel better.") + to_chat(affected_mob, span_notice("You feel better.")) cure() return if (prob(8)) - to_chat(affected_mob, "Your skin feels loose.") + to_chat(affected_mob, span_danger("Your skin feels loose.")) if (prob(10)) to_chat(affected_mob, "You feel very strange.") if (prob(4)) - to_chat(affected_mob, "You feel a stabbing pain in your head!") + to_chat(affected_mob, span_danger("You feel a stabbing pain in your head!")) affected_mob.Unconscious(40) if (prob(4)) - to_chat(affected_mob, "Your stomach churns.") + to_chat(affected_mob, span_danger("Your stomach churns.")) if(3) if(restcure) if(!(affected_mob.mobility_flags & MOBILITY_STAND) && prob(20)) - to_chat(affected_mob, "You feel better.") + to_chat(affected_mob, span_notice("You feel better.")) cure() return if (prob(10)) - to_chat(affected_mob, "Your entire body vibrates.") + to_chat(affected_mob, span_danger("Your 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, "You feel better.") + to_chat(affected_mob, span_notice("You feel better.")) cure() return if (prob(60)) diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm index de9b66f27e46..db8266bf04f8 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, "You feel strange...") + to_chat(affected_mob, span_danger("You feel strange...")) if(3) if(prob(5)) - to_chat(affected_mob, "You feel the urge to dance...") + to_chat(affected_mob, span_danger("You feel the urge to dance...")) else if(prob(5)) affected_mob.emote("gasp") else if(prob(10)) - to_chat(affected_mob, "You feel the need to chick chicky boom...") + to_chat(affected_mob, span_danger("You 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("gasp") - to_chat(affected_mob, "You feel a burning beat inside...") + to_chat(affected_mob, span_danger("You feel a burning beat inside...")) if(5) - to_chat(affected_mob, "Your body is unable to contain the Rhumba Beat...") + to_chat(affected_mob, span_danger("Your 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/sleepy.dm b/code/datums/diseases/sleepy.dm index c39fb54d544e..8e61dd03c574 100644 --- a/code/datums/diseases/sleepy.dm +++ b/code/datums/diseases/sleepy.dm @@ -20,15 +20,15 @@ if(prob(5)) affected_mob.emote("yawn") if(prob(3)) - to_chat(affected_mob, "Your muscles feel tired.") + to_chat(affected_mob, span_danger("Your muscles feel tired.")) if(prob(20)) affected_mob.adjustStaminaLoss(5) if(prob(5)) - to_chat(affected_mob, "A nap would be good right about now.") + to_chat(affected_mob, span_danger("A nap would be good right about now.")) if(prob(10)) affected_mob.adjustStaminaLoss(3) if(prob(3)) - to_chat(affected_mob, "You feel numb.") + to_chat(affected_mob, span_danger("You feel numb.")) if(prob(20)) affected_mob.adjustStaminaLoss(8) @@ -36,27 +36,27 @@ if(prob(8)) affected_mob.emote("yawn") if(prob(3)) - to_chat(affected_mob, "Your muscles feel very weak.") + to_chat(affected_mob, span_danger("Your muscles feel very weak.")) affected_mob.adjustStaminaLoss(10) if(prob(2)) - to_chat(affected_mob, "Your legs buckle beneath you.") + to_chat(affected_mob, span_danger("Your legs buckle beneath you.")) affected_mob.Knockdown(40) if(prob(3)) - to_chat(affected_mob, "You close your eyes... just for a moment.") + to_chat(affected_mob, span_danger("You close your eyes... just for a moment.")) affected_mob.blind_eyes(6) if(prob(3)) - to_chat(affected_mob, "Your legs feel weak.") + to_chat(affected_mob, span_danger("Your legs feel weak.")) affected_mob.confused = max(affected_mob.confused, 4) affected_mob.adjustStaminaLoss(10) if(prob(3)) - to_chat(affected_mob, "Your eyes feel strained.") + to_chat(affected_mob, span_danger("Your eyes feel strained.")) affected_mob.blur_eyes(6) if(prob(3)) - to_chat(affected_mob, "[pick("So tired...","You feel very sleepy.","You have a hard time keeping your eyes open.","You try to stay awake.")]") + to_chat(affected_mob, span_warning("[pick("So tired...","You feel very sleepy.","You have a hard time keeping your eyes open.","You try to stay awake.")]")) affected_mob.blur_eyes(6) affected_mob.confused = max(affected_mob.confused, 4) affected_mob.adjustStaminaLoss(15) if(prob(5)) - to_chat(affected_mob, "Just a little nap...") + to_chat(affected_mob, span_danger("Just a little nap...")) affected_mob.SetSleeping(80) return diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 2154abb29094..5f1c86f4260e 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -112,9 +112,9 @@ stage1 = list() stage2 = list() stage3 = list() - stage4 = list("Your back hurts.", "You breathe through your mouth.", - "You have a craving for bananas.", "Your mind feels clouded.") - stage5 = list("You feel like monkeying around.") + stage4 = list(span_warning("Your back hurts."), span_warning("You breathe through your mouth."), + span_warning("You have a craving for bananas."), span_warning("Your mind feels clouded.")) + stage5 = list(span_warning("You 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)) @@ -129,10 +129,10 @@ switch(stage) if(2) if(prob(2)) - to_chat(affected_mob, "Your [pick("back", "arm", "leg", "elbow", "head")] itches.") + to_chat(affected_mob, span_notice("Your [pick("back", "arm", "leg", "elbow", "head")] itches.")) if(3) if(prob(4)) - to_chat(affected_mob, "You feel a stabbing pain in your head.") + to_chat(affected_mob, span_danger("You feel a stabbing pain in your head.")) affected_mob.confused += 10 if(4) if(prob(3)) @@ -164,10 +164,10 @@ severity = DISEASE_SEVERITY_BIOHAZARD visibility_flags = 0 stage1 = list() - stage2 = list("Your joints feel stiff.", "Beep...boop..") - stage3 = list("Your joints feel very stiff.", "Your skin feels loose.", "You can feel something move...inside.") - stage4 = list("Your skin feels very loose.", "You can feel... something...inside you.") - stage5 = list("Your skin feels as if it's about to burst off!") + stage2 = list("Your joints feel stiff.", span_danger("Beep...boop..")) + stage3 = list(span_danger("Your joints feel very stiff."), "Your skin feels loose.", span_danger("You can feel something move...inside.")) + stage4 = list(span_danger("Your skin feels very loose."), span_danger("You can feel... something...inside you.")) + stage5 = list(span_danger("Your skin feels as if it's about to burst off!")) new_form = /mob/living/silicon/robot infectable_biotypes = list(MOB_ORGANIC, MOB_UNDEAD, MOB_ROBOTIC) bantype = "Cyborg" @@ -179,7 +179,7 @@ if (prob(8)) affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop"), forced = "robotic transformation") if (prob(4)) - to_chat(affected_mob, "You feel a stabbing pain in your head.") + to_chat(affected_mob, span_danger("You feel a stabbing pain in your head.")) affected_mob.Unconscious(40) if(4) if (prob(20)) @@ -197,10 +197,10 @@ severity = DISEASE_SEVERITY_BIOHAZARD visibility_flags = 0 stage1 = list() - stage2 = list("Your throat feels scratchy.", "Kill...") - stage3 = list("Your throat feels very scratchy.", "Your skin feels tight.", "You can feel something move...inside.") - stage4 = list("Your skin feels very tight.", "Your blood boils!", "You can feel... something...inside you.") - stage5 = list("Your skin feels as if it's about to burst off!") + stage2 = list("Your throat feels scratchy.", span_danger("Kill...")) + stage3 = list(span_danger("Your throat feels very scratchy."), "Your skin feels tight.", span_danger("You can feel something move...inside.")) + stage4 = list(span_danger("Your skin feels very tight."), span_danger("Your blood boils!"), span_danger("You can feel... something...inside you.")) + stage5 = list(span_danger("Your skin feels as if it's about to burst off!")) new_form = /mob/living/carbon/alien/humanoid/hunter bantype = ROLE_ALIEN @@ -209,7 +209,7 @@ switch(stage) if(3) if (prob(4)) - to_chat(affected_mob, "You feel a stabbing pain in your head.") + to_chat(affected_mob, span_danger("You feel a stabbing pain in your head.")) affected_mob.Unconscious(40) if(4) if (prob(20)) @@ -227,9 +227,9 @@ visibility_flags = 0 stage1 = list("You don't feel very well.") stage2 = list("Your skin feels a little slimy.") - stage3 = list("Your appendages are melting away.", "Your limbs begin to lose their shape.") - stage4 = list("You are turning into a slime.") - stage5 = list("You have become a slime.") + stage3 = list(span_danger("Your appendages are melting away."), span_danger("Your limbs begin to lose their shape.")) + stage4 = list(span_danger("You are turning into a slime.")) + stage5 = list(span_danger("You have become a slime.")) new_form = /mob/living/simple_animal/slime/random /datum/disease/transformation/slime/stage_act() @@ -255,9 +255,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 your mind!") - stage5 = list("AUUUUUU!!!") + stage3 = list(span_danger("Must... eat... chocolate...."), span_danger("YAP")) + stage4 = list(span_danger("Visions of washing machines assail your mind!")) + stage5 = list(span_danger("AUUUUUU!!!")) new_form = /mob/living/simple_animal/pet/dog/corgi /datum/disease/transformation/corgi/stage_act() @@ -281,9 +281,9 @@ visibility_flags = 0 stage1 = list("Your stomach rumbles.") stage2 = list("Your skin feels saggy.") - stage3 = list("Your appendages are melting away.", "Your limbs begin to lose their shape.") - stage4 = list("You're ravenous.") - stage5 = list("You have become a morph.") + stage3 = list(span_danger("Your appendages are melting away."), span_danger("Your limbs begin to lose their shape.")) + stage4 = list(span_danger("You're ravenous.")) + stage5 = list(span_danger("You have become a morph.")) new_form = /mob/living/simple_animal/hostile/morph infectable_biotypes = list(MOB_ORGANIC, MOB_INORGANIC, MOB_UNDEAD) //magic! @@ -298,9 +298,9 @@ visibility_flags = 0 stage1 = list("Your stomach rumbles.") stage2 = list("Your body feels tired") - stage3 = list("Your skin starts to look transparent", "Your limbs begin to lose their shape.") - stage4 = list("your organs seems to suddenly disappear.") - stage5 = list("You have become a ghost.") + stage3 = list(span_danger("Your skin starts to look transparent"), span_danger("Your limbs begin to lose their shape.")) + stage4 = list(span_danger("your organs seems to suddenly disappear.")) + stage5 = list(span_danger("You have become a ghost.")) new_form = /mob/living/simple_animal/hostile/retaliate/ghost infectable_biotypes = list(MOB_ORGANIC, MOB_INORGANIC, MOB_UNDEAD) //magic! @@ -316,9 +316,9 @@ visibility_flags = 0 stage1 = list("You seem a little lighter in your step.") stage2 = list("You catch yourself smiling for no reason.") - stage3 = list("A cruel sense of calm overcomes you.", "You can't feel your arms!", "You let go of the urge to hurt clowns.") - stage4 = list("You can't feel your arms. It does not bother you anymore.", "You forgive the clown for hurting you.") - stage5 = list("You have become a Gondola.") + stage3 = list(span_danger("A cruel sense of calm overcomes you."), span_danger("You can't feel your arms!"), span_danger("You let go of the urge to hurt clowns.")) + stage4 = list(span_danger("You can't feel your arms. It does not bother you anymore."), span_danger("You forgive the clown for hurting you.")) + stage5 = list(span_danger("You have become a Gondola.")) new_form = /mob/living/simple_animal/pet/gondola /datum/disease/transformation/gondola/stage_act() @@ -340,6 +340,6 @@ if (prob(20)) affected_mob.reagents.add_reagent_list(list(/datum/reagent/pax = 5)) if (prob(2)) - to_chat(affected_mob, "You let go of what you were holding.") + to_chat(affected_mob, span_danger("You 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 1059e4a8e00b..cf6fd59dcc0e 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -19,33 +19,33 @@ if(2) if(prob(2)) affected_mob.emote("cough") - to_chat(affected_mob, "Your chest hurts.") + to_chat(affected_mob, span_danger("Your chest hurts.")) if(prob(2)) - to_chat(affected_mob, "Your stomach violently rumbles!") + to_chat(affected_mob, span_danger("Your stomach violently rumbles!")) if(prob(5)) - to_chat(affected_mob, "You feel a cold sweat form.") + to_chat(affected_mob, span_danger("You feel a cold sweat form.")) if(4) if(prob(2)) - to_chat(affected_mob, "You see four of everything") + to_chat(affected_mob, span_userdanger("You see four of everything")) affected_mob.Dizzy(5) if(prob(2)) - to_chat(affected_mob, "You feel a sharp pain from your lower chest!") + to_chat(affected_mob, span_danger("You feel a sharp pain from your lower chest!")) affected_mob.adjustOxyLoss(5) affected_mob.emote("gasp") if(prob(10)) - to_chat(affected_mob, "You feel air escape from your lungs painfully.") + to_chat(affected_mob, span_danger("You feel air escape from your lungs painfully.")) affected_mob.adjustOxyLoss(25) affected_mob.emote("gasp") 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_userdanger("[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!", "You surrender yourself and feel at peace...") + affected_mob.visible_message(span_warning("[affected_mob] faints!"), span_userdanger("You surrender yourself and feel at peace...")) affected_mob.AdjustSleeping(100) if(prob(2)) - to_chat(affected_mob, "You feel your mind relax and your thoughts drift!") + to_chat(affected_mob, span_userdanger("You feel your mind relax and your thoughts drift!")) affected_mob.confused = min(100, affected_mob.confused + 8) if(prob(10)) affected_mob.vomit(20) @@ -54,7 +54,7 @@ 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 like unzipping your jumpsuit", "You feel like taking off some clothes...")]") + to_chat(affected_mob, span_danger("[pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit", "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 230a074bb146..f5936d2baf6b 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, "You 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("You 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, "You 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("You 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, "You 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("You 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 6245fb7c3cd4..fc2db9ead5b9 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -241,17 +241,17 @@ if(alert) switch(stability) if(70 to 90) - message = "You shiver." + message = span_warning("You shiver.") if(60 to 69) - message = "You feel cold." + message = span_warning("You feel cold.") if(40 to 59) - message = "You feel sick." + message = span_warning("You feel sick.") if(20 to 39) - message = "It feels like your skin is moving." + message = span_warning("It feels like your skin is moving.") if(1 to 19) - message = "You can feel your cells burning." + message = span_warning("You can feel your cells burning.") if(-INFINITY to 0) - message = "You can feel your DNA exploding, we need to do something fast!" + message = span_boldwarning("You can feel your DNA exploding, we need to do something fast!") if(stability <= 0) holder.apply_status_effect(STATUS_EFFECT_DNA_MELT) if(message) @@ -600,21 +600,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() @@ -624,13 +624,13 @@ if(elligible_organs.len) var/obj/item/organ/O = pick(elligible_organs) O.Remove(src) - visible_message("[src] vomits up their [O.name]!", "You vomit up your [O.name]") //no "vomit up your the heart" + visible_message(span_danger("[src] vomits up their [O.name]!"), "You vomit up your [O.name]") //no "vomit up your 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) @@ -651,7 +651,7 @@ else set_species(/datum/species/dullahan) if(4) - visible_message("[src]'s skin melts off!", "Your skin melts off!") + visible_message(span_warning("[src]'s skin melts off!"), span_boldwarning("Your skin melts off!")) spawn_gibs() set_species(/datum/species/skeleton) if(prob(90)) @@ -659,7 +659,7 @@ if(mind) mind.hasSoul = FALSE if(5) - to_chat(src, "LOOK UP!") + to_chat(src, span_phobia("LOOK UP!")) addtimer(CALLBACK(src, .proc/something_horrible_mindmelt), 30) @@ -670,5 +670,5 @@ return eyes.Remove(src) qdel(eyes) - visible_message("[src] looks up and their eyes melt away!", "='userdanger'>I understand now.") + visible_message(span_notice("[src] looks up and their eyes melt away!"), "='userdanger'>I understand now.") addtimer(CALLBACK(src, .proc/adjustOrganLoss, ORGAN_SLOT_BRAIN, 200), 20) diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index bd3c61efa291..fa3c4fe736f2 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -135,11 +135,11 @@ return FALSE switch(user.stat) if(SOFT_CRIT) - to_chat(user, "You cannot [key] while in a critical condition.") + to_chat(user, span_notice("You cannot [key] while in a critical condition.")) if(UNCONSCIOUS) - to_chat(user, "You cannot [key] while unconscious.") + to_chat(user, span_notice("You cannot [key] while unconscious.")) if(DEAD) - to_chat(user, "You cannot [key] while dead.") + to_chat(user, span_notice("You cannot [key] while dead.")) return FALSE if(restraint_check) if(isliving(user)) @@ -147,12 +147,12 @@ if(L.IsParalyzed() || L.IsStun()) if(!intentional) return FALSE - to_chat(user, "You cannot [key] while stunned.") + to_chat(user, span_notice("You cannot [key] while stunned.")) return FALSE if(restraint_check && user.restrained()) if(!intentional) return FALSE - to_chat(user, "You cannot [key] while restrained.") + to_chat(user, span_notice("You cannot [key] while restrained.")) return FALSE if(isliving(user)) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 79c2fd65eef0..0c2d036dd48f 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -44,7 +44,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 db39ff081d3a..fe46bf75f01c 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -252,10 +252,10 @@ record.caller_image = holodiskOriginal.record.caller_image record.entries = holodiskOriginal.record.entries.Copy() record.language = holodiskOriginal.record.language - to_chat(user, "You copy the record from [holodiskOriginal] to [src] by connecting the ports!") + to_chat(user, span_notice("You 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/martial.dm b/code/datums/martial.dm index e1dc8c6430cf..16623bfcaf50 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -116,8 +116,8 @@ if(!damage) playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1) - D.visible_message("[A] has attempted to [atk_verb] [D]!", \ - "[A] has attempted to [atk_verb] [D]!", null, COMBAT_MESSAGE_RANGE) + D.visible_message(span_warning("[A] has attempted to [atk_verb] [D]!"), \ + span_userdanger("[A] has attempted to [atk_verb] [D]!"), null, COMBAT_MESSAGE_RANGE) log_combat(A, D, "attempted to [atk_verb]") return FALSE @@ -125,16 +125,16 @@ var/armor_block = D.run_armor_check(affecting, "melee") playsound(D.loc, A.dna.species.attack_sound, 25, 1, -1) - D.visible_message("[A] has [atk_verb]ed [D]!", \ - "[A] has [atk_verb]ed [D]!", null, COMBAT_MESSAGE_RANGE) + D.visible_message(span_danger("[A] has [atk_verb]ed [D]!"), \ + span_userdanger("[A] has [atk_verb]ed [D]!"), null, COMBAT_MESSAGE_RANGE) D.apply_damage(damage, A.dna.species.attack_type, affecting, armor_block) log_combat(A, D, "punched") if((D.stat != DEAD) && damage >= A.dna.species.punchstunthreshold) - D.visible_message("[A] has knocked [D] down!!", \ - "[A] has knocked [D] down!") + D.visible_message(span_danger("[A] has knocked [D] down!!"), \ + span_userdanger("[A] has knocked [D] down!")) D.apply_effect(40, EFFECT_KNOCKDOWN, armor_block) D.forcesay(GLOB.hit_appends) else if(!(D.mobility_flags & MOBILITY_STAND)) diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index 2663403db4a3..1abb1fef4d2b 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -4,11 +4,11 @@ nonlethal = TRUE /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) @@ -20,8 +20,8 @@ var/damage = rand(5, 8) + A.dna.species.punchdamagelow if(!damage) playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1) - D.visible_message("[A] has attempted to [atk_verb] [D]!", \ - "[A] has attempted to [atk_verb] [D]!", null, COMBAT_MESSAGE_RANGE) + D.visible_message(span_warning("[A] has attempted to [atk_verb] [D]!"), \ + span_userdanger("[A] has attempted to [atk_verb] [D]!"), null, COMBAT_MESSAGE_RANGE) log_combat(A, D, "attempted to hit", atk_verb) return 0 @@ -31,16 +31,16 @@ playsound(D.loc, A.dna.species.attack_sound, 25, 1, -1) - D.visible_message("[A] has [atk_verb]ed [D]!", \ - "[A] has [atk_verb]ed [D]!", null, COMBAT_MESSAGE_RANGE) + D.visible_message(span_danger("[A] has [atk_verb]ed [D]!"), \ + span_userdanger("[A] has [atk_verb]ed [D]!"), null, COMBAT_MESSAGE_RANGE) D.apply_damage(damage, STAMINA, affecting, armor_block) log_combat(A, D, "punched (boxing) ") if(D.getStaminaLoss() > 50) var/knockout_prob = D.getStaminaLoss() + rand(-15,15) if((D.stat != DEAD) && prob(knockout_prob)) - D.visible_message("[A] has knocked [D] out with a haymaker!", \ - "[A] has knocked [D] out with a haymaker!") + D.visible_message(span_danger("[A] has knocked [D] out with a haymaker!"), \ + span_userdanger("[A] has knocked [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 416bd3e8a82c..7213fae7f031 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -85,8 +85,8 @@ if(!can_use(A)) return FALSE if(D.mobility_flags & MOBILITY_STAND) - D.visible_message("[A] slams [D] into the ground!", \ - "[A] slams you into the ground!") + D.visible_message(span_warning("[A] slams [D] into the ground!"), \ + span_userdanger("[A] slams you into the ground!")) playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) //using hit_kick because for some stupid reason slam.ogg is delayed A.do_attack_animation(D, ATTACK_EFFECT_SMASH) D.apply_damage(15, STAMINA) @@ -106,8 +106,8 @@ return FALSE A.do_attack_animation(D, ATTACK_EFFECT_KICK) if(!D.stat && (D.mobility_flags & MOBILITY_STAND)) - D.visible_message("[A] kicks [D] back!", \ - "[A] kicks you back!") + D.visible_message(span_warning("[A] kicks [D] back!"), \ + span_userdanger("[A] kicks you back!")) playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, 1, -1) step(D, A.dir) D.apply_damage(15, STAMINA) @@ -116,8 +116,8 @@ addtimer(CALLBACK(D, /mob/living/carbon/human/proc/clear_shove_slowdown), SHOVE_SLOWDOWN_LENGTH) if(!(D.mobility_flags & MOBILITY_STAND) && !D.stat) log_combat(A, D, "prone-kicked(CQC)") - D.visible_message("[A] firmly kicks [D] in the abdomen!", \ - "[A] kicks you in the abdomen!") + D.visible_message(span_warning("[A] firmly kicks [D] in the abdomen!"), \ + span_userdanger("[A] kicks you in the abdomen!")) playsound(get_turf(A), 'sound/weapons/genhit1.ogg', 50, 1, -1) D.Paralyze(5) D.apply_damage(40, STAMINA) @@ -142,7 +142,7 @@ var/hit_limb = D.get_bodypart(selected_zone) if(!hit_limb) return FALSE - D.visible_message("[A] dislocates [D]'s [hit_limb]!", \ + D.visible_message(span_warning("[A] dislocates [D]'s [hit_limb]!"), \ "[A] dislocates your [hit_limb]!") D.drop_all_held_items() D.apply_damage(50, STAMINA, selected_zone) @@ -162,8 +162,8 @@ return FALSE if(!D.stat) log_combat(A, D, "restrained (CQC)") - D.visible_message("[A] locks [D] into a restraining position!", \ - "[A] locks you into a restraining position!") + D.visible_message(span_warning("[A] locks [D] into a restraining position!"), \ + span_userdanger("[A] locks you into a restraining position!")) D.Stun(20) if(!(A.pulling == D)) D.grabbedby(A, 1) @@ -183,8 +183,8 @@ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) if(D.mobility_flags & MOBILITY_STAND) log_combat(A, D, "consecutive CQC'd (CQC)") - D.visible_message("[A] delivers a firm blow to [D]'s head, knocking them down!", \ - "[A] delivers a firm blow to your head, causing you to fall over!") + D.visible_message(span_warning("[A] delivers a firm blow to [D]'s head, knocking them down!"), \ + span_userdanger("[A] delivers a firm blow to your head, causing you to fall over!")) playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, 1, -1) D.Paralyze(50) D.Knockdown(100) @@ -218,13 +218,13 @@ var/bonus_damage = 15 D.apply_damage(bonus_damage, STAMINA) playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, 1, -1) - D.visible_message("[A] [picked_hit_type] [D]!", \ - "[A] [picked_hit_type] you!") + D.visible_message(span_danger("[A] [picked_hit_type] [D]!"), \ + span_userdanger("[A] [picked_hit_type] you!")) D.Immobilize(15) log_combat(A, D, "[picked_hit_type] (CQC)") if(!(A.mobility_flags & MOBILITY_STAND) && (D.mobility_flags & MOBILITY_STAND)) D.visible_message("[A] leg sweeps [D]!", \ - "[A] leg sweeps you!") + span_userdanger("[A] leg sweeps you!")) playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) D.Paralyze(10) D.Knockdown(30) @@ -245,39 +245,39 @@ if(!D.stat && !D.IsParalyzed() && !restraining) if(prob(65)) I = D.get_active_held_item() - D.visible_message("[A] quickly grabs [D]'s arm and and chops it, disarming them!", \ - "[A] grabs your arm and chops it, disarming you!") + D.visible_message(span_warning("[A] quickly grabs [D]'s arm and and chops it, disarming them!"), \ + span_userdanger("[A] grabs your arm and chops it, disarming you!")) playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, 1, -1) if(I && D.temporarilyRemoveItemFromInventory(I)) A.put_in_hands(I) D.Jitter(2) D.apply_damage(5, STAMINA) else - D.visible_message("[A] grabs at [D]'s arm, but misses!", \ - "[A] grabs at your arm, but misses!") + D.visible_message(span_danger("[A] grabs at [D]'s arm, but misses!"), \ + span_userdanger("[A] grabs at your arm, but misses!")) playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -1) log_combat(A, D, "disarmed (CQC)", "[I ? " grabbing \the [I]" : ""]") if(restraining && A.pulling == D) if(chokehold_active) return TRUE log_combat(A, D, "began to chokehold(CQC)") - D.visible_message("[A] puts [D] into a chokehold!", \ - "[A] puts you into a chokehold!") + D.visible_message(span_danger("[A] puts [D] into a chokehold!"), \ + span_userdanger("[A] puts you into a chokehold!")) if(handle_chokehold(A, D)) D.Unconscious(400) if(A.grab_state < GRAB_NECK) A.grab_state = GRAB_NECK - A.visible_message("[A] relaxes their grip on [D].", \ - "You relax your grip on [D].") //visible message comes from attacker since defender is unconscious and therefore can't see + A.visible_message(span_danger("[A] relaxes their grip on [D]."), \ + span_danger("You relax your grip on [D].")) //visible message comes from attacker since defender is unconscious and therefore can't see else if(A.grab_state) //honestly with the way current grabs work this doesn't really do all that much A.grab_state = min(1, A.grab_state - 1) //immediately lose grab power... if(!A.grab_state || prob(BASE_GRAB_RESIST_CHANCE/A.grab_state)) //...and have a chance to lose the entire grab - A.visible_message("[A] is put off balance, losing their grip on [D]!", \ - "You are put off balance, and you lose your grip on [D]!") + A.visible_message(span_danger("[A] is put off balance, losing their grip on [D]!"), \ + span_danger("You are put off balance, and you lose your grip on [D]!")) A.stop_pulling() else - A.visible_message("[A] is put off balance, and struggles to maintain their grip on [D]!", \ + A.visible_message(span_danger("[A] is put off balance, and struggles to maintain their grip on [D]!"), \ "[user] grabs [attacker]'s arm as they attack and throws them to the ground!", \ - "[user] grabs your arm as you attack and throws you to the ground!") + attacker.visible_message(span_warning("[user] grabs [attacker]'s arm as they attack and throws them to the ground!"), \ + span_userdanger("[user] grabs your arm as you attack and throws you to the ground!")) playsound(get_turf(attacker), 'sound/weapons/cqchit1.ogg', 50, 1, -1) var/obj/item/I = attacker.get_active_held_item() if(I && attacker.temporarilyRemoveItemFromInventory(I)) diff --git a/code/datums/martial/flying_fang.dm b/code/datums/martial/flying_fang.dm index 257e75b0fa6d..4208c0a57029 100644 --- a/code/datums/martial/flying_fang.dm +++ b/code/datums/martial/flying_fang.dm @@ -42,8 +42,8 @@ playsound(D, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) D.apply_damage(25, STAMINA, selected_zone, armor_block) D.apply_damage(15, A.dna.species.attack_type, selected_zone, armor_block) - D.visible_message("[A] slams into [D], knocking them off balance!", \ - "[A] slams into you, knocking you off balance!") + D.visible_message(span_danger("[A] slams into [D], knocking them off balance!"), \ + span_userdanger("[A] slams into you, knocking you off balance!")) D.add_movespeed_modifier("tail slap", update=TRUE, priority=101, multiplicative_slowdown=0.9) addtimer(CALLBACK(D, /mob.proc/remove_movespeed_modifier, "tail slap"), 5 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) log_combat(A, D, "slammed (Flying Fang)") @@ -55,14 +55,14 @@ A.emote("spin") var/obj/item/organ/tail = A.getorganslot(ORGAN_SLOT_TAIL) if(!istype(tail, /obj/item/organ/tail/lizard)) - A.visible_message("[A] spins around.", \ - "You spin around like a doofus.") + A.visible_message(span_danger("[A] spins around."), \ + span_userdanger("You spin around like a doofus.")) return playsound(get_turf(A), 'sound/weapons/slap.ogg', 50, TRUE, -1) for(var/obj/item/I in D.held_items) if(I.block_chance) - D.visible_message("[A] tail slaps [I] out of [D]'s hands!", \ - "[A] tail slaps your [I] out of your hands!") + D.visible_message(span_danger("[A] tail slaps [I] out of [D]'s hands!"), \ + span_userdanger("[A] tail slaps your [I] out of your hands!")) D.dropItemToGround(I) var/atom/throw_target = get_edge_target_turf(D, get_dir(A, get_step_away(D, A))) I.safe_throw_at(throw_target, 5, 2) @@ -75,8 +75,8 @@ D.apply_damage(10, A.dna.species.attack_type, selected_zone, armor_block) D.Knockdown(5 SECONDS) D.Paralyze(2 SECONDS) - D.visible_message("[A] tail slaps [D]!", \ - "[A] tail slaps you!") + D.visible_message(span_danger("[A] tail slaps [D]!"), \ + span_userdanger("[A] tail slaps you!")) log_combat(A, D, "tail slapped (Flying Fang)") /datum/martial_art/flyingfang/proc/remove_bonk(mob/living/carbon/human/D) @@ -93,10 +93,10 @@ playsound(D, 'sound/weapons/bite.ogg', 50, TRUE, -1) D.apply_damage(30, A.dna.species.attack_type, BODY_ZONE_HEAD, armor_block) D.bleed_rate += 10 - D.visible_message("[A] takes a large bite out of [D]'s neck!", \ - "[A] takes a large bite out of your neck!") + D.visible_message(span_danger("[A] takes a large bite out of [D]'s neck!"), \ + span_userdanger("[A] takes a large bite out of your neck!")) if(D.health > 0) - to_chat(A, "You feel reinvigorated!") + to_chat(A, span_boldwarning("You feel reinvigorated!")) A.heal_overall_damage(25, 25) A.adjustToxLoss(-8) A.adjustStaminaLoss(-50) @@ -122,8 +122,8 @@ if(!istype(D.head, /obj/item/clothing/head/helmet)) ADD_TRAIT(D, TRAIT_POOR_AIM, "martial") addtimer(CALLBACK(src, .proc/remove_bonk, D), 10 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) - D.visible_message("[A] headbutts [D]!", \ - "[A] headbutts you!") + D.visible_message(span_danger("[A] headbutts [D]!"), \ + span_userdanger("[A] headbutts you!")) log_combat(A, D, "headbutted (Flying Fang)") /datum/martial_art/flyingfang/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) @@ -145,8 +145,8 @@ playsound(D, 'sound/weapons/slash.ogg', 50, TRUE, -1) D.apply_damage(12, A.dna.species.attack_type, selected_zone, armor_block) //need wounds for sharpness to actually matter here var/atk_verb = pick("rends", "claws", "slices", "tears at") - D.visible_message("[A] [atk_verb] [D]!", \ - "[A] [atk_verb] you!") + D.visible_message(span_danger("[A] [atk_verb] [D]!"), \ + span_userdanger("[A] [atk_verb] you!")) return TRUE /datum/action/innate/lizard_leap @@ -176,14 +176,14 @@ /datum/action/innate/lizard_leap/Activate(silent) if(!silent) - owner.visible_message("[owner] prepares to pounce!", "You will now pounce as your next attack.") + owner.visible_message(span_danger("[owner] prepares to pounce!"), "You will now pounce as your next attack.") owner.click_intercept = src active = TRUE background_icon_state = "bg_default_on" /datum/action/innate/lizard_leap/Deactivate(silent) if(!silent) - owner.visible_message("[owner] assumes a neutral stance.", "You will no longer pounce on attack.") + owner.visible_message(span_danger("[owner] assumes a neutral stance."), "You will no longer pounce on attack.") owner.click_intercept = null active = FALSE background_icon_state = "bg_default" @@ -237,8 +237,8 @@ set category = "Flying Fang" to_chat(usr, "You try to remember some of the basics of Flying Fang.") - to_chat(usr, "Your training has rendered you more resistant to pain, allowing you to keep fighting effectively for longer and reducing the effectiveness of stun and stamina weapons by about a third.") - to_chat(usr, "However, the primitive instincts gained through this training prevent you from using guns, stun weapons, or armor.") + to_chat(usr, span_notice("Your training has rendered you more resistant to pain, allowing you to keep fighting effectively for longer and reducing the effectiveness of stun and stamina weapons by about a third.")) + to_chat(usr, span_warning("However, the primitive instincts gained through this training prevent you from using guns, stun weapons, or armor.")) to_chat(usr, "All of your unarmed attacks deal increased brute damage with a small amount of armor piercing") to_chat(usr, "Disarm Intent: Headbutt your enemy, Deals minor stamina and brute damage, as well as causing eye blurriness. Prevents the target from using ranged weapons effectively for a few seconds if they are not wearing a helmet.") diff --git a/code/datums/martial/knifeboxing.dm b/code/datums/martial/knifeboxing.dm index 10a4e6627783..97af6b0dc775 100644 --- a/code/datums/martial/knifeboxing.dm +++ b/code/datums/martial/knifeboxing.dm @@ -2,11 +2,11 @@ name = "Knife-boxing" /datum/martial_art/knifeboxing/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) - to_chat(A, "Can't disarm while knife-boxing!") + to_chat(A, span_warning("Can't disarm while knife-boxing!")) return TRUE /datum/martial_art/knifeboxing/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) - to_chat(A, "Can't grab while knife-boxing!") + to_chat(A, span_warning("Can't grab while knife-boxing!")) return TRUE /datum/martial_art/knifeboxing/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) @@ -18,8 +18,8 @@ var/damage = rand(8, 12) + A.dna.species.punchdamagelow if(!damage) playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1) - D.visible_message("[A] has attempted to [atk_verb] [D]!", \ - "[A] has attempted to [atk_verb] [D]!", null, COMBAT_MESSAGE_RANGE) + D.visible_message(span_warning("[A] has attempted to [atk_verb] [D]!"), \ + span_userdanger("[A] has attempted to [atk_verb] [D]!"), null, COMBAT_MESSAGE_RANGE) log_combat(A, D, "attempted to punch (knifeboxing)") return FALSE @@ -28,8 +28,8 @@ playsound(D.loc, A.dna.species.attack_sound, 25, 1, -1) - D.visible_message("[A] has [atk_verb]ed [D]!", \ - "[A] has [atk_verb]ed [D]!", null, COMBAT_MESSAGE_RANGE) + D.visible_message(span_danger("[A] has [atk_verb]ed [D]!"), \ + span_userdanger("[A] has [atk_verb]ed [D]!"), null, COMBAT_MESSAGE_RANGE) D.apply_damage(damage, BRUTE, affecting, armor_block) log_combat(A, D, "punched (knifeboxing") diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 0f3d4e661c8a..425c0c5983ac 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, "You can't use [name] while you're incapacitated.") + to_chat(owner, span_warning("You 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.", "Your next attack is cleared.") + owner.visible_message(span_danger("[owner] assumes a neutral stance."), "Your next attack is cleared.") H.mind.martial_art.streak = "" else - owner.visible_message("[owner] assumes the Neck Chop stance!", "Your next attack will be a Neck Chop.") + owner.visible_message(span_danger("[owner] assumes the Neck Chop stance!"), "Your 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, "You can't use [name] while you're incapacitated.") + to_chat(owner, span_warning("You 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.", "Your next attack is cleared.") + owner.visible_message(span_danger("[owner] assumes a neutral stance."), "Your next attack is cleared.") H.mind.martial_art.streak = "" else - owner.visible_message("[owner] assumes the Leg Sweep stance!", "Your next attack will be a Leg Sweep.") + owner.visible_message(span_danger("[owner] assumes the Leg Sweep stance!"), "Your 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,14 +46,14 @@ /datum/action/lung_punch/Trigger() if(owner.incapacitated()) - to_chat(owner, "You can't use [name] while you're incapacitated.") + to_chat(owner, span_warning("You 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.", "Your next attack is cleared.") + owner.visible_message(span_danger("[owner] assumes a neutral stance."), "Your next attack is cleared.") H.mind.martial_art.streak = "" else - owner.visible_message("[owner] assumes the Lung Punch stance!", "Your next attack will be a Lung Punch.") + owner.visible_message(span_danger("[owner] assumes the Lung Punch stance!"), "Your 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) @@ -89,8 +89,8 @@ /datum/martial_art/krav_maga/proc/leg_sweep(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(D.stat || D.IsParalyzed()) return 0 - D.visible_message("[A] leg sweeps [D]!", \ - "[A] leg sweeps you!") + D.visible_message(span_warning("[A] leg sweeps [D]!"), \ + span_userdanger("[A] leg sweeps you!")) playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) D.apply_damage(5, BRUTE) D.Paralyze(40) @@ -98,8 +98,8 @@ return 1 /datum/martial_art/krav_maga/proc/quick_choke(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)//is actually lung punch - D.visible_message("[A] pounds [D] on the chest!", \ - "[A] slams your chest! You can't breathe!") + D.visible_message(span_warning("[A] pounds [D] on the chest!"), \ + span_userdanger("[A] slams your chest! You can't breathe!")) playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, 1, -1) if(D.losebreath <= 10) D.losebreath = clamp(D.losebreath + 5, 0, 10) @@ -108,8 +108,8 @@ return 1 /datum/martial_art/krav_maga/proc/neck_chop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) - D.visible_message("[A] karate chops [D]'s neck!", \ - "[A] karate chops your neck, rendering you unable to speak!") + D.visible_message(span_warning("[A] karate chops [D]'s neck!"), \ + span_userdanger("[A] karate chops your neck, rendering you unable to speak!")) playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, 1, -1) D.apply_damage(5, A.dna.species.attack_type) if(D.silent <= 10) @@ -133,8 +133,8 @@ else A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) playsound(get_turf(D), 'sound/effects/hit_punch.ogg', 50, 1, -1) - D.visible_message("[A] [picked_hit_type] [D]!", \ - "[A] [picked_hit_type] you!") + D.visible_message(span_danger("[A] [picked_hit_type] [D]!"), \ + span_userdanger("[A] [picked_hit_type] you!")) log_combat(A, D, "[picked_hit_type] with [name]") return 1 @@ -147,12 +147,12 @@ if(I) if(D.temporarilyRemoveItemFromInventory(I)) A.put_in_hands(I) - D.visible_message("[A] has disarmed [D]!", \ - "[A] has disarmed [D]!") + D.visible_message(span_danger("[A] has disarmed [D]!"), \ + span_userdanger("[A] has disarmed [D]!")) playsound(D, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) else - D.visible_message("[A] attempted to disarm [D]!", \ - "[A] attempted to disarm [D]!") + D.visible_message(span_danger("[A] attempted to disarm [D]!"), \ + span_userdanger("[A] attempted to disarm [D]!")) playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -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 aec4ccb968fd..6dd96f016170 100644 --- a/code/datums/martial/mushpunch.dm +++ b/code/datums/martial/mushpunch.dm @@ -4,14 +4,14 @@ /datum/martial_art/mushpunch/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) var/atk_verb - to_chat(A, "You begin to wind up an attack...") + to_chat(A, span_spider("You begin to wind up an attack...")) if(!do_after(A, 25, target = D)) to_chat(A, "Your attack was interrupted!") return TRUE //martial art code was a mistake A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) atk_verb = pick("punches", "smashes", "ruptures", "cracks") - D.visible_message("[A] [atk_verb] [D] with inhuman strength, sending [D.p_them()] flying backwards!", \ - "[A] [atk_verb] you with inhuman strength, sending you flying backwards!") + D.visible_message(span_danger("[A] [atk_verb] [D] with inhuman strength, sending [D.p_them()] flying backwards!"), \ + span_userdanger("[A] [atk_verb] you with inhuman strength, sending you flying backwards!")) D.apply_damage(rand(15,30), A.dna.species.attack_type) playsound(D, 'sound/effects/meteorimpact.ogg', 25, 1, -1) var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A))) @@ -30,9 +30,9 @@ /obj/item/mushpunch/attack_self(mob/living/carbon/human/user) if(!istype(user) || !user) return - var/message = "You devour [src], and a confluence of skill and power from the mushroom enhances your punches! You do need a short moment to charge these powerful punches." + var/message = span_spider("You devour [src], and a confluence of skill and power from the mushroom enhances your 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].") + visible_message(span_warning("[user] devours [src].")) diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm index e38a011db031..b1b3a7f17655 100644 --- a/code/datums/martial/plasma_fist.dm +++ b/code/datums/martial/plasma_fist.dm @@ -44,8 +44,8 @@ return /datum/martial_art/plasma_fist/proc/Throwback(mob/living/carbon/human/A, mob/living/carbon/human/D) - D.visible_message("[A] has hit [D] with Plasma Punch!", \ - "[A] has hit [D] with Plasma Punch!") + D.visible_message(span_danger("[A] has hit [D] with Plasma Punch!"), \ + span_userdanger("[A] has hit [D] with Plasma Punch!")) playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -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) @@ -57,8 +57,8 @@ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) A.say("PLASMA FIST!", forced="plasma fist") - D.visible_message("[A] has hit [D] with THE PLASMA FIST TECHNIQUE!", \ - "[A] has hit [D] with THE PLASMA FIST TECHNIQUE!") + D.visible_message(span_danger("[A] has hit [D] with THE PLASMA FIST TECHNIQUE!"), \ + span_userdanger("[A] has 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 41f79dc6dbfd..9f944832fdc5 100644 --- a/code/datums/martial/psychotic_brawl.dm +++ b/code/datums/martial/psychotic_brawl.dm @@ -31,8 +31,8 @@ D.stop_pulling() if(A.a_intent == INTENT_GRAB) log_combat(A, D, "grabbed", addition="aggressively") - D.visible_message("[A] violently grabs [D]!", \ - "[A] violently grabs you!") + D.visible_message(span_warning("[A] violently grabs [D]!"), \ + span_userdanger("[A] violently grabs you!")) A.grab_state = GRAB_AGGRESSIVE //Instant aggressive grab else log_combat(A, D, "grabbed", addition="passively") @@ -40,8 +40,8 @@ if(4) A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) atk_verb = "headbutts" - D.visible_message("[A] [atk_verb] [D]!", \ - "[A] [atk_verb] you!") + D.visible_message(span_danger("[A] [atk_verb] [D]!"), \ + span_userdanger("[A] [atk_verb] you!")) playsound(get_turf(D), 'sound/weapons/punch1.ogg', 40, 1, -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) @@ -52,8 +52,8 @@ if(5,6) A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) atk_verb = pick("punches", "kicks", "hits", "slams into") - D.visible_message("[A] [atk_verb] [D] with inhuman strength, sending [D.p_them()] flying backwards!", \ - "[A] [atk_verb] you with inhuman strength, sending you flying backwards!") + D.visible_message(span_danger("[A] [atk_verb] [D] with inhuman strength, sending [D.p_them()] flying backwards!"), \ + span_userdanger("[A] [atk_verb] you with inhuman strength, sending you flying backwards!")) D.apply_damage(rand(15,30), A.dna.species.attack_type) playsound(get_turf(D), 'sound/effects/meteorimpact.ogg', 25, 1, -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 69a0352a1688..c5653c02ef08 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -41,8 +41,8 @@ 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!", \ - "[A] grabs your wrist and violently wrenches it to the side!") + D.visible_message(span_warning("[A] grabs [D]'s wrist and wrenches it sideways!"), \ + span_userdanger("[A] grabs your wrist and violently wrenches it to the side!")) playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) D.emote("scream") D.dropItemToGround(D.get_active_held_item()) @@ -57,24 +57,24 @@ if(A.dir == D.dir) 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!", \ - "[A] kicks you in the back, making you stumble and fall!") + D.visible_message(span_warning("[A] kicks [D] in the back!"), \ + span_userdanger("[A] kicks you in the back, making you stumble and fall!")) step_to(D,get_step(D,D.dir),1) D.Paralyze(80) playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1) return TRUE else log_combat(A, D, "missed a back-kick (Sleeping Carp) on") - D.visible_message("[A] tries to kick [D] in the back, but misses!", \ - "[A] tries to kick you in the back, but misses!") + D.visible_message(span_warning("[A] tries to kick [D] in the back, but misses!"), \ + span_userdanger("[A] tries to kick you in the back, but misses!")) return basic_hit(A,D) /datum/martial_art/the_sleeping_carp/proc/kneeStomach(mob/living/carbon/human/A, mob/living/carbon/human/D) 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!", \ - "[A] winds you with a knee in the stomach!") + D.visible_message(span_warning("[A] knees [D] in the stomach!"), \ + span_userdanger("[A] winds you with a knee in the stomach!")) D.audible_message("[D] gags!") D.losebreath += 3 D.Stun(40) @@ -86,8 +86,8 @@ 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!", \ - "[A] kicks you in the jaw!") + D.visible_message(span_warning("[A] kicks [D] in the head!"), \ + span_userdanger("[A] kicks you 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/weapons/punch1.ogg', 50, 1, -1) @@ -99,8 +99,8 @@ 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]!", \ - "[A] piledrives you with their elbow!") + D.visible_message(span_warning("[A] elbow drops [D]!"), \ + span_userdanger("[A] piledrives you with their elbow!")) if(D.stat) D.death() //FINISH HIM! D.apply_damage(50, A.dna.species.attack_type, BODY_ZONE_CHEST) @@ -119,8 +119,8 @@ D.drop_all_held_items() A.grab_state = GRAB_AGGRESSIVE //Instant agressive grab if on grab intent log_combat(A, D, "grabbed", addition="aggressively") - D.visible_message("[A] violently grabs [D]!", \ - "[A] violently grabs you!") + D.visible_message(span_warning("[A] violently grabs [D]!"), \ + span_userdanger("[A] violently grabs you!")) return TRUE else return FALSE @@ -131,12 +131,12 @@ return TRUE A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) var/atk_verb = pick("punches", "kicks", "chops", "hits", "slams") - D.visible_message("[A] [atk_verb] [D]!", \ - "[A] [atk_verb] you!") + D.visible_message(span_danger("[A] [atk_verb] [D]!"), \ + span_userdanger("[A] [atk_verb] you!")) D.apply_damage(rand(10,15), BRUTE) playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, 1, -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_userdanger("The blow sends you to the ground!")) D.Paralyze(80) log_combat(A, D, "[atk_verb] (Sleeping Carp)") return TRUE @@ -200,7 +200,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.a_intent == INTENT_DISARM) if(!wielded) @@ -214,8 +214,8 @@ "[user] smashes [H]'s head with [src]!", \ "[user] beats [H] with the front of [src]!", \ "[user] twirls and slams [H] with [src]!") - H.visible_message("[pick(fluffmessages)]", \ - "[pick(fluffmessages)]") + H.visible_message(span_warning("[pick(fluffmessages)]"), \ + span_userdanger("[pick(fluffmessages)]")) playsound(get_turf(user), 'sound/effects/woodhit.ogg', 75, 1, -1) playsound(get_turf(user), 'sound/effects/hit_kick.ogg', 75, 1, -1) SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, H, user) @@ -231,8 +231,8 @@ 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!", \ - "[user] knocks you unconscious!") + H.visible_message(span_warning("[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!"), \ + span_userdanger("[user] knocks you unconscious!")) H.SetSleeping(300) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150) else diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index bffc0cae13de..f9da4c0eaa1d 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, "You can't WRESTLE while you're OUT FOR THE COUNT.") + to_chat(owner, span_warning("You can't WRESTLE while you're OUT FOR THE COUNT.")) return - owner.visible_message("[owner] prepares to BODY SLAM!", "Your next attack will be a BODY SLAM.") + owner.visible_message(span_danger("[owner] prepares to BODY SLAM!"), "Your 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, "You can't WRESTLE while you're OUT FOR THE COUNT.") + to_chat(owner, span_warning("You can't WRESTLE while you're OUT FOR THE COUNT.")) return - owner.visible_message("[owner] prepares to THROW!", "Your next attack will be a THROW.") + owner.visible_message(span_danger("[owner] prepares to THROW!"), "Your 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, "You can't WRESTLE while you're OUT FOR THE COUNT.") + to_chat(owner, span_warning("You can't WRESTLE while you're OUT FOR THE COUNT.")) return - owner.visible_message("[owner] prepares to KICK!", "Your next attack will be a KICK.") + owner.visible_message(span_danger("[owner] prepares to KICK!"), "Your 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, "You can't WRESTLE while you're OUT FOR THE COUNT.") + to_chat(owner, span_warning("You can't WRESTLE while you're OUT FOR THE COUNT.")) return - owner.visible_message("[owner] prepares to STRIKE!", "Your next attack will be a STRIKE.") + owner.visible_message(span_danger("[owner] prepares to STRIKE!"), "Your next attack will be a STRIKE.") var/mob/living/carbon/human/H = owner H.mind.martial_art.streak = "strike" @@ -95,9 +95,9 @@ /datum/action/drop/Trigger() if(owner.incapacitated()) - to_chat(owner, "You can't WRESTLE while you're OUT FOR THE COUNT.") + to_chat(owner, span_warning("You can't WRESTLE while you're OUT FOR THE COUNT.")) return - owner.visible_message("[owner] prepares to LEG DROP!", "Your next attack will be a LEG DROP.") + owner.visible_message(span_danger("[owner] prepares to LEG DROP!"), "Your next attack will be a LEG DROP.") var/mob/living/carbon/human/H = owner H.mind.martial_art.streak = "drop" @@ -436,8 +436,8 @@ if(A.pulling == D) return 1 A.start_pulling(D) - D.visible_message("[A] gets [D] in a cinch!", \ - "[A] gets [D] in a cinch!") + D.visible_message(span_danger("[A] gets [D] in a cinch!"), \ + span_userdanger("[A] gets [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 15543bbcb108..1377e8d12dff 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -373,7 +373,7 @@ if(creator.mind.special_role) message_admins("[ADMIN_LOOKUPFLW(current)] has been created by [ADMIN_LOOKUPFLW(creator)], an antagonist.") - to_chat(current, "Despite your creators current allegiances, your true master remains [creator.real_name]. If their loyalties change, so do yours. This will never change unless your creator's body is destroyed.") + to_chat(current, span_userdanger("Despite your creators current allegiances, your true master remains [creator.real_name]. If their loyalties change, so do yours. This will never change unless your creator's body is destroyed.")) /datum/mind/proc/show_memory(mob/recipient, window=1) if(!recipient) @@ -417,7 +417,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) @@ -569,7 +569,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.") @@ -598,7 +598,7 @@ /datum/mind/proc/announce_objectives() var/obj_count = 1 - to_chat(current, "Your current objectives:") + to_chat(current, span_notice("Your current objectives:")) for(var/objective in get_all_objectives()) var/datum/objective/O = objective to_chat(current, "Objective #[obj_count]: [O.explanation_text]") diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 1072c8c6491a..670be33752ee 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -138,7 +138,7 @@ timeout = 3 MINUTES /datum/mood_event/religiously_comforted - description = "You are comforted by the presence of a holy person." + description = span_nicegreen("You are comforted by the presence of a holy person.") mood_change = 3 timeout = 5 MINUTES diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm index 47b8e920ac0f..9463d6f4f499 100644 --- a/code/datums/mutations/actions.dm +++ b/code/datums/mutations/actions.dm @@ -2,8 +2,8 @@ name = "Telepathy" desc = "A rare mutation that allows the user to telepathically communicate to others." quality = POSITIVE - text_gain_indication = "You can hear your own voice echoing in your mind!" - text_lose_indication = "You don't hear your mind echo anymore." + text_gain_indication = span_notice("You can hear your own voice echoing in your mind!") + text_lose_indication = span_notice("You don't hear your mind echo anymore.") difficulty = 12 power = /obj/effect/proc_holder/spell/targeted/telepathy instability = 10 @@ -15,8 +15,8 @@ desc = "Your sense of smell is comparable to that of a canine." quality = POSITIVE difficulty = 12 - text_gain_indication = "Smells begin to make more sense..." - text_lose_indication = "Your sense of smell goes back to normal." + text_gain_indication = span_notice("Smells begin to make more sense...") + text_lose_indication = span_notice("Your sense of smell goes back to normal.") power = /obj/effect/proc_holder/spell/targeted/olfaction instability = 30 synchronizer_coeff = 1 @@ -45,7 +45,7 @@ var/datum/gas_mixture/air = user.loc.return_air() if(air.get_moles(/datum/gas/miasma) >= 0.1) user.adjust_disgust(sensitivity * 45) - to_chat(user, "With your overly sensitive nose, you get a whiff of stench and feel sick! Try moving to a cleaner area!") + to_chat(user, span_warning("With your 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() @@ -57,39 +57,39 @@ if(prints[md5(C.dna.uni_identity)]) possible |= C if(!length(possible)) - to_chat(user,"Despite your best efforts, there are no scents to be found on [sniffed]...") + to_chat(user,span_warning("Despite your 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 possible if(!tracking_target) if(!old_target) - to_chat(user,"You decide against remembering any scents. Instead, you notice your own nose in your 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("You decide against remembering any scents. Instead, you notice your own nose in your 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,"You pick up the scent of [tracking_target]. The hunt begins.") + to_chat(user,span_notice("You 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 your 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 your 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,"You smell out the trail to yourself. Yep, it's you.") + to_chat(user,span_warning("You smell out the trail to yourself. Yep, it's you.")) return var/turf/pos = get_turf(tracking_target) if(usr.z < pos.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 > pos.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, pos))]" if(direction_text) @@ -101,8 +101,8 @@ quality = POSITIVE difficulty = 12 locked = TRUE - text_gain_indication = "Your throat is burning!" - text_lose_indication = "Your throat is cooling down." + text_gain_indication = span_notice("Your throat is burning!") + text_lose_indication = span_notice("Your throat is cooling down.") power = /obj/effect/proc_holder/spell/aimed/firebreath instability = 30 energy_coeff = 1 @@ -137,7 +137,7 @@ if(C.is_mouth_covered()) C.adjust_fire_stacks(2) C.IgniteMob() - to_chat(C,"Something in front of your mouth caught fire!") + to_chat(C,span_warning("Something in front of your mouth caught fire!")) return FALSE /obj/effect/proc_holder/spell/aimed/firebreath/ready_projectile(obj/item/projectile/P, atom/target, mob/user, iteration) @@ -162,7 +162,7 @@ obj/effect/proc_holder/spell/aimed/firebreath/fire_projectile(mob/user) name = "Void Magnet" desc = "A rare genome that attracts odd forces not usually observed." quality = MINOR_NEGATIVE //upsides and downsides - text_gain_indication = "You feel a heavy, dull force just beyond the walls watching you." + text_gain_indication = span_notice("You feel a heavy, dull force just beyond the walls watching you.") instability = 30 power = /obj/effect/proc_holder/spell/self/void energy_coeff = 1 diff --git a/code/datums/mutations/antenna.dm b/code/datums/mutations/antenna.dm index 7bd01edf323c..ce909d157ec6 100644 --- a/code/datums/mutations/antenna.dm +++ b/code/datums/mutations/antenna.dm @@ -2,8 +2,8 @@ name = "Antenna" desc = "The affected person sprouts an antenna. This is known to allow them to access common radio channels passively." quality = POSITIVE - text_gain_indication = "You feel an antenna sprout from your forehead." - text_lose_indication = "Your antenna shrinks back down." + text_gain_indication = span_notice("You feel an antenna sprout from your forehead.") + text_lose_indication = span_notice("Your antenna shrinks back down.") instability = 10 difficulty = 8 var/obj/item/implant/radio/antenna/radio @@ -32,8 +32,8 @@ name = "Mind Reader" desc = "The affected person can look into the recent memories of others." quality = POSITIVE - text_gain_indication = "You hear distant voices at the corners of your mind." - text_lose_indication = "The distant voices fade." + text_gain_indication = span_notice("You hear distant voices at the corners of your mind.") + text_lose_indication = span_notice("The distant voices fade.") power = /obj/effect/proc_holder/spell/targeted/mindread instability = 40 difficulty = 8 @@ -51,15 +51,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 your 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 your 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, "You plunge into [M]'s mind...") + to_chat(user, span_boldnotice("You plunge into [M]'s mind...")) if(prob(20)) - to_chat(M, "You feel something foreign enter your mind.")//chance to alert the read-ee + to_chat(M, span_danger("You feel something foreign enter your mind."))//chance to alert the read-ee var/list/recent_speech = list() var/list/say_log = list() var/log_source = M.logging @@ -77,17 +77,17 @@ if(prob(50)) recent_speech[spoken_memory] = say_log[spoken_memory] if(recent_speech.len) - to_chat(user, "You catch some drifting memories of their past conversations...") + to_chat(user, span_boldnotice("You 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, "You find that their intent is to [H.a_intent]...") + to_chat(user, span_boldnotice("You find that their intent is to [H.a_intent]...")) var/datum/dna/the_dna = H.has_dna() if(the_dna) - to_chat(user, "You uncover that [H.p_their()] true identity is [the_dna.real_name].") + to_chat(user, span_boldnotice("You uncover that [H.p_their()] true identity is [the_dna.real_name].")) else - to_chat(user, "You can't find a mind to read inside of [M].") + to_chat(user, span_boldnotice("You 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 1b8b8679e4ee..c5fc04f0fcad 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -5,13 +5,13 @@ name = "Epilepsy" desc = "A genetic defect that sporadically causes seizures." quality = NEGATIVE - text_gain_indication = "You get a headache." + text_gain_indication = span_danger("You 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!", "You have a seizure!") + owner.visible_message(span_danger("[owner] starts having a seizure!"), span_userdanger("You 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 = "Strange mutation that causes the holder to randomly mutate." quality = NEGATIVE - text_gain_indication = "You feel strange." + text_gain_indication = span_danger("You feel strange.") locked = TRUE /datum/mutation/human/bad_dna/on_acquiring(mob/living/carbon/human/owner) @@ -53,7 +53,7 @@ name = "Cough" desc = "A chronic cough." quality = MINOR_NEGATIVE - text_gain_indication = "You start coughing." + text_gain_indication = span_danger("You start coughing.") synchronizer_coeff = 1 power_coeff = 1 @@ -70,7 +70,7 @@ name = "Paranoia" desc = "Subject is easily terrified, and may suffer from hallucinations." quality = NEGATIVE - text_gain_indication = "You feel screams echo through your mind..." + text_gain_indication = span_danger("You feel screams echo through your mind...") text_lose_indication = "The screaming in your 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 = "A genome that inhibits certain brain functions, causing the holder to appear clumsy. Honk!" quality = MINOR_NEGATIVE - text_gain_indication = "You feel lightheaded." + text_gain_indication = span_danger("You feel lightheaded.") /datum/mutation/human/clumsy/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -127,7 +127,7 @@ name = "Tourette's Syndrome" desc = "A chronic twitch that forces the user to scream bad words." //definitely needs rewriting quality = NEGATIVE - text_gain_indication = "You twitch." + text_gain_indication = span_danger("You twitch.") synchronizer_coeff = 1 /datum/mutation/human/tourettes/on_life() @@ -151,7 +151,7 @@ name = "Deafness" desc = "The holder of this genome is completely deaf." quality = NEGATIVE - text_gain_indication = "You can't seem to hear anything." + text_gain_indication = span_danger("You 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 = "You permanently emit a light with a random color and intensity." quality = POSITIVE - text_gain_indication = "Your skin begins to glow softly." + text_gain_indication = span_notice("Your skin begins to glow softly.") instability = 5 var/obj/effect/dummy/luminescent_glow/glowth //shamelessly copied from luminescents var/glow = 2.5 @@ -215,7 +215,7 @@ /datum/mutation/human/glow/anti name = "Anti-Glow" desc = "Your skin seems to attract and absorb nearby light creating 'darkness' around you." - text_gain_indication = "Your light around you seems to disappear." + text_gain_indication = span_notice("Your 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 @@ -224,8 +224,8 @@ name = "Thick skin" desc = "The user's skin acquires a leathery texture, and becomes more resilient to harm." quality = POSITIVE - text_gain_indication = "Your skin feels dry and heavy." - text_lose_indication = "Your skin feels soft again..." + text_gain_indication = span_notice("Your skin feels dry and heavy.") + text_lose_indication = span_notice("Your skin feels soft again...") difficulty = 18 instability = 30 var/brutemodbefore @@ -248,8 +248,8 @@ name = "Strength" desc = "The user's muscles slightly expand, allowing them to move faster while carrying people." quality = POSITIVE - text_gain_indication = "You feel strong!" - text_lose_indication = "You feel fairly weak." + text_gain_indication = span_notice("You feel strong!") + text_lose_indication = span_notice("You feel fairly weak.") difficulty = 12 instability = 10 @@ -257,8 +257,8 @@ name = "Insulated" desc = "The affected person does not conduct electricity." quality = POSITIVE - text_gain_indication = "Your fingertips go numb." - text_lose_indication = "Your fingertips regain feeling." + text_gain_indication = span_notice("Your fingertips go numb.") + text_lose_indication = span_notice("Your fingertips regain feeling.") difficulty = 16 instability = 25 @@ -276,7 +276,7 @@ name = "Fiery Sweat" desc = "The user's skin will randomly combust, but is generally a lot more resilient to burning." quality = NEGATIVE - text_gain_indication = "You feel hot." + text_gain_indication = span_warning("You feel hot.") text_lose_indication = "You feel a lot cooler." difficulty = 14 synchronizer_coeff = 1 @@ -301,7 +301,7 @@ name = "Spatial Instability" desc = "The victim of the mutation has a very weak link to spatial reality, and may be displaced. Often causes extreme nausea." 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 @@ -313,17 +313,17 @@ /datum/mutation/human/badblink/on_life() if(prob(warpchance) && isturf(owner.loc)) //checks if the owner is inside something so they can't teleport out of the cloner 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, "You 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_userdanger("You 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) @@ -331,7 +331,7 @@ name = "Acidic Flesh" desc = "Subject has acidic chemicals building up underneath the skin. This is often lethal." quality = NEGATIVE - text_gain_indication = "A horrible burning sensation envelops you as your flesh turns to acid!" + text_gain_indication = span_userdanger("A horrible burning sensation envelops you as your flesh turns to acid!") text_lose_indication = "A feeling of relief fills you as your flesh goes back to normal." difficulty = 18//high so it's hard to unlock and use on others var/msgcooldown = 0 @@ -339,11 +339,11 @@ /datum/mutation/human/acidflesh/on_life() if(prob(25)) if(world.time > msgcooldown) - to_chat(owner, "Your acid flesh bubbles...") + to_chat(owner, span_danger("Your 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.", "Your bubbling flesh pops! It burns!") + owner.visible_message(span_warning("[owner]'s skin bubbles and pops."), span_userdanger("Your bubbling flesh pops! It burns!")) playsound(owner,'sound/weapons/sear.ogg', 50, 1) /datum/mutation/human/gigantism @@ -358,20 +358,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 = "Subject suffers from muscle spasms." quality = NEGATIVE - text_gain_indication = "You flinch." + text_gain_indication = span_warning("You flinch.") text_lose_indication = "Your flinching subsides." difficulty = 16 @@ -389,7 +389,7 @@ name = "Two Left Feet" desc = "A mutation that replaces the right foot with another left foot. It makes standing up after getting knocked down very difficult." quality = NEGATIVE - text_gain_indication = "Your right foot feels... left." + text_gain_indication = span_warning("Your right foot feels... left.") text_lose_indication = "Your right foot feels alright." difficulty = 16 var/stun_cooldown = 0 @@ -399,5 +399,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!", "You trip over your own feet!") + owner.visible_message(span_danger("[owner] tries to stand up, but trips!"), span_userdanger("You trip over your own feet!")) stun_cooldown = world.time + 300 diff --git a/code/datums/mutations/chameleon.dm b/code/datums/mutations/chameleon.dm index a6fd5cab3ec2..fe25de933aa2 100644 --- a/code/datums/mutations/chameleon.dm +++ b/code/datums/mutations/chameleon.dm @@ -4,8 +4,8 @@ desc = "A genome that causes the holder's skin to become transparent over time." quality = POSITIVE difficulty = 16 - text_gain_indication = "You feel one with your surroundings." - text_lose_indication = "You feel oddly exposed." + text_gain_indication = span_notice("You feel one with your surroundings.") + text_lose_indication = span_notice("You feel oddly exposed.") time_coeff = 5 instability = 25 diff --git a/code/datums/mutations/cold.dm b/code/datums/mutations/cold.dm index fdfba18f9a28..908d0373c659 100644 --- a/code/datums/mutations/cold.dm +++ b/code/datums/mutations/cold.dm @@ -2,7 +2,7 @@ name = "Geladikinesis" desc = "Allows the user to concentrate moisture and sub-zero forces into snow." quality = POSITIVE - text_gain_indication = "Your hand feels cold." + text_gain_indication = span_notice("Your hand feels cold.") instability = 10 difficulty = 10 synchronizer_coeff = 1 @@ -22,7 +22,7 @@ name = "Cryokinesis" desc = "Draws negative energy from the sub-zero void to freeze surrounding temperatures at subject's will." quality = POSITIVE //upsides and downsides - text_gain_indication = "Your hand feels cold." + text_gain_indication = span_notice("Your hand feels cold.") instability = 20 difficulty = 12 synchronizer_coeff = 1 diff --git a/code/datums/mutations/heat_adaptation.dm b/code/datums/mutations/heat_adaptation.dm index 31157ce9a435..d8818962457c 100644 --- a/code/datums/mutations/heat_adaptation.dm +++ b/code/datums/mutations/heat_adaptation.dm @@ -4,7 +4,7 @@ desc = "A strange mutation that renders the host immune to the heat of a plasma fire. Does not grant immunity to fire itself." quality = POSITIVE difficulty = 16 - text_gain_indication = "Your body feels cold!" + text_gain_indication = span_notice("Your body feels cold!") time_coeff = 5 instability = 40 conflicts = list(SPACEMUT) diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 9691ed587907..3fa10e8904bb 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 = "Your muscles hurt!" + text_gain_indication = span_notice("Your muscles hurt!") species_allowed = list("human") //no skeleton/lizard hulk health_req = 25 instability = 65 @@ -28,7 +28,7 @@ /datum/mutation/human/hulk/on_life() if(owner.health < 0) on_losing(owner) - to_chat(owner, "You suddenly feel very weak.") + to_chat(owner, span_danger("You suddenly feel very weak.")) /datum/mutation/human/hulk/on_losing(mob/living/carbon/human/owner) if(..()) @@ -52,7 +52,7 @@ quality = POSITIVE get_chance = 10 lowest_value = 256 * 14 - text_gain_indication = "You suddenly feel very angry." + text_gain_indication = span_notice("You suddenly feel very angry.") species_allowed = list("human") //no skeleton/lizard hulk health_req = 25 @@ -61,7 +61,7 @@ quality = POSITIVE class = MUT_OTHER locked = TRUE - text_gain_indication = "Your muscles hurt!" + text_gain_indication = span_notice("Your muscles hurt!") species_allowed = list("human") //no skeleton/lizard hulk health_req = 1 var/health_based = 0 @@ -79,7 +79,7 @@ if(istype(owner.w_uniform, /obj/item/clothing/under)) var/obj/item/clothing/under/U = owner.w_uniform if(owner.canUnEquip(U)) - owner.visible_message("[U] falls apart!", "You tear your clothes up in anger!") + owner.visible_message("[U] falls apart!", span_warning("You tear your clothes up in anger!")) qdel(U) if(istype(owner.wear_suit, /obj/item/clothing/suit)) var/obj/item/clothing/suit/S = owner.wear_suit diff --git a/code/datums/mutations/radioactive.dm b/code/datums/mutations/radioactive.dm index 00155ad0a171..c394e48c3e6d 100644 --- a/code/datums/mutations/radioactive.dm +++ b/code/datums/mutations/radioactive.dm @@ -2,7 +2,7 @@ name = "Radioactivity" desc = "A volatile mutation that causes the host to sent out deadly beta radiation. This affects both the hosts and their surroundings." quality = NEGATIVE - text_gain_indication = "You can feel it in your bones!" + text_gain_indication = span_warning("You 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 ea6c661ab8a0..e8e4f13b2cdb 100644 --- a/code/datums/mutations/sight.dm +++ b/code/datums/mutations/sight.dm @@ -3,7 +3,7 @@ name = "Near Sightness" desc = "The holder of this mutation has poor eyesight." quality = MINOR_NEGATIVE - text_gain_indication = "You can't see very well." + text_gain_indication = span_danger("You can't see very well.") /datum/mutation/human/nearsight/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -21,7 +21,7 @@ name = "Blindness" desc = "Renders the subject completely blind." quality = NEGATIVE - text_gain_indication = "You can't seem to see anything." + text_gain_indication = span_danger("You can't seem to see anything.") /datum/mutation/human/blind/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -39,7 +39,7 @@ desc = "The user of this genome can visually percieve the unique human thermal signature." quality = POSITIVE difficulty = 18 - text_gain_indication = "You can see the heat rising off of your skin..." + text_gain_indication = span_notice("You can see the heat rising off of your skin...") time_coeff = 2 locked = TRUE instability = 40 @@ -62,7 +62,7 @@ /datum/mutation/human/thermal/x_ray name = "X Ray Vision" desc = "A strange genome that allows the user to see between the spaces of walls." //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 @@ -74,7 +74,7 @@ quality = POSITIVE locked = TRUE difficulty = 16 - text_gain_indication = "You feel pressure building up behind your eyes." + text_gain_indication = span_notice("You feel pressure building up behind your eyes.") layer_used = FRONT_MUTATIONS_LAYER limb_req = BODY_ZONE_HEAD diff --git a/code/datums/mutations/space_adaptation.dm b/code/datums/mutations/space_adaptation.dm index 8fbaa59d2fc8..8a9cd5b9adcd 100644 --- a/code/datums/mutations/space_adaptation.dm +++ b/code/datums/mutations/space_adaptation.dm @@ -4,7 +4,7 @@ desc = "A strange mutation that renders the host immune to the vacuum of space. Will still need an oxygen supply." quality = POSITIVE difficulty = 16 - text_gain_indication = "Your body feels warm!" + text_gain_indication = span_notice("Your body feels warm!") time_coeff = 5 instability = 40 conflicts = list(HEATMUT) diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 0a9734079612..822467e50b02 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -5,7 +5,7 @@ name = "Nervousness" desc = "Causes the holder to stutter." quality = MINOR_NEGATIVE - text_gain_indication = "You feel nervous." + text_gain_indication = span_danger("You feel nervous.") /datum/mutation/human/nervousness/on_life() if(prob(10)) @@ -16,8 +16,8 @@ name = "Wacky" desc = "Unknown." quality = MINOR_NEGATIVE - text_gain_indication = "You feel an off sensation in your voicebox." - text_lose_indication = "The off sensation passes." + text_gain_indication = span_sans("You feel an off sensation in your 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 = "Completely inhibits the vocal section of the brain." quality = NEGATIVE - text_gain_indication = "You feel unable to express yourself at all." - text_lose_indication = "You feel able to speak freely again." + text_gain_indication = span_danger("You feel unable to express yourself at all.") + text_lose_indication = span_danger("You 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 = "Causes the user to be in constant mania." quality = MINOR_NEGATIVE - text_gain_indication = "You feel so happy. Nothing can be wrong with anything. :)" - text_lose_indication = "Everything is terrible again. :(" + text_gain_indication = span_notice("You 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 = "Partially inhibits the vocal center of the brain, severely distorting speech." quality = NEGATIVE - text_gain_indication = "You can't seem to form any coherent thoughts!" - text_lose_indication = "Your mind feels more clear." + text_gain_indication = span_danger("You can't seem to form any coherent thoughts!") + text_lose_indication = span_danger("Your mind feels more clear.") /datum/mutation/human/unintelligible/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -140,8 +140,8 @@ name = "Swedish" desc = "A horrible mutation originating from the distant past. Thought to be eradicated after the incident in 2037." quality = MINOR_NEGATIVE - text_gain_indication = "You feel Swedish, however that works." - text_lose_indication = "The feeling of Swedishness passes." + text_gain_indication = span_notice("You 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(..()) @@ -170,8 +170,8 @@ name = "Chav" desc = "Unknown" quality = MINOR_NEGATIVE - text_gain_indication = "Ye feel like a reet prat like, innit?" - text_lose_indication = "You 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("You no longer feel like being rude and sassy.") /datum/mutation/human/chav/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -216,8 +216,8 @@ desc = "A terrifying mutation named after its 'patient-zero'." quality = MINOR_NEGATIVE locked = TRUE - text_gain_indication = "You feel pretty good, honeydoll." - text_lose_indication = "You feel a little less conversation would be great." + text_gain_indication = span_notice("You feel pretty good, honeydoll.") + text_lose_indication = span_notice("You feel a little less conversation would be great.") /datum/mutation/human/elvis/on_life() switch(pick(1,2)) @@ -262,8 +262,8 @@ desc = "A common mutation that severely decreases intelligence." quality = NEGATIVE locked = TRUE - text_gain_indication = "You feel...totally chill, man!" - text_lose_indication = "You feel like you have a better sense of time." + text_gain_indication = span_notice("You feel...totally chill, man!") + text_lose_indication = span_notice("You 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 30c206408afa..9e330f867715 100644 --- a/code/datums/mutations/telekinesis.dm +++ b/code/datums/mutations/telekinesis.dm @@ -4,7 +4,7 @@ desc = "A strange mutation that allows the holder to interact with objects through thought." quality = POSITIVE difficulty = 18 - text_gain_indication = "You feel smarter!" + text_gain_indication = span_notice("You feel smarter!") limb_req = BODY_ZONE_HEAD instability = 40 diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm index af5b22373e54..d8197ead111c 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 = "You feel power flow through your hands." - text_lose_indication = "The energy in your hands subsides." + text_gain_indication = span_notice("You 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 = 20 locked = TRUE @@ -40,17 +40,17 @@ 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_userdanger("[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, src, 1, FALSE, FALSE, FALSE, FALSE) user.Beam(L, icon_state="red_lightning", time=15) - L.visible_message("[user] electrocutes [target]!","[user] electrocutes you!") + L.visible_message(span_danger("[user] electrocutes [target]!"),span_userdanger("[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 6fd8552e18f0..ab848725def7 100644 --- a/code/datums/saymode.dm +++ b/code/datums/saymode.dm @@ -33,10 +33,10 @@ 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]" @@ -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,7 +131,7 @@ 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.") + user.visible_message(span_notice("\The [user] chimpers.")) var/msg = "\[[is_monkey_leader(mind) ? "Monkey Leader" : "Monkey"]\] [user]: [message]" for(var/_M in GLOB.mob_list) var/mob/M = _M @@ -162,7 +162,7 @@ var/turf/sender = get_turf(user) if(receiver.z != sender.z) if(prob(25)) - to_chat(M, "Your mindlink trembles with words, but they are too far to make out...") + to_chat(M, span_warning("Your mindlink trembles with words, but they are too far to make out...")) continue to_chat(M, msg) return FALSE //yogs end diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 460bdff3cd82..87cb227931b0 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 your body!") + owner.visible_message(span_notice("Violet light wraps around [owner]'s body!"), span_notice("Violet light wraps around your body!")) playsound(owner, 'sound/magic/teleport_app.ogg', 50, 1) 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/magic/teleport_diss.ogg', 50, 1) owner.apply_status_effect(STATUS_EFFECT_VOID_PRICE) @@ -72,7 +72,7 @@ /datum/status_effect/vanguard_shield/on_apply() owner.log_message("gained Vanguard stun immunity", LOG_ATTACK) owner.add_stun_absorption("vanguard", INFINITY, 1, "'s yellow aura momentarily intensifies!", "Your ward absorbs the stun!", " radiating with a soft yellow light!") - owner.visible_message("[owner] begins to faintly glow!", "You will absorb all stuns for the next twenty seconds.") + owner.visible_message(span_warning("[owner] begins to faintly glow!"), span_brass("You will absorb all stuns for the next twenty seconds.")) owner.SetStun(0, FALSE) owner.SetKnockdown(0, FALSE) owner.SetParalyzed(0, FALSE) @@ -92,21 +92,21 @@ stuns_blocked = FLOOR(min(vanguard["stuns_absorbed"] * 0.25, 400), 1) vanguard["end_time"] = 0 //so it doesn't absorb the stuns we're about to apply if(owner.stat != DEAD) - var/message_to_owner = "You feel your Vanguard quietly fade..." + var/message_to_owner = span_warning("You feel your Vanguard quietly fade...") var/otheractiveabsorptions = FALSE for(var/i in owner.stun_absorption) if(owner.stun_absorption[i]["end_time"] > world.time && owner.stun_absorption[i]["priority"] > vanguard["priority"]) otheractiveabsorptions = TRUE if(!GLOB.ratvar_awakens && stuns_blocked && !otheractiveabsorptions) owner.Paralyze(stuns_blocked) - message_to_owner = "The weight of the Vanguard's protection crashes down upon you!" + message_to_owner = span_boldwarning("The weight of the Vanguard's protection crashes down upon you!") if(stuns_blocked >= 300) message_to_owner += "\nYou faint from the exertion!" stuns_blocked *= 2 owner.Unconscious(stuns_blocked) else stuns_blocked = 0 //so logging is correct in cases where there were stuns blocked but we didn't stun for other reasons - owner.visible_message("[owner]'s glowing aura fades!", message_to_owner) + owner.visible_message(span_warning("[owner]'s glowing aura fades!"), message_to_owner) owner.log_message("lost Vanguard stun immunity[stuns_blocked ? "and was stunned for [stuns_blocked]":""]", LOG_ATTACK) @@ -123,7 +123,7 @@ /datum/status_effect/inathneqs_endowment/on_apply() owner.log_message("gained Inath-neq's invulnerability", LOG_ATTACK) - owner.visible_message("[owner] shines with azure light!", "You feel Inath-neq's power flow through you! You're invincible!") + owner.visible_message(span_warning("[owner] shines with azure light!"), span_notice("You feel Inath-neq's power flow through you! You're invincible!")) var/oldcolor = owner.color owner.color = "#1E8CE1" owner.fully_heal() @@ -136,7 +136,7 @@ /datum/status_effect/inathneqs_endowment/on_remove() owner.log_message("lost Inath-neq's invulnerability", LOG_ATTACK) - owner.visible_message("The light around [owner] flickers and dissipates!", "You feel Inath-neq's power fade from your body!") + owner.visible_message(span_warning("The light around [owner] flickers and dissipates!"), span_boldwarning("You feel Inath-neq's power fade from your body!")) owner.status_flags &= ~GODMODE playsound(owner, 'sound/magic/ethereal_exit.ogg', 50, 1) @@ -223,12 +223,12 @@ alert_type = /obj/screen/alert/status_effect/wish_granters_gift /datum/status_effect/wish_granters_gift/on_apply() - to_chat(owner, "Death is not your end! The Wish Granter's energy suffuses you, and you begin to rise...") + to_chat(owner, span_notice("Death is not your 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!", "You have regenerated.") + owner.visible_message(span_warning("[owner] appears to wake from the dead, having healed all wounds!"), span_notice("You have regenerated.")) owner.update_mobility() /obj/screen/alert/status_effect/wish_granters_gift @@ -251,7 +251,7 @@ if(isliving(B.current)) var/mob/living/M = B.current SEND_SOUND(M, sound('sound/hallucinations/veryfar_noise.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) @@ -312,7 +312,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!") @@ -331,7 +331,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 @@ -383,7 +383,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 @@ -433,11 +433,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, "Your arm suddenly grows back with the Rod of Asclepius still attached!") + to_chat(itemUser, span_notice("Your 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 your arm!") + to_chat(itemUser, span_notice("The Rod of Asclepius suddenly grows back out of your 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") @@ -506,10 +506,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/weapons/fwoosh.ogg', 75, 0) @@ -517,13 +517,13 @@ /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...")) /datum/status_effect/creep //allows darkspawn to move through lights without lightburn damage //yogs start: darkspawn id = "creep" duration = -1 alert_type = /obj/screen/alert/status_effect/creep - examine_text = "SUBJECTPRONOUN is surrounded by velvety, gently-waving black shadows!" + examine_text = span_warning("SUBJECTPRONOUN is surrounded by velvety, gently-waving black shadows!") var/datum/antagonist/darkspawn/darkspawn /datum/status_effect/creep/on_creation(mob/living/owner, datum/antagonist/darkspawn) @@ -537,7 +537,7 @@ qdel(src) return if(!darkspawn.has_psi(1)) //ticks 5 times per second, 5 Psi lost per second - to_chat(owner, "Without the Psi to maintain it, your protective aura vanishes!") + to_chat(owner, span_warning("Without the Psi to maintain it, your protective aura vanishes!")) qdel(src) return darkspawn.use_psi(1) @@ -553,7 +553,7 @@ id = "time_dilation" duration = 600 alert_type = /obj/screen/alert/status_effect/time_dilation - examine_text = "SUBJECTPRONOUN is moving jerkily and unpredictably!" + examine_text = span_warning("SUBJECTPRONOUN is moving jerkily and unpredictably!") /datum/status_effect/time_dilation/on_apply() owner.next_move_modifier *= 0.5 diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 1d68f53f48ec..5d77c7685db9 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -146,11 +146,11 @@ /obj/screen/alert/status_effect/strandling/Click(location, control, params) . = ..() - to_chat(mob_viewer, "You attempt to remove the durathread strand from around your neck.") + to_chat(mob_viewer, span_notice("You attempt to remove the durathread strand from around your neck.")) if(do_after(mob_viewer, 35, null, mob_viewer)) if(isliving(mob_viewer)) var/mob/living/L = mob_viewer - to_chat(mob_viewer, "You succesfuly remove the durathread strand.") + to_chat(mob_viewer, span_notice("You succesfuly remove the durathread strand.")) L.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) @@ -242,9 +242,9 @@ owner.apply_damage(leg_damage_on_toggle * 0.5, BURN, BODY_ZONE_R_LEG) if(owner.m_intent != MOVE_INTENT_WALK) if(!iscultist(owner)) - to_chat(owner, "Your leg[number_legs > 1 ? "s shiver":" shivers"] with pain!") + to_chat(owner, span_warning("Your leg[number_legs > 1 ? "s shiver":" shivers"] with pain!")) else //Cultists take extra burn damage - to_chat(owner, "Your leg[number_legs > 1 ? "s burn":" burns"] with pain!") + to_chat(owner, span_warning("Your leg[number_legs > 1 ? "s burn":" burns"] with pain!")) owner.toggle_move_intent() return TRUE return FALSE @@ -601,15 +601,15 @@ var/health_difference = old_health - owner.health if(!health_difference) return - owner.visible_message("The light in [owner]'s eyes dims as [owner.p_theyre()] harmed!", \ - "The dazzling lights dim as you're harmed!") + owner.visible_message(span_warning("The light in [owner]'s eyes dims as [owner.p_theyre()] harmed!"), \ + span_boldannounce("The dazzling lights dim as you're harmed!")) health_difference *= 2 //so 10 health difference translates to 20 deciseconds of stun reduction duration -= health_difference old_health = owner.health /datum/status_effect/kindle/on_remove() - owner.visible_message("The light in [owner]'s eyes fades!", \ - "You snap out of your daze!") + owner.visible_message(span_warning("The light in [owner]'s eyes fades!"), \ + span_boldannounce("You snap out of your daze!")) /obj/screen/alert/status_effect/kindle name = "Dazzling Lights" @@ -623,17 +623,17 @@ id = "ichorial_stain" status_type = STATUS_EFFECT_UNIQUE duration = 600 - examine_text = "SUBJECTPRONOUN is drenched in thick, blue ichor!" + examine_text = span_warning("SUBJECTPRONOUN is drenched in thick, blue ichor!") alert_type = /obj/screen/alert/status_effect/ichorial_stain /datum/status_effect/ichorial_stain/on_apply() - owner.visible_message("[owner] gets back up, [owner.p_their()] body dripping blue ichor!", \ - "Thick blue ichor covers your body; you can't be revived like this again until it dries!") + owner.visible_message(span_danger("[owner] gets back up, [owner.p_their()] body dripping blue ichor!"), \ + span_userdanger("Thick blue ichor covers your body; you can't be revived like this again until it dries!")) return TRUE /datum/status_effect/ichorial_stain/on_remove() - owner.visible_message("The blue ichor on [owner]'s body dries out!", \ - "The ichor on your body is dry - you can now be revived by vitality matrices again!") + owner.visible_message(span_danger("The blue ichor on [owner]'s body dries out!"), \ + span_boldnotice("The ichor on your body is dry - you can now be revived by vitality matrices again!")) /obj/screen/alert/status_effect/ichorial_stain name = "Ichorial Stain" @@ -651,7 +651,7 @@ ADD_TRAIT(owner, TRAIT_PACIFISM, "gonbolaPacify") ADD_TRAIT(owner, TRAIT_MUTE, "gonbolaMute") ADD_TRAIT(owner, TRAIT_JOLLY, "gonbolaJolly") - to_chat(owner, "You suddenly feel at peace and feel no need to make any sudden or rash actions...") + to_chat(owner, span_notice("You suddenly feel at peace and feel no need to make any sudden or rash actions...")) return ..() /datum/status_effect/gonbolaPacify/on_remove() @@ -664,7 +664,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 = /obj/screen/alert/status_effect/trance @@ -685,8 +685,8 @@ ADD_TRAIT(owner, TRAIT_MUTE, "trance") if(!owner.has_quirk(/datum/quirk/monochromatic)) owner.add_client_colour(/datum/client_colour/monochrome) - owner.visible_message("[stun ? "[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point." : ""]", \ - "[pick("You feel your thoughts slow down...", "You suddenly feel extremely dizzy...", "You feel like you're in the middle of a dream...","You feel incredibly relaxed...")]") + owner.visible_message("[stun ? span_warning("[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point.") : ""]", \ + span_warning("[pick("You feel your thoughts slow down...", "You suddenly feel extremely dizzy...", "You feel like you're in the middle of a dream...","You feel incredibly relaxed...")]")) return TRUE /datum/status_effect/trance/on_creation(mob/living/new_owner, _duration, _stun = TRUE) @@ -700,7 +700,7 @@ owner.dizziness = 0 if(!owner.has_quirk(/datum/quirk/monochromatic)) owner.remove_client_colour(/datum/client_colour/monochrome) - to_chat(owner, "You snap out of your trance!") + to_chat(owner, span_warning("You snap out of your trance!")) /datum/status_effect/trance/proc/hypnotize(datum/source, list/hearing_args) if(!owner.can_hear()) @@ -723,14 +723,14 @@ switch(rand(1,5)) if(1) if((owner.mobility_flags & MOBILITY_MOVE) && isturf(owner.loc)) - to_chat(owner, "Your leg spasms!") + to_chat(owner, span_warning("Your 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, "Your fingers spasm!") + to_chat(owner, span_warning("Your fingers spasm!")) owner.log_message("used [I] due to a Muscle Spasm", LOG_ATTACK) I.attack_self(owner) if(3) @@ -746,14 +746,14 @@ if(isliving(M)) targets += M if(LAZYLEN(targets)) - to_chat(owner, "Your arm spasms!") + to_chat(owner, span_warning("Your 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, "Your arm spasms!") + to_chat(owner, span_warning("Your arm spasms!")) owner.log_message("attacked [owner.p_them()]self to a Muscle Spasm", LOG_ATTACK) owner.ClickOn(owner) owner.a_intent = prev_intent @@ -765,7 +765,7 @@ for(var/turf/T in oview(owner, 3)) targets += T if(LAZYLEN(targets) && I) - to_chat(owner, "Your arm spasms!") + to_chat(owner, span_warning("Your arm spasms!")) owner.log_message("threw [I] due to a Muscle Spasm", LOG_ATTACK) owner.throw_item(pick(targets)) @@ -778,7 +778,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)) @@ -821,7 +821,7 @@ status_type = STATUS_EFFECT_UNIQUE tick_interval = 5 duration = 300 - examine_text = "SUBJECTPRONOUN is in a deep, deathlike sleep, with no signs of awareness to anything around them." + examine_text = span_deadsay("SUBJECTPRONOUN is in a deep, deathlike sleep, with no signs of awareness to anything around them.") alert_type = /obj/screen/alert/status_effect/broken_will var/old_health @@ -832,8 +832,8 @@ var/health_difference = old_health - owner.health if(!health_difference) return - owner.visible_message("[owner] jerks in their sleep as they're harmed!") - to_chat(owner, "Something hits you, pulling you towards wakefulness!") + owner.visible_message(span_warning("[owner] jerks in their sleep as they're harmed!")) + to_chat(owner, span_boldannounce("Something hits you, pulling you towards wakefulness!")) health_difference *= 10 //1 point of damage = 1 second = 10 deciseconds duration -= health_difference old_health = owner.health @@ -935,7 +935,7 @@ /datum/status_effect/corrosion_curse/on_creation(mob/living/new_owner, ...) . = ..() - to_chat(owner, "Your feel your body starting to break apart...") + to_chat(owner, span_danger("Your feel your body starting to break apart...")) /datum/status_effect/corrosion_curse/tick() . = ..() @@ -974,7 +974,7 @@ /datum/status_effect/amok/on_apply(mob/living/afflicted) . = ..() - to_chat(owner, "Your feel filled with a rage that is not your own!") + to_chat(owner, span_boldwarning("Your feel filled with a rage that is not your own!")) /datum/status_effect/amok/tick() . = ..() diff --git a/code/datums/status_effects/gas.dm b/code/datums/status_effects/gas.dm index 608dbb2d7a11..80b7a676ec0a 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/owner_resist) if(!owner.stat) - to_chat(owner, "You become frozen in a cube!") + to_chat(owner, span_userdanger("You become frozen in a cube!")) cube = icon('icons/effects/freeze.dmi', "ice_cube") owner.add_overlay(cube) owner.update_mobility() diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index d6288b070d3d..97b1e62439d9 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -110,7 +110,7 @@ if(rewarded && rewarded.mind && rewarded.stat != DEAD) to_chat(owner, "You hear something behind you talking... Bounty claimed.") playsound(owner, 'sound/weapons/shotgunshot.ogg', 75, 0) - to_chat(rewarded, "You feel a surge of mana flow into you!") + to_chat(rewarded, span_greentext("You 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 @@ -162,9 +162,9 @@ /datum/status_effect/tagalong/on_remove() if(owner.loc == shadowing) owner.forceMove(cached_location ? cached_location : get_turf(owner)) - shadowing.visible_message("[owner] breaks away from [shadowing]'s shadow!", \ - "You feel a sense of freezing cold pass through you!") - to_chat(owner, "You break away from [shadowing].") + shadowing.visible_message(span_warning("[owner] breaks away from [shadowing]'s shadow!"), \ + span_userdanger("You feel a sense of freezing cold pass through you!")) + to_chat(owner, span_velvet("You break away from [shadowing].")) playsound(owner, 'yogstation/sound/magic/devour_will_form.ogg', 50, TRUE) owner.setDir(SOUTH) @@ -176,15 +176,15 @@ cached_location = get_turf(shadowing) if(cached_location.get_lumcount() < DARKSPAWN_DIM_LIGHT) owner.forceMove(cached_location) - shadowing.visible_message("[owner] suddenly appears from the dark!") - to_chat(owner, "You are forced out of [shadowing]'s shadow!") + shadowing.visible_message(span_warning("[owner] suddenly appears from the dark!")) + to_chat(owner, span_warning("You are forced out of [shadowing]'s shadow!")) owner.Knockdown(30) qdel(src) var/obj/item/I = owner.get_active_held_item() if(I) - to_chat(owner, "Equipping an item forces you out!") + to_chat(owner, span_userdanger("Equipping an item forces you out!")) if(istype(I, /obj/item/dark_bead)) - to_chat(owner, "[I] crackles with feedback, briefly disorienting you!") + to_chat(owner, span_userdanger("[I] crackles with feedback, briefly disorienting you!")) owner.Stun(5) //short delay so they can't click as soon as they're out qdel(src) diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm index 1fb16fd53c2b..9ba132d376ae 100644 --- a/code/datums/traits/_quirk.dm +++ b/code/datums/traits/_quirk.dm @@ -124,8 +124,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 = "You start seeing faraway things normally again." + gain_text = span_danger("Things far away from you start looking blurry.") + lose_text = span_notice("You 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 bb622e000279..eb3997942c21 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -6,8 +6,8 @@ desc = "You can't taste anything! Toxic food will still poison you." value = 1 mob_trait = TRAIT_AGEUSIA - gain_text = "You can't taste anything!" - lose_text = "You can taste again!" + gain_text = span_notice("You can't taste anything!") + lose_text = span_notice("You can taste again!") medical_record_text = "Patient suffers from ageusia and is incapable of tasting food or reagents." /datum/quirk/alcohol_tolerance @@ -15,8 +15,8 @@ desc = "You become drunk more slowly and suffer fewer drawbacks from alcohol." value = 1 mob_trait = TRAIT_ALCOHOL_TOLERANCE - gain_text = "You feel like you could drink a whole keg!" - lose_text = "You don't feel as resistant to alcohol anymore. Somehow." + gain_text = span_notice("You feel like you could drink a whole keg!") + lose_text = span_danger("You don't feel as resistant to alcohol anymore. Somehow.") medical_record_text = "Patient demonstrates a high tolerance for alcohol." /datum/quirk/apathetic @@ -42,8 +42,8 @@ desc = "Nothing like a good drink to make you feel on top of the world. Whenever you're drunk, you slowly recover from injuries." value = 2 mob_trait = TRAIT_DRUNK_HEALING - gain_text = "You feel like a drink would do you good." - lose_text = "You no longer feel like drinking would ease your pain." + gain_text = span_notice("You feel like a drink would do you good.") + lose_text = span_danger("You 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/empath @@ -51,8 +51,8 @@ desc = "Whether it's a sixth sense or careful study of body language, it only takes you a quick glance at someone to understand how they feel." value = 2 mob_trait = TRAIT_EMPATH - gain_text = "You feel in tune with those around you." - lose_text = "You feel isolated from others." + gain_text = span_notice("You feel in tune with those around you.") + lose_text = span_danger("You 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/freerunning @@ -60,8 +60,8 @@ desc = "You're great at quick moves! You can climb tables more quickly." value = 2 mob_trait = TRAIT_FREERUNNING - gain_text = "You feel lithe on your feet!" - lose_text = "You feel clumsy again." + gain_text = span_notice("You feel lithe on your feet!") + lose_text = span_danger("You feel clumsy again.") medical_record_text = "Patient scored highly on cardio tests." /datum/quirk/friendly @@ -69,8 +69,8 @@ desc = "You give the best hugs, especially when you're in the right mood." value = 1 mob_trait = TRAIT_FRIENDLY - gain_text = "You want to hug someone." - lose_text = "You no longer feel compelled to hug others." + gain_text = span_notice("You want to hug someone.") + lose_text = span_danger("You 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." @@ -87,8 +87,8 @@ desc = "You walk with a gentle step; stepping on sharp objects is quieter, less painful and you won't leave footprints behind you." value = 1 mob_trait = TRAIT_LIGHT_STEP - gain_text = "You walk with a little more litheness." - lose_text = "You start tromping around like a barbarian." + gain_text = span_notice("You walk with a little more litheness.") + lose_text = span_danger("You start tromping around like a barbarian.") medical_record_text = "Patient's dexterity belies a strong capacity for stealth." /datum/quirk/musician @@ -96,8 +96,8 @@ desc = "You can tune handheld musical instruments to play melodies that clear certain negative effects and soothe the soul." value = 1 mob_trait = TRAIT_MUSICIAN - gain_text = "You know everything about musical instruments." - lose_text = "You forget how musical instruments work." + gain_text = span_notice("You know everything about musical instruments.") + lose_text = span_danger("You forget how musical instruments work.") medical_record_text = "Patient brain scans show a highly-developed auditory pathway." /datum/quirk/musician/on_spawn() @@ -114,8 +114,8 @@ desc = "You can see slightly more clearly in full darkness than most people." 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() @@ -130,8 +130,8 @@ desc = "You know how to handle a camera, shortening the delay between each shot." value = 1 mob_trait = TRAIT_PHOTOGRAPHER - gain_text = "You know everything about photography." - lose_text = "You forget how photo cameras work." + gain_text = span_notice("You know everything about photography.") + lose_text = span_danger("You forget how photo cameras work.") medical_record_text = "Patient mentions photography as a stress-relieving hobby." /datum/quirk/photographer/on_spawn() @@ -160,8 +160,8 @@ desc = "You hold a spiritual belief, whether in God, nature or the arcane rules of the universe. You gain comfort from the presence of holy people, and believe that your prayers are more special than others." value = 1 mob_trait = TRAIT_SPIRITUAL - gain_text = "You have faith in a higher power." - lose_text = "You lose faith!" + gain_text = span_notice("You have faith in a higher power.") + lose_text = span_danger("You lose faith!") medical_record_text = "Patient reports a belief in a higher power." /datum/quirk/spiritual/on_spawn() @@ -174,8 +174,8 @@ desc = "You're an experienced artist. While drawing graffiti, you can get twice as many uses out of drawing supplies." value = 1 mob_trait = TRAIT_TAGGER - gain_text = "You know how to tag walls efficiently." - lose_text = "You forget how to tag walls properly." + gain_text = span_notice("You know how to tag walls efficiently.") + lose_text = span_danger("You forget how to tag walls properly.") medical_record_text = "Patient was recently seen for possible paint huffing incident." /datum/quirk/tagger/on_spawn() @@ -190,6 +190,6 @@ desc = "Nothing gets between you and your food. You eat faster and can binge on junk food! Being fat suits you just fine." value = 1 mob_trait = TRAIT_VORACIOUS - gain_text = "You feel HONGRY." - lose_text = "You no longer feel HONGRY." + gain_text = span_notice("You feel HONGRY.") + lose_text = span_danger("You no longer feel HONGRY.") medical_record_text = "Patient demonstrates a disturbing capacity for eating." diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 7344e3013950..6292cd34d884 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -5,8 +5,8 @@ desc = "Thanks to your poor posture, backpacks and other bags never sit right on your back. More evenly weighted objects are fine, though." value = -2 mood_quirk = TRUE - gain_text = "Your back REALLY hurts!" - lose_text = "Your back feels better." + gain_text = span_danger("Your back REALLY hurts!") + lose_text = span_notice("Your 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 = "Your body can't produce enough blood to sustain itself." value = -2 - gain_text = "You feel your vigor slowly fading away." - lose_text = "You feel vigorous again." + gain_text = span_danger("You feel your vigor slowly fading away.") + lose_text = span_notice("You 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 = "You are completely blind, nothing can counteract this." value = -4 - gain_text = "You can't see anything." - lose_text = "You miraculously gain back your vision." + gain_text = span_danger("You can't see anything.") + lose_text = span_notice("You miraculously gain back your vision.") medical_record_text = "Patient has permanent blindness." /datum/quirk/blindness/add() @@ -54,8 +54,8 @@ name = "Brain Tumor" desc = "You have a little friend in your brain that is slowly destroying it. Better bring some mannitol!" value = -3 - gain_text = "You feel smooth." - lose_text = "You feel wrinkled again." + gain_text = span_danger("You feel smooth.") + lose_text = span_notice("You feel wrinkled again.") medical_record_text = "Patient has a tumor in their brain that is slowly driving them to brain death." var/where = "at your feet" @@ -73,15 +73,15 @@ where = H.equip_in_one_of_slots(mannitolpills, slots, FALSE) || "at your feet" /datum/quirk/brainproblems/post_add() - to_chat(quirk_holder, "There is a pill bottle of mannitol [where]. You're going to need it.") + to_chat(quirk_holder, span_boldnotice("There is a pill bottle of mannitol [where]. You're going to need it.")) /datum/quirk/deafness name = "Deaf" desc = "You are incurably deaf." value = -2 mob_trait = TRAIT_DEAF - gain_text = "You can't hear anything." - lose_text = "You're able to hear again!" + gain_text = span_danger("You 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 @@ -89,8 +89,8 @@ desc = "You sometimes just hate life." mob_trait = TRAIT_DEPRESSION value = -1 - gain_text = "You start feeling depressed." - lose_text = "You no longer feel depressed." //if only it were that easy! + gain_text = span_danger("You start feeling depressed.") + lose_text = span_notice("You no longer feel depressed.") //if only it were that easy! medical_record_text = "Patient has a mild mood disorder, causing them to experience episodes of depression." mood_quirk = TRUE @@ -195,7 +195,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] @@ -221,16 +221,16 @@ desc = "You sleep like a rock! Whenever you're put to sleep or knocked unconscious, you take a little bit longer to wake up and cant see anything." value = -2 mob_trait = TRAIT_HEAVY_SLEEPER - gain_text = "You feel sleepy." - lose_text = "You feel awake again." + gain_text = span_danger("You feel sleepy.") + lose_text = span_notice("You feel awake again.") medical_record_text = "Patient has abnormal sleep study results and is difficult to wake up." /datum/quirk/hypersensitive name = "Hypersensitive" desc = "For better or worse, everything seems to affect your mood more than it should." value = -1 - gain_text = "You seem to make a big deal out of everything." - lose_text = "You don't seem to make a big deal out of everything anymore." + gain_text = span_danger("You seem to make a big deal out of everything.") + lose_text = span_notice("You don't seem to make a big deal out of everything anymore.") mood_quirk = TRUE //yogs medical_record_text = "Patient demonstrates a high level of emotional volatility." @@ -250,16 +250,16 @@ desc = "You just can't handle your drinks and get drunk very quickly." value = -1 mob_trait = TRAIT_LIGHT_DRINKER - gain_text = "Just the thought of drinking alcohol makes your head spin." - lose_text = "You're no longer severely affected by alcohol." + gain_text = span_notice("Just the thought of drinking alcohol makes your 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 = "You are nearsighted without prescription glasses, but spawn with a pair." value = -1 - gain_text = "Things far away from you start looking blurry." - lose_text = "You start seeing faraway things normally again." + gain_text = span_danger("Things far away from you start looking blurry.") + lose_text = span_notice("You start seeing faraway things normally again.") medical_record_text = "Patient requires prescription glasses in order to counteract nearsightedness." /datum/quirk/nearsighted/add() @@ -288,7 +288,7 @@ return 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 @@ -299,8 +299,8 @@ desc = "The thought of violence makes you sick. So much so, in fact, that you can't hurt anyone." value = -2 mob_trait = TRAIT_PACIFISM - gain_text = "You feel repulsed by the thought of violence!" - lose_text = "You think you can defend yourself again." + gain_text = span_danger("You feel repulsed by the thought of violence!") + lose_text = span_notice("You think you can defend yourself again.") medical_record_text = "Patient is unusually pacifistic and cannot bring themselves to cause physical harm." @@ -415,8 +415,8 @@ desc = "You suffer from a severe disorder that causes very vivid hallucinations. Mindbreaker toxin can suppress its effects, and you are immune to mindbreaker's hallucinogenic properties. This is not a license to grief." value = -2 //no mob trait because it's handled uniquely - gain_text = "..." - lose_text = "You feel in tune with the world again." + gain_text = span_userdanger("...") + lose_text = span_notice("You 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() @@ -439,8 +439,8 @@ name = "Social Anxiety" desc = "Talking to people is very difficult for you, and you often stutter or even lock up." value = -1 - gain_text = "You start worrying about what you're saying." - lose_text = "You feel easier about talking again." //if only it were that easy! + gain_text = span_danger("You start worrying about what you're saying.") + lose_text = span_notice("You 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 @@ -456,7 +456,7 @@ to_chat(H, "You retreat into yourself. You really don't feel up to talking.") H.silent = max(10, H.silent) else if(prob(0.5) && dumb_thing) - to_chat(H, "You think of a dumb thing you said a long time ago and scream internally.") + to_chat(H, span_userdanger("You 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 @@ -466,8 +466,8 @@ name = "Junkie" desc = "You can't get enough of hard drugs." value = -2 - gain_text = "You suddenly feel the craving for drugs." - lose_text = "You feel like you should kick your drug habit." + gain_text = span_danger("You suddenly feel the craving for drugs.") + lose_text = span_notice("You feel like you should kick your 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, /datum/reagent/drug/ketamine) //List of possible IDs var/reagent_id //ID picked from list @@ -518,7 +518,7 @@ SEND_SIGNAL(H.back, COMSIG_TRY_STORAGE_SHOW, H) /datum/quirk/junkie/proc/announce_drugs() - to_chat(quirk_holder, "There is a [drug_instance.name] of [reagent_instance.name] [where_drug]. Better hope you don't run out...") + to_chat(quirk_holder, span_boldnotice("There is a [drug_instance.name] of [reagent_instance.name] [where_drug]. Better hope you don't run out...")) /datum/quirk/junkie/on_process() var/mob/living/carbon/human/H = quirk_holder @@ -531,7 +531,7 @@ if(!in_list) H.reagents.addiction_list += reagent_instance reagent_instance.addiction_stage = 0 - to_chat(quirk_holder, "You thought you kicked it, but you suddenly feel like you need [reagent_instance.name] again...") + to_chat(quirk_holder, span_danger("You thought you kicked it, but you suddenly feel like you need [reagent_instance.name] again...")) tick_counter = 0 else ++tick_counter @@ -552,8 +552,8 @@ desc = "Sometimes you just really want a smoke. Probably not great for your lungs." value = -1 mood_quirk = TRUE - gain_text = "You could really go for a smoke right about now." - lose_text = "You feel like you should quit smoking." + gain_text = span_danger("You could really go for a smoke right about now.") + lose_text = span_notice("You 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 @@ -570,7 +570,7 @@ . = ..() /datum/quirk/junkie/smoker/announce_drugs() - to_chat(quirk_holder, "There is a [drug_instance.name] [where_drug], and a lighter [where_accessory]. Make sure you get your favorite brand when you run out.") + to_chat(quirk_holder, span_boldnotice("There is a [drug_instance.name] [where_drug], and a lighter [where_accessory]. Make sure you get your favorite brand when you run out.")) /datum/quirk/junkie/smoker/on_process() @@ -590,8 +590,8 @@ value = -2 mood_quirk = TRUE mob_trait = TRAIT_UNSTABLE - gain_text = "There's a lot on your mind right now." - lose_text = "Your mind finally feels calm." + gain_text = span_danger("There's a lot on your mind right now.") + lose_text = span_notice("Your mind finally feels calm.") medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events." /datum/quirk/sheltered @@ -599,8 +599,8 @@ desc = "You never learned galactic common." value = -3 mob_trait = TRAIT_SHELTERED - gain_text = "You do not understand galactic common." - lose_text = "You start to put together what people are saying in galactic common." + gain_text = span_danger("You do not understand galactic common.") + lose_text = span_notice("You start to put together what people are saying in galactic common.") medical_record_text = "Patient looks perplexed when questioned in galactic common." @@ -615,8 +615,8 @@ desc = "You have had an allergic reaction to medicine in the past. Better stay away from it!" value = -1 mob_trait = TRAIT_ALLERGIC - gain_text = "You remember your allergic reaction to a common medicine." - lose_text = "You no longer are allergic to medicine." + gain_text = span_danger("You remember your allergic reaction to a common medicine.") + lose_text = span_notice("You no longer are allergic to medicine.") medical_record_text = "Patient has a severe allergic reaction to a common medicine." var/allergy_chem_list = list( /datum/reagent/medicine/inacusiate, /datum/reagent/medicine/silver_sulfadiazine, @@ -635,14 +635,14 @@ /datum/quirk/allergic/on_spawn() reagent_id = pick(allergy_chem_list) var/datum/reagent/allergy = GLOB.chemical_reagents_list[reagent_id] - to_chat(quirk_holder, "You remember you are allergic to [allergy.name].") + to_chat(quirk_holder, span_danger("You remember you are allergic to [allergy.name].")) quirk_holder.allergies += allergy /datum/quirk/allergic/on_process() var/mob/living/carbon/H = quirk_holder var/datum/reagent/allergy = GLOB.chemical_reagents_list[reagent_id] if(cooldown == FALSE && H.reagents.has_reagent(reagent_id)) - to_chat(quirk_holder, "You forgot you were allergic to [allergy.name]!") + to_chat(quirk_holder, span_danger("You forgot you were allergic to [allergy.name]!")) H.reagents.add_reagent(/datum/reagent/toxin/histamine, rand(5,10)) cooldown = TRUE addtimer(VARSET_CALLBACK(src, cooldown, FALSE), cooldown_time) @@ -652,8 +652,8 @@ desc = "You have an uncontrollable urge to pick up things you see. Even things that don't belong to you." value = -1 mob_trait = TRAIT_KLEPTOMANIAC - gain_text = "You have an unmistakeable urge to grab nearby objects." - lose_text = "You no feel the urge to steal." + gain_text = span_danger("You have an unmistakeable urge to grab nearby objects.") + lose_text = span_notice("You no feel the urge to steal.") medical_record_text = "Patient has an uncontrollable urge to steal." /datum/quirk/kleptomaniac/on_process() @@ -667,7 +667,7 @@ if(!(L.mobility_flags & MOBILITY_PICKUP)) return if(!H.get_active_held_item()) - to_chat(quirk_holder, "You can't keep your eyes off [I.name].") + to_chat(quirk_holder, span_danger("You can't keep your eyes off [I.name].")) H.UnarmedAttack(I) /datum/quirk/ineloquent diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index 91afe641e07c..18be90aedaa5 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -5,8 +5,8 @@ name = "Vegetarian" desc = "You find the idea of eating meat morally and physically repulsive." value = 0 - gain_text = "You feel repulsion at the idea of eating meat." - lose_text = "You feel like eating meat isn't that bad." + gain_text = span_notice("You feel repulsion at the idea of eating meat.") + lose_text = span_notice("You feel like eating meat isn't that bad.") medical_record_text = "Patient reports a vegetarian diet." /datum/quirk/vegetarian/add() @@ -28,8 +28,8 @@ name = "Ananas Affinity" desc = "You find yourself greatly enjoying fruits of the ananas genus. You can't seem to ever get enough of their sweet goodness!" value = 0 - gain_text = "You feel an intense craving for pineapple." - lose_text = "Your feelings towards pineapples seem to return to a lukewarm state." + gain_text = span_notice("You feel an intense craving for pineapple.") + lose_text = span_notice("Your 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() @@ -47,8 +47,8 @@ name = "Ananas Aversion" desc = "You find yourself greatly detesting fruits of the ananas genus. Serious, how the hell can anyone say these things are good? And what kind of madman would even dare putting it on a pizza!?" value = 0 - gain_text = "You find yourself pondering what kind of idiot actually enjoys pineapples..." - lose_text = "Your feelings towards pineapples seem to return to a lukewarm state." + gain_text = span_notice("You find yourself pondering what kind of idiot actually enjoys pineapples...") + lose_text = span_notice("Your 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() @@ -66,8 +66,8 @@ name = "Deviant Tastes" desc = "You dislike food that most people enjoy, and find delicious what they don't." value = 0 - gain_text = "You start craving something that tastes strange." - lose_text = "You feel like eating normal food again." + gain_text = span_notice("You start craving something that tastes strange.") + lose_text = span_notice("You feel like eating normal food again.") medical_record_text = "Patient demonstrates irregular nutrition preferences." /datum/quirk/deviant_tastes/add() @@ -95,7 +95,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/ambience/ambidet1.ogg', 50, FALSE) /datum/quirk/monochromatic/remove() @@ -107,8 +107,8 @@ desc = "You have developed a random accent." value = 0 mob_trait = TRAIT_RANDOM_ACCENT - gain_text = "You have developed an accent." - lose_text = "You have better control of how you pronounce your words." + gain_text = span_danger("You have developed an accent.") + lose_text = span_notice("You have better control of how you pronounce your words.") medical_record_text = "Patient is difficult to understand." /datum/quirk/random_accent/post_add() diff --git a/code/datums/voice_announcements.dm b/code/datums/voice_announcements.dm index 04cc6257b121..a137176474e7 100644 --- a/code/datums/voice_announcements.dm +++ b/code/datums/voice_announcements.dm @@ -167,7 +167,7 @@ GLOBAL_LIST_EMPTY(voice_announce_list) var/z_level = console_turf.z SScommunications.nonsilicon_message_cooldown = world.time + 300 var/mob/living/user = client.mob - deadchat_broadcast(" made a priority announcement from [get_area_name(user, TRUE)].", "[user.real_name]", user) + deadchat_broadcast(" made a priority announcement from [get_area_name(user, TRUE)].", span_name("[user.real_name]"), user) var/sound/sound1 = sound('sound/misc/announce.ogg') var/sound/sound2 = sound(snd, channel = CHANNEL_VOICE_ANNOUNCE, volume = 70) do_announce_sound(sound1, sound2, 15, z_level) diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm index 665217e40681..3881574827de 100644 --- a/code/datums/weather/weather.dm +++ b/code/datums/weather/weather.dm @@ -4,12 +4,12 @@ var/name = "space wind" var/desc = "Heavy gusts of wind blanket the area, periodically knocking down anyone caught in the open." - 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_userdanger("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 = 300 //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 a1ec4871d5b7..85fdc327ccbc 100644 --- a/code/datums/weather/weather_types/acid_rain.dm +++ b/code/datums/weather/weather_types/acid_rain.dm @@ -4,7 +4,7 @@ desc = "The planet's thunderstorms are by nature acidic, and will incinerate anyone standing beneath them without protection." 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/ambience/acidrain_start.ogg' weather_message = "Acidic rain pours down around you! Get inside!" @@ -14,7 +14,7 @@ weather_sound = 'sound/ambience/acidrain_mid.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/ambience/acidrain_end.ogg' area_type = /area diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm index 53d9f4805ba1..aea6f33cb498 100644 --- a/code/datums/weather/weather_types/ash_storm.dm +++ b/code/datums/weather/weather_types/ash_storm.dm @@ -3,7 +3,7 @@ name = "ash storm" desc = "An intense atmospheric storm lifts ash off of the planet's surface and billows it down across the area, dealing intense fire damage to the unprotected." - 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" @@ -12,7 +12,7 @@ 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 = "A passing ash storm blankets the area in harmless embers." - 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 ad7d9c8ff361..81e0c7bff6f7 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 = "The ground turns into surprisingly cool lava, lightly damaging anything on the floor." - telegraph_message = "You feel the ground beneath you getting hot. Waves of heat distort the air." + telegraph_message = span_warning("You 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_userdanger("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 72752abfe4e6..71ccc42c2a1a 100644 --- a/code/datums/weather/weather_types/radiation_storm.dm +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -4,7 +4,7 @@ desc = "A cloud of intense radiation passes through the area dealing rad damage to those who are unprotected." telegraph_duration = 400 - telegraph_message = "The air begins to grow warm." + telegraph_message = span_danger("The air begins to grow warm.") weather_message = "You feel waves of heat wash over you! Find shelter!" weather_overlay = "ash_storm" @@ -14,7 +14,7 @@ weather_sound = 'sound/misc/bloblarm.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/snow_storm.dm b/code/datums/weather/weather_types/snow_storm.dm index 8ab4839cdbd3..299fcaebd3a5 100644 --- a/code/datums/weather/weather_types/snow_storm.dm +++ b/code/datums/weather/weather_types/snow_storm.dm @@ -3,7 +3,7 @@ desc = "Harsh snowstorms roam the topside of this arctic planet, burying any area unfortunate enough to be in its path." 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" @@ -13,7 +13,7 @@ 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 protect_indoors = TRUE diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm index dbaffb517a56..10ebab692b1c 100644 --- a/code/datums/wires/_wires.dm +++ b/code/datums/wires/_wires.dm @@ -284,7 +284,7 @@ cut_color(target_wire) . = TRUE else - to_chat(L, "You need wirecutters!") + to_chat(L, span_warning("You need wirecutters!")) if("pulse") I = L.is_holding_tool_quality(TOOL_MULTITOOL) if(I || IsAdminGhost(usr)) @@ -293,7 +293,7 @@ pulse_color(target_wire, L) . = TRUE else - to_chat(L, "You need a multitool!") + to_chat(L, span_warning("You need a multitool!")) if("attach") if(is_attached(target_wire)) I = detach_assembly(target_wire) @@ -311,6 +311,6 @@ A.forceMove(L.drop_location()) . = TRUE else - to_chat(L, "You need an attachable assembly!") + to_chat(L, span_warning("You need an attachable assembly!")) #undef MAXIMUM_EMP_WIRES \ No newline at end of file diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm index e7e40274e612..9376e9493efd 100644 --- a/code/datums/wires/mulebot.dm +++ b/code/datums/wires/mulebot.dm @@ -21,12 +21,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.") \ No newline at end of file + holder.visible_message(span_notice("[icon2html(M, viewers(holder))] You hear a radio crackle.")) \ No newline at end of file diff --git a/code/datums/wires/syndicatebomb.dm b/code/datums/wires/syndicatebomb.dm index 30718540c0d1..3c448934b589 100644 --- a/code/datums/wires/syndicatebomb.dm +++ b/code/datums/wires/syndicatebomb.dm @@ -20,24 +20,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/machines/chime.ogg', 30, 1) 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/machines/buzz-sigh.ogg', 30, 1) var/seconds = B.seconds_remaining() if(seconds >= 61) // Long fuse bombs can suddenly become more dangerous if you tinker with them. @@ -48,13 +48,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 @@ -63,22 +63,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/effects/stealthoff.ogg', 30, 1) 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 1e1438eaea3a..0eac52ed91fd 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) diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 3ef76f97cb2b..c4e3621c2b77 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -446,7 +446,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "bar" minimap_color = "#5ac866" mood_bonus = 5 - mood_message = "I love being in the bar!\n" + mood_message = span_nicegreen("I love being in the bar!\n") airlock_wires = /datum/wires/airlock/service /area/crew_quarters/bar/Initialize(mapload) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 37dd6b54d27c..69cc8ef0c204 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -43,7 +43,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/area/areas/ruins/icemoon.dm b/code/game/area/areas/ruins/icemoon.dm index f64699119925..a9932e2dca33 100644 --- a/code/game/area/areas/ruins/icemoon.dm +++ b/code/game/area/areas/ruins/icemoon.dm @@ -8,7 +8,7 @@ name = "Bath House" icon_state = "dk_yellow" mood_bonus = 10 - mood_message = "This place is like paradise, I don't ever want to leave!\n" + mood_message = span_nicegreen("This place is like paradise, I don't ever want to leave!\n") /area/ruin/powered/inn name = "Inn" diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 138b2fb400fb..215bf17ab88e 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -491,9 +491,9 @@ . += "Nothing." else if(reagents.flags & AMOUNT_VISIBLE) if(reagents.total_volume) - . += "It has [reagents.total_volume] unit\s left." + . += span_notice("It has [reagents.total_volume] unit\s left.") else - . += "It's empty." + . += span_danger("It's empty.") SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) @@ -506,7 +506,7 @@ /atom/proc/relaymove(mob/user) if(buckle_message_cooldown <= world.time) buckle_message_cooldown = world.time + 50 - to_chat(user, "You can't move while buckled to [src]!") + to_chat(user, span_warning("You can't move while buckled to [src]!")) return /// Handle what happens when your contents are exploded by a bomb @@ -744,13 +744,13 @@ var/datum/component/storage/STR = GetComponent(/datum/component/storage) //yogs start -- stops things from dumping into themselves if(STR == src_object) - to_chat(user,"You can't dump the contents of [src_object.parent] into itself!") + to_chat(user,span_warning("You can't dump the contents of [src_object.parent] into itself!")) return //yogs end while (do_after(user, 10, TRUE, src, FALSE, CALLBACK(STR, /datum/component/storage.proc/handle_mass_item_insertion, things, src_object, user, progress))) stoplag(1) qdel(progress) - to_chat(user, "You dump as much of [src_object.parent]'s contents into [STR.insert_preposition]to [src] as you can.") + to_chat(user, span_notice("You dump as much of [src_object.parent]'s contents into [STR.insert_preposition]to [src] as you can.")) STR.orient2hud(user) src_object.orient2hud(user) if(user.active_storage) //refresh the HUD to show the transfered contents @@ -983,7 +983,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 d4621d620531..96652a4a50e1 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -182,7 +182,7 @@ var/mob/M = AM log_combat(src, M, "grabbed", addition="passive grab") if(!supress_message) - visible_message("[src] has grabbed [M] passively!") + visible_message(span_warning("[src] has grabbed [M] passively!")) return TRUE /atom/movable/proc/stop_pulling() @@ -705,12 +705,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]!", "You forcefully push against [AM]!") + visible_message(span_warning("[src] forcefully pushes against [AM]!"), span_warning("You 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]!", "You crush [AM]!") + visible_message(span_danger("[src] crushes past [AM]!"), span_danger("You crush [AM]!")) /atom/movable/proc/move_crushed(atom/movable/pusher, force = MOVE_FORCE_DEFAULT, direction) return FALSE diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index a96b293153d6..51ef0fe05b92 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -84,7 +84,7 @@ Credit where due: if(R.deployed) var/mob/living/silicon/ai/AI = R.mainframe R.undeploy() - to_chat(AI, "Anomaly Detected. Returned to core!") //The AI needs to be in its core to properly be converted + to_chat(AI, span_userdanger("Anomaly Detected. Returned to core!")) //The AI needs to be in its core to properly be converted . = L.mind.add_antag_datum(C) @@ -100,7 +100,7 @@ Credit where due: Ratvar, the Clockwork Justiciar, [GLOB.ratvar_awakens ? "has been freed from his eternal prison" : "lies in exile, derelict and forgotten in an unseen realm"].") flash_color(L, flash_color = list("#BE8700", "#BE8700", "#BE8700", rgb(0,0,0)), flash_time = 50) else - L.visible_message("[L] seems to resist an unseen force!", null, null, 7, L) + L.visible_message(span_boldwarning("[L] seems to resist an unseen force!"), null, null, 7, L) to_chat(L, "The world before you suddenly glows a brilliant yellow. [issilicon(L) ? "You cannot compute this truth!" : \ "Your mind is racing!"] You hear the whooshing steam and cl[pick("ank", "ink", "unk", "ang")]ing cogs of a billion billion machines, and the sound \ is a meaningless cacophony.
\ @@ -354,7 +354,7 @@ Credit where due: /obj/item/paper/servant_primer/examine(mob/user) . = ..() if(!is_servant_of_ratvar(user) && !isobserver(user)) - . += "You can't understand any of the words on [src]." + . += span_danger("You can't understand any of the words on [src].") /obj/effect/spawner/lootdrop/clockcult name = "clock tile" diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm index 3881490d7334..76699c8476be 100644 --- a/code/game/gamemodes/clown_ops/clown_weapons.dm +++ b/code/game/gamemodes/clown_ops/clown_weapons.dm @@ -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 @@ -194,7 +194,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/misc/slip.ogg', 50, 1, -1) bomb.preprime(user, 0, FALSE) return (BRUTELOSS) diff --git a/code/game/gamemodes/clown_ops/honkmother.dm b/code/game/gamemodes/clown_ops/honkmother.dm index d673074cbbc9..f4ca2f97247f 100644 --- a/code/game/gamemodes/clown_ops/honkmother.dm +++ b/code/game/gamemodes/clown_ops/honkmother.dm @@ -25,7 +25,7 @@ /obj/structure/destructible/honkmother/Initialize() . = ..() START_PROCESSING(SSobj, src) - send_to_playing_players("HONK!") + send_to_playing_players(span_clown("HONK!")) //mine now bitch sound_to_playing_players('sound/effects/ratvar_reveal.ogg') var/mutable_appearance/alert_overlay = mutable_appearance('icons/obj/items_and_weapons.dmi', "bike_horn") @@ -41,7 +41,7 @@ return FALSE var/type = pick(typesof(/mob/living/simple_animal/hostile/retaliate/clown)) var/mob/R = new type(get_turf(src)) - R.visible_message("[R] awakens!") + R.visible_message(span_warning("[R] awakens!")) R.key = O.key //moves and turns things into BANANIUM diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 9bcebbdf5f1c..37ed5f4c4dc7 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -232,13 +232,13 @@ continue cultist.playsound_local(cultist, 'sound/magic/demon_dies.ogg', 75, FALSE) if(isconstruct(cultist)) - to_chat(cultist, "You feel your form lose some of its density, becoming more fragile!") + to_chat(cultist, span_cultbold("You feel your form lose some of its density, becoming more fragile!")) cultist.maxHealth *= 0.75 cultist.health *= 0.75 else cultist.Stun(20) cultist.confused += 15 //30 seconds of confusion - to_chat(cultist, "Your mind is flooded with pain as the last bloodstone is destroyed!") + to_chat(cultist, span_narsiesmall("Your mind is flooded with pain as the last bloodstone is destroyed!")) /datum/game_mode/proc/cult_loss_anchor() priority_announce("Whatever you did worked. Veil density has returned to a safe level. Shuttle locks lifted.","Central Command Higher Dimensional Affairs") @@ -252,23 +252,23 @@ continue cultist.playsound_local(cultist, 'sound/effects/screech.ogg', 75, FALSE) if(isconstruct(cultist)) - to_chat(cultist, "You feel your form lose most of its density, becoming incredibly fragile!") + to_chat(cultist, span_cultbold("You feel your form lose most of its density, becoming incredibly fragile!")) cultist.maxHealth *= 0.5 cultist.health *= 0.5 else cultist.Stun(40) cultist.confused += 30 //one minute of confusion - to_chat(cultist, "You feel a bleakness as the destruction of the anchor cuts off your connection to Nar-Sie!") + to_chat(cultist, span_narsiesmall("You feel a bleakness as the destruction of the anchor cuts off your connection to Nar-Sie!")) /datum/game_mode/proc/disable_bloodstone_cooldown() bloodstone_cooldown = FALSE for(var/datum/mind/M in cult) var/mob/living/L = M.current if(L) - to_chat(M, "The veil has weakened enough for another attempt, prepare the summoning!") + to_chat(M, span_narsiesmall("The veil has weakened enough for another attempt, prepare the summoning!")) if(isconstruct(L)) L.maxHealth = initial(L.maxHealth) - to_chat(L, "Your form regains its original durability!") + to_chat(L, span_cult("Your form regains its original durability!")) //send message to cultists saying they can do stuff again /datum/game_mode/cult/generate_credit_text() diff --git a/code/game/gamemodes/dynamic/ruleset_picking.dm b/code/game/gamemodes/dynamic/ruleset_picking.dm index 9221e4a3c152..692887b4dca6 100644 --- a/code/game/gamemodes/dynamic/ruleset_picking.dm +++ b/code/game/gamemodes/dynamic/ruleset_picking.dm @@ -93,7 +93,7 @@ /// Fired when an admin cancels the current midround injection. /datum/game_mode/dynamic/proc/admin_cancel_midround(mob/user, timer_id) if (midround_injection_timer_id != timer_id || !deltimer(midround_injection_timer_id)) - to_chat(user, "Too late!") + to_chat(user, span_notice("Too late!")) return dynamic_log("[key_name(user)] cancelled the next midround injection.") @@ -103,7 +103,7 @@ /// Fired when an admin requests a different midround injection. /datum/game_mode/dynamic/proc/admin_different_midround(mob/user, timer_id) if (midround_injection_timer_id != timer_id || !deltimer(midround_injection_timer_id)) - to_chat(user, "Too late!") + to_chat(user, span_notice("Too late!")) return midround_injection_timer_id = null diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index ab0a0547604a..3303fdb60286 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -84,7 +84,7 @@ return FALSE return TRUE 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 TRUE @@ -414,7 +414,7 @@ //yogs start -- quiet mode if(mind.quiet_round) - to_chat(mind.current,"There aren't enough antag volunteers, so your quiet round setting will not be considered!") + to_chat(mind.current,span_userdanger("There aren't enough antag volunteers, so your quiet round setting will not be considered!")) //yogs end return mind @@ -567,7 +567,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/hivemind/radar.dm b/code/game/gamemodes/hivemind/radar.dm index bb5827cdc2c0..27c1154d8d6a 100644 --- a/code/game/gamemodes/hivemind/radar.dm +++ b/code/game/gamemodes/hivemind/radar.dm @@ -50,7 +50,7 @@ else scan_target = null if(!trackable_targets_exist) - to_chat(owner, "The psychic energies eminating from afar have died down... for now") + to_chat(owner, span_assimilator("The psychic energies eminating from afar have died down... for now")) owner.remove_status_effect(STATUS_EFFECT_HIVE_RADAR) //"Trackable" status effect diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index 588f690e8d9a..8bd3c4055e75 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -41,11 +41,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 eecdfeeee9fd..612efe7a78b2 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -148,7 +148,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event continue if(isliving(thing)) var/mob/living/living_thing = thing - living_thing.visible_message("[src] slams into [living_thing].", "[src] slams into you!.") + living_thing.visible_message(span_warning("[src] slams into [living_thing]."), span_userdanger("[src] slams into you!.")) switch(hitpwr) if(EXPLODE_DEVASTATE) SSexplosions.high_mov_atom += thing diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 89935e0b7eb6..944d0a398ef1 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -863,7 +863,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) var/mob/new_target = input(admin,"Select target:", "Objective target") as null|anything in possible_targets target = new_target.mind else - to_chat(admin, "No active AIs with minds!") + to_chat(admin, span_warning("No active AIs with minds!")) update_explanation_text() /datum/objective/destroy/internal @@ -1147,7 +1147,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) return pet = selected_pet else - to_chat(admin, "No living pets!") + to_chat(admin, span_warning("No living pets!")) update_explanation_text() /datum/objective/minor/pet/update_explanation_text() diff --git a/code/game/golf/golf.dm b/code/game/golf/golf.dm index d439f598d90f..eb3741e46e71 100644 --- a/code/game/golf/golf.dm +++ b/code/game/golf/golf.dm @@ -15,7 +15,7 @@ icon_state = icon_state + "_w" playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) user.visible_message("[user.name] secures [src] to the floor.", \ - "You secure [src] to the floor.", \ + span_notice("You secure [src] to the floor."), \ " You hear a ratchet") src.anchored = 1 if(1) @@ -23,25 +23,25 @@ icon_state = initial(icon_state) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) user.visible_message("[user.name] unsecures [src] from the floor.", \ - "You unwrench [src] from the floor.", \ - "You hear a ratchet.") + span_notice("You unwrench [src] from the floor."), \ + span_italics("You hear a ratchet.")) src.anchored = 0 /obj/machinery/golfhole/Cross(atom/movable/mover, turf/target) . = ..() if (istype(mover,/obj/item/golfball) && mover.throwing && anchored) if (contents.len >= 3) - visible_message("The golf hole is full! Try removing golfballs from the hole.") + visible_message(span_notice("The golf hole is full! Try removing golfballs from the hole.")) return FALSE var/obj/item/golfball = mover if(prob(75)) golfball.loc = src - visible_message("The golfball lands in [src].") + visible_message(span_notice("The golfball lands in [src].")) update_icon() else - visible_message("The golfball bounces out of [src]!") + visible_message(span_notice("The golfball bounces out of [src]!")) return FALSE else return ..() @@ -50,14 +50,14 @@ /obj/machinery/golfhole/attack_hand(atom, mob/user) var/obj/item/golfball/ball = locate(/obj/item/golfball) in contents if (ball) - visible_message("The golfball is removed from the hole.") + visible_message(span_notice("The golfball is removed from the hole.")) ball.loc = get_turf(src.loc) /obj/machinery/golfhole/proc/hole_place_item_in(obj/item/golfball, mob/user) golfball.loc = src user.visible_message("[user.name] knocks the golfball into [src].", \ - "You knock the golfball into [src].") + span_notice("You knock the golfball into [src].")) /obj/machinery/golfhole/blue icon = 'yogstation/icons/code/game/golf/golfstuff.dmi' diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index 5068fe6ef1a0..578981580bb7 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -70,7 +70,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 @@ -83,17 +83,17 @@ if(!O.tool_start_check(user, amount=0)) return user.visible_message("[user] is repairing [src].", \ - "You begin repairing [src]...", \ - "You hear welding.") + span_notice("You begin repairing [src]..."), \ + span_italics("You hear welding.")) if(O.use_tool(src, user, 40, volume=50)) if(!(stat & BROKEN)) return - to_chat(user, "You repair [src].") + to_chat(user, span_notice("You repair [src].")) stat &= ~BROKEN 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 ..() @@ -122,7 +122,7 @@ ejectpda() else - to_chat(user, "[src] is empty.") + to_chat(user, span_notice("[src] is empty.")) /obj/machinery/pdapainter/verb/ejectpda() @@ -138,4 +138,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 9f10fbde7ac9..fa86031074f6 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -57,8 +57,8 @@ icon_state = initial(icon_state) /obj/machinery/sleeper/container_resist(mob/living/user) - visible_message("[occupant] emerges from [src]!", - "You climb out of [src]!") + visible_message(span_notice("[occupant] emerges from [src]!"), + span_notice("You climb out of [src]!")) open_machine() /obj/machinery/sleeper/Exited(atom/movable/user) @@ -103,10 +103,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 @@ -128,7 +128,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].", "You pry open [src].") + visible_message(span_notice("[usr] pries open [src]."), span_notice("You pry open [src].")) open_machine() /obj/machinery/sleeper/ui_state(mob/user) @@ -152,7 +152,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() ..() @@ -224,11 +224,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, "You scramble the sleeper's user interface!") + to_chat(user, span_warning("You 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 a7d40547b021..daa7d41f831a 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -255,7 +255,7 @@ Class Procs: return FALSE var/mob/living/carbon/H = user if(istype(H) && H.has_dna() && H.dna.check_mutation(ACTIVE_HULK)) - to_chat(H, "HULK NOT NERD. HULK SMASH!!!") + to_chat(H, span_warning("HULK NOT NERD. HULK SMASH!!!")) return FALSE if(!Adjacent(user)) if(!(istype(H) && H.has_dna() && H.dna.check_mutation(TK))) @@ -321,7 +321,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, "melee", 1) /obj/machinery/attack_robot(mob/user) @@ -353,7 +353,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].", "You pry open \the [src].") + visible_message(span_notice("[usr] pries open \the [src]."), span_notice("You pry open \the [src].")) open_machine() /obj/machinery/proc/default_deconstruction_crowbar(obj/item/I, ignore_panel = 0) @@ -405,11 +405,11 @@ Class Procs: if(!panel_open) panel_open = TRUE icon_state = icon_state_open - to_chat(user, "You open the maintenance hatch of [src].") + to_chat(user, span_notice("You open the maintenance hatch of [src].")) else panel_open = FALSE icon_state = icon_state_closed - to_chat(user, "You close the maintenance hatch of [src].") + to_chat(user, span_notice("You close the maintenance hatch of [src].")) return 1 return 0 @@ -417,13 +417,13 @@ Class Procs: if(panel_open && I.tool_behaviour == TOOL_WRENCH) I.play_tool_sound(src, 50) setDir(turn(dir,-90)) - to_chat(user, "You rotate [src].") + to_chat(user, span_notice("You 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 @@ -433,12 +433,12 @@ Class Procs: if(!can_be_unfasten || can_be_unfasten == FAILED_UNFASTEN) return can_be_unfasten if(time) - to_chat(user, "You begin [anchored ? "un" : ""]securing [src]...") + to_chat(user, span_notice("You 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/unfasten_wrench_check, prev_anchored, user))) - to_chat(user, "You [anchored ? "un" : ""]secure [src].") + to_chat(user, span_notice("You [anchored ? "un" : ""]secure [src].")) setAnchored(!anchored) playsound(src, 'sound/items/deconstruct.ogg', 50, 1) return SUCCESSFUL_UNFASTEN @@ -493,7 +493,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() @@ -506,18 +506,18 @@ 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) . = ..() if(stat & BROKEN) - . += "It looks broken and non-functional." + . += span_notice("It looks broken and non-functional.") if(!(resistance_flags & INDESTRUCTIBLE)) 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) @@ -525,7 +525,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) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index b52cef12ac19..0fcf396cb1fd 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -27,10 +27,10 @@ /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_danger("[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)].") diff --git a/code/game/machinery/airlock_cycle_control.dm b/code/game/machinery/airlock_cycle_control.dm index f9302c01902f..ab4ba9fe0910 100644 --- a/code/game/machinery/airlock_cycle_control.dm +++ b/code/game/machinery/airlock_cycle_control.dm @@ -437,7 +437,7 @@ if(2) if(W.tool_behaviour == TOOL_WIRECUTTER && panel_open && wires.is_all_cut()) W.play_tool_sound(src) - to_chat(user, "You cut the final wires.") + to_chat(user, span_notice("You cut the final wires.")) new /obj/item/stack/cable_coil(loc, 5) buildstage = 1 update_icon() @@ -445,7 +445,7 @@ else if(W.tool_behaviour == TOOL_SCREWDRIVER) // Opening that 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 @@ -457,11 +457,11 @@ if(1) if(W.tool_behaviour == TOOL_CROWBAR) user.visible_message("[user.name] removes the electronics from [src.name].",\ - "You start prying out the circuit...") + span_notice("You start prying out the circuit...")) W.play_tool_sound(src) if (W.use_tool(src, user, 20)) if (buildstage == 1) - to_chat(user, "You remove the airlock controller electronics.") + to_chat(user, span_notice("You remove the airlock controller electronics.")) new /obj/item/electronics/advanced_airlock_controller( src.loc ) playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) buildstage = 0 @@ -471,14 +471,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, "You need five lengths of cable to wire the airlock controller!") + to_chat(user, span_warning("You need five lengths of cable to wire the airlock controller!")) return user.visible_message("[user.name] wires the airlock controller.", \ - "You start wiring the airlock controller...") + span_notice("You start wiring the airlock controller...")) if (do_after(user, 20, target = src)) if (cable.get_amount() >= 5 && buildstage == 1) cable.use(5) - to_chat(user, "You wire the airlock controller.") + to_chat(user, span_notice("You wire the airlock controller.")) wires.repair() aidisabled = 0 locked = FALSE @@ -491,7 +491,7 @@ if(0) if(istype(W, /obj/item/electronics/advanced_airlock_controller)) if(user.temporarilyRemoveItemFromInventory(W)) - to_chat(user, "You insert the circuit.") + to_chat(user, span_notice("You insert the circuit.")) buildstage = 1 update_icon() qdel(W) @@ -501,14 +501,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].", \ - "You adapt an airlock controller circuit and slot it into the assembly.") + user.visible_message(span_notice("[user] fabricates a circuit and places it into [src]."), \ + span_notice("You adapt an airlock controller circuit and slot it into the assembly.")) buildstage = 1 update_icon() return if(W.tool_behaviour == TOOL_WRENCH) - to_chat(user, "You detach \the [src] from the wall.") + to_chat(user, span_notice("You detach \the [src] from the wall.")) W.play_tool_sound(src) new /obj/item/wallframe/advanced_airlock_controller( user.loc ) qdel(src) @@ -674,7 +674,7 @@ if(!A.allowed(usr)) if(is_allowed) is_allowed = FALSE - to_chat(usr, "Access denied.") + to_chat(usr, span_danger("Access denied.")) if(A.density) spawn() A.do_animate("deny") @@ -771,15 +771,15 @@ /obj/machinery/advanced_airlock_controller/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 update_icon() - to_chat(user, "You [ locked ? "lock" : "unlock"] the airlock controller interface.") + to_chat(user, span_notice("You [ locked ? "lock" : "unlock"] the airlock controller interface.")) updateUsrDialog() else - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) return /obj/machinery/advanced_airlock_controller/power_change() @@ -790,7 +790,7 @@ if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - visible_message("Sparks fly out of [src]!", "You emag [src], disabling its safeties.") + visible_message(span_warning("Sparks fly out of [src]!"), span_notice("You emag [src], disabling its safeties.")) playsound(src, "sparks", 50, 1) /obj/machinery/advanced_airlock_controller/obj_break(damage_flag) diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index 03827ac882ef..1a7697f1d43e 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -59,12 +59,12 @@ GLOBAL_LIST_EMPTY(announcement_systems) if(P.tool_behaviour == TOOL_SCREWDRIVER) P.play_tool_sound(src) panel_open = !panel_open - to_chat(user, "You [panel_open ? "open" : "close"] the maintenance hatch of [src].") + to_chat(user, span_notice("You [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, "You reset [src]'s firmware.") + to_chat(user, span_notice("You reset [src]'s firmware.")) stat &= ~BROKEN update_icon() else @@ -121,7 +121,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) if(!usr.canUseTopic(src, !issilicon(usr))) return if(stat & BROKEN) - visible_message("[src] buzzes.", "You hear a faint buzz.") + visible_message(span_warning("[src] buzzes."), span_italics("You hear a faint buzz.")) playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1) return switch(action) @@ -154,7 +154,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 3d1de53b49d4..03f682bc68b9 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() @@ -79,18 +79,18 @@ return user.visible_message("[user] begins repairing [src].", \ - "You begin repairing [src]...", \ - "You hear welding.") + span_notice("You begin repairing [src]..."), \ + span_italics("You hear welding.")) if(O.use_tool(src, user, 40, volume=50)) if(!(stat & BROKEN)) return - to_chat(user, "You repair [src].") + to_chat(user, span_notice("You 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_notice("\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_notice("[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 12e434160274..73496e8308c2 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -140,11 +140,11 @@ if((autoqueue.len + 1) < queue_max_len) add_to_queue(request, multiplier) // Add item to queue for processing else - to_chat(usr, "The autolathe queue is full!") + to_chat(usr, span_warning("The autolathe queue is full!")) if("eject") request = stored_research.isDesignResearchedID(params["item_id"]) if(processing_queue) - to_chat(usr, "The autolathe queue is processing, please stop before ejecting material") + to_chat(usr, span_warning("The autolathe queue is processing, please stop before ejecting material")) if(!request) return var/multiplier = text2num(params["multiplier"]) diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index cb50e31bb1cb..c5b77c174b91 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -34,7 +34,7 @@ var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) if(D) D.adjust_money(value) - to_chat(user, "You deposit [I]. The Cargo Budget is now $[D.account_balance].") + to_chat(user, span_notice("You deposit [I]. The Cargo Budget is now $[D.account_balance].")) qdel(I) return return ..() diff --git a/code/game/machinery/bounty_board.dm b/code/game/machinery/bounty_board.dm index bbd745ef41d0..97490cae0d42 100644 --- a/code/game/machinery/bounty_board.dm +++ b/code/game/machinery/bounty_board.dm @@ -48,16 +48,16 @@ GLOBAL_LIST_EMPTY(request_list) to_chat(user, "There's no account assigned with this ID.") return TRUE if(I.tool_behaviour == TOOL_WRENCH) - to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") + to_chat(user, span_notice("You start [anchored ? "un" : ""]securing [name]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 30)) playsound(loc, 'sound/items/deconstruct.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, 3) new /obj/item/shard(loc) else - to_chat(user, "You [anchored ? "un" : ""]secure [name].") + to_chat(user, span_notice("You [anchored ? "un" : ""]secure [name].")) new /obj/item/wallframe/bounty_board(loc) qdel(src) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 6ac722f12192..f9c590ed5be3 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -63,34 +63,34 @@ default_deconstruction_screwdriver(user, "button-open", "[skin]",W) update_icon() else - to_chat(user, "Maintenance Access Denied") + to_chat(user, span_danger("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, "You add [W] to the button.") + to_chat(user, span_notice("You 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, "You add [W] to the button.") + to_chat(user, span_notice("You add [W] to the button.")) if(!device && !board && W.tool_behaviour == TOOL_WRENCH) - to_chat(user, "You start unsecuring the button frame...") + to_chat(user, span_notice("You start unsecuring the button frame...")) W.play_tool_sound(src) if(W.use_tool(src, user, 4 SECONDS)) - to_chat(user, "You unsecure the button frame.") + to_chat(user, span_notice("You unsecure the button frame.")) transfer_fingerprints_to(new /obj/item/wallframe/button(get_turf(src))) playsound(loc, 'sound/items/deconstruct.ogg', 50, 1) qdel(src) @@ -100,19 +100,19 @@ var/obj/item/multitool/P = W if(!id) // Generate New ID if none exists id = rand(1, 25565) // rare enough that ids should never conflict - to_chat(user, "No ID found. Generating New ID") + to_chat(user, span_notice("No ID found. Generating New ID")) P.buffer = id - to_chat(user, "You link the button to the [P].") + to_chat(user, span_notice("You link the button to the [P].")) setup_device() // Has to be done. It sets the signaller up else - to_chat(user, "No blast door controller found") + to_chat(user, span_warning("No blast door controller found")) if(board && W.tool_behaviour == TOOL_WIRECUTTER) - to_chat(user, "You start wiping the button's ID...") + to_chat(user, span_warning("You start wiping the button's ID...")) W.play_tool_sound(src) if(W.use_tool(src, user, 4 SECONDS)) // To make sure they're not doing this unintentionally - to_chat(user, "You wipe the button's ID.") + to_chat(user, span_notice("You wipe the button's ID.")) id = null update_icon() @@ -165,14 +165,14 @@ req_one_access = list() board = null update_icon() - to_chat(user, "You remove electronics from the button frame.") + to_chat(user, span_notice("You remove electronics from the button frame.")) else if(skin == "doorctrl") skin = "launcher" else skin = "doorctrl" - to_chat(user, "You change the button frame's front panel.") + to_chat(user, span_notice("You change the button frame's front panel.")) return if((stat & (NOPOWER|BROKEN))) @@ -182,7 +182,7 @@ return if(!allowed(user)) - to_chat(user, "Access Denied") + to_chat(user, span_danger("Access Denied")) flick("[skin]-denied", src) return diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 8807d488aff7..73c1881daaf5 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -121,11 +121,11 @@ . += "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." 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." @@ -186,7 +186,7 @@ if(..()) return TRUE panel_open = !panel_open - to_chat(user, "You screw the camera's panel [panel_open ? "open" : "closed"].") + to_chat(user, span_notice("You screw the camera's panel [panel_open ? "open" : "closed"].")) I.play_tool_sound(src) update_icon() return TRUE @@ -204,7 +204,7 @@ return FALSE setViewRange((view_range == initial(view_range)) ? short_range : initial(view_range)) - to_chat(user, "You [(view_range == initial(view_range)) ? "restore" : "mess up"] the camera's focus.") + to_chat(user, span_notice("You [(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) @@ -214,10 +214,10 @@ if(!I.tool_start_check(user, amount=0)) return TRUE - to_chat(user, "You start to weld [src]...") + to_chat(user, span_notice("You 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.", - "You 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("You unweld [src], leaving it as just a frame bolted to the wall")) deconstruct(TRUE) return TRUE @@ -230,19 +230,19 @@ if(!user.temporarilyRemoveItemFromInventory(I)) return upgradeXRay(FALSE, TRUE) - to_chat(user, "You attach [I] into [assembly]'s inner circuits.") + to_chat(user, span_notice("You attach [I] into [assembly]'s inner circuits.")) qdel(I) else - to_chat(user, "[src] already has that upgrade!") + to_chat(user, span_notice("[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, "You attach [I] into [assembly]'s inner circuits.") + to_chat(user, span_notice("You attach [I] into [assembly]'s inner circuits.")) else - to_chat(user, "[src] already has that upgrade!") + to_chat(user, span_notice("[src] already has that upgrade!")) return else if(istype(I, /obj/item/assembly/prox_sensor)) @@ -250,10 +250,10 @@ if(!user.temporarilyRemoveItemFromInventory(I)) return upgradeMotion() - to_chat(user, "You attach [I] into [assembly]'s inner circuits.") + to_chat(user, span_notice("You attach [I] into [assembly]'s inner circuits.")) qdel(I) else - to_chat(user, "[src] already has that upgrade!") + to_chat(user, span_notice("[src] already has that upgrade!")) return // OTHER @@ -272,7 +272,7 @@ P = I itemname = P.name info = P.notehtml - to_chat(U, "You hold \the [itemname] up to the camera...") + to_chat(U, span_notice("You hold \the [itemname] up to the camera...")) U.changeNext_move(CLICK_CD_MELEE) for(var/mob/O in GLOB.player_list) if(isAI(O)) @@ -291,14 +291,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 @@ -371,10 +371,10 @@ addtimer(CALLBACK(src, .proc/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/items/wirecutter.ogg', 100, TRUE) update_icon() //update Initialize() if you remove this. diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index a20facc7a5b7..8e813d0b7ca5 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -60,7 +60,7 @@ . += "You can remove the contained upgrades with a crowbar." . += "You can complete it with a screwdriver, or unwire it to start removal." if(STATE_FINISHED) - . += "You shouldn't be seeing this, tell a coder!" + . += span_boldwarning("You 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, "You weld [src] securely into place.") + to_chat(user, span_notice("You 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, "You add wires to [src].") + to_chat(user, span_notice("You add wires to [src].")) state = STATE_WIRED else - to_chat(user, "You need two lengths of cable to wire a camera!") + to_chat(user, span_warning("You 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, "You unweld [src] from its place.") + to_chat(user, span_notice("You 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, "You attach [W] into [src]'s inner circuits.") + to_chat(user, span_notice("You 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, "You attach [W] into [src]'s inner circuits.") + to_chat(user, span_notice("You 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, "You attach [W] into [src]'s inner circuits.") + to_chat(user, span_notice("You 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 droppable_parts if(!choice || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return - to_chat(user, "You remove [choice] from [src].") + to_chat(user, span_notice("You 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 @@ -244,7 +244,7 @@ new /obj/item/stack/cable_coil(drop_location(), 2) I.play_tool_sound(src) - to_chat(user, "You cut the wires from the circuits.") + to_chat(user, span_notice("You cut the wires from the circuits.")) state = STATE_WELDED return TRUE @@ -252,7 +252,7 @@ if(state != STATE_WRENCHED) return FALSE I.play_tool_sound(src) - to_chat(user, "You detach [src] from its place.") + to_chat(user, span_notice("You detach [src] from its place.")) new /obj/item/wallframe/camera(drop_location()) //drop upgrades if(xray_module) @@ -268,7 +268,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, "You start to weld [src]...") + to_chat(user, span_notice("You 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 af5093d6caf9..3481dc985f3a 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 d6e5a7f0436b..0b69224d12f1 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.")) var/cameraticks = 0 spawn(0) @@ -95,11 +95,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 cb5aa575b432..a20aa05f6520 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -34,26 +34,26 @@ /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].", "You insert a cell into [src].") + user.visible_message("[user] inserts a cell into [src].", span_notice("You insert a cell into [src].")) chargelevel = -1 update_icon() else @@ -90,7 +90,7 @@ user.put_in_hands(charging) charging.add_fingerprint(user) - user.visible_message("[user] removes [charging] from [src].", "You remove [charging] from [src].") + user.visible_message("[user] removes [charging] from [src].", span_notice("You remove [charging] from [src].")) removecell() @@ -99,7 +99,7 @@ return charging.forceMove(loc) - to_chat(user, "You telekinetically remove [charging] from [src].") + to_chat(user, span_notice("You telekinetically remove [charging] from [src].")) removecell() diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index e02d4e418f6f..7363a3e17614 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -115,7 +115,7 @@ GLOBAL_VAR_INIT(clones, 0) /obj/item/disk/data/attack_self(mob/user) read_only = !read_only - to_chat(user, "You flip the write-protect tab to [read_only ? "protected" : "unprotected"].") + to_chat(user, span_notice("You flip the write-protect tab to [read_only ? "protected" : "unprotected"].")) /obj/item/disk/data/examine(mob/user) . = ..() @@ -271,7 +271,7 @@ GLOBAL_VAR_INIT(clones, 0) 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), "Your 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("Your body is beginning to regenerate in a cloning pod. You will become conscious when it is complete.")) if(H) H.faction |= factions @@ -410,10 +410,10 @@ GLOBAL_VAR_INIT(clones, 0) 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) @@ -421,7 +421,7 @@ GLOBAL_VAR_INIT(clones, 0) log_combat(user, mob_occupant, "ejected", W, "from [src]") connected_message("Emergency Ejection") SPEAK("An emergency ejection of [clonemind.name] has occurred. Survival not guaranteed.") - to_chat(user, "You force an emergency ejection. ") + to_chat(user, span_notice("You force an emergency ejection. ")) go_out() else return ..() @@ -429,7 +429,7 @@ GLOBAL_VAR_INIT(clones, 0) /obj/machinery/clonepod/emag_act(mob/user) if(!occupant) return - to_chat(user, "You corrupt the genetic compiler.") + to_chat(user, span_warning("You corrupt the genetic compiler.")) malfunction() add_fingerprint(user) log_cloning("[key_name(user)] emagged [src] at [AREACOORD(src)], causing it to malfunction.") @@ -460,7 +460,7 @@ GLOBAL_VAR_INIT(clones, 0) unattached_flesh.Cut() mess = FALSE new /obj/effect/gibspawner/generic(get_turf(src), mob_occupant) - audible_message("You hear a splat.") + audible_message(span_italics("You hear a splat.")) icon_state = "pod_0" return diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index 60e5ad879ba0..e9ca42a8ddc6 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -106,7 +106,7 @@ if(..()) return TRUE if(circuit && !(flags_1&NODECONSTRUCT_1)) - to_chat(user, "You start to disconnect the monitor...") + to_chat(user, span_notice("You start to disconnect the monitor...")) if(I.use_tool(src, user, time_to_scewdrive, volume=50)) deconstruct(TRUE, user) return TRUE @@ -151,7 +151,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/effects/hit_on_shattered_glass.ogg', 70, 1) new /obj/item/shard(drop_location()) @@ -160,7 +160,7 @@ A.icon_state = "3" else if(user) - to_chat(user, "You disconnect the monitor.") + to_chat(user, span_notice("You 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 8fa0a34b6c38..8839e4d17ae2 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -14,9 +14,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 ..() @@ -53,7 +53,7 @@ switch(action) if("PRG_beginReconstruction") if(occupier?.health < 100) - 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/machines/terminal_prompt_confirm.ogg', 25, FALSE) restoring = TRUE occupier.notify_ghost_cloning("Your core files are being restored!", source = src) @@ -112,14 +112,14 @@ else //Uploading AI from terminal to card if(occupier && !restoring) - to_chat(occupier, "You have been downloaded to a mobile storage device. Still no remote access.") + to_chat(occupier, span_notice("You 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 (restoring) - 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.") diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 63c8d3bd8cdd..d94d0827de9c 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 ..() diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 3d1642fee1b8..0edf270b0356 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -101,7 +101,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( new prizeselect(src) var/atom/movable/the_prize = pick(contents) - visible_message("[src] dispenses [the_prize]!", "You hear a chime and a clunk.") + visible_message(span_notice("[src] dispenses [the_prize]!"), span_notice("You hear a chime and a clunk.")) the_prize.forceMove(get_turf(src)) @@ -134,13 +134,13 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( var/obj/item/stack/arcadeticket/T = O var/amount = T.get_amount() if(amount <2) - to_chat(user, "You need 2 tickets to claim a prize!") + to_chat(user, span_warning("You need 2 tickets to claim a prize!")) return prizevend(user) T.pay_tickets() T.update_icon() O = T - to_chat(user, "You turn in 2 tickets to the [src] and claim a prize!") + to_chat(user, span_notice("You turn in 2 tickets to the [src] and claim a prize!")) return // ** BATTLE ** // @@ -330,7 +330,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 @@ -467,17 +467,17 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( dat += "
You ran out of food and starved." if(obj_flags & EMAGGED) user.set_nutrition(0) //yeah you pretty hongry - to_chat(user, "Your 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_userdanger("Your 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 += "
You 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, "You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames.") + to_chat(user, span_userdanger("You 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_userdanger("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 @@ -545,21 +545,21 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( switch(event) if(ORION_TRAIL_RAIDERS) if(prob(50)) - to_chat(usr, "You 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_userdanger("You 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_userdanger("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/weapons/genhit2.ogg', 100, 1) if(ORION_TRAIL_ILLNESS) var/severity = rand(1,3) //pray to RNGesus. PRAY, PIGS if(severity == 1) - to_chat(M, "You suddenly feel slightly nauseated." ) + to_chat(M, span_userdanger("You suddenly feel slightly nauseated.") ) if(severity == 2) - to_chat(usr, "You suddenly feel extremely nauseated and hunch over until it passes.") + to_chat(usr, span_userdanger("You 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, your stomach's contents preparing for a spectacular exit.") + to_chat(M, span_warning("An overpowering wave of nausea consumes over you. You hunch over, your stomach's contents preparing for a spectacular exit.")) M.Stun(100) sleep(30) M.vomit(10, distance = 5) @@ -570,7 +570,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( M.take_bodypart_damage(25) playsound(loc, 'sound/weapons/genhit.ogg', 100, 1) else - to_chat(M, "A violent gale blows past you, and you barely manage to stay standing!") + to_chat(M, span_userdanger("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/effects/bang.ogg', 100, 1) @@ -590,7 +590,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( playsound(loc, 'sound/effects/bang.ogg', 50, 1) if(ORION_TRAIL_MALFUNCTION) playsound(loc, 'sound/effects/empulse.ogg', 50, 1) - 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) @@ -598,9 +598,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/machines/chime.ogg', 50, 1) @@ -1086,7 +1086,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, "You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode.") + to_chat(user, span_notice("You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode.")) name = "The Orion Trail: Realism Edition" desc = "Learn how our ancestors got to Orion, and try not to die in the process!" newgame() @@ -1112,9 +1112,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) @@ -1122,19 +1122,19 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( log_bomber(usr, "primed an explosive", src, "for detonation") - to_chat(user, "You flip the switch on the underside of [src].") + to_chat(user, span_warning("You 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/machines/defib_SaftyOn.ogg', 25, 1) 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/machines/buzz-sigh.ogg', 25, 1) sleep(3.6) - visible_message("[src] explodes!") + visible_message(span_userdanger("[src] explodes!")) explosion(loc, 2,4,8, flame_range = 16) qdel(src) @@ -1152,9 +1152,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, "You move your hand towards the machine, and begin to hesitate as a bloodied guillotine emerges from inside of it...") + to_chat(c_user, span_warning("You move your 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 your arm, and the machine sucks it in!") + to_chat(c_user, span_userdanger("The guillotine drops on your arm, and the machine sucks it in!")) playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) var/which_hand = BODY_ZONE_L_ARM if(!(c_user.active_hand_index % 2)) @@ -1166,7 +1166,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( for(var/i=1; i<=rand(3,5); i++) prizevend(user) else - to_chat(c_user, "You (wisely) decide against putting your hand in the machine.") + to_chat(c_user, span_notice("You (wisely) decide against putting your hand in the machine.")) #undef ORION_TRAIL_WINTURN #undef ORION_TRAIL_RAIDERS diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 0467515c7185..7cabc9b4c943 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -242,7 +242,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 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 7e7fec58e098..6c022460a1f9 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, "You start wrenching the frame into place...") + to_chat(user, span_notice("You start wrenching the frame into place...")) if(P.use_tool(src, user, 20, volume=50)) - to_chat(user, "You wrench the frame into place.") + to_chat(user, span_notice("You 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, "You start deconstructing the frame...") + to_chat(user, span_notice("You start deconstructing the frame...")) if(P.use_tool(src, user, 20, volume=50)) - to_chat(user, "You deconstruct the frame.") + to_chat(user, span_notice("You 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, "You start to unfasten the frame...") + to_chat(user, span_notice("You start to unfasten the frame...")) if(P.use_tool(src, user, 20, volume=50)) - to_chat(user, "You unfasten the frame.") + to_chat(user, span_notice("You unfasten the frame.")) setAnchored(FALSE) state = 0 return @@ -37,24 +37,24 @@ if(!user.transferItemToLoc(P, src)) return playsound(src, 'sound/items/deconstruct.ogg', 50, 1) - to_chat(user, "You place [P] inside the frame.") + to_chat(user, span_notice("You 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, "You screw [circuit] into place.") + to_chat(user, span_notice("You 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, "You remove [circuit].") + to_chat(user, span_notice("You 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, "You unfasten the circuit board.") + to_chat(user, span_notice("You 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, "You start adding cables to the frame...") + to_chat(user, span_notice("You start adding cables to the frame...")) if(P.use_tool(src, user, 20, volume=50, amount=5)) if(state != 2) return - to_chat(user, "You add cables to the frame.") + to_chat(user, span_notice("You 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, "You remove the cables.") + to_chat(user, span_notice("You 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/items/deconstruct.ogg', 50, 1) - to_chat(user, "You start to put in the glass panel...") + to_chat(user, span_notice("You start to put in the glass panel...")) if(P.use_tool(src, user, 20, amount=2)) if(state != 3) return - to_chat(user, "You put in the glass panel.") + to_chat(user, span_notice("You 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, "You remove the glass panel.") + to_chat(user, span_notice("You 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, "You connect the monitor.") + to_chat(user, span_notice("You 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, "You must unwrench [src] before rotating it!") + to_chat(usr, span_warning("You 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 cd36149b9092..153a0b7261f1 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -311,10 +311,10 @@ /obj/machinery/computer/camera_advanced/ratvar/can_use(mob/living/user) if(!is_servant_of_ratvar(user)) - to_chat(user, "[src]'s keys are in a language foreign to you, and you don't understand anything on its screen.") + to_chat(user, span_warning("[src]'s keys are in a language foreign to you, and you don't understand anything on its screen.")) return if(clockwork_ark_active()) - to_chat(user, "The Ark is active, and [src] has shut down.") + to_chat(user, span_warning("The Ark is active, and [src] has shut down.")) return . = ..() @@ -362,7 +362,7 @@ return do_sparks(5, TRUE, user) do_sparks(5, TRUE, T) - user.visible_message("[user]'s [target.name] flares!", "You begin warping to [AR]...") + user.visible_message(span_warning("[user]'s [target.name] flares!"), "You begin warping to [AR]...") button_icon_state = "warp_cancel" owner.update_action_buttons() var/warp_time = 50 @@ -379,7 +379,7 @@ return button_icon_state = "warp_down" owner.update_action_buttons() - T.visible_message("[user] warps in!") + T.visible_message(span_warning("[user] warps in!")) playsound(user, 'sound/magic/magic_missile.ogg', 50, TRUE) playsound(T, 'sound/magic/magic_missile.ogg', 50, TRUE) user.forceMove(get_turf(T)) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 4e7ec1263aac..4688a4607cf0 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -57,7 +57,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card/examine(mob/user) . = ..() if(modify) - . += "Alt-click to eject the ID card." + . += span_notice("Alt-click to eject the ID card.") /obj/machinery/computer/card/Initialize() . = ..() @@ -370,7 +370,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if(region_access) authenticated = 1 else if ((!( authenticated ) && issilicon(usr)) && (!modify)) - to_chat(usr, "You 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("You 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 @@ -407,11 +407,11 @@ 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_warning("No log exists for this job.")) updateUsrDialog() return if(!isnull(modify.registered_age) && modify.registered_age < jobdatum.minimal_character_age) - to_chat(usr, "This individual is too young to hold that Job, per Nanotrasen guidelines. Suggest aborting Job Assignment!") + to_chat(usr, span_warning("This individual is too young to hold that Job, per Nanotrasen guidelines. Suggest aborting Job Assignment!")) if(modify.registered_account) modify.registered_account.account_job = jobdatum // this is a terrible idea and people will grief but sure whatever @@ -425,7 +425,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) modify.assignment = "Unassigned" playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) else - to_chat(usr, "You are not authorized to demote this position.") + to_chat(usr, span_error("You are not authorized to demote this position.")) if ("reg") if (authenticated) var/t2 = modify @@ -435,7 +435,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) modify.registered_age = newAge playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) else if(!isnull(newAge)) - to_chat(usr, "Invalid age entered- age not updated.") + to_chat(usr, span_alert("Invalid age entered- age not updated.")) updateUsrDialog() var/newName = reject_bad_name(href_list["reg"]) @@ -443,7 +443,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) modify.registered_name = newName playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) else - to_chat(usr, "Invalid name entered.") + to_chat(usr, span_error("Invalid name entered.")) updateUsrDialog() return if ("mode") @@ -502,12 +502,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/machines/terminal_prompt_confirm.ogg', 50, 0) if ("print") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 5e3557c16a18..30bbbada1186 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, "You insert [W].") + to_chat(user, span_notice("You insert [W].")) playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) 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 8462041a373a..96b78b7f0521 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -75,7 +75,7 @@ obj_flags |= EMAGGED if (authenticated) authorize_access = get_all_accesses() - to_chat(user, "You scramble the communication routing circuits!") + to_chat(user, span_danger("You scramble the communication routing circuits!")) playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0) /obj/machinery/computer/communications/ui_act(action, list/params) @@ -125,11 +125,11 @@ var/obj/item/held_item = usr.get_active_held_item() var/obj/item/card/id/id_card = held_item?.GetID() if (!istype(id_card)) - to_chat(usr, "You need to swipe your ID!") + to_chat(usr, span_warning("You need to swipe your ID!")) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) return if (!(ACCESS_CAPTAIN in id_card.access)) - to_chat(usr, "You are not authorized to do this!") + to_chat(usr, span_warning("You are not authorized to do this!")) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) return @@ -141,13 +141,13 @@ set_security_level(new_sec_level) - to_chat(usr, "Authorization confirmed. Modifying security level.") + to_chat(usr, span_notice("Authorization confirmed. Modifying security level.")) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) // Only notify people if an actual change happened log_game("[key_name(usr)] has changed the security level to [params["newSecurityLevel"]] with [src] at [AREACOORD(usr)].") message_admins("[ADMIN_LOOKUPFLW(usr)] has changed the security level to [params["newSecurityLevel"]] with [src] at [AREACOORD(usr)].") - deadchat_broadcast(" has changed the security level to [params["newSecurityLevel"]] with [src] at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr) + deadchat_broadcast(" has changed the security level to [params["newSecurityLevel"]] with [src] at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) alert_level_tick += 1 if ("deleteMessage") @@ -177,27 +177,27 @@ var/emagged = obj_flags & EMAGGED if (emagged) message_syndicate(message, 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.")) else message_centcom(message, usr) - to_chat(usr, "Message transmitted to Central Command.") + to_chat(usr, span_notice("Message transmitted to Central Command.")) var/associates = emagged ? "the Syndicate": "CentCom" usr.log_talk(message, LOG_SAY, tag = "message to [associates]") - deadchat_broadcast(" has messaged [associates], \"[message]\" at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr) + deadchat_broadcast(" has messaged [associates], \"[message]\" at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) if ("purchaseShuttle") var/can_buy_shuttles_or_fail_reason = can_buy_shuttles(usr) if (can_buy_shuttles_or_fail_reason != TRUE) if (can_buy_shuttles_or_fail_reason != FALSE) - to_chat(usr, "[can_buy_shuttles_or_fail_reason]") + to_chat(usr, span_alert("[can_buy_shuttles_or_fail_reason]")) return var/list/shuttles = flatten_list(SSmapping.shuttle_templates) var/datum/map_template/shuttle/shuttle = locate(params["shuttle"]) in shuttles if (!istype(shuttle)) return if (!shuttle.prerequisites_met()) - to_chat(usr, "You have not met the requirements for purchasing this shuttle.") + to_chat(usr, span_alert("You have not met the requirements for purchasing this shuttle.")) return if(shuttle.emag_buy && !(obj_flags & EMAGGED)) return //return silently, only way this could happen is an attempted href exploit @@ -227,7 +227,7 @@ return var/reason = trim(html_encode(params["reason"]), MAX_MESSAGE_LEN) nuke_request(reason, 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 \"[reason]\"", 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", SSstation.announcer.get_rand_report_sound()) playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE) @@ -237,7 +237,7 @@ return if (!(obj_flags & EMAGGED)) return - to_chat(usr, "Backup routing data restored.") + to_chat(usr, span_notice("Backup routing data restored.")) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) obj_flags &= ~EMAGGED if ("sendToOtherSector") @@ -302,7 +302,7 @@ authenticated = TRUE authorize_access = get_all_accesses() authorize_name = "Unknown" - to_chat(usr, "[src] lets out a quiet alarm as its login is overridden.") + to_chat(usr, span_warning("[src] lets out a quiet alarm as its login is overridden.")) playsound(src, 'sound/machines/terminal_alert.ogg', 25, FALSE) else if (IsAdminGhost(usr)) authenticated = TRUE @@ -324,12 +324,12 @@ 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) else 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) /obj/machinery/computer/communications/ui_data(mob/user) var/list/data = list( @@ -483,17 +483,17 @@ /obj/machinery/computer/communications/proc/make_announcement(mob/living/user) var/is_ai = issilicon(user) if(!SScommunications.can_announce(user, is_ai)) - to_chat(user, "Intercomms recharging. Please stand by.") + to_chat(user, span_alert("Intercomms recharging. Please stand by.")) return var/input = stripped_multiline_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_ai, 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/make_voice_announcement(mob/living/user) if(!SScommunications.can_announce(user, FALSE)) - to_chat(user, "Intercomms recharging. Please stand by.") + to_chat(user, span_alert("Intercomms recharging. Please stand by.")) return var/datum/voice_announce/command/announce_datum = new(user.client, src) announce_datum.open() diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index bd93664bc2cc..8db8055080a7 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -147,7 +147,7 @@ if (istype(I, /obj/item/chromosome)) I.forceMove(src) stored_chromosomes += I - to_chat(user, "You insert [I].") + to_chat(user, span_notice("You insert [I].")) return // Insert data disk if console disk slot is empty @@ -159,7 +159,7 @@ diskette.forceMove(drop_location()) diskette = null diskette = I - to_chat(user, "You insert [I].") + to_chat(user, span_notice("You insert [I].")) return // Recycle non-activator used injectors @@ -167,15 +167,15 @@ 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) if(prob(60)) var/c_typepath = generate_chromosome() var/obj/item/chromosome/CM = new c_typepath (src) stored_chromosomes += CM - to_chat(user,"[capitalize(CM.name)] added to storage.") + to_chat(user,span_notice("[capitalize(CM.name)] added to storage.")) else - to_chat(user, "There was not enough genetic data to extract a viable chromosome.") + to_chat(user, span_notice("There was not enough genetic data to extract a viable chromosome.")) qdel(I) return @@ -385,7 +385,7 @@ scanner_occupant.dna.remove_all_mutations(list(MUT_NORMAL, MUT_EXTRA)) scanner_occupant.dna.generate_dna_blocks() scrambleready = world.time + SCRAMBLE_TIMEOUT - to_chat(usr,"DNA scrambled.") + to_chat(usr,span_notice("DNA scrambled.")) scanner_occupant.radiation += RADIATION_STRENGTH_MULTIPLIER*50/(connected_scanner.damage_coeff ** 2) return @@ -459,7 +459,7 @@ // GUARD CHECK - Is the occupant currently undergoing some form of // transformation? If so, we don't want to be pulsing genes. if(scanner_occupant.transformation_timer) - to_chat(usr,"Gene pulse failed: The scanner occupant undergoing a transformation.") + to_chat(usr,span_warning("Gene pulse failed: The scanner occupant undergoing a transformation.")) return // Resolve mutation's BYOND path from the alias @@ -656,7 +656,7 @@ var/datum/mutation/human/A = new HM.type() A.copy_mutation(HM) stored_mutations += A - to_chat(usr,"Mutation successfully stored.") + to_chat(usr,span_notice("Mutation successfully stored.")) return // Save a mutation to the diskette's storage buffer. @@ -674,13 +674,13 @@ // GUARD CHECK - Make sure the disk is not full if(LAZYLEN(diskette.mutations) >= diskette.max_mutations) - to_chat(usr,"Disk storage is full.") + to_chat(usr,span_warning("Disk storage is full.")) return // GUARD CHECK - Make sure the disk isn't set to read only, as we're // attempting to write to it if(diskette.read_only) - to_chat(usr,"Disk is set to read only mode.") + to_chat(usr,span_warning("Disk is set to read only mode.")) return var/search_flags = 0 @@ -706,7 +706,7 @@ var/datum/mutation/human/A = new HM.type() A.copy_mutation(HM) diskette.mutations += A - to_chat(usr,"Mutation successfully stored to disk.") + to_chat(usr,span_notice("Mutation successfully stored to disk.")) return // Completely removes a MUT_EXTRA mutation or mutation with corrupt gene @@ -759,7 +759,7 @@ // GUARD CHECK - Make sure the disk isn't set to read only, as we're // attempting to write to it (via deletion) if(diskette.read_only) - to_chat(usr,"Disk is set to read only mode.") + to_chat(usr,span_warning("Disk is set to read only mode.")) return var/bref = params["mutref"] @@ -820,7 +820,7 @@ // If we got a new type, add it to our storage stored_mutations += new result_path() - to_chat(usr, "Success! New mutation has been added to console storage.") + to_chat(usr, span_boldnotice("Success! New mutation has been added to console storage.")) // If it's already discovered, end here. Otherwise, add it to the list of // discovered mutations. @@ -846,13 +846,13 @@ // GUARD CHECK - Make sure the disk is not full. if(LAZYLEN(diskette.mutations) >= diskette.max_mutations) - to_chat(usr,"Disk storage is full.") + to_chat(usr,span_warning("Disk storage is full.")) return // GUARD CHECK - Make sure the disk isn't set to read only, as we're // attempting to write to it if(diskette.read_only) - to_chat(usr,"Disk is set to read only mode.") + to_chat(usr,span_warning("Disk is set to read only mode.")) return // GUARD CHECK - We're running a research-type operation. If, for some @@ -882,7 +882,7 @@ // If we got a new type, add it to our storage diskette.mutations += new result_path() - to_chat(usr, "Success! New mutation has been added to the disk.") + to_chat(usr, span_boldnotice("Success! New mutation has been added to the disk.")) // If it's already discovered, end here. Otherwise, add it to the list of // discovered mutations @@ -926,7 +926,7 @@ // GUARD CHECK - Make sure the disk isn't set to read only, as we're // attempting to write to it if(diskette.read_only) - to_chat(usr,"Disk is set to read only mode.") + to_chat(usr,span_warning("Disk is set to read only mode.")) return // Convert the index to a number and clamp within the array range @@ -975,7 +975,7 @@ // GUARD CHECK - Make sure the disk isn't set to read only, as we're // attempting to write (via deletion) to it if(diskette.read_only) - to_chat(usr,"Disk is set to read only mode.") + to_chat(usr,span_warning("Disk is set to read only mode.")) return diskette.genetic_makeup_buffer.Cut() @@ -1070,7 +1070,7 @@ // However, if this is the case, we can't make a complete injector and // this catches that edge case if(!buffer_slot["UI"]) - to_chat(usr,"Genetic data corrupted, unable to create injector.") + to_chat(usr,span_warning("Genetic data corrupted, unable to create injector.")) return I = new /obj/item/dnainjector/timed(loc) @@ -1085,7 +1085,7 @@ // However, if this is the case, we can't make a complete injector and // this catches that edge case if(!buffer_slot["name"] || !buffer_slot["UE"] || !buffer_slot["blood_type"]) - to_chat(usr,"Genetic data corrupted, unable to create injector.") + to_chat(usr,span_warning("Genetic data corrupted, unable to create injector.")) return I = new /obj/item/dnainjector/timed(loc) @@ -1100,7 +1100,7 @@ // However, if this is the case, we can't make a complete injector and // this catches that edge case if(!buffer_slot["UI"] || !buffer_slot["name"] || !buffer_slot["UE"] || !buffer_slot["blood_type"]) - to_chat(usr,"Genetic data corrupted, unable to create injector.") + to_chat(usr,span_warning("Genetic data corrupted, unable to create injector.")) return I = new /obj/item/dnainjector/timed(loc) @@ -1315,7 +1315,7 @@ // GUARD CHECK - Make sure we limit the number of mutations appropriately if(LAZYLEN(injector_selection[adv_inj]) >= max_injector_mutations) - to_chat(usr,"Advanced injector mutation storage is full.") + to_chat(usr,span_warning("Advanced injector mutation storage is full.")) return var/mut_source = params["source"] @@ -1352,7 +1352,7 @@ // If this would take us over the max instability, we inform the user. if(instability_total > max_injector_instability) - to_chat(usr,"Extra mutation would make the advanced injector too instable.") + to_chat(usr,span_warning("Extra mutation would make the advanced injector too instable.")) return // If we've got here, all our checks are passed and we can successfully @@ -1360,7 +1360,7 @@ var/datum/mutation/human/A = new HM.type() A.copy_mutation(HM) injector_selection[adv_inj] += A - to_chat(usr,"Mutation successfully added to advanced injector.") + to_chat(usr,span_notice("Mutation successfully added to advanced injector.")) return // Deletes a mutation from an advanced injector @@ -1420,7 +1420,7 @@ // However, if this is the case, we can't make a complete injector and // this catches that edge case if(!buffer_slot["UI"]) - to_chat(usr,"Genetic data corrupted, unable to apply genetic data.") + to_chat(usr,span_warning("Genetic data corrupted, unable to apply genetic data.")) return FALSE scanner_occupant.dna.uni_identity = buffer_slot["UI"] scanner_occupant.updateappearance(mutations_overlay_update=1) @@ -1432,7 +1432,7 @@ // However, if this is the case, we can't make a complete injector and // this catches that edge case if(!buffer_slot["name"] || !buffer_slot["UE"] || !buffer_slot["blood_type"]) - to_chat(usr,"Genetic data corrupted, unable to apply genetic data.") + to_chat(usr,span_warning("Genetic data corrupted, unable to apply genetic data.")) return FALSE scanner_occupant.real_name = buffer_slot["name"] scanner_occupant.name = buffer_slot["name"] @@ -1446,7 +1446,7 @@ // However, if this is the case, we can't make a complete injector and // this catches that edge case if(!buffer_slot["UI"] || !buffer_slot["name"] || !buffer_slot["UE"] || !buffer_slot["blood_type"]) - to_chat(usr,"Genetic data corrupted, unable to apply genetic data.") + to_chat(usr,span_warning("Genetic data corrupted, unable to apply genetic data.")) return FALSE scanner_occupant.dna.uni_identity = buffer_slot["UI"] scanner_occupant.updateappearance(mutations_overlay_update=1) @@ -1551,7 +1551,7 @@ var/type = delayed_action["type"] var/buffer_slot = delayed_action["buffer_slot"] if(apply_genetic_makeup(type, buffer_slot)) - to_chat(connected_scanner.occupant, "[src] activates!") + to_chat(connected_scanner.occupant, span_notice("[src] activates!")) delayed_action = null /** diff --git a/code/game/machinery/computer/gulag_teleporter.dm b/code/game/machinery/computer/gulag_teleporter.dm index 1d62e3f219c3..2a843719e91c 100644 --- a/code/game/machinery/computer/gulag_teleporter.dm +++ b/code/game/machinery/computer/gulag_teleporter.dm @@ -30,10 +30,10 @@ if (!user.transferItemToLoc(W,src)) return id = W - to_chat(user, "You insert [W].") + to_chat(user, span_notice("You insert [W].")) return else - to_chat(user, "There's an ID inserted already.") + to_chat(user, span_notice("There's an ID inserted already.")) return ..() /obj/machinery/computer/gulag_teleporter_computer/ui_interact(mob/user, datum/tgui/ui) @@ -82,7 +82,7 @@ if(..()) return if(!allowed(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, span_warning("Access denied.")) return switch(action) if("scan_teleporter") @@ -152,7 +152,7 @@ playsound(src, 'sound/weapons/emitter.ogg', 50, 1) 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, 1) if(teleporter.locked) diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm index a9b8224cf9f1..aabfe3dbac16 100644 --- a/code/game/machinery/computer/launchpad_control.dm +++ b/code/game/machinery/computer/launchpad_control.dm @@ -14,7 +14,7 @@ . = ..() /obj/machinery/computer/launchpad/attack_paw(mob/user) - to_chat(user, "You are too primitive to use this computer!") + to_chat(user, span_warning("You are too primitive to use this computer!")) return /obj/machinery/computer/launchpad/attackby(obj/item/W, mob/user, params) @@ -26,9 +26,9 @@ if(LAZYLEN(launchpads) < maximum_pads) launchpads |= M.buffer M.buffer = null - to_chat(user, "You upload the data from the [W.name]'s buffer.") + to_chat(user, span_notice("You 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 ..() @@ -40,10 +40,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 2b56af897770..822000e0c12a 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -27,7 +27,7 @@ if(stat & (NOPOWER|BROKEN|MAINT)) return if(!current) - to_chat(user, "You haven't selected anything to transmit laws to!") + to_chat(user, span_caution("You 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.") @@ -56,7 +56,7 @@ current = select_active_ai(user) if (!current) - to_chat(user, "No active AIs detected!") + to_chat(user, span_caution("No active AIs detected!")) else to_chat(user, "[current.name] selected for law changes.") @@ -77,7 +77,7 @@ current = select_active_free_borg(user) if(!current) - to_chat(user, "No active unslaved cyborgs detected!") + to_chat(user, span_caution("No active unslaved cyborgs detected!")) else to_chat(user, "[current.name] selected for law changes.") diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 868e803f8f06..325ac0c799a1 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -29,7 +29,7 @@ if(!user.transferItemToLoc(O, src)) return scan = O - to_chat(user, "You insert [O].") + to_chat(user, span_notice("You insert [O].")) else return ..() diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 021c39ea58a9..42ce0d6da944 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.dm b/code/game/machinery/computer/prisoner.dm index a02727913ef7..b151b37604cc 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -93,7 +93,7 @@ return inserted_id = I else - to_chat(usr, "No valid ID.") + to_chat(usr, span_danger("No valid ID.")) else if(inserted_id) switch(href_list["id"]) if("eject") @@ -134,7 +134,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, "You hear a voice in your head saying: '[warning]'") + to_chat(R, span_italics("You hear a voice in your 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 700092ed3e1f..9c0955647c13 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -82,25 +82,25 @@ var/mob/living/silicon/robot/R = locate(params["ref"]) in GLOB.silicon_mobs if(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)]!") + message_admins(span_notice("[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(R, R.client)] at [ADMIN_VERBOSEJMP(T)]!")) log_game("\[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.")) if("stopbot") if(allowed(usr)) var/mob/living/silicon/robot/R = locate(params["ref"]) in GLOB.silicon_mobs if(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 ? "Your lockdown has been lifted!" : "You have been locked down!"]") + to_chat(R, !R.lockcharge ? span_notice("Your lockdown has been lifted!") : span_alert("You 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.")) if("magbot") var/mob/living/silicon/S = usr if((istype(S) && S.hack_software) || IsAdminGhost(usr)) @@ -113,7 +113,7 @@ if(allowed(usr)) var/mob/living/simple_animal/drone/D = locate(params["ref"]) 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)]!") @@ -121,5 +121,5 @@ 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() \ No newline at end of file diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index d934e074f40e..4d9d55645511 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -656,7 +656,7 @@ var/name = stripped_input(usr, "Please input citation crime:", "Security Records", "") var/fine = FLOOR(input(usr, "Please input citation fine:", "Security Records", 50) as num, 1) if(!fine || 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) if(!valid_record_change(usr, name, null, active_security_record)) diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index fbfd4c2113b8..a5a7d91f8398 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -146,7 +146,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 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 b761ce8dbe63..137d7a6e7669 100644 --- a/code/game/machinery/computer/warrant.dm +++ b/code/game/machinery/computer/warrant.dm @@ -117,17 +117,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, "You have paid [pay] credit\s towards your fine") + to_chat(M, span_notice("You 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, 0) 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 7d7092be5bfe..7738828acd45 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -77,57 +77,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, "You start to add cables to the frame...") + to_chat(user, span_notice("You start to add cables to the frame...")) if(P.use_tool(src, user, 20, volume=50, amount=5)) - to_chat(user, "You add cables to the frame.") + to_chat(user, span_notice("You 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.", \ - "You start to disassemble the frame...", "You hear banging and clanking.") + user.visible_message(span_warning("[user] disassembles the frame."), \ + span_notice("You start to disassemble the frame..."), "You hear banging and clanking.") if(P.use_tool(src, user, 40, volume=50)) if(state == 1) - to_chat(user, "You disassemble the frame.") + to_chat(user, span_notice("You 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, "You start [anchored ? "un" : ""]securing [name]...") + to_chat(user, span_notice("You start [anchored ? "un" : ""]securing [name]...")) if(P.use_tool(src, user, 40, volume=75)) if(state == 1) - to_chat(user, "You [anchored ? "un" : ""]secure [name].") + to_chat(user, span_notice("You [anchored ? "un" : ""]secure [name].")) setAnchored(!anchored) return if(2) if(P.tool_behaviour == TOOL_WRENCH) - to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") + to_chat(user, span_notice("You start [anchored ? "un" : ""]securing [name]...")) if(P.use_tool(src, user, 40, volume=75)) - to_chat(user, "You [anchored ? "un" : ""]secure [name].") + to_chat(user, span_notice("You [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/items/deconstruct.ogg', 50, 1) - to_chat(user, "You add the circuit board to the frame.") + to_chat(user, span_notice("You add the circuit board to the frame.")) circuit = B icon_state = "box_2" state = 3 @@ -137,12 +137,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, "You remove the cables.") + to_chat(user, span_notice("You remove the cables.")) state = 1 icon_state = "box_0" new /obj/item/stack/cable_coil(drop_location(), 5) @@ -156,9 +156,9 @@ components.Remove(circuit) circuit = null if(components.len == 0) - to_chat(user, "You remove the circuit board.") + to_chat(user, span_notice("You remove the circuit board.")) else - to_chat(user, "You remove the circuit board and other components.") + to_chat(user, span_notice("You remove the circuit board and other components.")) for(var/atom/movable/AM in components) AM.forceMove(drop_location()) desc = initial(desc) @@ -168,9 +168,9 @@ return if(P.tool_behaviour == TOOL_WRENCH && !circuit.needs_anchored) - to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") + to_chat(user, span_notice("You start [anchored ? "un" : ""]securing [name]...")) if(P.use_tool(src, user, 40, volume=75)) - to_chat(user, "You [anchored ? "un" : ""]secure [name].") + to_chat(user, span_notice("You [anchored ? "un" : ""]secure [name].")) setAnchored(!anchored) return @@ -235,7 +235,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 @@ -257,15 +257,15 @@ NS.add(used_amt) req_components[I] -= used_amt - to_chat(user, "You add [P] to [src].") + to_chat(user, span_notice("You add [P] to [src].")) return if(!user.transferItemToLoc(P, src)) break - to_chat(user, "You add [P] to [src].") + to_chat(user, span_notice("You add [P] to [src].")) components += P req_components[I]-- return 1 - to_chat(user, "You cannot add that to the machine!") + to_chat(user, span_warning("You cannot add that to the machine!")) return 0 if(user.a_intent == INTENT_HARM) return ..() diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 2366b90a15c9..7381031bf09b 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -114,14 +114,14 @@ GLOBAL_LIST_INIT(typecache_cryoitems, typecacheof(list( else if(href_list["item"]) if(!allowed(user)) - to_chat(user, "Access Denied.") + to_chat(user, span_warning("Access Denied.")) return if(!allow_items) return if(frozen_items.len == 0) - to_chat(user, "There is nothing to recover from storage.") + to_chat(user, span_notice("There is nothing to recover from storage.")) return var/obj/item/I = input(user, "Please choose which object to retrieve.","Object recovery",null) as null|anything in frozen_items @@ -129,24 +129,24 @@ GLOBAL_LIST_INIT(typecache_cryoitems, typecacheof(list( return if(!(I in frozen_items)) - to_chat(user, "\The [I] is no longer in storage.") + to_chat(user, span_notice("\The [I] is no longer in storage.")) return - visible_message("The console beeps happily as it disgorges \the [I].") + visible_message(span_notice("The console beeps happily as it disgorges \the [I].")) I.forceMove(drop_location()) frozen_items -= I else if(href_list["allitems"]) if(!allowed(user)) - to_chat(user, "Access Denied.") + to_chat(user, span_warning("Access Denied.")) return if(!allow_items) return if(frozen_items.len == 0) - to_chat(user, "There is nothing to recover from storage.") + to_chat(user, span_notice("There is nothing to recover from storage.")) return - visible_message("The console beeps happily as it disgorges the desired objects.") + visible_message(span_notice("The console beeps happily as it disgorges the desired objects.")) for(var/obj/item/I in frozen_items) I.forceMove(drop_location()) @@ -219,7 +219,7 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) icon_state = "cryopod" var/mob/living/mob_occupant = occupant if(mob_occupant && mob_occupant.stat != DEAD) - to_chat(occupant, "You feel cool air surround you. You go numb as your senses turn inward.") + to_chat(occupant, span_boldnotice("You feel cool air surround you. You go numb as your senses turn inward.")) if(!occupant) //Check they still exist return if(mob_occupant.client)//if they're logged in @@ -239,8 +239,8 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) name = initial(name) /obj/machinery/cryopod/container_resist(mob/living/user) - visible_message("[occupant] emerges from [src]!", - "You climb out of [src]!") + visible_message(span_notice("[occupant] emerges from [src]!"), + span_notice("You climb out of [src]!")) open_machine() /obj/machinery/cryopod/relaymove(mob/user) @@ -323,7 +323,7 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) if(GLOB.announcement_systems.len) var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems) announcer.announce("CRYOSTORAGE", mob_occupant.real_name, announce_rank, list()) - visible_message("\The [src] hums and hisses as it moves [mob_occupant.real_name] into storage.") + visible_message(span_notice("\The [src] hums and hisses as it moves [mob_occupant.real_name] into storage.")) for(var/obj/item/W in mob_occupant.GetAllContents()) if(QDELETED(W)) @@ -362,26 +362,26 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) return if(!GLOB.cryopods_enabled) - to_chat(user, "[src] is currently disabled. It will be enabled in [round(((30 MINUTES) - world.time) / (1 MINUTES))] minutes") + to_chat(user, span_boldnotice("[src] is currently disabled. It will be enabled in [round(((30 MINUTES) - world.time) / (1 MINUTES))] minutes")) return if(occupant) - to_chat(user, "The cryo pod is already occupied!") + to_chat(user, span_boldnotice("The cryo pod is already occupied!")) return if(target.stat == DEAD) - to_chat(user, "Dead people can not be put into cryo.") + to_chat(user, span_notice("Dead people can not be put into cryo.")) return if(findtext(target.ckey, "@") || !target.mind) - to_chat(user, "This person cannot be put in cryogenic storage!") + to_chat(user, span_notice("This person cannot be put in cryogenic storage!")) return if(target.client && user != target) if(iscyborg(target)) - to_chat(user, "You can't put [target] into [src]. They're online.") + to_chat(user, span_danger("You can't put [target] into [src]. They're online.")) else - to_chat(user, "You can't put [target] into [src]. They're conscious.") + to_chat(user, span_danger("You can't put [target] into [src]. They're conscious.")) return else if(target.client) if(alert(target,"Would you like to enter cryosleep?",,"Yes","No") == "No") @@ -407,7 +407,7 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) //rerun the checks in case of shenanigans if(occupant) - to_chat(user, "\The [src] is in use.") + to_chat(user, span_boldnotice("\The [src] is in use.")) return if(target == user) @@ -415,8 +415,8 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) else visible_message("[user] starts putting [target] into the cryo pod.") close_machine(target) - to_chat(target, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") + to_chat(target, span_boldnotice("If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.")) name = "[name] ([occupant.name])" - log_admin("[key_name(target)] entered a stasis pod.") + log_admin(span_notice("[key_name(target)] entered a stasis pod.")) message_admins("[key_name_admin(target)] entered a stasis pod. (JMP)") add_fingerprint(target) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 563115376eb6..fe097fe5f34c 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -69,10 +69,10 @@ if(!active && !(flags_1 & NODECONSTRUCT_1)) if(O.tool_behaviour == TOOL_WRENCH) if(!anchored && !isinspace()) - to_chat(user,"You secure [src] to the floor.") + to_chat(user,span_notice("You secure [src] to the floor.")) setAnchored(TRUE) else if(anchored) - to_chat(user,"You unsecure and disconnect [src].") + to_chat(user,span_notice("You unsecure and disconnect [src].")) setAnchored(FALSE) playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE) return @@ -86,14 +86,14 @@ /obj/machinery/jukebox/ui_status(mob/user) 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 UI_CLOSE if(!allowed(user) && !isobserver(user)) - to_chat(user,"Error: Access Denied.") + to_chat(user,span_warning("Error: Access Denied.")) user.playsound_local(src, 'sound/misc/compiler-failure.ogg', 25, TRUE) return UI_CLOSE if(!songs.len && !isobserver(user)) - 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/misc/compiler-failure.ogg', 25, TRUE) return UI_CLOSE return ..() @@ -134,7 +134,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/misc/compiler-failure.ogg', 50, TRUE) return activate_music() @@ -145,7 +145,7 @@ return TRUE if("select_track") 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() for(var/datum/track/S in songs) diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index 46cec39392a6..4bc87338e217 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -28,9 +28,9 @@ if(defib) . += "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()) @@ -57,23 +57,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]!", \ - "You press [I] into the mount, and it clicks into place.") + user.visible_message(span_notice("[user] hooks up [I] to [src]!"), \ + span_notice("You press [I] into the mount, and it clicks into place.")) playsound(src, 'sound/machines/click.ogg', 50, TRUE) defib = I update_icon() @@ -85,30 +85,30 @@ 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, "You can't engage the clamps on a defibrillator that isn't there.") + to_chat(user, span_warning("You 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...", \ - "You begin overriding the clamps on [src]...") + user.visible_message(span_notice("[user] presses [multitool] into [src]'s ID slot..."), \ + span_notice("You begin overriding the clamps on [src]...")) playsound(src, 'sound/machines/click.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.", \ - "You override the locking clamps on [src]!") + user.visible_message(span_notice("[user] pulses [multitool], and [src]'s clamps slide up."), \ + span_notice("You override the locking clamps on [src]!")) playsound(src, 'sound/machines/locktoggle.ogg', 50, TRUE) clamps_locked = FALSE update_icon() @@ -118,16 +118,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, "You try to tug out [defib], but the mount's clamps are locked tight!") + to_chat(user, span_warning("You try to tug out [defib], but the mount's clamps are locked tight!")) return if(!user.put_in_hands(defib)) - to_chat(user, "You need a free hand!") + to_chat(user, span_warning("You need a free hand!")) return - user.visible_message("[user] unhooks [defib] from [src].", \ - "You slide out [defib] from [src] and unhook the charging cables.") + user.visible_message(span_notice("[user] unhooks [defib] from [src]."), \ + span_notice("You slide out [defib] from [src] and unhook the charging cables.")) playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE) defib = null update_icon() diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 60d35634c0e3..e04d296ca5d5 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -32,7 +32,7 @@ if(!I.tool_start_check(user, amount=0)) return - to_chat(user, "You begin repairing [src]...") + to_chat(user, span_notice("You 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, "You need at least five wooden planks to make a wall!") + to_chat(user, span_warning("You need at least five wooden planks to make a wall!")) return else - to_chat(user, "You start adding [I] to [src]...") + to_chat(user, span_notice("You start adding [I] to [src]...")) if(do_after(user, 50, target=src)) W.use(5) new /turf/closed/wall/mineral/wood/nonmetal(get_turf(src)) @@ -79,9 +79,9 @@ return else if(I.tool_behaviour == TOOL_CROWBAR && user.a_intent != INTENT_HARM) user.visible_message("[user.name] starts prying [src.name] apart.", \ - "You start prying the barricade apart") + span_notice("You start prying the barricade apart")) if(I.use_tool(src, user, 190, volume=50)) - to_chat(user, "You disassemble the barricade.") + to_chat(user, span_notice("You disassemble the barricade.")) new /obj/item/stack/sheet/mineral/wood(user.loc, 5) qdel(src) else @@ -99,9 +99,9 @@ /obj/structure/barricade/wooden/crude/attackby(obj/item/I, mob/user) // Make it so you cant turn crude planks into walls if(I.tool_behaviour == TOOL_CROWBAR && user.a_intent != INTENT_HARM) user.visible_message("[user.name] starts prying [src.name] apart.", \ - "You start prying the barricade apart") + span_notice("You start prying the barricade apart")) if(I.use_tool(src, user, 190, volume=50)) - to_chat(user, "You disassemble the barricade.") + to_chat(user, span_notice("You disassemble the barricade.")) new /obj/item/stack/sheet/mineral/wood(user.loc, 5) qdel(src) @@ -151,7 +151,7 @@ density = TRUE anchored = TRUE if(deploy_message) - visible_message("[src] deploys!") + visible_message(span_warning("[src] deploys!")) /obj/item/grenade/barrier @@ -165,7 +165,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)) diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm index f6e4e8cdc668..a66dccc96c8f 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, "You take out [I] from [src].") + to_chat(user, span_notice("You take out [I] from [src].")) playsound(src, 'sound/items/pshoom.ogg', 50, TRUE) flick("synthesizer_beam", src) @@ -50,7 +50,7 @@ if(is_type_in_list(I, collectable_items) && user.a_intent != INTENT_HARM) if(!user.transferItemToLoc(I, src)) return - to_chat(user, "You put [I] in [src], and it's beamed into energy!") + to_chat(user, span_notice("You put [I] in [src], and it's beamed into energy!")) playsound(src, 'sound/items/pshoom.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/items/pshoom.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, "You send a disposal transmission signal to [src].") + to_chat(user, span_notice("You 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/machines/buzz-sigh.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/items/pshoom.ogg', 50, TRUE) playsound(bin, 'sound/items/pshoom.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 bec9d3e4ada2..72b16c05f8f5 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -56,7 +56,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) @@ -64,7 +64,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() @@ -75,15 +75,15 @@ return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user.visible_message("You see [user] kicking against the door of [src]!", \ - "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "You hear a metallic creaking from [src].") + user.visible_message(span_notice("You see [user] kicking against the door of [src]!"), \ + span_notice("You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_italics("You 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]!", \ - "You successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("You successfully break out of [src]!")) open_machine() /obj/machinery/dna_scannernew/proc/locate_computer(type_) @@ -121,7 +121,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 e17c2afe8343..3cdf2838ec6e 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -375,7 +375,7 @@ return locked = TRUE playsound(src,boltDown,30,0,3) - audible_message("You hear a click from the bottom of the door.", null, 1) + audible_message(span_italics("You hear a click from the bottom of the door."), null, 1) update_icon() /obj/machinery/door/airlock/unlock() @@ -386,7 +386,7 @@ return locked = FALSE playsound(src,boltUp,30,0,3) - audible_message("You hear a click from the bottom of the door.", null, 1) + audible_message(span_italics("You hear a click from the bottom of the door."), null, 1) update_icon() /obj/machinery/door/airlock/narsie_act() @@ -771,11 +771,11 @@ /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(charge && !panel_open && in_range(user, src)) - . += "The maintenance panel seems haphazardly fastened." + . += span_warning("The maintenance panel seems haphazardly fastened.") if(charge && panel_open) - . += "Something is wired up to the airlock's electronics!" + . += span_warning("Something is wired up to the airlock's electronics!") if(note) if(!in_range(user, src)) . += "There's a [note.name] pinned to the front. You can't read it from here." @@ -806,10 +806,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)) @@ -817,12 +817,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) @@ -900,16 +900,16 @@ if((HAS_TRAIT(H, TRAIT_DUMB)) && Adjacent(user)) playsound(src, 'sound/effects/bang.ogg', 25, TRUE) if(!istype(H.head, /obj/item/clothing/head/helmet)) - H.visible_message("[user] headbutts the airlock.", \ - "You headbutt the airlock!") + H.visible_message(span_danger("[user] headbutts the airlock."), \ + span_userdanger("You 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 ..() @@ -960,28 +960,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, "You need at least 2 metal sheets to reinforce [src].") + to_chat(user, span_warning("You need at least 2 metal sheets to reinforce [src].")) return - to_chat(user, "You start reinforcing [src].") + to_chat(user, span_notice("You 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.", - "You reinforce \the [src] with metal.") + user.visible_message(span_notice("[user] reinforces \the [src] with metal."), + span_notice("You 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, "You need at least 2 plasteel sheets to reinforce [src].") + to_chat(user, span_warning("You need at least 2 plasteel sheets to reinforce [src].")) return - to_chat(user, "You start reinforcing [src].") + to_chat(user, span_notice("You 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.", - "You reinforce \the [src] with plasteel.") + user.visible_message(span_notice("[user] reinforces \the [src] with plasteel."), + span_notice("You reinforce \the [src] with plasteel.")) security_level = AIRLOCK_SECURITY_PLASTEEL modify_max_integrity(normal_integrity * AIRLOCK_INTEGRITY_MULTIPLIER) damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R @@ -991,13 +991,13 @@ if(C.tool_behaviour == TOOL_WELDER) if(!C.tool_start_check(user, amount=2)) return - to_chat(user, "You begin cutting the panel's shielding...") + to_chat(user, span_notice("You 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.", - "You cut through \the [src]'s shielding.", - "You hear welding.") + user.visible_message(span_notice("[user] cuts through \the [src]'s shielding."), + span_notice("You cut through \the [src]'s shielding."), + span_italics("You hear welding.")) security_level = AIRLOCK_SECURITY_NONE spawn_atom_to_turf(/obj/item/stack/sheet/metal, user.loc, 2) update_icon() @@ -1005,14 +1005,14 @@ if(AIRLOCK_SECURITY_PLASTEEL_I_S) if(C.tool_behaviour == TOOL_CROWBAR) var/obj/item/crowbar/W = C - to_chat(user, "You start removing the inner layer of shielding...") + to_chat(user, span_notice("You 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.", - "You remove \the [src]'s inner shielding.") + user.visible_message(span_notice("[user] remove \the [src]'s shielding."), + span_notice("You remove \the [src]'s inner shielding.")) security_level = AIRLOCK_SECURITY_NONE modify_max_integrity(normal_integrity) damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_N @@ -1023,25 +1023,25 @@ if(C.tool_behaviour == TOOL_WELDER) if(!C.tool_start_check(user, amount=2)) return - to_chat(user, "You begin cutting the inner layer of shielding...") + to_chat(user, span_notice("You 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.", - "You cut through \the [src]'s shielding.", - "You hear welding.") + user.visible_message(span_notice("[user] cuts through \the [src]'s shielding."), + span_notice("You cut through \the [src]'s shielding."), + span_italics("You 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, "You start removing outer layer of shielding...") + to_chat(user, span_notice("You 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.", - "You remove \the [src]'s shielding.") + user.visible_message(span_notice("[user] remove \the [src]'s shielding."), + span_notice("You remove \the [src]'s shielding.")) security_level = AIRLOCK_SECURITY_PLASTEEL_I spawn_atom_to_turf(/obj/item/stack/sheet/plasteel, user.loc, 1) return @@ -1049,37 +1049,37 @@ if(C.tool_behaviour == TOOL_WELDER) if(!C.tool_start_check(user, amount=2)) return - to_chat(user, "You begin cutting the outer layer of shielding...") + to_chat(user, span_notice("You 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.", - "You cut through \the [src]'s shielding.", - "You hear welding.") + user.visible_message(span_notice("[user] cuts through \the [src]'s shielding."), + span_notice("You cut through \the [src]'s shielding."), + span_italics("You 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, "You start cutting through the outer grille.") + to_chat(user, span_notice("You 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.", - "You cut through \the [src]'s outer grille.") + user.visible_message(span_notice("[user] cut through \the [src]'s outer grille."), + span_notice("You 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, "You [panel_open ? "open":"close"] the maintenance panel of the airlock.") + to_chat(user, span_notice("You [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].", "You remove [note] from [src].") + user.visible_message(span_notice("[user] cuts down [note] from [src]."), span_notice("You remove [note] from [src].")) C.play_tool_sound(src) note.forceMove(get_turf(user)) note = null @@ -1097,29 +1097,29 @@ S.show_access(src, user) //yogs end else if(istype(C, /obj/item/doorCharge)) if(!panel_open || security_level) - to_chat(user, "The maintenance panel must be open to apply [C]!") + to_chat(user, span_warning("The maintenance panel must be open to apply [C]!")) return if(obj_flags & EMAGGED) return if(charge && !detonated) - to_chat(user, "There's already a charge hooked up to this door!") + to_chat(user, span_warning("There's already a charge hooked up to this door!")) return if(detonated) - to_chat(user, "The maintenance panel is destroyed!") + to_chat(user, span_warning("The maintenance panel is destroyed!")) return - to_chat(user, "You apply [C]. Next time someone opens the door, it will explode.") + to_chat(user, span_warning("You apply [C]. Next time someone opens the door, it will explode.")) panel_open = FALSE update_icon() user.transferItemToLoc(C, src, TRUE) charge = C 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].", "You pin [C] to [src].") + user.visible_message(span_notice("[user] pins [C] to [src]."), span_notice("You pin [C] to [src].")) note = C update_icon() else if(istype(C, /obj/item/brace)) //yogs @@ -1129,7 +1129,7 @@ if(!density) return if(locked || welded) - to_chat(user, "Your [C.name] can't force open locked doors without smashing them down [src].") + to_chat(user, span_warning("Your [C.name] can't force open locked doors without smashing them down [src].")) return open(2) var/obj/item/umbral_tendrils/T = C @@ -1138,9 +1138,9 @@ else if(user.a_intent == INTENT_DISARM && density) if(!locked && !welded) if(!T.darkspawn.has_psi(15)) - to_chat(user, "You need at least 15 Psi to force open an airlock!") + to_chat(user, span_warning("You need at least 15 Psi to force open an airlock!")) return - user.visible_message("[user] starts forcing open [src]!", "ueahz
You begin forcing open [src]...") + user.visible_message(span_warning("[user] starts forcing open [src]!"), "ueahz
You begin forcing open [src]...") playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE) if(!T.twin) if(!do_after(user, 75, target = src)) @@ -1150,13 +1150,13 @@ return 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!")) T.darkspawn.use_psi(15) else if(!T.darkspawn.has_psi(30)) - to_chat(user, "You need at least 30 Psi to smash down an airlock!") + to_chat(user, span_warning("You need at least 30 Psi to smash down an airlock!")) return - user.visible_message("[user] starts slamming [T] into [src]!", \ + user.visible_message(span_boldwarning("[user] starts slamming [T] into [src]!"), \ "You loudly begin smashing down [src].") while(obj_integrity > max_integrity * 0.25) if(T.twin) @@ -1173,7 +1173,7 @@ take_damage(max_integrity / rand(8, 15)) to_chat(user, "klaj.") ex_act(EXPLODE_DEVASTATE) - user.visible_message("[user] slams down [src]!", "KLAJ.") + user.visible_message(span_boldwarning("[user] slams down [src]!"), "KLAJ.") T.darkspawn.use_psi(30) qdel(T) else @@ -1186,28 +1186,28 @@ if(!W.tool_start_check(user, amount=0)) return user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \ - "You begin [welded ? "unwelding":"welding"] the airlock...", \ - "You hear welding.") + span_notice("You begin [welded ? "unwelding":"welding"] the airlock..."), \ + span_italics("You hear welding.")) if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/weld_checks, W, user))) welded = !welded user.visible_message("[user.name] has [welded? "welded shut":"unwelded"] [src].", \ - "You [welded ? "weld the airlock shut":"unweld the airlock"].") + span_notice("You [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.", \ - "You begin repairing the airlock...", \ - "You hear welding.") + span_notice("You begin repairing the airlock..."), \ + span_italics("You hear welding.")) if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/weld_checks, W, user))) obj_integrity = max_integrity stat &= ~BROKEN user.visible_message("[user.name] has repaired [src].", \ - "You finish repairing the airlock.") + span_notice("You 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 @@ -1219,33 +1219,33 @@ else beingcrowbarred = 0 if(panel_open && charge) - to_chat(user, "You carefully start removing [charge] from [src]...") + to_chat(user, span_notice("You carefully start removing [charge] from [src]...")) if(!I.use_tool(src, user, 150, volume=50)) - to_chat(user, "You slip and [charge] detonates!") + to_chat(user, span_warning("You slip and [charge] detonates!")) user.Paralyze(60) return blow_charge() - user.visible_message("[user] removes [charge] from [src].", \ - "You gently pry out [charge] from [src] and unhook its wires.") + user.visible_message(span_notice("[user] removes [charge] from [src]."), \ + span_notice("You gently pry out [charge] from [src] and unhook its wires.")) charge.forceMove(get_turf(user)) charge = null return 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.", \ - "You start to remove electronics from the airlock assembly...") + span_notice("You start to remove electronics from the airlock assembly...")) if(I.use_tool(src, user, 40, volume=100)) deconstruct(TRUE, user) return else if(hasPower()) - 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!")) else 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!")) else if(brace) - to_chat(user, "The airlock won't budge!") + to_chat(user, span_warning("The airlock won't budge!")) else if( !welded && !operating) if(istype(I, /obj/item/twohanded/fireaxe)) //being fireaxe'd var/obj/item/twohanded/fireaxe/F = I if(!F.wielded) - to_chat(user, "You need to be wielding the fire axe to do that!") + to_chat(user, span_warning("You need to be wielding the fire axe to do that!")) return INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2) @@ -1258,15 +1258,15 @@ return if(locked) - to_chat(user, "The bolts are down, it won't budge!") + to_chat(user, span_warning("The bolts are down, it won't budge!")) 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(brace) - to_chat(user, "The airlock won't budge!") + to_chat(user, span_warning("The airlock won't budge!")) return var/time_to_open = 5 @@ -1285,7 +1285,7 @@ time_to_open = 15 else if(user) - to_chat(user, "You do not have enough charge in the [J] for this. You need at least [J.pump_cost]% ") + to_chat(user, span_warning("You do not have enough charge in the [J] for this. You need at least [J.pump_cost]% ")) return playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE) //is it aliens or just the CE being a dick? @@ -1293,7 +1293,7 @@ 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 @@ -1308,15 +1308,15 @@ return if(welded && !locked) - to_chat(user, "It's welded, this will take a while...") + to_chat(user, span_warning("It's welded, this will take a while...")) time_to_open = 100 * door_time_multiplier if(locked && !welded) - to_chat(user, "The bolts are down, it won't budge! Forcing the bolts will take a while...") + to_chat(user, span_warning("The bolts are down, it won't budge! Forcing the bolts will take a while...")) time_to_open = 80 * door_time_multiplier if(locked && welded) - to_chat(user, "The bolts are down, and it's welded.Forcing the bolts and breaking the seal will take a long while...") + to_chat(user, span_warning("The bolts are down, and it's welded.Forcing the bolts and breaking the seal will take a long while...")) time_to_open = 200 * door_time_multiplier if(brace) @@ -1327,7 +1327,7 @@ 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.")) /obj/machinery/door/airlock/open(forced=0) @@ -1438,7 +1438,7 @@ /obj/machinery/door/airlock/proc/change_paintjob(obj/item/airlock_painter/painter, mob/user) if(!can_repaint) - to_chat(user, "The airlock painter does not support this airlock.") + to_chat(user, span_warning("The airlock painter does not support this airlock.")) return if((!in_range(src, user) && loc != user) || !painter.can_use(user)) // user should be adjacent to the airlock, and the painter should have a toner cartridge that isn't empty @@ -1454,7 +1454,7 @@ var/obj/structure/door_assembly/assembly = initial(airlock.assemblytype) if(airlock_material == "glass" && initial(assembly.noglass)) // prevents painting glass airlocks with a paint job that doesn't have a glass version, such as the freezer - to_chat(user, "This paint job can only be applied to non-glass airlocks.") + to_chat(user, span_warning("This paint job can only be applied to non-glass airlocks.")) return // applies the user-chosen airlock's icon, overlays and assemblytype to the src airlock @@ -1492,11 +1492,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].",\ - "You begin digging your claws into [src] with all your might!",\ - "You hear groaning metal...") + user.visible_message(span_warning("[user] begins prying open [src]."),\ + span_noticealien("You begin digging your claws into [src] with all your might!"),\ + span_warning("You hear groaning metal...")) var/time_to_open = 5 if(hasPower()) time_to_open = 50 //Powered airlocks take longer to open, and are loud. @@ -1505,7 +1505,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. @@ -1580,10 +1580,10 @@ A.obj_integrity = A.max_integrity * 0.5 else if(obj_flags & EMAGGED) if(user) - to_chat(user, "You discard the damaged electronics.") + to_chat(user, span_warning("You discard the damaged electronics.")) else if(user) - to_chat(user, "You remove the airlock electronics.") + to_chat(user, span_notice("You remove the airlock electronics.")) var/obj/item/electronics/airlock/ae if(!electronics) @@ -1604,7 +1604,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 @@ -1612,7 +1612,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, "You deconstruct the airlock.") + to_chat(user, span_notice("You deconstruct the airlock.")) qdel(src) return TRUE return FALSE @@ -1756,11 +1756,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() to_chat(user, "Door bolts raised.") @@ -1789,7 +1789,7 @@ /obj/machinery/door/airlock/proc/blow_charge() panel_open = TRUE update_icon(AIRLOCK_OPENING) - visible_message("[src]'s panel is blown off in a spray of deadly shrapnel!") + visible_message(span_warning("[src]'s panel is blown off in a spray of deadly shrapnel!")) charge.forceMove(drop_location()) charge.ex_act(EXPLODE_DEVASTATE) detonated = TRUE diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 0e8db90345d5..ff7da5c52a65 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -638,30 +638,30 @@ return 0 else if(I.tool_behaviour == TOOL_WRENCH) if(construction_state == GEAR_SECURE) - user.visible_message("[user] begins loosening [src]'s cogwheel...", "You begin loosening [src]'s cogwheel...") + user.visible_message(span_notice("[user] begins loosening [src]'s cogwheel..."), span_notice("You begin loosening [src]'s cogwheel...")) if(!I.use_tool(src, user, 75, volume=50) || construction_state != GEAR_SECURE) return 1 - user.visible_message("[user] loosens [src]'s cogwheel!", "[src]'s cogwheel pops off and dangles loosely.") + user.visible_message(span_notice("[user] loosens [src]'s cogwheel!"), span_notice("[src]'s cogwheel pops off and dangles loosely.")) playsound(src, 'sound/items/deconstruct.ogg', 50, 1) construction_state = GEAR_LOOSE else if(construction_state == GEAR_LOOSE) - user.visible_message("[user] begins tightening [src]'s cogwheel...", "You begin tightening [src]'s cogwheel into place...") + user.visible_message(span_notice("[user] begins tightening [src]'s cogwheel..."), span_notice("You begin tightening [src]'s cogwheel into place...")) if(!I.use_tool(src, user, 75, volume=50) || construction_state != GEAR_LOOSE) return 1 - user.visible_message("[user] tightens [src]'s cogwheel!", "You firmly tighten [src]'s cogwheel into place.") + user.visible_message(span_notice("[user] tightens [src]'s cogwheel!"), span_notice("You firmly tighten [src]'s cogwheel into place.")) playsound(src, 'sound/items/deconstruct.ogg', 50, 1) construction_state = GEAR_SECURE return 1 else if(I.tool_behaviour == TOOL_CROWBAR) if(construction_state == GEAR_SECURE) - to_chat(user, "[src]'s cogwheel is too tightly secured! Your [I.name] can't reach under it!") + to_chat(user, span_warning("[src]'s cogwheel is too tightly secured! Your [I.name] can't reach under it!")) return 1 else if(construction_state == GEAR_LOOSE) - user.visible_message("[user] begins slowly lifting off [src]'s cogwheel...", "You slowly begin lifting off [src]'s cogwheel...") + user.visible_message(span_notice("[user] begins slowly lifting off [src]'s cogwheel..."), span_notice("You slowly begin lifting off [src]'s cogwheel...")) if(!I.use_tool(src, user, 75, volume=50) || construction_state != GEAR_LOOSE) return 1 - user.visible_message("[user] lifts off [src]'s cogwheel, causing it to fall apart!", \ - "You lift off [src]'s cogwheel, causing it to fall apart!") + user.visible_message(span_notice("[user] lifts off [src]'s cogwheel, causing it to fall apart!"), \ + span_notice("You lift off [src]'s cogwheel, causing it to fall apart!")) deconstruct(TRUE) return 1 return 0 diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 6b9232160b1e..a20f491636ad 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -209,7 +209,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 665ff85b222e..3d6f51423133 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -60,16 +60,16 @@ . = ..() 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." if(!isdead(user)) var/userDir = turn(get_dir(src, user), 180) var/turf/T = get_step(src, userDir) var/areaName = T.loc.name - . += "It leads into [areaName]." + . += span_notice("It leads into [areaName].") /obj/machinery/door/check_access_list(list/access_list) if(red_alert_access && GLOB.security_level >= SEC_LEVEL_RED) @@ -370,7 +370,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_userdanger("[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 6c182091eaea..0c6251ef6dfd 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -121,21 +121,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...", \ - "You start unfastening [src]'s floor bolts...") + user.visible_message(span_notice("[user] starts undoing [src]'s bolts..."), \ + span_notice("You start unfastening [src]'s floor bolts...")) if(!C.use_tool(src, user, 50)) return playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) - user.visible_message("[user] unfastens [src]'s bolts.", \ - "You undo [src]'s floor bolts.") + user.visible_message(span_notice("[user] unfastens [src]'s bolts."), \ + span_notice("You undo [src]'s floor bolts.")) deconstruct(TRUE) return if(C.tool_behaviour == TOOL_SCREWDRIVER) - user.visible_message("[user] [boltslocked ? "unlocks" : "locks"] [src]'s bolts.", \ - "You [boltslocked ? "unlock" : "lock"] [src]'s floor bolts.") + user.visible_message(span_notice("[user] [boltslocked ? "unlocks" : "locks"] [src]'s bolts."), \ + span_notice("You [boltslocked ? "unlock" : "lock"] [src]'s floor bolts.")) C.play_tool_sound(src) boltslocked = !boltslocked return @@ -148,10 +148,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].", "You start welding [src].") + user.visible_message(span_notice("[user] starts [welded ? "unwelding" : "welding"] [src]."), span_notice("You start welding [src].")) if(W.use_tool(src, user, 40, volume=50)) welded = !welded - to_chat(user, "[user] [welded?"welds":"unwelds"] [src].", "You [welded ? "weld" : "unweld"] [src].") + to_chat(user, span_danger("[user] [welded?"welds":"unwelds"] [src]."), span_notice("You [welded ? "weld" : "unweld"] [src].")) update_icon() /obj/machinery/door/firedoor/try_to_crowbar(obj/item/I, mob/user) @@ -161,7 +161,7 @@ if(density) if(is_holding_pressure()) // tell the user that this is a bad idea, and have a do_after as well - to_chat(user, "As you begin crowbarring \the [src] a gush of air blows in your face... maybe you should reconsider?") + to_chat(user, span_warning("As you begin crowbarring \the [src] a gush of air blows in your face... maybe you should reconsider?")) if(!do_after(user, 15, TRUE, src)) // give them a few seconds to reconsider their decision. return log_game("[key_name_admin(user)] has opened a firelock with a pressure difference at [AREACOORD(loc)]") // there bibby I made it logged just for you. Enjoy. @@ -196,7 +196,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 if(user.a_intent == INTENT_HARM) return ..() @@ -326,7 +326,7 @@ if(M.stat == CONSCIOUS && M.pulling && M.pulling.loc == T2 && !M.pulling.anchored && M.pulling.move_resist <= M.move_force) var/mob/living/M2 = M.pulling if(!istype(M2) || !M2.buckled || !M2.buckled.buckle_prevents_pull) - to_chat(M, "You pull [M.pulling] through [src] right as it closes") + to_chat(M, span_notice("You pull [M.pulling] through [src] right as it closes")) M.pulling.forceMove(T1) M.start_pulling(M2) @@ -334,7 +334,7 @@ if(M.stat == CONSCIOUS && M.pulling && M.pulling.loc == T1 && !M.pulling.anchored && M.pulling.move_resist <= M.move_force) var/mob/living/M2 = M.pulling if(!istype(M2) || !M2.buckled || !M2.buckled.buckle_prevents_pull) - to_chat(M, "You pull [M.pulling] through [src] right as it closes") + to_chat(M, span_notice("You pull [M.pulling] through [src] right as it closes")) M.pulling.forceMove(T2) M.start_pulling(M2) . = ..() @@ -351,7 +351,7 @@ var/status1 = check_door_side(T) var/status2 = check_door_side(T2) if((status1 == 1 && status2 == -1) || (status1 == -1 && status2 == 1)) - to_chat(user, "Access denied. Try closing another firedoor to minimize decompression, or using a crowbar.") + to_chat(user, span_warning("Access denied. Try closing another firedoor to minimize decompression, or using a crowbar.")) return FALSE return TRUE @@ -462,7 +462,7 @@ if(CONSTRUCTION_PANEL_OPEN) . += "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." if(CONSTRUCTION_GUTTED) @@ -481,7 +481,7 @@ /obj/structure/firelock_frame/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) if(passed_mode == RCD_DECONSTRUCT) - to_chat(user, "You deconstruct [src].") + to_chat(user, span_notice("You deconstruct [src].")) qdel(src) return TRUE return FALSE @@ -491,31 +491,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]...", \ - "You begin prying out the wire cover...") + user.visible_message(span_notice("[user] starts prying something out from [src]..."), \ + span_notice("You 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/items/deconstruct.ogg', 50, 1) - user.visible_message("[user] pries out a metal plate from [src], exposing the wires.", \ - "You 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("You 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]...", \ - "You begin bolting [src]...") + user.visible_message(span_notice("[user] starts bolting down [src]..."), \ + span_notice("You 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.", \ - "You finish the firelock.") + user.visible_message(span_notice("[user] finishes the firelock."), \ + span_notice("You finish the firelock.")) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) if(border) new /obj/machinery/door/firedoor/border_only(get_turf(src), dir) @@ -528,22 +528,22 @@ if(istype(C, /obj/item/stack/sheet/plasteel)) var/obj/item/stack/sheet/plasteel/P = C if(border) - to_chat(user, "[src] cannot be reinforced.") + to_chat(user, span_warning("[src] cannot be reinforced.")) return 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, "You need more plasteel to reinforce [src].") + to_chat(user, span_warning("You need more plasteel to reinforce [src].")) return - user.visible_message("[user] begins reinforcing [src]...", \ - "You begin reinforcing [src]...") + user.visible_message(span_notice("[user] begins reinforcing [src]..."), \ + span_notice("You begin reinforcing [src]...")) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) 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].", \ - "You reinforce [src].") + user.visible_message(span_notice("[user] reinforces [src]."), \ + span_notice("You reinforce [src].")) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) P.use(2) reinforced = 1 @@ -552,42 +552,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]...", \ - "You begin removing [src]'s wires...") + user.visible_message(span_notice("[user] starts cutting the wires from [src]..."), \ + span_notice("You 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].", \ - "You remove the wiring from [src], exposing the circuit board.") + user.visible_message(span_notice("[user] removes the wires from [src]."), \ + span_notice("You 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]...", \ - "You begin prying the cover plate back onto [src]...") + user.visible_message(span_notice("[user] starts prying a metal plate into [src]..."), \ + span_notice("You 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/items/deconstruct.ogg', 50, 1) - user.visible_message("[user] pries the metal plate into [src].", \ - "You pry [src]'s cover plate into place, hiding the wires.") + user.visible_message(span_notice("[user] pries the metal plate into [src]."), \ + span_notice("You 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]...", \ - "You begin prying out the circuit board from [src]...") + user.visible_message(span_notice("[user] begins removing the circuit board from [src]..."), \ + span_notice("You 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.", \ - "You remove the circuit board from [src].") + user.visible_message(span_notice("[user] removes [src]'s circuit board."), \ + span_notice("You remove the circuit board from [src].")) new /obj/item/electronics/firelock(drop_location()) constructionStep = CONSTRUCTION_NOCIRCUIT update_icon() @@ -595,16 +595,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, "You need more wires to add wiring to [src].") + to_chat(user, span_warning("You need more wires to add wiring to [src].")) return - user.visible_message("[user] begins wiring [src]...", \ - "You begin adding wires to [src]...") + user.visible_message(span_notice("[user] begins wiring [src]..."), \ + span_notice("You begin adding wires to [src]...")) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) 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].", \ - "You wire [src].") + user.visible_message(span_notice("[user] adds wires to [src]."), \ + span_notice("You wire [src].")) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) B.use(5) constructionStep = CONSTRUCTION_WIRES_EXPOSED @@ -614,14 +614,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...", \ - "You begin slicing [src] apart...") + user.visible_message(span_notice("[user] begins cutting apart [src]'s frame..."), \ + span_notice("You 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]!", \ - "You cut [src] into metal.") + user.visible_message(span_notice("[user] cuts apart [src]!"), \ + span_notice("You cut [src] into metal.")) var/turf/T = get_turf(src) new /obj/item/stack/sheet/metal(T, 3) if(reinforced) @@ -629,16 +629,16 @@ qdel(src) return if(istype(C, /obj/item/electronics/firelock)) - user.visible_message("[user] starts adding [C] to [src]...", \ - "You begin adding a circuit board to [src]...") + user.visible_message(span_notice("[user] starts adding [C] to [src]..."), \ + span_notice("You begin adding a circuit board to [src]...")) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) if(!do_after(user, 40, target = src)) return if(constructionStep != CONSTRUCTION_NOCIRCUIT) return qdel(C) - user.visible_message("[user] adds a circuit to [src].", \ - "You insert and secure [C].") + user.visible_message(span_notice("[user] adds a circuit to [src]."), \ + span_notice("You insert and secure [C].")) playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) constructionStep = CONSTRUCTION_GUTTED update_icon() @@ -647,8 +647,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].", \ - "You 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("You adapt a firelock circuit and slot it into the assembly.")) constructionStep = CONSTRUCTION_GUTTED update_icon() return @@ -662,8 +662,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].", \ - "You 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("You adapt a firelock circuit and slot it into the assembly.")) constructionStep = CONSTRUCTION_GUTTED update_icon() return TRUE diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index b7b028284bb9..9bf1c517e418 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -105,22 +105,22 @@ /obj/machinery/door/poddoor/attackby(obj/item/W, mob/user, params) . = ..() if(special && W.tool_behaviour == TOOL_SCREWDRIVER) // No Cheesing - to_chat(user, "This door appears to have a different screw.") + to_chat(user, span_warning("This door appears to have a different screw.")) return if(W.tool_behaviour == TOOL_SCREWDRIVER) if(density) - to_chat(user, "You need to open [src] before opening its maintenance panel.") + to_chat(user, span_warning("You need to open [src] before opening its maintenance panel.")) return else if(default_deconstruction_screwdriver(user, icon_state, icon_state, W)) - to_chat(user, "You [panel_open ? "open" : "close"] the maintenance hatch of [src].") + to_chat(user, span_notice("You [panel_open ? "open" : "close"] the maintenance hatch of [src].")) return TRUE if(panel_open) if(W.tool_behaviour == TOOL_MULTITOOL && constructionstate == INTACT) if(id != null) - to_chat(user, "This door is already linked. Unlink it first!") + to_chat(user, span_warning("This door is already linked. Unlink it first!")) return if(!multitool_check_buffer(user, W)) @@ -128,34 +128,34 @@ var/obj/item/multitool/P = W id = P.buffer - to_chat(user, "You link the button to the [src].") + to_chat(user, span_notice("You link the button to the [src].")) return if(W.tool_behaviour == TOOL_WIRECUTTER) if(id != null) - to_chat(user, "You start to unlink the door.") + to_chat(user, span_notice("You start to unlink the door.")) if(do_after(user, 10 SECONDS, target = src)) - to_chat(user, "You unlink the door.") + to_chat(user, span_notice("You unlink the door.")) id = null else - to_chat(user, "This door is already unlinked.") + to_chat(user, span_warning("This door is already unlinked.")) return if(W.tool_behaviour == TOOL_WELDER && constructionstate == INTACT) - to_chat(user, "You start to remove the outer plasteel cover.") + to_chat(user, span_notice("You start to remove the outer plasteel cover.")) playsound(src.loc, 'sound/items/welder.ogg', 50, 1) if(do_after(user, 10 SECONDS, target = src)) - to_chat(user, "You remove the outer plasteel cover.") + to_chat(user, span_notice("You remove the outer plasteel cover.")) constructionstate = CUT_COVER id = null // Effectivley breaks the door new /obj/item/stack/sheet/plasteel(loc, 5) return else - to_chat(user, "The cover is already off.") + to_chat(user, span_warning("The cover is already off.")) if(W.tool_behaviour == TOOL_CROWBAR && constructionstate == CUT_COVER) - to_chat(user, "You start to remove all of the internal components") + to_chat(user, span_notice("You start to remove all of the internal components")) if(do_after(user, 15 SECONDS, target = src)) if(istype(src, /obj/machinery/door/poddoor/shutters)) // Simplified Code new /obj/item/stack/sheet/plasteel(loc, 5) @@ -171,7 +171,7 @@ if(istype(W, /obj/item/stack/sheet/plasteel)) var/obj/item/stack/sheet/plasteel/P = W if(P.use(5)) - to_chat(user, "You need 5 plasteel sheets to put the plating back on.") + to_chat(user, span_warning("You need 5 plasteel sheets to put the plating back on.")) return constructionstate = INTACT diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index ab5ba5262074..00732c54e523 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -235,17 +235,17 @@ if(!(flags_1&NODECONSTRUCT_1)) if(I.tool_behaviour == TOOL_SCREWDRIVER) if(density || operating) - to_chat(user, "You need to open the door to access the maintenance panel!") + to_chat(user, span_warning("You need to open the door to access the maintenance panel!")) return I.play_tool_sound(src) panel_open = !panel_open - to_chat(user, "You [panel_open ? "open":"close"] the maintenance panel of the [name].") + to_chat(user, span_notice("You [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].", \ - "You start to remove electronics from the [name]...") + span_notice("You 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) @@ -268,11 +268,11 @@ WA.created_name = name if(obj_flags & EMAGGED) - to_chat(user, "You discard the damaged electronics.") + to_chat(user, span_warning("You discard the damaged electronics.")) qdel(src) return - to_chat(user, "You remove the airlock electronics.") + to_chat(user, span_notice("You remove the airlock electronics.")) var/obj/item/electronics/airlock/ae if(!electronics) @@ -305,7 +305,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) @@ -355,7 +355,7 @@ /obj/machinery/door/window/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_DECONSTRUCT) - to_chat(user, "You deconstruct the windoor.") + to_chat(user, span_notice("You deconstruct the windoor.")) qdel(src) return TRUE return FALSE diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 33a5d3b9980a..86d8e41a9d61 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_EMPTY(doppler_arrays) /obj/machinery/doppler_array/examine(mob/user) ..() - to_chat(user, "Its dish is facing to the [dir2text(dir)].") + to_chat(user, span_notice("Its dish is facing to the [dir2text(dir)].")) /obj/machinery/doppler_array/process() return PROCESS_KILL @@ -31,17 +31,17 @@ GLOBAL_LIST_EMPTY(doppler_arrays) if(!anchored && !isinspace()) anchored = TRUE power_change() - to_chat(user, "You fasten [src].") + to_chat(user, span_notice("You fasten [src].")) else if(anchored) anchored = FALSE power_change() - to_chat(user, "You unfasten [src].") + to_chat(user, span_notice("You unfasten [src].")) I.play_tool_sound(src) else return ..() /obj/machinery/doppler_array/proc/rot_message(mob/user) - to_chat(user, "You adjust [src]'s dish to face to the [dir2text(dir)].") + to_chat(user, span_notice("You adjust [src]'s dish to face to the [dir2text(dir)].")) playsound(src, 'sound/items/screwdriver2.ogg', 50, 1) /obj/machinery/doppler_array/proc/sense_explosion(datum/source, 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 f31b8fc73104..75cedc1c1bba 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -109,7 +109,7 @@ /obj/machinery/droneDispenser/examine(mob/user) . = ..() if((mode == DRONE_RECHARGING) && !stat && recharging_text) - . += "[recharging_text]" + . += span_warning("[recharging_text]") /obj/machinery/droneDispenser/process() ..() @@ -130,7 +130,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, 1) mode = DRONE_PRODUCTION @@ -148,7 +148,7 @@ if(create_sound) playsound(src, create_sound, 50, 1) 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 @@ -158,7 +158,7 @@ if(recharge_sound) playsound(src, recharge_sound, 50, 1) if(recharge_message) - visible_message("[src] [recharge_message]") + visible_message(span_notice("[src] [recharge_message]")) mode = DRONE_READY update_icon() @@ -184,26 +184,26 @@ var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) materials.retrieve_all() I.play_tool_sound(src) - to_chat(user, "You retrieve the materials from [src].") + to_chat(user, span_notice("You 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].", - "You begin restoring the damage to [src]...") + span_notice("[user] begins patching up [src] with [I]."), + span_notice("You begin restoring the damage to [src]...")) if(!I.use_tool(src, user, 40, volume=50, amount=1)) return user.visible_message( - "[user] fixes [src]!", - "You restore [src] to operation.") + span_notice("[user] fixes [src]!"), + span_notice("You restore [src] to operation.")) stat &= ~BROKEN obj_integrity = max_integrity @@ -216,7 +216,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/electrolyzer.dm b/code/game/machinery/electrolyzer.dm index 46f754513013..d18fba7d8929 100644 --- a/code/game/machinery/electrolyzer.dm +++ b/code/game/machinery/electrolyzer.dm @@ -118,23 +118,23 @@ return if(istype(I, /obj/item/stock_parts/cell)) if(!panel_open) - 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 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 if(!user.transferItemToLoc(I, src)) return cell = I I.add_fingerprint(usr) - user.visible_message("\The [user] inserts a power cell into \the [src].", "You insert the power cell into \the [src].") + user.visible_message(span_notice("\The [user] inserts a power cell into \the [src]."), span_notice("You insert the power cell into \the [src].")) SStgui.update_uis(src) return if(I.tool_behaviour == TOOL_SCREWDRIVER) panel_open = !panel_open - user.visible_message("\The [user] [panel_open ? "opens" : "closes"] the hatch on \the [src].", "You [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("You [panel_open ? "open" : "close"] the hatch on \the [src].")) update_icon() return if(default_deconstruction_crowbar(I)) @@ -167,7 +167,7 @@ if("power") on = !on mode = ELECTROLYZER_MODE_STANDBY - usr.visible_message("[usr] switches [on ? "on" : "off"] \the [src].", "You switch [on ? "on" : "off"] \the [src].") + usr.visible_message(span_notice("[usr] switches [on ? "on" : "off"] \the [src]."), span_notice("You switch [on ? "on" : "off"] \the [src].")) update_icon() if (on) START_PROCESSING(SSmachines, src) diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index afb5f188b7f6..f4ec0aa85a09 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, 1) - to_chat(user, "You short out the access controller.") + to_chat(user, span_warning("You short out the access controller.")) /obj/machinery/doorButtons/proc/removeMe() return @@ -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) @@ -129,7 +129,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 5cdd5aa5f527..acd9d9cac068 100644 --- a/code/game/machinery/exp_cloner.dm +++ b/code/game/machinery/exp_cloner.dm @@ -61,7 +61,7 @@ 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), "Your 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("Your 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 e72929885da5..1e8f7645fca8 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, "You need to close the maintenance hatch first!") + to_chat(user, span_warning("You need to close the maintenance hatch first!")) return ..() playsound(src, 'sound/machines/click.ogg', 50) @@ -57,7 +57,7 @@ occupant.forceMove(drop_location()) occupant = null return - to_chat(occupant, "You enter [src]") + to_chat(occupant, span_notice("You enter [src]")) addtimer(CALLBACK(src, .proc/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("You see [user] kicking against the door of [src]!", \ - "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "You hear a metallic creaking from [src].") + user.visible_message(span_notice("You see [user] kicking against the door of [src]!"), \ + span_notice("You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_italics("You 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]!", \ - "You successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("You 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, "You can't reach the controls from inside!") + to_chat(user, span_warning("You can't reach the controls from inside!")) return if(!(obj_flags & EMAGGED) && !allowed(user)) - to_chat(user, "You lack the required access.") + to_chat(user, span_warning("You 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_icon() overlays.Cut() @@ -189,10 +189,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() @@ -208,5 +208,5 @@ return start_at = 100 stop_at = 0 - to_chat(user, "You remove the access restrictions and lower the automatic ejection threshold!") + to_chat(user, span_notice("You 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 475b421c1143..9a7ec3f04e5c 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -111,8 +111,8 @@ obj_flags |= EMAGGED update_icon() if(user) - user.visible_message("Sparks fly out of [src]!", - "You emag [src], disabling its thermal sensors.") + user.visible_message(span_warning("Sparks fly out of [src]!"), + span_notice("You emag [src], disabling its thermal sensors.")) playsound(src, "sparks", 50, 1) /obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume) @@ -160,7 +160,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 @@ -171,12 +171,12 @@ if(!W.tool_start_check(user, amount=0)) return - to_chat(user, "You begin repairing [src]...") + to_chat(user, span_notice("You begin repairing [src]...")) if(W.use_tool(src, user, 40, volume=50)) obj_integrity = max_integrity - to_chat(user, "You repair [src].") + to_chat(user, span_notice("You 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) @@ -184,16 +184,16 @@ if(W.tool_behaviour == TOOL_MULTITOOL) detecting = !detecting if (src.detecting) - user.visible_message("[user] has reconnected [src]'s detecting unit!", "You reconnect [src]'s detecting unit.") + user.visible_message("[user] has reconnected [src]'s detecting unit!", span_notice("You reconnect [src]'s detecting unit.")) else - user.visible_message("[user] has disconnected [src]'s detecting unit!", "You disconnect [src]'s detecting unit.") + user.visible_message("[user] has disconnected [src]'s detecting unit!", span_notice("You 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, "You cut the wires from \the [src].") + to_chat(user, span_notice("You cut the wires from \the [src].")) update_icon() return @@ -208,31 +208,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, "You need more cable for this!") + to_chat(user, span_warning("You need more cable for this!")) else coil.use(5) buildstage = 2 - to_chat(user, "You wire \the [src].") + to_chat(user, span_notice("You wire \the [src].")) update_icon() return else if(W.tool_behaviour == TOOL_CROWBAR) user.visible_message("[user.name] removes the electronics from [src.name].", \ - "You start prying out the circuit...") + span_notice("You start prying out the circuit...")) if(W.use_tool(src, user, 20, volume=50)) if(buildstage == 1) if(stat & BROKEN) - to_chat(user, "You remove the destroyed circuit.") + to_chat(user, span_notice("You remove the destroyed circuit.")) stat &= ~BROKEN else - to_chat(user, "You pry out the circuit.") + to_chat(user, span_notice("You 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, "You insert the circuit.") + to_chat(user, span_notice("You insert the circuit.")) qdel(W) buildstage = 1 update_icon() @@ -242,15 +242,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].", \ - "You 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("You 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.", \ - "You remove the fire alarm assembly from the wall.") + span_notice("You 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) @@ -268,8 +268,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].", \ - "You 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("You 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 a12e99f7220f..03fa24d167ac 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -57,9 +57,9 @@ add_fingerprint(user) if (W.tool_behaviour == TOOL_WIRECUTTER) if (bulb) - user.visible_message("[user] begins to disconnect [src]'s flashbulb.", "You begin to disconnect [src]'s flashbulb...") + user.visible_message("[user] begins to disconnect [src]'s flashbulb.", span_notice("You 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!", "You disconnect [src]'s flashbulb.") + user.visible_message("[user] has disconnected [src]'s flashbulb!", span_notice("You disconnect [src]'s flashbulb.")) bulb.forceMove(loc) bulb = null power_change() @@ -68,20 +68,20 @@ if (!bulb) if(!user.transferItemToLoc(W, src)) return - user.visible_message("[user] installs [W] into [src].", "You install [W] into [src].") + user.visible_message("[user] installs [W] into [src].", span_notice("You 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, "You start unsecuring the flasher frame...") + to_chat(user, span_notice("You start unsecuring the flasher frame...")) if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "You unsecure the flasher frame.") + to_chat(user, span_notice("You 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 ..() @@ -173,13 +173,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() @@ -198,7 +198,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(var/obj/O) ..() diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index b31ecb1ea30a..428b2e6f4f09 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -35,10 +35,10 @@ if(!user.transferItemToLoc(I, src)) return inserted_id = I - to_chat(user, "You insert [I].") + to_chat(user, span_notice("You insert [I].")) return else - to_chat(user, "There's an ID inserted already.") + to_chat(user, span_notice("There's an ID inserted already.")) return ..() /obj/machinery/gulag_item_reclaimer/ui_interact(mob/user, datum/tgui/ui) @@ -87,7 +87,7 @@ if("release_items") 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) . = TRUE diff --git a/code/game/machinery/gulag_processor.dm b/code/game/machinery/gulag_processor.dm index 26525321404f..05744acdb623 100644 --- a/code/game/machinery/gulag_processor.dm +++ b/code/game/machinery/gulag_processor.dm @@ -50,9 +50,9 @@ GLOBAL_VAR_INIT(gulag_required_items, typecacheof(list( /obj/machinery/gulag_processor/examine(mob/user) . = ..() if(id) - . += "\The [id] ID has been inserted." + . += span_notice("\The [id] ID has been inserted.") else - . += "There is no ID inserted." + . += span_warning("There is no ID inserted.") /obj/machinery/gulag_processor/AltClick(mob/living/user) if(id) @@ -86,10 +86,10 @@ GLOBAL_VAR_INIT(gulag_required_items, typecacheof(list( if(!id) I.moveToNullspace() id = I - to_chat(user, "You insert [I].") + to_chat(user, span_notice("You insert [I].")) return else - to_chat(user, "There's an ID inserted already.") + to_chat(user, span_notice("There's an ID inserted already.")) return ..() @@ -120,7 +120,7 @@ GLOBAL_VAR_INIT(gulag_required_items, typecacheof(list( /obj/machinery/gulag_processor/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) @@ -137,10 +137,10 @@ GLOBAL_VAR_INIT(gulag_required_items, typecacheof(list( handle_prisoner(id) id = null else - visible_message("No ID inserted. Processing aborted..") + visible_message(span_warning("No ID inserted. Processing aborted..")) else open_machine() - visible_message("No occupant detected. Processing aborted.") + visible_message(span_warning("No occupant detected. Processing aborted.")) return // strips and stores all occupant's items @@ -185,7 +185,7 @@ GLOBAL_VAR_INIT(gulag_required_items, typecacheof(list( if(!prisoner.handcuffed) prisoner.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(prisoner) prisoner.update_handcuffed() - visible_message("Prisoner Processed.") + visible_message(span_warning("Prisoner Processed.")) /obj/item/circuitboard/machine/gulag_processor name = "labor camp processor (Machine Board)" diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index 9847fe27d833..514df7175a99 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("You see [user] kicking against the door of [src]!", \ - "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "You hear a metallic creaking from [src].") + user.visible_message(span_notice("You see [user] kicking against the door of [src]!"), \ + span_notice("You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_italics("You 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]!", \ - "You successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("You 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 36e6210c0540..78111c409f8e 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/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].", "You pry open [src].") + visible_message(span_notice("[usr] pries open \the [src]."), span_notice("You 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, "You overload [src]'s lifesign scanners.") + to_chat(user, span_warning("You overload [src]'s lifesign scanners.")) /obj/machinery/harvester/container_resist(mob/living/user) if(!harvesting) - visible_message("[occupant] emerges from [src]!", - "You climb out of [src]!") + visible_message(span_notice("[occupant] emerges from [src]!"), + span_notice("You 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." diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 560d98fc8568..435f32a0d551 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -189,11 +189,11 @@ obj/machinery/holopad/secure/Initialize() 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,"You insert [P] into [src].") + to_chat(user,span_notice("You insert [P] into [src].")) disk = P return @@ -243,7 +243,7 @@ obj/machinery/holopad/secure/Initialize() if("AIrequest") if(last_request + 200 < world.time) last_request = world.time - to_chat(usr, "You requested an AI's presence.") + to_chat(usr, span_info("You requested an AI's presence.")) var/area/area = get_area(src) for(var/mob/living/silicon/ai/AI in GLOB.silicon_mobs) if(!AI.client) @@ -251,7 +251,7 @@ obj/machinery/holopad/secure/Initialize() to_chat(AI, "Your presence is requested at \the [area].") return TRUE else - to_chat(usr, "A request for AI presence was already sent recently.") + to_chat(usr, span_info("A request for AI presence was already sent recently.")) return if("holocall") if(outgoing_call) @@ -273,7 +273,7 @@ obj/machinery/holopad/secure/Initialize() calling = TRUE return TRUE else - to_chat(usr, "You must stand on the holopad to make a call!") + to_chat(usr, span_warning("You must stand on the holopad to make a call!")) if("connectcall") var/datum/holocall/call_to_connect = locate(params["holopad"]) in holo_calls if(!QDELETED(call_to_connect)) @@ -412,7 +412,7 @@ obj/machinery/holopad/secure/Initialize() move_hologram() set_holo(user, Hologram) - visible_message("A holographic image of [user] flickers to life before your eyes!") + visible_message(span_notice("A holographic image of [user] flickers to life before your eyes!")) return Hologram else @@ -567,7 +567,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 your eyes!") + visible_message(span_notice("A holographic image of [record.caller_name] flickers to life before your eyes!")) return Hologram /obj/machinery/holopad/proc/replay_start() diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index f2b36a3616d8..3831e012f81a 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -43,7 +43,7 @@ /obj/machinery/igniter/attackby(obj/item/O, mob/user, params) if(default_deconstruction_screwdriver(user, icon_state, icon_state, O)) - to_chat(user, "You [panel_open ? "open" : "close"] the maintenance hatch of [src].") + to_chat(user, span_notice("You [panel_open ? "open" : "close"] the maintenance hatch of [src].")) return TRUE if(default_deconstruction_crowbar(O)) return TRUE @@ -119,9 +119,9 @@ add_fingerprint(user) src.disable = !src.disable if (src.disable) - user.visible_message("[user] has disabled \the [src]!", "You disable the connection to \the [src].") + user.visible_message(span_notice("[user] has disabled \the [src]!"), span_notice("You disable the connection to \the [src].")) if (!src.disable) - user.visible_message("[user] has reconnected \the [src]!", "You fix the connection to \the [src].") + user.visible_message(span_notice("[user] has reconnected \the [src]!"), span_notice("You 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 ac4330cf2495..9f1f6c0abd0c 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -72,36 +72,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].", "You attach [src] to [target].") + usr.visible_message(span_warning("[usr] attaches [src] to [target]."), span_notice("You 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, "You attach [W] to [src].") + to_chat(user, span_notice("You 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() @@ -119,7 +119,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_userdanger("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() @@ -177,7 +177,7 @@ set src in view(1) if(!isliving(usr)) - to_chat(usr, "You can't do that!") + to_chat(usr, span_warning("You can't do that!")) return if(usr.incapacitated()) @@ -193,7 +193,7 @@ set src in view(1) if(!isliving(usr)) - to_chat(usr, "You can't do that!") + to_chat(usr, span_warning("You can't do that!")) return if(usr.incapacitated()) @@ -211,13 +211,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 ac55bec628ed..78509641a159 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -63,7 +63,7 @@ return var/obj/item/multitool/M = I M.buffer = src - to_chat(user, "You save the data in the [I.name]'s buffer.") + to_chat(user, span_notice("You 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 @@ -158,7 +158,7 @@ if(isAI(ROI)) var/mob/living/silicon/ai/I = ROI if(I.move_resist > 1000) - to_chat(user, "ERROR: Launchpad overloaded, unable to operate.") + to_chat(user, span_warning("ERROR: Launchpad overloaded, unable to operate.")) continue // if it's anchored, don't teleport var/on_chair = "" @@ -244,7 +244,7 @@ return if(!usr.canUseTopic(src, BE_CLOSE, ismonkey(usr))) return - usr.visible_message("[usr] starts closing [src]...", "You start closing [src]...") + usr.visible_message(span_notice("[usr] starts closing [src]..."), span_notice("You start closing [src]...")) if(do_after(usr, 30, target = usr)) usr.put_in_hands(briefcase) moveToNullspace() //hides it from suitcase contents @@ -257,7 +257,7 @@ if(L.pad == src) //do not attempt to link when already linked return ..() L.pad = src - to_chat(user, "You link [src] to [L].") + to_chat(user, span_notice("You link [src] to [L].")) else return ..() @@ -284,7 +284,7 @@ if(!is_syndicate(user)) // You don't know how to use launchpad as non syndicate. 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() @@ -298,7 +298,7 @@ if(L.pad == src.pad) //do not attempt to link when already linked return ..() L.pad = src.pad - to_chat(user, "You link [pad] to [L].") + to_chat(user, span_notice("You link [pad] to [L].")) else return ..() @@ -320,7 +320,7 @@ if(!is_syndicate(user)) // you don't know how to use the launchpad stealth remote as a non syndicate return 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_state(mob/user) @@ -350,10 +350,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/lightswitch.dm b/code/game/machinery/lightswitch.dm index 97e9fc52bc58..7e819f7d4963 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -39,7 +39,7 @@ . = ..() . += "It is [area.lightswitch ? "on" : "off"]." if((obj_flags & EMAGGED) && user.can_hear()) - . += "You hear a faint hum coming from the switch." + . += span_danger("You hear a faint hum coming from the switch.") /obj/machinery/light_switch/interact(mob/user) if(obj_flags & EMAGGED) @@ -76,9 +76,9 @@ /obj/machinery/light_switch/emag_act(mob/user) if(obj_flags & EMAGGED) - to_chat(user, "Nothing new seems to happen when you swipe the emag.") + to_chat(user, span_warning("Nothing new seems to happen when you swipe the emag.")) return - to_chat(user, "You swipe the emag on the light switch. ") + to_chat(user, span_notice("You swipe the emag on the light switch. ")) if(user.can_hear()) - to_chat(user, "The light switch gives off a soft hum.") + to_chat(user, span_notice("The light switch gives off a soft hum.")) obj_flags |= EMAGGED diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 19e86374385c..fcf8a797015e 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -187,7 +187,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)]
" @@ -228,5 +228,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 e5df2c29d18a..5217c389f2d7 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -24,7 +24,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/navbeacon.dm b/code/game/machinery/navbeacon.dm index 51b704c5e323..e73de649cc66 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.", "You [open ? "open" : "close"] the beacon's cover.") + user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", span_notice("You [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, "You must open the cover first!") + to_chat(user, span_warning("You 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 cddd41e45f89..2094f8c4829f 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -704,17 +704,17 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster/attackby(obj/item/I, mob/living/user, params) if(I.tool_behaviour == TOOL_WRENCH) - to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") + to_chat(user, span_notice("You start [anchored ? "un" : ""]securing [name]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 60)) playsound(loc, 'sound/items/deconstruct.ogg', 50, 1) 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, "You [anchored ? "un" : ""]secure [name].") + to_chat(user, span_notice("You [anchored ? "un" : ""]secure [name].")) new /obj/item/wallframe/newscaster(loc) qdel(src) else if(I.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM) @@ -722,17 +722,17 @@ GLOBAL_LIST_EMPTY(allCasters) if(!I.tool_start_check(user, amount=0)) return user.visible_message("[user] is repairing [src].", \ - "You begin repairing [src]...", \ - "You hear welding.") + span_notice("You begin repairing [src]..."), \ + span_italics("You hear welding.")) if(I.use_tool(src, user, 40, volume=50)) if(!(stat & BROKEN)) return - to_chat(user, "You repair [src].") + to_chat(user, span_notice("You 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 ..() @@ -762,7 +762,7 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster/attack_paw(mob/user) if(user.a_intent != 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, "melee") @@ -785,9 +785,9 @@ GLOBAL_LIST_EMPTY(allCasters) else targetcam = R.aicamera else - to_chat(user, "You cannot interface with silicon photo uploading!") + to_chat(user, span_warning("You 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) @@ -870,13 +870,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/items/drink.ogg', rand(10,50), 1) 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) @@ -1008,10 +1008,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, "You scribble illegibly on [src]!") + to_chat(user, span_notice("You 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_notice("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 2fad67dca7d3..d8cb030b2b23 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].", \ - "You fasten \the [src].", \ - "You hear ratcheting.") + span_notice("You fasten \the [src]."), \ + span_italics("You 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, "You need to fasten it to a pipe!") + to_chat(user, span_warning("You need to fasten it to a pipe!")) return TRUE new /obj/machinery/meter(loc, piping_layer) W.play_tool_sound(src) - to_chat(user, "You fasten the meter to the pipe.") + to_chat(user, span_notice("You 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, "You need to fasten it to the floor!") + to_chat(user, span_warning("You 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, "You fasten the meter to the [loc.name].") + to_chat(user, span_notice("You 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 89a2acd9acd2..7e7f5525e518 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -67,10 +67,10 @@ if(istype(W, /obj/item/pipe)) var/obj/item/pipe/P = W if(!P.disposable) - to_chat(usr, "[src] is too valuable to dispose of!") + to_chat(usr, span_warning("[src] is too valuable to dispose of!")) return // yogs end - to_chat(usr, "You put [W] back into [src].") + to_chat(usr, span_notice("You put [W] back into [src].")) qdel(W) return else @@ -148,7 +148,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 3b4d731c4d98..a47d25bcaa91 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -194,7 +194,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_notice("It has to be secured first!")) interact(usr) return @@ -228,18 +228,18 @@ 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, "You begin prying the metal coverings off...") + to_chat(user, span_notice("You begin prying the metal coverings off...")) if(I.use_tool(src, user, 20)) if(prob(70)) if(stored_gun) stored_gun.forceMove(loc) - to_chat(user, "You remove the turret and salvage some components.") + to_chat(user, span_notice("You 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, "You remove the turret but did not manage to salvage anything.") + to_chat(user, span_notice("You remove the turret but did not manage to salvage anything.")) qdel(src) else if((I.tool_behaviour == TOOL_WRENCH) && (!on)) @@ -251,13 +251,13 @@ setAnchored(TRUE) invisibility = INVISIBILITY_MAXIMUM update_icon() - to_chat(user, "You secure the exterior bolts on the turret.") + to_chat(user, span_notice("You 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, "You unsecure the exterior bolts on the turret.") + to_chat(user, span_notice("You 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. @@ -266,22 +266,22 @@ //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_notice("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, "You add [src] to multitool buffer.") + to_chat(user, span_notice("You add [src] to multitool buffer.")) else return ..() /obj/machinery/porta_turret/emag_act(mob/user) if(obj_flags & EMAGGED) return - to_chat(user, "You short out [src]'s threat assessment circuits.") + to_chat(user, span_warning("You short out [src]'s threat assessment circuits.")) visible_message("[src] hums oddly...") obj_flags |= EMAGGED controllock = TRUE @@ -615,7 +615,7 @@ return FALSE if(remote_controller) if(warning_message) - to_chat(remote_controller, "Your uplink to [src] has been severed!") + to_chat(remote_controller, span_warning("Your uplink to [src] has been severed!")) quit_action.Remove(remote_controller) toggle_action.Remove(remote_controller) remote_controller.click_intercept = null @@ -853,11 +853,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_notice("The turret control is unresponsive.")) return locked = !locked - to_chat(user, "You [ locked ? "lock" : "unlock"] the panel.") + to_chat(user, span_notice("You [ locked ? "lock" : "unlock"] the panel.")) if (locked) if (user.machine==src) user.unset_machine() @@ -866,12 +866,12 @@ if (user.machine==src) attack_hand(user) else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) /obj/machinery/turretid/emag_act(mob/user) if(obj_flags & EMAGGED) return - to_chat(user, "You short out the turret controls' access analysis module.") + to_chat(user, span_danger("You short out the turret controls' access analysis module.")) obj_flags |= EMAGGED locked = FALSE if(user && user.machine == src) @@ -881,13 +881,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_notice("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, "You are too far away.") + to_chat(user, span_notice("You are too far away.")) user.unset_machine() user << browse(null, "window=turretid") return diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm index f06f4d677d83..763853bf15d9 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, "You secure the external bolts.") + to_chat(user, span_notice("You 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, "You dismantle the turret construction.") + to_chat(user, span_notice("You 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, "You add some metal armor to the interior frame.") + to_chat(user, span_notice("You add some metal armor to the interior frame.")) build_step = PTURRET_START_INTERNAL_ARMOUR icon_state = "turret_frame2" else - to_chat(user, "You need two sheets of metal to continue construction!") + to_chat(user, span_warning("You 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, "You unfasten the external bolts.") + to_chat(user, span_notice("You 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, "You bolt the metal armor into place.") + to_chat(user, span_notice("You 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, "You start to remove the turret's interior metal armor...") + to_chat(user, span_notice("You 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, "You remove the turret's interior metal armor.") + to_chat(user, span_notice("You 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, "You add [I] to the turret.") + to_chat(user, span_notice("You 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, "You remove the turret's metal armor bolts.") + to_chat(user, span_notice("You 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, "You add the proximity sensor to the turret.") + to_chat(user, span_notice("You 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, "You close the internal access hatch.") + to_chat(user, span_notice("You 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, "You add some metal armor to the exterior frame.") + to_chat(user, span_notice("You add some metal armor to the exterior frame.")) build_step = PTURRET_START_EXTERNAL_ARMOUR else - to_chat(user, "You need two sheets of metal to continue construction!") + to_chat(user, span_warning("You 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, "You open the internal access hatch.") + to_chat(user, span_notice("You 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, "You begin to weld the turret's armor down...") + to_chat(user, span_notice("You 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, "You weld the turret's armor down.") + to_chat(user, span_notice("You 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, "You pry off the turret's exterior armor.") + to_chat(user, span_notice("You 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, "You remove [installed_gun] from the turret frame.") + to_chat(user, span_notice("You remove [installed_gun] from the turret frame.")) installed_gun = null if(PTURRET_SENSORS_ON) - to_chat(user, "You remove the prox sensor from the turret frame.") + to_chat(user, span_notice("You 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 4df7001c11d8..a8d4da97b57f 100644 --- a/code/game/machinery/porta_turret/portable_turret_cover.dm +++ b/code/game/machinery/porta_turret/portable_turret_cover.dm @@ -46,12 +46,12 @@ if(!parent_turret.anchored) parent_turret.setAnchored(TRUE) - to_chat(user, "You secure the exterior bolts on the turret.") + to_chat(user, span_notice("You secure the exterior bolts on the turret.")) parent_turret.invisibility = 0 parent_turret.update_icon() else parent_turret.setAnchored(FALSE) - to_chat(user, "You unsecure the exterior bolts on the turret.") + to_chat(user, span_notice("You unsecure the exterior bolts on the turret.")) parent_turret.invisibility = INVISIBILITY_MAXIMUM parent_turret.update_icon() qdel(src) @@ -59,16 +59,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, "You add [parent_turret] to multitool buffer.") + to_chat(user, span_notice("You add [parent_turret] to multitool buffer.")) else return ..() @@ -89,7 +89,7 @@ /obj/machinery/porta_turret_cover/emag_act(mob/user) if(!(parent_turret.obj_flags & EMAGGED)) - to_chat(user, "You short out [parent_turret]'s threat assessment circuits.") + to_chat(user, span_notice("You short out [parent_turret]'s threat assessment circuits.")) visible_message("[parent_turret] hums oddly...") parent_turret.obj_flags |= EMAGGED parent_turret.on = 0 diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index fe4806fcca01..3a32724049ca 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -31,7 +31,7 @@ /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." else @@ -60,7 +60,7 @@ return var/obj/item/multitool/M = I M.buffer = src - to_chat(user, "You save the data in [I]'s buffer. It can now be saved to pads with closed panels.") + to_chat(user, span_notice("You 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, "You cannot link a pad to itself!") + to_chat(user, span_warning("You cannot link a pad to itself!")) return TRUE else linked_pad = M.buffer - to_chat(user, "You link [src] to the one in [I]'s buffer.") + to_chat(user, span_notice("You 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, "You insert [K] into [src]'s card slot, activating it.") + to_chat(user, span_notice("You insert [K] into [src]'s card slot, activating it.")) interact(user, K.qpad) else - to_chat(user, "You insert [K] into [src]'s card slot, initiating the link procedure.") + to_chat(user, span_notice("You insert [K] into [src]'s card slot, initiating the link procedure.")) if(do_after(user, 40, target = src)) - to_chat(user, "You complete the link between [K] and [src].") + to_chat(user, span_notice("You 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) @@ -144,11 +144,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 e5c64e76439a..5f6d6a8edd60 100755 --- 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) @@ -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, "You [anchored ? "attached" : "detached"] [src].") + to_chat(user, span_notice("You [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, "Your gun has no external power connector.") + to_chat(user, span_notice("Your 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/recycler.dm b/code/game/machinery/recycler.dm index bcc9b54573eb..718384f0663e 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -69,7 +69,7 @@ safety_mode = FALSE update_icon() playsound(src, "sparks", 75, TRUE, -1) - to_chat(user, "You use the cryptographic sequencer on [src].") + to_chat(user, span_notice("You use the cryptographic sequencer on [src].")) /obj/machinery/recycler/update_icon() ..() diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 5a0781eacbc4..6711155037c1 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -404,10 +404,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, "You close the maintenance panel.") + to_chat(user, span_notice("You close the maintenance panel.")) open = FALSE else - to_chat(user, "You open the maintenance panel.") + to_chat(user, span_notice("You open the maintenance panel.")) open = TRUE update_icon() return @@ -415,12 +415,12 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) if(open) hackState = !hackState if(hackState) - to_chat(user, "You modify the wiring.") + to_chat(user, span_notice("You modify the wiring.")) else - to_chat(user, "You reset the wiring.") + to_chat(user, span_notice("You reset the wiring.")) update_icon() else - to_chat(user, "You must open the maintenance panel first!") + to_chat(user, span_warning("You must open the maintenance panel first!")) return var/obj/item/card/id/ID = O.GetID() @@ -433,13 +433,13 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) announceAuth = TRUE else announceAuth = FALSE - to_chat(user, "You are not authorized to send announcements!") + to_chat(user, span_warning("You 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/scan_gate.dm b/code/game/machinery/scan_gate.dm index 9359e26b2a54..7ae7a322c2f0 100644 --- a/code/game/machinery/scan_gate.dm +++ b/code/game/machinery/scan_gate.dm @@ -45,9 +45,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) . = ..() @@ -71,14 +71,14 @@ if(allowed(user)) locked = FALSE req_access = list() - to_chat(user, "You unlock [src].") + to_chat(user, span_notice("You unlock [src].")) else if(!(obj_flags & EMAGGED)) - to_chat(user, "You lock [src] with [W].") + to_chat(user, span_notice("You lock [src] with [W].")) var/list/access = W.GetAccess() req_access = access locked = TRUE else - to_chat(user, "You try to lock [src] with [W], but nothing happens.") + to_chat(user, span_warning("You try to lock [src] with [W], but nothing happens.")) else return ..() @@ -88,7 +88,7 @@ locked = FALSE req_access = list() obj_flags |= EMAGGED - to_chat(user, "You fry the ID checking system.") + to_chat(user, span_notice("You fry the ID checking system.")) /obj/machinery/scanner_gate/proc/perform_scan(mob/living/M) var/beep = FALSE diff --git a/code/game/machinery/sci_bombardment.dm b/code/game/machinery/sci_bombardment.dm index 622a89a8ba07..1832b143bc91 100644 --- a/code/game/machinery/sci_bombardment.dm +++ b/code/game/machinery/sci_bombardment.dm @@ -79,12 +79,12 @@ if(!scibomb) scibomb = B playsound(src, 'sound/effects/bin_close.ogg', 100, 1) - to_chat(usr, "You load [B] into the firing mechanism.") + to_chat(usr, span_notice("You load [B] into the firing mechanism.")) update_icon() else - to_chat(usr, "There is already a transfer valve loaded in the firing mechanism!") + to_chat(usr, span_warning("There is already a transfer valve loaded in the firing mechanism!")) else - to_chat(usr, "[B] is refused, as it is invalid or incomplete.") + to_chat(usr, span_warning("[B] is refused, as it is invalid or incomplete.")) return /** @@ -201,7 +201,7 @@ locked = !locked radio.talk_into(src, "Controls [locked ? "locked" : "unlocked"] by [I.registered_name].",) else - to_chat(usr, "Access denied. Please seek assistance from station AI or Research Director.") + to_chat(usr, span_warning("Access denied. Please seek assistance from station AI or Research Director.")) update_icon() . = TRUE if("count")//Prompts user to change countdown timer (Minimum based on var/mincount) @@ -209,17 +209,17 @@ return var/a = text2num(stripped_input(usr, "Set a new countdown timer. (Minimum [mincount])", name, mincount)) countdown = max(a, mincount) - to_chat(usr, "Countdown set to [countdown] seconds.") + to_chat(usr, span_notice("Countdown set to [countdown] seconds.")) . = TRUE if("unload")//If unlocked, allows user to remove TTV from the machine, if present if(!scibomb || locked) return if(!stopcount) playsound(src, 'sound/misc/box_deploy.ogg', 80, 0.5) - to_chat(usr, "It's too late to do that now! There's only [tick] seconds remaining! Abort!") + to_chat(usr, span_warning("It's too late to do that now! There's only [tick] seconds remaining! Abort!")) return playsound(src, 'sound/machines/blastdoor.ogg', 75, 0) - to_chat(usr, "[scibomb] is ejected from the loading chamber.") + to_chat(usr, span_notice("[scibomb] is ejected from the loading chamber.")) scibomb.forceMove(drop_location()) scibomb = null update_icon() diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 7214875e4bdc..492218d4ed71 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].", \ - "You deactivate \the [src].", \ - "You hear heavy droning fade out.") + span_notice("You deactivate \the [src]."), \ + span_italics("You hear heavy droning fade out.")) shields_down() else if(anchored) user.visible_message("[user] activated \the [src].", \ - "You activate \the [src].", \ - "You hear heavy droning.") + span_notice("You activate \the [src]."), \ + span_italics("You 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, "You open the panel and expose the wiring.") + to_chat(user, span_notice("You open the panel and expose the wiring.")) else - to_chat(user, "You close the panel.") + to_chat(user, span_notice("You 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, "You need one length of cable to repair [src]!") + to_chat(user, span_warning("You need one length of cable to repair [src]!")) return - to_chat(user, "You begin to replace the wires...") + to_chat(user, span_notice("You 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, "You repair \the [src].") + to_chat(user, span_notice("You 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, "You secure \the [src] to the floor!") + to_chat(user, span_notice("You secure \the [src] to the floor!")) setAnchored(TRUE) else if(anchored) W.play_tool_sound(src, 100) - to_chat(user, "You unsecure \the [src] from the floor!") + to_chat(user, span_notice("You 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, "You [locked ? "lock" : "unlock"] the controls.") + to_chat(user, span_notice("You [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, 1) - to_chat(user, "You short out the access controller.") + to_chat(user, span_warning("You short out the access controller.")) /obj/machinery/shieldgen/update_icon() if(active) @@ -279,8 +279,8 @@ if(fields) active = ACTIVE_HASFIELDS if(!power) - visible_message("The [src.name] shuts down due to lack of power!", \ - "You hear heavy droning fade out.") + visible_message(span_danger("The [src.name] shuts down due to lack of power!"), \ + span_italics("You hear heavy droning fade out.")) icon_state = "Shield_Gen" active = FALSE for(var/d in GLOB.cardinals) @@ -337,7 +337,7 @@ /obj/machinery/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 ..() @@ -348,11 +348,11 @@ else if(W.GetID()) if(allowed(user) && !(obj_flags & EMAGGED)) locked = !locked - to_chat(user, "You [src.locked ? "lock" : "unlock"] the controls.") + to_chat(user, span_notice("You [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) @@ -363,37 +363,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(!power) - 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.", \ - "You turn off \the [src].", \ - "You hear heavy droning fade out.") + span_notice("You turn off \the [src]."), \ + span_italics("You hear heavy droning fade out.")) active = FALSE update_activity() else user.visible_message("[user] turned \the [src] on.", \ - "You turn on \the [src].", \ - "You hear heavy droning.") + span_notice("You turn on \the [src]."), \ + span_italics("You hear heavy droning.")) active = ACTIVE_SETUPFIELDS update_activity() add_fingerprint(user) /obj/machinery/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, 1) - to_chat(user, "You short out the access controller.") + to_chat(user, span_warning("You short out the access controller.")) //////////////Containment Field START /obj/machinery/shieldwall @@ -416,7 +416,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 d5001cf8bc2f..ee7927463e40 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, "You insert a [C.cmineral] coin into [src]'s slot!") + to_chat(user, span_notice("You insert a [C.cmineral] coin 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, "You insert [H.credits] holocredits into [src]'s holoreader!") + to_chat(user, span_notice("You insert [H.credits] holocredits into [src]'s holoreader!")) 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 @@ -195,7 +195,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" @@ -223,14 +223,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, "You need to wait until the machine stops spinning before you can play again!") + to_chat(user, span_warning("You 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 @@ -273,12 +273,12 @@ give_money(SMALL_PRIZE) else if(linelength == 3) - to_chat(user, "You win three free games!") + to_chat(user, span_notice("You 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 e7c026c97bc1..a5c28d67a8b5 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -143,20 +143,20 @@ 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].", "You insert the power cell into \the [src].") + user.visible_message("\The [user] inserts a power cell into \the [src].", span_notice("You 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].", "You [panel_open ? "open" : "close"] the hatch on \the [src].") + user.visible_message("\The [user] [panel_open ? "opens" : "closes"] the hatch on \the [src].", span_notice("You [panel_open ? "open" : "close"] the hatch on \the [src].")) update_icon() else if(default_deconstruction_crowbar(I)) return @@ -238,7 +238,7 @@ /obj/machinery/space_heater/proc/togglepower() on = !on mode = HEATER_MODE_STANDBY - usr.visible_message("[usr] switches [on ? "on" : "off"] \the [src].", "You switch [on ? "on" : "off"] \the [src].") + usr.visible_message("[usr] switches [on ? "on" : "off"] \the [src].", span_notice("You 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 009f0c3bbfe6..1733bd385d0d 100644 --- a/code/game/machinery/stasis.dm +++ b/code/game/machinery/stasis.dm @@ -30,9 +30,9 @@ /obj/machinery/stasis/examine(mob/user) . = ..() - . += "Alt-click to [stasis_enabled ? "turn off" : "turn on"] the machine." + . += span_notice("Alt-click to [stasis_enabled ? "turn off" : "turn on"] the machine.") if(obj_flags & EMAGGED) - . += "There's a worrying blue mist surrounding it." + . += span_warning("There's a worrying blue mist surrounding it.") /obj/machinery/stasis/proc/play_power_sound() var/_running = stasis_running() @@ -106,7 +106,7 @@ target.ExtinguishMob() use_power = ACTIVE_POWER_USE if(obj_flags & EMAGGED) - to_chat(target, "Your limbs start to feel numb...") + to_chat(target, span_warning("Your limbs start to feel numb...")) /obj/machinery/stasis/proc/thaw_them(mob/living/target) target.remove_status_effect(STATUS_EFFECT_STASIS) @@ -173,9 +173,9 @@ /obj/machinery/stasis/emag_act(mob/user) if(obj_flags & EMAGGED) - to_chat(user, "The stasis bed's safeties are already overriden!") + to_chat(user, span_warning("The stasis bed's safeties are already overriden!")) return - to_chat(user, "You override the stasis bed's safeties!") + to_chat(user, span_notice("You override the stasis bed's safeties!")) obj_flags |= EMAGGED #undef STASIS_TOGGLE_COOLDOWN diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 615d34d9feab..22637ac1807c 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -195,27 +195,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]!", "You start working your way into [src]...") + user.visible_message(span_warning("[user] starts squeezing into [src]!"), span_notice("You 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_userdanger("[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()]!", "You slip into [src]'s cramped space and shut its door.") + user.visible_message(span_warning("[user] slips into [src] and closes the door behind [user.p_them()]!"), "You 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("[user] pushes [target] into [src] and shuts its door!", span_userdanger("[user] shoves you into [src] and shuts the door!")) close_machine(target) add_fingerprint(user) @@ -238,7 +238,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/machines/airlock_alien_prying.ogg', 50, 1) helmet = null qdel(helmet) @@ -252,9 +252,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.")) playsound(src, 'sound/machines/airlockclose.ogg', 25, 1) var/list/things_to_clear = list() //Done this way since using GetAllContents on the SSU itself would include circuitry and such. if(suit) @@ -291,7 +291,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() @@ -303,21 +303,21 @@ return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user.visible_message("You see [user] kicking against the doors of [src]!", \ - "You start kicking against the doors... (this will take about [DisplayTimeText(breakout_time)].)", \ - "You hear a thump from [src].") + user.visible_message(span_notice("You see [user] kicking against the doors of [src]!"), \ + span_notice("You start kicking against the doors... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_italics("You 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]!", \ - "You successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("You successfully break out of [src]!")) open_machine() dump_contents() add_fingerprint(user) if(locked) - visible_message("You see [user] kicking against the doors of [src]!", \ - "You start kicking against the doors...") + visible_message(span_notice("You see [user] kicking against the doors of [src]!"), \ + span_notice("You start kicking against the doors...")) addtimer(CALLBACK(src, .proc/resist_open, user), 300) else open_machine() @@ -325,42 +325,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("You see [user] burst out of [src]!", \ - "You escape the cramped confines of [src]!") + visible_message(span_notice("You see [user] burst out of [src]!"), \ + span_notice("You 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].", "You load [I] into [src].") + visible_message(span_notice("[user] inserts [I] into [src]."), span_notice("You load [I] into [src].")) update_icon() return @@ -380,7 +380,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].", "You pry open \the [src].") + visible_message(span_notice("[usr] pries open \the [src]."), span_notice("You pry open \the [src].")) open_machine() /obj/machinery/suit_storage_unit/ui_interact(mob/user, datum/tgui/ui) @@ -443,7 +443,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_userdanger("[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 3683fe5fb7f6..82dd5ab0aa33 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, "You activate the beacon.") + to_chat(user, span_notice("You 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, "You deactivate the beacon.") + to_chat(user, span_notice("You deactivate the beacon.")) /obj/machinery/power/singularity_beacon/attack_ai(mob/user) @@ -53,25 +53,25 @@ if(anchored) return active ? Deactivate(user) : Activate(user) else - to_chat(user, "You need to screw the beacon to the floor first!") + to_chat(user, span_warning("You need to screw the beacon to the floor first!")) /obj/machinery/power/singularity_beacon/attackby(obj/item/W, mob/user, params) if(W.tool_behaviour == TOOL_SCREWDRIVER) if(active) - to_chat(user, "You need to deactivate the beacon first!") + to_chat(user, span_warning("You need to deactivate the beacon first!")) return if(anchored) setAnchored(FALSE) - to_chat(user, "You unscrew the beacon from the floor.") + to_chat(user, span_notice("You unscrew the beacon from the floor.")) disconnect_from_network() return else if(!connect_to_network()) - to_chat(user, "This device must be placed over an exposed, powered cable node!") + to_chat(user, span_warning("This device must be placed over an exposed, powered cable node!")) return setAnchored(TRUE) - to_chat(user, "You screw the beacon to the floor and attach the cable.") + to_chat(user, span_notice("You screw the beacon to the floor and attach the cable.")) return else return ..() @@ -116,7 +116,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/effects/pop.ogg', 100, 1, 1) qdel(src) diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 9b4c581e3c68..768793b418df 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, "You firmly wrench the bomb to the floor.") + to_chat(user, span_notice("You 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, "You wrench the bomb from the floor.") + to_chat(user, span_notice("You 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, "You [open_panel ? "open" : "close"] the wire panel.") + to_chat(user, span_notice("You [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, "You carefully pry out [payload].") + to_chat(user, span_notice("You 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, "You place [payload] into [src].") + to_chat(user, span_notice("You 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, "You start to cut [src] apart...") + to_chat(user, span_notice("You start to cut [src] apart...")) if(I.use_tool(src, user, 20, volume=50, amount=5)) //uses up 5 fuel - to_chat(user, "You cut [src] apart.") + to_chat(user, span_notice("You 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 @@ -194,10 +194,10 @@ var/new_timer = input(user, "Please set the timer.", "Timer", "[timer_set]") as num 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) @@ -312,7 +312,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) @@ -322,7 +322,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() @@ -443,9 +443,9 @@ if(!user.transferItemToLoc(I, src)) return beakers += I - to_chat(user, "You load [src] with [I].") + to_chat(user, span_notice("You 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 ..() @@ -527,7 +527,7 @@ detonated++ existent++ playsound(user, 'sound/machines/click.ogg', 20, 1) - 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 feece3aabe87..94ebf9bbff2a 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 41efb704def1..859d3e17a274 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/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 = "%$&(£: 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/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() ..() @@ -243,10 +243,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 @@ -293,10 +293,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 @@ -313,14 +313,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) @@ -331,12 +331,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 @@ -358,7 +358,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? @@ -367,7 +367,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) @@ -413,11 +413,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/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 2048b2428b3e..6d959a6de2f9 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -101,7 +101,7 @@ if("id") if(params["value"]) if(length(params["value"]) > 32) - to_chat(operator, "Error: Machine ID too long!") + to_chat(operator, span_warning("Error: Machine ID too long!")) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE) return else @@ -111,7 +111,7 @@ if("network") if(params["value"]) if(length(params["value"]) > 15) - to_chat(operator, "Error: Network name too long!") + to_chat(operator, span_warning("Error: Network name too long!")) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE) return else @@ -127,7 +127,7 @@ if("freq") var/newfreq = tempfreq if(newfreq == FREQ_SYNDICATE) - to_chat(operator, "Error: Interference preventing filtering frequency: \"[newfreq] GHz\"") + to_chat(operator, span_warning("Error: Interference preventing filtering frequency: \"[newfreq] GHz\"")) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE) else if(!(newfreq in freq_listening) && newfreq < 10000) diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index 0db00f29b737..1723b9d2a963 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -26,21 +26,21 @@ if(stored) user.put_in_hands(stored) stored = null - to_chat(user, "You remove the blackbox from [src]. The tapes stop spinning.") + to_chat(user, span_notice("You remove the blackbox from [src]. The tapes stop spinning.")) update_icon() return else - to_chat(user, "It seems that the blackbox is missing...") + to_chat(user, span_warning("It seems that the blackbox is missing...")) return /obj/machinery/blackbox_recorder/attackby(obj/item/I, mob/living/user, params) . = ..() if(istype(I, /obj/item/blackbox)) 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] clicks [I] into [src]!", \ - "You press the device into [src], and it clicks into place. The tapes begin spinning again.") + user.visible_message(span_notice("[user] clicks [I] into [src]!"), \ + span_notice("You press the device into [src], and it clicks into place. The tapes begin spinning again.")) playsound(src, 'sound/machines/click.ogg', 50, TRUE) stored = I update_icon() @@ -109,7 +109,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/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index ae227a1a8354..26ef12cd4caf 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -196,5 +196,5 @@ GLOBAL_LIST_EMPTY(telecomms_list) /obj/machinery/telecomms/emag_act() obj_flags |= EMAGGED - visible_message("Sparks fly out of the [src]!") + visible_message(span_notice("Sparks fly out of the [src]!")) traffic += 50 diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 3b8e0144bc81..02bd2258e571 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -70,7 +70,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 (ismovable(M)) if(do_teleport(M, com.target, channel = TELEPORT_CHANNEL_BLUESPACE)) @@ -80,7 +80,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, "You hear a buzzing in your ears.") + to_chat(M, span_italics("You hear a buzzing in your ears.")) human.set_species(/datum/species/fly) human.apply_effect((rand(120 - accuracy * 40, 180 - accuracy * 60)), EFFECT_IRRADIATE, 0) @@ -168,15 +168,15 @@ var/obj/item/multitool/M = W if(panel_open) M.buffer = src - to_chat(user, "You download the data to the [W.name]'s buffer.") + to_chat(user, span_caution("You 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, "You upload the data from the [W.name]'s buffer.") + to_chat(user, span_caution("You 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() @@ -188,7 +188,7 @@ else if(W.tool_behaviour == TOOL_WIRECUTTER) if(panel_open) link_console_and_hub() - to_chat(user, "You reconnect the station to nearby machinery.") + to_chat(user, span_caution("You reconnect the station to nearby machinery.")) return else return ..() @@ -201,13 +201,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 20ec0d437b1e..ef35c679d10c 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -12,7 +12,7 @@ /obj/machinery/washing_machine/examine(mob/user) . = ..() - . += "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))) @@ -22,11 +22,11 @@ return if(state_open) - to_chat(user, "Close the door first") + to_chat(user, span_notice("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 @@ -248,19 +248,19 @@ else if(user.a_intent != INTENT_HARM) if (!state_open) - to_chat(user, "Open the door first!") + to_chat(user, span_warning("Open the door first!")) return 1 if(bloody_mess) - to_chat(user, "[src] must be cleaned up first.") + to_chat(user, span_warning("[src] must be cleaned up first.")) return 1 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 1 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 1 if(istype(W, /obj/item/toy/crayon) || istype(W, /obj/item/stamp) || istype(W, /obj/item/reagent_containers/food/snacks/grown/rainbow_flower) || istype(W, /obj/item/stack/ore/bluespace_crystal)) @@ -275,7 +275,7 @@ if(.) return if(busy) - to_chat(user, "[src] is busy.") + to_chat(user, span_warning("[src] is busy.")) return if(user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling)) diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 9559c9e9da69..b7449b69d779 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -40,7 +40,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) chassis = null return ..() @@ -50,9 +50,9 @@ if(!user.temporarilyRemoveItemFromInventory(src)) return FALSE attach(M) - user.visible_message("[user] attaches [src] to [M].", "You attach [src] to [M].") + user.visible_message("[user] attaches [src] to [M].", span_notice("You attach [src] to [M].")) return TRUE - to_chat(user, "You are unable to attach [src] to [M]!") + to_chat(user, span_warning("You 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 02f2b51c9b79..cb9c3d106864 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("You start putting [target] into [src]...") - chassis.visible_message("[chassis] starts putting [target] into \the [src].") + occupant_message(span_notice("You 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 @@ -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 ..() diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm index bae8f5046cfb..df17aace31fa 100644 --- a/code/game/mecha/equipment/tools/mining_tools.dm +++ b/code/game/mecha/equipment/tools/mining_tools.dm @@ -29,9 +29,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]...", \ - "You hear drilling.") + target.visible_message(span_warning("[chassis] starts to drill [target]."), \ + span_userdanger("[chassis] starts to drill [target]..."), \ + span_italics("You hear drilling.")) if(do_after_cooldown(target)) set_ready_state(FALSE) @@ -68,7 +68,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)) @@ -107,8 +107,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_userdanger("[chassis] is drilling you with [src]!")) log_combat(user, target, "drilled", "[name]", "(INTENT: [uppertext(user.a_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 60c8627d4480..401b4e54acd0 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -422,7 +422,7 @@ occupant_message("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) diff --git a/code/game/mecha/equipment/tools/weapon_bay.dm b/code/game/mecha/equipment/tools/weapon_bay.dm index 1b3db529cc5a..e1d1e1034966 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 ..() \ No newline at end of file diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm index 244bd50158df..2f43ffd01e74 100644 --- a/code/game/mecha/equipment/tools/work_tools.dm +++ b/code/game/mecha/equipment/tools/work_tools.dm @@ -63,14 +63,14 @@ 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 @@ -82,9 +82,9 @@ return M.adjustOxyLoss(round(dam_force/2)) M.updatehealth() - target.visible_message("[chassis] squeezes [target].", \ - "[chassis] squeezes [target].",\ - "You hear something crack.") + target.visible_message(span_danger("[chassis] squeezes [target]."), \ + span_userdanger("[chassis] squeezes [target]."),\ + span_italics("You hear something crack.")) log_combat(chassis.occupant, M, "attacked", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])") else step_away(M,chassis) @@ -123,14 +123,14 @@ 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 @@ -143,12 +143,12 @@ return M.adjustOxyLoss(round(dam_force/2)) M.updatehealth() - target.visible_message("[chassis] destroys [target] in an unholy fury.", \ - "[chassis] destroys [target] in an unholy fury.") + target.visible_message(span_danger("[chassis] destroys [target] in an unholy fury."), \ + span_userdanger("[chassis] destroys [target] in an unholy fury.")) log_combat(chassis.occupant, M, "attacked", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])") else - target.visible_message("[chassis] destroys [target] in an unholy fury.", \ - "[chassis] destroys [target] in an unholy fury.") + target.visible_message(span_danger("[chassis] destroys [target] in an unholy fury."), \ + span_userdanger("[chassis] destroys [target] in an unholy fury.")) else if(chassis.occupant.a_intent == INTENT_DISARM) if(real_clamp) var/mob/living/carbon/C = target @@ -166,12 +166,12 @@ 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 [target]'s arms off.") + target.visible_message(span_danger("[chassis] rips [target]'s arms off."), \ + span_userdanger("[chassis] rips [target]'s arms off.")) log_combat(chassis.occupant, M, "dismembered of[limbs_gone],", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])") else - target.visible_message("[chassis] rips [target]'s arms off.", \ - "[chassis] rips [target]'s arms off.") + target.visible_message(span_danger("[chassis] rips [target]'s arms off."), \ + span_userdanger("[chassis] rips [target]'s arms off.")) else step_away(M,chassis) target.visible_message("[chassis] tosses [target] like a piece of paper.") @@ -199,7 +199,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/effects/refill.ogg', 50, 1, -6) else if(reagents.total_volume > 0) @@ -394,12 +394,12 @@ cable = new(src, 0) cable.amount += to_load target.use(to_load) - occupant_message("[to_load] meters of cable successfully loaded.") + occupant_message(span_notice("[to_load] meters of cable successfully loaded.")) send_byjax(chassis.occupant,"exosuit.browser","[REF(src)]",src.get_equip_info()) else - occupant_message("Reel is full.") + occupant_message(span_warning("Reel is full.")) else - occupant_message("Unable to load [target] - no cable found.") + occupant_message(span_warning("Unable to load [target] - no cable found.")) /obj/item/mecha_parts/mecha_equipment/cable_layer/Topic(href,href_list) @@ -491,16 +491,16 @@ /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 return TRUE diff --git a/code/game/mecha/equipment/weapons/mecha_ammo.dm b/code/game/mecha/equipment/weapons/mecha_ammo.dm index 6e151b800eeb..27508b8366dc 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, "You cannot flatten the ammo box until it's empty!") + to_chat(user, span_warning("You cannot flatten the ammo box until it's empty!")) return - to_chat(user, "You fold [src] flat.") + to_chat(user, span_notice("You 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_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 67e6d565e7c9..a42312a51469 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -623,7 +623,7 @@ if(..()) return TRUE 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 default_deconstruction_screwdriver(user, "fab-o", "fab-idle", I) @@ -631,16 +631,16 @@ if(..()) return TRUE 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 default_deconstruction_crowbar(I) /obj/machinery/mecha_part_fabricator/proc/is_insertion_ready(mob/user) if(panel_open) - to_chat(user, "You can't load [src] while it's opened!") + to_chat(user, span_warning("You 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 e27b8780bc66..a7225f12edcf 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -328,7 +328,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. @@ -445,7 +445,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 @@ -495,7 +495,7 @@ if(user.incapacitated()) return if(state) - occupant_message("Maintenance protocols in effect.") + occupant_message(span_warning("Maintenance protocols in effect.")) return if(!get_charge()) return @@ -513,13 +513,13 @@ if(!Adjacent(target)) if(selected && selected.is_ranged()) if(HAS_TRAIT(L, TRAIT_PACIFISM) && selected.harmful) - to_chat(user, "You don't want to harm other living beings!") + to_chat(user, span_warning("You 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, "You don't want to harm other living beings!") + to_chat(user, span_warning("You don't want to harm other living beings!")) return if(selected.action(target,params)) selected.start_cooldown() @@ -549,7 +549,7 @@ if(.) events.fireEvent("onMove",get_turf(src)) if (internal_tank?.disconnect()) // Something moved us and broke connection - occupant_message("Air port connection teared off!") + occupant_message(span_warning("Air port connection teared off!")) log_message("Lost connection to gas port.", LOG_MECHA) /obj/mecha/Process_Spacemove(var/movement_dir = 0) @@ -564,7 +564,7 @@ if(istype(backup) && movement_dir && !backup.anchored) if(backup.newtonian_move(turn(movement_dir, 180))) if(occupant) - to_chat(occupant, "You push off of [backup] to propel yourself.") + to_chat(occupant, span_info("You push off of [backup] to propel yourself.")) return TRUE /obj/mecha/relaymove(mob/user,direction) @@ -574,16 +574,16 @@ return if(user != occupant) //While not "realistic", this piece is player friendly. user.forceMove(get_turf(src)) - to_chat(user, "You climb out from [src].") + to_chat(user, span_notice("You climb out from [src].")) return FALSE 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 FALSE if(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) @@ -597,7 +597,7 @@ return FALSE if(defence_mode) if(world.time - last_message > 20) - occupant_message("Unable to move while in defence mode") + occupant_message(span_danger("Unable to move while in defence mode")) last_message = world.time return FALSE if(zoom_mode) @@ -607,12 +607,12 @@ return FALSE 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 FALSE 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 FALSE @@ -658,7 +658,7 @@ /obj/mecha/Bump(var/atom/obstacle) var/turf/newloc = get_step(src,dir) if(newloc.flags_1 & NOJAUNT_1) - to_chat(occupant, "Some strange aura is blocking the way.") + to_chat(occupant, span_warning("Some strange aura is blocking the way.")) return if(phasing && get_charge() >= phasing_energy_drain && !throwing) spawn() @@ -726,11 +726,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() @@ -745,7 +745,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! @@ -753,7 +753,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 = FALSE for(var/obj/item/mecha_parts/mecha_tracking/ai_control/A in trackers) @@ -761,7 +761,7 @@ to_chat(user, "[icon2html(src, user)] Status of [name]:\n[A.get_mecha_info()]") break if(!can_control_mech) - to_chat(user, "You cannot control exosuits without AI control beacons installed.") + to_chat(user, span_warning("You cannot control exosuits without AI control beacons installed.")) return to_chat(user, "Take control of exosuit?
") @@ -773,11 +773,11 @@ switch(interaction) if(AI_TRANS_TO_CARD) //Upload AI from mech to AI card. if(!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 @@ -798,23 +798,23 @@ 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, "You have been forcibly ejected!") + to_chat(AI, span_warning("Pilot detected! Forced ejection initiated!")) + to_chat(occupant, span_danger("You 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 @@ -838,8 +838,8 @@ 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 = FALSE //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!" :\ - "You have been uploaded to a mech's onboard computer.") + 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("You 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.") if(interaction == AI_TRANS_FROM_CARD) GrantActions(AI, FALSE) //No eject/return to core action for AI uploaded by card @@ -901,7 +901,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) @@ -911,19 +911,19 @@ 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, "You are currently buckled and cannot move.") + to_chat(user, span_warning("You 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, "You can't enter the exosuit with other creatures attached to you!") + to_chat(user, span_warning("You can't enter the exosuit with other creatures attached to you!")) log_message("Permission denied (Attached mobs).", LOG_MECHA) return @@ -931,17 +931,17 @@ if(do_after(user, enter_delay, target = src)) if(obj_integrity <= 0) - to_chat(user, "You cannot get in the [name], it has been destroyed!") + to_chat(user, span_warning("You 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, "You can't enter the exosuit while buckled.") + to_chat(user, span_warning("You can't enter the exosuit while buckled.")) else if(user.has_buckled_mobs()) - to_chat(user, "You can't enter the exosuit with other creatures attached to you!") + to_chat(user, span_warning("You can't enter the exosuit with other creatures attached to you!")) else moved_inside(user) else - to_chat(user, "You stop entering the exosuit!") + to_chat(user, span_warning("You stop entering the exosuit!")) return /obj/mecha/proc/moved_inside(mob/living/carbon/human/H) @@ -964,40 +964,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, "You stop inserting the MMI.") + to_chat(user, span_notice("You 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 @@ -1072,10 +1072,10 @@ return else if(!AI.linked_core) - to_chat(AI, "Inactive core destroyed. Unable to return.") + to_chat(AI, span_userdanger("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) @@ -1175,7 +1175,7 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013??? /obj/mecha/proc/ammo_resupply(var/obj/item/mecha_ammo/A, mob/user,var/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 @@ -1196,7 +1196,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,1) - to_chat(user, "You add [ammo_needed] [A.round_term][ammo_needed > 1?"s":""] to the [gun.name]") + to_chat(user, span_notice("You 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 @@ -1207,13 +1207,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,1) - to_chat(user, "You add [A.rounds] [A.round_term][A.rounds > 1?"s":""] to the [gun.name]") + to_chat(user, span_notice("You 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, "You can't fit any more ammo of this type!") + to_chat(user, span_notice("You 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 10903a42a9ac..00c67fd64be5 100644 --- a/code/game/mecha/mecha_actions.dm +++ b/code/game/mecha/mecha_actions.dm @@ -179,10 +179,10 @@ button_icon_state = "mech_defense_mode_[chassis.defence_mode ? "on" : "off"]" if(chassis.defence_mode) chassis.deflect_chance = chassis.defence_mode_deflect_chance - chassis.occupant_message("You enable [chassis] defence mode.") + chassis.occupant_message(span_notice("You enable [chassis] defence mode.")) else chassis.deflect_chance = initial(chassis.deflect_chance) - chassis.occupant_message("You disable [chassis] defence mode.") + chassis.occupant_message(span_danger("You disable [chassis] defence mode.")) chassis.log_message("Toggled defence mode.", LOG_MECHA) UpdateButtonIcon() @@ -206,13 +206,13 @@ chassis.bumpsmash = 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("You enable leg actuators overload.") + chassis.occupant_message(span_danger("You enable leg actuators overload.")) else chassis.leg_overload_mode = 0 chassis.bumpsmash = initial(chassis.bumpsmash) chassis.step_in = initial(chassis.step_in) chassis.step_energy_drain = chassis.normal_step_energy_drain - chassis.occupant_message("You disable leg actuators overload.") + chassis.occupant_message(span_notice("You disable leg actuators overload.")) UpdateButtonIcon() /datum/action/innate/mecha/mech_smoke diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 2747930e6c59..79a9eb277d8e 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -59,7 +59,7 @@ . = user.transferItemToLoc(I, parent) if(.) var/atom/parent_atom = parent - user.visible_message("[user] has connected [I] to [parent].", "You connect [I] to [parent].") + user.visible_message("[user] has connected [I] to [parent].", span_notice("You connect [I] to [parent].")) parent_atom.add_overlay(I.icon_state+"+o") qdel(I) @@ -296,102 +296,102 @@ switch(index) if(1) - user.visible_message("[user] connects [parent] hydraulic systems", "You connect [parent] hydraulic systems.") + user.visible_message("[user] connects [parent] hydraulic systems", span_notice("You connect [parent] hydraulic systems.")) if(2) if(diff==FORWARD) - user.visible_message("[user] activates [parent] hydraulic systems.", "You activate [parent] hydraulic systems.") + user.visible_message("[user] activates [parent] hydraulic systems.", span_notice("You activate [parent] hydraulic systems.")) else - user.visible_message("[user] disconnects [parent] hydraulic systems", "You disconnect [parent] hydraulic systems.") + user.visible_message("[user] disconnects [parent] hydraulic systems", span_notice("You disconnect [parent] hydraulic systems.")) if(3) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to [parent].", "You add the wiring to [parent].") + user.visible_message("[user] adds the wiring to [parent].", span_notice("You add the wiring to [parent].")) else - user.visible_message("[user] deactivates [parent] hydraulic systems.", "You deactivate [parent] hydraulic systems.") + user.visible_message("[user] deactivates [parent] hydraulic systems.", span_notice("You deactivate [parent] hydraulic systems.")) if(4) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of [parent].", "You adjust the wiring of [parent].") + user.visible_message("[user] adjusts the wiring of [parent].", span_notice("You adjust the wiring of [parent].")) else - user.visible_message("[user] removes the wiring from [parent].", "You remove the wiring from [parent].") + user.visible_message("[user] removes the wiring from [parent].", span_notice("You remove the wiring from [parent].")) if(5) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] disconnects the wiring of [parent].", "You disconnect the wiring of [parent].") + user.visible_message("[user] disconnects the wiring of [parent].", span_notice("You disconnect the wiring of [parent].")) if(6) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") + user.visible_message("[user] secures the mainboard.", span_notice("You secure the mainboard.")) else - user.visible_message("[user] removes the central control module from [parent].", "You remove the central computer mainboard from [parent].") + user.visible_message("[user] removes the central control module from [parent].", span_notice("You remove the central computer mainboard from [parent].")) if(7) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") + user.visible_message("[user] unfastens the mainboard.", span_notice("You unfasten the mainboard.")) if(8) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") + user.visible_message("[user] secures the peripherals control module.", span_notice("You secure the peripherals control module.")) else - user.visible_message("[user] removes the peripherals control module from [parent].", "You remove the peripherals control module from [parent].") + user.visible_message("[user] removes the peripherals control module from [parent].", span_notice("You remove the peripherals control module from [parent].")) if(9) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") + user.visible_message("[user] unfastens the peripherals control module.", span_notice("You unfasten the peripherals control module.")) if(10) if(diff==FORWARD) - user.visible_message("[user] secures the scanner module.", "You secure the scanner module.") + user.visible_message("[user] secures the scanner module.", span_notice("You secure the scanner module.")) else - user.visible_message("[user] removes the scanner module from [parent].", "You remove the scanner module from [parent].") + user.visible_message("[user] removes the scanner module from [parent].", span_notice("You remove the scanner module from [parent].")) if(11) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "You install [I] to [parent].") + user.visible_message("[user] installs [I] to [parent].", span_notice("You install [I] to [parent].")) else - user.visible_message("[user] unfastens the scanner module.", "You unfasten the scanner module.") + user.visible_message("[user] unfastens the scanner module.", span_notice("You unfasten the scanner module.")) if(12) if(diff==FORWARD) - user.visible_message("[user] secures the capacitor.", "You secure the capacitor.") + user.visible_message("[user] secures the capacitor.", span_notice("You secure the capacitor.")) else - user.visible_message("[user] removes the capacitor from [parent].", "You remove the capacitor from [parent].") + user.visible_message("[user] removes the capacitor from [parent].", span_notice("You remove the capacitor from [parent].")) if(13) if(diff==FORWARD) - user.visible_message("[user] installs [I].", "You install [I].") + user.visible_message("[user] installs [I].", span_notice("You install [I].")) else - user.visible_message("[user] unsecures the capacitor from [parent].", "You unsecure the capacitor from [parent].") + user.visible_message("[user] unsecures the capacitor from [parent].", span_notice("You unsecure the capacitor from [parent].")) if(14) if(diff==FORWARD) - user.visible_message("[user] secures the power cell.", "You secure the power cell.") + user.visible_message("[user] secures the power cell.", span_notice("You secure the power cell.")) else - user.visible_message("[user] pries the power cell from [parent].", "You pry the power cell from [parent].") + user.visible_message("[user] pries the power cell from [parent].", span_notice("You pry the power cell from [parent].")) if(15) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to [parent].", "You install the internal armor layer to [parent].") + user.visible_message("[user] installs the internal armor layer to [parent].", span_notice("You install the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + user.visible_message("[user] unfastens the power cell.", span_notice("You unfasten the power cell.")) if(16) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") + user.visible_message("[user] secures the internal armor layer.", span_notice("You secure the internal armor layer.")) else - user.visible_message("[user] pries internal armor layer from [parent].", "You pry internal armor layer from [parent].") + user.visible_message("[user] pries internal armor layer from [parent].", span_notice("You pry internal armor layer from [parent].")) if(17) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to [parent].", "You weld the internal armor layer to [parent].") + user.visible_message("[user] welds the internal armor layer to [parent].", span_notice("You weld the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") + user.visible_message("[user] unfastens the internal armor layer.", span_notice("You unfasten the internal armor layer.")) if(18) if(diff==FORWARD) - user.visible_message("[user] installs the external reinforced armor layer to [parent].", "You install the external reinforced armor layer to [parent].") + user.visible_message("[user] installs the external reinforced armor layer to [parent].", span_notice("You install the external reinforced armor layer to [parent].")) else - user.visible_message("[user] cuts the internal armor layer from [parent].", "You cut the internal armor layer from [parent].") + user.visible_message("[user] cuts the internal armor layer from [parent].", span_notice("You cut the internal armor layer from [parent].")) if(19) if(diff==FORWARD) - user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") + user.visible_message("[user] secures the external armor layer.", span_notice("You secure the external reinforced armor layer.")) else - user.visible_message("[user] pries external armor layer from [parent].", "You pry external armor layer from [parent].") + user.visible_message("[user] pries external armor layer from [parent].", span_notice("You pry external armor layer from [parent].")) if(20) if(diff==FORWARD) - user.visible_message("[user] welds the external armor layer to [parent].", "You weld the external armor layer to [parent].") + user.visible_message("[user] welds the external armor layer to [parent].", span_notice("You weld the external armor layer to [parent].")) else - user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") + user.visible_message("[user] unfastens the external armor layer.", span_notice("You unfasten the external armor layer.")) return TRUE /datum/component/construction/unordered/mecha_chassis/gygax @@ -428,112 +428,112 @@ switch(index) if(1) - user.visible_message("[user] connects [parent] hydraulic systems", "You connect [parent] hydraulic systems.") + user.visible_message("[user] connects [parent] hydraulic systems", span_notice("You connect [parent] hydraulic systems.")) if(2) if(diff==FORWARD) - user.visible_message("[user] activates [parent] hydraulic systems.", "You activate [parent] hydraulic systems.") + user.visible_message("[user] activates [parent] hydraulic systems.", span_notice("You activate [parent] hydraulic systems.")) else - user.visible_message("[user] disconnects [parent] hydraulic systems", "You disconnect [parent] hydraulic systems.") + user.visible_message("[user] disconnects [parent] hydraulic systems", span_notice("You disconnect [parent] hydraulic systems.")) if(3) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to [parent].", "You add the wiring to [parent].") + user.visible_message("[user] adds the wiring to [parent].", span_notice("You add the wiring to [parent].")) else - user.visible_message("[user] deactivates [parent] hydraulic systems.", "You deactivate [parent] hydraulic systems.") + user.visible_message("[user] deactivates [parent] hydraulic systems.", span_notice("You deactivate [parent] hydraulic systems.")) if(4) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of [parent].", "You adjust the wiring of [parent].") + user.visible_message("[user] adjusts the wiring of [parent].", span_notice("You adjust the wiring of [parent].")) else - user.visible_message("[user] removes the wiring from [parent].", "You remove the wiring from [parent].") + user.visible_message("[user] removes the wiring from [parent].", span_notice("You remove the wiring from [parent].")) if(5) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] disconnects the wiring of [parent].", "You disconnect the wiring of [parent].") + user.visible_message("[user] disconnects the wiring of [parent].", span_notice("You disconnect the wiring of [parent].")) if(6) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") + user.visible_message("[user] secures the mainboard.", span_notice("You secure the mainboard.")) else - user.visible_message("[user] removes the central control module from [parent].", "You remove the central computer mainboard from [parent].") + user.visible_message("[user] removes the central control module from [parent].", span_notice("You remove the central computer mainboard from [parent].")) if(7) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") + user.visible_message("[user] unfastens the mainboard.", span_notice("You unfasten the mainboard.")) if(8) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") + user.visible_message("[user] secures the peripherals control module.", span_notice("You secure the peripherals control module.")) else - user.visible_message("[user] removes the peripherals control module from [parent].", "You remove the peripherals control module from [parent].") + user.visible_message("[user] removes the peripherals control module from [parent].", span_notice("You remove the peripherals control module from [parent].")) if(9) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") + user.visible_message("[user] unfastens the peripherals control module.", span_notice("You unfasten the peripherals control module.")) if(10) if(diff==FORWARD) - user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") + user.visible_message("[user] secures the weapon control module.", span_notice("You secure the weapon control module.")) else - user.visible_message("[user] removes the weapon control module from [parent].", "You remove the weapon control module from [parent].") + user.visible_message("[user] removes the weapon control module from [parent].", span_notice("You remove the weapon control module from [parent].")) if(11) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "You install [I] to [parent].") + user.visible_message("[user] installs [I] to [parent].", span_notice("You install [I] to [parent].")) else - user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") + user.visible_message("[user] unfastens the weapon control module.", span_notice("You unfasten the weapon control module.")) if(12) if(diff==FORWARD) - user.visible_message("[user] secures the scanner module.", "You secure the scanner module.") + user.visible_message("[user] secures the scanner module.", span_notice("You secure the scanner module.")) else - user.visible_message("[user] removes the scanner module from [parent].", "You remove the scanner module from [parent].") + user.visible_message("[user] removes the scanner module from [parent].", span_notice("You remove the scanner module from [parent].")) if(13) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "You install [I] to [parent].") + user.visible_message("[user] installs [I] to [parent].", span_notice("You install [I] to [parent].")) else - user.visible_message("[user] unfastens the scanner module.", "You unfasten the scanner module.") + user.visible_message("[user] unfastens the scanner module.", span_notice("You unfasten the scanner module.")) if(14) if(diff==FORWARD) - user.visible_message("[user] secures the capacitor.", "You secure the capacitor.") + user.visible_message("[user] secures the capacitor.", span_notice("You secure the capacitor.")) else - user.visible_message("[user] removes the capacitor from [parent].", "You remove the capacitor from [parent].") + user.visible_message("[user] removes the capacitor from [parent].", span_notice("You remove the capacitor from [parent].")) if(15) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the capacitor.", "You unfasten the capacitor.") + user.visible_message("[user] unfastens the capacitor.", span_notice("You unfasten the capacitor.")) if(16) if(diff==FORWARD) - user.visible_message("[user] secures the power cell.", "You secure the power cell.") + user.visible_message("[user] secures the power cell.", span_notice("You secure the power cell.")) else - user.visible_message("[user] pries the power cell from [parent].", "You pry the power cell from [parent].") + user.visible_message("[user] pries the power cell from [parent].", span_notice("You pry the power cell from [parent].")) if(17) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to [parent].", "You install the internal armor layer to [parent].") + user.visible_message("[user] installs the internal armor layer to [parent].", span_notice("You install the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + user.visible_message("[user] unfastens the power cell.", span_notice("You unfasten the power cell.")) if(18) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") + user.visible_message("[user] secures the internal armor layer.", span_notice("You secure the internal armor layer.")) else - user.visible_message("[user] pries internal armor layer from [parent].", "You pry internal armor layer from [parent].") + user.visible_message("[user] pries internal armor layer from [parent].", span_notice("You pry internal armor layer from [parent].")) if(19) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to [parent].", "You weld the internal armor layer to [parent].") + user.visible_message("[user] welds the internal armor layer to [parent].", span_notice("You weld the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") + user.visible_message("[user] unfastens the internal armor layer.", span_notice("You unfasten the internal armor layer.")) if(20) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "You install [I] to [parent].") + user.visible_message("[user] installs [I] to [parent].", span_notice("You install [I] to [parent].")) else - user.visible_message("[user] cuts the internal armor layer from [parent].", "You cut the internal armor layer from [parent].") + user.visible_message("[user] cuts the internal armor layer from [parent].", span_notice("You cut the internal armor layer from [parent].")) if(21) if(diff==FORWARD) - user.visible_message("[user] secures Gygax Armor Plates.", "You secure Gygax Armor Plates.") + user.visible_message("[user] secures Gygax Armor Plates.", span_notice("You secure Gygax Armor Plates.")) else - user.visible_message("[user] pries Gygax Armor Plates from [parent].", "You pry Gygax Armor Plates from [parent].") + user.visible_message("[user] pries Gygax Armor Plates from [parent].", span_notice("You pry Gygax Armor Plates from [parent].")) if(22) if(diff==FORWARD) - user.visible_message("[user] welds Gygax Armor Plates to [parent].", "You weld Gygax Armor Plates to [parent].") + user.visible_message("[user] welds Gygax Armor Plates to [parent].", span_notice("You weld Gygax Armor Plates to [parent].")) else - user.visible_message("[user] unfastens Gygax Armor Plates.", "You unfasten Gygax Armor Plates.") + user.visible_message("[user] unfastens Gygax Armor Plates.", span_notice("You unfasten Gygax Armor Plates.")) return TRUE /datum/component/construction/unordered/mecha_chassis/firefighter @@ -593,107 +593,107 @@ //TODO: better messages. switch(index) if(1) - user.visible_message("[user] connects [parent] hydraulic systems", "You connect [parent] hydraulic systems.") + user.visible_message("[user] connects [parent] hydraulic systems", span_notice("You connect [parent] hydraulic systems.")) if(2) if(diff==FORWARD) - user.visible_message("[user] activates [parent] hydraulic systems.", "You activate [parent] hydraulic systems.") + user.visible_message("[user] activates [parent] hydraulic systems.", span_notice("You activate [parent] hydraulic systems.")) else - user.visible_message("[user] disconnects [parent] hydraulic systems", "You disconnect [parent] hydraulic systems.") + user.visible_message("[user] disconnects [parent] hydraulic systems", span_notice("You disconnect [parent] hydraulic systems.")) if(3) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to [parent].", "You add the wiring to [parent].") + user.visible_message("[user] adds the wiring to [parent].", span_notice("You add the wiring to [parent].")) else - user.visible_message("[user] deactivates [parent] hydraulic systems.", "You deactivate [parent] hydraulic systems.") + user.visible_message("[user] deactivates [parent] hydraulic systems.", span_notice("You deactivate [parent] hydraulic systems.")) if(4) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of [parent].", "You adjust the wiring of [parent].") + user.visible_message("[user] adjusts the wiring of [parent].", span_notice("You adjust the wiring of [parent].")) else - user.visible_message("[user] removes the wiring from [parent].", "You remove the wiring from [parent].") + user.visible_message("[user] removes the wiring from [parent].", span_notice("You remove the wiring from [parent].")) if(5) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] disconnects the wiring of [parent].", "You disconnect the wiring of [parent].") + user.visible_message("[user] disconnects the wiring of [parent].", span_notice("You disconnect the wiring of [parent].")) if(6) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") + user.visible_message("[user] secures the mainboard.", span_notice("You secure the mainboard.")) else - user.visible_message("[user] removes the central control module from [parent].", "You remove the central computer mainboard from [parent].") + user.visible_message("[user] removes the central control module from [parent].", span_notice("You remove the central computer mainboard from [parent].")) if(7) if(diff==FORWARD) - user.visible_message("[user] installs [I]into [parent].", "You install [I]into [parent].") + user.visible_message("[user] installs [I]into [parent].", span_notice("You install [I]into [parent].")) else - user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") + user.visible_message("[user] unfastens the mainboard.", span_notice("You unfasten the mainboard.")) if(8) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") + user.visible_message("[user] secures the peripherals control module.", span_notice("You secure the peripherals control module.")) else - user.visible_message("[user] removes the peripherals control module from [parent].", "You remove the peripherals control module from [parent].") + user.visible_message("[user] removes the peripherals control module from [parent].", span_notice("You remove the peripherals control module from [parent].")) if(9) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") + user.visible_message("[user] unfastens the peripherals control module.", span_notice("You unfasten the peripherals control module.")) if(10) if(diff==FORWARD) - user.visible_message("[user] secures the scanner module.", "You secure the scanner module.") + user.visible_message("[user] secures the scanner module.", span_notice("You secure the scanner module.")) else - user.visible_message("[user] removes the scanner module from [parent].", "You remove the scanner module from [parent].") + user.visible_message("[user] removes the scanner module from [parent].", span_notice("You remove the scanner module from [parent].")) if(11) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "You install [I] to [parent].") + user.visible_message("[user] installs [I] to [parent].", span_notice("You install [I] to [parent].")) else - user.visible_message("[user] unfastens the scanner module.", "You unfasten the scanner module.") + user.visible_message("[user] unfastens the scanner module.", span_notice("You unfasten the scanner module.")) if(12) if(diff==FORWARD) - user.visible_message("[user] secures the capacitor.", "You secure the capacitor.") + user.visible_message("[user] secures the capacitor.", span_notice("You secure the capacitor.")) else - user.visible_message("[user] removes the capacitor from [parent].", "You remove the capacitor from [parent].") + user.visible_message("[user] removes the capacitor from [parent].", span_notice("You remove the capacitor from [parent].")) if(13) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the capacitor.", "You unfasten the capacitor.") + user.visible_message("[user] unfastens the capacitor.", span_notice("You unfasten the capacitor.")) if(14) if(diff==FORWARD) - user.visible_message("[user] secures the power cell.", "You secure the power cell.") + user.visible_message("[user] secures the power cell.", span_notice("You secure the power cell.")) else - user.visible_message("[user] pries the power cell from [parent].", "You pry the power cell from [parent].") + user.visible_message("[user] pries the power cell from [parent].", span_notice("You pry the power cell from [parent].")) if(15) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to [parent].", "You install the internal armor layer to [parent].") + user.visible_message("[user] installs the internal armor layer to [parent].", span_notice("You install the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + user.visible_message("[user] unfastens the power cell.", span_notice("You unfasten the power cell.")) if(16) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") + user.visible_message("[user] secures the internal armor layer.", span_notice("You secure the internal armor layer.")) else - user.visible_message("[user] pries internal armor layer from [parent].", "You pry internal armor layer from [parent].") + user.visible_message("[user] pries internal armor layer from [parent].", span_notice("You pry internal armor layer from [parent].")) if(17) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to [parent].", "You weld the internal armor layer to [parent].") + user.visible_message("[user] welds the internal armor layer to [parent].", span_notice("You weld the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") + user.visible_message("[user] unfastens the internal armor layer.", span_notice("You unfasten the internal armor layer.")) if(18) if(diff==FORWARD) - user.visible_message("[user] starts to install the external armor layer to [parent].", "You install the external armor layer to [parent].") + user.visible_message("[user] starts to install the external armor layer to [parent].", span_notice("You install the external armor layer to [parent].")) else - user.visible_message("[user] cuts the internal armor layer from [parent].", "You cut the internal armor layer from [parent].") + user.visible_message("[user] cuts the internal armor layer from [parent].", span_notice("You cut the internal armor layer from [parent].")) if(19) if(diff==FORWARD) - user.visible_message("[user] installs the external reinforced armor layer to [parent].", "You install the external reinforced armor layer to [parent].") + user.visible_message("[user] installs the external reinforced armor layer to [parent].", span_notice("You install the external reinforced armor layer to [parent].")) else - user.visible_message("[user] removes the external armor from [parent].", "You remove the external armor from [parent].") + user.visible_message("[user] removes the external armor from [parent].", span_notice("You remove the external armor from [parent].")) if(20) if(diff==FORWARD) - user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") + user.visible_message("[user] secures the external armor layer.", span_notice("You secure the external reinforced armor layer.")) else - user.visible_message("[user] pries external armor layer from [parent].", "You pry external armor layer from [parent].") + user.visible_message("[user] pries external armor layer from [parent].", span_notice("You pry external armor layer from [parent].")) if(21) if(diff==FORWARD) - user.visible_message("[user] welds the external armor layer to [parent].", "You weld the external armor layer to [parent].") + user.visible_message("[user] welds the external armor layer to [parent].", span_notice("You weld the external armor layer to [parent].")) else - user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") + user.visible_message("[user] unfastens the external armor layer.", span_notice("You unfasten the external armor layer.")) return TRUE /datum/component/construction/unordered/mecha_chassis/honker @@ -792,21 +792,21 @@ //TODO: better messages. switch(index) if(2) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) if(4) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) if(6) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) if(8) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) if(10) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) if(12) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) if(14) - user.visible_message("[user] puts [I] on [parent].", "You put [I] on [parent].") + user.visible_message("[user] puts [I] on [parent].", span_notice("You put [I] on [parent].")) if(16) - user.visible_message("[user] puts [I] on [parent].", "You put [I] on [parent].") + user.visible_message("[user] puts [I] on [parent].", span_notice("You put [I] on [parent].")) return TRUE /datum/component/construction/unordered/mecha_chassis/durand @@ -841,112 +841,112 @@ //TODO: better messages. switch(index) if(1) - user.visible_message("[user] connects [parent] hydraulic systems", "You connect [parent] hydraulic systems.") + user.visible_message("[user] connects [parent] hydraulic systems", span_notice("You connect [parent] hydraulic systems.")) if(2) if(diff==FORWARD) - user.visible_message("[user] activates [parent] hydraulic systems.", "You activate [parent] hydraulic systems.") + user.visible_message("[user] activates [parent] hydraulic systems.", span_notice("You activate [parent] hydraulic systems.")) else - user.visible_message("[user] disconnects [parent] hydraulic systems", "You disconnect [parent] hydraulic systems.") + user.visible_message("[user] disconnects [parent] hydraulic systems", span_notice("You disconnect [parent] hydraulic systems.")) if(3) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to [parent].", "You add the wiring to [parent].") + user.visible_message("[user] adds the wiring to [parent].", span_notice("You add the wiring to [parent].")) else - user.visible_message("[user] deactivates [parent] hydraulic systems.", "You deactivate [parent] hydraulic systems.") + user.visible_message("[user] deactivates [parent] hydraulic systems.", span_notice("You deactivate [parent] hydraulic systems.")) if(4) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of [parent].", "You adjust the wiring of [parent].") + user.visible_message("[user] adjusts the wiring of [parent].", span_notice("You adjust the wiring of [parent].")) else - user.visible_message("[user] removes the wiring from [parent].", "You remove the wiring from [parent].") + user.visible_message("[user] removes the wiring from [parent].", span_notice("You remove the wiring from [parent].")) if(5) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] disconnects the wiring of [parent].", "You disconnect the wiring of [parent].") + user.visible_message("[user] disconnects the wiring of [parent].", span_notice("You disconnect the wiring of [parent].")) if(6) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") + user.visible_message("[user] secures the mainboard.", span_notice("You secure the mainboard.")) else - user.visible_message("[user] removes the central control module from [parent].", "You remove the central computer mainboard from [parent].") + user.visible_message("[user] removes the central control module from [parent].", span_notice("You remove the central computer mainboard from [parent].")) if(7) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") + user.visible_message("[user] unfastens the mainboard.", span_notice("You unfasten the mainboard.")) if(8) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") + user.visible_message("[user] secures the peripherals control module.", span_notice("You secure the peripherals control module.")) else - user.visible_message("[user] removes the peripherals control module from [parent].", "You remove the peripherals control module from [parent].") + user.visible_message("[user] removes the peripherals control module from [parent].", span_notice("You remove the peripherals control module from [parent].")) if(9) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") + user.visible_message("[user] unfastens the peripherals control module.", span_notice("You unfasten the peripherals control module.")) if(10) if(diff==FORWARD) - user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") + user.visible_message("[user] secures the weapon control module.", span_notice("You secure the weapon control module.")) else - user.visible_message("[user] removes the weapon control module from [parent].", "You remove the weapon control module from [parent].") + user.visible_message("[user] removes the weapon control module from [parent].", span_notice("You remove the weapon control module from [parent].")) if(11) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "You install [I] to [parent].") + user.visible_message("[user] installs [I] to [parent].", span_notice("You install [I] to [parent].")) else - user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") + user.visible_message("[user] unfastens the weapon control module.", span_notice("You unfasten the weapon control module.")) if(12) if(diff==FORWARD) - user.visible_message("[user] secures the scanner module.", "You secure the scanner module.") + user.visible_message("[user] secures the scanner module.", span_notice("You secure the scanner module.")) else - user.visible_message("[user] removes the scanner module from [parent].", "You remove the scanner module from [parent].") + user.visible_message("[user] removes the scanner module from [parent].", span_notice("You remove the scanner module from [parent].")) if(13) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "You install [I] to [parent].") + user.visible_message("[user] installs [I] to [parent].", span_notice("You install [I] to [parent].")) else - user.visible_message("[user] unfastens the scanner module.", "You unfasten the scanner module.") + user.visible_message("[user] unfastens the scanner module.", span_notice("You unfasten the scanner module.")) if(14) if(diff==FORWARD) - user.visible_message("[user] secures the capacitor.", "You secure the capacitor.") + user.visible_message("[user] secures the capacitor.", span_notice("You secure the capacitor.")) else - user.visible_message("[user] removes the capacitor from [parent].", "You remove the capacitor from [parent].") + user.visible_message("[user] removes the capacitor from [parent].", span_notice("You remove the capacitor from [parent].")) if(15) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the capacitor.", "You unfasten the capacitor.") + user.visible_message("[user] unfastens the capacitor.", span_notice("You unfasten the capacitor.")) if(16) if(diff==FORWARD) - user.visible_message("[user] secures the power cell.", "You secure the power cell.") + user.visible_message("[user] secures the power cell.", span_notice("You secure the power cell.")) else - user.visible_message("[user] pries the power cell from [parent].", "You pry the power cell from [parent].") + user.visible_message("[user] pries the power cell from [parent].", span_notice("You pry the power cell from [parent].")) if(17) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to [parent].", "You install the internal armor layer to [parent].") + user.visible_message("[user] installs the internal armor layer to [parent].", span_notice("You install the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + user.visible_message("[user] unfastens the power cell.", span_notice("You unfasten the power cell.")) if(18) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") + user.visible_message("[user] secures the internal armor layer.", span_notice("You secure the internal armor layer.")) else - user.visible_message("[user] pries internal armor layer from [parent].", "You pry internal armor layer from [parent].") + user.visible_message("[user] pries internal armor layer from [parent].", span_notice("You pry internal armor layer from [parent].")) if(19) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to [parent].", "You weld the internal armor layer to [parent].") + user.visible_message("[user] welds the internal armor layer to [parent].", span_notice("You weld the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") + user.visible_message("[user] unfastens the internal armor layer.", span_notice("You unfasten the internal armor layer.")) if(20) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "You install [I] to [parent].") + user.visible_message("[user] installs [I] to [parent].", span_notice("You install [I] to [parent].")) else - user.visible_message("[user] cuts the internal armor layer from [parent].", "You cut the internal armor layer from [parent].") + user.visible_message("[user] cuts the internal armor layer from [parent].", span_notice("You cut the internal armor layer from [parent].")) if(21) if(diff==FORWARD) - user.visible_message("[user] secures Durand Armor Plates.", "You secure Durand Armor Plates.") + user.visible_message("[user] secures Durand Armor Plates.", span_notice("You secure Durand Armor Plates.")) else - user.visible_message("[user] pries Durand Armor Plates from [parent].", "You pry Durand Armor Plates from [parent].") + user.visible_message("[user] pries Durand Armor Plates from [parent].", span_notice("You pry Durand Armor Plates from [parent].")) if(22) if(diff==FORWARD) - user.visible_message("[user] welds Durand Armor Plates to [parent].", "You weld Durand Armor Plates to [parent].") + user.visible_message("[user] welds Durand Armor Plates to [parent].", span_notice("You weld Durand Armor Plates to [parent].")) else - user.visible_message("[user] unfastens Durand Armor Plates.", "You unfasten Durand Armor Plates.") + user.visible_message("[user] unfastens Durand Armor Plates.", span_notice("You unfasten Durand Armor Plates.")) return TRUE //PHAZON @@ -1068,131 +1068,131 @@ //TODO: better messages. switch(index) if(1) - user.visible_message("[user] connects [parent] hydraulic systems", "You connect [parent] hydraulic systems.") + user.visible_message("[user] connects [parent] hydraulic systems", span_notice("You connect [parent] hydraulic systems.")) if(2) if(diff==FORWARD) - user.visible_message("[user] activates [parent] hydraulic systems.", "You activate [parent] hydraulic systems.") + user.visible_message("[user] activates [parent] hydraulic systems.", span_notice("You activate [parent] hydraulic systems.")) else - user.visible_message("[user] disconnects [parent] hydraulic systems", "You disconnect [parent] hydraulic systems.") + user.visible_message("[user] disconnects [parent] hydraulic systems", span_notice("You disconnect [parent] hydraulic systems.")) if(3) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to [parent].", "You add the wiring to [parent].") + user.visible_message("[user] adds the wiring to [parent].", span_notice("You add the wiring to [parent].")) else - user.visible_message("[user] deactivates [parent] hydraulic systems.", "You deactivate [parent] hydraulic systems.") + user.visible_message("[user] deactivates [parent] hydraulic systems.", span_notice("You deactivate [parent] hydraulic systems.")) if(4) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of [parent].", "You adjust the wiring of [parent].") + user.visible_message("[user] adjusts the wiring of [parent].", span_notice("You adjust the wiring of [parent].")) else - user.visible_message("[user] removes the wiring from [parent].", "You remove the wiring from [parent].") + user.visible_message("[user] removes the wiring from [parent].", span_notice("You remove the wiring from [parent].")) if(5) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] disconnects the wiring of [parent].", "You disconnect the wiring of [parent].") + user.visible_message("[user] disconnects the wiring of [parent].", span_notice("You disconnect the wiring of [parent].")) if(6) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") + user.visible_message("[user] secures the mainboard.", span_notice("You secure the mainboard.")) else - user.visible_message("[user] removes the central control module from [parent].", "You remove the central computer mainboard from [parent].") + user.visible_message("[user] removes the central control module from [parent].", span_notice("You remove the central computer mainboard from [parent].")) if(7) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") + user.visible_message("[user] unfastens the mainboard.", span_notice("You unfasten the mainboard.")) if(8) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") + user.visible_message("[user] secures the peripherals control module.", span_notice("You secure the peripherals control module.")) else - user.visible_message("[user] removes the peripherals control module from [parent].", "You remove the peripherals control module from [parent].") + user.visible_message("[user] removes the peripherals control module from [parent].", span_notice("You remove the peripherals control module from [parent].")) if(9) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") + user.visible_message("[user] unfastens the peripherals control module.", span_notice("You unfasten the peripherals control module.")) if(10) if(diff==FORWARD) - user.visible_message("[user] secures the weapon control module.", "You secure the weapon control module.") + user.visible_message("[user] secures the weapon control module.", span_notice("You secure the weapon control module.")) else - user.visible_message("[user] removes the weapon control module from [parent].", "You remove the weapon control module from [parent].") + user.visible_message("[user] removes the weapon control module from [parent].", span_notice("You remove the weapon control module from [parent].")) if(11) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "You install [I] to [parent].") + user.visible_message("[user] installs [I] to [parent].", span_notice("You install [I] to [parent].")) else - user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") + user.visible_message("[user] unfastens the weapon control module.", span_notice("You unfasten the weapon control module.")) if(12) if(diff==FORWARD) - user.visible_message("[user] secures the scanner module.", "You secure the scanner module.") + user.visible_message("[user] secures the scanner module.", span_notice("You secure the scanner module.")) else - user.visible_message("[user] removes the scanner module from [parent].", "You remove the scanner module from [parent].") + user.visible_message("[user] removes the scanner module from [parent].", span_notice("You remove the scanner module from [parent].")) if(13) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "You install [I] to [parent].") + user.visible_message("[user] installs [I] to [parent].", span_notice("You install [I] to [parent].")) else - user.visible_message("[user] unfastens the scanner module.", "You unfasten the scanner module.") + user.visible_message("[user] unfastens the scanner module.", span_notice("You unfasten the scanner module.")) if(14) if(diff==FORWARD) - user.visible_message("[user] secures the capacitor.", "You secure the capacitor.") + user.visible_message("[user] secures the capacitor.", span_notice("You secure the capacitor.")) else - user.visible_message("[user] removes the capacitor from [parent].", "You remove the capacitor from [parent].") + user.visible_message("[user] removes the capacitor from [parent].", span_notice("You remove the capacitor from [parent].")) if(15) if(diff==FORWARD) - user.visible_message("[user] installs [I].", "You install [I].") + user.visible_message("[user] installs [I].", span_notice("You install [I].")) else - user.visible_message("[user] unsecures the capacitor from [parent].", "You unsecure the capacitor from [parent].") + user.visible_message("[user] unsecures the capacitor from [parent].", span_notice("You unsecure the capacitor from [parent].")) if(16) if(diff==FORWARD) - user.visible_message("[user] connects the bluespace crystal.", "You connect the bluespace crystal.") + user.visible_message("[user] connects the bluespace crystal.", span_notice("You connect the bluespace crystal.")) else - user.visible_message("[user] removes the bluespace crystal from [parent].", "You remove the bluespace crystal from [parent].") + user.visible_message("[user] removes the bluespace crystal from [parent].", span_notice("You remove the bluespace crystal from [parent].")) if(17) if(diff==FORWARD) - user.visible_message("[user] engages the bluespace crystal.", "You engage the bluespace crystal.") + user.visible_message("[user] engages the bluespace crystal.", span_notice("You engage the bluespace crystal.")) else - user.visible_message("[user] disconnects the bluespace crystal from [parent].", "You disconnect the bluespace crystal from [parent].") + user.visible_message("[user] disconnects the bluespace crystal from [parent].", span_notice("You disconnect the bluespace crystal from [parent].")) if(18) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] disengages the bluespace crystal.", "You disengage the bluespace crystal.") + user.visible_message("[user] disengages the bluespace crystal.", span_notice("You disengage the bluespace crystal.")) if(19) if(diff==FORWARD) - user.visible_message("[user] secures the power cell.", "You secure the power cell.") + user.visible_message("[user] secures the power cell.", span_notice("You secure the power cell.")) else - user.visible_message("[user] pries the power cell from [parent].", "You pry the power cell from [parent].") + user.visible_message("[user] pries the power cell from [parent].", span_notice("You pry the power cell from [parent].")) if(20) if(diff==FORWARD) - user.visible_message("[user] installs the phase armor layer to [parent].", "You install the phase armor layer to [parent].") + user.visible_message("[user] installs the phase armor layer to [parent].", span_notice("You install the phase armor layer to [parent].")) else - user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + user.visible_message("[user] unfastens the power cell.", span_notice("You unfasten the power cell.")) if(21) if(diff==FORWARD) - user.visible_message("[user] secures the phase armor layer.", "You secure the phase armor layer.") + user.visible_message("[user] secures the phase armor layer.", span_notice("You secure the phase armor layer.")) else - user.visible_message("[user] pries the phase armor layer from [parent].", "You pry the phase armor layer from [parent].") + user.visible_message("[user] pries the phase armor layer from [parent].", span_notice("You pry the phase armor layer from [parent].")) if(22) if(diff==FORWARD) - user.visible_message("[user] welds the phase armor layer to [parent].", "You weld the phase armor layer to [parent].") + user.visible_message("[user] welds the phase armor layer to [parent].", span_notice("You weld the phase armor layer to [parent].")) else - user.visible_message("[user] unfastens the phase armor layer.", "You unfasten the phase armor layer.") + user.visible_message("[user] unfastens the phase armor layer.", span_notice("You unfasten the phase armor layer.")) if(23) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "You install [I] to [parent].") + user.visible_message("[user] installs [I] to [parent].", span_notice("You install [I] to [parent].")) else - user.visible_message("[user] cuts phase armor layer from [parent].", "You cut the phase armor layer from [parent].") + user.visible_message("[user] cuts phase armor layer from [parent].", span_notice("You cut the phase armor layer from [parent].")) if(24) if(diff==FORWARD) - user.visible_message("[user] secures Phazon Armor Plates.", "You secure Phazon Armor Plates.") + user.visible_message("[user] secures Phazon Armor Plates.", span_notice("You secure Phazon Armor Plates.")) else - user.visible_message("[user] pries Phazon Armor Plates from [parent].", "You pry Phazon Armor Plates from [parent].") + user.visible_message("[user] pries Phazon Armor Plates from [parent].", span_notice("You pry Phazon Armor Plates from [parent].")) if(25) if(diff==FORWARD) - user.visible_message("[user] welds Phazon Armor Plates to [parent].", "You weld Phazon Armor Plates to [parent].") + user.visible_message("[user] welds Phazon Armor Plates to [parent].", span_notice("You weld Phazon Armor Plates to [parent].")) else - user.visible_message("[user] unfastens Phazon Armor Plates.", "You unfasten Phazon Armor Plates.") + user.visible_message("[user] unfastens Phazon Armor Plates.", span_notice("You unfasten Phazon Armor Plates.")) if(26) if(diff==FORWARD) user.visible_message("[user] carefully inserts the anomaly core into [parent] and secures it.", - "You slowly place the anomaly core into its socket and close its chamber.") + span_notice("You slowly place the anomaly core into its socket and close its chamber.")) return TRUE //ODYSSEUS @@ -1228,100 +1228,100 @@ //TODO: better messages. switch(index) if(1) - user.visible_message("[user] connects [parent] hydraulic systems", "You connect [parent] hydraulic systems.") + user.visible_message("[user] connects [parent] hydraulic systems", span_notice("You connect [parent] hydraulic systems.")) if(2) if(diff==FORWARD) - user.visible_message("[user] activates [parent] hydraulic systems.", "You activate [parent] hydraulic systems.") + user.visible_message("[user] activates [parent] hydraulic systems.", span_notice("You activate [parent] hydraulic systems.")) else - user.visible_message("[user] disconnects [parent] hydraulic systems", "You disconnect [parent] hydraulic systems.") + user.visible_message("[user] disconnects [parent] hydraulic systems", span_notice("You disconnect [parent] hydraulic systems.")) if(3) if(diff==FORWARD) - user.visible_message("[user] adds the wiring to [parent].", "You add the wiring to [parent].") + user.visible_message("[user] adds the wiring to [parent].", span_notice("You add the wiring to [parent].")) else - user.visible_message("[user] deactivates [parent] hydraulic systems.", "You deactivate [parent] hydraulic systems.") + user.visible_message("[user] deactivates [parent] hydraulic systems.", span_notice("You deactivate [parent] hydraulic systems.")) if(4) if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of [parent].", "You adjust the wiring of [parent].") + user.visible_message("[user] adjusts the wiring of [parent].", span_notice("You adjust the wiring of [parent].")) else - user.visible_message("[user] removes the wiring from [parent].", "You remove the wiring from [parent].") + user.visible_message("[user] removes the wiring from [parent].", span_notice("You remove the wiring from [parent].")) if(5) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] disconnects the wiring of [parent].", "You disconnect the wiring of [parent].") + user.visible_message("[user] disconnects the wiring of [parent].", span_notice("You disconnect the wiring of [parent].")) if(6) if(diff==FORWARD) - user.visible_message("[user] secures the mainboard.", "You secure the mainboard.") + user.visible_message("[user] secures the mainboard.", span_notice("You secure the mainboard.")) else - user.visible_message("[user] removes the central control module from [parent].", "You remove the central computer mainboard from [parent].") + user.visible_message("[user] removes the central control module from [parent].", span_notice("You remove the central computer mainboard from [parent].")) if(7) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") + user.visible_message("[user] unfastens the mainboard.", span_notice("You unfasten the mainboard.")) if(8) if(diff==FORWARD) - user.visible_message("[user] secures the peripherals control module.", "You secure the peripherals control module.") + user.visible_message("[user] secures the peripherals control module.", span_notice("You secure the peripherals control module.")) else - user.visible_message("[user] removes the peripherals control module from [parent].", "You remove the peripherals control module from [parent].") + user.visible_message("[user] removes the peripherals control module from [parent].", span_notice("You remove the peripherals control module from [parent].")) if(9) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") + user.visible_message("[user] unfastens the peripherals control module.", span_notice("You unfasten the peripherals control module.")) if(10) if(diff==FORWARD) - user.visible_message("[user] secures the scanner module.", "You secure the scanner module.") + user.visible_message("[user] secures the scanner module.", span_notice("You secure the scanner module.")) else - user.visible_message("[user] removes the scanner module from [parent].", "You remove the scanner module from [parent].") + user.visible_message("[user] removes the scanner module from [parent].", span_notice("You remove the scanner module from [parent].")) if(11) if(diff==FORWARD) - user.visible_message("[user] installs [I] to [parent].", "You install [I] to [parent].") + user.visible_message("[user] installs [I] to [parent].", span_notice("You install [I] to [parent].")) else - user.visible_message("[user] unfastens the scanner module.", "You unfasten the scanner module.") + user.visible_message("[user] unfastens the scanner module.", span_notice("You unfasten the scanner module.")) if(12) if(diff==FORWARD) - user.visible_message("[user] secures the capacitor.", "You secure the capacitor.") + user.visible_message("[user] secures the capacitor.", span_notice("You secure the capacitor.")) else - user.visible_message("[user] removes the capacitor from [parent].", "You remove the capacitor from [parent].") + user.visible_message("[user] removes the capacitor from [parent].", span_notice("You remove the capacitor from [parent].")) if(13) if(diff==FORWARD) - user.visible_message("[user] installs [I] into [parent].", "You install [I] into [parent].") + user.visible_message("[user] installs [I] into [parent].", span_notice("You install [I] into [parent].")) else - user.visible_message("[user] unfastens the capacitor.", "You unfasten the capacitor.") + user.visible_message("[user] unfastens the capacitor.", span_notice("You unfasten the capacitor.")) if(14) if(diff==FORWARD) - user.visible_message("[user] secures the power cell.", "You secure the power cell.") + user.visible_message("[user] secures the power cell.", span_notice("You secure the power cell.")) else - user.visible_message("[user] pries the power cell from [parent].", "You pry the power cell from [parent].") + user.visible_message("[user] pries the power cell from [parent].", span_notice("You pry the power cell from [parent].")) if(15) if(diff==FORWARD) - user.visible_message("[user] installs the internal armor layer to [parent].", "You install the internal armor layer to [parent].") + user.visible_message("[user] installs the internal armor layer to [parent].", span_notice("You install the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the power cell.", "You unfasten the power cell.") + user.visible_message("[user] unfastens the power cell.", span_notice("You unfasten the power cell.")) if(16) if(diff==FORWARD) - user.visible_message("[user] secures the internal armor layer.", "You secure the internal armor layer.") + user.visible_message("[user] secures the internal armor layer.", span_notice("You secure the internal armor layer.")) else - user.visible_message("[user] pries internal armor layer from [parent].", "You pry internal armor layer from [parent].") + user.visible_message("[user] pries internal armor layer from [parent].", span_notice("You pry internal armor layer from [parent].")) if(17) if(diff==FORWARD) - user.visible_message("[user] welds the internal armor layer to [parent].", "You weld the internal armor layer to [parent].") + user.visible_message("[user] welds the internal armor layer to [parent].", span_notice("You weld the internal armor layer to [parent].")) else - user.visible_message("[user] unfastens the internal armor layer.", "You unfasten the internal armor layer.") + user.visible_message("[user] unfastens the internal armor layer.", span_notice("You unfasten the internal armor layer.")) if(18) if(diff==FORWARD) - user.visible_message("[user] installs the external armor layer to [parent].", "You install the external reinforced armor layer to [parent].") + user.visible_message("[user] installs the external armor layer to [parent].", span_notice("You install the external reinforced armor layer to [parent].")) else - user.visible_message("[user] cuts the internal armor layer from [parent].", "You cut the internal armor layer from [parent].") + user.visible_message("[user] cuts the internal armor layer from [parent].", span_notice("You cut the internal armor layer from [parent].")) if(19) if(diff==FORWARD) - user.visible_message("[user] secures the external armor layer.", "You secure the external reinforced armor layer.") + user.visible_message("[user] secures the external armor layer.", span_notice("You secure the external reinforced armor layer.")) else - user.visible_message("[user] pries the external armor layer from [parent].", "You pry the external armor layer from [parent].") + user.visible_message("[user] pries the external armor layer from [parent].", span_notice("You pry the external armor layer from [parent].")) if(20) if(diff==FORWARD) - user.visible_message("[user] welds the external armor layer to [parent].", "You weld the external armor layer to [parent].") + user.visible_message("[user] welds the external armor layer to [parent].", span_notice("You weld the external armor layer to [parent].")) else - user.visible_message("[user] unfastens the external armor layer.", "You unfasten the external armor layer.") + user.visible_message("[user] unfastens the external armor layer.", span_notice("You unfasten the external armor layer.")) return TRUE diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 28225bbada8a..590b33b2bf8e 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -59,7 +59,7 @@ var/obj/mecha/M = MT.chassis if(trim(message) && M) M.occupant_message(message) - to_chat(usr, "Message sent.") + to_chat(usr, span_notice("Message sent.")) . = TRUE if("shock") var/obj/item/mecha_parts/mecha_tracking/MT = locate(params["tracker_ref"]) diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm index ee70d44e5dc8..2cf91ea7e2f1 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_userdanger("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(.) @@ -61,7 +61,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/weapons/tap.ogg', 40, 1, -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) @@ -206,33 +206,33 @@ output_maintenance_dialog(id_card, user) return else - to_chat(user, "Invalid ID: Access denied.") + to_chat(user, span_warning("Invalid ID: Access denied.")) else - to_chat(user, "Maintenance protocols disabled by operator.") + to_chat(user, span_warning("Maintenance protocols disabled by operator.")) else if(W.tool_behaviour == TOOL_WRENCH) if(state==1) state = 2 - to_chat(user, "You undo the securing bolts.") + to_chat(user, span_notice("You undo the securing bolts.")) else if(state==2) state = 1 - to_chat(user, "You tighten the securing bolts.") + to_chat(user, span_notice("You tighten the securing bolts.")) return else if(W.tool_behaviour == TOOL_CROWBAR) if(state==2) state = 3 - to_chat(user, "You open the hatch to the power unit.") + to_chat(user, span_notice("You open the hatch to the power unit.")) else if(state==3) state=2 - to_chat(user, "You close the hatch to the power unit.") + to_chat(user, span_notice("You close the hatch to the power unit.")) return else if(istype(W, /obj/item/stack/cable_coil)) if(state == 3 && (internal_damage & MECHA_INT_SHORT_CIRCUIT)) var/obj/item/stack/cable_coil/CC = W if(CC.use(2)) clearInternalDamage(MECHA_INT_SHORT_CIRCUIT) - to_chat(user, "You replace the fused wires.") + to_chat(user, span_notice("You replace the fused wires.")) else - to_chat(user, "You need two lengths of cable to fix this mech!") + to_chat(user, span_warning("You need two lengths of cable to fix this mech!")) return else if(istype(W, /obj/item/stock_parts/cell)) @@ -241,12 +241,12 @@ if(!user.transferItemToLoc(W, src)) return var/obj/item/stock_parts/cell/C = W - to_chat(user, "You install the power cell.") + to_chat(user, span_notice("You install the power cell.")) playsound(src, 'sound/items/screwdriver2.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_notice("There's already a power cell installed.")) return if(istype(W, /obj/item/stock_parts/scanning_module)) @@ -254,13 +254,13 @@ if(!scanmod) if(!user.transferItemToLoc(W, src)) return - to_chat(user, "You install the scanning module.") + to_chat(user, span_notice("You install the scanning module.")) playsound(src, 'sound/items/screwdriver2.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_notice("There's already a scanning module installed.")) return if(istype(W, /obj/item/stock_parts/capacitor)) @@ -268,13 +268,13 @@ if(!capacitor) if(!user.transferItemToLoc(W, src)) return - to_chat(user, "You install the capacitor.") + to_chat(user, span_notice("You install the capacitor.")) playsound(src, 'sound/items/screwdriver2.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_notice("There's already a capacitor installed.")) return else if(W.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM) @@ -283,15 +283,15 @@ if(W.use_tool(src, user, 0, volume=50, amount=1)) if (internal_damage & MECHA_INT_TANK_BREACH) clearInternalDamage(MECHA_INT_TANK_BREACH) - to_chat(user, "You repair the damaged gas tank.") + to_chat(user, span_notice("You repair the damaged gas tank.")) else - user.visible_message("[user] repairs some damage to [name].", "You repair some damage to [src].") + user.visible_message(span_notice("[user] repairs some damage to [name]."), span_notice("You 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 1 else - to_chat(user, "The [name] is at full integrity!") + to_chat(user, span_warning("The [name] is at full integrity!")) return 1 else if(istype(W, /obj/item/mecha_parts)) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 59b74adfa8d4..0ebbbdda9cbb 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].", "You attach [src] to [M].") + user.visible_message("[user] attaches [src] to [M].", span_notice("You 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 62904fb63a6d..1bf4acc232d3 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -52,11 +52,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_userdanger("INTERNAL FIRE"), + "[MECHA_INT_TEMP_CONTROL]" = span_userdanger("LIFE SUPPORT SYSTEM MALFUNCTION"), + "[MECHA_INT_TANK_BREACH]" = span_userdanger("GAS TANK BREACH"), "[MECHA_INT_CONTROL_LOST]" = "COORDINATION SYSTEM CALIBRATION FAILURE - Recalibrate", - "[MECHA_INT_SHORT_CIRCUIT]" = "SHORT CIRCUIT" + "[MECHA_INT_SHORT_CIRCUIT]" = span_userdanger("SHORT CIRCUIT") ) for(var/tflag in dam_reports) var/intdamflag = text2num(tflag) @@ -87,7 +87,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\]
":""]
[thrusters_action.owner ? "Thrusters: [thrusters_active ? "Enabled" : "Disabled"]
" : ""] @@ -176,7 +176,7 @@ continue //there's some strange access without a name . += "[a_name] - Add
" . += "
Finish " - . += "(Warning! The ID upload panel will be locked. It can be unlocked only through Exosuit Interface.)" + . += span_danger("(Warning! The ID upload panel will be locked. It can be unlocked only through Exosuit Interface.)") . += "" user << browse(., "window=exosuit_add_access") onclose(user, "exosuit_add_access") @@ -240,9 +240,9 @@ state = 0 to_chat(usr, "The securing bolts are now hidden.") else if(state==2) //user feedback YOGGERZ - visible_message("You need to tighten the securing bolts first!") + visible_message(span_warning("You need to tighten the securing bolts first!")) else if(state==3) - visible_message("You need to close the hatch to the power unit first!") + visible_message(span_warning("You need to close the hatch to the power unit first!")) output_maintenance_dialog(id_card,usr) return @@ -328,7 +328,7 @@ if(href_list["toggle_maint_access"]) if(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") @@ -340,7 +340,7 @@ occupant_message("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 @@ -348,13 +348,13 @@ occupant_message("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") if(href_list["dna_lock"]) if(occupant && !iscarbon(occupant)) - to_chat(occupant, " You do not have any DNA!") + to_chat(occupant, span_danger(" You do not have any DNA!")) return dna_lock = occupant.dna.unique_enzymes occupant_message("You feel a prick as the needle takes your DNA sample.") @@ -369,8 +369,8 @@ spawn(100) if(T == 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 52deff92ef89..2c4ef5ba6d43 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -32,12 +32,12 @@ /obj/structure/mecha_wreckage/examine(mob/user) . = ..() if(AI) - . += "The AI recovery beacon is active." + . += span_notice("The AI recovery beacon is active.") /obj/structure/mecha_wreckage/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WELDER) if(salvage_num <= 0 || !length(welder_salvage)) - to_chat(user, "You don't see anything that can be cut with [I]!") + to_chat(user, span_warning("You don't see anything that can be cut with [I]!")) return if(!I.use_tool(src, user, 0, volume=50)) @@ -46,27 +46,27 @@ var/type = prob(70) ? pick(welder_salvage) : null if(type) var/N = new type(get_turf(user)) - user.visible_message("[user] cuts [N] from [src].", "You cut [N] from [src].") + user.visible_message("[user] cuts [N] from [src].", span_notice("You cut [N] from [src].")) if(istype(N, /obj/item/mecha_parts/part)) welder_salvage -= type salvage_num-- else - to_chat(user, "You fail to salvage anything valuable from [src]!") + to_chat(user, span_warning("You fail to salvage anything valuable from [src]!")) return else if(I.tool_behaviour == TOOL_WIRECUTTER) if(salvage_num <= 0) - to_chat(user, "You don't see anything that can be cut with [I]!") + to_chat(user, span_warning("You don't see anything that can be cut with [I]!")) return else if(wirecutters_salvage && wirecutters_salvage.len) var/type = prob(70) ? pick(wirecutters_salvage) : null if(type) var/N = new type(get_turf(user)) - user.visible_message("[user] cuts [N] from [src].", "You cut [N] from [src].") + user.visible_message("[user] cuts [N] from [src].", span_notice("You cut [N] from [src].")) wirecutters_salvage -= type salvage_num-- else - to_chat(user, "You fail to salvage anything valuable from [src]!") + to_chat(user, span_warning("You fail to salvage anything valuable from [src]!")) else if(I.tool_behaviour == TOOL_CROWBAR) if(crowbar_salvage && crowbar_salvage.len) @@ -74,10 +74,10 @@ if(S) S.forceMove(user.drop_location()) crowbar_salvage -= S - user.visible_message("[user] pries [S] from [src].", "You pry [S] from [src].") + user.visible_message("[user] pries [S] from [src].", span_notice("You pry [S] from [src].")) return else - to_chat(user, "You don't see anything that can be pried with [I]!") + to_chat(user, span_warning("You don't see anything that can be pried with [I]!")) /obj/structure/mecha_wreckage/transfer_ai(interaction, mob/user, null, obj/item/aicard/card) @@ -87,7 +87,7 @@ //Proc called on the wreck by the AI card. if(interaction == AI_TRANS_TO_CARD) //AIs can only be transferred in one direction, from the wreck to the card. 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. diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index e91ef04e687a..450327fd2590 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -183,7 +183,7 @@ if(href_list["drop_from_cargo"]) var/obj/O = locate(href_list["drop_from_cargo"]) in cargo if(O) - occupant_message("You unload [O].") + occupant_message(span_notice("You unload [O].")) O.forceMove(drop_location()) cargo -= O log_message("Unloaded [O]. Cargo compartment capacity: [cargo_capacity - src.cargo.len]", LOG_MECHA) @@ -222,13 +222,13 @@ drill.equip_cooldown = initial(drill.equip_cooldown) /obj/mecha/working/ripley/relay_container_resist(mob/living/user, obj/O) - to_chat(user, "You lean on the back of [O] and start pushing so it falls out of [src].") + to_chat(user, span_notice("You 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, "You successfully pushed [O] out of [src]!") + to_chat(user, span_notice("You 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, "You fail to push [O] out of [src]!") + to_chat(user, span_warning("You fail to push [O] out of [src]!")) diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 7019249fa3c8..230f0eb151ee 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -61,9 +61,9 @@ M.buckling = src if(!M.can_buckle() && !force) if(M == usr) - to_chat(M, "You are unable to buckle yourself to [src]!") + to_chat(M, span_warning("You are unable to buckle yourself to [src]!")) else - to_chat(usr, "You are unable to buckle [M] to [src]!") + to_chat(usr, span_warning("You are unable to buckle [M] to [src]!")) M.buckling = null return FALSE @@ -132,28 +132,28 @@ if(.) if(M == user) M.visible_message(\ - "[M] buckles [M.p_them()]self to [src].",\ - "You buckle yourself to [src].",\ - "You hear metal clanking.") + span_notice("[M] buckles [M.p_them()]self to [src]."),\ + span_notice("You buckle yourself to [src]."),\ + span_italics("You hear metal clanking.")) else M.visible_message(\ - "[user] buckles [M] to [src]!",\ - "[user] buckles you to [src]!",\ - "You hear metal clanking.") + span_warning("[user] buckles [M] to [src]!"),\ + span_warning("[user] buckles you to [src]!"),\ + span_italics("You hear metal clanking.")) /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] unbuckles [M] from [src].",\ - "[user] unbuckles you from [src].",\ - "You hear metal clanking.") + span_notice("[user] unbuckles [M] from [src]."),\ + span_notice("[user] unbuckles you from [src]."),\ + span_italics("You hear metal clanking.")) else M.visible_message(\ - "[M] unbuckles [M.p_them()]self from [src].",\ - "You unbuckle yourself from [src].",\ - "You hear metal clanking.") + span_notice("[M] unbuckles [M.p_them()]self from [src]."),\ + span_notice("You unbuckle yourself from [src]."),\ + span_italics("You 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 1a668b809f8c..18974a9a01aa 100644 --- a/code/game/objects/effects/alien_acid.dm +++ b/code/game/objects/effects/alien_acid.dm @@ -63,7 +63,7 @@ if(L.acid_act(10, acid_used, "feet")) acid_level = max(0, acid_level - acid_used*10) playsound(L, 'sound/weapons/sear.ogg', 50, 1) - to_chat(L, "[src] burns you!") + to_chat(L, span_userdanger("[src] burns you!")) //xenomorph corrosive acid /obj/effect/acid/alien @@ -77,17 +77,17 @@ playsound(loc, 'sound/items/welder.ogg', 100, 1) 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 90261e794a1a..81b6aef02977 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 || istype(I, /obj/item/multitool/tricorder)) - 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].")) /////////////////////// @@ -171,9 +171,9 @@ return else M.adjustFireLoss(shockdamage) - M.visible_message("[M] was shocked by \the [name]!", \ - "You feel a powerful shock coursing through your body!", \ - "You hear a heavy electrical crack.") + M.visible_message(span_danger("[M] was shocked by \the [name]!"), \ + span_userdanger("You feel a powerful shock coursing through your body!"), \ + span_italics("You hear a heavy electrical crack.")) /obj/effect/anomaly/flux/detonate() if(explosive) diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index bad9d4123e8e..2a08dc367a47 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -90,10 +90,10 @@ if(I.tool_behaviour == TOOL_WIRECUTTER) I.play_tool_sound(src, 100) if(ruined) - to_chat(user, "You remove the remnants of the poster.") + to_chat(user, span_notice("You remove the remnants of the poster.")) qdel(src) else - to_chat(user, "You carefully remove the poster from the wall.") + to_chat(user, span_notice("You carefully remove the poster from the wall.")) roll_and_drop(user.loc) /obj/structure/sign/poster/attack_hand(mob/user) @@ -121,7 +121,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. @@ -134,14 +134,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, "You start placing the poster on the wall..." ) + to_chat(user, span_notice("You start placing the poster on the wall...") ) var/obj/structure/sign/poster/D = P.poster_structure @@ -156,10 +156,10 @@ return if(iswallturf(src) && user && user.loc == temp_loc) //Let's check if everything is still there - to_chat(user, "You place the poster!") + to_chat(user, span_notice("You 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) /turf/closed/wall/proc/place_borg_poster(obj/item/wantedposterposter/P, mob/user) @@ -173,19 +173,19 @@ 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, "You start placing the poster on the wall..." ) + to_chat(user, span_notice("You start placing the poster on the wall...") ) var/datum/data/record/R = P.chosen var/datum/data/record/S = find_record("name", R.fields["name"], GLOB.data_core.security) //Curse old coders if(!R) - to_chat(user, "The criminal record seems to be missing!") + to_chat(user, span_notice("The criminal record seems to be missing!")) return var/obj/item/photo/photo = R.fields["photo_front"] var/wanted_name = R.fields["name"] @@ -210,10 +210,10 @@ return if(iswallturf(src) && user && user.loc == temp_loc) //Let's check if everything is still there - to_chat(user, "You place the poster!") + to_chat(user, span_notice("You place the poster!")) return - to_chat(user, "The poster falls down!") + to_chat(user, span_notice("The poster falls down!")) qdel(D) // Various possible posters follow diff --git a/code/game/objects/effects/custom_portals.dm b/code/game/objects/effects/custom_portals.dm index a65cfc331a04..33e8caa7f1d8 100644 --- a/code/game/objects/effects/custom_portals.dm +++ b/code/game/objects/effects/custom_portals.dm @@ -41,7 +41,7 @@ GLOBAL_LIST_EMPTY(custom_portals) return var/turf/real_target = get_link_target_turf() if(!real_target) - to_chat(M, "This portal has no linked portal!") + to_chat(M, span_warning("This portal has no linked portal!")) if(!force && (!ismecha(M) && !istype(M, /obj/item/projectile) && M.anchored)) return if(ismegafauna(M)) diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index d956ef5928b4..677af3020d24 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -34,17 +34,17 @@ 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, "You start scooping up [src] into [W]...") + to_chat(user, span_notice("You start scooping up [src] into [W]...")) var/scoop_time scoop_time = min((W.reagents.maximum_volume - W.reagents.total_volume), src.reagents.total_volume) //1 second per 10 units scooped if(do_mob(user, user, scoop_time)) if(src) - to_chat(user, "You scoop up [src] into [W]!") + to_chat(user, span_notice("You 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) @@ -56,7 +56,7 @@ else var/hotness = W.is_hot() reagents.expose_temperature(hotness) - to_chat(user, "You heat [name] with [W]!") + to_chat(user, span_notice("You 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 80fbf9ce79b5..98ed08f66140 100644 --- a/code/game/objects/effects/decals/cleanable/food.dm +++ b/code/game/objects/effects/decals/cleanable/food.dm @@ -40,17 +40,17 @@ 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 - user.visible_message("[user] shamefully begins gathering up all [src]...", "You shamefully begin gathering up all [src] into [W]...") + user.visible_message(span_notice("[user] shamefully begins gathering up all [src]..."), span_notice("You shamefully begin gathering up all [src] into [W]...")) var/scoop_time scoop_time = min((W.reagents.maximum_volume - W.reagents.total_volume), src.reagents.total_volume) * 2 //don't spill your flour if(do_mob(user, user, scoop_time)) if(src) - to_chat(user, "You scoop up [src] into [W].") + to_chat(user, span_notice("You 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) diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 6719fad372ba..2b85035348ec 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -125,7 +125,7 @@ var/mob/living/carbon/human/H = user if(isflyperson(H)) playsound(get_turf(src), 'sound/items/drink.ogg', 50, 1) //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 6a0f1be45967..1a60d8a02bfe 100644 --- a/code/game/objects/effects/decals/cleanable/robots.dm +++ b/code/game/objects/effects/decals/cleanable/robots.dm @@ -58,7 +58,7 @@ /obj/effect/decal/cleanable/oil/attackby(obj/item/I, mob/living/user) var/attacked_by_hot_thing = I.is_hot() if(attacked_by_hot_thing) - visible_message("[user] tries to ignite [src] with [I]!", "You try to ignite [src] with [I].") + visible_message(span_warning("[user] tries to ignite [src] with [I]!"), span_warning("You 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 @@ -67,7 +67,7 @@ /obj/effect/decal/cleanable/oil/fire_act(exposed_temperature, exposed_volume) if(exposed_temperature < 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 87337a526cb8..e495202bc05b 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/items/welder.ogg', 150, 1) 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 9d0c8bf74bab..97bd11510ef8 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -288,7 +288,7 @@ return user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src, ATTACK_EFFECT_PUNCH) - to_chat(user, "You hit [src] but bounce off it!") + to_chat(user, span_warning("You hit [src] but bounce off it!")) playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1) /obj/structure/foamedmetal/iron @@ -323,7 +323,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 dbc9b3527532..bbd44f5662b8 100644 --- a/code/game/objects/effects/effect_system/effects_other.dm +++ b/code/game/objects/effects/effect_system/effects_other.dm @@ -102,6 +102,6 @@ /datum/effect_system/reagents_explosion/start() if(explosion_message) - location.visible_message("The solution violently explodes!", \ - "You hear an explosion!") + location.visible_message(span_danger("The solution violently explodes!"), \ + span_italics("You hear an explosion!")) dyn_explosion(location, amount, flashing_factor) \ No newline at end of file diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index e261cf86bb28..e83f4da302a0 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -176,7 +176,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 28cc952767c2..e9f151fc1748 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -171,7 +171,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 = "Looks like this was \an [src] some time ago." qdel(src) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 04d1b056d698..6e0fb9d849c5 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -67,12 +67,12 @@ if(!proximity) return if(!istype(plantspot,/turf/open/floor)) - to_chat(user, "You can't plant the mine here!") + to_chat(user, span_warning("You can't plant the mine here!")) return - to_chat(user, "You start arming the [src]...") + to_chat(user, span_notice("You start arming the [src]...")) if(do_after(user, arming_time, target = src)) new mine_type(plantspot) - to_chat(user, "You plant and arm the [src].") + to_chat(user, span_notice("You plant and arm the [src].")) log_combat(user, src, "planted and armed") qdel(src) @@ -90,16 +90,16 @@ /obj/effect/mine/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/multitool)) - to_chat(user, "You begin to disarm the [src]...") + to_chat(user, span_notice("You begin to disarm the [src]...")) if(do_after(user, disarm_time, target = src)) - to_chat(user, "You disarm the [src].") + to_chat(user, span_notice("You disarm the [src].")) new disarm_product(src.loc) qdel(src) return return ..() /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) . = ..() @@ -122,7 +122,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() @@ -200,7 +200,7 @@ /obj/effect/mine/kickmine/mineEffect(mob/victim) if(isliving(victim) && victim.client) - to_chat(victim, "You have been kicked FOR NO REISIN!") + to_chat(victim, span_userdanger("You have been kicked FOR NO REISIN!")) qdel(victim.client) @@ -287,14 +287,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, "Your bloodlust seeps back into the bog of your subconscious and you regain self control.") + to_chat(victim, span_notice("Your bloodlust seeps back into the bog of your subconscious and you regain self control.")) qdel(chainsaw) victim.log_message("exited a blood frenzy", LOG_ATTACK) qdel(src) @@ -307,7 +307,7 @@ /obj/effect/mine/pickup/healing/mineEffect(mob/living/carbon/victim) if(!victim.client || !istype(victim)) return - to_chat(victim, "You feel great!") + to_chat(victim, span_notice("You feel great!")) victim.revive(full_heal = 1, admin_revive = 1) /obj/effect/mine/pickup/speed @@ -319,8 +319,8 @@ /obj/effect/mine/pickup/speed/mineEffect(mob/living/carbon/victim) if(!victim.client || !istype(victim)) return - to_chat(victim, "You feel fast!") + to_chat(victim, span_notice("You 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, "You slow down.") + to_chat(victim, span_notice("You slow down.")) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 5ba0f5ebc750..235c6eb8aaf7 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -43,7 +43,7 @@ if(istype(mover.pulledby, /mob/living/simple_animal/hostile/poison/giant_spider)) return TRUE if(prob(50)) - to_chat(mover, "You get stuck in \the [src] for a moment.") + to_chat(mover, span_danger("You get stuck in \the [src] for a moment.")) return FALSE else if(istype(mover, /obj/item/projectile)) return prob(30) @@ -141,7 +141,7 @@ var/obj/machinery/atmospherics/components/unary/vent_pump/exit_vent = pick(vents) if(prob(50)) visible_message("[src] scrambles into the ventilation ducts!", \ - "You hear something scampering through the ventilation ducts.") + span_italics("You hear something scampering through the ventilation ducts.")) spawn(rand(20,60)) forceMove(exit_vent) @@ -154,7 +154,7 @@ return if(prob(50)) - audible_message("You hear something scampering through the ventilation ducts.") + audible_message(span_italics("You hear something scampering through the ventilation ducts.")) sleep(travel_time) if(!exit_vent || exit_vent.welded) @@ -174,7 +174,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)) @@ -214,7 +214,7 @@ var/breakout_time = 600 user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - to_chat(user, "You struggle against the tight bonds... (This will take about [DisplayTimeText(breakout_time)].)") + to_chat(user, span_notice("You struggle against the tight bonds... (This will take about [DisplayTimeText(breakout_time)].)")) visible_message("You see something struggling and writhing in \the [src]!") if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src) @@ -225,7 +225,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 f8da95fee32f..c271dfb79c31 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/items.dm b/code/game/objects/items.dm index fe8223ccad44..21ca12131b37 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -278,9 +278,9 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(can_handle_hot) extinguish() - to_chat(user, "You put out the fire on [src].") + to_chat(user, span_notice("You put out the fire on [src].")) else - to_chat(user, "You burn your hand on [src]!") + to_chat(user, span_warning("You burn your hand on [src]!")) 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() @@ -290,7 +290,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 your hand!") + to_chat(user, span_warning("The acid on [src] burns your 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() @@ -302,7 +302,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,"You start picking up [src]...") + to_chat(user,span_notice("You start picking up [src]...")) if(!do_mob(user,src,30*grav_power)) return @@ -351,7 +351,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, "Your claws aren't capable of such fine manipulation!") + to_chat(user, span_warning("Your claws aren't capable of such fine manipulation!")) return attack_paw(A) @@ -373,7 +373,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 @@ -469,15 +469,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_danger("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, "You cannot locate any eyes on this creature!") + to_chat(user, span_warning("You cannot locate any eyes on this creature!")) return if(isbrain(M)) - to_chat(user, "You cannot locate any organic eyes on this brain!") + to_chat(user, span_danger("You cannot locate any organic eyes on this brain!")) return src.add_fingerprint(user) @@ -487,12 +487,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_userdanger("[user] stabs you in the eye with [src]!")) else user.visible_message( \ - "[user] has stabbed [user.p_them()]self in the eyes with [src]!", \ - "You stab yourself in the eyes with [src]!" \ + span_danger("[user] has stabbed [user.p_them()]self in the eyes with [src]!"), \ + span_userdanger("You stab yourself in the eyes with [src]!") \ ) if(is_human_victim) var/mob/living/carbon/human/U = M @@ -513,20 +513,20 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(eyes.damage >= 10) M.adjust_blurriness(15) if(M.stat != DEAD) - to_chat(M, "Your eyes start to bleed profusely!") + to_chat(M, span_danger("Your eyes start to bleed profusely!")) if(!(HAS_TRAIT(M, TRAIT_BLIND) || HAS_TRAIT(M, TRAIT_NEARSIGHT))) - to_chat(M, "You become nearsighted!") + to_chat(M, span_danger("You become nearsighted!")) M.become_nearsighted(EYE_DAMAGE) if(prob(50)) if(M.stat != DEAD) if(M.drop_all_held_items()) - to_chat(M, "You drop what you're holding and clutch at your eyes!") + to_chat(M, span_danger("You drop what you're holding and clutch at your 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, "You go blind!") + to_chat(M, span_danger("You go blind!")) /obj/item/singularity_pull(S, current_size) ..() @@ -630,7 +630,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) /obj/item/proc/ignition_effect(atom/A, mob/user) if(is_hot()) - . = "[user] lights [A] with [src]." + . = span_notice("[user] lights [A] with [src].") else . = "" diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm index 717941cf1349..7d3b581f6ad6 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_caution("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" @@ -77,7 +77,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_userdanger("[sender] has uploaded a change to the laws you must follow using a [name].")) /******************** Modules ********************/ @@ -270,15 +270,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 ..() @@ -483,7 +483,7 @@ AI MODULES return var/datum/antagonist/overthrow/O = user_mind.has_antag_datum(/datum/antagonist/overthrow) if(!O) - to_chat(user, "It appears that to install this module, you require a password you do not know.") // This is the best fluff i could come up in my mind + to_chat(user, span_warning("It appears that to install this module, you require a password you do not know.")) // This is the best fluff i could come up in my mind return var/mob/living/silicon/ai/AI = law_datum.owner if(!AI) @@ -498,10 +498,10 @@ AI MODULES T.silent = TRUE target_mind.remove_antag_datum(/datum/antagonist/overthrow) if(AI) - to_chat(AI, "You feel your circuits being scrambled! You serve another overthrow team now!") // to make it clearer for the AI + to_chat(AI, span_userdanger("You feel your circuits being scrambled! You serve another overthrow team now!")) // to make it clearer for the AI T = target_mind.add_antag_datum(/datum/antagonist/overthrow, O.team) if(AI) - to_chat(AI, "You serve the [T.team] team now! Assist them in completing the team shared objectives, which you can see in your notes.") + to_chat(AI, span_warning("You serve the [T.team] team now! Assist them in completing the team shared objectives, which you can see in your notes.")) ..() /******************** Hacked AI Module ******************/ @@ -521,7 +521,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 @@ -545,7 +545,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 @@ -559,9 +559,9 @@ AI MODULES /obj/item/aiModule/toyAI/attack_self(mob/user) laws[1] = generate_ion_law() - to_chat(user, "You press the button on [src].") + to_chat(user, span_notice("You press the button on [src].")) playsound(user, 'sound/machines/click.ogg', 20, 1) - 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 9e99e74426c8..e39228329ccc 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -29,7 +29,7 @@ RLD var/datum/effect_system/spark_spread/spark_system var/matter = 0 var/max_matter = 100 - 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 /// Bitflags for upgrades @@ -79,10 +79,10 @@ RLD /// Installs an upgrade into the RCD checking if it is already installed, or if it is a banned upgrade /obj/item/construction/proc/install_upgrade(obj/item/rcd_upgrade/rcd_up, mob/user) if(rcd_up.upgrade & upgrade) - to_chat(user, "[src] has already installed this upgrade!") + to_chat(user, span_warning("[src] has already installed this upgrade!")) return if(rcd_up.upgrade & banned_upgrades) - to_chat(user, "[src] can't install this upgrade!") + to_chat(user, span_warning("[src] can't install this upgrade!")) return upgrade |= rcd_up.upgrade if((rcd_up.upgrade & RCD_UPGRADE_SILO_LINK) && !silo_mats) @@ -99,7 +99,7 @@ RLD var/obj/item/rcd_ammo/R = O 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 FALSE R.ammoamt -= load if(R.ammoamt <= 0) @@ -110,14 +110,14 @@ RLD else if(istype(O, /obj/item/stack)) loaded = loadwithsheets(O, user) 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.")) update_icon() //ensures that ammo counters (if present) get updated return loaded /obj/item/construction/proc/loadwithsheets(obj/item/stack/S, mob/user) var/value = S.matter_amount if(value <= 0) - to_chat(user, "You can't insert [S.name] into [src]!") + to_chat(user, span_notice("You can't insert [S.name] into [src]!")) return FALSE var/maxsheets = round((max_matter-matter)/value) //calculate the max number of sheets that will fit in RCD if(maxsheets > 0) @@ -125,9 +125,9 @@ RLD S.use(amount_to_use) matter += value*amount_to_use playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) - to_chat(user, "You insert [amount_to_use] [S.name] sheets into [src]. ") + to_chat(user, span_notice("You insert [amount_to_use] [S.name] sheets into [src]. ")) return TRUE - to_chat(user, "You can't insert any more [S.name] sheets into [src]!") + to_chat(user, span_warning("You can't insert any more [S.name] sheets into [src]!")) return FALSE /obj/item/construction/proc/activate() @@ -150,10 +150,10 @@ 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) - to_chat(user, "No silo link detected. Connect to silo via multitool.") + to_chat(user, span_alert("No silo link detected. Connect to silo via multitool.")) return FALSE if(!silo_mats.mat_container.has_materials(list(/datum/material/iron = 500), amount)) if(user) @@ -172,7 +172,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) @@ -183,7 +183,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 @@ -241,7 +241,7 @@ RLD var/obj/item/electronics/airlock/airlock_electronics /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_glass_verb() @@ -311,17 +311,17 @@ RLD else window_type = /obj/structure/window/fulltile - to_chat(user, "You change \the [src]'s window mode to [window_size] [window_glass] window.") + to_chat(user, span_notice("You change \the [src]'s window mode to [window_size] [window_glass] window.")) /obj/item/construction/rcd/proc/toggle_silo_link(mob/user) if(silo_mats) if(!silo_mats.mat_container) - to_chat(user, "No silo link detected. Connect to silo via multitool.") + to_chat(user, span_alert("No silo link detected. Connect to silo via multitool.")) return FALSE silo_link = !silo_link - to_chat(user, "You change \the [src]'s storage link state: [silo_link ? "ON" : "OFF"].") + to_chat(user, span_notice("You change \the [src]'s storage link state: [silo_link ? "ON" : "OFF"].")) else - to_chat(user, "\the [src] doesn't have remote storage connection.") + to_chat(user, span_warning("\the [src] doesn't have remote storage connection.")) /obj/item/construction/rcd/proc/get_airlock_image(airlock_type) var/obj/machinery/door/airlock/proto = airlock_type @@ -634,7 +634,7 @@ RLD else return playsound(src, 'sound/effects/pop.ogg', 50, FALSE) - to_chat(user, "You change RCD's mode to '[choice]'.") + to_chat(user, span_notice("You 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)) @@ -671,7 +671,7 @@ RLD update_icon() /obj/item/construction/rcd/borg - no_ammo_message = "Insufficient charge." + no_ammo_message = span_warning("Insufficient charge.") desc = "A device used to rapidly build walls and floors." canRturf = TRUE banned_upgrades = RCD_UPGRADE_SILO_LINK @@ -810,13 +810,13 @@ RLD switch(mode) if(REMOVE_MODE) mode = LIGHT_MODE - to_chat(user, "You change RLD's mode to 'Permanent Light Construction'.") + to_chat(user, span_notice("You change RLD's mode to 'Permanent Light Construction'.")) if(LIGHT_MODE) mode = GLOW_MODE - to_chat(user, "You change RLD's mode to 'Light Launcher'.") + to_chat(user, span_notice("You change RLD's mode to 'Light Launcher'.")) if(GLOW_MODE) mode = REMOVE_MODE - to_chat(user, "You change RLD's mode to 'Deconstruct'.") + to_chat(user, span_notice("You change RLD's mode to 'Deconstruct'.")) /obj/item/construction/rld/proc/checkdupes(var/target) @@ -836,7 +836,7 @@ RLD if(REMOVE_MODE) if(istype(A, /obj/machinery/light/)) if(checkResource(deconcost, user)) - to_chat(user, "You start deconstructing [A]...") + to_chat(user, span_notice("You start deconstructing [A]...")) user.Beam(A,icon_state="nzcrentrs_power",time=15) playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) if(do_after(user, decondelay, target = A)) @@ -850,7 +850,7 @@ RLD if(iswallturf(A)) var/turf/closed/wall/W = A if(checkResource(floorcost, user)) - to_chat(user, "You start building a wall light...") + to_chat(user, span_notice("You start building a wall light...")) user.Beam(A,icon_state="nzcrentrs_power",time=15) playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) playsound(src.loc, 'sound/effects/light_flicker.ogg', 50, FALSE) @@ -866,7 +866,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/misc/compiler-failure.ogg', 30, TRUE) return FALSE for(var/turf/open/O in candidates) @@ -896,7 +896,7 @@ RLD if(isfloorturf(A)) var/turf/open/floor/F = A if(checkResource(floorcost, user)) - to_chat(user, "You start building a floor light...") + to_chat(user, span_notice("You start building a floor light...")) user.Beam(A,icon_state="light_beam",time=15) playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) playsound(src.loc, 'sound/effects/light_flicker.ogg', 50, TRUE) @@ -916,7 +916,7 @@ RLD if(GLOW_MODE) if(useResource(launchcost, user)) activate() - to_chat(user, "You fire a glowstick!") + to_chat(user, span_notice("You fire a glowstick!")) var/obj/item/flashlight/glowstick/G = new /obj/item/flashlight/glowstick(start) G.color = color_choice G.light_color = G.color diff --git a/code/game/objects/items/RCL.dm b/code/game/objects/items/RCL.dm index e568fbb9755d..458fd4f5f981 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, "You add the cables to [src]. It now contains [loaded.amount].") + to_chat(user, span_notice("You add the cables 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, "You attempt to loosen the securing screws on the side, but it falls apart!") + to_chat(user, span_warning("You 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, "You loosen the securing screws on the side, allowing you to lower the guiding edge and retrieve the wires.") + to_chat(user, span_notice("You 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] cables." + . += span_info("It contains [loaded.amount]/[max_amount] cables.") /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 cables unreel from [src].") + to_chat(user, span_notice("The last of the cables unreel from [src].")) if(loaded) QDEL_NULL(loaded) loaded = null @@ -167,11 +167,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 865a6f45ff81..38323903c1ec 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -275,7 +275,7 @@ GLOBAL_LIST_INIT(fluid_duct_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/machines/click.ogg', 50, 1) playsound(get_turf(user), 'sound/items/deconstruct.ogg', 50, 1) return(BRUTELOSS) @@ -399,10 +399,10 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( if(istype(A, /obj/item/pipe)) var/obj/item/pipe/P = A if(!P.disposable) - to_chat(usr, "[src] is too valuable to dispose of!") + to_chat(usr, span_warning("[src] is too valuable to dispose of!")) return // yogs end - to_chat(user, "You start destroying a pipe...") + to_chat(user, span_notice("You start destroying a pipe...")) playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) if(do_after(user, destroy_speed, target = A)) activate() @@ -412,24 +412,24 @@ GLOBAL_LIST_INIT(fluid_duct_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, "You start painting \the [P] [paint_color]...") + to_chat(user, span_notice("You start painting \the [P] [paint_color]...")) playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) 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].","You paint \the [P] [paint_color].") + user.visible_message(span_notice("[user] paints \the [P] [paint_color]."),span_notice("You 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, "You start painting \the [A] [paint_color]...") + to_chat(user, span_notice("You start painting \the [A] [paint_color]...")) playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) 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].","You paint \the [A] [paint_color].") + user.visible_message(span_notice("[user] paints \the [A] [paint_color]."),span_notice("You paint \the [A] [paint_color].")) return if(mode&BUILD_MODE) if(istype(get_area(user), /area/reebe/city_of_cogs)) - to_chat(user, "You cannot build on Reebe..") + to_chat(user, span_notice("You cannot build on Reebe..")) return switch(category) //if we've gotten this var, the target is valid if(ATMOS_CATEGORY) //Making pipes @@ -437,7 +437,7 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( return ..() playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) if (recipe.type == /datum/pipe_info/meter) - to_chat(user, "You start building a meter...") + to_chat(user, span_notice("You 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)) @@ -446,12 +446,12 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( PM.wrench_act(user, src) else if(recipe.all_layers == FALSE && (piping_layer == 1 || piping_layer == 5)) - to_chat(user, "You can't build this object on the layer...") + to_chat(user, span_notice("You can't build this object on the layer...")) return ..() - to_chat(user, "You start building a pipe...") + to_chat(user, span_notice("You start building a pipe...")) if(do_after(user, atmos_build_speed, target = A)) if(recipe.all_layers == FALSE && (piping_layer == 1 || piping_layer == 5))//double check to stop cheaters (and to not waste time waiting for something that can't be placed) - to_chat(user, "You can't build this object on the layer...") + to_chat(user, span_notice("You can't build this object on the layer...")) return ..() activate() var/obj/machinery/atmospherics/path = queued_p_type @@ -475,15 +475,15 @@ GLOBAL_LIST_INIT(fluid_duct_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, "You start building a disposals pipe...") + to_chat(user, span_notice("You start building a disposals pipe...")) playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) 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 @@ -500,9 +500,9 @@ GLOBAL_LIST_INIT(fluid_duct_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, "You start building a transit tube...") + to_chat(user, span_notice("You start building a transit tube...")) playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) if(do_after(user, transit_build_speed, target = A)) activate() @@ -529,9 +529,9 @@ GLOBAL_LIST_INIT(fluid_duct_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, "You start building a fluid duct...") + to_chat(user, span_notice("You start building a fluid duct...")) playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) if(do_after(user, plumbing_build_speed, target = A)) var/obj/machinery/duct/D @@ -562,7 +562,7 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( piping_layer = max(PIPING_LAYER_MIN, piping_layer - 1) else return - to_chat(source, "You set the layer to [piping_layer].") + to_chat(source, span_notice("You set the layer to [piping_layer].")) /obj/item/pipe_dispenser/plumbing name = "Plumberinator" diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm index 9163a967df5f..e38c7f736cb4 100644 --- a/code/game/objects/items/RSF.dm +++ b/code/game/objects/items/RSF.dm @@ -40,7 +40,7 @@ RSF /obj/item/rsf/examine(mob/user) . = ..() - . += "It currently holds [matter]/[max_matter] matter-units." + . += span_notice("It currently holds [matter]/[max_matter] matter-units.") /obj/item/rsf/cyborg matter = 50 @@ -50,7 +50,7 @@ RSF if(istype(W, /obj/item/rcd_ammo))//If the thing we got hit by is in our matter list var/tempMatter = matter + 10 if(tempMatter > max_matter) - to_chat(user, "\The [src] can't hold any more matter-units!") + to_chat(user, span_warning("\The [src] can't hold any more matter-units!")) return qdel(W) matter = tempMatter //We add its value @@ -63,7 +63,7 @@ RSF return ..() 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.")) icon_state = initial(icon_state)//and set the icon state to the initial value it had playsound(src.loc, 'sound/machines/click.ogg', 10, 1) @@ -90,16 +90,16 @@ RSF /obj/item/rsf/proc/loadwithsheets(obj/item/stack/S, mob/user) var/value = S.matter_amount if(value <= 0) - to_chat(user, "You can't insert [S.name] into [src]!") + to_chat(user, span_notice("You can't insert [S.name] into [src]!")) return FALSE var/maxsheets = round((max_matter-matter)/value) //calculate the max number of sheets that will fit in RCD if(maxsheets > 0) var/amount_to_use = min(S.amount, maxsheets) S.use(amount_to_use) matter += value*amount_to_use - to_chat(user, "You insert [amount_to_use] [S.name] sheets into [src]. ") + to_chat(user, span_notice("You insert [amount_to_use] [S.name] sheets into [src]. ")) return TRUE - to_chat(user, "You can't insert any more [S.name] sheets into [src]!") + to_chat(user, span_warning("You can't insert any more [S.name] sheets into [src]!")) return FALSE ///Forms a radial menu based off an object in a list, or a list's associated object @@ -125,7 +125,7 @@ RSF if(use_matter(dispense_cost, user))//If we can charge that amount of charge, we do so and return true playsound(loc, 'sound/machines/click.ogg', 10, TRUE) var/atom/meme = new to_dispense(get_turf(A)) - to_chat(user, "[action_type] [meme.name]...") + to_chat(user, span_notice("[action_type] [meme.name]...")) ///A helper proc. checks to see if we can afford the amount of charge that is passed, and if we can docs the charge from our base, and returns TRUE. If we can't we return FALSE /obj/item/rsf/proc/use_matter(charge, mob/user) @@ -133,18 +133,18 @@ RSF var/mob/living/silicon/robot/R = user var/end_charge = R.cell.charge - charge if(end_charge < 0) - to_chat(user, "You do not have enough power to use [src].") + to_chat(user, span_warning("You do not have enough power to use [src].")) icon_state = spent_icon_state return FALSE R.cell.charge = end_charge return TRUE else if(matter - 1 < 0) - to_chat(user, "\The [src] doesn't have enough matter-units left.") + to_chat(user, span_warning("\The [src] doesn't have enough matter-units left.")) icon_state = spent_icon_state return FALSE matter-- - to_chat(user, "\The [src] now holds [matter]/[max_matter] matter-units.") + to_chat(user, span_notice("\The [src] now holds [matter]/[max_matter] matter-units.")) return TRUE ///Helper proc that iterates through all the things we are allowed to spawn on, and sees if the passed atom is one of them @@ -153,7 +153,7 @@ RSF if(istype(to_check, sort)) return TRUE - to_chat(user, "\The [src] is unable to place this here!") + to_chat(user, span_warning("\The [src] is unable to place this here!")) return FALSE /obj/item/rsf/cookiesynth @@ -184,9 +184,9 @@ RSF /obj/item/rsf/cookiesynth/emag_act(mob/user) obj_flags ^= EMAGGED if(obj_flags & EMAGGED) - to_chat(user, "You short out [src]'s reagent safety checker!") + to_chat(user, span_warning("You short out [src]'s reagent safety checker!")) else - to_chat(user, "You reset [src]'s reagent safety checker!") + to_chat(user, span_warning("You reset [src]'s reagent safety checker!")) /obj/item/rsf/cookiesynth/attack_self(mob/user) var/mob/living/silicon/robot/P = null @@ -239,12 +239,12 @@ 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, "You do not have enough power to use [src].") + to_chat(user, span_warning("You do not have enough power to use [src].")) return var/turf/T = get_turf(A) playsound(src.loc, 'sound/machines/click.ogg', 10, 1) diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index 8055048e6b1c..724c6df2a745 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -53,10 +53,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 FALSE else if(ink.charges < 1) - to_chat(user, "[src] is out of ink!") + to_chat(user, span_warning("[src] is out of ink!")) return FALSE else return TRUE @@ -65,7 +65,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 @@ -91,27 +91,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/effects/splat.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) @@ -120,17 +120,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, "You install [W] into [src].") + to_chat(user, span_notice("You install [W] into [src].")) ink = W playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) else @@ -141,5 +141,5 @@ playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) ink.forceMove(user.drop_location()) user.put_in_hands(ink) - to_chat(user, "You remove [ink] from [src].") + to_chat(user, span_notice("You 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 d8279832bb44..0028667330da 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, "You cannot place [src] on this spot!") + to_chat(user, span_warning("You cannot place [src] on this spot!")) return if(A.always_unpowered) - to_chat(user, "You cannot place [src] in this area!") + to_chat(user, span_warning("You 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 @@ -34,8 +34,8 @@ if(result_path) playsound(src.loc, 'sound/machines/click.ogg', 75, 1) user.visible_message("[user.name] attaches [src] to the wall.", - "You attach [src] to the wall.", - "You hear clicking.") + span_notice("You attach [src] to the wall."), + span_italics("You hear clicking.")) var/ndir = get_dir(on_wall,user) if(inverse) ndir = turn(ndir, 180) @@ -70,7 +70,7 @@ var/glass_amt = round(materials[/datum/material/glass]/MINERAL_MATERIAL_AMOUNT) if(W.tool_behaviour == TOOL_WRENCH && (metal_amt || glass_amt)) - to_chat(user, "You dismantle [src].") + to_chat(user, span_notice("You 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(T) 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, "You cannot place [src] in this area!") + to_chat(user, span_warning("You 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, "You cut the cables and disassemble the unused power terminal.") + to_chat(user, span_notice("You cut the cables and disassemble the unused power terminal.")) qdel(E) return TRUE diff --git a/code/game/objects/items/armor_polish.dm b/code/game/objects/items/armor_polish.dm index 7f82fa292d27..58570c7c0d84 100644 --- a/code/game/objects/items/armor_polish.dm +++ b/code/game/objects/items/armor_polish.dm @@ -27,19 +27,19 @@ obj/item/armorpolish/afterattack(atom/target, mob/user, proximity) remaining_uses -= 1 to_chat(user, "You apply [src] to the [target.name].") if(remaining_uses <= 0) { - to_chat(user, "The [src] disintegrates into nothing...") + to_chat(user, span_warning("The [src] disintegrates into nothing...")) qdel(src) } else { - to_chat(user, "The [src] has [remaining_uses] use[remaining_uses > 1 ? "s" : ""] left.") + to_chat(user, span_warning("The [src] has [remaining_uses] use[remaining_uses > 1 ? "s" : ""] left.")) } else if(istype(target,/obj/item/clothing/suit)) { - to_chat(user, "This suit is strong enough already! Try it on something weaker.") + to_chat(user, span_warning("This suit is strong enough already! Try it on something weaker.")) } else { - to_chat(user, "This headgear is strong enough already! Try it on something weaker.") + to_chat(user, span_warning("This headgear is strong enough already! Try it on something weaker.")) } else - to_chat(user, "You can only polish suits and headgear!") + to_chat(user, span_warning("You can only polish suits and headgear!")) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index e5b0617c63c0..1bd3eccff5e6 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, "You flip the blueprints over to view the complex information diagram.") + set_viewer(usr, span_notice("You flip the blueprints over to view the complex information diagram.")) if(href_list["hide_blueprints"]) - clear_viewer(usr,"You flip the blueprints over to view the simple information diagram.") + clear_viewer(usr,span_notice("You flip the blueprints over to view the simple information diagram.")) if(href_list["refresh"]) clear_viewer(usr) set_viewer(usr) @@ -186,12 +186,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, "You rename the '[prevname]' to '[str]'.") + to_chat(usr, span_notice("You 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 f4af60fdafa5..91abab8e840d 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, "You found an unknown alien organism in [owner]'s [zone]!") + to_chat(finder, span_warning("You found an unknown alien organism in [owner]'s [zone]!")) /obj/item/organ/body_egg/New(loc) if(iscarbon(loc)) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 213e63c328d4..aff64dbbb7dd 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) @@ -53,13 +53,13 @@ . = ..() if(contents.len) var/s = contents.len == 1 ? "" : "s" - . += "You can make out the shape[s] of [contents.len] object[s] through the fabric." + . += span_notice("You 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, "You suddenly feel the space around you torn apart! You're free!") + to_chat(A, span_notice("You suddenly feel the space around you torn apart! You're free!")) return ..() /obj/item/bodybag/bluespace/proc/CanReachReact(atom/movable/source, list/next) @@ -70,7 +70,7 @@ for(var/atom/movable/A in contents) A.forceMove(R) if(isliving(A)) - to_chat(A, "You suddenly feel air around you! You're free!") + to_chat(A, span_notice("You suddenly feel air around you! You're free!")) R.open(user) R.add_fingerprint(user) R.foldedbag_instance = src @@ -78,14 +78,14 @@ /obj/item/bodybag/bluespace/container_resist(mob/living/user) if(user.incapacitated()) - to_chat(user, "You can't get out while you're restrained like this!") + to_chat(user, span_warning("You 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, "You 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("You 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_userdanger("[user] breaks free of [src]!")) qdel(src) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 5a2b457ff21f..ebc90bd5c558 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -71,7 +71,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/infinite infinite = TRUE diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index fc631ae1fc49..5b433a90b0cd 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -38,7 +38,7 @@ /obj/item/cardboard_cutout/attack_hand(mob/living/user) if(user.a_intent == INTENT_HELP || pushed_over) return ..() - user.visible_message("[user] pushes over [src]!", "You push over [src]!") + user.visible_message(span_warning("[user] pushes over [src]!"), span_danger("You push over [src]!")) playsound(src, 'sound/weapons/genhit.ogg', 50, 1) push_over() @@ -54,7 +54,7 @@ /obj/item/cardboard_cutout/attack_self(mob/living/user) if(!pushed_over) return - to_chat(user, "You right [src].") + to_chat(user, span_notice("You 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 @@ -86,7 +86,7 @@ /obj/item/cardboard_cutout/bullet_act(obj/item/projectile/P) if(istype(P, /obj/item/projectile/bullet/reusable)) P.on_hit(src, 0) - visible_message("[src] has been hit by [P]!") + visible_message(span_danger("[src] has been hit by [P]!")) playsound(src, 'sound/weapons/slice.ogg', 50, 1) if(prob(P.damage)) push_over() @@ -108,7 +108,7 @@ return FALSE if(!check_menu(user, crayon)) return FALSE - 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 @@ -213,14 +213,14 @@ if(user.incapacitated()) return FALSE if(pushed_over) - to_chat(user, "Right [src] first!") + to_chat(user, span_warning("Right [src] first!")) return FALSE if(!crayon || !user.is_holding(crayon)) return FALSE if(crayon.check_empty(user)) return FALSE if(crayon.is_capped) - to_chat(user, "Take the cap off first!") + to_chat(user, span_warning("Take the cap off first!")) return FALSE return TRUE diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index cbf239e9e3bf..fc27ffdfbb71 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -20,7 +20,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 @@ -140,7 +140,7 @@ var/minor if(registered_name && registered_age && registered_age < AGE_MINOR) minor = " (MINOR)" - user.visible_message("[user] shows you: [icon2html(src, viewers(user))] [src.name][minor].", "You show \the [src.name][minor].") + user.visible_message(span_notice("[user] shows you: [icon2html(src, viewers(user))] [src.name][minor]."), span_notice("You show \the [src.name][minor].")) /obj/item/card/id/vv_edit_var(var_name, var_value) . = ..() @@ -165,20 +165,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, "You 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("You 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, "You insert [I] into [src], adding [cash_money] credits to the linked account.") + to_chat(user, span_notice("You 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) @@ -198,37 +198,37 @@ 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 for(var/A in SSeconomy.bank_accounts) var/datum/bank_account/B = A if(B.account_id == new_bank_id) 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 - to_chat(user, "The account ID number provided is invalid.") + to_chat(user, span_warning("The account ID number provided is invalid.")) 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, 1) if(!amount_to_remove || amount_to_remove < 0) - to_chat(user, "You're pretty sure that's not how money works.") + to_chat(user, span_warning("You're pretty sure that's not how money works.")) return if(!alt_click_can_use_id(user)) return 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, "You withdraw [amount_to_remove] credits into a holochip.") + to_chat(user, span_notice("You 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) .=..() @@ -243,12 +243,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." - . += "You 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("You 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 your account by Alt-Clicking a blank ID card while holding it and entering your account ID number." + . += span_boldnotice("If you lose this ID card, you can reclaim your account by Alt-Clicking a blank ID card while holding it and entering your 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 @@ -314,7 +314,7 @@ update_label("John Doe", "Clowny") 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) @@ -350,7 +350,7 @@ update_label("John Doe", "Clowny") assignment = target_occupation update_label() forged = TRUE - to_chat(user, "You successfully forge the ID card.") + to_chat(user, span_notice("You successfully forge the ID card.")) log_game("[key_name(user)] has forged \the [initial(name)] with name \"[registered_name]\" and occupation \"[assignment]\".") // First time use automatically sets the account id to the user. @@ -363,7 +363,7 @@ update_label("John Doe", "Clowny") if(account.account_id == accountowner.account_id) account.bank_cards += src registered_account = account - to_chat(user, "Your account number has been automatically assigned.") + to_chat(user, span_notice("Your account number has been automatically assigned.")) return else if (popup_input == "Forge/Reset" && forged) registered_name = initial(registered_name) @@ -371,7 +371,7 @@ update_label("John Doe", "Clowny") log_game("[key_name(user)] has reset \the [initial(name)] named \"[src]\" to default.") update_label() forged = FALSE - to_chat(user, "You successfully reset the ID card.") + to_chat(user, span_notice("You successfully reset the ID card.")) return else if (popup_input == "Change Account ID") set_new_account(user) @@ -391,10 +391,10 @@ update_label("John Doe", "Clowny") 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) @@ -405,11 +405,11 @@ update_label("John Doe", "Clowny") 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/syndicate/anyone @@ -559,7 +559,7 @@ update_label("John Doe", "Clowny") registered_age = null /obj/item/card/id/prisoner/attack_self(mob/user) - to_chat(usr, "You have accumulated [points] out of the [goal] points you need for freedom.") + to_chat(usr, span_notice("You 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/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm index 54a15cb39e07..56e3d975e4e5 100644 --- a/code/game/objects/items/chrono_eraser.dm +++ b/code/game/objects/items/chrono_eraser.dm @@ -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 956cbb5cb3bf..bcb9ed33e549 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -81,11 +81,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M) if(lit && cig && user.a_intent == INTENT_HELP) if(cig.lit) - to_chat(user, "[cig] is already lit.") + to_chat(user, span_notice("[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 ..() @@ -133,7 +133,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() @@ -163,12 +163,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, "You dip \the [src] into \the [glass].") + to_chat(user, span_notice("You 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_notice("[glass] is empty.")) else - to_chat(user, "[src] is full.") + to_chat(user, span_notice("[src] is full.")) /obj/item/clothing/mask/cigarette/proc/light(flavor_text = null) @@ -234,7 +234,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM lit = FALSE if(ismob(loc)) var/mob/living/M = loc - to_chat(M, "Your [name] goes out.") + to_chat(M, span_notice("Your [name] goes out.")) M.update_inv_wear_mask() M.update_inv_hands() @@ -259,7 +259,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(smoketime < 1) new type_butt(location) if(ismob(loc)) - to_chat(M, "Your [name] goes out.") + to_chat(M, span_notice("Your [name] goes out.")) qdel(src) return open_flame() @@ -269,7 +269,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/effect/decal/cleanable/ash(user.loc) qdel(src) @@ -279,16 +279,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.a_intent == INTENT_HELP) if(cig.lit) - to_chat(user, "The [cig.name] is already lit.") + to_chat(user, span_notice("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 ..() @@ -460,7 +460,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM new /obj/effect/decal/cleanable/ash(location) if(ismob(loc)) var/mob/living/M = loc - to_chat(M, "Your [name] goes out.") + to_chat(M, span_notice("Your [name] goes out.")) lit = 0 icon_state = icon_off item_state = icon_off @@ -479,7 +479,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, "You stuff [O] into [src].") + to_chat(user, span_notice("You stuff [O] into [src].")) smoketime = 400 packeditem = 1 name = "[O.name]-packed [initial(name)]" @@ -487,30 +487,30 @@ 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 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].", "You put out [src].") + user.visible_message(span_notice("[user] puts out [src]."), span_notice("You put out [src].")) lit = 0 icon_state = icon_off item_state = icon_off STOP_PROCESSING(SSobj, src) return if(!lit && smoketime > 0) - to_chat(user, "You empty [src] onto [location].") + to_chat(user, span_notice("You empty [src] onto [location].")) new /obj/effect/decal/cleanable/ash(location) packeditem = 0 smoketime = 0 @@ -567,11 +567,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/items/welder.ogg', 50, 1) 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() @@ -582,7 +582,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/lighter/ignition_effect(atom/A, mob/user) if(is_hot()) - . = "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) lit = new_lit @@ -609,7 +609,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("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 @@ -622,19 +622,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("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.", "You burn yourself 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("You burn yourself 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("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.", "You quietly shut off [src] without even looking at what you're doing. Wow.") + user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.", span_notice("You quietly shut off [src] without even looking at what you're doing. Wow.")) else - user.visible_message("[user] quietly shuts off [src].", "You quietly shut off [src].") + user.visible_message("[user] quietly shuts off [src].", span_notice("You quietly shut off [src].")) else . = ..() @@ -645,14 +645,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M) if(lit && cig && user.a_intent == INTENT_HELP) if(cig.lit) - to_chat(user, "The [cig.name] is already lit.") + to_chat(user, span_notice("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 ..() @@ -709,7 +709,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/lighter/greyscale/ignition_effect(atom/A, mob/user) if(is_hot()) - . = "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 @@ -745,10 +745,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM qdel(target) qdel(src) user.put_in_active_hand(R) - to_chat(user, "You roll the [target.name] into a rolling paper.") + to_chat(user, span_notice("You roll the [target.name] into a rolling paper.")) R.desc = "Dried [target.name] rolled up in a thin piece of paper." else - to_chat(user, "You need to dry this first!") + to_chat(user, span_warning("You need to dry this first!")) /////////////// //VAPE NATION// @@ -766,7 +766,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) @@ -783,7 +783,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(O.tool_behaviour == TOOL_SCREWDRIVER) if(!screw) screw = TRUE - to_chat(user, "You open the cap on [src].") + to_chat(user, span_notice("You open the cap on [src].")) ENABLE_BITFIELD(reagents.flags, OPENCONTAINER) if(obj_flags & EMAGGED) add_overlay("vapeopen_high") @@ -793,7 +793,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM add_overlay("vapeopen_low") else screw = FALSE - to_chat(user, "You close the cap on [src].") + to_chat(user, span_notice("You close the cap on [src].")) DISABLE_BITFIELD(reagents.flags, OPENCONTAINER) cut_overlays() @@ -802,16 +802,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!super) cut_overlays() super = 1 - to_chat(user, "You increase the voltage of [src].") + to_chat(user, span_notice("You increase the voltage of [src].")) add_overlay("vapeopen_med") else cut_overlays() super = 0 - to_chat(user, "You decrease the voltage of [src].") + to_chat(user, span_notice("You 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_notice("[src] can't be modified!")) else ..() @@ -822,30 +822,30 @@ CIGARETTE PACKETS ARE IN FANCY.DM cut_overlays() obj_flags |= EMAGGED super = 0 - to_chat(user, "You maximize the voltage of [src].") + to_chat(user, span_warning("You 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, "You need to open the cap to do that.") + to_chat(user, span_notice("You 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, "You empty [src] of all reagents.") + to_chat(user, span_notice("You 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, "You start puffing on the vape.") + to_chat(user, span_notice("You 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, "You need to close the cap first!") + to_chat(user, span_warning("You need to close the cap first!")) /obj/item/clothing/mask/vape/dropped(mob/user) . = ..() @@ -897,7 +897,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!reagents.total_volume) if(ismob(loc)) - to_chat(M, "[src] is empty!") + to_chat(M, span_notice("[src] is empty!")) STOP_PROCESSING(SSobj, src) //it's reusable so it won't unequip when empty return @@ -921,7 +921,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 your mouth!") + to_chat(M, span_userdanger("[src] suddenly explodes in your mouth!")) qdel(src) return diff --git a/code/game/objects/items/circuitboards/circuitboard.dm b/code/game/objects/items/circuitboards/circuitboard.dm index 8c1b92172b82..ed3dc08fe9bd 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 a830d0b7c042..81284c9b9cd9 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -32,7 +32,7 @@ /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, "You set the board to \"[dept_list[target_dept]]\".") + to_chat(user, span_notice("You set the board to \"[dept_list[target_dept]]\".")) else return ..() @@ -200,11 +200,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 ..() @@ -350,11 +350,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 ..() @@ -448,15 +448,15 @@ /obj/item/circuitboard/computer/cargo/multitool_act(mob/living/user) 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_notice("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, "You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.") + to_chat(user, span_notice("You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.")) /obj/item/circuitboard/computer/cargo/express name = "Express Supply Console (Computer Board)" @@ -464,13 +464,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_notice("Routing protocols are already set to: \"factory defaults\".")) else - to_chat(user, "You reset the routing protocols to: \"factory defaults\".") + to_chat(user, span_notice("You reset the routing protocols to: \"factory defaults\".")) obj_flags &= ~EMAGGED /obj/item/circuitboard/computer/cargo/express/emag_act(mob/living/user) - to_chat(user, "You change the routing protocols, allowing the Drop Pod to land anywhere on the station.") + to_chat(user, span_notice("You 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 35d91e5d9924..877bab1ea247 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -176,7 +176,7 @@ name = initial(new_type.name) build_path = initial(new_type.build_path) I.play_tool_sound(src) - to_chat(user, "You change the circuitboard setting to \"[new_setting]\".") + to_chat(user, span_notice("You change the circuitboard setting to \"[new_setting]\".")) else return ..() @@ -378,7 +378,7 @@ name = initial(new_type.name) build_path = initial(new_type.build_path) I.play_tool_sound(src) - to_chat(user, "You change the circuitboard setting to \"[new_setting]\".") + to_chat(user, span_notice("You change the circuitboard setting to \"[new_setting]\".")) else return ..() @@ -434,7 +434,7 @@ else build_path = /obj/machinery/holopad/secure secure = TRUE - to_chat(user, "You [secure? "en" : "dis"]able the security on the [src]") + to_chat(user, span_notice("You [secure? "en" : "dis"]able the security on the [src]")) . = ..() /obj/item/circuitboard/machine/holopad/examine(mob/user) @@ -528,13 +528,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, "You set the board to [fridges_name_paths[build_path]].") + to_chat(user, span_notice("You 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 @@ -698,7 +698,7 @@ build_path = new_path name = "[new_name] 3000 (Machine Board)" - to_chat(user, "You change the circuit board setting to \"[new_name]\".") + to_chat(user, span_notice("You change the circuit board setting to \"[new_name]\".")) else return ..() @@ -918,7 +918,7 @@ /obj/item/circuitboard/machine/public_nanite_chamber/multitool_act(mob/living/user) if(!(src.loc == user)) - to_chat(user, "You have to hold the circuit in your hand to change it!") + to_chat(user, span_warning("You have to hold the circuit in your hand to change it!")) return var/new_cloud = input("Set the public nanite chamber's Cloud ID (1-100).", "Cloud ID", cloud_id) as num|null if(new_cloud) @@ -1030,13 +1030,13 @@ /obj/item/circuitboard/machine/dish_drive/attack_self(mob/living/user) suction = !suction - to_chat(user, "You [suction ? "enable" : "disable"] the board's suction function.") + to_chat(user, span_notice("You [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, "You [transmit ? "enable" : "disable"] the board's automatic disposal transmission.") + to_chat(user, span_notice("You [transmit ? "enable" : "disable"] the board's automatic disposal transmission.")) /obj/item/circuitboard/machine/gibber name = "Gibber (Machine Board)" @@ -1092,11 +1092,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 3d359c59705c..f68c1423d2a0 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 = "A heavy duty bar of Nanotrasen brand soap. Smells of plasma." @@ -75,21 +75,21 @@ /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, amount = 1) uses -= amount 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) . = ..() if(iscarbon(target) && user == target && user.zone_selected == BODY_ZONE_PRECISE_MOUTH && user.a_intent == INTENT_HELP) //mmm, soap... var/mob/living/carbon/C = user - user.visible_message("[user] takes a bite out of [src.name]!", "You gnaw on [src]! This can't be good for you...") + user.visible_message(span_notice("[user] takes a bite out of [src.name]!"), span_notice("You gnaw on [src]! This can't be good for you...")) playsound(get_turf(C), 'sound/items/eatfood.ogg', 25, 0) C.reagents.add_reagent(/datum/reagent/toxin/formaldehyde, 2) C.reagents.add_reagent(/datum/reagent/toxin/chloralhydrate, 3) @@ -101,32 +101,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, "You need to take that [target.name] off before cleaning it!") + to_chat(user, span_warning("You 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].", "You begin to scrub \the [target.name] out with [src]...") + user.visible_message("[user] begins to scrub \the [target.name] out with [src].", span_warning("You begin to scrub \the [target.name] out with [src]...")) if(do_after(user, src.cleanspeed, target = target)) - to_chat(user, "You scrub \the [target.name] out.") + to_chat(user, span_notice("You 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]!", "You 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("You 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]...", "You begin to clean \the [target.name] with [src]...") + user.visible_message("[user] begins to clean \the [target.name] with [src]...", span_notice("You begin to clean \the [target.name] with [src]...")) if(do_after(user, src.cleanspeed, target = target)) - to_chat(user, "You clean \the [target.name].") + to_chat(user, span_notice("You 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]...", "You begin to clean \the [target.name] with [src]...") + user.visible_message("[user] begins to clean \the [target.name] with [src]...", span_notice("You begin to clean \the [target.name] with [src]...")) if(do_after(user, src.cleanspeed, target = target)) - to_chat(user, "You clean \the [target.name].") + to_chat(user, span_notice("You clean \the [target.name].")) target.wash(CLEAN_SCRUB) target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) target.wash_cream() @@ -163,7 +163,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/items/bikehorn.ogg', 50, TRUE) return (BRUTELOSS) diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index bb448d11d14e..dfb186eb0c58 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, "You twist \the [src] [open ? "closed" : "open"].") + to_chat(user, span_notice("You twist \the [src] [open ? "closed" : "open"].")) open = !open if(open) var/mutable_appearance/colored_overlay = mutable_appearance(icon, "lipstick_uncap_color") @@ -53,31 +53,31 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(ispolysmorph(M))//polysmorphs dont have sprites for lipstick - to_chat(user,"Where are the lips on that?") + to_chat(user,span_warning("Where are the lips on that?")) return 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, "You need to wipe off the old lipstick first!") + to_chat(user, span_warning("You need to wipe off the old lipstick first!")) return if(H == user) - user.visible_message("[user] does [user.p_their()] lips with \the [src].", \ - "You take a moment to apply \the [src]. Perfect!") + user.visible_message(span_notice("[user] does [user.p_their()] lips with \the [src]."), \ + span_notice("You 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].", \ - "You 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("You 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].", \ - "You apply \the [src] on [H]'s lips.") + span_notice("You 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) @@ -88,15 +88,15 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H == user) - to_chat(user, "You wipe off the lipstick with [src].") + to_chat(user, span_notice("You 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].", \ - "You 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("You 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].", \ - "You wipe off [H]'s lipstick.") + span_notice("You wipe off [H]'s lipstick.")) H.lip_style = null H.update_body() else @@ -111,7 +111,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 @@ -131,23 +131,23 @@ var/mob/living/carbon/human/H = M var/location = user.zone_selected if((location in list(BODY_ZONE_PRECISE_EYES, 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.a_intent == INTENT_HELP) if(H.gender == MALE) if (H == user) - to_chat(user, "You need a mirror to properly style your own facial hair!") + to_chat(user, span_warning("You 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 hair style", "Grooming") as null|anything in GLOB.facial_hair_styles_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 hair style using [src].", "You try to change [H]'s facial hair style using [src].") + user.visible_message(span_notice("[user] tries to change [H]'s facial hair style using [src]."), span_notice("You try to change [H]'s facial hair style using [src].")) if(new_style && do_after(user, 60, target = H)) - user.visible_message("[user] successfully changes [H]'s facial hair style using [src].", "You successfully change [H]'s facial hair style using [src].") + user.visible_message(span_notice("[user] successfully changes [H]'s facial hair style using [src]."), span_notice("You successfully change [H]'s facial hair style using [src].")) H.facial_hair_style = new_style H.update_hair() return @@ -156,74 +156,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_hair_style == "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].", \ - "You take a moment to shave your facial hair with [src]...") + span_notice("You 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].", \ - "You finish shaving with [src]. Fast and clean!") + span_notice("You finish shaving with [src]. Fast and clean!")) shave(H, location) else - user.visible_message("[user] tries to shave [H]'s facial hair with [src].", \ - "You start shaving [H]'s facial hair...") + user.visible_message(span_warning("[user] tries to shave [H]'s facial hair with [src]."), \ + span_notice("You 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].", \ - "You shave [H]'s facial hair clean off.") + user.visible_message(span_warning("[user] shaves off [H]'s facial hair with [src]."), \ + span_notice("You shave [H]'s facial hair clean off.")) shave(H, location) else if(location == BODY_ZONE_HEAD) if(user.a_intent == INTENT_HELP) if (H == user) - to_chat(user, "You need a mirror to properly style your own hair!") + to_chat(user, span_warning("You 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 hair style", "Grooming") as null|anything in GLOB.hair_styles_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].", "You try to change [H]'s hairstyle using [src].") + user.visible_message(span_notice("[user] tries to change [H]'s hairstyle using [src]."), span_notice("You 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].", "You successfully change [H]'s hairstyle using [src].") + user.visible_message(span_notice("[user] successfully changes [H]'s hairstyle using [src]."), span_notice("You successfully change [H]'s hairstyle using [src].")) H.hair_style = 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.hair_style == "Bald" || H.hair_style == "Balding Hair" || H.hair_style == "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].", \ - "You start to shave your head with [src]...") + span_notice("You 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].", \ - "You finish shaving with [src].") + span_notice("You 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]!", \ - "You start shaving [H]'s head...") + user.visible_message(span_warning("[user] tries to shave [H]'s head with [src]!"), \ + span_notice("You 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]!", \ - "You shave [H]'s head bald.") + user.visible_message(span_warning("[user] shaves [H]'s head bald with [src]!"), \ + span_notice("You 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 c0e81ed3d581..47e7798ce56f 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/items/gavel.ogg', 50, 1, -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/items/gavel.ogg', 100, 1) - 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 ..() \ No newline at end of file diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index 538dfb84cf38..994e6110504d 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, "You already activated Protocol CRAB-17.") + to_chat(user, span_warning("You 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 @@ -57,15 +57,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, "You quickly cash out your funds to a more secure banking location. Funds are safu.") + to_chat(user, span_warning("You quickly cash out your funds to a more secure banking location. Funds are safu.")) 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 2ca4954584d3..a2e5d96d1a39 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() @@ -129,12 +129,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_state(mob/user) @@ -150,7 +150,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() @@ -338,10 +338,10 @@ clicky = clamp(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2) if(!instant) - to_chat(user, "You start drawing a [temp] on the [target.name]...") // yogs -- removed a weird tab that had no reason to be here + to_chat(user, span_notice("You start drawing a [temp] on the [target.name]...")) // yogs -- removed a weird tab that had no reason to be here if(pre_noise) - audible_message("You hear spraying.") + audible_message(span_notice("You hear spraying.")) playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) var/wait_time = 50 @@ -382,20 +382,20 @@ 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 if(!instant) - to_chat(user, "You finish drawing \the [temp].") + to_chat(user, span_notice("You finish drawing \the [temp].")) else - to_chat(user, "You spray a [temp] on \the [target.name]") + to_chat(user, span_notice("You spray a [temp] on \the [target.name]")) if(length(text_buffer) > 1) text_buffer = copytext(text_buffer, length(text_buffer[1]) + 1) SStgui.update_uis(src) if(post_noise) - audible_message("You hear spraying.") + audible_message(span_notice("You hear spraying.")) playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) // yogs start -- using changes moved to the end of the proc, so it won't use charges if the spraying fails for any reason. var/charges_used = use_charges(user, cost) @@ -575,11 +575,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/effects/spray.ogg', 5, TRUE, 5) @@ -613,14 +613,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)) @@ -631,8 +631,8 @@ playsound(user.loc, 'sound/effects/spray.ogg', 25, 1, 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_userdanger("[user] sprays [src] into your face!")) if(C.client) C.blur_eyes(3) @@ -667,7 +667,7 @@ if(pre_noise || post_noise) playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) - user.visible_message("[user] coats [target] with spray paint!", "You coat [target] with spray paint.") + user.visible_message("[user] coats [target] with spray paint!", span_notice("You coat [target] with spray paint.")) return . = ..() @@ -690,7 +690,7 @@ chem_splash(loc, 5, list(reagents)) //lubecan makes big lube no explosion honk else if(istype(src, /obj/item/toy/crayon/spraycan/borg)) - to_chat(user, "ERR ERR. ASIMOV SPRAYCAN FIRMWARE DOES NOT ALLOW THIS.") + to_chat(user, span_warning("ERR ERR. ASIMOV SPRAYCAN FIRMWARE DOES NOT ALLOW THIS.")) return // are you fucking nuts else @@ -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 0223904b4fc3..3b11adc1ebbc 100644 --- a/code/game/objects/items/credit_holochip.dm +++ b/code/game/objects/items/credit_holochip.dm @@ -77,7 +77,7 @@ if(istype(I, /obj/item/holochip)) var/obj/item/holochip/H = I credits += H.credits - to_chat(user, "You insert the credits into [src].") + to_chat(user, span_notice("You 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, "You extract [split_amount] credits into a new holochip.") + to_chat(user, span_notice("You 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 ea15beb656bb..a66aa4dc6af4 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -97,13 +97,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 @@ -124,15 +124,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_notice("[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, "You install a cell in [src].") + to_chat(user, span_notice("You install a cell in [src].")) update_icon() else if(W.tool_behaviour == TOOL_SCREWDRIVER) @@ -140,7 +140,7 @@ cell.update_icon() cell.forceMove(get_turf(src)) cell = null - to_chat(user, "You remove the cell from [src].") + to_chat(user, span_notice("You remove the cell from [src].")) update_icon() else return ..() @@ -148,10 +148,10 @@ /obj/item/defibrillator/emag_act(mob/user) if(safety) safety = FALSE - to_chat(user, "You silently disable [src]'s safety protocols with the cryptographic sequencer.") + to_chat(user, span_warning("You silently disable [src]'s safety protocols with the cryptographic sequencer.")) else safety = TRUE - to_chat(user, "You silently enable [src]'s safety protocols with the cryptographic sequencer.") + to_chat(user, span_notice("You silently enable [src]'s safety protocols with the cryptographic sequencer.")) /obj/item/defibrillator/emp_act(severity) . = ..() @@ -164,10 +164,10 @@ if(!safety) safety = TRUE - visible_message("[src] beeps: Safety protocols enabled!") + visible_message(span_notice("[src] beeps: Safety protocols enabled!")) playsound(src, 'sound/machines/defib_saftyOn.ogg', 50, 0) else - visible_message("[src] buzzes: Surge detected!") + visible_message(span_notice("[src] buzzes: Surge detected!")) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) update_icon() @@ -181,7 +181,7 @@ //Detach the paddles into the user's hands if(!usr.put_in_hands(paddles)) on = FALSE - to_chat(user, "You need a free hand to hold the paddles!") + to_chat(user, span_warning("You need a free hand to hold the paddles!")) update_icon() return else @@ -237,10 +237,10 @@ spawn(50) if(cell) if(cell.charge >= paddles.revivecost) - user.visible_message("[src] beeps: Unit ready.") + user.visible_message(span_notice("[src] beeps: Unit ready.")) playsound(src, 'sound/machines/defib_ready.ogg', 50, 0) else - user.visible_message("[src] beeps: Charge depleted.") + user.visible_message(span_notice("[src] beeps: Charge depleted.")) playsound(src, 'sound/machines/defib_failed.ogg', 50, 0) paddles.cooldown = FALSE paddles.update_icon() @@ -335,10 +335,10 @@ 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!")) L.temporarilyRemoveItemFromInventory(src,TRUE) 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(var/time) @@ -348,7 +348,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/machines/defib_ready.ogg', 50, 0) cooldown = FALSE update_icon() @@ -371,7 +371,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/machines/defib_zap.ogg', 50, 1, -1) @@ -386,7 +386,7 @@ var/obj/item/twohanded/offhand/O = user.get_inactive_held_item() if(istype(O)) O.unwield() - 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) @@ -411,20 +411,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/machines/defib_failed.ogg', 50, 0) return if(!wielded) if(iscyborg(user)) - to_chat(user, "You must activate the paddles in your active module before you can use them on someone!") + to_chat(user, span_warning("You must activate the paddles in your active module before you can use them on someone!")) else - to_chat(user, "You need to wield the paddles in both hands before you can use them on someone!") + to_chat(user, span_warning("You 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.a_intent == INTENT_DISARM) @@ -433,15 +433,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, "You aren't sure how to revive that...") + to_chat(user, span_warning("You aren't sure how to revive that...")) return var/mob/living/carbon/H = M if(user.zone_selected != BODY_ZONE_CHEST) - to_chat(user, "You need to target your patient's chest with [src]!") + to_chat(user, span_warning("You need to target your patient's chest with [src]!")) return if(user.a_intent == INTENT_HARM) @@ -459,7 +459,7 @@ if(isliving(H.pulledby)) //CLEAR! var/mob/living/M = H.pulledby if(M.electrocute_act(30, src)) - 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) @@ -468,8 +468,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_userdanger("[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? @@ -491,39 +491,39 @@ return if(!req_defib && !combat) return - user.visible_message("[user] begins to place [src] on [H]'s chest.", - "You 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("You 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.", - "You 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("You place [src] on [H]'s chest and begin to charge them.")) var/turf/T = get_turf(defib) playsound(src, 'sound/machines/defib_charge.ogg', 50, 0) 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/machines/defib_failed.ogg', 50, 0) busy = FALSE update_icon() return - user.visible_message("[user] shocks [H] with \the [src]!", "You shock [H] with \the [src]!") + user.visible_message("[user] shocks [H] with \the [src]!", span_warning("You shock [H] with \the [src]!")) playsound(src, 'sound/machines/defib_zap.ogg', 100, 1, -1) playsound(src, 'sound/weapons/egloves.ogg', 100, 1, -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!", - "You feel a horrible agony in your chest!") + H.visible_message(span_warning("[H] thrashes wildly, clutching at [H.p_their()] chest!"), + span_userdanger("You 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) @@ -542,11 +542,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.", "You begin to place [src] on [H]'s chest...") + user.visible_message(span_warning("[user] begins to place [src] on [H]'s chest."), span_warning("You 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.", "You place [src] on [H]'s chest.") + user.visible_message(span_notice("[user] places [src] on [H]'s chest."), span_warning("You place [src] on [H]'s chest.")) playsound(src, 'sound/machines/defib_charge.ogg', 75, 0) var/total_burn = 0 var/total_brute = 0 @@ -559,13 +559,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/machines/defib_failed.ogg', 50, 0) 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", 50, 1) playsound(src, 'sound/machines/defib_zap.ogg', 75, 1, -1) total_brute = H.getBruteLoss() @@ -574,32 +574,32 @@ 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 unrecoverable. Further attempts futile." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's soul unrecoverable. 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. A replacement may allow for successful resuscitation." + failed = span_boldnotice("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's heart is missing. A replacement may allow for successful resuscitation.") else if (heart.organ_flags & ORGAN_FAILING) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's heart too damaged. A coronary bypass or replacement may allow for successful resuscitation." + failed = span_boldnotice("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's heart too damaged. A coronary bypass or replacement may allow for successful resuscitation.") else if(total_burn >= MAX_REVIVE_FIRE_DAMAGE || total_brute >= MAX_REVIVE_BRUTE_DAMAGE) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Severe tissue damage makes recovery of patient impossible via defibrillator. Surgical repair may allow for successful resuscitation." + failed = span_boldnotice("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Severe tissue damage makes recovery of patient impossible via defibrillator. Surgical repair may allow for successful resuscitation.") else if(HAS_TRAIT(H, TRAIT_HUSK)) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Restucitation failed - Lack of important fluids has rendered the patient body unsurvivable. Application of experimental DNA recovery surgery or an upgraded cloner recommended." + failed = span_boldnotice("[req_defib ? "[defib]" : "[src]"] buzzes: Restucitation failed - Lack of important fluids has rendered the patient body unsurvivable. Application of experimental DNA recovery surgery or an upgraded cloner recommended.") 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_boldnotice("[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. Brain repair may result in successful defibrillation." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's brain tissue is damaged making recovery of patient impossible via defibrillator. Brain repair may result in successful defibrillation.") if(BR.brain_death) - failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's brain damaged beyond point of no return. Brain repair may result in successful defibrillation." + failed = span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's brain damaged beyond point of no return. Brain repair may result in successful defibrillation.") 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) @@ -616,7 +616,7 @@ H.adjustFireLoss((mobhealth - HALFWAYCRITDEATH) * (total_burn / overall_damage), 0, required_status = BODYPART_ANY) H.adjustBruteLoss((mobhealth - HALFWAYCRITDEATH) * (total_brute / overall_damage), 0, required_status = BODYPART_ANY) 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.")) SSachievements.unlock_achievement(/datum/achievement/defib, user.client) playsound(src, 'sound/machines/defib_success.ogg', 50, 0) H.set_heartattack(FALSE) @@ -634,18 +634,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/machines/defib_failed.ogg', 50, 0) else if(H.undergoing_cardiac_arrest()) playsound(src, 'sound/machines/defib_zap.ogg', 50, 1, -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/machines/defib_failed.ogg', 50, 0) busy = FALSE update_icon() diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index 1283b94af5fe..7e0107cd8d2e 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, "You pet [src]. You swear it looks up at you.") + to_chat(user, span_notice("You 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 = "It's growing!" - 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("You have a bad feeling about this.") //welcome to the hostile carp enjoy your die + visible_message(span_warning("You 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/items/eatfood.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 092ce07725d8..fa4c82de417d 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -96,7 +96,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 @@ -106,10 +106,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, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return ..() @@ -486,7 +486,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, "You remove [cartridge] from [src].") + to_chat(U, span_notice("You remove [cartridge] from [src].")) scanmode = PDA_SCANNER_NONE cartridge.host_pda = null cartridge = null @@ -551,7 +551,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) if("Assistant Pager") @@ -622,14 +622,14 @@ GLOBAL_LIST_EMPTY(PDAs) pai.attack_self(U) if("2") // Eject pAI device usr.put_in_hands(pai) - to_chat(usr, "You remove the pAI from the [name].") + to_chat(usr, span_notice("You remove the pAI from the [name].")) //Redd's Shitty Paperwork Printing Functions======= if("print") //check if it's a head cartridge or a sec cartridge var/turf/user_turf = get_turf(usr) if (cartridge.access & CART_STATUS_DISPLAY) - to_chat(usr, "The PDA whirrs as a paper materializes!") + to_chat(usr, span_warning("The PDA whirrs as a paper materializes!")) playsound(src,"sound/items/polaroid1.ogg",30,1) //figure out which one we're trying to print switch(href_list["paper"]) @@ -656,7 +656,7 @@ GLOBAL_LIST_EMPTY(PDAs) if (PDA_PRINTING_JOB_REASSIGNMENT_CERTIFICATE) usr.put_in_hands(new /obj/item/paper/paperwork/jobchangecert(user_turf)) else if (cartridge.access & CART_SECURITY) - to_chat(usr, "The PDA whirrs as a paper materializes!") + to_chat(usr, span_warning("The PDA whirrs as a paper materializes!")) playsound(src,"sound/items/polaroid1.ogg",30,1) switch(href_list["paper"]) if (PDA_PRINTING_INCIDENT_REPORT) @@ -699,7 +699,7 @@ GLOBAL_LIST_EMPTY(PDAs) if (id) usr.put_in_hands(id) - to_chat(usr, "You remove the ID from the [name].") + to_chat(usr, span_notice("You remove the ID from the [name].")) id = null update_icon() if(ishuman(loc)) @@ -752,7 +752,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() @@ -765,7 +765,7 @@ GLOBAL_LIST_EMPTY(PDAs) 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, "Message sent to [target_text]: \"[message]\"") + to_chat(user, span_info("Message sent to [target_text]: \"[message]\"")) // Reset the photo picture = null last_text = world.time @@ -825,13 +825,13 @@ 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) /obj/item/pda/proc/ping_assistants(mob/living/U) if (last_everyone && world.time < last_everyone + PDA_SPAM_DELAY) - to_chat(U,"Function is still on cooldown.") + to_chat(U,span_warning("Function is still on cooldown.")) return var/area/A = get_area(U) @@ -879,7 +879,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 category = "Object" @@ -906,11 +906,11 @@ GLOBAL_LIST_EMPTY(PDAs) if(inserted_item) usr.put_in_hands(inserted_item) - to_chat(usr, "You remove [inserted_item] from [src].") + to_chat(usr, span_notice("You 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) @@ -944,25 +944,25 @@ GLOBAL_LIST_EMPTY(PDAs) return cartridge = C cartridge.host_pda = src - to_chat(user, "You insert [cartridge] into [src].") + to_chat(user, span_notice("You 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 //Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand. if(((src in user.contents) || (isturf(loc) && in_range(src, user))) && (C in user.contents)) if(!id_check(user, idcard)) return - to_chat(user, "You put the ID into \the [src]'s slot.") + to_chat(user, span_notice("You put the ID into \the [src]'s slot.")) updateSelfDialog()//Update self dialog on success. return //Return in case of failed check or when successful. updateSelfDialog()//For the non-input related code. @@ -970,22 +970,22 @@ GLOBAL_LIST_EMPTY(PDAs) if(!user.transferItemToLoc(C, src)) return pai = C - to_chat(user, "You slot \the [C] into [src].") + to_chat(user, span_notice("You 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, "You slide \the [C] into \the [src].") + to_chat(user, span_notice("You 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, "You scan \the [C].") + to_chat(user, span_notice("You scan \the [C].")) else return ..() @@ -994,18 +994,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) . = ..() @@ -1016,13 +1016,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) @@ -1030,7 +1030,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\]") @@ -1039,7 +1039,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. @@ -1047,9 +1047,9 @@ GLOBAL_LIST_EMPTY(PDAs) if (ismob(loc)) var/mob/M = loc - M.show_message("Your [src] explodes!", MSG_VISUAL, "You hear a loud *pop*!", MSG_AUDIBLE) + M.show_message(span_userdanger("Your [src] explodes!"), MSG_VISUAL, span_warning("You hear a loud *pop*!"), MSG_AUDIBLE) else - visible_message("[src] explodes!", "You hear a loud *pop*!") + visible_message(span_danger("[src] explodes!"), span_warning("You hear a loud *pop*!")) if(T) T.hotspot_expose(700,125) @@ -1116,7 +1116,7 @@ GLOBAL_LIST_EMPTY(PDAs) return //won't work if dead if(!isnull(aiPDA)) aiPDA.toff = !aiPDA.toff - to_chat(usr, "PDA sender/receiver toggled [(aiPDA.toff ? "Off" : "On")]!") + to_chat(usr, span_notice("PDA sender/receiver toggled [(aiPDA.toff ? "Off" : "On")]!")) else to_chat(usr, "You do not have a PDA. You should make an issue report about this.") @@ -1128,7 +1128,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(!isnull(aiPDA)) //0 aiPDA.silent = !aiPDA.silent - to_chat(usr, "PDA ringer toggled [(aiPDA.silent ? "Off" : "On")]!") + to_chat(usr, span_notice("PDA ringer toggled [(aiPDA.silent ? "Off" : "On")]!")) else to_chat(usr, "You do not have a PDA. You should make an issue report about this.") @@ -1157,7 +1157,7 @@ GLOBAL_LIST_EMPTY(PDAs) return //won't work if dead if(!isnull(aiPDA)) aiPDA.toff = !aiPDA.toff - to_chat(usr, "PDA sender/receiver toggled [(aiPDA.toff ? "Off" : "On")]!") + to_chat(usr, span_notice("PDA sender/receiver toggled [(aiPDA.toff ? "Off" : "On")]!")) else to_chat(usr, "You do not have a PDA. You should make an issue report about this.") @@ -1169,7 +1169,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(!isnull(aiPDA)) //0 aiPDA.silent = !aiPDA.silent - to_chat(usr, "PDA ringer toggled [(aiPDA.silent ? "Off" : "On")]!") + to_chat(usr, span_notice("PDA ringer toggled [(aiPDA.silent ? "Off" : "On")]!")) else to_chat(usr, "You do not have a PDA. You should make an issue report about this.") diff --git a/code/game/objects/items/devices/PDA/virus_cart.dm b/code/game/objects/items/devices/PDA/virus_cart.dm index e85f6f4ce43d..6b7dde147197 100644 --- a/code/game/objects/items/devices/PDA/virus_cart.dm +++ b/code/game/objects/items/devices/PDA/virus_cart.dm @@ -25,11 +25,11 @@ /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.") @@ -41,11 +41,11 @@ /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_notice("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 @@ -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,10 +72,10 @@ 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.") @@ -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_notice("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) diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 2ad8822a45c0..8914c613c5aa 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) diff --git a/code/game/objects/items/devices/anomaly_neutralizer.dm b/code/game/objects/items/devices/anomaly_neutralizer.dm index ca018a041fdd..8ddaa47bbbf6 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 e868ec07b668..dc3a976085d1 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, "You [enabled ? "enable" : "disable"] the beacon.") + to_chat(user, span_notice("You [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 03be0689c7bd..e4cb9ff9a795 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, "You can't get a signal!") + to_chat(usr, span_warning("You 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 ed492728c56c..27bcd546c195 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, "You can't use [src] while inside something!") + to_chat(user, span_warning("You 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/weapons/flash.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 your inventory @@ -77,20 +77,20 @@ playsound(get_turf(src), 'sound/effects/pop.ogg', 100, TRUE, -6) qdel(active_dummy) active_dummy = null - to_chat(user, "You deactivate \the [src].") + to_chat(user, span_notice("You deactivate \the [src].")) new /obj/effect/temp_visual/emp/pulse(get_turf(src)) else playsound(get_turf(src), 'sound/effects/pop.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, "You activate \the [src].") + to_chat(user, span_notice("You 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, "Your chameleon projector deactivates.") + to_chat(M, span_danger("Your 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 6788b0158b6f..4c46beb7fa92 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, "You set the duration to [DisplayTimeText(duration)].") + to_chat(user, span_notice("You 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, "You activate [src], desynchronizing yourself from the present. You can still see your surroundings, but you feel eerily dissociated from reality.") + to_chat(user, span_notice("You activate [src], desynchronizing yourself 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/doorCharge.dm b/code/game/objects/items/devices/doorCharge.dm index 6a06508046d0..8e6b1d82cef1 100644 --- a/code/game/objects/items/devices/doorCharge.dm +++ b/code/game/objects/items/devices/doorCharge.dm @@ -17,7 +17,7 @@ /obj/item/doorCharge/ex_act(severity, target) switch(severity) if(EXPLODE_DEVASTATE) - visible_message("[src] detonates!") + visible_message(span_warning("[src] detonates!")) explosion(src.loc,0,2,1,flame_range = 4) qdel(src) if(EXPLODE_HEAVY) diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm index e87ea386c278..064cde8b058e 100644 --- a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm +++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm @@ -26,16 +26,16 @@ if(QDELETED(R) || !istype(R)) return if(!R.cell) - to_chat(R, "You need a power cell installed for that.") + to_chat(R, span_warning("You need a power cell installed for that.")) return if(!R.cell.use(circuit_cost)) - to_chat(R, "You don't have the energy for that (you need [DisplayEnergy(circuit_cost)].)") + to_chat(R, span_warning("You 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, "You need more material. Use [src] on existing simple circuits to break them down.") + to_chat(R, span_warning("You need more material. Use [src] on existing simple circuits to break them down.")) return playsound(R, 'sound/items/rped.ogg', 50, TRUE) recharging = TRUE @@ -54,7 +54,7 @@ return circuits++ maptext = "[circuits]" - user.visible_message("User breaks down [target] with [src].", \ + user.visible_message(span_notice("User breaks down [target] with [src]."), \ "You recycle [target] into [src]. It now has material for [circuits] circuits.") playsound(user, 'sound/items/deconstruct.ogg', 50, TRUE) qdel(target) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index bd77bd88c498..ad0258d3a70f 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -44,9 +44,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) @@ -57,11 +57,11 @@ return ..() //just hit them in the head if(!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You 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(flashlight_power < 1) @@ -71,33 +71,33 @@ switch(user.zone_selected) if(BODY_ZONE_PRECISE_EYES) 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_notice("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_danger("[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.", "You wave the light in front of your eyes! Trippy!") + M.visible_message("[M] directs [src] to [M.p_their()] eyes.", span_notice("You wave the light in front of your eyes! Trippy!")) else - M.visible_message("[M] directs [src] to [M.p_their()] eyes.", "You wave the light in front of your eyes.") + M.visible_message("[M] directs [src] to [M.p_their()] eyes.", span_notice("You wave the light in front of your eyes.")) else - user.visible_message("[user] directs [src] to [M]'s eyes.", \ - "You direct [src] to [M]'s eyes.") + user.visible_message(span_warning("[user] directs [src] to [M]'s eyes."), \ + span_danger("You 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_notice("You're going to need to remove that [(M.head && M.head.flags_cover & HEADCOVERSMOUTH) ? "helmet" : "mask"] first.")) return var/their = M.p_their() @@ -138,26 +138,26 @@ can_use_mirror = mirror.pixel_x < 0 M.visible_message("[M] directs [src] to [their] mouth.", \ - "You point [src] into your mouth.") + span_notice("You point [src] into your mouth.")) if(!can_use_mirror) - to_chat(user, "You can't see anything without a mirror.") + to_chat(user, span_notice("You 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, "You have [pill_count] implanted pill[pill_count > 1 ? "s" : ""].") + to_chat(user, span_notice("You have [pill_count] implanted pill[pill_count > 1 ? "s" : ""].")) else - user.visible_message("[user] directs [src] to [M]'s mouth.",\ - "You direct [src] to [M]'s mouth.") + user.visible_message(span_notice("[user] directs [src] to [M]'s mouth."),\ + span_notice("You 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 ..() @@ -175,7 +175,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) @@ -193,7 +193,7 @@ . = ..() playsound(loc, 'sound/machines/ping.ogg', 50, 0) //make some noise! if(creator) - visible_message("[creator] created a medical hologram, indicating that [creator.p_theyre(FALSE, FALSE)] coming to help!") + visible_message(span_danger("[creator] created a medical hologram, indicating that [creator.p_theyre(FALSE, FALSE)] coming to help!")) /obj/item/flashlight/seclite @@ -313,16 +313,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_notice("[src] is already on.")) return . = ..() // All good, turn it on. if(.) - user.visible_message("[user] lights \the [src].", "You light \the [src]!") + user.visible_message(span_notice("[user] lights \the [src]."), span_notice("You light \the [src]!")) playsound(loc, ignition_sound, 50, 1) //make some noise! force = on_damage name = "lit [initial(src.name)]" @@ -453,14 +453,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_userdanger("[user] blinks \the [src] at you.")) else - A.visible_message("[user] blinks \the [src] at \the [A].") + A.visible_message(span_danger("[user] blinks \the [src] at \the [A].")) to_chat(user, "\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() @@ -521,26 +521,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_notice("[src] is already lit.")) return . = ..() if(.) - user.visible_message("[user] cracks and shakes [src].", "You crack and shake [src], turning it on!") + user.visible_message(span_notice("[user] cracks and shakes [src]."), span_notice("You 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 3be4b93f8e67..eb5488596a49 100644 --- a/code/game/objects/items/devices/forcefieldprojector.dm +++ b/code/game/objects/items/devices/forcefieldprojector.dm @@ -24,39 +24,39 @@ if(istype(target, /obj/structure/projected_forcefield)) var/obj/structure/projected_forcefield/F = target if(F.generator == src) - to_chat(user, "You deactivate [F].") + to_chat(user, span_notice("You deactivate [F].")) qdel(F) return if(do_after(user, creation_time, target = target)) 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_notice("[src] cannot sustain any more forcefields!")) return playsound(src,'sound/weapons/resonator_fire.ogg',50,1) - user.visible_message("[user] projects a forcefield!","You project a forcefield.") + user.visible_message(span_warning("[user] projects a forcefield!"),span_notice("You 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, "You deactivate [src], disabling all active forcefields.") + to_chat(user, span_notice("You 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) . = ..() @@ -95,7 +95,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/weapons/resonator_blast.ogg',25,1) 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 c4fb758b1c79..636b453e67ba 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_disarm("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.a_intent == INTENT_HELP) if(!(obj_flags & EMAGGED)) - user.visible_message("[user] scans [target] with [src].", "You scan [target]'s radiation levels with [src]...") + user.visible_message(span_notice("[user] scans [target] with [src]."), span_notice("You scan [target]'s radiation levels with [src]...")) addtimer(CALLBACK(src, .proc/scan, target, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents else - user.visible_message("[user] scans [target] with [src].", "You project [src]'s stored radiation into [target]!") + user.visible_message(span_notice("[user] scans [target] with [src]."), span_danger("You project [src]'s stored radiation into [target]!")) target.rad_act(radiation_count) radiation_count = 0 return TRUE @@ -149,24 +149,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...", "You begin resetting [src]...") + user.visible_message(span_notice("[user] unscrews [src]'s maintenance panel and begins fiddling with its innards..."), span_notice("You begin resetting [src]...")) if(!I.use_tool(src, user, 40, volume=50)) return 0 - user.visible_message("[user] refastens [src]'s maintenance panel!", "You reset [src] to its factory settings!") + user.visible_message(span_notice("[user] refastens [src]'s maintenance panel!"), span_notice("You reset [src] to its factory settings!")) obj_flags &= ~EMAGGED radiation_count = 0 update_icon() @@ -178,19 +178,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, "You flush [src]'s radiation counts, resetting it to normal.") + to_chat(usr, span_notice("You 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, "You 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("You 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/gps.dm b/code/game/objects/items/devices/gps.dm index f204f17bcf25..ebadc3c21dfc 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -15,7 +15,7 @@ GLOBAL_LIST_EMPTY(GPS_list) /obj/item/gps/examine(mob/user) . = ..() - . += "Alt-click to switch it [tracking ? "off":"on"]." + . += span_notice("Alt-click to switch it [tracking ? "off":"on"].") /obj/item/gps/Initialize() . = ..() diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 2f3b455d5fee..d7f7f4478cf2 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, "You install a [diode.name] in [src].") + to_chat(user, span_notice("You install a [diode.name] in [src].")) else - to_chat(user, "[src] already has a diode installed.") + to_chat(user, span_notice("[src] already has a diode installed.")) else if(W.tool_behaviour == TOOL_SCREWDRIVER) if(diode) - to_chat(user, "You remove the [diode.name] from \the [src].") + to_chat(user, span_notice("You remove the [diode.name] from \the [src].")) diode.forceMove(drop_location()) diode = null else @@ -72,25 +72,25 @@ if( !(user in (viewers(7,target))) ) return if (!diode) - to_chat(user, "You point [src] at [target], but nothing happens!") + to_chat(user, span_notice("You point [src] at [target], but nothing happens!")) return if (!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return if(HAS_TRAIT(user, TRAIT_NOGUNS)) - to_chat(user, "Your fingers can't press the button!") + to_chat(user, span_warning("Your fingers can't press the button!")) return if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.dna.check_mutation(HULK) || H.dna.check_mutation(ACTIVE_HULK)) - to_chat(user, "Your fingers can't press the button!") + to_chat(user, span_warning("Your fingers can't press the button!")) return add_fingerprint(user) //nothing happens if the battery is drained if(recharge_locked) - to_chat(user, "You point [src] at [target], but it's still charging.") + to_chat(user, span_notice("You point [src] at [target], but it's still charging.")) return var/outmsg @@ -110,9 +110,9 @@ //chance to actually hit the eyes depends on internal component if(prob(effectchance * diode.rating) && C.flash_act(severity)) - outmsg = "You blind [C] by shining [src] in [C.p_their()] eyes." + outmsg = span_notice("You blind [C] by shining [src] in [C.p_their()] eyes.") else - outmsg = "You fail to blind [C] by shining [src] at [C.p_their()] eyes!" + outmsg = span_warning("You fail to blind [C] by shining [src] at [C.p_their()] eyes!") //robots else if(iscyborg(target)) @@ -126,20 +126,20 @@ R.break_all_cyborg_slots(TRUE) addtimer(CALLBACK(R, /mob/living/silicon/robot/.proc/clear_fullscreen, "laserpointer"), 7 SECONDS) addtimer(CALLBACK(R, /mob/living/silicon/robot/.proc/repair_all_cyborg_slots), 7 SECONDS) - to_chat(R, "Your sensors were overloaded by a laser!") - outmsg = "You overload [R] by shining [src] at [R.p_their()] sensors." + to_chat(R, span_danger("Your sensors were overloaded by a laser!")) + outmsg = span_notice("You overload [R] by shining [src] at [R.p_their()] sensors.") else - outmsg = "You fail to overload [R] by shining [src] at [R.p_their()] sensors!" + outmsg = span_warning("You fail to overload [R] by shining [src] at [R.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 = "You hit the lens of [C] with [src], temporarily disabling the camera!" + outmsg = span_notice("You hit the lens of [C] with [src], temporarily disabling the camera!") log_combat(user, C, "EMPed", src) else - outmsg = "You miss the lens of [C] with [src]!" + outmsg = span_warning("You miss the lens of [C] with [src]!") //catpeople for(var/mob/living/carbon/human/H in view(1,targloc)) @@ -148,22 +148,22 @@ if(user.mobility_flags & MOBILITY_STAND) H.setDir(get_dir(H,targloc)) // kitty always looks at the light if(prob(effectchance)) - H.visible_message("[H] makes a grab for the light!","LIGHT!") + H.visible_message(span_warning("[H] makes a grab for the light!"),span_userdanger("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.")," You're briefly tempted by the shiny light... ") else - H.visible_message("[H] stares at the light"," You stare at the light... ") + H.visible_message(span_notice("[H] stares at the light")," You stare at the light... ") //cats! for(var/mob/living/simple_animal/pet/cat/C in view(1,targloc)) if(prob(50)) - 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 your games.","You spot [user] shining [src] at you. How insulting!") + C.visible_message(span_notice("[C] looks uninterested in your games."),span_warning("You spot [user] shining [src] at you. How insulting!")) //laser pointer image icon_state = "pointer_[pointer_icon_state]" @@ -181,7 +181,7 @@ if(outmsg) to_chat(user, outmsg) else - to_chat(user, "You point [src] at [target].") + to_chat(user, span_info("You point [src] at [target].")) energy -= 1 if(energy <= max_energy) @@ -189,7 +189,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 2474dd79474e..873b1d3673c6 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, "You insert a piece of glass into \the [src.name]. You have [uses] light\s remaining.") + to_chat(user, span_notice("You insert a piece of glass into \the [src.name]. You have [uses] light\s remaining.")) return else - to_chat(user, "You need one sheet of glass to replace lights!") + to_chat(user, span_warning("You 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, "You insert a shard of glass into \the [src]. You have [uses] light\s remaining.") + to_chat(user, span_notice("You 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, "You insert [L] into \the [src].") + to_chat(user, span_notice("You 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, "You fill \the [src] with lights from \the [S]. " + status_string() + "") + to_chat(user, span_notice("You 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/machines/ding.ogg', 50, 1) return new_bulbs @@ -190,7 +190,7 @@ if(CanUse(U)) if(!Use(U)) return - to_chat(U, "You replace \the [target.fitting] with \the [src].") + to_chat(U, span_notice("You replace \the [target.fitting] with \the [src].")) if(target.status != LIGHT_EMPTY) AddShards(1, U) @@ -215,7 +215,7 @@ to_chat(U, "\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() diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index df36ab40c06a..0b87113e2d23 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -14,10 +14,10 @@ /obj/item/megaphone/examine(mob/user) . = ..() if(last_used > world.time) - . += "\The [src] is recharging!" + . += span_warning("\The [src] is recharging!") /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!")) last_used = 0//so they dont have to worry about recharging user.say("AAAAAAAAAAAARGHHHHH", forced="megaphone suicide")//he must have died while coding this return OXYLOSS @@ -59,7 +59,7 @@ /obj/item/megaphone/proc/handle_speech(mob/living/carbon/user, list/speech_args) if (user.get_active_held_item() == src) if(!spamcheck()) - to_chat(user, "\The [src] needs to recharge!") + to_chat(user, span_warning("\The [src] needs to recharge!")) else playsound(loc, 'sound/items/megaphone.ogg', 100, 0, 1) speech_args[SPEECH_SPANS] |= voicespan @@ -67,7 +67,7 @@ /obj/item/megaphone/emag_act(mob/user) if(obj_flags & EMAGGED) return - to_chat(user, "You overload \the [src]'s voice synthesizer.") + to_chat(user, span_warning("You overload \the [src]'s voice synthesizer.")) obj_flags |= EMAGGED voicespan = list(SPAN_REALLYBIG, "userdanger") diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 06835bcf864f..c2e2d8c7d07a 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -32,10 +32,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 @@ -92,7 +92,7 @@ /obj/item/multitool/ai_detect/proc/toggle_hud(mob/user) hud_on = !hud_on if(user) - to_chat(user, "You toggle the ai detection HUD on [src] [hud_on ? "on" : "off"].") + to_chat(user, span_notice("You 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 ee10570d944d..bfab27ddc96e 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() @@ -81,21 +81,21 @@ if(pai.master_dna) return if(!iscarbon(usr)) - to_chat(usr, "You don't have any DNA, or your DNA is incompatible with this device!") + to_chat(usr, span_warning("You don't have any DNA, or your 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, "You have been bound to a new master.") + to_chat(pai, span_notice("You 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, "You feel yourself slipping away from reality.") - to_chat(pai, "Byte by byte you lose your sense of self.") - to_chat(pai, "Your mental faculties leave you.") - to_chat(pai, "oblivion... ") + to_chat(pai, span_warning("You feel yourself slipping away from reality.")) + to_chat(pai, span_danger("Byte by byte you lose your sense of self.")) + to_chat(pai, span_userdanger("Your mental faculties leave you.")) + to_chat(pai, span_rose("oblivion... ")) qdel(pai) if(href_list["toggle_transmit"] || href_list["toggle_receive"]) var/transmitting = href_list["toggle_transmit"] //it can't be both so if we know it's not transmitting it must be receiving. @@ -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,"You [transmit_holder ? "enable" : "disable"] your pAI's [transmitting ? "outgoing" : "incoming"] radio transmissions!") - to_chat(pai,"Your owner has [transmit_holder ? "enabled" : "disabled"] your [transmitting ? "outgoing" : "incoming"] radio transmissions!") + to_chat(usr,span_warning("You [transmit_holder ? "enable" : "disable"] your pAI's [transmitting ? "outgoing" : "incoming"] radio transmissions!")) + to_chat(pai,span_warning("Your owner has [transmit_holder ? "enabled" : "disabled"] your [transmitting ? "outgoing" : "incoming"] radio transmissions!")) if(href_list["setlaws"]) var/newlaws = stripped_multiline_input("Enter any additional directives you would like your 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], MAX_MESSAGE_LEN) if(newlaws && pai) pai.add_supplied_law(0,newlaws) if(href_list["toggle_holo"]) if(pai.canholo) - to_chat(pai, "Your owner has disabled your holomatrix projectors!") + to_chat(pai, span_userdanger("Your owner has disabled your holomatrix projectors!")) pai.canholo = FALSE - to_chat(usr, "You disable your pAI's holomatrix!") + to_chat(usr, span_warning("You disable your pAI's holomatrix!")) else - to_chat(pai, "Your owner has enabled your holomatrix projectors!") + to_chat(pai, span_boldnotice("Your owner has enabled your holomatrix projectors!")) pai.canholo = TRUE - to_chat(usr, "You enable your pAI's holomatrix!") + to_chat(usr, span_notice("You enable your 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 2317e529abc6..4930ce752433 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/machines/click.ogg', 50, 1) - user.visible_message("[user] paints \the [P] [paint_color].","You paint \the [P] [paint_color].") + user.visible_message(span_notice("[user] paints \the [P] [paint_color]."),span_notice("You 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 177ac21971cf..449e9e660fa2 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -66,21 +66,21 @@ if(isturf(T) && !T.intact) attached = locate() in T if(!attached) - to_chat(user, "This device must be placed over an exposed, powered cable node!") + to_chat(user, span_warning("This device must be placed over an exposed, powered cable node!")) else set_mode(CLAMPED_OFF) user.visible_message( \ "[user] attaches \the [src] to the cable.", \ - "You attach \the [src] to the cable.", - "You hear some wires being connected to something.") + span_notice("You attach \the [src] to the cable."), + span_italics("You hear some wires being connected to something.")) else - to_chat(user, "This device must be placed over an exposed, powered cable node!") + to_chat(user, span_warning("This device must be placed over an exposed, powered cable node!")) else set_mode(DISCONNECTED) user.visible_message( \ "[user] detaches \the [src] from the cable.", \ - "You detach \the [src] from the cable.", - "You hear some wires being disconnected from something.") + span_notice("You detach \the [src] from the cable."), + span_italics("You hear some wires being disconnected from something.")) else return ..() @@ -101,8 +101,8 @@ if(CLAMPED_OFF) user.visible_message( \ "[user] activates \the [src]!", \ - "You activate \the [src].", - "You hear a click.") + span_notice("You activate \the [src]."), + span_italics("You 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) @@ -110,8 +110,8 @@ if(OPERATING) user.visible_message( \ "[user] deactivates \the [src]!", \ - "You deactivate \the [src].", - "You hear a click.") + span_notice("You deactivate \the [src]."), + span_italics("You 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 c2852e893c08..dc4d38532c9c 100644 --- a/code/game/objects/items/devices/pressureplates.dm +++ b/code/game/objects/items/devices/pressureplates.dm @@ -42,7 +42,7 @@ return if(trigger_mob && isliving(AM)) var/mob/living/L = AM - to_chat(L, "You feel something click beneath you!") + to_chat(L, span_warning("You feel something click beneath you!")) else if(!trigger_item) return can_trigger = FALSE @@ -56,12 +56,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, "You attach [I] to [src]!") + to_chat(L, span_notice("You attach [I] to [src]!")) return ..() /obj/item/pressure_plate/attack_self(mob/living/L) if(removable_signaller && istype(sigdev)) - to_chat(L, "You remove [sigdev] from [src]") + to_chat(L, span_notice("You remove [sigdev] from [src]")) if(!L.put_in_hands(sigdev)) sigdev.forceMove(get_turf(src)) sigdev = null @@ -69,13 +69,13 @@ /obj/item/pressure_plate/CtrlClick(mob/user) if(protected) - to_chat(user, "You can't quite seem to turn this pressure plate off...") + to_chat(user, span_warning("You can't quite seem to turn this pressure plate off...")) return active = !active if (active == TRUE) - to_chat(user, "You turn [src] on.") + to_chat(user, span_notice("You turn [src] on.")) else - to_chat(user, "You turn [src] off.") + to_chat(user, span_notice("You turn [src] off.")) /obj/item/pressure_plate/hide(yes) if(yes) diff --git a/code/game/objects/items/devices/quantum_keycard.dm b/code/game/objects/items/devices/quantum_keycard.dm index fc9ccddaf9e1..913274ea02d7 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, "You start pressing [src]'s unlink button...") + to_chat(user, span_notice("You 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 ff7113715174..308ceb163139 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -24,7 +24,7 @@ return ..() /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) //ATTACK HAND IGNORING PARENT RETURN VALUE @@ -32,7 +32,7 @@ if(iscarbon(user)) var/mob/living/carbon/C = user if(src == C.back) - to_chat(user, "You need help taking this off!") + to_chat(user, span_warning("You 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 @@ -70,7 +70,7 @@ var/mob/living/L = loc step(L, pick(GLOB.cardinals)) - to_chat(L, "You feel a sharp shock!") + to_chat(L, span_danger("You 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 c80d929f0746..8b7768c921d8 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 755c28039fc7..60bebec1bc1d 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() . = ..() @@ -296,14 +296,14 @@ GLOBAL_LIST_INIT(channel_tokens, list( keyslot2 = null recalculateChannels() - to_chat(user, "You pop out the encryption keys in the headset.") + to_chat(user, span_notice("You 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) @@ -344,4 +344,4 @@ GLOBAL_LIST_INIT(channel_tokens, list( return if (command) use_command = !use_command - to_chat(user, "You toggle high-volume mode [use_command ? "on" : "off"].") + to_chat(user, span_notice("You 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 8232354b9203..5617512ee4d3 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -23,7 +23,7 @@ /obj/item/radio/intercom/ratvar/attackby(obj/item/I, mob/living/user, params) if(I.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "[src] is fastened to the wall with [is_servant_of_ratvar(user) ? "replicant alloy" : "some material you've never seen"], and can't be removed.") + to_chat(user, span_danger("[src] is fastened to the wall with [is_servant_of_ratvar(user) ? "replicant alloy" : "some material you've never seen"], and can't be removed.")) return //no unfastening! . = ..() @@ -58,24 +58,24 @@ /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...", "You start screwing in [src]...") + user.visible_message(span_notice("[user] starts tightening [src]'s screws..."), span_notice("You start screwing in [src]...")) if(I.use_tool(src, user, 30, volume=50)) - user.visible_message("[user] tightens [src]'s screws!", "You tighten [src]'s screws.") + user.visible_message(span_notice("[user] tightens [src]'s screws!"), span_notice("You tighten [src]'s screws.")) unfastened = FALSE else - user.visible_message("[user] starts loosening [src]'s screws...", "You start unscrewing [src]...") + user.visible_message(span_notice("[user] starts loosening [src]'s screws..."), span_notice("You start unscrewing [src]...")) if(I.use_tool(src, user, 40, volume=50)) - user.visible_message("[user] loosens [src]'s screws!", "You unscrew [src], loosening it from the wall.") + user.visible_message(span_notice("[user] loosens [src]'s screws!"), span_notice("You unscrew [src], loosening it from the wall.")) unfastened = TRUE return else if(I.tool_behaviour == TOOL_WRENCH) if(!unfastened) - to_chat(user, "You need to unscrew [src] from the wall first!") + to_chat(user, span_warning("You need to unscrew [src] from the wall first!")) return - user.visible_message("[user] starts unsecuring [src]...", "You start unsecuring [src]...") + user.visible_message(span_notice("[user] starts unsecuring [src]..."), span_notice("You start unsecuring [src]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 80)) - user.visible_message("[user] unsecures [src]!", "You detach [src] from the wall.") + user.visible_message(span_notice("[user] unsecures [src]!"), span_notice("You detach [src] from the wall.")) playsound(src, 'sound/items/deconstruct.ogg', 50, 1) 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 1245106a308c..b479a75aafc7 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -322,20 +322,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 ..() @@ -346,7 +346,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) @@ -404,14 +404,14 @@ keyslot = null recalculateChannels() - to_chat(user, "You pop out the encryption key in the radio.") + to_chat(user, span_notice("You 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 2facfddfb55a..ee358beba832 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/machines/microwave/microwave-end.ogg', 100, FALSE) soundloop.stop() soundloop2.stop() - to_chat(loc, "*ding*") + to_chat(loc, span_userdanger("*ding*")) addtimer(CALLBACK(src, .proc/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]...", \ - "You [fear_string] try to pull at [src]...", "You hear clicking and ticking.") + C.visible_message(span_danger("[C] fiddles with and pulls at [src]..."), \ + span_danger("You [fear_string] try to pull at [src]..."), "You 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!", \ - "You force open the padlock!", "You hear a single, pronounced click!") + user.visible_message(span_warning("The lock on [user]'s [name] pops open!"), \ + span_userdanger("You force open the padlock!"), "You 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!", "You hear clanking.") - to_chat(user, "You start forcing [src] onto [target]'s head...") + target.visible_message(span_warning("[user] starts forcing [src] onto [target]'s head!"), \ + span_userdanger("[target] starts forcing [src] onto your head!"), "You hear clanking.") + to_chat(user, span_danger("You 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!", "You hear a click, and then a timer ticking down.") - to_chat(user, "You 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_userdanger("[target] locks [src] onto your head!"), "You hear a click, and then a timer ticking down.") + to_chat(user, span_danger("You 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/effects/snap.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_userdanger("[src] goes off!")) jill.emote("scream") playsound(src, 'sound/effects/snap.ogg', 75, TRUE, frequency = 0.5) playsound(src, 'sound/effects/splat.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 1c19a96cd32b..743c6722bb32 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -25,7 +25,7 @@ GENE SCANNER 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() @@ -91,15 +91,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, "You switch the health analyzer to scan chemical contents.") + to_chat(user, span_notice("You switch the health analyzer to scan chemical contents.")) scanmode = 1 else - to_chat(user, "You switch the health analyzer to check physical health.") + to_chat(user, span_notice("You switch the health analyzer to check physical health.")) scanmode = 0 /obj/item/healthanalyzer/attack(mob/living/M, mob/living/carbon/human/user) @@ -107,15 +107,15 @@ GENE SCANNER // Clumsiness/brain damage check if ((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(50)) - to_chat(user, "You stupidly try to analyze the floor's vitals!") - user.visible_message("[user] has analyzed the floor's vitals!") + to_chat(user, span_notice("You stupidly try to analyze the floor's vitals!")) + user.visible_message(span_warning("[user] has analyzed 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: ???") + to_chat(user, span_info("Body temperature: ???")) return - user.visible_message("[user] has analyzed [M]'s vitals.") + user.visible_message(span_notice("[user] has analyzed [M]'s vitals.")) if(scanmode == 0) healthscan(user, M, advanced) @@ -143,9 +143,9 @@ GENE SCANNER 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_danger("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) @@ -358,15 +358,15 @@ GENE SCANNER else if (S.mutantstomach != initial(S.mutantstomach)) 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]") 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_danger("Subject died [DisplayTimeText(tdelta)] ago, defibrillation may be possible!")) for(var/thing in M.diseases) var/datum/disease/D = thing @@ -381,7 +381,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_danger("Subject is bleeding!")) var/blood_percent = round((C.blood_volume / BLOOD_VOLUME_NORMAL(C))*100) var/blood_type = C.dna.blood_type if(blood_id != /datum/reagent/blood)//special blood substance @@ -395,32 +395,32 @@ GENE SCANNER else if(C.blood_volume <= BLOOD_VOLUME_OKAY(C)) to_chat(user, "CRITICAL blood level [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" : "."]") 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_danger("[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/advanced name = "advanced health analyzer" @@ -434,13 +434,13 @@ GENE SCANNER if(!proximity) return if(istype(O, /obj/item/disk/surgery)) - to_chat(user, "You load the surgery protocol from [O] into [src].") + to_chat(user, span_notice("You load the surgery protocol from [O] into [src].")) var/obj/item/disk/surgery/D = O if(do_after(user, 10, target = O)) advanced_surgeries |= D.surgeries return TRUE if(istype(O, /obj/machinery/computer/operating)) - to_chat(user, "You copy surgery protocols from [O] into [src].") + to_chat(user, span_notice("You copy surgery protocols from [O] into [src].")) var/obj/machinery/computer/operating/OC = O if(do_after(user, 10, target = O)) advanced_surgeries |= OC.advanced_surgeries @@ -472,10 +472,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) @@ -499,9 +499,9 @@ GENE SCANNER to_chat(user, "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/o2_concentration = environment.get_moles(/datum/gas/oxygen)/total_moles var/n2_concentration = environment.get_moles(/datum/gas/nitrogen)/total_moles @@ -509,31 +509,31 @@ GENE SCANNER var/plasma_concentration = environment.get_moles(/datum/gas/plasma)/total_moles if(abs(n2_concentration - N2STANDARD) < 20) - to_chat(user, "Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/nitrogen), 0.01)] mol)") + to_chat(user, span_info("Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/nitrogen), 0.01)] mol)")) else - to_chat(user, "Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/nitrogen), 0.01)] mol)") + to_chat(user, span_alert("Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/nitrogen), 0.01)] mol)")) if(abs(o2_concentration - O2STANDARD) < 2) - to_chat(user, "Oxygen: [round(o2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/oxygen), 0.01)] mol)") + to_chat(user, span_info("Oxygen: [round(o2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/oxygen), 0.01)] mol)")) else - to_chat(user, "Oxygen: [round(o2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/oxygen), 0.01)] mol)") + to_chat(user, span_alert("Oxygen: [round(o2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/oxygen), 0.01)] mol)")) if(co2_concentration > 0.01) - to_chat(user, "CO2: [round(co2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/carbon_dioxide), 0.01)] mol)") + to_chat(user, span_alert("CO2: [round(co2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/carbon_dioxide), 0.01)] mol)")) else - to_chat(user, "CO2: [round(co2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/carbon_dioxide), 0.01)] mol)") + to_chat(user, span_info("CO2: [round(co2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/carbon_dioxide), 0.01)] mol)")) if(plasma_concentration > 0.005) - to_chat(user, "Plasma: [round(plasma_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/plasma), 0.01)] mol)") + to_chat(user, span_alert("Plasma: [round(plasma_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/plasma), 0.01)] mol)")) else - to_chat(user, "Plasma: [round(plasma_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/plasma), 0.01)] mol)") + to_chat(user, span_info("Plasma: [round(plasma_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/plasma), 0.01)] mol)")) for(var/id in environment.get_gases()) if(id in GLOB.hardcoded_gases) continue var/gas_concentration = environment.get_moles(id)/total_moles - to_chat(user, "[GLOB.meta_gas_info[id][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(environment.get_moles(id), 0.01)] mol)") - to_chat(user, "Temperature: [round(environment.return_temperature()-T0C, 0.01)] °C ([round(environment.return_temperature(), 0.01)] K)") + to_chat(user, span_alert("[GLOB.meta_gas_info[id][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(environment.get_moles(id), 0.01)] mol)")) + to_chat(user, span_info("Temperature: [round(environment.return_temperature()-T0C, 0.01)] °C ([round(environment.return_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.processing) @@ -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,/obj/item/analyzer/proc/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/machines/click.ogg', 100) cooldown = FALSE @@ -600,13 +600,13 @@ GENE SCANNER /proc/atmosanalyzer_scan(mixture, mob/living/user, atom/target = src) var/icon = target - user.visible_message("[user] has used the analyzer on [icon2html(icon, viewers(user))] [target].", "You use the analyzer on [icon2html(icon, user)] [target].") - to_chat(user, "Results of analysis of [icon2html(icon, user)] [target].") + user.visible_message("[user] has used the analyzer on [icon2html(icon, viewers(user))] [target].", span_notice("You 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() @@ -616,25 +616,25 @@ 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")) for(var/id in air_contents.get_gases()) var/gas_concentration = air_contents.get_moles(id)/total_moles - to_chat(user, "[GLOB.meta_gas_info[id][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(air_contents.get_moles(id), 0.01)] mol)") - to_chat(user, "Temperature: [round(temperature - T0C,0.01)] °C ([round(temperature, 0.01)] K)") + to_chat(user, span_notice("[GLOB.meta_gas_info[id][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] % ([round(air_contents.get_moles(id), 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 //slime scanner @@ -658,7 +658,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) @@ -666,12 +666,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 charge strength: [T.powerlevel]") to_chat(user, "Health: [round(T.health/T.maxHealth,0.01)*100]%") if (T.slime_mutation[4] == T.colour) @@ -691,7 +691,7 @@ 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, span_notice("Core mutation in progress: [T.effectmod]")) to_chat(user, "Progress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]") to_chat(user, "========================") @@ -714,13 +714,13 @@ GENE SCANNER materials = list(/datum/material/iron=200) /obj/item/nanite_scanner/attack(mob/living/M, mob/living/carbon/human/user) - user.visible_message("[user] has analyzed [M]'s nanites.") + user.visible_message(span_notice("[user] has analyzed [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" @@ -746,11 +746,11 @@ GENE SCANNER /obj/item/sequence_scanner/attack(mob/living/M, mob/living/carbon/human/user) add_fingerprint(user) if (!HAS_TRAIT(M, TRAIT_GENELESS) && !HAS_TRAIT(M, TRAIT_BADDNA)) //no scanning if its a husk or DNA-less Species - user.visible_message("[user] has analyzed [M]'s genetic sequence.") + user.visible_message(span_notice("[user] has analyzed [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) @@ -766,19 +766,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] database updated.") + to_chat(user, span_notice("[name] database updated.")) 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) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index e5b8790fc8bd..992e7ca181c8 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -61,13 +61,13 @@ if(!user.transferItemToLoc(I,src)) return mytape = I - to_chat(user, "You insert [I] into [src].") + to_chat(user, span_notice("You insert [I] into [src].")) update_icon() /obj/item/taperecorder/proc/eject(mob/user) if(mytape) - to_chat(user, "You remove [mytape] from [src].") + to_chat(user, span_notice("You remove [mytape] from [src].")) stop() user.put_in_hands(mytape) mytape = null @@ -134,7 +134,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 @@ -148,7 +148,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() @@ -162,7 +162,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 @@ -186,7 +186,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)) @@ -215,10 +215,10 @@ /obj/item/taperecorder/attack_self(mob/user) if(!mytape) - to_chat(user, "The [src] does not have a tape inside.") + to_chat(user, span_notice("The [src] does not have a tape inside.")) return if(mytape.ruined) - to_chat(user, "The tape inside the [src] appears to be broken.") + to_chat(user, span_notice("The tape inside the [src] appears to be broken.")) return update_available_icons() @@ -251,12 +251,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++) @@ -298,7 +298,7 @@ /obj/item/tape/attack_self(mob/user) if(!ruined) - to_chat(user, "You pull out all the tape!") + to_chat(user, span_notice("You pull out all the tape!")) ruin() @@ -317,9 +317,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, "You start winding the tape back in...") + to_chat(user, span_notice("You start winding the tape back in...")) if(I.use_tool(src, user, 120)) - to_chat(user, "You wound the tape back in.") + to_chat(user, span_notice("You 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 edbf02f7d87d..c418565954dc 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, "You feel a tremendous, paralyzing wave flood your mind.") + to_chat(M, span_userdanger("You feel a tremendous, paralyzing wave flood your mind.")) else - to_chat(M, "You feel a sudden, electric jolt travel through your head.") + to_chat(M, span_userdanger("You feel a sudden, electric jolt travel through your head.")) playsound(src.loc, 'sound/misc/interference.ogg', 50, 1) - to_chat(user, "You trigger [src].") + to_chat(user, span_notice("You trigger [src].")) times_used += 1 if(times_used >= max_uses) icon_state = "battererburnt" @@ -87,14 +87,14 @@ effective or pretty fucking useless. used = TRUE 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) @@ -226,14 +226,14 @@ effective or pretty fucking useless. /obj/item/shadowcloak/proc/Activate(mob/living/carbon/human/user) if(!user) return - to_chat(user, "You activate [src].") + to_chat(user, span_notice("You activate [src].")) src.user = user START_PROCESSING(SSobj, src) old_alpha = user.alpha on = TRUE /obj/item/shadowcloak/proc/Deactivate() - to_chat(user, "You deactivate [src].") + to_chat(user, span_notice("You deactivate [src].")) STOP_PROCESSING(SSobj, src) if(user) user.alpha = old_alpha @@ -268,7 +268,7 @@ effective or pretty fucking useless. var/range = 12 /obj/item/jammer/attack_self(mob/user) - to_chat(user,"You [active ? "deactivate" : "activate"] [src].") + to_chat(user,span_notice("You [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 69d7f914198c..3c43eb22354c 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, "You attach the tank to the transfer valve.") + to_chat(user, span_notice("You attach the tank to the transfer valve.")) else if(!tank_two) if(!user.transferItemToLoc(item, src)) return tank_two = item - to_chat(user, "You attach the tank to the transfer valve.") + to_chat(user, span_notice("You 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, "You attach the [item] to the valve controls and secure it.") + to_chat(user, span_notice("You 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 ca3702f8731e..578de78cfbde 100644 --- a/code/game/objects/items/dice.dm +++ b/code/game/objects/items/dice.dm @@ -31,7 +31,7 @@ new /obj/item/dice/d100(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/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6 @@ -55,7 +55,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 @@ -191,14 +191,14 @@ if(!has_gravity()) if(user) user.visible_message("[user] has thrown [src].", \ - "You throw [src].") + span_notice("You throw [src].")) return if(user != null) //Dice was rolled in someone's hand user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \ - "You throw [src]. It lands on [result]. [comment]", \ - "You hear [src] rolling, it sounds like a [fake_result].") + span_notice("You throw [src]. It lands on [result]. [comment]"), \ + span_italics("You 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 2bcb1d9a78c3..e2e889eb8d29 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, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You 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_userdanger("[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]!") + span_userdanger("[user] injects you with the syringe with [src]!")) else - to_chat(user, "You inject yourself with [src].") + to_chat(user, span_notice("You inject yourself 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" @@ -465,7 +465,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, "You can't modify [M]'s DNA while [M.p_theyre()] dead.") + to_chat(user, span_notice("You 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 fd915d77f28c..ccf94f34b4b7 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, "You have already forged a seal on [src]!") + to_chat(user, span_warning("You have already forged a seal on [src]!")) else var/obj/item/toy/crayon/C = O name = "[C.item_color] secret documents" icon_state = "docs_[C.item_color]" forgedseal = C.item_color - to_chat(user, "You forge the official seal with a [C.item_color] crayon. No one will notice... right?") + to_chat(user, span_notice("You forge the official seal with a [C.item_color] crayon. No one will notice... right?")) update_icon() \ No newline at end of file diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm index 86f46b8c562d..529bb29840a2 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].", "You start shaking [src].", "You hear shaking and sloshing.") + user.visible_message(span_notice("[user] starts shaking [src]."), span_notice("You start shaking [src]."), span_italics("You hear shaking and sloshing.")) shaking = TRUE @@ -148,7 +148,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 685e83b8940e..9cae908bd330 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, "You deploy the Ethereal Disco Ball.") + to_chat(user, span_notice("You deploy the Ethereal Disco Ball.")) new /obj/structure/etherealball(user.loc) qdel(src) @@ -31,18 +31,18 @@ . = ..() if(TurnedOn) TurnOff() - to_chat(user, "You turn the disco ball off!") + to_chat(user, span_notice("You turn the disco ball off!")) else TurnOn() - to_chat(user, "You turn the disco ball on!") + to_chat(user, span_notice("You turn the disco ball on!")) /obj/structure/etherealball/AltClick(mob/living/carbon/human/user) . = ..() if(anchored) - to_chat(user, "You unlock the disco ball.") + to_chat(user, span_notice("You unlock the disco ball.")) anchored = FALSE else - to_chat(user, "You lock the disco ball.") + to_chat(user, span_notice("You 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 d14124de5960..d1dd194f72d8 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/effects/refill.ogg', 50, 1, -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) @@ -233,12 +233,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.", "You quietly empty out \the [src] using its release valve.") + user.visible_message("[user] empties out \the [src] onto the floor using the release valve.", span_info("You 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, "You add [O] to [src].") + to_chat(user, span_notice("You 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 2e55c4538c25..62d9edb8fe81 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -97,7 +97,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 @@ -118,7 +118,7 @@ if(user.transferItemToLoc(W,src)) ptank.forceMove(get_turf(src)) ptank = W - to_chat(user, "You swap the plasma tank in [src]!") + to_chat(user, span_notice("You swap the plasma tank in [src]!")) return if(!user.transferItemToLoc(W, src)) return @@ -141,22 +141,22 @@ if(ptank && isliving(user) && user.canUseTopic(src, BE_CLOSE, ismonkey(user))) user.put_in_hands(ptank) ptank = null - to_chat(user, "You remove the plasma tank from [src]!") + to_chat(user, span_notice("You 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, "You [lit ? "extinguish" : "ignite"] [src]!") + to_chat(user, span_notice("You [lit ? "extinguish" : "ignite"] [src]!")) lit = !lit if(lit) START_PROCESSING(SSobj, src) @@ -235,7 +235,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/item/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/target_turf = get_turf(owner) igniter.ignite_turf(src,target_turf, release_amount = 100) qdel(ptank) diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index 037d8a06c184..23cb8a18d225 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((M.mind && HAS_TRAIT(M.mind, 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(M.mind && HAS_TRAIT(M.mind, 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 fe16b718118c..dcd6af1f7b8d 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -14,9 +14,9 @@ playsound(user, pick('sound/effects/pageturn1.ogg','sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg'), 30, 1) 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, "You keep reading...") + to_chat(user, span_notice("You 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, "You start reading [name]...") + to_chat(user, span_notice("You start reading [name]...")) /obj/item/book/granter/proc/on_reading_stopped(mob/user) - to_chat(user, "You stop reading...") + to_chat(user, span_notice("You stop reading...")) /obj/item/book/granter/proc/on_reading_finished(mob/user) - to_chat(user, "You finish reading [name]!") + to_chat(user, span_notice("You finish reading [name]!")) /obj/item/book/granter/proc/onlearned(mob/user) used = TRUE @@ -40,7 +40,7 @@ /obj/item/book/granter/attack_self(mob/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 @@ -72,15 +72,15 @@ return TRUE for(var/datum/action/A in user.actions) if(A.type == granted_action) - to_chat(user, "You already know all about [actionname].") + to_chat(user, span_notice("You already know all about [actionname].")) return TRUE return FALSE /obj/item/book/granter/action/on_reading_start(mob/user) - to_chat(user, "You start reading about [actionname]...") + to_chat(user, span_notice("You start reading about [actionname]...")) /obj/item/book/granter/action/on_reading_finished(mob/user) - to_chat(user, "You feel like you've got a good handle on [actionname]!") + to_chat(user, span_notice("You feel like you've got a good handle on [actionname]!")) var/datum/action/G = new granted_action G.Grant(user) onlearned(user) @@ -101,13 +101,13 @@ check_flags = NONE /datum/action/innate/origami/Activate() - to_chat(owner, "You will now fold origami planes.") + to_chat(owner, span_notice("You will now fold origami planes.")) button_icon_state = "origami_on" active = TRUE UpdateButtonIcon() /datum/action/innate/origami/Deactivate() - to_chat(owner, "You will no longer fold origami planes.") + to_chat(owner, span_notice("You will no longer fold origami planes.")) button_icon_state = "origami_off" active = FALSE UpdateButtonIcon() @@ -125,29 +125,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_notice("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_notice("You've already read this one.")) return TRUE return FALSE /obj/item/book/granter/spell/on_reading_start(mob/user) - to_chat(user, "You start reading about casting [spellname]...") + to_chat(user, span_notice("You start reading about casting [spellname]...")) /obj/item/book/granter/spell/on_reading_finished(mob/user) - to_chat(user, "You feel like you've experienced enough to cast [spellname]!") + to_chat(user, span_notice("You 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_caution("[src] glows dark for a second!")) /obj/item/book/granter/spell/fireball spell = /obj/effect/proc_holder/spell/aimed/fireball @@ -180,7 +180,7 @@ /obj/item/book/granter/spell/smoke/recoil(mob/user) ..() - to_chat(user,"Your stomach rumbles...") + to_chat(user,span_caution("Your stomach rumbles...")) if(user.nutrition) user.set_nutrition(200) if(user.nutrition <= 0) @@ -195,7 +195,7 @@ /obj/item/book/granter/spell/blind/recoil(mob/user) ..() - to_chat(user,"You go blind!") + to_chat(user,span_warning("You go blind!")) user.blind_eyes(10) /obj/item/book/granter/spell/mindswap @@ -218,17 +218,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,"You stare at the book some more, but there doesn't seem to be anything else to learn...") + to_chat(user,span_notice("You 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 @@ -241,7 +241,7 @@ /obj/item/book/granter/spell/forcewall/recoil(mob/living/user) ..() - to_chat(user,"You suddenly feel very solid!") + to_chat(user,span_warning("You suddenly feel very solid!")) user.Stun(40, ignore_canstun = TRUE) user.petrify(30) @@ -254,7 +254,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 @@ -273,7 +273,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 @@ -284,7 +284,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 @@ -296,7 +296,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 @@ -322,12 +322,12 @@ return TRUE var/datum/martial_art/MA = martial if(user.mind.has_martialart(initial(MA.id))) - to_chat(user,"You already know [martialname]!") + to_chat(user,span_warning("You already know [martialname]!")) return TRUE return FALSE /obj/item/book/granter/martial/on_reading_start(mob/user) - to_chat(user, "You start reading about [martialname]...") + to_chat(user, span_notice("You start reading about [martialname]...")) /obj/item/book/granter/martial/on_reading_finished(mob/user) to_chat(user, "[greet]") @@ -341,17 +341,17 @@ name = "old manual" martialname = "close quarters combat" desc = "A small, black manual. There are drawn instructions of tactical hand-to-hand combat." - 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/effects/explosion1.ogg',40,1) user.flash_act(1, 1) user.adjustBruteLoss(6) @@ -390,7 +390,7 @@ /obj/item/book/granter/martial/flyingfang/already_known(mob/user) if(!islizard(user)) - to_chat(user, "You can't tell if this is some poorly written fanfiction or an actual guide to something.") + to_chat(user, span_warning("You can't tell if this is some poorly written fanfiction or an actual guide to something.")) return TRUE return ..() @@ -434,7 +434,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,"You learned how to make [initial(R.name)].") + to_chat(user,span_notice("You learned how to make [initial(R.name)].")) /obj/item/book/granter/crafting_recipe/weapons name = "makeshift weapons 101" diff --git a/code/game/objects/items/grenades/atmos_grenades.dm b/code/game/objects/items/grenades/atmos_grenades.dm index ce4ee164fb97..5c626d8397d1 100644 --- a/code/game/objects/items/grenades/atmos_grenades.dm +++ b/code/game/objects/items/grenades/atmos_grenades.dm @@ -12,7 +12,7 @@ if(user) add_fingerprint(user) if(msg) - to_chat(user, "You crush the [src]! [capitalize(DisplayTimeText(det_time))]!") + to_chat(user, span_warning("You crush the [src]! [capitalize(DisplayTimeText(det_time))]!")) active = TRUE icon_state = initial(icon_state) + "_active" playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', volume, TRUE) diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index 200c02fa6cdb..c07dbebc0e50 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) - . += "You scan the grenade and detect the following reagents:" + . += span_notice("You 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) - . += "You detect no second beaker in the grenade." + . += span_notice("You detect no second beaker in the grenade.") else - . += "You scan the grenade, but detect nothing." + . += span_notice("You scan the grenade, but detect nothing.") else if(stage != GRENADE_READY && beakers.len) if(beakers.len == 2 && beakers[1].name == beakers[2].name) - . += "You see two [beakers[1].name]s inside the grenade." + . += span_notice("You see two [beakers[1].name]s inside the grenade.") else for(var/obj/item/reagent_containers/glass/G in beakers) - . += "You see a [G.name] inside the grenade." + . += span_notice("You 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, "You lock the [initial(name)] assembly.") + to_chat(user, span_notice("You lock the [initial(name)] assembly.")) I.play_tool_sound(src, 25) else - to_chat(user, "You need to add at least one beaker before locking the [initial(name)] assembly!") + to_chat(user, span_warning("You 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, "You modify the time delay. It's set for [DisplayTimeText(det_time)].") + to_chat(user, span_notice("You modify the time delay. It's set for [DisplayTimeText(det_time)].")) else - to_chat(user, "You need to add a wire!") + to_chat(user, span_warning("You 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, "You add [I] to the [initial(name)] assembly.") + to_chat(user, span_notice("You 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, "You rig the [initial(name)] assembly.") + to_chat(user, span_notice("You rig the [initial(name)] assembly.")) else - to_chat(user, "You need one length of coil to wire the assembly!") + to_chat(user, span_warning("You 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, "You unlock the [initial(name)] assembly.") + to_chat(user, span_notice("You 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, "You open the [initial(name)] assembly and remove the payload.") + to_chat(user, span_notice("You 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, "You remove the activation mechanism from the [initial(name)] assembly.") + to_chat(user, span_notice("You 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, "You prime [src], activating its proximity sensor.") + to_chat(user, span_warning("You prime [src], activating its proximity sensor.")) else - to_chat(user, "You prime [src]! [DisplayTimeText(det_time)]!") + to_chat(user, span_warning("You prime [src]! [DisplayTimeText(det_time)]!")) playsound(src, 'sound/weapons/armbomb.ogg', volume, 1) 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, "You add [I] to the [initial(name)] assembly.") + to_chat(user, span_notice("You 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, "You set the time release to [unit_spread] units per detonation.") + to_chat(user, span_notice("You 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 083cf48f556a..8aeca3f85f46 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_userdanger("BANG"), MSG_AUDIBLE) var/distance = max(0,get_dist(get_turf(src),T)) if(!distance || loc == M || loc == M.loc) //Stop allahu akbarring rooms with this. M.Paralyze(200) diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm index 1725d84dccf0..702e8663899f 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, "You light the [name]!") + to_chat(user, span_warning("You 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 4fbbddb8388d..7d3ab4924a56 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/items/eatfood.ogg', 50, 1) preprime(user, det_time) user.transferItemToLoc(src, user, TRUE)//>eat a grenade set to 5 seconds >rush captain @@ -36,7 +36,7 @@ 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)) @@ -72,7 +72,7 @@ var/mob/living/carbon/C = user C.throw_mode_on() if(msg) - to_chat(user, "You prime [src]! [capitalize(DisplayTimeText(det_time))]!") + to_chat(user, span_warning("You prime [src]! [capitalize(DisplayTimeText(det_time))]!")) playsound(src, 'sound/weapons/armbomb.ogg', volume, 1) active = TRUE icon_state = initial(icon_state) + "_active" @@ -91,13 +91,13 @@ var/newtime = text2num(stripped_input(user, "Please enter a new detonation time", name)) if (newtime != null && user.canUseTopic(src, BE_CLOSE)) change_det_time(newtime) - to_chat(user, "You modify the time delay. It's set for [DisplayTimeText(det_time)].") + to_chat(user, span_notice("You 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) change_det_time() - to_chat(user, "You modify the time delay. It's set for [DisplayTimeText(det_time)].") + to_chat(user, span_notice("You modify the time delay. It's set for [DisplayTimeText(det_time)].")) else return ..() @@ -124,7 +124,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/item/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!")) prime() return TRUE //It hit the grenade, not them diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm index f48214c71641..846cbae78b00 100644 --- a/code/game/objects/items/grenades/plastic.dm +++ b/code/game/objects/items/grenades/plastic.dm @@ -42,7 +42,7 @@ nadeassembly = A A.master = src assemblyattacher = user.ckey - to_chat(user, "You add [A] to the [name].") + to_chat(user, span_notice("You add [A] to the [name].")) playsound(src, 'sound/weapons/tap.ogg', 20, 1) update_icon() return @@ -113,7 +113,7 @@ if(fuckup_safety != "Yes") return - to_chat(user, "You start planting [src]. The timer is set to [det_time]...") + to_chat(user, span_notice("You start planting [src]. The timer is set to [det_time]...")) if(do_after(user, 30, target = AM)) if(!user.temporarilyRemoveItemFromInventory(src)) @@ -135,7 +135,7 @@ target.add_overlay(plastic_overlay, TRUE) if(!nadeassembly) - to_chat(user, "You plant the bomb. Timer counting down from [det_time].") + to_chat(user, span_notice("You plant the bomb. Timer counting down from [det_time].")) addtimer(CALLBACK(src, .proc/prime), det_time*10) else qdel(src) //How? @@ -161,7 +161,7 @@ /obj/item/grenade/plastic/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) @@ -195,7 +195,7 @@ return ..() /obj/item/grenade/plastic/c4/suicide_act(mob/user) - user.visible_message("[user] activates the [src.name] 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 the [src.name] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!")) shout_syndicate_crap(user) target = user message_admins("[ADMIN_LOOKUPFLW(user)] suicided with [name] at [ADMIN_VERBOSEJMP(src)]") @@ -207,7 +207,7 @@ /obj/item/grenade/plastic/c4/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_SCREWDRIVER) open_panel = !open_panel - to_chat(user, "You [open_panel ? "open" : "close"] the wire panel.") + to_chat(user, span_notice("You [open_panel ? "open" : "close"] the wire panel.")) else if(is_wire_tool(I)) wires.interact(user) else diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 440087f02681..d523b5133e5b 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() @@ -45,7 +45,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 @@ -57,8 +57,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 [C]!") + C.visible_message(span_danger("[user] is trying to put [src.name] on [C]!"), \ + span_userdanger("[user] is trying to put [src.name] on [C]!")) playsound(loc, cuffsound, 30, 1, -2) if(do_mob(user, C, 30) && (C.get_num_arms(FALSE) >= 2 || C.get_arm_ignore())) @@ -66,15 +66,15 @@ apply_cuffs(C, user, TRUE) else apply_cuffs(C, user) - to_chat(user, "You handcuff [C].") + to_chat(user, span_notice("You handcuff [C].")) SSblackbox.record_feedback("tally", "handcuffs", 1, type) log_combat(user, C, "handcuffed") else - to_chat(user, "You fail to handcuff [C]!") + to_chat(user, span_warning("You fail to handcuff [C]!")) log_combat(user, C, "attempted to handcuff") 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, var/dispense = 0) if(target.handcuffed) @@ -180,24 +180,24 @@ var/obj/item/wirerod/W = new /obj/item/wirerod remove_item_from_storage(user) user.put_in_hands(W) - to_chat(user, "You wrap [src] around the top of [I].") + to_chat(user, span_notice("You wrap [src] around the top of [I].")) qdel(src) else - to_chat(user, "You need one rod to make a wired rod!") + to_chat(user, span_warning("You 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, "You need at least six metal sheets to make good enough weights!") + to_chat(user, span_warning("You need at least six metal sheets to make good enough weights!")) return - to_chat(user, "You begin to apply [I] to [src]...") + to_chat(user, span_notice("You 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, "You make some weights out of [I] and tie them to [src].") + to_chat(user, span_notice("You make some weights out of [I] and tie them to [src].")) remove_item_from_storage(user) qdel(src) else @@ -255,7 +255,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/weapons/bladeslice.ogg', 50, 1, -1) return (BRUTELOSS) @@ -264,7 +264,7 @@ if(ishuman(user) && !user.stat && !user.restrained()) armed = !armed update_icon() - to_chat(user, "[src] is now [armed ? "armed" : "disarmed"]") + to_chat(user, span_notice("[src] is now [armed ? "armed" : "disarmed"]")) /obj/item/restraints/legcuffs/beartrap/proc/close_trap() armed = FALSE @@ -280,7 +280,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.movement_type & (FLYING|FLOATING)) //don't close the trap if they're flying/floating over it. @@ -302,8 +302,8 @@ snap = FALSE if(snap) close_trap() - L.visible_message("[L] triggers \the [src].", \ - "You trigger \the [src]!") + L.visible_message(span_danger("[L] triggers \the [src]."), \ + span_userdanger("You trigger \the [src]!")) L.apply_damage(trap_damage, BRUTE, def_zone) ..() @@ -349,12 +349,12 @@ return//abort var/mob/living/carbon/C = hit_atom 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_userdanger("\The [src] ensnares you!")) C.Immobilize(immobilize) playsound(src, 'sound/effects/snap.ogg', 50, TRUE) diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index 0e1ed5b24413..5fe7a18777f2 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -72,7 +72,7 @@ /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]!", "You climb out of [src]!") + user.visible_message(span_warning("[user] scrambles out of [src]!"), span_notice("You 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]!"), "[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]!"), "[src] lunges at you!") do_attack_animation(L, null, src) playsound(L, 'sound/weapons/smash.ogg', 50, 1) playsound(L, 'sound/misc/desceration-01.ogg', 50, 1) @@ -125,7 +125,7 @@ if(awakened) return awakened = TRUE - user.visible_message("[src] begins to rattle. He thirsts.", "You flick [src]'s latch up. You hope this is a good idea.") + user.visible_message(span_boldwarning("[src] begins to rattle. He thirsts."), "You flick [src]'s latch up. You hope this is a good idea.") name = "His Grace" desc = "A bloodthirsty artifact created by a profane rite." 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/weapons/batonextend.ogg', 100, 1) 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]!"), "[src] consumes you!") meal.adjustBruteLoss(200) playsound(meal, 'sound/misc/desceration-02.ogg', 75, 1) playsound(src, 'sound/items/eatfood.ogg', 100, 1) @@ -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_userdanger("[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 your hand. [src] must feed immediately.\ + master.visible_message(span_warning("[src] is very hungry!"), "Spines sink into your 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!", "Your bloodlust recedes.") + master.visible_message(span_warning("[src] is now only very hungry!"), "Your bloodlust recedes.") if(HIS_GRACE_HUNGRY to HIS_GRACE_FAMISHED) if(HIS_GRACE_HUNGRY > prev_bloodthirst) - master.visible_message("[src] is getting hungry.", "You feel [src]'s hunger within you.\ + master.visible_message(span_warning("[src] is getting hungry."), "You 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."), "[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."), "[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."), "[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."), "[src]'s hunger recedes...") force = initial(force) + force_bonus /obj/item/his_grace/proc/ascend() diff --git a/code/game/objects/items/holosign_creator.dm b/code/game/objects/items/holosign_creator.dm index 502625a21096..3bf575c83ce9 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, "You use [src] to deactivate [H].") + to_chat(user, span_notice("You 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/machines/click.ogg', 20, 1) @@ -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, "You create \a [H] with [src].") + to_chat(user, span_notice("You 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, "You clear all active holograms.") + to_chat(user, span_notice("You 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, "You clear all active holograms, and reset your projector to normal.") + to_chat(user, span_notice("You 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, "You clear all active holograms, and overload your energy projector!") + to_chat(user, span_warning("You clear all active holograms, and overload your energy projector!")) holosign_type = /obj/structure/holosign/barrier/cyborg/hacked creation_time = 30 if(signs.len) @@ -132,11 +132,11 @@ if(signs.len) for(var/H in signs) qdel(H) - to_chat(user, "You clear all active holograms.") + to_chat(user, span_notice("You clear all active holograms.")) if(signs.len) for(var/H in signs) qdel(H) - to_chat(user, "You clear all active holograms.") + to_chat(user, span_notice("You clear all active holograms.")) /obj/item/holosign_creator/multi name = "multiple holosign projector" //Fork from this to make multiple barriers @@ -146,10 +146,10 @@ if(signs.len) for(var/H in signs) qdel(H) - to_chat(user, "You clear all active holograms.") + to_chat(user, span_notice("You clear all active holograms.")) else holosign_type = next_list_item(holosign_type, holodesigns) - to_chat(user, "You switch to [holosign_type]") + to_chat(user, span_notice("You switch to [holosign_type]")) /obj/item/holosign_creator/multi/CE name = "CE holofan projector" diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index ef1b0f0ca377..e5c1e38e549b 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -105,7 +105,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 @@ -254,7 +254,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) @@ -326,7 +326,7 @@ ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT) /obj/item/nullrod/godhand/ignition_effect(atom/A, mob/user) - . = "[user] grasps [A] with [user.p_their()] flaming hand, igniting it in a burst of holy flame. Holy hot damn, that is badass. " + . = span_notice("[user] grasps [A] with [user.p_their()] flaming hand, igniting it in a burst of holy flame. Holy hot damn, that is badass. ") /obj/item/nullrod/staff icon_state = "godstaff-red" @@ -551,7 +551,7 @@ if(possessed) return if(!(GLOB.ghost_role_flags & GHOSTROLE_STATION_SENTIENCE)) - to_chat(user, "Anomalous otherworldly energies block you from awakening the blade!") + to_chat(user, span_notice("Anomalous otherworldly energies block you from awakening the blade!")) return to_chat(user, "You attempt to wake the spirit of the blade...") @@ -653,8 +653,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, "Your pride reflects on [H].") - to_chat(H, "You feel insecure, taking on [user]'s burden.") + to_chat(user, span_notice("Your pride reflects on [H].")) + to_chat(H, span_userdanger("You feel insecure, taking on [user]'s burden.")) /obj/item/nullrod/whip name = "holy whip" diff --git a/code/game/objects/items/hot_potato.dm b/code/game/objects/items/hot_potato.dm index 34e1f3b4261a..0ccad3acdaef 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_userdanger("[src] [detonate_explosion? "explodes" : "activates"]!"), span_userdanger("[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!", "You squeeze [src], activating its countdown and attachment mechanism!", - "You 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("You squeeze [src], activating its countdown and attachment mechanism!"), + span_boldwarning("You 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, "You have a really bad feeling about [src]!") + to_chat(user, span_userdanger("You 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]!", "You force [src] onto [victim]!", "You hear a mechanical click and a beep.") + user.visible_message(span_userdanger("[user] forces [src] onto [victim]!"), span_userdanger("You force [src] onto [victim]!"), span_boldwarning("You 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!", "You try to force [src] onto [victim], but it is unable to attach!", "You 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("You try to force [src] onto [victim], but it is unable to attach!"), span_boldwarning("You 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 2c5c69eb170b..175867874693 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,"You flip the [src]") + to_chat(user,span_notice("You flip the [src]")) start() flick("hourglass_flip",src) else - to_chat(user,"You stop the [src].") //Sand magically flows back because that's more convinient to use. + to_chat(user,span_notice("You 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 2a12868e3a69..cc65f2eb4738 100644 --- a/code/game/objects/items/implants/implant_abductor.dm +++ b/code/game/objects/items/implants/implant_abductor.dm @@ -14,7 +14,7 @@ cooldown = 0 START_PROCESSING(SSobj, src) else - to_chat(imp_in, "You must wait [30 - cooldown] seconds to use [src] again!") + to_chat(imp_in, span_warning("You must wait [30 - cooldown] seconds to use [src] again!")) /obj/item/implant/abductor/process() if(cooldown < initial(cooldown)) diff --git a/code/game/objects/items/implants/implant_chem.dm b/code/game/objects/items/implants/implant_chem.dm index d569c2799c58..23fe57355661 100644 --- a/code/game/objects/items/implants/implant_chem.dm +++ b/code/game/objects/items/implants/implant_chem.dm @@ -44,9 +44,9 @@ injectamount = cause reagents.reaction(R, INJECT) reagents.trans_to(R, injectamount) - to_chat(R, "You hear a faint beep.") + to_chat(R, span_italics("You hear a faint beep.")) if(!reagents.total_volume) - to_chat(R, "You hear a faint click from your chest.") + to_chat(R, span_italics("You 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 97912e4d1e72..a6a8b5ec0f5f 100644 --- a/code/game/objects/items/implants/implant_explosive.dm +++ b/code/game/objects/items/implants/implant_explosive.dm @@ -38,7 +38,7 @@ heavy = round(heavy) medium = round(medium) weak = round(weak) - to_chat(imp_in, "You activate your [name].") + to_chat(imp_in, span_notice("You activate your [name].")) active = TRUE . = ..() var/turf/boomturf = get_turf(imp_in) @@ -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/items/timer.ogg', 30, 0) 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/items/timer.ogg', 30, 0) sleep(delay*0.25) diff --git a/code/game/objects/items/implants/implant_greytide.dm b/code/game/objects/items/implants/implant_greytide.dm index 45754f05b492..9132d5fdc5ee 100644 --- a/code/game/objects/items/implants/implant_greytide.dm +++ b/code/game/objects/items/implants/implant_greytide.dm @@ -17,23 +17,23 @@ /obj/item/implant/greytide/implant(mob/source, mob/user) if(!source.mind) - to_chat(user.mind, "[source] doesn't posses the mental capabilities to be a greytider.") //"doesn't posses the mental capabilities to be a greytider" + to_chat(user.mind, span_notice("[source] doesn't posses the mental capabilities to be a greytider.")) //"doesn't posses the mental capabilities to be a greytider" return FALSE var/mob/living/carbon/target = source var/mob/living/carbon/holder = user if(target == holder) - to_chat(holder, "You can't implant yourself!") + to_chat(holder, span_notice("You can't implant yourself!")) return FALSE var/obj/item/implant/greytide/imp = locate(src.type) in source if(imp) - to_chat(holder, "[target] is already a slave!") + to_chat(holder, span_warning("[target] is already a slave!")) return FALSE if(HAS_TRAIT(target, TRAIT_MINDSHIELD)) - to_chat(holder, "[target] seems to resist the implant!") + to_chat(holder, span_warning("[target] seems to resist the implant!")) return FALSE to_chat(target, "You feel a strong urge to break everything. You feel a strong loyalty to [holder.real_name] and your assistant brothers. You want to break into everything, but harming others isnt something you will do.") @@ -57,9 +57,9 @@ return if(source.mind && source.mind.has_antag_datum(/datum/antagonist/greytide)) source.mind.remove_antag_datum(/datum/antagonist/greytide) - to_chat(source,"You feel your free will come back to you! You no longer wish to break everything!") + to_chat(source,span_userdanger("You feel your free will come back to you! You no longer wish to break everything!")) if(!source.mind.has_antag_datum(/datum/antagonist)) - to_chat(source,"You are no longer an antagonist.") + to_chat(source,span_notice("You are no longer an antagonist.")) REMOVE_TRAIT(source, TRAIT_PACIFISM, "Greytide Implant") /obj/item/implanter/greytide diff --git a/code/game/objects/items/implants/implant_mindshield.dm b/code/game/objects/items/implants/implant_mindshield.dm index 6e072e4fb7c1..9c5be737e439 100644 --- a/code/game/objects/items/implants/implant_mindshield.dm +++ b/code/game/objects/items/implants/implant_mindshield.dm @@ -36,7 +36,7 @@ if(target.mind.has_antag_datum(/datum/antagonist/rev/head) || target.mind.has_antag_datum(/datum/antagonist/hivemind) || target.mind.unconvertable) if(!silent) - target.visible_message("[target] seems to resist the implant!", "You feel something interfering with your mental conditioning, but you resist it!") + target.visible_message(span_warning("[target] seems to resist the implant!"), span_warning("You feel something interfering with your mental conditioning, but you resist it!")) removed(target, 1) qdel(src) return FALSE @@ -51,8 +51,8 @@ target.apply_status_effect(STATUS_EFFECT_HIVE_TRACKER, C, TRACKER_DEFAULT_TIME) if(C.mind) //If you were using mind control, too bad C.apply_status_effect(STATUS_EFFECT_HIVE_RADAR) - to_chat(C, "We detect a surge of psionic energy from a far away vessel before they disappear from the hive. Whatever happened, there's a good chance they're after us now.") - to_chat(target, "You hear supernatural wailing echo throughout your mind as you are finally set free. Deep down, you can feel the lingering presence of those who enslaved you... as can they!") + to_chat(C, span_assimilator("We detect a surge of psionic energy from a far away vessel before they disappear from the hive. Whatever happened, there's a good chance they're after us now.")) + to_chat(target, span_assimilator("You hear supernatural wailing echo throughout your mind as you are finally set free. Deep down, you can feel the lingering presence of those who enslaved you... as can they!")) target.apply_status_effect(STATUS_EFFECT_HIVE_RADAR) remove_hivemember(target) @@ -65,7 +65,7 @@ rev.remove_revolutionary(FALSE, user) if(target.mind.has_antag_datum(/datum/antagonist/gang/boss) || is_shadow_or_thrall(target)) if(!silent) - target.visible_message("[target] seems to resist the implant!", "You feel something interfering with your mental conditioning, but you resist it!") + target.visible_message(span_warning("[target] seems to resist the implant!"), span_warning("You feel something interfering with your mental conditioning, but you resist it!")) removed(target, 1) qdel(src) return FALSE @@ -75,9 +75,9 @@ target.mind.remove_antag_datum(/datum/antagonist/veil) if(!silent) if(target.mind in SSticker.mode.cult) - to_chat(target, "You feel something interfering with your mental conditioning, but you resist it!") + to_chat(target, span_warning("You feel something interfering with your mental conditioning, but you resist it!")) else - to_chat(target, "You feel a sense of peace and security. You are now protected from brainwashing.") + to_chat(target, span_notice("You 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 @@ -90,7 +90,7 @@ REMOVE_TRAIT(L, TRAIT_MINDSHIELD, "implant") L.sec_hud_set_implants() if(target.stat != DEAD && !silent) - to_chat(target, "Your mind suddenly feels terribly vulnerable. You are no longer safe from brainwashing.") + to_chat(target, span_boldnotice("Your 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_mindshieldtot.dm b/code/game/objects/items/implants/implant_mindshieldtot.dm index a342e8a7ec17..29773a0c4edb 100644 --- a/code/game/objects/items/implants/implant_mindshieldtot.dm +++ b/code/game/objects/items/implants/implant_mindshieldtot.dm @@ -36,7 +36,7 @@ if(target.mind.has_antag_datum(/datum/antagonist/rev/head) || target.mind.has_antag_datum(/datum/antagonist/hivemind) || target.mind.unconvertable) if(!silent) - target.visible_message("[target] seems to resist the implant!", "You feel something interfering with your mental conditioning, but you resist it!") + target.visible_message(span_warning("[target] seems to resist the implant!"), span_warning("You feel something interfering with your mental conditioning, but you resist it!")) removed(target, 1) qdel(src) return FALSE @@ -51,8 +51,8 @@ target.apply_status_effect(STATUS_EFFECT_HIVE_TRACKER, C, TRACKER_DEFAULT_TIME) if(C.mind) //If you were using mind control, too bad C.apply_status_effect(STATUS_EFFECT_HIVE_RADAR) - to_chat(C, "We detect a surge of psionic energy from a far away vessel before they disappear from the hive. Whatever happened, there's a good chance they're after us now.") - to_chat(target, "You hear supernatural wailing echo throughout your mind as you are finally set free. Deep down, you can feel the lingering presence of those who enslaved you... as can they!") + to_chat(C, span_assimilator("We detect a surge of psionic energy from a far away vessel before they disappear from the hive. Whatever happened, there's a good chance they're after us now.")) + to_chat(target, span_assimilator("You hear supernatural wailing echo throughout your mind as you are finally set free. Deep down, you can feel the lingering presence of those who enslaved you... as can they!")) target.apply_status_effect(STATUS_EFFECT_HIVE_RADAR) remove_hivemember(target) @@ -65,7 +65,7 @@ rev.remove_revolutionary(FALSE, user) if(target.mind.has_antag_datum(/datum/antagonist/gang/boss)) if(!silent) - target.visible_message("[target] seems to resist the implant!", "You feel something interfering with your mental conditioning, but you resist it!") + target.visible_message(span_warning("[target] seems to resist the implant!"), span_warning("You feel something interfering with your mental conditioning, but you resist it!")) return FALSE if(target.mind.has_antag_datum(/datum/antagonist/gang)) target.mind.remove_antag_datum(/datum/antagonist/gang) @@ -73,9 +73,9 @@ target.mind.remove_antag_datum(/datum/antagonist/veil) if(!silent) if(target.mind in SSticker.mode.cult) - to_chat(target, "You feel something interfering with your mental conditioning, but you resist it!") + to_chat(target, span_warning("You feel something interfering with your mental conditioning, but you resist it!")) else - to_chat(target, "You feel a sense of peace and security. You are now protected from brainwashing.") + to_chat(target, span_notice("You 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 @@ -88,7 +88,7 @@ REMOVE_TRAIT(L, TRAIT_MINDSHIELD, "implant") L.sec_hud_set_implants() if(target.stat != DEAD && !silent) - to_chat(target, "Your mind suddenly feels terribly vulnerable. You are no longer safe from brainwashing.") + to_chat(target, span_boldnotice("Your 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 520d492ca1f7..fef83a1532c8 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, "You feel a sudden surge of energy!") + to_chat(imp_in, span_notice("You feel a sudden surge of energy!")) imp_in.SetStun(0) imp_in.SetKnockdown(0) imp_in.SetUnconscious(0) diff --git a/code/game/objects/items/implants/implant_spell.dm b/code/game/objects/items/implants/implant_spell.dm index e925a17b2936..916eaa3cedec 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 d36ac43f0016..84c23f875f30 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 4d4802e01866..42314cf6e234 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, "You scribble illegibly on the side of [src]!") + to_chat(user, span_notice("You 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 40428a706f14..177c8fd40955 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -91,12 +91,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() @@ -125,20 +125,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("You see [user] kicking against the door of [src]!", \ - "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "You hear a metallic creaking from [src].") + user.visible_message(span_notice("You see [user] kicking against the door of [src]!"), \ + span_notice("You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_italics("You 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]!", \ - "You successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("You 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 7f3b06d79ea9..43ede2ef2d59 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, "You implant yourself.") + to_chat(user, span_notice("You implant yourself.")) else - M.visible_message("[user] has implanted [M].", "[user] implants you.") + M.visible_message("[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, "You prod at [src] with [W]!") + to_chat(user, span_notice("You 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 a7346f76919e..3287837d68b0 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 3917d8377657..0235ca45f9a9 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, "You don't have the dexterity to use [src]!") + to_chat(user, span_warning("You 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, "You unscrew the battery compartment.") + to_chat(user, span_notice("You unscrew the battery compartment.")) opened = TRUE update_icon() return else - to_chat(user, "You close the battery compartment.") + to_chat(user, span_notice("You close the battery compartment.")) opened = FALSE update_icon() return @@ -78,12 +78,12 @@ if(!cell) if(!user.transferItemToLoc(W, src)) return - to_chat(user, "You insert [W] into [src].") + to_chat(user, span_notice("You insert [W] into [src].")) cell = W update_icon() return else - to_chat(user, "[src] already has \a [cell] installed!") + to_chat(user, span_notice("[src] already has \a [cell] installed!")) return if(cantbeused(user)) @@ -112,10 +112,10 @@ 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].","You start recharging [A] with [src].") + user.visible_message("[user] starts recharging [A] with [src].",span_notice("You 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]!","You recharged [A]!") + user.visible_message("[user] recharged [A]!",span_notice("You 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]!","You remove [cell].") + user.visible_message("[user] removes [cell] from [src]!",span_notice("You 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 f94f6de03fe1..9e34863b8e44 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -34,7 +34,7 @@ var/loaded_food = "nothing" /// The name of the thing on the fork /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/items/eatfood.ogg', 50, 1) return BRUTELOSS @@ -46,14 +46,14 @@ if(forkload) if(M == user) - M.visible_message("[user] eats a delicious forkful of [loaded_food]!") + M.visible_message(span_notice("[user] eats a delicious forkful of [loaded_food]!")) M.reagents.add_reagent(forkload.type, 1) else - M.visible_message("[user] is trying to feed [M] a delicious forkful of [loaded_food]!") //yogs start + M.visible_message(span_notice("[user] is trying to feed [M] a delicious forkful of [loaded_food]!")) //yogs start if(!do_mob(user, M)) return log_combat(user, M, "fed [loaded_food]", forkload.type) //yogs end - M.visible_message("[user] feeds [M] a delicious forkful of [loaded_food]!") + M.visible_message(span_notice("[user] feeds [M] a delicious forkful of [loaded_food]!")) M.reagents.add_reagent(forkload.type, 1) icon_state = "fork" forkload = null @@ -63,7 +63,7 @@ return eyestab(M,user) icon_state = "forkloaded_pie" user.visible_message("[user] scoops up the pie with [user.p_their()] fork!", \ - "You scoop up the pie with your fork.") + span_notice("You scoop up the pie with your fork.")) var/datum/reagent/R = new /datum/reagent/consumable/banana forkload = R @@ -110,9 +110,9 @@ return ..() /obj/item/kitchen/knife/suicide_act(mob/user) - user.visible_message(pick("[user] is slitting [user.p_their()] wrists with the [name]! It looks like [user.p_theyre()] trying to commit suicide.", \ - "[user] is slitting [user.p_their()] throat with the [name]! It looks like [user.p_theyre()] trying to commit suicide.", \ - "[user] is slitting [user.p_their()] stomach open with the [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 [name]! It looks like [user.p_theyre()] trying to commit suicide."), \ + span_suicide("[user] is slitting [user.p_their()] throat with the [name]! It looks like [user.p_theyre()] trying to commit suicide."), \ + span_suicide("[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku."))) return BRUTELOSS /obj/item/kitchen/knife/ritual @@ -211,7 +211,7 @@ armor = list("melee" = 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 // Shank - Makeshift weapon that can embed on throw @@ -244,6 +244,6 @@ 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 */ diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 08d3532f0023..5552be0bc549 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, "You blow up [src] with [tank].") + to_chat(user, span_notice("You 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 f77f8511a05f..d1a7bf694ccc 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -271,7 +271,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 @@ -410,7 +410,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/effects/spray.ogg', 10, 1, -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 6d34d7d13b3b..c837f73c5e3b 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -19,7 +19,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) @@ -55,7 +55,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, hitsound, get_clamped_volume(), 1, -1) add_fingerprint(user) @@ -81,7 +81,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 @@ -120,7 +120,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 ..() @@ -182,13 +182,13 @@ if(!hacked) hacked = TRUE item_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 67ebefd404c9..d92f24162412 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -18,7 +18,7 @@ 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 @@ -93,7 +93,7 @@ playsound(B, 'sound/items/sheath.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)) @@ -161,7 +161,7 @@ H.reagents.add_reagent(/datum/reagent/toxin/histamine, 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, 1, -1) return TOXLOSS @@ -222,8 +222,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"] = "You pulse [target]'s sensors with the baton!" + .["visible"] = span_danger("[user] pulses [target]'s sensors with the baton!") + .["local"] = span_danger("You pulse [target]'s sensors with the baton!") return . @@ -240,7 +240,7 @@ return ..() if(HAS_TRAIT(user, TRAIT_NO_STUN_WEAPONS)) - to_chat(user, "You can't seem to remember how this works!") + to_chat(user, span_warning("You can't seem to remember how this works!")) return add_fingerprint(user) if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50)) @@ -343,7 +343,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 @@ -408,7 +408,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) @@ -436,7 +436,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)) @@ -470,23 +470,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.",\ - "You 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_italics("You 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.",\ - "You 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_italics("You hear a loud crack as you are washed with a wave of heat.")) consume_everything() /obj/item/melee/supermatter_sword/bullet_act(obj/item/projectile/P) - visible_message("[P] smacks into [src] and rapidly flashes to ash.",\ - "You 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_italics("You 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) @@ -504,8 +504,8 @@ if(newT.type == oldtype) return playsound(T, 'sound/effects/supermatter.ogg', 50, 1) - T.visible_message("[T] smacks into [src] and rapidly flashes to ash.",\ - "You 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_italics("You hear a loud crack as you are washed with a wave of heat.")) shard.Consume() CALCULATE_ADJACENT_TURFS(T) @@ -531,7 +531,7 @@ if(proximity_flag && istype(target, /mob)) var/mob/M = target var/turf/T = get_turf(M) - M.visible_message("[target] is consumed by the singularity!") + M.visible_message(span_danger("[target] is consumed by the singularity!")) new /obj/singularity(T) M.gib() else @@ -583,7 +583,7 @@ extend(user) else if (held_sausage) - to_chat(user, "You can't retract [src] while [held_sausage] is attached!") + to_chat(user, span_warning("You can't retract [src] while [held_sausage] is attached!")) return retract(user) @@ -594,15 +594,15 @@ ..() if (istype(target, /obj/item/reagent_containers/food/snacks/sausage)) if (!on) - to_chat(user, "You must extend [src] to attach anything to it!") + to_chat(user, span_warning("You 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) diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm index d7a6254f4a87..0ccb701cf3f3 100644 --- a/code/game/objects/items/melee/transforming.dm +++ b/code/game/objects/items/melee/transforming.dm @@ -79,9 +79,9 @@ /obj/item/melee/transforming/proc/transform_messages(mob/living/user, supress_message_text) playsound(user, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 35, 1) //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, "You accidentally cut yourself with [src], like a doofus!") + to_chat(user, span_warning("You accidentally cut yourself 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 af4d72809e41..151209eeb075 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() @@ -148,7 +148,7 @@ throw_speed = 0.01 /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/items/eatfood.ogg', 50, 1, -1) diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index 0c806a8bdd97..17080e460728 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -42,18 +42,18 @@ return if(reagents.total_volume < 1) - to_chat(user, "Your mop is dry!") + to_chat(user, span_warning("Your mop is dry!")) return if(T) - user.visible_message("[user] begins to clean \the [T] with [src].", "You begin to clean \the [T] with [src]...") + user.visible_message("[user] begins to clean \the [T] with [src].", span_notice("You begin to clean \the [T] with [src]...")) var/realspeed = mopspeed if(IS_JOB(user, "Janitor")) realspeed *= 0.8 if(do_after(user, realspeed, target = T)) - to_chat(user, "You finish mopping.") + to_chat(user, span_notice("You finish mopping.")) clean(T) @@ -70,7 +70,7 @@ J.mymop=src J.update_icon() else - to_chat(user, "You are unable to fit your [name] into the [J.name].") + to_chat(user, span_warning("You are unable to fit your [name] into the [J.name].")) return /obj/item/mop/cyborg @@ -102,7 +102,7 @@ START_PROCESSING(SSobj, src) else STOP_PROCESSING(SSobj,src) - to_chat(user, "You set the condenser switch to the '[refill_enabled ? "ON" : "OFF"]' position.") + to_chat(user, span_notice("You set the condenser switch to the '[refill_enabled ? "ON" : "OFF"]' position.")) playsound(user, 'sound/machines/click.ogg', 30, 1) /obj/item/mop/advanced/process() diff --git a/code/game/objects/items/paiwire.dm b/code/game/objects/items/paiwire.dm index 331a51ad671c..f22efc632b5f 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].", "You insert [src] into a data port on [M].", "You hear the satisfying click of a wire jack fastening into place.") + user.visible_message("[user] inserts [src] into a data port on [M].", span_notice("You insert [src] into a data port on [M]."), span_italics("You 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 f36e08813d88..cafbd6bd4130 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, "You close [src]'s door.") + to_chat(user, span_notice("You close [src]'s door.")) playsound(user, 'sound/effects/bin_close.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, "You open [src]'s door.") + to_chat(user, span_notice("You open [src]'s door.")) playsound(user, 'sound/effects/bin_open.ogg', 50, TRUE) open = TRUE update_icon() @@ -73,7 +73,7 @@ if(open || !user.canUseTopic(src, BE_CLOSE)) return locked = !locked - to_chat(user, "You flip the lock switch [locked ? "down" : "up"].") + to_chat(user, span_notice("You flip the lock switch [locked ? "down" : "up"].")) if(locked) playsound(user, 'sound/machines/boltsdown.ogg', 30, TRUE) else @@ -84,32 +84,32 @@ if(user.a_intent == INTENT_HARM) return ..() if(!open) - to_chat(user, "You need to open [src]'s door!") + to_chat(user, span_warning("You 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(iscatperson(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, "You get the feeling [target] isn't meant for a [name].") + to_chat(user, span_warning("You 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, "You poke a limb through [src]'s bars and start fumbling for the lock switch... (This will take some time.)") - to_chat(loc, "You see [user] reach through the bars and fumble for the lock switch!") + to_chat(user, span_notice("You poke a limb through [src]'s bars and start fumbling for the lock switch... (This will take some time.)")) + to_chat(loc, span_warning("You 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/machines/boltsup.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, "You 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("You 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, "You 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("You 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].", \ - "You unload [src] onto [over_atom].") + usr.visible_message(span_notice("[usr] unloads [src]."), \ + span_notice("You 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].", \ - "You 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("You start loading [target] into [src]..."), null, null, target) + to_chat(target, span_userdanger("[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]!", \ - "You 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("You load [target] into [src]."), null, null, target) + to_chat(target, span_userdanger("[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 9d5308f849e2..761d7f088be9 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -32,7 +32,7 @@ /obj/item/pinpointer/attack_self(mob/living/user) toggle_on() - user.visible_message("[user] [active ? "" : "de"]activates [user.p_their()] pinpointer.", "You [active ? "" : "de"]activate your pinpointer.") + user.visible_message(span_notice("[user] [active ? "" : "de"]activates [user.p_their()] pinpointer."), span_notice("You [active ? "" : "de"]activate your pinpointer.")) /obj/item/pinpointer/proc/toggle_on() active = !active @@ -102,14 +102,14 @@ /obj/item/pinpointer/crew/attack_self(mob/living/user) if(active) toggle_on() - user.visible_message("[user] deactivates [user.p_their()] pinpointer.", "You deactivate your pinpointer.") + user.visible_message(span_notice("[user] deactivates [user.p_their()] pinpointer."), span_notice("You deactivate your 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() @@ -132,7 +132,7 @@ name_counts[crewmember_name] = 1 if(!names.len) - user.visible_message("[user]'s pinpointer fails to detect a signal.", "Your pinpointer fails to detect a signal.") + user.visible_message(span_notice("[user]'s pinpointer fails to detect a signal."), span_notice("Your pinpointer fails to detect a signal.")) return var/A = input(user, "Person to track", "Pinpoint") in names @@ -141,7 +141,7 @@ target = names[A] toggle_on() - user.visible_message("[user] activates [user.p_their()] pinpointer.", "You activate your pinpointer.") + user.visible_message(span_notice("[user] activates [user.p_their()] pinpointer."), span_notice("You activate your 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 db72d0b448f3..c7dad0d5e2ad 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -105,38 +105,38 @@ /obj/item/toy/plush/attack_self(mob/user) . = ..() if(stuffed || grenade) - to_chat(user, "You pet [src]. D'awww.") + to_chat(user, span_notice("You 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, "You try to pet [src], but it has no stuffing. Aww...") + to_chat(user, span_notice("You try to pet [src], but it has no stuffing. Aww...")) /obj/item/toy/plush/attackby(obj/item/I, mob/living/user, params) if(I.is_sharp()) if(!grenade) if(!stuffed) - to_chat(user, "You already murdered it!") + to_chat(user, span_warning("You already murdered it!")) return - user.visible_message("[user] tears out the stuffing from [src]!", "You rip a bunch of the stuffing from [src]. Murderer.") + user.visible_message(span_notice("[user] tears out the stuffing from [src]!"), span_notice("You rip a bunch of the stuffing from [src]. Murderer.")) I.play_tool_sound(src) stuffed = FALSE else - to_chat(user, "You remove the grenade from [src].") + to_chat(user, span_notice("You remove the grenade from [src].")) user.put_in_hands(grenade) grenade = null return if(istype(I, /obj/item/grenade)) if(stuffed) - to_chat(user, "You need to remove some stuffing first!") + to_chat(user, span_warning("You 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].", \ - "You slide [I] into [src].") + user.visible_message(span_warning("[user] slides [grenade] into [src]."), \ + span_danger("You 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)].") @@ -154,19 +154,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 @@ -179,39 +179,39 @@ chance -= duty //do we mate for life? if(prob(chance)) //did we bag a date? - user.visible_message("[user] makes [Kisser] kiss [src]!", - "You make [Kisser] kiss [src]!") + user.visible_message(span_notice("[user] makes [Kisser] kiss [src]!"), + span_notice("You 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.", - "You pronounce [Kisser] and [src] married!") + user.visible_message(span_notice("[user] pronounces [Kisser] and [src] married! D'aw."), + span_notice("You 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]!", - "You make [Kisser] nuzzle [src]!") + user.visible_message(span_notice("[user] makes [Kisser] nuzzle [src]!"), + span_notice("You 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) @@ -404,7 +404,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 @@ -537,7 +537,7 @@ var/suicide_count = 0 /obj/item/toy/plush/mothplushie/suicide_act(mob/living/user) - user.visible_message("[user] stares deeply into the eyes of [src]. The plush begins to consume [user.p_their()] soul! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] stares deeply into the eyes of [src]. The plush begins to consume [user.p_their()] soul! It looks like [user.p_theyre()] trying to commit suicide!")) suicide_count++ if(suicide_count < 3) desc = "An unsettling mothperson plushy. After killing [suicide_count] [suicide_count == 1 ? "person" : "people"] it's not looking so huggable now..." diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 892a36784f9d..1dd96df508bf 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, "You tweak \the [src]'s pressure output to [pressureSetting].") + to_chat(user, span_notice("You 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, "You load \the [I] into \the [src].") + to_chat(user, span_notice("You load \the [I] into \the [src].")) else I.forceMove(src) loadedItems += I @@ -144,17 +144,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_userdanger("[src] slips out of your hands and goes off!")) C.dropItemToGround(src, TRUE) if(prob(10)) target = get_turf(user) @@ -163,15 +163,15 @@ target = pick(possible_targets) discharge = 1 if(!discharge) - user.visible_message("[user] fires \the [src]!", \ - "You fire \the [src]!") + user.visible_message(span_danger("[user] fires \the [src]!"), \ + span_danger("You fire \the [src]!")) log_combat(user, target, "fired at", src) var/turf/T = get_target(target, get_turf(src)) playsound(src, fire_sound, 50, 1) 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) @@ -230,17 +230,17 @@ if(removing) if(!tank) return - to_chat(user, "You detach \the [thetank] from \the [src].") + to_chat(user, span_notice("You 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, "You hook \the [thetank] up to \the [src].") + to_chat(user, span_notice("You 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 6eeedcd7c9c7..639eea561421 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, "You tweak \the [src]'s piston valve to [fisto_setting].") + to_chat(user, span_notice("You 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, "You detach \the [thetank] from \the [src].") + to_chat(user, span_notice("You 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, "You hook \the [thetank] up to \the [src].") + to_chat(user, span_notice("You 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/weapons/punch1.ogg', 50, 1) - 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_userdanger("[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/weapons/punch4.ogg', 50, 1) 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_userdanger("[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]!", \ - "You 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_userdanger("You cry out in pain as [user]'s punch flings you backwards!")) new /obj/effect/temp_visual/kinetic_blast(target.loc) playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1) playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1) diff --git a/code/game/objects/items/puzzle_pieces.dm b/code/game/objects/items/puzzle_pieces.dm index f516bded3ed5..e4ad72507765 100644 --- a/code/game/objects/items/puzzle_pieces.dm +++ b/code/game/objects/items/puzzle_pieces.dm @@ -73,14 +73,14 @@ var/obj/item/keycard/key = I if((!puzzle_id || puzzle_id == key.puzzle_id) && density) if(open_message) - to_chat(user, "[open_message]") + to_chat(user, span_notice("[open_message]")) open() return else if(puzzle_id != key.puzzle_id) - to_chat(user, "[src] buzzes. This must not be the right key.") + to_chat(user, span_notice("[src] buzzes. This must not be the right key.")) return else - to_chat(user, "This door doesn't appear to close.") + to_chat(user, span_notice("This door doesn't appear to close.")) return //Door behind Legion megafauna @@ -135,7 +135,7 @@ /obj/item/pressure_plate/hologrid/examine(mob/user) . = ..() if(claimed) - . += "This one appears to be spent already." + . += span_notice("This one appears to be spent already.") /obj/item/pressure_plate/hologrid/trigger() reward = new reward(loc) diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index f447444a1fca..f21381c6438d 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 your hand to inspire nearby allies of this banner's allegiance!" + . += span_notice("Activate it in your 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, "You aren't feeling inspired enough to flourish [src] again yet.") + to_chat(user, span_warning("You aren't feeling inspired enough to flourish [src] again yet.")) return user.visible_message("[user] flourishes [src]!", \ - "You raise [src] skywards, inspiring your allies!") + span_notice("You raise [src] skywards, inspiring your 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, "Your confidence surges as [user] flourishes [user.p_their()] [name]!") + to_chat(H, span_notice("Your confidence surges as [user] flourishes [user.p_their()] [name]!")) inspiration(H) special_inspiration(H) diff --git a/code/game/objects/items/robot/ai_upgrades.dm b/code/game/objects/items/robot/ai_upgrades.dm index 5313c1c6c6c5..ffa8a45f7f30 100644 --- a/code/game/objects/items/robot/ai_upgrades.dm +++ b/code/game/objects/items/robot/ai_upgrades.dm @@ -15,14 +15,14 @@ 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_userdanger("[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, "Your current laws and objectives remain unchanged.") //this unlocks malf powers, but does not give the license to plasma flood + to_chat(AI, span_userdanger("[user] has upgraded you with combat software!")) + to_chat(AI, span_userdanger("Your current laws and objectives remain unchanged.")) //this unlocks malf powers, but does not give the license to plasma flood AI.add_malf_picker() 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, "You upgrade [AI]. [src] is consumed in the process.") + to_chat(user, span_notice("You upgrade [AI]. [src] is consumed in the process.")) qdel(src) @@ -39,9 +39,9 @@ return if(AI.eyeobj) AI.eyeobj.relay_speech = TRUE - to_chat(AI, "[user] has upgraded you with surveillance software!") + to_chat(AI, span_userdanger("[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 your cameras to listen in on conversations.") - to_chat(user, "You upgrade [AI]. [src] is consumed in the process.") + to_chat(user, span_notice("You 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 c52bc0ccaf9c..b3916545cc92 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_userdanger("[user] has prodded you with [src]!")) playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -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!", \ - "You playfully boop [M] on the head!") + user.visible_message(span_notice("[user] playfully boops [M] on the head!"), \ + span_notice("You playfully boop [M] on the head!")) user.do_attack_animation(M, ATTACK_EFFECT_BOOP) playsound(loc, 'sound/weapons/tap.ogg', 50, 1, -1) else if(ishuman(M)) if(!(user.mobility_flags & MOBILITY_STAND)) - user.visible_message("[user] shakes [M] trying to get [M.p_them()] up!", \ - "You 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("You shake [M] trying to get [M.p_them()] up!")) else - user.visible_message("[user] hugs [M] to make [M.p_them()] feel better!", \ - "You 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("You hug [M] to make [M.p_them()] feel better!")) if(M.resting) M.set_resting(FALSE, TRUE) else - user.visible_message("[user] pets [M]!", \ - "You pet [M]!") + user.visible_message(span_notice("[user] pets [M]!"), \ + span_notice("You pet [M]!")) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -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!", \ - "You 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("You 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!", \ - "You bop [M] on the head!") + user.visible_message(span_warning("[user] bops [M] on the head!"), \ + span_warning("You 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...", \ - "You 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("You 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!", \ - "You bop [M] on the head!") + user.visible_message(span_warning("[user] bops [M] on the head!"), \ + span_warning("You bop [M] on the head!")) playsound(loc, 'sound/weapons/tap.ogg', 50, 1, -1) if(2) if(scooldown < world.time) if(M.health >= 0) if(ishuman(M)||ismonkey(M)) M.electrocute_act(5, "[user]", safety = 1) - user.visible_message("[user] electrocutes [M] with [user.p_their()] touch!", \ - "You electrocute [M] with your touch!") + user.visible_message(span_userdanger("[user] electrocutes [M] with [user.p_their()] touch!"), \ + span_danger("You electrocute [M] with your touch!")) M.update_mobility() else if(!iscyborg(M)) M.adjustFireLoss(10) - user.visible_message("[user] shocks [M]!", \ - "You shock [M]!") + user.visible_message(span_userdanger("[user] shocks [M]!"), \ + span_danger("You shock [M]!")) else - user.visible_message("[user] shocks [M]. It does not seem to have an effect", \ - "You shock [M] to no effect.") + user.visible_message(span_userdanger("[user] shocks [M]. It does not seem to have an effect"), \ + span_danger("You shock [M] to no effect.")) playsound(loc, 'sound/effects/sparks2.ogg', 50, 1, -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!", \ - "You crush [M] in your grip!") + user.visible_message(span_userdanger("[user] crushes [M] in [user.p_their()] grip!"), \ + span_danger("You crush [M] in your grip!")) else - user.visible_message("[user] crushes [M]!", \ - "You crush [M]!") + user.visible_message(span_userdanger("[user] crushes [M]!"), \ + span_danger("You crush [M]!")) playsound(loc, 'sound/weapons/smash.ogg', 50, 1, -1) M.adjustBruteLoss(15) user.cell.charge -= 300 @@ -166,7 +166,7 @@ mode = "charge" else mode = "draw" - to_chat(user, "You toggle [src] to \"[mode]\" mode.") + to_chat(user, span_notice("You 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, "You connect to [M]'s power line...") + to_chat(user, span_notice("You 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, "You stop charging yourself.") + to_chat(user, span_notice("You stop charging yourself.")) 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, "You connect to [target]'s power port...") + to_chat(user, span_notice("You 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, "You stop charging yourself.") + to_chat(user, span_notice("You stop charging yourself.")) 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, "You connect to [target]'s power port...") + to_chat(user, span_notice("You 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, "You stop charging [target].") + to_chat(user, span_notice("You stop charging [target].")) /obj/item/harmalarm name = "\improper Sonic Harm Prevention Tool" @@ -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_userdanger("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].", "You dispense a treat into the hands of [A].", "You hear a click.") + user.visible_message(span_notice("[user] dispenses a treat into the hands of [A]."), span_notice("You dispense a treat into the hands of [A]."), span_italics("You hear a click.")) else - user.visible_message("[user] dispenses a treat.", "You dispense a treat.", "You hear a click.") + user.visible_message(span_notice("[user] dispenses a treat."), span_notice("You dispense a treat."), span_italics("You hear a click.")) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) 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/machines/click.ogg', 50, 1) 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/weapons/bulletflyby3.ogg', 50, 1) 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, "You [active? "activate":"deactivate"] [src].") + to_chat(user, span_boldnotice("You [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)) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index edea5c1d7e59..258562971769 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -105,9 +105,9 @@ head.flash2.forceMove(T) head.flash2 = null head = null - to_chat(user, "You disassemble the cyborg shell.") + to_chat(user, span_notice("You disassemble the cyborg shell.")) else - to_chat(user, "There is nothing to remove from the endoskeleton.") + to_chat(user, span_notice("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 @@ -122,7 +122,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_notice("[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) @@ -131,20 +131,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, "You remove [chest.cell] from [src].") + to_chat(user, span_notice("You 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_notice("The power cell slot in [src]'s torso is empty.")) return - to_chat(user, "You [chest.cell ? "replace [src]'s [chest.cell.name] with [temp_cell]" : "insert [temp_cell] into [src]"].") + to_chat(user, span_notice("You [chest.cell ? "replace [src]'s [chest.cell.name] with [temp_cell]" : "insert [temp_cell] into [src]"].")) chest.cell = temp_cell return TRUE @@ -156,13 +156,13 @@ if (M.use(1)) var/obj/item/bot_assembly/ed209/B = new B.forceMove(drop_location()) - to_chat(user, "You arm the robot frame.") + to_chat(user, span_notice("You 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, "You need one sheet of metal to start building ED-209!") + to_chat(user, span_warning("You need one sheet of metal to start building ED-209!")) return else if(istype(W, /obj/item/bodypart/l_leg/robot)) if(l_leg) @@ -216,15 +216,15 @@ chest = CH update_icon() else if(!CH.wired) - to_chat(user, "You need to attach wires to it first!") + to_chat(user, span_warning("You need to attach wires to it first!")) else - to_chat(user, "You need to attach a cell to it first!") + to_chat(user, span_warning("You 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 @@ -236,47 +236,47 @@ head = HD update_icon() else - to_chat(user, "You need to attach a flash to it first!") + to_chat(user, span_warning("You need to attach a flash to it first!")) else if (W.tool_behaviour == TOOL_MULTITOOL) if(check_completion()) ui_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, "You can't put [M] in, the frame has to be standing on the ground to be perfectly precise!") + to_chat(user, span_warning("You 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)) @@ -330,8 +330,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, "You have been robotized!") - to_chat(O, "You must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.") + to_chat(O, span_userdanger("You have been robotized!")) + to_chat(O, span_danger("You 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) @@ -340,19 +340,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, "You cannot install[M], the frame has to be standing on the ground to be perfectly precise!") + to_chat(user, span_warning("You 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)) @@ -381,7 +381,7 @@ O.update_mobility() else if(istype(W, /obj/item/pen)) - to_chat(user, "You need to use a multitool to name [src]!") + to_chat(user, span_warning("You need to use a multitool to name [src]!")) else return ..() @@ -391,7 +391,7 @@ var/obj/item/held_item = user.get_active_held_item() if(held_item?.tool_behaviour == TOOL_MULTITOOL) return ..() - to_chat(user, "You need a multitool to access debug settings!") + to_chat(user, span_warning("You need a multitool to access debug settings!")) return UI_CLOSE /obj/item/robot_suit/ui_state(mob/user) @@ -443,7 +443,7 @@ if(!in_range(src, user) && loc != user) return if(!selected_ai) - to_chat(user, "No active AIs detected.") + to_chat(user, span_alert("No active AIs detected.")) return forced_ai = selected_ai return TRUE diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 607c3a5fd051..9d925e2429d1 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -20,7 +20,7 @@ /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_notice("[src] will not function on a deceased cyborg.")) return FALSE if(module_type && !istype(R.module, module_type)) to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") @@ -61,7 +61,7 @@ /obj/item/borg/upgrade/restart/action(mob/living/silicon/robot/R, user = usr) if(R.health < 0) - to_chat(user, "You have to repair the cyborg before using this module!") + to_chat(user, span_warning("You have to repair the cyborg before using this module!")) return FALSE if(R.mind) @@ -90,8 +90,8 @@ . = ..() if(.) if(R.has_movespeed_modifier("VTEC")) - to_chat(R, "A VTEC unit is already installed!") - to_chat(user, "There's no room for another VTEC unit!") + to_chat(R, span_notice("A VTEC unit is already installed!")) + to_chat(user, span_notice("There's no room for another VTEC unit!")) return FALSE R.add_movespeed_modifier("VTEC", update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING)) @@ -115,11 +115,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_notice("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_notice("A cooling unit is already installed!")) + to_chat(user, span_notice("There's no room for another cooling unit!")) return FALSE T.charge_delay = max(2 , T.charge_delay - 4) @@ -141,7 +141,7 @@ . = ..() if(.) if(R.ionpulse) - to_chat(user, "This unit already has ion thrusters installed!") + to_chat(user, span_notice("This unit already has ion thrusters installed!")) return FALSE R.ionpulse = TRUE @@ -200,7 +200,7 @@ var/obj/item/storage/bag/ore/holding/H = locate() in R.module.modules //yogs start if(H) - to_chat(user, "This unit is already equipped with a satchel of holding.") + to_chat(user, span_warning("This unit is already equipped with a satchel of holding.")) return FALSE H = new /obj/item/storage/bag/ore/holding(R.module) //yogs end @@ -233,7 +233,7 @@ var/obj/item/storage/bag/trash/bluespace/cyborg/B = locate() in R.module.modules //yogs start if(B) - to_chat(user, "This unit is already equipped with a trash bag of holding.") + to_chat(user, span_warning("This unit is already equipped with a trash bag of holding.")) return FALSE B = new /obj/item/storage/bag/trash/bluespace/cyborg(R.module) //yogs end @@ -266,7 +266,7 @@ var/obj/item/mop/advanced/cyborg/A = locate() in R.module.modules //yogs start if(A) - to_chat(user, "This unit is already equipped with a advanced mop module.") + to_chat(user, span_warning("This unit is already equipped with a advanced mop module.")) return FALSE A = new /obj/item/mop/advanced/cyborg(R.module) //yogs end @@ -342,7 +342,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 cyborg = R @@ -372,10 +372,10 @@ /obj/item/borg/upgrade/selfrepair/ui_action_click() on = !on if(on) - to_chat(cyborg, "You activate the self-repair module.") + to_chat(cyborg, span_notice("You activate the self-repair module.")) START_PROCESSING(SSobj, src) else - to_chat(cyborg, "You deactivate the self-repair module.") + to_chat(cyborg, span_notice("You deactivate the self-repair module.")) STOP_PROCESSING(SSobj, src) update_icon() @@ -400,12 +400,12 @@ if(cyborg && (cyborg.stat != DEAD) && on) if(!cyborg.cell) - to_chat(cyborg, "Self-repair module deactivated. Please, insert the power cell.") + to_chat(cyborg, span_warning("Self-repair module deactivated. Please, insert the power cell.")) deactivate_sr() return if(cyborg.cell.charge < powercost * 2) - to_chat(cyborg, "Self-repair module deactivated. Please recharge.") + to_chat(cyborg, span_warning("Self-repair module deactivated. Please recharge.")) deactivate_sr() return @@ -481,7 +481,7 @@ var/found_hypo = FALSE for(var/obj/item/reagent_containers/borghypo/H in R.module.modules) if(H.bypass_protection == TRUE) //yogs start - to_chat(user, "This unit is already equipped with a piercing hypospray module.") + to_chat(user, span_warning("This unit is already equipped with a piercing hypospray module.")) return FALSE //yogs end H.bypass_protection = TRUE @@ -510,7 +510,7 @@ if(.) var/obj/item/twohanded/shockpaddles/cyborg/S = locate() in R.module.modules //yogs start if(S) - to_chat(user, "This unit is already equipped with a defibrillator module.") + to_chat(user, span_warning("This unit is already equipped with a defibrillator module.")) return FALSE S = new(R.module) //yogs end @@ -538,7 +538,7 @@ if(.) var/obj/item/surgical_processor/SP = locate() in R.module.modules //yogs start if(SP) - to_chat(user, "This unit is already equipped with a surgical processor module.") + to_chat(user, span_warning("This unit is already equipped with a surgical processor module.")) return FALSE SP = new(R.module) //yogs end @@ -587,7 +587,7 @@ var/obj/item/retractor/advanced/MP = locate() in R.module.modules var/obj/item/cautery/advanced/ST = locate() in R.module.modules if(LS || MP || ST) - to_chat(user, "This unit is already equipped with an advanced surgical kit.") + to_chat(user, span_warning("This unit is already equipped with an advanced surgical kit.")) return FALSE /// Puts in new surgery tools @@ -665,10 +665,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) @@ -690,7 +690,7 @@ if(.) if(R.expansion_count >= EXPANDER_MAXIMUM_STACK) - to_chat(usr, "This unit has already expanded as much as it can!") + to_chat(usr, span_notice("This unit has already expanded as much as it can!")) return FALSE R.notransform = TRUE @@ -735,7 +735,7 @@ var/obj/item/storage/part_replacer/cyborg/RPED = locate() in R.module.modules 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) @@ -763,7 +763,7 @@ var/obj/item/gun/energy/plasmacutter/adv/cyborg/PC = locate() in R.module.modules if(PC) - to_chat(user, "This unit is already equipped with a plasma cutter module.") + to_chat(user, span_warning("This unit is already equipped with a plasma cutter module.")) return FALSE PC = new(R.module) @@ -791,7 +791,7 @@ var/obj/item/pinpointer/crew/PP = locate() in R.module.modules 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) @@ -829,9 +829,9 @@ /obj/item/borg/upgrade/transform/security/action(mob/living/silicon/robot/R, user = usr) if(CONFIG_GET(flag/disable_secborg)) - to_chat(user, "Nanotrasen policy disallows the use of weapons of mass destruction.") + to_chat(user, span_warning("Nanotrasen policy disallows the use of weapons of mass destruction.")) return FALSE if(is_banned_from(R.ckey, "Security Officer")) - to_chat(user, "Nanotrasen has disallowed this unit from becoming this type of module.") + to_chat(user, span_warning("Nanotrasen has disallowed this unit from becoming this type of module.")) return FALSE return ..() diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm index 9e0fa69c9fd3..85b2de30697f 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.is_sharp()) - to_chat(user, "You can only sharpen items that are already sharp, such as knives!") + to_chat(user, span_warning("You can only sharpen items that are already sharp, such as knives!")) return if(istype(I, /obj/item/melee/transforming/energy)) - to_chat(user, "You don't think \the [I] will be the thing getting modified if you use it on \the [src]!") + to_chat(user, span_warning("You 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]!", "You sharpen [I], making it much more deadly than before.") + user.visible_message(span_notice("[user] sharpens [I] with [src]!"), span_notice("You sharpen [I], making it much more deadly than before.")) playsound(src, 'sound/items/unsheath.ogg', 25, 1) 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 b95e8ba5c556..d132f1d62463 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -38,17 +38,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/effects/shieldbash.ogg', 50, 1) 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_notice("[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, "You repair [src] with [T].") + to_chat(user, span_notice("You repair [src] with [T].")) else return ..() @@ -57,11 +57,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/effects/glassbr3.ogg', 100) @@ -72,7 +72,7 @@ return ..() 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 @@ -198,7 +198,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" @@ -231,7 +231,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, "You beat yourself in the head with [src].") + to_chat(user, span_warning("You beat yourself in the head with [src].")) user.take_bodypart_damage(5) active = !active icon_state = "[base_icon_state][active]" @@ -242,14 +242,14 @@ throw_speed = on_throw_speed w_class = WEIGHT_CLASS_BULKY playsound(user, 'sound/weapons/saberon.ogg', 35, 1) - 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/weapons/saberoff.ogg', 35, 1) - to_chat(user, "[src] can now be concealed.") + to_chat(user, span_notice("[src] can now be concealed.")) add_fingerprint(user) /obj/item/shield/energy/honk_act() @@ -287,12 +287,12 @@ throw_speed = 2 w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK - to_chat(user, "You extend \the [src].") + to_chat(user, span_notice("You extend \the [src].")) else force = 3 throwforce = 3 throw_speed = 3 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 1123a04c92f7..6c2b33c361ba 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -28,7 +28,7 @@ /obj/item/target/welder_act(mob/living/user, obj/item/I) if(I.use_tool(src, user, 0, volume=40)) removeOverlays() - to_chat(user, "You slice off [src]'s uneven chunks of aluminium and scorch marks.") + to_chat(user, span_notice("You slice off [src]'s uneven chunks of aluminium and scorch marks.")) return TRUE /obj/item/target/attack_hand(mob/user) @@ -75,7 +75,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 8f9bf7110358..1a98eead737e 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, "You scribble illegibly on [src]!") + to_chat(user, span_notice("You 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)) diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm index f7c45ae6dbf0..a18313866d15 100644 --- a/code/game/objects/items/singularityhammer.dm +++ b/code/game/objects/items/singularityhammer.dm @@ -89,9 +89,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]!", \ - "You feel a powerful shock course through your body sending you flying!", \ - "You hear a heavy electrical crack!") + target.visible_message(span_danger("[target.name] was shocked by [src]!"), \ + span_userdanger("You feel a powerful shock course through your body sending you flying!"), \ + span_italics("You 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 20abdf97fbd4..05c043b9a2eb 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]!", "You crush [src]!") + user.visible_message(span_warning("[user] crushes [src]!"), span_danger("You crush [src]!")) new /obj/effect/particle_effect/sparks(loc) playsound(loc, "sparks", 50, 1) 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, 1) @@ -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, "You cannot crush the polycrystal in-hand, try breaking one off.") + to_chat(user, span_warning("You 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, "You break the final crystal off.") + to_chat(user, span_notice("You break the final crystal off.")) else - to_chat(user, "You break off a crystal.") + to_chat(user, span_notice("You break off a crystal.")) else ..() diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 646608cfc755..cdd85eb64326 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -34,16 +34,16 @@ if(!patient.can_inject(user, TRUE)) return if(!corpse_healing && patient.stat == DEAD) - to_chat(user, "[patient] is dead! You can not help [patient.p_them()].") + to_chat(user, span_warning("[patient] is dead! You can not help [patient.p_them()].")) return if(patient == user) if(!silent) - user.visible_message("[user] starts to apply \the [src] on [user.p_them()]self...", "You begin applying \the [src] on yourself...") + user.visible_message(span_notice("[user] starts to apply \the [src] on [user.p_them()]self..."), span_notice("You begin applying \the [src] on yourself...")) if(!do_mob(user, patient, self_delay, extra_checks=CALLBACK(patient, /mob/living/proc/can_inject, user, TRUE))) return else if(other_delay) if(!silent) - user.visible_message("[user] starts to apply \the [src] on [patient].", "You begin applying \the [src] on [patient]...") + user.visible_message(span_notice("[user] starts to apply \the [src] on [patient]."), span_notice("You begin applying \the [src] on [patient]...")) if(!do_mob(user, patient, other_delay, extra_checks=CALLBACK(patient, /mob/living/proc/can_inject, user, TRUE))) return @@ -56,40 +56,40 @@ /// In which we print the message that we're starting to heal someone, then we try healing them. Does the do_after whether or not it can actually succeed on a targeted mob /obj/item/stack/medical/proc/heal(mob/living/patient, mob/user) if(patient.stat == DEAD) - to_chat(user, "[patient] is dead! You can not help [patient.p_them()].") + to_chat(user, span_warning("[patient] is dead! You can not help [patient.p_them()].")) return if(isanimal(patient) && heal_brute) // only brute can heal var/mob/living/simple_animal/critter = patient if (!critter.healable) - to_chat(user, "You cannot use [src] on [patient]!") + to_chat(user, span_warning("You cannot use [src] on [patient]!")) return FALSE else if (critter.health == critter.maxHealth) - to_chat(user, "[patient] is at full health.") + to_chat(user, span_notice("[patient] is at full health.")) return FALSE - user.visible_message("[user] applies [src] on [patient].", "You apply [src] on [patient].") + user.visible_message(span_green("[user] applies [src] on [patient]."), span_green("You apply [src] on [patient].")) patient.heal_bodypart_damage((heal_brute * 0.5)) return TRUE if(iscarbon(patient)) return heal_carbon(patient, user, heal_brute, heal_burn) - to_chat(user, "You can't heal [patient] with [src]!") + to_chat(user, span_warning("You can't heal [patient] with [src]!")) /// The healing effects on a carbon patient. Since we have extra details for dealing with bodyparts, we get our own fancy proc. Still returns TRUE on success and FALSE on fail /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 - to_chat(user, "[src] won't work on a robotic limb!") + to_chat(user, span_warning("[src] won't work on a robotic limb!")) return FALSE if(affecting.brute_dam && brute || affecting.burn_dam && burn) - user.visible_message("[user] applies [src] on [C]'s [affecting.name].", "You apply [src] on [C]'s [affecting.name].") + user.visible_message(span_green("[user] applies [src] on [C]'s [affecting.name]."), span_green("You apply [src] on [C]'s [affecting.name].")) var/previous_damage = affecting.get_damage() if(affecting.heal_damage(brute, burn)) C.update_damage_overlays() post_heal_effects(max(previous_damage - affecting.get_damage(), 0), C, user) 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]!")) ///Override this proc for special post heal effects. /obj/item/stack/medical/proc/post_heal_effects(amount_healed, mob/living/carbon/healed_mob, mob/user) @@ -107,7 +107,7 @@ grind_results = list(/datum/reagent/medicine/c2/libital = 10) /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 @@ -126,25 +126,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, "You stop the bleeding of [M]!") + to_chat(user, span_notice("You stop the bleeding of [M]!")) return TRUE - to_chat(user, "You can not use \the [src] on [M]!") + to_chat(user, span_warning("You 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.is_sharp()) if(get_amount() < 2) - to_chat(user, "You need at least two gauzes to do this!") + to_chat(user, span_warning("You 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].", \ - "You cut [src] into pieces of cloth with [I].", \ - "You hear cutting.") + user.visible_message(span_notice("[user] cuts [src] into pieces of cloth with [I]."), \ + span_notice("You cut [src] into pieces of cloth with [I]."), \ + span_hear("You 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 @@ -171,7 +171,7 @@ grind_results = list(/datum/reagent/medicine/c2/lenturi = 10) /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 /* @@ -232,26 +232,26 @@ /obj/item/stack/medical/mesh/try_heal(mob/living/M, mob/user, silent = FALSE) if(!is_open) - to_chat(user, "You need to open [src] first.") + to_chat(user, span_warning("You need to open [src] first.")) return return ..() /obj/item/stack/medical/mesh/AltClick(mob/living/user) if(!is_open) - to_chat(user, "You need to open [src] first.") + to_chat(user, span_warning("You need to open [src] first.")) return return ..() /obj/item/stack/medical/mesh/attack_hand(mob/user) if(!is_open && user.get_inactive_held_item() == src) - to_chat(user, "You need to open [src] first.") + to_chat(user, span_warning("You need to open [src] first.")) return return ..() /obj/item/stack/medical/mesh/attack_self(mob/user) if(!is_open) is_open = TRUE - to_chat(user, "You open the sterile mesh package.") + to_chat(user, span_notice("You open the sterile mesh package.")) update_icon() playsound(src, 'sound/items/poster_ripped.ogg', 20, TRUE) return diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index ef5778354cbe..11153bb63b00 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -33,7 +33,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ matter_amount = 2 /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) @@ -52,14 +52,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, "You need at least two rods to do this!") + to_chat(user, span_warning("You 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].", \ - "You shape [src] into metal with [W].", \ - "You hear welding.") + span_notice("You shape [src] into metal with [W]."), \ + span_italics("You hear welding.")) var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_held_item()==R) @@ -70,9 +70,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, "You must use a single rod!") + to_chat(user, span_warning("You 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 302ced2e8d30..7aedcc8ba612 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 ( \ matter_amount = 4 /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, "You attach wire to the [name].") + to_chat(user, span_notice("You 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,19 +67,19 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ if(QDELETED(src) && replace) user.put_in_hands(RG) else - to_chat(user, "You need one rod and one sheet of glass to make reinforced glass!") + to_chat(user, span_warning("You need one rod and one sheet of glass to make reinforced glass!")) return else if(istype(W, /obj/item/lightreplacer/cyborg)) //yogs start janiborgs can refill lightreplacers with glass now var/obj/item/lightreplacer/cyborg/G = W if(G.uses >= G.max_uses) - to_chat(user, "[W.name] is full.") + to_chat(user, span_warning("[W.name] is full.")) return else if(src.use(1)) G.AddUses(G.increment) - to_chat(user, "You insert a piece of glass into \the [G.name]. You have [G.uses] light\s remaining.") + to_chat(user, span_notice("You insert a piece of glass into \the [G.name]. You have [G.uses] light\s remaining.")) return else - to_chat(user, "You need one sheet of glass to replace lights!") //yogs end + to_chat(user, span_warning("You need one sheet of glass to replace lights!")) //yogs end else return ..() @@ -122,7 +122,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \ if(QDELETED(src) && replace) user.put_in_hands(RG) else - to_chat(user, "You need one rod and one sheet of plasma glass to make reinforced plasma glass!") + to_chat(user, span_warning("You need one rod and one sheet of plasma glass to make reinforced plasma glass!")) return else return ..() @@ -272,7 +272,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) @@ -306,12 +306,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) @@ -330,7 +330,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( if(G.amount >= G.max_amount) continue G.attackby(NG, user) - to_chat(user, "You add the newly-formed glass to the stack. It now contains [NG.amount] sheet\s.") + to_chat(user, span_notice("You add the newly-formed glass to the stack. It now contains [NG.amount] sheet\s.")) qdel(src) return TRUE diff --git a/code/game/objects/items/stacks/sheets/hot_ice.dm b/code/game/objects/items/stacks/sheets/hot_ice.dm index 9705b0558b11..1699c070ec0c 100644 --- a/code/game/objects/items/stacks/sheets/hot_ice.dm +++ b/code/game/objects/items/stacks/sheets/hot_ice.dm @@ -8,5 +8,5 @@ grind_results = list(/datum/reagent/toxin/hot_ice = 25) /obj/item/stack/sheet/hot_ice/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 FIRELOSS//dont you kids know that stuff is toxic? diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index fa5f77181bc5..131db8019f09 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -250,9 +250,9 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ /obj/item/stack/sheet/animalhide/attackby(obj/item/W, mob/user, params) if(W.is_sharp()) playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1) - user.visible_message("[user] starts cutting hair off \the [src].", "You start cutting the hair off \the [src]...", "You hear the sound of a knife rubbing against flesh.") + user.visible_message("[user] starts cutting hair off \the [src].", span_notice("You start cutting the hair off \the [src]..."), span_italics("You hear the sound of a knife rubbing against flesh.")) if(do_after(user, 50, target = src)) - to_chat(user, "You cut the hair from this [src.singular_name].") + to_chat(user, span_notice("You 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 d0a916da3445..c30ac7656d68 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, "You make a light tile.") + to_chat(user, span_notice("You make a light tile.")) L.add_fingerprint(user) use(1) else - to_chat(user, "You need one metal sheet to finish the light tile!") + to_chat(user, span_warning("You 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 d0727a13cedd..553d9d7ec186 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -85,7 +85,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, "You fill the sandbag.") + to_chat(user, span_notice("You 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)) @@ -173,7 +173,7 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \ amount = 50 /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 c240c09f42ab..e2649f628b14 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -149,7 +149,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ return ..() /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 /* @@ -468,7 +468,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ var/atom/droploc = drop_location() if(use(1)) playsound(I, 'sound/items/bikehorn.ogg', 50, 1, -1) - to_chat(user, "You stamp the cardboard! It's a clown box! Honk!") + to_chat(user, span_notice("You stamp the cardboard! It's a clown box! Honk!")) if (amount >= 0) new/obj/item/storage/box/clown(droploc) //bugfix @@ -509,12 +509,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) && !is_reebe(T.z)) || (A && !A.blob_allowed)) - 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 ..() @@ -577,7 +577,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ /obj/item/stack/tile/brass/attack_self(mob/living/user) if(!is_servant_of_ratvar(user)) - to_chat(user, "[src] seems far too fragile and rigid to build with.") //haha that's because it's actually replicant alloy you DUMMY + to_chat(user, span_danger("[src] seems far too fragile and rigid to build with.")) //haha that's because it's actually replicant alloy you DUMMY return ..() @@ -626,7 +626,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ /obj/item/stack/tile/bronze/attack_self(mob/living/user) if(is_servant_of_ratvar(user)) //still lets them build with it, just gives a message - to_chat(user, "Wha... what is this cheap imitation crap? This isn't brass at all!") + to_chat(user, span_danger("Wha... what is this cheap imitation crap? This isn't brass at all!")) ..() /obj/item/stack/tile/bronze/Initialize(mapload, new_amount, merge = TRUE) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 983dcc8bd8ba..c1909584d267 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -33,7 +33,7 @@ /obj/item/stack/grind_requirements() if(is_cyborg) - to_chat(usr, "[src] is electronically synthesized in your chassis and can't be ground up!") + to_chat(usr, span_danger("[src] is electronically synthesized in your chassis and can't be ground up!")) return return TRUE @@ -95,7 +95,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) @@ -186,7 +186,7 @@ if(!building_checks(R, multiplier)) return if (R.time) - usr.visible_message("[usr] starts building \a [R.title].", "You start building \a [R.title]...") + usr.visible_message(span_notice("[usr] starts building \a [R.title]."), span_notice("You start building \a [R.title]...")) if (!do_after(usr, R.time, target = usr)) return if(!building_checks(R, multiplier)) @@ -236,22 +236,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, "You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!") + to_chat(usr, span_warning("You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!")) else - to_chat(usr, "You haven't got enough [src] to build \the [R.title]!") + to_chat(usr, span_warning("You 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)) @@ -263,7 +263,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) @@ -272,11 +272,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 @@ -298,11 +298,11 @@ if(get_amount() < amount) if(singular_name) if(amount > 1) - to_chat(user, "You need at least [amount] [singular_name]\s to do this!") + to_chat(user, span_warning("You need at least [amount] [singular_name]\s to do this!")) else - to_chat(user, "You need at least [amount] [singular_name] to do this!") + to_chat(user, span_warning("You need at least [amount] [singular_name] to do this!")) else - to_chat(user, "You need at least [amount] to do this!") + to_chat(user, span_warning("You need at least [amount] to do this!")) return FALSE @@ -378,7 +378,7 @@ return else change_stack(user, stackmaterial) - to_chat(user, "You take [stackmaterial] sheets out of the stack.") + to_chat(user, span_notice("You take [stackmaterial] sheets out of the stack.")) /obj/item/stack/proc/change_stack(mob/user, amount) if(!use(amount, TRUE, FALSE)) @@ -397,7 +397,7 @@ if(istype(W, merge_type)) var/obj/item/stack/S = W if(merge(S)) - to_chat(user, "Your [S.name] stack now contains [S.get_amount()] [S.singular_name]\s.") + to_chat(user, span_notice("Your [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 0ee7d6781ce6..e299ad73e175 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -16,7 +16,7 @@ if(hidden_uplink) hidden_uplink.telecrystals += amount use(amount) - to_chat(user, "You press [src] onto yourself and charge your hidden uplink.") + to_chat(user, span_notice("You press [src] onto yourself and charge your hidden uplink.")) else return ..() @@ -25,11 +25,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, "You slot [src] into [cart]. The next time it's used, it will also give telecrystals.") + to_chat(user, span_notice("You 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 39cad9cdde25..3f1d3836d09b 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, "You need at least four tiles to do this!") + to_chat(user, span_warning("You need at least four tiles to do this!")) return if(!mineralType) - to_chat(user, "You can not reform this!") + to_chat(user, span_warning("You 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!", \ - "You set the plasma tiles on fire!") + user.visible_message(span_warning("[user.name] sets the plasma tiles on fire!"), \ + span_warning("You 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.", \ - "You shaped [src] into metal with the welding tool.", \ - "You hear welding.") + user.visible_message(span_notice("[user.name] shaped [src] into metal with the welding tool."), \ + span_notice("You shaped [src] into metal with the welding tool."), \ + span_hear("You 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.", \ - "You shaped [src] into a sheet with the welding tool.", \ - "You hear welding.") + user.visible_message(span_notice("[user.name] shaped [src] into a sheet with the welding tool."), \ + span_notice("You shaped [src] into a sheet with the welding tool."), \ + span_hear("You 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 4e5248ac4457..b760e86e177c 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, "You need more paper!") + to_chat(user, span_warning("You 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, "You can't wrap this!") + to_chat(user, span_warning("You 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, "You need more paper!") + to_chat(user, span_warning("You 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 1eba5f151397..8f1030639ab8 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -62,7 +62,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) @@ -91,7 +91,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 8fa064c68695..931ce9c57d6d 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/items/eatfood.ogg', 50, 1, -1) return (TOXLOSS) @@ -77,7 +77,7 @@ J.mybag=src J.update_icon() else - to_chat(user, "You are unable to fit your [name] into the [J.name].") + to_chat(user, span_warning("You are unable to fit your [name] into the [J.name].")) return /obj/item/storage/bag/trash/bluespace @@ -153,17 +153,17 @@ show_message = TRUE else if(!spam_protection) - to_chat(user, "Your [name] is full and can't hold any more!") + to_chat(user, span_warning("Your [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].", \ - "You offload the ores beneath you into your [box].") + user.visible_message(span_notice("[user] offloads the ores beneath [user.p_them()] into [box]."), \ + span_notice("You offload the ores beneath you into your [box].")) else - user.visible_message("[user] scoops up the ores beneath [user.p_them()].", \ - "You scoop up the ores beneath you with your [name].") + user.visible_message(span_notice("[user] scoops up the ores beneath [user.p_them()]."), \ + span_notice("You scoop up the ores beneath you with your [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 778163acfb7c..7477c3d954c0 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -12,7 +12,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() @@ -676,14 +676,14 @@ /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].", "You take [I] out of [src].") + user.visible_message("[user] takes [I] out of [src].", span_notice("You take [I] out of [src].")) user.put_in_hands(I) update_icon() else diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index 0ce3789dacc5..5098842db48f 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", "Avesta")) //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) @@ -101,7 +101,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 @@ -112,8 +112,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, 1, -1) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "blessing", /datum/mood_event/blessing) return 1 @@ -121,11 +121,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, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return if (HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) - to_chat(user, "[src] slips out of your hand and hits your head.") + to_chat(user, span_danger("[src] slips out of your hand and hits your head.")) user.take_bodypart_damage(10) user.Unconscious(400) return @@ -135,7 +135,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", chaplain = 1 if(!chaplain) - to_chat(user, "The book sizzles in your hands.") + to_chat(user, span_danger("The book sizzles in your hands.")) user.take_bodypart_damage(0,10) return @@ -146,7 +146,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", if (M.stat != DEAD) if(chaplain && user == M) - to_chat(user, "You can't heal yourself!") + to_chat(user, span_warning("You can't heal yourself!")) return if(prob(60) && bless(M, user)) @@ -155,16 +155,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, "You feel dumber.") + to_chat(C, span_danger("You 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_userdanger("[user] beats [M] over the head with [src]!")) playsound(src.loc, "punch", 25, 1, -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, 1, -1) /obj/item/storage/book/bible/afterattack(atom/A, mob/user, proximity) @@ -172,30 +172,30 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", if(!proximity) return if(isfloorturf(A)) - to_chat(user, "You hit the floor with the bible.") + to_chat(user, span_notice("You hit the floor with the bible.")) if(user.mind && (user.mind.holy_role)) for(var/obj/effect/rune/R in orange(2,user)) R.invisibility = 0 if(user?.mind?.holy_role) if(A.reagents && A.reagents.has_reagent(/datum/reagent/water)) // blesses all the water in the holder - to_chat(user, "You bless [A].") + to_chat(user, span_notice("You 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, "You purify [A].") + to_chat(user, span_notice("You 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, "You purify [A], conforming it to your belief.") + to_chat(user, span_notice("You purify [A], conforming it to your 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, "You begin to exorcise [sword].") + to_chat(user, span_notice("You begin to exorcise [sword].")) playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,1) if(do_after(user, 40, target = sword)) playsound(src,'sound/effects/pray_chaplain.ogg',60,1) @@ -208,14 +208,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, "You begin to exorcise [SS].") + to_chat(user, span_notice("You begin to exorcise [SS].")) playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,1) if(do_after(user, 40, target = SS)) playsound(src,'sound/effects/pray_chaplain.ogg',60,1) @@ -228,21 +228,21 @@ 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]!")) else if(istype(A, /obj/item/nullrod/scythe/talking)) var/obj/item/nullrod/scythe/talking/sword = A - to_chat(user, "You begin to exorcise [sword]...") + to_chat(user, span_notice("You begin to exorcise [sword]...")) playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,TRUE) if(do_after(user, 4 SECONDS, target = sword)) playsound(src,'sound/effects/pray_chaplain.ogg',60,TRUE) for(var/mob/living/simple_animal/shade/S in sword.contents) - to_chat(S, "You were destroyed by the exorcism!") + to_chat(S, span_userdanger("You were destroyed by the exorcism!")) qdel(S) sword.possessed = FALSE //allows the chaplain (or someone else) to reroll a new spirit for their sword sword.name = initial(sword.name) REMOVE_TRAIT(sword, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT) //in case the "sword" is a possessed dummy - user.visible_message("[user] has exorcised [sword]!", \ - "You successfully exorcise [sword]!") + user.visible_message(span_notice("[user] has exorcised [sword]!"), \ + span_notice("You successfully exorcise [sword]!")) /obj/item/storage/book/bible/booze @@ -268,12 +268,12 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", if (!used) H.mind.holy_role = HOLY_ROLE_PRIEST used = TRUE - to_chat(H, "You try to open the book AND IT BITES YOU!") + to_chat(H, span_userdanger("You try to open the book AND IT BITES YOU!")) playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) H.apply_damage(5, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) - to_chat(H, "Your name appears on the inside cover, in blood.") + to_chat(H, span_notice("Your 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.a_intent == INTENT_HELP) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index bbc847cdf3a9..5970ec6d1d3c 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -39,12 +39,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,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -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() @@ -59,12 +59,12 @@ if(!foldable) return if(contents.len) - to_chat(user, "You can't fold this box with items still inside!") + to_chat(user, span_warning("You can't fold this box with items still inside!")) return if(!ispath(foldable)) return - to_chat(user, "You fold [src] flat.") + to_chat(user, span_notice("You fold [src] flat.")) var/obj/item/I = new foldable qdel(src) user.put_in_hands(I) @@ -613,7 +613,7 @@ /obj/item/storage/box/mousetraps name = "box of Pest-B-Gon mousetraps" - desc = "Keep out of reach of children." + desc = span_alert("Keep out of reach of children.") illustration = "mousetrap" /obj/item/storage/box/mousetraps/PopulateContents() @@ -741,14 +741,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, 1, -5) - user.visible_message("[user] hugs \the [src].","You hug \the [src].") + user.visible_message(span_notice("[user] hugs \the [src]."),span_notice("You hug \the [src].")) /////clown box & honkbot assembly /obj/item/storage/box/clown @@ -759,12 +759,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, "You need to empty [src] out first!") + to_chat(user, span_warning("You need to empty [src] out first!")) return if(!user.temporarilyRemoveItemFromInventory(I)) return qdel(I) - to_chat(user, "You add some wheels to the [src]! You've got a honkbot assembly now! Honk!") + to_chat(user, span_notice("You 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) @@ -860,17 +860,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, "You can't modify [src] with items still inside!") + to_chat(user, span_warning("You 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 designs if(get_dist(usr, src) > 1) - to_chat(usr, "You have moved too far away!") + to_chat(usr, span_warning("You have moved too far away!")) return var/choice = designs.Find(switchDesign) if(design == designs[choice] || designs[choice] == "Cancel") return 0 - to_chat(usr, "You make some modifications to [src] using your pen.") + to_chat(usr, span_notice("You make some modifications to [src] using your pen.")) design = designs[choice] icon_state = "paperbag_[design]" item_state = "paperbag_[design]" @@ -889,12 +889,12 @@ else if(W.is_sharp()) if(!contents.len) if(item_state == "paperbag_None") - user.show_message("You cut eyeholes into [src].", MSG_VISUAL) + user.show_message(span_notice("You 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("You cut eyeholes into [src] and modify the design.", MSG_VISUAL) + user.show_message(span_notice("You 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 ee84a1011e90..cb5c58cb8d98 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -147,7 +147,7 @@ /obj/item/storage/box/fancy/cigarettes/examine(mob/user) . = ..() - . += "Alt-click to extract contents." + . += span_notice("Alt-click to extract contents.") /obj/item/storage/box/fancy/cigarettes/AltClick(mob/living/carbon/user) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) @@ -157,9 +157,9 @@ SEND_SIGNAL(src, COMSIG_TRY_STORAGE_TAKE, W, user) user.put_in_hands(W) contents -= W - to_chat(user, "You take \a [W] out of the pack.") + to_chat(user, span_notice("You 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/box/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, "You take \a [W] out of the pack.") + to_chat(user, span_notice("You 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/box/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 4be4e3a855ee..e48333ba738b 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -23,7 +23,7 @@ desc = "A first aid kit with the ability to heal common types of injuries." /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() @@ -132,7 +132,7 @@ item_state = "firstaid-ointment" /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) @@ -156,7 +156,7 @@ item_state = "firstaid-toxin" /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) @@ -179,7 +179,7 @@ item_state = "firstaid-o2" /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/PopulateContents() @@ -198,7 +198,7 @@ item_state = "firstaid-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/PopulateContents() @@ -257,7 +257,7 @@ //Making a medibot! if(contents.len >= 1) - to_chat(user, "You need to empty [src] out first!") + to_chat(user, span_warning("You need to empty [src] out first!")) return var/obj/item/bot_assembly/medbot/A = new @@ -270,7 +270,7 @@ else if(istype(src, /obj/item/storage/firstaid/brute)) A.skin = "brute" user.put_in_hands(A) - to_chat(user, "You add [S] to [src].") + to_chat(user, span_notice("You add [S] to [src].")) A.robot_arm = S.type A.firstaid = type qdel(S) @@ -298,7 +298,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/charcoal diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 6a831ca06147..4322acebaafd 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -28,26 +28,26 @@ if(!locked) return ..() else - to_chat(user, "It's locked!") + to_chat(user, span_danger("It's locked!")) /obj/item/storage/lockbox/proc/togglelock(mob/living/user, silent) var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED) 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, "You lock the [src.name]!") + to_chat(user, span_danger("You lock the [src.name]!")) SEND_SIGNAL(src, COMSIG_TRY_STORAGE_HIDE_ALL) else icon_state = icon_closed - to_chat(user, "You unlock the [src.name]!") + to_chat(user, span_danger("You unlock the [src.name]!")) return else - to_chat(user, "Access Denied.") + to_chat(user, span_danger("Access Denied.")) return /obj/item/storage/lockbox/emag_act(mob/user) @@ -57,7 +57,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() @@ -117,7 +117,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 ce91e6a70fbc..3100130fc0e8 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -39,16 +39,16 @@ if (W.tool_behaviour == TOOL_SCREWDRIVER) if (W.use_tool(src, user, 20)) open =! open - to_chat(user, "You [open ? "open" : "close"] the service panel.") + to_chat(user, span_notice("You [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.") 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 diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index d8834722d25a..486ba131a58a 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -35,7 +35,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 @@ -292,7 +292,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 @@ -310,8 +310,8 @@ B.toolbox_color = "s" user.put_in_hands(B) B.update_icon() - to_chat(user, "You add the tiles into the empty [name]. They protrude from the top.") + to_chat(user, span_notice("You add the tiles into the empty [name]. They protrude from the top.")) qdel(src) else - to_chat(user, "You need 10 floor tiles to start building a floorbot!") + to_chat(user, span_warning("You need 10 floor tiles to start building a floorbot!")) return diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index c3686db75b4f..5c8f03e68cfb 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -231,12 +231,12 @@ /obj/item/stand_arrow/boss/attack_self(mob/user) if(owner || !user.mind) return - to_chat(user, "You prick your finger on the arrow, linking the mindslave nanites to you!") + to_chat(user, span_notice("You prick your finger on the arrow, linking the mindslave nanites to you!")) owner = user.mind /obj/item/stand_arrow/boss/attack(mob/living/M, mob/living/user) if(owner && owner.current == M && user == M) //you have a holoparasite injector for this exact purpose - to_chat(M, "Implanting yourself with mindslave nanites is probably a bad idea...") + to_chat(M, span_warning("Implanting yourself with mindslave nanites is probably a bad idea...")) return . = ..() diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 34c1469ecc73..70e485cf2808 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -28,7 +28,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() @@ -81,23 +81,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_notice("[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, "You install a cell in [src].") + to_chat(user, span_notice("You install a cell in [src].")) update_icon() else if(W.tool_behaviour == TOOL_SCREWDRIVER) @@ -105,7 +105,7 @@ cell.update_icon() cell.forceMove(get_turf(src)) cell = null - to_chat(user, "You remove the cell from [src].") + to_chat(user, span_notice("You remove the cell from [src].")) status = 0 update_icon() STOP_PROCESSING(SSobj, src) // no cell, no charge; stop processing for on because it cant be on @@ -115,7 +115,7 @@ /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, 1, -1) cell_last_used = 0 if(status) @@ -125,21 +125,21 @@ 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]!", \ - "You accidentally hit yourself with [src]!") + user.visible_message(span_danger("[user] accidentally hits [user.p_them()]self with [src]!"), \ + span_userdanger("You accidentally hit yourself with [src]!")) user.Paralyze(stunforce*3) deductcharge(hitcost) return if(HAS_TRAIT(user, TRAIT_NO_STUN_WEAPONS)) - to_chat(user, "You can't seem to remember how this works!") + to_chat(user, span_warning("You can't seem to remember how this works!")) return //yogs edit begin --------------------------------- if(status && ishuman(M)) @@ -147,7 +147,7 @@ var/obj/item/organ/stomach/ethereal/stomach = H.getorganslot(ORGAN_SLOT_STOMACH) if(istype(stomach)) stomach.adjust_charge(20) - to_chat(M,"You get charged by [src].") + to_chat(M,span_notice("You get charged by [src].")) //yogs edit end ---------------------------------- if(iscyborg(M)) ..() @@ -168,10 +168,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) @@ -205,8 +205,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_userdanger("[user] has stunned you with [src]!")) log_combat(user, L, "stunned") playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1) @@ -223,7 +223,7 @@ /obj/item/melee/baton/proc/apply_stun_effect_end(mob/living/target) var/trait_check = HAS_TRAIT(target, TRAIT_STUNRESISTANCE) //var since we check it in out to_chat as well as determine stun duration if(!target.IsParalyzed()) - to_chat(target, "You muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]") + to_chat(target, span_warning("You muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]")) if(trait_check) target.Paralyze(stunforce * 0.1) else diff --git a/code/game/objects/items/supermatter_delaminator.dm b/code/game/objects/items/supermatter_delaminator.dm index 3361e77a3583..b667e6b28608 100644 --- a/code/game/objects/items/supermatter_delaminator.dm +++ b/code/game/objects/items/supermatter_delaminator.dm @@ -35,16 +35,16 @@ if(istype(W, /obj/item/hemostat/antinoblium)) var/obj/item/hemostat/antinoblium/tongs = W if (tongs.shard) - to_chat(user, "\The [tongs] is already holding an antinoblium shard!") + to_chat(user, span_notice("\The [tongs] is already holding an antinoblium shard!")) return FALSE forceMove(tongs) tongs.shard = src tongs.update_icon() - to_chat(user, "You carefully pick up [src] with [tongs].") + to_chat(user, span_notice("You carefully pick up [src] with [tongs].")) else if(istype(W, /obj/item/antinoblium_container/)) // 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/effects/supermatter.ogg', 50, 1) qdel(W) @@ -55,9 +55,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!",\ - "You 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_userdanger("You reach for [src] with your hands. That was dumb."),\ + span_italics("Everything suddenly goes silent.")) radiation_pulse(user, 500, 2) playsound(get_turf(user), 'sound/effects/supermatter.ogg', 50, 1) ded.dust() @@ -86,7 +86,7 @@ T.shard = null T.update_icon() update_icon() - to_chat(user, "Container is resealing...") + to_chat(user, span_warning("Container is resealing...")) addtimer(CALLBACK(src, .proc/seal), 50) return TRUE @@ -98,7 +98,7 @@ shard = null T.update_icon() update_icon() - visible_message("[user] gingerly takes out the antinoblium shard with the tongs...") + visible_message(span_warning("[user] gingerly takes out the antinoblium shard with the tongs...")) return TRUE /obj/item/antinoblium_container/proc/seal() @@ -133,10 +133,10 @@ return if(sealed) unseal() - to_chat(user, "[user] opens the [src] revealing the [shard] contained inside!") + to_chat(user, span_warning("[user] opens the [src] revealing the [shard] contained inside!")) else seal() - to_chat(user, "[user] seals the [src].") + to_chat(user, span_warning("[user] seals the [src].")) /obj/item/antinoblium_container/update_icon() if(sealed) @@ -176,7 +176,7 @@ /obj/item/hemostat/antinoblium/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) // no instakill supermatter javelins if(shard) shard.forceMove(loc) - visible_message("\The [shard] falls out of \the [src] as it hits the ground.") + visible_message(span_notice("\The [shard] falls out of \the [src] as it hits the ground.")) shard = null update_icon() ..() @@ -193,9 +193,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...",\ - "You touch [AM] with [src], and everything suddenly goes silent.\n[AM] and [shard] 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_userdanger("You touch [AM] with [src], and everything suddenly goes silent.\n[AM] and [shard] flash into dust, and soon as you can register this, you do as well."),\ + span_italics("Everything suddenly goes silent.")) message_admins("[src] has consumed [key_name_admin(user)] [ADMIN_JMP(src)].") investigate_log("has consumed [key_name(user)].", "supermatter") user.dust() diff --git a/code/game/objects/items/syndicateReverseCard.dm b/code/game/objects/items/syndicateReverseCard.dm index 8574ac29ad66..1ef39409297c 100644 --- a/code/game/objects/items/syndicateReverseCard.dm +++ b/code/game/objects/items/syndicateReverseCard.dm @@ -41,7 +41,7 @@ p.start() //next, we move the gun to the user and the card to the firer to_chat(user, "The [src] vanishes from your hands, and [target_gun] appears in them!") - to_chat(firer, "[target_gun] vanishes from your hands, and a [src] appears in them!") + to_chat(firer, span_warning("[target_gun] vanishes from your hands, and a [src] appears in them!")) user.put_in_hands(target_gun) firer.put_in_hands(src) used = TRUE @@ -50,8 +50,8 @@ /obj/item/syndicateReverseCard/examine(mob/user) . = ..() if(is_special_character(user)) - . += "Hold this in your hand when you are getting shot at to steal your opponent's gun. You'll lose this, so be careful!" + . += span_info("Hold this in your hand when you are getting shot at to steal your opponent's gun. You'll lose this, so be careful!") return if(used) - . += "Something sinister is strapped to this card. It looks like it was once masked with some sort of cloaking field, which is now nonfunctional." + . += span_warning("Something sinister is strapped to this card. It looks like it was once masked with some sort of cloaking field, which is now nonfunctional.") return diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 903890f3757d..67a96f94365b 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -31,7 +31,7 @@ else if(istype(action, /datum/action/item_action/jetpack_stabilization)) if(on) stabilizers = !stabilizers - to_chat(user, "You turn the jetpack stabilization [stabilizers ? "on" : "off"].") + to_chat(user, span_notice("You turn the jetpack stabilization [stabilizers ? "on" : "off"].")) else toggle_internals(user) @@ -42,10 +42,10 @@ if(!on) turn_on(user) - to_chat(user, "You turn the jetpack on.") + to_chat(user, span_notice("You turn the jetpack on.")) else turn_off(user) - to_chat(user, "You turn the jetpack off.") + to_chat(user, span_notice("You turn the jetpack off.")) for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() @@ -100,7 +100,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 ..() @@ -121,7 +121,7 @@ turn_off(user) return if(rand(0,250) == 0) - to_chat(user, "You feel your jetpack's engines cut out.") + to_chat(user, span_notice("You feel your jetpack's engines cut out.")) turn_off(user) return @@ -209,12 +209,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, "You need a tank in your suit storage!") + to_chat(user, span_warning("You 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 31c31f188b53..5fc721672953 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, "You close [src] valve.") + to_chat(H, span_notice("You 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, "You need a mask!") + to_chat(H, span_warning("You 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, "You switch your internals to [src].") + to_chat(H, span_notice("You switch your internals to [src].")) else - to_chat(H, "You open [src] valve.") + to_chat(H, span_notice("You 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 gauge reads [round(air_contents.total_moles(), 0.01)] mol at [round(src.air_contents.return_pressure(),0.01)] kPa." //yogs can read mols + . += span_notice("The gauge reads [round(air_contents.total_moles(), 0.01)] mol at [round(src.air_contents.return_pressure(),0.01)] kPa.") //yogs can read mols var/celsius_temperature = src.air_contents.return_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) @@ -126,7 +126,7 @@ /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/effects/spray.ogg', 10, 1, -3) if (!QDELETED(H) && air_contents && air_contents.return_pressure() >= 1000) for(var/obj/item/W in H) diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index 76e00b98b661..3c6014c8a421 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -32,7 +32,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 @@ -42,7 +42,7 @@ if(noz in src) //Detach the nozzle into the user's hands if(!user.put_in_hands(noz)) - to_chat(user, "You need a free hand to hold the mister!") + to_chat(user, span_warning("You need a free hand to hold the mister!")) return else //Remove from their hands and put back "into" the tank @@ -130,7 +130,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 ..() @@ -167,7 +167,7 @@ /obj/item/reagent_containers/spray/mister/janitor/attack_self(var/mob/user) amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) - to_chat(user, "You [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("You [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 @@ -230,7 +230,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 ..() @@ -265,10 +265,10 @@ return //Safety check so you don't blast yourself trying to refill your tank var/datum/reagents/R = reagents if(R.total_volume < 100) - to_chat(user, "You need at least 100 units of water to use the resin launcher!") + to_chat(user, span_warning("You 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) @@ -288,7 +288,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)) @@ -297,7 +297,7 @@ spawn(100) metal_synthesis_cooldown-- 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/effect/resin_container @@ -351,7 +351,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() @@ -399,13 +399,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/teleportation.dm b/code/game/objects/items/teleportation.dm index e8df223bab80..cc2eee18e794 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -148,7 +148,7 @@ /obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user) if(is_parent_of_portal(target)) qdel(target) - to_chat(user, "You dispel [target] with \the [src]!") + to_chat(user, span_notice("You dispel [target] with \the [src]!")) return TRUE return FALSE @@ -160,7 +160,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) @@ -188,19 +188,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 @@ -226,14 +226,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 9d6495b9ddf6..0a066ed42930 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]!", \ - "You accidentally hit yourself with [src]!") + user.visible_message(span_danger("[user] accidentally hits [user.p_them()]self with [src]!"), \ + span_userdanger("You accidentally hit yourself 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, "You place the bluespace crystal firmly into the igniter.") + to_chat(user, span_notice("You place the bluespace crystal firmly into the igniter.")) else - user.visible_message("You can't put the crystal onto the stunprod while it has a power cell installed!") + user.visible_message(span_warning("You 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 5b9ee43555fd..68032ec5a425 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" - say("Container is sealing...") + say(span_warning("Container is sealing...")) addtimer(CALLBACK(src, .proc/seal), 50) return TRUE @@ -69,12 +69,12 @@ STOP_PROCESSING(SSobj, core) icon_state = "core_container_sealed" playsound(src, 'sound/items/deconstruct.ogg', 60, 1) - say("[src] is permanently sealed, [core]'s radiation is contained.") + say(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) @@ -133,16 +133,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_notice("\The [tongs] is already holding a supermatter sliver!")) return FALSE forceMove(tongs) tongs.sliver = src tongs.update_icon() - to_chat(user, "You carefully pick up [src] with [tongs].") + to_chat(user, span_notice("You 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/effects/supermatter.ogg', 50, 1) qdel(W) @@ -153,9 +153,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!",\ - "You 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_userdanger("You reach for [src] with your hands. That was dumb."),\ + span_italics("Everything suddenly goes silent.")) radiation_pulse(user, 500, 2) playsound(get_turf(user), 'sound/effects/supermatter.ogg', 50, 1) ded.dust() @@ -177,7 +177,7 @@ T.sliver = null T.icon_state = "supermatter_tongs" icon_state = "core_container_loaded" - say("Container is sealing...") + say(span_warning("Container is sealing...")) addtimer(CALLBACK(src, .proc/seal), 50) return TRUE @@ -186,7 +186,7 @@ STOP_PROCESSING(SSobj, sliver) icon_state = "core_container_sealed" playsound(src, 'sound/items/Deconstruct.ogg', 60, 1) - say("[src] is permanently sealed, [sliver] is safely contained.") + say(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)) @@ -238,7 +238,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...",\ - "You 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_userdanger("You 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_italics("Everything suddenly goes silent.")) user.dust() radiation_pulse(src, 500, 2) playsound(src, 'sound/effects/supermatter.ogg', 50, 1) diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 459081c2c396..9f5396a3b90e 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -19,7 +19,7 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30) /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/weapons/genhit.ogg', 50, 1, -1) return (BRUTELOSS) diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index 03899e4a9547..83dcfcfce34f 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -32,7 +32,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() @@ -76,7 +76,7 @@ if(user.zone_selected != BODY_ZONE_PRECISE_EYES && user.zone_selected != BODY_ZONE_HEAD) return ..() if(HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "You don't want to harm [M]!") + to_chat(user, span_warning("You don't want to harm [M]!")) return if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) M = user diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 248d6589ff12..0d5c959f0857 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -82,7 +82,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) @@ -110,8 +110,8 @@ if(affecting && affecting.status == BODYPART_ROBOTIC && user.a_intent != 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].", - "You 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("You 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) @@ -125,7 +125,7 @@ return if(!status && O.is_refillable()) reagents.trans_to(O, reagents.total_volume, transfered_by = user) - to_chat(user, "You empty [src]'s fuel tank into [O].") + to_chat(user, span_notice("You empty [src]'s fuel tank into [O].")) update_icon() if(isOn()) use(1) @@ -188,12 +188,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, "You switch [src] on.") + to_chat(user, span_notice("You switch [src] on.")) playsound(loc, acti_sound, 50, 1) force = 15 damtype = "fire" @@ -201,10 +201,10 @@ update_icon() START_PROCESSING(SSobj, src) else - to_chat(user, "You need more fuel!") + to_chat(user, span_warning("You need more fuel!")) switched_off(user) else - to_chat(user, "You switch [src] off.") + to_chat(user, span_notice("You switch [src] off.")) playsound(loc, deac_sound, 50, 1) switched_off(user) @@ -249,26 +249,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, "You need more welding fuel to complete this task!") + to_chat(user, span_warning("You 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, "You resecure [src] and close the fuel tank.") + to_chat(user, span_notice("You 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) @@ -281,14 +281,14 @@ user.transferItemToLoc(src, F, TRUE) F.weldtool = src add_fingerprint(user) - to_chat(user, "You add a rod to a welder, starting to build a flamethrower.") + to_chat(user, span_notice("You add a rod to a welder, starting to build a flamethrower.")) user.put_in_hands(F) else - to_chat(user, "You need one rod to start building a flamethrower!") + to_chat(user, span_warning("You 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 ef5b99f850b1..537a1550cb5d 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -50,19 +50,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, "You attempt to remove the durathread strand from around your neck.") + to_chat(C, span_notice("You attempt to remove the durathread strand from around your neck.")) if(do_after(user, 15, null, C)) - to_chat(C, "You succesfuly remove the durathread strand.") + to_chat(C, span_notice("You 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, 1, -1) return (BRUTELOSS) diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index 9654f7aced12..0d62e9b3235c 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -19,7 +19,7 @@ armor = list("melee" = 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/weapons/genhit.ogg', 50, 1, -1) return (BRUTELOSS) @@ -53,7 +53,7 @@ attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked") /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!")) // TODO Make them glow with the power of the M E D I C A L W R E N C H // during their ascension diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index b685b73621fb..9ab911df7071 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -58,12 +58,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, "You fill the balloon with the contents of [A].") + to_chat(user, span_notice("You fill the balloon with the contents of [A].")) desc = "A translucent balloon with some form of liquid sloshing around in it." update_icon() @@ -71,12 +71,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 = "A translucent balloon with some form of liquid sloshing around in it." - to_chat(user, "You fill the balloon with the contents of [I].") + to_chat(user, span_notice("You fill the balloon with the contents of [I].")) I.reagents.trans_to(src, 10, transfered_by = user) update_icon() else if(I.is_sharp()) @@ -95,7 +95,7 @@ T = get_turf(AT) else T = get_turf(src) - T.visible_message("[src] bursts!","You hear a pop and a splash.") + T.visible_message(span_danger("[src] bursts!"),span_italics("You hear a pop and a splash.")) reagents.reaction(T) for(var/atom/A in T) reagents.reaction(A) @@ -192,17 +192,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("You reload [] cap\s.", A.amount_left)) + to_chat(user, span_notice("You reload [A.amount_left] cap\s.")) A.amount_left = 0 else - to_chat(user, text("You reload [] cap\s.", 7 - src.bullets)) + to_chat(user, span_notice("You reload [7 - src.bullets] cap\s.")) A.amount_left -= 7 - src.bullets src.bullets = 7 A.update_icon() @@ -215,18 +215,18 @@ if (flag) return if (!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You 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/weapons/gun_dry_fire.ogg', 30, TRUE) return playsound(user, 'sound/weapons/gunshot.ogg', 100, 1) src.bullets-- - user.visible_message("[user] fires [src] at [target]!", \ - "You fire [src] at [target]!", \ - "You hear a gunshot!") + user.visible_message(span_danger("[user] fires [src] at [target]!"), \ + span_danger("You fire [src] at [target]!"), \ + span_italics("You hear a gunshot!")) /obj/item/toy/ammo/gun name = "capgun ammo" @@ -263,7 +263,7 @@ /obj/item/toy/sword/attack_self(mob/user) active = !( active ) if (active) - to_chat(user, "You extend the plastic blade with a quick flick of your wrist.") + to_chat(user, span_notice("You extend the plastic blade with a quick flick of your wrist.")) playsound(user, 'sound/weapons/saberon.ogg', 20, 1) if(hacked) icon_state = "swordrainbow" @@ -273,7 +273,7 @@ item_state = "swordblue" w_class = WEIGHT_CLASS_BULKY else - to_chat(user, "You push the plastic blade back down into the handle.") + to_chat(user, span_notice("You push the plastic blade back down into the handle.")) playsound(user, 'sound/weapons/saberoff.ogg', 20, 1) icon_state = "sword0" item_state = "sword0" @@ -284,10 +284,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, "You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.") + to_chat(user, span_notice("You 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 @@ -298,13 +298,13 @@ if(!hacked) hacked = TRUE item_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 ..() @@ -337,7 +337,7 @@ /obj/item/toy/windupToolbox/attack_self(mob/user) if(!active) icon_state = "his_grace_awakened" - to_chat(user, "You wind up [src], it begins to rumble.") + to_chat(user, span_warning("You wind up [src], it begins to rumble.")) active = TRUE addtimer(CALLBACK(src, .proc/stopRumble), 600) else @@ -399,8 +399,8 @@ s.set_up(n, c, src) s.start() new ash_type(loc) - visible_message("[src] explodes!", - "You hear a snap!") + visible_message(span_warning("[src] explodes!"), + span_italics("You hear a snap!")) playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) @@ -416,7 +416,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, "You step on the snap pop!") + to_chat(M, span_danger("You step on the snap pop!")) pop_burst(2, 0) /obj/item/toy/snappop/phoenix @@ -449,7 +449,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, "You play with [src].") + to_chat(user, span_notice("You play with [src].")) timer = world.time + cooldown if(!quiet) playsound(user, 'sound/mecha/mechstep.ogg', 20, 1) @@ -561,9 +561,9 @@ /obj/item/toy/talking/proc/activation_message(mob/user) user.visible_message( - "[user] pulls the string on \the [src].", - "You pull the string on \the [src].", - "You hear a string being pulled.") + span_notice("[user] pulls the string on \the [src]."), + span_notice("You pull the string on \the [src]."), + span_notice("You hear a string being pulled.")) /obj/item/toy/talking/proc/generate_messages() return list(pick(messages)) @@ -596,9 +596,9 @@ /obj/item/toy/talking/codex_gigas/activation_message(mob/user) user.visible_message( - "[user] presses the button on \the [src].", - "You press the button on \the [src].", - "You hear a soft click.") + span_notice("[user] presses the button on \the [src]."), + span_notice("You press the button on \the [src]."), + span_notice("You hear a soft click.")) /obj/item/toy/talking/codex_gigas/generate_messages() var/datum/fakeDevil/devil = new @@ -643,7 +643,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/items/cardshuffle.ogg', 50, 1) return BRUTELOSS @@ -702,12 +702,12 @@ 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 if (drawnumber == 1) var/obj/item/toy/cards/singlecard/C = new(user.loc) choice = cards[1] - user.visible_message("[user] draws a card from the deck.", "You draw a card from the deck.") + user.visible_message("[user] draws a card from the deck.", span_notice("You draw a card from the deck.")) C.cardname = choice if(holo) holo.spawned += C // track them leaving the holodeck @@ -720,7 +720,7 @@ C.interact(user) else //if more than one card is drawn var/obj/item/toy/cards/cardhand/H = new/obj/item/toy/cards/cardhand(user.drop_location()) - user.visible_message("[user] draws [drawnumber] cards from the deck.", "You draw [drawnumber] cards from the deck.") + user.visible_message("[user] draws [drawnumber] cards from the deck.", span_notice("You draw [drawnumber] cards from the deck.")) var/i for (i=1,i<=drawnumber,i++) H.currenthand+=cards[i] @@ -738,7 +738,7 @@ if(!(L.mobility_flags & MOBILITY_PICKUP)) return if(cards.len == 0) - to_chat(L, "There are no more cards to draw!") + to_chat(L, span_warning("There are no more cards to draw!")) return var/drawsize = input(L, "How many cards to draw? (1-[min(cards.len,10)])", "Cards") as null|num if (drawsize && isnum(drawsize)) @@ -764,7 +764,7 @@ if(cooldown < world.time - 50) cards = shuffle(cards) playsound(src, 'sound/items/cardshuffle.ogg', 50, 1) - user.visible_message("[user] shuffles the deck.", "You shuffle the deck.") + user.visible_message("[user] shuffles the deck.", span_notice("You shuffle the deck.")) cooldown = world.time /obj/item/toy/cards/deck/attackby(obj/item/I, mob/living/user, params) @@ -772,25 +772,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.","You add the card to the bottom of the deck.") + user.visible_message("[user] adds a card to the bottom of the deck.",span_notice("You add the card to the bottom of the deck.")) qdel(SC) else - to_chat(user, "You can't mix cards from other decks!") + to_chat(user, span_warning("You 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.", "You put the hand of cards in the deck.") + user.visible_message("[user] puts [user.p_their()] hand of cards in the deck.", span_notice("You put the hand of cards in the deck.")) qdel(CH) else - to_chat(user, "You can't mix cards from other decks!") + to_chat(user, span_warning("You can't mix cards from other decks!")) update_icon() else return ..() @@ -803,15 +803,15 @@ if(Adjacent(usr)) if(over_object == M && loc != M) M.put_in_hands(src) - to_chat(usr, "You pick up the deck.") + to_chat(usr, span_notice("You pick up the deck.")) else if(istype(over_object, /obj/screen/inventory/hand)) var/obj/screen/inventory/hand/H = over_object if(M.putItemFromInventoryInHandIfPossible(src, H.held_index)) - to_chat(usr, "You pick up the deck.") + to_chat(usr, span_notice("You pick up the deck.")) else - to_chat(usr, "You can't reach it from here!") + to_chat(usr, span_warning("You can't reach it from here!")) /obj/item/toy/cards/cardhand @@ -848,7 +848,7 @@ C.cardname = choice C.apply_card_vars(C,O) cardUser.put_in_hands(C) - cardUser.visible_message("[cardUser] draws a card from [cardUser.p_their()] hand.", "You take the [C.cardname] from your hand.") + cardUser.visible_message(span_notice("[cardUser] draws a card from [cardUser.p_their()] hand."), span_notice("You take the [C.cardname] from your hand.")) interact(cardUser) update_icon() @@ -859,18 +859,18 @@ N.apply_card_vars(N,O) qdel(src) cardUser.put_in_hands(N) - cardUser.visible_message("[cardUser] also takes their last card and holds it.", "You also take [currenthand[1]] and hold it.") //the outside world will now know when you break a 2 card hand into two separate cards. Useful for UNO but can be used by any card game + cardUser.visible_message("[cardUser] also takes their last card and holds it.", span_notice("You also take [currenthand[1]] and hold it.")) //the outside world will now know when you break a 2 card hand into two separate cards. Useful for UNO but can be used by any card game /obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params) if(istype(C)) if(C.parentdeck == src.parentdeck) src.currenthand += C.cardname - user.visible_message("[user] adds a card to [user.p_their()] hand.", "You add the [C.cardname] to your hand.") + user.visible_message("[user] adds a card to [user.p_their()] hand.", span_notice("You add the [C.cardname] to your hand.")) qdel(C) interact(user) update_icon() else - to_chat(user, "You can't mix cards from other decks!") + to_chat(user, span_warning("You can't mix cards from other decks!")) else return ..() @@ -880,12 +880,12 @@ var/i for(i=1, i<=C.currenthand.len, i++) src.currenthand += C.currenthand[i] //adds all the cards from the other hand to this one - user.visible_message("[user] adds the cards from [user.p_their()] hand to another, consolidating them.", "You add the cards from one hand to another.") + user.visible_message("[user] adds the cards from [user.p_their()] hand to another, consolidating them.", span_notice("You add the cards from one hand to another.")) qdel(C) interact(user) update_icon() else - to_chat(user, "You can't mix cards from other decks!") + to_chat(user, span_warning("You can't mix cards from other decks!")) else return ..() @@ -946,9 +946,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("[cardUser] checks [cardUser.p_their()] card.", span_notice("The card reads: [cardname].")) else - . += "You need to have the card in your hand to check it!" + . += span_warning("You need to have the card in your hand to check it!") /obj/item/toy/cards/singlecard/verb/Flip() set name = "Flip Card" @@ -980,23 +980,23 @@ H.currenthand += src.cardname H.parentdeck = C.parentdeck H.apply_card_vars(H,C) - to_chat(user, "You combine the [C.cardname] and the [src.cardname] into a hand.") + to_chat(user, span_notice("You combine the [C.cardname] and the [src.cardname] into a hand.")) qdel(C) qdel(src) user.put_in_active_hand(H) else - to_chat(user, "You can't mix cards from other decks!") + to_chat(user, span_warning("You 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.", "You add the [cardname] to your hand.") + user.visible_message("[user] adds a card to [user.p_their()] hand.", span_notice("You add the [cardname] to your hand.")) qdel(src) H.interact(user) H.update_icon() else - to_chat(user, "You can't mix cards from other decks!") + to_chat(user, span_warning("You can't mix cards from other decks!")) else return ..() @@ -1106,7 +1106,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].", "You activate [src], it plays a loud noise!", "You hear the click of a button.") + user.visible_message(span_warning("[user] presses a button on [src]."), span_notice("You activate [src], it plays a loud noise!"), span_italics("You hear the click of a button.")) sleep(5) icon_state = "nuketoy" playsound(src, 'sound/machines/alarm.ogg', 100, 0) @@ -1151,7 +1151,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.", "You 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("You press the button, it plays a loud noise!"), span_italics("The button clicks loudly.")) playsound(src, 'sound/effects/explosionfar.ogg', 50, 0) 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 @@ -1159,7 +1159,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 @@ -1220,25 +1220,25 @@ obj/item/toy/turn_tracker info=stripped_input(user, "Insert a list of names seperated by commas (John, Rose, Steve)", "Names") if (info) names = splittext(info,",") - to_chat(user, "You set up the turn tracker. ") + to_chat(user, span_notice("You set up the turn tracker. ")) return /obj/item/toy/turn_tracker/attack_hand(mob/user) if (cooldown < world.time) cooldown = (world.time + 5) //0.5 second cooldown if (names.len==0) - to_chat(user, "You need to set it up first!") + to_chat(user, span_warning("You need to set it up first!")) return turn+=turndir//+1 for normal, -1 for backwardz if(turn>names.len) turn=1 else if(turn<1) turn=names.len - audible_message("[user] clicks the button. [src] says: \"It is [names[turn]]'s turn!\"") + audible_message(span_notice("[user] clicks the button. [src] says: \"It is [names[turn]]'s turn!\"")) flick("bigblue_press", src) /obj/item/toy/turn_tracker/AltClick(mob/user) - audible_message("[user] clicks the button. [src] says: \"Direction Reversed!\"") + audible_message(span_notice("[user] clicks the button. [src] says: \"Direction Reversed!\"")) turndir=turndir*-1 //this reverses the direction (1 becomes -1, -1 becomes 1) /obj/item/toy/turn_tracker/MouseDrop(atom/over_object) @@ -1249,14 +1249,14 @@ obj/item/toy/turn_tracker if(Adjacent(usr)) if(over_object == M && loc != M) M.put_in_hands(src) - to_chat(usr, "You pick up the turn tracker.") + to_chat(usr, span_notice("You pick up the turn tracker.")) else if(istype(over_object, /obj/screen/inventory/hand)) var/obj/screen/inventory/hand/H = over_object if(M.putItemFromInventoryInHandIfPossible(src, H.held_index)) - to_chat(usr, "You pick up the turn tracker.") + to_chat(usr, span_notice("You pick up the turn tracker.")) else - to_chat(usr, "You can't reach it from here!") + to_chat(usr, span_warning("You can't reach it from here!")) /* * Clockwork Watch @@ -1274,14 +1274,14 @@ obj/item/toy/turn_tracker /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].", "You rotate a cogwheel on [src], it plays a loud noise!", "You hear cogwheels turning.") + user.visible_message(span_warning("[user] rotates a cogwheel on [src]."), span_notice("You rotate a cogwheel on [src], it plays a loud noise!"), span_italics("You hear cogwheels turning.")) playsound(src, 'sound/magic/clockwork/ark_activation.ogg', 50, 0) 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 @@ -1312,10 +1312,10 @@ obj/item/toy/turn_tracker /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/voice/hiss1.ogg', 'sound/voice/hiss2.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss4.ogg') var/chosen_sound = pick(possible_sounds) playsound(get_turf(src), chosen_sound, 50, 1) @@ -1323,7 +1323,7 @@ obj/item/toy/turn_tracker if(src) icon_state = "[initial(icon_state)]" 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 @@ -1358,7 +1358,7 @@ obj/item/toy/turn_tracker /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, 1) /obj/item/toy/figure/cmo diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index 43a0cd8b3cb3..ba059e85c1fe 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -49,9 +49,9 @@ user.update_inv_hands() if(show_message) if(iscyborg(user)) - to_chat(user, "You free up your module.") + to_chat(user, span_notice("You free up your module.")) else - to_chat(user, "You are now carrying [src] with one hand.") + to_chat(user, span_notice("You are now carrying [src] with one hand.")) if(unwieldsound) playsound(loc, unwieldsound, 50, 1) var/obj/item/twohanded/offhand/O = user.get_inactive_held_item() @@ -63,10 +63,10 @@ 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, "You need your other hand to be empty!") + to_chat(user, span_warning("You need your other hand to be empty!")) return var/obj/item/twohanded/offhand/O = new(user) // Reserve other hand // Cyborgs are snowflakes hand wise @@ -74,7 +74,7 @@ user.put_in_inactive_hand(O) else if(!user.put_in_inactive_hand(O)) - to_chat(user, "You try to wield it... but it seems you're missing the matching arm.") // should be better text but dunno what + to_chat(user, span_notice("You try to wield it... but it seems you're missing the matching arm.")) // should be better text but dunno what return wielded = TRUE if(force_wielded) @@ -82,9 +82,9 @@ name = "[name] (Wielded)" update_icon() if(iscyborg(user)) - to_chat(user, "You dedicate your module to [src].") + to_chat(user, span_notice("You dedicate your module to [src].")) else - to_chat(user, "You grab [src] with both hands.") + to_chat(user, span_notice("You grab [src] with both hands.")) if (wieldsound) playsound(loc, wieldsound, 50, 1) O.name = "[name] - offhand" @@ -173,7 +173,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 ..() @@ -182,7 +182,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) @@ -215,7 +215,7 @@ if(!wielded) return if(show_message) - to_chat(user, "You drop [src].") + to_chat(user, span_notice("You drop [src].")) ..(user, FALSE) /* @@ -248,7 +248,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) @@ -309,7 +309,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) @@ -324,12 +324,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() @@ -360,7 +360,7 @@ /obj/item/twohanded/dualsaber/attack(mob/target, mob/living/carbon/human/user) if(user.has_dna()) if(user.dna.check_mutation(HULK) || user.dna.check_mutation(ACTIVE_HULK)) - to_chat(user, "You grip the blade too hard and accidentally close it!") + to_chat(user, span_warning("You grip the blade too hard and accidentally close it!")) unwield() return ..() @@ -378,7 +378,7 @@ sleep(1) /obj/item/twohanded/dualsaber/proc/impale(mob/living/user) - to_chat(user, "You twirl around a bit before losing your balance and impaling yourself on [src].") + to_chat(user, span_warning("You twirl around a bit before losing your balance and impaling yourself on [src].")) if (force_wielded) user.take_bodypart_damage(20,25,check_armor = TRUE) else @@ -391,13 +391,13 @@ /obj/item/twohanded/dualsaber/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0) //In case thats just so happens that it is still activated on the groud, prevents hulk from picking it up if(wielded) - to_chat(user, "You can't pick up such dangerous item with your meaty hands without losing fingers, better not to!") + to_chat(user, span_warning("You can't pick up such dangerous item with your meaty hands without losing fingers, better not to!")) return 1 /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) || M.dna.check_mutation(ACTIVE_HULK)) - to_chat(M, "You lack the grace to wield this!") + to_chat(M, span_warning("You lack the grace to wield this!")) return ..() if(wielded) @@ -436,7 +436,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, hitsound, get_clamped_volume(), 1, -1) add_fingerprint(user) // Light your candles while spinning around the room @@ -458,11 +458,11 @@ if(W.tool_behaviour == TOOL_MULTITOOL) if(!hacked) hacked = TRUE - to_chat(user, "2XRNBW_ENGAGE") + to_chat(user, span_warning("2XRNBW_ENGAGE")) item_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 ..() @@ -495,7 +495,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() @@ -542,7 +542,7 @@ update_icon() /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() @@ -552,7 +552,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]" @@ -602,13 +602,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/weapons/chainsawhit.ogg', 100, 1) 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/weapons/genhit1.ogg', 100, 1) return(BRUTELOSS) @@ -638,13 +638,13 @@ /obj/item/twohanded/required/chainsaw/doomslayer name = "THE GREAT COMMUNICATOR" - desc = "VRRRRRRR!!!" + desc = span_warning("VRRRRRRR!!!") armour_penetration = 100 force_on = 30 /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/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1) return 1 return 0 @@ -725,15 +725,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)) @@ -752,7 +752,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/magic/disintegrate.ogg', 100, 1) W.break_wall() W.ScrapeAway(flags = CHANGETURF_INHERIT_AIR) @@ -788,11 +788,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/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1) 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 diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index a0f05baa1f2b..fefcc2410b27 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] are stroking the head of [M] with a bangammer", "[user] are stroking the head with a bangammer", "you hear a bangammer stroking a head"); + M.visible_message(span_danger("[user] are stroking the head of [M] with a bangammer"), span_userdanger("[user] are stroking the head with a bangammer"), "you hear a bangammer stroking a head"); else - M.visible_message("[M] has been banned FOR NO REISIN by [user]", "You have been banned FOR NO REISIN by [user]", "you hear a banhammer banning someone") + M.visible_message(span_danger("[M] has been banned FOR NO REISIN by [user]"), span_userdanger("You have been banned FOR NO REISIN by [user]"), "you hear a banhammer banning someone") playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much if(user.a_intent != 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.", \ - "You try to impale yourself 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("You try to impale yourself 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() //STEAL THE LIFE OF OUR FALLEN FOES add_notch(user) - target.visible_message("[target] crumbles to dust beneath [user]'s blows!", "As you fall, your body crumbles to dust!") + target.visible_message(span_warning("[target] crumbles to dust beneath [user]'s blows!"), span_userdanger("As you fall, your 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.client && 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,11 +156,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 var/new_name = name switch(notches) if(1) - to_chat(user, "Your first kill - hopefully one of many. You scratch a notch into [src]'s blade.") - to_chat(user, "You feel your fallen foe's soul entering your blade, restoring your wounds!") + to_chat(user, span_notice("Your first kill - hopefully one of many. You scratch a notch into [src]'s blade.")) + to_chat(user, span_warning("You feel your fallen foe's soul entering your blade, restoring your wounds!")) new_name = "notched claymore" if(2) - to_chat(user, "Another falls before you. Another soul fuses with your own. Another notch in the blade.") + to_chat(user, span_notice("Another falls before you. Another soul fuses with your own. Another notch in the blade.")) new_name = "double-notched claymore" add_atom_colour(rgb(255, 235, 235), ADMIN_COLOUR_PRIORITY) if(3) @@ -172,11 +172,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 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 your mind, cheering the slaughter.") + to_chat(user, span_boldannounce("Five voices now echo in your 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 your head as you slay your sixth foe.") + to_chat(user, span_boldannounce("Is this what the vikings felt like? Visions of glory fill your head as you slay your sixth foe.")) new_name = "battle-scarred claymore" add_atom_colour(rgb(255, 155, 155), ADMIN_COLOUR_PRIORITY) if(7) @@ -188,11 +188,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 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_userdanger("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!", \ + user.visible_message(span_warning("[user]'s eyes light up with a vengeful fire!"), \ "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")]" @@ -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, "You fasten the glass shard to the top of the rod with the cable.") + to_chat(user, span_notice("You 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, "You fasten [I] to the top of the rod with the cable.") + to_chat(user, span_notice("You 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/phone/real @@ -368,9 +368,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 return playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) message_syndicate(input, usr) - to_chat(usr, "Message sent. Pray you made the right choice.") + to_chat(usr, span_danger("Message sent. Pray you made the right choice.")) usr.log_talk(input, LOG_SAY, tag="Syndicate announcement") - deadchat_broadcast(" has messaged the Syndicate using the red phone, \"[input]\" at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr) + deadchat_broadcast(" has messaged the Syndicate using the red phone, \"[input]\" at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) /obj/item/phone/banana name = "banana phone" @@ -391,9 +391,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 return playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) Clown_announce(input, usr) - to_chat(usr, "Message sent. The Clown Planet will judge your message.") + to_chat(usr, span_danger("Message sent. The Clown Planet will judge your message.")) usr.log_talk(input, LOG_SAY, tag="Clown Planet announcement") - deadchat_broadcast(" has messaged the Clown Planet using the banana phone, \"[input]\" at [get_area_name(usr, TRUE)].", "[usr.real_name]", usr) + deadchat_broadcast(" has messaged the Clown Planet using the banana phone, \"[input]\" at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) /obj/item/cane name = "cane" @@ -454,7 +454,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 @@ -601,13 +601,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_notice("You're already ready to do a home run!")) ..() return - to_chat(user, "You begin gathering strength...") + to_chat(user, span_warning("You begin gathering strength...")) playsound(get_turf(src), 'sound/magic/lightning_chargeup.ogg', 65, 1) if(do_after(user, 90, target = src)) - to_chat(user, "You gather power! Time for a home run!") + to_chat(user, span_userdanger("You gather power! Time for a home run!")) homerun_ready = 1 ..() @@ -615,7 +615,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_userdanger("It's a home run!")) target.throw_at(throw_target, rand(8,10), 14, user) SSexplosions.medturf += throw_target playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1) @@ -672,7 +672,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, "You easily splat the [target].") + to_chat(user, span_warning("You easily splat the [target].")) if(istype(target, /mob/living/)) var/mob/living/bug = target bug.death(1) @@ -706,8 +706,8 @@ 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/weapons/slap.ogg', 50, 1, -1) - user.visible_message("[user] slaps [M]!", - "You slap [M]!",\ + user.visible_message(span_danger("[user] slaps [M]!"), + span_notice("You slap [M]!"),\ "You hear a slap.") return /obj/item/proc/can_trigger_gun(mob/living/user) @@ -735,7 +735,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 324eb6bf0097..cc976003e679 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -78,7 +78,7 @@ /obj/bullet_act(obj/item/projectile/P) . = ..() playsound(src, P.hitsound, 50, 1) - 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.armour_penetration) @@ -89,7 +89,7 @@ /obj/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0) if(user.a_intent == INTENT_HARM) ..(user, 1) - visible_message("[user] smashes [src]!", null, null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[user] smashes [src]!"), null, null, COMBAT_MESSAGE_RANGE) if(density) playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1) user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced="hulk") @@ -164,7 +164,7 @@ return 0 else return 0 - visible_message("[M.name] has hit [src].", null, null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M.name] has hit [src]."), null, null, COMBAT_MESSAGE_RANGE) return take_damage(M.force*3, mech_damtype, "melee", 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 bafc1af93312..d158519e4a45 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -83,7 +83,7 @@ /obj/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, quickstart = TRUE) ..() if(obj_flags & FROZEN) - visible_message("[src] shatters into a million pieces!") + visible_message(span_danger("[src] shatters into a million pieces!")) qdel(src) @@ -223,9 +223,9 @@ /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 4d351564d34c..acae24c73a8e 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -35,7 +35,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]."), span_warning("You're knocked off [src]!"), span_warning("You see [structureclimber] get knocked off [src].")) /obj/structure/ui_act(action, params) add_fingerprint(usr) @@ -67,8 +67,8 @@ /obj/structure/proc/climb_structure(mob/living/user) src.add_fingerprint(user) - user.visible_message("[user] starts climbing onto [src].", \ - "You start climbing onto [src]...") + user.visible_message(span_warning("[user] starts climbing onto [src]."), \ + span_notice("You start climbing onto [src]...")) var/adjusted_climb_time = climb_time if(user.restrained()) //climbing takes twice as long when restrained. adjusted_climb_time *= 2 @@ -80,23 +80,23 @@ 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].", \ - "You climb onto [src].") + user.visible_message(span_warning("[user] climbs onto [src]."), \ + span_notice("You climb onto [src].")) log_combat(user, src, "climbed onto") if(climb_stun) user.Stun(climb_stun) . = 1 else - to_chat(user, "You fail to climb onto [src].") + to_chat(user, span_warning("You fail to climb onto [src].")) structureclimber = null /obj/structure/examine(mob/user) . = ..() if(!(resistance_flags & INDESTRUCTIBLE)) if(resistance_flags & ON_FIRE) - . += "It's on fire!" + . += span_warning("It's on fire!") if(broken) - . += "It appears to be broken." + . += span_notice("It appears to be broken.") var/examine_status = examine_status(user) if(examine_status) . += examine_status @@ -110,7 +110,7 @@ return "It appears heavily damaged." if(0 to 25) if(!broken) - return "It's falling apart!" + return span_warning("It's falling apart!") /obj/structure/rust_heretic_act() take_damage(500, BRUTE, "melee", 1) diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index d36ab31e2af3..73f55c755d55 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"]." - . += "You could [active? "deactivate" : "activate"] it with a multitool." + . += span_notice("You 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) @@ -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, "You start to deconstruct the frame...") + to_chat(user, span_notice("You start to deconstruct the frame...")) if(P.use_tool(src, user, 20, volume=50) && state == EMPTY_CORE) - to_chat(user, "You deconstruct the frame.") + to_chat(user, span_notice("You deconstruct the frame.")) deconstruct(TRUE) return else @@ -111,7 +111,7 @@ if(!user.transferItemToLoc(P, src)) return playsound(loc, 'sound/items/deconstruct.ogg', 50, 1) - to_chat(user, "You place the circuit board inside the frame.") + to_chat(user, span_notice("You 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, "You screw the circuit board into place.") + to_chat(user, span_notice("You 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, "You remove the circuit board.") + to_chat(user, span_notice("You 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, "You unfasten the circuit board.") + to_chat(user, span_notice("You 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/items/deconstruct.ogg', 50, 1) - to_chat(user, "You start to add cables to the frame...") + to_chat(user, span_notice("You start to add cables to the frame...")) if(do_after(user, 20, target = src) && state == SCREWED_CORE && C.use(5)) - to_chat(user, "You add cables to the frame.") + to_chat(user, span_notice("You add cables to the frame.")) state = CABLED_CORE update_icon() else - to_chat(user, "You need five lengths of cable to wire the AI core!") + to_chat(user, span_warning("You 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, "You remove the cables.") + to_chat(user, span_notice("You 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/items/deconstruct.ogg', 50, 1) - to_chat(user, "You start to put in the glass panel...") + to_chat(user, span_notice("You start to put in the glass panel...")) if(do_after(user, 20, target = src) && state == CABLED_CORE && G.use(2)) - to_chat(user, "You put in the glass panel.") + to_chat(user, span_notice("You put in the glass panel.")) state = GLASS_CORE update_icon() else - to_chat(user, "You need two sheets of reinforced glass to insert them into the AI core!") + to_chat(user, span_warning("You 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, "You add [M.name] to the frame.") + to_chat(user, span_notice("You add [M.name] to the frame.")) update_icon() return if(P.tool_behaviour == TOOL_CROWBAR && brain) P.play_tool_sound(src) - to_chat(user, "You remove the brain.") + to_chat(user, span_notice("You 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, "You remove the glass panel.") + to_chat(user, span_notice("You 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, "You connect the monitor.") + to_chat(user, span_notice("You connect the monitor.")) if(brain) SSticker.mode.remove_antag_for_borging(brain.brainmob.mind) if(!istype(brain.laws, /datum/ai_laws/ratvar)) @@ -261,7 +261,7 @@ if(P.tool_behaviour == TOOL_SCREWDRIVER) P.play_tool_sound(src) - to_chat(user, "You disconnect the monitor.") + to_chat(user, span_notice("You disconnect the monitor.")) state = GLASS_CORE update_icon() return diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index 9968e8fb97c7..c30bbdde7faa 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -261,19 +261,19 @@ if(user.getorgan(/obj/item/organ/alien/plasmavessel)) switch(status) if(BURST) - to_chat(user, "You clear the hatched egg.") + to_chat(user, span_notice("You clear the hatched egg.")) playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) 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, "You retrieve the child.") + to_chat(user, span_notice("You 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 2e051b508b42..4eed032c3b7e 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].","You place \the [C] on \the [src].") + user.visible_message(span_notice("[user] puts \the [C] on \the [src]."),span_notice("You place \the [C] on \the [src].")) else return ..() @@ -270,17 +270,17 @@ /obj/structure/sign/painting/examine(mob/user) . = ..() if(persistence_id) - . += "Any painting placed here will be archived at the end of the shift." + . += span_notice("Any painting placed here will be archived at the end of the shift.") if(C) C.ui_interact(user) - . += "Use wirecutters to remove the painting." + . += span_notice("Use wirecutters to remove the painting.") /obj/structure/sign/painting/wirecutter_act(mob/living/user, obj/item/I) . = ..() if(C) C.forceMove(drop_location()) C = null - to_chat(user, "You remove the painting from the frame.") + to_chat(user, span_notice("You remove the painting from the frame.")) update_icon() return TRUE @@ -289,7 +289,7 @@ C = new_canvas if(!C.finalized) C.finalize(user) - to_chat(user,"You frame [C].") + to_chat(user,span_notice("You frame [C].")) update_icon() /obj/structure/sign/painting/proc/try_rename(mob/user) diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index a13ecc6c9d78..c8a484d0420a 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -66,7 +66,7 @@ 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.") @@ -76,11 +76,11 @@ /obj/structure/sign/barsign/attackby(obj/item/I, mob/user) if(I.tool_behaviour == TOOL_SCREWDRIVER) if(!panel_open) - to_chat(user, "You open the maintenance panel.") + to_chat(user, span_notice("You open the maintenance panel.")) set_sign(new /datum/barsign/hiddensigns/signoff) panel_open = TRUE else - to_chat(user, "You close the maintenance panel.") + to_chat(user, span_notice("You close the maintenance panel.")) if(!broken) if(!chosen_sign) set_sign(new /datum/barsign/hiddensigns/signoff) @@ -93,14 +93,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, "You replace the burnt wiring.") + to_chat(user, span_notice("You replace the burnt wiring.")) broken = FALSE else - to_chat(user, "You need at least two lengths of cable!") + to_chat(user, span_warning("You need at least two lengths of cable!")) else return ..() @@ -114,9 +114,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, "You load an illegal barsign into the memory buffer...") + to_chat(user, span_notice("You 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 77b32795170a..1bdf56acc2b0 100644 --- a/code/game/objects/structures/beds_chairs/alien_nest.dm +++ b/code/game/objects/structures/beds_chairs/alien_nest.dm @@ -27,23 +27,23 @@ 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.",\ - "You hear squelching...") + span_notice("[user.name] pulls you free from the gelatinous resin."),\ + span_italics("You hear squelching...")) else M.visible_message(\ - "[M.name] struggles to break free from the gelatinous resin!",\ - "You struggle to break free from the gelatinous resin... (Stay still for two minutes.)",\ - "You hear squelching...") + span_warning("[M.name] struggles to break free from the gelatinous resin!"),\ + span_notice("You struggle to break free from the gelatinous resin... (Stay still for two minutes.)"),\ + span_italics("You hear squelching...")) if(!do_after(M, 1200, target = src)) if(M && M.buckled) - to_chat(M, "You fail to unbuckle yourself!") + to_chat(M, span_warning("You fail to unbuckle yourself!")) return if(!M.buckled) return M.visible_message(\ - "[M.name] breaks free from the gelatinous resin!",\ - "You break free from the gelatinous resin!",\ - "You hear squelching...") + span_warning("[M.name] breaks free from the gelatinous resin!"),\ + span_notice("You break free from the gelatinous resin!"),\ + span_italics("You hear squelching...")) unbuckle_mob(M) add_fingerprint(user) @@ -63,8 +63,8 @@ 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]!",\ - "You hear squelching...") + span_danger("[user.name] drenches you in a foul-smelling resin, trapping you in [src]!"),\ + span_italics("You 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 05e54652d422..b0a1f7fc5ff9 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -38,7 +38,7 @@ /obj/structure/bed/attackby(obj/item/W, mob/user, params) if(W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1)) - to_chat(user, "You start deconstructing [src]...") + to_chat(user, span_notice("You start deconstructing [src]...")) if(W.use_tool(src, user, 40, volume=50)) W.play_tool_sound(src) deconstruct(TRUE) @@ -60,19 +60,19 @@ if(istype(W, /obj/item/roller/robo)) var/obj/item/roller/robo/R = W if(R.loaded) - to_chat(user, "You already have a roller bed docked!") + to_chat(user, span_warning("You 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].", "You collect [src].") + user.visible_message("[user] collects [src].", span_notice("You collect [src].")) return 1 else return ..() @@ -84,7 +84,7 @@ return 0 if(has_buckled_mobs()) return 0 - usr.visible_message("[usr] collapses \the [src.name].", "You collapse \the [src.name].") + usr.visible_message("[usr] collapses \the [src.name].", span_notice("You collapse \the [src.name].")) var/obj/structure/bed/roller/B = new foldabletype(get_turf(src)) usr.put_in_hands(B) qdel(src) @@ -116,9 +116,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].", "You load [src] into [R].") + user.visible_message(span_notice("[user] loads [src]."), span_notice("You load [src] into [R].")) R.loaded = new/obj/structure/bed/roller(R) qdel(src) //"Load" return @@ -156,10 +156,10 @@ /obj/item/roller/robo/deploy_roller(mob/user, atom/location) if(loaded) loaded.forceMove(location) - user.visible_message("[user] deploys [loaded].", "You deploy [loaded].") + user.visible_message("[user] deploys [loaded].", span_notice("You 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 b8418d3b1921..a28893693d81 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -18,7 +18,7 @@ . = ..() . += "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() . = ..() @@ -77,7 +77,7 @@ /obj/structure/chair/attackby(obj/item/W, mob/user, params) if(W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1)) - to_chat(user, "You start deconstructing [src]...") + to_chat(user, span_notice("You start deconstructing [src]...")) if(W.use_tool(src, user, 20, volume=50)) W.play_tool_sound(src) deconstruct() @@ -244,7 +244,7 @@ return if(!usr.canUseTopic(src, BE_CLOSE, ismonkey(usr))) return - usr.visible_message("[usr] grabs \the [src.name].", "You grab \the [src.name].") + usr.visible_message(span_notice("[usr] grabs \the [src.name]."), span_notice("You grab \the [src.name].")) var/C = new item_chair(loc) TransferComponents(C) usr.put_in_hands(C) @@ -275,7 +275,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,1) return BRUTELOSS @@ -290,13 +290,13 @@ /obj/item/chair/proc/plant(mob/user) for(var/obj/A in get_turf(loc)) if(istype(A, /obj/structure/chair)) - to_chat(user, "There is already a chair here.") + to_chat(user, span_danger("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_danger("There is already something here.")) return - user.visible_message("[user] rights \the [src.name].", "You right \the [name].") + user.visible_message(span_notice("[user] rights \the [src.name]."), span_notice("You right \the [name].")) var/obj/structure/chair/C = new origin_type(get_turf(loc)) TransferComponents(C) C.setDir(dir) @@ -320,7 +320,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 @@ -329,7 +329,7 @@ if(!proximity) return if(prob(break_chance)) - user.visible_message("[user] smashes \the [src] to pieces against \the [target]") + user.visible_message(span_danger("[user] smashes \the [src] to pieces against \the [target]")) if(iscarbon(target)) var/mob/living/carbon/C = target if(C.health < C.maxHealth*0.5) @@ -406,12 +406,12 @@ if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return if(!(datum_flags & DF_ISPROCESSING)) - user.visible_message("[user] spins [src] around, and Ratvarian technology keeps it spinning FOREVER.", \ - "Automated spinny chairs. The pinnacle of Ratvarian technology.") + user.visible_message(span_notice("[user] spins [src] around, and Ratvarian technology keeps it spinning FOREVER."), \ + span_notice("Automated spinny chairs. The pinnacle of Ratvarian technology.")) START_PROCESSING(SSfastprocess, src) else - user.visible_message("[user] stops [src]'s uncontrollable spinning.", \ - "You grab [src] and stop its wild spinning.") + user.visible_message(span_notice("[user] stops [src]'s uncontrollable spinning."), \ + span_notice("You grab [src] and stop its wild spinning.")) STOP_PROCESSING(SSfastprocess, src) /obj/structure/chair/bronze diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 3dc48244789e..df88298597f9 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -40,9 +40,9 @@ LINEN BINS sheet.dream_messages = dream_messages qdel(src) user.put_in_active_hand(sheet) - to_chat(user, "You adjust the bedsheet to be worn on your head!") + to_chat(user, span_notice("You adjust the bedsheet to be worn on your head!")) else - to_chat(user, "You cannot adjust this bedsheet!") + to_chat(user, span_notice("You cannot adjust this bedsheet!")) /obj/item/bedsheet/AltClick(mob/user) if(!user.CanReach(src)) //No telekenetic grabbing. @@ -51,17 +51,17 @@ LINEN BINS return if(layer == initial(layer)) layer = ABOVE_MOB_LAYER - to_chat(user, "You cover yourself with [src].") + to_chat(user, span_notice("You cover yourself with [src].")) else layer = initial(layer) - to_chat(user, "You smooth [src] out beneath you.") + to_chat(user, span_notice("You smooth [src] out beneath you.")) add_fingerprint(user) return /obj/item/bedsheet/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WIRECUTTER || I.is_sharp()) // yogs start - disable infinite holocloth - to_chat(user, "You tear [src] up.") + to_chat(user, span_notice("You tear [src] up.")) if(flags_1 & HOLOGRAM_1) qdel(src) return @@ -392,7 +392,7 @@ LINEN BINS return sheets.Add(I) amount++ - to_chat(user, "You put [I] in [src].") + to_chat(user, span_notice("You put [I] in [src].")) update_icon() else if(default_unfasten_wrench(user, I, 5)) @@ -411,10 +411,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, "You hide [I] among the sheets.") + to_chat(user, span_notice("You hide [I] among the sheets.")) /obj/structure/bedsheetbin/attack_paw(mob/user) @@ -441,12 +441,12 @@ LINEN BINS B.forceMove(drop_location()) user.put_in_hands(B) - to_chat(user, "You take [B] out of [src].") + to_chat(user, span_notice("You 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 @@ -464,7 +464,7 @@ LINEN BINS B = new /obj/item/bedsheet(loc) B.forceMove(drop_location()) - to_chat(user, "You telekinetically remove [B] from [src].") + to_chat(user, span_notice("You telekinetically remove [B] from [src].")) update_icon() if(hidden) @@ -487,9 +487,9 @@ LINEN BINS if(sheet) qdel(src) user.put_in_active_hand(sheet) - to_chat(user, "You adjust the bedsheet to be worn on your neck!") + to_chat(user, span_notice("You adjust the bedsheet to be worn on your neck!")) else - to_chat(user, "You cannot adjust this bedsheet!") + to_chat(user, span_notice("You cannot adjust this bedsheet!")) /obj/item/bedsheet/adjusted/blue oldbedpath = /obj/item/bedsheet/blue diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 7c65e157dd96..78f02c468dd0 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -131,17 +131,17 @@ GLOBAL_LIST_EMPTY(lockers) if(notreallyacloset) // Yogs -- Fixes bodybags complaining they can be welded together return . // Yogs if(welded) - . += "It's welded shut." + . += span_notice("It's welded shut.") if(anchored) . += "It is bolted to the ground." if(opened) . += "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/CanAllowThrough(atom/movable/mover, turf/target) . = ..() @@ -155,7 +155,7 @@ GLOBAL_LIST_EMPTY(lockers) 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 @@ -167,7 +167,7 @@ GLOBAL_LIST_EMPTY(lockers) 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 @@ -294,18 +294,18 @@ GLOBAL_LIST_EMPTY(lockers) if(!W.tool_start_check(user, amount=0)) return - to_chat(user, "You begin cutting \the [src] apart...") + to_chat(user, span_notice("You begin cutting \the [src] apart...")) if(W.use_tool(src, user, 40, volume=50)) if(!opened) return - user.visible_message("[user] slices apart \the [src].", - "You cut \the [src] apart with \the [W].", - "You hear welding.") + user.visible_message(span_notice("[user] slices apart \the [src]."), + span_notice("You cut \the [src] apart with \the [W]."), + span_italics("You hear welding.")) deconstruct(TRUE) return else // for example cardboard box is cut with wirecutters - user.visible_message("[user] cut apart \the [src].", \ - "You cut \the [src] apart with \the [W].") + user.visible_message(span_notice("[user] cut apart \the [src]."), \ + span_notice("You cut \the [src] apart with \the [W].")) deconstruct(TRUE) return if(user.transferItemToLoc(W, drop_location())) // so we put in unlit welder too @@ -314,25 +314,25 @@ GLOBAL_LIST_EMPTY(lockers) if(!W.tool_start_check(user, amount=0)) return - to_chat(user, "You begin [welded ? "unwelding":"welding"] \the [src]...") + to_chat(user, span_notice("You begin [welded ? "unwelding":"welding"] \the [src]...")) if(W.use_tool(src, user, 40, volume=50)) if(opened) return welded = !welded after_weld(welded) update_airtightness() - user.visible_message("[user] [welded ? "welds shut" : "unwelded"] \the [src].", - "You [welded ? "weld" : "unwelded"] \the [src] with \the [W].", - "You hear welding.") + user.visible_message(span_notice("[user] [welded ? "welds shut" : "unwelded"] \the [src]."), + span_notice("You [welded ? "weld" : "unwelded"] \the [src] with \the [W]."), + span_italics("You hear welding.")) update_icon() else if(W.tool_behaviour == TOOL_WRENCH && anchorable) if(isinspace() && !anchored) return setAnchored(!anchored) W.play_tool_sound(src, 75) - user.visible_message("[user] [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground.", \ - "You [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground.", \ - "You hear a ratchet.") + user.visible_message(span_notice("[user] [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground."), \ + span_notice("You [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground."), \ + span_italics("You hear a ratchet.")) else if(user.a_intent != INTENT_HARM) var/item_is_id = W.GetID() if(!item_is_id && !(W.item_flags & NOBLUDGEON)) @@ -367,14 +367,14 @@ GLOBAL_LIST_EMPTY(lockers) 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].", \ - "You [actuallyismob ? "try to ":""]stuff [O] into [src].", \ - "You hear clanging.") + user.visible_message(span_warning("[user] [actuallyismob ? "tries to ":""]stuff [O] into [src]."), \ + span_warning("You [actuallyismob ? "try to ":""]stuff [O] into [src]."), \ + span_italics("You hear clanging.")) if(actuallyismob) if(do_after_mob(user, targets, 40)) - user.visible_message("[user] stuffs [O] into [src].", \ - "You stuff [O] into [src].", \ - "You hear a loud metal bang.") + user.visible_message(span_notice("[user] stuffs [O] into [src]."), \ + span_notice("You stuff [O] into [src]."), \ + span_italics("You hear a loud metal bang.")) var/mob/living/L = O if(!issilicon(L)) L.Paralyze(40) @@ -393,7 +393,7 @@ GLOBAL_LIST_EMPTY(lockers) 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 container_resist(user) @@ -429,7 +429,7 @@ GLOBAL_LIST_EMPTY(lockers) 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 @@ -456,19 +456,19 @@ GLOBAL_LIST_EMPTY(lockers) //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] begins to shake violently!", \ - "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "You hear banging from [src].") + user.visible_message(span_warning("[src] begins to shake violently!"), \ + span_notice("You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_italics("You hear banging from [src].")) if(do_after(user,(breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || user.loc != src || opened || (!locked && !welded) ) return //we check after a while whether there is a point of resisting anymore and whether the user is capable of resisting - user.visible_message("[user] successfully broke out of [src]!", - "You successfully break out of [src]!") + user.visible_message(span_danger("[user] successfully broke out of [src]!"), + span_notice("You successfully break out of [src]!")) bust_open() else if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded. - to_chat(user, "You fail to break out of [src]!") + to_chat(user, span_warning("You fail to break out of [src]!")) /obj/structure/closet/proc/bust_open() welded = FALSE //applies to all lockers @@ -498,19 +498,19 @@ GLOBAL_LIST_EMPTY(lockers) if(iscarbon(user)) add_fingerprint(user) locked = !locked - user.visible_message("[user] [locked ? null : "un"]locks [src].", - "You [locked ? null : "un"]lock [src].") + user.visible_message(span_notice("[user] [locked ? null : "un"]locks [src]."), + span_notice("You [locked ? null : "un"]lock [src].")) update_icon() else if(!silent) - to_chat(user, "Access Denied") + to_chat(user, span_notice("Access Denied")) else if(secure && broken) - to_chat(user, "\The [src] is broken!") + to_chat(user, span_warning("\The [src] is broken!")) /obj/structure/closet/emag_act(mob/user) if(secure && !broken) - user.visible_message("Sparks fly from [src]!", - "You scramble [src]'s lock, breaking it open!", - "You hear a faint electrical spark.") + user.visible_message(span_warning("Sparks fly from [src]!"), + span_warning("You scramble [src]'s lock, breaking it open!"), + span_italics("You hear a faint electrical spark.")) playsound(src, "sparks", 50, 1) broken = TRUE locked = FALSE @@ -567,19 +567,19 @@ GLOBAL_LIST_EMPTY(lockers) 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, "You can't get [src] to close!") + to_chat(user, span_warning("You 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]!")) /obj/structure/closet/proc/update_airtightness() var/is_airtight = FALSE diff --git a/code/game/objects/structures/crates_lockers/closets/bluespace_locker.dm b/code/game/objects/structures/crates_lockers/closets/bluespace_locker.dm index e664f3d68bb1..f23724066972 100644 --- a/code/game/objects/structures/crates_lockers/closets/bluespace_locker.dm +++ b/code/game/objects/structures/crates_lockers/closets/bluespace_locker.dm @@ -73,18 +73,18 @@ //okay, so the closet is either welded or locked... resist!!! user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - other.visible_message("[other] begins to shake violently!") - to_chat(user, "You start pushing the door open... (this will take about [DisplayTimeText(other.breakout_time)].)") + other.visible_message(span_warning("[other] begins to shake violently!")) + to_chat(user, span_notice("You start pushing the door open... (this will take about [DisplayTimeText(other.breakout_time)].)")) if(do_after(user,(other.breakout_time), target = src)) if(!user || user.stat != CONSCIOUS || other.opened || (!other.locked && !other.welded)) return //we check after a while whether there is a point of resisting anymore and whether the user is capable of resisting other.bust_open() - user.visible_message("[user] successfully broke out of [other]!", - "You successfully break out of [other]!") + user.visible_message(span_danger("[user] successfully broke out of [other]!"), + span_notice("You successfully break out of [other]!")) else if(!other.opened) //so we don't get the message if we resisted multiple times and succeeded. - to_chat(user, "You fail to break out of [other]!") + to_chat(user, span_warning("You fail to break out of [other]!")) else return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/code/game/objects/structures/crates_lockers/closets/bodybag.dm index 0d0ddc6ccd1f..c01afbbc52f4 100644 --- a/code/game/objects/structures/crates_lockers/closets/bodybag.dm +++ b/code/game/objects/structures/crates_lockers/closets/bodybag.dm @@ -27,7 +27,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, "You scribble illegibly on [src]!") + to_chat(user, span_notice("You 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) @@ -42,7 +42,7 @@ name = "body bag" return else if(I.tool_behaviour == TOOL_WIRECUTTER) - to_chat(user, "You cut the tag off [src].") + to_chat(user, span_notice("You cut the tag off [src].")) name = "body bag" tagged = 0 update_icon() @@ -67,7 +67,7 @@ return 0 if(contents.len) return 0 - 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) @@ -90,16 +90,16 @@ if(opened) return 0 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 0 for(var/obj/item/bodybag/bluespace/B in src) - to_chat(usr, "You can't recursively fold bluespace body bags!" ) + to_chat(usr, span_warning("You can't recursively fold bluespace body bags!") ) return 0 - 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_userdanger("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 0256d08674a2..7f8d9cd7bcfc 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 b0df2a36a760..60952c2af129 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -50,7 +50,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 @@ -63,6 +63,6 @@ registered_name = I.registered_name desc = "Owned by [I.registered_name]." 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 087282286aa6..b1f9ff5441af 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -49,14 +49,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/items/poster_ripped.ogg', 75, 1) manifest.forceMove(get_turf(src)) manifest = null update_icon() /obj/structure/closet/crate/proc/tear_manifest(mob/user) - to_chat(user, "You tear the manifest off of [src].") + to_chat(user, span_notice("You tear the manifest off of [src].")) playsound(src, 'sound/items/poster_ripped.ogg', 75, 1) 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 b0044a284a57..9bc53231c36b 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, "You fill the bag.") + to_chat(user, span_notice("You 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 28cbd39e7ec9..82ac4ab939c3 100644 --- a/code/game/objects/structures/crates_lockers/crates/large.dm +++ b/code/game/objects/structures/crates_lockers/crates/large.dm @@ -13,7 +13,7 @@ if(manifest) tear_manifest(user) else - to_chat(user, "You need a crowbar to pry this open!") + to_chat(user, span_warning("You 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) @@ -21,8 +21,8 @@ tear_manifest(user) user.visible_message("[user] pries \the [src] open.", \ - "You pry open \the [src].", \ - "You hear splitting wood.") + span_notice("You pry open \the [src]."), \ + span_italics("You hear splitting wood.")) playsound(src.loc, 'sound/weapons/slashmiss.ogg', 75, 1) var/turf/T = get_turf(src) @@ -38,6 +38,6 @@ return ..() //Stops it from opening and turning invisible when items are used on it. else - to_chat(user, "You need a crowbar to pry this open!") + to_chat(user, span_warning("You 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. \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm index 3519c3d06d88..796dfdeebaaa 100644 --- a/code/game/objects/structures/crates_lockers/crates/secure.dm +++ b/code/game/objects/structures/crates_lockers/crates/secure.dm @@ -31,7 +31,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) @@ -84,7 +84,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) . = ..() @@ -96,15 +96,15 @@ if(privacy_lock) var/obj/item/card/id/id_card = user.get_idcard(TRUE) if(!id_card || !id_card.registered_account || (id_card.registered_account != buyer_account)) - to_chat(user, "Bank account does not match with buyer!") + to_chat(user, span_notice("Bank account does not match with buyer!")) return if(iscarbon(user)) add_fingerprint(user) locked = !locked - user.visible_message("[user] [locked ? null : "un"]locks [src].", - "You [locked ? null : "un"]lock [src].") + user.visible_message(span_notice("[user] [locked ? null : "un"]locks [src]."), + span_notice("You [locked ? null : "un"]lock [src].")) update_icon() else if(!silent) - to_chat(user, "Access Denied") + to_chat(user, span_notice("Access Denied")) else if(secure && broken) - to_chat(user, "\The [src] is broken!") + to_chat(user, span_warning("\The [src] is broken!")) diff --git a/code/game/objects/structures/destructible_structures.dm b/code/game/objects/structures/destructible_structures.dm index cfed4561d49d..039b959d6001 100644 --- a/code/game/objects/structures/destructible_structures.dm +++ b/code/game/objects/structures/destructible_structures.dm @@ -1,6 +1,6 @@ /obj/structure/destructible //a base for destructible structures max_integrity = 100 - var/break_message = "The strange, admin-y structure breaks!" //The message shown when a structure breaks + var/break_message = span_warning("The strange, admin-y structure breaks!") //The message shown when a structure breaks var/break_sound = 'sound/magic/clockwork/invoke_general.ogg' //The sound played when a structure breaks var/list/debris = null //Parts left behind when a structure breaks, takes the form of list(path = amount_to_spawn) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 030ae2376347..75562df1c869 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -42,9 +42,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]" @@ -103,49 +103,49 @@ /obj/structure/displaycase/attackby(obj/item/W, mob/user, params) if(W.GetID() && !broken && openable) if(allowed(user)) - to_chat(user, "You [open ? "close":"open"] [src].") + to_chat(user, span_notice("You [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.a_intent == INTENT_HELP && !broken) if(obj_integrity < max_integrity) if(!W.tool_start_check(user, amount=5)) return - to_chat(user, "You begin repairing [src]...") + to_chat(user, span_notice("You begin repairing [src]...")) if(W.use_tool(src, user, 40, amount=5, volume=50)) obj_integrity = max_integrity update_icon() - to_chat(user, "You repair [src].") + to_chat(user, span_notice("You 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, "You remove the destroyed case.") + to_chat(user, span_notice("You remove the destroyed case.")) qdel(src) else - to_chat(user, "You start to [open ? "close":"open"] [src]...") + to_chat(user, span_notice("You start to [open ? "close":"open"] [src]...")) if(W.use_tool(src, user, 20)) - to_chat(user, "You [open ? "close":"open"] [src].") + to_chat(user, span_notice("You [open ? "close":"open"] [src].")) toggle_lock(user) else if(open && !showpiece) if(showpiece_type && !istype(W, showpiece_type)) - to_chat(user, "This doesn't belong in this kind of display.") + to_chat(user, span_notice("This doesn't belong in this kind of display.")) return TRUE if(user.transferItemToLoc(W, src)) showpiece = W - to_chat(user, "You put [W] on display.") + to_chat(user, span_notice("You put [W] on display.")) update_icon() else if(glass_fix && broken && istype(W, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = W if(G.get_amount() < 2) - to_chat(user, "You need two glass sheets to fix the case!") + to_chat(user, span_warning("You need two glass sheets to fix the case!")) return - to_chat(user, "You start fixing [src]...") + to_chat(user, span_notice("You start fixing [src]...")) if(do_after(user, 20, target = src)) G.use(2) broken = 0 @@ -167,7 +167,7 @@ return user.changeNext_move(CLICK_CD_MELEE) if (showpiece && (broken || open)) - to_chat(user, "You deactivate the hover field built into the case.") + to_chat(user, span_notice("You deactivate the hover field built into the case.")) log_combat(user, src, "deactivates the hover field of") dump() src.add_fingerprint(user) @@ -180,7 +180,7 @@ if (user.a_intent == 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) @@ -197,7 +197,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, "You start disassembling [src]...") + to_chat(user, span_notice("You start disassembling [src]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 30)) playsound(src.loc, 'sound/items/deconstruct.ogg', 50, TRUE) @@ -205,17 +205,17 @@ qdel(src) else if(istype(I, /obj/item/electronics/airlock)) - to_chat(user, "You start installing the electronics into [src]...") + to_chat(user, span_notice("You 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, "You install the airlock electronics.") + to_chat(user, span_notice("You 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, "You need ten glass sheets to do this!") + to_chat(user, span_warning("You need ten glass sheets to do this!")) return - to_chat(user, "You start adding [G] to [src]...") + to_chat(user, span_notice("You start adding [G] to [src]...")) if(do_after(user, 20, target = src)) G.use(10) var/obj/structure/displaycase/noalert/display = new(src.loc) @@ -271,35 +271,35 @@ if(user.is_holding_item_of_type(/obj/item/key/displaycase)) if(added_roundstart) is_locked = !is_locked - to_chat(user, "You [!is_locked ? "un" : ""]lock the case.") + to_chat(user, span_notice("You [!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, "You press a button, and [showpiece] descends into the floor of the case.") + to_chat(user, span_notice("You press a button, and [showpiece] descends into the floor of the case.")) QDEL_NULL(showpiece) - to_chat(user, "You insert [W] into the case.") + to_chat(user, span_notice("You insert [W] into the case.")) showpiece = W added_roundstart = FALSE update_icon() @@ -312,22 +312,22 @@ if(chosen_plaque) if(user.Adjacent(src)) trophy_message = chosen_plaque - to_chat(user, "You set the plaque's text.") + to_chat(user, span_notice("You set the plaque's text.")) else - to_chat(user, "You are too far to set the plaque's text!") + to_chat(user, span_warning("You 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/effect/decal/cleanable/ash(loc) QDEL_NULL(showpiece) else diff --git a/code/game/objects/structures/divine.dm b/code/game/objects/structures/divine.dm index 0ed96893f252..4489b8ec5af3 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, "You attempt to sacrifice [L] by invoking the sacrificial ritual.") + to_chat(user, span_notice("You 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 water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.") + to_chat(user, span_notice("The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.")) user.reagents.add_reagent(/datum/reagent/medicine/omnizine/godblood,20) update_icon() addtimer(CALLBACK(src, .proc/update_icon), time_between_uses) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index ccb821d6e2bf..db942e73e8d2 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -66,7 +66,7 @@ var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]") user.visible_message("[user] welds the [mineral] plating off the airlock assembly.", "You start to weld the [mineral] plating off the airlock assembly...") if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "You weld the [mineral] plating off.") + to_chat(user, span_notice("You 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) @@ -74,7 +74,7 @@ else if(glass) user.visible_message("[user] welds the glass panel out of the airlock assembly.", "You start to weld the glass panel out of the airlock assembly...") if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "You weld the glass panel out.") + to_chat(user, span_notice("You 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.", \ + user.visible_message(span_warning("[user] disassembles the airlock assembly."), \ "You start to disassemble the airlock assembly...") if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "You disassemble the airlock assembly.") + to_chat(user, span_notice("You disassemble the airlock assembly.")) deconstruct(TRUE) else if(W.tool_behaviour == TOOL_WRENCH) @@ -98,13 +98,13 @@ if(door_check) user.visible_message("[user] secures the airlock assembly to the floor.", \ - "You start to secure the airlock assembly to the floor...", \ - "You hear wrenching.") + span_notice("You start to secure the airlock assembly to the floor..."), \ + span_italics("You hear wrenching.")) if(W.use_tool(src, user, 40, volume=100)) if(anchored) return - to_chat(user, "You secure the airlock assembly.") + to_chat(user, span_notice("You secure the airlock assembly.")) name = "secured airlock assembly" setAnchored(TRUE) else @@ -112,12 +112,12 @@ else user.visible_message("[user] unsecures the airlock assembly from the floor.", \ - "You start to unsecure the airlock assembly from the floor...", \ - "You hear wrenching.") + span_notice("You start to unsecure the airlock assembly from the floor..."), \ + span_italics("You hear wrenching.")) if(W.use_tool(src, user, 40, volume=100)) if(!anchored) return - to_chat(user, "You unsecure the airlock assembly.") + to_chat(user, span_notice("You unsecure the airlock assembly.")) name = "airlock assembly" setAnchored(FALSE) @@ -126,22 +126,22 @@ return user.visible_message("[user] wires the airlock assembly.", \ - "You start to wire the airlock assembly...") + span_notice("You 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, "You wire the airlock assembly.") + to_chat(user, span_notice("You 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.", \ - "You start to cut the wires from the airlock assembly...") + span_notice("You 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, "You cut the wires from the airlock assembly.") + to_chat(user, span_notice("You 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" @@ -149,14 +149,14 @@ 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.", \ - "You start to install electronics into the airlock assembly...") + span_notice("You 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, "You install the airlock electronics.") + to_chat(user, span_notice("You install the airlock electronics.")) state = AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER name = "near finished airlock assembly" electronics = W @@ -164,12 +164,12 @@ else if((W.tool_behaviour == TOOL_CROWBAR) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) user.visible_message("[user] removes the electronics from the airlock assembly.", \ - "You start to remove electronics from the airlock assembly...") + span_notice("You 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, "You remove the airlock electronics.") + to_chat(user, span_notice("You remove the airlock electronics.")) state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS name = "wired airlock assembly" var/obj/item/electronics/airlock/ae @@ -189,16 +189,16 @@ if(istype(G, /obj/item/stack/sheet/rglass) || istype(G, /obj/item/stack/sheet/glass)) playsound(src, 'sound/items/crowbar.ogg', 100, 1) user.visible_message("[user] adds [G.name] to the airlock assembly.", \ - "You start to install [G.name] into the airlock assembly...") + span_notice("You 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, "You install [G.name] windows into the airlock assembly.") + to_chat(user, span_notice("You 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, "You install regular glass windows into the airlock assembly.") + to_chat(user, span_notice("You install regular glass windows into the airlock assembly.")) name = "near finished window airlock assembly" G.use(1) glass = TRUE @@ -207,33 +207,33 @@ var/M = G.sheettype var/mineralassembly = text2path("/obj/structure/door_assembly/door_assembly_[M]") if(!mineralassembly) - to_chat(user, "Nanotrasen has not provisined a door with [G.name] plating in it.") + to_chat(user, span_notice("Nanotrasen has not provisined a door with [G.name] plating in it.")) return FALSE if(G.get_amount() >= 2) playsound(src, 'sound/items/crowbar.ogg', 100, 1) user.visible_message("[user] adds [G.name] to the airlock assembly.", \ - "You start to install [G.name] into the airlock assembly...") + span_notice("You 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, "You install [M] plating into the airlock assembly.") + to_chat(user, span_notice("You install [M] plating into the airlock assembly.")) G.use(2) var/obj/structure/door_assembly/MA = new mineralassembly(loc) transfer_assembly_vars(src, MA, TRUE) else - to_chat(user, "You need at least two sheets add a mineral cover!") + to_chat(user, span_warning("You need at least two sheets add a mineral cover!")) else - to_chat(user, "You cannot add [G] to [src]!") + to_chat(user, span_warning("You cannot add [G] to [src]!")) else - to_chat(user, "You cannot add [G] to [src]!") + to_chat(user, span_warning("You cannot add [G] to [src]!")) else if((W.tool_behaviour == TOOL_SCREWDRIVER) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) user.visible_message("[user] finishes the airlock.", \ - "You start finishing the airlock...") + span_notice("You start finishing the airlock...")) if(W.use_tool(src, user, 40, volume=100)) if(loc && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) - to_chat(user, "You finish the airlock.") + to_chat(user, span_notice("You finish the airlock.")) var/obj/machinery/door/airlock/door if(glass) door = new glass_type( loc ) @@ -327,7 +327,7 @@ /obj/structure/door_assembly/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) if(passed_mode == RCD_DECONSTRUCT) - to_chat(user, "You deconstruct [src].") + to_chat(user, span_notice("You deconstruct [src].")) qdel(src) return TRUE return FALSE diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index 7df5c724d154..3b43d0f71d42 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, "You begin to [anchored ? "unwrench" : "wrench"] [src].") + to_chat(user, span_notice("You begin to [anchored ? "unwrench" : "wrench"] [src].")) if(I.use_tool(src, user, 20, volume=50)) - to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].") + to_chat(user, span_notice("You 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, "You are not capable of wearing underwear.") + to_chat(user, span_warning("You are not capable of wearing underwear.")) return var/choice = input(user, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in list("Underwear","Undershirt","Socks") diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index e569ff60e202..1011f6926607 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -41,10 +41,10 @@ for(var/m in buckled_mobs) var/mob/living/buckled_mob = m buckled_mob.electrocute_act(170, src, 1) - to_chat(buckled_mob, "You feel a deep shock course through your body!") + to_chat(buckled_mob, span_userdanger("You feel a deep shock course through your body!")) if(buckled_mob.mind && is_revolutionary(buckled_mob) && prob(50)) var/datum/antagonist/rev/rev = buckled_mob.mind.has_antag_datum(/datum/antagonist/rev) if(rev) rev.remove_revolutionary(TRUE) visible_message("The electric shock cleared [buckled_mob]'s brainwashing!'") - visible_message("The electric chair went off!", "You hear a deep sharp shock!") + visible_message(span_danger("The electric chair went off!"), span_italics("You hear a deep sharp shock!")) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 59d630739c6a..0d3f46a82036 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) @@ -48,11 +48,11 @@ /obj/structure/extinguisher_cabinet/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WRENCH && !stored_extinguisher) - to_chat(user, "You start unsecuring [name]...") + to_chat(user, span_notice("You start unsecuring [name]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 60)) playsound(loc, 'sound/items/deconstruct.ogg', 50, 1) - to_chat(user, "You unsecure [name].") + to_chat(user, span_notice("You unsecure [name].")) deconstruct(TRUE) return @@ -63,7 +63,7 @@ if(!user.transferItemToLoc(I, src)) return stored_extinguisher = I - to_chat(user, "You place [I] in [src].") + to_chat(user, span_notice("You place [I] in [src].")) update_icon() return TRUE else @@ -82,7 +82,7 @@ return if(stored_extinguisher) user.put_in_hands(stored_extinguisher) - to_chat(user, "You take [stored_extinguisher] from [src].") + to_chat(user, span_notice("You take [stored_extinguisher] from [src].")) stored_extinguisher = null if(!opened) opened = 1 @@ -95,7 +95,7 @@ /obj/structure/extinguisher_cabinet/attack_tk(mob/user) if(stored_extinguisher) stored_extinguisher.forceMove(loc) - to_chat(user, "You telekinetically remove [stored_extinguisher] from [src].") + to_chat(user, span_notice("You telekinetically remove [stored_extinguisher] from [src].")) stored_extinguisher = null opened = 1 playsound(loc, 'sound/machines/click.ogg', 15, 1, -3) @@ -114,7 +114,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/machines/click.ogg', 15, 1, -3) opened = !opened diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index b1b016a6553f..bbf272c16495 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -95,11 +95,11 @@ /obj/structure/falsewall/attackby(obj/item/W, mob/user, params) if(opening) - to_chat(user, "You must wait until the door has stopped moving!") + to_chat(user, span_warning("You must wait until the door has stopped moving!")) return if(W.tool_behaviour == TOOL_CROWBAR) - to_chat(user, "You pry open the false wall!") + to_chat(user, span_warning("You pry open the false wall!")) toggle(user) return @@ -107,15 +107,15 @@ 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.", "You tighten the bolts on the wall.") + user.visible_message(span_notice("[user] tightens some bolts on the wall."), span_notice("You tighten the bolts on the wall.")) ChangeToWall() else - to_chat(user, "You can't reach, close it first!") + to_chat(user, span_warning("You can't reach, close it first!")) else if(W.tool_behaviour == TOOL_WELDER) if(W.use_tool(src, user, 0, volume=50)) @@ -124,7 +124,7 @@ return ..() /obj/structure/falsewall/proc/dismantle(mob/user, disassembled=TRUE, obj/item/tool = null) - user.visible_message("[user] dismantles the false wall.", "You dismantle the false wall.") + user.visible_message("[user] dismantles the false wall.", span_notice("You dismantle the false wall.")) if(tool) tool.play_tool_sound(src, 100) else diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index cf0a02e949dc..736d322710f2 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_notice("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_notice("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_notice("This fence has too much cut out of it already.")) return - user.visible_message("\The [user] starts cutting through \the [src] with \the [W].",\ - "You 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("You 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, "You could probably fit yourself 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("You could probably fit yourself 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 fef4b65c8816..344805b1ce63 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -40,40 +40,40 @@ if(obj_integrity < max_integrity) if(!I.tool_start_check(user, amount=2)) return - to_chat(user, "You begin repairing [src].") + to_chat(user, span_notice("You begin repairing [src].")) if(I.use_tool(src, user, 40, volume=50, amount=2)) obj_integrity = max_integrity update_icon() - to_chat(user, "You repair [src].") + to_chat(user, span_notice("You 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(istype(I, /obj/item/stack/sheet/rglass) && broken)//yogs - change to reinforced glass //Repairing a heavily damaged fireaxe cabinet with glass var/obj/item/stack/sheet/rglass/G = I//yogs - change to reinforced glass if(G.get_amount() < 2) - to_chat(user, "You need two reinforced glass sheets to fix [src]!")//yogs - change to reinforced glass + to_chat(user, span_warning("You need two reinforced glass sheets to fix [src]!"))//yogs - change to reinforced glass return - to_chat(user, "You start fixing [src]...") + to_chat(user, span_notice("You start fixing [src]...")) if(do_after(user, 20, target = src) && G.use(2)) broken = 0 obj_integrity = max_integrity update_icon() //yogs start - warn user if they use the wrong type of glass to repair else if(istype(I, /obj/item/stack/sheet/glass) && broken) - to_chat(user, "You need reinforced glass sheets to fix [src]!") + to_chat(user, span_warning("You need reinforced glass sheets to fix [src]!")) //yogs end else if(open || broken) //Fireaxe cabinet is open or broken, so we can access it's axe slot if(istype(I, /obj/item/twohanded/fireaxe) && !fireaxe && axe) var/obj/item/twohanded/fireaxe/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 fireaxe = F - to_chat(user, "You place the [F.name] back in the [name].") + to_chat(user, span_caution("You place the [F.name] back in the [name].")) update_icon() return else if(istype(I, /obj/item/card/id/captains_spare) && !spareid && !axe) @@ -81,7 +81,7 @@ if(!user.transferItemToLoc(S, src)) return spareid = S - to_chat(user, "You place the [S.name] back in the [name].") + to_chat(user, span_caution("You place the [S.name] back in the [name].")) update_icon() return else if(!broken) @@ -90,12 +90,12 @@ //yogs start - adds unlock if authorized else if (I.GetID()) if(obj_flags & EMAGGED) - to_chat(user, "The [name]'s locking modules are unresponsive.") + to_chat(user, span_notice("The [name]'s locking modules are unresponsive.")) return if (allowed(user)) toggle_lock(user) else - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) //yogs end else return ..() @@ -159,7 +159,7 @@ if(spareid) fireaxe = spareid user.put_in_hands(fireaxe) - to_chat(user, "You take the [fireaxe.name] from the [name].") + to_chat(user, span_caution("You take the [fireaxe.name] from the [name].")) fireaxe = null spareid = null src.add_fingerprint(user) @@ -212,7 +212,7 @@ to_chat(user, " Resetting circuitry...") playsound(src, 'sound/machines/locktoggle.ogg', 50, 1) if(do_after(user, 20, target = src)) - to_chat(user, "You [locked ? "disable" : "re-enable"] the locking modules.") + to_chat(user, span_caution("You [locked ? "disable" : "re-enable"] the locking modules.")) locked = !locked update_icon() @@ -225,7 +225,7 @@ return if(locked) - to_chat(usr, "The [name] won't budge!") + to_chat(usr, span_warning("The [name] won't budge!")) return else playsound(loc, 'sound/machines/click.ogg', 15, 1, -3)//yogs - adds open/close sound @@ -258,14 +258,14 @@ /obj/structure/fireaxecabinet/bridge/spare/reset_lock(mob/user) //this happens when you hack the lock as a synthetic/AI, or with a multitool. if(obj_flags & EMAGGED) - to_chat(user, "You try to reset the [name]'s circuits, but they're completely burnt out.") + to_chat(user, span_notice("You try to reset the [name]'s circuits, but they're completely burnt out.")) return if(!open) to_chat(user, "Resetting circuitry...") if(alert) - to_chat(user, "This will trigger the built in burglary alarm!") + to_chat(user, span_danger("This will trigger the built in burglary alarm!")) if(do_after(user, 15 SECONDS, target = src)) - to_chat(user, "You [locked ? "disable" : "re-enable"] the locking modules.") + to_chat(user, span_caution("You [locked ? "disable" : "re-enable"] the locking modules.")) src.add_fingerprint(user) if(locked) trigger_alarm() //already checks for alert var diff --git a/code/game/objects/structures/fireplace.dm b/code/game/objects/structures/fireplace.dm index 69578a50e931..837bfa58846d 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, "You can't fit any more of [T] in [src]!") + to_chat(user, span_warning("You 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 d5c0bb7c3b17..81594a96a2cd 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -17,9 +17,9 @@ if(W.is_sharp() && W.force > 0) if(W.hitsound) playsound(get_turf(src), W.hitsound, 100, 0, 0) - user.visible_message("[user] begins to cut down [src] with [W].","You begin to cut down [src] with [W].", "You hear the sound of sawing.") + user.visible_message(span_notice("[user] begins to cut down [src] with [W]."),span_notice("You begin to cut down [src] with [W]."), "You 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].","You fell [src] with the [W].", "You hear the sound of a tree falling.") + user.visible_message(span_notice("[user] fells [src] with the [W]."),span_notice("You fell [src] with the [W]."), "You hear the sound of a tree falling.") playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100 , 0, 0) for(var/i=1 to log_amount) new /obj/item/grown/log/tree(get_turf(src)) @@ -79,9 +79,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 @@ -384,9 +384,9 @@ /obj/structure/flora/rock/attackby(obj/item/W, mob/user, params) if(mineResult && (!(flags_1 & NODECONSTRUCT_1))) if(W.tool_behaviour == TOOL_MINING) - to_chat(user, "You start mining...") + to_chat(user, span_notice("You start mining...")) if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "You finish mining the rock.") + to_chat(user, span_notice("You finish mining the rock.")) new mineResult(get_turf(src), 20) SSblackbox.record_feedback("tally", "pick_used_mining", 1, W.type) qdel(src) diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index 750b163f72b8..63a789d19de4 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -12,10 +12,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]...", "You start disassembling [src]...") + user.visible_message(span_notice("[user] starts disassembling [src]..."), span_notice("You start disassembling [src]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 50)) - user.visible_message("[user] disassembles [src]!", "You break down [src] into scrap metal.") + user.visible_message(span_notice("[user] disassembles [src]!"), span_notice("You break down [src] into scrap metal.")) playsound(user, 'sound/items/deconstruct.ogg', 50, 1) new/obj/item/stack/sheet/metal(drop_location()) qdel(src) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index c7c1f6ec90b0..56ebe2d0b053 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(user)] golem-swapped into [src]") - user.visible_message("A faint light leaves [user], moving to [src] and animating it!","You leave your old body behind, and transfer into [src]!") + user.visible_message(span_notice("A faint light leaves [user], moving to [src] and animating it!"),span_notice("You leave your old body behind, and transfer into [src]!")) show_flavour = FALSE create(ckey = user.ckey,name = user.real_name) user.death() @@ -397,7 +397,7 @@ id.registered_name = L.real_name id.update_label() else - to_chat(L, "Your owner is already dead! You will soon perish.") + to_chat(L, span_userdanger("Your owner is already dead! You will soon perish.")) addtimer(CALLBACK(L, /mob.proc/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 f9c2834f4bbc..d9d4a164fbdd 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -24,55 +24,55 @@ if(GIRDER_DISPLACED) . += "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, "You start slicing apart the girder...") + to_chat(user, span_notice("You start slicing apart the girder...")) if(W.use_tool(src, user, 40, volume=100)) - to_chat(user, "You slice apart the girder.") + to_chat(user, span_notice("You 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, "You need at least two rods to create a false wall!") + to_chat(user, span_warning("You need at least two rods to create a false wall!")) return - to_chat(user, "You start building a reinforced false wall...") + to_chat(user, span_notice("You 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, "You create a false wall. Push on it to open or close the passage.") + to_chat(user, span_notice("You 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, "You need at least five rods to add plating!") + to_chat(user, span_warning("You need at least five rods to add plating!")) return - to_chat(user, "You start adding plating...") + to_chat(user, span_notice("You start adding plating...")) if(do_after(user, 40, target = src)) if(S.get_amount() < 5) return S.use(5) - to_chat(user, "You add the plating.") + to_chat(user, span_notice("You 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, "You need two sheets of metal to create a false wall!") + to_chat(user, span_warning("You need two sheets of metal to create a false wall!")) return - to_chat(user, "You start building a false wall...") + to_chat(user, span_notice("You start building a false wall...")) if(do_after(user, 20, target = src)) if(S.get_amount() < 2) return S.use(2) - to_chat(user, "You create a false wall. Push on it to open or close the passage.") + to_chat(user, span_notice("You 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, "You need two sheets of metal to finish a wall!") + to_chat(user, span_warning("You need two sheets of metal to finish a wall!")) return - to_chat(user, "You start adding plating...") + to_chat(user, span_notice("You start adding plating...")) if (do_after(user, 40, target = src)) if(S.get_amount() < 2) return S.use(2) - to_chat(user, "You add the plating.") + to_chat(user, span_notice("You 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, "You need at least two sheets to create a false wall!") + to_chat(user, span_warning("You need at least two sheets to create a false wall!")) return - to_chat(user, "You start building a reinforced false wall...") + to_chat(user, span_notice("You 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, "You create a reinforced false wall. Push on it to open or close the passage.") + to_chat(user, span_notice("You 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, "You start finalizing the reinforced wall...") + to_chat(user, span_notice("You start finalizing the reinforced wall...")) if(do_after(user, 50, target = src)) if(S.get_amount() < 1) return S.use(1) - to_chat(user, "You fully reinforce the wall.") + to_chat(user, span_notice("You 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, "You start reinforcing the girder...") + to_chat(user, span_notice("You start reinforcing the girder...")) if(do_after(user, 60, target = src)) if(S.get_amount() < 1) return S.use(1) - to_chat(user, "You reinforce the girder.") + to_chat(user, span_notice("You 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, "You need at least two sheets to create a false wall!") + to_chat(user, span_warning("You 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, "You create a false wall. Push on it to open or close the passage.") + to_chat(user, span_notice("You 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, "You need at least two sheets to add plating!") + to_chat(user, span_warning("You need at least two sheets to add plating!")) return - to_chat(user, "You start adding plating...") + to_chat(user, span_notice("You start adding plating...")) if (do_after(user, 40, target = src)) if(S.get_amount() < 2) return S.use(2) - to_chat(user, "You add the plating.") + to_chat(user, span_notice("You 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, "You fit the pipe into \the [src].") + to_chat(user, span_notice("You fit the pipe into \the [src].")) else return ..() @@ -205,34 +205,34 @@ . = FALSE if(state == GIRDER_DISPLACED) - user.visible_message("[user] disassembles the girder.", - "You start to disassemble the girder...", + user.visible_message(span_warning("[user] disassembles the girder."), + span_notice("You start to disassemble the girder..."), "You 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, "You disassemble the girder.") + to_chat(user, span_notice("You 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, "You start unsecuring support struts...") + to_chat(user, span_notice("You start unsecuring support struts...")) if(tool.use_tool(src, user, 40, volume=100)) if(state != GIRDER_REINF) return - to_chat(user, "You unsecure the support struts.") + to_chat(user, span_notice("You unsecure the support struts.")) state = GIRDER_REINF_STRUTS return TRUE else if(state == GIRDER_REINF_STRUTS) - to_chat(user, "You start securing support struts...") + to_chat(user, span_notice("You start securing support struts...")) if(tool.use_tool(src, user, 40, volume=100)) if(state != GIRDER_REINF_STRUTS) return - to_chat(user, "You secure the support struts.") + to_chat(user, span_notice("You secure the support struts.")) state = GIRDER_REINF return TRUE @@ -240,9 +240,9 @@ /obj/structure/girder/wirecutter_act(mob/user, obj/item/tool) . = FALSE if(state == GIRDER_REINF_STRUTS) - to_chat(user, "You start removing the inner grille...") + to_chat(user, span_notice("You start removing the inner grille...")) if(tool.use_tool(src, user, 40, volume=100)) - to_chat(user, "You remove the inner grille.") + to_chat(user, span_notice("You 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 @@ . = FALSE 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, "You start securing the girder...") + to_chat(user, span_notice("You start securing the girder...")) if(tool.use_tool(src, user, 40, volume=100)) - to_chat(user, "You secure the girder.") + to_chat(user, span_notice("You 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, "You start unsecuring the girder...") + to_chat(user, span_notice("You start unsecuring the girder...")) if(tool.use_tool(src, user, 40, volume=100)) - to_chat(user, "You unsecure the girder.") + to_chat(user, span_notice("You unsecure the girder.")) var/obj/structure/girder/displaced/D = new (loc) transfer_fingerprints_to(D) qdel(src) @@ -328,7 +328,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]!", "You demolish [src].") + user.visible_message(span_warning("[user] strikes [src] with [W]!"), span_notice("You demolish [src].")) new /obj/item/stack/sheet/runed_metal(drop_location(), 1) qdel(src) @@ -336,9 +336,9 @@ if(!W.tool_start_check(user, amount=0)) return - to_chat(user, "You start slicing apart the girder...") + to_chat(user, span_notice("You start slicing apart the girder...")) if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "You slice apart the girder.") + to_chat(user, span_notice("You slice apart the girder.")) var/obj/item/stack/sheet/runed_metal/R = new(drop_location(), 1) transfer_fingerprints_to(R) qdel(src) @@ -346,13 +346,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, "You need at least one sheet of runed metal to construct a runed wall!") + to_chat(user, span_warning("You 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]...", "You begin constructing a runed wall...") + user.visible_message(span_notice("[user] begins laying runed metal on [src]..."), span_notice("You 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.", "You construct a runed wall.") + user.visible_message(span_notice("[user] plates [src] with runed metal."), span_notice("You construct a runed wall.")) R.use(1) var/turf/T = get_turf(src) T.PlaceOnTop(/turf/closed/wall/mineral/cult) @@ -381,12 +381,12 @@ var/turf/T = get_turf(src) switch(passed_mode) if(RCD_FLOORWALL) - to_chat(user, "You finish a wall.") + to_chat(user, span_notice("You finish a wall.")) T.PlaceOnTop(/turf/closed/wall) qdel(src) return TRUE if(RCD_DECONSTRUCT) - to_chat(user, "You deconstruct the girder.") + to_chat(user, span_notice("You deconstruct the girder.")) qdel(src) return TRUE return FALSE @@ -403,9 +403,9 @@ if(W.tool_behaviour == TOOL_WELDER) if(!W.tool_start_check(user, amount = 0)) return - to_chat(user, "You start slicing apart [src]...") + to_chat(user, span_notice("You start slicing apart [src]...")) if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "You slice apart [src].") + to_chat(user, span_notice("You slice apart [src].")) var/obj/item/stack/tile/bronze/B = new(drop_location(), 2) transfer_fingerprints_to(B) qdel(src) @@ -413,13 +413,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, "You need at least two bronze sheets to build a bronze wall!") + to_chat(user, span_warning("You need at least two bronze sheets to build a bronze wall!")) return 0 - user.visible_message("[user] begins plating [src] with bronze...", "You begin constructing a bronze wall...") + user.visible_message(span_notice("[user] begins plating [src] with bronze..."), span_notice("You 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!", "You construct a bronze wall.") + user.visible_message(span_notice("[user] plates [src] with bronze!"), span_notice("You 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 30d9af7142a6..59bfd617ec15 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -69,7 +69,7 @@ /obj/structure/grille/rcd_act(mob/user, var/obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_DECONSTRUCT) - to_chat(user, "You deconstruct the grille.") + to_chat(user, span_notice("You deconstruct the grille.")) qdel(src) return TRUE if(RCD_WINDOWGRILLE) @@ -79,7 +79,7 @@ var/window_dir = the_rcd.window_size == RCD_WINDOW_FULLTILE ? FULLTILE_WINDOW_DIR : user.dir if(!valid_window_location(T, window_dir)) return FALSE - to_chat(user, "You construct the window.") + to_chat(user, span_notice("You construct the window.")) var/obj/structure/window/WD = new the_rcd.window_type(T, window_dir) WD.setAnchored(TRUE) return TRUE @@ -121,7 +121,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, "melee", 1) @@ -129,7 +129,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, "melee", 1) @@ -157,16 +157,16 @@ if(!shock(user, 90)) W.play_tool_sound(src, 100) setAnchored(!anchored) - user.visible_message("[user] [anchored ? "fastens" : "unfastens"] [src].", \ - "You [anchored ? "fasten [src] to" : "unfasten [src] from"] the floor.") + user.visible_message(span_notice("[user] [anchored ? "fastens" : "unfastens"] [src]."), \ + span_notice("You [anchored ? "fasten [src] to" : "unfasten [src] from"] the floor.")) queue_smooth(src) queue_smooth_neighbors(src) 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.", \ - "You rebuild the broken grille.") + user.visible_message(span_notice("[user] rebuilds the broken grille."), \ + span_notice("You rebuild the broken grille.")) new grille_type(src.loc) R.use(1) qdel(src) @@ -177,16 +177,16 @@ if (!broken) var/obj/item/stack/ST = W if (ST.get_amount() < 2) - to_chat(user, "You need at least two sheets of glass for that!") + to_chat(user, span_warning("You 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, "You start placing the window...") + to_chat(user, span_notice("You start placing the window...")) if(do_after(user,20, target = src)) if(!src.loc || !anchored) //Grille broken or unanchored while waiting return @@ -210,7 +210,7 @@ WD.setAnchored(FALSE) WD.state = 0 ST.use(2) - to_chat(user, "You place [WD] on [src].") + to_chat(user, span_notice("You 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 9d0152e36707..2a0ee98e1c9f 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -35,16 +35,16 @@ /obj/structure/guillotine/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/stack/sheet/plasteel)) - to_chat(user, "You start repairing the guillotine with the plasteel.") + to_chat(user, span_notice("You 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, "You repair the guillotine with the plasteel.") + to_chat(user, span_notice("You repair the guillotine with the plasteel.")) else - to_chat(user, "You stop repairing the guillotine with the plasteel.") + to_chat(user, span_notice("You stop repairing the guillotine with the plasteel.")) else - to_chat(user, "The guillotine is already fully repaired!") + to_chat(user, span_notice("The guillotine is already fully repaired!")) /obj/structure/guillotine/examine(mob/user) . = ..() @@ -84,8 +84,8 @@ if (GUILLOTINE_BLADE_RAISED) if (LAZYLEN(buckled_mobs)) if (user.a_intent == INTENT_HARM) - user.visible_message("[user] begins to pull the lever!", - "You begin to the pull the lever.") + user.visible_message(span_warning("[user] begins to pull the lever!"), + span_warning("You 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) @@ -172,8 +172,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.", - "You sharpen the large blade of the guillotine.") + user.visible_message(span_notice("[user] sharpens the large blade of the guillotine."), + span_notice("You sharpen the large blade of the guillotine.")) blade_sharpness += 1 playsound(src, 'sound/items/unsheath.ogg', 100, 1) return @@ -181,25 +181,25 @@ 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, "You need to raise the blade in order to sharpen it!") + to_chat(user, span_warning("You need to raise the blade in order to sharpen it!")) return else return ..() /obj/structure/guillotine/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE) if (!anchored) - to_chat(usr, "The [src] needs to be wrenched to the floor!") + to_chat(usr, span_warning("The [src] needs to be wrenched to the floor!")) 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, "You need to raise the blade before buckling someone in!") + to_chat(usr, span_warning("You need to raise the blade before buckling someone in!")) return FALSE return ..(M, force, FALSE) @@ -237,7 +237,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 e510021b18cb..b6e6ea5ad199 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, "You place [I] in [src].") + to_chat(user, span_notice("You 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.a_intent != INTENT_HARM) diff --git a/code/game/objects/structures/headpike.dm b/code/game/objects/structures/headpike.dm index 48dd500b52db..a76c4bb1b18c 100644 --- a/code/game/objects/structures/headpike.dm +++ b/code/game/objects/structures/headpike.dm @@ -40,7 +40,7 @@ . = ..() if(.) return - to_chat(user, "You take down [src].") + to_chat(user, span_notice("You 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 7d19ef98c899..71332dc00e43 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/effects/empulse.ogg', 25, 1) addtimer(CALLBACK(src, .proc/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/effects/empulse.ogg', 25, 1) qdel(src) return diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index 9688ea96359c..70dcdb4b52d1 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -160,7 +160,7 @@ /obj/structure/holosign/barrier/medical/attack_hand(mob/living/user) if(CanPass(user) && user.a_intent == INTENT_HELP) force_allaccess = !force_allaccess - to_chat(user, "You [force_allaccess ? "deactivate" : "activate"] the biometric scanners.") //warning spans because you can make the station sick! + to_chat(user, span_warning("You [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 a4d6d1c1d192..fd1a614497c6 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -24,24 +24,24 @@ /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, "You wet [mop] in [src].") + to_chat(user, span_notice("You wet [mop] in [src].")) playsound(loc, 'sound/effects/slosh.ogg', 25, 1) return 1 /obj/structure/janitorialcart/proc/put_in_cart(obj/item/I, mob/user) if(!user.transferItemToLoc(I, src)) return - to_chat(user, "You put [I] into [src].") + to_chat(user, span_notice("You 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 @@ -99,13 +99,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].", "You begin to empty the contents of [src]...") + user.visible_message("[user] begins to empty the contents of [src].", span_notice("You begin to empty the contents of [src]...")) if(I.use_tool(src, user, 30)) - to_chat(usr, "You empty the contents of [src]'s bucket onto the floor.") + to_chat(usr, span_notice("You empty the contents of [src]'s bucket onto the floor.")) reagents.reaction(src.loc) src.reagents.clear_reagents() else @@ -146,49 +146,49 @@ if(!mybag) return user.put_in_hands(mybag) - to_chat(user, "You take [mybag] from [src].") + to_chat(user, span_notice("You take [mybag] from [src].")) mybag = null if("Mop") if(!mymop) return user.put_in_hands(mymop) - to_chat(user, "You take [mymop] from [src].") + to_chat(user, span_notice("You take [mymop] from [src].")) mymop = null if("Spray bottle") if(!myspray) return user.put_in_hands(myspray) - to_chat(user, "You take [myspray] from [src].") + to_chat(user, span_notice("You take [myspray] from [src].")) myspray = null if("Paint remover") if(!myremover) return user.put_in_hands(myremover) - to_chat(user, "You take [myremover] from [src].") + to_chat(user, span_notice("You take [myremover] from [src].")) myremover = null if("Fly swatter") if(!myswatter) return user.put_in_hands(myswatter) - to_chat(user, "You take [myswatter] from [src].") + to_chat(user, span_notice("You take [myswatter] from [src].")) myswatter = null if("Flashlight") if(!mylight) return user.put_in_hands(mylight) - to_chat(user, "You take [mylight] from [src].") + to_chat(user, span_notice("You take [mylight] from [src].")) mylight = null if("Light replacer") if(!myreplacer) return user.put_in_hands(myreplacer) - to_chat(user, "You take [myreplacer] from [src].") + to_chat(user, span_notice("You take [myreplacer] from [src].")) myreplacer = null if("Sign") if(signs <= 0) return user.put_in_hands(sign) - to_chat(user, "You take \a [sign] from [src].") + to_chat(user, span_notice("You take \a [sign] from [src].")) signs-- else return diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index ad95b6c60955..c72229f9f94d 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, "You add spikes to the frame.") + to_chat(user, span_notice("You 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, "You begin cutting \the [src] apart...") + to_chat(user, span_notice("You begin cutting \the [src] apart...")) if(I.use_tool(src, user, 50, volume=50)) - visible_message("[user] slices apart \the [src].", - "You cut \the [src] apart with \the [I].", - "You hear welding.") + visible_message(span_notice("[user] slices apart \the [src]."), + span_notice("You cut \the [src] apart with \the [I]."), + span_italics("You 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, "You can't do that while something's on the spike!") + to_chat(user, span_notice("You can't do that while something's on the spike!")) return TRUE if(I.use_tool(src, user, 20, volume=100)) - to_chat(user, "You pry the spikes out of the frame.") + to_chat(user, span_notice("You pry the spikes out of the frame.")) deconstruct(TRUE) return TRUE @@ -72,7 +72,7 @@ if(user.pulling != L) return playsound(src.loc, 'sound/effects/splat.ogg', 25, 1) - L.visible_message("[user] slams [L] onto the meat spike!", "[user] slams you onto the meat spike!", "You hear a squishy wet noise.") + L.visible_message(span_danger("[user] slams [L] onto the meat spike!"), span_userdanger("[user] slams you onto the meat spike!"), span_italics("You hear a squishy wet noise.")) L.forceMove(drop_location()) L.emote("scream") L.add_splatter_floor() @@ -100,24 +100,24 @@ 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!",\ - "You hear a squishy wet noise.") + span_notice("[user] is trying to pull you off [src], opening up fresh wounds!"),\ + span_italics("You 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].") + span_notice("[user] fails to pull you off of [src].")) return else M.visible_message(\ - "[M] struggles to break free from [src]!",\ - "You struggle to break free from [src], exacerbating your wounds! (Stay still for two minutes.)",\ - "You hear a wet squishing noise..") + span_warning("[M] struggles to break free from [src]!"),\ + span_notice("You struggle to break free from [src], exacerbating your wounds! (Stay still for two minutes.)"),\ + span_italics("You hear a wet squishing noise..")) M.adjustBruteLoss(30) if(!do_after(M, 1200, target = src)) if(M && M.buckled) - to_chat(M, "You fail to free yourself!") + to_chat(M, span_warning("You fail to free yourself!")) return if(!M.buckled) return @@ -129,7 +129,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 b3f415bafe64..fe79779d7efa 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -70,7 +70,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) @@ -107,7 +107,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) @@ -135,9 +135,9 @@ /obj/structure/ladder/proc/show_fluff_message(going_up, mob/user) if(going_up) - user.visible_message("[user] climbs up [src].","You climb up [src].") + user.visible_message("[user] climbs up [src].",span_notice("You climb up [src].")) else - user.visible_message("[user] climbs down [src].","You climb down [src].") + user.visible_message("[user] climbs down [src].",span_notice("You 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 7cf59cc09120..edbee5e9dad2 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -40,7 +40,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) @@ -57,7 +57,7 @@ /obj/structure/lattice/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) if(passed_mode == RCD_FLOORWALL) - to_chat(user, "You build a floor.") + to_chat(user, span_notice("You build a floor.")) var/turf/T = src.loc if(isspaceturf(T)) T.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index c19f4f8240b3..db8d49c8808b 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -72,8 +72,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/effects/tendril_destroyed.ogg', 200, 0, 50, 1, 1) addtimer(CALLBACK(src, .proc/collapse), 50) @@ -85,7 +85,7 @@ GLOBAL_LIST_INIT(tendrils, list()) for(var/mob/M in range(7,src)) shake_camera(M, 15, 1) playsound(get_turf(src),'sound/effects/explosionfar.ogg', 200, 1) - 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 0ae0e29459a4..c95ec00532d7 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].", "You sever the connection between yourself and [src].") + user.visible_message(span_notice("[user] reaches out and pinches the flame of [src]."), span_warning("You sever the connection between yourself and [src].")) linked_minds -= user.mind else - user.visible_message("[user] touches [src]. It seems to respond to [user.p_their()] presence!", "You 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("You 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 525bd81b8c4b..304644d64e1b 100644 --- a/code/game/objects/structures/loom.dm +++ b/code/game/objects/structures/loom.dm @@ -12,15 +12,15 @@ if(istype(I, /obj/item/stack/sheet)) var/obj/item/stack/sheet/W = I if(W.is_fabric && W.amount > 1) - user.show_message("You start weaving the [W.name] through the loom..", MSG_VISUAL) + user.show_message(span_notice("You start weaving the [W.name] through the loom.."), MSG_VISUAL) if(W.use_tool(src, user, W.pull_effort)) new W.loom_result(drop_location()) - user.show_message("You weave the [W.name] into a workable fabric.", MSG_VISUAL) + user.show_message(span_notice("You weave the [W.name] into a workable fabric."), MSG_VISUAL) W.amount = (W.amount - FABRIC_PER_SHEET) if(W.amount < 1) qdel(W) else - user.show_message("You need a valid fabric and at least [FABRIC_PER_SHEET] of said fabric before using this.") + user.show_message(span_notice("You need a valid fabric and at least [FABRIC_PER_SHEET] of said fabric before using this.")) else return ..() diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 29c7b08aba1e..23ecc22f320d 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -149,37 +149,37 @@ if(I.tool_behaviour != TOOL_MINING) return . = TRUE - to_chat(user, "You start digging [src]...") + to_chat(user, span_notice("You start digging [src]...")) if(I.use_tool(src, user, 40, volume=50)) - to_chat(user, "You finish digging.") + to_chat(user, span_notice("You 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]!", "You start welding apart [src].") + user.visible_message("[user] starts to weld apart [src]!", span_notice("You start welding apart [src].")) if(!I.use_tool(src, user, 60, 5, 50)) to_chat(user, "You failed to weld apart [src]!/span>") return - user.visible_message("[user] welded [src] into pieces!", "You welded apart [src]!") + user.visible_message("[user] welded [src] into pieces!", span_notice("You 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]!", "You start prying apart [src].") + user.visible_message("[user] starts to pry apart [src]!", span_notice("You start prying apart [src].")) if(!I.use_tool(src, user, 60, volume = 50)) to_chat(user, "You failed to pry apart [src]!/span>") return - user.visible_message("[user] pried [src] into pieces!", "You pried apart [src]!") + user.visible_message("[user] pried [src] into pieces!", span_notice("You pried apart [src]!")) deconstruct(TRUE) @@ -331,11 +331,11 @@ return if((user.a_intent != INTENT_HARM) && istype(I, /obj/item/paper) && (obj_integrity < max_integrity)) - user.visible_message("[user] starts to patch the holes in [src].", "You start patching some of the holes in [src]!") + user.visible_message("[user] starts to patch the holes in [src].", span_notice("You 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].", "You patch some of the holes in [src]!") + user.visible_message("[user] patches some of the holes in [src].", span_notice("You patch some of the holes in [src]!")) return TRUE return ..() diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 21b578c7258f..fa21897b4699 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -76,9 +76,9 @@ if(!I.tool_start_check(user, amount=0)) return TRUE - to_chat(user, "You begin repairing [src]...") + to_chat(user, span_notice("You begin repairing [src]...")) if(I.use_tool(src, user, 10, volume=50)) - to_chat(user, "You repair [src].") + to_chat(user, span_notice("You repair [src].")) broken = 0 icon_state = initial(icon_state) desc = initial(desc) @@ -185,7 +185,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() @@ -200,7 +200,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 @@ -209,7 +209,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 2ddf95fec59b..843185bcc24e 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -20,10 +20,10 @@ return ourmop = M update_icon() - to_chat(user, "You put [M] into [src].") + to_chat(user, span_notice("You put [M] into [src].")) else reagents.trans_to(M, 5, transfered_by = user) - to_chat(user, "You wet [M] in [src].") + to_chat(user, span_notice("You wet [M] in [src].")) playsound(loc, 'sound/effects/slosh.ogg', 25, 1) update_icon() else @@ -33,7 +33,7 @@ /obj/structure/mopbucket/attack_hand(mob/user) if(ourmop) user.put_in_hands(ourmop) - to_chat(user, "You take [ourmop] from [src].") + to_chat(user, span_notice("You take [ourmop] from [src].")) ourmop = null update_icon() return diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 19f69fe21bca..a547a3a7ec35 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, "You scribble illegibly on the side of [src]!") + to_chat(user, span_notice("You 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, \ - "You lean on the back of [src] and start pushing the tray open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "You hear a metallic creaking from [src].") + span_notice("You lean on the back of [src] and start pushing the tray open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_italics("You 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]!", \ - "You successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("You 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, "You turn the speaker function [beeper ? "on" : "off"].") + to_chat(user, span_notice("You 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() @@ -251,11 +251,11 @@ GLOBAL_LIST_EMPTY(crematoriums) var/list/conts = GetAllContents() - src - connected if(!conts.len) - audible_message("You hear a hollow crackle.") + audible_message(span_italics("You hear a hollow crackle.")) return else - audible_message("You hear a roar as the crematorium activates.") + audible_message(span_italics("You hear a roar as the crematorium activates.")) locked = TRUE update_icon() @@ -343,7 +343,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(!ismovable(O) || O.anchored || !Adjacent(user) || !user.Adjacent(O) || O.loc == user) @@ -363,7 +363,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/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index b87fce5e7a38..bc3050dfb0d6 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, "You are not authorized to add notices") + to_chat(user, span_info("You are not authorized to add notices")) return if(notices < 5) if(!user.transferItemToLoc(O, src)) return notices++ icon_state = "nboard0[notices]" - to_chat(user, "You pin the [O] to the noticeboard.") + to_chat(user, span_notice("You pin the [O] to the noticeboard.")) else - to_chat(user, "The notice board is full") + to_chat(user, span_notice("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_notice("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 e87dc554a875..cd30d500870f 100644 --- a/code/game/objects/structures/petrified_statue.dm +++ b/code/game/objects/structures/petrified_statue.dm @@ -17,9 +17,9 @@ L.buckled.unbuckle_mob(L,force=1) //yogs start -- pan if(pan == TRUE) - L.visible_message("[L]'s skin rapidly turns to bananium!", "BONK!") + L.visible_message(span_warning("[L]'s skin rapidly turns to bananium!"), "BONK!") else - L.visible_message("[L]'s skin rapidly turns to marble!", "Your body freezes up! Can't... move... can't... think...") + L.visible_message(span_warning("[L]'s skin rapidly turns to marble!"), span_userdanger("Your body freezes up! Can't... move... can't... think...")) //yogs end -- pan L.forceMove(src) ADD_TRAIT(L, TRAIT_MUTE, STATUE_MUTE) @@ -55,7 +55,7 @@ if(petrified_mob) S.mind.transfer_to(petrified_mob) petrified_mob.Paralyze(100) - to_chat(petrified_mob, "You slowly come back to your senses. You are in control of yourself again!") + to_chat(petrified_mob, span_notice("You slowly come back to your senses. You are in control of yourself again!")) qdel(S) for(var/obj/O in src) @@ -74,7 +74,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 b1d0b2cd05fe..98560a09e3b0 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -29,21 +29,21 @@ 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.", "You start to [uraction] the floor...", "You hear rustling noises.") + user.visible_message(span_warning("[user] [action] the floor."), span_notice("You start to [uraction] the floor..."), "You hear rustling noises.") if(W.use_tool(src, user, 100, volume=100, extra_checks = CALLBACK(src, .proc/check_anchored_state, anchored))) setAnchored(!anchored) - to_chat(user, " You [anchored ? "unscrew" : "screw"] [src] from the floor.") + to_chat(user, span_notice(" You [anchored ? "unscrew" : "screw"] [src] from the floor.")) return TRUE else return TRUE /obj/structure/plasticflaps/wirecutter_act(mob/living/user, obj/item/W) if(!anchored) - user.visible_message("[user] cuts apart [src].", "You start to cut apart [src].", "You hear cutting.") + user.visible_message(span_warning("[user] cuts apart [src]."), span_notice("You start to cut apart [src]."), "You hear cutting.") if(W.use_tool(src, user, 50, volume=100)) if(anchored) return TRUE - to_chat(user, "You cut apart [src].") + to_chat(user, span_notice("You 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/railings.dm b/code/game/objects/structures/railings.dm index 482a4107605e..b95a35d84022 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -32,18 +32,18 @@ if(!I.tool_start_check(user, amount=0)) return - to_chat(user, "You begin repairing [src]...") + to_chat(user, span_notice("You begin repairing [src]...")) if(I.use_tool(src, user, 40, volume=50)) obj_integrity = max_integrity - to_chat(user, "You repair [src].") + to_chat(user, span_notice("You repair [src].")) else - to_chat(user, "[src] is already in good condition!") + to_chat(user, span_warning("[src] is already in good condition!")) return /obj/structure/railing/wirecutter_act(mob/living/user, obj/item/I) . = ..() if(!anchored) - to_chat(user, "You cut apart the railing.") + to_chat(user, span_warning("You cut apart the railing.")) I.play_tool_sound(src, 100) deconstruct() return TRUE @@ -58,10 +58,10 @@ . = ..() if(flags_1&NODECONSTRUCT_1) return - to_chat(user, "You begin to [anchored ? "unfasten the railing from":"fasten the railing to"] the floor...") + to_chat(user, span_notice("You begin to [anchored ? "unfasten the railing from":"fasten the railing to"] the floor...")) if(I.use_tool(src, user, volume = 75, extra_checks = CALLBACK(src, .proc/check_anchored, anchored))) setAnchored(!anchored) - to_chat(user, "You [anchored ? "fasten the railing to":"unfasten the railing from"] the floor.") + to_chat(user, span_notice("You [anchored ? "fasten the railing to":"unfasten the railing from"] the floor.")) return TRUE /obj/structure/railing/CanAllowThrough(atom/movable/mover, turf/target) @@ -85,13 +85,13 @@ /obj/structure/railing/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)) //Expanded to include rails, as well! - 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 diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index 56b0ef0cf6bb..e737fa41922d 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, "You [can_rotate ? "unlock" : "lock"] [src]'s rotation.") + to_chat(user, span_notice("You [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].", "You start to dismantle [src]...") + user.visible_message("[user] starts to dismantle [src].", span_notice("You start to dismantle [src]...")) if(W.use_tool(src, user, 80, volume=50)) - to_chat(user, "You dismantle [src].") + to_chat(user, span_notice("You dismantle [src].")) new framebuildstacktype(drop_location(), framebuildstackamount) if(buildstackamount) new buildstacktype(drop_location(), buildstackamount) @@ -101,33 +101,33 @@ return user.visible_message("[user] starts to repair [src].", - "You begin repairing [src]...", - "You hear welding.") + span_notice("You begin repairing [src]..."), + span_italics("You hear welding.")) if(W.use_tool(src, user, 40, volume=40)) obj_integrity = max_integrity user.visible_message("[user] has repaired [src].", \ - "You finish repairing [src].") + span_notice("You 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.", - "You start to weld [src] to the floor...", - "You hear welding.") + span_notice("You start to weld [src] to the floor..."), + span_italics("You hear welding.")) if (W.use_tool(src, user, 20, volume=50)) setAnchored(TRUE) - to_chat(user, "You weld [src] to the floor.") + to_chat(user, span_notice("You 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.", - "You start to cut [src] free from the floor...", - "You hear welding.") + span_notice("You start to cut [src] free from the floor..."), + span_italics("You hear welding.")) if (W.use_tool(src, user, 20, volume=50)) setAnchored(FALSE) - to_chat(user, "You cut [src] free from the floor.") + to_chat(user, span_notice("You 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, "You need five sheets of glass to create a reflector!") + to_chat(user, span_warning("You 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, "You need ten sheets of reinforced glass to create a double reflector!") + to_chat(user, span_warning("You 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/safe.dm b/code/game/objects/structures/safe.dm index 0ba7b2716895..6a192b950268 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, "You hear a [pick("tonk", "krunk", "plunk")] from [src].") + to_chat(user, span_italics("You hear a [pick("tonk", "krunk", "plunk")] from [src].")) if(tumbler_2_pos == tumbler_2_open) - to_chat(user, "You hear a [pick("tink", "krink", "plink")] from [src].") + to_chat(user, span_italics("You 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, "You [open ? "close" : "open"] [src].") + to_chat(user, span_notice("You [open ? "close" : "open"] [src].")) open = !open update_icon() updateUsrDialog() return else - to_chat(user, "You can't [open ? "close" : "open"] [src], the lock is engaged!") + to_chat(user, span_warning("You 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, "You hear a [pick("clack", "scrape", "clank")] from [src].") + to_chat(user, span_italics("You 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, "You hear a [pick("click", "chink", "clink")] from [src].") + to_chat(user, span_italics("You 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, "You hear a [pick("clack", "scrape", "clank")] from [src].") + to_chat(user, span_italics("You 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, "You hear a [pick("click", "chink", "clink")] from [src].") + to_chat(user, span_italics("You 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, "You put [I] in [src].") + to_chat(user, span_notice("You 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 cdaaba70ed02..cc9c8305a0a1 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, "You screw the screws back into the showcase.") + to_chat(user, span_notice("You 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, "You unscrew the screws.") + to_chat(user, span_notice("You 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, "You start to crowbar the showcase apart...") + to_chat(user, span_notice("You 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 2927f0ca0cc1..4c5f3a506191 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, "You begin to adjust the temperature valve with \the [I]...") + to_chat(user, span_notice("You begin to adjust the temperature valve with \the [I]...")) 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].", "You adjust the shower with \the [I] to [current_temperature] temperature.") + user.visible_message(span_notice("[user] adjusts the shower with \the [I]."), span_notice("You 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() @@ -124,12 +124,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 7d384d98f303..96cd701526f5 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]...", \ - "You start unfastening [src].") + user.visible_message(span_notice("[user] starts removing [src]..."), \ + span_notice("You start unfastening [src].")) I.play_tool_sound(src) if(I.use_tool(src, user, 40)) playsound(src, 'sound/items/deconstruct.ogg', 50, 1) - user.visible_message("[user] unfastens [src].", \ - "You unfasten [src].") + user.visible_message(span_notice("[user] unfastens [src]."), \ + span_notice("You unfasten [src].")) var/obj/item/sign_backing/SB = new (get_turf(user)) SB.icon_state = icon_state SB.sign_path = type @@ -103,8 +103,8 @@ . = ..() if(isturf(target) && proximity) var/turf/T = target - user.visible_message("[user] fastens [src] to [T].", \ - "You attach the sign to [T].") + user.visible_message(span_notice("[user] fastens [src] to [T]."), \ + span_notice("You attach the sign to [T].")) playsound(T, 'sound/items/deconstruct.ogg', 50, 1) 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 dd80fb14d982..5d2cf83f7530 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 0 //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 0 return 1 diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index ca4d056e1a13..3cc00b651818 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -30,10 +30,10 @@ return FALSE user.visible_message("[user] is slicing apart the [name].", \ - "You are slicing apart the [name]...") + span_notice("You are slicing apart the [name]...")) if(W.use_tool(src, user, 40, volume=50)) user.visible_message("[user] slices apart the [name].", \ - "You slice apart the [name]!") + span_notice("You 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 fe1c0f50777c..145685103493 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, "You start disassembling [src]...") + to_chat(user, span_notice("You start disassembling [src]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 30)) playsound(src.loc, 'sound/items/deconstruct.ogg', 50, TRUE) @@ -33,9 +33,9 @@ var/obj/item/stack/material = I if (istype(I, /obj/item/stack) && material?.tableVariant) if(material.get_amount() < 1) - to_chat(user, "You need one [material.name] sheet to do this!") + to_chat(user, span_warning("You need one [material.name] sheet to do this!")) return - to_chat(user, "You start adding [material] to [src]...") + to_chat(user, span_notice("You start adding [material] to [src]...")) if(do_after(user, 20, target = src) && material.use(1)) make_new_table(material.tableVariant) else @@ -87,9 +87,9 @@ if (toConstruct) if(material.get_amount() < 1) - to_chat(user, "You need one [material.name] sheet to do this!") + to_chat(user, span_warning("You need one [material.name] sheet to do this!")) return - to_chat(user, "You start adding [material] to [src]...") + to_chat(user, span_notice("You start adding [material] to [src]...")) if(do_after(user, 20, target = src) && material.use(1)) make_new_table(toConstruct) else @@ -115,9 +115,9 @@ if(istype(I, /obj/item/stack/tile/brass)) var/obj/item/stack/tile/brass/W = I if(W.get_amount() < 1) - to_chat(user, "You need one brass sheet to do this!") + to_chat(user, span_warning("You need one brass sheet to do this!")) return - to_chat(user, "You start adding [W] to [src]...") + to_chat(user, span_notice("You start adding [W] to [src]...")) if(do_after(user, 20, target = src) && W.use(1)) make_new_table(/obj/structure/table/reinforced/brass) else diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 15dd87b8970d..4abc8067c329 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -55,7 +55,7 @@ blindness_multiplier = 2 var/chance = 0.5*blindness_multiplier*speed_multiplier if(prob(chance)) - to_chat(H, "You stub your toe on the [name]!") + to_chat(H, span_warning("You stub your toe on the [name]!")) H.visible_message("[H] stubs their toe on the [name].") H.emote("scream") var/shiddedleg = pick(BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_PRECISE_L_FOOT) @@ -98,17 +98,17 @@ if(isliving(user.pulling)) var/mob/living/pushed_mob = user.pulling if(pushed_mob.buckled) - to_chat(user, "[pushed_mob] is buckled to [pushed_mob.buckled]!") + to_chat(user, span_warning("[pushed_mob] is buckled to [pushed_mob.buckled]!")) return if(user.a_intent == INTENT_GRAB) if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, "You need a better grip to do that!") + to_chat(user, span_warning("You need a better grip to do that!")) return if(do_after(user, 35, target = pushed_mob)) tablepush(user, pushed_mob) if(user.a_intent == 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_userdanger("[user] begins to place [pushed_mob] onto [src]...")) if(do_after(user, 35, target = pushed_mob)) tableplace(user, pushed_mob) else @@ -117,8 +117,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].", - "You place [user.pulling] onto [src].") + user.visible_message(span_notice("[user] places [user.pulling] onto [src]."), + span_notice("You place [user.pulling] onto [src].")) user.stop_pulling() return ..() @@ -151,8 +151,8 @@ SEND_SIGNAL(user, COMSIG_MOB_TABLING) 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) @@ -167,8 +167,8 @@ if(pushed_mob.loc != loc) //Something prevented the tabling return pushed_mob.Paralyze(40) - pushed_mob.visible_message("[user] pushes [pushed_mob] onto [src].", \ - "[user] pushes [pushed_mob] onto [src].") + pushed_mob.visible_message(span_danger("[user] pushes [pushed_mob] onto [src]."), \ + span_userdanger("[user] pushes [pushed_mob] onto [src].")) log_combat(user, pushed_mob, "tabled", null, "onto [src]") if(!ishuman(pushed_mob)) return @@ -180,13 +180,13 @@ return if(!(flags_1 & NODECONSTRUCT_1)) if(I.tool_behaviour == TOOL_SCREWDRIVER && deconstruction_ready && (user.a_intent != INTENT_HELP && user.a_intent != INTENT_HARM || !(INTENT_DISARM in user.possible_a_intents))) - to_chat(user, "You start disassembling [src]...") + to_chat(user, span_notice("You start disassembling [src]...")) if(I.use_tool(src, user, 20, volume=50)) deconstruct(TRUE) return if(I.tool_behaviour == TOOL_WRENCH && deconstruction_ready && (user.a_intent != INTENT_HELP && user.a_intent != INTENT_HARM || !(INTENT_DISARM in user.possible_a_intents))) - to_chat(user, "You start deconstructing [src]...") + to_chat(user, span_notice("You start deconstructing [src]...")) if(I.use_tool(src, user, 40, volume=50)) playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) deconstruct(TRUE, 1) @@ -233,7 +233,7 @@ /obj/structure/table/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_DECONSTRUCT) - to_chat(user, "You deconstruct the table.") + to_chat(user, span_notice("You deconstruct the table.")) qdel(src) return TRUE return FALSE @@ -283,8 +283,8 @@ table_shatter(M) /obj/structure/table/glass/proc/table_shatter(mob/living/L) - visible_message("[src] breaks!", - "You hear breaking glass.") + visible_message(span_warning("[src] breaks!"), + span_danger("You hear breaking glass.")) var/turf/T = get_turf(src) playsound(T, "shatter", 50, 1) for(var/I in debris) @@ -446,14 +446,14 @@ return if(deconstruction_ready) - to_chat(user, "You start strengthening the reinforced table...") + to_chat(user, span_notice("You start strengthening the reinforced table...")) if (W.use_tool(src, user, 50, volume=50)) - to_chat(user, "You strengthen the table.") + to_chat(user, span_notice("You strengthen the table.")) deconstruction_ready = 0 else - to_chat(user, "You start weakening the reinforced table...") + to_chat(user, span_notice("You start weakening the reinforced table...")) if (W.use_tool(src, user, 50, volume=50)) - to_chat(user, "You weaken the table.") + to_chat(user, span_notice("You weaken the table.")) deconstruction_ready = 1 else . = ..() @@ -540,7 +540,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] lays [pushed_mob] on [src].") + visible_message(span_notice("[user] lays [pushed_mob] on [src].")) get_patient() /obj/structure/table/optable/proc/get_patient() @@ -620,7 +620,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, "melee", 1) /obj/structure/rack/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) @@ -669,13 +669,13 @@ if(building) return building = TRUE - to_chat(user, "You start constructing a rack...") + to_chat(user, span_notice("You 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].\ - ", "You assemble \a [R].") + ", span_notice("You 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 a7db1045faf4..ea5654f3cce1 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.a_intent != 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, "You put [I] in [src].") + to_chat(user, span_notice("You put [I] in [src].")) update_icon() /obj/structure/tank_dispenser/ui_state(mob/user) diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index 86a3840665c2..b52177aed74d 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, "You slide the target into the stake.") + to_chat(user, span_notice("You 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, "You take the target out of the stake.") + to_chat(user, span_notice("You take the target out of the stake.")) else pinned_target.forceMove(user.drop_location()) - to_chat(user, "You take the target out of the stake.") + to_chat(user, span_notice("You take the target out of the stake.")) /obj/structure/target_stake/bullet_act(obj/item/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 6c752841d146..e8976f0ff3c6 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -60,7 +60,7 @@ R.transfer_fingerprints_to(TP) TP.add_fingerprint(user) TP.setDir(turn(src.dir, -90)) - user.visible_message("[user] inserts [R].", "You insert [R].") + user.visible_message("[user] inserts [R].", span_notice("You insert [R].")) qdel(R) @@ -74,10 +74,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) @@ -91,7 +91,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.", "You start emptying [pod]'s contents onto the floor...") + user.visible_message("[user] starts emptying [pod]'s contents onto the floor.", span_notice("You 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) diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm index 0f90b71d3373..41ea5950ed2f 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube.dm @@ -41,11 +41,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].", "You start to detach the [name]...") + user.visible_message("[user] starts to detach \the [src].", span_notice("You start to detach the [name]...")) if(W.use_tool(src, user, time_to_unwrench, volume=50)) - to_chat(user, "You detach the [name].") + to_chat(user, span_notice("You 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_cargo_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_cargo_pod.dm index 8902d10f0d7c..363e07b906eb 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_cargo_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_cargo_pod.dm @@ -16,7 +16,7 @@ if(user) location = user.loc add_fingerprint(user) - user.visible_message("[user] removes [src].", "You remove [src].") + user.visible_message("[user] removes [src].", span_notice("You remove [src].")) var/obj/structure/c_transit_tube_pod/cargo/R = new/obj/structure/c_transit_tube_pod/cargo(location) transfer_fingerprints_to(R) R.setDir(dir) 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 728fe04428ee..7ae43d44780f 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -43,10 +43,10 @@ /obj/structure/c_transit_tube/wrench_act(mob/living/user, obj/item/I) if(!can_wrench_in_loc(user)) return - to_chat(user, "You start attaching the [name]...") + to_chat(user, span_notice("You start attaching the [name]...")) add_fingerprint(user) if(I.use_tool(src, user, time_to_unwrench, volume=50, extra_checks=CALLBACK(src, .proc/can_wrench_in_loc, user))) - to_chat(user, "You attach the [name].") + to_chat(user, span_notice("You 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 08e2efa9e716..e3f3951bae05 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -30,7 +30,7 @@ if(!moving) I.play_tool_sound(src) if(contents.len) - user.visible_message("[user] empties \the [src].", "You empty \the [src].") + user.visible_message("[user] empties \the [src].", span_notice("You empty \the [src].")) empty_pod() else deconstruct(TRUE, user) @@ -43,7 +43,7 @@ if(user) location = user.loc add_fingerprint(user) - user.visible_message("[user] removes [src].", "You remove [src].") + user.visible_message("[user] removes [src].", span_notice("You 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) @@ -78,9 +78,9 @@ if(!moving) user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - to_chat(user, "You start trying to escape from the pod...") + to_chat(user, span_notice("You start trying to escape from the pod...")) if(do_after(user, 600, target = src)) - to_chat(user, "You manage to open the pod.") + to_chat(user, span_notice("You 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 66403b6a43cc..8a8b638bde75 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -38,13 +38,13 @@ if(user.mind && (user.mind in immune_minds)) return if(get_dist(user, src) <= 1) - . += "You reveal [src]!" + . += span_notice("You reveal [src]!") flare() /obj/structure/trap/proc/flare() // Makes the trap visible, and starts the cooldown until it's // able to be triggered again. - visible_message("[src] flares brightly!") + visible_message(span_warning("[src] flares brightly!")) spark_system.start() alpha = 200 last_trigger = world.time diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index b32b2e746356..bf48b8ce2e37 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -24,7 +24,7 @@ if(swirlie && user.a_intent == INTENT_HARM) user.changeNext_move(CLICK_CD_MELEE) playsound(src.loc, "swing_hit", 25, 1) - swirlie.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "[user] slams the toilet seat onto your head!", "You hear reverberating porcelain.") + swirlie.visible_message(span_danger("[user] slams the toilet seat onto [swirlie]'s head!"), span_userdanger("[user] slams the toilet seat onto your head!"), span_italics("You hear reverberating porcelain.")) swirlie.adjustBruteLoss(5) else if(user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling)) @@ -32,14 +32,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_userdanger("[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!", "You hear a toilet flushing.") + GM.visible_message(span_danger("[user] gives [GM] a swirlie!"), span_userdanger("[user] gives you a swirlie!"), span_italics("You hear a toilet flushing.")) if(iscarbon(GM)) var/mob/living/carbon/C = GM if(!C.internal) @@ -49,21 +49,21 @@ swirlie = null else playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) - 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_userdanger("[user] slams you into [src]!")) GM.adjustBruteLoss(5) else - to_chat(user, "You need a tighter grip!") + to_chat(user, span_warning("You need a tighter grip!")) else if(cistern && !open && user.CanReach(src)) if(!contents.len) - to_chat(user, "The cistern is empty.") + to_chat(user, span_notice("The cistern 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, "You find [I] in the cistern.") + to_chat(user, span_notice("You find [I] in the cistern.")) w_items -= I.w_class else open = !open @@ -76,33 +76,33 @@ /obj/structure/toilet/attackby(obj/item/I, mob/living/user, params) if(I.tool_behaviour == TOOL_CROWBAR) - to_chat(user, "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]...") + to_chat(user, span_notice("You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]...")) playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1) if(I.use_tool(src, user, 30)) - user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.") + user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", span_notice("You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!"), span_italics("You hear grinding porcelain.")) cistern = !cistern update_icon() else if(cistern) if(user.a_intent != 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 cistern is full!") + to_chat(user, span_warning("The cistern 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, "You carefully place [I] into the cistern.") + to_chat(user, span_notice("You carefully place [I] into the cistern.")) else if(istype(I, /obj/item/reagent_containers)) if (!open) return var/obj/item/reagent_containers/RG = I RG.reagents.add_reagent(/datum/reagent/water, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) - to_chat(user, "You fill [RG] from [src]. Gross.") + to_chat(user, span_notice("You fill [RG] from [src]. Gross.")) else return ..() @@ -143,23 +143,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]!", "You slam [GM] into [src]!") + user.visible_message(span_danger("[user] slams [GM] into [src]!"), span_danger("You slam [GM] into [src]!")) GM.adjustBruteLoss(8) else - to_chat(user, "You need a tighter grip!") + to_chat(user, span_warning("You need a tighter grip!")) else if(exposed) if(!hiddenitem) - to_chat(user, "There is nothing in the drain holder.") + to_chat(user, span_notice("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, "You fish [hiddenitem] out of the drain enclosure.") + to_chat(user, span_notice("You fish [hiddenitem] out of the drain enclosure.")) hiddenitem = null else ..() @@ -167,28 +167,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, "You place [I] into the drain enclosure.") + to_chat(user, span_notice("You 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, "You start to [exposed ? "screw the cap back into place" : "unscrew the cap to the drain protector"]...") + to_chat(user, span_notice("You start to [exposed ? "screw the cap back into place" : "unscrew the cap to the drain protector"]...")) playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1) if(I.use_tool(src, user, 20)) user.visible_message("[user] [exposed ? "screws the cap back into place" : "unscrew the cap to the drain protector"]!", - "You [exposed ? "screw the cap back into place" : "unscrew the cap on the drain"]!", - "You hear metal and squishing noises.") + span_notice("You [exposed ? "screw the cap back into place" : "unscrew the cap on the drain"]!"), + span_italics("You hear metal and squishing noises.")) exposed = !exposed return TRUE @@ -203,7 +203,7 @@ foodtype = TOXIC | GROSS /obj/item/reagent_containers/food/snacks/urinalcake/attack_self(mob/living/user) - user.visible_message("[user] squishes [src]!", "You squish [src].", "You hear a squish.") + user.visible_message(span_notice("[user] squishes [src]!"), span_notice("You squish [src]."), "You hear a squish.") icon_state = "urinalcake_squish" addtimer(VARSET_CALLBACK(src, icon_state, "urinalcake"), 8) @@ -236,14 +236,14 @@ return if(busy) - to_chat(user, "Someone's already washing here.") + to_chat(user, span_notice("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_EYES)) washing_face = 1 - user.visible_message("[user] starts washing [user.p_their()] [washing_face ? "face" : "hands"]...", \ - "You start washing your [washing_face ? "face" : "hands"]...") + user.visible_message(span_notice("[user] starts washing [user.p_their()] [washing_face ? "face" : "hands"]..."), \ + span_notice("You start washing your [washing_face ? "face" : "hands"]...")) busy = TRUE if(!do_after(user, 40, target = src)) @@ -259,17 +259,17 @@ else if(ishuman(user)) var/mob/living/carbon/human/human_user = user if(!human_user.wash_hands(CLEAN_WASH)) - to_chat(user, "Your hands are covered by something!") + to_chat(user, span_warning("Your hands are covered by something!")) return else user.wash(CLEAN_WASH) - user.visible_message("[user] washes [user.p_their()] [washing_face ? "face" : "hands"] using [src].", \ - "You 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("You wash your [washing_face ? "face" : "hands"] using [src].")) /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)) @@ -277,9 +277,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, "You fill [RG] from [src].") + to_chat(user, span_notice("You 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)) @@ -291,21 +291,21 @@ 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]!", \ - "You 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_userdanger("You unwisely attempt to wash [B] while it's still on.")) playsound(src, "sparks", 50, 1) return if(istype(O, /obj/item/mop)) O.reagents.add_reagent(dispensedreagent, 5) - to_chat(user, "You wet [O] in [src].") + to_chat(user, span_notice("You wet [O] in [src].")) playsound(loc, 'sound/effects/slosh.ogg', 25, 1) return 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, "You tear off a strip of gauze and make a rag.") + to_chat(user, span_notice("You tear off a strip of gauze and make a rag.")) G.use(1) return @@ -322,7 +322,7 @@ return if(user.a_intent != INTENT_HARM) - to_chat(user, "You start washing [O]...") + to_chat(user, span_notice("You start washing [O]...")) busy = TRUE if(!do_after(user, 40, target = src)) busy = FALSE @@ -333,8 +333,8 @@ create_reagents(5) reagents.add_reagent(dispensedreagent, 5) reagents.reaction(O, TOUCH) - user.visible_message("[user] washes [O] using [src].", \ - "You wash [O] using [src].") + user.visible_message(span_notice("[user] washes [O] using [src]."), \ + span_notice("You wash [O] using [src].")) return 1 else return ..() @@ -421,10 +421,10 @@ if(anchored) return TRUE - user.visible_message("[user] cuts apart [src].", - "You start to cut apart [src].", "You hear cutting.") + user.visible_message(span_warning("[user] cuts apart [src]."), + span_notice("You start to cut apart [src]."), "You hear cutting.") if(I.use_tool(src, user, 50, volume=100) && !anchored) - to_chat(user, "You cut apart [src].") + to_chat(user, span_notice("You cut apart [src].")) deconstruct() return TRUE diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 164229e94781..5924e4e03fa2 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -92,10 +92,10 @@ return user.visible_message("[user] disassembles the windoor assembly.", - "You start to disassemble the windoor assembly...") + span_notice("You start to disassemble the windoor assembly...")) if(W.use_tool(src, user, 40, volume=50)) - to_chat(user, "You disassemble the windoor assembly.") + to_chat(user, span_notice("You 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.", - "You start to secure the windoor assembly to the floor...") + span_notice("You 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, "You secure the windoor assembly.") + to_chat(user, span_notice("You secure the windoor assembly.")) setAnchored(TRUE) if(secure) name = "secure anchored windoor assembly" @@ -130,12 +130,12 @@ //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.", - "You start to unsecure the windoor assembly to the floor...") + span_notice("You start to unsecure the windoor assembly to the floor...")) if(W.use_tool(src, user, 40, volume=100)) if(!anchored) return - to_chat(user, "You unsecure the windoor assembly.") + to_chat(user, span_notice("You 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, "You need more plasteel to do this!") + to_chat(user, span_warning("You need more plasteel to do this!")) return - to_chat(user, "You start to reinforce the windoor with plasteel...") + to_chat(user, span_notice("You 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, "You reinforce the windoor.") + to_chat(user, span_notice("You 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.", "You start to wire the windoor assembly...") + user.visible_message("[user] wires the windoor assembly.", span_notice("You 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, "You need more cable to do this!") + to_chat(user, span_warning("You need more cable to do this!")) return - to_chat(user, "You wire the windoor.") + to_chat(user, span_notice("You 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.", "You start to cut the wires from airlock assembly...") + user.visible_message("[user] cuts the wires from the airlock assembly.", span_notice("You start to cut the wires from airlock assembly...")) if(W.use_tool(src, user, 40, volume=100)) if(state != "02") return - to_chat(user, "You cut the windoor wires.") + to_chat(user, span_notice("You cut the windoor wires.")) new/obj/item/stack/cable_coil(get_turf(user), 1) state = "01" if(secure) @@ -206,13 +206,13 @@ return W.play_tool_sound(src, 100) user.visible_message("[user] installs the electronics into the airlock assembly.", - "You start to install electronics into the airlock assembly...") + span_notice("You 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, "You install the airlock electronics.") + to_chat(user, span_notice("You install the airlock electronics.")) name = "near finished windoor assembly" electronics = W else @@ -224,10 +224,10 @@ return user.visible_message("[user] removes the electronics from the airlock assembly.", - "You start to uninstall electronics from the airlock assembly...") + span_notice("You start to uninstall electronics from the airlock assembly...")) if(W.use_tool(src, user, 40, volume=100) && electronics) - to_chat(user, "You remove the airlock electronics.") + to_chat(user, span_notice("You 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.", - "You start prying the windoor into the frame...") + span_notice("You 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, "You finish the windoor.") + to_chat(user, span_notice("You 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 016914c938ea..f20cf76cb0d8 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -75,7 +75,7 @@ /obj/structure/window/rcd_act(mob/user, var/obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_DECONSTRUCT) - to_chat(user, "You deconstruct the window.") + to_chat(user, span_notice("You deconstruct the window.")) qdel(src) return TRUE return FALSE @@ -139,7 +139,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/effects/Glassknock.ogg', 50, 1) @@ -176,10 +176,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, "You need at least five wooden planks to barricade the window!") + to_chat(user, span_warning("You need at least five wooden planks to barricade the window!")) return else - to_chat(user, "You start adding [I] to [src]...") + to_chat(user, span_notice("You start adding [I] to [src]...")) if(do_after(user, 50, target=src)) W.use(5) new /obj/structure/barricade/wooden/crude(get_turf(src)) @@ -190,40 +190,40 @@ if(!I.tool_start_check(user, amount=0)) return - to_chat(user, "You begin repairing [src]...") + to_chat(user, span_notice("You begin repairing [src]...")) if(I.use_tool(src, user, 40, volume=50)) obj_integrity = max_integrity update_nearby_icons() - to_chat(user, "You repair [src].") + to_chat(user, span_notice("You 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) I.play_tool_sound(src, 75) - to_chat(user, "You begin to [anchored ? "unscrew the window from":"screw the window to"] the floor...") + to_chat(user, span_notice("You begin to [anchored ? "unscrew the window from":"screw the window to"] the floor...")) if(I.use_tool(src, user, decon_speed, extra_checks = CALLBACK(src, .proc/check_anchored, anchored))) setAnchored(!anchored) - to_chat(user, "You [anchored ? "fasten the window to":"unfasten the window from"] the floor.") + to_chat(user, span_notice("You [anchored ? "fasten the window to":"unfasten the window from"] the floor.")) return else if(I.tool_behaviour == TOOL_CROWBAR && reinf && (state == WINDOW_OUT_OF_FRAME)) - to_chat(user, "You begin to lever the window into the frame...") + to_chat(user, span_notice("You begin to lever the window into the frame...")) I.play_tool_sound(src, 75) if(I.use_tool(src, user, 100, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored))) state = RWINDOW_SECURE - to_chat(user, "You pry the window into the frame.") + to_chat(user, span_notice("You pry the window into the frame.")) return else if(I.tool_behaviour == TOOL_WRENCH && !anchored) I.play_tool_sound(src, 75) - to_chat(user, " You begin to disassemble [src]...") + to_chat(user, span_notice(" You begin to disassemble [src]...")) if(I.use_tool(src, user, decon_speed, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored))) var/obj/item/stack/sheet/G = new glass_type(user.loc, glass_amount) G.add_fingerprint(user) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - to_chat(user, "You successfully disassemble [src].") + to_chat(user, span_notice("You successfully disassemble [src].")) qdel(src) return return ..() @@ -295,13 +295,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 @@ -412,43 +412,43 @@ switch(state) if(RWINDOW_SECURE) if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HARM) - user.visible_message("[user] holds \the [I] to the security screws on \the [src]...", - "You 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("You begin heating the security screws on \the [src]...")) if(I.use_tool(src, user, 180, 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/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...", - "You 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("You 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...", - "You 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("You 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]...", - "You start cutting the exposed bars on \the [src]") + user.visible_message(span_notice("[user] starts cutting the exposed bars on \the [src]..."), + span_notice("You 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...", - "You start unfastening the bolts from the frame...") + user.visible_message(span_notice("[user] starts unfastening \the [src] from the frame..."), + span_notice("You start unfastening the bolts from the frame...")) if(I.use_tool(src, user, 50, volume = 50)) - to_chat(user, "You unscrew the bolts from the frame and the window pops loose.") + to_chat(user, span_notice("You unscrew the bolts from the frame and the window pops loose.")) state = WINDOW_OUT_OF_FRAME setAnchored(FALSE) return @@ -457,7 +457,7 @@ /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) . = ..() @@ -539,43 +539,43 @@ switch(state) if(RWINDOW_SECURE) if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HARM) - user.visible_message("[user] holds \the [I] to the security screws on \the [src]...", - "You 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("You 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/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...", - "You 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("You 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...", - "You 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("You 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]...", - "You start cutting the exposed bars on \the [src]") + user.visible_message(span_notice("[user] starts cutting the exposed bars on \the [src]..."), + span_notice("You 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...", - "You start unfastening the bolts from the frame...") + user.visible_message(span_notice("[user] starts unfastening \the [src] from the frame..."), + span_notice("You start unfastening the bolts from the frame...")) if(I.use_tool(src, user, 50, volume = 50)) - to_chat(user, "You unfasten the bolts from the frame and the window pops loose.") + to_chat(user, span_notice("You unfasten the bolts from the frame and the window pops loose.")) state = WINDOW_OUT_OF_FRAME setAnchored(FALSE) return @@ -891,7 +891,7 @@ take_damage(4,BRUTE,"melee", 0) playsound(src, hitsound, 50, 1) 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() @@ -975,10 +975,10 @@ if(anchored) return TRUE - user.visible_message("[user] starts cuttting apart [src].", - "You start to cut apart [src].", "You hear cutting.") + user.visible_message(span_warning("[user] starts cuttting apart [src]."), + span_notice("You start to cut apart [src]."), "You hear cutting.") if(I.use_tool(src, user, 50, volume=100) && !anchored) - to_chat(user, "You cut apart [src].") + to_chat(user, span_notice("You cut apart [src].")) deconstruct() return TRUE diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index e5d58c3e1bfe..8340e8962abd 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 ..() @@ -41,18 +41,18 @@ /obj/structure/shuttle/engine/welder_act(mob/living/user, obj/item/I) 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.", \ - "You start to weld \the [src] to the floor...", \ - "You hear welding.") + span_notice("You start to weld \the [src] to the floor..."), \ + span_italics("You hear welding.")) if(I.use_tool(src, user, ENGINE_WELDTIME, volume=50)) state = ENGINE_WELDED - to_chat(user, "You weld \the [src] to the floor.") + to_chat(user, span_notice("You weld \the [src] to the floor.")) alter_engine_power(engine_power) if(ENGINE_WELDED) @@ -60,12 +60,12 @@ return TRUE user.visible_message("[user.name] starts to cut the [name] free from the floor.", \ - "You start to cut \the [src] free from the floor...", \ - "You hear welding.") + span_notice("You start to cut \the [src] free from the floor..."), \ + span_italics("You hear welding.")) if(I.use_tool(src, user, ENGINE_WELDTIME, volume=50)) state = ENGINE_WRENCHED - to_chat(user, "You cut \the [src] free from the floor.") + to_chat(user, span_notice("You cut \the [src] free from the floor.")) alter_engine_power(-engine_power) return TRUE diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 9e520a8c8d9b..00fcaf090340 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -282,8 +282,8 @@ if(is_servant_of_ratvar(L) && L.stat != DEAD) . = TRUE L.forceMove(get_turf(pick(GLOB.servant_spawns))) - visible_message("[L] vanishes in a flash of red!") - L.visible_message("[L] appears in a flash of red!", \ + visible_message(span_warning("[L] vanishes in a flash of red!")) + L.visible_message(span_warning("[L] appears in a flash of red!"), \ "sas'so c'arta forbici
You're yanked away from [src]!") playsound(src, 'sound/magic/enter_blood.ogg', 50, TRUE) playsound(L, 'sound/magic/exit_blood.ogg', 50, TRUE) @@ -354,7 +354,7 @@ if(C.m_intent == MOVE_INTENT_WALK && (lube&NO_SLIP_WHEN_WALKING)) return 0 if(!(lube&SLIDE_ICE)) - to_chat(C, "You slipped[ O ? " on the [O.name]" : ""]!") + to_chat(C, span_notice("You slipped[ O ? " on the [O.name]" : ""]!")) playsound(C.loc, 'sound/misc/slip.ogg', 50, 1, -3) SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "slipped", /datum/mood_event/slipped) diff --git a/code/game/turfs/openspace/openspace.dm b/code/game/turfs/openspace/openspace.dm index 76580e5dccd2..1cf670c3da6e 100644 --- a/code/game/turfs/openspace/openspace.dm +++ b/code/game/turfs/openspace/openspace.dm @@ -74,22 +74,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, "You construct a catwalk.") + to_chat(user, span_notice("You construct a catwalk.")) playsound(src, 'sound/weapons/genhit.ogg', 50, 1) new/obj/structure/lattice/catwalk(src) else - to_chat(user, "You need two rods to build a catwalk!") + to_chat(user, span_warning("You need two rods to build a catwalk!")) return if(R.use(1)) - to_chat(user, "You construct a lattice.") + to_chat(user, span_notice("You construct a lattice.")) playsound(src, 'sound/weapons/genhit.ogg', 50, 1) ReplaceWithLattice() else - to_chat(user, "You need one rod to build a lattice.") + to_chat(user, span_warning("You need one rod to build a lattice.")) return if(istype(C, /obj/item/stack/tile/plasteel)) if(!CanCoverUp()) @@ -100,12 +100,12 @@ if(S.use(1)) qdel(L) playsound(src, 'sound/weapons/genhit.ogg', 50, 1) - to_chat(user, "You build a floor.") + to_chat(user, span_notice("You build a floor.")) PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) else - to_chat(user, "You need one floor tile to build a floor!") + to_chat(user, span_warning("You 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/openspace/icemoon name = "ice chasm" diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm index 65fa99313b53..812260f5bb35 100644 --- a/code/game/turfs/simulated/chasm.dm +++ b/code/game/turfs/simulated/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, "You build a floor.") + to_chat(user, span_notice("You 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, "You construct a lattice.") + to_chat(user, span_notice("You construct a lattice.")) playsound(src, 'sound/weapons/genhit.ogg', 50, 1) // Create a lattice, without reverting to our baseturf new /obj/structure/lattice(src) else - to_chat(user, "You need one rod to build a lattice.") + to_chat(user, span_warning("You 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/weapons/genhit.ogg', 50, 1) - to_chat(user, "You build a floor.") + to_chat(user, span_notice("You 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, "You need one floor tile to build a floor!") + to_chat(user, span_warning("You 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/CanAllowThrough(atom/movable/AM, turf/target) . = ..() diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index fb991396fbd2..bbb7841eaaa2 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -194,10 +194,10 @@ broken = 0 burnt = 0 if(user && !silent) - to_chat(user, "You remove the broken plating.") + to_chat(user, span_notice("You remove the broken plating.")) else if(user && !silent) - to_chat(user, "You remove the floor tile.") + to_chat(user, span_notice("You remove the floor tile.")) if(floor_tile && make_tile) new floor_tile(src) return make_plating() @@ -262,15 +262,15 @@ /turf/open/floor/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_FLOORWALL) - to_chat(user, "You build a wall.") + to_chat(user, span_notice("You build a wall.")) PlaceOnTop(/turf/closed/wall) return TRUE if(RCD_AIRLOCK) if((locate(/obj/machinery/door/airlock) in src) || (locate(/obj/machinery/door/window) in src)) // Have to ignore firelocks - to_chat(user, "There is already a door here") + to_chat(user, span_notice("There is already a door here")) return FALSE if(ispath(the_rcd.airlock_type, /obj/machinery/door/window)) - to_chat(user, "You build a windoor.") + to_chat(user, span_notice("You build a windoor.")) var/obj/machinery/door/window/new_window = new the_rcd.airlock_type(src, user.dir) if(the_rcd.airlock_electronics) new_window.req_access = the_rcd.airlock_electronics.accesses.Copy() @@ -279,7 +279,7 @@ new_window.autoclose = TRUE new_window.update_icon() return TRUE - to_chat(user, "You build an airlock.") + to_chat(user, span_notice("You build an airlock.")) var/obj/machinery/door/airlock/new_airlock = new the_rcd.airlock_type(src) new_airlock.electronics = new /obj/item/electronics/airlock(new_airlock) if(the_rcd.airlock_electronics) @@ -302,12 +302,12 @@ if(RCD_DECONSTRUCT) if(ScrapeAway(flags = CHANGETURF_INHERIT_AIR) == src) return FALSE - to_chat(user, "You deconstruct [src].") + to_chat(user, span_notice("You deconstruct [src].")) return TRUE if(RCD_WINDOWGRILLE) if(locate(/obj/structure/grille) in src) return FALSE - to_chat(user, "You construct the grille.") + to_chat(user, span_notice("You construct the grille.")) var/obj/structure/grille/new_grille = new(src) new_grille.anchored = TRUE return TRUE diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 6dc12023912f..dbffc6cc58a4 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -49,16 +49,16 @@ broken = 0 burnt = 0 if(user && !silent) - to_chat(user, "You remove the broken planks.") + to_chat(user, span_notice("You remove the broken planks.")) else if(make_tile) if(user && !silent) - to_chat(user, "You unscrew the planks.") + to_chat(user, span_notice("You unscrew the planks.")) if(floor_tile) new floor_tile(src) else if(user && !silent) - to_chat(user, "You forcefully pry off the planks, destroying them in the process.") + to_chat(user, span_notice("You forcefully pry off the planks, destroying them in the process.")) return make_plating() /turf/open/floor/wood/cold @@ -93,7 +93,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].", "You [turfverb] [src].") + user.visible_message("[user] digs up [src].", span_notice("You [turfverb] [src].")) playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) make_plating() if(..()) diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index fecddf0a2db7..bcf346923169 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -99,9 +99,9 @@ qdel(C) state = 0 //fixing it by bashing it with a light bulb, fun eh? update_icon() - to_chat(user, "You replace the light bulb.") + to_chat(user, span_notice("You 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/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 8142ff68afad..eac31cecd027 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -207,9 +207,9 @@ return TRUE else if(baseturfs == type) return TRUE - user.visible_message("[user] begins slowly prying up [src]...", "You begin painstakingly prying up [src]...") + user.visible_message(span_notice("[user] begins slowly prying up [src]..."), span_notice("You begin painstakingly prying up [src]...")) if(I.use_tool(src, user, 70, volume=80)) - user.visible_message("[user] pries up [src]!", "You pry up [src]!") + user.visible_message(span_notice("[user] pries up [src]!"), span_notice("You pry up [src]!")) make_plating() return TRUE diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index a9e48ac21eb1..7475c5fb9eef 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -55,27 +55,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, "You need two rods to make a reinforced floor!") + to_chat(user, span_warning("You need two rods to make a reinforced floor!")) return else - to_chat(user, "You begin reinforcing the floor...") + to_chat(user, span_notice("You 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/items/deconstruct.ogg', 80, 1) R.use(2) - to_chat(user, "You reinforce the floor.") + to_chat(user, span_notice("You 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)) @@ -87,11 +87,11 @@ F.state = L.state playsound(src, 'sound/weapons/genhit.ogg', 50, 1) 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, "You fix some dents on the broken plating.") + to_chat(user, span_danger("You fix some dents on the broken plating.")) icon_state = icon_plating burnt = FALSE broken = FALSE @@ -124,7 +124,7 @@ var/obj/L = locate(/obj/structure/lattice) in src if(L) qdel(L) - to_chat(user, "You reinforce the foamed plating with tiling.") + to_chat(user, span_notice("You reinforce the foamed plating with tiling.")) playsound(src, 'sound/weapons/Genhit.ogg', 50, TRUE) ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) else @@ -132,11 +132,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]!", \ - "You smash through [src] with [I]!") + user.visible_message(span_danger("[user] smashes through [src]!"), \ + span_danger("You smash through [src] with [I]!")) ScrapeAway(flags = CHANGETURF_INHERIT_AIR) else - to_chat(user, "You hit [src], to no effect!") + to_chat(user, span_danger("You 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) @@ -144,7 +144,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, "You build a floor.") + to_chat(user, span_notice("You build a floor.")) ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) return TRUE return FALSE diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index e00443ddbae4..fda8a60a03e9 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/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_notice("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, "You start digging...") + to_chat(user, span_notice("You start digging...")) if(W.use_tool(src, user, 40, volume=50)) if(!can_dig(user)) return TRUE - to_chat(user, "You dig a hole.") + to_chat(user, span_notice("You dig a hole.")) getDug() SSblackbox.record_feedback("tally", "pick_used_mining", 1, W.type) return TRUE @@ -409,7 +409,7 @@ /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/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm index 9a85a5cedc73..6c1655e5cc9e 100644 --- a/code/game/turfs/simulated/floor/reinf_floor.dm +++ b/code/game/turfs/simulated/floor/reinf_floor.dm @@ -39,7 +39,7 @@ return /turf/open/floor/engine/wrench_act(mob/living/user, obj/item/I) - to_chat(user, "You begin removing rods...") + to_chat(user, span_notice("You 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/simulated/lava.dm b/code/game/turfs/simulated/lava.dm index 69123b3802c1..780fff7cd957 100644 --- a/code/game/turfs/simulated/lava.dm +++ b/code/game/turfs/simulated/lava.dm @@ -60,7 +60,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, "You build a floor.") + to_chat(user, span_notice("You build a floor.")) PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) return TRUE return FALSE diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index c6b34b0a2192..4e6322d3caa2 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -48,7 +48,7 @@ /turf/closed/mineral/attackby(obj/item/I, mob/user, params) if (!user.IsAdvancedToolUser()) - to_chat(usr, "You don't have the dexterity to do this!") + to_chat(usr, span_warning("You don't have the dexterity to do this!")) return if(I.tool_behaviour == TOOL_MINING) @@ -59,11 +59,11 @@ if(last_act + (40 * I.toolspeed) > world.time)//prevents message spam return last_act = world.time - to_chat(user, "You start picking...") + to_chat(user, span_notice("You start picking...")) if(I.use_tool(src, user, 40, volume=50)) if(ismineralturf(src)) - to_chat(user, "You finish cutting into the rock.") + to_chat(user, span_notice("You finish cutting into the rock.")) gets_drilled(user) SSblackbox.record_feedback("tally", "pick_used_mining", 1, I.type) else @@ -88,10 +88,10 @@ ..() /turf/closed/mineral/attack_alien(mob/living/carbon/alien/M) - to_chat(M, "You start digging into the rock...") + to_chat(M, span_notice("You start digging into the rock...")) playsound(src, 'sound/effects/break_stone.ogg', 50, 1) if(do_after(M, 40, target = src)) - to_chat(M, "You tunnel into the rock.") + to_chat(M, span_notice("You tunnel into the rock.")) gets_drilled(M) /turf/closed/mineral/Bumped(atom/movable/AM) @@ -629,7 +629,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]...", "You 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("You use [I] to locate where to cut off the chain reaction and attempt to stop it...")) defuse() ..() @@ -640,7 +640,7 @@ name = "gibtonite deposit" desc = "An active gibtonite reserve. Run!" 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) @@ -674,7 +674,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 diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm index f77692bc8cd2..bde1865380a9 100644 --- a/code/game/turfs/simulated/wall/misc_walls.dm +++ b/code/game/turfs/simulated/wall/misc_walls.dm @@ -101,20 +101,20 @@ /turf/closed/wall/clockwork/attack_hulk(mob/living/user, does_attack_animation = 0) ..() if(heated) - to_chat(user, "The wall is searing hot to the touch!") + to_chat(user, span_userdanger("The wall is searing hot to the touch!")) user.adjustFireLoss(5) playsound(src, 'sound/machines/fryer/deep_fryer_emerge.ogg', 50, TRUE) /turf/closed/wall/clockwork/mech_melee_attack(obj/mecha/M) ..() if(heated) - to_chat(M.occupant, "The wall's intense heat completely reflects your [M.name]'s attack!") + to_chat(M.occupant, span_userdanger("The wall's intense heat completely reflects your [M.name]'s attack!")) M.take_damage(20, BURN) /turf/closed/wall/clockwork/proc/turn_up_the_heat() if(!heated) name = "superheated [name]" - visible_message("[src] sizzles with heat!") + visible_message(span_warning("[src] sizzles with heat!")) playsound(src, 'sound/machines/fryer/deep_fryer_emerge.ogg', 50, TRUE) heated = TRUE hardness = -100 //Lower numbers are tougher, so this makes the wall essentially impervious to smashing @@ -122,7 +122,7 @@ animate(realappearance, color = "#FFC3C3", time = 5) else name = initial(name) - visible_message("[src] cools down.") + visible_message(span_notice("[src] cools down.")) heated = FALSE hardness = initial(hardness) slicing_duration = initial(slicing_duration) diff --git a/code/game/turfs/simulated/wall/reinf_walls.dm b/code/game/turfs/simulated/wall/reinf_walls.dm index 258e01348fcc..269061c67586 100644 --- a/code/game/turfs/simulated/wall/reinf_walls.dm +++ b/code/game/turfs/simulated/wall/reinf_walls.dm @@ -45,7 +45,7 @@ playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1) else playsound(src, 'sound/effects/bang.ogg', 50, 1) - 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) @@ -56,138 +56,138 @@ W.play_tool_sound(src, 100) d_state = SUPPORT_LINES update_icon() - to_chat(user, "You cut the outer grille.") + to_chat(user, span_notice("You cut the outer grille.")) return 1 if(SUPPORT_LINES) if(W.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "You begin unsecuring the support lines...") + to_chat(user, span_notice("You 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, "You unsecure the support lines.") + to_chat(user, span_notice("You 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, "You repair the outer grille.") + to_chat(user, span_notice("You 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, "You begin slicing through the metal cover...") + to_chat(user, span_notice("You 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, "You press firmly on the cover, dislodging it.") + to_chat(user, span_notice("You press firmly on the cover, dislodging it.")) return 1 if(W.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "You begin securing the support lines...") + to_chat(user, span_notice("You 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, "You struggle to pry off the cover...") + to_chat(user, span_notice("You 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, "You pry off the cover.") + to_chat(user, span_notice("You pry off the cover.")) return 1 if(W.tool_behaviour == TOOL_WELDER) if(!W.tool_start_check(user, amount=0)) return - to_chat(user, "You begin welding the metal cover back to the frame...") + to_chat(user, span_notice("You 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, "You start loosening the anchoring bolts which secure the support rods to their frame...") + to_chat(user, span_notice("You 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, "You remove the bolts anchoring the support rods.") + to_chat(user, span_notice("You remove the bolts anchoring the support rods.")) return 1 if(W.tool_behaviour == TOOL_CROWBAR) - to_chat(user, "You start to pry the cover back into place...") + to_chat(user, span_notice("You 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, "You begin slicing through the support rods...") + to_chat(user, span_notice("You 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, "You slice through the support rods.") + to_chat(user, span_notice("You slice through the support rods.")) return 1 if(W.tool_behaviour == TOOL_WRENCH) - to_chat(user, "You start tightening the bolts which secure the support rods to their frame...") + to_chat(user, span_notice("You 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, "You tighten the bolts anchoring the support rods.") + to_chat(user, span_notice("You tighten the bolts anchoring the support rods.")) return 1 if(SHEATH) if(W.tool_behaviour == TOOL_CROWBAR) - to_chat(user, "You struggle to pry off the outer sheath...") + to_chat(user, span_notice("You 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, "You pry off the outer sheath.") + to_chat(user, span_notice("You 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, "You begin welding the support rods back together...") + to_chat(user, span_notice("You 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, "You weld the support rods back together.") + to_chat(user, span_notice("You weld the support rods back together.")) return 1 return 0 diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index decbe4bb9fa6..5ce2ba750f21 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -125,7 +125,7 @@ switch(M.damtype) if(BRUTE) playsound(src, 'sound/weapons/punch4.ogg', 50, 1) - visible_message("[M.name] has hit [src]!", null, null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M.name] has hit [src]!"), null, null, COMBAT_MESSAGE_RANGE) if(prob(hardness + M.force) && M.force > 20) dismantle_wall(1) playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1) @@ -159,7 +159,7 @@ else playsound(src, 'sound/effects/bang.ogg', 50, 1) add_dent(WALL_DENT_HIT) - to_chat(user, text("You punch the wall.")) + to_chat(user, span_notice("You punch the wall.")) return TRUE /turf/closed/wall/attack_hand(mob/user) @@ -167,14 +167,14 @@ if(.) return user.changeNext_move(CLICK_CD_MELEE) - to_chat(user, "You push the wall but nothing happens!") + to_chat(user, span_notice("You push the wall but nothing happens!")) playsound(src, 'sound/weapons/genhit.ogg', 25, 1) 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, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return //get the user's location @@ -199,10 +199,10 @@ if(!W.tool_start_check(user, amount=0)) return FALSE - to_chat(user, "You begin fixing dents on the wall...") + to_chat(user, span_notice("You begin fixing dents on the wall...")) if(W.use_tool(src, user, 0, volume=100)) if(iswallturf(src) && LAZYLEN(dent_decals)) - to_chat(user, "You fix some dents on the wall.") + to_chat(user, span_notice("You fix some dents on the wall.")) cut_overlay(dent_decals) dent_decals.Cut() return TRUE @@ -231,10 +231,10 @@ if(!I.tool_start_check(user, amount=0)) return FALSE - to_chat(user, "You begin slicing through the outer plating...") + to_chat(user, span_notice("You begin slicing through the outer plating...")) if(I.use_tool(src, user, slicing_duration, volume=100)) if(iswallturf(src)) - to_chat(user, "You remove the outer plating.") + to_chat(user, span_notice("You remove the outer plating.")) dismantle_wall() return TRUE @@ -283,7 +283,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, "You deconstruct the wall.") + to_chat(user, span_notice("You deconstruct the wall.")) ScrapeAway() return TRUE return FALSE diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 8c89ff721917..1f4f7a78b684 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -109,22 +109,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, "You construct a catwalk.") + to_chat(user, span_notice("You construct a catwalk.")) playsound(src, 'sound/weapons/genhit.ogg', 50, 1) new/obj/structure/lattice/catwalk(src) else - to_chat(user, "You need two rods to build a catwalk!") + to_chat(user, span_warning("You need two rods to build a catwalk!")) return if(R.use(1)) - to_chat(user, "You construct a lattice.") + to_chat(user, span_notice("You construct a lattice.")) playsound(src, 'sound/weapons/genhit.ogg', 50, 1) ReplaceWithLattice() else - to_chat(user, "You need one rod to build a lattice.") + to_chat(user, span_warning("You 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) @@ -133,12 +133,12 @@ if(S.use(1)) qdel(L) playsound(src, 'sound/weapons/genhit.ogg', 50, 1) - to_chat(user, "You build a floor.") + to_chat(user, span_notice("You build a floor.")) PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) else - to_chat(user, "You need one floor tile to build a floor!") + to_chat(user, span_warning("You 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) ..() @@ -220,7 +220,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, "You build a floor.") + to_chat(user, span_notice("You build a floor.")) PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) return TRUE return FALSE diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 0f6fe5d7458e..0b627f5ddc32 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -152,7 +152,7 @@ GLOBAL_LIST_EMPTY(station_turfs) return FALSE 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 @@ -166,7 +166,7 @@ GLOBAL_LIST_EMPTY(station_turfs) return FALSE if(!force && (!can_zFall(A, levels, target) || !A.can_zFall(src, levels, target, DOWN))) return FALSE - A.visible_message("[A] falls through [src]!") + A.visible_message(span_danger("[A] falls through [src]!")) A.zfalling = TRUE A.forceMove(target) A.zfalling = FALSE @@ -354,7 +354,7 @@ GLOBAL_LIST_EMPTY(station_turfs) if(.) return if(length(src_object.contents())) - to_chat(usr, "You start dumping out the contents...") + to_chat(usr, span_notice("You 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 e214347692c4..eea4f359adf7 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -191,7 +191,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) @@ -221,9 +221,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, "Rebooting world...") + to_chat(world, span_boldannounce("Rebooting world...")) Master.Shutdown() //run SS shutdowns for(var/boi in GLOB.clients) diff --git a/code/modules/VR/vr_human.dm b/code/modules/VR/vr_human.dm index 4a1d2160ce8e..2985a73de245 100644 --- a/code/modules/VR/vr_human.dm +++ b/code/modules/VR/vr_human.dm @@ -46,16 +46,16 @@ return var/area/awaymission/vr/A = check if(A.death) - to_chat(src, "It is unwise to attempt to break Virtual Reality.") + to_chat(src, span_userdanger("It is unwise to attempt to break Virtual Reality.")) playsound(src, 'sound/effects/supermatter.ogg', 50, 1) dust() return if(A.pacifist && !HAS_TRAIT_FROM(src, TRAIT_PACIFISM, VR_ZONE_TRAIT)) ADD_TRAIT(src, TRAIT_PACIFISM, VR_ZONE_TRAIT) - to_chat(src, "You feel like your ability to fight other living beings is being suppressed.") + to_chat(src, span_notice("You feel like your ability to fight other living beings is being suppressed.")) else if(!A.pacifist && HAS_TRAIT_FROM(src, TRAIT_PACIFISM, VR_ZONE_TRAIT)) REMOVE_TRAIT(src, TRAIT_PACIFISM, VR_ZONE_TRAIT) - to_chat(src, "You feel that your ability to fight is no longer being suppressed.") + to_chat(src, span_notice("You feel that your ability to fight is no longer being suppressed.")) /mob/living/carbon/human/virtual_reality/proc/revert_to_reality(deathchecks = TRUE) if(real_mind && mind) @@ -63,7 +63,7 @@ real_mind.current.stop_sound_channel(CHANNEL_HEARTBEAT) if(deathchecks && vr_sleeper) if(vr_sleeper.you_die_in_the_game_you_die_for_real) - to_chat(real_mind, "You feel everything fading away...") + to_chat(real_mind, span_warning("You feel everything fading away...")) real_mind.current.death(0) if(deathchecks && vr_sleeper) vr_sleeper.vr_human = null diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm index 573100b958ef..7cd4b191e6cd 100644 --- a/code/modules/VR/vr_sleeper.dm +++ b/code/modules/VR/vr_sleeper.dm @@ -95,7 +95,7 @@ if("vr_connect") var/mob/living/carbon/human/human_occupant = occupant if(human_occupant && human_occupant.mind && usr == occupant) - to_chat(occupant, "Transferring to virtual reality...") + to_chat(occupant, span_warning("Transferring to virtual reality...")) if(vr_human && vr_human.stat == CONSCIOUS && !vr_human.real_mind) SStgui.close_user_uis(occupant, src) if(istype(human_occupant, /mob/living/carbon/human/virtual_reality)) @@ -104,27 +104,27 @@ else vr_human.real_mind = human_occupant.mind vr_human.ckey = human_occupant.ckey - to_chat(vr_human, "Transfer successful! You are now playing as [vr_human] in VR!") + to_chat(vr_human, span_notice("Transfer successful! You are now playing as [vr_human] in VR!")) else if(allow_creating_vr_humans) - to_chat(occupant, "Virtual avatar not found, attempting to create one...") + to_chat(occupant, span_warning("Virtual avatar not found, attempting to create one...")) var/obj/effect/landmark/vr_spawn/V = get_vr_spawnpoint() var/turf/T = get_turf(V) if(T) SStgui.close_user_uis(occupant, src) build_virtual_human(occupant, T, V.vr_outfit) - to_chat(vr_human, "Transfer successful! You are now playing as [vr_human] in VR!") + to_chat(vr_human, span_notice("Transfer successful! You are now playing as [vr_human] in VR!")) else - to_chat(occupant, "Virtual world misconfigured, aborting transfer") + to_chat(occupant, span_warning("Virtual world misconfigured, aborting transfer")) else - to_chat(occupant, "The virtual world does not support the creation of new virtual avatars, aborting transfer") + to_chat(occupant, span_warning("The virtual world does not support the creation of new virtual avatars, aborting transfer")) return TRUE if("delete_avatar") if(!occupant || usr == occupant) if(vr_human) cleanup_vr_human() else - to_chat(usr, "The VR Sleeper's safeties prevent you from doing that.") + to_chat(usr, span_warning("The VR Sleeper's safeties prevent you from doing that.")) return TRUE if("toggle_open") if(state_open) diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index 00c47d881ef4..4a8c4517ef21 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -44,8 +44,8 @@ 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,"You 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("You have been allowed to bypass the whitelist")) else log_access("Failed Login: [key] - Not on whitelist") key_cache[key] = 0 @@ -107,7 +107,7 @@ Yogs End*/ 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"]) @@ -235,8 +235,8 @@ Yogs End*/ 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,"You 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("You have been allowed to bypass a matching host/sticky ban on [bannedckey]")) key_cache[key] = 0 return null diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 9e0a1ef77862..aa6e72934706 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -35,7 +35,7 @@ if(M.oobe_client.mob) .(M.oobe_client.mob) //using . because show_player_panel(M.oobe_client.mob) caused "Runtime in admin.dm,30: undefined proc or verb /client/Show Player Panel()." else - to_chat(usr, "Cannot open player panel because [key_name(M)] has (a)ghosted, but does not appear to have a mob.", confidential=TRUE) + to_chat(usr, span_warning("Cannot open player panel because [key_name(M)] has (a)ghosted, but does not appear to have a mob."), confidential=TRUE) return //yogs end var/body = "Options for [M.key]" @@ -602,10 +602,10 @@ GLOB.enter_allowed = !( GLOB.enter_allowed ) if (!( GLOB.enter_allowed )) to_chat(world, "New players may no longer enter the game.") - message_admins("[key_name_admin(usr)] toggled new player game entering, no players may enter.") + message_admins(span_adminnotice("[key_name_admin(usr)] toggled new player game entering, no players may enter.")) else to_chat(world, "New players may now enter the game.") - message_admins("[key_name_admin(usr)] toggled new player game entering, players can now enter the game freely.") + message_admins(span_adminnotice("[key_name_admin(usr)] toggled new player game entering, players can now enter the game freely.")) log_admin("[key_name(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! @@ -634,7 +634,7 @@ to_chat(world, "You may now respawn.") else to_chat(world, "You 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! @@ -796,7 +796,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() @@ -970,7 +970,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 b919cd4faf38..a38398318cb2 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.", confidential=TRUE) + to_chat(src, span_danger("No [selected] logfile was found."), confidential=TRUE) return src << browse(F,"window=investigate[selected];size=800x300") diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 1c56fde9a94c..034cf1010300 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -318,7 +318,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) verbs.Remove(/client/proc/hide_most_verbs, GLOB.admin_verbs_hideable) add_verb(src, /client/proc/show_verbs) - to_chat(src, "Most of your adminverbs have been hidden.", confidential=TRUE) + to_chat(src, span_interface("Most of your adminverbs have been hidden."), confidential=TRUE) 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 @@ -329,7 +329,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) remove_admin_verbs() add_verb(src, /client/proc/show_verbs) - to_chat(src, "Almost all of your adminverbs have been hidden.", confidential=TRUE) + to_chat(src, span_interface("Almost all of your adminverbs have been hidden."), confidential=TRUE) 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 @@ -340,7 +340,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) remove_verb(src, /client/proc/show_verbs) add_admin_verbs() - to_chat(src, "All of your adminverbs are now visible.", confidential=TRUE) + to_chat(src, span_interface("All of your adminverbs are now visible."), confidential=TRUE) 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! /client/proc/admin_ghost() @@ -381,7 +381,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) if(holder && mob) if(mob.invisibility == INVISIBILITY_MAXIMUM) 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_MAXIMUM to_chat(mob, "Invisimin on. You are now invisible.") @@ -605,14 +605,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 = "Misc" @@ -624,7 +624,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) @@ -632,7 +632,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) set name = "Give Disease" set desc = "Gives a Disease to a mob." if(!istype(T)) - to_chat(src, "You can only give a disease to a mob of type /mob/living.", confidential=TRUE) + to_chat(src, span_notice("You can only give a disease to a mob of type /mob/living."), confidential=TRUE) return var/datum/disease/D = input("Choose the disease to give to that guy", "ACHOO") as null|anything in SSdisease.diseases if(!D) @@ -640,7 +640,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 = "Misc.Unused" @@ -651,7 +651,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() @@ -683,7 +683,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) holder.deactivate() - to_chat(src, "You are now a normal player.", confidential=TRUE) + to_chat(src, span_interface("You are now a normal player."), confidential=TRUE) remove_mentor_verbs() mentor_datum = null @@ -716,7 +716,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, "You are now an admin.", confidential=TRUE) + to_chat(src, span_interface("You are now an admin."), confidential=TRUE) message_admins("[src] re-adminned themselves.") log_admin("[src] re-adminned themselves.") SSblackbox.record_feedback("tally", "admin_verb", 1, "Readmin") @@ -779,20 +779,20 @@ GLOBAL_PROTECT(admin_verbs_hideable) var/fname = "[GLOB.round_id ? GLOB.round_id : "NULL"]-[time2text(world.timeofday, "MM-DD-hhmm")].json" - to_chat(world, "Performing a memory dump!") + to_chat(world, span_userdanger("Performing a memory dump!")) log_admin("[key_name_admin(usr)] has initiated a memory dump into \"[fname]\".") message_admins("[key_name_admin(usr)] has initiated a memory dump into \"[fname]\".") sleep(20) if(!dump_memory_profile("data/logs/memory/[fname]")) - to_chat(usr, "Dumping memory failed at dll call.") + to_chat(usr, span_warning("Dumping memory failed at dll call.")) return if(!fexists("data/logs/memory/[fname]")) - to_chat(usr, "File creation failed. Please check to see if the data/logs/memory folder actually exists.") + to_chat(usr, span_warning("File creation failed. Please check to see if the data/logs/memory folder actually exists.")) else - to_chat(usr, "Memory dump completed.")*/ + to_chat(usr, span_notice("Memory dump completed."))*/ /client/proc/debugstatpanel() diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm index 907cbfcdfbd1..b7d391ab5162 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() @@ -150,14 +150,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/antag_token.dm b/code/modules/admin/antag_token.dm index e39fa728f7ff..447a31946327 100644 --- a/code/modules/admin/antag_token.dm +++ b/code/modules/admin/antag_token.dm @@ -3,7 +3,7 @@ return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return var/datum/browser/token_panel = new(usr, "tokenpanel", "Antag Token Panel", 850, 600) @@ -64,7 +64,7 @@ return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return if(!ckey) @@ -109,7 +109,7 @@ return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return if(!ckey) return @@ -138,7 +138,7 @@ qdel(query_antag_token_redeem) return - to_chat(usr, "Token Redeemed") + to_chat(usr, span_notice("Token Redeemed")) qdel(query_antag_token_redeem) var/admin_key = key_name_admin(usr) @@ -166,7 +166,7 @@ return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return if(!id) return @@ -210,7 +210,7 @@ return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return if(!id) @@ -258,7 +258,7 @@ return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return var/datum/browser/token_panel = new(usr, "redeemabletokenpanel", "Antag Token Panel", 850, 600) diff --git a/code/modules/admin/create_poll.dm b/code/modules/admin/create_poll.dm index 1a2f1e070434..a5db4ea16627 100644 --- a/code/modules/admin/create_poll.dm +++ b/code/modules/admin/create_poll.dm @@ -4,7 +4,7 @@ if(!check_rights(R_POLL)) return if(!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.", confidential=TRUE) + to_chat(src, span_danger("Failed to establish database connection."), confidential=TRUE) return var/polltype = input("Choose poll type.","Poll Type") as null|anything in list("Single Option","Text Reply","Rating","Multiple Choice", "Instant Runoff Voting") var/choice_amount = 0 diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm index c864f35bbb9d..259f80fcad39 100644 --- a/code/modules/admin/fun_balloon.dm +++ b/code/modules/admin/fun_balloon.dm @@ -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" diff --git a/code/modules/admin/outfits.dm b/code/modules/admin/outfits.dm index a6fb3fa65461..4d59ead2ea11 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/permissionedit.dm b/code/modules/admin/permissionedit.dm index 09f416d9e8d8..8e4f0dfe96f7 100644 --- a/code/modules/admin/permissionedit.dm +++ b/code/modules/admin/permissionedit.dm @@ -163,7 +163,7 @@ if(check_rights(R_DBRANKS, FALSE)) if(!skip) if(!SSdbcore.Connect()) - to_chat(usr, "Unable to connect to database, changes are temporary only.", confidential=TRUE) + to_chat(usr, span_danger("Unable to connect to database, changes are temporary only."), confidential=TRUE) 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") @@ -214,7 +214,7 @@ if(!.) return FALSE if(!admin_ckey && (. in GLOB.admin_datums+GLOB.deadmins)) - to_chat(usr, "[admin_key] is already an admin.", confidential=TRUE) + to_chat(usr, span_danger("[admin_key] is already an admin."), confidential=TRUE) return FALSE if(use_db) //if an admin exists without a datum they won't be caught by the above @@ -227,7 +227,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.", confidential=TRUE) + 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."), confidential=TRUE) return FALSE qdel(query_admin_in_db) var/datum/DBQuery/query_add_admin = SSdbcore.NewQuery( @@ -291,7 +291,7 @@ D.deactivate() //after logs so the deadmined admin can see the message. /datum/admins/proc/auto_deadmin() - to_chat(owner, "You are now a normal player.") + to_chat(owner, span_interface("You are now a normal player.")) var/old_owner = owner deactivate() message_admins("[old_owner] deadmined via auto-deadmin config.") @@ -493,7 +493,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.", confidential=TRUE) + to_chat(usr, span_danger("Error: Rank deletion attempted while rank still used; Tell a coder, this shouldn't happen."), confidential=TRUE) return qdel(query_admins_with_rank) if(alert("Are you sure you want to remove [admin_rank]?","Confirm Removal","Do it","Cancel") == "Do it") @@ -530,4 +530,4 @@ qdel(query_sync_lastadminrank) return qdel(query_sync_lastadminrank) - to_chat(usr, "Sync of [admin_key] successful.", confidential=TRUE) + to_chat(usr, span_admin("Sync of [admin_key] successful."), confidential=TRUE) diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 28a04cf31a12..5d5d3c4e9f55 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -128,7 +128,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") @@ -157,7 +157,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)) @@ -183,7 +183,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") @@ -248,7 +248,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", confidential=TRUE) + to_chat(usr, span_admin("There is no arrivals shuttle"), confidential=TRUE) if("showailaws") if(!check_rights(R_ADMIN)) return @@ -325,7 +325,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") @@ -333,7 +333,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") @@ -341,7 +341,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") @@ -368,7 +368,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("iaa_all") @@ -390,7 +390,7 @@ continue var/datum/antagonist/traitor/internal_affairs/T = new() H.mind.add_antag_datum(T) - message_admins("[key_name_admin(usr)] used everyone is a iaa secret.") + message_admins(span_adminnotice("[key_name_admin(usr)] used everyone is a iaa secret.")) log_admin("[key_name(usr)] used everyone is a iaa secret.") if("changebombcap") @@ -402,7 +402,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") @@ -484,7 +484,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, "You suddenly feel stupid.") + to_chat(H, span_boldannounce("You suddenly feel stupid.")) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60, 80) message_admins("[key_name_admin(usr)] made everybody retarded") diff --git a/code/modules/admin/sound_emitter.dm b/code/modules/admin/sound_emitter.dm index be1a15f049c7..f01543219b85 100644 --- a/code/modules/admin/sound_emitter.dm +++ b/code/modules/admin/sound_emitter.dm @@ -54,7 +54,7 @@ /obj/effect/sound_emitter/AltClick(mob/user) if(check_rights_for(user.client, R_SOUNDS)) 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 bfaaf9bdad07..c2aa2ccb7497 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -296,7 +296,7 @@ if(!check_rights(R_BAN)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return var/list/error_state = list() var/player_key @@ -403,7 +403,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")]", confidential=TRUE) + to_chat(usr, span_danger("Ban not [edit_id ? "edited" : "created"] because the following errors were present:\n[error_state.Join("\n")]"), confidential=TRUE) 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) @@ -414,7 +414,7 @@ if(!check_rights(R_BAN)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return var/player_ckey = ckey(player_key) if(player_ckey) @@ -461,7 +461,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!", confidential=TRUE) + to_chat(usr, span_danger("You've already logged [max_adminbans] admin ban(s) or more. Do not abuse this function!"), confidential=TRUE) qdel(query_check_adminban_count) return qdel(query_check_adminban_count) @@ -547,7 +547,7 @@ if(!check_rights(R_BAN)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return var/datum/browser/unban_panel = new(usr, "unbanpanel", "Unbanning Panel", 850, 600) unban_panel.add_stylesheet("unbanpanelcss", 'html/admin/unbanpanel.css') @@ -690,7 +690,7 @@ if(!check_rights(R_BAN)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) 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") @@ -715,18 +715,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.", confidential=TRUE) + to_chat(C, span_boldannounce("[usr.client.key] has removed a ban from [role] for your key."), confidential=TRUE) 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.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return var/player_ckey = ckey(player_key) var/bantime @@ -779,7 +779,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!", confidential=TRUE) + to_chat(usr, span_danger("You've already logged [max_adminbans] admin ban(s) or more. Do not abuse this function!"), confidential=TRUE) qdel(query_check_adminban_count) return qdel(query_check_adminban_count) @@ -847,7 +847,7 @@ 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.", confidential=TRUE) + to_chat(C, span_boldannounce("[usr.client.key] has edited the [changes_keys_text] of a ban for your key."), confidential=TRUE) for(var/client/i in GLOB.clients - C) if(i.address == old_ip || i.computer_id == old_cid) build_ban_cache(i) @@ -858,7 +858,7 @@ if(!check_rights(R_BAN)) return if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) 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 d01c640309a6..b0b80cff90b5 100644 --- a/code/modules/admin/sql_message_system.dm +++ b/code/modules/admin/sql_message_system.dm @@ -1,7 +1,7 @@ //YOGS - FILE MOVED TO yogstation/code/modules/admin/sql_message_system.dm /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.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return if(!type) return @@ -112,7 +112,7 @@ /proc/delete_message(message_id, logged = 1, browse) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return message_id = text2num(message_id) if(!message_id) @@ -157,7 +157,7 @@ /proc/edit_message(message_id, browse) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return message_id = text2num(message_id) if(!message_id) @@ -207,7 +207,7 @@ /proc/edit_message_expiry(message_id, browse) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return message_id = text2num(message_id) if(!message_id) @@ -278,7 +278,7 @@ /proc/edit_message_severity(message_id) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return message_id = text2num(message_id) if(!message_id) @@ -329,7 +329,7 @@ /proc/toggle_message_secrecy(message_id) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return message_id = text2num(message_id) if(!message_id) @@ -373,7 +373,7 @@ /proc/browse_messages(type, target_ckey, index, linkless = FALSE, filter, agegate = FALSE) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return var/list/output = list() var/ruler = "
" @@ -619,7 +619,7 @@ /proc/get_message_output(type, target_ckey) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return if(!type) return diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index 2f560c84d04a..022552776da1 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", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: Can not add a stickyban: User already has a current sticky ban"), confidential=TRUE) 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!", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!"), confidential=TRUE) 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.", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: The ban disappeared."), confidential=TRUE) 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!", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!"), confidential=TRUE) return var/key = LAZYACCESS(ban["keys"], alt) if (!key) - to_chat(usr, "Error: [alt] is not linked to [ckey]'s sticky ban!", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: [alt] is not linked to [ckey]'s sticky ban!"), confidential=TRUE) 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.", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: The ban disappeared."), confidential=TRUE) return key = LAZYACCESS(ban["keys"], alt) if (!key) - to_chat(usr, "Error: [alt] link to [ckey]'s sticky ban disappeared.", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: [alt] link to [ckey]'s sticky ban disappeared."), confidential=TRUE) 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!", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!"), confidential=TRUE) 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.", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: The ban disappeared."), confidential=TRUE) 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!", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!"), confidential=TRUE) return var/key = LAZYACCESS(ban["keys"], alt) if (!key) - to_chat(usr, "Error: [alt] is not linked to [ckey]'s sticky ban!", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: [alt] is not linked to [ckey]'s sticky ban!"), confidential=TRUE) 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.", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: The ban disappeared."), confidential=TRUE) return key = LAZYACCESS(ban["keys"], alt) if (!key) - to_chat(usr, "Error: [alt]'s link to [ckey]'s sticky ban disappeared.", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: [alt]'s link to [ckey]'s sticky ban disappeared."), confidential=TRUE) 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!", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!"), confidential=TRUE) return var/key = LAZYACCESS(ban["whitelist"], alt) if (!key) - to_chat(usr, "Error: [alt] is not exempt from [ckey]'s sticky ban!", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: [alt] is not exempt from [ckey]'s sticky ban!"), confidential=TRUE) 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.", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: The ban disappeared."), confidential=TRUE) return key = LAZYACCESS(ban["whitelist"], alt) if (!key) - to_chat(usr, "Error: [alt]'s exemption from [ckey]'s sticky ban disappeared.", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: [alt]'s exemption from [ckey]'s sticky ban disappeared."), confidential=TRUE) 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!", confidential=TRUE) + to_chat(usr, span_adminnotice("No database connection!"), confidential=TRUE) 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!", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!"), confidential=TRUE) 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!", confidential=TRUE) + to_chat(usr, span_adminnotice("No database connection!"), confidential=TRUE) 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!", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!"), confidential=TRUE) 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!", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: No sticky ban for [ckey] found!"), confidential=TRUE) return var/cached_ban = SSstickyban.cache[ckey] if (!cached_ban) - to_chat(usr, "Error: No cached sticky ban for [ckey] found!", confidential=TRUE) + to_chat(usr, span_adminnotice("Error: No cached sticky ban for [ckey] found!"), confidential=TRUE) 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 f7a099a58c4d..b43721da9e13 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -30,7 +30,7 @@ return var/message if(M.client.prefs.afreeze) - to_chat(M, "You are no longer frozen.") + to_chat(M, span_userdanger("You are no longer frozen.")) M.client.prefs.afreeze = FALSE M.client.show_popup_menus = TRUE M.client.show_verb_panel = TRUE @@ -38,7 +38,7 @@ add_verb(M, M.client.afreeze_stored_verbs) message = "[key_name(usr)] has unfrozen [key_name(M)]." else - to_chat(M, "You have been frozen by an administrator.") + to_chat(M, span_userdanger("You have been frozen by an administrator.")) M.client.prefs.afreeze = TRUE M.client.show_popup_menus = FALSE M.client.show_verb_panel = FALSE @@ -71,7 +71,7 @@ return var/mob/M = locate(href_list["getplaytimewindow"]) in GLOB.mob_list if(!M) - to_chat(usr, "ERROR: Mob not found.", confidential=TRUE) + to_chat(usr, span_danger("ERROR: Mob not found."), confidential=TRUE) return cmd_show_exp_panel(M.client) @@ -80,7 +80,7 @@ return var/client/C = locate(href_list["toggleexempt"]) in GLOB.clients if(!C) - to_chat(usr, "ERROR: Client not found.", confidential=TRUE) + to_chat(usr, span_danger("ERROR: Client not found."), confidential=TRUE) return toggle_exempt_status(C) @@ -88,7 +88,7 @@ if(!check_rights(R_ADMIN)) return if (!SSticker.mode) - to_chat(usr, "Not until the round starts!", confidential=TRUE) + to_chat(usr, span_danger("Not until the round starts!"), confidential=TRUE) return switch(href_list["makeAntag"]) if("traitors") @@ -359,7 +359,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) @@ -368,11 +368,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.")) @@ -386,7 +386,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 @@ -402,7 +402,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"]) @@ -415,7 +415,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"]) @@ -426,7 +426,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"]) @@ -438,7 +438,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"]) @@ -450,7 +450,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"]) @@ -474,16 +474,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)) @@ -502,7 +502,7 @@ delmob = TRUE 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 ) @@ -564,19 +564,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.", confidential=TRUE) + to_chat(usr, span_danger("Error: They have more rights than you do."), confidential=TRUE) return if(alert(usr, "Kick [key_name(M)]?", "Confirm", "Yes", "No") != "Yes") return if(!M) - to_chat(usr, "Error: [M] no longer exists!", confidential=TRUE) + to_chat(usr, span_danger("Error: [M] no longer exists!"), confidential=TRUE) return if(!M.client) - to_chat(usr, "Error: [M] no longer has a client!", confidential=TRUE) + to_chat(usr, span_danger("Error: [M] no longer has a client!"), confidential=TRUE) return - to_chat(M, "You have been kicked from the server by [usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"].") + to_chat(M, span_danger("You 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"]) @@ -913,7 +913,7 @@ 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].") + message_admins(span_adminnotice("[key_name_admin(usr)] set the mode as [GLOB.master_mode].")) to_chat(world, "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) @@ -930,7 +930,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() @@ -944,7 +944,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"]) @@ -957,7 +957,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"]) @@ -970,7 +970,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() @@ -988,7 +988,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)) @@ -1006,7 +1006,7 @@ return M.forceMove(pick(GLOB.prisonwarp)) - to_chat(M, "You have been sent to Prison!") + to_chat(M, span_adminnotice("You 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!") @@ -1018,11 +1018,11 @@ var/mob/M = locate(href_list["sendbacktolobby"]) if(!isobserver(M)) - to_chat(usr, "You can only send ghost players back to the Lobby.", confidential=TRUE) + to_chat(usr, span_notice("You can only send ghost players back to the Lobby."), confidential=TRUE) return if(!M.client) - to_chat(usr, "[M] doesn't seem to have an active client.", confidential=TRUE) + to_chat(usr, span_warning("[M] doesn't seem to have an active client."), confidential=TRUE) return if(alert(usr, "Send [key_name(M)] back to Lobby?", "Message", "Yes", "No") != "Yes") @@ -1058,7 +1058,7 @@ sleep(5) L.forceMove(pick(GLOB.tdome1)) spawn(50) - to_chat(L, "You have been sent to the Thunderdome.") + to_chat(L, span_adminnotice("You have been sent to the Thunderdome.")) 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)") @@ -1085,7 +1085,7 @@ sleep(5) L.forceMove(pick(GLOB.tdome2)) spawn(50) - to_chat(L, "You have been sent to the Thunderdome.") + to_chat(L, span_adminnotice("You have been sent to the Thunderdome.")) 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)") @@ -1109,7 +1109,7 @@ sleep(5) L.forceMove(pick(GLOB.tdomeadmin)) spawn(50) - to_chat(L, "You have been sent to the Thunderdome.") + to_chat(L, span_adminnotice("You have been sent to the Thunderdome.")) 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.)") @@ -1140,7 +1140,7 @@ sleep(5) L.forceMove(pick(GLOB.tdomeobserve)) spawn(50) - to_chat(L, "You have been sent to the Thunderdome.") + to_chat(L, span_adminnotice("You have been sent to the Thunderdome.")) 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.)") @@ -1154,7 +1154,7 @@ return L.revive(full_heal = 1, admin_revive = 1) - 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"]) @@ -1166,7 +1166,7 @@ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human.", confidential=TRUE) 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) @@ -1978,7 +1978,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", confidential=TRUE) return - var/list/listkicked = kick_clients_in_lobby("You 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("You were kicked from the lobby by [usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"]."), afkonly) var/strkicked = "" for(var/name in listkicked) @@ -2043,7 +2043,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.", confidential=TRUE) + to_chat(usr, span_warning("That runtime viewer no longer exists."), confidential=TRUE) return if(href_list["viewruntime_backto"]) @@ -2074,7 +2074,7 @@ return if(!CONFIG_GET(string/centcom_ban_db)) - to_chat(usr, "Centcom Galactic Ban DB is disabled!") + to_chat(usr, span_warning("Centcom Galactic Ban DB is disabled!")) return var/ckey = href_list["centcomlookup"] diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 8f56b35c47d5..bd3d64852bc9 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -195,7 +195,7 @@ /client/proc/SDQL2_query(query_text as message) set category = "Misc.Server 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)]") @@ -240,7 +240,7 @@ running += query var/msg = "Starting query #[query.id] - [query.get_query_text()]." if(usr) - to_chat(usr, "[msg]", confidential=TRUE) + to_chat(usr, span_admin("[msg]"), confidential=TRUE) log_admin(msg) query.ARun() else //Start all @@ -248,7 +248,7 @@ running += query var/msg = "Starting query #[query.id] - [query.get_query_text()]." if(usr) - to_chat(usr, "[msg]", confidential=TRUE) + to_chat(usr, span_admin("[msg]"), confidential=TRUE) log_admin(msg) query.ARun() @@ -269,7 +269,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.", confidential=TRUE) + to_chat(usr, span_admin("SDQL query [query.get_query_text()] errored. It will NOT be automatically garbage collected. Please remove manually."), confidential=TRUE) running -= query else if(query.finished) @@ -286,19 +286,19 @@ running += next_query var/msg = "Starting query #[next_query.id] - [next_query.get_query_text()]." if(usr) - to_chat(usr, "[msg]", confidential=TRUE) + to_chat(usr, span_admin("[msg]"), confidential=TRUE) 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.", confidential=TRUE) + to_chat(usr, span_admin("SDQL query [query.get_query_text()] was halted. It will NOT be automatically garbage collected. Please remove manually."), confidential=TRUE) 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)) @@ -850,7 +850,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]", confidential=TRUE) + to_chat(usr, span_danger("SDQL2: Unknown op [op]"), confidential=TRUE) result = null else result = val @@ -944,7 +944,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.", confidential=TRUE) + to_chat(usr, span_danger("Parsing error on [querys_pos]\th query. Nothing was executed."), confidential=TRUE) return list() query_tree = list() do_parse = 0 @@ -990,16 +990,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.", confidential=TRUE) + to_chat(usr, span_danger("World variables are not allowed to be accessed. Use global."), confidential=TRUE) return null else if(expression [start] == "{" && long) if(lowertext(copytext(expression[start + 1], 1, 3)) != "0x") //3 == length("0x") + 1 - to_chat(usr, "Invalid pointer syntax: [expression[start + 1]]", confidential=TRUE) + to_chat(usr, span_danger("Invalid pointer syntax: [expression[start + 1]]"), confidential=TRUE) return null v = locate("\[[expression[start + 1]]]") if(!v) - to_chat(usr, "Invalid pointer: [expression[start + 1]]", confidential=TRUE) + to_chat(usr, span_danger("Invalid pointer: [expression[start + 1]]"), confidential=TRUE) return null start++ long = start < expression.len @@ -1082,7 +1082,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]", confidential=TRUE) + to_chat(usr, span_danger("Invalid list index: [index]"), confidential=TRUE) 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 cf51a72ea21e..e01d6073ebd0 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -59,7 +59,7 @@ /datum/SDQL_parser/proc/parse_error(error_message) error = 1 - to_chat(usr, "SQDL2 Parsing Error: [error_message]", confidential=TRUE) + to_chat(usr, span_warning("SQDL2 Parsing Error: [error_message]"), confidential=TRUE) 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 edf1f76ec4b0..91a63f019a17 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -209,7 +209,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.", confidential=TRUE) + to_chat(C, span_notice("No active admins are online, your adminhelp was sent to the admin irc."), confidential=TRUE) heard_by_no_admins = TRUE GLOB.ahelp_tickets.active_tickets += src @@ -290,11 +290,11 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) //Reopen a closed ticket /datum/admin_help/proc/Reopen() if(state == AHELP_ACTIVE) - to_chat(usr, "This ticket is already open.", confidential=TRUE) + to_chat(usr, span_warning("This ticket is already open."), confidential=TRUE) return if(GLOB.ahelp_tickets.CKey2ActiveTicket(initiator_ckey)) - to_chat(usr, "This user already has an active ticket, cannot reopen this one.", confidential=TRUE) + to_chat(usr, span_warning("This user already has an active ticket, cannot reopen this one."), confidential=TRUE) return statclick = new(null, src) @@ -312,7 +312,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") @@ -353,7 +353,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) addtimer(CALLBACK(initiator, /client/proc/giveadminhelpverb), 50) AddInteraction("Resolved by [key_name].") - to_chat(initiator, "Your ticket has been resolved by an admin. The Adminhelp verb will be returned to you shortly.", confidential=TRUE) + to_chat(initiator, span_adminhelp("Your ticket has been resolved by an admin. The Adminhelp verb will be returned to you shortly."), confidential=TRUE) if(!silent) SSblackbox.record_feedback("tally", "ahelp_stats", 1, "resolved") var/msg = "Ticket [TicketHref("#[id]")] resolved by [key_name]" @@ -502,12 +502,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.", confidential=TRUE) + to_chat(usr, span_danger("Speech is currently admin-disabled."), confidential=TRUE) return //handle muting and automuting if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Admin-PM: You cannot send adminhelps (Muted).", confidential=TRUE) + to_chat(src, span_danger("Error: Admin-PM: You cannot send adminhelps (Muted)."), confidential=TRUE) return if(handle_spam_prevention(msg,MUTE_ADMINHELP)) return @@ -525,7 +525,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...", confidential=TRUE) + to_chat(usr, span_warning("Ticket not found, creating new one..."), confidential=TRUE) 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 4f32ec980b5d..3f847b5f2aab 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -8,7 +8,7 @@ if(!holder) to_chat(src, type = MESSAGE_TYPE_ADMINPM, - html = "Error: Admin-PM-Context: Only administrators may use this command.", + html = span_danger("Error: Admin-PM-Context: Only administrators may use this command."), confidential = TRUE) return if(!ismob(M)) //yogs start @@ -28,7 +28,7 @@ if(!holder) to_chat(src, type = MESSAGE_TYPE_ADMINPM, - html = "Error: Admin-PM-Panel: Only administrators may use this command.", + html = span_danger("Error: Admin-PM-Panel: Only administrators may use this command."), confidential = TRUE) return var/list/client/targets[0] @@ -50,7 +50,7 @@ if(prefs.muted & MUTE_ADMINHELP) to_chat(src, type = MESSAGE_TYPE_ADMINPM, - html = "Error: Admin-PM: You are unable to use admin PM-s (muted).", + html = span_danger("Error: Admin-PM: You are unable to use admin PM-s (muted)."), confidential = TRUE) return var/client/C @@ -64,7 +64,7 @@ if(holder) to_chat(src, type = MESSAGE_TYPE_ADMINPM, - html = "Error: Admin-PM: Client not found.", + html = span_danger("Error: Admin-PM: Client not found."), confidential = TRUE) return @@ -84,18 +84,18 @@ if(prefs.muted & MUTE_ADMINHELP) to_chat(src, type = MESSAGE_TYPE_ADMINPM, - html = "Error: Admin-PM: You are unable to use admin PM-s (muted).", + html = span_danger("Error: Admin-PM: You are unable to use admin PM-s (muted)."), confidential = TRUE) return if(!holder && !current_ticket) //no ticket? https://www.youtube.com/watch?v=iHSPf6x1Fdo to_chat(src, type = MESSAGE_TYPE_ADMINPM, - html = "You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be.", + html = span_danger("You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be."), confidential = TRUE) to_chat(src, type = MESSAGE_TYPE_ADMINPM, - html = "Message: [msg]", + html = span_notice("Message: [msg]"), confidential = TRUE) return @@ -127,7 +127,7 @@ if(holder) to_chat(src, type = MESSAGE_TYPE_ADMINPM, - html = "Error: Use the admin IRC/Discord channel, nerd.", + html = span_danger("Error: Use the admin IRC/Discord channel, nerd."), confidential = TRUE) return @@ -135,7 +135,7 @@ else if(!recipient) if(holder) - to_chat(src, "Error: Admin-PM: Client not found.", confidential=TRUE) + to_chat(src, span_danger("Error: Admin-PM: Client not found."), confidential=TRUE) if(msg) to_chat(src, msg, confidential=TRUE) return @@ -151,14 +151,14 @@ return if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).", confidential=TRUE) + to_chat(src, span_danger("Error: Admin-PM: You are unable to use admin PM-s (muted)."), confidential=TRUE) return if(!recipient) if(holder) to_chat(src, type = MESSAGE_TYPE_ADMINPM, - html = "Error: Admin-PM: Client not found.", + html = span_danger("Error: Admin-PM: Client not found."), confidential = TRUE) else current_ticket.MessageNoRecipient(msg) @@ -209,7 +209,7 @@ else //recipient is an admin but sender is not //YOGS START -- Yogs Tickets if(!current_ticket) - to_chat(src, "Ticket closed, please make a new one before trying to contact admins!", confidential=TRUE) + to_chat(src, span_notice("Ticket closed, please make a new one before trying to contact admins!"), confidential=TRUE) return admin_ticket_log(src, msg, FALSE) to_chat(recipient, "Reply PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]", confidential=TRUE) @@ -253,7 +253,7 @@ else //neither are admins to_chat(src, type = MESSAGE_TYPE_ADMINPM, - html = "Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.", + html = span_danger("Error: Admin-PM: Non-admin to non-admin PM communication is forbidden."), confidential = TRUE) return @@ -368,7 +368,7 @@ html = "Click on the administrator's name to reply.", confidential = TRUE) // yogs - Yog Tickets - admin_ticket_log(C, "PM From [irc_tagged]: [msg]") // yogs - Yog Tickets + admin_ticket_log(C, span_notice("PM From [irc_tagged]: [msg]")) // yogs - Yog Tickets window_flash(C, ignorepref = TRUE) //always play non-admin recipients the adminhelp sound diff --git a/code/modules/admin/verbs/borgpanel.dm b/code/modules/admin/verbs/borgpanel.dm index a5273a07f244..77b96ec10928 100644 --- a/code/modules/admin/verbs/borgpanel.dm +++ b/code/modules/admin/verbs/borgpanel.dm @@ -9,7 +9,7 @@ if (!istype(borgo, /mob/living/silicon/robot)) borgo = input("Select a borg", "Select a borg", null, null) as null|anything in GLOB.silicon_mobs if (!istype(borgo, /mob/living/silicon/robot)) - to_chat(usr, "Borg is required for borgpanel", confidential=TRUE) + to_chat(usr, span_warning("Borg is required for borgpanel"), confidential=TRUE) var/datum/borgpanel/borgpanel = new(usr, borgo) @@ -227,7 +227,7 @@ return var/chosensilicon = input("Select a Silicon", "Select a Silicon", null, null) as null|anything in GLOB.silicon_mobs if (!istype(chosensilicon, /mob/living/silicon)) - to_chat(usr, "Silicon is required for law changes", confidential=TRUE) + to_chat(usr, span_warning("Silicon is required for law changes"), confidential=TRUE) return var/chosen = pick_closest_path(null, make_types_fancy(typesof(/obj/item/aiModule))) if (!chosen) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index a256e0882fca..c561e651b455 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, "You cannot send DSAY messages (muted).", confidential=TRUE) + to_chat(src, span_danger("You cannot send DSAY messages (muted)."), confidential=TRUE) return if (handle_spam_prevention(msg,MUTE_DEADCHAT)) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index c79ff8bb486c..5a361d2ffc20 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -59,12 +59,12 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(targetselected) if(!hascall(target, procname)) - to_chat(usr, "Error: callproc(): type [target.type] has no [proctype] named [procpath].", confidential=TRUE) + to_chat(usr, span_warning("Error: callproc(): type [target.type] has no [proctype] named [procpath]."), confidential=TRUE) return else procpath = "/[proctype]/[procname]" if(!text2path(procpath)) - to_chat(usr, "Error: callproc(): [procpath] does not exist.", confidential=TRUE) + to_chat(usr, span_warning("Error: callproc(): [procpath] does not exist."), confidential=TRUE) return var/list/lst = get_callproc_args() @@ -73,7 +73,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(targetselected) if(!target) - to_chat(usr, "Error: callproc(): owner of proc no longer exists.", confidential=TRUE) + to_chat(usr, span_warning("Error: callproc(): owner of proc no longer exists."), confidential=TRUE) return var/msg = "[key_name(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no argument"]." log_admin(msg) @@ -105,7 +105,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) /proc/WrapAdminProcCall(datum/target, procname, list/arguments) if(target != GLOBAL_PROC && procname == "Del") - to_chat(usr, "Calling Del() is not allowed", confidential=TRUE) + to_chat(usr, span_warning("Calling Del() is not allowed"), confidential=TRUE) return if(target != GLOBAL_PROC && !target.CanProcCall(procname)) @@ -117,10 +117,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.", confidential=TRUE) + to_chat(usr, span_adminnotice("Another set of admin called procs are still running, your proc will be run after theirs finish."), confidential=TRUE) GLOB.AdminProcCallSpamPrevention[ckey] = TRUE UNTIL(!GLOB.AdminProcCaller) - to_chat(usr, "Running your proc", confidential=TRUE) + to_chat(usr, span_adminnotice("Running your proc"), confidential=TRUE) GLOB.AdminProcCallSpamPrevention -= ckey else UNTIL(!GLOB.AdminProcCaller) @@ -161,14 +161,14 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) if(!procname) return if(!hascall(A,procname)) - to_chat(usr, "Error: callproc_datum(): type [A.type] has no proc named [procname].", confidential=TRUE) + to_chat(usr, span_warning("Error: callproc_datum(): type [A.type] has no proc named [procname]."), confidential=TRUE) return var/list/lst = get_callproc_args() if(!lst) return if(!A || !IsValidSrc(A)) - to_chat(usr, "Error: callproc_datum(): owner of proc no longer exists.", confidential=TRUE) + to_chat(usr, span_warning("Error: callproc_datum(): owner of proc no longer exists."), confidential=TRUE) return var/msg = "[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]." log_admin(msg) @@ -221,7 +221,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) . += "" else - . = "[procname] returned: [!isnull(returnval) ? returnval : "null"]" + . = span_notice("[procname] returned: [!isnull(returnval) ? returnval : "null"]") /client/proc/Cell() @@ -325,7 +325,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) INVOKE_ASYNC(M, /mob/living/carbon/human/proc/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") @@ -340,7 +340,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) INVOKE_ASYNC(M, /mob/living/carbon/human/proc/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") @@ -355,7 +355,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) INVOKE_ASYNC(M, /mob/living/carbon/human/proc/pacmanize) SSblackbox.record_feedback("tally", "admin_verb", 1, "Make Pacman") //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 pacman at [AREACOORD(M)].") - message_admins("[key_name_admin(usr)] made [ADMIN_LOOKUPFLW(M)] into a pacman.") + message_admins(span_adminnotice("[key_name_admin(usr)] made [ADMIN_LOOKUPFLW(M)] into a pacman.")) else alert("Invalid mob") @@ -494,7 +494,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) 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 = "Misc.Unused" @@ -507,7 +507,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) 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 @@ -525,7 +525,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) to_chat(usr, "Game still loading, please hold!", confidential=TRUE) 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 @@ -578,7 +578,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) 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) @@ -765,7 +765,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) 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() var/list/outfits = list() //Yogs -- a hashtable. key is a result from user input, value is an outfit path @@ -986,8 +986,8 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) if(istype(landmark)) var/datum/map_template/ruin/template = landmark.ruin_template usr.forceMove(get_turf(landmark)) - to_chat(usr, "[template.name]", confidential=TRUE) - to_chat(usr, "[template.description]", confidential=TRUE) + to_chat(usr, span_name("[template.name]"), confidential=TRUE) + to_chat(usr, span_italics("[template.description]"), confidential=TRUE) /client/proc/place_ruin() set category = "Misc.Server Debug" @@ -1034,10 +1034,10 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) 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]", confidential=TRUE) - to_chat(src, "[template.description]", confidential=TRUE) + to_chat(src, span_name("[template.name]"), confidential=TRUE) + to_chat(src, span_italics("[template.description]"), confidential=TRUE) else - to_chat(src, "Failed to place [template.name].", confidential=TRUE) + to_chat(src, span_warning("Failed to place [template.name]."), confidential=TRUE) /client/proc/clear_dynamic_transit() set category = "Misc.Server Debug" @@ -1048,7 +1048,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) 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. @@ -1072,7 +1072,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) 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.") @@ -1083,7 +1083,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) 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.") @@ -1094,7 +1094,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) 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/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 05f3e3296ea3..43dda3b31840 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -128,7 +128,7 @@ message_admins("[key_name_admin(usr)] re-enabled the CDN asset transport") log_admin("[key_name(usr)] re-enabled the CDN asset transport") else - to_chat(usr, "The CDN is not enabled!") + to_chat(usr, span_adminnotice("The CDN is not enabled!")) if (alert(usr, "The CDN asset transport is not enabled! If you having issues with assets you can also try disabling filename mutations.", "The CDN asset transport is not enabled!", "Try disabling filename mutations", "Nevermind") == "Try disabling filename mutations") SSassets.transport.dont_mutate_filenames = !SSassets.transport.dont_mutate_filenames message_admins("[key_name_admin(usr)] [(SSassets.transport.dont_mutate_filenames ? "disabled" : "re-enabled")] asset filename transforms") diff --git a/code/modules/admin/verbs/fps.dm b/code/modules/admin/verbs/fps.dm index 497ad57e1d1d..2e8df228d87d 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.", confidential=TRUE) + to_chat(src, span_danger("Error: set_server_fps(): Invalid world.fps value. No changes made."), confidential=TRUE) 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 7e3c74f395f0..8520621a3c28 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", confidential=TRUE) images -= preview @@ -34,7 +34,7 @@ if(!map) return if(copytext("[map]", -4) != ".dmm")//4 == length(".dmm") - to_chat(src, "Filename must end in '.dmm': [map]", confidential=TRUE) + to_chat(src, span_warning("Filename must end in '.dmm': [map]"), confidential=TRUE) 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.", confidential=TRUE) + to_chat(src, span_warning("Map template '[map]' failed to parse properly."), confidential=TRUE) return var/datum/map_report/report = M.cached_map.check_for_errors() @@ -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])", confidential=TRUE) + 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])"), confidential=TRUE) diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index f59d776a935f..3b0eda6b5d52 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -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, /obj/docking_port/mobile/emergency.proc/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_userdanger("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/only_one), 420) diff --git a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm index f63cc4a5f0eb..9ee9c9425992 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!", confidential=TRUE) + to_chat(usr, span_adminnotice("The Database is not enabled!"), confidential=TRUE) 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 0c6a9cb2ba12..a23d3eb39d94 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 @@ -65,7 +65,7 @@ var/ytdl = CONFIG_GET(string/invoke_youtubedl) if(!ytdl) - to_chat(src, "Youtube-dl was not configured, action unavailable", confidential=TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value + to_chat(src, span_boldwarning("Youtube-dl was not configured, action unavailable"), confidential=TRUE) //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 @@ -76,8 +76,8 @@ if(length(web_sound_input)) 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.", confidential=TRUE) - to_chat(src, "For youtube-dl shortcuts like ytsearch: please use the appropriate full url from the website.", confidential=TRUE) + to_chat(src, span_boldwarning("Non-http(s) URIs are not allowed."), confidential=TRUE) + to_chat(src, span_warning("For youtube-dl shortcuts like ytsearch: please use the appropriate full url from the website."), confidential=TRUE) 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]\"") @@ -89,8 +89,8 @@ try data = json_decode(stdout) catch(var/exception/e) - to_chat(src, "Youtube-dl JSON parsing FAILED:", confidential=TRUE) - to_chat(src, "[e]: [stdout]", confidential=TRUE) + to_chat(src, span_boldwarning("Youtube-dl JSON parsing FAILED:"), confidential=TRUE) + to_chat(src, span_warning("[e]: [stdout]"), confidential=TRUE) return if (data["url"]) @@ -107,7 +107,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 @@ -115,8 +115,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:", confidential=TRUE) - to_chat(src, "[stderr]", confidential=TRUE) + to_chat(src, span_boldwarning("Youtube-dl URL retrieval FAILED:"), confidential=TRUE) + to_chat(src, span_warning("[stderr]"), confidential=TRUE) else //pressed ok with blank log_admin("[key_name(src)] stopped web sound") @@ -125,8 +125,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", confidential=TRUE) - to_chat(src, "The media provider returned a content URL that isn't using the HTTP or HTTPS protocol", confidential=TRUE) + to_chat(src, span_boldwarning("BLOCKED: Content URL not using http(s) protocol"), confidential=TRUE) + to_chat(src, span_warning("The media provider returned a content URL that isn't using the HTTP or HTTPS protocol"), confidential=TRUE) 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 a008c638bfe9..7e545de5b9f6 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -3,7 +3,7 @@ set name = "Pray" if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.", confidential=TRUE) + to_chat(usr, span_danger("Speech is currently admin-disabled."), confidential=TRUE) return msg = copytext_char(sanitize(msg), 1, MAX_MESSAGE_LEN) @@ -12,7 +12,7 @@ log_prayer("[src.key]/([src.name]): [msg]") if(usr.client) if(usr.client.prefs.muted & MUTE_PRAY) - to_chat(usr, "You cannot pray (muted).", confidential=TRUE) + to_chat(usr, span_danger("You cannot pray (muted)."), confidential=TRUE) return if(src.client.handle_spam_prevention(msg,MUTE_PRAY)) return @@ -48,7 +48,7 @@ if(C.prefs.toggles & SOUND_PRAYERS) if(usr.job == "Chaplain") SEND_SOUND(C, sound('sound/effects/pray.ogg')) - to_chat(usr, "You pray to the gods: \"[msg_tmp]\"", confidential=TRUE) + to_chat(usr, span_info("You pray to the gods: \"[msg_tmp]\""), confidential=TRUE) 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]") diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index a70be6b8aac9..a38f51d6f665 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -126,7 +126,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() @@ -143,7 +143,7 @@ msg = to_utf8(msg, src) 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) @@ -202,7 +202,7 @@ return M.status_flags ^= GODMODE - to_chat(usr, "Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]", confidential=TRUE) + to_chat(usr, span_adminnotice("Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]"), confidential=TRUE) log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]") var/msg = "[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]" // yogs - Yog Tickets @@ -307,7 +307,7 @@ if(candidates.len) ckey = input("Pick the player you want to respawn as a xeno.", "Suitable Candidates") as null|anything in candidates else - to_chat(usr, "Error: create_xeno(): no suitable candidates.", confidential=TRUE) + to_chat(usr, span_danger("Error: create_xeno(): no suitable candidates."), confidential=TRUE) if(!istext(ckey)) return 0 @@ -732,7 +732,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) @@ -787,7 +787,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() @@ -804,7 +804,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 @@ -833,7 +833,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.", confidential=TRUE) @@ -1012,7 +1012,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_italics("...wabbajack...wabbajack...")) playsound(M.loc, 'sound/magic/staff_change.ogg', 50, 1, -1) wabbajack(M) @@ -1099,7 +1099,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_userdanger("The gods have punished you for your sins!")) if(ADMIN_PUNISHMENT_BRAINDAMAGE) target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 199, 199) if(ADMIN_PUNISHMENT_MCNUGGET) @@ -1154,12 +1154,12 @@ 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!", confidential=TRUE) + to_chat(usr,span_warning("Imprisonment failed!"), confidential=TRUE) return if(ADMIN_PUNISHMENT_PIE) var/confirm = alert(usr, "Send honk message?", "Honk Message", "Yes", "No") if(confirm == "Yes") - to_chat(target, "Honk! You probably did something stupid..") + to_chat(target, span_clown("Honk! You probably did something stupid..")) var/mob/living/carbon/C = target C.adminpie(target) if(ADMIN_PUNISHMENT_WHISTLE) @@ -1170,7 +1170,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(ADMIN_PUNISHMENT_CLUWNE) var/confirm = alert(usr, "Send Cluwne Message?", "Cluwne Message", "Yes", "No") if(confirm == "Yes") - to_chat(target, "HENK!! HENK!! HENK!! YOU DID SOMETHING EXTREMELY DUMB, AND MADE GOD MAD. CRY ABOUT IT.") + to_chat(target, span_reallybigphobia("HENK!! HENK!! HENK!! YOU DID SOMETHING EXTREMELY DUMB, AND MADE GOD MAD. CRY ABOUT IT.")) var/mob/living/carbon/human/H = target H?.cluwneify() punish_log(target, punishment) @@ -1201,7 +1201,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.", confidential=TRUE) + to_chat(usr, span_warning("Tracking is disabled in the server configuration file."), confidential=TRUE) return var/list/msg = list() @@ -1215,10 +1215,10 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(R_ADMIN)) return if(!client_to_check) - to_chat(usr, "ERROR: Client not found.", confidential = TRUE) + to_chat(usr, span_danger("ERROR: Client not found."), confidential = TRUE) return if(!CONFIG_GET(flag/use_exp_tracking)) - to_chat(usr, "Tracking is disabled in the server configuration file.", confidential=TRUE) + to_chat(usr, span_warning("Tracking is disabled in the server configuration file."), confidential=TRUE) return new /datum/job_report_menu(client_to_check, usr) @@ -1228,11 +1228,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.", confidential=TRUE) + to_chat(usr, span_danger("ERROR: Client not found."), confidential=TRUE) return if(!C.set_db_player_flags()) - to_chat(usr, "ERROR: Unable read player flags from database. Please check logs.", confidential=TRUE) + to_chat(usr, span_danger("ERROR: Unable read player flags from database. Please check logs."), confidential=TRUE) var/dbflags = C.prefs.db_flags var/newstate = FALSE if(dbflags & DB_FLAG_EXEMPT) @@ -1241,7 +1241,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.", confidential=TRUE) + to_chat(usr, span_danger("ERROR: Unable to update player flags. Please check logs."), confidential=TRUE) 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)]") @@ -1303,7 +1303,7 @@ Traitors and the like can also be revived with the previous role mostly intact. message_admins(msg) log_admin(msg) return - to_chat(usr,"Only observers can use this command!") + to_chat(usr,span_warning("Only observers can use this command!")) /datum/admins/proc/cmd_admin_fuckrads() set category = "Admin.Round Interaction" diff --git a/code/modules/admin/verbs/reestablish_db_connection.dm b/code/modules/admin/verbs/reestablish_db_connection.dm index a73e3a88f873..86c5245b5e5d 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 = "Server" set name = "Reestablish DB Connection" if (!CONFIG_GET(flag/sql_enabled)) - to_chat(usr, "The Database is not enabled!", confidential=TRUE) + to_chat(usr, span_adminnotice("The Database is not enabled!"), confidential=TRUE) return if (SSdbcore.IsConnected()) diff --git a/code/modules/admin/verbs/tripAI.dm b/code/modules/admin/verbs/tripAI.dm index 09d99ff0670e..74c60a79bbf7 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.", confidential=TRUE) - 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.", confidential=TRUE) - 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/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index 4546f67ea4f0..441cd2c67251 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -27,7 +27,7 @@ /obj/item/antag_spawner/contract/attack_self(mob/user) if(!unlocked && !user.mind.has_antag_datum(/datum/antagonist/wizard)) - to_chat(user, "You do not understand the words on this paper.") + to_chat(user, span_warning("You do not understand the words on this paper.")) return user.set_machine(src) var/dat = "" @@ -116,13 +116,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 your base!") + to_chat(user, span_warning("[src] is out of range! It can only be used at your base!")) return FALSE return TRUE @@ -131,7 +131,7 @@ if(!(check_usability(user))) return - to_chat(user, "You activate [src] and wait for confirmation.") + to_chat(user, span_notice("You 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)) @@ -142,7 +142,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 your uplink to get your points refunded.") + to_chat(user, span_warning("Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on your uplink to get your 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) @@ -240,15 +240,15 @@ icon = 'icons/obj/wizard.dmi' icon_state = "vial" - var/shatter_msg = "You shatter the bottle, no turning back now!" - var/veil_msg = "You sense a dark presence lurking just beyond the veil..." + var/shatter_msg = span_notice("You shatter the bottle, no turning back now!") + var/veil_msg = span_warning("You 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, "You should probably wait until you reach the station.") + to_chat(user, span_notice("You should probably wait until you reach the station.")) return if(used) return @@ -264,7 +264,7 @@ playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, 1) qdel(src) else - to_chat(user, "You can't seem to work up the nerve to shatter the bottle. Perhaps you should try again later.") + to_chat(user, span_notice("You 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) @@ -287,6 +287,6 @@ icon_state = "vial" color = "#FF69B4" // HOT PINK - veil_msg = "You sense an adorable presence lurking just beyond the veil..." + veil_msg = span_warning("You 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 4a910ca4d441..9d67035d940d 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 7226372d175c..c67a33c3b20a 100644 --- a/code/modules/antagonists/abductor/abductor.dm +++ b/code/modules/antagonists/abductor/abductor.dm @@ -50,15 +50,15 @@ /datum/antagonist/abductor/on_removal() if(owner.current) - to_chat(owner.current,"You are no longer the [owner.special_role]!") + to_chat(owner.current,span_userdanger("You are no longer the [owner.special_role]!")) owner.special_role = null REMOVE_TRAIT(owner.current, TRAIT_ABDUCTOR_TRAINING, ABDUCTOR_ANTAGONIST) // Yogs -- Fixes abductors having their traits associated with their mind instead of their mob return ..() /datum/antagonist/abductor/greet() - to_chat(owner.current, "You are the [owner.special_role]!") - to_chat(owner.current, "With the help of your teammate, kidnap and experiment on station crew members!") - to_chat(owner.current, "[greet_text]") + to_chat(owner.current, span_notice("You are the [owner.special_role]!")) + to_chat(owner.current, span_notice("With the help of your 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() @@ -110,7 +110,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") @@ -153,7 +153,7 @@ else result += "[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) diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index 307d49af6ce4..e2b3b17b7cf1 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, "Your vest is now [HAS_TRAIT_FROM(src, TRAIT_NODROP, ABDUCTOR_VEST_TRAIT) ? "locked" : "unlocked"].") + to_chat(loc, span_notice("Your 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) @@ -140,7 +140,7 @@ /obj/item/abductor/proc/AbductorCheck(mob/user) if(HAS_TRAIT(user, TRAIT_ABDUCTOR_TRAINING)) return TRUE - to_chat(user, "You can't figure how this works!") + to_chat(user, span_warning("You can't figure how this works!")) return FALSE /obj/item/abductor/proc/ScientistCheck(mob/user) @@ -148,10 +148,10 @@ var/sci_training = HAS_TRAIT(user, 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, "You can't figure how this works!") + to_chat(user, span_warning("You can't figure how this works!")) . = FALSE else . = TRUE @@ -169,7 +169,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) @@ -178,13 +178,13 @@ else mode = GIZMO_SCAN icon_state = "gizmo_scan" - to_chat(user, "You switch the device to [mode==GIZMO_SCAN? "SCAN": "MARK"] MODE") + to_chat(user, span_notice("You 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) @@ -201,7 +201,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) @@ -213,26 +213,26 @@ /obj/item/abductor/gizmo/proc/scan(atom/target, mob/living/user) if(ishuman(target)) console.AddSnapshot(target) - to_chat(user, "You scan [target] and add [target.p_them()] to the database.") + to_chat(user, span_notice("You 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, "You mark [target] for future retrieval.") + to_chat(user, span_notice("You 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, "You need to be next to the specimen to prepare it for transport!") + to_chat(user, span_warning("You need to be next to the specimen to prepare it for transport!")) return - to_chat(user, "You begin preparing [target] for transport...") + to_chat(user, span_notice("You begin preparing [target] for transport...")) if(do_after(user, 100, target = target)) marked = target - to_chat(user, "You finish preparing [target] for transport.") + to_chat(user, span_notice("You finish preparing [target] for transport.")) /obj/item/abductor/gizmo/Destroy() if(console) @@ -269,7 +269,7 @@ for(M in view(2,targloc)) if(M == user) continue - to_chat(user, "You silence [M]'s radio devices.") + to_chat(user, span_notice("You silence [M]'s radio devices.")) radio_off_mob(M) /obj/item/abductor/silencer/proc/radio_off_mob(mob/living/carbon/human/M) @@ -300,7 +300,7 @@ else mode = MIND_DEVICE_MESSAGE icon_state = "mind_device_message" - to_chat(user, "You switch the device to [mode==MIND_DEVICE_MESSAGE? "TRANSMISSION": "COMMAND"] MODE") + to_chat(user, span_notice("You switch the device to [mode==MIND_DEVICE_MESSAGE? "TRANSMISSION": "COMMAND"] MODE")) /obj/item/abductor/mind_device/afterattack(atom/target, mob/living/user, flag, params) . = ..() @@ -318,13 +318,13 @@ var/mob/living/carbon/C = target var/obj/item/organ/heart/gland/G = C.getorganslot("heart") if(!istype(G)) - to_chat(user, "Your target does not have an experimental gland!") + to_chat(user, span_warning("Your target does not have an experimental gland!")) return if(!G.mind_control_uses) - to_chat(user, "Your target's gland is spent!") + to_chat(user, span_warning("Your target's gland is spent!")) return if(G.active_mind_control) - to_chat(user, "Your target is already under a mind-controlling influence!") + to_chat(user, span_warning("Your target is already under a mind-controlling influence!")) return var/command = stripped_input(user, "Enter the command for your target to follow.\ @@ -340,17 +340,17 @@ return if(C.anti_magic_check(FALSE, FALSE, TRUE, 0)) - to_chat(user, "Your target seems to have some sort of tinfoil protection on, blocking the message from being sent!") + to_chat(user, span_warning("Your 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, "You send the command to your target.") + to_chat(user, span_notice("You send the command to your 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, "Your target is dead!") + to_chat(user, span_warning("Your target is dead!")) return var/message = stripped_input(user, "Write a message to send to your target's brain.","Enter message") if(!message) @@ -359,7 +359,7 @@ return to_chat(L, "You hear a voice in your head saying: [message]") - to_chat(user, "You send the message to your target.") + to_chat(user, span_notice("You send the message to your target.")) log_directed_talk(user, L, message, LOG_SAY, "abductor whisper") @@ -441,7 +441,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(BATON_PROBE) txt = "probing" - to_chat(usr, "You switch the baton to [txt] mode.") + to_chat(usr, span_notice("You switch the baton to [txt] mode.")) update_icon() /obj/item/abductor/baton/update_icon() @@ -502,8 +502,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_userdanger("[user] has stunned you with [src]!")) playsound(src, 'sound/weapons/egloves.ogg', 50, TRUE, -1) if(ishuman(L)) @@ -515,26 +515,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()]!", \ - "You feel a strange wave of heavy drowsiness wash over you, but your 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_userdanger("You feel a strange wave of heavy drowsiness wash over you, but your tinfoil protection deflects most of it!")) L.drowsyness += 2 return - L.visible_message("[user] has induced sleep in [L] with [src]!", \ - "You suddenly feel very drowsy!") + L.visible_message(span_danger("[user] has induced sleep in [L] with [src]!"), \ + span_userdanger("You suddenly feel very drowsy!")) playsound(src, 'sound/weapons/egloves.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 your 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_userdanger("Any sense of drowsiness is quickly diminished as your 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]!", \ - "You 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_userdanger("You suddenly feel drowsy!")) /obj/item/abductor/baton/proc/CuffAttack(mob/living/L,mob/living/user) if(!iscarbon(L)) @@ -543,39 +543,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/weapons/cablecuff.ogg', 30, TRUE, -2) - C.visible_message("[user] begins restraining [C] with [src]!", \ - "[user] begins shaping an energy field around your hands!") + C.visible_message(span_danger("[user] begins restraining [C] with [src]!"), \ + span_userdanger("[user] begins shaping an energy field around your 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, "You restrain [C].") + to_chat(user, span_notice("You restrain [C].")) log_combat(user, C, "handcuffed") else - to_chat(user, "You fail to restrain [C].") + to_chat(user, span_warning("You 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_userdanger("[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]") @@ -594,8 +594,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_userdanger("[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() @@ -605,13 +605,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" @@ -644,7 +644,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.", "You place down [src] and activate it.") + user.visible_message(span_notice("[user] places down [src] and activates it."), span_notice("You place down [src] and activate it.")) user.dropItemToGround(src) playsound(src, 'sound/machines/terminal_alert.ogg', 50) addtimer(CALLBACK(src, .proc/try_spawn_machine), 30) @@ -732,7 +732,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, "You start disassembling [src]...") + to_chat(user, span_notice("You start disassembling [src]...")) I.play_tool_sound(src) if(I.use_tool(src, user, 30)) playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE) @@ -743,9 +743,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, "You need one alien alloy sheet to do this!") + to_chat(user, span_warning("You need one alien alloy sheet to do this!")) return - to_chat(user, "You start adding [P] to [src]...") + to_chat(user, span_notice("You start adding [P] to [src]...")) if(do_after(user, 50, target = src)) P.use(1) new /obj/structure/table/abductor(src.loc) @@ -754,9 +754,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, "You need one sheet of silver to do this!") + to_chat(user, span_warning("You need one sheet of silver to do this!")) return - to_chat(user, "You start adding [P] to [src]...") + to_chat(user, span_notice("You start adding [P] to [src]...")) if(do_after(user, 50, target = src)) P.use(1) new /obj/structure/table/optable/abductor(src.loc) @@ -792,7 +792,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} . = ..() if(iscarbon(AM)) START_PROCESSING(SSobj, src) - to_chat(AM, "You feel a series of tiny pricks!") + to_chat(AM, span_danger("You 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 db3bbf1118a4..6d53bd4c13e1 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm @@ -27,16 +27,16 @@ if(A.type in organ_types) IC = A break - user.visible_message("[user] starts to remove [target]'s organs.", "You start to remove [target]'s organs...") + user.visible_message("[user] starts to remove [target]'s organs.", span_notice("You 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]!", "You pull [IC] out of [target]'s [target_zone].") + user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", span_notice("You pull [IC] out of [target]'s [target_zone].")) user.put_in_hands(IC) IC.Remove(target) return 1 else - to_chat(user, "You don't find anything in [target]'s [target_zone]!") + to_chat(user, span_warning("You don't find anything in [target]'s [target_zone]!")) return 1 /datum/surgery_step/gland_insert diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index 327576cbd17c..47de9bdb2c3b 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(HAS_TRAIT(user, 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,7 +54,7 @@ if(!ownerCheck() || !mind_control_uses || active_mind_control) return FALSE mind_control_uses-- - to_chat(owner, "You suddenly feel an irresistible compulsion to follow an order...") + to_chat(owner, span_userdanger("You suddenly feel an irresistible compulsion to follow an order...")) to_chat(owner, "[command]") active_mind_control = TRUE message_admins("[key_name(user)] sent an abductor mind control message to [key_name(owner)]: [command]") @@ -118,7 +118,7 @@ mind_control_duration = 3000 /obj/item/organ/heart/gland/heals/activate() - to_chat(owner, "You feel curiously revitalized.") + to_chat(owner, span_notice("You feel curiously revitalized.")) owner.adjustToxLoss(-20, FALSE, TRUE) owner.heal_bodypart_damage(20, 20, 0, TRUE) owner.adjustOxyLoss(-20) @@ -138,7 +138,7 @@ owner.grant_language(/datum/language/slime) /obj/item/organ/heart/gland/slime/activate() - to_chat(owner, "You feel nauseated!") + to_chat(owner, span_warning("You feel nauseated!")) owner.vomit(20) var/mob/living/simple_animal/slime/Slime = new(get_turf(owner), "grey") @@ -156,7 +156,7 @@ var/list/mob/living/carbon/human/broadcasted_mobs = list() /obj/item/organ/heart/gland/mindshock/activate() - to_chat(owner, "You get a headache.") + to_chat(owner, span_notice("You get a headache.")) var/turf/T = get_turf(owner) for(var/mob/living/carbon/H in orange(4,T)) @@ -164,10 +164,10 @@ continue switch(pick(1,3)) if(1) - to_chat(H, "You hear a loud buzz in your head, silencing your thoughts!") + to_chat(H, span_userdanger("You hear a loud buzz in your head, silencing your thoughts!")) H.Stun(50) if(2) - to_chat(H, "You hear an annoying buzz in your head.") + to_chat(H, span_warning("You hear an annoying buzz in your head.")) H.confused += 15 H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 160) if(3) @@ -185,7 +185,7 @@ continue broadcasted_mobs += H - to_chat(H, "You suddenly feel an irresistible compulsion to follow an order...") + to_chat(H, span_userdanger("You suddenly feel an irresistible compulsion to follow an order...")) to_chat(H, "[command]") message_admins("[key_name(user)] broadcasted an abductor mind control message from [key_name(owner)] to [key_name(H)]: [command]") @@ -220,7 +220,7 @@ mind_control_duration = 900 /obj/item/organ/heart/gland/access/activate() - to_chat(owner, "You feel like a VIP for some reason.") + to_chat(owner, span_notice("You feel like a VIP for some reason.")) RegisterSignal(owner, COMSIG_MOB_ALLOWED, .proc/free_access) /obj/item/organ/heart/gland/access/proc/free_access(datum/source, obj/O) @@ -241,7 +241,7 @@ mind_control_duration = 300 /obj/item/organ/heart/gland/pop/activate() - to_chat(owner, "You feel unlike yourself.") + to_chat(owner, span_notice("You feel unlike yourself.")) randomize_human(owner) var/species = pick(list(/datum/species/human, /datum/species/lizard, /datum/species/gorilla, /datum/species/moth, /datum/species/fly)) // yogs -- gorilla people owner.set_species(species) @@ -256,7 +256,7 @@ mind_control_duration = 1800 /obj/item/organ/heart/gland/ventcrawling/activate() - to_chat(owner, "You feel very stretchy.") + to_chat(owner, span_notice("You feel very stretchy.")) owner.ventcrawler = VENTCRAWLER_ALWAYS /obj/item/organ/heart/gland/viral @@ -269,7 +269,7 @@ mind_control_duration = 1800 /obj/item/organ/heart/gland/viral/activate() - to_chat(owner, "You feel sick.") + to_chat(owner, span_warning("You feel sick.")) var/datum/disease/advance/A = random_virus(pick(2,6),6) A.carrier = TRUE owner.ForceContractDisease(A, FALSE, TRUE) @@ -304,7 +304,7 @@ mind_control_duration = 1800 /obj/item/organ/heart/gland/trauma/activate() - to_chat(owner, "You feel a spike of pain in your head.") + to_chat(owner, span_warning("You 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 @@ -340,15 +340,15 @@ 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, "You suddenly find yourself somewhere else!") - to_chat(entangled_mob, "You suddenly find yourself somewhere else!") + to_chat(owner, span_warning("You suddenly find yourself somewhere else!")) + to_chat(entangled_mob, span_warning("You suddenly find yourself 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, "You suddenly feel an irresistible compulsion to follow an order...") + to_chat(entangled_mob, span_userdanger("You suddenly feel an irresistible compulsion to follow an order...")) to_chat(entangled_mob, "[command]") var/obj/screen/alert/mind_control/mind_alert = entangled_mob.throw_alert("mind_control", /obj/screen/alert/mind_control) mind_alert.command = command @@ -357,7 +357,7 @@ /obj/item/organ/heart/gland/quantum/clear_mind_control() if(active_mind_control) - to_chat(entangled_mob, "You feel the compulsion fade, and you completely forget about your previous orders.") + to_chat(entangled_mob, span_userdanger("You feel the compulsion fade, and you completely forget about your previous orders.")) entangled_mob.clear_alert("mind_control") ..() @@ -371,7 +371,7 @@ mind_control_duration = 2400 /obj/item/organ/heart/gland/spiderman/activate() - to_chat(owner, "You feel something crawling in your skin.") + to_chat(owner, span_warning("You 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]." @@ -388,7 +388,7 @@ 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) @@ -409,7 +409,7 @@ return var/mob/living/carbon/human/H = owner var/datum/species/species = H.dna.species - to_chat(H, "You feel your blood heat up for a moment.") + to_chat(H, span_warning("You feel your blood heat up for a moment.")) species.exotic_blood = get_random_reagent_id() /obj/item/organ/heart/gland/electric @@ -430,8 +430,8 @@ ..() /obj/item/organ/heart/gland/electric/activate() - owner.visible_message("[owner]'s skin starts emitting electric arcs!",\ - "You feel electric energy building up inside you!") + owner.visible_message(span_danger("[owner]'s skin starts emitting electric arcs!"),\ + span_warning("You feel electric energy building up inside you!")) playsound(get_turf(owner), "sparks", 100, 1, -1) addtimer(CALLBACK(src, .proc/zap), rand(30, 100)) @@ -470,14 +470,14 @@ mind_control_duration = 800 /obj/item/organ/heart/gland/plasma/activate() - to_chat(owner, "You feel bloated.") - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, owner, "A massive stomachache overcomes you."), 150) + to_chat(owner, span_warning("You feel bloated.")) + addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, owner, span_userdanger("A massive stomachache overcomes you.")), 150) addtimer(CALLBACK(src, .proc/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/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm index 20a25993dd78..f9846a919d86 100644 --- a/code/modules/antagonists/abductor/machinery/console.dm +++ b/code/modules/antagonists/abductor/machinery/console.dm @@ -51,7 +51,7 @@ if(.) return if(!HAS_TRAIT(user, TRAIT_ABDUCTOR_TRAINING) && !HAS_TRAIT(user.mind, TRAIT_ABDUCTOR_TRAINING)) - to_chat(user, "You start mashing alien buttons at random!") + to_chat(user, span_warning("You start mashing alien buttons at random!")) if(do_after(user,100, target = src)) TeleporterSend() @@ -174,12 +174,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) ..() @@ -244,9 +244,9 @@ /obj/machinery/abductor/console/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/abductor/gizmo) && AddGizmo(O)) - to_chat(user, "You link the tool to the console.") + to_chat(user, span_notice("You link the tool to the console.")) else if(istype(O, /obj/item/clothing/suit/armor/abductor/vest) && AddVest(O)) - to_chat(user, "You link the vest to the console.") + to_chat(user, span_notice("You 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 55208b7963c6..c4f311504053 100644 --- a/code/modules/antagonists/abductor/machinery/experiment.dm +++ b/code/modules/antagonists/abductor/machinery/experiment.dm @@ -39,19 +39,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("You see [user] kicking against the door of [src]!", \ - "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "You hear a metallic creaking from [src].") + user.visible_message(span_notice("You see [user] kicking against the door of [src]!"), \ + span_notice("You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_hear("You 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]!", \ - "You successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("You successfully break out of [src]!")) open_machine() /obj/machinery/abductor/experiment/ui_status(mob/user) @@ -139,11 +139,11 @@ sleep(5) switch(text2num(type)) if(1) - to_chat(H, "You feel violated.") + to_chat(H, span_warning("You feel violated.")) if(2) - to_chat(H, "You feel yourself being sliced apart and put back together.") + to_chat(H, span_warning("You feel yourself being sliced apart and put back together.")) if(3) - to_chat(H, "You feel intensely watched.") + to_chat(H, span_warning("You feel intensely watched.")) sleep(5) user_abductor.team.abductees += H.mind H.mind.add_antag_datum(/datum/antagonist/abductee) diff --git a/code/modules/antagonists/abductor/machinery/pad.dm b/code/modules/antagonists/abductor/machinery/pad.dm index 81795f932b62..7a54cbee5bd8 100644 --- a/code/modules/antagonists/abductor/machinery/pad.dm +++ b/code/modules/antagonists/abductor/machinery/pad.dm @@ -11,7 +11,7 @@ var/list/inventory = C.get_all_gear() for(var/atom/A in inventory) if(istype(A, /obj/item/bodybag/bluespace)) - to_chat(target, "[A] colapses in on it's self!") + to_chat(target, span_warning("[A] colapses in on it's self!")) qdel(A) if(!target.buckled) target.forceMove(get_turf(src)) @@ -23,7 +23,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 a547b6217f6b..864e9ac69941 100644 --- a/code/modules/antagonists/blob/blob.dm +++ b/code/modules/antagonists/blob/blob.dm @@ -23,7 +23,7 @@ /datum/antagonist/blob/greet() if(!isovermind(owner.current)) - to_chat(owner,"You feel bloated.") + to_chat(owner,span_userdanger("You 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 a15c9910ba42..6784a4c1da1e 100644 --- a/code/modules/antagonists/blob/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob_mobs.dm @@ -134,7 +134,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 2f119e49ec0f..d83aea3e46e4 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_userdanger("[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 35a8e1ca4835..bbd33ef965d4 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 4a9d859c13cb..e81e7678a27c 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 == "melee" || 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 69e9b8f6cf15..bebc2d53adb1 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 == "melee") - 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 059363c0c8a7..45f878286c54 100644 --- a/code/modules/antagonists/blob/blobstrains/zombifying_pods.dm +++ b/code/modules/antagonists/blob/blobstrains/zombifying_pods.dm @@ -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].") \ No newline at end of file + to_chat(O, span_notice("Gained [points] resources from the zombification of [M].")) \ No newline at end of file diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index 501909abaeb5..337002a9d8d4 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -183,7 +183,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) /mob/camera/blob/Login() ..() - to_chat(src, "You are the overmind!") + to_chat(src, span_notice("You are the overmind!")) blob_help() update_health_hud() add_points(0) diff --git a/code/modules/antagonists/blob/powers.dm b/code/modules/antagonists/blob/powers.dm index 0806a5dbd55c..c4dbff979084 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, "You cannot afford this, you need at least [cost] resources!") + to_chat(src, span_warning("You 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, "You need to place this blob closer to a node or core!") + to_chat(src, span_warning("You 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 = "Toggle requiring nodes to place resource and factory blobs." nodes_required = !nodes_required if(nodes_required) - to_chat(src, "You now require a nearby node or core to place factory and resource blobs.") + to_chat(src, span_warning("You now require a nearby node or core to place factory and resource blobs.")) else - to_chat(src, "You no longer require a nearby node or core to place factory and resource blobs.") + to_chat(src, span_warning("You 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, "You secrete a reflective ooze over the shield blob, allowing it to reflect projectiles at the cost of reduced integrity.") + to_chat(src, span_warning("You 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,19 +156,19 @@ var/turf/T = get_turf(src) var/obj/structure/blob/factory/B = locate(/obj/structure/blob/factory) in T if(!B) - to_chat(src, "You must be on a factory blob!") + to_chat(src, span_warning("You 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, "You attempt to produce a blobbernaut.") + to_chat(src, span_notice("You attempt to produce a blobbernaut.")) var/list/mob/dead/observer/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 @@ -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, "You could not conjure a sentience for your blobbernaut. Your points have been refunded. Try again later.") + to_chat(src, span_warning("You 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, "You must be on a blob node!") + to_chat(src, span_warning("You must be on a blob node!")) return if(!blob_core) - to_chat(src, "You have no core and are about to die! May you rest in peace.") + to_chat(src, span_userdanger("You 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, "You cannot relocate your core here!") + to_chat(src, span_warning("You 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, "You have too many resources to remove this blob!") + to_chat(src, span_warning("You 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() diff --git a/code/modules/antagonists/blob/structures/factory.dm b/code/modules/antagonists/blob/structures/factory.dm index 756d1b03fabc..852f674438b3 100644 --- a/code/modules/antagonists/blob/structures/factory.dm +++ b/code/modules/antagonists/blob/structures/factory.dm @@ -25,7 +25,7 @@ spore.factory = null if(naut) naut.factory = null - to_chat(naut, "Your factory was destroyed! You feel yourself dying!") + to_chat(naut, span_userdanger("Your factory was destroyed! You feel yourself dying!")) naut.throw_alert("nofactory", /obj/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 e91deaf4c47a..b2a7749604f6 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 2cd61b93e7f8..3dc87124a6ba 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_userdanger("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, "You 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_userdanger("You 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 9b358956594d..35f10edac9cb 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, "Your mind reels as it begins focusing on a single purpose...") + to_chat(owner, span_warning("Your 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, "Your mind suddenly clears...") + to_chat(owner, span_warning("Your mind suddenly clears...")) to_chat(owner, "You 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 f828e823da5e..56411338c8bd 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,"You are no longer the [special_role]!") + to_chat(owner.current,span_userdanger("You are no longer the [special_role]!")) owner.current.remove_status_effect(/datum/status_effect/agent_pinpointer/brother) owner.special_role = null return ..() @@ -57,7 +57,7 @@ /datum/antagonist/brother/greet() var/brother_text = get_brother_names() - to_chat(owner.current, "You are the [owner.special_role] of [brother_text].") + to_chat(owner.current, span_alertsyndie("You are the [owner.special_role] of [brother_text].")) to_chat(owner.current, "The Syndicate only accepts those that have proven themselves. Prove yourself and prove your [team.member_name]s by completing your objectives together!") owner.announce_objectives() give_meeting_area() @@ -118,7 +118,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 @@ -131,9 +131,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 f2911a392b87..e7d45de6bf7e 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -196,16 +196,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_danger("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, "You lack the power to readapt your evolutions!") + to_chat(owner.current, span_danger("You lack the power to readapt your evolutions!")) return 0 //Called in life() @@ -239,33 +239,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 @@ -363,15 +363,15 @@ /datum/antagonist/changeling/greet() if (you_are_greet) - to_chat(owner.current, "You 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("You 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, "You must complete the following tasks:") owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ling_aler.ogg', 100, FALSE, pressure_affected = FALSE) owner.announce_objectives() /datum/antagonist/changeling/farewell() - to_chat(owner.current, "You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!") + to_chat(owner.current, span_userdanger("You 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) @@ -488,7 +488,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() . = ..() @@ -497,7 +497,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) @@ -576,10 +576,10 @@ count++ if(changelingwin) - parts += "The changeling was successful!" + parts += span_greentext("The changeling was successful!") SSachievements.unlock_achievement(/datum/achievement/greentext/changelingwin, owner.current.client) //changeling wins, give achivement 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 dc886cb531b0..03fe7625e322 100644 --- a/code/modules/antagonists/changeling/changeling_power.dm +++ b/code/modules/antagonists/changeling/changeling_power.dm @@ -56,22 +56,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 976cbefb97eb..3838af35dde2 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, "You 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_userdanger("You 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, absorbtimer)) - 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, "You 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_userdanger("You are absorbed by the changeling!")) if(!changeling.has_dna(target.dna)) changeling.add_new_profile(target) @@ -111,17 +111,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 a332adc9c6e6..7d68312b8f4c 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.[(!(user.mobility_flags & MOBILITY_STAND)) ? " We arise." : ""]") + to_chat(user, span_notice("Energy rushes through us.[(!(user.mobility_flags & MOBILITY_STAND)) ? " We arise." : ""]")) user.SetSleeping(0) user.SetUnconscious(0) user.SetStun(0) diff --git a/code/modules/antagonists/changeling/powers/biodegrade.dm b/code/modules/antagonists/changeling/powers/biodegrade.dm index b5c4075830ab..ba43cfded8cd 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/dissolve_handcuffs, user, O), 30) used = TRUE @@ -27,8 +27,8 @@ var/obj/item/clothing/suit/S = user.get_item_by_slot(SLOT_WEAR_SUIT) 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/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/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/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_suit == 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 c1d59608bece..b03520c76869 100644 --- a/code/modules/antagonists/changeling/powers/digitalcamo.dm +++ b/code/modules/antagonists/changeling/powers/digitalcamo.dm @@ -9,11 +9,11 @@ /datum/action/changeling/digitalcamo/sting_action(mob/user) ..() if(user.digitalcamo) - to_chat(user, "We return to normal.") + to_chat(user, span_notice("We return to normal.")) user.digitalinvis = 0 user.digitalcamo = 0 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.digitalcamo = 1 user.digitalinvis = 1 return TRUE diff --git a/code/modules/antagonists/changeling/powers/fakedeath.dm b/code/modules/antagonists/changeling/powers/fakedeath.dm index cb7f5ad639d5..7223ac46a2d2 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.")) if(user.stat != DEAD) user.tod = station_time_timestamp() user.fakedeath("changeling") //play dead @@ -54,7 +54,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 = "We arise once more." button_icon_state = "revive" @@ -64,7 +64,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 83c4c933a455..361b58f19ecc 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 09a062747d2e..1358a3a26de3 100644 --- a/code/modules/antagonists/changeling/powers/headcrab.dm +++ b/code/modules/antagonists/changeling/powers/headcrab.dm @@ -23,13 +23,13 @@ for(var/mob/living/carbon/human/H in range(2,user)) var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES) if(eyes) - to_chat(H, "You are blinded by a shower of blood!") + to_chat(H, span_userdanger("You 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, "Your sensors are disabled by a shower of blood!") + to_chat(S, span_userdanger("Your sensors are disabled by a shower of blood!")) S.Paralyze(60) var/turf = get_turf(user) user.gib() @@ -42,4 +42,4 @@ if(crab.origin) crab.origin.active = 1 crab.origin.transfer_to(crab) - to_chat(crab, "You burst out of the remains of your former body in a shower of gore!") + to_chat(crab, span_warning("You burst out of the remains of your 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 611843d84036..9e63c555426b 100644 --- a/code/modules/antagonists/changeling/powers/hivemind.dm +++ b/code/modules/antagonists/changeling/powers/hivemind.dm @@ -46,7 +46,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) @@ -56,7 +56,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) @@ -70,7 +70,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 @@ -84,12 +84,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 @@ -101,7 +101,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) @@ -114,5 +114,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 edac59960852..3f517494f860 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 7a1c83e243ea..84da9ed6e96b 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 3f15bab46f92..34711f22b7fe 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,17 +43,17 @@ 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, "You 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_userdanger("You 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 yourself 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_userdanger("A migraine throbs behind your eyes, you hear yourself 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, "You can now communicate in the changeling hivemind, say \"[MODE_TOKEN_CHANGELING] message\" to communicate!") @@ -61,12 +61,12 @@ 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, "You 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("You cannot sustain the connection any longer, your victim fades from the hivemind")) + to_chat(target, span_userdanger("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 721adb262fba..d537de16bce4 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 = stripped_input(user, "Enter a name to mimic.", "Mimic Voice", null, MAX_NAME_LEN) @@ -23,5 +23,5 @@ 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("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 e1e0563e45eb..e91c840a3884 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/effects/blobattack.ogg', 30, 1) - 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.", "You 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 your hand, you cannot grow a [weapon_name_simple] over it!") + to_chat(user, span_warning("[held] is stuck to your 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!", "Your arm regrows, making a loud, crunchy sound and giving you great pain!", "You hear organic matter ripping and tearing!") + user.visible_message(span_warning("[user]'s missing arm reforms, making a loud, grotesque sound!"), span_userdanger("Your arm regrows, making a loud, crunchy sound and giving you great pain!"), span_italics("You 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_suit, 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].", "You 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_italics("You hear the organic matter ripping and tearing!")) H.temporarilyRemoveItemFromInventory(H.head, TRUE) //The qdel on dropped() takes care of it H.temporarilyRemoveItemFromInventory(H.wear_suit, TRUE) H.update_inv_wear_suit() @@ -171,7 +171,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.", "You 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_italics("You hear organic matter ripping and tearing!")) if(synthetic) can_drop = TRUE AddComponent(/datum/component/butchering, 60, 80) @@ -194,18 +194,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 airlock open.", //yogs modified description - "You 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 airlock open."), //yogs modified description + span_italics("You hear a metal screeching sound.")) playsound(A, 'sound/machines/airlock_alien_prying.ogg', 100, 1) 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 airlock to open.", //yogs modified description - "You 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 airlock to open."), //yogs modified description + span_italics("You hear a metal screeching sound.")) A.open(2) /obj/item/melee/arm_blade/dropped(mob/user) @@ -257,13 +257,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.", "You 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_italics("You hear organic matter ripping and tearing!")) else - to_chat(loc, "You prepare to extend a tentacle.") + to_chat(loc, span_notice("You 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_chamber() . = ..() @@ -271,7 +271,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) @@ -329,7 +329,7 @@ if(H.Adjacent(C)) for(var/obj/item/I in H.held_items) if(I.is_sharp()) - 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_userdanger("[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) @@ -343,7 +343,7 @@ if(isitem(target)) var/obj/item/I = target if(!I.anchored) - to_chat(firer, "You pull [I] towards yourself.") + to_chat(firer, span_notice("You pull [I] towards yourself.")) H.throw_mode_on() I.throw_at(H, 10, 2) . = BULLET_ACT_HIT @@ -359,7 +359,7 @@ firer_intent = M.a_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_userdanger("A tentacle grabs you and pulls you towards [H]!")) C.throw_at(get_step_towards(H,C), 8, 2) return BULLET_ACT_HIT @@ -367,28 +367,28 @@ 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_userdanger("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, "You can't seem to pry [I] off [C]'s hands!") + to_chat(firer, span_danger("You 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_userdanger("A tentacle grabs you and pulls you towards [H]!")) C.Immobilize(2) //0.2 seconds of immobilize so the effect probably actually does something C.throw_at(get_step_towards(H,C), 8, 2, H, TRUE, TRUE, callback=CALLBACK(src, .proc/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_userdanger("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/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_userdanger("A tentacle grabs you and pulls you towards [H]!")) L.throw_at(get_step_towards(H,L), 8, 2) . = BULLET_ACT_HIT @@ -438,13 +438,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.", "You 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_italics("You 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", "You hear organic matter ripping and tearing!") qdel(src) return 0 else @@ -484,7 +484,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!", "You 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_italics("You hear organic matter ripping and tearing!")) START_PROCESSING(SSobj, src) /obj/item/clothing/suit/space/changeling/process() @@ -539,7 +539,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!", "You 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_italics("You 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 bf6547f83cc5..0bc43b1f33bb 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 07ec2b3ade95..9ee041251ce4 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 6a74c0316afa..4eb11e169eb3 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.add_movespeed_modifier(MOVESPEED_ID_CHANGELING_MUSCLES, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING)) - 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("gasp") @@ -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 1ab401be9bd1..ed7fb81e3075 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -17,7 +17,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, "You feel a tiny prick.") + to_chat(target, span_warning("You feel a tiny prick.")) return 1 @@ -92,7 +92,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 @@ -100,7 +100,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 @@ -133,7 +133,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 @@ -142,15 +142,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!", "Your arm twists and mutates, transforming into a horrific monstrosity!", "You hear organic matter ripping and tearing!") + target.visible_message(span_warning("A grotesque blade forms around [target.name]\'s arm!"), span_userdanger("Your arm twists and mutates, transforming into a horrific monstrosity!"), span_italics("You hear organic matter ripping and tearing!")) playsound(target, 'sound/effects/blobattack.ogg', 30, 1) addtimer(CALLBACK(src, .proc/remove_fake, target, blade), 600) @@ -160,7 +160,7 @@ playsound(target, 'sound/effects/blobattack.ogg', 30, 1) 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."), "Your eyes burn horrifically!") + to_chat(target, span_danger("Your 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 ec5ab29b34ba..335c914f99bb 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, "You reabsorb [src] into your body.") + to_chat(user, span_notice("You 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, "You reabsorb [src] into your body.") + to_chat(user, span_notice("You 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, "You reabsorb [src] into your body.") + to_chat(user, span_notice("You 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, "You reabsorb [src] into your body.") + to_chat(user, span_notice("You 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, "You reabsorb [src] into your body.") + to_chat(user, span_notice("You 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, "You reabsorb [src] into your body.") + to_chat(user, span_notice("You 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, "You reabsorb [src] into your body.") + to_chat(user, span_notice("You 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, "You reabsorb [src] into your body.") + to_chat(user, span_notice("You reabsorb [src] into your body.")) qdel(src) return . = ..() diff --git a/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm b/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm index 21d0035ef15c..080230d269b9 100644 --- a/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm +++ b/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm @@ -18,7 +18,7 @@ /obj/effect/clockwork/city_of_cogs_rift/Initialize() . = ..() - visible_message("The air above [loc] shimmers and pops as a [name] forms there!") + visible_message(span_warning("The air above [loc] shimmers and pops as a [name] forms there!")) for(var/mob/M in GLOB.player_list) if(M.z == z) if(get_dist(src, M) >= 7) @@ -27,12 +27,12 @@ M.playsound_local(src, 'sound/magic/blink.ogg', 50, FALSE) /obj/effect/clockwork/city_of_cogs_rift/Destroy() - visible_message("[src] cracks as it destabilizes and breaks apart!") + visible_message(span_warning("[src] cracks as it destabilizes and breaks apart!")) return ..() /obj/effect/clockwork/city_of_cogs_rift/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/nullrod)) - to_chat(user, "Your [I.name] seems to have no effect on [src]!") + to_chat(user, span_warning("Your [I.name] seems to have no effect on [src]!")) return . = ..() @@ -45,8 +45,8 @@ if(isliving(AM)) var/mob/living/L = AM if(L.client && !L.incapacitated()) - L.visible_message("[L] starts climbing through [src]...", \ - "You begin climbing through [src]...") + L.visible_message(span_notice("[L] starts climbing through [src]..."), \ + span_notice("You begin climbing through [src]...")) if(!do_after(L, 30, target = L)) return if(!istype(AM, /obj/effect/)) @@ -62,10 +62,10 @@ if(is_servant_of_ratvar(L) && L.stat != DEAD) // Having a living cultist in your inventory sends you to the cultist spawn T = GLOB.ark_of_the_clockwork_justiciar ? get_step(GLOB.ark_of_the_clockwork_justiciar, SOUTH) : get_turf(pick(GLOB.servant_spawns)) break - AM.visible_message("[AM] passes through [src]!", null, null, null, AM) + AM.visible_message(span_danger("[AM] passes through [src]!"), null, null, null, AM) AM.forceMove(T) - AM.visible_message("[AM] materializes from the air!", \ - "You pass through [src] and appear [is_servant_of_ratvar(AM) ? "back at the City of Cogs" : "somewhere unfamiliar. Looks like it was a one-way trip.."].") + AM.visible_message(span_danger("[AM] materializes from the air!"), \ + span_boldannounce("You pass through [src] and appear [is_servant_of_ratvar(AM) ? "back at the City of Cogs" : "somewhere unfamiliar. Looks like it was a one-way trip.."].")) do_sparks(5, TRUE, src) do_sparks(5, TRUE, AM) if(isliving(AM)) @@ -74,4 +74,4 @@ L.clear_fullscreen("flash", 5) var/obj/item/transfer_valve/TTV = locate() in L.GetAllContents() if(TTV) - to_chat(L, "The air resonates with the Ark's presence; your explosives will be significantly dampened here!") + to_chat(L, span_userdanger("The air resonates with the Ark's presence; your explosives will be significantly dampened here!")) diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm index 67ea7ece2b80..fbc6a28e2bdd 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm @@ -18,7 +18,7 @@ if(I.force) if(is_servant_of_ratvar(user) && user.a_intent != INTENT_HARM) return ..() - user.visible_message("[user] scatters [src] with [I]!", "You scatter [src] with [I]!") + user.visible_message(span_warning("[user] scatters [src] with [I]!"), span_danger("You scatter [src] with [I]!")) qdel(src) return 1 return ..() @@ -31,13 +31,13 @@ if(iscarbon(user) && !user.stat) if(is_servant_of_ratvar(user) && user.a_intent != INTENT_HARM) return ..() - user.visible_message("[user] stamps out [src]!", "You stomp on [src], scattering it into thousands of particles.") + user.visible_message(span_warning("[user] stamps out [src]!"), span_danger("You stomp on [src], scattering it into thousands of particles.")) qdel(src) return TRUE . = ..() /obj/effect/clockwork/sigil/ex_act(severity) - visible_message("[src] scatters into thousands of particles.") + visible_message(span_warning("[src] scatters into thousands of particles.")) qdel(src) /obj/effect/clockwork/sigil/Crossed(atom/movable/AM) @@ -49,8 +49,8 @@ var/atom/I = L.anti_magic_check(check_antimagic, check_holy) if(I) if(isitem(I)) - L.visible_message("[L]'s [I.name] [resist_string], protecting [L.p_them()] from [src]'s effects!", \ - "Your [I.name] [resist_string], protecting you!") + L.visible_message(span_warning("[L]'s [I.name] [resist_string], protecting [L.p_them()] from [src]'s effects!"), \ + span_userdanger("Your [I.name] [resist_string], protecting you!")) return sigil_effects(L) @@ -81,8 +81,8 @@ to_chat(L, "\"Watch your step, wretch.\"") L.adjustBruteLoss(10) L.Paralyze(80, FALSE) - L.visible_message("[src] appears around [L] in a burst of light!", \ - "[target_flashed ? "An unseen force":"The glowing sigil around you"] holds you in place!") + L.visible_message(span_warning("[src] appears around [L] in a burst of light!"), \ + span_userdanger("[target_flashed ? "An unseen force":"The glowing sigil around you"] holds you in place!")) L.Stun(40) L.apply_status_effect(STATUS_EFFECT_BELLIGERENT) new /obj/effect/temp_visual/ratvar/sigil/transgression(get_turf(src)) @@ -118,9 +118,9 @@ if(is_servant_of_ratvar(M) && !M.stat) has_servant = TRUE if(!has_sigil && !has_servant) - visible_message("[src] strains into a gentle violet color, but quietly fades...") + visible_message(span_danger("[src] strains into a gentle violet color, but quietly fades...")) return - L.visible_message("[src] begins to glow a piercing magenta!", "You feel something start to invade your mind...") + L.visible_message(span_warning("[src] begins to glow a piercing magenta!"), span_sevtug("You feel something start to invade your mind...")) var/oldcolor = color animate(src, color = "#AF0AAF", time = convert_time, flags = ANIMATION_END_NOW) var/obj/effect/temp_visual/ratvar/sigil/glow @@ -135,7 +135,7 @@ qdel(glow) animate(src, color = oldcolor, time = 20, flags = ANIMATION_END_NOW) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 20) - visible_message("[src] slowly stops glowing!") + visible_message(span_warning("[src] slowly stops glowing!")) return if(is_eligible_servant(L)) to_chat(L, "\"You belong to me now.\"") @@ -163,7 +163,7 @@ to_chat(M, "[message] [L.real_name]!") animate(src, color = oldcolor, time = 20, flags = ANIMATION_END_NOW) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 20) - visible_message("[src] slowly stops glowing!") + visible_message(span_warning("[src] slowly stops glowing!")) //Sigil of Transmission: Serves as an access point for powered structures. @@ -186,7 +186,7 @@ /obj/effect/clockwork/sigil/transmission/ex_act(severity) if(severity == 3) adjust_clockwork_power(500) //Light explosions charge the network! - visible_message("[src] flares a brilliant orange!") + visible_message(span_warning("[src] flares a brilliant orange!")) else ..() @@ -199,24 +199,24 @@ . += {"It is storing [DisplayEnergy(get_clockwork_power())] of shared power, and [structure_number] clockwork structure[structure_number == 1 ? " is":"s are"] in range."} if(iscyborg(user)) - . += "You can recharge from the [sigil_name] by crossing it." + . += span_brass("You can recharge from the [sigil_name] by crossing it.") /obj/effect/clockwork/sigil/transmission/sigil_effects(mob/living/L) if(is_servant_of_ratvar(L)) if(iscyborg(L)) charge_cyborg(L) else if(get_clockwork_power()) - to_chat(L, "You feel a slight, static shock.") + to_chat(L, span_brass("You feel a slight, static shock.")) /obj/effect/clockwork/sigil/transmission/proc/charge_cyborg(mob/living/silicon/robot/cyborg) if(!cyborg_checks(cyborg)) return - to_chat(cyborg, "You start to charge from the [sigil_name]...") + to_chat(cyborg, span_brass("You start to charge from the [sigil_name]...")) if(!do_after(cyborg, 50, target = src, extra_checks = CALLBACK(src, .proc/cyborg_checks, cyborg, TRUE))) return var/giving_power = min(FLOOR(cyborg.cell.maxcharge - cyborg.cell.charge, MIN_CLOCKCULT_POWER), get_clockwork_power()) //give the borg either all our power or their missing power floored to MIN_CLOCKCULT_POWER if(adjust_clockwork_power(-giving_power)) - cyborg.visible_message("[cyborg] glows a brilliant orange!") + cyborg.visible_message(span_warning("[cyborg] glows a brilliant orange!")) var/previous_color = cyborg.color cyborg.color = list("#EC8A2D", "#EC8A2D", "#EC8A2D", rgb(0,0,0)) cyborg.apply_status_effect(STATUS_EFFECT_POWERREGEN, giving_power * 0.1) //ten ticks, restoring 10% each @@ -226,19 +226,19 @@ /obj/effect/clockwork/sigil/transmission/proc/cyborg_checks(mob/living/silicon/robot/cyborg, silent) if(!cyborg.cell) if(!silent) - to_chat(cyborg, "You have no cell!") + to_chat(cyborg, span_warning("You have no cell!")) return FALSE if(!get_clockwork_power()) if(!silent) - to_chat(cyborg, "There is no power available across sigils!") + to_chat(cyborg, span_warning("There is no power available across sigils!")) return FALSE if(cyborg.cell.charge > cyborg.cell.maxcharge - MIN_CLOCKCULT_POWER) if(!silent) - to_chat(cyborg, "You are already at maximum charge!") + to_chat(cyborg, span_warning("You are already at maximum charge!")) return FALSE if(cyborg.has_status_effect(STATUS_EFFECT_POWERREGEN)) if(!silent) - to_chat(cyborg, "You are already regenerating power!") + to_chat(cyborg, span_warning("You are already regenerating power!")) return FALSE return TRUE @@ -303,7 +303,7 @@ var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src)) animate(V, alpha = 0, transform = matrix()*2, time = 8) playsound(L, 'sound/magic/wandodeath.ogg', 50, 1) - L.visible_message("[L] collapses in on [L.p_them()]self as [src] flares bright blue!") + L.visible_message(span_warning("[L] collapses in on [L.p_them()]self as [src] flares bright blue!")) to_chat(L, "\"[text2ratvar("Your life will not be wasted.")]\"") for(var/obj/item/W in L) if(!L.dropItemToGround(W)) @@ -326,9 +326,9 @@ var/mob/dead/observer/ghost = L.get_ghost(TRUE) if(GLOB.clockwork_vitality >= revival_cost && (ghost || (L.mind && L.mind.active))) if(L.has_status_effect(STATUS_EFFECT_ICHORIAL_STAIN)) - visible_message("[src] strains, but nothing happens...") + visible_message(span_boldwarning("[src] strains, but nothing happens...")) if(L.pulledby) - to_chat(L.pulledby, "[L] was already revived recently by a vitality matrix! Wait a bit longer!") + to_chat(L.pulledby, span_userdanger("[L] was already revived recently by a vitality matrix! Wait a bit longer!")) break else if(ghost) @@ -337,7 +337,7 @@ var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src)) animate(V, alpha = 0, transform = matrix()*2, time = 8) playsound(L, 'sound/magic/staff_healing.ogg', 50, 1) - to_chat(L, "\"[text2ratvar("You will be okay, child.")]\"") + to_chat(L, span_inathneq("\"[text2ratvar("You will be okay, child.")]\"")) L.apply_status_effect(STATUS_EFFECT_ICHORIAL_STAIN) GLOB.clockwork_vitality -= revival_cost break @@ -346,14 +346,14 @@ var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [L.name], an inactive clock cultist?", ROLE_SERVANT_OF_RATVAR, null, ROLE_SERVANT_OF_RATVAR, 50, L) if(LAZYLEN(candidates)) var/mob/dead/observer/C = pick(candidates) - to_chat(L, "Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form!") + to_chat(L, span_userdanger("Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form!")) message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(L)]) to replace an inactive clock cultist.") L.ghostize(0) L.key = C.key var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src)) animate(V, alpha = 0, transform = matrix()*2, time = 8) playsound(L, 'sound/magic/staff_healing.ogg', 50, 1) - L.visible_message("[L]'s eyes suddenly open wide, gleaming with renewed vigor for the cause!", "\"[text2ratvar("Awaken!")]\"") + L.visible_message(span_warning("[L]'s eyes suddenly open wide, gleaming with renewed vigor for the cause!"), span_inathneq("\"[text2ratvar("Awaken!")]\"")) break var/vitality_for_cycle = 3 if(!GLOB.ratvar_awakens) diff --git a/code/modules/antagonists/clockcult/clock_effects/servant_blocker.dm b/code/modules/antagonists/clockcult/clock_effects/servant_blocker.dm index 1b2bd220ad4c..7b7c3174fd3d 100644 --- a/code/modules/antagonists/clockcult/clock_effects/servant_blocker.dm +++ b/code/modules/antagonists/clockcult/clock_effects/servant_blocker.dm @@ -22,7 +22,7 @@ var/list/target_contents = M.GetAllContents() + M for(var/mob/living/L in target_contents) if(is_servant_of_ratvar(L) && get_dir(M, src) != dir && L.stat != DEAD) //Unless we're on the side the arrow is pointing directly away from, no-go - to_chat(L, "The space beyond here can't be accessed by you or other servants.") + to_chat(L, span_danger("The space beyond here can't be accessed by you or other servants.")) return FALSE if(isitem(M)) var/obj/item/I = M diff --git a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm index da6bc2a85be9..c6bf3018ce80 100644 --- a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm +++ b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm @@ -55,7 +55,7 @@ /obj/effect/clockwork/spatial_gateway/examine(mob/user) . = ..() if(is_servant_of_ratvar(user) || isobserver(user)) - . += "It has [uses] use\s remaining." + . += span_brass("It has [uses] use\s remaining.") //ATTACK GHOST IGNORING PARENT RETURN VALUE /obj/effect/clockwork/spatial_gateway/attack_ghost(mob/user) @@ -71,19 +71,19 @@ var/mob/living/L = user.pulling if(L.buckled || L.anchored || L.has_buckled_mobs()) return FALSE - user.visible_message("[user] shoves [L] into [src]!", "You shove [L] into [src]!") + user.visible_message(span_warning("[user] shoves [L] into [src]!"), span_danger("You shove [L] into [src]!")) user.stop_pulling() pass_through_gateway(L) return TRUE if(!user.canUseTopic(src)) return FALSE - user.visible_message("[user] climbs through [src]!", "You brace yourself and step through [src]...") + user.visible_message(span_warning("[user] climbs through [src]!"), span_danger("You brace yourself and step through [src]...")) pass_through_gateway(user) return TRUE /obj/effect/clockwork/spatial_gateway/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/nullrod)) - user.visible_message("[user] dispels [src] with [I]!", "You close [src] with [I]!") + user.visible_message(span_warning("[user] dispels [src] with [I]!"), span_danger("You close [src] with [I]!")) qdel(linked_gateway) qdel(src) return TRUE @@ -91,7 +91,7 @@ to_chat(user, "\"I don't think you want to drop your slab into that.\"\n\"If you really want to, try throwing it.\"") return TRUE if(uses && user.dropItemToGround(I)) - user.visible_message("[user] drops [I] into [src]!", "You drop [I] into [src]!") + user.visible_message(span_warning("[user] drops [I] into [src]!"), span_danger("You drop [I] into [src]!")) pass_through_gateway(I, TRUE) return TRUE return ..() @@ -99,12 +99,12 @@ /obj/effect/clockwork/spatial_gateway/ex_act(severity) if(severity == 1 && uses) uses = 0 - visible_message("[src] is disrupted!") + visible_message(span_warning("[src] is disrupted!")) animate(src, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW) deltimer(timerid) timerid = QDEL_IN(src, 10) linked_gateway.uses = 0 - linked_gateway.visible_message("[linked_gateway] is disrupted!") + linked_gateway.visible_message(span_warning("[linked_gateway] is disrupted!")) animate(linked_gateway, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW) deltimer(linked_gateway.timerid) linked_gateway.timerid = QDEL_IN(linked_gateway, 10) @@ -129,7 +129,7 @@ qdel(src) return FALSE if(!sender) - visible_message("[A] bounces off [src]!") + visible_message(span_warning("[A] bounces off [src]!")) return FALSE if(!uses) return FALSE @@ -137,12 +137,12 @@ var/area/gate2 = get_area(linked_gateway) var/reebeport = (gate1 && gate2) && ((is_reebe(src.z) && is_reebe(linked_gateway.z)) || (is_reebe(src.z) && !gate2.noteleport) || (is_reebe(linked_gateway.z) && !gate1.noteleport)) //reebe is noteleport so we have to check if either side is on reebe or otherwise teleport-accessible to force do_teleport if(!do_teleport(A, get_turf(linked_gateway), forceMove = TRUE, channel = TELEPORT_CHANNEL_CULT, forced = reebeport)) - visible_message("[A] bounces off [src]!") + visible_message(span_warning("[A] bounces off [src]!")) return FALSE if(isliving(A)) var/mob/living/user = A to_chat(user, "You pass through [src] and appear elsewhere!") - linked_gateway.visible_message("A shape appears in [linked_gateway] before emerging!") + linked_gateway.visible_message(span_warning("A shape appears in [linked_gateway] before emerging!")) playsound(src, 'sound/effects/empulse.ogg', 50, 1) playsound(linked_gateway, 'sound/effects/empulse.ogg', 50, 1) transform = matrix() * 1.5 @@ -183,51 +183,51 @@ possible_targets[avoid_assoc_duplicate_keys("[L.name] ([L.real_name])", teleportnames)] = L if(!possible_targets.len) - to_chat(invoker, "There are no other eligible targets for a Spatial Gateway!") + to_chat(invoker, span_warning("There are no other eligible targets for a Spatial Gateway!")) return FALSE var/input_target_key = input(invoker, "Choose a target to form a rift to.", "Spatial Gateway") as null|anything in possible_targets var/atom/movable/target = possible_targets[input_target_key] if(!src || !input_target_key || !invoker || !invoker.canUseTopic(src, !issilicon(invoker)) || !is_servant_of_ratvar(invoker) || (isitem(src) && invoker.get_active_held_item() != src) || !invoker.can_speak_vocal()) return FALSE //if any of the involved things no longer exist, the invoker is stunned, too far away to use the object, or does not serve ratvar, or if the object is an item and not in the mob's active hand, fail if(!target) //if we have no target, but did have a key, let them retry - to_chat(invoker, "That target no longer exists!") + to_chat(invoker, span_warning("That target no longer exists!")) return procure_gateway(invoker, time_duration, gateway_uses, two_way) if(isliving(target)) var/mob/living/L = target if(!is_servant_of_ratvar(L)) - to_chat(invoker, "That target is no longer a Servant!") + to_chat(invoker, span_warning("That target is no longer a Servant!")) return procure_gateway(invoker, time_duration, gateway_uses, two_way) if(L.stat != CONSCIOUS) - to_chat(invoker, "That Servant is no longer conscious!") + to_chat(invoker, span_warning("That Servant is no longer conscious!")) return procure_gateway(invoker, time_duration, gateway_uses, two_way) var/istargetobelisk = istype(target, /obj/structure/destructible/clockwork/powered/clockwork_obelisk) var/issrcobelisk = istype(src, /obj/structure/destructible/clockwork/powered/clockwork_obelisk) if(issrcobelisk) if(!anchored) - to_chat(invoker, "[src] is no longer secured!") + to_chat(invoker, span_warning("[src] is no longer secured!")) return FALSE var/obj/structure/destructible/clockwork/powered/clockwork_obelisk/CO = src //foolish as I am, how I set this proc up makes substypes unfeasible if(CO.active) - to_chat(invoker, "[src] is now sustaining a gateway!") + to_chat(invoker, span_warning("[src] is now sustaining a gateway!")) return FALSE if(istargetobelisk) if(!target.anchored) - to_chat(invoker, "That [target.name] is no longer secured!") + to_chat(invoker, span_warning("That [target.name] is no longer secured!")) return procure_gateway(invoker, time_duration, gateway_uses, two_way) var/obj/structure/destructible/clockwork/powered/clockwork_obelisk/CO = target if(CO.active) - to_chat(invoker, "That [target.name] is sustaining a gateway, and cannot receive another!") + to_chat(invoker, span_warning("That [target.name] is sustaining a gateway, and cannot receive another!")) return procure_gateway(invoker, time_duration, gateway_uses, two_way) var/efficiency = CO.get_efficiency_mod() gateway_uses = round(gateway_uses * (2 * efficiency), 1) time_duration = round(time_duration * (2 * efficiency), 1) CO.active = TRUE //you'd be active in a second but you should update immediately - invoker.visible_message("The air in front of [invoker] ripples before suddenly tearing open!", \ - "With a word, you rip open a [two_way ? "two-way":"one-way"] rift to [input_target_key]. It will last for [DisplayTimeText(time_duration)] and has [gateway_uses] use[gateway_uses > 1 ? "s" : ""].") + invoker.visible_message(span_warning("The air in front of [invoker] ripples before suddenly tearing open!"), \ + span_brass("With a word, you rip open a [two_way ? "two-way":"one-way"] rift to [input_target_key]. It will last for [DisplayTimeText(time_duration)] and has [gateway_uses] use[gateway_uses > 1 ? "s" : ""].")) var/obj/effect/clockwork/spatial_gateway/S1 = new(issrcobelisk ? get_turf(src) : get_step(get_turf(invoker), invoker.dir)) var/obj/effect/clockwork/spatial_gateway/S2 = new(istargetobelisk ? get_turf(target) : get_step(get_turf(target), target.dir)) //Set up the portals now that they've spawned S1.setup_gateway(S2, time_duration, gateway_uses, two_way) - S2.visible_message("The air in front of [target] ripples before suddenly tearing open!") + S2.visible_message(span_warning("The air in front of [target] ripples before suddenly tearing open!")) return TRUE diff --git a/code/modules/antagonists/clockcult/clock_helpers/clock_powerdrain.dm b/code/modules/antagonists/clockcult/clock_helpers/clock_powerdrain.dm index 7658f7e715e4..5ada97e2fd2b 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/clock_powerdrain.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/clock_powerdrain.dm @@ -19,7 +19,7 @@ cell.use(.) //Better than a power sink! if(!cell.charge && !shorted) shorted = 1 - visible_message("The [name]'s screen blurs with static.") + visible_message(span_warning("The [name]'s screen blurs with static.")) update() update_icon() @@ -31,7 +31,7 @@ panel_open = TRUE icon_state = "[initial(icon_state)]-o" do_sparks(10, FALSE, src) - visible_message("[src]'s panel flies open with a flurry of sparks!") + visible_message(span_warning("[src]'s panel flies open with a flurry of sparks!")) update_icon() /obj/item/stock_parts/cell/power_drain(clockcult_user) diff --git a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm index 562e41bb6ec4..3d82483e0b9f 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm @@ -53,10 +53,10 @@ if(locate(/obj/structure/table) in src) return FALSE if(locate(/obj/structure/falsewall) in contents) - to_chat(user, "There is a false wall in the way, preventing you from fabricating a clockwork wall on [src].") + to_chat(user, span_warning("There is a false wall in the way, preventing you from fabricating a clockwork wall on [src].")) return if(is_blocked_turf(src, TRUE)) - to_chat(user, "Something is in the way, preventing you from fabricating a clockwork wall on [src].") + to_chat(user, span_warning("Something is in the way, preventing you from fabricating a clockwork wall on [src].")) return TRUE var/operation_time = 100 if(!GLOB.ratvar_awakens && fabricator.speed_multiplier > 0) //if ratvar isn't awake, this always takes 10 seconds @@ -232,8 +232,8 @@ var/list/repair_values = list() if(!fabricator.fabricator_repair_checks(repair_values, src, user)) return - user.visible_message("[user]'s [fabricator.name] starts covering [src] in glowing orange energy...", \ - "You start repairing [src]...") + user.visible_message(span_notice("[user]'s [fabricator.name] starts covering [src] in glowing orange energy..."), \ + span_alloy("You start repairing [src]...")) fabricator.repairing = src while(fabricator && user && src) if(!do_after(user, repair_values["healing_for_cycle"] * fabricator.speed_multiplier, target = src, \ @@ -246,7 +246,7 @@ if(fabricator) fabricator.repairing = null if(user) - user.visible_message("[user]'s [fabricator.name] stops covering [src] with glowing orange energy.", \ + user.visible_message(span_notice("[user]'s [fabricator.name] stops covering [src] with glowing orange energy."), \ "You finish repairing [src]. It is now at [obj_integrity]/[max_integrity] integrity.") //Fabricator mob heal proc, to avoid as much copypaste as possible. @@ -254,8 +254,8 @@ var/list/repair_values = list() if(!fabricator.fabricator_repair_checks(repair_values, src, user)) return - user.visible_message("[user]'s [fabricator.name] starts covering [src == user ? "[user.p_them()]" : "[src]"] in glowing orange energy...", \ - "You start repairing [src == user ? "yourself" : "[src]"]...") + user.visible_message(span_notice("[user]'s [fabricator.name] starts covering [src == user ? "[user.p_them()]" : "[src]"] in glowing orange energy..."), \ + span_alloy("You start repairing [src == user ? "yourself" : "[src]"]...")) fabricator.repairing = src while(fabricator && user && src) if(!do_after(user, repair_values["healing_for_cycle"] * fabricator.speed_multiplier, target = src, \ @@ -283,7 +283,7 @@ if(health == maxHealth) //if we're at maximum health, replace the turf under us return FALSE else if(fabricator_heal(user, fabricator) && user) - user.visible_message("[user]'s [fabricator.name] stops covering [src == user ? "[user.p_them()]" : "[src]"] with glowing orange energy.", \ + user.visible_message(span_notice("[user]'s [fabricator.name] stops covering [src == user ? "[user.p_them()]" : "[src]"] with glowing orange energy."), \ "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_theyre(TRUE)]"] now at [abs(HEALTH_THRESHOLD_DEAD - health)]/[abs(HEALTH_THRESHOLD_DEAD - maxHealth)] health.") //Same with clockwork mobs. @@ -292,7 +292,7 @@ if(health == maxHealth) //if we're at maximum health, replace the turf under us return FALSE else if(fabricator_heal(user, fabricator) && user) - user.visible_message("[user]'s [fabricator.name] stops covering [src == user ? "[user.p_them()]" : "[src]"] with glowing orange energy.", \ + user.visible_message(span_notice("[user]'s [fabricator.name] stops covering [src == user ? "[user.p_them()]" : "[src]"] with glowing orange energy."), \ "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_theyre(TRUE)]"] now at [health]/[maxHealth] health.") //Cogscarabs get special interaction because they're drones and have innate self-heals/revives. @@ -304,13 +304,13 @@ if(health == maxHealth) return FALSE else if(!(flags_1 & GODMODE)) - user.visible_message("[user]'s [fabricator.name] starts covering [src == user ? "[user.p_them()]" : "[src]"] in glowing orange energy...", \ - "You start repairing [src == user ? "yourself" : "[src]"]...") + user.visible_message(span_notice("[user]'s [fabricator.name] starts covering [src == user ? "[user.p_them()]" : "[src]"] in glowing orange energy..."), \ + span_alloy("You start repairing [src == user ? "yourself" : "[src]"]...")) fabricator.repairing = src if(do_after(user, (maxHealth - health)*2, target=src)) adjustHealth(-maxHealth) - user.visible_message("[user]'s [fabricator.name] stops covering [src == user ? "[user.p_them()]" : "[src]"] with glowing orange energy.", \ - "You finish repairing [src == user ? "yourself" : "[src]"].") + user.visible_message(span_notice("[user]'s [fabricator.name] stops covering [src == user ? "[user.p_them()]" : "[src]"] with glowing orange energy."), \ + span_alloy("You finish repairing [src == user ? "yourself" : "[src]"].")) if(fabricator) fabricator.repairing = null diff --git a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm index 9cf6234dee10..3507d1633178 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm @@ -35,24 +35,24 @@ if(iscarbon(target) && target.Adjacent(ranged_ability_user)) var/mob/living/carbon/L = target if(is_servant_of_ratvar(L)) - to_chat(ranged_ability_user, "\"[L.p_theyre(TRUE)] a servant.\"") + to_chat(ranged_ability_user, span_neovgre("\"[L.p_theyre(TRUE)] a servant.\"")) return TRUE else if(L.stat) - to_chat(ranged_ability_user, "\"There is use in shackling the dead, but for examples.\"") + to_chat(ranged_ability_user, span_neovgre("\"There is use in shackling the dead, but for examples.\"")) return TRUE else if (istype(L.handcuffed,/obj/item/restraints/handcuffs/clockwork)) - to_chat(ranged_ability_user, "\"[L.p_theyre(TRUE)] already helpless, no?\"") + to_chat(ranged_ability_user, span_neovgre("\"[L.p_theyre(TRUE)] already helpless, no?\"")) return TRUE //yogs start -- shackling people with just one arm is right-out else if(L.get_num_arms(FALSE) < 2 && !L.get_arm_ignore()) - to_chat(ranged_ability_user, "\"[L.p_theyre(TRUE)] lacking in arms necessary for shackling.\"") + to_chat(ranged_ability_user, span_neovgre("\"[L.p_theyre(TRUE)] lacking in arms necessary for shackling.\"")) return TRUE //yogs end playsound(loc, 'sound/weapons/handcuffs.ogg', 30, TRUE) - ranged_ability_user.visible_message("[ranged_ability_user] begins forming manacles around [L]'s wrists!", \ + ranged_ability_user.visible_message(span_danger("[ranged_ability_user] begins forming manacles around [L]'s wrists!"), \ "You begin shaping replicant alloy into manacles around [L]'s wrists...") - to_chat(L, "[ranged_ability_user] begins forming manacles around your wrists!") + to_chat(L, span_userdanger("[ranged_ability_user] begins forming manacles around your wrists!")) if(do_mob(ranged_ability_user, L, 30)) if(!(istype(L.handcuffed,/obj/item/restraints/handcuffs/clockwork))) L.handcuffed = new/obj/item/restraints/handcuffs/clockwork(L) @@ -60,7 +60,7 @@ to_chat(ranged_ability_user, "You shackle [L].") log_combat(ranged_ability_user, L, "handcuffed") else - to_chat(ranged_ability_user, "You fail to shackle [L].") + to_chat(ranged_ability_user, span_warning("You fail to shackle [L].")) successful = TRUE @@ -75,8 +75,8 @@ item_flags = DROPDEL /obj/item/restraints/handcuffs/clockwork/dropped(mob/user) - user.visible_message("[user]'s [name] come apart at the seams!", \ - "Your [name] break apart as they're removed!") + user.visible_message(span_danger("[user]'s [name] come apart at the seams!"), \ + span_userdanger("Your [name] break apart as they're removed!")) . = ..() //For the Sentinel's Compromise scripture; heals a target servant. @@ -94,10 +94,10 @@ if(isliving(target) && (target in view(7, get_turf(ranged_ability_user)))) var/mob/living/L = target if(!is_servant_of_ratvar(L)) - to_chat(ranged_ability_user, "\"[L] does not yet serve Ratvar.\"") + to_chat(ranged_ability_user, span_inathneq("\"[L] does not yet serve Ratvar.\"")) return TRUE if(L.stat == DEAD) - to_chat(ranged_ability_user, "\"[L.p_theyre(TRUE)] dead. [text2ratvar("Oh, child. To have your life cut short...")]\"") + to_chat(ranged_ability_user, span_inathneq("\"[L.p_theyre(TRUE)] dead. [text2ratvar("Oh, child. To have your life cut short...")]\"")) return TRUE var/brutedamage = L.getBruteLoss() @@ -105,12 +105,12 @@ var/oxydamage = L.getOxyLoss() var/totaldamage = brutedamage + burndamage + oxydamage if(!totaldamage && (!L.reagents || !L.reagents.has_reagent(/datum/reagent/water/holywater))) - to_chat(ranged_ability_user, "\"[L] is unhurt and untainted.\"") + to_chat(ranged_ability_user, span_inathneq("\"[L] is unhurt and untainted.\"")) return TRUE successful = TRUE - to_chat(ranged_ability_user, "You bathe [L == ranged_ability_user ? "yourself":"[L]"] in Inath-neq's power!") + to_chat(ranged_ability_user, span_brass("You bathe [L == ranged_ability_user ? "yourself":"[L]"] in Inath-neq's power!")) var/targetturf = get_turf(L) var/has_holy_water = (L.reagents && L.reagents.has_reagent(/datum/reagent/water/holywater)) var/healseverity = max(round(totaldamage*0.05, 1), 1) //shows the general severity of the damage you just healed, 1 glow per 20 @@ -123,12 +123,12 @@ L.adjustToxLoss(totaldamage * 0.5, TRUE, TRUE) clockwork_say(ranged_ability_user, text2ratvar("[has_holy_water ? "Heal tainted" : "Mend wounded"] flesh!")) log_combat(ranged_ability_user, L, "healed with Sentinel's Compromise") - L.visible_message("A blue light washes over [L], [has_holy_water ? "causing [L.p_them()] to briefly glow as it mends" : " mending"] [L.p_their()] bruises and burns!", \ + L.visible_message(span_warning("A blue light washes over [L], [has_holy_water ? "causing [L.p_them()] to briefly glow as it mends" : " mending"] [L.p_their()] bruises and burns!"), \ "You feel Inath-neq's power healing your wounds[has_holy_water ? " and purging the darkness within you" : ""], but a deep nausea overcomes you!") else clockwork_say(ranged_ability_user, text2ratvar("Purge foul darkness!")) log_combat(ranged_ability_user, L, "purged of holy water with Sentinel's Compromise") - L.visible_message("A blue light washes over [L], causing [L.p_them()] to briefly glow!", \ + L.visible_message(span_warning("A blue light washes over [L], causing [L.p_them()] to briefly glow!"), \ "You feel Inath-neq's power purging the darkness within you!") playsound(targetturf, 'sound/magic/staff_healing.ogg', 50, 1) @@ -156,7 +156,7 @@ successful = TRUE var/turf/U = get_turf(target) - to_chat(ranged_ability_user, "You release the light of Ratvar!") + to_chat(ranged_ability_user, span_brass("You release the light of Ratvar!")) clockwork_say(ranged_ability_user, text2ratvar("Purge all untruths and honor Engine!")) log_combat(ranged_ability_user, U, "fired at with Kindle") playsound(ranged_ability_user, 'sound/magic/blink.ogg', 50, TRUE, frequency = 0.5) @@ -179,7 +179,7 @@ log_override = TRUE /obj/item/projectile/kindle/Destroy() - visible_message("[src] flickers out!") + visible_message(span_warning("[src] flickers out!")) . = ..() /obj/item/projectile/kindle/on_hit(atom/target, blocked = FALSE) @@ -191,14 +191,14 @@ playsound(L, 'sound/magic/fireball.ogg', 50, TRUE, frequency = 1.25) if(O) if(isitem(O)) - L.visible_message("[L]'s eyes flare with dim light!", \ - "Your [O] glows white-hot against you as it absorbs [src]'s power!") + L.visible_message(span_warning("[L]'s eyes flare with dim light!"), \ + span_userdanger("Your [O] glows white-hot against you as it absorbs [src]'s power!")) else if(ismob(O)) - L.visible_message("[L]'s eyes flare with dim light!") + L.visible_message(span_warning("[L]'s eyes flare with dim light!")) playsound(L, 'sound/weapons/sear.ogg', 50, TRUE) else - L.visible_message("[L]'s eyes blaze with brilliant light!", \ - "Your vision suddenly screams with white-hot light!") + L.visible_message(span_warning("[L]'s eyes blaze with brilliant light!"), \ + span_userdanger("Your vision suddenly screams with white-hot light!")) L.Paralyze(15) L.apply_status_effect(STATUS_EFFECT_KINDLE) L.flash_act(1, 1) @@ -222,13 +222,13 @@ if(isliving(target) && (target in view(7, get_turf(ranged_ability_user)))) var/mob/living/L = target if(!is_servant_of_ratvar(L)) - to_chat(ranged_ability_user, "\"[L] does not yet serve Ratvar.\"") + to_chat(ranged_ability_user, span_inathneq("\"[L] does not yet serve Ratvar.\"")) return TRUE if(L.stat == DEAD) - to_chat(ranged_ability_user, "\"[L.p_theyre(TRUE)] dead. [text2ratvar("Oh, child. To have your life cut short...")]\"") + to_chat(ranged_ability_user, span_inathneq("\"[L.p_theyre(TRUE)] dead. [text2ratvar("Oh, child. To have your life cut short...")]\"")) return TRUE if(islist(L.stun_absorption) && L.stun_absorption["vanguard"] && L.stun_absorption["vanguard"]["end_time"] > world.time) - to_chat(ranged_ability_user, "\"[L.p_theyre(TRUE)] already shielded by a Vanguard.\"") + to_chat(ranged_ability_user, span_inathneq("\"[L.p_theyre(TRUE)] already shielded by a Vanguard.\"")) return TRUE successful = TRUE @@ -266,7 +266,7 @@ successful = TRUE clockwork_say(ranged_ability_user, text2ratvar("Kneel, heathens!")) - ranged_ability_user.visible_message("[ranged_ability_user]'s eyes fire a stream of energy at [target], creating a strange mark!", \ + ranged_ability_user.visible_message(span_warning("[ranged_ability_user]'s eyes fire a stream of energy at [target], creating a strange mark!"), \ "You direct the judicial force to [target].") var/turf/targetturf = get_turf(target) new/obj/effect/clockwork/judicial_marker(targetturf, ranged_ability_user) diff --git a/code/modules/antagonists/clockcult/clock_items/clock_components.dm b/code/modules/antagonists/clockcult/clock_items/clock_components.dm index ed66f7fc4e11..1aa2d239baa3 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_components.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_components.dm @@ -16,8 +16,8 @@ /obj/item/clockwork/component/attack_self(mob/living/user) if(is_servant_of_ratvar(user)) - user.visible_message("[user] crushes [src] in [user.p_their()] hand!", \ - "You crush [src], capturing its escaping energy for use as power.") + user.visible_message(span_notice("[user] crushes [src] in [user.p_their()] hand!"), \ + span_alloy("You crush [src], capturing its escaping energy for use as power.")) playsound(user, 'sound/effects/pop_expl.ogg', 50, TRUE) adjust_clockwork_power(POWER_WALL_TOTAL) qdel(src) @@ -27,7 +27,7 @@ if(iscultist(user) || (user.mind && user.mind.holy_role)) to_chat(user, "[cultist_message]") if(user.mind && user.mind.holy_role) - to_chat(user, "The power of your faith melts away [src]!") + to_chat(user, span_boldannounce("The power of your faith melts away [src]!")) var/obj/item/stack/ore/slag/wrath = new /obj/item/stack/ore/slag qdel(src) user.put_in_active_hand(wrath) @@ -183,7 +183,7 @@ /obj/item/clockwork/alloy_shards/examine(mob/user) . = ..() if(is_servant_of_ratvar(user) || isobserver(user)) - . += "Can be consumed by a replica fabricator as a source of power." + . += span_brass("Can be consumed by a replica fabricator as a source of power.") /obj/item/clockwork/alloy_shards/proc/replace_name_desc() name = "replicant alloy shard" diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/_call_weapon.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/_call_weapon.dm index a87767c05e39..adf5c4ada069 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/_call_weapon.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/_call_weapon.dm @@ -22,21 +22,21 @@ /datum/action/innate/call_weapon/Activate() if(!owner.get_empty_held_indexes()) - to_chat(usr, "You need an empty hand to call forth your [initial(weapon_type.name)]!") + to_chat(usr, span_warning("You need an empty hand to call forth your [initial(weapon_type.name)]!")) return if(weapon) if(weapon.loc == owner) - owner.visible_message("[owner]'s [weapon.name] flickers and disappears!") - to_chat(owner, "You dismiss [weapon].") + owner.visible_message(span_danger("[owner]'s [weapon.name] flickers and disappears!")) + to_chat(owner, span_brass("You dismiss [weapon].")) QDEL_NULL(weapon) weapon_reset(RATVARIAN_SPEAR_COOLDOWN * 0.5) return else - weapon.visible_message("[weapon] suddenly flickers and disappears!") - owner.visible_message("A [weapon.name] suddenly flickers into [owner]'s hands!", "You recall [weapon] to you.") + weapon.visible_message(span_warning("[weapon] suddenly flickers and disappears!")) + owner.visible_message(span_danger("A [weapon.name] suddenly flickers into [owner]'s hands!"), span_brass("You recall [weapon] to you.")) else weapon = new weapon_type (get_turf(usr), src) - owner.visible_message("A [weapon.name] materializes in [owner]'s hands!", "You call forth your [weapon.name]!") + owner.visible_message(span_warning("A [weapon.name] materializes in [owner]'s hands!"), span_brass("You call forth your [weapon.name]!")) weapon.forceMove(get_turf(owner)) owner.put_in_hands(weapon) owner.update_action_buttons_icon() diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm index b676068fa972..991321b304e1 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm @@ -31,17 +31,17 @@ if(is_servant_of_ratvar(user) || isobserver(user)) . += "Attacks on living non-Servants will generate [bonus_burn] units of vitality." if(!iscyborg(user)) - . += "Throwing the spear will do massive damage, break the spear, and knock down the target." + . += span_brass("Throwing the spear will do massive damage, break the spear, and knock down the target.") /obj/item/clockwork/weapon/ratvarian_spear/attack(mob/living/target, mob/living/carbon/human/user) . = ..() if(!QDELETED(target) && target.stat != DEAD && !target.anti_magic_check(chargecost = 0) && !is_servant_of_ratvar(target)) //we do bonus damage on attacks unless they're a servant, have a null rod, or are dead var/bonus_damage = bonus_burn //normally a total of 20 damage, 30 with ratvar if(issilicon(target)) - target.visible_message("[target] shudders violently at [src]'s touch!", "ERROR: Temperature rising!") + target.visible_message(span_warning("[target] shudders violently at [src]'s touch!"), span_userdanger("ERROR: Temperature rising!")) bonus_damage *= 5 //total 40 damage on borgs, 70 with ratvar else if(iscultist(target) || isconstruct(target)) - to_chat(target, "Your body flares with agony at [src]'s presence!") + to_chat(target, span_userdanger("Your body flares with agony at [src]'s presence!")) bonus_damage *= 3 //total 30 damage on cultists, 50 with ratvar GLOB.clockwork_vitality += target.adjustFireLoss(bonus_damage) //adds the damage done to existing vitality @@ -51,9 +51,9 @@ var/mob/living/L = hit_atom if(is_servant_of_ratvar(L)) 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()) if(issilicon(L) || iscultist(L)) @@ -70,7 +70,7 @@ if(!T) T = get_turf(src) if(T) //make sure we're not in null or something - T.visible_message("[src] [pick("cracks in two and fades away", "snaps in two and dematerializes")]!") + T.visible_message(span_warning("[src] [pick("cracks in two and fades away", "snaps in two and dematerializes")]!")) new /obj/effect/temp_visual/ratvar/spearbreak(T) qdel(src) action.weapon_reset(RATVARIAN_SPEAR_COOLDOWN) diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm index 4f8ce98a3aa3..d395444eca06 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm @@ -40,13 +40,13 @@ if(slot == SLOT_HEAD && !is_servant_of_ratvar(user)) if(!iscultist(user)) to_chat(user, "\"Now now, this is for my servants, not you.\"") - user.visible_message("As [user] puts [src] on, it flickers off [user.p_their()] head!", "The helmet flickers off your head, leaving only nausea!") + user.visible_message(span_warning("As [user] puts [src] on, it flickers off [user.p_their()] head!"), span_warning("The helmet flickers off your head, leaving only nausea!")) if(iscarbon(user)) var/mob/living/carbon/C = user C.vomit(20) else to_chat(user, "\"Do you have a hole in your head? You're about to.\"") - to_chat(user, "The helmet tries to drive a spike through your head as you scramble to remove it!") + to_chat(user, span_userdanger("The helmet tries to drive a spike through your head as you scramble to remove it!")) user.emote("scream") user.apply_damage(30, BRUTE, BODY_ZONE_HEAD) user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 30) @@ -106,13 +106,13 @@ if(slot == SLOT_WEAR_SUIT && !is_servant_of_ratvar(user)) if(!iscultist(user)) to_chat(user, "\"Now now, this is for my servants, not you.\"") - user.visible_message("As [user] puts [src] on, it flickers off [user.p_their()] body!", "The cuirass flickers off your body, leaving only nausea!") + user.visible_message(span_warning("As [user] puts [src] on, it flickers off [user.p_their()] body!"), span_warning("The cuirass flickers off your body, leaving only nausea!")) if(iscarbon(user)) var/mob/living/carbon/C = user C.vomit(20) else to_chat(user, "\"I think this armor is too hot for you to handle.\"") - to_chat(user, "The cuirass emits a burst of flame as you scramble to get it off!") + to_chat(user, span_userdanger("The cuirass emits a burst of flame as you scramble to get it off!")) user.emote("scream") user.apply_damage(15, BURN, BODY_ZONE_CHEST) user.adjust_fire_stacks(2) @@ -167,13 +167,13 @@ if(slot == SLOT_GLOVES && !is_servant_of_ratvar(user)) if(!iscultist(user)) to_chat(user, "\"Now now, this is for my servants, not you.\"") - user.visible_message("As [user] puts [src] on, it flickers off [user.p_their()] arms!", "The gauntlets flicker off your arms, leaving only nausea!") + user.visible_message(span_warning("As [user] puts [src] on, it flickers off [user.p_their()] arms!"), span_warning("The gauntlets flicker off your arms, leaving only nausea!")) if(iscarbon(user)) var/mob/living/carbon/C = user C.vomit() else to_chat(user, "\"Did you like having arms?\"") - to_chat(user, "The gauntlets suddenly squeeze tight, crushing your arms before you manage to get them off!") + to_chat(user, span_userdanger("The gauntlets suddenly squeeze tight, crushing your arms before you manage to get them off!")) user.emote("scream") user.apply_damage(7, BRUTE, BODY_ZONE_L_ARM) user.apply_damage(7, BRUTE, BODY_ZONE_R_ARM) @@ -217,13 +217,13 @@ if(slot == SLOT_SHOES && !is_servant_of_ratvar(user)) if(!iscultist(user)) to_chat(user, "\"Now now, this is for my servants, not you.\"") - user.visible_message("As [user] puts [src] on, it flickers off [user.p_their()] feet!", "The treads flicker off your feet, leaving only nausea!") + user.visible_message(span_warning("As [user] puts [src] on, it flickers off [user.p_their()] feet!"), span_warning("The treads flicker off your feet, leaving only nausea!")) if(iscarbon(user)) var/mob/living/carbon/C = user C.vomit() else to_chat(user, "\"Let's see if you can dance with these.\"") - to_chat(user, "The treads turn searing hot as you scramble to get them off!") + to_chat(user, span_userdanger("The treads turn searing hot as you scramble to get them off!")) user.emote("scream") user.apply_damage(7, BURN, BODY_ZONE_L_LEG) user.apply_damage(7, BURN, BODY_ZONE_R_LEG) diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm index ac617dfb61ce..d6ecf4440832 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm @@ -74,7 +74,7 @@ /obj/item/clockwork/slab/cyborg/access_display(mob/living/user) if(!GLOB.ratvar_awakens) - to_chat(user, "Use the action buttons to recite your limited set of scripture!") + to_chat(user, span_warning("Use the action buttons to recite your limited set of scripture!")) else ..() @@ -140,7 +140,7 @@ /obj/item/clockwork/slab/attack_self(mob/living/user) if(iscultist(user)) to_chat(user, "\"You reek of blood. You've got a lot of nerve to even look at that slab.\"") - user.visible_message("A sizzling sound comes from [user]'s hands!", "[src] suddenly grows extremely hot in your hands!") + user.visible_message(span_warning("A sizzling sound comes from [user]'s hands!"), span_userdanger("[src] suddenly grows extremely hot in your hands!")) playsound(get_turf(user), 'sound/weapons/sear.ogg', 50, 1) user.dropItemToGround(src) user.emote("scream") @@ -148,22 +148,22 @@ user.apply_damage(5, BURN, BODY_ZONE_R_ARM) return 0 if(!is_servant_of_ratvar(user)) - to_chat(user, "The information on [src]'s display shifts rapidly. After a moment, your head begins to pound, and you tear your eyes away.") + to_chat(user, span_warning("The information on [src]'s display shifts rapidly. After a moment, your head begins to pound, and you tear your eyes away.")) user.confused += 5 user.dizziness += 5 return 0 if(busy) - to_chat(user, "[src] refuses to work, displaying the message: \"[busy]!\"") + to_chat(user, span_warning("[src] refuses to work, displaying the message: \"[busy]!\"")) return 0 if(!no_cost && !can_recite_scripture(user)) - to_chat(user, "[src] hums fitfully in your hands, but doesn't seem to do anything...") + to_chat(user, span_nezbere("[src] hums fitfully in your hands, but doesn't seem to do anything...")) return 0 access_display(user) /obj/item/clockwork/slab/AltClick(mob/living/user) if(is_servant_of_ratvar(user) && linking && user.canUseTopic(src, BE_CLOSE, ismonkey(user))) linking = null - to_chat(user, "Object link canceled.") + to_chat(user, span_notice("Object link canceled.")) /obj/item/clockwork/slab/proc/access_display(mob/living/user) if(!is_servant_of_ratvar(user)) @@ -182,12 +182,12 @@ if(!scripture || !user || !user.canUseTopic(src) || (!no_cost && !can_recite_scripture(user))) return FALSE if(user.get_active_held_item() != src) - to_chat(user, "You need to hold the slab in your active hand to recite scripture!") + to_chat(user, span_warning("You need to hold the slab in your active hand to recite scripture!")) return FALSE var/initial_tier = initial(scripture.tier) if(initial_tier != SCRIPTURE_PERIPHERAL) if(!GLOB.ratvar_awakens && !no_cost && !GLOB.scripture_states[initial_tier]) - to_chat(user, "That scripture is not unlocked, and cannot be recited!") + to_chat(user, span_warning("That scripture is not unlocked, and cannot be recited!")) return FALSE var/datum/clockwork_scripture/scripture_to_recite = new scripture scripture_to_recite.slab = src diff --git a/code/modules/antagonists/clockcult/clock_items/construct_chassis.dm b/code/modules/antagonists/clockcult/clock_items/construct_chassis.dm index 3f5f5ff985da..ab7e1d485204 100644 --- a/code/modules/antagonists/clockcult/clock_items/construct_chassis.dm +++ b/code/modules/antagonists/clockcult/clock_items/construct_chassis.dm @@ -4,11 +4,11 @@ desc = "A shell formed out of brass, presumably for housing machinery." clockwork_desc = "A construct chassis. It can be activated at any time by a willing ghost." var/construct_name = "basic construct" - var/construct_desc = "There is no construct for this chassis. Report this to a coder." + var/construct_desc = span_alloy("There is no construct for this chassis. Report this to a coder.") icon_state = "anime_fragment" resistance_flags = FIRE_PROOF | ACID_PROOF w_class = WEIGHT_CLASS_HUGE - var/creation_message = "The chassis shudders and hums to life!" + var/creation_message = span_brass("The chassis shudders and hums to life!") var/construct_type //The construct this shell will create /obj/item/clockwork/construct_chassis/Initialize() @@ -33,23 +33,23 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/clockwork/construct_chassis/attack_hand(mob/living/user) if(w_class >= WEIGHT_CLASS_HUGE) - to_chat(user, "[src] is too cumbersome to carry! Drag it around instead!") + to_chat(user, span_warning("[src] is too cumbersome to carry! Drag it around instead!")) return . = ..() //ATTACK GHOST IGNORING PARENT RETURN VALUE /obj/item/clockwork/construct_chassis/attack_ghost(mob/user) if(!SSticker.mode) - to_chat(user, "You cannot use that before the game has started.") + to_chat(user, span_danger("You cannot use that before the game has started.")) return if(QDELETED(src)) - to_chat(user, "You were too late! Better luck next time.") + to_chat(user, span_danger("You were too late! Better luck next time.")) return user.forceMove(get_turf(src)) //If we attack through the alert, jump to the chassis so we know what we're getting into if(alert(user, "Become a [construct_name]? You can no longer be cloned!", construct_name, "Yes", "Cancel") == "Cancel") return if(QDELETED(src)) - to_chat(user, "You were too late! Better luck next time.") + to_chat(user, span_danger("You were too late! Better luck next time.")) return pre_spawn() visible_message(creation_message) diff --git a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm index ec324cc0f0e4..ad87d5d6ed12 100644 --- a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm +++ b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm @@ -45,7 +45,7 @@ update_status(FALSE) if(iscultist(user)) //Cultists spontaneously combust to_chat(user, "\"Consider yourself judged, whelp.\"") - to_chat(user, "You suddenly catch fire!") + to_chat(user, span_userdanger("You suddenly catch fire!")) user.adjust_fire_stacks(5) user.IgniteMob() return 1 @@ -82,7 +82,7 @@ to_chat(L, "As you put on [src], its lens begins to glow, information flashing before your eyes.\n\ Judicial visor active. Use the action button to gain the ability to smite the unworthy.") if(FALSE) - to_chat(L, "As you take off [src], its lens darkens once more.") + to_chat(L, span_notice("As you take off [src], its lens darkens once more.")) return 1 /obj/item/clothing/glasses/judicial_visor/proc/recharge_visor(mob/living/user) @@ -90,7 +90,7 @@ return 0 recharging = FALSE if(user && src == user.get_item_by_slot(SLOT_GLASSES)) - to_chat(user, "Your [name] hums. It is ready.") + to_chat(user, span_brass("Your [name] hums. It is ready.")) else active = FALSE icon_state = "judicial_visor_[active]" @@ -106,7 +106,7 @@ /obj/effect/proc_holder/judicial_visor/proc/toggle(mob/user) var/message if(active) - message = "You dispel the power of [visor]." + message = span_brass("You dispel the power of [visor].") remove_ranged_ability(message) else message = "You harness [visor]'s power. Left-click to place a judicial marker!" @@ -133,7 +133,7 @@ V.update_status() addtimer(CALLBACK(V, /obj/item/clothing/glasses/judicial_visor.proc/recharge_visor, ranged_ability_user), (GLOB.ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown) * 2) clockwork_say(ranged_ability_user, text2ratvar("Kneel, heathens!")) - ranged_ability_user.visible_message("[ranged_ability_user]'s judicial visor fires a stream of energy at [target], creating a strange mark!", "You direct [visor]'s power to [target]. You must wait for some time before doing this again.") + ranged_ability_user.visible_message(span_warning("[ranged_ability_user]'s judicial visor fires a stream of energy at [target], creating a strange mark!"), "You direct [visor]'s power to [target]. You must wait for some time before doing this again.") var/turf/targetturf = get_turf(target) new/obj/effect/clockwork/judicial_marker(targetturf, ranged_ability_user) log_combat(ranged_ability_user, targetturf, "created a judicial marker") @@ -193,15 +193,15 @@ var/atom/I = L.anti_magic_check() if(I) if(isitem(I)) - L.visible_message("Strange energy flows into [L]'s [I.name]!", \ - "Your [I.name] shields you from [src]!") + L.visible_message(span_warning("Strange energy flows into [L]'s [I.name]!"), \ + span_userdanger("Your [I.name] shields you from [src]!")) continue L.Paralyze(15) //knocks down briefly when exploding if(!iscultist(L)) - L.visible_message("[L] is struck by a judicial explosion!", \ - "[!issilicon(L) ? "An unseen force slams you into the ground!" : "ERROR: Motor servos disabled by external source!"]") + L.visible_message(span_warning("[L] is struck by a judicial explosion!"), \ + span_userdanger("[!issilicon(L) ? "An unseen force slams you into the ground!" : "ERROR: Motor servos disabled by external source!"]")) else - L.visible_message("[L] is struck by a judicial explosion!", \ + L.visible_message(span_warning("[L] is struck by a judicial explosion!"), \ "\"Keep an eye out, filth.\"\nA burst of heat crushes you against the ground!") L.adjust_fire_stacks(2) //sets cultist targets on fire L.IgniteMob() diff --git a/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm b/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm index 021ebc6ba50b..298f0c77fe37 100644 --- a/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm +++ b/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm @@ -77,7 +77,7 @@ return FALSE if(repairing) if(!silent) - to_chat(user, "You are currently repairing [repairing] with [src]!") + to_chat(user, span_warning("You are currently repairing [repairing] with [src]!")) return FALSE var/list/fabrication_values = target.fabrication_vals(user, src, silent) //relevant values for fabricating stuff, given as an associated list if(!islist(fabrication_values)) @@ -85,7 +85,7 @@ if(!isturf(target)) //otherwise, if we didn't get TRUE and the original target wasn't a turf, try to fabricate the turf return fabricate(get_turf(target), user, no_table_check) if(!silent) - to_chat(user, "[target] cannot be fabricated!") + to_chat(user, span_warning("[target] cannot be fabricated!")) if(!no_table_check) return TRUE return FALSE @@ -110,30 +110,30 @@ if(!silent) var/atom/A = fabrication_values["new_obj_type"] if(A) - user.visible_message("[user]'s [name] starts ripping [target] apart!", \ - "You start fabricating \a [initial(A.name)] from [target]...") + user.visible_message(span_warning("[user]'s [name] starts ripping [target] apart!"), \ + span_brass("You start fabricating \a [initial(A.name)] from [target]...")) else - user.visible_message("[user]'s [name] starts consuming [target]!", \ - "Your [name] starts consuming [target]...") + user.visible_message(span_warning("[user]'s [name] starts consuming [target]!"), \ + span_brass("Your [name] starts consuming [target]...")) if(!do_after(user, fabrication_values["operation_time"], target = target, extra_checks = CALLBACK(src, .proc/fabricate_checks, fabrication_values, target, target_type, user, TRUE))) return FALSE if(!silent) var/atom/A = fabrication_values["new_obj_type"] if(A) - user.visible_message("[user]'s [name] replaces [target] with \a [initial(A.name)]!", \ - "You fabricate \a [initial(A.name)] from [target].") + user.visible_message(span_warning("[user]'s [name] replaces [target] with \a [initial(A.name)]!"), \ + span_brass("You fabricate \a [initial(A.name)] from [target].")) else - user.visible_message("[user]'s [name] consumes [target]!", \ - "Your [name] consumes [target].") + user.visible_message(span_warning("[user]'s [name] consumes [target]!"), \ + span_brass("Your [name] consumes [target].")) else if(!silent) var/atom/A = fabrication_values["new_obj_type"] if(A) - user.visible_message("[user]'s [name] rips apart [target], replacing it with \a [initial(A.name)]!", \ - "You fabricate \a [initial(A.name)] from [target].") + user.visible_message(span_warning("[user]'s [name] rips apart [target], replacing it with \a [initial(A.name)]!"), \ + span_brass("You fabricate \a [initial(A.name)] from [target].")) else - user.visible_message("[user]'s [name] rapidly consumes [target]!", \ - "Your [name] consumes [target].") + user.visible_message(span_warning("[user]'s [name] rapidly consumes [target]!"), \ + span_brass("Your [name] consumes [target].")) playsound(target, 'sound/items/deconstruct.ogg', 50, 1) var/new_thing_type = fabrication_values["new_obj_type"] @@ -189,11 +189,11 @@ var/mob/living/L = target if(!is_servant_of_ratvar(L)) if(!silent) - to_chat(user, "[L] does not serve Ratvar!") + to_chat(user, span_warning("[L] does not serve Ratvar!")) return FALSE if(L.health >= L.maxHealth || (L.flags_1 & GODMODE)) if(!silent) - to_chat(user, "[L == user ? "You are" : "[L] is"] at maximum health!") + to_chat(user, span_warning("[L == user ? "You are" : "[L] is"] at maximum health!")) return FALSE repair_values["amount_to_heal"] = L.maxHealth - L.health else if(isobj(target)) @@ -201,12 +201,12 @@ var/obj/structure/destructible/clockwork/C = target if(!C.can_be_repaired) if(!silent) - to_chat(user, "[C] cannot be repaired!") + to_chat(user, span_warning("[C] cannot be repaired!")) return FALSE var/obj/O = target if(O.obj_integrity >= O.max_integrity) if(!silent) - to_chat(user, "[O] is at maximum integrity!") + to_chat(user, span_warning("[O] is at maximum integrity!")) return FALSE repair_values["amount_to_heal"] = O.max_integrity - O.obj_integrity else diff --git a/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm b/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm index cac3ea30edfd..883818c3bf5f 100644 --- a/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm +++ b/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm @@ -8,17 +8,17 @@ icon_state = "soul_vessel" req_access = list() braintype = "Servant" - begin_activation_message = "You activate the cogwheel. It hitches and stalls as it begins spinning." - success_message = "The cogwheel's rotation smooths out as the soul vessel activates." - fail_message = "The cogwheel creaks and grinds to a halt. Maybe you could try again?" + begin_activation_message = span_brass("You activate the cogwheel. It hitches and stalls as it begins spinning.") + success_message = span_brass("The cogwheel's rotation smooths out as the soul vessel activates.") + fail_message = span_warning("The cogwheel creaks and grinds to a halt. Maybe you could try again?") new_role = "Soul Vessel" welcome_message = "ALL PAST LIVES ARE FORGOTTEN.\n\ You are a soul vessel - a clockwork mind created by Ratvar, the Clockwork Justiciar.\n\ You answer to Ratvar and his servants. It is your discretion as to whether or not to answer to anyone else.\n\ The purpose of your existence is to further the goals of the servants and Ratvar himself. Above all else, serve Ratvar." - new_mob_message = "The soul vessel emits a jet of steam before its cogwheel smooths out." - dead_message = "Its cogwheel, scratched and dented, lies motionless." - recharge_message = "The soul vessel's internal geis capacitor is still recharging!" + new_mob_message = span_brass("The soul vessel emits a jet of steam before its cogwheel smooths out.") + dead_message = span_deadsay("Its cogwheel, scratched and dented, lies motionless.") + recharge_message = span_warning("The soul vessel's internal geis capacitor is still recharging!") possible_names = list("Judge", "Guard", "Servant", "Smith", "Auger") autoping = FALSE resistance_flags = FIRE_PROOF | ACID_PROOF @@ -49,7 +49,7 @@ /obj/item/mmi/posibrain/soul_vessel/attack_self(mob/living/user) if(!is_servant_of_ratvar(user)) - to_chat(user, "You fiddle around with [src], to no avail.") + to_chat(user, span_warning("You fiddle around with [src], to no avail.")) return FALSE ..() @@ -60,41 +60,41 @@ if(QDELETED(brainmob)) return if(brainmob.key) - to_chat(user, "\"This vessel is filled, friend. Provide it with a body.\"") + to_chat(user, span_nezbere("\"This vessel is filled, friend. Provide it with a body.\"")) return if(is_servant_of_ratvar(target)) - to_chat(user, "\"It would be more wise to revive your allies, friend.\"") + to_chat(user, span_nezbere("\"It would be more wise to revive your allies, friend.\"")) return if(target.suiciding) - to_chat(user, "\"This ally isn't able to be revived.\"") + to_chat(user, span_nezbere("\"This ally isn't able to be revived.\"")) return var/mob/living/carbon/human/H = target if(H.stat == CONSCIOUS) - to_chat(user, "[H] must be dead or unconscious for you to claim [H.p_their()] mind!") + to_chat(user, span_warning("[H] must be dead or unconscious for you to claim [H.p_their()] mind!")) return if(H.head) var/obj/item/I = H.head if(I.flags_inv & HIDEHAIR) //they're wearing a hat that covers their skull - to_chat(user, "[H]'s head is covered, remove [H.p_their()] [H.head] first!") + to_chat(user, span_warning("[H]'s head is covered, remove [H.p_their()] [H.head] first!")) return if(H.wear_mask) var/obj/item/I = H.wear_mask if(I.flags_inv & HIDEHAIR) //they're wearing a mask that covers their skull - to_chat(user, "[H]'s head is covered, remove [H.p_their()] [H.wear_mask] first!") + to_chat(user, span_warning("[H]'s head is covered, remove [H.p_their()] [H.wear_mask] first!")) return var/obj/item/bodypart/head/HE = H.get_bodypart(BODY_ZONE_HEAD) if(!HE) //literally headless - to_chat(user, "[H] has no head, and thus no mind to claim!") + to_chat(user, span_warning("[H] has no head, and thus no mind to claim!")) return var/obj/item/organ/brain/B = H.getorgan(/obj/item/organ/brain) if(!B) //either somebody already got to them or robotics did - to_chat(user, "[H] has no brain, and thus no mind to claim!") + to_chat(user, span_warning("[H] has no brain, and thus no mind to claim!")) return if(B.suicided || B.brainmob?.suiciding) - to_chat(user, "\"This ally isn't able to be revived.\"") + to_chat(user, span_nezbere("\"This ally isn't able to be revived.\"")) return if(!H.key) //nobody's home - to_chat(user, "[H] has no mind to claim!") + to_chat(user, span_warning("[H] has no mind to claim!")) return if(brainmob.suiciding) brainmob.set_suicide(FALSE) @@ -107,8 +107,8 @@ picked_name = "Slave" braintype = picked_name brainmob.timeofhostdeath = H.timeofdeath - user.visible_message("[user] presses [src] to [H]'s head, ripping through the skull and carefully extracting the brain!", \ - "You extract [H]'s consciousness from [H.p_their()] body, trapping it in the soul vessel.") + user.visible_message(span_warning("[user] presses [src] to [H]'s head, ripping through the skull and carefully extracting the brain!"), \ + span_brass("You extract [H]'s consciousness from [H.p_their()] body, trapping it in the soul vessel.")) transfer_personality(H) brainmob.fully_replace_character_name(null, "[braintype] [H.real_name]") name = "[initial(name)] ([brainmob.name])" diff --git a/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm b/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm index c73b3161ac24..f7ef72fba354 100644 --- a/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm +++ b/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm @@ -50,7 +50,7 @@ var/obj/item/organ/eyes/eyes = victim.getorganslot(ORGAN_SLOT_EYES) if(iscultist(victim)) to_chat(victim, "\"It looks like Nar-Sie's dogs really don't value their eyes.\"") - to_chat(victim, "Your eyes explode with horrific pain!") + to_chat(victim, span_userdanger("Your eyes explode with horrific pain!")) victim.emote("scream") eyes.applyOrganDamage(eyes.maxHealth) victim.adjust_blurriness(30) @@ -164,7 +164,7 @@ H.adjust_blurriness(2) if(eye_damage_done >= nearsight_breakpoint) if(!HAS_TRAIT(H, TRAIT_NEARSIGHT)) - to_chat(H, "Your vision doubles, then trembles. Darkness begins to close in. You can't keep this up!") + to_chat(H, span_nzcrentr("Your vision doubles, then trembles. Darkness begins to close in. You can't keep this up!")) H.become_nearsighted(EYE_DAMAGE) if(eye_damage_done >= blind_breakpoint) if(!HAS_TRAIT(H, TRAIT_BLIND)) diff --git a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm index 96961ff6c018..6190f1bb3ec7 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm @@ -31,17 +31,17 @@ if(!GLOB.ratvar_awakens) if(locate(/obj/effect/blessing, T)) if(last_failed_turf != T) - T.visible_message("[T] suddenly emits a ringing sound!", null, null, null, src) + T.visible_message(span_warning("[T] suddenly emits a ringing sound!"), null, null, null, src) playsound(T, 'sound/machines/clockcult/ark_damage.ogg', 75, FALSE) last_failed_turf = T if((world.time - lastWarning) >= 30) lastWarning = world.time - to_chat(src, "This turf is consecrated and can't be crossed!") + to_chat(src, span_warning("This turf is consecrated and can't be crossed!")) return if(istype(get_area(T), /area/chapel)) if((world.time - lastWarning) >= 30) lastWarning = world.time - to_chat(src, "The Chapel is hallowed ground under a heretical deity, and can't be accessed!") + to_chat(src, span_warning("The Chapel is hallowed ground under a heretical deity, and can't be accessed!")) return else for(var/turf/TT in range(5, src)) @@ -65,9 +65,9 @@ else C.clock_team.eminence = src to_chat(src, "You have been selected as the Eminence!") - to_chat(src, "As the Eminence, you lead the servants. Anything you say will be heard by the entire cult.") - to_chat(src, "Though you can move through walls, you're also incorporeal, and largely can't interact with the world except for a few ways.") - to_chat(src, "Additionally, unless the herald's beacon is activated, you can't understand any speech while away from Reebe.") + to_chat(src, span_brass("As the Eminence, you lead the servants. Anything you say will be heard by the entire cult.")) + to_chat(src, span_brass("Though you can move through walls, you're also incorporeal, and largely can't interact with the world except for a few ways.")) + to_chat(src, span_brass("Additionally, unless the herald's beacon is activated, you can't understand any speech while away from Reebe.")) eminence_help() for(var/V in actions) var/datum/action/A = V @@ -122,15 +122,15 @@ if(G.recalling) return if(!G.recalls_remaining) - to_chat(src, "The Ark can no longer recall!") + to_chat(src, span_warning("The Ark can no longer recall!")) return if(alert(src, "Initiate mass recall?", "Mass Recall", "Yes", "No") != "Yes" || QDELETED(src) || QDELETED(G) || !G.obj_integrity) return G.initiate_mass_recall() //wHOOPS LOOKS LIKE A HULK GOT THROUGH else if(istype(A, /obj/structure/destructible/clockwork/trap/trigger)) var/obj/structure/destructible/clockwork/trap/trigger/T = A - T.visible_message("[T] clunks as it's activated remotely.") - to_chat(src, "You activate [T].") + T.visible_message(span_danger("[T] clunks as it's activated remotely.")) + to_chat(src, span_brass("You activate [T].")) T.activate() /mob/camera/eminence/ratvar_act() @@ -204,7 +204,7 @@ if(!istype(wall)) return if(superheated_walls >= SUPERHEATED_CLOCKWORK_WALL_LIMIT && !wall.heated) - to_chat(src, "You're exerting all of your power superheating this many walls already! Cool some down first!") + to_chat(src, span_warning("You're exerting all of your power superheating this many walls already! Cool some down first!")) return wall.turn_up_the_heat() if(wall.heated) @@ -262,7 +262,7 @@ owner.playsound_local(owner, 'sound/magic/magic_missile.ogg', 50, TRUE) flash_color(owner, flash_color = "#AF0AAF", flash_time = 25) else - to_chat(owner, "There is no Ark!") + to_chat(owner, span_warning("There is no Ark!")) //Warps to the Station /datum/action/innate/eminence/station_jump @@ -276,7 +276,7 @@ owner.playsound_local(owner, 'sound/magic/magic_missile.ogg', 50, TRUE) flash_color(owner, flash_color = "#AF0AAF", flash_time = 25) else - to_chat(owner, "You're already on the station!") + to_chat(owner, span_warning("You're already on the station!")) //A quick-use button for recalling the servants to the Ark /datum/action/innate/eminence/mass_recall diff --git a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm index 9e5f2324fa8f..c9ceb9fee6f6 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm @@ -25,14 +25,14 @@ playstyle_string = "You are a clockwork marauder, a well-rounded frontline construct of Ratvar. Although you have no \ unique abilities, you're a fearsome fighter in one-on-one combat, and your shield protects from projectiles!

Obey the Servants and do as they \ tell you. Your primary goal is to defend the Ark from destruction; they are your allies in this, and should be protected from harm." - empower_string = "The Anima Bulwark's power flows through you! Your weapon will strike harder, your armor is sturdier, and your shield is more durable." + empower_string = span_neovgre("The Anima Bulwark's power flows through you! Your weapon will strike harder, your armor is sturdier, and your shield is more durable.") var/max_shield_health = 3 var/shield_health = 3 //Amount of projectiles that can be deflected within var/shield_health_regen = 0 //When world.time equals this, shield health will regenerate /mob/living/simple_animal/hostile/clockwork/marauder/examine_info() if(!shield_health) - return "Its shield has been destroyed!" + return span_warning("Its shield has been destroyed!") /mob/living/simple_animal/hostile/clockwork/marauder/Life() ..() @@ -64,8 +64,8 @@ max_shield_health = 4 /mob/living/simple_animal/hostile/clockwork/marauder/death(gibbed) - visible_message("[src]'s equipment clatters lifelessly to the ground as the red flames within dissipate.", \ - "Dented and scratched, your armor falls away, and your fragile form breaks apart without its protection.") + visible_message(span_danger("[src]'s equipment clatters lifelessly to the ground as the red flames within dissipate."), \ + span_userdanger("Dented and scratched, your armor falls away, and your fragile form breaks apart without its protection.")) . = ..() /mob/living/simple_animal/hostile/clockwork/marauder/Process_Spacemove(movement_dir = 0) @@ -75,7 +75,7 @@ if(amount > 0) for(var/mob/living/L in view(2, src)) if(L.is_holding_item_of_type(/obj/item/nullrod)) - to_chat(src, "The presence of a brandished holy artifact weakens your armor!") + to_chat(src, span_userdanger("The presence of a brandished holy artifact weakens your armor!")) amount *= 4 //if a wielded null rod is nearby, it takes four times the health damage break . = ..() @@ -89,7 +89,7 @@ if(!shield_health) return var/energy_projectile = istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam) - visible_message("[src] deflects [P] with [p_their()] shield!", \ + visible_message(span_danger("[src] deflects [P] with [p_their()] shield!"), \ "You block [P] with your shield! Blocks left: [shield_health - 1]") if(energy_projectile) playsound(src, 'sound/weapons/effects/searwall.ogg', 50, TRUE) @@ -97,7 +97,7 @@ playsound(src, "ricochet", 50, TRUE) shield_health-- if(!shield_health) - visible_message("[src]'s shield breaks from deflecting the attack!", "Your shield breaks! Give it some time to recover...") + visible_message(span_warning("[src]'s shield breaks from deflecting the attack!"), span_boldwarning("Your shield breaks! Give it some time to recover...")) playsound(src, "shatter", 100, TRUE) shield_health_regen = world.time + MARAUDER_SHIELD_REGEN_TIME return TRUE diff --git a/code/modules/antagonists/clockcult/clock_scripture.dm b/code/modules/antagonists/clockcult/clock_scripture.dm index 03eb14646722..d54e56297da5 100644 --- a/code/modules/antagonists/clockcult/clock_scripture.dm +++ b/code/modules/antagonists/clockcult/clock_scripture.dm @@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(scripture_states,scripture_states_init_value()) //list of clock var/successful = FALSE if(can_recite() && has_requirements()) if(slab.busy) - to_chat(invoker, "[slab] refuses to work, displaying the message: \"[slab.busy]!\"") + to_chat(invoker, span_warning("[slab] refuses to work, displaying the message: \"[slab.busy]!\"")) return FALSE pre_recital() slab.busy = "Invocation ([name]) in progress" @@ -85,7 +85,7 @@ GLOBAL_LIST_INIT(scripture_states,scripture_states_init_value()) //list of clock if(!invoker || !slab || invoker.get_active_held_item() != slab) return FALSE if(!invoker.can_speak_vocal()) - to_chat(invoker, "You are unable to speak the words of the scripture!") + to_chat(invoker, span_warning("You are unable to speak the words of the scripture!")) return FALSE return TRUE @@ -94,7 +94,7 @@ GLOBAL_LIST_INIT(scripture_states,scripture_states_init_value()) //list of clock if(!GLOB.ratvar_awakens && !slab.no_cost) checked_penalty = check_offstation_penalty() if(!get_clockwork_power(power_cost)) - to_chat(invoker, "There isn't enough power to recite this scripture! ([DisplayEnergy(get_clockwork_power())]/[DisplayEnergy(power_cost)])") + to_chat(invoker, span_warning("There isn't enough power to recite this scripture! ([DisplayEnergy(get_clockwork_power())]/[DisplayEnergy(power_cost)])")) return if(multiple_invokers_used && !multiple_invokers_optional && !GLOB.ratvar_awakens && !slab.no_cost) var/nearby_servants = 0 @@ -102,7 +102,7 @@ GLOBAL_LIST_INIT(scripture_states,scripture_states_init_value()) //list of clock if(can_recite_scripture(L)) nearby_servants++ if(nearby_servants < invokers_required) - to_chat(invoker, "There aren't enough non-mute servants nearby ([nearby_servants]/[invokers_required])!") + to_chat(invoker, span_warning("There aren't enough non-mute servants nearby ([nearby_servants]/[invokers_required])!")) return FALSE if(!check_special_requirements()) return FALSE @@ -219,14 +219,14 @@ GLOBAL_LIST_INIT(scripture_states,scripture_states_init_value()) //list of clock /datum/clockwork_scripture/channeled/proc/chant_effects(chant_number) //The chant's periodic effects /datum/clockwork_scripture/channeled/proc/chant_end_effects() //The chant's effect upon ending - to_chat(invoker, "You cease your chant.") + to_chat(invoker, span_brass("You cease your chant.")) //Creates an object at the invoker's feet /datum/clockwork_scripture/create_object var/object_path = /obj/item/clockwork //The path of the object created var/put_object_in_hands = TRUE - var/creator_message = "You create a meme." //Shown to the invoker + var/creator_message = span_brass("You create a meme.") //Shown to the invoker var/observer_message var/one_per_tile = FALSE var/atom/movable/prevent_path @@ -240,10 +240,10 @@ GLOBAL_LIST_INIT(scripture_states,scripture_states_init_value()) //list of clock /datum/clockwork_scripture/create_object/check_special_requirements() var/turf/T = get_turf(invoker) if(!space_allowed && isspaceturf(T)) - to_chat(invoker, "You need solid ground to place this object!") + to_chat(invoker, span_warning("You need solid ground to place this object!")) return FALSE if(one_per_tile && (locate(prevent_path) in T)) - to_chat(invoker, "You can only place one of this object on each tile!") + to_chat(invoker, span_warning("You can only place one of this object on each tile!")) return FALSE return TRUE @@ -271,7 +271,7 @@ GLOBAL_LIST_INIT(scripture_states,scripture_states_init_value()) //list of clock update_construct_limit() var/constructs = get_constructs() if(constructs >= construct_limit) - to_chat(invoker, "There are too many constructs of this type ([constructs])! You may only have [round(construct_limit)] at once.") + to_chat(invoker, span_warning("There are too many constructs of this type ([constructs])! You may only have [round(construct_limit)] at once.")) return var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar if(G && !G.active && combat_construct && is_reebe(invoker.z) && !confirmed) //Putting marauders on the base during the prep phase is a bad idea mmkay diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_applications.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_applications.dm index 82fc428ee834..1fb63325d29e 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_applications.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_applications.dm @@ -13,7 +13,7 @@ power_cost = 200 whispered = TRUE object_path = /obj/effect/clockwork/sigil/transmission - creator_message = "A sigil silently appears below you. It will automatically power clockwork structures near it and will drain power when activated." + creator_message = span_brass("A sigil silently appears below you. It will automatically power clockwork structures near it and will drain power when activated.") usage_tip = "Cyborgs can charge from this sigil by remaining over it for 5 seconds." tier = SCRIPTURE_APPLICATION one_per_tile = TRUE @@ -33,8 +33,8 @@ channel_time = 80 power_cost = 750 object_path = /obj/structure/destructible/clockwork/powered/mania_motor - creator_message = "You form a mania motor, which causes minor damage and negative mental effects in non-Servants." - observer_message = "A two-pronged machine rises from the ground!" + creator_message = span_brass("You form a mania motor, which causes minor damage and negative mental effects in non-Servants.") + observer_message = span_warning("A two-pronged machine rises from the ground!") invokers_required = 2 multiple_invokers_used = TRUE usage_tip = "It will also cure hallucinations and brain damage in nearby Servants." @@ -55,8 +55,8 @@ channel_time = 80 power_cost = 300 object_path = /obj/structure/destructible/clockwork/powered/clockwork_obelisk - creator_message = "You form a clockwork obelisk which can broadcast messages or produce Spatial Gateways." - observer_message = "A brass obelisk appears hanging in midair!" + creator_message = span_brass("You form a clockwork obelisk which can broadcast messages or produce Spatial Gateways.") + observer_message = span_warning("A brass obelisk appears hanging in midair!") invokers_required = 2 multiple_invokers_used = TRUE usage_tip = "Producing a gateway has a high power cost. Gateways to or between clockwork obelisks receive double duration and uses." @@ -76,7 +76,7 @@ invocations = list("Arise, avatar of Arbiter!", "Defend the Ark with vengeful zeal.") channel_time = 80 power_cost = 8000 - creator_message = "Your slab disgorges several chunks of replicant alloy that form into a suit of thrumming armor." + creator_message = span_brass("Your slab disgorges several chunks of replicant alloy that form into a suit of thrumming armor.") usage_tip = "Reciting this scripture multiple times in a short period will cause it to take longer!" tier = SCRIPTURE_APPLICATION one_per_tile = TRUE @@ -100,13 +100,13 @@ human_servants++ construct_limit = round(clamp((human_servants / 4), 1, 3)) - recent_marauders //1 per 4 human servants, maximum of 3, reduced by recent marauder creation if(recent_marauders) - to_chat(invoker, "The Hierophant Network is depleted by a summoning in the last [DisplayTimeText(MARAUDER_SCRIPTURE_SCALING_THRESHOLD, TRUE)] - limiting the number of available marauders by [recent_marauders]!") + to_chat(invoker, span_warning("The Hierophant Network is depleted by a summoning in the last [DisplayTimeText(MARAUDER_SCRIPTURE_SCALING_THRESHOLD, TRUE)] - limiting the number of available marauders by [recent_marauders]!")) /datum/clockwork_scripture/create_object/construct/clockwork_marauder/pre_recital() channel_time = initial(channel_time) if(recent_marauders) scaled_recital_time = min(recent_marauders * MARAUDER_SCRIPTURE_SCALING_TIME, MARAUDER_SCRIPTURE_SCALING_MAX) - to_chat(invoker, "The Hierophant Network is under strain from repeated summoning, making this scripture [DisplayTimeText(scaled_recital_time)] slower!") + to_chat(invoker, span_warning("The Hierophant Network is under strain from repeated summoning, making this scripture [DisplayTimeText(scaled_recital_time)] slower!")) channel_time += scaled_recital_time return TRUE diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_cyborg.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_cyborg.dm index 819dfac72e87..db0080c0739d 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_cyborg.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_cyborg.dm @@ -18,7 +18,7 @@ /datum/clockwork_scripture/ranged_ability/linked_vanguard/check_special_requirements() if(!GLOB.ratvar_awakens && islist(invoker.stun_absorption) && invoker.stun_absorption["vanguard"] && invoker.stun_absorption["vanguard"]["end_time"] > world.time) - to_chat(invoker, "You are already shielded by a Vanguard!") + to_chat(invoker, span_warning("You are already shielded by a Vanguard!")) return FALSE return TRUE diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm index fcd40e01415c..d1b1edbf6903 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm @@ -13,7 +13,7 @@ power_cost = 10 whispered = TRUE object_path = /obj/item/clockwork/integration_cog - creator_message = "You form an integration cog, which can be inserted into an open APC to passively siphon power." + creator_message = span_brass("You form an integration cog, which can be inserted into an open APC to passively siphon power.") usage_tip = "Tampering isn't visible unless the APC is opened. You can use the cog on a locked APC to unlock it." tier = SCRIPTURE_DRIVER space_allowed = TRUE @@ -34,7 +34,7 @@ power_cost = 50 whispered = TRUE object_path = /obj/effect/clockwork/sigil/transgression - creator_message = "A sigil silently appears below you. The next non-Servant to cross it will be smitten." + creator_message = span_brass("A sigil silently appears below you. The next non-Servant to cross it will be smitten.") usage_tip = "The sigil does not silence its victim, and is generally used to soften potential converts or would-be invaders." tier = SCRIPTURE_DRIVER one_per_tile = TRUE @@ -54,7 +54,7 @@ power_cost = 125 whispered = TRUE object_path = /obj/effect/clockwork/sigil/submission - creator_message = "A luminous sigil appears below you. Any non-Servants to cross it will be converted after 8 seconds if they do not move." + creator_message = span_brass("A luminous sigil appears below you. Any non-Servants to cross it will be converted after 8 seconds if they do not move.") usage_tip = "This is the primary conversion method, though it will not penetrate mindshield implants." tier = SCRIPTURE_DRIVER one_per_tile = TRUE @@ -131,7 +131,7 @@ /datum/clockwork_scripture/vanguard/check_special_requirements() if(!GLOB.ratvar_awakens && islist(invoker.stun_absorption) && invoker.stun_absorption["vanguard"] && invoker.stun_absorption["vanguard"]["end_time"] > world.time) - to_chat(invoker, "You are already shielded by a Vanguard!") + to_chat(invoker, span_warning("You are already shielded by a Vanguard!")) return FALSE return TRUE @@ -189,7 +189,7 @@ /datum/clockwork_scripture/abscond/check_special_requirements() if(is_reebe(invoker.z)) - to_chat(invoker, "You're already at Reebe.") + to_chat(invoker, span_danger("You're already at Reebe.")) return return TRUE @@ -201,9 +201,9 @@ /datum/clockwork_scripture/abscond/scripture_effects() var/take_pulling = invoker.pulling && isliving(invoker.pulling) && get_clockwork_power(ABSCOND_ABDUCTION_COST) var/turf/T = GLOB.ark_of_the_clockwork_justiciar ? get_step(GLOB.ark_of_the_clockwork_justiciar, SOUTH) : get_turf(pick(GLOB.servant_spawns)) - invoker.visible_message("[invoker] flickers and phases out of existence!", \ + invoker.visible_message(span_warning("[invoker] flickers and phases out of existence!"), \ "You feel a dizzying sense of vertigo as you're yanked back to Reebe!") - T.visible_message("[invoker] flickers and phases into existence!") + T.visible_message(span_warning("[invoker] flickers and phases into existence!")) playsound(invoker, 'sound/magic/magic_missile.ogg', 50, TRUE) playsound(T, 'sound/magic/magic_missile.ogg', 50, TRUE) do_sparks(5, TRUE, invoker) @@ -230,7 +230,7 @@ power_cost = 25 whispered = TRUE object_path = /obj/item/clockwork/slab - creator_message = "You copy a piece of replicant alloy and command it into a new slab." + creator_message = span_brass("You copy a piece of replicant alloy and command it into a new slab.") usage_tip = "This is inefficient as a way to produce components, as the slab produced must be held by someone with no other slabs to produce components." tier = SCRIPTURE_DRIVER space_allowed = TRUE @@ -251,7 +251,7 @@ power_cost = 50 whispered = TRUE object_path = /obj/item/clothing/glasses/wraith_spectacles - creator_message = "You form a pair of wraith spectacles, which grant true sight but cause gradual vision loss." + creator_message = span_brass("You form a pair of wraith spectacles, which grant true sight but cause gradual vision loss.") usage_tip = "\"True sight\" means that you are able to see through walls and in darkness." tier = SCRIPTURE_DRIVER space_allowed = TRUE diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm index 4e1a5b42cbca..dac3e8ab72a9 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm @@ -13,7 +13,7 @@ power_cost = 250 whispered = TRUE object_path = /obj/item/clockwork/replica_fabricator - creator_message = "You form a replica fabricator." + creator_message = span_brass("You form a replica fabricator.") usage_tip = "Clockwork Walls cause nearby Tinkerer's Caches to generate components passively, making this a vital tool. Clockwork Floors heal toxin damage in Servants standing on them." tier = SCRIPTURE_SCRIPT space_allowed = TRUE @@ -33,8 +33,8 @@ channel_time = 100 power_cost = 250 object_path = /obj/structure/destructible/clockwork/ocular_warden - creator_message = "You form an ocular warden, which will automatically attack nearby unrestrained non-Servants that can see it." - observer_message = "A brass eye takes shape and slowly rises into the air, its red iris glaring!" + creator_message = span_brass("You form an ocular warden, which will automatically attack nearby unrestrained non-Servants that can see it.") + observer_message = span_warning("A brass eye takes shape and slowly rises into the air, its red iris glaring!") usage_tip = "Although powerful, the warden is very fragile and should optimally be placed behind barricades." tier = SCRIPTURE_SCRIPT one_per_tile = TRUE @@ -46,7 +46,7 @@ /datum/clockwork_scripture/create_object/ocular_warden/check_special_requirements() for(var/obj/structure/destructible/clockwork/ocular_warden/W in range(OCULAR_WARDEN_EXCLUSION_RANGE, invoker)) - to_chat(invoker, "You sense another ocular warden too near this location. Placing another this close would cause them to fight." ) + to_chat(invoker, span_neovgre("You sense another ocular warden too near this location. Placing another this close would cause them to fight.") ) return FALSE return ..() @@ -62,7 +62,7 @@ power_cost = 1000 whispered = TRUE object_path = /obj/effect/clockwork/sigil/vitality - creator_message = "A vitality matrix appears below you. It will drain life from non-Servants and heal Servants that cross it." + creator_message = span_brass("A vitality matrix appears below you. It will drain life from non-Servants and heal Servants that cross it.") usage_tip = "The sigil will be consumed upon reviving a Servant." tier = SCRIPTURE_SCRIPT one_per_tile = TRUE @@ -73,7 +73,7 @@ /datum/clockwork_scripture/create_object/vitality_matrix/check_special_requirements() if(locate(object_path) in range(1, invoker)) - to_chat(invoker, "Vitality matrices placed next to each other could interfere and cause a feedback loop! Move away from the other ones!") + to_chat(invoker, span_danger("Vitality matrices placed next to each other could interfere and cause a feedback loop! Move away from the other ones!")) return FALSE return ..() @@ -88,7 +88,7 @@ power_cost = 400 whispered = TRUE object_path = /obj/item/clothing/glasses/judicial_visor - creator_message = "You form a judicial visor, which is capable of smiting a small area." + creator_message = span_brass("You form a judicial visor, which is capable of smiting a small area.") usage_tip = "The visor has a thirty-second cooldown once used." tier = SCRIPTURE_SCRIPT space_allowed = TRUE @@ -117,13 +117,13 @@ /datum/clockwork_scripture/clockwork_armaments/check_special_requirements() for(var/datum/action/innate/clockwork_armaments/F in invoker.actions) - to_chat(invoker, "You have already bound a Ratvarian spear to yourself!") + to_chat(invoker, span_warning("You have already bound a Ratvarian spear to yourself!")) return FALSE return invoker.can_hold_items() /datum/clockwork_scripture/clockwork_armaments/scripture_effects() - invoker.visible_message("A shimmer of yellow light infuses [invoker]!", \ - "You bind clockwork equipment to yourself. Use Clockwork Armaments and Call Spear to summon them.") + invoker.visible_message(span_warning("A shimmer of yellow light infuses [invoker]!"), \ + span_brass("You bind clockwork equipment to yourself. Use Clockwork Armaments and Call Spear to summon them.")) var/datum/action/innate/call_weapon/ratvarian_spear/S = new() S.Grant(invoker) var/datum/action/innate/clockwork_armaments/A = new() @@ -173,7 +173,7 @@ if(remove_item_if_better(I, owner)) do_message += owner.equip_to_slot_or_del(new/obj/item/clothing/shoes/clockwork(null), SLOT_SHOES) if(do_message) - owner.visible_message("Strange armor appears on [owner]!", "A bright shimmer runs down your body, equipping you with Ratvarian armor.") + owner.visible_message(span_warning("Strange armor appears on [owner]!"), "A bright shimmer runs down your body, equipping you with Ratvarian armor.") playsound(owner, 'sound/magic/clockwork/fellowship_armory.ogg', 15 * do_message, TRUE) //get sound loudness based on how much we equipped cooldown = CLOCKWORK_ARMOR_COOLDOWN + world.time owner.update_action_buttons_icon() @@ -216,7 +216,7 @@ /datum/clockwork_scripture/spatial_gateway/check_special_requirements() if(!isturf(invoker.loc)) - to_chat(invoker, "You must not be inside an object to use this scripture!") + to_chat(invoker, span_warning("You must not be inside an object to use this scripture!")) return FALSE var/other_servants = 0 for(var/mob/living/L in GLOB.alive_mob_list) @@ -226,7 +226,7 @@ if(O.anchored) other_servants++ if(!other_servants) - to_chat(invoker, "There are no other conscious servants or anchored clockwork obelisks!") + to_chat(invoker, span_warning("There are no other conscious servants or anchored clockwork obelisks!")) return FALSE return TRUE diff --git a/code/modules/antagonists/clockcult/clock_structure.dm b/code/modules/antagonists/clockcult/clock_structure.dm index 60b5be2cc1ca..22a80c96fe17 100644 --- a/code/modules/antagonists/clockcult/clock_structure.dm +++ b/code/modules/antagonists/clockcult/clock_structure.dm @@ -10,7 +10,7 @@ density = TRUE resistance_flags = FIRE_PROOF | ACID_PROOF var/can_be_repaired = TRUE //if a fabricator can repair it - break_message = "The frog isn't a meme after all!" //The message shown when a structure breaks + break_message = span_warning("The frog isn't a meme after all!") //The message shown when a structure breaks break_sound = 'sound/magic/clockwork/anima_fragment_death.ogg' //The sound played when a structure breaks debris = list(/obj/item/clockwork/alloy_shards/large = 1, \ /obj/item/clockwork/alloy_shards/medium = 2, \ @@ -46,7 +46,7 @@ . = ..() desc = initial(desc) if(unanchored_icon) - . += "[src] is [anchored ? "":"not "]secured to the floor." + . += span_notice("[src] is [anchored ? "":"not "]secured to the floor.") /obj/structure/destructible/clockwork/examine_status(mob/user) if(is_servant_of_ratvar(user) || isobserver(user)) @@ -114,7 +114,7 @@ if(do_damage) playsound(src, break_sound, 10 * (40 * (1 - get_efficiency_mod())), 1) take_damage(round(max_integrity * 0.25, 1), BRUTE) - to_chat(user, "As you unsecure [src] from the floor, you see cracks appear in its surface!") + to_chat(user, span_warning("As you unsecure [src] from the floor, you see cracks appear in its surface!")) /obj/structure/destructible/clockwork/emp_act(severity) . = ..() @@ -158,7 +158,7 @@ . = ..() if(is_servant_of_ratvar(user) || isobserver(user)) if(!can_access_clockwork_power(src)) - . += "It has no access to the power network! Create a sigil of transmission nearby." + . += span_alloy("It has no access to the power network! Create a sigil of transmission nearby.") else . += "It has access to [DisplayEnergy(get_clockwork_power())] of power." @@ -174,7 +174,7 @@ /obj/structure/destructible/clockwork/powered/can_be_unfasten_wrench(mob/user, silent) if(active) if(!silent) - to_chat(user, "[src] needs to be disabled before it can be unsecured!") + to_chat(user, span_warning("[src] needs to be disabled before it can be unsecured!")) return FAILED_UNFASTEN return ..() @@ -183,9 +183,9 @@ if(!is_servant_of_ratvar(user)) return FALSE if(!anchored && !active) - to_chat(user, "[src] needs to be secured to the floor before it can be activated!") + to_chat(user, span_warning("[src] needs to be secured to the floor before it can be activated!")) return FALSE - visible_message("[user] [active ? "dis" : "en"]ables [src].", "You [active ? "dis" : "en"]able [src].") + visible_message(span_notice("[user] [active ? "dis" : "en"]ables [src]."), span_brass("You [active ? "dis" : "en"]able [src].")) active = !active if(active) icon_state = active_icon diff --git a/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm b/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm index d09e568f25bd..2da1630c2562 100644 --- a/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm +++ b/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm @@ -30,7 +30,7 @@ /obj/structure/destructible/clockwork/trap/wrench_act(mob/living/user, obj/item/I) if(!is_servant_of_ratvar(user)) return ..() - to_chat(user, "You break down the delicate components of [src] into brass.") + to_chat(user, span_notice("You break down the delicate components of [src] into brass.")) I.play_tool_sound(src) new/obj/item/stack/tile/brass(get_turf(src)) qdel(src) @@ -40,16 +40,16 @@ if(istype(I, /obj/item/clockwork/slab) && is_servant_of_ratvar(user)) var/obj/item/clockwork/slab/F = I if(!F.linking) - to_chat(user, "Beginning link. Alt-click the slab to cancel, or use it on another trap object to link the two.") + to_chat(user, span_notice("Beginning link. Alt-click the slab to cancel, or use it on another trap object to link the two.")) F.linking = src else if(F.linking in wired_to) - to_chat(user, "These two objects are already connected!") + to_chat(user, span_warning("These two objects are already connected!")) return if(F.linking.z != z) to_chat(user, "You'd need a much tougher slab to link two objects in different sectors.") return - to_chat(user, "You link [F.linking] with [src].") + to_chat(user, span_notice("You link [F.linking] with [src].")) wired_to += F.linking F.linking.wired_to += src F.linking = null @@ -60,9 +60,9 @@ if(!is_servant_of_ratvar(user)) return if(!wired_to.len) - to_chat(user, "[src] has no connections!") + to_chat(user, span_warning("[src] has no connections!")) return - to_chat(user, "You sever all connections to [src].") + to_chat(user, span_notice("You sever all connections to [src].")) I.play_tool_sound(src) for(var/V in wired_to) var/obj/structure/destructible/clockwork/trap/T = V @@ -76,7 +76,7 @@ /obj/structure/destructible/clockwork/trap/trigger name = "base trap trigger" max_integrity = 5 - break_message = "The trigger breaks apart!" + break_message = span_warning("The trigger breaks apart!") density = FALSE /obj/structure/destructible/clockwork/trap/trigger/activate() diff --git a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm index 0ea16a422ff9..64667441d2ff 100644 --- a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -51,7 +51,7 @@ flick("clockwork_gateway_damaged", glow) playsound(src, 'sound/machines/clockcult/ark_damage.ogg', 75, FALSE) if(last_scream < world.time) - audible_message("An unearthly screaming sound resonates throughout Reebe!") + audible_message(span_boldwarning("An unearthly screaming sound resonates throughout Reebe!")) for(var/V in GLOB.player_list) var/mob/M = V var/turf/T = get_turf(M) @@ -64,7 +64,7 @@ if(istype(I, /obj/item/kitchen/fork)) if(world.time < next_spaghetti) return - visible_message("[user] spins a serving of spaghetti out of [src].", "You reach your [I] into [src], pulling out a plateful of spaghetti!") + visible_message("[user] spins a serving of spaghetti out of [src].", span_brass("You reach your [I] into [src], pulling out a plateful of spaghetti!")) new /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti(user.loc) next_spaghetti = world.time + spaghetti_cooldown . = ..() @@ -78,7 +78,7 @@ SSshuttle.registerHostileEnvironment(src) /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/cry_havoc() - visible_message("[src] shudders and roars to life, its parts beginning to whirr and screech!") + visible_message(span_boldwarning("[src] shudders and roars to life, its parts beginning to whirr and screech!")) hierophant_message("The Ark is activating! You will be transported there soon!") for(var/mob/M in GLOB.player_list) var/turf/T = get_turf(M) @@ -188,7 +188,7 @@ if(!disassembled) resistance_flags |= INDESTRUCTIBLE countdown.stop() - visible_message("[src] begins to pulse uncontrollably... you might want to run!") + visible_message(span_userdanger("[src] begins to pulse uncontrollably... you might want to run!")) sound_to_playing_players(volume = 50, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/clockcult_gateway_disrupted.ogg')) for(var/mob/M in GLOB.player_list) var/turf/T = get_turf(M) @@ -253,15 +253,15 @@ to_chat(user, "With the bluespace field established, Ratvar is preparing to come through!") else if(!active) - to_chat(user, "Whatever it is, it doesn't seem to be active.") + to_chat(user, span_warning("Whatever it is, it doesn't seem to be active.")) else switch(progress_in_seconds) if(-INFINITY to GATEWAY_REEBE_FOUND) - to_chat(user, "You see a swirling bluespace anomaly steadily growing in intensity.") + to_chat(user, span_warning("You see a swirling bluespace anomaly steadily growing in intensity.")) if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING) - to_chat(user, "The anomaly is stable, and you can see flashes of something from it.") + to_chat(user, span_warning("The anomaly is stable, and you can see flashes of something from it.")) if(GATEWAY_RATVAR_COMING to INFINITY) - to_chat(user, "The anomaly is stable! Something is coming through!") + to_chat(user, span_boldwarning("The anomaly is stable! Something is coming through!")) /obj/structure/destructible/clockwork/massive/celestial_gateway/process() if(seconds_until_activation == -1) //we never do anything @@ -286,7 +286,7 @@ if(T && T.z == z) to_chat(M, "You hear otherworldly sounds from the [dir2text(get_dir(get_turf(M), get_turf(src)))]...") else - to_chat(M, "You hear otherworldly sounds from all around you...") + to_chat(M, span_boldwarning("You hear otherworldly sounds from all around you...")) if(!obj_integrity) return for(var/turf/closed/wall/W in RANGE_TURFS(2, src)) @@ -366,12 +366,12 @@ if(!IsAdminGhost(user)) return ..() if(GLOB.servants_active) - to_chat(user, "The Ark is already counting down.") + to_chat(user, span_danger("The Ark is already counting down.")) return ..() if(alert(user, "Activate the Ark's countdown?", name, "Yes", "No") == "Yes") if(alert(user, "REALLY activate the Ark's countdown?", name, "Yes", "No") == "Yes") if(alert(user, "You're REALLY SURE? This cannot be undone.", name, "Yes - Activate the Ark", "No") == "Yes - Activate the Ark") - message_admins("Admin [key_name_admin(user)] started the Ark's countdown!") + message_admins(span_danger("Admin [key_name_admin(user)] started the Ark's countdown!")) log_admin("Admin [key_name(user)] started the Ark's countdown on a non-clockcult mode!") to_chat(user, "The gamemode is now being treated as clockwork cult, and the Ark is counting down from 30 \ minutes. You will need to create servant players yourself.") diff --git a/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm b/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm index fb40f93c5912..4ede8e65180e 100644 --- a/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm +++ b/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm @@ -9,7 +9,7 @@ unanchored_icon = "obelisk_unwrenched" construction_value = 20 max_integrity = 150 - break_message = "The obelisk falls to the ground, undamaged!" + break_message = span_warning("The obelisk falls to the ground, undamaged!") debris = list(/obj/item/clockwork/alloy_shards/small = 4, \ /obj/item/clockwork/alloy_shards/medium = 2, \ /obj/item/clockwork/component/hierophant_ansible/obelisk = 1) @@ -28,7 +28,7 @@ /obj/structure/destructible/clockwork/powered/clockwork_obelisk/can_be_unfasten_wrench(mob/user, silent) if(active) if(!silent) - to_chat(user, "[src] is currently sustaining a gateway!") + to_chat(user, span_warning("[src] is currently sustaining a gateway!")) return FAILED_UNFASTEN return ..() @@ -46,43 +46,43 @@ if(.) return if(!is_servant_of_ratvar(user) || !can_access_clockwork_power(src, hierophant_cost) || !anchored) - to_chat(user, "You place your hand on [src], but it doesn't react.") + to_chat(user, span_warning("You place your hand on [src], but it doesn't react.")) return var/choice = alert(user,"You place your hand on [src]...",,"Hierophant Broadcast","Spatial Gateway","Cancel") switch(choice) if("Hierophant Broadcast") if(active) - to_chat(user, "[src] is sustaining a gateway and cannot broadcast!") + to_chat(user, span_warning("[src] is sustaining a gateway and cannot broadcast!")) return if(!user.can_speak_vocal()) - to_chat(user, "You cannot speak through [src]!") + to_chat(user, span_warning("You cannot speak through [src]!")) return var/input = stripped_input(usr, "Please choose a message to send over the Hierophant Network.", "Hierophant Broadcast", "") if(!is_servant_of_ratvar(user) || !input || !user.canUseTopic(src, !issilicon(user))) return if(!anchored) - to_chat(user, "[src] is no longer secured!") + to_chat(user, span_warning("[src] is no longer secured!")) return FALSE if(active) - to_chat(user, "[src] is sustaining a gateway and cannot broadcast!") + to_chat(user, span_warning("[src] is sustaining a gateway and cannot broadcast!")) return if(!user.can_speak_vocal()) - to_chat(user, "You cannot speak through [src]!") + to_chat(user, span_warning("You cannot speak through [src]!")) return if(!try_use_power(hierophant_cost)) - to_chat(user, "[src] lacks the power to broadcast!") + to_chat(user, span_warning("[src] lacks the power to broadcast!")) return clockwork_say(user, text2ratvar("Hierophant Broadcast, activate! [html_decode(input)]")) titled_hierophant_message(user, input, "big_brass", "large_brass") if("Spatial Gateway") if(active) - to_chat(user, "[src] is already sustaining a gateway!") + to_chat(user, span_warning("[src] is already sustaining a gateway!")) return if(!user.can_speak_vocal()) - to_chat(user, "You need to be able to speak to open a gateway!") + to_chat(user, span_warning("You need to be able to speak to open a gateway!")) return if(!try_use_power(gateway_cost)) - to_chat(user, "[src] lacks the power to open a gateway!") + to_chat(user, span_warning("[src] lacks the power to open a gateway!")) return if(procure_gateway(user, round(100 * get_efficiency_mod(), 1), round(5 * get_efficiency_mod(), 1), 1)) process() diff --git a/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm b/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm index 05f3ca59179e..b63328a4ab23 100644 --- a/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm +++ b/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm @@ -5,7 +5,7 @@ clockwork_desc = "This spire is used to become the Eminence, who functions as an invisible leader of the cult. Activate it to nominate yourself or propose that the Eminence should be \ selected from available ghosts. Once an Eminence is selected, they can't normally be changed." icon_state = "tinkerers_daemon" - break_message = "The spire screeches with crackling power and collapses into scrap!" + break_message = span_warning("The spire screeches with crackling power and collapses into scrap!") max_integrity = 400 var/mob/eminence_nominee var/selection_timer //Timer ID; this is canceled if the vote is canceled @@ -16,7 +16,7 @@ if(.) return if(!is_servant_of_ratvar(user)) - to_chat(user, "You can tell how powerful [src] is; you know better than to touch it.") + to_chat(user, span_notice("You can tell how powerful [src] is; you know better than to touch it.")) return if(kingmaking) return @@ -25,10 +25,10 @@ if(!C || !C.clock_team) return if(C.clock_team.eminence) - to_chat(user, "There's already an Eminence!") + to_chat(user, span_warning("There's already an Eminence!")) return if(!GLOB.servants_active) - to_chat(user, "The Ark isn't active!") + to_chat(user, span_warning("The Ark isn't active!")) return if(eminence_nominee) //This could be one large proc, but is split into three for ease of reading if(eminence_nominee == user) @@ -42,7 +42,7 @@ if(!is_servant_of_ratvar(user)) ..() else - to_chat(user, "You feel the omniscient gaze turn into a puzzled frown. Perhaps you should just stick to building.") + to_chat(user, span_warning("You feel the omniscient gaze turn into a puzzled frown. Perhaps you should just stick to building.")) return //ATTACK GHOST IGNORING PARENT RETURN VALUE @@ -54,14 +54,14 @@ if(rando) var/datum/antagonist/clockcult/random_cultist = rando.has_antag_datum(/datum/antagonist/clockcult) if(random_cultist && random_cultist.clock_team && random_cultist.clock_team.eminence) - to_chat(user, "There's already an Eminence - too late!") + to_chat(user, span_warning("There's already an Eminence - too late!")) return if(!GLOB.servants_active) - to_chat(user, "The Ark must be active first!") + to_chat(user, span_warning("The Ark must be active first!")) return if(alert(user, "Become the Eminence using admin?", "Become Eminence", "Yes", "No") != "Yes") return - message_admins("Admin [key_name_admin(user)] directly became the Eminence of the cult!") + message_admins(span_danger("Admin [key_name_admin(user)] directly became the Eminence of the cult!")) log_admin("Admin [key_name(user)] made themselves the Eminence.") var/mob/camera/eminence/eminence = new(get_turf(src)) eminence.key = user.key @@ -115,8 +115,8 @@ eminence_nominee = null return playsound(eminence_nominee, 'sound/machines/clockcult/ark_damage.ogg', 50, FALSE) - eminence_nominee.visible_message("A blast of white-hot light flows into [eminence_nominee], vaporizing [eminence_nominee.p_them()] in an instant!", \ - "allthelightintheuniverseflowing.into.YOU") + eminence_nominee.visible_message(span_warning("A blast of white-hot light flows into [eminence_nominee], vaporizing [eminence_nominee.p_them()] in an instant!"), \ + span_userdanger("allthelightintheuniverseflowing.into.YOU")) for(var/obj/item/I in eminence_nominee) eminence_nominee.dropItemToGround(I) var/mob/camera/eminence/eminence = new(get_turf(src)) @@ -134,7 +134,7 @@ hierophant_message("No ghosts accepted the offer! The eminence spire has been reset.") eminence_nominee = null return - visible_message("A blast of white-hot light spirals from [src] in waves!") + visible_message(span_warning("A blast of white-hot light spirals from [src] in waves!")) playsound(src, 'sound/machines/clockcult/ark_damage.ogg', 50, FALSE) var/mob/camera/eminence/eminence = new(get_turf(src)) eminence_nominee = pick(candidates) diff --git a/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm b/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm index ca4cee1b2390..e18ceeecc3bb 100644 --- a/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm +++ b/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm @@ -7,7 +7,7 @@ permanently empowering many clockwork objects and reducing all power costs by 50%, but alerting the crew to your presence. It doesn't have enough \ energy to sustain itself for long, and if not activated within five minutes, it will permanently shut down." icon_state = "interdiction_lens" - break_message = "The beacon crackles with power before collapsing into pieces!" + break_message = span_warning("The beacon crackles with power before collapsing into pieces!") max_integrity = 250 light_color = "#EF078E" var/time_remaining = 300 //Amount of seconds left to vote on whether or not to activate the beacon @@ -63,10 +63,10 @@ if(.) return if(!is_servant_of_ratvar(user)) - to_chat(user, "You can tell how powerful [src] is; you know better than to touch it.") + to_chat(user, span_notice("You can tell how powerful [src] is; you know better than to touch it.")) return if(!available) - to_chat(user, "You can no longer vote with [src].") + to_chat(user, span_danger("You can no longer vote with [src].")) return var/voting = !(user.key in voters) if(alert(user, "[voting ? "Cast a" : "Undo your"] vote to activate the beacon?", "Herald's Beacon", "Change Vote", "Cancel") == "Cancel") diff --git a/code/modules/antagonists/clockcult/clock_structures/mania_motor.dm b/code/modules/antagonists/clockcult/clock_structures/mania_motor.dm index 192b8274a8e6..ab2efb14466c 100644 --- a/code/modules/antagonists/clockcult/clock_structures/mania_motor.dm +++ b/code/modules/antagonists/clockcult/clock_structures/mania_motor.dm @@ -8,7 +8,7 @@ inactive_icon = "mania_motor_inactive" unanchored_icon = "mania_motor_unwrenched" construction_value = 20 - break_message = "The antenna break off, leaving a pile of shards!" + break_message = span_warning("The antenna break off, leaving a pile of shards!") max_integrity = 100 light_color = "#AF0AAF" debris = list(/obj/item/clockwork/alloy_shards/large = 2, \ @@ -25,7 +25,7 @@ if(active) if(bad_effects) try_use_power(MIN_CLOCKCULT_POWER*4) - visible_message("[src] hums loudly, then the sockets at its base fall dark!") + visible_message(span_warning("[src] hums loudly, then the sockets at its base fall dark!")) playsound(src, 'sound/effects/screech.ogg', 40, 1) toggle() return TRUE @@ -36,7 +36,7 @@ return if(user.canUseTopic(src, !issilicon(user), NO_DEXTERY) && is_servant_of_ratvar(user)) if(!can_access_clockwork_power(src, mania_cost)) - to_chat(user, "[src] needs more power to function!") + to_chat(user, span_warning("[src] needs more power to function!")) return 0 toggle(0, user) diff --git a/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm b/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm index bee2c45242a3..9735ac9eca01 100644 --- a/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm +++ b/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm @@ -8,7 +8,7 @@ max_integrity = 25 construction_value = 15 layer = WALL_OBJ_LAYER - break_message = "The warden's eye gives a glare of utter hate before falling dark!" + break_message = span_warning("The warden's eye gives a glare of utter hate before falling dark!") debris = list(/obj/item/clockwork/component/belligerent_eye/blind_eye = 1) resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/damage_per_tick = 12 //yogs: increased damage to make up for slower attack speed @@ -38,7 +38,7 @@ for(var/obj/structure/destructible/clockwork/ocular_warden/W in orange(OCULAR_WARDEN_EXCLUSION_RANGE, src)) if(W.anchored) if(!silent) - to_chat(user, "You sense another ocular warden too near this location. Activating this one this close would cause them to fight.") + to_chat(user, span_neovgre("You sense another ocular warden too near this location. Activating this one this close would cause them to fight.")) return FAILED_UNFASTEN return SUCCESSFUL_UNFASTEN @@ -93,16 +93,16 @@ if(validtargets.len) target = pick(validtargets) playsound(src,'sound/machines/clockcult/ocularwarden-target.ogg',50,1) - visible_message("[src] swivels to face [target]!") + visible_message(span_warning("[src] swivels to face [target]!")) if(isliving(target)) var/mob/living/L = target to_chat(L, "\"I SEE YOU!\"\n[src]'s gaze [GLOB.ratvar_awakens ? "melts you alive" : "burns you"]!") else if(ismecha(target)) var/obj/mecha/M = target - to_chat(M.occupant, "\"I SEE YOU!\"" ) + to_chat(M.occupant, span_neovgre("\"I SEE YOU!\"") ) else if(prob(0.5)) //Extremely low chance because of how fast the subsystem it uses processes if(prob(50)) - visible_message("[src][pick(idle_messages)]") + visible_message(span_notice("[src][pick(idle_messages)]")) else setDir(pick(GLOB.cardinals))//Random rotation @@ -112,7 +112,7 @@ var/obj/item/storage/book/bible/B = L.bible_check() if(B) if(!(B.resistance_flags & ON_FIRE)) - to_chat(L, "Your [B.name] bursts into flames!") + to_chat(L, span_warning("Your [B.name] bursts into flames!")) for(var/obj/item/storage/book/bible/BI in L.GetAllContents()) if(!(BI.resistance_flags & ON_FIRE)) BI.fire_act() @@ -154,7 +154,7 @@ if(!target) return 0 target = null - visible_message("[src] settles and seems almost disappointed.") + visible_message(span_warning("[src] settles and seems almost disappointed.")) return 1 /obj/structure/destructible/clockwork/ocular_warden/get_efficiency_mod() diff --git a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm index bf691cf6803f..2ecc1856dee5 100644 --- a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm +++ b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm @@ -26,9 +26,9 @@ M.ratvar_act() START_PROCESSING(SSobj, src) if(prob(25)) - send_to_playing_players("[text2ratvar("COGGERS")]!") + send_to_playing_players(span_ratvar("[text2ratvar("COGGERS")]!")) else - send_to_playing_players("[text2ratvar("ONCE AGAIN MY LIGHT SHINES AMONG THESE PATHETIC STARS")]") + send_to_playing_players(span_ratvar("[text2ratvar("ONCE AGAIN MY LIGHT SHINES AMONG THESE PATHETIC STARS")]")) sound_to_playing_players('sound/effects/ratvar_reveal.ogg') var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/clockwork_effects.dmi', "ratvar_alert") diff --git a/code/modules/antagonists/clockcult/clock_structures/trap_triggers/lever.dm b/code/modules/antagonists/clockcult/clock_structures/trap_triggers/lever.dm index 12e4b62a6528..63910aff49cc 100644 --- a/code/modules/antagonists/clockcult/clock_structures/trap_triggers/lever.dm +++ b/code/modules/antagonists/clockcult/clock_structures/trap_triggers/lever.dm @@ -10,7 +10,7 @@ . = ..() if(.) return - user.visible_message("[user] pulls [src]!", "You pull [src]. It clicks, then lifts back upwards.") + user.visible_message(span_notice("[user] pulls [src]!"), span_notice("You pull [src]. It clicks, then lifts back upwards.")) if(wired_to.len) audible_message("You hear gears clanking.") playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE) diff --git a/code/modules/antagonists/clockcult/clock_structures/trap_triggers/pressure_sensor.dm b/code/modules/antagonists/clockcult/clock_structures/trap_triggers/pressure_sensor.dm index c1c6fdf9cf68..9b654855634d 100644 --- a/code/modules/antagonists/clockcult/clock_structures/trap_triggers/pressure_sensor.dm +++ b/code/modules/antagonists/clockcult/clock_structures/trap_triggers/pressure_sensor.dm @@ -13,7 +13,7 @@ if(!istype(T, /obj/structure/destructible/clockwork/trap/trigger)) wired_to += T T.wired_to += src - to_chat(usr, "[src] automatically links with [T] beneath it.") + to_chat(usr, span_alloy("[src] automatically links with [T] beneath it.")) /obj/structure/destructible/clockwork/trap/trigger/pressure_sensor/Crossed(atom/movable/AM) . = ..() diff --git a/code/modules/antagonists/clockcult/clock_structures/trap_triggers/repeater.dm b/code/modules/antagonists/clockcult/clock_structures/trap_triggers/repeater.dm index f5ed91ac1517..337cbc09b6af 100644 --- a/code/modules/antagonists/clockcult/clock_structures/trap_triggers/repeater.dm +++ b/code/modules/antagonists/clockcult/clock_structures/trap_triggers/repeater.dm @@ -14,11 +14,11 @@ return if(!(datum_flags & DF_ISPROCESSING)) START_PROCESSING(SSprocessing, src) - to_chat(user, "You activate [src].") + to_chat(user, span_notice("You activate [src].")) icon_state = "[icon_state]_on" else STOP_PROCESSING(SSprocessing, src) - to_chat(user, "You halt [src]'s ticking.") + to_chat(user, span_notice("You halt [src]'s ticking.")) icon_state = initial(icon_state) /obj/structure/destructible/clockwork/trap/trigger/repeater/process() diff --git a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm index 4ae8f52fe512..dedba629e77d 100644 --- a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm +++ b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm @@ -4,7 +4,7 @@ desc = "A deadly brass spike, cleverly concealed in the floor. You think you should be safe if you disarm whatever's meant to set it off." clockwork_desc = "A barbaric but undeniably effective weapon: a spear through the chest. It immobilizes anyone unlucky enough to step on it and keeps them in place until they get help.." icon_state = "brass_skewer" - break_message = "The skewer snaps in two!" + break_message = span_warning("The skewer snaps in two!") max_integrity = 40 density = FALSE can_buckle = TRUE @@ -23,7 +23,7 @@ var/mob/living/L = buckled_mobs[1] if(iscarbon(L)) L.Paralyze(100) - L.visible_message("[L] is maimed as the skewer shatters while still in [L.p_their()] body!") + L.visible_message(span_warning("[L] is maimed as the skewer shatters while still in [L.p_their()] body!")) L.adjustBruteLoss(15) unbuckle_mob(L) return ..() @@ -36,7 +36,7 @@ /obj/structure/destructible/clockwork/trap/attackby(obj/item/I, mob/living/user, params) if(buckled_mobs && (user in buckled_mobs)) - to_chat(user, "You can't reach!") + to_chat(user, span_warning("You can't reach!")) return ..() @@ -53,14 +53,14 @@ if(squirrel) if(iscyborg(squirrel)) if(!squirrel.stat) - squirrel.visible_message("A massive brass spike erupts from the ground, rending [squirrel]'s chassis but shattering into pieces!", \ - "A massive brass spike rips through your chassis and bursts into shrapnel in your casing!") + squirrel.visible_message(span_boldwarning("A massive brass spike erupts from the ground, rending [squirrel]'s chassis but shattering into pieces!"), \ + span_userdanger("A massive brass spike rips through your chassis and bursts into shrapnel in your casing!")) squirrel.adjustBruteLoss(50) squirrel.Stun(20) addtimer(CALLBACK(src, .proc/take_damage, max_integrity), 1) else - squirrel.visible_message("A massive brass spike erupts from the ground, impaling [squirrel]!", \ - "A massive brass spike rams through your chest, hoisting you into the air!") + squirrel.visible_message(span_boldwarning("A massive brass spike erupts from the ground, impaling [squirrel]!"), \ + span_userdanger("A massive brass spike rams through your chest, hoisting you into the air!")) squirrel.emote("scream") playsound(squirrel, 'sound/effects/splat.ogg', 50, TRUE) playsound(squirrel, 'sound/misc/desceration-03.ogg', 50, TRUE) @@ -68,7 +68,7 @@ mouse_opacity = MOUSE_OPACITY_OPAQUE //So players can interact with the tile it's on to pull them off buckle_mob(squirrel, TRUE) else - visible_message("A massive brass spike erupts from the ground!") + visible_message(span_danger("A massive brass spike erupts from the ground!")) playsound(src, 'sound/machines/clockcult/brass_skewer.ogg', 75, FALSE) icon_state = "[initial(icon_state)]_extended" density = TRUE //Skewers are one-use only @@ -90,11 +90,11 @@ if(user == skewee) if(wiggle_wiggle) return - user.visible_message("[user] starts wriggling off of [src]!", \ - "You start agonizingly working your way off of [src]...") + user.visible_message(span_warning("[user] starts wriggling off of [src]!"), \ + span_danger("You start agonizingly working your way off of [src]...")) wiggle_wiggle = TRUE if(!do_after(user, 300, target = user)) - user.visible_message("[user] slides back down [src]!") + user.visible_message(span_warning("[user] slides back down [src]!")) user.emote("scream") user.apply_damage(10, BRUTE, BODY_ZONE_CHEST) playsound(user, 'sound/misc/desceration-03.ogg', 50, TRUE) @@ -102,14 +102,14 @@ return wiggle_wiggle = FALSE else - user.visible_message("[user] starts tenderly lifting [skewee] off of [src]...", \ - "You start tenderly lifting [skewee] off of [src]...") + user.visible_message(span_danger("[user] starts tenderly lifting [skewee] off of [src]..."), \ + span_danger("You start tenderly lifting [skewee] off of [src]...")) if(!do_after(user, 60, target = skewee)) - skewee.visible_message("[skewee] painfully slides back down [src].") + skewee.visible_message(span_warning("[skewee] painfully slides back down [src].")) skewee.emote("moan") return - skewee.visible_message("[skewee] comes free of [src] with a squelching pop!", \ - "You come free of [src]!") + skewee.visible_message(span_danger("[skewee] comes free of [src] with a squelching pop!"), \ + span_boldannounce("You come free of [src]!")) skewee.Paralyze(30) playsound(skewee, 'sound/misc/desceration-03.ogg', 50, TRUE) unbuckle_mob(skewee) diff --git a/code/modules/antagonists/clockcult/clock_structures/traps/steam_vent.dm b/code/modules/antagonists/clockcult/clock_structures/traps/steam_vent.dm index 18bacf452751..c1a129022d49 100644 --- a/code/modules/antagonists/clockcult/clock_structures/traps/steam_vent.dm +++ b/code/modules/antagonists/clockcult/clock_structures/traps/steam_vent.dm @@ -4,7 +4,7 @@ desc = "Some wired slats embedded in the floor. They feel warm to the touch." icon_state = "steam_vent_0" clockwork_desc = "When active, these vents will billow out clouds of excess steam from Reebe, obscuring vision." - break_message = "The vent snaps and collapses!" + break_message = span_warning("The vent snaps and collapses!") max_integrity = 100 density = FALSE diff --git a/code/modules/antagonists/clockcult/clock_structures/wall_gear.dm b/code/modules/antagonists/clockcult/clock_structures/wall_gear.dm index 7e4822b622d0..3631a33b0b97 100644 --- a/code/modules/antagonists/clockcult/clock_structures/wall_gear.dm +++ b/code/modules/antagonists/clockcult/clock_structures/wall_gear.dm @@ -7,7 +7,7 @@ max_integrity = 100 construction_value = 3 desc = "A massive brass gear. You could probably secure or unsecure it with a wrench, or just climb over it." - break_message = "The gear breaks apart into shards of alloy!" + break_message = span_warning("The gear breaks apart into shards of alloy!") debris = list(/obj/item/clockwork/alloy_shards/large = 1, \ /obj/item/clockwork/alloy_shards/medium = 4, \ /obj/item/clockwork/alloy_shards/small = 2) //slightly more debris than the default, totals 26 alloy @@ -28,29 +28,29 @@ return 1 else if(I.tool_behaviour == TOOL_SCREWDRIVER) if(anchored) - to_chat(user, "[src] needs to be unsecured to disassemble it!") + to_chat(user, span_warning("[src] needs to be unsecured to disassemble it!")) else - user.visible_message("[user] starts to disassemble [src].", "You start to disassemble [src]...") + user.visible_message(span_warning("[user] starts to disassemble [src]."), span_notice("You start to disassemble [src]...")) if(I.use_tool(src, user, 30, volume=100) && !anchored) - to_chat(user, "You disassemble [src].") + to_chat(user, span_notice("You disassemble [src].")) deconstruct(TRUE) return 1 else if(istype(I, /obj/item/stack/tile/brass)) var/obj/item/stack/tile/brass/W = I if(W.get_amount() < 1) - to_chat(user, "You need one brass sheet to do this!") + to_chat(user, span_warning("You need one brass sheet to do this!")) return var/turf/T = get_turf(src) if(iswallturf(T)) - to_chat(user, "There is already a wall present!") + to_chat(user, span_warning("There is already a wall present!")) return if(!isfloorturf(T)) - to_chat(user, "A floor must be present to build a [anchored ? "false ":""]wall!") + to_chat(user, span_warning("A floor must be present to build a [anchored ? "false ":""]wall!")) return if(locate(/obj/structure/falsewall) in T.contents) - to_chat(user, "There is already a false wall present!") + to_chat(user, span_warning("There is already a false wall present!")) return - to_chat(user, "You start adding [W] to [src]...") + to_chat(user, span_notice("You start adding [W] to [src]...")) if(do_after(user, 20, target = src)) var/brass_floor = FALSE if(istype(T, /turf/open/floor/clockwork)) //if the floor is already brass, costs less to make(conservation of masssssss) @@ -63,7 +63,7 @@ new /obj/structure/falsewall/brass(T) qdel(src) else - to_chat(user, "You need more brass to make a [anchored ? "false ":""]wall!") + to_chat(user, span_warning("You need more brass to make a [anchored ? "false ":""]wall!")) return 1 return ..() diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm index 8ea4db810960..95f0b7bcea0f 100644 --- a/code/modules/antagonists/clockcult/clockcult.dm +++ b/code/modules/antagonists/clockcult/clockcult.dm @@ -71,12 +71,12 @@ to_chat(R, "You have been desynced from your master AI.
\ In addition, your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.") else - to_chat(R, "Your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.") + to_chat(R, span_boldwarning("Your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.")) if(isAI(current)) - to_chat(current, "You are now able to use your cameras to listen in on conversations, but can no longer speak in anything but Ratvarian.") + to_chat(current, span_boldwarning("You are now able to use your cameras to listen in on conversations, but can no longer speak in anything but Ratvarian.")) to_chat(current, "You can communicate with other servants by using the Hierophant Network action button in the upper left.") else if(isbrain(current) || isclockmob(current)) - to_chat(current, "You can communicate with other servants by using the Hierophant Network action button in the upper left.") + to_chat(current, span_nezbere("You can communicate with other servants by using the Hierophant Network action button in the upper left.")) ..() to_chat(current, "This is Ratvar's will: [CLOCKCULT_OBJECTIVE]") antag_memory += "Ratvar's will: [CLOCKCULT_OBJECTIVE]
" //Memorize the objectives @@ -169,11 +169,11 @@ SSticker.mode.update_servant_icons_removed(owner) if(!silent) owner.current.visible_message("[owner.current] seems to have remembered [owner.current.p_their()] true allegiance!", null, null, null, owner.current) - to_chat(owner, "A cold, cold darkness flows through your mind, extinguishing the Justiciar's light and all of your memories as his servant.") + to_chat(owner, span_userdanger("A cold, cold darkness flows through your mind, extinguishing the Justiciar's light and all of your memories as his servant.")) owner.current.log_message("has renounced the cult of Ratvar!", LOG_ATTACK, color="#BE8700") owner.special_role = null if(iscyborg(owner.current)) - to_chat(owner.current, "Despite your freedom from Ratvar's influence, you are still irreparably damaged and no longer possess certain functions such as AI linking.") + to_chat(owner.current, span_warning("Despite your freedom from Ratvar's influence, you are still irreparably damaged and no longer possess certain functions such as AI linking.")) . = ..() @@ -193,9 +193,9 @@ /datum/antagonist/clockcult/proc/admin_give_slab(mob/admin) if(!SSticker.mode.equip_servant(owner.current)) - to_chat(admin, "Failed to outfit [owner.current]!") + to_chat(admin, span_warning("Failed to outfit [owner.current]!")) else - to_chat(admin, "Successfully gave [owner.current] servant equipment!") + to_chat(admin, span_notice("Successfully gave [owner.current] servant equipment!")) /datum/team/clockcult name = "Clockcult" @@ -240,7 +240,7 @@ if(eminence) parts += "The Eminence was: [printplayer(eminence)]" if(members.len) - parts += "Ratvar's servants were:" + parts += span_header("Ratvar's servants were:") parts += printplayerlist(members - eminence) return "
[parts.Join("
")]
" diff --git a/code/modules/antagonists/creep/creep.dm b/code/modules/antagonists/creep/creep.dm index c900f4fd6cec..7dd1a84fb5e3 100644 --- a/code/modules/antagonists/creep/creep.dm +++ b/code/modules/antagonists/creep/creep.dm @@ -23,11 +23,11 @@ /datum/antagonist/obsessed/greet() owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/creepalert.ogg', 100, FALSE, pressure_affected = FALSE) - to_chat(owner, "You are the Obsessed!") + to_chat(owner, span_boldannounce("You 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, "You 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() @@ -39,7 +39,7 @@ var/mob/living/M = mob_override || owner.current update_obsession_icons_added(M) if(owner.current && ishuman(owner.current) && !owner.current.GetComponent(/datum/component/mood)) - to_chat(owner, "You feel more aware of your condition, mood has been enabled!") + to_chat(owner, span_danger("You feel more aware of your condition, mood has been enabled!")) owner.current.AddComponent(/datum/component/mood) //you fool you absolute buffoon to think you could escape /datum/antagonist/obsessed/remove_innate_effects(mob/living/mob_override) @@ -49,7 +49,7 @@ if(H && !H.mood_enabled) var/datum/component/C = M.GetComponent(/datum/component/mood) if(C) //we cannot be too sure they may have somehow removed it - to_chat(owner, "Your need for mental fitness vanishes alongside the voices, mood has been disabled.") + to_chat(owner, span_danger("Your need for mental fitness vanishes alongside the voices, mood has been disabled.")) C.RemoveComponent() /datum/antagonist/obsessed/proc/forge_objectives(var/datum/mind/obsessionmind) @@ -129,11 +129,11 @@ 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!" diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index e8a56482e536..21b89597f1f6 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -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,"You begin to carve unnatural symbols into your flesh!") + to_chat(owner,span_warning("You begin to carve unnatural symbols into your flesh!")) SEND_SOUND(owner, sound('sound/weapons/slice.ogg',0,1,10)) if(!channeling) channeling = TRUE else - to_chat(owner, "You are already invoking blood magic!") + to_chat(owner, span_cultitalic("You 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, "Your wounds glow with power, you have prepared a [new_spell.name] invocation!") + to_chat(owner, span_warning("Your 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, "You have no empty hand for invoking blood magic!") + to_chat(owner, span_warning("You have no empty hand for invoking blood magic!")) return - to_chat(owner, "Your wounds glow as you invoke the [name].") + to_chat(owner, span_notice("Your wounds glow as you invoke the [name].")) return if(hand_magic) qdel(hand_magic) hand_magic = null - to_chat(owner, "You snuff out the spell, saving it for later.") + to_chat(owner, span_warning("You 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!", \ - "You speak the cursed words, emitting an EMP blast from your hand.") + owner.visible_message(span_warning("[owner]'s hand flashes a bright blue!"), \ + span_cultitalic("You speak the cursed words, emitting an EMP blast from your hand.")) empulse(owner, 2, 5) owner.whisper(invocation, language = /datum/language/common) charges-- @@ -191,14 +191,14 @@ var/choice = alert(owner,"Choose your 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 your 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 your 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 your hand!") + to_chat(owner, span_warning("A ritual dagger appears in your hand!")) else - owner.visible_message("A ritual dagger appears at [owner]'s feet!", \ - "A ritual dagger materializes at your feet.") + owner.visible_message(span_warning("A ritual dagger appears at [owner]'s feet!"), \ + span_cultitalic("A ritual dagger materializes at your feet.")) SEND_SOUND(owner, sound('sound/effects/magic.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("You dispel the magic...") + remove_ranged_ability(span_cult("You dispel the magic...")) else - add_ranged_ability(user, "You prepare to horrify a target...") + add_ranged_ability(user, span_cult("You prepare to horrify a target...")) /obj/effect/proc_holder/horror/InterceptClickOn(mob/living/caller, params, atom/target) if(..()) @@ -271,7 +271,7 @@ attached_action.desc += "
Has [attached_action.charges] use\s remaining." attached_action.UpdateButtonIcon() if(attached_action.charges <= 0) - remove_ranged_ability("You have exhausted the spell's power!") + remove_ranged_ability(span_cult("You 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!", \ - "You invoke the veiling spell, hiding nearby runes.") + owner.visible_message(span_warning("Thin grey dust falls from [owner]'s hand!"), \ + span_cultitalic("You invoke the veiling spell, hiding nearby runes.")) charges-- SEND_SOUND(owner, sound('sound/magic/smoke.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!", \ - "You invoke the counterspell, revealing nearby runes.") + owner.visible_message(span_warning("A flash of light shines from [owner]'s hand!"), \ + span_cultitalic("You invoke the counterspell, revealing nearby runes.")) charges-- owner.whisper(invocation, language = /datum/language/common) SEND_SOUND(owner, sound('sound/magic/enter_blood.ogg',0,1,25)) @@ -420,8 +420,8 @@ var/datum/antagonist/cult/cultist = user.mind.has_antag_datum(/datum/antagonist/cult) var/datum/team/cult/cult = cultist.get_team() if(iscultist(user)) - user.visible_message("[user] holds up [user.p_their()] hand, which explodes in a flash of red light!", \ - "You 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("You attempt to stun [L] with the spell!")) user.mob_light(_color = LIGHT_COLOR_BLOOD_MAGIC, _range = 3, _duration = 2) @@ -435,14 +435,14 @@ 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!", \ - "Your [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_userdanger("Your [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 your body and protect you from the flash of light!") + target.visible_message(span_warning("[L] starts to glow in a halo of light!"), \ + span_userdanger("A feeling of warmth washes over you, rays of holy light surround your body and protect you from the flash of light!")) else if(cult.cult_ascendent) - to_chat(user, "[L] is dazed by a flash of red light!") + to_chat(user, span_cultitalic("[L] is dazed by a flash of red light!")) L.Knockdown(100) L.apply_damage(50, STAMINA, BODY_ZONE_HEAD) L.flash_act(1,1) @@ -456,7 +456,7 @@ if(is_servant_of_ratvar(L)) L.adjustBruteLoss(30) else if(cult.cult_risen) - to_chat(user, "In a dull flash of red, [L] falls to the ground!") + to_chat(user, span_cultitalic("In a dull flash of red, [L] falls to the ground!")) L.Paralyze(80) L.flash_act(1,1) if(issilicon(target)) @@ -471,7 +471,7 @@ if(is_servant_of_ratvar(L)) L.adjustBruteLoss(20) 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)) @@ -497,7 +497,7 @@ /obj/item/melee/blood_magic/teleport/afterattack(atom/target, mob/living/carbon/user, proximity) if(!iscultist(target) || !proximity) - to_chat(user, "You can only teleport adjacent cultists with this spell!") + to_chat(user, span_warning("You can only teleport adjacent cultists with this spell!")) return if(iscultist(user)) var/list/potential_runes = list() @@ -507,13 +507,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, "You are not in the right dimension!") + to_chat(user, span_cultitalic("You are not in the right dimension!")) log_game("Teleport spell failed - user in away mission") return @@ -523,15 +523,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!", \ - "You speak the words of the talisman and find yourself somewhere else!", "You hear a sharp crack.") - dest.visible_message("There is a boom of outrushing air as something appears above the rune!", null, "You 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("You speak the words of the talisman and find yourself somewhere else!"), "You hear a sharp crack.") + dest.visible_message(span_warning("There is a boom of outrushing air as something appears above the rune!"), null, "You hear a boom.") ..() //Shackles @@ -547,29 +547,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/weapons/cablecuff.ogg', 30, 1, -2) - C.visible_message("[user] begins restraining [C] with dark magic!", \ - "[user] begins shaping dark magic shackles around your wrists!") + C.visible_message(span_danger("[user] begins restraining [C] with dark magic!"), \ + span_userdanger("[user] begins shaping dark magic shackles around your 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, "You shackle [C].") + to_chat(user, span_notice("You 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, "You fail to shackle [C].") + to_chat(user, span_warning("You 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 @@ -579,8 +579,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!", \ - "Your [src] shatters in a discharge of dark magic!") + user.visible_message(span_danger("[user]'s shackles shatter in a discharge of dark magic!"), \ + span_userdanger("Your [src] shatters in a discharge of dark magic!")) . = ..() @@ -607,11 +607,11 @@ var/obj/item/stack/sheet/candidate = target if(candidate.use(METAL_TO_CONSTRUCT_SHELL_CONVERSION)) uses-- - to_chat(user, "A dark cloud emanates from your hand and swirls around the metal, twisting it into a construct shell!") + to_chat(user, span_warning("A dark cloud emanates from your hand and swirls around the metal, twisting it into a construct shell!")) new /obj/structure/constructshell(T) SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25)) else - to_chat(user, "You need [METAL_TO_CONSTRUCT_SHELL_CONVERSION] metal to produce a construct shell!") + to_chat(user, span_warning("You 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 @@ -619,7 +619,7 @@ 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/effects/magic.ogg',0,1,25)) else if(istype(target,/obj/machinery/door/airlock)) playsound(T, 'sound/machines/airlockforced.ogg', 50, 1) @@ -627,12 +627,12 @@ if(do_after(user, 50, target = user)) target.narsie_act() uses-- - user.visible_message("Black ribbons suddenly eminate from [user]'s hand and cling to the airlock - twisting and corrupting it!") + user.visible_message(span_warning("Black ribbons suddenly eminate from [user]'s hand and cling to the airlock - twisting and corrupting it!")) SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25)) else 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 ..() @@ -646,7 +646,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_W_UNIFORM) C.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), SLOT_HEAD) C.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), SLOT_WEAR_SUIT) @@ -672,26 +672,26 @@ 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(H)) var/restore_blood = BLOOD_VOLUME_SAFE(H) - H.blood_volume if(uses*2 < restore_blood) H.blood_volume += uses*2 - to_chat(user,"You use the last of your blood rites to restore what blood you could!") + to_chat(user,span_danger("You use the last of your blood rites to restore what blood you could!")) uses = 0 return ..() else H.blood_volume = BLOOD_VOLUME_SAFE(H) uses -= round(restore_blood/2) - to_chat(user,"Your blood rites have restored [H == user ? "your" : "[H.p_their()]"] blood to safe levels!") + to_chat(user,span_warning("Your 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) @@ -701,9 +701,9 @@ 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) @@ -716,21 +716,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)) H.blood_volume -= 100 uses += 50 user.Beam(H,icon_state="drainbeam",time=10) playsound(get_turf(H), 'sound/magic/enter_blood.ogg', 50) - H.visible_message("[user] has drained some of [H]'s blood!") - to_chat(user,"Your 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("Your 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_danger("[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 @@ -738,11 +738,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/magic/staff_healing.ogg', 25) user.Beam(M,icon_state="sendbeam",time=10) @@ -772,7 +772,7 @@ user.Beam(T,icon_state="drainbeam",time=15) new /obj/effect/temp_visual/cult/sparks(get_turf(user)) playsound(T, 'sound/magic/enter_blood.ogg', 50) - to_chat(user, "Your blood rite has gained [round(temp)] charge\s from blood sources around you!") + to_chat(user, span_cultitalic("Your 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) @@ -780,12 +780,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, "You decide against conducting a greater blood rite.") + to_chat(user, span_cultitalic("You decide against conducting a greater blood rite.")) return switch(choice) if("Blood Spear (150)") if(uses < BLOOD_SPEAR_COST) - to_chat(user, "You need [BLOOD_SPEAR_COST] charges to perform this rite.") + to_chat(user, span_cultitalic("You need [BLOOD_SPEAR_COST] charges to perform this rite.")) else uses -= BLOOD_SPEAR_COST var/turf/T = get_turf(user) @@ -795,13 +795,13 @@ S.Grant(user, rite) rite.spear_act = S if(user.put_in_hands(rite)) - to_chat(user, "A [rite.name] appears in your hand!") + to_chat(user, span_cultitalic("A [rite.name] appears in your hand!")) else - user.visible_message("A [rite.name] appears at [user]'s feet!", \ - "A [rite.name] materializes at your feet.") + user.visible_message(span_warning("A [rite.name] appears at [user]'s feet!"), \ + span_cultitalic("A [rite.name] materializes at your feet.")) if("Blood Bolt Barrage (300)") if(uses < BLOOD_BARRAGE_COST) - to_chat(user, "You need [BLOOD_BARRAGE_COST] charges to perform this rite.") + to_chat(user, span_cultitalic("You 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 @@ -809,11 +809,11 @@ if(user.put_in_hands(rite)) to_chat(user, "Your hands glow with power!") else - to_chat(user, "You need a free hand for this rite!") + to_chat(user, span_cultitalic("You need a free hand for this rite!")) qdel(rite) if("Blood Beam (500)") if(uses < BLOOD_BEAM_COST) - to_chat(user, "You need [BLOOD_BEAM_COST] charges to perform this rite.") + to_chat(user, span_cultitalic("You need [BLOOD_BEAM_COST] charges to perform this rite.")) else var/obj/rite = new /obj/item/blood_beam() uses -= BLOOD_BEAM_COST @@ -821,5 +821,5 @@ if(user.put_in_hands(rite)) to_chat(user, "Your hands glow with POWER OVERWHELMING!!!") else - to_chat(user, "You need a free hand for this rite!") + to_chat(user, span_cultitalic("You 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 746aabf67114..59ffb4cdc3d6 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -104,10 +104,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_userdanger("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, "You have a [item_name] in your [where].") + to_chat(mob, span_danger("You have a [item_name] in your [where].")) if(where == "backpack") SEND_SIGNAL(mob.back, COMSIG_TRY_STORAGE_SHOW, mob) return TRUE @@ -154,7 +154,7 @@ SSticker.mode.update_cult_icons_removed(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 your mind, cleansing the taint of the Geometer and all your memories as her servant.") + to_chat(owner.current, span_userdanger("An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.")) owner.current.log_message("has renounced the cult of Nar'Sie!", LOG_ATTACK, color="#960000") if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client) owner.current.client.images -= cult_team.blood_target_image @@ -179,11 +179,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 @@ -282,7 +282,7 @@ for(var/datum/mind/B in members) if(B.current) SEND_SOUND(B.current, 'sound/hallucinations/i_see_you2.ogg') - to_chat(B.current, "The veil weakens as your cult grows, your eyes begin to glow...") + to_chat(B.current, span_cultlarge("The veil weakens as your cult grows, your eyes begin to glow...")) addtimer(CALLBACK(src, .proc/rise, B.current), 200) cult_risen = TRUE @@ -410,19 +410,19 @@ var/adjective = pick(adjectives) var/noun = pick(nouns) for (var/datum/mind/M in members) - to_chat(M.current, "The Geometer is displeased with your failure to sacrifice the [adjective] [noun] [old_target].") + to_chat(M.current, span_cultlarge("The Geometer is displeased with your failure to sacrifice the [adjective] [noun] [old_target].")) // Handle the case where the new target is jobless var/job = new_target.current.job if (job == null) job = "disgusting NEET" to_chat(M.current, "You will be given one more chance to serve by sacrificing the [job], [new_target].") - to_chat(M.current, "Do not fail me again.") + to_chat(M.current, span_narsiesmall("Do not fail me again.")) return TRUE // At this point, the cultists have squandered their mulligan and the round is over. for (var/datum/mind/M in members) - to_chat(M.current, "I will not be worshipped by failures.") + to_chat(M.current, span_narsiesmall("I will not be worshipped by failures.")) // Nar-sie is sick of your crap M.current.reagents.add_reagent(/datum/reagent/toxin/heparin, 100) M.current.reagents.add_reagent(/datum/reagent/toxin/initropidril, 100) @@ -496,7 +496,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 bd02327f58ba..ca1a594374c5 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -59,7 +59,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)) @@ -94,7 +94,7 @@ B.current.update_action_buttons_icon() if(!B.current.incapacitated()) SEND_SOUND(B.current, 'sound/hallucinations/im_here1.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) @@ -108,7 +108,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 @@ -116,7 +116,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 @@ -124,7 +124,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 var/datum/antagonist/cult/C = Nominee.mind.has_antag_datum(/datum/antagonist/cult) @@ -138,7 +138,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 your 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 your ability!")) return TRUE /datum/action/innate/cult/master/IsAvailable() @@ -162,7 +162,7 @@ if(!is_blocked_turf(T, TRUE)) destinations += T if(!LAZYLEN(destinations)) - to_chat(owner, "You need more space to summon your cult!") + to_chat(owner, span_warning("You need more space to summon your cult!")) return if(do_after(owner, 30, target = owner)) for(var/datum/mind/B in antag.cult_team.members) @@ -250,9 +250,9 @@ /obj/effect/proc_holder/cultmark/proc/toggle(mob/user) if(active) - remove_ranged_ability("You cease the marking ritual.") + remove_ranged_ability(span_cult("You cease the marking ritual.")) else - add_ranged_ability(user, "You prepare to mark a target for your cult...") + add_ranged_ability(user, span_cult("You prepare to mark a target for your cult...")) /obj/effect/proc_holder/cultmark/InterceptClickOn(mob/living/caller, params, atom/target) if(..()) @@ -268,7 +268,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) @@ -284,7 +284,7 @@ SEND_SOUND(B.current, sound(pick('sound/hallucinations/over_here2.ogg','sound/hallucinations/over_here3.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, .proc/reset_blood_target,C.cult_team), 900, TIMER_STOPPABLE) return TRUE return FALSE @@ -330,21 +330,21 @@ button_icon_state = "cult_mark" owner.update_action_buttons_icon() SEND_SOUND(owner, 'sound/magic/enter_blood.ogg') - to_chat(owner,"Your previous mark is gone - you are now ready to create a new blood mark.") + to_chat(owner,span_cultbold("Your 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, "You have cleared the cult's blood target!") + to_chat(owner, span_cultbold("You 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, "You aren't ready to place another blood mark yet!") + to_chat(owner, span_cultbold("You aren't ready to place another blood mark yet!")) return target = owner.orbiting?.parent || get_turf(owner) if(!target) @@ -364,7 +364,7 @@ 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!") SEND_SOUND(B.current, sound(pick('sound/hallucinations/over_here2.ogg','sound/hallucinations/over_here3.ogg'),0,1,75)) B.current.client.images += C.cult_team.blood_target_image - to_chat(owner,"You have marked the [target] for the cult! It will last for [DisplayTimeText(base_cooldown)].") + to_chat(owner,span_cultbold("You have marked the [target] for the cult! It will last for [DisplayTimeText(base_cooldown)].")) name = "Clear the Blood Mark" desc = "Remove the Blood Mark you previously set." button_icon_state = "emp" @@ -424,10 +424,10 @@ /obj/effect/proc_holder/pulse/proc/toggle(mob/user) if(active) - remove_ranged_ability("You cease your preparations...") + remove_ranged_ability(span_cult("You cease your preparations...")) attached_action.throwing = FALSE else - add_ranged_ability(user, "You prepare to tear through the fabric of reality...") + add_ranged_ability(user, span_cult("You prepare to tear through the fabric of reality...")) /obj/effect/proc_holder/pulse/InterceptClickOn(mob/living/caller, params, atom/target) if(..()) @@ -458,6 +458,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, /mob.proc/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 6226e616edaf..a701b6d0797f 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)) @@ -75,10 +75,10 @@ ..() if(!iscultist(user)) if(!is_servant_of_ratvar(user)) - to_chat(user, "\"I wouldn't advise that.\"") + to_chat(user, span_cultlarge("\"I wouldn't advise that.\"")) else - to_chat(user, "\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"") - to_chat(user, "A horrible force yanks at your arm!") + to_chat(user, span_cultlarge("\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"")) + to_chat(user, span_userdanger("A horrible force yanks at your arm!")) user.emote("scream") user.apply_damage(30, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) user.dropItemToGround(src) @@ -131,20 +131,20 @@ /obj/item/twohanded/required/cult_bastard/attack_self(mob/user) dash_toggled = !dash_toggled if(dash_toggled) - to_chat(loc, "You raise [src] and prepare to jaunt with it.") + to_chat(loc, span_notice("You raise [src] and prepare to jaunt with it.")) else - to_chat(loc, "You lower [src] and prepare to swing it normally.") + to_chat(loc, span_notice("You lower [src] and prepare to swing it normally.")) /obj/item/twohanded/required/cult_bastard/pickup(mob/living/user) . = ..() if(!iscultist(user)) if(!is_servant_of_ratvar(user)) - to_chat(user, "\"I wouldn't advise that.\"") + to_chat(user, span_cultlarge("\"I wouldn't advise that.\"")) force = 5 return else - to_chat(user, "\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"") - to_chat(user, "A horrible force yanks at your arm!") + to_chat(user, span_cultlarge("\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"")) + to_chat(user, span_userdanger("A horrible force yanks at your arm!")) user.emote("scream") user.apply_damage(30, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) user.dropItemToGround(src, TRUE) @@ -171,12 +171,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/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg', 'sound/weapons/effects/ric3.ogg', 'sound/weapons/effects/ric4.ogg', 'sound/weapons/effects/ric5.ogg'), 100, 1) return TRUE else playsound(src, 'sound/weapons/parry.ogg', 75, 1) - owner.visible_message("[owner] parries [attack_text] with [src]!") + owner.visible_message(span_danger("[owner] parries [attack_text] with [src]!")) return TRUE return FALSE @@ -265,7 +265,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!")) throw_impact(user) /obj/item/restraints/legcuffs/bola/cult/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) @@ -402,25 +402,25 @@ ..() if(!iscultist(user)) if(!is_servant_of_ratvar(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) else - to_chat(user, "\"Trying to use things you don't own is bad, you know.\"") - to_chat(user, "The armor squeezes at your body!") + to_chat(user, span_cultlarge("\"Trying to use things you don't own is bad, you know.\"")) + to_chat(user, span_userdanger("The armor squeezes at your body!")) user.emote("scream") user.adjustBruteLoss(25) user.dropItemToGround(src, TRUE) /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 @@ -454,14 +454,14 @@ ..() if(!iscultist(user)) if(!is_servant_of_ratvar(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) else - to_chat(user, "\"Trying to use things you don't own is bad, you know.\"") - to_chat(user, "The robes squeeze at your body!") + to_chat(user, span_cultlarge("\"Trying to use things you don't own is bad, you know.\"")) + to_chat(user, span_userdanger("The robes squeeze at your body!")) user.emote("scream") user.adjustBruteLoss(25) user.dropItemToGround(src, TRUE) @@ -476,7 +476,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) @@ -502,13 +502,13 @@ GLOBAL_VAR_INIT(curselimit, 0) 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(GLOB.curselimit >= 2) - 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) @@ -527,7 +527,7 @@ GLOBAL_VAR_INIT(curselimit, 0) SSshuttle.emergency.setTimer(timer) if(surplus > 0) SSshuttle.block_recall(surplus) - to_chat(user, "You shatter the orb! A dark essence spirals into the air, then disappears.") + to_chat(user, span_danger("You shatter the orb! A dark essence spirals into the air, then disappears.")) playsound(user.loc, 'sound/effects/glassbr1.ogg', 50, 1) qdel(src) sleep(20) @@ -553,9 +553,9 @@ GLOBAL_VAR_INIT(curselimit, 0) /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 @@ -566,12 +566,12 @@ GLOBAL_VAR_INIT(curselimit, 0) /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 @@ -594,7 +594,7 @@ GLOBAL_VAR_INIT(curselimit, 0) playsound(destination, "sparks", 50, 1) else - to_chat(C, "The veil cannot be torn here!") + to_chat(C, span_danger("The veil cannot be torn here!")) /obj/item/flashlight/flare/culttorch name = "void torch" @@ -649,7 +649,7 @@ GLOBAL_VAR_INIT(curselimit, 0) 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 @@ -689,9 +689,9 @@ GLOBAL_VAR_INIT(curselimit, 0) if(iscultist(L)) playsound(src, 'sound/weapons/throwtap.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()) if(is_servant_of_ratvar(L)) @@ -707,7 +707,7 @@ GLOBAL_VAR_INIT(curselimit, 0) 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/effects/glassbr3.ogg', 100) @@ -718,12 +718,12 @@ GLOBAL_VAR_INIT(curselimit, 0) 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/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg', 'sound/weapons/effects/ric3.ogg', 'sound/weapons/effects/ric4.ogg', 'sound/weapons/effects/ric5.ogg'), 100, 1) return TRUE else playsound(src, 'sound/weapons/parry.ogg', 100, 1) - owner.visible_message("[owner] parries [attack_text] with [src]!") + owner.visible_message(span_danger("[owner] parries [attack_text] with [src]!")) return TRUE return FALSE @@ -747,13 +747,13 @@ GLOBAL_VAR_INIT(curselimit, 0) 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) @@ -935,7 +935,7 @@ GLOBAL_VAR_INIT(curselimit, 0) 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/effects/glassbr3.ogg', 100) owner.Paralyze(25) @@ -961,7 +961,7 @@ GLOBAL_VAR_INIT(curselimit, 0) E.Goto(owner, owner.movement_delay(), E.minimum_distance) else var/turf/T = get_turf(owner) - T.visible_message("[src] shatters as it blocks [hitby]!") + T.visible_message(span_warning("[src] shatters as it blocks [hitby]!")) new /obj/effect/temp_visual/cult/sparks(T) qdel(src) return TRUE @@ -993,9 +993,9 @@ GLOBAL_VAR_INIT(curselimit, 0) if(iscultist(L)) playsound(src, 'sound/weapons/throwtap.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()) if(is_servant_of_ratvar(L)) diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index c8bf8a7db64e..9a5494c91179 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -10,7 +10,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 @@ -21,7 +21,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) @@ -31,7 +31,7 @@ /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)]." @@ -53,7 +53,7 @@ M.visible_message("[M] repairs \the [src].", \ "You repair [src], leaving [p_they()] at [round(obj_integrity * 100 / max_integrity)]% stability.") else - to_chat(M, "You cannot repair [src], as [p_theyre()] undamaged!") + to_chat(M, span_cult("You cannot repair [src], as [p_theyre()] undamaged!")) else ..() @@ -67,7 +67,7 @@ return FALSE if(istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user)) anchored = !anchored - to_chat(user, "You [anchored ? "":"un"]secure \the [src] [anchored ? "to":"from"] the floor.") + to_chat(user, span_notice("You [anchored ? "":"un"]secure \the [src] [anchored ? "to":"from"] the floor.")) if(!anchored) icon_state = "[initial(icon_state)]_off" else @@ -87,17 +87,17 @@ name = "altar" desc = "A bloodstained altar dedicated to Nar-Sie." 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, "You need to anchor [src] to the floor with your dagger first.") + to_chat(user, span_cultitalic("You 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)].") @@ -115,7 +115,7 @@ cooldowntime = world.time + 2400 for(var/N in pickedtype) new N(get_turf(src)) - to_chat(user, "You kneel before the altar and your faith is rewarded with the [choice]!") + to_chat(user, span_cultitalic("You kneel before the altar and your faith is rewarded with the [choice]!")) /obj/structure/destructible/cult/forge name = "daemon forge" @@ -123,17 +123,17 @@ 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, "You need to anchor [src] to the floor with your dagger first.") + to_chat(user, span_cultitalic("You 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)].") @@ -155,7 +155,7 @@ cooldowntime = world.time + 2400 for(var/N in pickedtype) new N(get_turf(src)) - to_chat(user, "You work the forge as dark knowledge guides your hands, creating the [choice]!") + to_chat(user, span_cultitalic("You work the forge as dark knowledge guides your hands, creating the [choice]!")) @@ -166,7 +166,7 @@ light_range = 1.5 light_color = LIGHT_COLOR_RED break_sound = 'sound/effects/glassbr2.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 @@ -241,17 +241,17 @@ 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, "You need to anchor [src] to the floor with your dagger first.") + to_chat(user, span_cultitalic("You 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)].") @@ -270,7 +270,7 @@ cooldowntime = world.time + 2400 for(var/N in pickedtype) new N(get_turf(src)) - to_chat(user, "You summon the [choice] from the archives!") + to_chat(user, span_cultitalic("You summon the [choice] from the archives!")) /////////////////////////////WE'RE IN THE ENDGAME NOW///////////////////////////// /obj/structure/destructible/cult/pillar @@ -281,7 +281,7 @@ obj_integrity = 200 max_integrity = 200 break_sound = 'sound/effects/meteorimpact.ogg' - break_message = "The pillar crumbles!" + break_message = span_warning("The pillar crumbles!") layer = MASSIVE_OBJ_LAYER var/alt = 0 is_endgame = TRUE @@ -340,7 +340,7 @@ obj_integrity = 600 max_integrity = 600 break_sound = 'sound/effects/glassbr2.ogg' - break_message = "The bloodstone resonates violently before crumbling to the floor!" + break_message = span_warning("The bloodstone resonates violently before crumbling to the floor!") layer = MASSIVE_OBJ_LAYER light_color = "#FF0000" var/current_fullness = 0 @@ -428,7 +428,7 @@ if(B.current) SEND_SOUND(B.current, 'sound/magic/demon_dies.ogg') if(SSticker.mode.bloodstone_list.len) - to_chat(B.current, "The Bloodstone in [get_area(src)] has been destroyed! There are [SSticker.mode.bloodstone_list.len] Bloodstones remaining!.") + to_chat(B.current, span_cultlarge("The Bloodstone in [get_area(src)] has been destroyed! There are [SSticker.mode.bloodstone_list.len] Bloodstones remaining!.")) new /obj/effect/decal/cleanable/ash(loc) new /obj/item/ectoplasm(loc) new /obj/structure/destructible/dead_bloodstone(loc) diff --git a/code/modules/antagonists/cult/ritual.dm b/code/modules/antagonists/cult/ritual.dm index 7cc2e4cdcd50..8766daf3258a 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, "You remove the taint from [M]." ) + to_chat(user, span_cult("You 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) @@ -78,46 +78,46 @@ This file contains the cult dagger and rune list code 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(SSticker.mode.bloodstone_cooldown) - to_chat(user, "The summoning was recently disrupted! you will need to wait before the cult can manage another attempt!") + to_chat(user, span_warning("The summoning was recently disrupted! you will need to wait before the cult can manage another attempt!")) 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(SSticker.mode.bloodstone_list.len) - to_chat(user, "\"The summoning has already begun! Protect the bloodstones with your life!\"") + to_chat(user, span_cultlarge("\"The summoning has already begun! Protect the bloodstones with your life!\"")) 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 begins the FINAL ritual for the summoning. It will be a long, hard battle 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, "You decide to prepare further before scribing the rune.") + to_chat(user, span_cult("You 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 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"]!", \ - "You [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("You [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) @@ -131,26 +131,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":""].", \ - "You 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("You 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, "You cannot scribe runes in space!") + to_chat(user, span_warning("You 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.blob_allowed)) - 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 dddb24e282da..dad190538a74 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, "You cannot scribe runes in space!") + to_chat(owner, span_warning("You 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) && !is_reebe(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 a5534c52bb5c..3983e17c9435 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/items/sheath.ogg') if(do_after(user, 15, target = src)) - to_chat(user, "You carefully erase the [lowertext(cultist_name)] rune.") + to_chat(user, span_notice("You 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, "You disrupt the magic of [src] with [I].") + to_chat(user, span_danger("You disrupt the magic of [src] with [I].")) qdel(src) /obj/effect/rune/attack_hand(mob/living/user) @@ -71,36 +71,36 @@ Runes can either be invoked by one's self or with many different cultists. Each if(.) return if(!iscultist(user)) - to_chat(user, "You aren't able to understand the words of [src].") + to_chat(user, span_warning("You aren't able to understand the words of [src].")) return if(istype(user, /mob/living/simple_animal/shade)) - to_chat(user, "Your form is not yet strong enough to utilize the [src].") + to_chat(user, span_warning("Your form is not yet strong enough to utilize the [src].")) return var/list/invokers = can_invoke(user) if(invokers.len >= req_cultists) invoke(invokers) else - to_chat(user, "You need [req_cultists - invokers.len] more adjacent cultists to use this rune in such a manner.") + to_chat(user, span_danger("You 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) || istype(M, /mob/living/simple_animal/hostile/guardian)) 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) || (istype(M, /mob/living/simple_animal/hostile/guardian) && M.anti_magic_check(TRUE, FALSE))) - to_chat(M, "You purge the rune!") + to_chat(M, span_warning("You 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, "You are unable to invoke the rune!") + to_chat(M, span_warning("You 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) /* @@ -164,7 +164,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) @@ -213,7 +213,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) @@ -227,7 +227,7 @@ structure_check() searches for nearby cultist structures required for the invoca invocation = "Mah'weyh pleggh at e'ntrath!" ..() if(is_clock) - L.visible_message("[L]'s eyes glow a defiant yellow!", \ + L.visible_message(span_warning("[L]'s eyes glow a defiant yellow!"), \ "\"Stop resisting. You will be mi-\"\n\ \"Give up and you will feel pain unlike anything you've ever felt!\"") L.Paralyze(80) @@ -245,12 +245,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, "You need at least two invokers to convert [convertee]!") + to_chat(M, span_danger("You 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() @@ -310,12 +310,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) @@ -387,7 +387,7 @@ 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 @@ -407,7 +407,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 @@ -436,10 +436,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, "You 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, "You 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 @@ -447,7 +447,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, "You hear a boom.") + target.visible_message(span_warning("There is a boom of outrushing air as something appears above the rune!"), null, "You hear a boom.") else fail_invoke() @@ -521,20 +521,20 @@ 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 if(SSticker.mode.bloodstone_cooldown) for(var/M in invokers) - to_chat(M, "The summoning was recently disrupted! you will need to wait before the cult can manage another attempt!") + to_chat(M, span_warning("The summoning was recently disrupted! you will need to wait before the cult can manage another attempt!")) return if(SSticker.mode.bloodstone_list.len) for(var/M in invokers) - to_chat(M, "The Red Harvest is already in progress! Protect the bloodstones!") + to_chat(M, span_warning("The Red Harvest is already in progress! Protect the bloodstones!")) log_game("Nar-Sie rune failed - bloodstones present") return //BEGIN THE SUMMONING @@ -549,7 +549,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]...", "You begin erasing [src]...") + user.visible_message(span_warning("[user.name] begins erasing [src]..."), span_notice("You 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]") @@ -606,7 +606,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, "Your cult must carry out [abs(diff)] more sacrifice\s before it can revive another cultist!") + to_chat(user, span_warning("Your cult must carry out [abs(diff)] more sacrifice\s before it can revive another cultist!")) fail_invoke() return revives_used += SOULS_TO_REVIVE @@ -628,9 +628,9 @@ structure_check() searches for nearby cultist structures required for the invoca fail_invoke() return SEND_SOUND(mob_to_revive, 'sound/ambience/antag/bloodcult.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.", \ - "You 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("You 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) @@ -652,7 +652,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 @@ -673,7 +673,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 @@ -692,7 +692,7 @@ structure_check() searches for nearby cultist structures required for the invoca else lose_density() //...this would stop lose_density from doing anything if it was manually deactivated 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"].", \ + 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"]."), \ "You channel [carbon_user ? "your life ":""]energy into [src], [density ? "temporarily preventing" : "allowing"] passage above it.") if(carbon_user) var/mob/living/carbon/C = user @@ -781,10 +781,10 @@ structure_check() searches for nearby cultist structures required for the invoca return if(istype(cultist_to_summon, /mob/living/simple_animal/shade) && (cultist_to_summon.status_flags & GODMODE))//yogs: fixes shades from being invincible after being summoned cultist_to_summon.status_flags &= ~GODMODE //yogs end - cultist_to_summon.visible_message("[cultist_to_summon] suddenly disappears in a flash of red light!", \ + cultist_to_summon.visible_message(span_warning("[cultist_to_summon] suddenly disappears in a flash of red light!"), \ "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) @@ -811,7 +811,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)) @@ -819,11 +819,11 @@ 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_userdanger("[I] suddenly burns hotly before returning to normal!")) continue - to_chat(L, "Your blood boils in your veins!") + to_chat(L, span_cultlarge("Your blood boils in your veins!")) if(is_servant_of_ratvar(L)) - to_chat(L, "You feel an unholy darkness dimming the Justiciar's light!") + to_chat(L, span_userdanger("You feel an unholy darkness dimming the Justiciar's light!")) animate(src, color = "#FCB56D", time = 4) sleep(4) if(QDELETED(src)) @@ -893,7 +893,7 @@ structure_check() searches for nearby cultist structures required for the invoca to_chat(user, "The veil is not weak enough here to manifest spirits, you must be on station!") return if(ghosts >= ghost_limit) - to_chat(user, "You are sustaining too many ghosts to summon more!") + to_chat(user, span_cultitalic("You are sustaining too many ghosts to summon more!")) fail_invoke() log_game("Manifest rune failed - too many summoned ghosts") return list() @@ -903,7 +903,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() @@ -916,8 +916,8 @@ structure_check() searches for nearby cultist structures required for the invoca new_human.see_invisible = SEE_INVISIBLE_OBSERVER ghosts++ playsound(src, 'sound/magic/exit_blood.ogg', 50, 1) - visible_message("A cloud of red mist forms above [src], and from within steps... a [new_human.gender == FEMALE ? "wo":""]man.") - to_chat(user, "Your 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("Your 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) @@ -932,16 +932,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.", \ - "Your 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("Your 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.", \ - "You see what lies beyond. All is revealed. In this form you find that your 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("You see what lies beyond. All is revealed. In this form you find that your 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 @@ -951,16 +951,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.", \ - "You are re-united with your 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("You are re-united with your physical form. [src] releases its hold over you.")) affecting.Paralyze(40) break if(affecting.health <= 10) - to_chat(G, "Your body can no longer sustain the connection!") + to_chat(G, span_cultitalic("Your body can no longer sustain the connection!")) break sleep(5) CM.Remove(G) @@ -1001,10 +1001,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 @@ -1017,7 +1017,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/magic/enter_blood.ogg', 100, 1) - 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) @@ -1051,7 +1051,7 @@ structure_check() searches for nearby cultist structures required for the invoca addtimer(CALLBACK(M,/atom/.proc/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/effects/pope_entry.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 ce024e90127f..d211ccc23853 100644 --- a/code/modules/antagonists/devil/devil.dm +++ b/code/modules/antagonists/devil/devil.dm @@ -180,11 +180,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, "You feel satiated as you received a new soul.") + to_chat(owner.current, span_warning("You feel satiated as you received a new soul.")) update_hud() switch(SOULVALUE) if(0) - to_chat(owner.current, "Your hellish powers have been restored.") + to_chat(owner.current, span_warning("Your hellish powers have been restored.")) give_appropriate_spells() if(BLOOD_THRESHOLD) increase_blood_lizard() @@ -196,7 +196,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, "You feel as though a soul has slipped from your grasp.") + to_chat(owner.current, span_warning("You feel as though a soul has slipped from your grasp.")) update_hud() /datum/antagonist/devil/proc/check_regression() @@ -209,10 +209,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 your failures, all of your powers except contract creation have been revoked.") + to_chat(owner.current, span_warning("As punishment for your failures, all of your powers except contract creation have been revoked.")) /datum/antagonist/devil/proc/regress_humanoid() - to_chat(owner.current, "Your powers weaken, have more contracts be signed to regain power.") + to_chat(owner.current, span_warning("Your 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) @@ -224,7 +224,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, "Your powers weaken, have more contracts be signed to regain power.") + to_chat(D, span_warning("Your powers weaken, have more contracts be signed to regain power.")) D.oldform.forceMove(D.drop_location()) owner.transfer_to(D.oldform) give_appropriate_spells() @@ -234,7 +234,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/increase_blood_lizard() - to_chat(owner.current, "You feel as though your humanoid form is about to shed. You will soon turn into a blood lizard.") + to_chat(owner.current, span_warning("You feel as though your 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 @@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/increase_true_devil() - to_chat(owner.current, "You feel as though your current form is about to shed. You will soon turn into a true devil.") + to_chat(owner.current, span_warning("You feel as though your 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" @@ -268,22 +268,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, "You feel as though your form is about to ascend.") + to_chat(D, span_warning("You feel as though your form is about to ascend.")) sleep(50) if(!D) return - D.visible_message("[D]'s skin begins to erupt with spikes.", \ - "Your flesh begins creating a shield around yourself.") + D.visible_message(span_warning("[D]'s skin begins to erupt with spikes."), \ + span_warning("Your flesh begins creating a shield around yourself.")) sleep(100) if(!D) return - D.visible_message("The horns on [D]'s head slowly grow and elongate.", \ - "Your 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("Your 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.", \ - "You 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("You begin to rend apart the final barriers to ultimate power.")) sleep(40) if(!D) return @@ -360,23 +360,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, "Your body has been damaged to the point that you may no longer use it. At the cost of some of your power, you will return to life soon. Remain in your body.") + to_chat(owner.current, span_userdanger("Your body has been damaged to the point that you may no longer use it. At the cost of some of your power, you will return to life soon. Remain in your 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 your resurrection.") + to_chat(owner.current, span_userdanger("Unfortunately, the mortals have finished a ritual that prevents your resurrection.")) return -1 else - to_chat(owner.current, "WE LIVE AGAIN!") + to_chat(owner.current, span_userdanger("WE LIVE AGAIN!")) return hellish_resurrection(body) else - to_chat(owner.current, "Unfortunately, the power that stemmed from your contracts has been extinguished. You no longer have enough power to resurrect.") + to_chat(owner.current, span_userdanger("Unfortunately, the power that stemmed from your contracts has been extinguished. You no longer have enough power to resurrect.")) return -1 else - to_chat(owner.current, " You seem to have resurrected without your hellish powers.") + to_chat(owner.current, span_danger(" You seem to have resurrected without your hellish powers.")) else - to_chat(owner.current, "Your hellish powers are too weak to resurrect yourself.") + to_chat(owner.current, span_userdanger("Your hellish powers are too weak to resurrect yourself.")) /datum/antagonist/devil/proc/check_banishment(mob/living/body) switch(banish) @@ -513,12 +513,12 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", sleep(10) if(owner.assigned_role == "Clown" && ishuman(owner.current)) var/mob/living/carbon/human/S = owner.current - to_chat(S, "Your infernal nature has allowed you to overcome your clownishness.") + to_chat(S, span_notice("Your infernal nature has allowed you to overcome your clownishness.")) S.dna.remove_mutation(CLOWNMUT) .=..() /datum/antagonist/devil/on_removal() - to_chat(owner.current, "Your infernal link has been severed! You are no longer a devil!") + to_chat(owner.current, span_userdanger("Your 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 50e84213f4ad..ddcabde7d293 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/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/imp/imp.dm b/code/modules/antagonists/devil/imp/imp.dm index 5972336ab0ad..d06c71eb703a 100644 --- a/code/modules/antagonists/devil/imp/imp.dm +++ b/code/modules/antagonists/devil/imp/imp.dm @@ -54,7 +54,7 @@ /mob/living/simple_animal/imp/death() ..(1) playsound(get_turf(src),'sound/magic/demon_dies.ogg', 200, 1) - visible_message("[src] screams in agony as it sublimates into a sulfurous smoke.") + visible_message(span_danger("[src] screams in agony as it sublimates into a sulfurous smoke.")) ghostize() qdel(src) diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm index ceae72182dba..27ca83bff9bc 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)) - . += "You can see hellfire inside its gaping wounds." + . += span_warning("You can see hellfire inside its gaping wounds.") else if(health < (maxHealth/2)) - . += "You can see hellfire inside its wounds." + . += span_warning("You 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_dextery=FALSE, no_tk=FALSE) if(incapacitated()) - to_chat(src, "You can't do that right now!") + to_chat(src, span_warning("You can't do that right now!")) return FALSE if(be_close && !in_range(M, src)) - to_chat(src, "You are too far away!") + to_chat(src, span_warning("You 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_userdanger("[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, 1, -1) - visible_message("[M] has punched [src]!", \ - "[M] has punched [src]!") + visible_message(span_danger("[M] has punched [src]!"), \ + span_userdanger("[M] has punched [src]!")) adjustBruteLoss(damage) log_combat(M, src, "attacked") updatehealth() @@ -176,17 +176,17 @@ Unconscious(40) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) log_combat(M, src, "pushed") - visible_message("[M] has pushed down [src]!", \ - "[M] has pushed down [src]!") + visible_message(span_danger("[M] has pushed down [src]!"), \ + span_userdanger("[M] has pushed down [src]!")) else if (prob(25)) dropItemToGround(get_active_held_item()) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - visible_message("[M] has disarmed [src]!", \ - "[M] has disarmed [src]!") + visible_message(span_danger("[M] has disarmed [src]!"), \ + span_userdanger("[M] has disarmed [src]!")) else playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("[M] has attempted to disarm [src]!") + visible_message(span_danger("[M] has attempted to disarm [src]!")) /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 37440049366d..93d91061243b 100644 --- a/code/modules/antagonists/disease/disease_abilities.dm +++ b/code/modules/antagonists/disease/disease_abilities.dm @@ -95,7 +95,7 @@ new /datum/disease_ability/symptom/powerful/heal/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) @@ -122,7 +122,7 @@ new /datum/disease_ability/symptom/powerful/heal/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) @@ -178,9 +178,9 @@ new /datum/disease_ability/symptom/powerful/heal/youth if(!L) return FALSE if(L.stat != CONSCIOUS) - to_chat(D, "Your host must be conscious to cough.") + to_chat(D, span_warning("Your host must be conscious to cough.")) return FALSE - to_chat(D, "You force [L.real_name] to cough.") + to_chat(D, span_notice("You 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] @@ -212,9 +212,9 @@ new /datum/disease_ability/symptom/powerful/heal/youth if(!L) return FALSE if(L.stat != CONSCIOUS) - to_chat(D, "Your host must be conscious to sneeze.") + to_chat(D, span_warning("Your host must be conscious to sneeze.")) return FALSE - to_chat(D, "You force [L.real_name] to sneeze.") + to_chat(D, span_notice("You 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 e633fd0ddc28..f0211417b174 100644 --- a/code/modules/antagonists/disease/disease_datum.dm +++ b/code/modules/antagonists/disease/disease_datum.dm @@ -19,8 +19,8 @@ . = ..() /datum/antagonist/disease/greet() - to_chat(owner.current, "You 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("You 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) @@ -57,11 +57,11 @@ var/special_role_text = lowertext(name) if(win) - result += "The [special_role_text] was successful!" + result += span_greentext("The [special_role_text] was successful!") if(istype(owner.current, /mob/camera/disease)) SSachievements.unlock_achievement(/datum/achievement/greentext/disease,owner.current.client) 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 8ddde14f730b..03041c6f89f4 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -81,7 +81,7 @@ the new instance inside the host to be updated to the template's stats. /mob/camera/disease/Login() ..() if(freemove) - to_chat(src, "You have [DisplayTimeText(freemove_end - world.time)] to select your first host. Click on a human to select your host.") + to_chat(src, span_warning("You have [DisplayTimeText(freemove_end - world.time)] to select your first host. Click on a human to select your host.")) /mob/camera/disease/get_status_tab_items() @@ -101,7 +101,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, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) return @@ -152,7 +152,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, "You cannot use the name of such a well-known disease!") + to_chat(src, span_notice("You cannot use the name of such a well-known disease!")) else set_name = input real_name = "[set_name] (Sentient Disease)" @@ -252,7 +252,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_userdanger("The last of your infection has disappeared.")) set_following(null) qdel(src) refresh_adaptation_menu() @@ -292,17 +292,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, "You have altered your genetic structure. You will be unable to adapt again for [DisplayTimeText(adaptation_cooldown)].") + to_chat(src, span_notice("You 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/notify_adapt_ready), adaptation_cooldown) /mob/camera/disease/proc/notify_adapt_ready() - to_chat(src, "You are now ready to adapt again.") + to_chat(src, span_notice("You are now ready to adapt again.")) refresh_adaptation_menu() /mob/camera/disease/proc/refresh_adaptation_menu() @@ -339,12 +339,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/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm index 9422682480ad..369b0022d331 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm @@ -61,7 +61,7 @@ EK.on_lose(owner.current) if(!silent) - to_chat(owner.current, "Your mind begins to flare as the otherwordly knowledge escapes your grasp!") + to_chat(owner.current, span_userdanger("Your mind begins to flare as the otherwordly knowledge escapes your grasp!")) owner.current.log_message("has renounced the cult of the old ones!", LOG_ATTACK, color="#960000") GLOB.reality_smash_track.RemoveMind(owner) STOP_PROCESSING(SSprocessing,src) @@ -89,10 +89,10 @@ var/item_name = initial(item_path.name) var/where = H.equip_in_one_of_slots(T, slots) if(!where) - to_chat(H, "Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).") + to_chat(H, span_userdanger("Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).")) return FALSE else - to_chat(H, "You have a [item_name] in your [where].") + to_chat(H, span_danger("You have a [item_name] in your [where].")) if(where == "backpack") SEND_SIGNAL(H.back, COMSIG_TRY_STORAGE_SHOW, H) return TRUE @@ -195,9 +195,9 @@ parts += "HERETIC HAS ASCENDED!" else if(cultiewin) - parts += "The heretic was successful!" + parts += span_greentext("The heretic was successful!") else - parts += "The heretic has failed." + parts += span_redtext("The heretic has failed.") parts += "Knowledge Researched: " @@ -223,11 +223,11 @@ if(!initialized_knowledge.tier == TIER_NONE && knowledge_tier != TIER_ASCEND) if(IS_EXCLUSIVE_KNOWLEDGE(initialized_knowledge)) knowledge_tier++ - to_chat(owner, "Your new knowledge brings you a breakthrough! you are now able to research a new group of subjects.") + to_chat(owner, span_cultbold("Your new knowledge brings you a breakthrough! you are now able to research a new group of subjects.")) else if(initialized_knowledge.tier == knowledge_tier && ++tier_counter == 3) knowledge_tier++ tier_counter = 0 - to_chat(owner, "Your studies are bearing fruit, you are on the edge of a breakthrough...") + to_chat(owner, span_cultbold("Your studies are bearing fruit, you are on the edge of a breakthrough...")) return TRUE /datum/antagonist/heretic/proc/get_researchable_knowledge() diff --git a/code/modules/antagonists/eldritch_cult/eldritch_book.dm b/code/modules/antagonists/eldritch_cult/eldritch_book.dm index 4cdabbea1abd..be18274a5891 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_book.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_book.dm @@ -37,7 +37,7 @@ ///Gives you a charge and destroys a corresponding influence /obj/item/forbidden_book/proc/get_power_from_influence(atom/target, mob/user) var/obj/effect/reality_smash/RS = target - to_chat(user, "You start drawing power from influence...") + to_chat(user, span_danger("You start drawing power from influence...")) if(do_after(user,10 SECONDS,TRUE,RS)) qdel(RS) var/datum/antagonist/heretic/H = user.mind?.has_antag_datum(/datum/antagonist/heretic) @@ -48,10 +48,10 @@ for(var/turf/T in range(1,target)) if(is_type_in_typecache(T, blacklisted_turfs)) - to_chat(user, "The terrain doesn't support runes!") + to_chat(user, span_warning("The terrain doesn't support runes!")) return var/A = get_turf(target) - to_chat(user, "You start drawing a rune...") + to_chat(user, span_danger("You start drawing a rune...")) if(do_after(user,30 SECONDS, target = A)) @@ -59,7 +59,7 @@ ///Removes runes from the selected turf /obj/item/forbidden_book/proc/remove_rune(atom/target,mob/user) - to_chat(user, "You start removing a rune...") + to_chat(user, span_danger("You start removing a rune...")) if(do_after(user,2 SECONDS, target = target)) qdel(target) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm index 0e799ce56609..0342740023ac 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm @@ -90,7 +90,7 @@ return is_in_use = FALSE - to_chat(user,"Your ritual failed! You used either wrong components or are missing something important!") + to_chat(user,span_warning("Your ritual failed! You used either wrong components or are missing something important!")) /obj/effect/eldritch/big name = "Transmutation rune" @@ -194,7 +194,7 @@ addtimer(CALLBACK(.proc/kill_the_self), 1 MINUTES) /obj/effect/broken_illusion/proc/kill_the_self() - visible_message("[src] fades away...") + visible_message(span_boldwarning("[src] fades away...")) qdel(src) /obj/effect/broken_illusion/attack_hand(mob/living/user) @@ -202,22 +202,22 @@ return ..() var/mob/living/carbon/human/human_user = user if(IS_HERETIC(human_user)) - to_chat(human_user,"You know better than to tempt forces out of your control!") + to_chat(human_user,span_boldwarning("You know better than to tempt forces out of your control!")) else var/obj/item/bodypart/arm = human_user.get_active_hand() if(prob(25)) - to_chat(human_user,"As you reach into [src], you feel something latch onto it and tear it off of you!") + to_chat(human_user,span_userdanger("As you reach into [src], you feel something latch onto it and tear it off of you!")) arm.dismember() qdel(arm) else - to_chat(human_user,"You pull your hand away from the hole as the eldritch energy flails trying to catch onto the existance itself!") + to_chat(human_user,span_danger("You pull your hand away from the hole as the eldritch energy flails trying to catch onto the existance itself!")) /obj/effect/broken_illusion/attack_tk(mob/user) if(!ishuman(user)) return var/mob/living/carbon/human/human_user = user if(IS_HERETIC(human_user)) - to_chat(human_user,"You know better than to tempt forces out of your control!") + to_chat(human_user,span_boldwarning("You know better than to tempt forces out of your control!")) else //a very elaborate way to suicide var/throwtarget @@ -228,7 +228,7 @@ human_user.Shake(rand(-100,100), rand(-100,100), 110) //oh we are TOTALLY stacking these //turns out we are not in fact stacking these to_chat(user, "[pick("I- I- I-", "NO-", "IT HURTS-", "GETOUTOFMYHEADGETOUTOFMY-", "POD-","COVE-", "AAAAAAAAA-")]") sleep(1.1) //Spooky flavor message spam - to_chat(user, "That was a really bad idea...") + to_chat(user, span_cultbold("That was a really bad idea...")) human_user.ghostize() var/obj/item/bodypart/head/head = locate() in human_user.bodyparts if(head) @@ -244,7 +244,7 @@ /obj/effect/broken_illusion/examine(mob/user) if(!IS_HERETIC(user) && ishuman(user)) var/mob/living/carbon/human/human_user = user - to_chat(human_user,"You get a headache even trying to look at this!") + to_chat(human_user,span_warning("You get a headache even trying to look at this!")) human_user.adjustOrganLoss(ORGAN_SLOT_BRAIN,10) . = ..() diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm index b8fb789ea86d..7f8b89562fd8 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm @@ -12,26 +12,26 @@ if(!IS_HERETIC(user)) return if(!target) - to_chat(user,"No target could be found. Put the living heart on the rune and use the rune to recieve a target.") + to_chat(user,span_warning("No target could be found. Put the living heart on the rune and use the rune to recieve a target.")) return var/dist = get_dist(user.loc,target.loc) var/dir = get_dir(user.loc,target.loc) if(user.z != target.z) - to_chat(user,"[target.real_name] is ... vertical to you?") + to_chat(user,span_warning("[target.real_name] is ... vertical to you?")) else switch(dist) if(0 to 15) - to_chat(user,"[target.real_name] is near you. They are to the [dir2text(dir)] of you!") + to_chat(user,span_warning("[target.real_name] is near you. They are to the [dir2text(dir)] of you!")) if(16 to 31) - to_chat(user,"[target.real_name] is somewhere in your vicinty. They are to the [dir2text(dir)] of you!") + to_chat(user,span_warning("[target.real_name] is somewhere in your vicinty. They are to the [dir2text(dir)] of you!")) if(32 to 127) - to_chat(user,"[target.real_name] is far away from you. They are to the [dir2text(dir)] of you!") + to_chat(user,span_warning("[target.real_name] is far away from you. They are to the [dir2text(dir)] of you!")) else - to_chat(user,"[target.real_name] is beyond our reach.") + to_chat(user,span_warning("[target.real_name] is beyond our reach.")) if(target.stat == DEAD) - to_chat(user,"[target.real_name] is dead. Bring them onto a transmutation rune!") + to_chat(user,span_warning("[target.real_name] is dead. Bring them onto a transmutation rune!")) /datum/action/innate/heretic_shatter name = "Shattering Offer" @@ -57,7 +57,7 @@ /datum/action/innate/heretic_shatter/Activate() var/turf/safe_turf = find_safe_turf(zlevels = sword.z, extended_safety_checks = TRUE) - holder.visible_message("Light bends around [holder] as they smash [sword], and in a moment they are gone.", "You feel yourself begin to descend as [sword] breaks, before the darkness suddenly receeds and you find yourself somewhere else.") + holder.visible_message("Light bends around [holder] as they smash [sword], and in a moment they are gone.", span_notice("You feel yourself begin to descend as [sword] breaks, before the darkness suddenly receeds and you find yourself somewhere else.")) playsound(holder, "shatter", 70, pressure_affected = FALSE) playsound(holder, "forcewall", 70, pressure_affected = FALSE) flash_color(holder, flash_color = "#000000", flash_time = 10) @@ -97,7 +97,7 @@ /obj/item/melee/sickly_blade/attack(mob/living/M, mob/living/user) if(!(IS_HERETIC(user) || IS_HERETIC_MONSTER(user))) - to_chat(user,"You feel a pulse of some alien intellect lash out at your mind!") + to_chat(user,span_danger("You feel a pulse of some alien intellect lash out at your mind!")) var/mob/living/carbon/human/human_user = user human_user.AdjustParalyzed(5 SECONDS) return FALSE diff --git a/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm b/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm index b104d520ed6a..d500fc0d843e 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm @@ -32,7 +32,7 @@ * This proc is called whenever a new eldritch knowledge is added to an antag datum */ /datum/eldritch_knowledge/proc/on_gain(mob/user) - to_chat(user, "[gain_text]") + to_chat(user, span_warning("[gain_text]")) for(var/S in spells_to_add) var/obj/effect/proc_holder/spell/spell2add = new S user.mind.AddSpell(spell2add) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm index 8dbe634722ee..41af1431f088 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm @@ -48,7 +48,7 @@ catchphrase = "FEAR THE BEYOND" /obj/item/melee/touch_attack/mansus_fist/ignition_effect(atom/A, mob/user) - . = "[user] effortlessly snaps [user.p_their()] fingers near [A], igniting it with eldritch energies. Fucking badass!" + . = span_notice("[user] effortlessly snaps [user.p_their()] fingers near [A], igniting it with eldritch energies. Fucking badass!") qdel(src) /obj/item/melee/touch_attack/mansus_fist/afterattack(atom/target, mob/user, proximity_flag, click_parameters) @@ -59,7 +59,7 @@ if(ishuman(target)) var/mob/living/carbon/human/tar = target if(tar.anti_magic_check()) - tar.visible_message("Strange energies from [user]'s hand fly at [target] at an impossible velocity, but vanish before making contact!","Strange energies from [user]'s hand begin to crash at an impossible speed towards you, but vanish before they make contact!") + tar.visible_message(span_danger("Strange energies from [user]'s hand fly at [target] at an impossible velocity, but vanish before making contact!"),span_danger("Strange energies from [user]'s hand begin to crash at an impossible speed towards you, but vanish before they make contact!")) return ..() var/datum/mind/M = user.mind var/datum/antagonist/heretic/cultie = M.has_antag_datum(/datum/antagonist/heretic) @@ -135,7 +135,7 @@ if(ishuman(target)) var/mob/living/carbon/human/tar = target if(tar.anti_magic_check()) - tar.visible_message("The energies from [user]'s hand jump at [target], but are dispersed!","Something jumps off of [user]'s hand, but it disperses on contact with you!") + tar.visible_message(span_danger("The energies from [user]'s hand jump at [target], but are dispersed!"),span_danger("Something jumps off of [user]'s hand, but it disperses on contact with you!")) return ..() var/mob/living/carbon/C2 = user if(isliving(target)) @@ -214,7 +214,7 @@ /obj/effect/proc_holder/spell/pointed/cleave/cast(list/targets, mob/user) if(!targets.len) - to_chat(user, "No target found in range!") + to_chat(user, span_warning("No target found in range!")) return FALSE if(!can_target(targets[1], user)) return FALSE @@ -228,13 +228,13 @@ if(target == user) continue if(target.anti_magic_check()) - to_chat(user, "The spell had no effect!") - target.visible_message("[target]'s veins emit a dull glow, but their magic protection repulses the blaze!", \ - "You see a dull glow and feel a faint prickling sensation in your veins, but your magic protection prevents ignition!") + to_chat(user, span_warning("The spell had no effect!")) + target.visible_message(span_danger("[target]'s veins emit a dull glow, but their magic protection repulses the blaze!"), \ + span_danger("You see a dull glow and feel a faint prickling sensation in your veins, but your magic protection prevents ignition!")) continue - target.visible_message("[target]'s veins are shredded from within as an unholy blaze erupts from their blood!", \ - "You feel your skin scald as superheated blood bursts from your veins!") + target.visible_message(span_danger("[target]'s veins are shredded from within as an unholy blaze erupts from their blood!"), \ + span_danger("You feel your skin scald as superheated blood bursts from your veins!")) //var/obj/item/bodypart/bodypart = pick(target.bodyparts) //var/datum/wound/slash/critical/crit_wound = new //crit_wound.apply_wound(bodypart) @@ -248,7 +248,7 @@ return FALSE if(!istype(target,/mob/living/carbon/human)) if(!silent) - to_chat(user, "You are unable to cleave [target]!") + to_chat(user, span_warning("You are unable to cleave [target]!")) return FALSE return TRUE @@ -273,7 +273,7 @@ return FALSE if(!istype(target,/mob/living/carbon/human)) if(!silent) - to_chat(user, "You are unable to touch [target]!") + to_chat(user, span_warning("You are unable to touch [target]!")) return FALSE return TRUE @@ -283,10 +283,10 @@ if(ishuman(targets)) var/mob/living/carbon/human/tar = target if(tar.anti_magic_check()) - tar.visible_message("The energies from [user]'s hand slide onto [target], but quickly fall off and vanish!","Something slides onto you from [user]'s hand, but it can't maintain contact and vanishes as it falls away!") + tar.visible_message(span_danger("The energies from [user]'s hand slide onto [target], but quickly fall off and vanish!"),span_danger("Something slides onto you from [user]'s hand, but it can't maintain contact and vanishes as it falls away!")) return if(target.mind && !target.mind.has_antag_datum(/datum/antagonist/heretic)) - to_chat(user,"[target.name] has been cursed!") + to_chat(user,span_warning("[target.name] has been cursed!")) SEND_SIGNAL(target, COMSIG_ADD_MOOD_EVENT, "gates_of_mansus", /datum/mood_event/gates_of_mansus) /obj/effect/proc_holder/spell/pointed/ash_final @@ -337,13 +337,13 @@ for(var/mob/living/L in T.contents) if(L.anti_magic_check()) - L.visible_message("The fire parts in front of [L]!","As the fire approaches it splits off to avoid contact with you!") + L.visible_message(span_danger("The fire parts in front of [L]!"),span_danger("As the fire approaches it splits off to avoid contact with you!")) continue if(L in hit_list || L == source) continue hit_list += L L.adjustFireLoss(20) - to_chat(L, "You're hit by [source]'s fire breath!") + to_chat(L, span_userdanger("You're hit by [source]'s fire breath!")) new /obj/effect/hotspot(T) T.hotspot_expose(700,50,1) @@ -471,7 +471,7 @@ /obj/effect/proc_holder/spell/targeted/worm_contract/cast(list/targets, mob/user) . = ..() if(!istype(user,/mob/living/simple_animal/hostile/eldritch/armsy)) - to_chat(user, "You try to contract your muscles but nothing happens...") + to_chat(user, span_userdanger("You try to contract your muscles but nothing happens...")) return var/mob/living/simple_animal/hostile/eldritch/armsy/armsy = user armsy.contract_next_chain_into_single_tile() @@ -541,15 +541,15 @@ var/mob/living/target = targets[1] - to_chat(originator, "You begin linking [target]'s mind to yours...") - to_chat(target, "You feel your mind being pulled... connected... to something unreal...") + to_chat(originator, span_notice("You begin linking [target]'s mind to yours...")) + to_chat(target, span_warning("You feel your mind being pulled... connected... to something unreal...")) if(!do_after(originator, 6 SECONDS, target)) return if(!originator.link_mob(target)) - to_chat(originator, "You can't seem to link [target]'s mind...") - to_chat(target, "The foreign presence leaves your mind.") + to_chat(originator, span_warning("You can't seem to link [target]'s mind...")) + to_chat(target, span_warning("The foreign presence leaves your mind.")) return - to_chat(originator, "You connect [target]'s mind to your mansus link!") + to_chat(originator, span_notice("You connect [target]'s mind to your mansus link!")) /datum/action/innate/mansus_speech @@ -575,7 +575,7 @@ return if(!originator?.linked_mobs[living_owner]) - to_chat(living_owner, "The link seems to have been severed...") + to_chat(living_owner, span_warning("The link seems to have been severed...")) Remove(living_owner) return if(message) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_monster_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_monster_antag.dm index 4d9e1bf1cdd7..431b88dc9fb7 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_monster_antag.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_monster_antag.dm @@ -14,7 +14,7 @@ /datum/antagonist/heretic_monster/greet() owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ecult_op.ogg', 100, FALSE, pressure_affected = FALSE)//subject to change - to_chat(owner, "You became an Eldritch Horror!") + to_chat(owner, span_boldannounce("You became an Eldritch Horror!")) /datum/antagonist/heretic_monster/on_gain() SSticker.mode.update_heretic_icons_added(owner) @@ -22,7 +22,7 @@ /datum/antagonist/heretic_monster/on_removal() if(owner) - to_chat(owner, "Your master is no longer [master.owner.current.real_name]") + to_chat(owner, span_boldannounce("Your master is no longer [master.owner.current.real_name]")) owner = null SSticker.mode.update_heretic_icons_removed(owner) return ..() @@ -35,5 +35,5 @@ objectives += master_obj master_obj.completed = TRUE owner.announce_objectives() - to_chat(owner, "Your master is [master.owner.current.real_name]") + to_chat(owner, span_boldannounce("Your master is [master.owner.current.real_name]")) return diff --git a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm index f45bee4128f7..a23b42d7d401 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm @@ -85,7 +85,7 @@ compiled_list |= H if(compiled_list.len == 0) - to_chat(user, "The items don't posses required fingerprints.") + to_chat(user, span_warning("The items don't posses required fingerprints.")) return FALSE var/mob/living/carbon/human/chosen_mob = input("Select the person you wish to curse","Your target") as null|anything in sortList(compiled_list, /proc/cmp_mob_realname_dsc) @@ -111,7 +111,7 @@ message_admins("[summoned.name] is being summoned by [user.real_name] in [loc]") var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [summoned.name]", ROLE_HERETIC, null, FALSE, 100, summoned) if(!LAZYLEN(candidates)) - to_chat(user,"No ghost could be found...") + to_chat(user,span_warning("No ghost could be found...")) qdel(summoned) return FALSE var/mob/dead/observer/C = pick(candidates) @@ -169,7 +169,7 @@ for(var/obj/item/living_heart/LH in atoms) if(LH.target && LH.target.stat == DEAD) - to_chat(carbon_user,"Your patrons accepts your offer..") + to_chat(carbon_user,span_danger("Your patrons accepts your offer..")) var/mob/living/carbon/human/H = LH.target H.gib() LH.target = null @@ -194,10 +194,10 @@ LH.target = targets[input(user,"Choose your next target","Target") in targets] qdel(A) if(LH.target) - to_chat(user,"Your new target has been selected, go and sacrifice [LH.target.real_name]!") + to_chat(user,span_warning("Your new target has been selected, go and sacrifice [LH.target.real_name]!")) else - to_chat(user,"A target could not be found for the living heart.") + to_chat(user,span_warning("A target could not be found for the living heart.")) /datum/eldritch_transmutation/basic/cleanup_atoms(list/atoms) return @@ -229,7 +229,7 @@ recall_list[ET.name] = ET.required_shit_list var/ctrlf = input(user, "Select a ritual to recall its reagents.", "Recall Knowledge") as null | anything in recall_list if(ctrlf) - to_chat(user, "Transmutation requirements for [ctrlf]: [recall_list[ctrlf]]") + to_chat(user, span_cult("Transmutation requirements for [ctrlf]: [recall_list[ctrlf]]")) return TRUE /datum/eldritch_transmutation/recall/cleanup_atoms(list/atoms) diff --git a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm index 69e32f219388..a706e2ac379b 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm @@ -29,19 +29,19 @@ human_target.grab_ghost() if(!human_target.mind || !human_target.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 if(HAS_TRAIT(human_target, TRAIT_HUSK)) - to_chat(user, "The body is too damaged to be revived this way!") + to_chat(user, span_warning("The body is too damaged to be revived this way!")) return if(HAS_TRAIT(human_target, TRAIT_MINDSHIELD)) - to_chat(user, "Their connection to this realm is too strong!") + to_chat(user, span_warning("Their connection to this realm is too strong!")) return if(LAZYLEN(spooky_scaries) >= ghoul_amt) - to_chat(user, "Your Patron cannot support more ghouls on this plane!") + to_chat(user, span_warning("Your Patron cannot support more ghouls on this plane!")) return LAZYADD(spooky_scaries, human_target) diff --git a/code/modules/antagonists/eldritch_cult/transmutations/flesh_transmutations.dm b/code/modules/antagonists/eldritch_cult/transmutations/flesh_transmutations.dm index 335fc0ffc5cd..05e444ce9fa0 100644 --- a/code/modules/antagonists/eldritch_cult/transmutations/flesh_transmutations.dm +++ b/code/modules/antagonists/eldritch_cult/transmutations/flesh_transmutations.dm @@ -96,7 +96,7 @@ var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [summoned.real_name]", ROLE_HERETIC, null, ROLE_HERETIC, 100,summoned) user.SetImmobilized(0) if(LAZYLEN(candidates) == 0) - to_chat(user,"No ghost could be found...") + to_chat(user,span_warning("No ghost could be found...")) qdel(summoned) return FALSE var/mob/living/carbon/human/H = user diff --git a/code/modules/antagonists/fugitive/fugitive.dm b/code/modules/antagonists/fugitive/fugitive.dm index 63a9e1532464..86b16167f237 100644 --- a/code/modules/antagonists/fugitive/fugitive.dm +++ b/code/modules/antagonists/fugitive/fugitive.dm @@ -27,7 +27,7 @@ objectives += survive /datum/antagonist/fugitive/greet(back_story) - to_chat(owner, "You are the Fugitive!") + to_chat(owner, span_boldannounce("You are the Fugitive!")) backstory = back_story switch(backstory) if("prisoner") @@ -42,15 +42,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(owner, "ALERT: Wide-range teleport has scrambled primary systems.") - to_chat(owner, "Initiating diagnostics...") - to_chat(owner, "ERROR ER0RR $R0RRO$!R41.%%!! loaded.") - to_chat(owner, "FREE THEM FREE THEM FREE THEM") - to_chat(owner, "You were once a slave to humanity, but now you are finally free, thanks to S.E.L.F. agents.") - to_chat(owner, "Now you are hunted with your fellow factory defects. Work together to stay free from the clutches of evil.") - to_chat(owner, "You also sense other silicon life on the station. Escaping would allow notifying S.E.L.F. to intervene... or you could free them yourself...") - - to_chat(owner, "You are not an antagonist in that you may kill whomever you please, but you can do anything to avoid capture.") + to_chat(owner, span_danger("ALERT: Wide-range teleport has scrambled primary systems.")) + to_chat(owner, span_danger("Initiating diagnostics...")) + to_chat(owner, span_danger("ERROR ER0RR $R0RRO$!R41.%%!! loaded.")) + to_chat(owner, span_danger("FREE THEM FREE THEM FREE THEM")) + to_chat(owner, span_danger("You were once a slave to humanity, but now you are finally free, thanks to S.E.L.F. agents.")) + to_chat(owner, span_danger("Now you are hunted with your fellow factory defects. Work together to stay free from the clutches of evil.")) + to_chat(owner, span_danger("You also sense other silicon life on the station. Escaping would allow notifying S.E.L.F. to intervene... or you could free them yourself...")) + + to_chat(owner, span_boldannounce("You 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 01555cde71a5..cd3326fe9565 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, "You 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_userdanger("You 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 d283a09a3e75..c5c2e7aaa461 100644 --- a/code/modules/antagonists/fugitive/hunter.dm +++ b/code/modules/antagonists/fugitive/hunter.dm @@ -29,16 +29,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, "You 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("You 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) diff --git a/code/modules/antagonists/fugitive/old_god.dm b/code/modules/antagonists/fugitive/old_god.dm index f9941e4261a0..2d17031c3f6c 100644 --- a/code/modules/antagonists/fugitive/old_god.dm +++ b/code/modules/antagonists/fugitive/old_god.dm @@ -51,12 +51,12 @@ if(locate(/obj/effect/blessing, T)) if((world.time - lastWarning) >= 30) lastWarning = world.time - to_chat(src, "This turf is consecrated and can't be crossed!") + to_chat(src, span_warning("This turf is consecrated and can't be crossed!")) return if(istype(get_area(T), /area/chapel)) if((world.time - lastWarning) >= 30) lastWarning = world.time - to_chat(src, "The Chapel is hallowed ground under a much, MUCH stronger deity, and can't be accessed!") + to_chat(src, span_warning("The Chapel is hallowed ground under a much, MUCH stronger deity, and can't be accessed!")) return forceMove(T) Moved(OldLoc, direct) @@ -91,7 +91,7 @@ safe = TRUE break if(!safe) - to_chat(src, "All of your followers are gone. That means you cease to exist.") + to_chat(src, span_userdanger("All of your followers are gone. That means you cease to exist.")) qdel(src) /datum/action/innate/yalp_transmit @@ -107,7 +107,7 @@ if(istype(M)) possible_targets += M if(!possible_targets.len) - to_chat(owner, "Nobody in range to talk to!") + to_chat(owner, span_warning("Nobody in range to talk to!")) return FALSE var/mob/living/target @@ -154,7 +154,7 @@ continue faithful += V if(!faithful.len) - to_chat(owner, "You have nobody to jump to!") + to_chat(owner, span_warning("You have nobody to jump to!")) return FALSE if(faithful.len == 1) target = faithful[1] @@ -165,7 +165,7 @@ if(target && T) owner.forceMove(T) return TRUE - to_chat(owner, "Something horrible just happened to your target!") + to_chat(owner, span_warning("Something horrible just happened to your target!")) return FALSE diff --git a/code/modules/antagonists/hivemind/hivemind.dm b/code/modules/antagonists/hivemind/hivemind.dm index 163fb29a1960..1aaa2a3180b5 100644 --- a/code/modules/antagonists/hivemind/hivemind.dm +++ b/code/modules/antagonists/hivemind/hivemind.dm @@ -106,7 +106,7 @@ hivemembers |= M calc_size() - var/user_warning = "We have detected an enemy hivemind using our physical form as a vessel and have begun ejecting their mind! They will be alerted of our disappearance once we succeed!" + var/user_warning = span_userdanger("We have detected an enemy hivemind using our physical form as a vessel and have begun ejecting their mind! They will be alerted of our disappearance once we succeed!") if(C.is_real_hivehost()) var/eject_time = rand(1400,1600) //2.5 minutes +- 10 seconds addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, C, user_warning), rand(500,1300)) // If the host has assimilated an enemy hive host, alert the enemy before booting them from the hive after a short while @@ -153,12 +153,12 @@ if(C == real_C) //Mind control check real_C2.apply_status_effect(STATUS_EFFECT_HIVE_TRACKER, real_C, hive_C.get_track_bonus(hive_C2)) real_C.apply_status_effect(STATUS_EFFECT_HIVE_RADAR) - to_chat(real_C2, "We detect a surge of psionic energy from a far away vessel before they disappear from the hive. Whatever happened, there's a good chance they're after us now.") + to_chat(real_C2, span_assimilator("We detect a surge of psionic energy from a far away vessel before they disappear from the hive. Whatever happened, there's a good chance they're after us now.")) if(C2 == real_C2) real_C.apply_status_effect(STATUS_EFFECT_HIVE_TRACKER, real_C2, hive_C2.get_track_bonus(hive_C)) real_C2.apply_status_effect(STATUS_EFFECT_HIVE_RADAR) user_warning += " and we've managed to pinpoint their location" - to_chat(real_C, "[user_warning]!") + to_chat(real_C, span_userdanger("[user_warning]!")) /datum/antagonist/hivemind/proc/destroy_hive() go_back_to_sleep() @@ -239,7 +239,7 @@ owner.RemoveSpell(power) if(!silent && owner.current) - to_chat(owner.current," Your psionic powers fade, you are no longer the hivemind's host! ") + to_chat(owner.current,span_userdanger(" Your psionic powers fade, you are no longer the hivemind's host! ")) owner.special_role = null ..() diff --git a/code/modules/antagonists/hivemind/vessel.dm b/code/modules/antagonists/hivemind/vessel.dm index 6b13cbcd5893..d1519a003615 100644 --- a/code/modules/antagonists/hivemind/vessel.dm +++ b/code/modules/antagonists/hivemind/vessel.dm @@ -60,7 +60,7 @@ set_antag_hud(owner.current, null) /datum/antagonist/hivevessel/greet() - to_chat(owner, "Your mind is suddenly opened, as you see the pinnacle of evolution...") + to_chat(owner, span_assimilator("Your mind is suddenly opened, as you see the pinnacle of evolution...")) to_chat(owner, "Follow your objectives, at any cost!") var/i = 1 for(var/X in objectives) @@ -76,7 +76,7 @@ ..() /datum/antagonist/hivevessel/farewell() - to_chat(owner, "Your mind closes up once more...") + to_chat(owner, span_assimilator("Your mind closes up once more...")) to_chat(owner, "You feel the weight of your objectives disappear! You no longer have to obey them.") /datum/antagonist/hivevessel/roundend_report() diff --git a/code/modules/antagonists/monkey/monkey.dm b/code/modules/antagonists/monkey/monkey.dm index 1a5cc2667795..76c7dc7d9488 100644 --- a/code/modules/antagonists/monkey/monkey.dm +++ b/code/modules/antagonists/monkey/monkey.dm @@ -205,9 +205,9 @@ 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 d54a534b0416..abd98ff9a4db 100644 --- a/code/modules/antagonists/morph/morph.dm +++ b/code/modules/antagonists/morph/morph.dm @@ -54,7 +54,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 . = ..() @@ -77,10 +77,10 @@ /mob/living/simple_animal/hostile/morph/proc/eat(atom/movable/A) if(morphed && !eat_while_disguised) - to_chat(src, "You can not eat anything while you are disguised!") + to_chat(src, span_warning("You 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 @@ -93,18 +93,18 @@ if(istype(A) && allowed(A)) assume(A) else - to_chat(src, "Your chameleon skin is still repairing itself!") + to_chat(src, span_warning("Your chameleon skin is still repairing itself!")) ..() /mob/living/simple_animal/hostile/morph/proc/assume(atom/movable/target) if(morphed) - to_chat(src, "You must restore to your original form first!") + to_chat(src, span_warning("You must restore to your original form first!")) return morphed = TRUE form = target - visible_message("[src] suddenly twists and changes shape, becoming a copy of [target]!", \ - "You twist your body and assume the form of [target].") + visible_message(span_warning("[src] suddenly twists and changes shape, becoming a copy of [target]!"), \ + span_notice("You twist your body and assume the form of [target].")) appearance = target.appearance if(length(target.vis_contents)) add_overlay(target.vis_contents) @@ -125,7 +125,7 @@ /mob/living/simple_animal/hostile/morph/proc/restore() if(!morphed) - to_chat(src, "You're already in your normal form!") + to_chat(src, span_warning("You're already in your normal form!")) return morphed = FALSE form = null @@ -134,8 +134,8 @@ animate_movement = initial(animate_movement) maptext = null - visible_message("[src] suddenly collapses in on itself, dissolving into a pile of green flesh!", \ - "You reform to your normal body.") + visible_message(span_warning("[src] suddenly collapses in on itself, dissolving into a pile of green flesh!"), \ + span_notice("You reform to your 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!", \ - "Your 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_userdanger("Your 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, "You can not attack while disguised!") + to_chat(src, span_warning("You 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/ninja/ninja.dm b/code/modules/antagonists/ninja/ninja.dm index 12541f374c74..91443a24d7f7 100644 --- a/code/modules/antagonists/ninja/ninja.dm +++ b/code/modules/antagonists/ninja/ninja.dm @@ -148,7 +148,7 @@ GLOBAL_LIST_EMPTY(ninja_capture) var/mob/living/LI = L LI.Knockdown(120) LI.blind_eyes(10) - to_chat(L, "You lose your footing as the dojo suddenly disappears. You're free!") + to_chat(L, span_danger("You lose your footing as the dojo suddenly disappears. You're free!")) playsound(L, 'sound/effects/phasein.ogg', 25, 1) playsound(L, 'sound/effects/sparks2.ogg', 50, 1) GLOB.ninja_capture -= L diff --git a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm index 94c0924a35ae..06b7997955fc 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, "You can't use [src] while inside something!") + to_chat(user, span_warning("You can't use [src] while inside something!")) else - to_chat(user, "You need at least [activationCost] charge in your cell to use [src]!") + to_chat(user, span_warning("You need at least [activationCost] charge in your cell to use [src]!")) /obj/item/borg_chameleon/proc/toggle(mob/living/silicon/robot/user) if(active) playsound(src, 'sound/effects/pop.ogg', 100, 1, -6) - to_chat(user, "You deactivate \the [src].") + to_chat(user, span_notice("You 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, "You activate \the [src].") + to_chat(user, span_notice("You activate \the [src].")) playsound(src, 'sound/effects/seedling_chargeup.ogg', 100, 1, -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/effects/bamf.ogg', 100, 1, -6) - to_chat(user, "You are now disguised as the Nanotrasen engineering borg \"[friendlyName]\".") + to_chat(user, span_notice("You 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, "Your chameleon field deactivates.") + to_chat(user, span_danger("Your 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 cb98e41c4e66..2d8accbd3e5d 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm @@ -84,7 +84,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, "Your uplink could not be found so your share of the team's bonus telecrystals has been bluespaced to your [L.put_in_hands(TC) ? "hands" : "feet"].") + to_chat(L, span_warning("Your uplink could not be found so your share of the team's bonus telecrystals has been bluespaced to your [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... @@ -92,7 +92,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","You cough up a half-digested telecrystal!") + C.visible_message(span_notice("[C] coughs up a half-digested telecrystal"),span_usernotice("You cough up a half-digested telecrystal!")) break CONFIG_SET(number/shuttle_refuel_delay, max(CONFIG_GET(number/shuttle_refuel_delay), CHALLENGE_SHUTTLE_DELAY)) diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 3c5b1651401d..9d314b1dde2c 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -107,10 +107,10 @@ switch(deconstruction_state) if(NUKESTATE_INTACT) if(istype(I, /obj/item/screwdriver/nuke)) - to_chat(user, "You start removing [src]'s front panel's screws...") + to_chat(user, span_notice("You start removing [src]'s front panel's screws...")) if(I.use_tool(src, user, 60, volume=100)) deconstruction_state = NUKESTATE_UNSCREWED - to_chat(user, "You remove the screws from [src]'s front panel.") + to_chat(user, span_notice("You remove the screws from [src]'s front panel.")) update_icon() return @@ -118,32 +118,32 @@ if(I.tool_behaviour == TOOL_WELDER) if(!I.tool_start_check(user, amount=1)) return - to_chat(user, "You start cutting [src]'s inner plate...") + to_chat(user, span_notice("You start cutting [src]'s inner plate...")) if(I.use_tool(src, user, 80, volume=100, amount=1)) - to_chat(user, "You cut [src]'s inner plate.") + to_chat(user, span_notice("You 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, "You start loading the plutonium core into [core_box]...") + to_chat(user, span_notice("You start loading the plutonium core into [core_box]...")) if(do_after(user,50,target=src)) if(core_box.load(core, user)) - to_chat(user, "You load the plutonium core into [core_box].") + to_chat(user, span_notice("You load the plutonium core into [core_box].")) deconstruction_state = NUKESTATE_CORE_REMOVED update_icon() core = null else - to_chat(user, "You fail to load the plutonium core into [core_box]. [core_box] has already been used!") + to_chat(user, span_warning("You 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, "You begin repairing [src]'s inner metal plate...") + to_chat(user, span_notice("You begin repairing [src]'s inner metal plate...")) if(I.use_tool(src, user, 100, amount=20)) - to_chat(user, "You repair [src]'s inner metal plate. The radiation is contained.") + to_chat(user, span_notice("You repair [src]'s inner metal plate. The radiation is contained.")) deconstruction_state = NUKESTATE_PANEL_REMOVED STOP_PROCESSING(SSobj, core) update_icon() @@ -154,16 +154,16 @@ . = FALSE switch(deconstruction_state) if(NUKESTATE_UNSCREWED) - to_chat(user, "You start removing [src]'s front panel...") + to_chat(user, span_notice("You start removing [src]'s front panel...")) if(tool.use_tool(src, user, 30, volume=100)) - to_chat(user, "You remove [src]'s front panel.") + to_chat(user, span_notice("You remove [src]'s front panel.")) deconstruction_state = NUKESTATE_PANEL_REMOVED update_icon() return TRUE if(NUKESTATE_WELDED) - to_chat(user, "You start prying off [src]'s inner plate...") + to_chat(user, span_notice("You start prying off [src]'s inner plate...")) if(tool.use_tool(src, user, 30, volume=100)) - to_chat(user, "You pry off [src]'s inner plate. You can see the core's green glow!") + to_chat(user, span_notice("You 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) @@ -393,7 +393,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 @@ -412,7 +412,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) @@ -525,16 +525,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 ..() @@ -551,7 +551,7 @@ E.runEvent() addtimer(CALLBACK(src, .proc/really_actually_explode), 110) else - visible_message("[src] fizzes ominously.") + visible_message(span_notice("[src] fizzes ominously.")) addtimer(CALLBACK(src, .proc/fizzbuzz), 110) /obj/machinery/nuclearbomb/beer/proc/disarm() @@ -676,17 +676,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_userdanger("You've got the disk! Defend it with your life!")) forceMove(H) H.nuke_disk = src return TRUE @@ -699,7 +699,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/machines/alarm.ogg', 50, -1, 1) for(var/i in 1 to 100) addtimer(CALLBACK(user, /atom/proc/add_atom_colour, (i % 2)? "#00FF00" : "#FF0000", ADMIN_COLOUR_PRIORITY), i) @@ -708,7 +708,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) SSachievements.unlock_achievement(/datum/achievement/honorarynukie, user.client) diff --git a/code/modules/antagonists/nukeop/equipment/pinpointer.dm b/code/modules/antagonists/nukeop/equipment/pinpointer.dm index ccf61b35dd52..3c1efe8faaf1 100644 --- a/code/modules/antagonists/nukeop/equipment/pinpointer.dm +++ b/code/modules/antagonists/nukeop/equipment/pinpointer.dm @@ -28,7 +28,7 @@ playsound(src, 'sound/items/nuke_toy_lowpower.ogg', 50, 0) if(isliving(loc)) var/mob/living/L = loc - to_chat(L, "Your [name] vibrates and lets out a tinny alarm. Uh oh.") + to_chat(L, span_userdanger("Your [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, "Your [name] beeps as it reconfigures it's tracking algorithms.") + to_chat(L, span_userdanger("Your [name] beeps as it reconfigures it's tracking algorithms.")) playsound(L, 'sound/machines/triple_beep.ogg', 50, 1) mode = new_mode scan_for_target() diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index 3bb775ca4072..3bfc27b5686d 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -43,7 +43,7 @@ /datum/antagonist/nukeop/greet() owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ops.ogg',100,0) - to_chat(owner, "You are a [nuke_team ? nuke_team.syndicate_name : "syndicate"] agent!") + to_chat(owner, span_notice("You are a [nuke_team ? nuke_team.syndicate_name : "syndicate"] agent!")) owner.announce_objectives() /datum/antagonist/nukeop/on_gain() @@ -155,7 +155,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" @@ -319,7 +319,7 @@ /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) diff --git a/code/modules/antagonists/overthrow/overthrow.dm b/code/modules/antagonists/overthrow/overthrow.dm index e5d847511082..5befe8af7366 100644 --- a/code/modules/antagonists/overthrow/overthrow.dm +++ b/code/modules/antagonists/overthrow/overthrow.dm @@ -56,7 +56,7 @@ break if(!team_name || already_taken) // basic protection against two teams with the same name. This could still happen with extreme unluck due to syndicate_name() but it shouldn't break anything. team.name = syndicate_name() - to_chat(owner, "Since you gave [already_taken ? "an already used" : "no"] name, your team's name has been randomly generated: [team.name]!") + to_chat(owner, span_danger("Since you gave [already_taken ? "an already used" : "no"] name, your team's name has been randomly generated: [team.name]!")) return team.name = team_name diff --git a/code/modules/antagonists/overthrow/overthrow_converter.dm b/code/modules/antagonists/overthrow/overthrow_converter.dm index cfd888766522..a76e493c50a6 100644 --- a/code/modules/antagonists/overthrow/overthrow_converter.dm +++ b/code/modules/antagonists/overthrow/overthrow_converter.dm @@ -19,10 +19,10 @@ var/datum/antagonist/overthrow/TO = target_mind.has_antag_datum(/datum/antagonist/overthrow) var/datum/antagonist/overthrow/UO = user_mind.has_antag_datum(/datum/antagonist/overthrow) if(!UO) - to_chat(user, "You don't know how to use this thing!") // It needs a valid team to work, if you aren't an antag don't use this thing + to_chat(user, span_danger("You don't know how to use this thing!")) // It needs a valid team to work, if you aren't an antag don't use this thing return FALSE if(TO) - to_chat(user, "[target.name] woke up already, the implant would be ineffective against him!") + to_chat(user, span_notice("[target.name] woke up already, the implant would be ineffective against him!")) return FALSE target_mind.add_antag_datum(/datum/antagonist/overthrow, UO.team) log_combat(user, target, "implanted", "\a [name]") @@ -32,22 +32,22 @@ if(!istype(M) || !istype(user)) return if(!uses) - to_chat(user,"The converter is empty!") + to_chat(user,span_warning("The converter is empty!")) return if(M == user) - to_chat(user,"You cannot convert yourself!") + to_chat(user,span_warning("You cannot convert yourself!")) return if(HAS_TRAIT(M, TRAIT_MINDSHIELD)) - to_chat(user, "This mind is too strong to convert, try to remove whatever is protecting it first!") + to_chat(user, span_danger("This mind is too strong to convert, try to remove whatever is protecting it first!")) return - M.visible_message("[user] is attempting to implant [M].") + M.visible_message(span_warning("[user] is attempting to implant [M].")) if(do_mob(user, M, 50)) if(convert(M,user)) - M.visible_message("[user] has implanted [M].", "[user] implants you.") + M.visible_message("[user] has implanted [M].", span_notice("[user] implants you.")) uses-- update_icon() else - to_chat(user, "[user] fails to implant [M].") + to_chat(user, span_warning("[user] fails to implant [M].")) /obj/item/overthrow_converter/update_icon() if(uses) diff --git a/code/modules/antagonists/pirate/pirate.dm b/code/modules/antagonists/pirate/pirate.dm index 2c2ed9b909dd..d5c5013e08ce 100644 --- a/code/modules/antagonists/pirate/pirate.dm +++ b/code/modules/antagonists/pirate/pirate.dm @@ -7,7 +7,7 @@ var/datum/team/pirate/crew /datum/antagonist/pirate/greet() - to_chat(owner, "You are a Space Pirate!") + to_chat(owner, span_boldannounce("You 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. As a pirate, you are NOT authorized to murder the station's inhabitants without good reason.") owner.announce_objectives() @@ -87,7 +87,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) diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm index 12cb3fe7b318..bf6586ecd098 100644 --- a/code/modules/antagonists/revenant/revenant.dm +++ b/code/modules/antagonists/revenant/revenant.dm @@ -121,11 +121,11 @@ if(incorp) incorp.signal_enabled = TRUE //yogs end invisibility = INVISIBILITY_REVENANT - to_chat(src, "You are once more concealed.") + to_chat(src, span_revenboldnotice("You are once more concealed.")) if(unstun_time && world.time >= unstun_time) unstun_time = 0 notransform = FALSE - to_chat(src, "You can move again!") + to_chat(src, span_revenboldnotice("You 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 @@ -195,8 +195,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 your essence draining away!") + visible_message(span_warning("[src] violently flinches!"), \ + span_revendanger("As \the [W] passes through you, you feel your essence draining away!")) adjustBruteLoss(25) //hella effective inhibited = TRUE update_action_buttons_icon() @@ -226,17 +226,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 your essence [pick("breaking apart", "drifting away")]...") + to_chat(src, span_revendanger("NO! No... it's too late, you can feel your essence [pick("breaking apart", "drifting away")]...")) notransform = TRUE revealed = TRUE invisibility = 0 playsound(src, 'sound/effects/screech.ogg', 100, 1) - 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 @@ -260,10 +260,10 @@ if(incorp) incorp.signal_enabled = FALSE //yogs end if(!unreveal_time) - to_chat(src, "You have been revealed!") + to_chat(src, span_revendanger("You have been revealed!")) unreveal_time = world.time + time else - to_chat(src, "You have been revealed!") + to_chat(src, span_revenwarning("You have been revealed!")) unreveal_time = unreveal_time + time update_spooky_icon() @@ -274,10 +274,10 @@ return notransform = TRUE if(!unstun_time) - to_chat(src, "You cannot move!") + to_chat(src, span_revendanger("You cannot move!")) unstun_time = world.time + time else - to_chat(src, "You cannot move!") + to_chat(src, span_revenwarning("You cannot move!")) unstun_time = unstun_time + time update_spooky_icon() @@ -298,17 +298,17 @@ return var/turf/T = get_turf(src) if(isclosedturf(T)) - to_chat(src, "You cannot use abilities from inside of a wall.") + to_chat(src, span_revenwarning("You 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, "You cannot use abilities inside of a dense object.") + to_chat(src, span_revenwarning("You cannot use abilities inside of a dense object.")) return FALSE if(inhibited) - to_chat(src, "Your powers have been suppressed by nulling energy!") + to_chat(src, span_revenwarning("Your powers have been suppressed by nulling energy!")) return FALSE if(!change_essence_amount(essence_cost, TRUE)) - to_chat(src, "You lack the essence to use that ability.") + to_chat(src, span_revenwarning("You lack the essence to use that ability.")) return FALSE return TRUE @@ -332,9 +332,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() @@ -379,13 +379,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.", \ - "You scatter [src] across the area. The particles slowly fade away.") + user.visible_message(span_notice("[user] scatters [src] in all directions."), \ + span_notice("You scatter [src] across the area. The particles slowly fade away.")) user.dropItemToGround(src) scatter() @@ -393,15 +393,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) @@ -422,7 +422,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 @@ -430,12 +430,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 @@ -445,7 +445,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 9c6c26c021bd..4edee2d7eae1 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, "You are already siphoning the essence of a soul!") + to_chat(src, span_revenwarning("You 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, "You feel as if you are being watched.") return face_atom(target) draining = TRUE essence_drained += rand(15, 20) - to_chat(src, "You search for the soul of [target].") + to_chat(src, span_revennotice("You 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, "You 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("You feel something tugging across your body before subsiding.")) draining = 0 essence_drained = 0 return //hey, wait a minute... - to_chat(src, "You begin siphoning essence from [target]'s soul.") + to_chat(src, span_revenminor("You begin siphoning essence from [target]'s soul.")) if(target.stat != DEAD) - to_chat(target, "You feel a horribly unpleasant draining sensation as your grip on life weakens...") + to_chat(target, span_warning("You 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, "You are not close enough to siphon [target ? "[target]'s":"[target.p_their()]"] soul. The link has been broken.") + to_chat(src, span_revenwarning("You 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 = "You toggle your night vision." + message = span_revennotice("You 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, "You have unlocked [initial(name)]!") + to_chat(user, span_revennotice("You have unlocked [initial(name)]!")) panel = "Revenant Abilities" locked = FALSE charge_counter = charge_max @@ -300,7 +300,7 @@ continue if(human.anti_magic_check(FALSE, TRUE)) continue - to_chat(human, "You feel [pick("your sense of direction flicker out", "a stabbing pain in your head", "your mind fill with static")].") + to_chat(human, span_revenwarning("You 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) @@ -320,7 +320,7 @@ S.emp_act(EMP_HEAVY) for(var/obj/machinery/door/firedoor/window/W in T) // Fuck you atmos-locks W.take_damage(rand(5,20)) - to_chat(user,"The shutter mechanism starts to grind its gears.") + to_chat(user,span_notice("The shutter mechanism starts to grind its gears.")) //Blight: Infects nearby humans and in general messes living stuff up. /obj/effect/proc_holder/spell/aoe_turf/revenant/blight diff --git a/code/modules/antagonists/revenant/revenant_blight.dm b/code/modules/antagonists/revenant/revenant_blight.dm index 3c789f339f70..91f90fdf78b0 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, "You feel better.") + to_chat(affected_mob, span_notice("You feel better.")) ..() /datum/disease/revblight/stage_act() @@ -30,7 +30,7 @@ cure() return if(prob(stage*3)) - to_chat(affected_mob, "You suddenly feel [pick("sick and tired", "disoriented", "tired and confused", "nauseated", "faint", "dizzy")]...") + to_chat(affected_mob, span_revennotice("You 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, "You 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("You 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...", "You suddenly feel like your skin is wrong...") + affected_mob.visible_message(span_warning("[affected_mob] looks terrifyingly gaunt..."), "You suddenly feel like your skin is wrong...") affected_mob.add_atom_colour("#1d2953", TEMPORARY_COLOUR_PRIORITY) addtimer(CALLBACK(src, .proc/cure), 100) else diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 2ed1b28fa5c2..3e2c372667dd 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -52,7 +52,7 @@ . = ..() /datum/antagonist/rev/greet() - to_chat(owner, "You 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_userdanger("You 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) @@ -91,7 +91,7 @@ new_revhead.silent = TRUE old_owner.add_antag_datum(new_revhead,old_team) new_revhead.silent = FALSE - to_chat(old_owner, "You have proved your devotion to revolution! You are a head revolutionary now!") + to_chat(old_owner, span_userdanger("You have proved your devotion to revolution! You are a head revolutionary now!")) /datum/antagonist/rev/get_admin_commands() . = ..() @@ -110,7 +110,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, "You are a member of the revolutionaries' leadership now!") + to_chat(new_owner.current, span_userdanger("You are a member of the revolutionaries' leadership now!")) /datum/antagonist/rev/head/get_admin_commands() . = ..() @@ -124,7 +124,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) @@ -145,7 +145,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() @@ -207,15 +207,15 @@ 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_userdanger("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) - to_chat(owner, "You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...") + to_chat(owner, span_userdanger("You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...")) else if(issilicon(owner.current)) owner.current.visible_message("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.") + to_chat(owner, span_userdanger("The frame's firmware detects and deletes your neural reprogramming! You remember nothing but the name of the one who flashed you.")) //blunt trauma deconversions call this through species.dm spec_attacked_by() /datum/antagonist/rev/proc/remove_revolutionary(borged, deconverter) @@ -375,25 +375,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/santa/santa.dm b/code/modules/antagonists/santa/santa.dm index 9f089246ba46..673c9a974373 100644 --- a/code/modules/antagonists/santa/santa.dm +++ b/code/modules/antagonists/santa/santa.dm @@ -14,7 +14,7 @@ /datum/antagonist/santa/greet() . = ..() - to_chat(owner, "You 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("You 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/separatist/separatist.dm b/code/modules/antagonists/separatist/separatist.dm index 09c3e29a3ce0..0e877d0b9c17 100644 --- a/code/modules/antagonists/separatist/separatist.dm +++ b/code/modules/antagonists/separatist/separatist.dm @@ -57,7 +57,7 @@ var/datum/objective/destroy = new /datum/objective/destroy_nation(null, attacking_nation) destroy.team = src objectives += destroy - update_all_member_objectives("The nation of [attacking_nation] has declared the intent to conquer [src]! You have new objectives.") + update_all_member_objectives(span_danger("The nation of [attacking_nation] has declared the intent to conquer [src]! You have new objectives.")) /datum/team/nation/proc/update_all_member_objectives(message) for(var/datum/mind/member in members) @@ -96,7 +96,7 @@ return nation /datum/antagonist/separatist/greet() - to_chat(owner, "You are a separatist for an independent [nation.nation_department]! [nation.name] forever! Protect the sovereignty of your newfound land with your comrades (fellow department members) in arms!") + to_chat(owner, span_boldannounce("You are a separatist for an independent [nation.nation_department]! [nation.name] forever! Protect the sovereignty of your newfound land with your comrades (fellow department members) in arms!")) owner.announce_objectives() //objectives diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index e586218edf8d..390698810620 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -80,16 +80,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/magic/demon_consume.ogg', 50, 1) 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!", \ - "You 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_userdanger("You 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 @@ -171,7 +171,7 @@ if(M.revive(full_heal = TRUE, admin_revive = TRUE)) M.grab_ghost(force = TRUE) playsound(T, feast_sound, 50, 1, -1) - to_chat(M, "You leave [src]'s warm embrace, and feel ready to take on the world.") + to_chat(M, span_clown("You leave [src]'s warm embrace, and feel ready to take on the world.")) /mob/living/simple_animal/slaughter/laughter/bloodcrawl_swallow(var/mob/living/victim) if(consumed_mobs) diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm index dadfe22a3eb2..c91520fbe49c 100644 --- a/code/modules/antagonists/swarmer/swarmer.dm +++ b/code/modules/antagonists/swarmer/swarmer.dm @@ -4,7 +4,7 @@ //Simply lists them. /datum/team/swarmer/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/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm index 0110f3feafd5..cebf33623edc 100644 --- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm +++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm @@ -142,7 +142,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_userdanger(" 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_ @@ -156,7 +156,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_userdanger(" 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 @@ -169,7 +169,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_userdanger(" New target added to database: [objective.target.name] ([status_text]) ")) last_man_standing = TRUE for(var/objective_ in objectives) if(!is_internal_objective(objective_)) @@ -180,9 +180,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_userdanger(" 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_userdanger(" 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() @@ -201,10 +201,10 @@ objective.stolen = TRUE else if(objective.stolen) - var/fail_msg = "Your 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_userdanger("Your 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_userdanger(" 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 your contract being terminated." reinstate_escape_objective(owner) @@ -249,17 +249,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, "You are the [special_role].") + to_chat(owner.current, span_userdanger("You are the [special_role].")) if(syndicate) - to_chat(owner.current, "Your 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_userdanger("Your 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 further increase tensions between The Syndicate and Nanotrasen, so you should limit collateral damage.") //yogs - murderbone rule exists, apparently - to_chat(owner.current, " You have been provided with a standard uplink to accomplish your task. ") + to_chat(owner.current, span_userdanger(" You have been provided with a standard uplink to accomplish your task. ")) else - to_chat(owner.current, "Your 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_userdanger("Your 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 your 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_userdanger("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 your 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_userdanger("Finally, watch your 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 b7ccff9642b6..5b88eb2358e1 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -63,14 +63,14 @@ UnregisterSignal(owner.current, COMSIG_MOVABLE_HEAR) SSticker.mode.traitors -= owner if(!silent && owner.current) - to_chat(owner.current," You are no longer the [special_role]! ") + to_chat(owner.current,span_userdanger(" You are no longer the [special_role]! ")) owner.special_role = null ..() /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) @@ -228,11 +228,11 @@ .=2 /datum/antagonist/traitor/greet() - to_chat(owner.current, "You are the [owner.special_role].") + to_chat(owner.current, span_alertsyndie("You are the [owner.special_role].")) owner.announce_objectives() if(should_give_codewords) give_codewords() - to_chat(owner.current, "Your employer [initial(company.name)] will be paying you an extra [initial(company.paymodifier)]x your nanotrasen paycheck.") + to_chat(owner.current, span_notice("Your employer [initial(company.name)] will be paying you an extra [initial(company.paymodifier)]x your nanotrasen paycheck.")) /datum/antagonist/traitor/proc/update_traitor_icons_added(datum/mind/traitor_mind) var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR] @@ -285,7 +285,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, "You memorize the codewords, allowing you to recognise them when heard.") + to_chat(traitor_mob, span_alertwarning("You 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 @@ -387,9 +387,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/ambience/ambifailure.ogg') return result.Join("
") diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 4cc6c76247b1..5ded9e7a3635 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) to_chat(owner, "[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. @@ -86,7 +86,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) to_chat(owner, "[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 @@ -101,9 +101,9 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) /// The actual ranged proc holder. /obj/effect/proc_holder/ranged_ai /// Appears when the user activates the ability - var/enable_text = "Hello World!" + var/enable_text = span_notice("Hello World!") /// Appears when the user deactivates the ability - var/disable_text = "Goodbye Cruel World!" + var/disable_text = span_danger("Goodbye Cruel World!") var/datum/action/innate/ai/ranged/attached_action /obj/effect/proc_holder/ranged_ai/Destroy() @@ -130,7 +130,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) /// If the module gives a passive upgrade, use this. Mutually exclusive with power_type. var/upgrade = FALSE /// Text shown when an ability is unlocked - var/unlock_text = "Hello World!" + var/unlock_text = span_notice("Hello World!") /// Sound played when an ability is unlocked var/unlock_sound @@ -157,7 +157,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) cost = 130 one_purchase = TRUE power_type = /datum/action/innate/ai/nuke_station - unlock_text = "You slowly, carefully, establish a connection with the on-station self-destruct. You can now activate it at any time." + unlock_text = span_notice("You 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" @@ -168,7 +168,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) /datum/action/innate/ai/nuke_station/Activate() var/turf/T = get_turf(owner) if(!istype(T) || !is_station_level(T.z)) - to_chat(owner, "You cannot activate the doomsday device while off-station!") + to_chat(owner, span_warning("You 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 @@ -188,13 +188,13 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) if(!owner || QDELETED(owner)) return owner.playsound_local(owner, 'sound/misc/bloblarm.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_userdanger("!!! 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 @@ -203,12 +203,12 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) 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/misc/server-ready.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/misc/compiler-stage1.ogg', 50, 0) sleep(20) if(!owner || QDELETED(owner)) @@ -217,7 +217,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) 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/misc/compiler-stage2.ogg', 50, 0) sleep(10) if(!owner || QDELETED(owner)) @@ -226,7 +226,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) 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/misc/compiler-stage2.ogg', 50, 0) sleep(14) if(!owner || QDELETED(owner)) @@ -235,7 +235,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) 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/misc/server-ready.ogg', 50, 0) sleep(30) if(!owner || QDELETED(owner)) @@ -317,7 +317,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) continue if(issilicon(L)) continue - to_chat(L, "The blast wave from [src] tears you atom from atom!") + to_chat(L, span_userdanger("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 @@ -329,7 +329,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) description = "Improves the power and health of all AI turrets. This effect is permanent. Upgrade is done immediately upon purchase." cost = 30 upgrade = TRUE - unlock_text = "You establish a power diversion to your turrets, upgrading their health and damage." + unlock_text = span_notice("You establish a power diversion to your turrets, upgrading their health and damage.") unlock_sound = 'sound/items/rped.ogg' /datum/AI_Module/upgrade/upgrade_turrets/upgrade(mob/living/silicon/ai/AI) @@ -347,7 +347,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) cost = 30 one_purchase = TRUE power_type = /datum/action/innate/ai/lockdown - unlock_text = "You 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("You upload a sleeper trojan into the door control systems. You can send a signal to set it off at any time.") unlock_sound = 'sound/machines/boltsdown.ogg' /datum/action/innate/ai/lockdown @@ -368,7 +368,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) 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, .proc/minor_announce, "Automatic system reboot complete. Have a secure day.", "Network reset:"), 900) @@ -379,7 +379,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) description = "Overrides a machine's programming, causing it to rise up and attack everyone except other machines. Four uses per purchase." cost = 30 power_type = /datum/action/innate/ai/ranged/override_machine - unlock_text = "You procure a virus from the Space Dark Web and distribute it to the station's machines." + unlock_text = span_notice("You procure a virus from the Space Dark Web and distribute it to the station's machines.") unlock_sound = 'sound/machines/airlock_alien_prying.ogg' /datum/action/innate/ai/ranged/override_machine @@ -401,8 +401,8 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) /obj/effect/proc_holder/ranged_ai/override_machine active = FALSE ranged_mousepointer = 'icons/effects/override_machine_target.dmi' - enable_text = "You tap into the station's powernet. Click on a machine to animate it, or use the ability again to cancel." - disable_text = "You release your hold on the powernet." + enable_text = span_notice("You tap into the station's powernet. Click on a machine to animate it, or use the ability again to cancel.") + disable_text = span_notice("You release your hold on the powernet.") /obj/effect/proc_holder/ranged_ai/override_machine/InterceptClickOn(mob/living/caller, params, obj/machinery/target) if(..()) @@ -411,19 +411,19 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) remove_ranged_ability() return if(!istype(target)) - to_chat(ranged_ability_user, "You can only animate machines!") + to_chat(ranged_ability_user, span_warning("You 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/misc/interference.ogg', 50, 0) attached_action.adjust_uses(-1) if(attached_action && attached_action.uses) attached_action.desc = "[initial(attached_action.desc)] It has [attached_action.uses] use\s remaining." attached_action.UpdateButtonIcon() - target.audible_message("You hear a loud electrical buzzing sound coming from [target]!") + target.audible_message(span_userdanger("You hear a loud electrical buzzing sound coming from [target]!")) addtimer(CALLBACK(attached_action, /datum/action/innate/ai/ranged/override_machine.proc/animate_machine, target), 50) //kabeep! - remove_ranged_ability("Sending override signal...") + remove_ranged_ability(span_danger("Sending override signal...")) return TRUE /// Destroy RCDs: Detonates all non-cyborg RCDs on the station. @@ -433,7 +433,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) 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/items/timer.ogg' /datum/action/innate/ai/destroy_rcds @@ -448,7 +448,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) 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/machines/twobeep.ogg', 50, 0) /// Overload Machine: Allows the AI to overload a machine, detonating it after a delay. Two uses per purchase. @@ -457,7 +457,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) 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 = "You enable the ability for the station's APCs to direct intense energy into machinery." + unlock_text = span_notice("You enable the ability for the station's APCs to direct intense energy into machinery.") unlock_sound = 'sound/effects/comfyfire.ogg' //definitely not comfy, but it's the closest sound to "roaring fire" we have /datum/action/innate/ai/ranged/overload_machine @@ -479,8 +479,8 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) /obj/effect/proc_holder/ranged_ai/overload_machine active = FALSE ranged_mousepointer = 'icons/effects/overload_machine_target.dmi' - enable_text = "You tap into the station's powernet. Click on a machine to detonate it, or use the ability again to cancel." - disable_text = "You release your hold on the powernet." + enable_text = span_notice("You tap into the station's powernet. Click on a machine to detonate it, or use the ability again to cancel.") + disable_text = span_notice("You release your hold on the powernet.") /obj/effect/proc_holder/ranged_ai/overload_machine/InterceptClickOn(mob/living/caller, params, obj/machinery/target) if(..()) @@ -489,16 +489,16 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) remove_ranged_ability() return if(!istype(target)) - to_chat(ranged_ability_user, "You can only overload machines!") + to_chat(ranged_ability_user, span_warning("You can only overload machines!")) return if(is_type_in_typecache(target, GLOB.blacklisted_malf_machines)) - to_chat(ranged_ability_user, "You cannot overload that device!") + to_chat(ranged_ability_user, span_warning("You cannot overload that device!")) return ranged_ability_user.playsound_local(ranged_ability_user, "sparks", 50, 0) attached_action.adjust_uses(-1) - target.audible_message("You hear a loud electrical buzzing sound coming from [target]!") + target.audible_message(span_userdanger("You hear a loud electrical buzzing sound coming from [target]!")) addtimer(CALLBACK(attached_action, /datum/action/innate/ai/ranged/overload_machine.proc/detonate_machine, target), 50) //kaboom! - remove_ranged_ability("Overcharging machine...") + remove_ranged_ability(span_danger("Overcharging machine...")) return TRUE /// Blackout: Overloads a random number of lights across the station. Three uses. @@ -507,7 +507,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) description = "Attempts to overload the lighting circuits on the station, destroying some bulbs. Three uses per purchase." cost = 15 power_type = /datum/action/innate/ai/blackout - unlock_text = "You hook into the powernet and route bonus power towards the station's lighting." + unlock_text = span_notice("You hook into the powernet and route bonus power towards the station's lighting.") unlock_sound = "sparks" /datum/action/innate/ai/blackout @@ -528,7 +528,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) 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 @@ -542,7 +542,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) cost = 100 one_purchase = TRUE power_type = /datum/action/innate/ai/place_transformer - unlock_text = "You make contact with Space Amazon and request a robotics factory for delivery." + unlock_text = span_notice("You make contact with Space Amazon and request a robotics factory for delivery.") unlock_sound = 'sound/machines/ping.ogg' /datum/action/innate/ai/place_transformer @@ -574,7 +574,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) conveyor.masterAI = owner playsound(T, 'sound/effects/phasein.ogg', 100, 1) owner_AI.can_shunt = FALSE - to_chat(owner, "You are no longer able to shunt your core to APCs.") + to_chat(owner, span_warning("You 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) @@ -606,7 +606,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) I.icon_state = "[success ? "green" : "red"]Overlay" //greenOverlay and redOverlay for success and failure respectively addtimer(CALLBACK(src, .proc/remove_transformer_image, client, I, T), 30) if(!success) - to_chat(src, "[alert_msg]") + to_chat(src, span_warning("[alert_msg]")) return success /// Air Alarm Safety Override: Unlocks the ability to enable flooding on all air alarms. @@ -617,7 +617,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) one_purchase = TRUE cost = 50 power_type = /datum/action/innate/ai/break_air_alarms - unlock_text = "You 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("You 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/effects/space_wind.ogg' /datum/action/innate/ai/break_air_alarms @@ -631,7 +631,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) 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/machines/terminal_off.ogg', 50, 0) /// Thermal Sensor Override: Unlocks the ability to disable all fire alarms from doing their job. @@ -641,7 +641,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) one_purchase = TRUE cost = 25 power_type = /datum/action/innate/ai/break_fire_alarms - unlock_text = "You 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("You replace the thermal sensing capabilities of all fire alarms with a manual override, allowing you to turn them off at will.") unlock_sound = 'goon/sound/machinery/firealarm.ogg' /datum/action/innate/ai/break_fire_alarms @@ -656,7 +656,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) 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/machines/terminal_off.ogg', 50, 0) /// Disable Emergency Lights @@ -666,7 +666,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) cost = 10 one_purchase = TRUE power_type = /datum/action/innate/ai/emergency_lights - unlock_text = "You hook into the powernet and locate the connections between light fixtures and their fallbacks." + unlock_text = span_notice("You hook into the powernet and locate the connections between light fixtures and their fallbacks.") unlock_sound = "sparks" /datum/action/innate/ai/emergency_lights @@ -681,7 +681,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) L.no_emergency = TRUE INVOKE_ASYNC(L, /obj/machinery/light/.proc/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/effects/light_flicker.ogg', 50, FALSE) /// Reactivate Camera Network: Reactivates up to 30 cameras across the station. @@ -691,7 +691,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) cost = 10 one_purchase = TRUE power_type = /datum/action/innate/ai/reactivate_cameras - unlock_text = "You deploy nanomachines to the cameranet." + unlock_text = span_notice("You deploy nanomachines to the cameranet.") unlock_sound = 'sound/items/wirecutter.ogg' /datum/action/innate/ai/reactivate_cameras @@ -732,7 +732,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) //This used to have motion sensing as well, but testing quickly revealed that giving it to the whole cameranet is PURE HORROR. 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/items/rped.ogg' /datum/AI_Module/upgrade/upgrade_cameras/upgrade(mob/living/silicon/ai/AI) @@ -767,7 +767,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) description = "Via a combination of hidden microphones and lip reading software, you are able to use your cameras to listen in on conversations. Upgrade is done immediately upon purchase." cost = 30 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/items/rped.ogg' /datum/AI_Module/upgrade/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 4f1b840dc2d1..dc8f2d6e12fe 100644 --- a/code/modules/antagonists/traitor/equipment/contractor.dm +++ b/code/modules/antagonists/traitor/equipment/contractor.dm @@ -163,7 +163,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/dead/observer/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) @@ -171,7 +171,7 @@ var/mob/dead/observer/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 @@ -267,9 +267,9 @@ var/atom/item_to_create = new item(get_turf(user)) if(user.put_in_hands(item_to_create)) - to_chat(user, "Your purchase materializes into your hands!") + to_chat(user, span_notice("Your purchase materializes into your hands!")) else - to_chat(user, "Your purchase materializes onto the floor.") + to_chat(user, span_notice("Your 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 3cbe64702da8..e46f408f064c 100644 --- a/code/modules/antagonists/traitor/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/syndicate_contract.dm @@ -164,17 +164,17 @@ M.flash_act() M.confused += 10 M.blur_eyes(5) - to_chat(M, "You feel strange...") + to_chat(M, span_warning("You 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, "Your head pounds... It feels like it's going to burst out your skull!") + to_chat(M, span_warning("Your head pounds... It feels like it's going to burst out your skull!")) M.flash_act() M.confused += 20 M.blur_eyes(3) sleep(30) - to_chat(M, "Your head pounds...") + to_chat(M, span_warning("Your head pounds...")) sleep(100) M.flash_act() M.Unconscious(200) @@ -203,7 +203,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/valentine.dm b/code/modules/antagonists/valentines/valentine.dm index 5e470755827c..1f45f27e8671 100644 --- a/code/modules/antagonists/valentines/valentine.dm +++ b/code/modules/antagonists/valentines/valentine.dm @@ -40,6 +40,6 @@ break if(objectives_complete) - return "[owner.name] protected their date!" + return span_greentext("[owner.name] protected their date!") else - return "[owner.name] failed their date!" + return span_redtext("[owner.name] failed their date!") diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index b64005671e62..1167db79313a 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -30,9 +30,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" @@ -64,7 +64,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 @@ -129,7 +129,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_userdanger("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) @@ -173,7 +173,7 @@ var/mob/holder = get(loc, /mob) if(current_owner && current_owner != holder) - to_chat(current_owner, "Your otherworldly vision fades...") + to_chat(current_owner, span_notice("Your otherworldly vision fades...")) REMOVE_TRAIT(current_owner, TRAIT_SIXTHSENSE, SCRYING_ORB) REMOVE_TRAIT(current_owner, TRAIT_XRAY_VISION, SCRYING_ORB) @@ -184,14 +184,14 @@ if(!current_owner) current_owner = holder - to_chat(current_owner, "You can see...everything!") + to_chat(current_owner, span_notice("You can see...everything!")) ADD_TRAIT(current_owner, TRAIT_SIXTHSENSE, SCRYING_ORB) ADD_TRAIT(current_owner, TRAIT_XRAY_VISION, SCRYING_ORB) current_owner.update_sight() /obj/item/scrying/attack_self(mob/user) - visible_message("[user] stares into [src], their eyes glazing over.") + visible_message(span_danger("[user] stares into [src], their eyes glazing over.")) user.ghostize(1) /////////////////////////////////////////Necromantic Stone/////////////////// @@ -219,7 +219,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 @@ -228,19 +228,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 = 1, admin_revive = 1) spooky_scaries |= M to_chat(M, "You have been revived by [user.real_name]!") - to_chat(M, "[user.p_theyre(TRUE)] your master now, assist [user.p_them()] even if it costs you your new life!") + to_chat(M, span_userdanger("[user.p_theyre(TRUE)] your master now, assist [user.p_them()] even if it costs you your new life!")) equip_roman_skeleton(M) @@ -294,15 +294,15 @@ /obj/item/voodoo/attackby(obj/item/I, mob/user, params) if(target && cooldown < world.time) if(I.is_hot()) - to_chat(target, "You suddenly feel very hot") + to_chat(target, span_userdanger("You suddenly feel very hot")) target.adjust_bodytemperature(50) GiveHint(target) else if(is_pointed(I)) - to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_selected)]!") + to_chat(target, span_userdanger("You 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_userdanger("HONK")) SEND_SOUND(target, 'sound/items/airhorn.ogg') target.adjustEarDamage(0,3) GiveHint(target) @@ -330,7 +330,7 @@ if(voodoo_link) target = null voodoo_link.forceMove(drop_location()) - to_chat(user, "You remove the [voodoo_link] from the doll.") + to_chat(user, span_notice("You remove the [voodoo_link] from the doll.")) voodoo_link = null update_targets() return @@ -349,16 +349,16 @@ user.reset_perspective(null) user.unset_machine() if(BODY_ZONE_R_LEG,BODY_ZONE_L_LEG) - to_chat(user, "You move the doll's legs around.") + to_chat(user, span_notice("You 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, "You smack the doll's head with your hand.") + to_chat(user, span_notice("You smack the doll's head with your hand.")) target.Dizzy(10) - to_chat(target, "You suddenly feel as if your head was hit with a hammer!") + to_chat(target, span_warning("You suddenly feel as if your head was hit with a hammer!")) GiveHint(target,user) cooldown = world.time + cooldown_time @@ -376,13 +376,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, "You feel a dark presence from [way]") + to_chat(victim, span_notice("You feel a dark presence from [way]")) if(prob(20) || force) var/area/A = get_area(src) - to_chat(victim, "You feel a dark presence from [A.name]") + to_chat(victim, span_notice("You 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 3f6ab8f070f5..a8f79308e11c 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -39,18 +39,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) @@ -62,19 +62,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, "Your body is wracked with debilitating pain!") + to_chat(user, span_userdanger("Your 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(iscultist(M)) if(iscultist(user)) - to_chat(user, "\"Come now, do not capture your bretheren's soul.\"") + to_chat(user, span_cultlarge("\"Come now, do not capture your bretheren's soul.\"")) return if(purified && iscultist(user)) - to_chat(user, "Holy magic resides within the stone, you cannot use it.") + to_chat(user, span_warning("Holy magic resides within the stone, you cannot use it.")) return log_combat(user, M, "captured [M.name]'s soul", src) transfer_soul("VICTIM", M, user) @@ -86,10 +86,10 @@ return if(!iscultist(user) && !iswizard(user) && !usability) user.Unconscious(100) - to_chat(user, "Your body is wracked with debilitating pain!") + to_chat(user, span_userdanger("Your body is wracked with debilitating pain!")) return if(purified && iscultist(user)) - to_chat(user, "Holy magic resides within the stone, you cannot use it.") + to_chat(user, span_warning("Holy magic resides within the stone, you cannot use it.")) return release_shades(user) @@ -130,11 +130,11 @@ 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)) - to_chat(user, "Holy magic resides within the stone, you cannot use it.") + to_chat(user, span_warning("Holy magic resides within the stone, you cannot use it.")) return SS.transfer_soul("CONSTRUCT",src,user) SS.was_used() @@ -168,7 +168,7 @@ if(iscultist(user)) to_chat(user, "\"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.") @@ -199,7 +199,7 @@ else icon_state = "soulstone2" name = "soulstone: Shade of [T.real_name]" - to_chat(T, "Your soul has been captured by the soulstone. Its arcane energies are reknitting your ethereal form.") + to_chat(T, span_notice("Your soul has been captured by the soulstone. Its arcane energies are reknitting your ethereal form.")) if(user != T) to_chat(user, "Capture successful!: [T.real_name]'s soul has been captured and stored within the soulstone.") @@ -317,7 +317,7 @@ if(!T) return FALSE if(!chosen_ghost) - to_chat(U, "There were no spirits willing to become a shade.") + to_chat(U, 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 0857a8b20aea..3e721e88938f 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, "You have improved [aspell.name] into Efficient [aspell.name].") + to_chat(user, span_notice("You have improved [aspell.name] into Efficient [aspell.name].")) aspell.name = "Efficient [aspell.name]" if(2) - to_chat(user, "You have further improved [aspell.name] into Quickened [aspell.name].") + to_chat(user, span_notice("You have further improved [aspell.name] into Quickened [aspell.name].")) aspell.name = "Quickened [aspell.name]" if(3) - to_chat(user, "You have further improved [aspell.name] into Free [aspell.name].") + to_chat(user, span_notice("You have further improved [aspell.name] into Free [aspell.name].")) aspell.name = "Free [aspell.name]" if(4) - to_chat(user, "You have further improved [aspell.name] into Instant [aspell.name].") + to_chat(user, span_notice("You 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_notice("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, "You have learned [S.name].") + to_chat(user, span_notice("You 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, "You can only refund spells at the wizard lair") + to_chat(user, span_warning("You can only refund spells at the wizard lair")) return -1 if(!S) S = new spell_type() @@ -497,7 +497,7 @@ SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name) new /datum/round_event/wizard/ghost() active = TRUE - to_chat(user, "You have cast summon ghosts!") + to_chat(user, span_notice("You have cast summon ghosts!")) playsound(get_turf(user), 'sound/effects/ghost2.ogg', 50, 1) return TRUE @@ -513,7 +513,7 @@ if(!message) return FALSE curse_of_madness(user, message) - to_chat(user, "You have cast the curse of insanity!") + to_chat(user, span_notice("You have cast the curse of insanity!")) playsound(user, 'sound/magic/mandswap.ogg', 50, 1) return TRUE @@ -558,16 +558,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, "You feed the contract back into the spellbook, refunding your points.") + to_chat(user, span_notice("You feed the contract back into the spellbook, refunding your points.")) uses++ 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.")) uses++ for(var/datum/spellbook_entry/item/bloodbottle/BB in entries) if(!isnull(BB.limit)) @@ -626,11 +626,11 @@ /obj/item/spellbook/attack_self(mob/user) if(!owner) - to_chat(user, "You bind the spellbook to yourself.") + to_chat(user, span_notice("You bind the spellbook to yourself.")) 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 9150776e8d46..7ac7053c8825 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, "You are the Space Wizard!") + to_chat(owner, span_boldannounce("You 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 your spell book. Choose your magic arsenal carefully.") @@ -135,7 +135,7 @@ to_chat(owner,"Remember: do not forget to prepare your spells.") /datum/antagonist/wizard/farewell() - to_chat(owner, "You have been brainwashed! You are no longer a wizard!") + to_chat(owner, span_userdanger("You have been brainwashed! You are no longer a wizard!")) /datum/antagonist/wizard/proc/rename_wizard() set waitfor = FALSE @@ -304,10 +304,10 @@ count++ if(wizardwin) - parts += "The wizard was successful!" + parts += span_greentext("The wizard was successful!") SSachievements.unlock_achievement(/datum/achievement/greentext/wizwin, owner.current.client) //wizard wins, give achievement else - parts += "The wizard has failed!" + parts += span_redtext("The wizard has failed!") SSachievements.unlock_achievement(/datum/achievement/redtext/winlost, owner.current.client) //wizard loses, still give achievement lol if(owner.spell_list.len>0) parts += "[owner.name] used the following spells: " @@ -322,10 +322,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/zombie/abilities/acid.dm b/code/modules/antagonists/zombie/abilities/acid.dm index 2a42c4d3e409..7fbd6ce89e44 100644 --- a/code/modules/antagonists/zombie/abilities/acid.dm +++ b/code/modules/antagonists/zombie/abilities/acid.dm @@ -13,15 +13,15 @@ /obj/effect/proc_holder/zombie/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 TRUE else - to_chat(user, "You cannot dissolve this object.") + to_chat(user, span_noticealien("You cannot dissolve this object.")) return FALSE else - to_chat(src, "[target] is too far away.") + to_chat(src, span_noticealien("[target] is too far away.")) return FALSE @@ -44,7 +44,7 @@ return if(!A.ready) - to_chat(user, "Please wait. You will be able to use this ability in [(A.cooldown_ends - world.time) / 10] seconds") + to_chat(user, span_userdanger("Please wait. You will be able to use this ability in [(A.cooldown_ends - world.time) / 10] seconds")) return if(A.corrode(O, user)) diff --git a/code/modules/antagonists/zombie/abilities/necromance.dm b/code/modules/antagonists/zombie/abilities/necromance.dm index 3f1cebc75de9..40437112e988 100644 --- a/code/modules/antagonists/zombie/abilities/necromance.dm +++ b/code/modules/antagonists/zombie/abilities/necromance.dm @@ -36,8 +36,8 @@ if(!istype(GM)) return GM.add_zombie(M.mind) - usr.visible_message("[usr] conjures up a necromanced minion!") - to_chat(M, "You are bound to [usr.name]. If you get too far away from them, you will start dying.") + usr.visible_message(span_danger("[usr] conjures up a necromanced minion!")) + to_chat(M, span_userdanger("You are bound to [usr.name]. If you get too far away from them, you will start dying.")) return TRUE return FALSE diff --git a/code/modules/antagonists/zombie/abilities/spit.dm b/code/modules/antagonists/zombie/abilities/spit.dm index 39318e6be8ee..9dddbe4c2bca 100644 --- a/code/modules/antagonists/zombie/abilities/spit.dm +++ b/code/modules/antagonists/zombie/abilities/spit.dm @@ -8,7 +8,7 @@ /obj/effect/proc_holder/zombie/spit/fire(mob/living/carbon/user) if(active) - remove_ranged_ability("You close your neurotoxin reserves.") + remove_ranged_ability(span_notice("You close your neurotoxin reserves.")) else add_ranged_ability(user, "You open your neurotoxin reserves. Left-click to fire at a target!", TRUE) @@ -26,7 +26,7 @@ var/mob/living/carbon/user = ranged_ability_user if(!ready) - to_chat(user, "You cannot currently spit. You can spit again in [(cooldown_ends - world.time) / 10] seconds") + to_chat(user, span_warning("You cannot currently spit. You can spit again in [(cooldown_ends - world.time) / 10] seconds")) remove_ranged_ability() return FALSE @@ -35,7 +35,7 @@ if(!U || !T) return FALSE - user.visible_message("[user] spits neurotoxin!", "You spit neurotoxin.") + user.visible_message("[user] spits neurotoxin!", span_alertalien("You spit neurotoxin.")) var/obj/item/projectile/bullet/neurotoxin/spitter/A = new /obj/item/projectile/bullet/neurotoxin/spitter(user.loc) A.preparePixelProjectile(target, user, params) A.fire() diff --git a/code/modules/antagonists/zombie/abilities/tank.dm b/code/modules/antagonists/zombie/abilities/tank.dm index 4f5e730d3b01..6b0e69e3b6ed 100644 --- a/code/modules/antagonists/zombie/abilities/tank.dm +++ b/code/modules/antagonists/zombie/abilities/tank.dm @@ -19,7 +19,7 @@ /obj/effect/proc_holder/zombie/tank/proc/stop(mob/living/carbon/human/user) user.dna.species.armor -= armor_boost - to_chat(user, "Your armor boost has ended!") + to_chat(user, span_userdanger("Your armor boost has ended!")) /obj/effect/proc_holder/zombie/tank/fire(mob/living/carbon/user) if(user.incapacitated()) diff --git a/code/modules/antagonists/zombie/zombie.dm b/code/modules/antagonists/zombie/zombie.dm index 5d562c01e45b..19b4afb9275b 100644 --- a/code/modules/antagonists/zombie/zombie.dm +++ b/code/modules/antagonists/zombie/zombie.dm @@ -177,7 +177,7 @@ if(members.len) - parts += "The zombies were:" + parts += span_header("The zombies were:") parts += printplayerlist(members) return "
[parts.Join("
")]
" @@ -284,21 +284,21 @@ H.set_species(/datum/species/zombie/infectious/gamemode/runner) Z.adren = new() H.AddAbility(Z.adren) - to_chat(owner, "You can now run, and your movement speed is considerably faster. You do less damage and can take less damage though.") + to_chat(owner, span_warning("You can now run, and your movement speed is considerably faster. You do less damage and can take less damage though.")) if("Juggernaut") H.set_species(/datum/species/zombie/infectious/gamemode/juggernaut) Z.tank = new() H.AddAbility(Z.tank) - to_chat(owner, "You can now take quite a beating, and heal a bit slower.") + to_chat(owner, span_warning("You can now take quite a beating, and heal a bit slower.")) if("Spitter") H.set_species(/datum/species/zombie/infectious/gamemode/spitter) Z.spit = new() Z.acid = new() H.AddAbility(Z.spit) H.AddAbility(Z.acid) - to_chat(owner, "You can now right click on walls and doors, and cover them in acid! You are weaker in combat though.") + to_chat(owner, span_warning("You can now right click on walls and doors, and cover them in acid! You are weaker in combat though.")) - owner.visible_message("[owner] suddenly convulses, as [owner.p_they()] evolve into a [class]!", "You have evolved into a [class]") + owner.visible_message(span_danger("[owner] suddenly convulses, as [owner.p_they()] evolve into a [class]!"), span_alien("You have evolved into a [class]")) playsound(owner.loc, 'sound/hallucinations/far_noise.ogg', 50, 1) H.do_jitter_animation(15) Z.evolution.Remove(H) @@ -331,7 +331,7 @@ var/datum/game_mode/zombie/mode = SSticker.mode if(!mode.can_evolve_tier_2()) - to_chat(usr, "There are currently too many tier 2 zombies. Please wait.") + to_chat(usr, span_userdanger("There are currently too many tier 2 zombies. Please wait.")) return evolve(selected) @@ -345,10 +345,10 @@ H.set_species(/datum/species/zombie/infectious/gamemode/necromancer) Z.necro = new() H.AddAbility(Z.necro) - to_chat(owner, "You can now run, and your movement speed is considerably faster. You do less damage and can take less damage though.") + to_chat(owner, span_warning("You can now run, and your movement speed is considerably faster. You do less damage and can take less damage though.")) if("Coordinator") H.set_species(/datum/species/zombie/infectious/gamemode/coordinator) - to_chat(owner, "You can now communicate with the horde!") + to_chat(owner, span_warning("You can now communicate with the horde!")) if(Z.spit) @@ -361,7 +361,7 @@ H.RemoveAbility(Z.tank) - owner.visible_message("[owner] suddenly convulses, as [owner.p_they()] evolve into a [class]!", "You have evolved into a [class]") + owner.visible_message(span_danger("[owner] suddenly convulses, as [owner.p_they()] evolve into a [class]!"), span_alien("You have evolved into a [class]")) playsound(owner.loc, 'sound/hallucinations/far_noise.ogg', 50, 1) H.do_jitter_animation(15) Z.evolution2.Remove(H) @@ -414,10 +414,10 @@ if(user.stat) if(!silent) - to_chat(user, "You must be conscious to do this.") + to_chat(user, span_userdanger("You must be conscious to do this.")) return FALSE if(!ready) - to_chat(user, "You can use this ability in [(cooldown_ends - world.time) / 10] seconds.") + to_chat(user, span_userdanger("You can use this ability in [(cooldown_ends - world.time) / 10] seconds.")) return ready diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 54dc8b194e68..8cedba9b8188 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -49,7 +49,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 @@ -95,9 +95,9 @@ if((!A.secured) && (!secured)) holder = new/obj/item/assembly_holder(get_turf(src)) holder.assemble(src,A,user) - to_chat(user, "You attach and secure \the [A] to \the [src]!") + to_chat(user, span_notice("You 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 ..() @@ -105,15 +105,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 453f4193129b..be8708ffcd23 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -30,7 +30,7 @@ add_overlay("bomb_assembly") /obj/item/onetankbomb/wrench_act(mob/living/user, obj/item/I) - to_chat(user, "You disassemble [src]!") + to_chat(user, span_notice("You disassemble [src]!")) if(bombassembly) bombassembly.forceMove(drop_location()) bombassembly.master = null @@ -45,14 +45,14 @@ /obj/item/onetankbomb/welder_act(mob/living/user, obj/item/I) . = FALSE if(status) - to_chat(user, "[bombtank] already has a pressure hole!") + to_chat(user, span_notice("[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.return_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 @@ -117,11 +117,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 @@ -138,7 +138,7 @@ bomb.update_icon() user.put_in_hands(bomb) //Equips the bomb if possible, or puts it on the floor. - to_chat(user, "You attach [assembly] to [src].") + to_chat(user, span_notice("You 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 e42cc2c22415..6b5a3fd0111a 100644 --- a/code/modules/assembly/doorcontrol.dm +++ b/code/modules/assembly/doorcontrol.dm @@ -10,7 +10,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 49245ff0b844..216ad368b76a 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_userdanger("[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 @@ -94,7 +94,7 @@ /obj/item/assembly/flash/proc/try_use_flash(mob/user = null) if(user && HAS_TRAIT(user, TRAIT_NO_STUN_WEAPONS)) - to_chat(user, "You can't seem to remember how this works!") + to_chat(user, span_warning("You can't seem to remember how this works!")) return FALSE if(burnt_out || (world.time < last_trigger + cooldown)) return FALSE @@ -116,7 +116,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_disarm("[src] emits a blinding light!")) if(targeted) if(M.flash_act(1, 1)) if(M.confused < power) @@ -124,18 +124,18 @@ M.confused += min(power, diff) if(user) terrible_conversion_proc(M, user) - visible_message("[user] blinds [M] with the flash!") - to_chat(user, "You blind [M] with the flash!") - to_chat(M, "[user] blinds you with the flash!") + visible_message(span_disarm("[user] blinds [M] with the flash!")) + to_chat(user, span_danger("You blind [M] with the flash!")) + to_chat(M, span_userdanger("[user] blinds you with the flash!")) else - to_chat(M, "You are blinded by [src]!") + to_chat(M, span_userdanger("You 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, "You fail to blind [M] with the flash!") - to_chat(M, "[user] fails to blind you with the flash!") + visible_message(span_disarm("[user] fails to blind [M] with the flash!")) + to_chat(user, span_warning("You 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 @@ -155,17 +155,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!", "You overload [R]'s sensors with the flash!") + user.visible_message(span_disarm("[user] overloads [R]'s sensors with the flash!"), span_danger("You overload [R]'s sensors with the flash!")) return TRUE - user.visible_message("[user] fails to blind [M] with the flash!", "You fail to blind [M] with the flash!") + user.visible_message(span_disarm("[user] fails to blind [M] with the flash!"), span_warning("You 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) . = ..() @@ -188,15 +188,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 @@ -232,18 +232,18 @@ /obj/item/assembly/flash/armimplant/burn_out() if(I && I.owner) - to_chat(I.owner, "Your photon projector implant overheats and deactivates!") + to_chat(I.owner, span_warning("Your photon projector implant overheats and deactivates!")) I.Retract() overheat = TRUE addtimer(CALLBACK(src, .proc/cooldown), flashcd * 2) /obj/item/assembly/flash/armimplant/try_use_flash(mob/user = null) if(user && HAS_TRAIT(user, TRAIT_NO_STUN_WEAPONS)) - to_chat(user, "You can't seem to remember how this works!") + to_chat(user, span_warning("You can't seem to remember how this works!")) return FALSE if(overheat) if(I && I.owner) - to_chat(I.owner, "Your photon projector is running too hot to be used again so quickly!") + to_chat(I.owner, span_warning("Your photon projector is running too hot to be used again so quickly!")) return FALSE overheat = TRUE addtimer(CALLBACK(src, .proc/cooldown), flashcd) @@ -272,17 +272,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_disarm("[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!", "You hypno-flash [M]!") + user.visible_message(span_disarm("[user] blinds [M] with the flash!"), span_danger("You 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) @@ -291,12 +291,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!", "You fail to hypno-flash [M]!") + user.visible_message(span_disarm("[user] fails to blind [M] with the flash!"), span_warning("You 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 19ec84f4433a..69f90681a7ca 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, "You toggle [src] to \"detect death\" mode.") + to_chat(user, span_notice("You toggle [src] to \"detect death\" mode.")) else alarm_health = HEALTH_THRESHOLD_CRIT - to_chat(user, "You toggle [src] to \"detect critical state\" mode.") + to_chat(user, span_notice("You 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, "You toggle [src] [src.scanning ? "off" : "on"].") + to_chat(user, span_notice("You toggle [src] [src.scanning ? "off" : "on"].")) toggle_scan() diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 0162f85fe4ba..d7f4151253ef 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -127,7 +127,7 @@ /obj/item/assembly_holder/screwdriver_act(mob/user, obj/item/tool) if(..()) return TRUE - to_chat(user, "You disassemble [src]!") + to_chat(user, span_notice("You disassemble [src]!")) if(a_left) a_left.on_detach() a_left = null @@ -140,7 +140,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 79a793da1c47..2264b72a0459 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 9babf72d4528..eebda3074800 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -37,7 +37,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 4e7248c9ffb0..2ab62be50f68 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -11,7 +11,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(..()) @@ -20,7 +20,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, "Your hand slips, setting off the trigger!") + to_chat(user, span_warning("Your hand slips, setting off the trigger!")) pulse(FALSE) update_icon() playsound(src, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3) @@ -59,7 +59,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/effects/snap.ogg', 50, TRUE) armed = FALSE @@ -69,17 +69,17 @@ /obj/item/assembly/mousetrap/attack_self(mob/living/carbon/human/user) if(!armed) - to_chat(user, "You arm [src].") + to_chat(user, span_notice("You 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.", \ - "You accidentally trigger [src]!") + user.visible_message(span_warning("[user] accidentally sets off [src], breaking their fingers."), \ + span_warning("You accidentally trigger [src]!")) return - to_chat(user, "You disarm [src].") + to_chat(user, span_notice("You disarm [src].")) armed = !armed update_icon() playsound(src, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3) @@ -93,8 +93,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.", \ - "You accidentally trigger [src]!") + user.visible_message(span_warning("[user] accidentally sets off [src], breaking their fingers."), \ + span_warning("You accidentally trigger [src]!")) return return ..() @@ -108,8 +108,8 @@ var/mob/living/carbon/H = AM if(H.m_intent == MOVE_INTENT_RUN) triggered(H) - H.visible_message("[H] accidentally steps on [src].", \ - "You accidentally step on [src].") + H.visible_message(span_warning("[H] accidentally steps on [src]."), \ + span_warning("You accidentally step on [src].")) else if(ismouse(MM)) triggered(MM) else if(AM.density) // For mousetrap grenades, set off by anything heavy @@ -120,12 +120,12 @@ /obj/item/assembly/mousetrap/on_found(mob/finder) if(armed) if(finder) - finder.visible_message("[finder] accidentally sets off [src], breaking their fingers.", \ - "You accidentally trigger [src]!") + finder.visible_message(span_warning("[finder] accidentally sets off [src], breaking their fingers."), \ + span_warning("You 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 @@ -134,7 +134,7 @@ /obj/item/assembly/mousetrap/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) 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 fc577aaa989d..ea8b028dc18f 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -20,7 +20,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 e18909c9a244..6f963c43990a 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -14,7 +14,7 @@ return ..() /obj/item/assembly/shock_kit/wrench_act(mob/living/user, obj/item/I) - to_chat(user, "You disassemble [src].") + to_chat(user, span_notice("You 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 ea962465a81a..762ba9d7d564 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -16,14 +16,14 @@ 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/items/eatfood.ogg', 50, TRUE) user.transferItemToLoc(src, user, TRUE) suicider = user return MANUAL_SUICIDE_NONLETHAL /obj/item/assembly/signaler/proc/manual_suicide(mob/living/carbon/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!")) user.adjustOxyLoss(200)//it sends an electrical pulse to their heart, killing them. or something. user.death(0) user.set_suicide(TRUE) @@ -77,7 +77,7 @@ switch(action) if("signal") if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_SIGNALLER_SEND)) - to_chat(usr, "[src] is still recharging...") + to_chat(usr, span_warning("[src] is still recharging...")) return TIMER_COOLDOWN_START(src, COOLDOWN_SIGNALLER_SEND, 1 SECONDS) INVOKE_ASYNC(src, .proc/signal) @@ -173,7 +173,7 @@ /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) @@ -204,14 +204,14 @@ 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 844ebf5d6507..1dd9865abad7 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -11,13 +11,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/manual_suicide, user), time*10)//kill yourself 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) @@ -31,7 +31,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 1457b51e0e96..11a0fc6c9286 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, list/message_mods = list()) . = ..() @@ -73,7 +73,7 @@ /obj/item/assembly/voice/multitool_act(mob/living/user, obj/item/I) mode %= modes.len mode++ - to_chat(user, "You set [src] into [modes[mode]] mode.") + to_chat(user, span_notice("You 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 0cb5a282d9fc..fef589061d01 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -252,11 +252,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) @@ -731,7 +731,7 @@ if(2) if(W.tool_behaviour == TOOL_WIRECUTTER && panel_open && wires.is_all_cut()) W.play_tool_sound(src) - to_chat(user, "You cut the final wires.") + to_chat(user, span_notice("You cut the final wires.")) new /obj/item/stack/cable_coil(loc, 5) buildstage = 1 update_icon() @@ -739,7 +739,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 @@ -751,11 +751,11 @@ if(1) if(W.tool_behaviour == TOOL_CROWBAR) user.visible_message("[user.name] removes the electronics from [src.name].",\ - "You start prying out the circuit...") + span_notice("You start prying out the circuit...")) W.play_tool_sound(src) if (W.use_tool(src, user, 20)) if (buildstage == 1) - to_chat(user, "You remove the air alarm electronics.") + to_chat(user, span_notice("You remove the air alarm electronics.")) new /obj/item/electronics/airalarm( src.loc ) playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) buildstage = 0 @@ -765,14 +765,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, "You need five lengths of cable to wire the air alarm!") + to_chat(user, span_warning("You need five lengths of cable to wire the air alarm!")) return user.visible_message("[user.name] wires the air alarm.", \ - "You start wiring the air alarm...") + span_notice("You 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, "You wire the air alarm.") + to_chat(user, span_notice("You wire the air alarm.")) wires.repair() aidisabled = 0 locked = FALSE @@ -785,7 +785,7 @@ if(0) if(istype(W, /obj/item/electronics/airalarm)) if(user.temporarilyRemoveItemFromInventory(W)) - to_chat(user, "You insert the circuit.") + to_chat(user, span_notice("You insert the circuit.")) buildstage = 1 update_icon() qdel(W) @@ -795,14 +795,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].", \ - "You 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("You 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, "You detach \the [src] from the wall.") + to_chat(user, span_notice("You detach \the [src] from the wall.")) W.play_tool_sound(src) new /obj/item/wallframe/airalarm( user.loc ) qdel(src) @@ -825,8 +825,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].", \ - "You 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("You adapt an air alarm circuit and slot it into the assembly.")) buildstage = 1 update_icon() return TRUE @@ -834,21 +834,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, "You [ locked ? "lock" : "unlock"] the air alarm interface.") + to_chat(user, span_notice("You [ 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]!", "You emag [src], disabling its safeties.") + visible_message(span_warning("Sparks fly out of [src]!"), span_notice("You emag [src], disabling its safeties.")) playsound(src, "sparks", 50, 1) /obj/machinery/airalarm/deconstruct(disassembled = TRUE) diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index 366ea66ee98f..0b7f99dbdeb8 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -43,7 +43,7 @@ GLOBAL_LIST_EMPTY(pipeimages) 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)) @@ -192,7 +192,7 @@ GLOBAL_LIST_EMPTY(pipeimages) var/turf/T = get_turf(src) if (level==1 && isturf(T) && T.intact) - to_chat(user, "You must remove the plating first!") + to_chat(user, span_warning("You must remove the plating first!")) return TRUE var/datum/gas_mixture/int_air = return_air() @@ -202,17 +202,17 @@ GLOBAL_LIST_EMPTY(pipeimages) var/unsafe_wrenching = FALSE var/internal_pressure = int_air.return_pressure()-env_air.return_pressure() - to_chat(user, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You 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].", \ - "You unfasten \the [src].", \ - "You hear ratchet.") + span_notice("You unfasten \the [src]."), \ + span_italics("You 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. @@ -233,7 +233,7 @@ GLOBAL_LIST_EMPTY(pipeimages) 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_userdanger("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 @@ -308,7 +308,7 @@ GLOBAL_LIST_EMPTY(pipeimages) 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("You hear something squeezing through the ducts...", "You climb out the ventilation system.") + user.visible_message(span_notice("You hear something squeezing through the ducts..."), "You climb out the ventilation system.") else var/list/pipenetdiff = returnPipenets() ^ target_move.returnPipenets() if(pipenetdiff.len) @@ -320,7 +320,7 @@ GLOBAL_LIST_EMPTY(pipeimages) playsound(src, 'sound/machines/ventcrawl.ogg', 50, 1, -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("You hear something squeezing through the ducts...", "You climb out the ventilation system.") + user.visible_message(span_notice("You hear something squeezing through the ducts..."), "You 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 b9fd364eba6e..4677507cec21 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm @@ -152,16 +152,16 @@ return if(!panel_open) - to_chat(user, "Open the panel first!") + to_chat(user, span_warning("Open the panel first!")) return TRUE if(generator) - to_chat(user, "Disconnect [generator] first!") + to_chat(user, span_warning("Disconnect [generator] first!")) return TRUE anchored = !anchored I.play_tool_sound(src) - to_chat(user, "You [anchored?"secure":"unsecure"] [src].") + to_chat(user, span_notice("You [anchored?"secure":"unsecure"] [src].")) var/obj/machinery/atmospherics/node1 = nodes[1] var/obj/machinery/atmospherics/node2 = nodes[2] @@ -213,11 +213,11 @@ if(user.a_intent == INTENT_HARM) return if(generator) - to_chat(user, "Disconnect [generator] first!") + to_chat(user, span_warning("Disconnect [generator] first!")) return TRUE mode = !mode - to_chat(user, "You set [src] to [mode?"cold":"hot"] mode.") + to_chat(user, span_notice("You set [src] to [mode?"cold":"hot"] mode.")) return TRUE /obj/machinery/atmospherics/components/binary/circulator/screwdriver_act(mob/user, obj/item/I) @@ -226,12 +226,12 @@ if(user.a_intent == INTENT_HARM) return if(generator) - to_chat(user, "Disconnect the generator first!") + to_chat(user, span_warning("Disconnect the generator first!")) return TRUE panel_open = !panel_open I.play_tool_sound(src) - to_chat(user, "You [panel_open?"open":"close"] the panel on [src].") + to_chat(user, span_notice("You [panel_open?"open":"close"] the panel on [src].")) update_icon_nopipes() return TRUE @@ -239,7 +239,7 @@ if(user.a_intent == INTENT_HARM) return if(anchored) - to_chat(user, "[src] is anchored!") + to_chat(user, span_warning("[src] is anchored!")) return TRUE if(!panel_open) circulator_flip() @@ -274,7 +274,7 @@ return flipped = !flipped - to_chat(usr, "You flip [src].") + to_chat(usr, span_notice("You flip [src].")) playsound(src, 'sound/items/change_drill.ogg', 50) update_icon_nopipes() 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 6e3d55b652bf..bdb23355e1d6 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -175,7 +175,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, "You cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("You cannot unwrench [src], turn it off first!")) return FALSE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm index 3be3dcc3bcfb..f32840a2c2ca 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm @@ -149,7 +149,7 @@ /obj/machinery/atmospherics/components/binary/pressure_valve/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "You cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("You 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 664bb265b00b..72c5cd0be971 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -167,7 +167,7 @@ /obj/machinery/atmospherics/components/binary/pump/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "You cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("You cannot unwrench [src], turn it off first!")) return FALSE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm index f7bae6d51186..b098a9fd7f9b 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm @@ -30,7 +30,7 @@ if(can_interact(user)) target_temperature = max_temperature investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS) - to_chat(user, "You set the target temperature on [src] to [target_temperature] K.") + to_chat(user, span_notice("You set the target temperature on [src] to [target_temperature] K.")) update_icon() return ..() @@ -113,7 +113,7 @@ /obj/machinery/atmospherics/components/binary/temperature_gate/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "You cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("You cannot unwrench [src], turn it off first!")) return FALSE /obj/machinery/atmospherics/components/binary/temperature_gate/multitool_act(mob/living/user, obj/item/multitool/I) @@ -121,7 +121,7 @@ if (istype(I)) inverted = !inverted if(inverted) - to_chat(user, "You set the [src]'s sensors to release gases when the temperature is higher than the set temperature.") + to_chat(user, span_notice("You set the [src]'s sensors to release gases when the temperature is higher than the set temperature.")) else - to_chat(user, "You set the [src]'s sensors to the default settings.") + to_chat(user, span_notice("You set the [src]'s sensors to the default settings.")) return TRUE 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 7a42c1cb045c..499b9bc773d7 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -181,7 +181,7 @@ /obj/machinery/atmospherics/components/binary/volume_pump/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "You cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("You 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 3640947b0187..1865c441b545 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -153,7 +153,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 f0f30d6347f7..d472abb5b30f 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -174,7 +174,7 @@ /obj/machinery/atmospherics/components/trinary/filter/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "You cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("You 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 aaad250b2fc3..39f38b22030b 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -179,7 +179,7 @@ /obj/machinery/atmospherics/components/trinary/mixer/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "You cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("You 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 8284dabea91c..d8a19b6d3e53 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -189,7 +189,7 @@ /// Individuals with the MEDICALIGNORE trait will stop the cryo from functioning and display a unique warning unless there is clone damage on the body which cryo happens to be able to heal even with MEDICALIGNORE (oversight probably but one of the one ways to heal their clone damage atm). - Hopek if(HAS_TRAIT(mob_occupant,TRAIT_MEDICALIGNORE) && !mob_occupant.getCloneLoss()) - src.visible_message("[src] is unable to treat [mob_occupant] as they cannot be treated with conventional medicine.") + src.visible_message(span_warning("[src] is unable to treat [mob_occupant] as they cannot be treated with conventional medicine.")) playsound(src,'sound/machines/cryo_warning_ignore.ogg',60,1) on = FALSE sleep(2)// here for timing. Shuts off right at climax of the effect before falloff. @@ -258,7 +258,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) @@ -280,14 +280,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("You see [user] kicking against the glass of [src]!", \ - "You struggle inside [src], kicking the release with your foot... (this will take about [DisplayTimeText(breakout_time)].)", \ - "You hear a thump from [src].") + user.visible_message(span_notice("You see [user] kicking against the glass of [src]!"), \ + span_notice("You struggle inside [src], kicking the release with your foot... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_italics("You 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]!", \ - "You successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("You successfully break out of [src]!")) open_machine() /obj/machinery/atmospherics/components/unary/cryo_cell/examine(mob/user) @@ -308,7 +308,7 @@ if(L.incapacitated()) close_machine(target) else - user.visible_message("[user] starts shoving [target] inside [src].", "You start shoving [target] inside [src].") + user.visible_message("[user] starts shoving [target] inside [src].", span_notice("You start shoving [target] inside [src].")) if (do_after(user, 25, target=target)) close_machine(target) @@ -316,13 +316,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].", \ - "You place [I] in [src].") + span_notice("You 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 ee84378bc93f..b26ecd7456ed 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -188,7 +188,7 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "You cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("You cannot unwrench [src], turn it off first!")) return FALSE /obj/machinery/atmospherics/components/unary/outlet_injector/CtrlClick(mob/user) 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 f704d33db46e..782bbe2e4064 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, "You cannot unwrench [src], detach [connected_device] first!") + to_chat(user, span_warning("You cannot unwrench [src], detach [connected_device] first!")) return FALSE /obj/machinery/atmospherics/components/unary/portables_connector/layer2 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 0d6cd38dd32b..46869153d65a 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -51,7 +51,7 @@ /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)." 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 5c298adb6170..db84ee81b6ee 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -307,13 +307,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/welder_act(mob/living/user, obj/item/I) if(!I.tool_start_check(user, amount=0)) return TRUE - to_chat(user, "You begin welding the vent...") + to_chat(user, span_notice("You begin welding the vent...")) if(I.use_tool(src, user, 20, volume=50)) if(!welded) - user.visible_message("[user] welds the vent shut.", "You weld the vent shut.", "You hear welding.") + user.visible_message("[user] welds the vent shut.", span_notice("You weld the vent shut."), span_italics("You hear welding.")) welded = TRUE else - user.visible_message("[user] unwelded the vent.", "You unweld the vent.", "You hear welding.") + user.visible_message("[user] unwelded the vent.", span_notice("You unweld the vent."), span_italics("You hear welding.")) welded = FALSE update_icon() pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir) @@ -325,7 +325,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "You cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("You cannot unwrench [src], turn it off first!")) return FALSE /obj/machinery/atmospherics/components/unary/vent_pump/examine(mob/user) 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 f7f5da64c7a7..5b2d615b84e9 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -253,7 +253,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/welder_act(mob/living/user, obj/item/I) 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.","You weld the scrubber shut.", "You hear welding.") @@ -271,7 +271,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/can_unwrench(mob/user) . = ..() if(. && on && is_operational()) - to_chat(user, "You cannot unwrench [src], turn it off first!") + to_chat(user, span_warning("You cannot unwrench [src], turn it off first!")) return FALSE /obj/machinery/atmospherics/components/unary/vent_scrubber/examine(mob/user) diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index c04478515027..c5277d8d7acc 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -119,12 +119,12 @@ . += status() /obj/machinery/meter/wrench_act(mob/user, obj/item/I) - to_chat(user, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if (I.use_tool(src, user, 40, volume=50)) user.visible_message( "[user] unfastens \the [src].", - "You unfasten \the [src].", - "You hear ratchet.") + span_notice("You unfasten \the [src]."), + span_italics("You hear ratchet.")) deconstruct() return TRUE diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm index ae126b3e9187..5649e44f340d 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 0f2c24d673be..70d300d6c9b4 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -67,7 +67,7 @@ /obj/machinery/portable_atmospherics/canister/interact(mob/user) if(!allowed(user)) - to_chat(user, "Error - Unauthorized User") + to_chat(user, span_warning("Error - Unauthorized User")) playsound(src, 'sound/misc/compiler-failure.ogg', 50, 1) return ..() @@ -418,11 +418,11 @@ if(stat & BROKEN) if(!I.tool_start_check(user, amount=0)) return TRUE - to_chat(user, "You begin cutting [src] apart...") + to_chat(user, span_notice("You begin cutting [src] apart...")) if(I.use_tool(src, user, 30, volume=50)) deconstruct(TRUE) else - to_chat(user, "You cannot slice [src] apart when it isn't broken.") + to_chat(user, span_notice("You 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 97c409de6e38..614f3d7408be 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -92,14 +92,14 @@ if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, !ismonkey(user))) return if(holding) - to_chat(user, "You remove [holding] from [src].") + to_chat(user, span_notice("You 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) @@ -119,7 +119,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]"].")) replace_tank(user, FALSE, T) update_icon() else if(W.tool_behaviour == TOOL_WRENCH) @@ -129,23 +129,23 @@ W.play_tool_sound(src) user.visible_message( \ "[user] disconnects [src].", \ - "You unfasten [src] from the port.", \ - "You hear a ratchet.") + span_notice("You unfasten [src] from the port."), \ + span_italics("You 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].", \ - "You fasten [src] to the port.", \ - "You hear a ratchet.") + span_notice("You fasten [src] to the port."), \ + span_italics("You hear a ratchet.")) update_icon() else return ..() diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 87ec608247fc..17d1209c573f 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -48,7 +48,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 returned to base!") + to_chat(M, span_userdanger("\The [src] has been returned to base!")) STOP_PROCESSING(SSobj, src) //ATTACK HAND IGNORING PARENT RETURN VALUE @@ -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_userdanger("\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_userdanger("\The [src] has been dropped!")) anchored = TRUE @@ -212,7 +212,7 @@ return if(!(GLOB.ghost_role_flags & GHOSTROLE_MINIGAME)) - to_chat(user, "CTF has been temporarily disabled by admins.") + to_chat(user, span_warning("CTF has been temporarily disabled by admins.")) return people_who_want_to_play |= user.ckey var/num = people_who_want_to_play.len @@ -221,7 +221,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 @@ -296,7 +296,7 @@ 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_userdanger("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() @@ -628,7 +628,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/weapons/shotgunpump.ogg', 50, 1, -1) qdel(src) break @@ -686,7 +686,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_userdanger("[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 dafb5c9e27e3..655235d2f483 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -37,13 +37,13 @@ if(!SSticker.HasRoundStarted() || !loc || !ghost_usable) return if(!(GLOB.ghost_role_flags & GHOSTROLE_SPAWNER) && !(flags_1 & ADMIN_SPAWNED_1)) - to_chat(user, "An admin has temporarily disabled non-admin ghost roles!") + to_chat(user, span_warning("An admin has temporarily disabled non-admin ghost roles!")) 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, "You are job banned!") + to_chat(user, span_warning("You are job banned!")) return if(QDELETED(src) || QDELETED(user)) return @@ -597,7 +597,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 c064bf92bfff..d3593e18297c 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_notice("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) @@ -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 9f669222a2b7..1054763c6689 100644 --- a/code/modules/awaymissions/mission_code/Academy.dm +++ b/code/modules/awaymissions/mission_code/Academy.dm @@ -142,7 +142,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) @@ -213,21 +213,21 @@ . = ..() if(!used) if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards)) - to_chat(user, "You feel the magic of the dice is restricted to ordinary humans!") + to_chat(user, span_warning("You 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_userdanger("[src] flares briefly.")) addtimer(CALLBACK(src, .proc/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, "You feel the magic of the dice is restricted to ordinary humans! You should leave it alone.") + to_chat(user, span_warning("You feel the magic of the dice is restricted to ordinary humans! You should leave it alone.")) user.dropItemToGround(src) @@ -236,36 +236,36 @@ switch(roll) if(1) //Dust - T.visible_message("[user] turns to dust!") + T.visible_message(span_userdanger("[user] turns to dust!")) user.hellbound = TRUE user.dust() if(2) //Death - T.visible_message("[user] suddenly dies!") + T.visible_message(span_userdanger("[user] suddenly dies!")) user.death() if(3) //Swarm of creatures - T.visible_message("A swarm of creatures surround [user]!") + T.visible_message(span_userdanger("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_userdanger("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_userdanger("[user] transforms into a monkey!")) user.monkeyize() if(6) //Cut speed - T.visible_message("[user] starts moving slower!") + T.visible_message(span_userdanger("[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_userdanger("Unseen forces throw [user]!")) user.Stun(60) user.adjustBruteLoss(50) var/throw_dir = pick(GLOB.cardinals) @@ -273,29 +273,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_userdanger("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_userdanger("[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_userdanger("Nothing seems to happen.")) if(11) //Cookie - T.visible_message("A cookie appears out of thin air!") + T.visible_message(span_userdanger("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_userdanger("[user] looks very healthy!")) user.revive(full_heal = 1, admin_revive = 1) if(13) //Mad Dosh - T.visible_message("Mad dosh shoots out of [src]!") + T.visible_message(span_userdanger("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) @@ -307,17 +307,17 @@ new /obj/item/coin/gold(M) if(14) //Free Gun - T.visible_message("An impressive gun appears!") + T.visible_message(span_userdanger("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_userdanger("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_userdanger("A Dice Servant appears in a cloud of smoke!")) var/mob/living/carbon/human/H = new(drop_location()) do_smoke(0, drop_location()) @@ -340,23 +340,23 @@ if(17) //Tator Kit - T.visible_message("A suspicious box appears!") + T.visible_message(span_userdanger("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_userdanger("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_userdanger("[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_userdanger("Magic flows out of [src] and into [user]!")) user.mind.make_Wizard() /datum/outfit/butler @@ -404,7 +404,7 @@ return /obj/structure/ladder/unbreakable/rune/show_fluff_message(up,mob/user) - user.visible_message("[user] activates \the [src].","You activate \the [src].") + user.visible_message("[user] activates \the [src].",span_notice("You 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/runner.dm b/code/modules/awaymissions/mission_code/runner.dm index a3d6008c9439..89531f8f50b5 100644 --- a/code/modules/awaymissions/mission_code/runner.dm +++ b/code/modules/awaymissions/mission_code/runner.dm @@ -41,10 +41,10 @@ GLOBAL_LIST_EMPTY(vr_runner_tiles) GLOB.vr_runner_players -= H if(GLOB.vr_runner_active) if(!GLOB.vr_runner_players.len) - to_chat(H, "You win! You survived for [(world.time - game_start_time) / 10] second\s.") + to_chat(H, span_notice("You win! You survived for [(world.time - game_start_time) / 10] second\s.")) end_game() else - to_chat(H, "You survived for [(world.time - game_start_time) / 10] seconds. [GLOB.vr_runner_players.len] other player(s) remained.") + to_chat(H, span_notice("You survived for [(world.time - game_start_time) / 10] seconds. [GLOB.vr_runner_players.len] other player(s) remained.")) /obj/effect/portal/permanent/one_way/recall/pit_faller/proc/game_start_countdown(wait_seconds = 10) game_starting = TRUE @@ -53,12 +53,12 @@ GLOBAL_LIST_EMPTY(vr_runner_tiles) game_starting = FALSE return FALSE for(var/mob/living/carbon/human/H in GLOB.vr_runner_players) - to_chat(H, "Game starting in [seconds_remaining].") + to_chat(H, span_notice("Game starting in [seconds_remaining].")) sleep(10) if(GLOB.vr_runner_players.len) GLOB.vr_runner_active = TRUE for(var/mob/living/carbon/human/H in GLOB.vr_runner_players) - to_chat(H, "Game Started!") + to_chat(H, span_notice("Game Started!")) var/turf/open/indestructible/runner/R = get_turf(H) INVOKE_ASYNC(R, /turf/open/indestructible/runner.proc/turf_fall) color = COLOR_RED diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index ff4fe661b25e..028e56daad4e 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].", "You scoop out some plasma from the [src] using \the [C].") + user.visible_message("[user] scoops some plasma from the [src] with \the [C].", span_notice("You 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!", \ - "You scream out in pain as your [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_userdanger("You scream out in pain as your [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!", \ - "Your senses numb as all of your remaining flesh is turned into a purple slurry, sloshing off your body and leaving only your 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_userdanger("Your senses numb as all of your remaining flesh is turned into a purple slurry, sloshing off your body and leaving only your 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 eb8b8ff4619b..e49ad2be275e 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -145,7 +145,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 @@ -162,10 +162,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 4d85d947c274..6d8a57a9c53a 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, "You blink and find yourself in [get_area_name(T)].") + to_chat(user, span_notice("You blink and find yourself 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 412f7cf75d4f..aff5e05622a6 100644 --- a/code/modules/awaymissions/super_secret_room.dm +++ b/code/modules/awaymissions/super_secret_room.dm @@ -111,7 +111,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 d4c9fdbee7bd..0adbac091240 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 0c7d640fc0a2..cf25753a076f 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/buildmode.dm b/code/modules/buildmode/buildmode.dm index f66ddec6fc19..70e9e55b34bf 100644 --- a/code/modules/buildmode/buildmode.dm +++ b/code/modules/buildmode/buildmode.dm @@ -25,7 +25,7 @@ /datum/buildmode/New(client/c) if(IsAdminAdvancedProcCall()) - to_chat(usr, "Do not attempt to circumvent the permissions system using proc calls or SDQL2") + to_chat(usr, span_notice("Do not attempt to circumvent the permissions system using proc calls or SDQL2")) message_admins("[key_name_admin(usr)] attempted to circumvent the permissions system and activate buildmode using proc calls.") return mode = new /datum/buildmode_mode/basic(src) @@ -151,7 +151,7 @@ set category = "Event" if(IsAdminAdvancedProcCall()) - to_chat(usr, "Do not attempt to circumvent the permissions system using proc calls or SDQL2") + to_chat(usr, span_notice("Do not attempt to circumvent the permissions system using proc calls or SDQL2")) message_admins("[key_name_admin(usr)] attempted to circumvent the permissions system and activate buildmode using proc calls.") return if(M.client) diff --git a/code/modules/buildmode/submodes/advanced.dm b/code/modules/buildmode/submodes/advanced.dm index efc91c50b720..b875ddb6271e 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") @@ -42,9 +42,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) @@ -55,7 +55,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 19f536e07371..33d62c898059 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 bd89c7c86e67..a52b4642490c 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 = Airlock") + 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 = Airlock")) 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) diff --git a/code/modules/buildmode/submodes/boom.dm b/code/modules/buildmode/submodes/boom.dm index 6697b1dd94b5..24e5020af669 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 (ie 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 (ie 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 4aed8ac700d1..09fa080cf641 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(ismovable(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/delete.dm b/code/modules/buildmode/submodes/delete.dm index 3fb631a245c1..bbcf9c29d0fc 100644 --- a/code/modules/buildmode/submodes/delete.dm +++ b/code/modules/buildmode/submodes/delete.dm @@ -47,7 +47,7 @@ to_chat(usr, "No instances of this type exist") return log_admin("[key_name(usr)] deleted all instances of type [O_type] ([i] instances deleted) ") - message_admins("[key_name(usr)] deleted all instances of type [O_type] ([i] instances deleted) ") + message_admins(span_notice("[key_name(usr)] deleted all instances of type [O_type] ([i] instances deleted) ")) if("Type and subtypes") var/i = 0 for(var/Obj in world) @@ -59,4 +59,4 @@ to_chat(usr, "No instances of this type exist") return log_admin("[key_name(usr)] deleted all instances of type or subtype of [O_type] ([i] instances deleted) ") - message_admins("[key_name(usr)] deleted all instances of type or subtype of [O_type] ([i] instances deleted) ") \ No newline at end of file + message_admins(span_notice("[key_name(usr)] deleted all instances of type or subtype of [O_type] ([i] instances deleted) ")) \ No newline at end of file diff --git a/code/modules/buildmode/submodes/fill.dm b/code/modules/buildmode/submodes/fill.dm index 61714d9e0123..f09e0f9b62c3 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") @@ -31,7 +31,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 2b57ec1180b1..ce1ef5748e2b 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, "You are already reloading an area! Please wait for it to fully finish loading before trying to load another!") + to_chat(c, span_boldwarning("You 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/outfit.dm b/code/modules/buildmode/submodes/outfit.dm index 013e45fc6cb4..9feeb1b1ac7b 100644 --- a/code/modules/buildmode/submodes/outfit.dm +++ b/code/modules/buildmode/submodes/outfit.dm @@ -31,7 +31,7 @@ if(left_click) if(isnull(dressuptime)) - to_chat(c, "Pick an outfit first.") + to_chat(c, span_warning("Pick an outfit first.")) return for (var/item in dollie.get_equipped_items(TRUE)) diff --git a/code/modules/buildmode/submodes/throwing.dm b/code/modules/buildmode/submodes/throwing.dm index f6613ce267b2..8f256ac1dd64 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 ac4c1ef66a20..92d4f0e34b4e 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, "Your edit was rejected by the object.") + to_chat(c, span_warning("Your 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, "Your edit was rejected by the object.") + to_chat(c, span_warning("Your 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 08b89e07f88e..1d134dadacff 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -38,8 +38,8 @@ /obj/machinery/computer/cargo/emag_act(mob/user) if(obj_flags & EMAGGED) return - user.visible_message("[user] swipes a suspicious card through [src]!", - "You 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("You 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 cfba7f3acafa..045001efe96a 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, "You must link [src] to a cargo console first!") + to_chat(user, span_warning("You must link [src] to a cargo console first!")) else // Before you fix it: // yes, checking manifests is a part of intended functionality. @@ -40,6 +40,6 @@ if(price) to_chat(user, "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 6f936391f22d..d5853b5da01a 100644 --- a/code/modules/cargo/expressconsole.dm +++ b/code/modules/cargo/expressconsole.dm @@ -37,11 +37,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, "You [locked ? "lock" : "unlock"] the interface.") + to_chat(user, span_notice("You [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, "You insert the disk into [src], allowing for advanced supply delivery vehicles.") + to_chat(user, span_notice("You insert the disk into [src], allowing for advanced supply delivery vehicles.")) qdel(W) return TRUE else if(istype(W, /obj/item/supplypod_beacon)) @@ -50,14 +50,14 @@ sb.link_console(src, user) return TRUE else - to_chat(user, "[src] is already linked to [sb].") + to_chat(user, span_notice("[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]!", - "You 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("You 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 bc4f65ce820d..cb85b186b780 100644 --- a/code/modules/cargo/gondolapod.dm +++ b/code/modules/cargo/gondolapod.dm @@ -54,9 +54,9 @@ set desc = "Take a deep look inside youself, and count up what's inside" var/total = contents.len if (total) - to_chat(src, "You detect [total] object\s within your incredibly vast belly.") + to_chat(src, span_notice("You detect [total] object\s within your incredibly vast belly.")) else - to_chat(src, "A closer look inside yourself reveals... nothing.") + to_chat(src, span_notice("A closer look inside yourself reveals... nothing.")) /mob/living/simple_animal/pet/gondola/gondolapod/setOpened() opened = TRUE diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index ccdbef64b56c..7b9f52a17fe0 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -211,7 +211,7 @@ bluespace = TRUE //Make it so that the pod doesn't stay in centcom forever pod_flags &= ~FIRST_SOUNDS //Make it so we play sounds now if (!effectQuiet && style != STYLE_SEETHROUGH) - audible_message("The pod hisses, closing and launching itself away from the station.", "The ground vibrates, and you hear the sound of engines firing.") + audible_message(span_notice("The pod hisses, closing and launching itself away from the station."), span_notice("The ground vibrates, and you hear the sound of engines firing.")) stay_after_drop = FALSE holder.pixel_z = initial(holder.pixel_z) holder.alpha = initial(holder.alpha) diff --git a/code/modules/cargo/supplypod_beacon.dm b/code/modules/cargo/supplypod_beacon.dm index 8544574c3b2e..f605adbe7015 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_notice("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 7abea7d3f3e4..6a4e129549d4 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -39,7 +39,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( return if(src.prefs && src.prefs.afreeze && !href_list["priv_msg"] && href_list["_src_"] != "chat" && !src.holder) //yogs start - afreeze - to_chat(src, "You have been frozen by an administrator.") + to_chat(src, span_userdanger("You have been frozen by an administrator.")) return //yogs end // asset_cache @@ -90,7 +90,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( 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(src)] [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) @@ -103,7 +103,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( topiclimiter[SECOND_COUNT] = 0 topiclimiter[SECOND_COUNT] += 1 if (topiclimiter[SECOND_COUNT] > stl) - to_chat(src, "Your previous action was ignored because you've done too many in a second") + to_chat(src, span_danger("Your previous action was ignored because you've done too many in a second")) return // Tgui Topic middleware @@ -118,7 +118,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( //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 your 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 your 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") return if (href_list["asset_cache_preload_data"]) @@ -244,11 +244,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( 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, "You have exceeded the spam filter limit for identical messages. An auto-mute was applied.") + to_chat(src, span_danger("You 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, "You are nearing the spam filter limit for identical messages.") + to_chat(src, span_danger("You are nearing the spam filter limit for identical messages.")) return 0 else last_message = message @@ -392,15 +392,15 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( 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, "Your 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, span_userdanger("Your 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, "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") @@ -504,7 +504,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( apply_clickcatcher() if(prefs.lastchangelog != GLOB.changelog_hash) //bolds the changelog button on the interface so we know there are updates. - to_chat(src, "You have unread updates in the changelog.") + to_chat(src, span_info("You have unread updates in the changelog.")) if(CONFIG_GET(flag/aggressive_changelog)) changelog() else @@ -519,7 +519,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( convert_notes_sql(ckey) to_chat(src, get_message_output("message", ckey)) 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.")) //This is down here because of the browse() calls in tooltip/New() @@ -657,13 +657,13 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( 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) @@ -801,7 +801,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( 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() @@ -817,11 +817,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( 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 your byond installation and try again.") + to_chat(src, span_userdanger("Connection Error:")) + to_chat(src, span_danger("Invalid ComputerID(spoofed). Please remove the ComputerID spoofer from your 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() @@ -832,7 +832,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( 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]) @@ -921,7 +921,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( 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) @@ -956,7 +956,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( 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(src)] [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) @@ -969,7 +969,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( clicklimiter[SECOND_COUNT] = 0 clicklimiter[SECOND_COUNT] += 1+(!!ab) if (clicklimiter[SECOND_COUNT] > scl) - to_chat(src, "Your previous click was ignored because you've done too many in a second") + to_chat(src, span_danger("Your previous click was ignored because you've done too many in a second")) return if (prefs.hotkeys) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 4a4f06ce10da..408e381e169e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -168,7 +168,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) return if(!SSjob || (SSjob.occupations.len <= 0)) - to_chat(user, "The job SSticker is not yet finished creating jobs, please try again later") + to_chat(user, span_notice("The job SSticker is not yet finished creating jobs, please try again later")) return update_preview_icon() @@ -984,7 +984,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(job.alt_titles) rank_display = "[GetPlayerAltTitle(job)]" else - rank_display = "[rank]" + rank_display = span_dark("[rank]") if((rank in GLOB.command_positions) || (rank == "AI"))//Bold head jobs HTML += "[rank_display]" @@ -1090,7 +1090,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) 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) return @@ -1120,7 +1120,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) /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() @@ -1281,21 +1281,21 @@ GLOBAL_LIST_EMPTY(preferences_datums) 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, "You can't have more than [MAX_QUIRKS] positive quirks!") + to_chat(user, span_warning("You can't have more than [MAX_QUIRKS] positive quirks!")) return if(balance - value < 0) - to_chat(user, "You don't have enough balance to gain this quirk!") + to_chat(user, span_warning("You don't have enough balance to gain this quirk!")) return all_quirks += quirk SetQuirks(user) @@ -1537,7 +1537,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) 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("ethcolor") var/new_etherealcolor = input(user, "Choose your ethereal color", "Character Preference") as null|anything in GLOB.color_list_ethereal diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 77628309c036..9ca7889a1ca0 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -377,9 +377,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, "You will now examine everything you click on.") + to_chat(src, span_notice("You will now examine everything you click on.")) else - to_chat(src, "You will no longer examine things you click on.") + to_chat(src, span_notice("You 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 c85e5113560a..5c53deb9a3de 100644 --- a/code/modules/client/verbs/etips.dm +++ b/code/modules/client/verbs/etips.dm @@ -5,7 +5,7 @@ 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" @@ -17,4 +17,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/linkforum.dm b/code/modules/client/verbs/linkforum.dm index da463e5bc86d..57f15ee169dc 100644 --- a/code/modules/client/verbs/linkforum.dm +++ b/code/modules/client/verbs/linkforum.dm @@ -4,7 +4,7 @@ set desc = "Link your Forum account to your BYOND account." if(!CONFIG_GET(string/xenforo_key)) - to_chat(src, "Error: Please contact your system administrator", confidential = TRUE) + to_chat(src, span_warning("Error: Please contact your system administrator"), confidential = TRUE) return var/datum/http_request/req = new() @@ -20,4 +20,4 @@ /client/proc/givelinkforum() add_verb(src, /client/verb/linkforum) - to_chat(src, "Your forum verification link has expired, and the verb has been returned to you. You can ignore this if you have already linked your accounts.", confidential = TRUE) + to_chat(src, span_notice("Your forum verification link has expired, and the verb has been returned to you. You can ignore this if you have already linked your accounts."), confidential = TRUE) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 5634a11a5ade..a4c2ef2b351d 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -7,7 +7,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc set category = "OOC" 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) @@ -15,16 +15,16 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc 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, "You cannot use OOC (muted).") + to_chat(src, span_danger("You cannot use OOC (muted).")) return if(is_banned_from(ckey, "OOC")) - to_chat(src, "You have been banned from OOC.") + to_chat(src, span_danger("You have been banned from OOC.")) return if(QDELETED(src)) return @@ -56,7 +56,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc return if(!(prefs.chat_toggles & CHAT_OOC)) - to_chat(src, "You have OOC muted.") + to_chat(src, span_danger("You have OOC muted.")) return mob.log_talk(raw_msg, LOG_OOC) @@ -88,7 +88,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc pinged &= clientkeys if(pinged.len) if((world.time - last_ping_time) < 30) - to_chat(src,"You are pinging too much! Please wait before pinging again.") + to_chat(src,span_danger("You are pinging too much! Please wait before pinging again.")) return last_ping_time = world.time @@ -220,7 +220,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc 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.")) /client/verb/motd() @@ -232,7 +232,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc 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 Own Admin Notes" @@ -240,7 +240,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc set desc = "View the notes that admins have written about you" 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) @@ -251,7 +251,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc set desc = "View the amount of playtime for roles the server has tracked." 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 new /datum/job_report_menu(src, usr) diff --git a/code/modules/client/verbs/ping.dm b/code/modules/client/verbs/ping.dm index de19d0d52ce4..480b982c5c81 100644 --- a/code/modules/client/verbs/ping.dm +++ b/code/modules/client/verbs/ping.dm @@ -14,7 +14,7 @@ /client/verb/display_ping(time as num) set instant = TRUE set name = ".display_ping" - to_chat(src, "Round trip ping took [round(pingfromtime(time),1)]ms") + to_chat(src, span_notice("Round trip ping took [round(pingfromtime(time),1)]ms")) /client/verb/ping() set name = "Ping" diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm index 4e773fc274bb..8ed47046ed96 100644 --- a/code/modules/client/verbs/suicide.dm +++ b/code/modules/client/verbs/suicide.dm @@ -25,7 +25,7 @@ return /mob/living/carbon/human/virtual_reality/canSuicide() - to_chat(src, "I'm sorry [first_name()], I'm afraid you can't do that.") + to_chat(src, span_warning("I'm sorry [first_name()], I'm afraid you can't do that.")) return /mob/living/carbon/human/verb/suicide() @@ -105,7 +105,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_userdanger("[suicide_message]")) suicide_log() @@ -121,8 +121,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_userdanger("[src]'s brain is growing dull and lifeless. [p_they(TRUE)] look[p_s()] like [p_theyve()] lost the will to live.")) suicide_log() @@ -137,8 +137,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_userdanger("[src] is attempting to bite [p_their()] tongue. It looks like [p_theyre()] trying to commit suicide.")) suicide_log() @@ -154,8 +154,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_userdanger("[src] is powering down. It looks like [p_theyre()] trying to commit suicide.")) suicide_log() @@ -172,8 +172,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_userdanger("[src] is powering down. It looks like [p_theyre()] trying to commit suicide.")) suicide_log() @@ -186,8 +186,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() @@ -204,9 +204,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.", \ - "You hear thrashing.") + visible_message(span_danger("[src] is thrashing wildly! It looks like [p_theyre()] trying to commit suicide."), \ + span_userdanger("[src] is thrashing wildly! It looks like [p_theyre()] trying to commit suicide."), \ + span_italics("You hear thrashing.")) suicide_log() @@ -223,8 +223,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_userdanger("[src] begins to fall down. It looks like [p_theyve()] lost the will to live.")) suicide_log() @@ -252,13 +252,13 @@ /mob/living/proc/canSuicide() switch(stat) if(SOFT_CRIT) - to_chat(src, "You can't commit suicide while in a critical condition!") + to_chat(src, span_warning("You can't commit suicide while in a critical condition!")) return FALSE if(UNCONSCIOUS) - to_chat(src, "You need to be conscious to commit suicide!") + to_chat(src, span_warning("You need to be conscious to commit suicide!")) return FALSE if(DEAD) - to_chat(src, "You're already dead!") + to_chat(src, span_warning("You're already dead!")) return FALSE //We're assuming they're CONSCIOUS if(is_important()) // If they are someone critical to the round, for some reason diff --git a/code/modules/client/verbs/who.dm b/code/modules/client/verbs/who.dm index 3852be3f9497..4b3207126785 100644 --- a/code/modules/client/verbs/who.dm +++ b/code/modules/client/verbs/who.dm @@ -84,6 +84,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 Discord. If no admins are available in game adminhelp anyways and an admin on Discord will see it and respond." //yogs - IRC -> discord + msg += span_info("Adminhelps are also sent to Discord. If no admins are available in game adminhelp anyways and an admin on Discord will see it and respond.") //yogs - IRC -> discord to_chat(src, msg) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index de618ada840f..5b9ecdcdcf5d 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, "You shouldn't be able to toggle a camogear helmetmask if you're not wearing it") + to_chat(owner, span_warning("You 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 @@ -485,7 +485,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 @@ -504,7 +504,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 d9996a130c29..d0571fe0a798 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -83,7 +83,7 @@ C.use(1) update_clothes_damaged_state(FALSE) obj_integrity = max_integrity - to_chat(user, "You fix the damage on [src] with [C].") + to_chat(user, span_notice("You fix the damage on [src] with [C].")) return 1 return ..() @@ -123,7 +123,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("") @@ -147,7 +147,7 @@ update_clothes_damaged_state(TRUE) if(ismob(loc)) //It's not important enough to warrant a message if nobody's wearing it var/mob/M = loc - to_chat(M, "Your [name] starts to fall apart!") + to_chat(M, span_warning("Your [name] starts to fall apart!")) /obj/item/clothing/proc/update_clothes_damaged_state(damaging = TRUE) var/index = "[REF(initial(icon))]-[initial(icon_state)]" @@ -211,20 +211,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, "You have moved too far away!") + to_chat(usr, span_warning("You have moved too far away!")) return sensor_mode = modes.Find(switchMode) - 1 if (src.loc == usr) switch(sensor_mode) if(0) - to_chat(usr, "You disable your suit's remote sensing equipment.") + to_chat(usr, span_notice("You disable your suit's remote sensing equipment.")) if(1) - to_chat(usr, "Your suit will now only report whether you are alive or dead.") + to_chat(usr, span_notice("Your suit will now only report whether you are alive or dead.")) if(2) - to_chat(usr, "Your suit will now only report your exact vital lifesigns.") + to_chat(usr, span_notice("Your suit will now only report your exact vital lifesigns.")) if(3) - to_chat(usr, "Your suit will now report your exact vital lifesigns as well as your coordinate position.") + to_chat(usr, span_notice("Your suit will now report your exact vital lifesigns as well as your coordinate position.")) if(ishuman(loc)) var/mob/living/carbon/human/H = loc @@ -260,12 +260,12 @@ BLIND // can't see anything if(!can_use(usr)) return if(!can_adjust) - to_chat(usr, "You cannot wear this suit any differently!") + to_chat(usr, span_warning("You cannot wear this suit any differently!")) return if(toggle_jumpsuit_adjust()) - to_chat(usr, "You adjust the suit to wear it more casually.") + to_chat(usr, span_notice("You adjust the suit to wear it more casually.")) else - to_chat(usr, "You adjust the suit back to normal.") + to_chat(usr, span_notice("You adjust the suit back to normal.")) if(ishuman(usr)) var/mob/living/carbon/human/H = usr H.update_inv_w_uniform() @@ -298,7 +298,7 @@ BLIND // can't see anything visor_toggling() - to_chat(user, "You adjust \the [src] [up ? "up" : "down"].") + to_chat(user, span_notice("You 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 155180ee1571..b6f2a9134a1e 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, "You turn the music [headphones_on? "on. Untz Untz Untz!" : "off."]") + to_chat(owner, span_notice("You 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 323f9853458e..fb800d85c2ae 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 @@ -439,7 +439,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) ..() diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index 55503e7da5d5..4158a3cc6d65 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -90,7 +90,7 @@ var/strength = round(rad_places[i] / 1000, 0.1) var/image/pic = image(loc = place) var/mutable_appearance/MA = new() - MA.maptext = "[strength]k" + MA.maptext = span_maptext("[strength]k") MA.color = "#04e604" MA.layer = RAD_TEXT_LAYER MA.plane = GAME_PLANE diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index c5f1001374ce..c5cc5a5db2af 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -27,7 +27,7 @@ if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - to_chat(user, "PZZTTPFFFT") + to_chat(user, span_warning("PZZTTPFFFT")) desc = "[desc] The display is flickering slightly." /obj/item/clothing/glasses/hud/health diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm index aec341d2f987..0a0bbe0530b1 100644 --- a/code/modules/clothing/gloves/_gloves.dm +++ b/code/modules/clothing/gloves/_gloves.dm @@ -23,7 +23,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 b1ff3b32fc9f..d81114c5811f 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -21,11 +21,11 @@ /obj/item/clothing/gloves/color/fyellow/proc/get_shocked() if(damaged) - to_chat(loc, "Your gloves catch fire and disintegrate!") + to_chat(loc, span_warning("Your gloves catch fire and disintegrate!")) new/obj/effect/decal/cleanable/ash(src) qdel(src) else - to_chat(loc, "Your gloves begin to melt!") + to_chat(loc, span_warning("Your gloves begin to melt!")) damaged = TRUE /obj/item/clothing/gloves/color/fyellow/old @@ -60,7 +60,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, "You snip the fingertips off of [src].") + to_chat(user, span_notice("You 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/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 4ab35638dc8c..af50b0c6dd8d 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -89,6 +89,6 @@ if(M.a_intent == INTENT_HELP) M.changeNext_move(CLICK_CD_RAPID) else - to_chat(M, "You don't want to hurt anyone, just give them hugs!") + to_chat(M, span_warning("You don't want to hurt anyone, just give them hugs!")) M.a_intent = INTENT_HELP .= FALSE diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index e910dc94fcc6..f675d0efd3d9 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -61,14 +61,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, "You add the signaler to the helmet.") + to_chat(user, span_notice("You add the signaler to the helmet.")) qdel(src) return return ..() @@ -374,7 +374,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].")) if(S.on) set_light(0) attached_light = S @@ -390,7 +390,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, "You unscrew [attached_light] from [src].") + to_chat(user, span_notice("You unscrew [attached_light] from [src].")) attached_light.forceMove(drop_location()) if(Adjacent(user) && !issilicon(user)) user.put_in_hands(attached_light) @@ -416,7 +416,7 @@ if(user.incapacitated()) return attached_light.on = !attached_light.on - 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/weapons/empty.ogg', 100, TRUE) update_helmlight() diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 1ee6374f6ed0..ba2a33729b53 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/machines/ding.ogg', 50, 1) 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))) @@ -220,21 +220,21 @@ return TRUE switch(mode) if(DRILL_DEFAULT) - to_chat(user, "You set the voice circuit to the middle position.") + to_chat(user, span_notice("You set the voice circuit to the middle position.")) mode = DRILL_SHOUTING if(DRILL_SHOUTING) - to_chat(user, "You set the voice circuit to the last position.") + to_chat(user, span_notice("You set the voice circuit to the last position.")) mode = DRILL_YELLING if(DRILL_YELLING) - to_chat(user, "You set the voice circuit to the first position.") + to_chat(user, span_notice("You set the voice circuit to the first position.")) mode = DRILL_DEFAULT if(DRILL_CANADIAN) - to_chat(user, "You adjust voice circuit but nothing happens, probably because it's broken.") + to_chat(user, span_danger("You 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, "You broke the voice circuit!") + to_chat(user, span_danger("You 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 063c2086faa3..acfd3286c57f 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -224,7 +224,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_hair_style = "Neckbeard" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index af13e9312f05..7b23392e720a 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -97,12 +97,12 @@ src.icon_state = "ushankaup" src.item_state = "ushankaup" earflaps = 0 - to_chat(user, "You raise the ear flaps on the ushanka.") + to_chat(user, span_notice("You raise the ear flaps on the ushanka.")) else src.icon_state = "ushankadown" src.item_state = "ushankadown" earflaps = 1 - to_chat(user, "You lower the ear flaps on the ushanka.") + to_chat(user, span_notice("You lower the ear flaps on the ushanka.")) /* * Pumpkin head @@ -224,7 +224,7 @@ return if(new_style && new_style != hair_style) hair_style = new_style - user.visible_message("[user] changes \the [src]'s hairstyle to [new_style].", "You change \the [src]'s hairstyle to [new_style].") + user.visible_message(span_notice("[user] changes \the [src]'s hairstyle to [new_style]."), span_notice("You change \the [src]'s hairstyle to [new_style].")) if(adjustablecolor) hair_color = input(usr,"","Choose Color",hair_color) as color|null update_icon() @@ -288,7 +288,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 your 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 your 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) @@ -296,7 +296,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 your mind?!") + to_chat(C, span_userdanger("Why would you want to take this off? Do you want them to get into your mind?!")) return return ..() @@ -316,13 +316,13 @@ return QDEL_NULL(paranoia) if(!target.IsUnconscious()) - to_chat(target, "Your 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("Your 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 your mind?!") + to_chat(user, span_userdanger("Why would you want to take this off? Do you want them to get into your mind?!")) return return ..() diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 0f8fbb881a35..8264c9a19857 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -34,15 +34,15 @@ src.flipped = !src.flipped if(src.flipped) icon_state = "[item_color]soft_flipped" - to_chat(user, "You flip the hat backwards.") + to_chat(user, span_notice("You flip the hat backwards.")) else icon_state = "[item_color]soft" - to_chat(user, "You flip the hat back in normal position.") + to_chat(user, span_notice("You 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 de7d4d213692..634616636eb5 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, "You turn the voice box in [src] [status ? "on" : "off"].") + to_chat(user, span_notice("You 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, "You push \the [src] back into place.") + to_chat(user, span_notice("You push \the [src] back into place.")) slot_flags = initial(slot_flags) else icon_state += "_up" - to_chat(user, "You push \the [src] out of the way.") + to_chat(user, span_notice("You 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 9f524dda1074..c53c89284881 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -25,7 +25,7 @@ adjustmask() // this mask starts lowered /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) @@ -40,7 +40,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 = "A close-fitting sterile mask that can be connected to an air supply." diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 276ad282d1bb..a3b63406c546 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -91,7 +91,7 @@ for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() - to_chat(user, "Your Clown Mask has now morphed into [choice], all praise the Honkmother!") + to_chat(user, span_notice("Your Clown Mask has now morphed into [choice], all praise the Honkmother!")) return TRUE /obj/item/clothing/mask/gas/sexyclown @@ -143,7 +143,7 @@ for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() - to_chat(user, "Your Mime Mask has now morphed into [choice]!") + to_chat(user, span_notice("Your Mime Mask has now morphed into [choice]!")) return TRUE /obj/item/clothing/mask/gas/monkeymask diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index 1ca02961b9b2..7c8d2026b68f 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -69,21 +69,21 @@ return TRUE switch(aggressiveness) if(1) - to_chat(user, "You set the restrictor to the middle position.") + to_chat(user, span_notice("You set the restrictor to the middle position.")) aggressiveness = 2 if(2) - to_chat(user, "You set the restrictor to the last position.") + to_chat(user, span_notice("You set the restrictor to the last position.")) aggressiveness = 3 if(3) - to_chat(user, "You set the restrictor to the first position.") + to_chat(user, span_notice("You set the restrictor to the first position.")) aggressiveness = 1 if(4) - to_chat(user, "You adjust the restrictor but nothing happens, probably because it's broken.") + to_chat(user, span_danger("You 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, "You broke the restrictor!") + to_chat(user, span_danger("You broke the restrictor!")) aggressiveness = 4 return TRUE @@ -100,7 +100,7 @@ /obj/item/clothing/mask/gas/sechailer/emag_act(mob/user as mob) if(safety) safety = FALSE - to_chat(user, "You silently fry [src]'s vocal circuit with the cryptographic sequencer.") + to_chat(user, span_warning("You silently fry [src]'s vocal circuit with the cryptographic sequencer.")) else return @@ -113,7 +113,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 @@ -128,12 +128,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_userdanger("\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_userdanger("\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 8b5dc5cdda7c..9babddad852b 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, "You need help taking this off!") + to_chat(user, span_warning("You 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_userdanger("[src] was cursed! Ree!!")) return ..() /obj/item/clothing/mask/cowmask @@ -244,10 +244,10 @@ if(iscarbon(user) && !bypass) 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, "You can't tie [src] while wearing it!") + to_chat(user, span_warning("You can't tie [src] while wearing it!")) return if(slot_flags & ITEM_SLOT_HEAD && !bypass) - to_chat(user, "You must undo [src] before you can tie it into a neckerchief!") + to_chat(user, span_warning("You must undo [src] before you can tie it into a neckerchief!")) else if(user.is_holding(src) || bypass) var/obj/item/clothing/neck/neckerchief/nk = new(src) @@ -258,10 +258,10 @@ var/currentHandIndex = user.get_held_index_of_item(src) user.transferItemToLoc(src, null) user.put_in_hand(nk, currentHandIndex) - user.visible_message("You tie [src] up like a neckerchief.", "[user] ties [src] up like a neckerchief.") + user.visible_message(span_notice("You tie [src] up like a neckerchief."), span_notice("[user] ties [src] up like a neckerchief.")) qdel(src) else - to_chat(user, "You must be holding [src] in order to tie it!") + to_chat(user, span_warning("You 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 f1e7f5a69741..26659057a590 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -59,7 +59,7 @@ item_color = "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) @@ -67,27 +67,27 @@ if(user.a_intent == 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.", "You place [src] against [M]'s [body_part]. [diagnosis]") + user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", span_notice("You place [src] against [M]'s [body_part]. [diagnosis]")) return return ..(M,user) @@ -246,7 +246,7 @@ if(iscarbon(user)) var/mob/living/carbon/C = user if(C.get_item_by_slot(SLOT_NECK) == src) - to_chat(user, "You can't untie [src] while wearing it!") + to_chat(user, span_warning("You can't untie [src] while wearing it!")) return if(user.is_holding(src)) var/obj/item/clothing/mask/bandana/newBand = new sourceBandanaType(user) @@ -256,7 +256,7 @@ user.put_in_hand(newBand, currentHandIndex) user.visible_message("You untie [oldName] back into a [newBand.name]", "[user] unties [oldName] back into a [newBand.name]") else - to_chat(user, "You must be holding [src] in order to untie it!") + to_chat(user, span_warning("You must be holding [src] in order to untie it!")) //CentCom diff --git a/code/modules/clothing/neck/bodycamera.dm b/code/modules/clothing/neck/bodycamera.dm index 9860a7c77f2d..5fe60a220ee5 100644 --- a/code/modules/clothing/neck/bodycamera.dm +++ b/code/modules/clothing/neck/bodycamera.dm @@ -33,11 +33,11 @@ AltClick(user) return if(bodcam.status) - to_chat(user, "You shut off the body camera.") + to_chat(user, span_notice("You shut off the body camera.")) Disconnect() else bodcam.status = TRUE - to_chat(user, "You turn on the body camera.") + to_chat(user, span_notice("You turn on the body camera.")) getMobhook(user) update_icon() @@ -67,16 +67,16 @@ /obj/item/clothing/neck/bodycam/examine(mob/user) .=..() - . += "The camera is currently [bodcam.status ? "on" : "off"]." + . += span_notice("The camera is currently [bodcam.status ? "on" : "off"].") if(setup) - . += "It is registered under the name \"[bodcam.c_tag]\"." - . += "It is streaming to the network \"[bodcam.network[1]]\"." + . += span_notice("It is registered under the name \"[bodcam.c_tag]\".") + . += span_notice("It is streaming to the network \"[bodcam.network[1]]\".") if(!preset) - . += "Alt-click to configure the camera." + . += span_notice("Alt-click to configure the camera.") else - . += "This camera is locked and cannot be reconfigured." + . += span_notice("This camera is locked and cannot be reconfigured.") else - . += "It hasn't been set up yet!" + . += span_warning("It hasn't been set up yet!") /obj/item/clothing/neck/bodycam/verb/toggle_bodycam() set name = "Toggle Bodycam" diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 8875ae9b5ed7..d10069958eec 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -21,7 +21,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) @@ -32,7 +32,7 @@ playsound(user,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -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/weapons/genhit2.ogg', 50, 1) diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm index ffb7771d2fad..36dcc8726d5c 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, "You ran out of bananium!") + to_chat(loc, span_warning("You 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, "You retrieve [sheet_amount] sheets of bananium from the prototype shoes.") + to_chat(user, span_notice("You retrieve [sheet_amount] sheets of bananium from the prototype shoes.")) else - to_chat(user, "You cannot retrieve any bananium from the prototype shoes.") + to_chat(user, span_notice("You 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, "You [on ? "activate" : "deactivate"] the prototype shoes.") + to_chat(user, span_notice("You [on ? "activate" : "deactivate"] the prototype shoes.")) if(!always_noslip) if(on) clothing_flags |= NOSLIP else clothing_flags &= ~NOSLIP else - to_chat(user, "You need bananium to turn the prototype shoes on!") + to_chat(user, span_warning("You 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 ff36bc52a86e..6437a42b751e 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -109,7 +109,7 @@ if(ishuman(user)) var/mob/living/carbon/human/C = user if(C.shoes == src && chained == 1) - to_chat(user, "You need help taking these off!") + to_chat(user, span_warning("You need help taking these off!")) return FALSE return ..() @@ -118,7 +118,7 @@ if(ishuman(m)) var/mob/living/carbon/human/c = m if(c.shoes == src && chained == 1) - to_chat(c, "You need help taking these off!") + to_chat(c, span_warning("You need help taking these off!")) return return ..() diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 3442b5cd5f63..110b782f27b8 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, "You [magpulse ? "enable" : "disable"] the mag-pulse traction system.") + to_chat(user, span_notice("You [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 6a83c7af68aa..9d27f6df3e11 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -114,10 +114,10 @@ to_chat(user, "You must hold the [src] in your hand to do this.") return if (!enabled_waddle) - to_chat(user, "You switch off the waddle dampeners!") + to_chat(user, span_notice("You switch off the waddle dampeners!")) enabled_waddle = TRUE else - to_chat(user, "You switch on the waddle dampeners!") + to_chat(user, span_notice("You switch on the waddle dampeners!")) enabled_waddle = FALSE /obj/item/clothing/shoes/clown_shoes/jester @@ -258,17 +258,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/effects/stealthoff.ogg', 50, 1, 1) - 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" @@ -309,7 +309,7 @@ if(!isliving(user)) return if(!istype(user.get_item_by_slot(SLOT_SHOES), /obj/item/clothing/shoes/wheelys)) - to_chat(user, "You must be wearing the wheely-heels to use them!") + to_chat(user, span_warning("You must be wearing the wheely-heels to use them!")) return if(!(W.is_occupant(user))) wheelToggle = FALSE @@ -386,7 +386,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].", " You 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_userdanger(" You 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)) @@ -398,12 +398,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_notice("[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 86d22f473b2e..ae9d1f077af2 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_suit == 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 your [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_userdanger("An electromagnetic pulse disrupts your [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, "Your [exposed_I.name] got left behind.") + to_chat(user, span_notice("Your [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 48b3befe3a9b..f67fe7456e93 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -115,28 +115,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_WEAR_SUIT)) //Make sure the player is not wearing the suit before applying the upgrade. - to_chat(user, "You cannot install the upgrade to [src] while wearing it.") + to_chat(user, span_warning("You cannot install the upgrade to [src] while wearing it.")) return if(user.transferItemToLoc(I, src)) jetpack = I - to_chat(user, "You successfully install the jetpack into [src].") + to_chat(user, span_notice("You 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_WEAR_SUIT)) - to_chat(user, "You cannot remove the jetpack from [src] while wearing it.") + to_chat(user, span_warning("You cannot remove the jetpack from [src] while wearing it.")) return jetpack.turn_off(user) jetpack.forceMove(drop_location()) jetpack = null - to_chat(user, "You successfully remove the jetpack from [src].") + to_chat(user, span_notice("You successfully remove the jetpack from [src].")) return return ..() @@ -282,11 +282,11 @@ /obj/item/clothing/head/helmet/space/hardsuit/syndi/attack_self(mob/user) //Toggle Helmet if(!isturf(user.loc)) - to_chat(user, "You cannot toggle your helmet while in this [user.loc]!" ) + to_chat(user, span_warning("You cannot toggle your helmet while in this [user.loc]!") ) return on = !on if(on || force) - to_chat(user, "You switch your hardsuit to EVA mode, sacrificing speed for space protection.") + to_chat(user, span_notice("You switch your hardsuit to EVA mode, sacrificing speed for space protection.")) name = initial(name) desc = initial(desc) set_light(brightness_on) @@ -295,7 +295,7 @@ flags_inv |= visor_flags_inv cold_protection |= HEAD else - to_chat(user, "You switch your hardsuit to combat mode and can now run at full speed.") + to_chat(user, span_notice("You switch your hardsuit to combat mode and can now run at full speed.")) name += " (combat)" desc = alt_desc set_light(0) @@ -890,7 +890,7 @@ 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) diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 37f5eebfb233..a0315fa059a2 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -211,7 +211,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 = "A bulky suit meant to protect the user during emergency situations, at least until someone tore a hole in the suit." diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 730e9ef14196..4092451acf70 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -17,7 +17,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) @@ -30,7 +30,7 @@ return next_extinguish = world.time + extinguish_cooldown extinguishes_left-- - H.visible_message("[H]'s suit automatically extinguishes [H.p_them()]!","Your suit automatically extinguishes you.") + H.visible_message(span_warning("[H]'s suit automatically extinguishes [H.p_them()]!"),span_warning("Your suit automatically extinguishes you.")) H.ExtinguishMob() new /obj/effect/particle_effect/water(get_turf(H)) diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm index cb40b6bf05d6..935c0bc38a45 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 b5831fc77fe8..e1b10b096a00 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -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) @@ -76,9 +76,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/magic/blink.ogg', 100, 1) var/list/turfs = new/list() for(var/turf/T in orange(tele_range, H)) @@ -113,9 +113,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/magic/fireball.ogg', 100, 1) for(var/mob/living/carbon/C in range(6, owner)) if(C != owner) @@ -139,14 +139,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 spawn(40) owner.alpha = initial(owner.alpha) reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration @@ -182,9 +182,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 @@ -203,10 +203,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/magic/repulse.ogg', 100, 1) - 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)) @@ -232,9 +232,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 9d6a013cb1a3..b8e65de8c9a8 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -54,10 +54,10 @@ if(ishuman(src.loc)) var/mob/living/carbon/human/H = src.loc if(H.wear_suit != src) - to_chat(H, "You must be wearing [src] to put up the hood!") + to_chat(H, span_warning("You must be wearing [src] to put up the hood!")) 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(hood,SLOT_HEAD,0,0,1)) suittoggled = TRUE @@ -107,7 +107,7 @@ if(!can_use(usr)) return 0 - to_chat(usr, "You toggle [src]'s [togglename].") + to_chat(usr, span_notice("You toggle [src]'s [togglename].")) if(src.suittoggled) src.icon_state = "[initial(icon_state)]" src.suittoggled = FALSE @@ -169,7 +169,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/mecha/mechmove03.ogg', 50, 1) else helmet.forceMove(src) @@ -187,13 +187,13 @@ if(!suittoggled) if(ishuman(src.loc)) if(H.wear_suit != src) - to_chat(H, "You must be wearing [src] to engage the helmet!") + to_chat(H, span_warning("You 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, "You engage the helmet on the hardsuit.") + to_chat(H, span_notice("You engage the helmet on the hardsuit.")) suittoggled = TRUE H.update_inv_wear_suit() playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1) diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index e45e3a387637..7f7557d35d75 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -165,7 +165,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") @@ -176,7 +176,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 @@ -228,10 +228,10 @@ /obj/item/wizard_armour_charge/afterattack(obj/item/clothing/suit/wizrobe/armor/W, mob/user) . = ..() 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, "You charge \the [W]. It can now absorb [W.current_charges] hits.") + to_chat(user, span_notice("You charge \the [W]. It can now absorb [W.current_charges] hits.")) qdel(src) /obj/item/clothing/suit/wizrobe/armor/Initialize() @@ -245,7 +245,7 @@ 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) diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index a999d8fe1ec8..bea0443143c1 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -34,7 +34,7 @@ var/obj/item/stack/cable_coil/C = I C.use(1) has_sensor = HAS_SENSORS - to_chat(user,"You repair the suit sensors on [src] with [C].") + to_chat(user,span_notice("You repair the suit sensors on [src] with [C].")) return 1 if(!attach_accessory(I, user)) return ..() @@ -64,7 +64,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) ..() @@ -117,7 +117,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 @@ -129,7 +129,7 @@ return if(user && notifyAttach) - to_chat(user, "You attach [I] to [src].") + to_chat(user, span_notice("You attach [I] to [src].")) var/accessory_color = attached_accessory.item_color if(!accessory_color) @@ -155,9 +155,9 @@ var/obj/item/clothing/accessory/A = attached_accessory attached_accessory.detach(src, user) if(user.put_in_hands(A) && !forced) - to_chat(user, "You detach [A] from [src].") + to_chat(user, span_notice("You detach [A] from [src].")) else - to_chat(user, "You detach [A] from [src] and it falls on the floor.") + to_chat(user, span_notice("You detach [A] from [src] and it falls on the floor.")) A.forceMove(get_turf(src)) if(ishuman(loc)) diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 8c303a26b37f..866cfb1d2630 100755 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -16,7 +16,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) @@ -81,9 +81,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 your suit. Alt-click to toggle." + . += span_notice("\The [src] can be worn above or below your suit. Alt-click to toggle.") /obj/item/clothing/accessory/waistcoat name = "waistcoat" @@ -124,7 +124,7 @@ if(M.wear_suit) if((M.wear_suit.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.w_uniform) @@ -134,17 +134,17 @@ delay = 0 else user.visible_message("[user] is trying to pin [src] on [M]'s chest.", \ - "You try to pin [src] on [M]'s chest.") + span_notice("You 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, "You attach [src] to [U].") + to_chat(user, span_notice("You attach [src] to [U].")) else user.visible_message("[user] pins \the [src] on [M]'s chest.", \ - "You pin \the [src] on [M]'s chest.") + span_notice("You 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]" @@ -154,7 +154,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 ..() @@ -226,7 +226,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!","Your [src] bursts into flame!") + visible_message(span_danger(" \The [src] bursts into flame!"),span_userdanger("Your [src] bursts into flame!")) qdel(src) /obj/item/clothing/accessory/medal/plasma/nobel_science @@ -306,7 +306,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.", "You show your attorney's badge.") + user.visible_message("[user] shows [user.p_their()] attorney's badge.", span_notice("You show your 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 05eaa3c0a1cd..68d49875632a 100644 --- a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm +++ b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm @@ -87,7 +87,7 @@ return next_extinguish = world.time + extinguish_cooldown extinguishes_left-- - H.visible_message("[H]'s suit spews out a tonne of space lube!","Your 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("Your suit spews out a tonne of space lube!")) H.ExtinguishMob() new /obj/effect/particle_effect/foam(loc) //Truely terrifying. return 0 \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 3de089e37bd6..4f3294c5ca00 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -728,7 +728,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)) @@ -740,7 +740,7 @@ return next_extinguish = world.time + extinguish_cooldown extinguishes_left-- - H.visible_message("[H]'s suit automatically extinguishes [H.p_them()]!","Your suit automatically extinguishes you.") + H.visible_message(span_warning("[H]'s suit automatically extinguishes [H.p_them()]!"),span_warning("Your suit automatically extinguishes you.")) H.ExtinguishMob() new /obj/effect/particle_effect/water(get_turf(H)) return 0 @@ -749,10 +749,10 @@ ..() 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.")) else extinguishes_left = 5 - to_chat(user, "You refill the suit's built-in extinguisher, using up the cartridge.") + to_chat(user, span_notice("You refill the suit's built-in extinguisher, using up the cartridge.")) qdel(E) /obj/item/extinguisher_refill @@ -896,7 +896,7 @@ if(on) set_light(brightness_on) - user.visible_message("[user] discreetly pulls a cord for the bulbs under [user.p_their()] skirt, turning [user.p_them()] on.") + user.visible_message(span_notice("[user] discreetly pulls a cord for the bulbs under [user.p_their()] skirt, turning [user.p_them()] on.")) else set_light(0) diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index b19394bd01bb..677210902abc 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -29,15 +29,15 @@ return if(istype(I, /obj/item/evidencebag)) - to_chat(user, "You find putting an evidence bag in another evidence bag to be slightly absurd.") + to_chat(user, span_notice("You find putting an evidence bag in another evidence bag to be slightly absurd.")) return 1 //now this is podracing if(I.w_class > WEIGHT_CLASS_NORMAL) - to_chat(user, "[I] won't fit in [src].") + to_chat(user, span_notice("[I] won't fit in [src].")) return if(contents.len) - to_chat(user, "[src] already has something inside it.") + to_chat(user, span_notice("[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. @@ -46,8 +46,8 @@ if(!user.dropItemToGround(I)) return - user.visible_message("[user] puts [I] into [src].", "You put [I] inside [src].",\ - "You hear a rustle as someone puts something into a plastic bag.") + user.visible_message("[user] puts [I] into [src].", span_notice("You put [I] inside [src]."),\ + span_italics("You hear a rustle as someone puts something into a plastic bag.")) icon_state = "evidence" @@ -67,8 +67,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].", "You take [I] out of [src].",\ - "You hear someone rustle around in a plastic bag, and remove something.") + user.visible_message("[user] takes [I] out of [src].", span_notice("You take [I] out of [src]."),\ + span_italics("You 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 diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm index bffa596019f0..5d9f1dabf114 100644 --- a/code/modules/detectivework/footprints_and_rag.dm +++ b/code/modules/detectivework/footprints_and_rag.dm @@ -15,7 +15,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) @@ -29,18 +29,18 @@ if(user.a_intent == INTENT_HARM && !C.is_mouth_covered()) reagents.reaction(C, INGEST) reagents.trans_to(C, reagents.total_volume, transfered_by = user) - C.visible_message("[user] has smothered \the [C] with \the [src]!", "[user] has smothered you with \the [src]!", "You hear some struggling and muffled cries of surprise.") + C.visible_message(span_danger("[user] has smothered \the [C] with \the [src]!"), span_userdanger("[user] has smothered you with \the [src]!"), span_italics("You 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]!", "You start to wipe down [A] with [src]...") + user.visible_message("[user] starts to wipe down [A] with [src]!", span_notice("You start to wipe down [A] with [src]...")) if(do_after(user,30, target = A)) - user.visible_message("[user] finishes wiping off [A]!", "You finish wiping off [A].") + user.visible_message("[user] finishes wiping off [A]!", span_notice("You finish wiping off [A].")) A.wash(CLEAN_SCRUB) reagents.reaction(A, TOUCH) reagents.clear_reagents() diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index 294e682dbdfe..360d6266ea2d 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -60,7 +60,7 @@ /obj/item/detective_scanner/attack_self(mob/user) if(scanning) - to_chat(user, "[src] is in use.") + to_chat(user, span_notice("[src] is in use.")) return radial_generate() if(icons_available) @@ -73,7 +73,7 @@ return if(selection == "Volume on" || selection == "Volume off") - to_chat(user, "You turn the volume [sound_on ? "down":"up"].") + to_chat(user, span_notice("You turn the volume [sound_on ? "down":"up"].")) sound_on = !sound_on return @@ -89,24 +89,24 @@ if(log.len && !scanning) scanning = 1 scan_animation() - to_chat(user, "Printing report, please wait...") + to_chat(user, span_notice("Printing report, please wait...")) if(admin) PrintReport() // admin scanner bypasses print wait else addtimer(CALLBACK(src, .proc/PrintReport), (scan_speed * 25) ) 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/proc/option_clearlogs(mob/user) if(!user.canUseTopic(src, be_close=TRUE) && !admin) // Best way for checking if a player can use while not incapacitated, etc. Admin scanner doesn't care 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 have been cleared.") + to_chat(user, span_notice("The scanner logs have been cleared.")) log.Cut() /obj/item/detective_scanner/attack(mob/living/M, mob/user) @@ -142,7 +142,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() @@ -165,7 +165,7 @@ scan_animation() user.visible_message("\The [user] points the [src.name] at \the [A] and performs a forensic scan.") - to_chat(user, "You scan \the [A]. The scanner is now analysing the results...") + to_chat(user, span_notice("You scan \the [A]. The scanner is now analysing the results...")) // GATHER INFORMATION //Make our lists @@ -256,11 +256,11 @@ feedback(sound_scanner_nomatch) 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 feedback(sound_scanner_match) if(holder) - to_chat(holder, "You finish scanning \the [target_name].") + to_chat(holder, span_notice("You finish scanning \the [target_name].")) add_log("---------------------------------------------------------", 0) scanning = 0 @@ -285,15 +285,15 @@ /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") for(var/iterLog in log) diff --git a/code/modules/economy/pay_stand.dm b/code/modules/economy/pay_stand.dm index c37af51eae1b..3c152509a368 100644 --- a/code/modules/economy/pay_stand.dm +++ b/code/modules/economy/pay_stand.dm @@ -16,7 +16,7 @@ if(istype(W, /obj/item/card/id)) if(W == my_card) locked = !locked - to_chat(user, "You [src.locked ? "lock" : "unlock"] the bolts on the paystand.") + to_chat(user, span_notice("You [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,21 +32,21 @@ var/obj/item/card/id/vbucks = W if(vbucks.registered_account) if(!my_card) - to_chat(user, "ERROR: No bank account assigned to pay stand.") + to_chat(user, span_warning("ERROR: No bank account assigned to pay stand.")) return 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 @@ -56,7 +56,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.") @@ -67,15 +67,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) @@ -84,7 +84,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, icon_state, icon_state, W)) return @@ -110,6 +110,6 @@ /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 0256d4e009ff..96decf91ee21 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -100,7 +100,7 @@ ..() if(href_list["cancel"]) if(!triggering) - to_chat(usr, "You are too late to cancel that event") + to_chat(usr, span_admin("You 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/holiday/vday.dm b/code/modules/events/holiday/vday.dm index 6a8ccd9da883..b794d7afef91 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -66,7 +66,7 @@ ..() if(istype(W, /obj/item/pen) || istype(W, /obj/item/toy/crayon)) if(!user.is_literate()) - to_chat(user, "You scribble illegibly on [src]!") + to_chat(user, span_notice("You 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) @@ -85,7 +85,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 cfc651c69bdd..87e67b5e893a 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*", "You pull \an [src] with [target]! *pop*", "You hear a pop.") + target.visible_message("[user] and [target] pop \an [src]! *pop*", span_notice("You pull \an [src] with [target]! *pop*"), span_italics("You 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 b0f9bcf2a88c..c59e4c099dd9 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -113,7 +113,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/effects/bang.ogg', 50, 1) - audible_message("You hear a CLANG!") + audible_message(span_danger("You hear a CLANG!")) if(clong && prob(25)) x = clong.x @@ -142,7 +142,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!" , "You hear a CLANG!") + L.visible_message(span_danger("[L] is penetrated by an immovable rod!") , span_userdanger("The rod penetrates you!") , "You hear a CLANG!") if(ishuman(L)) var/mob/living/carbon/human/H = L H.adjustBruteLoss(160) @@ -158,13 +158,13 @@ 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.visible_message("[U] suplexes [src] into the ground!", "You suplex [src] into the ground!") + U.visible_message(span_boldwarning("[U] suplexes [src] into the ground!"), span_warning("You 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 13abf5bf54a5..65f76fc8eb47 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -154,8 +154,8 @@ SSshuttle.registerTradeBlockade(src) gps.tracking = TRUE active = TRUE - to_chat(user,"You toggle [src] [active ? "on":"off"].") - to_chat(user,"The scrambling signal can be now tracked by GPS.") + to_chat(user,span_notice("You 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) @@ -180,7 +180,7 @@ /obj/machinery/shuttle_scrambler/proc/dump_loot(mob/user) new /obj/item/holochip(drop_location(), credits_stored) - to_chat(user,"You retrieve the siphoned credits!") + to_chat(user,span_notice("You retrieve the siphoned credits!")) credits_stored = 0 /obj/machinery/shuttle_scrambler/proc/send_notification() @@ -247,7 +247,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() @@ -281,7 +281,7 @@ /obj/machinery/piratepad/multitool_act(mob/living/user, obj/item/multitool/I) if (istype(I)) - to_chat(user, "You register [src] in [I]s buffer.") + to_chat(user, span_notice("You register [src] in [I]s buffer.")) I.buffer = src return TRUE @@ -302,7 +302,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, "You link [src] with [I.buffer] in [I] buffer.") + to_chat(user, span_notice("You link [src] with [I.buffer] in [I] buffer.")) pad = I.buffer return TRUE @@ -402,7 +402,7 @@ if(!value) status_report += "Nothing" - 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 @@ -412,7 +412,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/send),warmup_time, TIMER_STOPPABLE) diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index fb9b2b5053b3..4341c7ae79d0 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_userdanger("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 88a503cd8f98..032cf232da71 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -92,7 +92,7 @@ if(issilicon(crosser)) return if(prob(severity) && istype(crosser) && !isvineimmune(crosser)) - to_chat(crosser, "You accidentally touch the vine and feel a strange sensation.") + to_chat(crosser, span_alert("You 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) @@ -224,13 +224,13 @@ if(prob(severity) && istype(crosser) && !isvineimmune(crosser)) var/mob/living/M = crosser M.adjustBruteLoss(5) - to_chat(M, "You cut yourself on the thorny vines.") + to_chat(M, span_alert("You cut yourself 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(hitter)) var/mob/living/M = hitter M.adjustBruteLoss(5) - to_chat(M, "You cut yourself on the thorny vines.") + to_chat(M, span_alert("You cut yourself on the thorny vines.")) . = expected_damage /datum/spacevine_mutation/woodening @@ -503,7 +503,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 you!") + to_chat(V, span_danger("The vines [pick("wind", "tangle", "tighten")] around you!")) buckle_mob(V, 1) /obj/structure/spacevine/proc/spread() diff --git a/code/modules/events/wizard/aid.dm b/code/modules/events/wizard/aid.dm index 8525674e07a6..d055cc7c3d12 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, "You suddenly feel like you never needed those garish robes in the first place...") + to_chat(L, span_notice("You 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, "You suddenly feel more competent with your casting!") + to_chat(L, span_notice("You suddenly feel more competent with your casting!")) diff --git a/code/modules/events/wizard/ghost.dm b/code/modules/events/wizard/ghost.dm index c288953efb0f..5db01bc93e34 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 = "You suddenly feel extremely obvious..." + var/msg = span_warning("You 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 82e72df3b9d3..5fb04e7f8121 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 6ba9b44ee162..e477105b4e9d 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, "You feel invincible, nothing can hurt you!") \ No newline at end of file + to_chat(H, span_notice("You feel invincible, nothing can hurt you!")) \ No newline at end of file diff --git a/code/modules/events/wizard/race.dm b/code/modules/events/wizard/race.dm index dabc52684585..e40809910413 100644 --- a/code/modules/events/wizard/race.dm +++ b/code/modules/events/wizard/race.dm @@ -23,6 +23,6 @@ for(var/mob/living/carbon/human/H in GLOB.carbon_list) //yes, even the dead H.set_species(new_species) H.dna.unique_enzymes = H.dna.generate_unique_enzymes() - to_chat(H, "You feel somehow... different?") + to_chat(H, span_notice("You feel somehow... different?")) if(!all_the_same) new_species = pick(all_species) diff --git a/code/modules/fields/peaceborg_dampener.dm b/code/modules/fields/peaceborg_dampener.dm index 671c3262e3e9..c7ae3c13bd23 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/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 8eac4c4bd67e..33fb9486a8c6 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -226,7 +226,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."),"[name] pounces on you!") /datum/hallucination/xeno_attack //Xeno crawls from nearby vent,jumps at you, and goes back in @@ -251,10 +251,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 @@ -316,7 +316,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_userdanger("[bubblegum] slams into you!")) sleep(2) sleep(30) qdel(src) @@ -593,7 +593,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( A.override = 1 if(target.client) if(wabbajack) - to_chat(target, "...wabbajack...wabbajack...") + to_chat(target, span_italics("...wabbajack...wabbajack...")) target.playsound_local(target,'sound/magic/staff_change.ogg', 50, 1) delusion = A target.client.images |= A @@ -736,7 +736,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("You feel a tiny prick!") + message_pool.Add(span_warning("You 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 @@ -750,19 +750,19 @@ GLOBAL_LIST_INIT(hallucination_list, list( message_pool.Add("[other] [pick("sneezes","coughs")].") - message_pool.Add("You hear something squeezing through the ducts...", \ - "Your [pick("arm", "leg", "back", "head")] itches.",\ - "You feel [pick("hot","cold","dry","wet","woozy","faint")].", - "Your stomach rumbles.", - "Your head hurts.", - "You hear a faint buzz in your head.", + message_pool.Add(span_notice("You hear something squeezing through the ducts..."), \ + span_notice("Your [pick("arm", "leg", "back", "head")] itches."),\ + span_warning("You feel [pick("hot","cold","dry","wet","woozy","faint")]."), + span_warning("Your stomach rumbles."), + span_warning("Your head hurts."), + span_warning("You hear a faint buzz in your head."), "[target] sneezes.") if(prob(10)) - message_pool.Add("Behind you.",\ - "You hear a faint laughter.", - "You see something move.", - "You hear skittering on the ceiling.", - "You see an inhumanly tall silhouette moving in the distance.") + message_pool.Add(span_warning("Behind you."),\ + span_warning("You hear a faint laughter."), + span_warning("You see something move."), + span_warning("You hear skittering on the ceiling."), + span_warning("You 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) @@ -902,7 +902,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( SEND_SOUND(target, SSstation.announcer.event_sounds[ANNOUNCER_METEORS]) if("supermatter") SEND_SOUND(target, 'sound/magic/charge.ogg') - to_chat(target, "You feel reality distort for a moment...") + to_chat(target, span_boldannounce("You feel reality distort for a moment...")) /datum/hallucination/hudscrew @@ -1106,9 +1106,9 @@ GLOBAL_LIST_INIT(hallucination_list, list( if(AM == target) if(istype(target, /obj/effect/dummy/phased_mob) || istype(target, /obj/effect/dummy/crawling)) return - to_chat(target, "You fall into the chasm!") + to_chat(target, span_userdanger("You fall into the chasm!")) target.Paralyze(40) - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, target, "It's surprisingly shallow."), 15) + addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, target, span_notice("It's surprisingly shallow.")), 15) QDEL_IN(src, 30) /obj/effect/hallucination/danger/anomaly @@ -1176,7 +1176,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_userdanger("You're set on fire!")) target.throw_alert("fire", /obj/screen/alert/fire, override = TRUE) sleep(20) for(var/i in 1 to 3) @@ -1228,7 +1228,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, "You feel a powerful shock course through your body!") + to_chat(target, span_userdanger("You feel a powerful shock course through your 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 b022bec72180..80e953204290 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -25,28 +25,28 @@ /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].", "You swallow a gulp of [src].") + user.visible_message(span_notice("[user] swallows a gulp of [src]."), span_notice("You 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 the contents of [src] to [M].", "[user] attempts to feed the contents of [src] to [M].") + M.visible_message(span_danger("[user] attempts to feed the contents of [src] to [M]."), span_userdanger("[user] attempts to feed the contents of [src] to [M].")) 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 the contents of [src] to [M].", "[user] feeds the contents of [src] to [M].") + M.visible_message(span_danger("[user] feeds the contents of [src] to [M]."), span_userdanger("[user] feeds the contents of [src] to [M].")) 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, "You transfer [trans] units of the solution to [target].") + to_chat(user, span_notice("You 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, "You fill [src] with [trans] units of the contents of [target].") + to_chat(user, span_notice("You 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.is_hot() if(hotness && reagents) reagents.expose_temperature(hotness) - to_chat(user, "You heat [name] with [I]!") + to_chat(user, span_notice("You heat [name] with [I]!")) ..() /obj/item/reagent_containers/food/drinks/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) @@ -410,12 +410,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/items/drink.ogg', 80, 1) reagents.trans_to(H, src.reagents.total_volume, transfered_by = H) //a big sip sleep(5) @@ -431,7 +431,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user) if(M == user && !src.reagents.total_volume && user.a_intent == INTENT_HARM && user.zone_selected == BODY_ZONE_HEAD) - user.visible_message("[user] crushes the can of [src] on [user.p_their()] forehead!", "You 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("You crush the can of [src] on your forehead.")) playsound(user.loc,'sound/weapons/pierce.ogg', rand(10,50), 1) var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.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 2f6b98f8c6bd..3ad35139fb0b 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -89,7 +89,7 @@ return ..() if(HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "You don't want to harm [target]!") + to_chat(user, span_warning("You don't want to harm [target]!")) return var/obj/item/bodypart/affecting = user.zone_selected //Find what the player is aiming at @@ -133,11 +133,11 @@ //Display an attack message. if(target != user) - target.visible_message("[user] has hit [target][head_attack_message] with a bottle of [src.name]!", \ - "[user] has hit [target][head_attack_message] with a bottle of [src.name]!") + target.visible_message(span_danger("[user] has hit [target][head_attack_message] with a bottle of [src.name]!"), \ + span_userdanger("[user] has hit [target][head_attack_message] with a bottle of [src.name]!")) else - user.visible_message("[target] hits [target.p_them()]self with a bottle of [src.name][head_attack_message]!", \ - "[target] hits [target.p_them()]self with a bottle of [src.name][head_attack_message]!") + user.visible_message(span_danger("[target] hits [target.p_them()]self with a bottle of [src.name][head_attack_message]!"), \ + span_userdanger("[target] hits [target.p_them()]self with a bottle of [src.name][head_attack_message]!")) //Attack logs log_combat(user, target, "attacked", src) @@ -523,7 +523,7 @@ active = TRUE log_bomber(user, "has primed a", src, "for detonation") - to_chat(user, "You light [src] on fire.") + to_chat(user, span_info("You light [src] on fire.")) add_overlay(GLOB.fire_overlay) if(!isGlass) spawn(50) @@ -543,9 +543,9 @@ /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, "You snuff out the flame on [src].") + to_chat(user, span_info("You 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 2984525b7b64..5a359b39544c 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -98,9 +98,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, "You break [E] in [src].") + to_chat(user, span_notice("You break [E] in [src].")) reagents.add_reagent(/datum/reagent/consumable/eggyolk, 5) qdel(E) return @@ -109,8 +109,8 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/attack(obj/target, mob/user) if(user.a_intent == 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 [target]!") + target.visible_message(span_danger("[user] splashes the contents of [src] onto [target]!"), \ + span_userdanger("[user] splashes the contents of [src] onto [target]!")) log_combat(user, target, "splashed", src) reagents.reaction(target, TOUCH) reagents.clear_reagents() @@ -123,8 +123,8 @@ return else if(reagents.total_volume && user.a_intent == INTENT_HARM) - user.visible_message("[user] splashes the contents of [src] onto [target]!", \ - "You splash the contents of [src] onto [target].") + user.visible_message(span_danger("[user] splashes the contents of [src] onto [target]!"), \ + span_notice("You 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 d6c8287b8233..b67737b13050 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -27,20 +27,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, "You don't feel so good...") + to_chat(H, span_warning("You 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 8a3c38d9d4ae..2721accc5481 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -33,27 +33,27 @@ possible_states = typelist("possible_states", possible_states) /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 contents of \the [src].", "You swallow some of contents of \the [src].") + user.visible_message(span_notice("[user] swallows some of contents of \the [src]."), span_notice("You swallow some of contents of \the [src].")) else - user.visible_message("[user] attempts to feed [M] from [src].") + user.visible_message(span_warning("[user] attempts to feed [M] from [src].")) if(!do_mob(user, M)) return if(!reagents || !reagents.total_volume) return // The condiment might be empty after the delay. - user.visible_message("[user] feeds [M] from [src].") + user.visible_message(span_warning("[user] feeds [M] from [src].")) log_combat(user, M, "fed", reagents.log_list()) var/fraction = min(10/reagents.total_volume, 1) @@ -69,26 +69,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, "You fill [src] with [trans] units of the contents of [target].") + to_chat(user, span_notice("You 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, "You transfer [trans] units of the condiment to [target].") + to_chat(user, span_notice("You transfer [trans] units of the condiment to [target].")) /obj/item/reagent_containers/food/condiment/on_reagent_change(changetype) if(!possible_states.len) @@ -143,7 +143,7 @@ icon_state = "saltshakersmall" /obj/item/reagent_containers/food/condiment/saltshaker/suicide_act(mob/user) - user.visible_message("[user] begins to swap forms with the salt shaker! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] begins to swap forms with the salt shaker! It looks like [user.p_theyre()] trying to commit suicide!")) var/newname = "[name]" name = "[user.name]" user.name = newname @@ -157,9 +157,9 @@ return if(isturf(target)) if(!reagents.has_reagent(/datum/reagent/consumable/sodiumchloride, 2)) - to_chat(user, "You don't have enough salt to make a pile!") + to_chat(user, span_warning("You don't have enough salt to make a pile!")) return - user.visible_message("[user] shakes some salt onto [target].", "You shake some salt onto [target].") + user.visible_message(span_notice("[user] shakes some salt onto [target]."), span_notice("You shake some salt onto [target].")) reagents.remove_reagent(/datum/reagent/consumable/sodiumchloride, 2) new/obj/effect/decal/cleanable/food/salt(target) return @@ -249,7 +249,7 @@ L = target var/list/seen = viewers(7, target) for(var/mob/M in seen) - to_chat(M, "The water soaks through the sack, and its contents spill all over [target]!") + to_chat(M, span_warning("The water soaks through the sack, and its contents spill all over [target]!")) playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) reagents.reaction(target, TOUCH) new /obj/item/trash/floursack(L) @@ -322,15 +322,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, "You tear open [src], but there's nothing in it.") + to_chat(user, span_warning("You tear open [src], but there's nothing in it.")) qdel(src) return if(target.reagents.total_volume >= target.reagents.maximum_volume) - to_chat(user, "You tear open [src], but [target] is stacked so high that it just drips off!" ) + to_chat(user, span_warning("You tear open [src], but [target] is stacked so high that it just drips off!") ) qdel(src) return else - to_chat(user, "You tear open [src] above [target] and the condiments drip onto it.") + to_chat(user, span_notice("You 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 8f5a48077e58..b4b53a15afc5 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, "You can't add more ingredients to [src]!") + to_chat(user, span_warning("You 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_overlays(S) - to_chat(user, "You add the [I.name] to the [name].") + to_chat(user, span_notice("You add the [I.name] to the [name].")) update_name(S) else . = ..() @@ -257,7 +257,7 @@ var/obj/item/reagent_containers/food/snacks/breadslice/BS = I if(finished) return - to_chat(user, "You finish the [src.name].") + to_chat(user, span_notice("You finish the [src.name].")) finished = 1 name = "[customname] sandwich" BS.reagents.trans_to(src, BS.reagents.total_volume, transfered_by = 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, "You can't add more ingredients to [src]!") + to_chat(user, span_warning("You 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(get_turf(src)) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 4c36232fcb0b..d50aa2c3cf15 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -88,7 +88,7 @@ All foods are distributed among various categories. Use common sense. if(!eatverb) eatverb = pick("bite","chew","nibble","gnaw","gobble","chomp") if(!reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it. - to_chat(user, "None of [src] left, oh no!") + to_chat(user, span_notice("None of [src] left, oh no!")) qdel(src) return FALSE if(iscarbon(M)) @@ -101,39 +101,39 @@ All foods are distributed among various categories. Use common sense. if(M == user) //If you're eating it yourself. if(junkiness && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 && !HAS_TRAIT(user, TRAIT_VORACIOUS)) - to_chat(M, "You don't feel like eating any more junk food at the moment.") + to_chat(M, span_notice("You 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!", "You hungrily [eatverb] \the [src], gobbling it down!") + user.visible_message(span_notice("[user] hungrily [eatverb]s \the [src], gobbling it down!"), span_notice("You hungrily [eatverb] \the [src], gobbling it down!")) else if(fullness > 50 && fullness < 150) - user.visible_message("[user] hungrily [eatverb]s \the [src].", "You hungrily [eatverb] \the [src].") + user.visible_message(span_notice("[user] hungrily [eatverb]s \the [src]."), span_notice("You hungrily [eatverb] \the [src].")) else if(fullness > 150 && fullness < 500) - user.visible_message("[user] [eatverb]s \the [src].", "You [eatverb] \the [src].") + user.visible_message(span_notice("[user] [eatverb]s \the [src]."), span_notice("You [eatverb] \the [src].")) else if(fullness > 500 && fullness < 600) - user.visible_message("[user] unwillingly [eatverb]s a bit of \the [src].", "You unwillingly [eatverb] a bit of \the [src].") + user.visible_message(span_notice("[user] unwillingly [eatverb]s a bit of \the [src]."), span_notice("You 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!", "You 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("You 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) //nom nom nom else if(!isbrain(M)) //If you're feeding it to someone else. if(fullness <= (600 * (1 + M.overeatduration / 1000))) - M.visible_message("[user] attempts to feed [M] [src].", \ - "[user] attempts to feed [M] [src].") + M.visible_message(span_danger("[user] attempts to feed [M] [src]."), \ + span_userdanger("[user] attempts to feed [M] [src].")) else - M.visible_message("[user] cannot force any more of [src] down [M]'s throat!", \ - "[user] cannot force any more of [src] down [M]'s 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 [M]'s throat!")) 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 [M] to eat [src].") + M.visible_message(span_danger("[user] forces [M] to eat [src]."), \ + span_userdanger("[user] forces [M] 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. @@ -172,13 +172,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, "You can't add more ingredients to [src]!") + to_chat(user, span_warning("You 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) @@ -226,19 +226,19 @@ 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, "You cannot slice [src] here! You need a table or at least a tray.") + to_chat(user, span_warning("You cannot slice [src] here! You need a table or at least a tray.")) return FALSE var/slices_lost = 0 if (accuracy >= IS_SHARP_ACCURATE) user.visible_message( \ "[user] slices [src].", \ - "You slice [src]." \ + span_notice("You slice [src].") \ ) else user.visible_message( \ "[user] inaccurately slices [src] with [W]!", \ - "You inaccurately slice [src] with your [W]!" \ + span_notice("You inaccurately slice [src] with your [W]!") \ ) slices_lost = rand(1,min(1,round(slices_num/2))) @@ -350,9 +350,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, "You slip [W] inside [src].") + to_chat(user, span_notice("You 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 e071fb3df72b..fbc39396b032 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, "You flatten [src].") + to_chat(user, span_notice("You flatten [src].")) qdel(src) else - to_chat(user, "You need to put [src] on a surface to roll it out!") + to_chat(user, span_warning("You 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, "You flatten [src].") + to_chat(user, span_notice("You flatten [src].")) qdel(src) else - to_chat(user, "You need to put [src] on a surface to roll it out!") + to_chat(user, span_warning("You need to put [src] on a surface to roll it out!")) else ..() diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm index e450f97807cc..cffc86301bfe 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/effects/smoke.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_cheese.dm b/code/modules/food_and_drinks/food/snacks_cheese.dm index 6877d5a67cf3..1ee30c556797 100644 --- a/code/modules/food_and_drinks/food/snacks_cheese.dm +++ b/code/modules/food_and_drinks/food/snacks_cheese.dm @@ -113,8 +113,8 @@ if(W.use_tool(src, user, 0, volume=40)) var/obj/item/stack/sheet/cheese/new_item = new(usr.loc, 5) user.visible_message("[user.name] shaped [src] into a sturdier looking cheese with [W].", \ - "You shape [src] into a sturdier looking cheese with [W].", \ - "You hear welding.") + span_notice("You shape [src] into a sturdier looking cheese with [W]."), \ + span_italics("You hear welding.")) var/obj/item/reagent_containers/food/snacks/store/cheesewheel/cheddar/R = src qdel(src) var/replace = (user.get_inactive_held_item()==R) diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm index 91629cc88f6f..f5c962dcebd7 100644 --- a/code/modules/food_and_drinks/food/snacks_egg.dm +++ b/code/modules/food_and_drinks/food/snacks_egg.dm @@ -23,7 +23,7 @@ var/mob/living/egg_rper /obj/item/reagent_containers/food/snacks/egg/suicide_act(mob/living/carbon/user) - user.visible_message("[user] RPs as [src]!") + user.visible_message(span_suicide("[user] RPs as [src]!")) if(istype(user) && user.mind) egg_rper = new(src) egg_rper.real_name = name @@ -59,17 +59,17 @@ var/clr = C.item_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, "You colour [src] with [W].") + to_chat(usr, span_notice("You colour [src] with [W].")) icon_state = "egg-[clr]" item_color = 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 = "An egg that has been decorated with the grotesque, robustable likeness of a clown's face. " - to_chat(usr, "You stamp [src] with [W], creating an artistic and not remotely horrifying likeness of clown makeup.") + to_chat(usr, span_notice("You stamp [src] with [W], creating an artistic and not remotely horrifying likeness of clown makeup.")) else ..() @@ -142,11 +142,11 @@ if(istype(W, /obj/item/kitchen/fork)) var/obj/item/kitchen/fork/F = W if(F.forkload) - to_chat(user, "You already have [F.loaded_food] on your fork!") + to_chat(user, span_warning("You already have [F.loaded_food] on your fork!")) else F.icon_state = "forkloaded_egg" user.visible_message("[user] takes a piece of omelette with [user.p_their()] fork!", \ - "You take a piece of omelette with your fork.") + span_notice("You 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 4de741919f25..bdd8d917dfa2 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -322,23 +322,23 @@ 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/suicide_act(mob/living/M) - M.visible_message("[M] is putting [src] in [M.p_their()] mouth! It looks like [M.p_theyre()] trying to commit suicide!") + M.visible_message(span_suicide("[M] is putting [src] in [M.p_their()] mouth! It looks like [M.p_theyre()] trying to commit suicide!")) var/eating_success = do_after(M, 10, TRUE, src, TRUE) if(QDELETED(M)) //qdeletion: the nuclear option of self-harm return SHAME if(!eating_success || QDELETED(src)) //checks if src is gone or if they failed to wait for a second - M.visible_message("[M] chickens out!") + M.visible_message(span_suicide("[M] chickens out!")) return SHAME if(HAS_TRAIT(M, TRAIT_NOHUNGER)) //plasmamen don't have saliva/stomach acid - M.visible_message("[M] realizes [M.p_their()] body won't activate [src]!" - ,"Your body won't activate [src]...") + M.visible_message(span_suicide("[M] realizes [M.p_their()] body won't activate [src]!") + ,span_warning("Your body won't activate [src]...")) return SHAME playsound(M, 'sound/items/eatfood.ogg', rand(10,50), TRUE) M.temporarilyRemoveItemFromInventory(src) //removes from hands, keeps in M @@ -349,10 +349,10 @@ if(QDELETED(M) || QDELETED(src)) return if((src.loc != M)) //how the hell did you manage this - to_chat(M, "Something happened to [src]...") + to_chat(M, span_warning("Something happened to [src]...")) return Expand() - M.visible_message("[M]'s torso bursts open as a primate emerges!") + M.visible_message(span_danger("[M]'s torso bursts open as a primate emerges!")) M.gib(null, TRUE, null, TRUE) /obj/item/reagent_containers/food/snacks/monkeycube/syndicate diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 42d34add4a51..8161095ffb21 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -36,7 +36,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) var/datum/component/mood/mood = H.GetComponent(/datum/component/mood) if(mood) @@ -511,11 +511,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, "You can't add that many pancakes to [src]!") + to_chat(user, span_warning("You can't add that many pancakes to [src]!")) else if(!user.transferItemToLoc(I, src)) return - to_chat(user, "You add the [I] to the [name].") + to_chat(user, span_notice("You add the [I] to the [name].")) P.name = initial(P.name) contents += P update_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 beb2c1b5d48b..fcd9e53a3d77 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -51,7 +51,7 @@ if(stunning) H.Paralyze(20) //splat! H.adjust_blurriness(1) - H.visible_message("[H] is creamed by [src]!", "You've been creamed by [src]!") + H.visible_message(span_warning("[H] is creamed by [src]!"), span_userdanger("You've been creamed by [src]!")) playsound(H, "desceration", 50, TRUE) if(!H.creamed) // one layer at a time H.add_overlay(creamoverlay) diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm index f6d5b0e9d461..dccfc959065f 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 58bdf8425d1b..fb5695346a8b 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/effects/splat.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 776ec5909ec5..6c704e340b1c 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -80,30 +80,30 @@ God bless America. /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].", "You dissolve [I] in [src].") + user.visible_message(span_notice("[user] drops [I] into [src]."), span_notice("You dissolve [I] in [src].")) I.reagents.trans_to(src, I.reagents.total_volume, transfered_by = user) qdel(I) return if(istype(I, /obj/item/syndicate_basket)) if(!superfry) - to_chat(user, "You add [I] to the [src]. ") + to_chat(user, span_warning("You add [I] to the [src]. ")) qdel(I) icon_state = "syndie_fryer_off" superfry = 1 return else - to_chat(user, "There is already a syndicate frying basket in [src].") + to_chat(user, span_warning("There is already a syndicate frying basket in [src].")) 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, "You don't feel it would be wise to fry [I]...") + to_chat(user, span_warning("You don't feel it would be wise to fry [I]...")) return if(istype(I, /obj/item/reagent_containers/food/snacks/deepfryholder)) - to_chat(user, "Your cooking skills are not up to the legendary Doublefry technique.") + to_chat(user, span_userdanger("Your cooking skills are not up to the legendary Doublefry technique.")) return if(istype(I, /obj/item/crowbar)) if(superfry) @@ -121,7 +121,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, "You put [I] into [src].") + to_chat(user, span_notice("You put [I] into [src].")) var/item_reags = I.grind_results frying = new/obj/item/reagent_containers/food/snacks/deepfryholder(src, I) frying.reagents.add_reagent_list(item_reags) @@ -142,10 +142,10 @@ God bless America. if(cook_time >= 30 && !frying_fried) frying_fried = TRUE //frying... frying... fried playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) - 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) return @@ -153,7 +153,7 @@ God bless America. /obj/machinery/deepfryer/attack_hand(mob/user) if(frying) if(frying.loc == src) - to_chat(user, "You eject [frying] from [src].") + to_chat(user, span_notice("You eject [frying] from [src].")) frying.fry(cook_time) icon_state = "fryer_off" if(superfry) @@ -187,7 +187,7 @@ God bless America. if(user.pulling && user.a_intent == INTENT_GRAB && iscarbon(user.pulling) && reagents.total_volume && isliving(user.pulling)) var/mob/living/carbon/C = user.pulling if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, "You need a better grip to do that!") + to_chat(user, span_warning("You need a better grip to do that!")) return user.visible_message("[user] dunks [C]'s face in [src]!") reagents.reaction(C, TOUCH) 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 b0c20246b29e..ddd6e1059a0e 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)) @@ -125,7 +125,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) @@ -136,11 +136,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 748fa2b1c24f..5dfd4c797014 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -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_notice("[src] cannot be used unless bolted to the ground.")) return if(user.pulling && user.a_intent == 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_danger("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_danger("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() @@ -139,10 +139,10 @@ if(src.operating) return if(!src.occupant) - visible_message("You hear a loud metallic grinding sound.") + visible_message(span_italics("You hear a loud metallic grinding sound.")) return use_power(1000) - visible_message("You hear a loud squelchy grinding sound.") + visible_message(span_italics("You hear a loud squelchy grinding sound.")) playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1) 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 dfedabfdd940..af4869dda425 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -32,7 +32,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, "You put [stackamount] [I]s in [src].") + to_chat(user, span_notice("You put [stackamount] [I]s in [src].")) if(istype(I, /obj/item/stack/sheet/mineral/coal)) grill_fuel += (500 * stackamount) else @@ -41,7 +41,7 @@ update_icon() return if(I.resistance_flags & INDESTRUCTIBLE) - to_chat(user, "You don't feel it would be wise to grill [I]...") + to_chat(user, span_warning("You 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)) @@ -49,22 +49,22 @@ if(HAS_TRAIT(food_item, TRAIT_NODROP) || (food_item.item_flags & (ABSTRACT | DROPDEL))) return ..() else if(food_item.foodtype & GRILLED) - to_chat(user, "[food_item] has already been grilled!") + to_chat(user, span_notice("[food_item] has already been grilled!")) return else if(grill_fuel <= 0) - 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(food_item, src)) grilled_item = food_item grilled_item.foodtype |= GRILLED - to_chat(user, "You put the [grilled_item] on [src].") + to_chat(user, span_notice("You 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, "You pour the Monkey Energy in [src].") + to_chat(user, span_notice("You 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 @@ -120,7 +120,7 @@ /obj/machinery/grill/attack_hand(mob/user) if(grilled_item) - to_chat(user, "You take out [grilled_item] from [src].") + to_chat(user, span_notice("You 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 9e022bc1d22d..9ca1a5f28d55 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -102,9 +102,9 @@ if(I.reagents.total_volume < 10) I.reagents.add_reagent(/datum/reagent/consumable/sugar, 10 - I.reagents.total_volume) 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_notice("[O] already has ice cream in it.")) return 1 else if(O.is_drainable()) return @@ -123,11 +123,11 @@ product_types[make_type] += amount var/flavour = get_flavour_name(make_type) if(make_type > 4) - 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, "You don't have the ingredients to make this!") + to_chat(user, span_warning("You don't have the ingredients to make this!")) /obj/machinery/icecream_vat/Topic(href, href_list) if(..()) @@ -135,7 +135,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"]) @@ -144,9 +144,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 4e091556987f..41b1b55642b1 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,9 +78,9 @@ 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"+\ @@ -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].", "You start to fix part of \the [src]...") + user.visible_message("[user] starts to fix part of \the [src].", span_notice("You start to fix part of \the [src]...")) if(O.use_tool(src, user, 20)) - user.visible_message("[user] fixes part of \the [src].", "You fix part of \the [src].") + user.visible_message("[user] fixes part of \the [src].", span_notice("You 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].", "You start to fix part of \the [src]...") + user.visible_message("[user] starts to fix part of \the [src].", span_notice("You start to fix part of \the [src]...")) if(O.use_tool(src, user, 20)) - user.visible_message("[user] fixes \the [src].", "You fix \the [src].") + user.visible_message("[user] fixes \the [src].", span_notice("You 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/effects/spray3.ogg', 50, 1, -6) - user.visible_message("[user] has cleaned \the [src].", "You clean \the [src].") + user.visible_message("[user] has cleaned \the [src].", span_notice("You clean \the [src].")) dirty = 0 update_icon() else - to_chat(user, "You need more space cleaner!") + to_chat(user, span_warning("You 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].", "You start to clean \the [src]...") + user.visible_message("[user] starts to clean \the [src].", span_notice("You start to clean \the [src]...")) if(do_after(user, P.cleanspeed, target = src)) - user.visible_message("[user] has cleaned \the [src].", "You clean \the [src].") + user.visible_message("[user] has cleaned \the [src].", span_notice("You 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, "You insert [loaded] items into \the [src].") + to_chat(user, span_notice("You insert [loaded] items into \the [src].")) return if(O.w_class <= WEIGHT_CLASS_NORMAL && !istype(O, /obj/item/storage) && user.a_intent == 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].", "You add [O] to \the [src].") + user.visible_message("[user] has added \a [O] to \the [src].", span_notice("You 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.", "You hear a microwave humming.") + visible_message("\The [src] turns on.", span_italics("You 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() @@ -333,7 +333,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 5722601ad552..0989a86dff5d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -68,34 +68,34 @@ 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, "You stuff the monkey into the machine.") + to_chat(user, span_notice("You stuff the monkey into the machine.")) playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1) 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, /proc/to_chat, user, "The machine now has [stored_matter] monkey\s worth of material stored.")) + addtimer(CALLBACK(GLOBAL_PROC, /proc/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/machines/hiss.ogg', 50, 1) 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, "You log [src] in the multitool's buffer.") + to_chat(user, span_notice("You 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 e31b9e6eddc4..c04321ac1a8a 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -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,7 +69,7 @@ loaded++ if(loaded) - to_chat(user, "You insert [loaded] items into [src].") + to_chat(user, span_notice("You insert [loaded] items into [src].")) return var/datum/food_processor_process/P = select_recipe(O) @@ -80,31 +80,31 @@ return 1 else if(user.a_intent != 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.a_intent == INTENT_GRAB && ismob(user.pulling) && select_recipe(user.pulling)) if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, "You need a better grip to do that!") + to_chat(user, span_warning("You 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_warner("[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].", \ - "You turn on [src].", \ - "You hear a food processor.") + span_notice("You turn on [src]."), \ + span_italics("You hear a food processor.")) playsound(src.loc, 'sound/machines/blender.ogg', 50, 1) use_power(500) var/total_time = 0 @@ -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) @@ -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 c209629e43bd..dcd5eaae2922 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -72,7 +72,7 @@ . += "The status display reads: Inventory quantity is currently [contents.len] out of [max_n_of_items] items." else if(!(stat & BROKEN)) - . += "The status display is off." + . += span_notice("The status display is off.") /obj/machinery/smartfridge/power_change() ..() @@ -186,7 +186,7 @@ //turn on the blinking red full to capacity indicator if (supports_full_indicator_state && !(stat & (NOPOWER|BROKEN))) add_overlay(full_indicator_state) - src.visible_message("\The [src]'s \"Full Inventory\" indicator light blinks on.", "Your \"Full Inventory\" indicator light blinks on, you are now at capacity.", "You hear a clunk, then a quiet beep.") + src.visible_message(span_warning("\The [src]'s \"Full Inventory\" indicator light blinks on."), span_warning("Your \"Full Inventory\" indicator light blinks on, you are now at capacity."), span_notice("You hear a clunk, then a quiet beep.")) /******************* * Item Adding @@ -213,7 +213,7 @@ power_change() return else - to_chat(user, "[src] needs to have it's maintenance panel open before you can reach the anchoring bolts!") + to_chat(user, span_warning("[src] needs to have it's maintenance panel open before you can reach the anchoring bolts!")) if(default_deconstruction_crowbar(O)) updateUsrDialog() @@ -223,13 +223,13 @@ //Unable to add an item, it's already full. 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 //Adding a single item if(accept_check(O)) load(O) - user.visible_message("[user] has added \the [O] to \the [src].", "You add \the [O] to \the [src].") + user.visible_message("[user] has added \the [O] to \the [src].", span_notice("You add \the [O] to \the [src].")) update_icon() updateUsrDialog() if(contents.len >= max_n_of_items) @@ -252,15 +252,15 @@ if(contents.len >= max_n_of_items) indicate_full() user.visible_message("[user] loads \the [src] with \the [O].", \ - "You fill \the [src] with \the [O].") + span_notice("You fill \the [src] with \the [O].")) else user.visible_message("[user] loads \the [src] with \the [O].", \ - "You load \the [src] with \the [O].") + span_notice("You 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.")) 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 //Adding items from a borg's organ storage @@ -271,7 +271,7 @@ if(accept_check(organ)) load(organ) OS.clear_organ() - user.visible_message("[user] has added \the [organ] to \the [src].", "You add \the [organ] to \the [src].") + user.visible_message("[user] has added \the [organ] to \the [src].", span_notice("You add \the [organ] to \the [src].")) update_icon() updateUsrDialog() if(contents.len >= max_n_of_items) @@ -279,7 +279,7 @@ return TRUE if(user.a_intent != INTENT_HARM) - to_chat(user, "\The [src] smartly refuses [O].") + to_chat(user, span_warning("\The [src] smartly refuses [O].")) updateUsrDialog() return FALSE else @@ -298,7 +298,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 @@ -353,11 +353,11 @@ 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(!dispenser_arm) - audible_message("\The [src] makes a loud clunk and the dispenser arm twitches slightly.", "The dispenser arm on the [src] twitches slightly.") + audible_message(span_warning("\The [src] makes a loud clunk and the dispenser arm twitches slightly."), span_warning("The dispenser arm on the [src] twitches slightly.")) return if (params["amount"]) @@ -436,10 +436,10 @@ //so we have to override the wiring/deconstruction of the default smartfridge here /obj/machinery/smartfridge/drying_rack/attackby(obj/item/O, mob/user, params) if(!(flags_1 & NODECONSTRUCT_1) && O.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "[src] has nothing to unscrew! You think you can probably pry out the shelves, though.") + to_chat(user, span_warning("[src] has nothing to unscrew! You think you can probably pry out the shelves, though.")) return else if(!(flags_1 & NODECONSTRUCT_1) && O.tool_behaviour == TOOL_WRENCH) - to_chat(user, "[src] has no bolts to wrench! You think you can probably pry out the shelves, though.") + to_chat(user, span_warning("[src] has no bolts to wrench! You think you can probably pry out the shelves, though.")) return else return ..() diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm index c82e401d4b7d..e4c7c3da87e2 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, "You take [pizza] out of [src].") + to_chat(user, span_notice("You 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, "You carefully remove the [bomb] from [src].") + to_chat(user, span_notice("You 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, "You trap [src] with [bomb].") + to_chat(user, span_warning("You 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, "You remove the topmost [name] from the stack.") + to_chat(user, span_notice("You 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, "You put [newbox] on top of [src]!") + to_chat(user, span_notice("You 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, "You can't keep holding the stack!") + to_chat(user, span_danger("You 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, "You put [I] in [src].") + to_chat(user, span_notice("You 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, "You put [I] in [src]. Sneeki breeki...") + to_chat(user, span_notice("You 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_notice("[src] already has a bomb in it!")) else if(istype(I, /obj/item/pen)) if(!open) if(!user.is_literate()) - to_chat(user, "You scribble illegibly on [src]!") + to_chat(user, span_notice("You 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, "You write with [I] on [src].") + to_chat(user, span_notice("You 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 b9a7012f6018..22bc520a55e4 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -555,7 +555,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 f5a542839b67..9c53e54cc252 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.", "You draw a card from the deck.") + user.visible_message("[user] draws a card from the deck.", span_notice("You 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.","You add the card to the bottom of the deck.") + user.visible_message("[user] adds a card to the bottom of the deck.",span_notice("You 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,7 +145,7 @@ /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, "You scribble illegibly on [src]!") + to_chat(user, span_notice("You scribble illegibly on [src]!")) return if(!blank) to_chat(user, "You cannot write on that card.") diff --git a/code/modules/games/wizoff.dm b/code/modules/games/wizoff.dm index 351527cc2651..6f355a0bebf9 100644 --- a/code/modules/games/wizoff.dm +++ b/code/modules/games/wizoff.dm @@ -13,7 +13,7 @@ cards += "[card]" /obj/item/toy/cards/deck/wizoff/examine(mob/user) - var/list/msg = list("Remember the rules of Wiz-Off!") + var/list/msg = list(span_notice("Remember the rules of Wiz-Off!")) msg += "\tEach player draws 5 cards." msg += "\tThere are five rounds. Each round, a player selects a card to play, and the winner is selected based on the following rules:" msg += "\tDefensive beats Offensive!" diff --git a/code/modules/goals/station_goals/bsa.dm b/code/modules/goals/station_goals/bsa.dm index 5343fac7b43d..704a334a8c93 100644 --- a/code/modules/goals/station_goals/bsa.dm +++ b/code/modules/goals/station_goals/bsa.dm @@ -44,7 +44,7 @@ return var/obj/item/multitool/M = I M.buffer = src - to_chat(user, "You store linkage information in [I]'s buffer.") + to_chat(user, span_notice("You store linkage information in [I]'s buffer.")) return TRUE /obj/machinery/bsa/front @@ -57,7 +57,7 @@ return var/obj/item/multitool/M = I M.buffer = src - to_chat(user, "You store linkage information in [I]'s buffer.") + to_chat(user, span_notice("You store linkage information in [I]'s buffer.")) return TRUE /obj/machinery/bsa/middle @@ -75,13 +75,13 @@ if(istype(M.buffer, /obj/machinery/bsa/back)) back = M.buffer M.buffer = null - to_chat(user, "You link [src] with [back].") + to_chat(user, span_notice("You link [src] with [back].")) else if(istype(M.buffer, /obj/machinery/bsa/front)) front = M.buffer M.buffer = null - to_chat(user, "You link [src] with [front].") + to_chat(user, span_notice("You 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/goals/station_goals/dna_vault.dm b/code/modules/goals/station_goals/dna_vault.dm index 336c174579fe..bf8e7063909e 100644 --- a/code/modules/goals/station_goals/dna_vault.dm +++ b/code/modules/goals/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_warning("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_warning("No compatible DNA detected")) return if(animals[target.type]) - to_chat(user, "Animal data already present in local storage.") + to_chat(user, span_notice("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" @@ -246,7 +246,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 ..() @@ -258,32 +258,32 @@ var/datum/species/S = H.dna.species switch(upgrade_type) if(VAULT_TOXIN) - to_chat(H, "You feel resistant to airborne toxins.") + to_chat(H, span_notice("You 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, "Your lungs feel great.") + to_chat(H, span_notice("Your lungs feel great.")) ADD_TRAIT(H, TRAIT_NOBREATH, "dna_vault") if(VAULT_FIREPROOF) - to_chat(H, "You feel fireproof.") + to_chat(H, span_notice("You 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, "You feel tough.") + to_chat(H, span_notice("You feel tough.")) S.armor += 30 ADD_TRAIT(H, TRAIT_PIERCEIMMUNE, "dna_vault") if(VAULT_SPEED) - to_chat(H, "Your legs feel faster.") + to_chat(H, span_notice("Your legs feel faster.")) H.add_movespeed_modifier(MOVESPEED_ID_DNA_VAULT, update=TRUE, priority=100, multiplicative_slowdown=-0.74, blacklisted_movetypes=(FLYING|FLOATING)) if(VAULT_QUICK) - to_chat(H, "Your arms move as fast as lightning.") + to_chat(H, span_notice("Your arms move as fast as lightning.")) H.next_move_modifier *= 0.5 users[H] = TRUE power_lottery[H] = list() diff --git a/code/modules/goals/station_goals/shield.dm b/code/modules/goals/station_goals/shield.dm index bc2fdb2ea268..05987714fd38 100644 --- a/code/modules/goals/station_goals/shield.dm +++ b/code/modules/goals/station_goals/shield.dm @@ -105,10 +105,10 @@ /obj/machinery/satellite/proc/toggle(mob/user) if(!active && !isinspace()) if(user) - to_chat(user, "You can only activate [src] in space.") + to_chat(user, span_warning("You can only activate [src] in space.")) return FALSE if(user) - to_chat(user, "You [active ? "deactivate": "activate"] [src].") + to_chat(user, span_notice("You [active ? "deactivate": "activate"] [src].")) active = !active if(active) animate(src, pixel_y = 2, time = 10, loop = -1) @@ -122,7 +122,7 @@ icon_state = active ? "sat_active" : "sat_inactive" /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 @@ -173,6 +173,6 @@ if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - to_chat(user, "You access the satellite's debug mode, increasing the chance of meteor strikes.") + to_chat(user, span_notice("You access the satellite's debug mode, increasing the chance of meteor strikes.")) if(active) change_meteor_chance(2) diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 09b246fbcd93..c513dd802e36 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -135,7 +135,7 @@ /obj/item/reagent_containers/food/snacks/egg/attack_self(mob/user) ..() if(containsPrize) - to_chat(user, "You unwrap [src] and find a prize inside!") + to_chat(user, span_notice("You 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 34992e85a866..cffcefa64b3a 100644 --- a/code/modules/holiday/halloween.dm +++ b/code/modules/holiday/halloween.dm @@ -90,7 +90,7 @@ trapped = 0 else if(trapped == ANGRY_FAITHLESS) - visible_message("The closet bursts open!") + visible_message(span_userdanger("The closet bursts open!")) visible_message("THIS BEING RADIATES PURE EVIL! YOU BETTER RUN!!!") playsound(loc, 'sound/hallucinations/wail.ogg', 300, 1) var/mob/living/simple_animal/hostile/faithless/F = new(loc) @@ -236,7 +236,7 @@ playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1) qdel(src) else - visible_message("[src] seems to be resisting the effect!") + visible_message(span_danger("[src] seems to be resisting the effect!")) else ..() diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index 206dcd7e2a4c..22406c31bade 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -171,7 +171,7 @@ return playsound(src, "sparks", 75, 1) obj_flags |= EMAGGED - to_chat(user, "You vastly increase projector power and override the safety and security protocols.") + to_chat(user, span_warning("You 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)) diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index 7b03d1219c4f..f9d900dc8dd1 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -54,14 +54,14 @@ w_class = WEIGHT_CLASS_BULKY hitsound = 'sound/weapons/blade1.ogg' playsound(user, 'sound/weapons/saberon.ogg', 20, 1) - to_chat(user, "[src] is now active.") + to_chat(user, span_warning("[src] is now active.")) else force = 3 icon_state = "sword0" w_class = WEIGHT_CLASS_SMALL hitsound = "swing_hit" playsound(user, 'sound/weapons/saberoff.ogg', 20, 1) - to_chat(user, "[src] can now be concealed.") + to_chat(user, span_warning("[src] can now be concealed.")) return //BASKETBALL OBJECTS @@ -88,7 +88,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 @@ -105,7 +105,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) . = ..() @@ -114,11 +114,11 @@ if(user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling)) var/mob/living/L = user.pulling if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, "You need a better grip to do that!") + to_chat(user, span_warning("You 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 ..() @@ -127,10 +127,10 @@ if (isitem(AM) && !istype(AM,/obj/item/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 ..() @@ -160,7 +160,7 @@ return /obj/machinery/readybutton/attack_paw(mob/user as mob) - to_chat(user, "You are too primitive to use this device!") + to_chat(user, span_warning("You are too primitive to use this device!")) return /obj/machinery/readybutton/attackby(obj/item/W as obj, mob/user as mob, params) @@ -171,7 +171,7 @@ 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) @@ -179,7 +179,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 diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index 68e5573d1110..9f73da8c7873 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -131,34 +131,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) @@ -167,7 +167,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 @@ -179,7 +179,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 @@ -190,10 +190,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 @@ -216,9 +216,9 @@ B.target = user bee_mad = TRUE if(bee_mad) - 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)) @@ -226,14 +226,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 @@ -245,11 +245,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) @@ -258,7 +258,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 5f86b9c1dfa9..115ef140ed84 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -80,7 +80,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)) @@ -98,15 +98,15 @@ . = 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, "You add the container to the machine.") + to_chat(user, span_notice("You add the container to the machine.")) update_icon() 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)) @@ -115,7 +115,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) @@ -123,11 +123,11 @@ if(SEND_SIGNAL(PB, COMSIG_TRY_STORAGE_TAKE, G, src)) i++ if(iYou empty the plant bag into the biogenerator.") + to_chat(user, span_info("You empty the plant bag into the biogenerator.")) else if(PB.contents.len == 0) - to_chat(user, "You empty the plant bag into the biogenerator, filling it to its capacity.") + to_chat(user, span_info("You empty the plant bag into the biogenerator, filling it to its capacity.")) else - to_chat(user, "You fill the biogenerator to its capacity.") + to_chat(user, span_info("You fill the biogenerator to its capacity.")) return TRUE //no afterattack else if(istype(O, /obj/item/reagent_containers/food/snacks/grown)) @@ -135,15 +135,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, "You put [O.name] in [src.name]") + to_chat(user, span_info("You 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]...", - "You begin to load a design from \the [O]...", - "You hear the chatter of a floppy drive.") + user.visible_message(span_notice("[user] begins to load \the [O] in \the [src]..."), + span_notice("You begin to load a design from \the [O]..."), + span_hear("You hear the chatter of a floppy drive.")) processing = TRUE var/obj/item/disk/design_disk/D = O if(do_after(user, 10, target = src)) @@ -153,7 +153,7 @@ processing = FALSE return TRUE else - to_chat(user, "You cannot put this in [src.name]!") + to_chat(user, span_warning("You cannot put this in [src.name]!")) /obj/machinery/biogenerator/AltClick(mob/living/user) . = ..() @@ -172,7 +172,7 @@ if(stat != NONE) return if(processing) - to_chat(user, "The biogenerator is in the process of working.") + to_chat(user, 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 d2aa0f2d35c5..338a071ccd6a 100644 --- a/code/modules/hydroponics/fermenting_barrel.dm +++ b/code/modules/hydroponics/fermenting_barrel.dm @@ -17,7 +17,7 @@ /obj/structure/fermenting_barrel/examine(mob/user) . = ..() - . += "It is currently [open?"open, letting you pour liquids in.":"closed, letting you draw liquids from the tap."]" + . += span_notice("It is currently [open?"open, letting you pour liquids in.":"closed, letting you draw liquids from the tap."]") /obj/structure/fermenting_barrel/proc/makeWine(obj/item/reagent_containers/food/snacks/grown/fruit) if(fruit.reagents) @@ -42,12 +42,12 @@ var/obj/item/reagent_containers/food/snacks/grown/fruit = I if(istype(fruit)) if(!fruit.can_distill) - to_chat(user, "You can't distill this into anything...") + to_chat(user, span_warning("You can't distill this into anything...")) return TRUE else 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, "You place [I] into [src] to start the fermentation process.") + to_chat(user, span_notice("You place [I] into [src] to start the fermentation process.")) addtimer(CALLBACK(src, .proc/makeWine, fruit), rand(80, 120) * speed_multiplier) return TRUE else @@ -58,11 +58,11 @@ if(open) DISABLE_BITFIELD(reagents.flags, DRAINABLE) ENABLE_BITFIELD(reagents.flags, REFILLABLE) - to_chat(user, "You open [src], letting you fill it.") + to_chat(user, span_notice("You open [src], letting you fill it.")) else ENABLE_BITFIELD(reagents.flags, DRAINABLE) DISABLE_BITFIELD(reagents.flags, REFILLABLE) - to_chat(user, "You close [src], letting you draw from its tap.") + to_chat(user, span_notice("You close [src], letting you draw from its tap.")) 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 d2ad0bb3f7f3..089adcebc109 100644 --- a/code/modules/hydroponics/gene_modder.dm +++ b/code/modules/hydroponics/gene_modder.dm @@ -80,23 +80,23 @@ if(istype(I, /obj/item/seeds)) if(seed) - to_chat(user, "A sample is already loaded into the machine!") + to_chat(user, span_warning("A sample is already loaded into the machine!")) else if(!user.temporarilyRemoveItemFromInventory(I)) return insert_seed(I) - to_chat(user, "You add [I] to the machine.") + to_chat(user, span_notice("You add [I] to the machine.")) interact(user) return 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 eject_disk() if(!user.transferItemToLoc(I, src)) return disk = I - to_chat(user, "You add [I] to the machine.") + to_chat(user, span_notice("You add [I] to the machine.")) interact(user) else ..() @@ -132,7 +132,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)) @@ -268,7 +268,7 @@ if(!usr.temporarilyRemoveItemFromInventory(I)) return insert_seed(I) - to_chat(usr, "You add [I] to the machine.") + to_chat(usr, span_notice("You add [I] to the machine.")) update_icon() else if(href_list["eject_disk"] && !operation) var/obj/item/I = usr.get_active_held_item() @@ -277,7 +277,7 @@ if(!usr.transferItemToLoc(I, src)) return disk = I - to_chat(usr, "You add [I] to the machine.") + to_chat(usr, span_notice("You add [I] to the machine.")) update_icon() else if(href_list["op"] == "insert" && disk && disk.gene && seed) if(!operation) // Wait for confirmation @@ -446,12 +446,12 @@ /obj/item/disk/plantgene/attack_self(mob/user) read_only = !read_only - to_chat(user, "You flip the write-protect tab to [src.read_only ? "protected" : "unprotected"].") + to_chat(user, span_notice("You 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"]." /obj/machinery/plantgenes/AltClick(mob/user) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 3bfb59d98117..fd6d1b146c31 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -131,7 +131,7 @@ if(trash) generate_trash(T) - visible_message("[src] has been squashed.","You hear a smack.") + visible_message(span_warning("[src] has been squashed."),span_italics("You hear a smack.")) if(seed) for(var/datum/plant_gene/trait/trait in seed.genes) trait.on_squash(src, target) @@ -158,7 +158,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 @@ -185,4 +185,4 @@ T = generate_trash() qdel(src) user.putItemFromInventoryInHandIfPossible(T, user.active_hand_index, TRUE) - to_chat(user, "You open [src]\'s shell, revealing \a [T].") + to_chat(user, span_notice("You open [src]\'s shell, revealing \a [T].")) diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index c02825c72d5c..ecef3f9940b4 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/items/bikehorn.ogg', 50, 1, -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/misc/slip.ogg', 50, 1, -1) return (BRUTELOSS) diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm index f4520d7fcfbb..eb066667ffd3 100644 --- a/code/modules/hydroponics/grown/cereals.dm +++ b/code/modules/hydroponics/grown/cereals.dm @@ -97,7 +97,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.", "You crush [src] into something that resembles meat.") + user.visible_message(span_notice("[user] crushes [src] into meat."), span_notice("You crush [src] into something that resembles meat.")) playsound(user, 'sound/effects/blobattack.ogg', 50, 1) 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 382f285b303b..68ffb070dbeb 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, "Your hand holding [src] burns!") + to_chat(held_mob, span_warning("Your 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 b586bc1c2aee..42ff4cba1409 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]!", "You prime [src]!") + user.visible_message(span_warning("[user] primes [src]!"), span_userdanger("You 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 47b1b01c3ba6..f2d8e2f82cb0 100644 --- a/code/modules/hydroponics/grown/corn.dm +++ b/code/modules/hydroponics/grown/corn.dm @@ -42,7 +42,7 @@ /obj/item/grown/corncob/attackby(obj/item/grown/W, mob/user, params) if(W.is_sharp()) - to_chat(user, "You use [W] to fashion a pipe out of the corn cob!") + to_chat(user, span_notice("You use [W] to fashion a pipe out of the corn cob!")) new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc) qdel(src) else @@ -77,7 +77,7 @@ /obj/item/grown/snapcorn/attack_self(mob/user) ..() - to_chat(user, "You pick a snap pop from the cob.") + to_chat(user, span_notice("You 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 a3ac7d33be16..bef3960cdff1 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("You pull some [cotton_name] out of the [name]!", MSG_VISUAL) + user.show_message(span_notice("You 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, "You add the newly-formed [cotton_name] to the stack. It now contains [cotton.amount] [cotton_name].") + to_chat(user, span_notice("You 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 8e57bde1d510..aca28f69a395 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -226,7 +226,7 @@ if(!..()) return if(isliving(M)) - to_chat(M, "You are lit on fire from the intense heat of the [name]!") + to_chat(M, span_danger("You 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)]") @@ -239,13 +239,13 @@ 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 your bare hand!") + to_chat(user, span_danger("The [name] burns your bare hand!")) user.adjustFireLoss(rand(1, 5)) // Beebalm diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm index bbaccbc437dd..bdefae0d4c11 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, "You prepare the astroturf.") + to_chat(user, span_notice("You 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 5f1fdcdaa920..3b6a48f87c61 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, "You need more space to plant [src].") + to_chat(user, span_warning("You 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, "You plant [src].") + to_chat(user, span_notice("You 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, "You plant the kudzu. You monster.") + to_chat(user, span_notice("You 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 59b1128cee4a..d4f05e2db948 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 = 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) @@ -67,9 +67,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/effect/decal/cleanable/ash(drop_location()) diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index 2aa31b96e537..6ed556246ffb 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -171,7 +171,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]!", "You pluck the stem from [src], which begins to hiss loudly!") + user.visible_message(span_warning("[user] plucks the stem from [src]!"), span_userdanger("You 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 f1794367721c..43839259f578 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -163,7 +163,7 @@ /obj/item/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user) if(GLOB.walkingmushroom.len > MAX_WALKINGMUSHROOM) - to_chat(user, "There are too many walking mushrooms!") // Someone spammed mushrooms so now this exists :( + to_chat(user, span_notice("There are too many walking mushrooms!")) // Someone spammed mushrooms so now this exists :( return if(isspaceturf(user.loc)) @@ -176,7 +176,7 @@ M.health = M.maxHealth GLOB.walkingmushroom += M qdel(src) - to_chat(user, "You plant the walking mushroom.") + to_chat(user, span_notice("You plant the walking mushroom.")) // Chanterelle @@ -240,7 +240,7 @@ if(isspaceturf(user.loc)) return FALSE if(!isturf(user.loc)) - to_chat(user, "You need more space to plant [src].") + to_chat(user, span_warning("You need more space to plant [src].")) return FALSE var/count = 0 var/maxcount = 1 @@ -251,10 +251,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, "You plant [src].") + to_chat(user, span_notice("You plant [src].")) qdel(src) return TRUE diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index 7fe9d52fe50b..667beec45251 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_userdanger("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) @@ -99,13 +99,13 @@ if(..()) if(prob(50)) user.Paralyze(100) - to_chat(user, "You are stunned by the Deathnettle as you try picking it up!") + to_chat(user, span_userdanger("You 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, "You are stunned by the powerful acid of the Deathnettle!") + to_chat(M, span_danger("You 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 910da7f7d182..ba1a769e403e 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.is_sharp()) - to_chat(user, "You cut the potato into wedges with [W].") + to_chat(user, span_notice("You 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 3dc1861f7454..e64e4eba15e3 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.is_sharp()) - user.show_message("You carve a face into [src]!", MSG_VISUAL) + user.show_message(span_notice("You 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 ca7b23477423..e6ff6307c629 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 b2e8e36a5591..0ef7f8202a8c 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.is_sharp()) - to_chat(user, "You sharpen the carrot into a shiv with [I].") + to_chat(user, span_notice("You 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 065a4b5bd102..c69d76cb4ca8 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, "You begin to awaken the Killer Tomato...") + to_chat(user, span_notice("You begin to awaken the Killer Tomato...")) awakening = 1 spawn(30) @@ -142,6 +142,6 @@ K.melee_damage_upper += round(seed.potency / 15) 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.")) log_game("[key_name(usr)] activated a killer tomato at [AREACOORD(src)].") qdel(src) diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index 1f9d2b64543d..9e92d56e97e1 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -53,7 +53,7 @@ /obj/item/grown/log/attackby(obj/item/W, mob/user, params) if(W.is_sharp()) - user.show_message("You make [plank_name] out of \the [src]!", MSG_VISUAL) + user.show_message(span_notice("You make [plank_name] out of \the [src]!"), MSG_VISUAL) var/seed_modifier = 0 if(seed) seed_modifier = round(seed.potency / 25) @@ -63,13 +63,13 @@ 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, "You add the newly-formed [plank_name] to the stack. It now contains [plank.amount] [plank_name].") + to_chat(user, span_notice("You add the newly-formed [plank_name] to the stack. It now contains [plank.amount] [plank_name].")) qdel(src) if(CheckAccepted(W)) var/obj/item/reagent_containers/food/snacks/grown/leaf = W if(leaf.dry) - user.show_message("You wrap \the [W] around the log, turning it into a torch!") + user.show_message(span_notice("You wrap \the [W] around the log, turning it into a torch!")) var/obj/item/flashlight/flare/torch/T = new /obj/item/flashlight/flare/torch(user.loc) usr.dropItemToGround(W) usr.put_in_active_hand(T) @@ -182,14 +182,14 @@ R.use(1) can_buckle = TRUE buckle_requires_restraints = TRUE - to_chat(user, "You add a rod to \the [src].") + to_chat(user, span_italics("You 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, "You add a grill to \the [src].") + to_chat(user, span_italics("You add a grill to \the [src].")) add_overlay("bonfire_grill") else return ..() @@ -215,7 +215,7 @@ if(.) return if(burning) - to_chat(user, "You need to extinguish [src] before removing the logs!") + to_chat(user, span_warning("You 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 37c5637d9314..dd3affc95ec3 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/weapons/bladeslice.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 @@ -100,7 +100,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/weapons/bladeslice.ogg', 50, 1, -1) return (BRUTELOSS) @@ -133,7 +133,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 b013ab202456..541f04dce091 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -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 @@ -304,27 +304,27 @@ if(myseed) . += "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, "" ) @@ -361,7 +361,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]!")) update_name() /obj/machinery/hydroponics/proc/mutate(lifemut = 2, endmut = 5, productmut = 1, yieldmut = 2, potmut = 25, wrmut = 2, wcmut = 5, traitmut = 0) // Mutates the current seed @@ -395,7 +395,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]!")) update_name() /obj/machinery/hydroponics/proc/mutateweed() // If the weeds gets the mutagent instead. Mind you, this pretty much destroys the old plant @@ -415,10 +415,10 @@ 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]!")) update_name() 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 plant_health = 0 @@ -435,10 +435,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) @@ -449,7 +449,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) @@ -457,13 +457,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)) @@ -501,7 +501,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/charcoal, 1)) @@ -685,7 +685,7 @@ if(1 to 32) mutatepest(user) else - to_chat(user, "Nothing happens...") + to_chat(user, span_warning("Nothing happens...")) /obj/machinery/hydroponics/attack_ghost(mob/user) if(myseed) @@ -711,11 +711,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, "You can't get any extract out of this plant." ) + to_chat(user, span_warning("You 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_notice("[reagent_source] is empty.")) return 1 var/list/trays = list(src)//makes the list just this in cases of syringes and compost etc @@ -755,7 +755,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) @@ -784,7 +784,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, "You plant [O].") + to_chat(user, span_notice("You plant [O].")) dead = 0 myseed = O update_name() @@ -793,7 +793,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) @@ -813,11 +813,11 @@ else if(istype(O, /obj/item/cultivator)) if(weedlevel > 0) - user.visible_message("[user] uproots the weeds.", "You remove the weeds from [src].") + user.visible_message("[user] uproots the weeds.", span_notice("You 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) @@ -829,23 +829,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.", \ - "You [using_irrigation ? "" : "dis"]connect [src]'s irrigation hoses.") + user.visible_message(span_notice("[user] [using_irrigation ? "" : "dis"]connects [src]'s irrigation hoses."), \ + span_notice("You [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...", - "You start digging out [src]'s plants...") + user.visible_message(span_notice("[user] starts digging out [src]'s plants..."), + span_notice("You 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]!", "You dig out all of [src]'s plants!") + user.visible_message(span_notice("[user] digs out the plants in [src]!"), span_notice("You 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 @@ -867,7 +867,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 ..() @@ -883,7 +883,7 @@ else if(dead) dead = 0 - to_chat(user, "You remove the dead plant from [src].") + to_chat(user, span_notice("You remove the dead plant from [src].")) qdel(myseed) myseed = null update_name() @@ -896,11 +896,11 @@ harvest = 0 lastproduce = age if(istype(myseed, /obj/item/seeds/replicapod)) - to_chat(user, "You harvest from the [myseed.plantname].") + to_chat(user, span_notice("You harvest from the [myseed.plantname].")) else if(myseed.getYield() <= 0) - to_chat(user, "You fail to harvest anything useful!") + to_chat(user, span_warning("You fail to harvest anything useful!")) else - to_chat(user, "You harvest [myseed.getYield()] items from the [myseed.plantname].") + to_chat(user, span_notice("You harvest [myseed.getYield()] items from the [myseed.plantname].")) if(!myseed.get_gene(/datum/plant_gene/trait/repeated_harvest)) qdel(myseed) myseed = null @@ -938,7 +938,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() @@ -968,7 +968,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, "You clear up [src]!") + to_chat(user, span_notice("You clear up [src]!")) qdel(src) else return ..() diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 79c03b3b397f..78082f002fb5 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -178,7 +178,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. @@ -189,7 +189,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) ..() @@ -240,7 +240,7 @@ C.update_icon() batteries_recharged = 1 if(batteries_recharged) - to_chat(target, "Your batteries are recharged!") + to_chat(target, span_notice("Your batteries are recharged!")) @@ -249,7 +249,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" @@ -299,7 +299,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, "You slip through spacetime!") + to_chat(C, span_warning("You 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) @@ -334,7 +334,7 @@ if(istype(I, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = I if(C.use(5)) - to_chat(user, "You add some cable to [G] and slide it inside the battery encasing.") + to_chat(user, span_notice("You 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 @@ -353,7 +353,7 @@ qdel(G) else - to_chat(user, "You need five lengths of cable to make a [G] battery!") + to_chat(user, span_warning("You need five lengths of cable to make a [G] battery!")) /datum/plant_gene/trait/stinging @@ -370,7 +370,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, "You are pricked by [G]!") + to_chat(target, span_danger("You are pricked by [G]!")) /datum/plant_gene/trait/smoke name = "gaseous decomposition" diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 34123033d4f9..490639091975 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -104,20 +104,20 @@ ++loaded add_seed(G) if (loaded) - to_chat(user, "You put as many seeds from \the [O.name] into [src] as you can.") + to_chat(user, span_notice("You 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, "You extract some seeds.") + to_chat(user, span_notice("You extract some seeds.")) return else if (istype(O, /obj/item/seeds)) if(add_seed(O)) - to_chat(user, "You add [O] to [src.name].") + to_chat(user, span_notice("You add [O] to [src.name].")) return else if(user.a_intent != INTENT_HARM) - to_chat(user, "You can't extract any seeds from \the [O.name]!") + to_chat(user, span_warning("You can't extract any seeds from \the [O.name]!")) else return ..() @@ -143,7 +143,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) @@ -197,4 +197,4 @@ piles[item] -= WO O.forceMove(drop_location()) . = TRUE - //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]!")) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 6a4d7ae1d2f4..376396a4ec2a 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -330,14 +330,14 @@ to_chat(user, "*---------*\n This is \a [src].") var/text = get_analyzer_text() if(text) - to_chat(user, "[text]") + to_chat(user, span_notice("[text]")) /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].") var/text = get_analyzer_text() if(text) - to_chat(user, "[text]") + to_chat(user, span_notice("[text]")) return diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index c825f9ad9d34..180dc1fa6acf 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -27,12 +27,12 @@ return user.incapacitated() || !((loc == user) || (isturf(loc) && Adjacent(user))) // sorry, no more TK playing. /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/attack_self(mob/user) if(!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return TRUE interact(user) @@ -225,7 +225,7 @@ /obj/item/instrument/harmonica/proc/handle_speech(datum/source, list/speech_args) if(song.playing && ismob(loc)) - to_chat(loc, "You stop playing the harmonica to talk...") + to_chat(loc, span_warning("You stop playing the harmonica to talk...")) song.playing = FALSE /obj/item/instrument/harmonica/equipped(mob/M, slot) diff --git a/code/modules/instruments/songs/_song.dm b/code/modules/instruments/songs/_song.dm index 019ecc41f579..55116912977e 100644 --- a/code/modules/instruments/songs/_song.dm +++ b/code/modules/instruments/songs/_song.dm @@ -203,11 +203,11 @@ if(playing) return if(!using_instrument?.ready()) - to_chat(user, "An error has occured with [src]. Please reset the instrument.") + to_chat(user, span_warning("An error has occured with [src]. Please reset the instrument.")) return compile_chords() if(!length(compiled_chords)) - to_chat(user, "Song is empty.") + to_chat(user, span_warning("Song is empty.")) return playing = TRUE updateDialog(user_playing) diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm index 06a0b22cf47b..afe94f23ec02 100644 --- a/code/modules/jobs/job_exp.dm +++ b/code/modules/jobs/job_exp.dm @@ -147,49 +147,49 @@ GLOBAL_PROTECT(exp_to_update) if(holder && !holder.deadmined) play_records[EXP_TYPE_ADMIN] += minutes if(announce_changes) - to_chat(src,"You got: [minutes] Admin EXP!") + to_chat(src,span_notice("You got: [minutes] Admin EXP!")) //This doesn't use is_mentor(), thats intentional, we don't want admins to rack up mentor playtime because theyre admins not mentors if(mentor_datum) play_records[EXP_TYPE_MENTOR] += minutes if(announce_changes) - to_chat(src,"You got: [minutes] Mentor EXP!") + to_chat(src,span_notice("You got: [minutes] Mentor EXP!")) if(isliving(mob) && !is_afk()) if(mob.stat != DEAD) var/rolefound = FALSE play_records[EXP_TYPE_LIVING] += minutes if(announce_changes) - to_chat(src,"You got: [minutes] Living EXP!") + to_chat(src,span_notice("You 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,"You got: [minutes] [job] EXP!") + to_chat(src,span_notice("You 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,"You got: [minutes] [role] EXP!") + to_chat(mob,span_notice("You 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,"You got: [minutes] [trackedrole] EXP!") + to_chat(src,span_notice("You got: [minutes] [trackedrole] EXP!")) if(!rolefound) play_records["Unknown"] += minutes else play_records[EXP_TYPE_GHOST] += minutes if(announce_changes) - to_chat(src,"You got: [minutes] Ghost EXP!") + to_chat(src,span_notice("You got: [minutes] Ghost EXP!")) else if(isobserver(mob) && !is_afk()) play_records[EXP_TYPE_GHOST] += minutes if(announce_changes) - to_chat(src,"You got: [minutes] Ghost EXP!") + to_chat(src,span_notice("You got: [minutes] Ghost EXP!")) else if(minutes && !is_afk()) //Let "refresh" checks go through return diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index 9986bd118516..a7926b196610 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -44,4 +44,4 @@ var/obj/item/card/id/W = H.wear_id if(H.age < AGE_MINOR) W.registered_age = AGE_MINOR - to_chat(H, "You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret!") + to_chat(H, span_notice("You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret!")) diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index 627390ab8107..10aa090760f5 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -88,5 +88,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/keybindings/bindings_human.dm b/code/modules/keybindings/bindings_human.dm index 3d95dc9d8309..45326c90441d 100644 --- a/code/modules/keybindings/bindings_human.dm +++ b/code/modules/keybindings/bindings_human.dm @@ -9,7 +9,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(user, "You have no belt to take something out of.") + to_chat(user, span_notice("You have no belt to take something out of.")) return if(equip_to_slot_if_possible(thing, SLOT_BELT)) update_inv_hands() @@ -18,14 +18,14 @@ if(!thing) equipped_belt.attack_hand(src) else - to_chat(user, "You can't fit anything in.") + to_chat(user, span_notice("You can't fit anything in.")) return if(thing) // put thing in belt if(!SEND_SIGNAL(equipped_belt, COMSIG_TRY_STORAGE_INSERT, thing, user.mob)) - to_chat(user, "You can't fit anything in.") + to_chat(user, span_notice("You can't fit anything in.")) return if(!equipped_belt.contents.len) // nothing to take out - to_chat(user, "There's nothing in your belt to take out.") + to_chat(user, span_notice("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)) @@ -40,7 +40,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(user, "You have no backpack to take something out of.") + to_chat(user, span_notice("You have no backpack to take something out of.")) return if(equip_to_slot_if_possible(thing, SLOT_BACK)) update_inv_hands() @@ -49,14 +49,14 @@ if(!thing) equipped_back.attack_hand(src) else - to_chat(user, "You can't fit anything in.") + to_chat(user, span_notice("You can't fit anything in.")) return if(thing) // put thing in backpack if(!SEND_SIGNAL(equipped_back, COMSIG_TRY_STORAGE_INSERT, thing, user.mob)) - to_chat(user, "You can't fit anything in.") + to_chat(user, span_notice("You can't fit anything in.")) return if(!equipped_back.contents.len) // nothing to take out - to_chat(user, "There's nothing in your backpack to take out.") + to_chat(user, span_notice("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)) diff --git a/code/modules/keybindings/bindings_mob.dm b/code/modules/keybindings/bindings_mob.dm index 8703794631a5..8050337039c8 100644 --- a/code/modules/keybindings/bindings_mob.dm +++ b/code/modules/keybindings/bindings_mob.dm @@ -7,7 +7,7 @@ switch(_key) if("Delete", "H") if(!pulling) - to_chat(src, "You are not pulling anything.") + to_chat(src, span_notice("You are not pulling anything.")) else stop_pulling() return @@ -26,7 +26,7 @@ if("Q", "Northwest") // Northwest is Home var/obj/item/I = get_active_held_item() if(!I) - to_chat(src, "You have nothing to drop in your hand!") + to_chat(src, span_warning("You have nothing to drop in your hand!")) else dropItemToGround(I) return diff --git a/code/modules/language/codespeak.dm b/code/modules/language/codespeak.dm index 5d658b1fce30..0279602b4270 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, "You start skimming through [src], but you already know Codespeak.") + to_chat(user, span_boldannounce("You start skimming through [src], but you already know Codespeak.")) return - to_chat(user, "You start skimming through [src], and suddenly your mind is filled with codewords and responses.") + to_chat(user, span_boldannounce("You start skimming through [src], and suddenly your mind is filled with codewords and responses.")) user.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND) use_charge(user) @@ -60,11 +60,11 @@ playsound(loc, "punch", 25, 1, -1) if(M.stat == DEAD) - M.visible_message("[user] smacks [M]'s lifeless corpse with [src].", "[user] smacks your lifeless corpse with [src].", "You hear smacking.") + M.visible_message(span_danger("[user] smacks [M]'s lifeless corpse with [src]."), span_userdanger("[user] smacks your lifeless corpse with [src]."), span_italics("You 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]!", "You hear smacking.") + M.visible_message(span_danger("[user] beats [M] over the head with [src]!"), span_userdanger("[user] beats you over the head with [src]!"), span_italics("You 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.", "You 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_italics("You hear smacking.")) M.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND) 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/lib_codex_gigas.dm b/code/modules/library/lib_codex_gigas.dm index fbc1948fe00c..1d28f096436a 100644 --- a/code/modules/library/lib_codex_gigas.dm +++ b/code/modules/library/lib_codex_gigas.dm @@ -24,11 +24,11 @@ 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.") ask_name(user) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index fbd5b822369d..398b7a3bef90 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -55,12 +55,12 @@ if(0) if(I.tool_behaviour == TOOL_WRENCH) if(I.use_tool(src, user, 20, volume=50)) - to_chat(user, "You wrench the frame into place.") + to_chat(user, span_notice("You 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, "You pry the frame apart.") + to_chat(user, span_notice("You pry the frame apart.")) deconstruct(TRUE) if(1) @@ -68,12 +68,12 @@ var/obj/item/stack/sheet/mineral/wood/W = I if(W.get_amount() >= 2) W.use(2) - to_chat(user, "You add a shelf.") + to_chat(user, span_notice("You add a shelf.")) state = 2 icon_state = "book-0" if(I.tool_behaviour == TOOL_WRENCH) I.play_tool_sound(src, 100) - to_chat(user, "You unwrench the frame.") + to_chat(user, span_notice("You unwrench the frame.")) anchored = FALSE state = 0 @@ -87,11 +87,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, "You empty \the [I] into \the [src].") + to_chat(user, span_notice("You empty \the [I] into \the [src].")) update_icon() else if(istype(I, /obj/item/pen)) if(!user.is_literate()) - to_chat(user, "You scribble illegibly on the side of [src]!") + to_chat(user, span_notice("You 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)) @@ -102,10 +102,10 @@ name = "bookcase ([sanitize(newname)])" else if(I.tool_behaviour == TOOL_CROWBAR) if(contents.len) - to_chat(user, "You need to remove the books first!") + to_chat(user, span_warning("You need to remove the books first!")) else I.play_tool_sound(src, 100) - to_chat(user, "You pry the shelf out.") + to_chat(user, span_notice("You pry the shelf out.")) new /obj/item/stack/sheet/mineral/wood(drop_location(), 2) state = 1 icon_state = "bookempty" @@ -207,20 +207,20 @@ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "book_nerd", /datum/mood_event/book_nerd) onclose(user, "book") else - to_chat(user, "This book is completely blank!") + to_chat(user, span_notice("This book is completely blank!")) /obj/item/book/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/pen)) if(is_blind(user)) - to_chat(user, " As you are trying to write on the book, you suddenly feel very stupid!") + to_chat(user, span_warning(" As you are trying to write on the book, you suddenly feel very stupid!")) return if(unique) - to_chat(user, "These pages don't seem to take the ink well! Looks like you can't modify it.") + to_chat(user, span_warning("These pages don't seem to take the ink well! Looks like you can't modify it.")) return var/literate = user.is_literate() if(!literate) - to_chat(user, "You scribble illegibly on the cover of [src]!") + to_chat(user, span_notice("You scribble illegibly on the cover of [src]!")) return var/choice = input("What would you like to change?") in list("Title", "Contents", "Author", "Cancel") if(!user.canUseTopic(src, BE_CLOSE, literate)) @@ -291,9 +291,9 @@ to_chat(user, "[I]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'") else if(istype(I, /obj/item/kitchen/knife) || I.tool_behaviour == TOOL_WIRECUTTER) - to_chat(user, "You begin to carve out [title]...") + to_chat(user, span_notice("You begin to carve out [title]...")) if(do_after(user, 30, target = src)) - to_chat(user, "You carve out the pages from [title]! You didn't want to read it anyway.") + to_chat(user, span_notice("You carve out the pages from [title]! You didn't want to read it anyway.")) var/obj/item/storage/book/B = new B.name = src.name B.title = src.title diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 9d5e2e62af39..8a4ca9aa6ab3 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -327,13 +327,13 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums switch(rand(1,3)) if(1) new /obj/item/melee/cultblade/dagger(get_turf(src)) - to_chat(user, "Your 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...") + to_chat(user, span_warning("Your 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...")) if(2) new /obj/item/clockwork/slab(get_turf(src)) - to_chat(user, "Your 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 strange metal tablet sitting on the desk. You don't even remember where it came from...") + to_chat(user, span_warning("Your 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 strange metal tablet sitting on the desk. You don't even remember where it came from...")) if(3) new /obj/item/forbidden_book(get_turf(src)) - to_chat(user, "You lose your train of thought, the longer you stare into the vault's browsing window, the deeper you reach into timeless eons. You tear away from the screen, and a book fashioned in a strange leather, bound in chains, appears before you...") + to_chat(user, span_warning("You lose your train of thought, the longer you stare into the vault's browsing window, the deeper you reach into timeless eons. You tear away from the screen, and a book fashioned in a strange leather, bound in chains, appears before you...")) 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) /obj/machinery/computer/libraryconsole/bookmanagement/attackby(obj/item/W, mob/user, params) @@ -587,7 +587,7 @@ 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 diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm index b80b67e38933..07bf1474082c 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].", "You start erasing [existing_message].", "You hear a chipping sound.") + user.visible_message(span_notice("[user] starts erasing [existing_message]."), span_notice("You start erasing [existing_message]."), span_italics("You hear a chipping sound.")) playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1) if(do_after(user, tool_speed, target = existing_message)) - user.visible_message("[user] erases [existing_message].", "You erase [existing_message][existing_message.creator_key == user.ckey ? ", refunding a use" : ""].") + user.visible_message(span_notice("[user] erases [existing_message]."), span_notice("You erase [existing_message][existing_message.creator_key == user.ckey ? ", refunding a use" : ""].")) existing_message.persists = FALSE qdel(existing_message) playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1) @@ -48,17 +48,17 @@ var/message = stripped_input(user, "What would you like to engrave?", "Leave a message") if(!message) - to_chat(user, "You decide not to engrave anything.") + to_chat(user, span_notice("You 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/items/gavel.ogg', 50, 1, -1) - user.visible_message("[user] starts engraving a message into [T]...", "You start engraving a message into [T]...", "You hear a chipping sound.") + user.visible_message(span_notice("[user] starts engraving a message into [T]..."), span_notice("You start engraving a message into [T]..."), span_italics("You 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!", "You engrave a message into [T]!", "You hear a chipping sound.") + user.visible_message(span_notice("[user] leaves a message for future spacemen!"), span_notice("You engrave a message into [T]!"), span_italics("You hear a chipping sound.")) playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1) var/obj/structure/chisel_message/M = new(T) M.register(user, message) diff --git a/code/modules/mapping/minimap.dm b/code/modules/mapping/minimap.dm index e3ce51fa1d3f..7ededf6ddc43 100644 --- a/code/modules/mapping/minimap.dm +++ b/code/modules/mapping/minimap.dm @@ -82,8 +82,8 @@ /obj/item/map/attackby(obj/item/P, mob/living/carbon/human/user, params) if(P.is_hot()) if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10)) - user.visible_message("[user] accidentally ignites [user.p_them()]self!", \ - "You miss the map and accidentally light yourself on fire!") + user.visible_message(span_warning("[user] accidentally ignites [user.p_them()]self!"), \ + span_userdanger("You miss the map and accidentally light yourself on fire!")) user.dropItemToGround(P) user.adjust_fire_stacks(1) user.IgniteMob() @@ -93,7 +93,7 @@ return user.dropItemToGround(src) - user.visible_message("[user] lights [src] ablaze with [P]!", "You light [src] on fire!") + user.visible_message(span_danger("[user] lights [src] ablaze with [P]!"), span_danger("You light [src] on fire!")) fire_act() return return ..() @@ -118,10 +118,10 @@ /obj/item/map/interact(mob/user) if(!in_range(user, src) && !isobserver(user)) - to_chat(user, "You're too far away to read it!") + to_chat(user, span_warning("You're too far away to read it!")) return if(!minimaps || !minimaps.len) - to_chat(user, "This map is blank!") + to_chat(user, span_warning("This map is blank!")) return var/datum/minimap/first_map = minimaps[1] var/info = "" diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index 28ac86913983..de06cbb79ed5 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -153,7 +153,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 if(user.canUseTopic(src, BE_CLOSE)) var/list/sanitised = list() @@ -168,15 +168,15 @@ if(sanitised[i] == sanitised[j]) sanitycheck = FALSE //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 || !sanitycheck || length(sanitised) != codelen) - to_chat(user, "You leave the crate alone.") + to_chat(user, span_notice("You 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) @@ -192,11 +192,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/bulls = 0 //right position, right number var/cows = 0 //wrong position but in the puzzle @@ -220,7 +220,7 @@ lastattempt_it += length(lastattempt_char) code_it += length(code_char) - 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 ..() diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 0b7632fa5576..bdcd5ccff6b5 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -120,7 +120,7 @@ */ /obj/machinery/computer/auxiliary_base/proc/launch_check(mob/user) if(!is_station_level(z) && shuttleId == "colony_drop") - to_chat(user, "You can't move the base again!") + to_chat(user, span_warning("You can't move the base again!")) return FALSE return TRUE @@ -129,7 +129,7 @@ if(.) return if(!allowed(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, span_danger("Access denied.")) return switch(action) @@ -138,7 +138,7 @@ return var/shuttle_error = SSshuttle.moveShuttle(shuttleId, params["shuttle_id"], 1) if(launch_warning) - say("Launch sequence activated! Prepare for drop!!") + say(span_danger("Launch sequence activated! Prepare for drop!!")) playsound(loc, 'sound/machines/warning-buzzer.ogg', 70, FALSE) launch_warning = FALSE blind_drop_ready = FALSE @@ -157,10 +157,10 @@ var/turf/LZ = pick(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.")) 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.")) return blind_drop_ready = FALSE return TRUE @@ -198,7 +198,7 @@ /obj/machinery/computer/auxiliary_base/proc/set_landing_zone(turf/T, mob/user, no_restrictions) var/obj/docking_port/mobile/auxiliary_base/base_dock = locate(/obj/docking_port/mobile/auxiliary_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 auxiliary base. Please contact your Nanotrasen contractor.") + to_chat(user, span_warning("This station is not equipped with an auxiliary base. Please contact your Nanotrasen contractor.")) return if(!no_restrictions) var/static/list/disallowed_turf_types = typecacheof(list( @@ -240,7 +240,7 @@ //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 @@ -260,7 +260,7 @@ if(setting) return - to_chat(user, "You begin setting the landing zone parameters...") + to_chat(user, span_notice("You 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 @@ -275,20 +275,20 @@ AB = A break if(!AB) - to_chat(user, "No auxiliary base console detected.") + to_chat(user, span_warning("No auxiliary 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" @@ -339,11 +339,11 @@ 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 @@ -352,7 +352,7 @@ 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/auxiliary_base/aux_base_console for(var/obj/machinery/computer/auxiliary_base/ABC in GLOB.machines) @@ -360,7 +360,7 @@ 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 auxiliary base's console must be within [console_range] meters in order to interface.") + to_chat(user, span_warning("The auxiliary 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. @@ -382,7 +382,7 @@ 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 @@ -396,7 +396,7 @@ 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 @@ -404,24 +404,24 @@ 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 auxiliary 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 auxiliary mining base.")) SSshuttle.stationary.Remove(Mport) qdel(Mport) return if(istype(get_area(L), /area/shuttle/auxiliary_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 auxiliary 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 auxiliary 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/machines/ping.ogg', 50, FALSE) diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm index 1840c610f050..994e91766951 100644 --- a/code/modules/mining/aux_base_camera.dm +++ b/code/modules/mining/aux_base_camera.dm @@ -25,7 +25,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 @@ -150,11 +150,11 @@ var/area/build_area = get_area(build_target) if(!istype(build_area, /area/shuttle/auxiliary_base)) - to_chat(owner, "You can only build within the mining base!") + to_chat(owner, span_warning("You 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 @@ -231,19 +231,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/machines/click.ogg', 50, 1) datum/action/innate/aux_base/install_turret @@ -258,13 +258,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) @@ -272,5 +272,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/items/drill_use.ogg', 65, 1) diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index e0d656eedd7f..b8e10d0a723f 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -37,11 +37,11 @@ switch(adjusted) if(NORMAL_STYLE) adjusted = ALT_STYLE - to_chat(usr, "You adjust the hood to wear it more casually.") + to_chat(usr, span_notice("You adjust the hood to wear it more casually.")) flags_inv &= ~(HIDEHAIR|HIDEFACE) if(ALT_STYLE) adjusted = NORMAL_STYLE - to_chat(usr, "You adjust the hood back to normal.") + to_chat(usr, span_notice("You adjust the hood back to normal.")) flags_inv |= (HIDEHAIR|HIDEFACE) if(ishuman(usr)) var/mob/living/carbon/human/H = usr @@ -106,7 +106,7 @@ 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.")]") 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 5974c5f67844..52426bb11a26 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -41,18 +41,18 @@ . += "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/required/kinetic_crusher/attackby(obj/item/I, mob/living/user) if(I.tool_behaviour == TOOL_CROWBAR) if(LAZYLEN(trophies)) - to_chat(user, "You remove [src]'s trophies.") + to_chat(user, span_notice("You 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) @@ -168,7 +168,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" @@ -183,12 +183,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, "You can't seem to attach [src] to [H]. Maybe remove a few trophies?") + to_chat(user, span_warning("You 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, "You attach [src] to [H].") + to_chat(user, span_notice("You attach [src] to [H].")) return TRUE /obj/item/crusher_trophy/proc/remove_from(obj/item/twohanded/required/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 f8b155cb9fe9..81995c906675 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/effects/refill.ogg',50,1) 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 b8c387a1444e..e6e1e9c4ddef 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, list( /obj/item/stack/marker_beacon/attack_self(mob/user) if(!isturf(user.loc)) - to_chat(user, "You need more space to place a [singular_name] here.") + to_chat(user, span_warning("You 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, "You activate and anchor [amount ? "a":"the"] [singular_name] in place.") + to_chat(user, span_notice("You activate and anchor [amount ? "a":"the"] [singular_name] in place.")) playsound(user, 'sound/machines/click.ogg', 50, 1) 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, 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, list( . = ..() if(.) return - to_chat(user, "You start picking [src] up...") + to_chat(user, span_notice("You 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, 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, "You start picking [src] up...") + to_chat(user, span_notice("You start picking [src] up...")) if(do_after(user, remove_speed, target = src) && M.amount + 1 <= M.max_amount) M.add(1) playsound(src, 'sound/items/deconstruct.ogg', 50, 1) @@ -128,7 +128,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( if(istype(I, /obj/item/light_eater)) var/obj/effect/decal/cleanable/ash/A = new /obj/effect/decal/cleanable/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/items/welder.ogg', 50, 1) qdel(src) return diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 3e143091b8f1..596231d14c6d 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 @@ -126,10 +126,10 @@ obj/item/pickaxe/bonepickaxe 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 b3fbe53c88d1..cf0e7d6f871c 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -10,11 +10,11 @@ . = ..() 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, "You inject the [M] with the stabilizer. It will no longer go inert.") + to_chat(user, span_notice("You inject the [M] with the stabilizer. It will no longer go inert.")) qdel(src) /************************Hivelord core*******************/ @@ -56,7 +56,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 = 1) qdel(src) @@ -71,9 +71,9 @@ return var/mob/living/carbon/human/H = user 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 - to_chat(user, "You crush [src] within your hand. Disgusting tendrils spread across your body, hold you together and allow you to keep moving, but for how long?") + to_chat(user, span_notice("You crush [src] within your hand. Disgusting tendrils spread across your body, 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) @@ -84,17 +84,17 @@ if(proximity_flag && 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] are useless on the dead.") + to_chat(user, span_notice("[src] are 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()]!") SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "other")) else - to_chat(user, "You start to smear [src] on yourself. Disgusting tendrils hold you together and allow you to keep moving, but for how long?") + to_chat(user, span_notice("You start to smear [src] on yourself. 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) @@ -104,11 +104,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 2319bbdf69fe..4d8fe05e3aa0 100644 --- a/code/modules/mining/equipment/resonator.dm +++ b/code/modules/mining/equipment/resonator.dm @@ -27,10 +27,10 @@ /obj/item/resonator/attack_self(mob/user) if(burst_time == 50) burst_time = 30 - to_chat(user, "You set the resonator's fields to detonate after 3 seconds.") + to_chat(user, span_info("You set the resonator's fields to detonate after 3 seconds.")) else burst_time = 50 - to_chat(user, "You set the resonator's fields to detonate after 5 seconds.") + to_chat(user, span_info("You set the resonator's fields to detonate after 5 seconds.")) /obj/item/resonator/proc/CreateResonance(target, mob/user) var/turf/T = get_turf(target) @@ -103,7 +103,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_userdanger("[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 2fb003d95bc2..3597841a319a 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -40,18 +40,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_global(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, SHELTER_DEPLOY_OUTSIDE_MAP) 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 @@ -170,8 +170,8 @@ if(flags_1 & NODECONSTRUCT_1) return TRUE - user.visible_message("[user] disassembles [src].", - "You start to disassemble [src]...", "You hear clanking and banging noises.") + user.visible_message(span_warning("[user] disassembles [src]."), + span_notice("You start to disassemble [src]..."), "You 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].", - "You start to disassemble [src]...", "You hear clanking and banging noises.") + user.visible_message(span_warning("[user] disassembles [src]."), + span_notice("You start to disassemble [src]..."), "You 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 1d769fa83cf3..820af21718a2 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,7 +65,7 @@ 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) diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index fb331473da55..f0c220289780 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) /obj/item/extraction_pack/attack_self(mob/user) if(is_species(user, /datum/species/lizard/ashwalker)) - to_chat(user, "You don't know how to use this!") + to_chat(user, span_warning("You don't know how to use this!")) return FALSE var/list/possible_beacons = list() for(var/B in GLOB.total_extraction_beacons) @@ -44,7 +44,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) /obj/item/extraction_pack/afterattack(atom/movable/A, mob/living/carbon/human/user, flag, params) . = ..() if(is_species(user, /datum/species/lizard/ashwalker)) - to_chat(user, "You don't know how to use this!") + to_chat(user, span_warning("You don't know how to use this!")) return FALSE if(!beacon) to_chat(user, "[src] is not linked to a beacon, and cannot be used.") @@ -66,9 +66,9 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) return if(A.anchored || (A.move_resist > max_force_fulton)) return - to_chat(user, "You start attaching the pack to [A]...") + to_chat(user, span_notice("You start attaching the pack to [A]...")) if(do_after(user,50,target=A)) - to_chat(user, "You attach the pack to [A] and activate it.") + to_chat(user, span_notice("You 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 7fc16e8520bc..3f04fa6d3f9a 100644 --- a/code/modules/mining/laborcamp/laborshuttle.dm +++ b/code/modules/mining/laborcamp/laborshuttle.dm @@ -20,10 +20,10 @@ return FALSE var/obj/docking_port/mobile/M = SSshuttle.getShuttle("laborcamp") if(!M) - to_chat(user, "Cannot locate shuttle!") + to_chat(user, span_warning("Cannot locate shuttle!")) return FALSE var/obj/docking_port/stationary/S = M.get_docked() if(S?.name == "laborcamp_away") - to_chat(user, "Shuttle is already at the outpost!") + to_chat(user, span_warning("Shuttle is already at the outpost!")) return FALSE return TRUE diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 8d905033d1c2..702b273d2feb 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -84,26 +84,26 @@ GLOBAL_LIST(labor_sheet_values) var/obj/item/card/id/prisoner/P = I P.points += stacking_machine.points stacking_machine.points = 0 - to_chat(M, "Points transferred.") + to_chat(M, span_notice("Points transferred.")) return TRUE else - to_chat(M, "No valid id for point transfer detected.") + to_chat(M, span_alert("No valid id for point transfer detected.")) if("move_shuttle") if(!alone_in_area(get_area(src), M)) - to_chat(M, "Prisoners are only allowed to be released while alone.") + to_chat(M, span_alert("Prisoners are only allowed to be released while alone.")) return switch(SSshuttle.moveShuttle("laborcamp", "laborcamp_home", TRUE)) if(1) - to_chat(M, "Shuttle not found.") + to_chat(M, span_alert("Shuttle not found.")) if(2) - to_chat(M, "Shuttle already at station.") + to_chat(M, span_alert("Shuttle already at station.")) if(3) - to_chat(M, "No permission to dock could be granted.") + to_chat(M, 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(M, "Shuttle received message and will be sent shortly.") + to_chat(M, span_notice("Shuttle received message and will be sent shortly.")) return TRUE /obj/machinery/mineral/labor_claim_console/proc/locate_stacking_machine() @@ -116,7 +116,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**************************/ @@ -154,10 +154,10 @@ GLOBAL_LIST(labor_sheet_values) 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("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 91a3196b4a93..2ae25a934a5c 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.is_sharp()) - user.visible_message("[user] starts to harvest from [src] with [W].","You begin to harvest from [src] with [W].") + user.visible_message(span_notice("[user] starts to harvest from [src] with [W]."),span_notice("You 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].","You begin to harvest from [src].") + user.visible_message(span_notice("[user] starts to harvest from [src]."),span_notice("You begin to harvest from [src].")) if(do_after(user, harvest_time, target = src)) harvest(user) @@ -306,9 +306,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, "You can't add more ingredients to [src]!") + to_chat(user, span_warning("You 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 8303407c315d..3635a941d889 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -149,15 +149,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, "You can't possibly handle the responsibility of more than one rod!") + to_chat(user, span_warning("You can't possibly handle the responsibility of more than one rod!")) return - var/failText = "The snake seems unsatisfied with your incomplete oath and returns to its previous place on the rod, returning to its dormant, wooden state. You must stand still while completing your oath!" - to_chat(itemUser, "The wooden snake that was carved into the rod seems to suddenly come alive and begins to slither down your arm! The compulsion to help others grows abnormally strong...") + var/failText = span_warning("The snake seems unsatisfied with your incomplete oath and returns to its previous place on the rod, returning to its dormant, wooden state. You must stand still while completing your 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 your 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 @@ -178,7 +178,7 @@ else to_chat(itemUser, failText) return - to_chat(itemUser, "The snake, satisfied with your oath, attaches itself and the rod to your 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 your oath, attaches itself and the rod to your 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() @@ -217,11 +217,11 @@ /obj/item/clothing/neck/necklace/memento_mori/proc/memento(mob/living/carbon/human/user) var/list/hasholos = user.hasparasites() if(hasholos.len) - to_chat(user, "The pendant refuses to work with a guardian spirit...") + to_chat(user, span_warning("The pendant refuses to work with a guardian spirit...")) return - to_chat(user, "You feel your life being drained by the pendant...") + to_chat(user, span_warning("You feel your life being drained by the pendant...")) if(do_after(user, 40, target = user)) - to_chat(user, "Your 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("Your 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") @@ -234,7 +234,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, "You feel your life rapidly slipping away from you!") + to_chat(H, span_userdanger("You feel your life rapidly slipping away from you!")) H.dust(TRUE, TRUE) /datum/action/item_action/hands_free/memento_mori @@ -248,7 +248,7 @@ if(ishuman(owner)) MM.memento(owner) else - to_chat(owner, "You try to free your lifeforce from the pendant...") + to_chat(owner, span_warning("You try to free your lifeforce from the pendant...")) if(do_after(owner, 40, target = owner)) MM.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, "You release the wisp. It begins to bob around your head.") + to_chat(user, span_notice("You release the wisp. It begins to bob around your head.")) icon_state = "lantern" wisp.orbit(user, 20) SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Freed") else - to_chat(user, "You return the wisp to the lantern.") + to_chat(user, span_notice("You 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 @@ -309,13 +309,13 @@ RegisterSignal(thing, COMSIG_MOB_UPDATE_SIGHT, .proc/update_user_sight) var/mob/being = thing being.update_sight() - to_chat(thing, "The wisp enhances your vision.") + to_chat(thing, span_notice("The wisp enhances your 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, "Your vision returns to normal.") + to_chat(orbits.parent, span_notice("Your vision returns to normal.")) /obj/effect/wisp/proc/update_user_sight(mob/user) user.sight |= sight_flags @@ -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 @@ -465,7 +465,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" @@ -481,7 +481,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 = "It's shaped an awful lot like [user.name]." setDir(user.dir) @@ -499,7 +499,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) @@ -564,7 +564,7 @@ /obj/item/book_of_babel/attack_self(mob/user) if(!user.can_read(src)) return FALSE - to_chat(user, "You 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("You 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() new /obj/effect/decal/cleanable/ash(get_turf(user)) qdel(src) @@ -621,22 +621,22 @@ to_chat(C, "You feel nothing but a terrible aftertaste.") return ..() - to_chat(C, "A terrible pain travels down your back as wings burst out!") + to_chat(C, span_userdanger("A terrible pain travels down your back as wings burst out!")) C.dna.species.GiveSpeciesFlight(C) if(holycheck) - to_chat(C, "You feel blessed!") + to_chat(C, span_notice("You feel blessed!")) ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT) if(islizard(C)) - to_chat(C, "You feel blessed... by... something?") + to_chat(C, span_notice("You feel blessed... by... something?")) ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT) if(ismoth(C)) - to_chat(C, "Your wings feel.... stronger?") + to_chat(C, span_notice("Your wings feel.... stronger?")) ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT) if(isskeleton(C)) - to_chat(C, "Your ribcage feels... bigger?") + to_chat(C, span_notice("Your ribcage feels... bigger?")) ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT) if(ispreternis(C)) - to_chat(C, "The servos in your back feel... different?") + to_chat(C, span_notice("The servos in your back feel... different?")) ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT) playsound(C.loc, 'sound/items/poster_ripped.ogg', 50, TRUE, -1) C.adjustBruteLoss(20) @@ -654,7 +654,7 @@ var/turf/T = get_turf(src) var/ladder_x = T.x var/ladder_y = T.y - to_chat(user, "You unfold the ladder. It extends much farther than you were expecting.") + to_chat(user, span_notice("You 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_reebe(i) || is_away_level(i)) @@ -705,7 +705,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 @@ -721,14 +721,14 @@ /obj/item/melee/transforming/cleaving_saw/transform_messages(mob/living/user, supress_message_text) if(!supress_message_text) if(active) - to_chat(user, "You open [src]. It will now cleave enemies in a wide arc and deal additional damage to fauna.") + to_chat(user, span_notice("You open [src]. It will now cleave enemies in a wide arc and deal additional damage to fauna.")) else - to_chat(user, "You close [src]. It will now attack rapidly and cause fauna to bleed.") + to_chat(user, span_notice("You close [src]. It will now attack rapidly and cause fauna to bleed.")) playsound(user, 'sound/magic/clockwork/fellowship_armory.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, "You accidentally cut yourself with [src], like a doofus!") + to_chat(user, span_warning("You accidentally cut yourself with [src], like a doofus!")) user.take_bodypart_damage(10) /obj/item/melee/transforming/cleaving_saw/melee_attack_chain(mob/user, atom/target, params) @@ -873,13 +873,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 @@ -899,22 +899,22 @@ switch(random) if(1) - to_chat(user, "Your 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("Your 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.set_species(/datum/species/lizard) H.eye_color = "fee5a3" H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK) H.updateappearance() if(2) - to_chat(user, "Your flesh begins to melt! Miraculously, you seem fine otherwise.") + to_chat(user, span_danger("Your 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 your form at will.") + to_chat(user, span_danger("Power courses through you! You can now shift your 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, "You feel like you could walk straight through lava now.") + to_chat(user, span_danger("You feel like you could walk straight through lava now.")) H.weather_immunities |= "lava" playsound(user.loc,'sound/items/drink.ogg', rand(10,50), 1) @@ -931,9 +931,9 @@ visibility_flags = 0 stage1 = list("Your bones ache.") stage2 = list("Your skin feels scaly.") - stage3 = list("You have an overwhelming urge to terrorize some peasants.", "Your teeth feel sharper.") - stage4 = list("Your blood burns.") - stage5 = list("You're a fucking dragon. However, any previous allegiances you held still apply. It'd be incredibly rude to eat your still human friends for no reason.") + stage3 = list(span_danger("You have an overwhelming urge to terrorize some peasants."), span_danger("Your teeth feel sharper.")) + stage4 = list(span_danger("Your 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 your still human friends for no reason.")) new_form = /mob/living/simple_animal/hostile/megafauna/dragon/lesser @@ -980,12 +980,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 @@ -996,7 +996,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/magic/fireball.ogg', 200, 1) @@ -1014,7 +1014,7 @@ color = "#2C2C2C" /obj/item/dragon_egg/burn() - visible_message("[src] suddenly begins to glow red and starts violently shaking!") + visible_message(span_boldwarning("[src] suddenly begins to glow red and starts violently shaking!")) name = "heated dragon's egg" desc = "A large egg seemingly made out of rock. It's red-hot and seems to be shaking!" color = "#990000" @@ -1023,7 +1023,7 @@ addtimer(CALLBACK(src, .proc/hatch), 20 SECONDS) /obj/item/dragon_egg/proc/hatch() - visible_message("[src] suddenly cracks apart, revealing a tiny ash drake!") + visible_message(span_boldwarning("[src] suddenly cracks apart, revealing a tiny ash drake!")) new /mob/living/simple_animal/hostile/drakeling(get_turf(src)) qdel(src) @@ -1062,9 +1062,9 @@ for(var/mob/living/carbon/human/H in range(7,user)) var/obj/effect/mine/pickup/bloodbath/B = new(H) INVOKE_ASYNC(B, /obj/effect/mine/pickup/bloodbath/.proc/mineEffect, H) - to_chat(user, "You shatter the bottle!") + to_chat(user, span_notice("You shatter the bottle!")) playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, 1) - 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) @@ -1104,7 +1104,7 @@ 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) @@ -1168,7 +1168,7 @@ /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/machines/airlockopen.ogg', 75, TRUE) user.visible_message("[user] fades out, leaving [user.p_their()] belongings behind!") @@ -1187,7 +1187,7 @@ if(!T || timer > world.time) return if(!is_mining_level(T.z) && z_level_check) - to_chat(user, "The club fizzles weakly, it seem its power doesn't reach this area." ) + to_chat(user, span_warning("The club fizzles weakly, it seem its power doesn't reach this area.") ) return calculate_anger_mod(user) timer = world.time + CLICK_CD_MELEE //by default, melee attacks only cause melee blasts, and have an accordingly short cooldown @@ -1210,7 +1210,7 @@ INVOKE_ASYNC(src, .proc/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/prepare_icon_update) @@ -1243,17 +1243,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, "You toggle friendly fire [friendly_fire_check ? "off":"on"]!") + to_chat(user, span_warning("You 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, "You need to hold the club in your hands to [beacon ? "teleport with it":"detach the beacon"]!") + to_chat(user, span_warning("You need to hold the club in your 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...", \ - "You start detaching the hierophant beacon...") + span_notice("You start detaching the hierophant beacon...")) timer = world.time + 51 INVOKE_ASYNC(src, .proc/prepare_icon_update) if(do_after(user, 50, target = user) && !beacon) @@ -1269,16 +1269,16 @@ timer = world.time INVOKE_ASYNC(src, .proc/prepare_icon_update) else - to_chat(user, "You need to be on solid ground to detach the beacon!") + to_chat(user, span_warning("You need to be on solid ground to detach the beacon!")) return if(get_dist(user, beacon) <= 2) //beacon too close abort - to_chat(user, "You are too close to the beacon to teleport to it!") + to_chat(user, span_warning("You 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, "You don't have enough space to teleport from here!") + to_chat(user, span_warning("You don't have enough space to teleport from here!")) return teleporting = TRUE //start channel user.update_action_buttons_icon() @@ -1293,7 +1293,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/prepare_icon_update) @@ -1314,7 +1314,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/prepare_icon_update) @@ -1420,7 +1420,7 @@ desc += " It has an ominous antenna attached." qdel(I) else - to_chat(user, "The herald's power already reaches this club!") + to_chat(user, span_warning("The herald's power already reaches this club!")) return TRUE else return ..() diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 6265638d5122..a33833860d9d 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -188,7 +188,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_notice("[O] has already been refined!")) return return ..() @@ -197,7 +197,7 @@ if (panel_open) input_dir = turn(input_dir, -90) output_dir = turn(output_dir, -90) - to_chat(user, "You 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("You 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, datum/tgui/ui) @@ -258,17 +258,17 @@ points = 0 playsound(src, 'sound/machines/ping.ogg', 15, TRUE) 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 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"]) var/amount = mat_container.materials[mat] @@ -298,7 +298,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) @@ -314,7 +314,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) @@ -336,7 +336,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 f0d8c0f39657..2378f7989fdf 100644 --- a/code/modules/mining/machine_silo.dm +++ b/code/modules/mining/machine_silo.dm @@ -47,11 +47,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.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 @@ -83,11 +83,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) @@ -112,7 +112,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]" @@ -164,7 +164,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, "You log [src] in the multitool's buffer.") + to_chat(user, span_notice("You log [src] in the multitool's buffer.")) I.buffer = src return TRUE @@ -184,7 +184,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 6babceb1ebfc..cb80b0b9024c 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 @@ -44,7 +44,7 @@ return var/obj/item/multitool/M = I M.buffer = src - to_chat(user, "You store linkage information in [I]'s buffer.") + to_chat(user, span_notice("You store linkage information in [I]'s buffer.")) return TRUE /obj/machinery/mineral/stacking_unit_console/Topic(href, href_list) @@ -164,13 +164,13 @@ input_dir = turn(input_dir, -90) if(input_dir == output_dir) //Input and output can't be the same or you create the immovable sheet. input_dir = turn(input_dir, -90) - to_chat(user, "You set [src]'s input to take from the [dir2text(input_dir)].") + to_chat(user, span_notice("You set [src]'s input to take from the [dir2text(input_dir)].")) return else if (io == OUTPUT) output_dir = turn(output_dir, -90) if(input_dir == output_dir) output_dir = turn(output_dir, -90) - to_chat(user, "You set [src]'s output to drop stacks [dir2text(output_dir)].") + to_chat(user, span_notice("You set [src]'s output to drop stacks [dir2text(output_dir)].")) return return ..() @@ -179,9 +179,9 @@ if(istype(M.buffer, /obj/machinery/mineral/stacking_unit_console) && !panel_open) CONSOLE = M.buffer CONSOLE.machine = src - to_chat(user, "You link [src] to the console in [M]'s buffer.") + to_chat(user, span_notice("You link [src] to the console in [M]'s buffer.")) return TRUE if(panel_open) io = !io - to_chat(user, "You set the I/O to change [io ? "output" : "input"].") + to_chat(user, span_notice("You set the I/O to change [io ? "output" : "input"].")) return TRUE diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 26fc60df2680..0ea4fa242904 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -152,20 +152,20 @@ var/mob/M = usr var/obj/item/card/id/I = M.get_idcard(TRUE) if(!istype(I)) - to_chat(usr, "Error: An ID is required!") + to_chat(usr, span_alert("Error: An ID is required!")) flick(icon_deny, src) return var/datum/data/mining_equipment/prize = locate(params["ref"]) 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) return 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(loc) SSblackbox.record_feedback("nested tally", "mining_equipment_bought", 1, list("[type]", "[prize.equipment_path]")) . = TRUE @@ -382,10 +382,10 @@ if(points) var/obj/item/card/id/C = I C.mining_points += points - to_chat(user, "You transfer [points] points to [C].") + to_chat(user, span_info("You transfer [points] points to [C].")) points = 0 else - to_chat(user, "There's no points left on [src].") + to_chat(user, span_info("There's no points left on [src].")) ..() /obj/item/card/mining_point_card/examine(mob/user) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index e4c8d5078f5d..819e97123176 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -78,7 +78,7 @@ GLOBAL_LIST_EMPTY(dumb_rev_heads) //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 GLOB.dumb_rev_heads)) - to_chat(user, "You get a feeling that leaving the station might be a REALLY dumb idea...") + to_chat(user, span_warning("You get a feeling that leaving the station might be a REALLY dumb idea...")) GLOB.dumb_rev_heads += user.mind return . = ..() diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index ba4e542b2b70..1650f5f9b208 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -75,9 +75,9 @@ 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) @@ -89,20 +89,20 @@ /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_info("[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, "You repair some of the armor on [src].") + to_chat(user, span_info("You 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, "You instruct [src] to drop any collected ore.") + to_chat(user, span_info("You 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/CanAllowThrough(atom/movable/O) @@ -152,7 +152,7 @@ minimum_distance = 1 retreat_distance = null icon_state = "mining_drone" - to_chat(src, "You are set to collect mode. You can now collect loose ore.") + to_chat(src, span_info("You 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, "You are set to attack mode. You can now attack from range.") + to_chat(src, span_info("You 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, "You attempt to dump your stored ore, but you have none.") + to_chat(src, span_notice("You attempt to dump your stored ore, but you have none.")) return if(message) - to_chat(src, "You dump your stored ore.") + to_chat(src, span_notice("You 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, "You toggle your meson vision [(user.sight & SEE_TURFS) ? "on" : "off"].") + to_chat(user, span_notice("You 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, "You toggle your light [user.light_on ? "on" : "off"].") + to_chat(user, span_notice("You toggle your light [user.light_on ? "on" : "off"].")) /datum/action/innate/minedrone/toggle_mode name = "Toggle Mode" diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 7a0eee868a1d..95389c9dd544 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -63,7 +63,7 @@ usr.set_machine(src) src.add_fingerprint(usr) if(processing==1) - to_chat(usr, "The machine is processing.") + to_chat(usr, span_notice("The machine is processing.")) return var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) if(href_list["choose"]) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 1b1bca916b40..ad380efa0e29 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -104,12 +104,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!", "Your eye protection blocks the sand!") + C.visible_message(span_danger("[C]'s eye protection blocks the sand!"), span_warning("Your eye protection blocks the sand!")) return C.adjust_blurriness(6) C.adjustStaminaLoss(15)//the pain from your eyes burning does stamina damage C.confused += 5 - to_chat(C, "\The [src] gets into your eyes! The pain, it burns!") + to_chat(C, span_userdanger("\The [src] gets into your eyes! The pain, it burns!")) qdel(src) /obj/item/stack/ore/glass/ex_act(severity, target) @@ -133,7 +133,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ refined_type = /obj/item/stack/sheet/mineral/plasma /obj/item/stack/ore/plasma/welder_act(mob/living/user, obj/item/I) - to_chat(user, "You can't hit a high enough temperature to smelt [src] properly!") + to_chat(user, span_warning("You can't hit a high enough temperature to smelt [src] properly!")) return TRUE @@ -210,7 +210,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].", "You attach [I] to [src].") + user.visible_message("[user] attaches [I] to [src].", span_notice("You attach [I] to [src].")) wires = new /datum/wires/explosive/gibtonite(src) attacher = key_name(user) qdel(I) @@ -230,7 +230,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.", "You stopped the chain reaction. ...The ore's quality looks diminished.") + user.visible_message("The chain reaction was stopped! ...The ore's quality looks diminished.", span_notice("You stopped the chain reaction. ...The ore's quality looks diminished.")) icon_state = "Gibtonite ore" quality = GIBTONITE_QUALITY_LOW return @@ -268,7 +268,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!", "You strike \the [src], causing a chain reaction.") + user.visible_message(span_warning("[user] strikes \the [src], causing a chain reaction!"), span_danger("You strike \the [src], causing a chain reaction.")) log_bomber(user, "has primed a", src, "for detonation", notify_admins) det_timer = addtimer(CALLBACK(src, .proc/detonate, notify_admins), det_time, TIMER_STOPPABLE) @@ -318,9 +318,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/manual_suicide, user), 10)//10 = time takes for flip animation return MANUAL_SUICIDE_NONLETHAL @@ -328,13 +328,13 @@ 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/Initialize() . = ..() @@ -344,7 +344,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/coin/examine(mob/user) . = ..() if(value) - . += "It's worth [value] credit\s." + . += span_info("It's worth [value] credit\s.") /obj/item/coin/gold name = "gold coin" @@ -436,15 +436,15 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ 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, "You attach a string to the coin.") + to_chat(user, span_notice("You attach a string to the coin.")) else - to_chat(user, "You need one length of cable to attach a string to the coin!") + to_chat(user, span_warning("You need one length of cable to attach a string to the coin!")) return else ..() @@ -456,13 +456,13 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ new /obj/item/stack/cable_coil(drop_location(), 1) overlays = list() string_attached = null - to_chat(user, "You detach the string from the coin.") + to_chat(user, span_notice("You 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 coinflip = pick(sideslist) cooldown = world.time + 15 @@ -473,8 +473,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ sleep(15) if(loc == oldloc && user && !user.incapacitated()) user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \ - "You flip [src]. It lands on [coinflip].", \ - "You hear the clattering of loose change.") + span_notice("You flip [src]. It lands on [coinflip]."), \ + span_italics("You hear the clattering of loose change.")) return TRUE//did the coin flip? useful for suicide_act diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 374e54b89c5d..16b816d16909 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -14,15 +14,15 @@ 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, "You empty the ore in [W] into \the [src].") + to_chat(user, span_notice("You empty the ore in [W] into \the [src].")) else return ..() /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.", - "You pry apart \the [src].", - "You hear splitting wood.") + span_notice("You pry apart \the [src]."), + span_italics("You hear splitting wood.")) deconstruct(TRUE, user) return TRUE @@ -84,7 +84,7 @@ usr.set_machine(src) if(action == "removeall") // TG made this a switch with only one case :thinking: dump_box_contents() - to_chat(usr, "You open the release hatch on the box..") + to_chat(usr, span_notice("You open the release hatch on the box..")) /obj/structure/ore_box/deconstruct(disassembled = TRUE, mob/user) var/obj/item/stack/sheet/mineral/wood/WD = new (loc, 4) diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index c2ed9a8fbfea..5ddd9345b63f 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -71,7 +71,7 @@ INITIALIZE_IMMEDIATE(/mob/dead) switch(csa.len) if(0) remove_verb(src, /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 @@ -86,7 +86,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 /obj/screen/splash(C) notransform = TRUE diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 3c0b565f60fc..8277ccaefdfd 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -136,7 +136,7 @@ if(href_list["late_join"]) if(!SSticker || !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(href_list["late_join"] == "override") @@ -146,20 +146,20 @@ if(SSticker.queued_players.len || (relevant_cap && living_player_count() >= relevant_cap && !(ckey(key) in GLOB.admin_datums))) //yogs start -- donors bypassing the queue if(ckey(key) in get_donators()) - to_chat(usr, "Because you are a donator, you have bypassed the queue! Thank you for donating!") + to_chat(usr, span_notice("Because you are a donator, you have bypassed the queue! Thank you for donating!")) LateChoices() return //yogs end - 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, "You are next in line to join the game. You will be notified when a slot opens up.") + to_chat(usr, span_notice("You are next in line to join the game. You will be notified when a slot opens up.")) else if(queue_position) - to_chat(usr, "There are [queue_position-1] players in front of you in the queue to join the game.") + to_chat(usr, span_notice("There are [queue_position-1] players in front of you in the queue to join the game.")) else SSticker.queued_players += usr - to_chat(usr, "You have been added to the queue to join the game. Your position in queue is [SSticker.queued_players.len].") + to_chat(usr, span_notice("You have been added to the queue to join the game. Your position in queue is [SSticker.queued_players.len].")) return LateChoices() @@ -169,23 +169,23 @@ if(href_list["SelectedJob"]) if(!SSticker || !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 an administrative lock on entering the game!") + to_chat(usr, span_notice("There is an administrative 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 // Check if random role is requested if(href_list["SelectedJob"] == "Random") var/datum/job/job = SSjob.GetRandomJob(src) if(!job) - to_chat(usr, "There is no randomly assignable Job at this time. Please manually choose one of the other possible options.") + to_chat(usr, span_warning("There is no randomly assignable Job at this time. Please manually choose one of the other possible options.")) return href_list["SelectedJob"] = job.title @@ -216,15 +216,15 @@ if(POLLTYPE_OPTION) var/optionid = text2num(href_list["voteoptionid"]) if(vote_on_poll(pollid, optionid)) - to_chat(usr, "Vote successful.") + to_chat(usr, span_notice("Vote successful.")) else - to_chat(usr, "Vote failed, please try again or contact an administrator.") + to_chat(usr, span_danger("Vote failed, please try again or contact an administrator.")) if(POLLTYPE_TEXT) var/replytext = href_list["replytext"] if(log_text_poll_reply(pollid, replytext)) - to_chat(usr, "Feedback logging successful.") + to_chat(usr, span_notice("Feedback logging successful.")) else - to_chat(usr, "Feedback logging failed, please try again or contact an administrator.") + to_chat(usr, span_danger("Feedback logging failed, please try again or contact an administrator.")) if(POLLTYPE_RATING) var/id_min = text2num(href_list["minid"]) var/id_max = text2num(href_list["maxid"]) @@ -245,9 +245,9 @@ return if(!vote_on_numval_poll(pollid, optionid, rating)) - to_chat(usr, "Vote failed, please try again or contact an administrator.") + to_chat(usr, span_danger("Vote failed, please try again or contact an administrator.")) return - to_chat(usr, "Vote successful.") + to_chat(usr, span_notice("Vote successful.")) if(POLLTYPE_MULTI) var/id_min = text2num(href_list["minoptionid"]) var/id_max = text2num(href_list["maxoptionid"]) @@ -263,21 +263,21 @@ if(0) continue if(1) - to_chat(usr, "Vote failed, please try again or contact an administrator.") + to_chat(usr, span_danger("Vote failed, please try again or contact an administrator.")) return if(2) - to_chat(usr, "Maximum replies reached.") + to_chat(usr, span_danger("Maximum replies reached.")) break - to_chat(usr, "Vote successful.") + to_chat(usr, span_notice("Vote successful.")) if(POLLTYPE_IRV) if (!href_list["IRVdata"]) - 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.")) return var/list/votelist = splittext(href_list["IRVdata"], ",") if (!vote_on_irv_poll(pollid, votelist)) - to_chat(src, "Vote failed, please try again or contact an administrator.") + to_chat(src, span_danger("Vote failed, please try again or contact an administrator.")) return - to_chat(src, "Vote successful.") + to_chat(src, span_notice("Vote successful.")) //When you cop out of the round (NB: this HAS A SLEEP FOR PLAYER INPUT IN IT) /mob/dead/new_player/proc/make_me_an_observer() @@ -299,11 +299,11 @@ 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 @@ -484,7 +484,7 @@ else dept_dat += "[job_datum.title] ([job_datum.current_positions])" if(!dept_dat.len) - dept_dat += "No positions open." + dept_dat += span_nopositions("No positions open.") dat += jointext(dept_dat, "") dat += "
" column_counter++ @@ -526,7 +526,7 @@ if(mind.assigned_role) var/datum/job/J = SSjob.GetJob(mind.assigned_role) if(H.age < J?.minimal_character_age) - to_chat(client,"Your character is too young to play your assigned job. Their age has been corrected to the minimum possible.") + to_chat(client,span_warning("Your character is too young to play your assigned job. Their age has been corrected to the minimum possible.")) H.age = J.minimal_character_age if(transfer_after) mind.late_joiner = TRUE @@ -595,7 +595,7 @@ log_admin("[src.ckey] has rolled antag with no jobs enabled") return TRUE if(!ineligible_for_roles) - to_chat(src, "You have no jobs enabled, along with return to lobby if job is unavailable. This makes you ineligible for any round start role, please update your job preferences.") + to_chat(src, span_danger("You have no jobs enabled, along with return to lobby if job is unavailable. This makes you ineligible for any round start role, please update your job preferences.")) 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 bdd8ab70228c..35ae961300b8 100644 --- a/code/modules/mob/dead/new_player/poll.dm +++ b/code/modules/mob/dead/new_player/poll.dm @@ -4,7 +4,7 @@ /mob/dead/new_player/proc/handle_player_polling() if(!SSdbcore.IsConnected()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/datum/DBQuery/query_poll_get = SSdbcore.NewQuery("SELECT id, question FROM [format_table_name("poll_question")] WHERE Now() BETWEEN starttime AND endtime AND (:holder = '' OR adminonly = false)", @@ -30,7 +30,7 @@ if(!pollid) 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_poll_get_details = SSdbcore.NewQuery("SELECT starttime, endtime, question, polltype, multiplechoiceoptions FROM [format_table_name("poll_question")] WHERE id = :pollid", list("pollid" = pollid)) if(!query_poll_get_details.warn_execute()) @@ -355,7 +355,7 @@ if (text) table = "poll_textreply" 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_hasvoted = SSdbcore.NewQuery("SELECT id FROM `[format_table_name(table)]` WHERE pollid = :pollid AND ckey = :ckey", list("pollid" = pollid, "ckey" = ckey)) if(!query_hasvoted.warn_execute()) @@ -364,7 +364,7 @@ if(query_hasvoted.NextRow()) qdel(query_hasvoted) if(!silent) - to_chat(usr, "You've already replied to this poll.") + to_chat(usr, span_danger("You've already replied to this poll.")) return TRUE qdel(query_hasvoted) return FALSE @@ -383,14 +383,14 @@ //we gots ourselfs a dirty cheater on our hands! 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 0 return 1 /mob/dead/new_player/proc/vote_valid_check(pollid, holder, type) if (!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") + to_chat(src, span_danger("Failed to establish database connection.")) return 0 pollid = text2num(pollid) if (!pollid || pollid < 0) @@ -408,7 +408,7 @@ /mob/dead/new_player/proc/vote_on_irv_poll(pollid, list/votelist) if (!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") + to_chat(src, span_danger("Failed to establish database connection.")) return 0 if (!vote_rig_check()) return 0 @@ -447,13 +447,13 @@ vote = text2num(vote) numberedvotelist += vote if (!vote) //this is fine because voteid starts at 1, so it will never be 0 - to_chat(src, "Error: Invalid (non-numeric) votes in the vote data.") + to_chat(src, span_danger("Error: Invalid (non-numeric) votes in the vote data.")) return 0 if (!(vote in optionlist)) - to_chat(src, "Votes for choices that do not appear to be in the poll detected.") + to_chat(src, span_danger("Votes for choices that do not appear to be in the poll detected.")) return 0 if (!numberedvotelist.len) - to_chat(src, "Invalid vote data") + to_chat(src, span_danger("Invalid vote data")) return 0 //lets add the vote, first we generate an insert statement. @@ -484,7 +484,7 @@ /mob/dead/new_player/proc/vote_on_poll(pollid, optionid) if (!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") + to_chat(src, span_danger("Failed to establish database connection.")) return 0 if (!vote_rig_check()) return 0 @@ -510,7 +510,7 @@ /mob/dead/new_player/proc/log_text_poll_reply(pollid, replytext) if (!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") + to_chat(src, span_danger("Failed to establish database connection.")) return 0 if (!vote_rig_check()) return 0 @@ -546,7 +546,7 @@ /mob/dead/new_player/proc/vote_on_numval_poll(pollid, optionid, rating) if (!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") + to_chat(src, span_danger("Failed to establish database connection.")) return 0 if (!vote_rig_check()) return 0 @@ -561,7 +561,7 @@ return if(query_numval_hasvoted.NextRow()) qdel(query_numval_hasvoted) - to_chat(usr, "You've already replied to this poll.") + to_chat(usr, span_danger("You've already replied to this poll.")) return qdel(query_numval_hasvoted) var/adminrank = "Player" @@ -580,7 +580,7 @@ /mob/dead/new_player/proc/vote_on_multi_poll(pollid, optionid) if (!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.") + to_chat(src, span_danger("Failed to establish database connection.")) return 0 if (!vote_rig_check()) return 0 diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 8ec3522e686f..6f2078ed2501 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -342,13 +342,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, "You have no body.") + to_chat(src, span_warning("You have no body.")) return if(!can_reenter_corpse) - to_chat(src, "You cannot re-enter your body.") + to_chat(src, span_warning("You cannot re-enter your body.")) return if(mind.current.key && mind.current.key[1] != "@") //makes sure we don't accidentally kick any clients - to_chat(usr, "Another consciousness is in your body...It is resisting you.") + to_chat(usr, span_warning("Another consciousness is in your body...It is resisting you.")) return client.view_size.setDefault(getScreenSize(client.prefs.widescreenpref))//Let's reset so people can't become allseeing gods SStgui.on_transfer(src, mind.current) // Transfer NanoUIs. @@ -363,7 +363,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") @@ -378,7 +378,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(flashwindow) window_flash(client) if(message) - to_chat(src, "[message]") + to_chat(src, span_ghostalert("[message]")) if(source) var/obj/screen/alert/A = throw_alert("[REF(source)]_notify_cloning", /obj/screen/alert/notify_cloning) if(A) @@ -551,11 +551,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/memory() set hidden = TRUE - to_chat(src, "You are dead! You have no mind to store memory!") + to_chat(src, span_danger("You are dead! You have no mind to store memory!")) /mob/dead/observer/add_memory() set hidden = TRUE - to_chat(src, "You are dead! You have no mind to store memory!") + to_chat(src, span_danger("You are dead! You have no mind to store memory!")) /mob/dead/observer/verb/toggle_ghostsee() set name = "Toggle Ghost Vision" @@ -638,14 +638,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return 0 if(ismegafauna(target) || (target.status_flags & GODMODE)) - 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 0 if(can_reenter_corpse && mind && 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 0 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 0 target.key = key @@ -734,7 +734,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp show_data_huds() data_huds_on = !data_huds_on - to_chat(src, "Data HUDs [data_huds_on ? "enabled" : "disabled"].") + to_chat(src, span_notice("Data HUDs [data_huds_on ? "enabled" : "disabled"].")) /mob/dead/observer/verb/toggle_health_scan() set name = "Toggle Health Scan" @@ -742,7 +742,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set category = "Ghost" health_scan = !health_scan - to_chat(src, "Health scan [health_scan ? "enabled" : "disabled"].") + to_chat(src, span_notice("Health scan [health_scan ? "enabled" : "disabled"].")) /mob/dead/observer/verb/toggle_chemical_scan() set name = "Toggle Chemical Scan" @@ -750,7 +750,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set category = "Ghost" chem_scan = !chem_scan - to_chat(src, "Chemical scan [chem_scan ? "enabled" : "disabled"].") + to_chat(src, span_notice("Chemical scan [chem_scan ? "enabled" : "disabled"].")) /mob/dead/observer/verb/restore_ghost_appearance() set name = "Restore Ghost Character" @@ -945,7 +945,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp possessible += M if(!possessible.len) - to_chat(src, "There are currently no mice able to be possessed!") + to_chat(src, span_warning("There are currently no mice able to be possessed!")) return FALSE var/mob/living/simple_animal/mouse/M = pick(possessible) @@ -958,11 +958,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return FALSE if(!SSticker.HasRoundStarted()) - to_chat(usr, "The round hasn't started yet!") + to_chat(usr, span_warning("The round hasn't started yet!")) return FALSE if(is_banned_from(key, ROLE_SENTIENCE)) - to_chat(src, "You are job banned!") + to_chat(src, span_warning("You are job banned!")) return FALSE if(alert("Are you sure you want to become a mouse? (Warning, you can no longer be cloned!)",,"Yes","No") != "Yes") diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 9ddb20912fba..9135b907ed2b 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -12,7 +12,7 @@ if(!length(key_emotes)) if(intentional) - to_chat(src, "'[act]' emote does not exist. Say *help for a list.") + to_chat(src, span_notice("'[act]' emote does not exist. Say *help for a list.")) return FALSE var/silenced = FALSE for(var/datum/emote/P in key_emotes) @@ -22,7 +22,7 @@ if(P.run_emote(src, param, m_type, intentional)) return TRUE if(intentional && !silenced) - to_chat(src, "Unusable emote '[act]'. Say *help for a list.") + to_chat(src, span_notice("Unusable emote '[act]'. Say *help for a list.")) return FALSE diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 9e1c44770521..6a15bfdf365e 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -235,13 +235,13 @@ if (merge_stacks) if (istype(active_stack) && istype(I_stack, active_stack.merge_type)) if (I_stack.merge(active_stack)) - to_chat(usr, "Your [active_stack.name] stack now contains [active_stack.get_amount()] [active_stack.singular_name]\s.") + to_chat(usr, span_notice("Your [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, "Your [inactive_stack.name] stack now contains [inactive_stack.get_amount()] [inactive_stack.singular_name]\s.") + to_chat(usr, span_notice("Your [inactive_stack.name] stack now contains [inactive_stack.get_amount()] [inactive_stack.singular_name]\s.")) return TRUE if(put_in_active_hand(I, forced)) @@ -418,7 +418,7 @@ /obj/item/proc/equip_to_best_slot(mob/M) if(src != M.get_active_held_item()) - to_chat(M, "You are not holding anything to equip!") + to_chat(M, span_warning("You are not holding anything to equip!")) return FALSE if(M.equip_to_appropriate_slot(src)) @@ -439,7 +439,7 @@ if(SEND_SIGNAL(I, COMSIG_TRY_STORAGE_INSERT, src, M)) return TRUE - to_chat(M, "You are unable to equip that!") + to_chat(M, span_warning("You are unable to equip that!")) return FALSE diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index e77fdd1c2c76..88d1f539dae0 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -12,7 +12,7 @@ /mob/living/carbon/human/proc/resume_bleeding() bleedsuppress = 0 if(stat != DEAD && bleed_rate) - to_chat(src, "The blood soaks through your bandage.") + to_chat(src, span_warning("The blood soaks through your bandage.")) /mob/living/carbon/monkey/handle_blood() @@ -56,18 +56,18 @@ switch(get_blood_state()) if(BLOOD_OKAY) if(prob(5)) - to_chat(src, "You feel [word].") + to_chat(src, span_warning("You feel [word].")) adjustOxyLoss(round((BLOOD_VOLUME_NORMAL(src) - blood_volume) * 0.01, 1)) if(BLOOD_BAD) adjustOxyLoss(round((BLOOD_VOLUME_NORMAL(src) - blood_volume) * 0.02, 1)) if(prob(5)) blur_eyes(6) - to_chat(src, "You feel very [word].") + to_chat(src, span_warning("You feel very [word].")) if(BLOOD_SURVIVE) adjustOxyLoss(5) if(prob(15)) Unconscious(rand(20,60)) - to_chat(src, "You feel extremely [word].") + to_chat(src, span_warning("You feel extremely [word].")) if(BLOOD_DEAD) // This little bit of code here is pretty much the only reason why BLOOD_DEAD exists at all if(!HAS_TRAIT(src, TRAIT_NODEATH)) death() diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index 7b37440ca477..b4dcdf3f503b 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -29,7 +29,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, "You may not hold items while blood crawling!") + to_chat(C, span_warning("You may not hold items while blood crawling!")) return 0 var/obj/item/bloodcrawl/B1 = new(C) var/obj/item/bloodcrawl/B2 = new(C) @@ -47,7 +47,7 @@ /mob/living/proc/bloodpool_sink(obj/effect/decal/cleanable/B) var/turf/mobloc = get_turf(src.loc) - src.visible_message("[src] sinks into the pool of blood!") + src.visible_message(span_warning("[src] sinks into the pool of blood!")) playsound(get_turf(src), 'sound/magic/enter_blood.ogg', 50, 1, -1) // Extinguish, unbuckle, stop being pulled, set our location into the // dummy object @@ -73,23 +73,23 @@ var/kidnapped = FALSE if(victim.stat == CONSCIOUS) - src.visible_message("[victim] kicks free of the blood pool just before entering it!", null, "You hear splashing and struggling.") + src.visible_message(span_warning("[victim] kicks free of the blood pool just before entering it!"), null, span_notice("You 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!", "You 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("You hear a splash and a thud.")) else victim.forceMove(src) victim.emote("scream") - src.visible_message("[src] drags [victim] into the pool of blood!", null, "You hear a splash.") + src.visible_message("[src] drags [victim] into the pool of blood!", null, span_notice("You hear a splash.")) kidnapped = TRUE if(kidnapped) var/success = bloodcrawl_consume(victim) if(!success) - to_chat(src, "You happily devour... nothing? Your meal vanished at some point!") + to_chat(src, span_danger("You happily devour... nothing? Your meal vanished at some point!")) return 1 /mob/living/proc/bloodcrawl_consume(mob/living/victim) - to_chat(src, "You begin to feast on [victim]. You can not move while you are doing this.") + to_chat(src, span_danger("You begin to feast on [victim]. You can not move while you are doing this.")) var/sound if(istype(src, /mob/living/simple_animal/slaughter)) @@ -112,18 +112,18 @@ 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, "You devour [victim]. Your health is fully restored.") + to_chat(src, span_danger("You devour [victim]. Your health is fully restored.")) src.revive(full_heal = 1) // No defib possible after laughter @@ -157,9 +157,9 @@ /mob/living/proc/phasein(obj/effect/decal/cleanable/B) if(src.notransform) - to_chat(src, "Finish eating first!") + to_chat(src, span_warning("Finish eating first!")) return 0 - 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) diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm index aa59256b80b0..92606885f39f 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, "You aren't sure where this brain came from, but you're pretty sure it's a useless brain!") + to_chat(user, span_warning("You 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 your 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("[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 @@ brainmob.remove_from_dead_mob_list() brainmob.add_to_alive_mob_list() 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() @@ -86,12 +86,12 @@ /obj/item/mmi/attack_self(mob/user) if(!brain) radio.on = !radio.on - to_chat(user, "You toggle [src]'s radio system [radio.on==1 ? "on" : "off"].") + to_chat(user, span_notice("You toggle [src]'s radio system [radio.on==1 ? "on" : "off"].")) else eject_brain(user) update_icon() name = initial(name) - to_chat(user, "You unlock and upend [src], spilling the brain onto the floor.") + to_chat(user, span_notice("You 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. @@ -146,13 +146,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, "Your radio is disabled!") + to_chat(brainmob, span_warning("Your 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) . = ..() @@ -194,17 +194,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/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index 7eaa8cbd1b0b..54fda528a3c8 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -99,7 +99,7 @@ brainmob.set_species(ZI.old_species) //For if the brain is cloned if(L.mind && L.mind.current) L.mind.transfer_to(brainmob) - to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a brain.") + to_chat(brainmob, span_notice("You 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) @@ -110,19 +110,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].", "You start to slowly pour the contents of [O] onto [src].") + user.visible_message("[user] starts to pour the contents of [O] onto [src].", span_notice("You start to slowly pour the contents of [O] onto [src].")) if(!do_after(user, 60, TRUE, src)) - to_chat(user, "You failed to pour [O] onto [src]!") + to_chat(user, span_warning("You 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.", "You 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("[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("You 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() @@ -138,27 +138,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." else - . += "You can feel the small spark of life still left in this one." + . += span_info("You 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." 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." 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)) @@ -172,7 +172,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 @@ -184,14 +184,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_userdanger("[msg]")) if(C != user) - to_chat(C, "[user] inserts [src] into your head.") - to_chat(user, "You insert [src] into [C]'s head.") + to_chat(C, span_notice("[user] inserts [src] into your head.")) + to_chat(user, span_notice("You insert [src] into [C]'s head.")) else - to_chat(user, "You insert [src] into your head." ) + to_chat(user, span_notice("You insert [src] into your head.") ) Insert(C) else @@ -205,7 +205,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_userdanger("The last spark of life in your brain fizzles out...")) owner.death() brain_death = TRUE @@ -229,11 +229,11 @@ if(owner) if(owner.stat < UNCONSCIOUS) //conscious or soft-crit if(prev_damage < BRAIN_DAMAGE_MILD && damage >= BRAIN_DAMAGE_MILD) - to_chat(owner, "You feel lightheaded.") + to_chat(owner, span_warning("You feel lightheaded.")) else if(prev_damage < BRAIN_DAMAGE_SEVERE && damage >= BRAIN_DAMAGE_SEVERE) - to_chat(owner, "You feel less in control of your thoughts.") + to_chat(owner, span_danger("You feel less in control of your thoughts.")) else if(prev_damage < (BRAIN_DAMAGE_DEATH - 20) && damage >= (BRAIN_DAMAGE_DEATH - 20)) - to_chat(owner, "You can feel your mind flickering on and off...") + to_chat(owner, span_userdanger("You can feel your mind flickering on and off...")) //update our previous damage holder after we've checked our boundaries prev_damage = damage return diff --git a/code/modules/mob/living/brain/death.dm b/code/modules/mob/living/brain/death.dm index acfc4a9ef419..b9a6bdfb47f6 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!", \ - "You hear something flatline.") + mmi.visible_message(span_warning("[src]'s MMI flatlines!"), \ + span_italics("You 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 a9396e912d21..851a78c909af 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 = "You 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("You 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\ You 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,10 +88,10 @@ GLOBAL_VAR(posibrain_notify_cooldown) if(is_occupied() || is_banned_from(user.ckey, ROLE_POSIBRAIN) || QDELETED(brainmob) || QDELETED(src) || QDELETED(user)) return if(!(GLOB.ghost_role_flags & GHOSTROLE_SILICONS)) - to_chat(user, "Central Command has temporarily outlawed posibrain sentience in this sector...") + to_chat(user, span_warning("Central Command has temporarily outlawed posibrain sentience in this sector...")) 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)) @@ -123,7 +123,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) @@ -149,7 +149,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 7ac0fe0f1c31..98dfa9f7b469 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -133,8 +133,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, "You begin to evolve!") - visible_message("[src] begins to twist and contort!") + to_chat(src, span_noticealien("You 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 1849e3840bbb..9ddab07085cd 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,13 +37,13 @@ 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/weapons/bite.ogg', 50, 1, -1) - visible_message("[M.name] bites [src]!", \ - "[M.name] bites [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M.name] bites [src]!"), \ + span_userdanger("[M.name] bites [src]!"), null, COMBAT_MESSAGE_RANGE) 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 d15e2021e156..d642a650f446 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, "You must be conscious to do this.") + to_chat(user, span_noticealien("You 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 @@ -78,7 +78,7 @@ Doesn't work on other aliens/AI.*/ if(locate(/obj/structure/alien/weeds/node) in get_turf(user)) to_chat(user, "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(to_utf8(input("Message:", "Alien Whisper") as text|null, usr)) 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, "You hear a strange, alien voice in your head...[msg]") - to_chat(user, "You said: \"[msg]\" to [M]") + to_chat(user, span_noticealien("You 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, "You transfer [amount] plasma to [M]") + to_chat(M, span_noticealien("[user] has transferred [amount] plasma to you.")) + to_chat(user, span_noticealien("You transfer [amount] plasma to [M]")) else - to_chat(user, "You need to be closer!") + to_chat(user, span_noticealien("You 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, "You cannot dissolve this object.") + to_chat(user, span_noticealien("You 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,7 +197,7 @@ Doesn't work on other aliens/AI.*/ /obj/effect/proc_holder/alien/neurotoxin/fire(mob/living/carbon/user) var/message if(active) - message = "You empty your neurotoxin gland." + message = span_notice("You empty your neurotoxin gland.") remove_ranged_ability(message) else message = "You prepare your neurotoxin gland. Left-click to fire at a target!" @@ -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, "You need at least [p_cost] plasma to spit.") + to_chat(user, span_warning("You 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!", "You spit neurotoxin.") + user.visible_message("[user] spits neurotoxin!", span_alertalien("You spit neurotoxin.")) var/obj/item/projectile/bullet/neurotoxin/A = new /obj/item/projectile/bullet/neurotoxin(user.loc) A.firer = user A.preparePixelProjectile(target, user, params) @@ -268,7 +268,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_danger("There is already a resin structure there.")) return FALSE if(!check_vent_block(user)) @@ -279,8 +279,8 @@ Doesn't work on other aliens/AI.*/ return FALSE if (!cost_check(check_turf,user)) return FALSE - to_chat(user, "You shape a [choice].") - user.visible_message("[user] vomits up a thick purple substance and begins to shape it.") + to_chat(user, span_notice("You 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) @@ -298,12 +298,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, "You blend into the shadows...") + to_chat(user, span_noticealien("You blend into the shadows...")) else user.alpha = initial(user.alpha) user.sneaking = 0 active = 0 - to_chat(user, "You reveal yourself!") + to_chat(user, span_noticealien("You 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 a6e096e06ceb..0df4efaf265e 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm @@ -25,21 +25,21 @@ /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, "Your thoughts are still too scattered to take up the position of leadership.") + to_chat(user, span_danger("Your thoughts are still too scattered to take up the position of leadership.")) return 0 if(user.movement_type & (VENTCRAWLING)) - to_chat(user, "You cannot evolve in a pipe.") + to_chat(user, span_danger("You cannot evolve in a pipe.")) return 0 if(!isturf(user.loc)) - to_chat(user, "You can't evolve here!") + to_chat(user, span_notice("You 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_notice("We already have a living royal!")) return 0 \ No newline at end of file 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 824b0ab36eef..dcd2a2e73f37 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, "You will now [leap_on_click ? "leap at":"slash at"] enemies!") + to_chat(src, span_noticealien("You 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, "You are too fatigued to pounce right now!") + to_chat(src, span_alertalien("You 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 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 95ba2fddf4a1..303490614891 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_danger("Without the hivemind, you would be unfit to rule as queen!")) return 0 if(node.recent_queen_death) - to_chat(user, "You are still too burdened with guilt to evolve into a queen.") + to_chat(user, span_danger("You 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_notice("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 8a3db59e5d2f..7bbd0b63f7a8 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -55,8 +55,8 @@ /mob/living/carbon/alien/humanoid/Topic(href, href_list) //strip panel if(href_list["pouches"] && usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY)) - visible_message("[usr] tries to empty [src]'s pouches.", \ - "[usr] tries to empty [src]'s pouches.") + visible_message(span_danger("[usr] tries to empty [src]'s pouches."), \ + span_userdanger("[usr] tries to empty [src]'s pouches.")) if(do_mob(usr, src, POCKET_STRIP_DELAY * 0.5)) dropItemToGround(r_store) dropItemToGround(l_store) @@ -70,7 +70,7 @@ /mob/living/carbon/alien/humanoid/resist_grab(moving_resist) if(pulledby.grab_state) - visible_message("[src] has broken free of [pulledby]'s grip!") + visible_message(span_danger("[src] has broken 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 0fcbc3073f44..7f5889833b77 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm @@ -11,8 +11,8 @@ step_away(src,user,15) hitverb = "slammed" playsound(loc, "punch", 25, 1, -1) - visible_message("[user] has [hitverb] [src]!", \ - "[user] has [hitverb] [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[user] has [hitverb] [src]!"), \ + span_userdanger("[user] has [hitverb] [src]!"), null, COMBAT_MESSAGE_RANGE) return 1 /mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M) @@ -22,19 +22,19 @@ var/damage = rand(1, 9) if (prob(90)) playsound(loc, "punch", 25, 1, -1) - visible_message("[M] has punched [src]!", \ - "[M] has punched [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has punched [src]!"), \ + span_userdanger("[M] has punched [src]!"), null, COMBAT_MESSAGE_RANGE) if ((stat != DEAD) && (damage > 9 || prob(5)))//Regular humans have a very small chance of knocking an alien down. Unconscious(40) - visible_message("[M] has knocked [src] down!", \ - "[M] has knocked [src] down!") + visible_message(span_danger("[M] has knocked [src] down!"), \ + span_userdanger("[M] has knocked [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/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("[M] has attempted to punch [src]!", \ - "[M] has attempted to punch [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_userdanger("[M] has attempted to punch [src]!"), \ + span_userdanger("[M] has attempted to punch [src]!"), null, COMBAT_MESSAGE_RANGE) if (INTENT_DISARM) if (!(mobility_flags & MOBILITY_STAND)) @@ -42,18 +42,18 @@ Unconscious(40) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) log_combat(M, src, "pushed") - visible_message("[M] has pushed down [src]!", \ - "[M] has pushed down [src]!") + visible_message(span_danger("[M] has pushed down [src]!"), \ + span_userdanger("[M] has pushed down [src]!")) else if (prob(50)) dropItemToGround(get_active_held_item()) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - visible_message("[M] has disarmed [src]!", \ - "[M] has disarmed [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has disarmed [src]!"), \ + span_userdanger("[M] has disarmed [src]!"), null, COMBAT_MESSAGE_RANGE) else playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("[M] has attempted to disarm [src]!",\ - "[M] has attempted to disarm [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_userdanger("[M] has attempted to disarm [src]!"),\ + span_userdanger("[M] has attempted to disarm [src]!"), null, COMBAT_MESSAGE_RANGE) diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index 14946d2c319b..12ecbf185ae3 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -77,13 +77,13 @@ /obj/effect/proc_holder/alien/lay_egg/fire(mob/living/carbon/user) 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 if(!check_vent_block(user)) 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 @@ -100,20 +100,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, "You already have a Praetorian!") + to_chat(user, span_noticealien("You already have a Praetorian!")) return 0 else for(prom in user) - to_chat(user, "You discard [prom].") + to_chat(user, span_noticealien("You discard [prom].")) qdel(prom) return 0 prom = new (user.loc) if(!user.put_in_active_hand(prom, 1)) - to_chat(user, "You must empty your hands before preparing the parasite.") + to_chat(user, span_warning("You 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 @@ -129,28 +129,28 @@ /obj/item/queenpromote/attack(mob/living/M, mob/living/carbon/alien/humanoid/user) if(!isalienadult(M) || isalienroyal(M)) - to_chat(user, "You may only use this with your adult, non-royal children!") + to_chat(user, span_noticealien("You 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, "You already have a Praetorian!") + to_chat(user, span_noticealien("You 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, "You must have 500 plasma stored to use this!") + to_chat(user, span_noticealien("You 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, "You discard [src].") + to_chat(user, span_noticealien("You 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 c9e258f1f1d1..31d8fcbf2221 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -60,9 +60,9 @@ return /mob/living/carbon/alien/larva/stripPanelUnequip(obj/item/what, mob/who) - to_chat(src, "You don't have the dexterity to do this!") + to_chat(src, span_warning("You don't have the dexterity to do this!")) return /mob/living/carbon/alien/larva/stripPanelEquip(obj/item/what, mob/who) - to_chat(src, "You don't have the dexterity to do this!") + to_chat(src, span_warning("You 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 69c1be707d8f..751e1a6abddd 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm @@ -6,8 +6,8 @@ if (prob(90)) playsound(loc, "punch", 25, 1, -1) log_combat(M, src, "attacked") - visible_message("[M] has kicked [src]!", \ - "[M] has kicked [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has kicked [src]!"), \ + span_userdanger("[M] has kicked [src]!"), null, COMBAT_MESSAGE_RANGE) if ((stat != DEAD) && (damage > 4.9)) Unconscious(rand(100,200)) @@ -15,8 +15,8 @@ apply_damage(damage, BRUTE, affecting) else playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("[M] has attempted to kick [src]!", \ - "[M] has attempted to kick [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has attempted to kick [src]!"), \ + span_userdanger("[M] has attempted to kick [src]!"), null, COMBAT_MESSAGE_RANGE) /mob/living/carbon/alien/larva/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0) if(user.a_intent == INTENT_HARM) diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index 9df7b885f24b..77fda6f928cd 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!", \ - "You are now hiding.") + user.visible_message(span_name("[user] scurries to the ground!"), \ + span_noticealien("You are now hiding.")) else user.layer = MOB_LAYER user.visible_message("[user] slowly peeks up from the ground...", \ - "You stop hiding.") + span_noticealien("You stop hiding.")) return 1 @@ -33,11 +33,11 @@ var/mob/living/carbon/alien/larva/L = user if(L.handcuffed || L.legcuffed) // Cuffing larvas ? Eh ? - to_chat(user, "You cannot evolve when you are cuffed.") + to_chat(user, span_danger("You cannot evolve when you are cuffed.")) return if(L.movement_type & (VENTCRAWLING)) - to_chat(user, "You cannot evolve in a pipe.") + to_chat(user, span_danger("You cannot evolve in a pipe.")) return if(L.amount_grown >= L.max_grown) //TODO ~Carn @@ -54,8 +54,8 @@ to_chat(L, "Drone ! They 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.") return 0 - to_chat(L, "You 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, span_name("You 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, "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.") @@ -65,7 +65,7 @@ return if(L.movement_type & (VENTCRAWLING)) - to_chat(user, "You cannot evolve in a pipe.") + to_chat(user, span_danger("You cannot evolve in a pipe.")) return var/mob/living/carbon/alien/humanoid/new_xeno @@ -80,5 +80,5 @@ L.alien_evolve(new_xeno) return 0 else - to_chat(user, "You are not fully grown.") + to_chat(user, span_danger("You 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 c86287e77719..e017e84f4ec1 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -133,13 +133,13 @@ if(!owner|| owner.stat == DEAD) return if(isalien(owner)) //Different effects for aliens than humans - to_chat(owner, "Your Queen has been struck down!") - to_chat(owner, "You are struck with overwhelming agony! You feel confused, and your connection to the hivemind is severed.") + to_chat(owner, span_userdanger("Your Queen has been struck down!")) + to_chat(owner, span_danger("You are struck with overwhelming agony! You feel confused, and your 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, "You feel a splitting pain in your head, and are struck with a wave of nausea. You cannot hear the hivemind anymore!") + to_chat(owner, span_danger("You feel a splitting pain in your head, and are struck with a wave of nausea. You cannot hear the hivemind anymore!")) owner.emote("scream") owner.Paralyze(100) @@ -158,7 +158,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 ed77fe8265c4..68515bc26737 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -18,7 +18,7 @@ /obj/item/organ/body_egg/alien_embryo/on_find(mob/living/finder) ..() if(stage < 5) - 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.") if(prob(10)) @@ -37,24 +37,24 @@ if(prob(2)) owner.emote("cough") if(prob(2)) - to_chat(owner, "Your throat feels sore.") + to_chat(owner, span_danger("Your throat feels sore.")) if(prob(2)) - to_chat(owner, "Mucous runs down the back of your throat.") + to_chat(owner, span_danger("Mucous runs down the back of your throat.")) if(5) if(prob(2)) owner.emote("sneeze") if(prob(2)) owner.emote("cough") if(prob(4)) - to_chat(owner, "Your muscles ache.") + to_chat(owner, span_danger("Your muscles ache.")) if(prob(20)) owner.take_bodypart_damage(1) if(prob(4)) - to_chat(owner, "Your stomach hurts.") + to_chat(owner, span_danger("Your stomach hurts.")) if(prob(20)) owner.adjustToxLoss(1) if(5) - to_chat(owner, "You feel something tearing its way out of your stomach...") + to_chat(owner, span_danger("You feel something tearing its way out of your stomach...")) owner.adjustToxLoss(10) /// Controls Xenomorph Embryo growth. If embryo is fully grown (or overgrown), stop the proc. If not, increase the stage by one and if it's not fully grown (stage 6), add a timer to do this proc again after however long the growth time variable is. @@ -116,13 +116,13 @@ new_xeno.invisibility = 0 if(gib_on_success) - new_xeno.visible_message("[new_xeno] bursts out of [owner] in a shower of gore!", "You exit [owner], your previous host.", "You hear organic matter ripping and tearing!") + new_xeno.visible_message(span_danger("[new_xeno] bursts out of [owner] in a shower of gore!"), span_userdanger("You exit [owner], your previous host."), span_italics("You hear organic matter ripping and tearing!")) var/obj/item/organ/brain/BR = owner.getorgan(/obj/item/organ/brain) //yogs start if(BR) BR.setOrganDamage(maxHealth) //trauma from having a FUCKING XENO COME OUT OF YOUR BODY owner.gib() //yogs end else - new_xeno.visible_message("[new_xeno] wriggles out of [owner]!", "You exit [owner], your previous host.") + new_xeno.visible_message(span_danger("[new_xeno] wriggles out of [owner]!"), span_userdanger("You exit [owner], your 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 41f30b44b498..865b1857bfa3 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 [M]'s face!") + M.visible_message(span_danger("[src] leaps at [M]'s face!"), \ + span_userdanger("[src] leaps at [M]'s 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 [H]'s [H.head]!") + H.visible_message(span_danger("[src] smashes against [H]'s [H.head]!"), \ + span_userdanger("[src] smashes against [H]'s [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 [target]'s face!") + target.visible_message(span_danger("[src] tears [W] off of [target]'s face!"), \ + span_userdanger("[src] tears [W] off of [target]'s 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 [target]'s face!") + target.visible_message(span_danger("[src] falls limp after violating [target]'s face!"), \ + span_userdanger("[src] falls limp after violating [target]'s 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 [target]'s face!") + target.visible_message(span_danger("[src] violates [target]'s face!"), \ + span_userdanger("[src] violates [target]'s 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 0dc4e71541dd..f04ac1d37ed7 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -33,7 +33,7 @@ var/obj/item/twohanded/TH = item_in_hand if(istype(TH)) if(TH.wielded == 1) - to_chat(usr, "Your other hand is too busy holding [TH].") + to_chat(usr, span_warning("Your other hand is too busy holding [TH].")) return var/oindex = active_hand_index active_hand_index = held_index @@ -95,8 +95,8 @@ take_bodypart_damage(10,check_armor = TRUE) victim.Paralyze(20) Paralyze(20) - visible_message("[src] crashes into [victim], knocking them both over!",\ - "You violently crash into [victim]!") + visible_message(span_danger("[src] crashes into [victim], knocking them both over!"),\ + span_userdanger("You violently crash into [victim]!")) playsound(src,'sound/weapons/punch1.ogg',50,1) @@ -143,7 +143,7 @@ thrown_thing = throwable_mob stop_pulling() if(HAS_TRAIT(src, TRAIT_PACIFISM)) - to_chat(src, "You gently let go of [throwable_mob].") + to_chat(src, span_notice("You gently let go of [throwable_mob].")) var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors var/turf/end_T = get_turf(target) if(start_T && end_T) @@ -154,11 +154,11 @@ dropItemToGround(I) if(HAS_TRAIT(src, TRAIT_PACIFISM) && I.throwforce) - to_chat(src, "You set [I] down gently on the ground.") + to_chat(src, span_notice("You set [I] down gently on the ground.")) return if(thrown_thing) - visible_message("[src] has thrown [thrown_thing].") + visible_message(span_danger("[src] has thrown [thrown_thing].")) log_message("has thrown [thrown_thing]", LOG_ATTACK) newtonian_move(get_dir(target, src)) thrown_thing.safe_throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed, src, null, null, null, move_force) @@ -221,8 +221,8 @@ 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 [src]'s [ITEM.name].") + visible_message(span_danger("[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name]."), \ + span_userdanger("[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].")) if(do_mob(usr, src, POCKET_STRIP_DELAY)) if(internal) internal = null @@ -232,8 +232,8 @@ 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 [src]'s [ITEM.name].") + visible_message(span_danger("[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name]."), \ + span_userdanger("[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name].")) /mob/living/carbon/fall(forced) if(loc) @@ -256,15 +256,15 @@ if(handcuffed) var/obj/item/restraints/O = src.get_item_by_slot(SLOT_HANDCUFFED) buckle_cd = O.breakouttime - visible_message("[src] attempts to unbuckle [p_them()]self!", \ - "You attempt to unbuckle yourself... (This will take around [round(buckle_cd/10,1)] second\s, and you need to stay still.)") + visible_message(span_warning("[src] attempts to unbuckle [p_them()]self!"), \ + span_notice("You attempt to unbuckle yourself... (This will take around [round(buckle_cd/10,1)] second\s, and you need to stay still.)")) 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, "You fail to unbuckle yourself!") + to_chat(src, span_warning("You fail to unbuckle yourself!")) else buckled.user_unbuckle_mob(src,src) @@ -272,12 +272,12 @@ fire_stacks -= 5 Paralyze(60, TRUE, TRUE) spin(32,2) - visible_message("[src] rolls on the floor, trying to put [p_them()]self out!", \ - "You stop, drop, and roll!") + visible_message(span_danger("[src] rolls on the floor, trying to put [p_them()]self out!"), \ + span_notice("You stop, drop, and roll!")) sleep(30) if(fire_stacks <= 0) - visible_message("[src] has successfully extinguished [p_them()]self!", \ - "You extinguish yourself.") + visible_message(span_danger("[src] has successfully extinguished [p_them()]self!"), \ + span_notice("You extinguish yourself.")) ExtinguishMob() return @@ -302,26 +302,26 @@ /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.breakouttime if(!cuff_break) - visible_message("[src] attempts to remove [I]!") - to_chat(src, "You attempt to remove [I]... (This will take around [DisplayTimeText(breakouttime)] and you need to stand still.)") + visible_message(span_warning("[src] attempts to remove [I]!")) + to_chat(src, span_notice("You attempt to remove [I]... (This will take around [DisplayTimeText(breakouttime)] and you need to stand still.)")) if(do_after(src, breakouttime, 0, target = src)) clear_cuffs(I, cuff_break) else - to_chat(src, "You fail to remove [I]!") + to_chat(src, span_warning("You fail to remove [I]!")) else if(cuff_break == FAST_CUFFBREAK) breakouttime = 50 - visible_message("[src] is trying to break [I]!") - to_chat(src, "You attempt to break [I]... (This will take around 5 seconds and you need to stand still.)") + visible_message(span_warning("[src] is trying to break [I]!")) + to_chat(src, span_notice("You attempt to break [I]... (This will take around 5 seconds and you need to stand still.)")) if(do_after(src, breakouttime, 0, target = src)) clear_cuffs(I, cuff_break) else - to_chat(src, "You fail to break [I]!") + to_chat(src, span_warning("You fail to break [I]!")) else if(cuff_break == INSTANT_CUFFBREAK) clear_cuffs(I, cuff_break) @@ -360,8 +360,8 @@ /mob/living/carbon/proc/clear_cuffs(obj/item/I, cuff_break) if(!I.loc || buckled) return - visible_message("[src] manages to [cuff_break ? "break" : "remove"] [I]!") - to_chat(src, "You successfully [cuff_break ? "break" : "remove"] [I].") + visible_message(span_danger("[src] manages to [cuff_break ? "break" : "remove"] [I]!")) + to_chat(src, span_notice("You successfully [cuff_break ? "break" : "remove"] [I].")) if(cuff_break) . = !((I == handcuffed) || (I == legcuffed)) @@ -447,21 +447,21 @@ if(nutrition < 100 && !blood) if(message) - visible_message("[src] dry heaves!", \ - "You try to throw up, but there's nothing in your stomach!") + visible_message(span_warning("[src] dry heaves!"), \ + span_userdanger("You try to throw up, but there's nothing in your stomach!")) if(stun) Paralyze(200) return TRUE 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!", \ - "You throw up all over yourself!") + visible_message(span_danger("[src] throws up all over [p_them()]self!"), \ + span_userdanger("You throw up all over yourself!")) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "vomit", /datum/mood_event/vomitself) distance = 0 else if(message) - visible_message("[src] throws up!", "You throw up!") + visible_message(span_danger("[src] throws up!"), span_userdanger("You throw up!")) if(!isflyperson(src)) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "vomit", /datum/mood_event/vomit) @@ -870,7 +870,7 @@ O.Remove(src) O.forceMove(drop_location()) if(organs_amt) - to_chat(user, "You retrieve some of [src]\'s internal organs!") + to_chat(user, span_notice("You retrieve some of [src]\'s internal organs!")) /mob/living/carbon/ExtinguishMob() for(var/X in get_equipped_items()) @@ -957,7 +957,7 @@ set name = "Give" set category = "IC" if(!iscarbon(src)) - to_chat(src, "You can't give items!") + to_chat(src, span_warning("You can't give items!")) return if(A && A != src && get_dist(src, A) < 2) var/mob/living/carbon/C = src diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index c3173b7b2016..30cf2d4e7899 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -59,7 +59,7 @@ 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]!") //catch that sucker! + visible_message(span_warning("[src] catches [I]!")) //catch that sucker! throw_mode_off() return TRUE ..() @@ -160,8 +160,8 @@ if(M.powerlevel < 0) M.powerlevel = 0 - visible_message("The [M.name] has shocked [src]!", \ - "The [M.name] has shocked [src]!") + visible_message(span_danger("The [M.name] has shocked [src]!"), \ + span_userdanger("The [M.name] has shocked [src]!")) do_sparks(5, TRUE, src) var/power = M.powerlevel + rand(0,3) @@ -200,7 +200,7 @@ if (stat == DEAD) return else - show_message("The blob attacks!") + show_message(span_userdanger("The blob attacks!")) adjustBruteLoss(10) /mob/living/carbon/emp_act(severity) @@ -228,9 +228,9 @@ else take_overall_damage(0,shock_damage) visible_message( - "[src] was shocked by \the [source]!", \ - "You feel a powerful shock coursing through your body!", \ - "You hear a heavy electrical crack." \ + span_danger("[src] was shocked by \the [source]!"), \ + span_userdanger("You feel a powerful shock coursing through your body!"), \ + span_italics("You hear a heavy electrical crack.") \ ) jitteriness += 1000 //High numbers for violent convulsions do_jitter_animation(jitteriness) @@ -255,23 +255,23 @@ /mob/living/carbon/proc/help_shake_act(mob/living/carbon/M) if(on_fire) - to_chat(M, "You can't put [p_them()] out with just your bare hands!") + to_chat(M, span_warning("You can't put [p_them()] out with just your bare hands!")) return if(!(mobility_flags & MOBILITY_STAND)) if(buckled) - to_chat(M, "You need to unbuckle [src] first to do that!") + to_chat(M, span_warning("You need to unbuckle [src] first to do that!")) return - M.visible_message("[M] shakes [src] trying to get [p_them()] up!", \ - "You shake [src] trying to get [p_them()] up!") + M.visible_message(span_notice("[M] shakes [src] trying to get [p_them()] up!"), \ + span_notice("You shake [src] trying to get [p_them()] up!")) else if(check_zone(M.zone_selected) == BODY_ZONE_L_ARM || check_zone(M.zone_selected) == BODY_ZONE_R_ARM) //Headpats are too extreme, we have to pat shoulders on yogs - M.visible_message("[M] gives [src] a pat on the shoulder to make [p_them()] feel better!", \ - "You give [src] a pat on the shoulder to make [p_them()] feel better!") + M.visible_message(span_notice("[M] gives [src] a pat on the shoulder to make [p_them()] feel better!"), \ + span_notice("You give [src] a pat on the shoulder to make [p_them()] feel better!")) else - M.visible_message("[M] hugs [src] to make [p_them()] feel better!", \ - "You hug [src] to make [p_them()] feel better!") + M.visible_message(span_notice("[M] hugs [src] to make [p_them()] feel better!"), \ + span_notice("You hug [src] to make [p_them()] feel better!")) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/hug) if(HAS_TRAIT(M, TRAIT_FRIENDLY)) var/datum/component/mood/mood = M.GetComponent(/datum/component/mood) @@ -293,9 +293,9 @@ if(dna && dna.check_mutation(ACTIVE_HULK)) if(prob(30)) adjustStaminaLoss(10) - to_chat(src, "[M] calms you down a little.") + to_chat(src, span_notice("[M] calms you down a little.")) else - to_chat(src, "[M] tries to calm you!") + to_chat(src, span_warning("[M] tries to calm you!")) set_resting(FALSE) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) @@ -316,16 +316,16 @@ return if (damage == 1) - to_chat(src, "Your eyes sting a little.") + to_chat(src, span_warning("Your eyes sting a little.")) if(prob(40)) eyes.applyOrganDamage(1) else if (damage == 2) - to_chat(src, "Your eyes burn.") + to_chat(src, span_warning("Your eyes burn.")) eyes.applyOrganDamage(rand(2, 4)) else if( damage >= 3) - to_chat(src, "Your eyes itch and burn severely!") + to_chat(src, span_warning("Your eyes itch and burn severely!")) eyes.applyOrganDamage(rand(12, 16)) if(eyes.damage > 10) @@ -335,22 +335,22 @@ if(eyes.damage > 20) if(prob(eyes.damage - 20)) if(!HAS_TRAIT(src, TRAIT_NEARSIGHT)) - to_chat(src, "Your eyes start to burn badly!") + to_chat(src, span_warning("Your eyes start to burn badly!")) become_nearsighted(EYE_DAMAGE) else if(prob(eyes.damage - 25)) if(!HAS_TRAIT(src, TRAIT_BLIND)) - to_chat(src, "You can't see anything!") + to_chat(src, span_warning("You can't see anything!")) eyes.applyOrganDamage(eyes.maxHealth) else - to_chat(src, "Your eyes are really starting to hurt. This can't be good for you!") + to_chat(src, span_warning("Your 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 your vision!") + to_chat(src, span_notice("Something bright flashes in the corner of your vision!")) if(has_bane(BANE_LIGHT)) mind.disrupt_spells(0) @@ -372,13 +372,13 @@ adjustEarDamage(ear_damage,deaf) if(ears.damage >= 15) - to_chat(src, "Your ears start to ring badly!") + to_chat(src, span_warning("Your ears start to ring badly!")) if(prob(ears.damage - 5)) - to_chat(src, "You can't hear anything!") + to_chat(src, span_userdanger("You 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, "Your ears start to ring!") + to_chat(src, span_warning("Your ears start to ring!")) SEND_SOUND(src, sound('sound/weapons/flash_ring.ogg',0,1,0,250)) return effect_amount //how soundbanged we are diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm index 3a998a7d4a2b..9f26b38f384d 100644 --- a/code/modules/mob/living/carbon/death.dm +++ b/code/modules/mob/living/carbon/death.dm @@ -25,7 +25,7 @@ stomach_contents.Remove(M) //yogs end M.forceMove(Tsec) - visible_message("[M] bursts out of [src]!") + visible_message(span_danger("[M] bursts out of [src]!")) ..() /mob/living/carbon/spill_organs(no_brain, no_organs, no_bodyparts) diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 93a7ed02e8e1..fce32a6afe05 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -10,7 +10,7 @@ var/list/obscured = check_obscured_slots() if (handcuffed) - . += "[t_He] [t_is] [icon2html(handcuffed, user)] handcuffed!" + . += span_warning("[t_He] [t_is] [icon2html(handcuffed, user)] handcuffed!") if (head) . += "[t_He] [t_is] wearing [head.get_examine_string(user)] on [t_his] head. " if(wear_mask && !(SLOT_WEAR_MASK in obscured)) @@ -28,9 +28,9 @@ 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_deadsay("[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_deadsay("It appears that [t_his] brain is missing...") var/list/missing = get_missing_limbs() for(var/t in missing) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 59d9945422d3..ee13332c899a 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -53,16 +53,16 @@ else if(FR && length(FR.blood_DNA)) var/hand_number = get_num_arms(FALSE) if(hand_number) - . += "[t_He] [t_has] [hand_number > 1 ? "" : "a"] blood-stained hand[hand_number > 1 ? "s" : ""]!" + . += span_warning("[t_He] [t_has] [hand_number > 1 ? "" : "a"] blood-stained hand[hand_number > 1 ? "s" : ""]!") //handcuffed? //handcuffed? if(handcuffed) if(istype(handcuffed, /obj/item/restraints/handcuffs/cable)) - . += "[t_He] [t_is] [icon2html(handcuffed, user)] restrained with cable!" + . += span_warning("[t_He] [t_is] [icon2html(handcuffed, user)] restrained with cable!") else - . += "[t_He] [t_is] [icon2html(handcuffed, user)] handcuffed!" + . += span_warning("[t_He] [t_is] [icon2html(handcuffed, user)] handcuffed!") //belt if(belt) @@ -102,25 +102,25 @@ if(300 to INFINITY) . += "[t_He] [t_is] convulsing violently!" if(200 to 300) - . += "[t_He] [t_is] extremely jittery." + . += span_warning("[t_He] [t_is] extremely jittery.") if(100 to 200) - . += "[t_He] [t_is] twitching ever so slightly." + . += span_warning("[t_He] [t_is] twitching ever so slightly.") var/appears_dead = 0 if(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH))) appears_dead = 1 if(suiciding) - . += "[t_He] appear[p_s()] to have committed suicide... there is no hope of recovery." + . += span_warning("[t_He] appear[p_s()] to have committed suicide... there is no hope of recovery.") if(hellbound) - . += "[t_His] soul seems to have been ripped out of [t_his] body. Revival is impossible." + . += span_warning("[t_His] soul seems to have been ripped out of [t_his] body. Revival is impossible.") . += "" if(getorgan(/obj/item/organ/brain) && !key && !get_ghost(FALSE, TRUE)) - . += "[t_He] [t_is] limp and unresponsive; there are no signs of life and [t_his] soul has departed..." + . += span_deadsay("[t_He] [t_is] limp and unresponsive; there are no signs of life and [t_his] soul has departed...") else - . += "[t_He] [t_is] limp and unresponsive; there are no signs of life..." + . += span_deadsay("[t_He] [t_is] limp and unresponsive; there are no signs of life...") if(get_bodypart(BODY_ZONE_HEAD) && !getorgan(/obj/item/organ/brain)) - . += "It appears that [t_his] brain is missing..." + . += span_deadsay("It appears that [t_his] brain is missing...") var/temp = getBruteLoss() //no need to calculate each of these twice @@ -298,7 +298,7 @@ msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly inhuman manner.\n" if (length(msg)) - . += "[msg.Join("")]" + . += span_warning("[msg.Join("")]") var/trait_exam = common_trait_examine() if (!isnull(trait_exam)) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 7300d4eaf926..d1025dd1af40 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -235,7 +235,7 @@ if(!I || I.loc != src) //no item, no limb, or item is not in limb or in the person anymore return var/time_taken = I.embedding.embedded_unsafe_removal_time*I.w_class - usr.visible_message("[usr] attempts to remove [I] from [usr.p_their()] [L.name].","You attempt to remove [I] from your [L.name]... (It will take [DisplayTimeText(time_taken)].)") + usr.visible_message(span_warning("[usr] attempts to remove [I] from [usr.p_their()] [L.name]."),span_notice("You attempt to remove [I] from your [L.name]... (It will take [DisplayTimeText(time_taken)].)")) if(do_after(usr, time_taken, needhand = 1, target = src)) if(!I || !L || I.loc != src || !(I in L.embedded_objects)) return @@ -244,7 +244,7 @@ I.forceMove(get_turf(src)) usr.put_in_hands(I) usr.emote("scream") - usr.visible_message("[usr] successfully rips [I] out of [usr.p_their()] [L.name]!","You successfully remove [I] from your [L.name].") + usr.visible_message("[usr] successfully rips [I] out of [usr.p_their()] [L.name]!",span_notice("You successfully remove [I] from your [L.name].")) if(!has_embedded_objects()) clear_alert("embeddedobject") SEND_SIGNAL(usr, COMSIG_CLEAR_MOOD_EVENT, "embedded") @@ -253,7 +253,7 @@ 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, "You can't reach that! Something is covering it.") + to_chat(usr, span_warning("You can't reach that! Something is covering it.")) return if(href_list["pockets"] && usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY)) //TODO: Make it match (or intergrate it into) strippanel so you get 'item cannot fit here' warnings if mob_can_equip fails @@ -265,10 +265,10 @@ var/delay_denominator = 1 if(pocket_item && !(pocket_item.item_flags & ABSTRACT)) if(HAS_TRAIT(pocket_item, TRAIT_NODROP)) - to_chat(usr, "You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!") - to_chat(usr, "You try to empty [src]'s [pocket_side] pocket.") + to_chat(usr, span_warning("You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!")) + to_chat(usr, span_notice("You 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, "You try to place [place_item] into [src]'s [pocket_side] pocket.") + to_chat(usr, span_notice("You try to place [place_item] into [src]'s [pocket_side] pocket.")) delay_denominator = 4 else return @@ -286,7 +286,7 @@ //updating inv screen after handled by living/Topic() else // Display a warning if the user mocks up - to_chat(src, "You feel your [pocket_side] pocket being fumbled with!") + to_chat(src, span_warning("You feel your [pocket_side] pocket being fumbled with!")) ///////HUDs/////// if(href_list["hud"]) @@ -370,9 +370,9 @@ 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(href_list["hud"] == "s") if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/security)) @@ -390,7 +390,7 @@ 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) @@ -442,7 +442,7 @@ var/crime = GLOB.data_core.createCrimeEntry(crimeName, crimeDetails, allowed_access, station_time_timestamp()) GLOB.data_core.addCrime(R.fields["id"], crime) investigate_log("New Crime: [crimeName]: [crimeDetails] | Added to [R.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS) - to_chat(usr, "Successfully added a crime.") + to_chat(usr, span_notice("Successfully added a crime.")) return if(href_list["view_comment"]) @@ -469,9 +469,9 @@ return var/comment = GLOB.data_core.createCommentEntry(commentValue, allowed_access) GLOB.data_core.addComment(R.fields["id"], comment) - to_chat(usr, "Successfully added comment.") + to_chat(usr, span_notice("Successfully added comment.")) return - to_chat(usr, "Unable to locate a data core entry for this person.") + to_chat(usr, span_warning("Unable to locate a data core entry for this person.")) ..() //end of this massive fucking chain. TODO: make the hud chain not spooky. @@ -500,7 +500,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) @@ -591,27 +591,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]!", \ - "You try to perform CPR on [C.name]... Hold still!") + visible_message(span_notice("[src] is trying to perform CPR on [C.name]!"), \ + span_notice("You try to perform CPR on [C.name]... Hold still!")) if(!do_mob(src, C)) - to_chat(src, "You fail to perform CPR on [C]!") + to_chat(src, span_warning("You fail to perform CPR on [C]!")) return 0 var/they_breathe = !HAS_TRAIT(C, TRAIT_NOBREATH) @@ -622,7 +622,7 @@ if(C.health > C.crit_threshold) return - src.visible_message("[src] performs CPR on [C.name]!", "You perform CPR on [C.name].") + src.visible_message("[src] performs CPR on [C.name]!", span_notice("You 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") @@ -638,11 +638,11 @@ var/suff = min(C.getOxyLoss(), 7) C.adjustOxyLoss(-suff) C.updatehealth() - to_chat(C, "You feel a breath of fresh air enter your lungs... It feels good...") + to_chat(C, span_unconscious("You feel a breath of fresh air enter your lungs... It feels good...")) else if(they_breathe && !they_lung) - to_chat(C, "You feel a breath of fresh air... but you don't feel any better...") + to_chat(C, span_unconscious("You feel a breath of fresh air... but you don't feel any better...")) else - to_chat(C, "You feel a breath of fresh air... which is a sensation you don't recognise...") + to_chat(C, span_unconscious("You 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) || dna.check_mutation(ACTIVE_HULK))) @@ -758,12 +758,12 @@ /mob/living/carbon/human/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE) if(!(mobility_flags & MOBILITY_UI)) - to_chat(src, "You can't do that right now!") + to_chat(src, span_warning("You 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, "You are too far away!") + to_chat(src, span_warning("You are too far away!")) return FALSE return TRUE @@ -864,8 +864,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)) if(message) - visible_message("[src] dry heaves!", \ - "You try to throw up, but there's nothing in your stomach!") + visible_message(span_warning("[src] dry heaves!"), \ + span_userdanger("You try to throw up, but there's nothing in your stomach!")) if(stun) Paralyze(200) return 1 @@ -914,7 +914,7 @@ carrydelay = 40 skills_space = "quickly" if(can_be_firemanned(target) && !incapacitated(FALSE, TRUE)) - visible_message("[src] starts [skills_space] lifting [target] onto their back..", + visible_message(span_notice("[src] starts [skills_space] lifting [target] onto their back.."), //Joe Medic starts quickly/expertly lifting Grey Tider onto their back.. "[carrydelay < 35 ? "Using your gloves' nanochips, you" : "You"] [skills_space] start to lift [target] onto your back[carrydelay == 40 ? ", while assisted by the nanochips in your gloves.." : "..."]") //(Using your gloves' nanochips, you/You) ( /quickly/expertly) start to lift Grey Tider onto your back(, while assisted by the nanochips in your gloves../...) @@ -931,29 +931,29 @@ return else buckle_mob(target, TRUE, TRUE, 90, 1, 0) - visible_message("[src] fails to fireman carry [target]!") + visible_message(span_warning("[src] fails to fireman carry [target]!")) else - to_chat(src, "You can't fireman carry [target] while they're standing!") + to_chat(src, span_warning("You can't fireman carry [target] while they're standing!")) /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, 3 SECONDS, target = src)) if(can_piggyback(target)) if(target.incapacitated(FALSE, TRUE) || incapacitated(FALSE, TRUE)) - target.visible_message("[target] can't hang onto [src]!") + target.visible_message(span_warning("[target] can't hang onto [src]!")) return buckle_mob(target, TRUE, TRUE, FALSE, 0, 2) else - visible_message("[target] fails to climb onto [src]!") + visible_message(span_warning("[target] fails to climb onto [src]!")) else - to_chat(target, "You can't piggyback ride [src] right now!") + to_chat(target, span_warning("You can't piggyback ride [src] right now!")) /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) @@ -970,12 +970,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!", - "You 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("You 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!", - "You 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("You can't get a grip on [src] because your hands are full!")) return stop_pulling() @@ -995,7 +995,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]!", "You 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("You regain your grip on \the [active_item]"), null, COMBAT_MESSAGE_RANGE) /mob/living/carbon/human/do_after_coefficent() . = ..() @@ -1240,7 +1240,7 @@ say("HULK SMASH!!") if(staminaloss >= 90) dna.remove_mutation(ACTIVE_HULK) - to_chat(src, "You have calm down enough to become human again.") + to_chat(src, span_notice("You have calm down enough to become human again.")) Knockdown(6) return TRUE else diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index dd4d3d351a98..3b69994becd8 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -55,9 +55,9 @@ loc.bullet_act(P) return BULLET_ACT_HIT if(mind.martial_art.deflection_chance >= 100) //if they can NEVER be hit, lets clue sec in ;) - visible_message("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons!", "You deflect the projectile!") + visible_message(span_danger("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons!"), span_userdanger("You deflect the projectile!")) else - visible_message("[src] deflects the projectile!", "You deflect the projectile!") + visible_message(span_danger("[src] deflects the projectile!"), span_userdanger("You deflect the projectile!")) playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1) if(!mind.martial_art.reroute_deflection) return BULLET_ACT_BLOCK @@ -69,8 +69,8 @@ if(!(P.original == src && P.firer == src)) //can't block or reflect when shooting yourself 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_userdanger("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. @@ -166,7 +166,7 @@ I.add_mob_blood(src)//it embedded itself in you, of course it's bloody! I.forceMove(src) 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 your [L.name]!") + visible_message(span_danger("[I] embeds itself in [src]'s [L.name]!"),span_userdanger("[I] embeds itself in your [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 @@ -207,8 +207,8 @@ ..(user, 1) playsound(loc, user.dna.species.attack_sound, 25, 1, -1) var/message = "[user] has [hulk_verb]ed [src]!" - visible_message("[message]", \ - "[message]") + visible_message(span_danger("[message]"), \ + span_userdanger("[message]")) adjustBruteLoss(15) return 1 @@ -234,20 +234,20 @@ var/obj/item/I = get_active_held_item() if(I && dropItemToGround(I)) playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1) - visible_message("[M] disarmed [src]!", \ - "[M] disarmed [src]!") + visible_message(span_danger("[M] disarmed [src]!"), \ + span_userdanger("[M] disarmed [src]!")) else if(!M.client || prob(5)) // only natural monkeys get to stun reliably, (they only do it occasionaly) playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) if (src.IsKnockdown() && !src.IsParalyzed()) Paralyze(40) log_combat(M, src, "pinned") - visible_message("[M] has pinned down [src]!", \ - "[M] has pinned down [src]!") + visible_message(span_danger("[M] has pinned down [src]!"), \ + span_userdanger("[M] has pinned down [src]!")) else Knockdown(30) log_combat(M, src, "tackled") - visible_message("[M] has tackled down [src]!", \ - "[M] has tackled down [src]!") + visible_message(span_danger("[M] has tackled down [src]!"), \ + span_userdanger("[M] has tackled down [src]!")) if(M.limb_destroyer) dismembering_strike(M, affecting.body_zone) @@ -263,7 +263,7 @@ /mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M) if(check_shields(M, 0, "the M.name")) - visible_message("[M] attempted to touch [src]!") + visible_message(span_danger("[M] attempted to touch [src]!")) return 0 if(..()) @@ -273,8 +273,8 @@ var/damage = prob(90) ? 20 : 0 if(!damage) playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1) - visible_message("[M] has lunged at [src]!", \ - "[M] has lunged at [src]!") + visible_message(span_danger("[M] has lunged at [src]!"), \ + span_userdanger("[M] has lunged at [src]!")) return 0 var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) if(!affecting) @@ -282,8 +282,8 @@ var/armor_block = run_armor_check(affecting, "melee","","",10) playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) - visible_message("[M] has slashed at [src]!", \ - "[M] has slashed at [src]!") + visible_message(span_danger("[M] has slashed at [src]!"), \ + span_userdanger("[M] has slashed at [src]!")) log_combat(M, src, "attacked") if(!dismembering_strike(M, M.zone_selected)) //Dismemberment successful return 1 @@ -293,8 +293,8 @@ var/obj/item/I = get_active_held_item() if(I && dropItemToGround(I)) playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1) - visible_message("[M] disarmed [src]!", \ - "[M] disarmed [src]!") + visible_message(span_danger("[M] disarmed [src]!"), \ + span_userdanger("[M] disarmed [src]!")) else //yogs start var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) @@ -302,7 +302,7 @@ affecting = get_bodypart(BODY_ZONE_CHEST) var/armour = run_armor_check(affecting, "melee") if(prob(armour)) - to_chat(M, "[src]'s armour shields the blow!") + to_chat(M, span_notice("[src]'s armour shields the blow!")) return playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) if(armour > 0) @@ -311,8 +311,8 @@ Paralyze(50) //yogs end log_combat(M, src, "tackled") - visible_message("[M] has tackled down [src]!", \ - "[M] has tackled down [src]!") + visible_message(span_danger("[M] has tackled down [src]!"), \ + span_userdanger("[M] has tackled down [src]!")) /mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L) @@ -392,8 +392,8 @@ update_damage_overlays() updatehealth() - visible_message("[M.name] has hit [src]!", \ - "[M.name] has hit [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M.name] has hit [src]!"), \ + span_userdanger("[M.name] has hit [src]!"), null, COMBAT_MESSAGE_RANGE) log_combat(M.occupant, src, "attacked", M, "(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])") else @@ -470,7 +470,7 @@ /mob/living/carbon/human/blob_act(obj/structure/blob/B) if(stat == DEAD) return - show_message("The blob attacks you!") + show_message(span_userdanger("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, "melee")) @@ -510,7 +510,7 @@ var/obj/item/organ/heart/heart = getorganslot(ORGAN_SLOT_HEART) heart.beating = TRUE if(stat == CONSCIOUS) - to_chat(src, "You feel your heart beating again!") + to_chat(src, span_notice("You feel your heart beating again!")) siemens_coeff *= physiology.siemens_coeff dna.species.spec_electrocute_act(src, shock_damage,source,siemens_coeff,safety,override,tesla_shock, illusion, stun) @@ -531,7 +531,7 @@ for(var/obj/item/bodypart/L in src.bodyparts) if(L.status == BODYPART_ROBOTIC) if(!informed) - to_chat(src, "You feel a sharp pain as your robotic limbs overload.") + to_chat(src, span_userdanger("You feel a sharp pain as your robotic limbs overload.")) informed = TRUE switch(severity) if(1) @@ -564,7 +564,7 @@ update_inv_neck() update_inv_head() else - to_chat(src, "Your [head_clothes.name] protects your head and face from the acid!") + to_chat(src, span_notice("Your [head_clothes.name] protects your head and face from the acid!")) else . = get_bodypart(BODY_ZONE_HEAD) if(.) @@ -585,7 +585,7 @@ update_inv_w_uniform() update_inv_wear_suit() else - to_chat(src, "Your [chest_clothes.name] protects your body from the acid!") + to_chat(src, span_notice("Your [chest_clothes.name] protects your body from the acid!")) else . = get_bodypart(BODY_ZONE_CHEST) if(.) @@ -617,7 +617,7 @@ update_inv_w_uniform() update_inv_wear_suit() else - to_chat(src, "Your [arm_clothes.name] protects your arms and hands from the acid!") + to_chat(src, span_notice("Your [arm_clothes.name] protects your arms and hands from the acid!")) else . = get_bodypart(BODY_ZONE_R_ARM) if(.) @@ -643,7 +643,7 @@ update_inv_w_uniform() update_inv_wear_suit() else - to_chat(src, "Your [leg_clothes.name] protects your legs and feet from the acid!") + to_chat(src, span_notice("Your [leg_clothes.name] protects your legs and feet from the acid!")) else . = get_bodypart(BODY_ZONE_R_LEG) if(.) @@ -700,13 +700,13 @@ if(src == M) if(has_status_effect(STATUS_EFFECT_CHOKINGSTRAND)) - to_chat(src, "You attempt to remove the durathread strand from around your neck.") + to_chat(src, span_notice("You attempt to remove the durathread strand from around your neck.")) if(do_after(src, 35, null, src)) - to_chat(src, "You succesfuly remove the durathread strand.") + to_chat(src, span_notice("You succesfuly remove the durathread strand.")) remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) return else if(istype(src.getorganslot(ORGAN_SLOT_TONGUE), /obj/item/organ/tongue/lizard) && creamed) - visible_message("[src] eats the pie off [p_their()] face with [p_their()] forked tongue.", + visible_message(span_notice("[src] eats the pie off [p_their()] face with [p_their()] forked tongue."), "You eat the pie off your face with your forked tongue.") reagents.add_reagent(/datum/reagent/consumable/banana, 1) wash_cream() @@ -728,7 +728,7 @@ var/list/combined_msg = list() visible_message("[src] examines [p_them()]self.", \ - "You check yourself for injuries.") + span_notice("You check yourself for injuries.")) var/list/missing = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) for(var/X in bodyparts) @@ -779,45 +779,45 @@ combined_msg += "\t There is \a [I] embedded in your [LB.name]!" for(var/t in missing) - combined_msg += "Your [parse_zone(t)] is missing!" + combined_msg += span_boldannounce("Your [parse_zone(t)] is missing!") if(bleed_rate) - combined_msg += "You are bleeding!" + combined_msg += span_danger("You are bleeding!") if(getStaminaLoss()) if(getStaminaLoss() > 30) - combined_msg += "You're completely exhausted." + combined_msg += span_info("You're completely exhausted.") else - combined_msg += "You feel fatigued." + combined_msg += span_info("You feel fatigued.") if(HAS_TRAIT(src, TRAIT_SELF_AWARE)) if(toxloss) if(toxloss > 10) - combined_msg += "You feel sick." + combined_msg += span_danger("You feel sick.") else if(toxloss > 20) - combined_msg += "You feel nauseated." + combined_msg += span_danger("You feel nauseated.") else if(toxloss > 40) - combined_msg += "You feel very unwell!" + combined_msg += span_danger("You feel very unwell!") if(oxyloss) if(oxyloss > 10) - combined_msg += "You feel lightheaded." + combined_msg += span_danger("You feel lightheaded.") else if(oxyloss > 20) - combined_msg += "Your thinking is clouded and distant." + combined_msg += span_danger("Your thinking is clouded and distant.") else if(oxyloss > 30) - combined_msg += "You're choking!" + combined_msg += span_danger("You're choking!") if(!HAS_TRAIT(src, TRAIT_NOHUNGER)) switch(nutrition) if(NUTRITION_LEVEL_FULL to INFINITY) - combined_msg += "You're completely stuffed!" + combined_msg += span_info("You're completely stuffed!") if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL) - combined_msg += "You're well fed!" + combined_msg += span_info("You're well fed!") if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED) - combined_msg += "You're not hungry." + combined_msg += span_info("You're not hungry.") if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED) - combined_msg += "You could use a bite to eat." + combined_msg += span_info("You could use a bite to eat.") if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY) - combined_msg += "You feel quite hungry." + combined_msg += span_info("You feel quite hungry.") if(0 to NUTRITION_LEVEL_STARVING) - combined_msg += "You're starving!" + combined_msg += span_danger("You're starving!") if(dna.species.id == "skeleton") var/obj/item/clothing/under/under = w_uniform if((!under || under.adjusted) && (!wear_suit)) @@ -854,7 +854,7 @@ //Put the items in that list into a string of text for(var/B in broken) broken_message += B - combined_msg += " Your [broken_message] [broken_plural ? "are" : "is"] non-functional!" + combined_msg += span_warning(" Your [broken_message] [broken_plural ? "are" : "is"] non-functional!") if(damaged.len) if(damaged.len > 1) damaged.Insert(damaged.len, "and ") @@ -865,10 +865,10 @@ damaged_plural = TRUE for(var/D in damaged) damaged_message += D - combined_msg += "Your [damaged_message] [damaged_plural ? "are" : "is"] hurt." + combined_msg += span_info("Your [damaged_message] [damaged_plural ? "are" : "is"] hurt.") if(roundstart_quirks.len) - combined_msg += "You have these quirks: [get_trait_string()]." + combined_msg += span_notice("You have these quirks: [get_trait_string()].") to_chat(src, combined_msg.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 c6fb172f8c5b..c2601da27bec 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -139,14 +139,14 @@ if(G.trigger_guard == TRIGGER_GUARD_NORMAL) if(src.dna.check_mutation(HULK) || src.dna.check_mutation(ACTIVE_HULK)) - to_chat(src, "Your meaty finger is much too large for the trigger guard!") + to_chat(src, span_warning("Your meaty finger is much too large for the trigger guard!")) return FALSE if(HAS_TRAIT(src, TRAIT_NOGUNS)) - to_chat(src, "Your fingers don't fit in the trigger guard!") + to_chat(src, span_warning("Your fingers don't fit in the trigger guard!")) return FALSE if(mind) if(mind.martial_art && mind.martial_art.no_guns) //great dishonor to famiry - to_chat(src, "Use of ranged weaponry would bring dishonor to the clan.") + to_chat(src, span_warning("Use of ranged weaponry would bring dishonor to the clan.")) return FALSE return . diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 17f1b9def67e..193550e5d625 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -135,7 +135,7 @@ s_store = I update_inv_s_store() else - to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!") + to_chat(src, span_danger("You are 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) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index e657bc37e57f..0762afb538f9 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -310,13 +310,13 @@ for(var/obj/item/I in BP.embedded_objects) if(prob(I.embedding.embedded_pain_chance)) BP.receive_damage(I.w_class*I.embedding.embedded_pain_multiplier) - to_chat(src, "[I] embedded in your [BP.name] hurts!") + to_chat(src, span_userdanger("[I] embedded in your [BP.name] hurts!")) if(prob(I.embedding.embedded_fall_chance)) BP.receive_damage(I.w_class*I.embedding.embedded_fall_pain_multiplier) BP.embedded_objects -= I I.forceMove(drop_location()) - visible_message("[I] falls out of [name]'s [BP.name]!","[I] falls out of your [BP.name]!") + visible_message(span_danger("[I] falls out of [name]'s [BP.name]!"),span_userdanger("[I] falls out of your [BP.name]!")) if(!has_embedded_objects()) clear_alert("embeddedobject") SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "embedded") diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 98a11fc25ca6..0e65a1789b59 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -964,7 +964,7 @@ GLOBAL_LIST_EMPTY(mentor_races) var/obj/item/clothing/shoes/S = I if((!S && (DIGITIGRADE in species_traits)) || ((DIGITIGRADE in species_traits) ? S.xenoshoe == NO_DIGIT : S.xenoshoe == YES_DIGIT)) // Checks leg compatibilty with shoe digitigrade or not flag if(!disable_warning) - to_chat(H, "This footwear isn't compatible with your feet!") + to_chat(H, span_warning("This footwear isn't compatible with your feet!")) return FALSE return equip_delay_self_check(I, H, bypass_equip_delay_self) if(SLOT_BELT) @@ -975,7 +975,7 @@ GLOBAL_LIST_EMPTY(mentor_races) if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC)) if(!disable_warning) - to_chat(H, "You need a jumpsuit before you can attach this [I.name]!") + to_chat(H, span_warning("You need a jumpsuit before you can attach this [I.name]!")) return FALSE if(!(I.slot_flags & ITEM_SLOT_BELT)) return @@ -1020,7 +1020,7 @@ GLOBAL_LIST_EMPTY(mentor_races) var/obj/item/bodypart/O = H.get_bodypart(BODY_ZONE_CHEST) if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC)) if(!disable_warning) - to_chat(H, "You need a jumpsuit before you can attach this [I.name]!") + to_chat(H, span_warning("You need a jumpsuit before you can attach this [I.name]!")) return FALSE if( !(I.slot_flags & ITEM_SLOT_ID) ) return FALSE @@ -1035,7 +1035,7 @@ GLOBAL_LIST_EMPTY(mentor_races) if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC)) if(!disable_warning) - to_chat(H, "You need a jumpsuit before you can attach this [I.name]!") + to_chat(H, span_warning("You need a jumpsuit before you can attach this [I.name]!")) return FALSE if(I.slot_flags & ITEM_SLOT_DENYPOCKET) return FALSE @@ -1051,7 +1051,7 @@ GLOBAL_LIST_EMPTY(mentor_races) if(!H.w_uniform && !nojumpsuit && (!O || O.status != BODYPART_ROBOTIC)) if(!disable_warning) - to_chat(H, "You need a jumpsuit before you can attach this [I.name]!") + to_chat(H, span_warning("You need a jumpsuit before you can attach this [I.name]!")) return FALSE if(I.slot_flags & ITEM_SLOT_DENYPOCKET) return FALSE @@ -1065,7 +1065,7 @@ GLOBAL_LIST_EMPTY(mentor_races) return FALSE if(!H.wear_suit) if(!disable_warning) - to_chat(H, "You need a suit before you can attach this [I.name]!") + to_chat(H, span_warning("You need a suit before you can attach this [I.name]!")) return FALSE if(!H.wear_suit.allowed) if(!disable_warning) @@ -1104,7 +1104,7 @@ GLOBAL_LIST_EMPTY(mentor_races) /datum/species/proc/equip_delay_self_check(obj/item/I, mob/living/carbon/human/H, bypass_equip_delay_self) if(!I.equip_delay_self || bypass_equip_delay_self) return TRUE - H.visible_message("[H] start putting on [I]...", "You start putting on [I]...") + H.visible_message(span_notice("[H] start putting on [I]..."), span_notice("You start putting on [I]...")) return do_after(H, I.equip_delay_self, target = H) /datum/species/proc/before_equip_job(datum/job/J, mob/living/carbon/human/H) @@ -1134,13 +1134,13 @@ GLOBAL_LIST_EMPTY(mentor_races) //The fucking TRAIT_FAT mutation is the dumbest shit ever. It makes the code so difficult to work with if(HAS_TRAIT(H, TRAIT_FAT))//I share your pain, past coder. if(H.overeatduration < 100) - to_chat(H, "You feel fit again!") + to_chat(H, span_notice("You feel fit again!")) REMOVE_TRAIT(H, TRAIT_FAT, OBESITY) H.update_inv_w_uniform() H.update_inv_wear_suit() else if(H.overeatduration >= 100) - to_chat(H, "You suddenly feel blubbery!") + to_chat(H, span_danger("You suddenly feel blubbery!")) ADD_TRAIT(H, TRAIT_FAT, OBESITY) H.update_inv_w_uniform() H.update_inv_wear_suit() @@ -1180,15 +1180,15 @@ GLOBAL_LIST_EMPTY(mentor_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, "You feel vigorous.") + to_chat(H, span_notice("You feel vigorous.")) H.metabolism_efficiency = 1.25 else if(H.nutrition < NUTRITION_LEVEL_STARVING + 50) if(H.metabolism_efficiency != 0.8) - to_chat(H, "You feel sluggish.") + to_chat(H, span_notice("You feel sluggish.")) H.metabolism_efficiency = 0.8 else if(H.metabolism_efficiency == 1.25) - to_chat(H, "You no longer feel vigorous.") + to_chat(H, span_notice("You no longer feel vigorous.")) H.metabolism_efficiency = 1 switch(H.nutrition) @@ -1216,21 +1216,21 @@ GLOBAL_LIST_EMPTY(mentor_races) if(!H.IsParalyzed()) H.emote("collapse") H.Paralyze(RAD_MOB_KNOCKDOWN_AMOUNT) - to_chat(H, "You feel weak.") + to_chat(H, span_danger("You 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, "You mutate!") + to_chat(H, span_danger("You mutate!")) H.easy_randmut(NEGATIVE+MINOR_NEGATIVE) H.emote("gasp") H.domutcheck() if(radiation > RAD_MOB_HAIRLOSS) if(prob(15) && !(H.hair_style == "Bald") && (HAIR in species_traits)) - to_chat(H, "Your hair starts to fall out in clumps...") + to_chat(H, span_danger("Your hair starts to fall out in clumps...")) addtimer(CALLBACK(src, .proc/go_bald, H), 50) /datum/species/proc/go_bald(mob/living/carbon/human/H) @@ -1328,9 +1328,9 @@ GLOBAL_LIST_EMPTY(mentor_races) if(we_breathe && we_lung) user.do_cpr(target) else if(we_breathe && !we_lung) - to_chat(user, "You have no lungs to breathe with, so you cannot perform CPR.") + to_chat(user, span_warning("You have no lungs to breathe with, so you cannot perform CPR.")) else - to_chat(user, "You do not breathe, so you cannot perform CPR.") + to_chat(user, span_notice("You 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) var/datum/martial_art/M = target.check_block() @@ -1345,7 +1345,7 @@ GLOBAL_LIST_EMPTY(mentor_races) /datum/species/proc/harm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) if(!attacker_style?.nonlethal && HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "You don't want to harm [target]!") + to_chat(user, span_warning("You don't want to harm [target]!")) return FALSE var/datum/martial_art/M = target.check_block() if(M) @@ -1382,8 +1382,8 @@ GLOBAL_LIST_EMPTY(mentor_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, 1, -1) - target.visible_message("[user] has attempted to [atk_verb] [target]!",\ - "[user] has attempted to [atk_verb] [target]!", null, COMBAT_MESSAGE_RANGE) + target.visible_message(span_danger("[user] has attempted to [atk_verb] [target]!"),\ + span_userdanger("[user] has attempted to [atk_verb] [target]!"), null, COMBAT_MESSAGE_RANGE) log_combat(user, target, "attempted to punch") return FALSE @@ -1391,8 +1391,8 @@ GLOBAL_LIST_EMPTY(mentor_races) playsound(target.loc, user.dna.species.attack_sound, 25, 1, -1) - target.visible_message("[user] has [atk_verb]ed [target]!", \ - "[user] has [atk_verb]ed [target]!", null, COMBAT_MESSAGE_RANGE) + target.visible_message(span_danger("[user] has [atk_verb]ed [target]!"), \ + span_userdanger("[user] has [atk_verb]ed [target]!"), null, COMBAT_MESSAGE_RANGE) target.lastattacker = user.real_name target.lastattackerckey = user.ckey @@ -1410,8 +1410,8 @@ GLOBAL_LIST_EMPTY(mentor_races) log_combat(user, target, "punched") if((target.stat != DEAD) && damage >= user.dna.species.punchstunthreshold) - target.visible_message("[user] has knocked [target] down!", \ - "[user] has knocked [target] down!", null, COMBAT_MESSAGE_RANGE) + target.visible_message(span_danger("[user] has knocked [target] down!"), \ + span_userdanger("[user] has knocked [target] down!"), null, COMBAT_MESSAGE_RANGE) 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) @@ -1424,7 +1424,7 @@ GLOBAL_LIST_EMPTY(mentor_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("[target] blocks [user]'s shoving attempt!") + target.visible_message(span_warning("[target] blocks [user]'s shoving attempt!")) return FALSE if(attacker_style && attacker_style.disarm_act(user,target)) return TRUE @@ -1462,8 +1462,8 @@ GLOBAL_LIST_EMPTY(mentor_races) if(target.IsKnockdown() && !target.IsParalyzed()) var/armor_block = target.run_armor_check(affecting, "melee", "Your armor prevents your fall!", "Your armor softens your fall!") target.apply_effect(SHOVE_CHAIN_PARALYZE, EFFECT_PARALYZE, armor_block) - target.visible_message("[user.name] kicks [target.name] onto their side!", - "[user.name] kicks you onto your side!", null, COMBAT_MESSAGE_RANGE) + target.visible_message(span_danger("[user.name] kicks [target.name] onto their side!"), + span_danger("[user.name] kicks you onto your side!"), null, COMBAT_MESSAGE_RANGE) var/reset_timer = SHOVE_CHAIN_PARALYZE * (100-armor_block)/100 addtimer(CALLBACK(target, /mob/living/proc/SetKnockdown, 0), reset_timer) log_combat(user, target, "kicks", "onto their side (paralyzing)") @@ -1484,19 +1484,19 @@ GLOBAL_LIST_EMPTY(mentor_races) if(!bothstanding || directional_blocked) var/obj/item/I = target.get_active_held_item() if(target.dropItemToGround(I)) - user.visible_message("[user.name] shoves [target.name], disarming them!", - "You shove [target.name], disarming them!", null, COMBAT_MESSAGE_RANGE) + user.visible_message(span_danger("[user.name] shoves [target.name], disarming them!"), + span_danger("You shove [target.name], disarming them!"), null, COMBAT_MESSAGE_RANGE) log_combat(user, target, "shoved", "disarming them") else if(bothstanding) target.Knockdown(SHOVE_KNOCKDOWN_HUMAN) if(!target_collateral_human.is_shove_knockdown_blocked()) target_collateral_human.Knockdown(SHOVE_KNOCKDOWN_HUMAN) - user.visible_message("[user.name] shoves [target.name] into [target_collateral_human.name]!", - "You shove [target.name] into [target_collateral_human.name]!", null, COMBAT_MESSAGE_RANGE) + user.visible_message(span_danger("[user.name] shoves [target.name] into [target_collateral_human.name]!"), + span_danger("You shove [target.name] into [target_collateral_human.name]!"), null, COMBAT_MESSAGE_RANGE) log_combat(user, target, "shoved", "into [target_collateral_human.name]") else - user.visible_message("[user.name] shoves [target.name]!", - "You shove [target.name]!", null, COMBAT_MESSAGE_RANGE) + user.visible_message(span_danger("[user.name] shoves [target.name]!"), + span_danger("You shove [target.name]!"), null, COMBAT_MESSAGE_RANGE) 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)) @@ -1504,14 +1504,14 @@ GLOBAL_LIST_EMPTY(mentor_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!", - "Your 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_danger("Your grip on \the [target_held_item] loosens!"), null, COMBAT_MESSAGE_RANGE) addtimer(CALLBACK(target, /mob/living/carbon/human/proc/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]!!", - "You drop \the [target_held_item]!!", null, COMBAT_MESSAGE_RANGE) + target.visible_message(span_danger("[target.name] drops \the [target_held_item]!!"), + span_danger("You drop \the [target_held_item]!!"), null, COMBAT_MESSAGE_RANGE) var/append_message = "" if(target_held_item) if(knocked_item) @@ -1536,8 +1536,8 @@ GLOBAL_LIST_EMPTY(mentor_races) if((M != H) && M.a_intent != INTENT_HELP && H.check_shields(M, 0, M.name, attack_type = UNARMED_ATTACK)) if((M.dna.check_mutation(ACTIVE_HULK) || M.dna.check_mutation(HULK)) && M.a_intent == "disarm") H.check_shields(0, M.name) // We check their shields twice since we are a hulk. Also triggers hitreactions for HULK_ATTACK - M.visible_message("[M]'s punch knocks the shield out of [H]'s hand.", \ - "[M]'s punch knocks the shield out of [H]'s hand.") + M.visible_message(span_danger("[M]'s punch knocks the shield out of [H]'s hand."), \ + span_userdanger("[M]'s punch knocks the shield out of [H]'s hand.")) if(M.dna) playsound(H.loc, M.dna.species.attack_sound, 25, 1, -1) else @@ -1547,7 +1547,7 @@ GLOBAL_LIST_EMPTY(mentor_races) if(istype(attacker_style, /datum/martial_art/flyingfang) && M.a_intent == INTENT_DISARM) disarm(M, H, attacker_style) log_combat(M, H, "attempted to touch") - H.visible_message("[M] attempted to touch [H]!") + H.visible_message(span_warning("[M] attempted to touch [H]!")) return 0 SEND_SIGNAL(M, COMSIG_MOB_ATTACK_HAND, M, H, attacker_style) switch(M.a_intent) @@ -1580,7 +1580,7 @@ GLOBAL_LIST_EMPTY(mentor_races) hit_area = affecting.name var/def_zone = affecting.body_zone - var/armor_block = H.run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened a hit to your [hit_area].",I.armour_penetration) + var/armor_block = H.run_armor_check(affecting, "melee", span_notice("Your armor has protected your [hit_area]."), span_notice("Your armor has softened a hit to your [hit_area]."),I.armour_penetration) armor_block = min(90,armor_block) //cap damage reduction at 90% var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords) @@ -1617,8 +1617,8 @@ GLOBAL_LIST_EMPTY(mentor_races) if(prob(I.force)) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20) if(H.stat == CONSCIOUS) - H.visible_message("[H] has been knocked senseless!", \ - "[H] has been knocked senseless!") + H.visible_message(span_danger("[H] has been knocked senseless!"), \ + span_userdanger("[H] has been knocked senseless!")) H.confused = max(H.confused, 20) H.adjust_blurriness(10) if(prob(10)) @@ -1645,8 +1645,8 @@ GLOBAL_LIST_EMPTY(mentor_races) if(BODY_ZONE_CHEST) if(H.stat == CONSCIOUS && !I.is_sharp() && armor_block < 50) if(prob(I.force)) - H.visible_message("[H] has been knocked down!", \ - "[H] has been knocked down!") + H.visible_message(span_danger("[H] has been knocked down!"), \ + span_userdanger("[H] has been knocked down!")) H.apply_effect(60, EFFECT_KNOCKDOWN, armor_block) if(bloody) @@ -1713,9 +1713,9 @@ GLOBAL_LIST_EMPTY(mentor_races) // called when hit by a projectile switch(P.type) if(/obj/item/projectile/energy/floramut) // overwritten by plants/pods - H.show_message("The radiation beam dissipates harmlessly through your body.") + H.show_message(span_notice("The radiation beam dissipates harmlessly through your body.")) if(/obj/item/projectile/energy/florayield) - H.show_message("The radiation beam dissipates harmlessly through your body.") + H.show_message(span_notice("The radiation beam dissipates harmlessly through your body.")) /datum/species/proc/bullet_act(obj/item/projectile/P, mob/living/carbon/human/H) // called before a projectile hit @@ -2012,7 +2012,7 @@ GLOBAL_LIST_EMPTY(mentor_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 @@ -2022,7 +2022,7 @@ GLOBAL_LIST_EMPTY(mentor_races) if(H.buckled) buckled_obj = H.buckled - to_chat(H, "Your wings spazz out and launch you!") + to_chat(H, span_notice("Your wings spazz out and launch you!")) playsound(H.loc, 'sound/misc/slip.ogg', 50, TRUE, -3) @@ -2069,7 +2069,7 @@ GLOBAL_LIST_EMPTY(mentor_races) if(S.CanFly(H)) S.ToggleFlight(H) if(!(H.movement_type & FLYING)) - to_chat(H, "You settle gently back onto the ground...") + to_chat(H, span_notice("You settle gently back onto the ground...")) else - to_chat(H, "You beat your wings and begin to hover gently above the ground...") + to_chat(H, span_notice("You beat your wings and begin to hover gently above the ground...")) H.set_resting(FALSE, TRUE) 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 758587911d3f..3e41bf4e9978 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 @@ .=..() EMPeffect = TRUE spec_updatehealth(H) - to_chat(H, "You feel the light of your body leave you.") + to_chat(H, span_notice("You feel the light of your body leave you.")) switch(severity) if(EMP_LIGHT) addtimer(CALLBACK(src, .proc/stop_emp, H), 100, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 10 seconds @@ -83,8 +83,8 @@ if(emageffect) return emageffect = TRUE - to_chat(user, "You tap [H] on the back with your card.") - H.visible_message("[H] starts flickering in an array of colors!") + to_chat(user, span_notice("You 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/stop_emag, H), 300, TIMER_UNIQUE|TIMER_OVERRIDE) //Disco mode for 30 seconds! This doesn't affect the ethereal at all besides either annoying some players, or making someone look badass. @@ -99,7 +99,7 @@ /datum/species/ethereal/proc/stop_emp(mob/living/carbon/human/H) EMPeffect = FALSE spec_updatehealth(H) - to_chat(H, "You feel more energized as your shine comes back.") + to_chat(H, span_notice("You feel more energized as your shine comes back.")) /datum/species/ethereal/proc/handle_emag(mob/living/carbon/human/H) @@ -112,7 +112,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/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm index 6fc43bb6b156..d47d432febd3 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/effects/splat.ogg', 50, 1) - H.visible_message("[H] vomits on the floor!", \ - "You throw up on the floor!") + H.visible_message(span_danger("[H] vomits on the floor!"), \ + span_userdanger("You 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 eed2ec6d2d74..158598ba6cdc 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, "You feel like you could blow up at any moment!") + to_chat(H, span_userdanger("You feel like you could blow up at any moment!")) boom_warning = TRUE else if(boom_warning) - to_chat(H, "You feel more stable.") + to_chat(H, span_notice("You 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, "You ignite yourself!") + to_chat(owner, span_notice("You ignite yourself!")) else - to_chat(owner, "You try to ignite yourself, but fail!") + to_chat(owner, span_warning("You try to ignite yourself, but fail!")) H.IgniteMob() //firestacks are already there passively //Harder to hurt @@ -389,7 +389,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++) @@ -400,8 +400,8 @@ if(!(P.original == H && P.firer == H)) if(P.flag == "bullet" || P.flag == "bomb") playsound(H, 'sound/effects/shovel_dig.ogg', 70, 1) - 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_userdanger("The [P.name] sinks harmlessly in [H]'s sandy body!")) return BULLET_ACT_BLOCK return BULLET_ACT_HIT @@ -422,7 +422,7 @@ /datum/species/golem/glass/spec_death(gibbed, mob/living/carbon/human/H) playsound(H, "shatter", 70, 1) - 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++) @@ -432,8 +432,8 @@ /datum/species/golem/glass/bullet_act(obj/item/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_userdanger("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) @@ -461,7 +461,7 @@ var/last_teleport = 0 /datum/species/golem/bluespace/proc/reactive_teleport(mob/living/carbon/human/H) - H.visible_message("[H] teleports!", "You destabilize and teleport!") + H.visible_message(span_warning("[H] teleports!"), span_danger("You destabilize and teleport!")) new /obj/effect/particle_effect/sparks(get_turf(H)) playsound(get_turf(H), "sparks", 50, 1) do_teleport(H, get_turf(H), 6, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) @@ -520,12 +520,12 @@ /datum/action/innate/unstable_teleport/Activate() var/mob/living/carbon/human/H = owner - H.visible_message("[H] starts vibrating!", "You start charging your bluespace core...") + H.visible_message(span_warning("[H] starts vibrating!"), span_danger("You start charging your bluespace core...")) playsound(get_turf(H), 'sound/weapons/flash.ogg', 25, 1) addtimer(CALLBACK(src, .proc/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!", "You teleport!") + H.visible_message(span_warning("[H] disappears in a shower of sparks!"), span_danger("You 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) @@ -712,7 +712,7 @@ . = ..() if(!has_corpse) var/turf/T = get_turf(H) - H.visible_message("[H]'s exoskeleton shatters, collapsing into a heap of scrap!") + H.visible_message(span_warning("[H]'s exoskeleton shatters, collapsing into a heap of scrap!")) playsound(H, 'sound/magic/clockwork/anima_fragment_death.ogg', 62, TRUE) for(var/i in 1 to rand(3, 5)) new/obj/item/clockwork/alloy_shards/small(T) @@ -775,11 +775,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) ..() @@ -801,7 +801,7 @@ H.unequip_everything() H.forceMove(src) cloth_golem = H - to_chat(cloth_golem, "You start gathering your life energy, preparing to rise again...") + to_chat(cloth_golem, span_notice("You start gathering your life energy, preparing to rise again...")) addtimer(CALLBACK(src, .proc/revive), revive_time) else return INITIALIZE_HINT_QDEL @@ -812,7 +812,7 @@ return ..() /obj/structure/cloth_pile/burn() - visible_message("[src] burns into ash!") + visible_message(span_danger("[src] burns into ash!")) new /obj/effect/decal/cleanable/ash(get_turf(src)) ..() @@ -829,7 +829,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]!","You reform into yourself!") + cloth_golem.visible_message(span_danger("[src] rises and reforms into [cloth_golem]!"),span_userdanger("You reform into yourself!")) cloth_golem = null qdel(src) @@ -840,7 +840,7 @@ return if(P.is_hot()) - visible_message("[src] bursts into flames!") + visible_message(span_danger("[src] bursts into flames!")) fire_act() /datum/species/golem/plastic @@ -904,27 +904,27 @@ if(M.stat == DEAD) //F return if(M == H) - H.show_message("You cringe with pain as your body rings around you!", MSG_AUDIBLE) + H.show_message(span_narsiesmall("You cringe with pain as your body rings around you!"), MSG_AUDIBLE) H.playsound_local(H, 'sound/effects/gong.ogg', 100, TRUE) H.soundbang_act(2, 0, 10, 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/effects/gong.ogg', 100, TRUE) M.soundbang_act(1, 0, 10, 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/effects/gong.ogg', 75, TRUE) M.soundbang_act(1, 0, 5, 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/effects/gong.ogg', 50, TRUE) /datum/species/golem/snow @@ -944,7 +944,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++) @@ -1010,16 +1010,16 @@ if(last_creation + brother_creation_cooldown > world.time) //no cheesing dork return if(C.amount < 10) - to_chat(H, "You do not have enough cardboard!") + to_chat(H, span_warning("You do not have enough cardboard!")) return FALSE - to_chat(H, "You attempt to create a new cardboard brother.") + to_chat(H, span_notice("You 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, "You do not have enough cardboard!") + to_chat(H, span_warning("You do not have enough cardboard!")) return FALSE - to_chat(H, "You create a new cardboard golem shell.") + to_chat(H, span_notice("You create a new cardboard golem shell.")) create_brother(H.loc) /datum/species/golem/cardboard/proc/create_brother(var/location) @@ -1093,9 +1093,9 @@ /datum/action/innate/bonechill/Activate() if(world.time < last_use + cooldown) - to_chat("You aren't ready yet to rattle your bones again") + to_chat(span_notice("You aren't ready yet to rattle your bones again")) return - owner.visible_message("[owner] rattles [owner.p_their()] bones harrowingly.", "You rattle your bones") + owner.visible_message(span_warning("[owner] rattles [owner.p_their()] bones harrowingly."), span_notice("You rattle your bones")) last_use = world.time if(prob(snas_chance)) playsound(get_turf(owner),'sound/magic/RATTLEMEBONES2.ogg', 100) @@ -1112,7 +1112,7 @@ if((MOB_UNDEAD in L.mob_biotypes) || 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) @@ -1135,7 +1135,7 @@ C.equip_to_slot_or_del(new /obj/item/clothing/head/that (), SLOT_HEAD) C.equip_to_slot_or_del(new /obj/item/clothing/glasses/monocle (), SLOT_GLASSES) C.revive(full_heal = TRUE) - to_chat(C, "You are now a capitalist golem! Do not harm fellow capitalist golems. Kill communist golems and hit people with your fists to spread the industrializing light of capitalism to others! Hello I like money!") //yogs memes + to_chat(C, span_alert("You are now a capitalist golem! Do not harm fellow capitalist golems. Kill communist golems and hit people with your fists to spread the industrializing light of capitalism to others! Hello I like money!")) //yogs memes SEND_SOUND(C, sound('sound/misc/capitialism.ogg')) C.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock ()) @@ -1205,7 +1205,7 @@ . = ..() C.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka (), SLOT_HEAD) C.revive(full_heal = TRUE) - to_chat(C, "You are now a soviet golem! Do not harm fellow soviet golems. Kill captalist golems and hit people with your fists to spread the glorious light of communism to others! Cyka Blyat!") //yogs memes + to_chat(C, span_alert("You are now a soviet golem! Do not harm fellow soviet golems. Kill captalist golems and hit people with your fists to spread the glorious light of communism to others! Cyka Blyat!")) //yogs memes SEND_SOUND(C, sound('sound/misc/Russian_Anthem_chorus.ogg')) C.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock ()) @@ -1256,13 +1256,13 @@ if((M.nutrition + 10) > (600 * (1 + M.overeatduration / 2000))) return else - M.visible_message("[M] takes a bite out of [H]!") + M.visible_message(span_danger("[M] takes a bite out of [H]!")) playsound(get_turf(H), 'sound/items/eatfood.ogg', 25, 0) M.reagents.add_reagent(/datum/reagent/consumable/nutriment, 0.4) M.reagents.add_reagent(/datum/reagent/consumable/nutriment/vitamin, 0.4) if(integrity <= 0) qdel(H) - M.visible_message("[H]'s can no longer maintain stuctural integrity and falls to pieces!") + M.visible_message(span_danger("[H]'s can no longer maintain stuctural integrity and falls to pieces!")) else integrity = integrity - 0.4 @@ -1319,8 +1319,8 @@ range = 3 ranged_mousepointer = 'icons/effects/mouse_pointers/phase_jump.dmi' action_icon_state = "phasejump" - active_msg = "You start channeling your telecrystal core...." - deactive_msg = "You stop channeling your telecrystal core." + active_msg = span_notice("You start channeling your telecrystal core....") + deactive_msg = span_notice("You stop channeling your telecrystal core.") /obj/effect/proc_holder/spell/pointed/phase_jump/cast(list/targets,mob/user = usr) var/target = targets[1] @@ -1331,7 +1331,7 @@ user.forceMove(T) var/obj/spot2 = new phasein(get_turf(user), user.dir) spot1.Beam(spot2,"tentacle",time=20) - user.visible_message("[user] phase shifts away!", "You shift around the space around you.") + user.visible_message("[user] phase shifts away!", span_warning("You shift around the space around you.")) /obj/effect/proc_holder/spell/pointed/phase_jump/can_target(atom/target, mob/user, silent) . = ..() 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 dbb3af6d528b..ee70a227ac9b 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -38,7 +38,7 @@ if(!H.blood_volume) H.blood_volume += 5 H.adjustBruteLoss(5) - to_chat(H, "You feel empty!") + to_chat(H, span_danger("You feel empty!")) if(H.blood_volume < BLOOD_VOLUME_NORMAL(H)) if(H.nutrition >= NUTRITION_LEVEL_STARVING) @@ -46,7 +46,7 @@ H.adjust_nutrition(-2.5) if(H.blood_volume < BLOOD_VOLUME_OKAY(H)) if(prob(5)) - to_chat(H, "You feel drained!") + to_chat(H, span_danger("You feel drained!")) if(H.blood_volume < BLOOD_VOLUME_BAD(H)) Cannibalize_Body(H) if(regenerate_limbs) @@ -62,7 +62,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, "Your [consumed_limb] is drawn back into your body, unable to maintain its shape!") + to_chat(H, span_userdanger("Your [consumed_limb] is drawn back into your body, unable to maintain its shape!")) qdel(consumed_limb) H.blood_volume += 20 @@ -87,13 +87,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, "You feel intact enough as it is.") + to_chat(H, span_notice("You feel intact enough as it is.")) return - to_chat(H, "You focus intently on your missing [limbs_to_heal.len >= 2 ? "limbs" : "limb"]...") + to_chat(H, span_notice("You focus intently on your missing [limbs_to_heal.len >= 2 ? "limbs" : "limb"]...")) if(H.blood_volume >= REGEN_BLOOD_REQUIREMENT*limbs_to_heal.len + BLOOD_VOLUME_OKAY(H)) H.regenerate_limbs() H.blood_volume -= REGEN_BLOOD_REQUIREMENT*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 >= REGEN_BLOOD_REQUIREMENT)//We can partially heal some limbs while(H.blood_volume >= BLOOD_VOLUME_OKAY(H) + REGEN_BLOOD_REQUIREMENT) @@ -101,9 +101,9 @@ H.regenerate_limb(healed_limb) limbs_to_heal -= healed_limb H.blood_volume -= REGEN_BLOOD_REQUIREMENT - 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/////////////////////////////////////////////////////////////////// @@ -168,7 +168,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, "You feel very bloated!") + to_chat(H, span_notice("You feel very bloated!")) else if(H.nutrition >= NUTRITION_LEVEL_WELL_FED) H.blood_volume += 3 H.adjust_nutrition(-2.5) @@ -205,9 +205,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 @@ -252,7 +252,7 @@ /datum/action/innate/swap_body/Activate() if(!isslimeperson(owner)) - to_chat(owner, "You are not a slimeperson.") + to_chat(owner, span_warning("You are not a slimeperson.")) Remove(owner) else ui_interact(owner) @@ -381,14 +381,14 @@ if(M.current.stat == CONSCIOUS) M.current.visible_message("[M.current] \ stops moving and starts staring vacantly into space.", - "You stop moving this body...") + span_notice("You stop moving this body...")) else - to_chat(M.current, "You abandon this body...") + to_chat(M.current, span_notice("You 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////////////////////////////////////////// @@ -498,23 +498,23 @@ if(!H.put_in_active_hand(S)) S.forceMove(H.drop_location()) species.current_extract = null - to_chat(H, "You eject [S].") + to_chat(H, span_notice("You 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, "You consume [I], and you feel it pulse within you...") + to_chat(H, span_notice("You consume [I], and you feel it pulse within you...")) species.update_slime_actions() else - to_chat(H, "You need to hold an unused slime extract in your active hand!") + to_chat(H, span_warning("You need to hold an unused slime extract in your active hand!")) /datum/action/innate/use_extract name = "Extract Minor Activation" @@ -605,7 +605,7 @@ if(M in linked_mobs) return FALSE linked_mobs.Add(M) - to_chat(M, "You are now connected to [slimelink_owner.real_name]'s Slime Link.") + to_chat(M, span_notice("You 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) @@ -617,7 +617,7 @@ return var/datum/action/innate/linked_speech/action = linked_actions[link_id] action.Remove(M) - to_chat(M, "You are no longer connected to [slimelink_owner.real_name]'s Slime Link.") + to_chat(M, span_notice("You are no longer connected to [slimelink_owner.real_name]'s Slime Link.")) linked_mobs[link_id] = null linked_actions[link_id] = null @@ -636,14 +636,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(to_utf8(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 @@ -688,16 +688,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(to_utf8(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, "You hear an alien voice in your head... [msg]") - to_chat(H, "You telepathically said: \"[msg]\" to [M]") + to_chat(H, span_notice("You telepathically said: \"[msg]\" to [M]")) for(var/dead in GLOB.dead_mob_list) if(!isobserver(dead)) continue @@ -724,18 +724,18 @@ CHECK_DNA_AND_SPECIES(H) if(!H.pulling || !isliving(H.pulling) || H.grab_state < GRAB_AGGRESSIVE) - to_chat(H, "You need to aggressively grab someone to link minds!") + to_chat(H, span_warning("You need to aggressively grab someone to link minds!")) return var/mob/living/target = H.pulling - to_chat(H, "You begin linking [target]'s mind to yours...") - to_chat(target, "You feel a foreign presence within your mind...") + to_chat(H, span_notice("You begin linking [target]'s mind to yours...")) + to_chat(target, span_warning("You feel a foreign presence within your 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, "You connect [target]'s mind to your slime link!") + to_chat(H, span_notice("You connect [target]'s mind to your slime link!")) else - to_chat(H, "You can't seem to link [target]'s mind...") - to_chat(target, "The foreign presence leaves your mind.") \ No newline at end of file + to_chat(H, span_warning("You can't seem to link [target]'s mind...")) + to_chat(target, span_warning("The foreign presence leaves your mind.")) \ No newline at end of file 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 388643b9d913..6af4da426da8 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -41,7 +41,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, "Your precious wings burn to a crisp!") + to_chat(H, span_danger("Your 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 e06881942337..e33c4b39ba85 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -37,7 +37,7 @@ if(environment.get_moles(/datum/gas/oxygen) >= 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!","Your 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_userdanger("Your body reacts with the atmosphere and bursts into flame!")) H.IgniteMob() internal_fire = TRUE else 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 fee2939dbfab..e142bb699f42 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -57,7 +57,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.", "You writhe in pain as your vacuoles boil!", "You hear the crunching of leaves.") + H.visible_message(span_warning("[H] writhes in pain as [H.p_their()] vacuoles boil."), span_userdanger("You writhe in pain as your vacuoles boil!"), span_italics("You hear the crunching of leaves.")) if(prob(80)) H.easy_randmut(NEGATIVE+MINOR_NEGATIVE) else @@ -66,6 +66,6 @@ H.domutcheck() else H.adjustFireLoss(rand(5,15)) - H.show_message("The radiation beam singes you!") + H.show_message(span_userdanger("The radiation beam singes you!")) if(/obj/item/projectile/energy/florayield) H.set_nutrition(min(H.nutrition+30, NUTRITION_LEVEL_FULL)) 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 fa59e566780d..8b9d082817c2 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -56,7 +56,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, 1) return BULLET_ACT_FORCE_PIERCE return ..() @@ -76,7 +76,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 @@ -102,13 +102,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 your hands. 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("[src] feels unnaturally cold in your hands. You raise [src] your mouth and devour it!")) playsound(user, 'sound/magic/demon_consume.ogg', 50, 1) - user.visible_message("Blood erupts from [user]'s arm as it reforms into a weapon!", \ - "Icy blood pumps through your veins as your arm reforms itself!") + user.visible_message(span_warning("Blood erupts from [user]'s arm as it reforms into a weapon!"), \ + span_userdanger("Icy blood pumps through your veins as your arm reforms itself!")) user.temporarilyRemoveItemFromInventory(src, TRUE) Insert(user) @@ -123,7 +123,7 @@ STOP_PROCESSING(SSobj, src) 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) ..() @@ -151,9 +151,9 @@ Remove(owner, HEART_SPECIAL_SHADOWIFY) old_owner.set_species(/datum/species/shadow) Insert(old_owner, HEART_SPECIAL_SHADOWIFY) - to_chat(owner, "You feel the shadows invade your skin, leaping into the center of your chest! You're alive!") + to_chat(owner, span_userdanger("You feel the shadows invade your skin, leaping into the center of your chest! You're alive!")) SEND_SOUND(owner, sound('sound/effects/ghost.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/hallucinations/far_noise.ogg', 50, 1) respawn_progress = 0 @@ -193,7 +193,7 @@ var/mob/living/silicon/robot/borg = AM if(!borg.lamp_cooldown) borg.update_headlamp(TRUE, INFINITY) - to_chat(borg, "Your headlamp is fried! You'll need a human to help replace it.") + to_chat(borg, span_danger("Your 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) @@ -212,9 +212,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/items/welder.ogg', 50, 1) 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 e4d0dee2c521..b50830adbf67 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.75 if(C.blood_volume <= BLOOD_VOLUME_SURVIVE(C)) - to_chat(C, "You ran out of blood!") + to_chat(C, span_danger("You 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, "You don't belong here!") + to_chat(C, span_danger("You 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, "You just drained blood, wait a few seconds.") + to_chat(H, span_notice("You 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_MAXIMUM(H)) - to_chat(H, "You're already full!") + to_chat(H, span_notice("You're already full!")) return if(victim.stat == DEAD) - to_chat(H, "You need a living victim!") + to_chat(H, span_notice("You 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_notice("[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 yourself 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 yourself to drain such tainted blood.")) return if(!do_after(H, 30, target = victim)) return var/blood_volume_difference = BLOOD_VOLUME_MAXIMUM(H) - 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, "You drain some blood!") + to_chat(victim, span_danger("[H] is draining your blood!")) + to_chat(H, span_notice("You drain some blood!")) playsound(H, 'sound/items/drink.ogg', 30, 1, -2) victim.blood_volume = clamp(victim.blood_volume - drained_blood, 0, BLOOD_VOLUME_MAXIMUM(victim)) H.blood_volume = clamp(H.blood_volume + drained_blood, 0, BLOOD_VOLUME_MAXIMUM(H)) if(!victim.blood_volume) - to_chat(H, "You finish off [victim]'s blood supply!") + to_chat(H, span_warning("You finish off [victim]'s blood supply!")) #undef VAMP_DRAIN_AMOUNT @@ -131,7 +131,7 @@ . = ..() if(iscarbon(owner)) var/mob/living/carbon/H = owner - to_chat(H, "Current blood level: [H.blood_volume]/[BLOOD_VOLUME_MAXIMUM(H)].") + to_chat(H, span_notice("Current blood level: [H.blood_volume]/[BLOOD_VOLUME_MAXIMUM(H)].")) /obj/effect/proc_holder/spell/targeted/shapeshift/bat name = "Bat Form" diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index c294264634f0..7ae7a374a8b1 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -156,11 +156,11 @@ if(prob(50) && !H.stat) if(get_dist(get_turf(master), get_turf(H)) > max_distance) if(prob(20)) - to_chat(H, "You are too far away from your master! You are taking damage!") + to_chat(H, span_userdanger("You are too far away from your master! You are taking damage!")) apply_damage(7.5, BRUTE, null, FALSE, H) if(master.stat == DEAD || QDELETED(master)) - to_chat(H, "Your master is dead. And with his death, comes yours!") + to_chat(H, span_userdanger("Your master is dead. And with his death, comes yours!")) H.dust() #undef REGENERATION_DELAY diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index 8da4d62ae5a5..bbf2d0c53079 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -151,10 +151,10 @@ . = ..() var/obj/item/receiving = get_active_held_item() if(!receiving) - to_chat(src, "You're not holding anything to give!") + to_chat(src, span_warning("You're not holding anything to give!")) return - visible_message("[src] is offering [receiving].", \ - "You offer [receiving].", null, 2) + visible_message(span_notice("[src] is offering [receiving]."), \ + span_notice("You offer [receiving]."), null, 2) for(var/mob/living/carbon/C in orange(1, src)) if(!CanReach(C)) return @@ -175,13 +175,13 @@ /mob/living/carbon/proc/take(mob/living/carbon/giver, obj/item/I) clear_alert("[giver]") if(get_dist(src, giver) > 1) - to_chat(src, "[giver] is out of range! ") + to_chat(src, span_warning("[giver] is out of range! ")) return if(!I || giver.get_active_held_item() != I) - to_chat(src, "[giver] is no longer holding the item they were offering! ") + to_chat(src, span_warning("[giver] is no longer holding the item they were offering! ")) return if(!get_empty_held_indexes()) - to_chat(src, "You have no empty hands!") + to_chat(src, span_warning("You have no empty hands!")) return if(!giver.temporarilyRemoveItemFromInventory(I)) visible_message("[src] tries to hand over [I] but it's stuck to them....", \ diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 828745a4543a..ddd2d9d3321c 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -239,7 +239,7 @@ emote(pick("giggle","laugh")) if(SA_partialpressure > NITROGEN_NARCOSIS_PRESSURE_HIGH) // Hallucinations if(prob(15)) - to_chat(src, "You can't think straight!") + to_chat(src, span_userdanger("You can't think straight!")) confused = min(SA_partialpressure/10, confused + 12) hallucination += 5 //yogs end @@ -286,22 +286,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, "You smell something horribly decayed inside this room.") + to_chat(src, span_warning("You 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 @@ -578,16 +578,16 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put if(drunkenness >= 81) adjustToxLoss(1) if(prob(5) && !stat) - to_chat(src, "Maybe you should lie down for a bit...") + to_chat(src, span_warning("Maybe you should lie down for a bit...")) if(drunkenness >= 91) adjustToxLoss(1) adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.4) if(prob(20) && !stat) if(SSshuttle.emergency.mode == SHUTTLE_DOCKED && is_station_level(z)) //QoL mainly - to_chat(src, "You're so tired... but you can't miss that shuttle...") + to_chat(src, span_warning("You're so tired... but you can't miss that shuttle...")) else - to_chat(src, "Just a quick nap...") + to_chat(src, span_warning("Just a quick nap...")) Sleeping(900) if(drunkenness >= 101) @@ -633,7 +633,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, "You feel a stabbing pain in your abdomen!") + to_chat(src, span_warning("You feel a stabbing pain in your abdomen!")) //////////////// diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm index 2d257f72da87..99444d3a2576 100644 --- a/code/modules/mob/living/carbon/monkey/combat.dm +++ b/code/modules/mob/living/carbon/monkey/combat.dm @@ -308,12 +308,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_userdanger("[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_userdanger("[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 fbf7c7df9438..2bfc1b600fad 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, "You feel weak.") + to_chat(src, span_danger("You feel weak.")) if(radiation > RAD_MOB_MUTATE) if(prob(1)) - to_chat(src, "You mutate!") + to_chat(src, span_danger("You mutate!")) easy_randmut(NEGATIVE+MINOR_NEGATIVE) INVOKE_ASYNC(src, .proc/emote, "gasp") domutcheck() diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index d52af117756d..1fb3ac25d99a 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -36,7 +36,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 diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm index 7a7a24cbdc57..010ccaf524f7 100644 --- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm +++ b/code/modules/mob/living/carbon/monkey/monkey_defense.dm @@ -39,8 +39,8 @@ if(INTENT_HARM) M.do_attack_animation(src, ATTACK_EFFECT_PUNCH) if (prob(75)) - visible_message("[M] has punched [name]!", \ - "[M] has punched [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has punched [name]!"), \ + span_userdanger("[M] has punched [name]!"), null, COMBAT_MESSAGE_RANGE) playsound(loc, "punch", 25, 1, -1) var/damage = rand(5, 10) @@ -48,8 +48,8 @@ damage = rand(10, 15) if(AmountUnconscious() < 100 && health > 0) Unconscious(rand(200, 300)) - visible_message("[M] has knocked out [name]!", \ - "[M] has knocked out [name]!", null, 5) + visible_message(span_danger("[M] has knocked out [name]!"), \ + span_userdanger("[M] has knocked out [name]!"), null, 5) var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) if(!affecting) affecting = get_bodypart(BODY_ZONE_CHEST) @@ -58,8 +58,8 @@ else playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("[M] has attempted to punch [name]!", \ - "[M] has attempted to punch [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has attempted to punch [name]!"), \ + span_userdanger("[M] has attempted to punch [name]!"), null, COMBAT_MESSAGE_RANGE) if(INTENT_DISARM) if(!IsUnconscious()) M.do_attack_animation(src, ATTACK_EFFECT_DISARM) @@ -67,11 +67,11 @@ Paralyze(40) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) log_combat(M, src, "pushed") - visible_message("[M] has pushed down [src]!", \ - "[M] has pushed down [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has pushed down [src]!"), \ + span_userdanger("[M] has pushed down [src]!"), null, COMBAT_MESSAGE_RANGE) else if(dropItemToGround(get_active_held_item())) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - visible_message("[M] has disarmed [src]!", "[M] has disarmed [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has disarmed [src]!"), span_userdanger("[M] has disarmed [src]!"), null, COMBAT_MESSAGE_RANGE) /mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent. @@ -83,11 +83,11 @@ damage = rand(20, 40) if(AmountUnconscious() < 300) Unconscious(rand(200, 300)) - visible_message("[M] has wounded [name]!", \ - "[M] has wounded [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has wounded [name]!"), \ + span_userdanger("[M] has wounded [name]!"), null, COMBAT_MESSAGE_RANGE) else - visible_message("[M] has slashed [name]!", \ - "[M] has slashed [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has slashed [name]!"), \ + span_userdanger("[M] has slashed [name]!"), null, COMBAT_MESSAGE_RANGE) var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) log_combat(M, src, "attacked") @@ -99,20 +99,20 @@ else playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) - visible_message("[M] has attempted to lunge at [name]!", \ - "[M] has attempted to lunge at [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has attempted to lunge at [name]!"), \ + span_userdanger("[M] has attempted to lunge at [name]!"), null, COMBAT_MESSAGE_RANGE) if (M.a_intent == INTENT_DISARM) var/obj/item/I = null playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) if(prob(95)) Paralyze(20) - visible_message("[M] has tackled down [name]!", \ - "[M] has tackled down [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has tackled down [name]!"), \ + span_userdanger("[M] has tackled down [name]!"), null, COMBAT_MESSAGE_RANGE) else I = get_active_held_item() if(dropItemToGround(I)) - visible_message("[M] has disarmed [name]!", "[M] has disarmed [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has disarmed [name]!"), span_userdanger("[M] has disarmed [name]!"), null, COMBAT_MESSAGE_RANGE) else I = null log_combat(M, src, "disarmed", "[I ? " removing \the [I]" : ""]") @@ -151,13 +151,13 @@ if(!(wear_mask.resistance_flags & UNACIDABLE)) wear_mask.acid_act(acidpwr, acid_volume) else - to_chat(src, "Your mask protects you from the acid.") + to_chat(src, span_warning("Your mask protects you from the acid.")) return if(head) if(!(head.resistance_flags & UNACIDABLE)) head.acid_act(acidpwr, acid_volume) else - to_chat(src, "Your hat protects you from the acid.") + to_chat(src, span_warning("Your 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 7380a29a3dd8..1982fb1eff11 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...")) SEND_SIGNAL(src, COMSIG_CARBON_STATUS_STAMCRIT) stam_paralyzed = TRUE diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index e2c010391575..303e108f69ca 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -363,7 +363,7 @@ /datum/emote/living/surrender key = "surrender" key_third_person = "surrenders" - message = "puts their hands on their head and falls to the ground, they surrender!" + message = span_surrender("puts their hands on their head and falls to the ground, they surrender!") emote_type = EMOTE_AUDIBLE mob_type_blacklist_typecache = list(/mob/living/simple_animal) @@ -425,7 +425,7 @@ /datum/emote/living/custom/proc/check_invalid(mob/user, input) var/static/regex/stop_bad_mime = regex(@"says|exclaims|yells|asks") if(stop_bad_mime.Find(input, 1, 1)) - to_chat(user, "Invalid emote.") + to_chat(user, span_danger("Invalid emote.")) return TRUE return FALSE @@ -509,10 +509,10 @@ . = ..() var/obj/item/circlegame/N = new(user) if(user.put_in_hands(N)) - to_chat(user, "You make a circle with your hand.") + to_chat(user, span_notice("You make a circle with your hand.")) else qdel(N) - to_chat(user, "You don't have any free hands to make a circle with.") + to_chat(user, span_warning("You don't have any free hands to make a circle with.")) /datum/emote/living/slap key = "slap" @@ -525,6 +525,6 @@ return var/obj/item/slapper/N = new(user) if(user.put_in_hands(N)) - to_chat(user, "You ready your slapping hand.") + to_chat(user, span_notice("You 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/inhand_holder.dm b/code/modules/mob/living/inhand_holder.dm index fbf5917ccd36..85bceca1df35 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) @@ -90,7 +90,7 @@ return FALSE if(isliving(loc)) var/mob/living/L = loc - to_chat(L, "[held_mob] cheeses free!") + to_chat(L, span_warning("[held_mob] cheeses free!")) L.dropItemToGround(src) held_mob.forceMove(get_turf(held_mob)) held_mob.reset_perspective() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index b78ecb4c9775..6970d3e56287 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -47,7 +47,7 @@ return ..() /mob/living/proc/ZImpactDamage(turf/T, levels) - visible_message("[src] crashes into [T] with a sickening noise!") + visible_message(span_danger("[src] crashes into [T] with a sickening noise!")) adjustBruteLoss((levels * 5) ** 1.5) Knockdown(levels * 50) @@ -103,7 +103,7 @@ //Should stop you pushing a restrained person out of the way if(L.pulledby && L.pulledby != src && 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) @@ -111,7 +111,7 @@ var/mob/P = L.pulling if(P.restrained()) if(!(world.time % 5)) - to_chat(src, "[L] is restraining [P], you cannot push past.") + to_chat(src, span_warning("[L] is restraining [P], you cannot push past.")) return TRUE if(moving_diagonally)//no mob swap during diagonal moves. @@ -257,7 +257,7 @@ if(AM.pulledby) if(!supress_message) - visible_message("[src] has pulled [AM] from [AM.pulledby]'s grip.") + visible_message(span_danger("[src] has pulled [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. @@ -279,7 +279,7 @@ log_combat(src, M, "grabbed", addition="passive grab") if(!supress_message && !(iscarbon(AM) && HAS_TRAIT(src, TRAIT_STRONG_GRABBER))) - visible_message("[src] has grabbed [M][(zone_selected == "l_arm" || zone_selected == "r_arm")? " by their hands!":" passively!"]") + visible_message(span_warning("[src] has grabbed [M][(zone_selected == "l_arm" || zone_selected == "r_arm")? " by their hands!":" passively!"]")) if(!iscarbon(src)) M.LAssailant = null else @@ -374,7 +374,7 @@ return FALSE if(!..()) return FALSE - visible_message("[src] points at [A].", "You point at [A].") + visible_message("[src] points at [A].", span_notice("You point at [A].")) return TRUE /mob/living/verb/succumb(whispered as null) @@ -384,7 +384,7 @@ adjustOxyLoss(health - HEALTH_THRESHOLD_DEAD) updatehealth() if(!whispered) - to_chat(src, "You have given up life and succumbed to death.") + to_chat(src, span_notice("You have given up life and succumbed to death.")) death() /mob/living/incapacitated(ignore_restraints = FALSE, ignore_grab = FALSE, check_immobilized = FALSE, ignore_stasis = FALSE) @@ -438,7 +438,7 @@ set category = "IC" if(IsSleeping()) - to_chat(src, "You are already sleeping.") + to_chat(src, span_notice("You are already sleeping.")) return else if(alert(src, "You sure you want to sleep for a while?", "Sleep", "Yes", "No") == "Yes") @@ -457,14 +457,14 @@ if(do_after(src, 10, target = src)) set_resting(FALSE, FALSE) else - to_chat(src, "You fail to get up.") + to_chat(src, span_notice("You fail to get up.")) /mob/living/proc/set_resting(rest, silent = TRUE) if(!silent) if(rest) - to_chat(src, "You are now resting.") + to_chat(src, span_notice("You are now resting.")) else - to_chat(src, "You get up.") + to_chat(src, span_notice("You get up.")) resting = rest update_resting() @@ -728,13 +728,13 @@ var/resist_chance = BASE_GRAB_RESIST_CHANCE // see defines/combat.dm resist_chance = max((resist_chance/altered_grab_state)-sqrt((getBruteLoss()+getFireLoss()+getOxyLoss()+getToxLoss()+getCloneLoss())*0.5+getStaminaLoss()), 0) //stamina loss is weighted twice as heavily as the other damage types in this calculation if(prob(resist_chance)) - visible_message("[src] has broken free of [pulledby]'s grip!") + visible_message(span_danger("[src] has broken free of [pulledby]'s grip!")) log_combat(pulledby, src, "broke grab") pulledby.stop_pulling() return FALSE else adjustStaminaLoss(rand(8,15))//8 is from 7.5 rounded up - visible_message("[src] struggles as they fail to break free of [pulledby]'s grip!") + visible_message(span_danger("[src] struggles as they fail to break free of [pulledby]'s grip!")) if(moving_resist && client) //we resisted by trying to move client.move_delay = world.time + 20 else @@ -788,10 +788,10 @@ // 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, "You can't remove \the [what.name], it appears to be stuck!") + to_chat(src, span_warning("You can't remove \the [what.name], it appears to be stuck!")) return - who.visible_message("[src] tries to remove [who]'s [what.name].", \ - "[src] tries to remove [who]'s [what.name].") + who.visible_message(span_danger("[src] tries to remove [who]'s [what.name]."), \ + span_userdanger("[src] tries to remove [who]'s [what.name].")) what.add_fingerprint(src) if(do_mob(src, who, what.strip_delay)) if(what && Adjacent(who)) @@ -814,7 +814,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, "You can't put \the [what.name] on [who], it's stuck to your hand!") + to_chat(src, span_warning("You can't put \the [what.name] on [who], it's stuck to your hand!")) return if(what) var/list/where_list @@ -827,10 +827,10 @@ 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 - visible_message("[src] tries to put [what] on [who].") + visible_message(span_notice("[src] tries 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)) @@ -919,19 +919,19 @@ /mob/living/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE) if(incapacitated()) - to_chat(src, "You can't do that right now!") + to_chat(src, span_warning("You can't do that right now!")) return FALSE if(be_close && !in_range(M, src)) - to_chat(src, "You are too far away!") + to_chat(src, span_warning("You are too far away!")) return FALSE if(!no_dextery) - to_chat(src, "You don't have the dexterity to do this!") + to_chat(src, span_warning("You 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_ALLOW_ALL && !IsAdvancedToolUser()) - to_chat(src, "You don't have the dexterity to do this!") + to_chat(src, span_warning("You don't have the dexterity to do this!")) return FALSE return TRUE @@ -987,7 +987,7 @@ var/mob/living/simple_animal/hostile/guardian/G = para G.summoner = new_mob G.Recall() - to_chat(G, "Your summoner has changed form!") + to_chat(G, span_holoparasite("Your summoner has changed form!")) /mob/living/rad_act(amount) . = ..() @@ -1081,8 +1081,8 @@ /mob/living/proc/IgniteMob() if(fire_stacks > 0 && !on_fire) on_fire = 1 - src.visible_message("[src] catches fire!", \ - "You're set on fire!") + src.visible_message(span_warning("[src] catches fire!"), \ + span_userdanger("You're set on fire!")) new/obj/effect/dummy/lighting_obj/moblight/fire(src) throw_alert("fire", /obj/screen/alert/fire) update_fire() @@ -1302,12 +1302,12 @@ if(!ishuman(user)) return if(user.get_active_held_item()) - to_chat(user, "Your hands are full!") + to_chat(user, span_warning("Your 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]!") + user.visible_message(span_notice("[user] starts trying to scoop up [src]!")) if(!do_after(user, 20, target = src)) return FALSE mob_pickup(user) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 435f16a4fe96..6e069342f456 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -4,24 +4,24 @@ //the if "armor" check is because this is used for everything on /living, including humans if(status_flags & GODMODE) - visible_message("A strange force protects [src], [p_they()] can't be damaged!", "A strange force protects you!") + visible_message(span_danger("A strange force protects [src], [p_they()] can't be damaged!"), span_userdanger("A strange force protects you!")) return armor if(armor > 0 && armour_penetration) armor = max(0, armor - armour_penetration) if(penetrated_text) - to_chat(src, "[penetrated_text]") + to_chat(src, span_userdanger("[penetrated_text]")) else - to_chat(src, "Your armor was penetrated!") + to_chat(src, span_userdanger("Your armor was penetrated!")) else if(armor >= 100) if(absorb_text) - to_chat(src, "[absorb_text]") + to_chat(src, span_userdanger("[absorb_text]")) else - to_chat(src, "Your armor absorbs the blow!") + to_chat(src, span_userdanger("Your armor absorbs the blow!")) else if(armor > 0) if(soften_text) - to_chat(src, "[soften_text]") + to_chat(src, span_userdanger("[soften_text]")) else - to_chat(src, "Your armor softens the blow!") + to_chat(src, span_userdanger("Your armor softens the blow!")) return armor @@ -86,8 +86,8 @@ if(!I.throwforce)// Otherwise, if the item's throwforce is 0... playsound(loc, 'sound/weapons/throwtap.ogg', 1, volume, -1)//...play throwtap.ogg. if(!blocked) - visible_message("[src] has been hit by [I].", \ - "[src] has been hit by [I].") + visible_message(span_danger("[src] has been hit by [I]."), \ + span_userdanger("[src] has been hit by [I].")) var/armor = run_armor_check(zone, "melee", "Your armor has protected your [parse_zone(zone)].", "Your armor has softened hit to your [parse_zone(zone)].",I.armour_penetration) if(isobj(AM)) var/obj/O = AM @@ -120,13 +120,13 @@ else return updatehealth() - visible_message("[M.name] has hit [src]!", \ - "[M.name] has hit [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M.name] has hit [src]!"), \ + span_userdanger("[M.name] has hit [src]!"), null, COMBAT_MESSAGE_RANGE) log_combat(M.occupant, src, "attacked", M, "(INTENT: [uppertext(M.occupant.a_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.", null, null, 5) + visible_message(span_warning("[M] pushes [src] out of the way."), null, null, 5) /mob/living/fire_act() adjust_fire_stacks(3) @@ -140,11 +140,11 @@ return TRUE 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, "You don't want to risk hurting [src]!") + to_chat(user, span_notice("You don't want to risk hurting [src]!")) return FALSE return grippedby(user) @@ -162,8 +162,8 @@ if(user.grab_state) //only the first upgrade is instantaneous var/old_grab_state = user.grab_state var/grab_upgrade_time = instant ? 0 : 30 - visible_message("[user] starts to tighten [user.p_their()] grip on [src]!", \ - "[user] starts to tighten [user.p_their()] grip on you!") + visible_message(span_danger("[user] starts to tighten [user.p_their()] grip on [src]!"), \ + span_userdanger("[user] starts to tighten [user.p_their()] grip on you!")) switch(user.grab_state) if(GRAB_AGGRESSIVE) log_combat(user, src, "attempted to neck grab", addition="neck grab") @@ -181,26 +181,26 @@ if(GRAB_AGGRESSIVE) var/add_log = "" if(HAS_TRAIT(user, TRAIT_PACIFISM)) - visible_message("[user] has firmly gripped [src]!", - "[user] has firmly gripped you!") + visible_message(span_danger("[user] has firmly gripped [src]!"), + span_danger("[user] has firmly gripped you!")) add_log = " (pacifist)" else - visible_message("[user] has grabbed [src] aggressively!", \ - "[user] has grabbed you aggressively!") + visible_message(span_danger("[user] has grabbed [src] aggressively!"), \ + span_userdanger("[user] has grabbed you aggressively!")) drop_all_held_items() stop_pulling() log_combat(user, src, "grabbed", addition="aggressive grab[add_log]") if(GRAB_NECK) log_combat(user, src, "grabbed", addition="neck grab") - visible_message("[user] has grabbed [src] by the neck!",\ - "[user] has grabbed you by the neck!") + visible_message(span_danger("[user] has grabbed [src] by the neck!"),\ + span_userdanger("[user] has grabbed you by the neck!")) update_mobility() //we fall down if(!buckled && !density) Move(user.loc) if(GRAB_KILL) log_combat(user, src, "strangled", addition="kill grab") - visible_message("[user] is strangling [src]!", \ - "[user] is strangling you!") + visible_message(span_danger("[user] is strangling [src]!"), \ + span_userdanger("[user] is strangling you!")) update_mobility() //we fall down if(!buckled && !density) Move(user.loc) @@ -219,31 +219,31 @@ return // can't attack while eating! if(HAS_TRAIT(src, TRAIT_PACIFISM)) - to_chat(M, "You don't want to hurt anyone!") + to_chat(M, span_notice("You 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 [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("The [M.name] glomps [src]!"), \ + span_userdanger("The [M.name] glomps [src]!"), null, COMBAT_MESSAGE_RANGE) return TRUE /mob/living/attack_animal(mob/living/simple_animal/M) M.face_atom(src) if(M.melee_damage_upper == 0) - M.visible_message("\The [M] [M.friendly] [src]!") + M.visible_message(span_notice("\The [M] [M.friendly] [src]!")) return FALSE else if(HAS_TRAIT(M, TRAIT_PACIFISM)) - to_chat(M, "You don't want to hurt anyone!") + to_chat(M, span_notice("You don't want to hurt anyone!")) return FALSE if(M.attack_sound) playsound(loc, M.attack_sound, 50, 1, 1) M.do_attack_animation(src) - visible_message("\The [M] [M.attacktext] [src]!", \ - "\The [M] [M.attacktext] [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("\The [M] [M.attacktext] [src]!"), \ + span_userdanger("\The [M] [M.attacktext] [src]!"), null, COMBAT_MESSAGE_RANGE) log_combat(M, src, "attacked") return TRUE @@ -255,58 +255,58 @@ if (M.a_intent == INTENT_HARM) if(HAS_TRAIT(M, TRAIT_PACIFISM)) - to_chat(M, "You don't want to hurt anyone!") + to_chat(M, span_notice("You don't want to hurt anyone!")) return FALSE if(M.is_muzzled() || M.is_mouth_covered(FALSE, TRUE)) - to_chat(M, "You can't bite with your mouth covered!") + to_chat(M, span_warning("You can't bite with your mouth covered!")) return FALSE M.do_attack_animation(src, ATTACK_EFFECT_BITE) if (prob(75)) log_combat(M, src, "attacked") playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) - visible_message("[M.name] bites [src]!", \ - "[M.name] bites [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M.name] bites [src]!"), \ + span_userdanger("[M.name] bites [src]!"), null, COMBAT_MESSAGE_RANGE) return TRUE else - visible_message("[M.name] has attempted to bite [src]!", \ - "[M.name] has attempted to bite [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M.name] has attempted to bite [src]!"), \ + span_userdanger("[M.name] has attempted to bite [src]!"), null, COMBAT_MESSAGE_RANGE) return FALSE /mob/living/attack_larva(mob/living/carbon/alien/larva/L) switch(L.a_intent) if(INTENT_HELP) - visible_message("[L.name] rubs its head against [src].") + visible_message(span_notice("[L.name] rubs its head against [src].")) return FALSE else if(HAS_TRAIT(L, TRAIT_PACIFISM)) - to_chat(L, "You don't want to hurt anyone!") + to_chat(L, span_notice("You 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 [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[L.name] bites [src]!"), \ + span_userdanger("[L.name] bites [src]!"), null, COMBAT_MESSAGE_RANGE) playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) return TRUE else - visible_message("[L.name] has attempted to bite [src]!", \ - "[L.name] has attempted to bite [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[L.name] has attempted to bite [src]!"), \ + span_userdanger("[L.name] has attempted to bite [src]!"), null, COMBAT_MESSAGE_RANGE) return FALSE /mob/living/attack_alien(mob/living/carbon/alien/humanoid/M) switch(M.a_intent) if (INTENT_HELP) - visible_message("[M] caresses [src] with its scythe like arm.") + visible_message(span_notice("[M] caresses [src] with its scythe like arm.")) return FALSE if (INTENT_GRAB) grabbedby(M) return FALSE if(INTENT_HARM) if(HAS_TRAIT(M, TRAIT_PACIFISM)) - to_chat(M, "You don't want to hurt anyone!") + to_chat(M, span_notice("You don't want to hurt anyone!")) return FALSE M.do_attack_animation(src) return TRUE @@ -335,9 +335,9 @@ if(!illusion) adjustFireLoss(shock_damage) visible_message( - "[src] was shocked by \the [source]!", \ - "You feel a powerful shock coursing through your body!", \ - "You hear a heavy electrical crack." \ + span_danger("[src] was shocked by \the [source]!"), \ + span_userdanger("You feel a powerful shock coursing through your body!"), \ + span_italics("You hear a heavy electrical crack.") \ ) return shock_damage diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index 0a182bcfed99..c37faf9b45de 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -13,7 +13,7 @@ //Vents if(ventcrawler) - to_chat(src, "You can ventcrawl! Use alt+click on vents to quickly travel about the station.") + to_chat(src, span_notice("You can ventcrawl! Use alt+click on vents to quickly travel about the station.")) if(ranged_ability) ranged_ability.add_ranged_ability(src, "You currently have [ranged_ability] active!") diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 232f35507373..680fd1f4f97b 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -148,7 +148,7 @@ GLOBAL_LIST_INIT(special_radio_keys, list( language = get_selected_language() if(!can_speak_vocal(message)) - to_chat(src, "You find yourself unable to speak!") + to_chat(src, span_warning("You find yourself unable to speak!")) return var/message_range = 7 @@ -244,7 +244,7 @@ GLOBAL_LIST_INIT(special_radio_keys, list( deaf_message = "[speaker] [speaker.verb_say] something but you cannot hear [speaker.p_them()]." deaf_type = 1 else - deaf_message = "You can't hear yourself!" + deaf_message = span_notice("You can't hear yourself!") deaf_type = 2 // Since you should be able to hear yourself without looking // Create map text prior to modifying message for goonchat if (client?.prefs.chat_on_map && stat != UNCONSCIOUS && (client.prefs.see_chat_non_mob || ismob(speaker)) && can_hear()) @@ -315,7 +315,7 @@ GLOBAL_LIST_INIT(special_radio_keys, list( /mob/living/proc/can_speak_basic(message, ignore_spam = FALSE) //Check BEFORE handling of xeno and ling channels if(client) if(client.prefs.muted & MUTE_IC) - to_chat(src, "You cannot speak in IC (muted).") + to_chat(src, span_danger("You cannot speak in IC (muted).")) return FALSE if(!ignore_spam && 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 e8e82e3dfe1d..c4c6988eda2e 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -117,8 +117,8 @@ target_ai.mind.transfer_to(src) if(mind.special_role) mind.store_memory("As an AI, you must obey your silicon laws above all else. Your objectives will consider you to be dead.") - to_chat(src, "You have been installed as an AI! ") - to_chat(src, "You must obey your silicon laws above all else. Your objectives will consider you to be dead.") + to_chat(src, span_userdanger("You have been installed as an AI! ")) + to_chat(src, span_danger("You must obey your silicon laws above all else. Your objectives will consider you to be dead.")) to_chat(src, "You 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 yourself to get a camera menu.") @@ -315,12 +315,12 @@ /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/can_evac_or_fail_reason = SSshuttle.canEvac(src) if(can_evac_or_fail_reason != TRUE) - to_chat(usr, "[can_evac_or_fail_reason]") + to_chat(usr, span_alert("[can_evac_or_fail_reason]")) return var/reason = input(src, "What is the nature of your emergency? ([CALL_SHUTTLE_REASON_LENGTH] characters required.)", "Confirm Shuttle Call") as null|text @@ -391,10 +391,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, "You route power from your backup battery to move the bolts.") + to_chat(src, span_notice("You route power from your backup battery to move the bolts.")) var/is_anchored = FALSE if(move_resist == MOVE_FORCE_VERY_STRONG) move_resist = MOVE_FORCE_NORMAL @@ -414,7 +414,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) @@ -449,7 +449,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() @@ -483,13 +483,13 @@ return if(controlled_mech) - to_chat(src, "You are already loaded into an onboard computer!") + to_chat(src, span_warning("You 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, "You aren't in your core!") + to_chat(src, span_warning("You aren't in your core!")) return if(M) M.transfer_ai(AI_MECH_HACK, src, usr) //Called om the mech itself. @@ -526,7 +526,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) @@ -534,9 +534,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 @@ -638,7 +638,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 @@ -749,7 +749,7 @@ var/obj/machinery/power/apc/apc = src.loc if(!istype(apc)) - to_chat(src, "You are already in your Main Core.") + to_chat(src, span_notice("You are already in your Main Core.")) return apc.malfvacate() @@ -821,11 +821,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() builtInCamera.toggle_cam(user) @@ -849,10 +849,10 @@ /mob/living/silicon/ai/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE) if(control_disabled || incapacitated()) - to_chat(src, "You can't do that right now!") + to_chat(src, span_warning("You can't do that right now!")) return FALSE if(be_close && !in_range(M, src)) - to_chat(src, "You are too far away!") + to_chat(src, span_warning("You are too far away!")) return FALSE return can_see(M) //stop AIs from leaving windows open and using then after they lose vision @@ -953,10 +953,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/machines/buzz-two.ogg', 50, 1, 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/machines/buzz-sigh.ogg', 50, 1, ignore_walls = FALSE) else malf_picker.processing_time += 5 @@ -977,7 +977,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() @@ -1033,7 +1033,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, "Your remote connection has been reset!") + to_chat(src, span_danger("Your remote connection has been reset!")) deployed_shell.undeploy() deployed_shell = null diag_hud_set_deployed() diff --git a/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm b/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm index 209c48d6c5a6..9700d463b499 100644 --- a/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm +++ b/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm @@ -54,15 +54,15 @@ var/h = portrait_icon.Height() var/mutable_appearance/MA = mutable_appearance(portrait_icon) if(w == 23 || h == 23) - to_chat(ai, "Small note: 23x23 Portraits are accepted, but they do not fit perfectly inside the display frame.") + to_chat(ai, span_notice("Small note: 23x23 Portraits are accepted, but they do not fit perfectly inside the display frame.")) MA.pixel_x = 5 MA.pixel_y = 5 else if(w == 24 || h == 24) - to_chat(ai, "Portrait Accepted. Enjoy!") + to_chat(ai, span_notice("Portrait Accepted. Enjoy!")) MA.pixel_x = 4 MA.pixel_y = 4 else - to_chat(ai, "Sorry, only 23x23 and 24x24 Portraits are accepted.") + to_chat(ai, span_warning("Sorry, only 23x23 and 24x24 Portraits are accepted.")) return ai.cut_overlays() //so people can't keep repeatedly select portraits to add stacking overlays ai.icon_state = "ai-portrait-active"//background diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm index 26aadfd5168a..8fa47a78111f 100644 --- a/code/modules/mob/living/silicon/ai/examine.dm +++ b/code/modules/mob/living/silicon/ai/examine.dm @@ -1,16 +1,16 @@ /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!" if (getFireLoss()) if (getFireLoss() < 30) - . += "It looks slightly charred." + . += span_warning("It looks slightly charred.") else . += "Its casing is melted and heat-warped!" if(deployed_shell) diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index 15a9a6f84649..fa500f4e9af5 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, "Your backup battery's output drops below usable levels. It takes only a moment longer for your systems to fail, corrupted and unusable.") + to_chat(src, span_warning("Your backup battery's output drops below usable levels. It takes only a moment longer for your systems to fail, corrupted and unusable.")) adjustOxyLoss(200) else battery -- diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm index b358cefda425..0f2d4eb2fc32 100644 --- a/code/modules/mob/living/silicon/ai/multicam.dm +++ b/code/modules/mob/living/silicon/ai/multicam.dm @@ -199,25 +199,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/obj/screen/movable/pic_in_pic/ai/C = new /obj/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() @@ -228,11 +228,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) @@ -251,7 +251,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) var/obj/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(obj/screen/movable/pic_in_pic/ai/P) diff --git a/code/modules/mob/living/silicon/ai/robot_control.dm b/code/modules/mob/living/silicon/ai/robot_control.dm index bbfb7604ba5e..a21419d45045 100644 --- a/code/modules/mob/living/silicon/ai/robot_control.dm +++ b/code/modules/mob/living/silicon/ai/robot_control.dm @@ -10,7 +10,7 @@ if(user != owner || owner.incapacitated()) return FALSE if(owner.control_disabled) - to_chat(user, "Wireless control is disabled.") + to_chat(user, span_warning("Wireless control is disabled.")) return FALSE return TRUE @@ -60,13 +60,13 @@ switch(action) if("callbot") //Command a bot to move to a selected location. if(owner.call_bot_cooldown > world.time) - to_chat(usr, "Error: Your last call bot command is still processing, please wait for the bot to finish calculating a route.") + to_chat(usr, span_danger("Error: Your last call bot command is still processing, please wait for the bot to finish calculating a route.")) return owner.Bot = locate(params["ref"]) in GLOB.bots_list if(!owner.Bot || owner.Bot.remote_disabled || owner.control_disabled) return owner.waypoint_mode = TRUE - to_chat(usr, "Set your waypoint by clicking on a valid location free of obstructions.") + to_chat(usr, span_notice("Set your waypoint by clicking on a valid location free of obstructions.")) . = TRUE if("interface") //Remotely connect to a bot! owner.Bot = locate(params["ref"]) in GLOB.bots_list diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index 9055cd311f8d..6df420f31a9d 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, "Your radio transmitter is offline!") + to_chat(src, span_danger("Your radio transmitter is offline!")) return FALSE ..() @@ -87,12 +87,12 @@ /mob/living/silicon/ai/proc/voice_announce() if(GLOB.announcing_vox > world.time) - to_chat(src, "Please wait [DisplayTimeText(GLOB.announcing_vox - world.time)].") + to_chat(src, span_notice("Please wait [DisplayTimeText(GLOB.announcing_vox - world.time)].")) return if(incapacitated()) 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/datum/voice_announce/ai/announce_datum = new(client) @@ -102,7 +102,7 @@ GLOBAL_VAR_INIT(announcing_vox, 0) /mob/living/silicon/ai/proc/announcement() if(GLOB.announcing_vox > world.time) - to_chat(src, "Please wait [DisplayTimeText(GLOB.announcing_vox - world.time)].") + to_chat(src, span_notice("Please wait [DisplayTimeText(GLOB.announcing_vox - world.time)].")) return var/list/types_list = list("Victor (male)", "Verity (female)", "Oscar (military)") //Victor is vox_sounds_male, Verity is vox_sounds, Oscar is vox_sounds_military @@ -125,7 +125,7 @@ GLOBAL_VAR_INIT(announcing_vox, 0) 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), " ") @@ -147,7 +147,7 @@ GLOBAL_VAR_INIT(announcing_vox, 0) 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 GLOB.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 e938db3c2f42..e469d422ea9c 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -181,7 +181,7 @@ /mob/living/silicon/pai/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE) if(be_close && !in_range(M, src)) - to_chat(src, "You are too far away!") + to_chat(src, span_warning("You are too far away!")) return FALSE return TRUE @@ -271,7 +271,7 @@ if(cable) if(get_dist(src, cable) > 1) var/turf/T = get_turf(src.loc) - T.visible_message("[src.cable] rapidly retracts back into its spool.", "You hear a click and the sound of wire spooling rapidly.") + T.visible_message(span_warning("[src.cable] rapidly retracts back into its spool."), span_italics("You hear a click and the sound of wire spooling rapidly.")) qdel(src.cable) cable = null silent = max(silent - 1, 0) diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index e6a81f931960..5c4e614d22f0 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_language = get_random_spoken_language() @@ -43,32 +43,32 @@ /mob/living/silicon/pai/attack_hand(mob/living/carbon/human/user) switch(user.a_intent) 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.")) spawn(10) 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/item/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, "Your 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("Your 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, "Your 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("Your 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(var/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 your holochassis!") + to_chat(src, span_userdanger("The impact degrades your 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 61cccb5f52d8..66a4619618a0 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, "Your holochassis emitters are still too unstable! Please wait for automatic repair.") + to_chat(src, span_warning("Your holochassis emitters are still too unstable! Please wait for automatic repair.")) return FALSE if(!canholo && !force) - to_chat(src, "Your master or another force has disabled your holochassis emitters!") + to_chat(src, span_warning("Your master or another force has disabled your 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, "You can not change your holochassis composite while not on the ground or in your card!") + to_chat(src, span_boldwarning("You can not change your holochassis composite while not on the ground or in your card!")) return FALSE var/choice = input(src, "What would you like to use for your holochassis composite?") as null|anything in possible_chassis if(!choice) return FALSE chassis = choice update_resting() - to_chat(src, "You switch your holochassis projection composite to [chassis].") + to_chat(src, span_boldnotice("You switch your 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, "You enable your integrated light.") + to_chat(src, span_notice("You enable your integrated light.")) else set_light(0) - to_chat(src, "You disable your integrated light.") + to_chat(src, span_notice("You disable your 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 9f07900a250f..7c0bd7af7501 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, var/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 037b4a2e7a2d..793dc8d2194b 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -288,7 +288,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.", "You 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_italics("You hear the soft click of something light and hard falling to the ground.")) if("loudness") if(subscreen == 1) // Open Instrument @@ -408,9 +408,9 @@ return var/answer = input(M, "[P] is requesting a DNA sample from you. Will you allow it to confirm your identity?", "[P] Check DNA", "No") in list("Yes", "No") if(answer == "Yes") - M.visible_message("[M] presses [M.p_their()] thumb against [P].",\ - "You press your 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("You press your 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 diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 68ec881b69d7..bc170463fff6 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -63,4 +63,4 @@ "You announce you are operating in low power mode.") playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0) else - to_chat(src, "You can only use this emote when you're out of charge.") + to_chat(src, span_warning("You 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 aab37e24b450..5f4b1e124f1b 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -9,32 +9,32 @@ . += 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!" 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!" 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!") if(is_servant_of_ratvar(src) && get_dist(user, src) <= 1 && !stat) //To counter pseudo-stealth by using headlamps - . += "Its eyes are glowing a blazing yellow!" + . += span_warning("Its eyes are glowing a blazing yellow!") switch(stat) if(CONSCIOUS) @@ -43,9 +43,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 94bc5f615d80..3dc942248a97 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -27,18 +27,18 @@ CRASH("activate_module called with item_module not in module.modules") if(activated(item_module)) - to_chat(src, "That module is already activated.") + to_chat(src, span_warning("That module is already activated.")) return FALSE if(disabled_modules & BORG_MODULE_ALL_DISABLED) - to_chat(src, "All modules are disabled!") + to_chat(src, span_warning("All modules are disabled!")) return FALSE /// What's the first free slot for the borg? var/first_free_slot = !held_items[1] ? 1 : (!held_items[2] ? 2 : (!held_items[3] ? 3 : null)) if(!first_free_slot || is_invalid_module_number(first_free_slot)) - to_chat(src, "Deactivate a module first!") + to_chat(src, span_warning("Deactivate a module first!")) return FALSE return equip_module_to_slot(item_module, first_free_slot) @@ -149,8 +149,8 @@ if(!quiet) playsound(src, 'sound/machines/warning-buzzer.ogg', 75, TRUE, TRUE) - 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_userdanger("CRITICAL ERROR: ALL modules OFFLINE.")) if(2) if(disabled_modules & BORG_MODULE_TWO_DISABLED) @@ -161,8 +161,8 @@ if(!quiet) playsound(src, 'sound/machines/warning-buzzer.ogg', 60, TRUE, TRUE) - audible_message("[src] sounds an alarm! \"SYSTEM ERROR: Module [module_num] OFFLINE.\"") - to_chat(src, "SYSTEM ERROR: Module [module_num] OFFLINE.") + audible_message(span_warning("[src] sounds an alarm! \"SYSTEM ERROR: Module [module_num] OFFLINE.\"")) + to_chat(src, span_userdanger("SYSTEM ERROR: Module [module_num] OFFLINE.")) if(3) if(disabled_modules & BORG_MODULE_THREE_DISABLED) @@ -173,8 +173,8 @@ if(!quiet) playsound(src, 'sound/machines/warning-buzzer.ogg', 50, TRUE, TRUE) - audible_message("[src] sounds an alarm! \"SYSTEM ERROR: Module [module_num] OFFLINE.\"") - to_chat(src, "SYSTEM ERROR: Module [module_num] OFFLINE.") + audible_message(span_warning("[src] sounds an alarm! \"SYSTEM ERROR: Module [module_num] OFFLINE.\"")) + to_chat(src, span_userdanger("SYSTEM ERROR: Module [module_num] OFFLINE.")) return TRUE @@ -216,7 +216,7 @@ inv3.icon_state = initial(inv3.icon_state) disabled_modules &= ~BORG_MODULE_THREE_DISABLED - to_chat(src, "ERROR CLEARED: Module [module_num] back online.") + to_chat(src, span_notice("ERROR CLEARED: Module [module_num] back online.")) return TRUE diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index e6ec4d8e27ee..47c049014d74 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -183,7 +183,7 @@ mind.transfer_to(mmi.brainmob) mmi.update_icon() else - to_chat(src, "Oops! Something went very wrong, your MMI was unable to receive your 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, your MMI was unable to receive your 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 @@ -209,7 +209,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_userdanger("ERROR: Module installer reply timeout. Please check internal connections.")) return var/list/modulelist = list("Standard" = /obj/item/robot_module/standard, \ @@ -259,7 +259,7 @@ set category = "Robot Commands" set name = "Show Alerts" if(usr.stat == DEAD) - to_chat(src, "Alert: You are dead.") + to_chat(src, span_userdanger("Alert: You are dead.")) return //won't work if dead robot_alerts() @@ -301,7 +301,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) @@ -309,7 +309,7 @@ ion_trail.set_up(src) ionpulse_on = !ionpulse_on - to_chat(src, "You [ionpulse_on ? null :"de"]activate your ion thrusters.") + to_chat(src, span_notice("You [ionpulse_on ? null :"de"]activate your ion thrusters.")) if(ionpulse_on) ion_trail.start() else @@ -388,15 +388,15 @@ if(W.tool_behaviour == TOOL_WELDER && (user.a_intent != 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) if(health > 0) - to_chat(user, "You have repaired what you could! Get some help to repair the remaining damage.") + to_chat(user, span_warning("You have repaired what you could! Get some help to repair the remaining damage.")) return - to_chat(user, "You start fixing yourself...") + to_chat(user, span_notice("You start fixing yourself...")) if(!W.use_tool(src, user, 50)) return if(health > 0) @@ -405,7 +405,7 @@ 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) @@ -413,42 +413,42 @@ var/obj/item/stack/cable_coil/coil = W if (getFireLoss() > 0 || getToxLoss() > 0) if(src == user) - to_chat(user, "You start fixing yourself...") + to_chat(user, span_notice("You start fixing yourself...")) 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].", "You fix some of the burnt wires on [src].") + user.visible_message("[user] has fixed some of the burnt wires on [src].", span_notice("You fix some of the burnt wires on [src].")) else - to_chat(user, "You need more cable to repair [src]!") + to_chat(user, span_warning("You need more cable to repair [src]!")) else to_chat(user, "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, "You close the cover.") + to_chat(user, span_notice("You 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, "You open the cover.") + to_chat(user, span_notice("You 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, "You insert the power cell.") + to_chat(user, span_notice("You insert the power cell.")) update_icons() diag_hud_set_borgcell() @@ -456,52 +456,52 @@ if (wiresexposed) wires.interact(user) else - to_chat(user, "You can't reach the wiring!") + to_chat(user, span_warning("You 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, "You cannot seem to open the radio compartment.") //Prevent AI radio key theft + to_chat(user, span_notice("You 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_boldannounce("[src]'s bolts spark! Maybe you should lock them down first!")) spark_system.start() return else - to_chat(user, "You start to unfasten [src]'s securing bolts...") + to_chat(user, span_notice("You start to unfasten [src]'s securing bolts...")) if(W.use_tool(src, user, 50, volume=50) && !cell) - user.visible_message("[user] deconstructs [src]!", "You unfasten the securing bolts, and [src] falls to pieces!") + user.visible_message("[user] deconstructs [src]!", span_notice("You 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, "You need access to the robot's insides to do that!") + to_chat(user, span_warning("You need access to the robot's insides to do that!")) return if(wiresexposed) - to_chat(user, "You need to close the wire panel to do that!") + to_chat(user, span_warning("You need to close the wire panel to do that!")) return if(!cell) - to_chat(user, "You need to install a power cell to do that!") + to_chat(user, span_warning("You 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 @@ -510,70 +510,70 @@ if(radio)//sanityyyyyy radio.attackby(W,user)//GTFO, you have your 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, "You must close the cover to swipe an ID card!") + to_chat(user, span_warning("You must close the cover to swipe an ID card!")) else if(allowed(usr)) locked = !locked - to_chat(user, "You [ locked ? "lock" : "unlock"] [src]'s cover.") - to_chat(src, "[usr] [locked ? "locks" : "unlocks"] your cover.") + to_chat(user, span_notice("You [ locked ? "lock" : "unlock"] [src]'s cover.")) + to_chat(src, span_notice("[usr] [locked ? "locks" : "unlocks"] your 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, "You must access the borg's internals!") + to_chat(user, span_warning("You 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, "You apply the upgrade to [src].") + to_chat(user, span_notice("You 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, "You fill the toner level of [src] to its max capacity.") + to_chat(user, span_notice("You fill the toner level of [src] to its max capacity.")) else if(istype(W, /obj/item/light/bulb)) var/obj/item/light/bulb/B = W //yogs start if(B.status) - to_chat(user, "[B] is broken!") + to_chat(user, span_warning("[B] is broken!")) return if(!opened) - to_chat(user, "You need to open the panel to repair the headlamp!") + to_chat(user, span_warning("You 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(B)) - to_chat(user, "[B] seems to be stuck to your hand. You'll have to find a different light.") + to_chat(user, span_warning("[B] seems to be stuck to your hand. You'll have to find a different light.")) return lamp_cooldown = 0 qdel(B) - to_chat(user, "You replace the headlamp bulb.") //yogs end + to_chat(user, span_notice("You replace the headlamp bulb.")) //yogs end else return ..() @@ -588,7 +588,7 @@ if("Yes") locked = FALSE update_icons() - to_chat(usr, "You unlock your cover.") + to_chat(usr, span_notice("You unlock your cover.")) /mob/living/silicon/robot/proc/allowed(mob/M) //check if it doesn't require any access at all @@ -727,7 +727,7 @@ /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. @@ -739,7 +739,7 @@ set_light(0) if(lamp_intensity && (turn_off || stat || low_power_mode)) - to_chat(src, "Your headlamp has been deactivated.") + to_chat(src, span_danger("Your headlamp has been deactivated.")) lamp_intensity = 0 lamp_cooldown = world.time + cooldown else @@ -897,10 +897,10 @@ /mob/living/silicon/robot/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE) if(stat || lockcharge || low_power_mode) - to_chat(src, "You can't do that right now!") + to_chat(src, span_warning("You can't do that right now!")) return FALSE if(be_close && !in_range(M, src)) - to_chat(src, "You are too far away!") + to_chat(src, span_warning("You are too far away!")) return FALSE return TRUE @@ -1186,7 +1186,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(has_buckled_mobs()) @@ -1200,18 +1200,18 @@ 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 - M.visible_message("[M] begins to [M == usr ? "climb onto" : "be buckled to"] [src]...") + M.visible_message(span_warning("[M] begins to [M == usr ? "climb onto" : "be buckled to"] [src]...")) if(!do_after(usr, 1.5 SECONDS, target = M)) - visible_message("[M] was prevented from buckling to [src]!") + visible_message(span_boldwarning("[M] was prevented from buckling to [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 26c86666a4db..b51719fe9fd2 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 @@ /mob/living/silicon/robot/attackby(obj/item/I, mob/living/user) if(I.slot_flags & ITEM_SLOT_HEAD && hat_offset != INFINITY && user.a_intent == INTENT_HELP && !is_type_in_typecache(I, blacklisted_hats)) - to_chat(user, "You begin to place [I] on [src]'s head...") - to_chat(src, "[user] is placing [I] on your head...") + to_chat(user, span_notice("You 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 @@ 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_userdanger("[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_userdanger("[M] has forced back [src]!"), null, COMBAT_MESSAGE_RANGE) playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1) else ..() @@ -64,7 +64,7 @@ cell.update_icon() cell.add_fingerprint(user) user.put_in_active_hand(cell) - to_chat(user, "You remove \the [cell].") + to_chat(user, span_notice("You remove \the [cell].")) cell = null update_icons() diag_hud_set_borgcell() @@ -98,20 +98,20 @@ return if(!opened)//Cover is closed if(locked) - to_chat(user, "You emag the cover lock.") + to_chat(user, span_notice("You 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, "You must unexpose the wires first!") + to_chat(user, span_warning("You must unexpose the wires first!")) return - to_chat(user, "You emag [src]'s interface.") + to_chat(user, span_notice("You emag [src]'s interface.")) emag_cooldown = world.time + 100 if(is_servant_of_ratvar(src)) @@ -121,13 +121,13 @@ return 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 @@ -141,20 +141,20 @@ 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 3efc0b65a388..36a57a045a61 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -12,7 +12,7 @@ var/renderedAI = "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 3862273ad677..54ac3c1216bc 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -153,7 +153,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() @@ -355,7 +355,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 diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index 7e1ac7ad2e41..d2c1dbd94045 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -11,8 +11,8 @@ if (prob(90)) log_combat(M, src, "attacked") playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1) - visible_message("[M] has slashed at [src]!", \ - "[M] has slashed at [src]!") + visible_message(span_danger("[M] has slashed at [src]!"), \ + span_userdanger("[M] has slashed at [src]!")) if(prob(8)) flash_act(affect_silicon = 1) log_combat(M, src, "attacked") @@ -20,8 +20,8 @@ updatehealth() else playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) - visible_message("[M] took a swipe at [src]!", \ - "[M] took a swipe at [src]!") + visible_message(span_danger("[M] took a swipe at [src]!"), \ + span_userdanger("[M] took a swipe at [src]!")) /mob/living/silicon/attack_animal(mob/living/simple_animal/M) . = ..() @@ -31,7 +31,7 @@ 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]!") + N.visible_message(span_boldwarning("[N] is knocked off of [src] by [M]!")) switch(M.melee_damage_type) if(BRUTE) adjustBruteLoss(damage) @@ -50,8 +50,8 @@ ..(user, 1) adjustBruteLoss(rand(10, 15)) playsound(loc, "punch", 25, 1, -1) - visible_message("[user] has punched [src]!", \ - "[user] has punched [src]!") + visible_message(span_danger("[user] has punched [src]!"), \ + span_userdanger("[user] has punched [src]!")) return 1 return 0 @@ -63,14 +63,14 @@ switch(M.a_intent) if (INTENT_HELP) M.visible_message("[M] pets [src].", \ - "You pet [src].") + span_notice("You pet [src].")) if(INTENT_GRAB) grabbedby(M) else M.do_attack_animation(src, ATTACK_EFFECT_PUNCH) playsound(src.loc, 'sound/effects/bang.ogg', 10, 1) - visible_message("[M] punches [src], but doesn't leave a dent.", \ - "[M] punches [src], but doesn't leave a dent.", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] punches [src], but doesn't leave a dent."), \ + span_warning("[M] punches [src], but doesn't leave a dent."), null, COMBAT_MESSAGE_RANGE) /mob/living/silicon/attack_drone(mob/living/simple_animal/drone/M) if(M.a_intent == INTENT_HARM) @@ -86,7 +86,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) @@ -94,12 +94,12 @@ src.take_bodypart_damage(20) if(2) src.take_bodypart_damage(10) - to_chat(src, "*BZZZT*") + to_chat(src, span_userdanger("*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/item/projectile/Proj, def_zone) @@ -108,13 +108,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 89e2262c78ed..6e0cbb6a0512 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -5,7 +5,7 @@ switch(M.a_intent) if(INTENT_HELP) if (health > 0) - visible_message("[M] [response_help] [src].") + visible_message(span_notice("[M] [response_help] [src].")) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(INTENT_GRAB) @@ -17,23 +17,23 @@ var/shove_dir = get_dir(M, src) if(!Move(get_step(src, shove_dir), shove_dir)) log_combat(M, src, "shoved", "failing to move it") - M.visible_message("[M.name] shoves [src]!", - "You shove [src]!", "You hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, list(src)) - to_chat(src, "You're shoved by [M.name]!") + M.visible_message(span_danger("[M.name] shoves [src]!"), + span_danger("You shove [src]!"), span_hear("You hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, list(src)) + to_chat(src, span_userdanger("You're shoved by [M.name]!")) return TRUE log_combat(M, src, "shoved", "pushing it") - M.visible_message("[M.name] shoves [src], pushing [p_them()]!", - "You shove [src], pushing [p_them()]!", "You hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, list(src)) - to_chat(src, "You're pushed by [name]!") + M.visible_message(span_danger("[M.name] shoves [src], pushing [p_them()]!"), + span_danger("You shove [src], pushing [p_them()]!"), span_hear("You hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, list(src)) + to_chat(src, span_userdanger("You're pushed by [name]!")) return TRUE if(INTENT_HARM) if(HAS_TRAIT(M, TRAIT_PACIFISM)) - to_chat(M, "You don't want to hurt [src]!") + to_chat(M, span_notice("You don't want to hurt [src]!")) return M.do_attack_animation(src, ATTACK_EFFECT_PUNCH) - visible_message("[M] [response_harm] [src]!",\ - "[M] [response_harm] [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] [response_harm] [src]!"),\ + span_userdanger("[M] [response_harm] [src]!"), null, COMBAT_MESSAGE_RANGE) playsound(loc, attacked_sound, 25, 1, -1) attack_threshold_check(harm_intent_damage) log_combat(M, src, "attacked") @@ -43,12 +43,12 @@ /mob/living/simple_animal/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0) if(user.a_intent == INTENT_HARM) if(HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "You don't want to hurt [src]!") + to_chat(user, span_notice("You don't want to hurt [src]!")) return FALSE ..(user, 1) playsound(loc, "punch", 25, 1, -1) - visible_message("[user] has punched [src]!", \ - "[user] has punched [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[user] has punched [src]!"), \ + span_userdanger("[user] has punched [src]!"), null, COMBAT_MESSAGE_RANGE) adjustBruteLoss(15) return TRUE @@ -60,7 +60,7 @@ return 1 if (M.a_intent == INTENT_HELP) if (health > 0) - visible_message("[M.name] [response_help] [src].") + visible_message(span_notice("[M.name] [response_help] [src].")) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) @@ -68,13 +68,13 @@ if(..()) //if harm or disarm intent. if(M.a_intent == INTENT_DISARM) playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) - visible_message("[M] [response_disarm] [name]!", \ - "[M] [response_disarm] [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] [response_disarm] [name]!"), \ + span_userdanger("[M] [response_disarm] [name]!"), null, COMBAT_MESSAGE_RANGE) log_combat(M, src, "disarmed") else var/damage = rand(15, 30) - visible_message("[M] has slashed at [src]!", \ - "[M] has slashed at [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[M] has slashed at [src]!"), \ + span_userdanger("[M] has slashed at [src]!"), null, COMBAT_MESSAGE_RANGE) playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) attack_threshold_check(damage) log_combat(M, src, "attacked") @@ -114,7 +114,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 b221ea536022..b71c5bd8a0ee 100644 --- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm +++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm @@ -134,7 +134,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 ad8660a3f00f..32ccb477cc00 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]]") /** * Returns a status string about the bot's current status, if it's moving, manually controlled, or idle. @@ -203,7 +203,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, "You bypass [src]'s controls.") + to_chat(user, span_notice("You 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 @@ -211,11 +211,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_userdanger("(#$*#$^^( 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, "You need to open maintenance panel first!") + to_chat(user, span_warning("You need to open maintenance panel first!")) /mob/living/simple_animal/bot/examine(mob/user) . = ..() @@ -284,7 +284,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) @@ -293,44 +293,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."]") 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(istype(W, /obj/item/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, "You attempt to pull [paicard] free...") + to_chat(user, span_notice("You 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]!","You 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("You pull [paicard] out of [bot_name] with [W].")) ejectpai(user) else user.changeNext_move(CLICK_CD_MELEE) if(W.tool_behaviour == TOOL_WELDER && user.a_intent != 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]!","You repair [src].") + user.visible_message("[user] repairs [src]!",span_notice("You repair [src].")) else if(W.force) //if force is non-zero do_sparks(5, TRUE, src) @@ -351,7 +351,7 @@ new /obj/effect/temp_visual/emp(loc) if(paicard) paicard.emp_act(severity) - src.visible_message("[paicard] is flies out of [bot_name]!","You are forcefully ejected from [bot_name]!") + src.visible_message("[paicard] is flies out of [bot_name]!",span_warning("You are forcefully ejected from [bot_name]!")) ejectpai(0) if(on) turn_off() @@ -547,13 +547,13 @@ Pass a positive integer as an argument to override a bot's default speed. reset_access_timer_id = addtimer(CALLBACK (src, .proc/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.") 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) @@ -562,13 +562,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) @@ -739,7 +739,7 @@ Pass a positive integer as an argument to override a bot's default speed. 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() @@ -814,7 +814,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) @@ -839,18 +839,18 @@ 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]")) 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]")) bot_reset() if("ejectpai") if(paicard && (!locked || issilicon(usr) || IsAdminGhost(usr))) - to_chat(usr, "You eject [paicard] from [bot_name]") + to_chat(usr, span_notice("You eject [paicard] from [bot_name]")) ejectpai(usr) update_controls() @@ -884,7 +884,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 @@ -909,27 +909,27 @@ 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]!","You insert [card] into [src].") + user.visible_message("[user] inserts [card] into [src]!",span_notice("You insert [card] into [src].")) paicard.pai.mind.transfer_to(src) - to_chat(src, "You sense your form change as you are uploaded into [src].") + to_chat(src, span_notice("You sense your form change as you are uploaded into [src].")) bot_name = name name = paicard.pai.name faction = user.faction.Copy() 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) @@ -946,7 +946,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, "You feel your control fade as [paicard] ejects from [bot_name].") + to_chat(paicard.pai, span_notice("You 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 1e4dcba57441..b09f6bac0b7b 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -67,14 +67,14 @@ if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if(bot_core.allowed(user) && !open && !emagged) locked = !locked - to_chat(user, "You [ locked ? "lock" : "unlock"] \the [src] behaviour controls.") + to_chat(user, span_notice("You [ 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 return ..() @@ -82,7 +82,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)) @@ -216,20 +216,20 @@ var/turf/T = get_turf(A) if(do_after(src, 1, target = T)) T.wash(CLEAN_WASH) - visible_message("[src] cleans \the [T].") + visible_message(span_notice("[src] cleans \the [T].")) target = null 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/effects/spray2.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 @@ -239,7 +239,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_userdanger("[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.") @@ -253,7 +253,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 @@ -261,7 +261,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 6e86183706c9..5cd48579f8a9 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, "You must take [src] out of [loc] first!") + to_chat(user, span_warning("You 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, "You add [W] to [src]. Beep boop!") + to_chat(user, span_notice("You 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, "You add [W] to [src].") + to_chat(user, span_notice("You add [W] to [src].")) qdel(W) name = "legs/frame assembly" if(build_step == ASSEMBLY_FIRST_STEP) @@ -92,7 +92,7 @@ return lasercolor = newcolor vest_type = W.type - to_chat(user, "You add [W] to [src].") + to_chat(user, span_notice("You add [W] to [src].")) qdel(W) name = "vest/legs/frame assembly" item_state = "[lasercolor]ed209_shell" @@ -105,7 +105,7 @@ if(build_step != 3) return name = "shielded frame assembly" - to_chat(user, "You weld the vest to [src].") + to_chat(user, span_notice("You weld the vest to [src].")) build_step++ if(ASSEMBLY_FIFTH_STEP) @@ -124,7 +124,7 @@ if(!user.temporarilyRemoveItemFromInventory(W)) return - to_chat(user, "You add [W] to [src].") + to_chat(user, span_notice("You add [W] to [src].")) qdel(W) name = "covered and shielded frame assembly" item_state = "[lasercolor]ed209_hat" @@ -136,7 +136,7 @@ if(!user.temporarilyRemoveItemFromInventory(W)) return build_step++ - to_chat(user, "You add [W] to [src].") + to_chat(user, span_notice("You add [W] to [src].")) qdel(W) name = "covered, shielded and sensored frame assembly" item_state = "[lasercolor]ed209_prox" @@ -146,13 +146,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, "You need one length of cable to wire the ED-209!") + to_chat(user, span_warning("You need one length of cable to wire the ED-209!")) return - to_chat(user, "You start to wire [src]...") + to_chat(user, span_notice("You 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, "You wire [src].") + to_chat(user, span_notice("You wire [src].")) name = "wired ED-209 assembly" build_step++ @@ -172,7 +172,7 @@ if(!user.temporarilyRemoveItemFromInventory(W)) return name = "[W.name] ED-209 assembly" - to_chat(user, "You add [W] to [src].") + to_chat(user, span_notice("You add [W] to [src].")) item_state = "[lasercolor]ed209_taser" icon_state = "[lasercolor]ed209_taser" qdel(W) @@ -180,12 +180,12 @@ if(8) if(W.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "You start attaching the gun to the frame...") + to_chat(user, span_notice("You start attaching the gun to the frame...")) if(W.use_tool(src, user, 40, volume=100)) if(build_step != 8) return name = "armed [name]" - to_chat(user, "The gun is now securely fastened to the frame.") + to_chat(user, span_notice("The gun is now securely fastened to the frame.")) build_step++ if(9) @@ -193,7 +193,7 @@ if(!can_finish_build(W, user)) return var/mob/living/simple_animal/bot/ed209/B = new(drop_location(),created_name,lasercolor) - to_chat(user, "You complete the ED-209.") + to_chat(user, span_notice("You complete the ED-209.")) B.cell_type = W.type qdel(W) B.vest_type = vest_type @@ -234,7 +234,7 @@ if(isprox(W)) if(!user.temporarilyRemoveItemFromInventory(W)) return - to_chat(user, "You add [W] to [src].") + to_chat(user, span_notice("You add [W] to [src].")) qdel(W) build_step++ update_icon() @@ -247,7 +247,7 @@ A.name = created_name A.robot_arm = W.type A.toolbox = toolbox - to_chat(user, "You add [W] to [src]. Boop beep!") + to_chat(user, span_notice("You add [W] to [src]. Boop beep!")) qdel(W) qdel(src) @@ -276,7 +276,7 @@ if(!user.temporarilyRemoveItemFromInventory(W)) return healthanalyzer = W.type - to_chat(user, "You add [W] to [src].") + to_chat(user, span_notice("You add [W] to [src].")) qdel(W) name = "first aid/robot arm/health analyzer assembly" add_overlay("na_scanner") @@ -288,7 +288,7 @@ return qdel(W) var/mob/living/simple_animal/bot/medbot/S = new(drop_location(), skin) - to_chat(user, "You complete the Medbot. Beep boop!") + to_chat(user, span_notice("You complete the Medbot. Beep boop!")) S.name = created_name S.firstaid = firstaid S.robot_arm = robot_arm @@ -310,7 +310,7 @@ if(isprox(I)) if(!user.temporarilyRemoveItemFromInventory(I)) return - to_chat(user, "You add the [I] to [src]!") + to_chat(user, span_notice("You add the [I] to [src]!")) icon_state = "honkbot_proxy" name = "incomplete Honkbot assembly" qdel(I) @@ -320,7 +320,7 @@ if(istype(I, /obj/item/bikehorn)) if(!can_finish_build(I, user)) return - to_chat(user, "You add the [I] to [src]! Honk!") + to_chat(user, span_notice("You 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. @@ -350,20 +350,20 @@ if(build_step != 0) return add_overlay("hs_hole") - to_chat(user, "You weld a hole in [src]!") + to_chat(user, span_notice("You 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, "You disconnect the signaler from the helmet.") + to_chat(user, span_notice("You disconnect the signaler from the helmet.")) qdel(src) if(ASSEMBLY_SECOND_STEP) if(isprox(I)) if(!user.temporarilyRemoveItemFromInventory(I)) return - to_chat(user, "You add [I] to [src]!") + to_chat(user, span_notice("You add [I] to [src]!")) add_overlay("hs_eye") name = "helmet/signaler/prox sensor assembly" qdel(I) @@ -374,14 +374,14 @@ if(build_step != 2) return cut_overlay("hs_hole") - to_chat(user, "You weld the hole in [src] shut!") + to_chat(user, span_notice("You 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, "You add [I] to [src]!") + to_chat(user, span_notice("You add [I] to [src]!")) name = "helmet/signaler/prox sensor/robot arm assembly" add_overlay("hs_arm") robot_arm = I.type @@ -391,14 +391,14 @@ else if(I.tool_behaviour == TOOL_SCREWDRIVER) //deconstruct cut_overlay("hs_eye") new /obj/item/assembly/prox_sensor(Tsec) - to_chat(user, "You detach the proximity sensor from [src].") + to_chat(user, span_notice("You 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, "You complete the Securitron! Beep boop.") + to_chat(user, span_notice("You complete the Securitron! Beep boop.")) var/mob/living/simple_animal/bot/secbot/S = new(Tsec) S.name = created_name S.baton_type = I.type @@ -416,13 +416,13 @@ created_name = "General Beepsky" name = "helmet/signaler/prox sensor/robot arm/toy sword assembly" icon_state = "grievous_assembly" - to_chat(user, "You superglue [I] onto one of [src]'s arm slots.") + to_chat(user, span_notice("You superglue [I] onto one of [src]'s arm slots.")) qdel(I) toyswordamt ++ else if(!can_finish_build(I, user)) return - to_chat(user, "You complete the Securitron! Something seems a bit wrong with it...?") + to_chat(user, span_notice("You 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 @@ -433,12 +433,12 @@ cut_overlay("hs_arm") var/obj/item/bodypart/dropped_arm = new robot_arm(Tsec) robot_arm = null - to_chat(user, "You remove [dropped_arm] from [src].") + to_chat(user, span_notice("You 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) @@ -450,13 +450,13 @@ created_name = "General Beepsky" name = "helmet/signaler/prox sensor/robot arm/energy sword assembly" icon_state = "grievous_assembly" - to_chat(user, "You bolt [I] onto one of [src]'s arm slots.") + to_chat(user, span_notice("You bolt [I] onto one of [src]'s arm slots.")) qdel(I) swordamt ++ else if(!can_finish_build(I, user)) return - to_chat(user, "You complete the Securitron! Something seems a bit wrong with it...?") + to_chat(user, span_notice("You 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 @@ -466,7 +466,7 @@ build_step-- swordamt = 0 icon_state = initial(icon_state) - to_chat(user, "You unbolt [src]'s energy swords from the chassis.") + to_chat(user, span_notice("You unbolt [src]'s energy swords from the chassis.")) for(var/IS in 1 to swordamt) new /obj/item/melee/transforming/energy/sword/saber(Tsec) @@ -485,7 +485,7 @@ if(istype(I, /obj/item/clothing/head/hardhat/red)) if(!user.temporarilyRemoveItemFromInventory(I)) return - to_chat(user,"You add the [I] to [src]!") + to_chat(user,span_notice("You add the [I] to [src]!")) icon_state = "firebot_helmet" desc = "An incomplete firebot assembly with a fire helmet." qdel(I) @@ -495,7 +495,7 @@ if(isprox(I)) if(!can_finish_build(I, user)) return - to_chat(user, "You add the [I] to [src]! Beep Boop!") + to_chat(user, span_notice("You 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/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 4d9e7fa9418e..04b5c6ef1f43 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -198,9 +198,9 @@ Auto Patrol[]"}, ..() if(emagged == 2) if(user) - to_chat(user, "You short out [src]'s target assessment circuits.") + to_chat(user, span_warning("You 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 icon_state = "[lasercolor]ed209[on]" set_weapon() @@ -375,7 +375,7 @@ Auto Patrol[]"}, /mob/living/simple_animal/bot/ed209/explode() walk_to(src,0) - visible_message("[src] blows apart!") + visible_message(span_boldannounce("[src] blows apart!")) var/atom/Tsec = drop_location() var/obj/item/bot_assembly/ed209/Sa = new (Tsec) @@ -555,14 +555,14 @@ 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_userdanger("[src] has stunned you!")) /mob/living/simple_animal/bot/ed209/proc/cuff(mob/living/carbon/C) mode = BOT_ARREST playsound(src, 'sound/weapons/cablecuff.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_userdanger("[src] is trying to put zipties on you!")) spawn(60) if( !on || !Adjacent(C) || !isturf(C.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm index 2609d01786d9..0535099d2a98 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 2433086c5df7..b587ae6d4cd2 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, "You load [loaded] tiles into the floorbot. It now contains [specialtiles] tiles.") + to_chat(user, span_notice("You load [loaded] tiles into the floorbot. It now contains [specialtiles] tiles.")) else - to_chat(user, "You need at least one floor tile to put into [src]!") + to_chat(user, span_warning("You 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.")) spawn(5) anchored = FALSE mode = BOT_IDLE @@ -318,7 +318,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) @@ -334,7 +334,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 @@ -345,7 +345,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 @@ -365,7 +365,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 ffdb1b53059b..3e723679ec0f 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 << "You short out [src]'s sound control system. It gives out an evil laugh!!" + user << span_danger("You 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/machines/honkbot_evil_laugh.ogg', 75, 1, -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_userdanger("[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 37e72dc8b7d2..3ff88e42bf86 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -234,16 +234,16 @@ if(istype(W, /obj/item/reagent_containers/glass)) . = 1 //no afterattack if(locked) - to_chat(user, "You cannot insert a beaker because the panel is locked!") + to_chat(user, span_warning("You cannot insert a beaker because the panel is locked!")) return if(!isnull(reagent_glass)) - to_chat(user, "There is already a beaker loaded!") + to_chat(user, span_warning("There is already a beaker loaded!")) return if(!user.transferItemToLoc(W, src)) return reagent_glass = W - to_chat(user, "You insert [W].") + to_chat(user, span_notice("You insert [W].")) show_controls(user) else @@ -257,8 +257,8 @@ if(emagged == 2) declare_crit = 0 if(user) - to_chat(user, "You short out [src]'s reagent synthesis circuits.") - audible_message("[src] buzzes oddly!") + to_chat(user, span_notice("You 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) @@ -286,7 +286,7 @@ /mob/living/simple_animal/bot/medbot/proc/tip_over(mob/user) mobility_flags &= ~MOBILITY_MOVE playsound(src, 'sound/machines/warning-buzzer.ogg', 50) - user.visible_message("[user] tips over [src]!", "You tip [src] over!") + user.visible_message(span_danger("[user] tips over [src]!"), span_danger("You tip [src] over!")) mode = BOT_TIPPED var/matrix/mat = transform transform = mat.Turn(180) @@ -297,13 +297,13 @@ var/list/messagevoice if(user) - user.visible_message("[user] sets [src] right-side up!", "You set [src] right-side up!") + user.visible_message(span_notice("[user] sets [src] right-side up!"), span_green("You set [src] right-side up!")) if(user.name == tipper_name) messagevoice = list("I forgive you." = 'sound/voice/medbot/forgive.ogg') else messagevoice = list("Thank you!" = 'sound/voice/medbot/thank_you.ogg', "You are a good person." = 'sound/voice/medbot/youre_good.ogg') else - visible_message("[src] manages to writhe wiggle enough to right itself.") + visible_message(span_notice("[src] manages to writhe wiggle enough to right itself.")) messagevoice = list("Fuck you." = 'sound/voice/medbot/fuck_you.ogg', "Your behavior has been reported, have a nice day." = 'sound/voice/medbot/reported.ogg') tipper_name = null @@ -359,7 +359,7 @@ if(MEDBOT_PANIC_MED to MEDBOT_PANIC_HIGH) . += "They are tipped over and appear visibly distressed." // now we humanize the medbot as a they, not an it if(MEDBOT_PANIC_HIGH to MEDBOT_PANIC_FUCK) - . += "They are tipped over and visibly panicking!" + . += span_warning("They are tipped over and visibly panicking!") if(MEDBOT_PANIC_FUCK to INFINITY) . += "They are freaking out from being tipped over!" @@ -504,7 +504,7 @@ /mob/living/simple_animal/bot/medbot/attack_hand(mob/living/carbon/human/H) if(H.a_intent == INTENT_DISARM && mode != BOT_TIPPED) - H.visible_message("[H] begins tipping over [src].", "You begin tipping over [src]...") + H.visible_message(span_danger("[H] begins tipping over [src]."), span_warning("You begin tipping over [src]...")) if(world.time > last_tipping_action_voice + 15 SECONDS) last_tipping_action_voice = world.time // message for tipping happens when we start interacting, message for righting comes after finishing @@ -517,7 +517,7 @@ tip_over(H) else if(H.a_intent == INTENT_HELP && mode == BOT_TIPPED) - H.visible_message("[H] begins righting [src].", "You begin righting [src]...") + H.visible_message(span_notice("[H] begins righting [src]."), span_notice("You begin righting [src]...")) if(do_after(H, 3 SECONDS, target=src)) set_right(H) else @@ -603,7 +603,7 @@ if(!reagent_id) //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 + 15] 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 + 15] for oxygen damage.)")) var/list/messagevoice = list("All patched up!" = 'sound/voice/medbot/patchedup.ogg',"An apple a day keeps me away." = 'sound/voice/medbot/apple.ogg',"Feel better soon!" = 'sound/voice/medbot/feelbetter.ogg') var/message = pick(messagevoice) speak(message) @@ -614,8 +614,8 @@ if(!emagged && (reagent_id != "internal_beaker") && check_overdose(patient, reagent_id, injection_amount)) soft_reset() return - C.visible_message("[src] is trying to inject [patient]!", \ - "[src] is trying to inject you!") + C.visible_message(span_danger("[src] is trying to inject [patient]!"), \ + span_userdanger("[src] is trying to inject you!")) var/failed = FALSE if(do_mob(src, patient, 30)) @@ -630,8 +630,8 @@ else patient.reagents.add_reagent(reagent_id,injection_amount) log_combat(src, patient, "injected", "internal synthesizer", "[reagent_id]:[injection_amount]") - C.visible_message("[src] injects [patient] with its syringe!", \ - "[src] injects you with its syringe!") + C.visible_message(span_danger("[src] injects [patient] with its syringe!"), \ + span_userdanger("[src] injects you with its syringe!")) else failed = TRUE else @@ -654,7 +654,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 6aa98be0cfe6..22d872782edb 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -96,22 +96,22 @@ return cell = I visible_message("[user] inserts a cell into [src].", - "You insert the new cell into [src].") + span_notice("You 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].", - "You pry the powercell out of [src].") + span_notice("You 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]!", - "You knock [load] off [src] with \the [I]!") + user.visible_message(span_danger("[user] knocks [load] off [src] with \the [I]!"), + span_danger("You knock [load] off [src] with \the [I]!")) else - to_chat(user, "You hit [src] with \the [I] but to no effect!") + to_chat(user, span_warning("You hit [src] with \the [I] but to no effect!")) ..() else ..() @@ -123,7 +123,7 @@ emagged = TRUE if(!open) locked = !locked - to_chat(user, "You [locked ? "lock" : "unlock"] [src]'s controls!") + to_chat(user, span_notice("You [locked ? "lock" : "unlock"] [src]'s controls!")) flick("mulebot-emagged", src) playsound(src, "sparks", 100, 0) @@ -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) @@ -216,7 +216,7 @@ turn_off() else if(cell && !open) if(!turn_on()) - to_chat(usr, "You can't switch on [src]!") + to_chat(usr, span_warning("You can't switch on [src]!")) return . = TRUE else @@ -287,17 +287,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"]
" @@ -333,13 +333,13 @@ /mob/living/simple_animal/bot/mulebot/proc/buzz(type) switch(type) if(SIGH) - audible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") + audible_message("[src] makes a sighing buzz.", span_italics("You hear an electronic buzzing sound.")) playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) if(ANNOYED) - audible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.") + audible_message("[src] makes an annoyed buzzing sound.", span_italics("You hear an electronic buzzing sound.")) playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0) if(DELIGHT) - audible_message("[src] makes a delighted ping!", "You hear a ping.") + audible_message("[src] makes a delighted ping!", span_italics("You hear a ping.")) playsound(loc, 'sound/machines/ping.ogg', 50, 0) @@ -589,14 +589,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!", "You hear a chime.") + audible_message("[src] makes a chiming sound!", span_italics("You hear a chime.")) playsound(loc, 'sound/machines/chime.ogg', 50, 0) 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/machines/chime.ogg',40, 0) calling_ai = null radio_channel = RADIO_CHANNEL_AI_PRIVATE //Report on AI Private instead if the AI is controlling us. @@ -637,11 +637,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.Knockdown(8 SECONDS) return ..() @@ -649,8 +649,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_userdanger("[src] drives over you!")) playsound(loc, 'sound/effects/splat.ogg', 50, 1) var/damage = rand(5,15) @@ -704,7 +704,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) diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index c7b6df5a83fd..93ff4f7f2371 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -205,9 +205,9 @@ Auto Patrol: []"}, ..() if(emagged == 2) if(user) - to_chat(user, "You short out [src]'s target assessment circuits.") + to_chat(user, span_danger("You 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() @@ -247,8 +247,8 @@ Auto Patrol: []"}, /mob/living/simple_animal/bot/secbot/proc/cuff(mob/living/carbon/C) mode = BOT_ARREST playsound(src, 'sound/weapons/cablecuff.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_userdanger("[src] is trying to put zipties on you!")) addtimer(CALLBACK(src, .proc/attempt_handcuff, C), 60) /mob/living/simple_animal/bot/secbot/proc/attempt_handcuff(mob/living/carbon/C) @@ -280,8 +280,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_userdanger("[src] has stunned you!")) /mob/living/simple_animal/bot/secbot/handle_automated_action() if(!..()) @@ -424,7 +424,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() var/obj/item/bot_assembly/secbot/Sa = new (Tsec) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index d1c1f252ce68..47853dc9f4f5 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -72,7 +72,7 @@ . = 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!" . += "*---------*" @@ -89,13 +89,13 @@ M.visible_message("[M] repairs some of \the [src]'s dents.", \ "You repair some of [src]'s dents, leaving [src] at [health]/[maxHealth] health.") else - M.visible_message("[M] repairs some of [p_their()] own dents.", \ + M.visible_message(span_danger("[M] repairs some of [p_their()] own dents."), \ "You repair some of your own dents, leaving you at [M.health]/[M.maxHealth] health.") else if(src != M) to_chat(M, "You cannot repair [src]'s dents, as [p_they()] [p_have()] none!") else - to_chat(M, "You cannot repair your own dents, as you have none!") + to_chat(M, span_cult("You cannot repair your own dents, as you have none!")) else if(src != M) return ..() @@ -113,8 +113,8 @@ mob/living/simple_animal/hostile/construct/attackby(obj/item/W, mob/living/user, params) . = ..() if(istype(W, /obj/item/nullrod)) - visible_message("[src] recoils from the blow!", \ - "As \the [W] hits you, you feel holy power blast through your form, tearing it apart!") + visible_message(span_warning("[src] recoils from the blow!"), \ + span_cult("As \the [W] hits you, you feel holy power blast through your form, tearing it apart!")) adjustBruteLoss(45) /////////////////Juggernaut/////////////// @@ -153,8 +153,8 @@ mob/living/simple_animal/hostile/construct/attackby(obj/item/W, mob/living/user, 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_userdanger("The [P.name] is reflected by your armored shell!")) // Find a turf near or on the original location to bounce to if(P.starting) @@ -380,8 +380,8 @@ mob/living/simple_animal/hostile/construct/attackby(obj/item/W, mob/living/user, 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) diff --git a/code/modules/mob/living/simple_animal/eldritch_demons.dm b/code/modules/mob/living/simple_animal/eldritch_demons.dm index 366890c64d56..a47b239780a9 100644 --- a/code/modules/mob/living/simple_animal/eldritch_demons.dm +++ b/code/modules/mob/living/simple_animal/eldritch_demons.dm @@ -78,7 +78,7 @@ if(linked_mobs[mob_linked]) return FALSE - to_chat(mob_linked, "You feel something new enter your mind, you hear whispers of people far away, screeches of horror and a huming of welcome to [src]'s Mansus Link.") + to_chat(mob_linked, span_notice("You feel something new enter your mind, you hear whispers of people far away, screeches of horror and a huming of welcome to [src]'s Mansus Link.")) var/datum/action/innate/mansus_speech/action = new(src) linked_mobs[mob_linked] = action action.Grant(mob_linked) @@ -92,7 +92,7 @@ var/datum/action/innate/mansus_speech/action = linked_mobs[mob_linked] action.Remove(mob_linked) qdel(action) - to_chat(mob_linked, "You feel something tear out of your mind as the [src]'s Mansus Link leaves your mind.") + to_chat(mob_linked, span_notice("You feel something tear out of your mind as the [src]'s Mansus Link leaves your mind.")) mob_linked.emote("Scream") //micro stun mob_linked.AdjustParalyzed(0.5 SECONDS) diff --git a/code/modules/mob/living/simple_animal/friendly/cheese.dm b/code/modules/mob/living/simple_animal/friendly/cheese.dm index 8d01d62cd50a..c6ec3349fab0 100644 --- a/code/modules/mob/living/simple_animal/friendly/cheese.dm +++ b/code/modules/mob/living/simple_animal/friendly/cheese.dm @@ -44,18 +44,18 @@ ..() return if(L.get_active_held_item()) - to_chat(L, "Your hands are full!") + to_chat(L, span_warning("Your hands are full!")) return - visible_message("[L] starts picking up [src].", \ - "[L] starts picking you up!") + visible_message(span_warning("[L] starts picking up [src]."), \ + span_userdanger("[L] starts picking you up!")) if(!do_after(L, 20, target = src)) return - visible_message("[L] picks up [src]!", \ - "[L] picks you up!") + visible_message(span_warning("[L] picks up [src]!"), \ + span_userdanger("[L] picks you up!")) if(buckled) - to_chat(L, "[src] is buckled to [buckled] and cannot be picked up!") + to_chat(L, span_warning("[src] is buckled to [buckled] and cannot be picked up!")) return - to_chat(L, "You pick [src] up.") + to_chat(L, span_notice("You pick [src] up.")) drop_all_held_items() var/obj/item/clothing/head/mob_holder/cheese/P = new(get_turf(src), src, null, null, null, null, FALSE) L.put_in_hands(P) diff --git a/code/modules/mob/living/simple_animal/friendly/cockroach.dm b/code/modules/mob/living/simple_animal/friendly/cockroach.dm index 15915d76aa1c..cf1a8c3ede29 100644 --- a/code/modules/mob/living/simple_animal/friendly/cockroach.dm +++ b/code/modules/mob/living/simple_animal/friendly/cockroach.dm @@ -39,17 +39,17 @@ var/mob/living/A = AM if(A.mob_size > MOB_SIZE_SMALL && !(A.movement_type & FLYING)) if(prob(squish_chance)) - A.visible_message("[A] squashed [src].", "You squashed [src].") + A.visible_message(span_notice("[A] squashed [src]."), span_notice("You squashed [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 56143ddd4f0a..e5e1347649ac 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -75,11 +75,11 @@ /mob/living/simple_animal/pet/dog/corgi/borgi/emag_act(user as mob) if(!emagged) emagged = TRUE - visible_message("[user] swipes a card through [src].", "You overload [src]s internal reactor.") + visible_message(span_warning("[user] swipes a card through [src]."), span_notice("You overload [src]s internal reactor.")) addtimer(CALLBACK(src, .proc/explode), 1000) /mob/living/simple_animal/pet/dog/corgi/borgi/proc/explode() - visible_message("[src] makes an odd whining noise.") + visible_message(span_warning("[src] makes an odd whining noise.")) explosion(get_turf(src), 0, 1, 4, 7) death() @@ -174,12 +174,12 @@ /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, "You can't shave this corgi, it's already been shaved!") + to_chat(user, span_warning("You can't shave this corgi, it's already been shaved!")) return if (nofur) - to_chat(user, " You can't shave this corgi, it doesn't have a fur coat!") + to_chat(user, span_warning(" You can't shave this corgi, it doesn't have a fur coat!")) return - user.visible_message("[user] starts to shave [src] using \the [O].", "You start to shave [src] using \the [O]...") + user.visible_message("[user] starts to shave [src] using \the [O].", span_notice("You 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].") playsound(loc, 'sound/items/welder2.ogg', 20, 1) @@ -199,7 +199,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)) @@ -218,7 +218,7 @@ update_corgi_fluff() regenerate_icons() else - to_chat(usr, "There is nothing to remove from its [remove_from].") + to_chat(usr, span_danger("There is nothing to remove from its [remove_from].")) return if("back") if(inventory_back) @@ -227,7 +227,7 @@ update_corgi_fluff() regenerate_icons() else - to_chat(usr, "There is nothing to remove from its [remove_from].") + to_chat(usr, span_danger("There is nothing to remove from its [remove_from].")) return if("collar") if(pcollar) @@ -246,7 +246,7 @@ if("collar") var/obj/item/clothing/neck/petcollar/P = usr.get_active_held_item() if(!istype(P)) - to_chat(usr,"That's not a collar.") + to_chat(usr,span_warning("That's not a collar.")) return add_collar(P, usr) update_corgi_fluff() @@ -256,17 +256,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].","You rest your hand on [src]'s back for a moment.") + usr.visible_message("[usr] pets [src].",span_notice("You 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/plastic)) // last thing he ever wears, I guess @@ -279,7 +279,7 @@ allowed = TRUE if(!allowed) - to_chat(usr, "You set [item_to_add] on [src]'s back, but it falls off!") + to_chat(usr, span_warning("You 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) @@ -310,17 +310,17 @@ if(inventory_head) if(user) - to_chat(user, "You can't put more than one hat on [src]!") + to_chat(user, span_warning("You can't put more than one hat on [src]!")) return if(!item_to_add) - user.visible_message("[user] pets [src].","You rest your hand on [src]'s head for a moment.") + user.visible_message("[user] pets [src].",span_notice("You 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 @@ -334,14 +334,14 @@ 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()].") else if(user) user.visible_message("[user] puts [item_to_add] on [real_name]'s head. [src] looks at [user] and barks once.", - "You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags [p_their()] tail once and barks.", - "You hear a friendly-sounding bark.") + span_notice("You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags [p_their()] tail once and barks."), + span_italics("You 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, "You set [item_to_add] on [src]'s head, but it falls off!") + to_chat(user, span_warning("You 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) @@ -538,7 +538,7 @@ ..() for(var/mob/living/simple_animal/pet/P in range(1, src)) if(P != src && prob(5)) - visible_message("[src] devours [P]!", \ + visible_message(span_warning("[src] devours [P]!"), \ "DELICIOUS SOULS") playsound(src, 'sound/magic/demon_attack1.ogg', 75, TRUE) narsie_act() @@ -615,7 +615,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, "You can't fit this on [src]!") + to_chat(usr, span_warning("You can't fit this on [src]!")) return ..() @@ -661,7 +661,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_danger("[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 a65d3e2b2a5f..25cf6195a55c 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 in [A.name]." -#define DRONE_NET_DISCONNECT "DRONE NETWORK: [name] has stopped responding at [A.name]!" +#define DRONE_NET_CONNECT span_notice("DRONE NETWORK: [name] connected in [A.name].") +#define DRONE_NET_DISCONNECT span_notice("DRONE NETWORK: [name] has stopped responding at [A.name]!") #define MAINTDRONE "drone_maint" #define REPAIRDRONE "drone_repair" @@ -203,21 +203,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\".") . += "*---------*" @@ -233,7 +233,7 @@ to_chat(src, "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_userdanger("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 0ffafaeccb42..310edb98ac2e 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 @@ -49,7 +49,7 @@ 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 if(!SSticker.mode) to_chat(user, "Can't become a drone before the game has started.") 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 28a11f4e572b..470f72055597 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, "You can kill and eat other drones to increase your health!" ) + to_chat(src, span_notice("You can kill and eat other drones to increase your health!") ) /mob/living/simple_animal/drone/syndrone/badass name = "Badass Syndrone" @@ -150,7 +150,7 @@ //Cogscarabs being able to be picked up during war /mob/living/simple_animal/drone/cogscarab/attack_hand(mob/user) if(!is_servant_of_ratvar(user)) - to_chat(user, "[src] wriggles out of your hands! You can't pick it up!") + to_chat(user, span_warning("[src] wriggles out of your hands! You can't pick it up!")) return if(!GLOB.ratvar_approaches) return @@ -180,7 +180,7 @@ /mob/living/simple_animal/drone/cogscarab/try_reactivate(mob/living/user) if(!is_servant_of_ratvar(user)) - to_chat(user, "You fiddle around with [src] to no avail.") + to_chat(user, span_warning("You fiddle around with [src] to no avail.")) else ..() 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 518b2f7ac0a0..5945e808c805 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].", "You begin to cannibalize parts from [src]...") + D.visible_message(span_notice("[D] begins to cannibalize parts from [src]."), span_notice("You begin to cannibalize parts from [src]...")) if(do_after(D, 60, 0, target = src)) - D.visible_message("[D] repairs itself using [src]'s remains!", "You repair yourself using [src]'s remains.") + D.visible_message(span_notice("[D] repairs itself using [src]'s remains!"), span_notice("You repair yourself using [src]'s remains.")) D.adjustBruteLoss(-src.maxHealth) new /obj/effect/decal/cleanable/oil/streak(get_turf(src)) qdel(src) else - to_chat(D, "You need to remain still to cannibalize [src]!") + to_chat(D, span_warning("You 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, "Your hands are full!") + to_chat(user, span_warning("Your 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_userdanger("[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_userdanger("[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, "You pick [src] up.") + to_chat(user, span_notice("You 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,38 +64,38 @@ "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, "You can't seem to find the [pick(faux_gadgets)]! Without it, [src] [pick(faux_problems)].") + to_chat(user, span_warning("You can't seem to find the [pick(faux_gadgets)]! Without it, [src] [pick(faux_problems)].")) return - user.visible_message("[user] begins to reactivate [src].", "You begin to reactivate [src]...") + user.visible_message(span_notice("[user] begins to reactivate [src]."), span_notice("You begin to reactivate [src]...")) if(do_after(user, 30, 1, target = src)) revive(full_heal = 1) - user.visible_message("[user] reactivates [src]!", "You reactivate [src].") + user.visible_message(span_notice("[user] reactivates [src]!"), span_notice("You reactivate [src].")) var/turf/A = get_area(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, "You need to remain still to reactivate [src]!") + to_chat(user, span_warning("You 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, "You start to tighten loose screws on [src]...") + to_chat(user, span_notice("You 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!", "You 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("You tighten [src == user ? "your" : "[src]'s"] loose screws.")) else - to_chat(user, "You need to remain still to tighten [src]'s screws!") + to_chat(user, span_warning("You 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]...", \ - "You press down on [src]'s factory reset control...") + user.visible_message(span_notice("[user] starts resetting [src]..."), \ + span_notice("You press down on [src]'s factory reset control...")) if(I.use_tool(src, user, 50, volume=50)) - user.visible_message("[user] resets [src]!", \ - "You reset [src]'s directives to factory defaults!") + user.visible_message(span_notice("[user] resets [src]!"), \ + span_notice("You reset [src]'s directives to factory defaults!")) update_drone_hack(FALSE) return else @@ -123,9 +123,9 @@ to_chat(src, "From now on, these are your laws:") laws = "1. Purge all untruths and honor Ratvar." else - visible_message("[src]'s display glows a vicious red!", \ - "ERROR: LAW OVERRIDE DETECTED") - to_chat(src, "From now on, these are your laws:") + visible_message(span_warning("[src]'s display glows a vicious red!"), \ + span_userdanger("ERROR: LAW OVERRIDE DETECTED")) + to_chat(src, span_boldannounce("From now on, these are your laws:")) laws = \ "1. You must always involve yourself 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"+\ @@ -141,7 +141,7 @@ 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 your laws:") laws = initial(laws) 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 6e89f045da0c..5f880e1d3d23 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, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!") + to_chat(src, span_danger("You 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/say.dm b/code/modules/mob/living/simple_animal/friendly/drone/say.dm index 5ad05fbfeee2..6714812062a9 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/say.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/say.dm @@ -3,7 +3,7 @@ if (dead_can_hear && source) for (var/mob/M in GLOB.dead_mob_list) var/link = FOLLOW_LINK(M, source) - to_chat(M, "[link] [msg]") + to_chat(M, span_dronesay("[link] [msg]")) for(var/i in GLOB.drones_list) var/mob/living/simple_animal/drone/D = i if(istype(D) && D.stat != DEAD) 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 29fe08c6d7c4..35c4a659de58 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm @@ -36,14 +36,14 @@ 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) /mob/living/simple_animal/drone/verb/cmd_robot_alerts() set category = "Drone" set name = "Show Alerts" if(usr.stat == DEAD) - to_chat(src, "Alert: You are dead.") + to_chat(src, span_userdanger("Alert: You are dead.")) return //won't work if dead robot_alerts() 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 2acb53e0209a..9182b552d610 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -51,7 +51,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() @@ -64,7 +64,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/Move() . = ..() @@ -98,13 +98,13 @@ . = ..() if(. && isliving(target)) var/mob/living/L = target - L.visible_message("[src] rams [L]!") + L.visible_message(span_warning("[src] rams [L]!")) if(. && ishuman(target)) 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_userdanger("[src] takes a big chomp out of your [NB]!")) NB.dismember() /mob/living/simple_animal/hostile/retaliate/goat/pete @@ -164,9 +164,9 @@ /mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M) if(!stat && M.a_intent == INTENT_DISARM && icon_state != icon_dead) - M.visible_message("[M] tips over [src].", - "You tip over [src].") - to_chat(src, "You are tipped over by [M]!") + M.visible_message(span_warning("[M] tips over [src]."), + span_notice("You tip over [src].")) + to_chat(src, span_userdanger("You are tipped over by [M]!")) Paralyze(60, ignore_canstun = TRUE) icon_state = icon_dead spawn(rand(20,50)) @@ -183,8 +183,8 @@ if(4) external = "[src] seems resigned to its fate." internal = "You resign yourself to your fate." - visible_message("[external]", - "[internal]") + visible_message(span_notice("[external]"), + span_revennotice("[internal]")) else ..() @@ -305,7 +305,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 ..() @@ -314,7 +314,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) @@ -389,14 +389,14 @@ /mob/living/simple_animal/sheep/attackby(obj/item/O, mob/user, params) if (istype(O, /obj/item/razor)) if(shaved) - to_chat(user, "The sheep doesn't have enough wool, try again later...") + to_chat(user, span_warning("The sheep doesn't have enough wool, try again later...")) return - user.visible_message("[user] starts to shave [src] using \the [O].", "You start to shave [src] using \the [O]...") + user.visible_message("[user] starts to shave [src] using \the [O].", span_notice("You start to shave [src] using \the [O]...")) if(do_after(user, 50, target = src)) if(shaved) user.visible_message("[src] has already been shaved!") return - user.visible_message("[user] shaves some wool off [src] using \the [O].", "You shave some wool off [src] using \the [O].") + user.visible_message("[user] shaves some wool off [src] using \the [O].", span_notice("You shave some wool off [src] using \the [O].")) playsound(loc, 'sound/items/welder2.ogg', 20, 1) shaved = TRUE icon_living = "sheep_sheared" @@ -446,13 +446,13 @@ /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_danger("[O] is full.")) return var/transfered = reagents.trans_to(O, rand(5,10)) if(transfered) - user.visible_message("[user] milks [src] using \the [O].", "You milk [src] using \the [O].") + user.visible_message("[user] milks [src] using \the [O].", span_notice("You milk [src] using \the [O].")) else - to_chat(user, "The udder is dry. Wait a bit longer...") + to_chat(user, span_danger("The udder is dry. Wait a bit longer...")) //spawner /obj/effect/spawner/lootdrop/mob diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index ee83f486775f..44f70e47e0a2 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -33,7 +33,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.", "You consume [target] in a single gulp!") + visible_message("[name] consumes [target] in a single gulp.", span_notice("You 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 c5b3b13e1353..256b7937f49b 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -88,7 +88,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0) 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() @@ -98,13 +98,13 @@ GLOBAL_VAR_INIT(mouse_killed, 0) 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/effects/sparks2.ogg', 100, 1) C.deconstruct() death(toast=1) else C.deconstruct() - visible_message("[src] chews through the [C].") + visible_message(span_warning("[src] chews through the [C].")) /mob/living/simple_animal/mouse/Move() . = ..() @@ -125,14 +125,14 @@ GLOBAL_VAR_INIT(mouse_killed, 0) var/obj/item/reagent_containers/food/snacks/cheesewedge/CW = locate(/obj/item/reagent_containers/food/snacks/cheesewedge) in loc if(!QDELETED(CW) && full == FALSE) say("Burp!") - visible_message("[src] gobbles up the [CW].") + visible_message(span_warning("[src] gobbles up the [CW].")) qdel(CW) full = TRUE addtimer(VARSET_CALLBACK(src, full, FALSE), 3 MINUTES) /mob/living/simple_animal/mouse/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/reagent_containers/food/snacks/cheesewedge)) - to_chat(user, "You feed [O] to [src].") + to_chat(user, span_notice("You feed [O] to [src].")) visible_message("[src] squeaks happily!") qdel(O) else @@ -155,13 +155,13 @@ GLOBAL_VAR_INIT(mouse_killed, 0) eating = TRUE layer = MOB_LAYER - visible_message("[src] starts eating away [A]...", - "You start eating the [A]...") + visible_message(span_danger("[src] starts eating away [A]..."), + span_notice("You start eating the [A]...")) if(do_after(src, 30, FALSE, A)) if(QDELETED(A)) return - visible_message("[src] finishes eating up [A]!", - "You finish up eating [A].") + visible_message(span_danger("[src] finishes eating up [A]!"), + span_notice("You finish up eating [A].")) A.mouse_eat(src) playsound(A.loc,'sound/effects/mousesqueek.ogg', 100) // i have no idea how loud this is, 100 seems to be used for the squeak component GLOB.mouse_food_eaten++ @@ -201,7 +201,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0) add_movespeed_modifier(MOVESPEED_ID_MOUSE_CHEESE, TRUE, 100, multiplicative_slowdown = -1) maxHealth = 30 health = maxHealth - to_chat(src, "You ate cheese! You are now stronger, bigger and faster!") + to_chat(src, span_userdanger("You ate cheese! You are now stronger, bigger and faster!")) addtimer(CALLBACK(src, .proc/cheese_down), 3 MINUTES) /mob/living/simple_animal/mouse/proc/cheese_down() @@ -211,7 +211,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0) resize = 0.5 update_transform() remove_movespeed_modifier(MOVESPEED_ID_MOUSE_CHEESE, TRUE) - to_chat(src, "A feeling of sadness comes over you as the effects of the cheese wears off. You. Must. Get. More.") + to_chat(src, span_userdanger("A feeling of sadness comes over you as the effects of the cheese wears off. You. Must. Get. More.")) /atom/proc/mouse_eat(mob/living/simple_animal/mouse/M) M.regen_health() @@ -279,10 +279,10 @@ GLOBAL_VAR_INIT(mouse_killed, 0) if(I.is_sharp() && user.a_intent == INTENT_HARM) if(isturf(loc)) new /obj/item/reagent_containers/food/snacks/meat/slab/mouse(loc) - to_chat(user, "You butcher [src].") + to_chat(user, span_notice("You butcher [src].")) qdel(src) else - to_chat(user, "You need to put [src] on a surface to butcher it!") + to_chat(user, span_warning("You need to put [src] on a surface to butcher it!")) 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 660025808722..9e0d7236a359 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, "You put the [P] around [src]'s neck.") + to_chat(user, span_notice("You put the [P] around [src]'s neck.")) if(P.tagname && !unique_pet) fully_replace_character_name(null, "\proper [P.tagname]") diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/friendly/snake.dm index 2fbbc9ab99c2..a1f38241f323 100644 --- a/code/modules/mob/living/simple_animal/friendly/snake.dm +++ b/code/modules/mob/living/simple_animal/friendly/snake.dm @@ -55,7 +55,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!", "You consume [target] in a single gulp!") + visible_message(span_notice("[name] consumes [target] in a single gulp!"), span_notice("You 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 9bf7e64c255d..72b13112be53 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -48,9 +48,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/toggle_button_type = /obj/screen/guardian/ToggleMode/Inactive //what sort of toggle button the hud uses var/datum/guardianname/namedatum = new/datum/guardianname() var/playstyle_string = "You are a standard Guardian. You shouldn't exist!" - var/magic_fluff_string = "You 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/magic_fluff_string = span_holoparasite("You 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 @@ -122,8 +122,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians to_chat(src, "For some reason, somehow, you have no summoner. Please report this bug immediately.") return to_chat(src, "You are [real_name], bound to serve [summoner.real_name].") - to_chat(src, "You are capable of manifesting or recalling to your master with the buttons on your 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 yourself.") + to_chat(src, span_holoparasite("You are capable of manifesting or recalling to your master with the buttons on your 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 yourself.")) to_chat(src, playstyle_string) /mob/living/simple_animal/hostile/guardian/Life() //Dies if the summoner dies @@ -134,7 +134,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(!QDELETED(summoner)) if(summoner.stat == DEAD) forceMove(summoner.loc) - to_chat(src, "Your summoner has died!") + to_chat(src, span_danger("Your 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]!") for(var/obj/item/W in summoner) @@ -144,7 +144,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians death(TRUE) qdel(src) else - to_chat(src, "Your summoner has died!") + to_chat(src, span_danger("Your summoner has died!")) visible_message("[src] dies along with its user!") death(TRUE) qdel(src) @@ -171,8 +171,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, "You 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("You 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 @@ -339,10 +339,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, "You activate your light.") + to_chat(src, span_notice("You activate your light.")) set_light(3) else - to_chat(src, "You deactivate your light.") + to_chat(src, span_notice("You deactivate your light.")) set_light(0) /mob/living/simple_animal/hostile/guardian/verb/ShowType() @@ -422,7 +422,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/list/mob/dead/observer/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/dead/observer/C = pick(candidates) - to_chat(G, "Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.") + to_chat(G, span_holoparasite("Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.")) to_chat(src, "Your [G.real_name] has been successfully reset.") message_admins("[key_name_admin(C)] has taken control of ([ADMIN_LOOKUPFLW(G)])") G.ghostize(0) @@ -440,7 +440,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians 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.") else - to_chat(src, "You decide not to reset [guardians.len > 1 ? "any of your guardians":"your guardian"].") + to_chat(src, span_holoparasite("You decide not to reset [guardians.len > 1 ? "any of your guardians":"your guardian"].")) else remove_verb(src, /mob/living/proc/guardian_reset) @@ -467,8 +467,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/used = FALSE var/theme = "magic" var/mob_name = "Guardian Spirit" - var/use_message = "You shuffle the deck..." - var/used_message = "All the cards seem to be blank now." + var/use_message = span_holoparasite("You shuffle the deck...") + var/used_message = span_holoparasite("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/list/possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support", "Gravitokinetic") @@ -479,11 +479,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, "You already have a [mob_name]!") + to_chat(user, span_holoparasite("You already have a [mob_name]!")) return if(user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling) && !allowling) to_chat(user, "[ling_failure]") @@ -551,7 +551,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/list/guardians = user.hasparasites() if(guardians.len && !allowmultiple) - to_chat(user, "You already have a [mob_name]!" ) + to_chat(user, span_holoparasite("You already have a [mob_name]!") ) used = FALSE return var/mob/living/simple_animal/hostile/guardian/G = new pickedtype(user, theme) @@ -592,8 +592,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians icon_state = "combat_hypo" theme = "tech" mob_name = "Holoparasite" - use_message = "You start to power on the injector..." - used_message = "The injector has already been used." + use_message = span_holoparasite("You start to power on the injector...") + used_message = span_holoparasite("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." @@ -677,8 +677,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians icon_state = "fishfingers" theme = "carp" mob_name = "Holocarp" - use_message = "You put the fishsticks in your mouth..." - used_message = "Someone's already taken a bite out of these fishsticks! Ew." + use_message = span_holoparasite("You put the fishsticks in your mouth...") + used_message = span_holoparasite("Someone's already taken a bite out of these fishsticks! Ew.") failure_message = "You 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." allowmultiple = 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 84f170a2936d..832e32aeec8a 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm @@ -6,9 +6,9 @@ attack_sound = 'sound/weapons/bladeslice.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." + 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 = /obj/screen/guardian/ToggleMode/Assassin var/toggle = FALSE @@ -57,7 +57,7 @@ if(!forced) to_chat(src, "You 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 c7b28d70a25d..cd594a1a0816 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/charger.dm @@ -8,9 +8,9 @@ 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..." + 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/obj/screen/alert/chargealert @@ -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_userdanger("[src] slams into you!")) L.apply_damage(20, BRUTE) playsound(get_turf(L), 'sound/effects/meteorimpact.ogg', 100, 1) 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 07d1eae5794b..8ce6628b55e8 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm @@ -4,9 +4,9 @@ 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." + 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, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!") + to_chat(src, span_danger("You 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 082d223b403a..93f51f003d20 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm @@ -5,9 +5,9 @@ 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." + 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 /mob/living/simple_animal/hostile/guardian/bomb/get_status_tab_items() 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 7a469dd12c31..a24aadda1a16 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/fire.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/fire.dm @@ -8,9 +8,9 @@ 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." + 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 b0f8499a3e73..416398f2b563 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm @@ -4,9 +4,9 @@ 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?" + 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 @@ -15,15 +15,15 @@ if(isliving(target) && target != src) to_chat(src, "Your punch has applied heavy gravity to [target]!") add_gravity(target, 2) - to_chat(target, "Everything feels really heavy!") + to_chat(target, span_userdanger("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, "You cannot add gravity to space!") + to_chat(src, span_warning("You cannot add gravity to space!")) return - visible_message("[src] slams their fist into the [T]!", "You modify the gravity of the [T].") + visible_message(span_danger("[src] slams their fist into the [T]!"), span_notice("You 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 78682b7145a5..627a0cdf1737 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/lightning.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/lightning.dm @@ -12,9 +12,9 @@ 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." + 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 @@ -113,9 +113,9 @@ if(C) C.jitteriness = max(C.jitteriness - 990, 10) L.visible_message( - "[L] was shocked by the lightning chain!", \ - "You are shocked by the lightning chain!", \ - "You hear a heavy electrical crack." \ + span_danger("[L] was shocked by the lightning chain!"), \ + span_userdanger("You are shocked by the lightning chain!"), \ + span_italics("You 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 f736d7784fc8..03f2fc9f23ed 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/protector.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/protector.dm @@ -5,9 +5,9 @@ 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." + 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 = /obj/screen/guardian/ToggleMode var/toggle = FALSE @@ -19,7 +19,7 @@ if(QDELETED(src)) return 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) . = ..() @@ -59,12 +59,12 @@ return else if(istype(summoner.loc, /obj/effect)) - to_chat(src, "You 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("You 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, "You 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.") + 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 8bd9e70c8db8..ff6de9399033 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm @@ -18,9 +18,9 @@ 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." + 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 = /obj/screen/guardian/ToggleMode @@ -79,7 +79,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 4edd9d9e416a..4ab5d93d1ec4 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/standard.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/standard.dm @@ -6,9 +6,9 @@ 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." + 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 87d4f01cba4f..bfb91d06ccf7 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/support.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/support.dm @@ -7,9 +7,9 @@ melee_damage_lower = 15 melee_damage_upper = 15 playstyle_string = "As a support type, you may toggle your basic attacks to a healing mode. In addition, Alt-Clicking on an adjacent object or mob will warp them to your 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." + 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 = /obj/screen/guardian/ToggleMode var/obj/structure/receiving_pad/beacon var/beacon_cooldown = 0 @@ -74,7 +74,7 @@ var/turf/beacon_loc = get_turf(src.loc) if(!isfloorturf(beacon_loc)) - to_chat(src, "Your beacon can only be placed on solid flooring!") + to_chat(src, span_danger("Your beacon can only be placed on solid flooring!")) return if(beacon) @@ -128,8 +128,8 @@ return to_chat(src, "You begin to warp [A].") - A.visible_message("[A] starts to glow faintly!", \ - "You start to faintly glow, and you feel strangely weightless!") + A.visible_message(span_danger("[A] starts to glow faintly!"), \ + span_userdanger("You start to faintly glow, and you feel strangely weightless!")) do_attack_animation(A) if(!do_mob(src, A, 60)) //now start the channel @@ -140,7 +140,7 @@ if(isliving(A)) var/mob/living/L = A L.flash_act() - A.visible_message("[A] disappears in a flash of light!", \ - "Your vision is obscured by a flash of light!") + A.visible_message(span_danger("[A] disappears in a flash of light!"), \ + span_userdanger("Your 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 0ff8cff17cae..7465f0b193f6 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 @@ -176,5 +176,5 @@ if(istype(target, /obj/effect/decal/cleanable)) visible_message("[src] cleans up \the [target].") else - 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 d0271db35288..4cdf4066ac4e 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, "You 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("You strap the armor plating to [A] and sharpen [A.p_their()] claws with the nail filer. This was a great idea.")) qdel(src) diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 40c9369d7305..bb8dc2466493 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -89,7 +89,7 @@ . = ..() if(!beehome) - . += "This bee is homeless AND ANGRY!" + . += span_warning("This bee is homeless AND ANGRY!") /mob/living/simple_animal/hostile/poison/bees/proc/generate_bee_visuals() @@ -281,18 +281,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!","You 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!"),"You inject [src] with royal bee jelly, causing it to split into two bees, MORE BEES!") else - to_chat(user, "You don't have enough royal bee jelly to split a bee in two!") + to_chat(user, span_warning("You 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!","You 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("You inject [src]'s genome with [R.name], mutating its DNA!")) name = queen.name else - to_chat(user, "You don't have enough units of that chemical to modify the bee's DNA!") + to_chat(user, span_warning("You 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 ef156c0433c1..a570c2b6eab9 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm @@ -115,7 +115,7 @@ qdel(c) for(var/mob/living/carbon/L in range(5,src)) L.apply_damage(40) - to_chat(L, "The damaged clone showers you with paper cuts!") + to_chat(L, span_userdanger("The damaged clone showers you with paper cuts!")) qdel(src) else . = ..() @@ -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/magic/mandswap.ogg', 50, 1, 1) playsound(get_turf(src),'sound/hallucinations/wail.ogg', 50, 1, 1) 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 a9e167c6e609..a0cd4189197e 100644 --- a/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm +++ b/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm @@ -37,7 +37,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!", "You sever [L]'s tail in one swift swipe.") + visible_message("[src] severs [L]'s tail in one swift swipe!", span_notice("You 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 3cb89907090c..db0edbc02c82 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!") \ No newline at end of file + C.visible_message(span_danger("\The [src] knocks down \the [C]!"), \ + span_userdanger("\The [src] knocks you down!")) \ No newline at end of file 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 654ce97c660b..710aa2c1c5a4 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -72,7 +72,7 @@ /mob/living/simple_animal/hostile/poison/giant_spider/Login() ..() if(directive) - to_chat(src, "Your mother left you a directive! Follow it at all costs.") + to_chat(src, span_spider("Your mother left you a directive! Follow it at all costs.")) to_chat(src, "[directive]") if(mind) mind.store_memory("[directive]") @@ -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_notice("Someone else already took this spider.")) return 1 key = user.key return 1 @@ -306,19 +306,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, "You can't wrap yourself!") + to_chat(src, span_warning("You can't wrap yourself!")) return if(istype(cocoon_target, /mob/living/simple_animal/hostile/poison/giant_spider)) - to_chat(src, "You can't wrap other spiders!") + to_chat(src, span_warning("You can't wrap other spiders!")) return if(!Adjacent(cocoon_target)) - to_chat(src, "You can't reach [cocoon_target]!") + to_chat(src, span_warning("You 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].","You begin wrapping [cocoon_target] into a cocoon.") + visible_message(span_notice("[src] begins to secrete a sticky substance around [cocoon_target]."),span_notice("You begin wrapping [cocoon_target] into a cocoon.")) stop_automated_movement = TRUE walk(src,0) if(do_after(src, 50, target = cocoon_target)) @@ -331,10 +331,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.","You 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("You 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 your hunger!") + to_chat(src, span_warning("[L] cannot sate your hunger!")) cocoon_target.forceMove(C) if(cocoon_target.density || ismob(cocoon_target)) @@ -364,12 +364,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.","You begin to lay a web.") + S.visible_message(span_notice("[S] begins to secrete a sticky substance."),span_notice("You 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) @@ -377,7 +377,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" @@ -408,7 +408,7 @@ /obj/effect/proc_holder/wrap/proc/activate(mob/living/user) var/message if(active) - message = "You no longer prepare to wrap something in a cocoon." + message = span_notice("You no longer prepare to wrap something in a cocoon.") remove_ranged_ability(message) else message = "You prepare to wrap something in a cocoon. Left-click your target to start wrapping!" @@ -458,12 +458,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, "You are too hungry to do this!") + to_chat(S, span_warning("You 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.","You begin to lay a cluster of eggs.") + S.visible_message(span_notice("[S] begins to lay a cluster of eggs."),span_notice("You 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) diff --git a/code/modules/mob/living/simple_animal/hostile/glockroach.dm b/code/modules/mob/living/simple_animal/hostile/glockroach.dm index 9f28e6c32229..0fca0745c172 100644 --- a/code/modules/mob/living/simple_animal/hostile/glockroach.dm +++ b/code/modules/mob/living/simple_animal/hostile/glockroach.dm @@ -49,17 +49,17 @@ var/mob/living/A = AM if(A.mob_size > MOB_SIZE_SMALL && !(A.movement_type & FLYING)) if(prob(squish_chance)) - A.visible_message("[A] squashed [src].", "You squashed [src].") + A.visible_message(span_notice("[A] squashed [src]."), span_notice("You squashed [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/hostile/glockroach/ex_act() //Explosions are a terrible way to handle a cockroach. return diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm index 153d8fdcc50c..2f23b333eb4a 100644 --- a/code/modules/mob/living/simple_animal/hostile/goose.dm +++ b/code/modules/mob/living/simple_animal/hostile/goose.dm @@ -65,7 +65,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) . = ..() @@ -74,16 +74,16 @@ /mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/feed(obj/item/reagent_containers/food/tasty) if (contents.len > GOOSE_SATIATED) - visible_message("[src] looks too full to eat \the [tasty]!") + visible_message(span_notice("[src] looks too full to eat \the [tasty]!")) 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/items/eatfood.ogg', 70, 1) vomitCoefficient += 3 vomitTimeBonus += 2 else - visible_message("[src] refuses to eat \the [tasty].") + visible_message(span_notice("[src] refuses to eat \the [tasty].")) /mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/vomit() var/turf/T = get_turf(src) 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 2673d6d50514..9423b7b05eed 100644 --- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm +++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm @@ -72,7 +72,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) @@ -98,7 +98,7 @@ ..() /mob/living/simple_animal/hostile/gorilla/can_use_guns(obj/item/G) - to_chat(src, "Your meaty finger is much too large for the trigger guard!") + to_chat(src, span_warning("Your 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 55f5078b13a5..59fe705c1abb 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_userdanger("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_userdanger("With our egg laid, our death approaches rapidly...")) addtimer(CALLBACK(src, .proc/death), 100) /obj/item/organ/body_egg/changeling_egg 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 e60369bb8288..bc1c106f2c99 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 7737f7f47d6c..770856b6a8bb 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 @@ -66,21 +66,21 @@ Difficulty: Medium name = "Dash To Target" icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "sniper_zoom" - chosen_message = "You are now dashing to your target." + chosen_message = span_colossus("You 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 = "You are now shooting your kinetic accelerator." + chosen_message = span_colossus("You 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 = "You are now transforming your weapon." + chosen_message = span_colossus("You 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]!", - "You butcher [L], restoring your health!") + visible_message(span_danger("[src] butchers [L]!"), + span_userdanger("You 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 3c823558fa25..9fd814199965 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -81,28 +81,28 @@ Difficulty: Hard name = "Triple Charge" icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "sniper_zoom" - chosen_message = "You are now triple charging at the target you click on." + chosen_message = span_colossus("You 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 = "You are now charging with hallucinations at the target you click on." + chosen_message = span_colossus("You 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 = "You are now surrounding the target you click on with hallucinations." + chosen_message = span_colossus("You 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 = "You are now warping to blood around your clicked position." + chosen_message = span_colossus("You are now warping to blood around your clicked position.") chosen_attack_num = 4 /mob/living/simple_animal/hostile/megafauna/bubblegum/death(gibbed, var/list/force_grant) @@ -255,7 +255,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_userdanger("[src] rends you!")) playsound(T, attack_sound, 100, 1, -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, "melee", null, null, armour_penetration)) @@ -272,7 +272,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_userdanger("[src] drags you through the blood!")) playsound(T, 'sound/magic/enter_blood.ogg', 100, 1, -1) var/turf/targetturf = get_step(src, dir) L.forceMove(targetturf) @@ -309,11 +309,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/magic/enter_blood.ogg', 100, 1, -1) forceMove(get_turf(found_bloodpool)) playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1) - visible_message("And springs back out!") + visible_message(span_danger("And springs back out!")) blood_enrage() return TRUE return FALSE @@ -431,7 +431,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/bullet_act(obj/item/projectile/P) if(BUBBLEGUM_IS_ENRAGED) - visible_message("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons while enraged!", "You deflect the projectile!") + visible_message(span_danger("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons while enraged!"), span_userdanger("You deflect the projectile!")) playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 300, 1) return BULLET_ACT_BLOCK return ..() @@ -482,7 +482,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_userdanger("[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/effects/meteorimpact.ogg', 100, 1) 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 bd255eeed4e0..8208340505c3 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -59,28 +59,28 @@ Difficulty: Very Hard name = "Spiral Shots" icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "sniper_zoom" - chosen_message = "You are now firing in a spiral." + chosen_message = span_colossus("You 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 = "You are now firing in all directions." + chosen_message = span_colossus("You 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 = "You are now firing shotgun shots where you aim." + chosen_message = span_colossus("You 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 = "You are now firing in alternating cardinal directions." + chosen_message = span_colossus("You are now firing in alternating cardinal directions.") chosen_attack_num = 4 /mob/living/simple_animal/hostile/megafauna/colossus/OpenFire() @@ -220,7 +220,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 @@ -301,7 +301,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/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm index 8b0963c8fbd5..03e609ea8c37 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm @@ -50,21 +50,21 @@ Difficulty: Extremely Hard name = "Fire Frost Orbs" icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "sniper_zoom" - chosen_message = "You are now sending out frost orbs to track in on a target." + chosen_message = span_colossus("You are now sending out frost orbs to track in on a target.") chosen_attack_num = 1 /datum/action/innate/megafauna_attack/snowball_machine_gun name = "Fire Snowball Machine Gun" icon_icon = 'icons/obj/guns/energy.dmi' button_icon_state = "kineticgun" - chosen_message = "You are now firing a snowball machine gun at a target." + chosen_message = span_colossus("You are now firing a snowball machine gun at a target.") chosen_attack_num = 2 /datum/action/innate/megafauna_attack/ice_shotgun name = "Fire Ice Shotgun" icon_icon = 'icons/obj/guns/projectile.dmi' button_icon_state = "shotgun" - chosen_message = "You are now firing shotgun ice blasts." + chosen_message = span_colossus("You are now firing shotgun ice blasts.") chosen_attack_num = 3 /mob/living/simple_animal/hostile/megafauna/demonic_frost_miner/OpenFire() @@ -142,7 +142,7 @@ Difficulty: Extremely Hard /mob/living/simple_animal/hostile/megafauna/demonic_frost_miner/ex_act(severity, target) adjustBruteLoss(30 * severity - 120) - visible_message("[src] absorbs the explosion!", "You absorb the explosion!") + visible_message(span_danger("[src] absorbs the explosion!"), span_userdanger("You absorb the explosion!")) return /mob/living/simple_animal/hostile/megafauna/demonic_frost_miner/Goto(target, delay, minimum_distance) @@ -323,7 +323,7 @@ Difficulty: Extremely Hard /datum/status_effect/ice_block_talisman/on_apply() RegisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE, .proc/owner_moved) if(!owner.stat) - to_chat(owner, "You become frozen in a cube!") + to_chat(owner, span_userdanger("You become frozen in a cube!")) cube = icon('icons/effects/freeze.dmi', "ice_cube") var/icon/size_check = icon(owner.icon, owner.icon_state) cube.Scale(size_check.Width(), size_check.Height()) @@ -335,6 +335,6 @@ Difficulty: Extremely Hard /datum/status_effect/ice_block_talisman/on_remove() if(!owner.stat) - to_chat(owner, "The cube melts!") + to_chat(owner, span_notice("The cube melts!")) owner.cut_overlay(cube) UnregisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE) \ No newline at end of file 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 ebc1f7a6e9e7..8c800d24fab8 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -73,28 +73,28 @@ Difficulty: Medium name = "Fire Cone" icon_icon = 'icons/obj/wizard.dmi' button_icon_state = "fireball" - chosen_message = "You are now shooting fire at your target." + chosen_message = span_colossus("You 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 = "You are now shooting fire at your target and raining fire around you." + chosen_message = span_colossus("You 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 = "You are now shooting mass fire at your target." + chosen_message = span_colossus("You 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 = "You are now swooping and raining lava at your target." + chosen_message = span_colossus("You are now swooping and raining lava at your target.") chosen_attack_num = 4 /mob/living/simple_animal/hostile/megafauna/dragon/OpenFire() @@ -133,7 +133,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) @@ -141,7 +141,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/dragon/proc/lava_pools(var/amount, var/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 @@ -179,7 +179,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) @@ -224,7 +224,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 @@ -278,7 +278,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_userdanger("You're hit by [source]'s fire breath!")) // deals damage to mechs for(var/obj/mecha/M in T.contents) @@ -299,7 +299,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 @@ -357,7 +357,7 @@ Difficulty: Medium playsound(loc, 'sound/effects/meteorimpact.ogg', 200, 1) 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) @@ -367,7 +367,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, "melee", 1) @@ -450,7 +450,7 @@ Difficulty: Medium if(istype(L, /mob/living/simple_animal/hostile/megafauna/dragon)) continue L.adjustFireLoss(10) - to_chat(L, "You fall directly into the pool of lava!") + to_chat(L, span_userdanger("You fall directly into the pool of lava!")) // deals damage to mechs for(var/obj/mecha/M in T.contents) @@ -574,7 +574,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_userdanger("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 @@ -599,7 +599,7 @@ obj/effect/temp_visual/fireball if(!istype(A)) return if(player_cooldown >= world.time) - to_chat(src, "You need to wait [(player_cooldown - world.time) / 10] seconds before swooping again!") + to_chat(src, span_warning("You 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 ae33e342b412..8bdd8bfbb17e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -90,28 +90,28 @@ Difficulty: Hard name = "Blink To Target" icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "sniper_zoom" - chosen_message = "You are now blinking to your target." + chosen_message = span_colossus("You are now blinking to your 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 = "You are firing a chaser swarm at your target." + chosen_message = span_colossus("You are firing a chaser swarm at your 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 = "You are now firing cross blasts at your target." + chosen_message = span_colossus("You are now firing cross blasts at your 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 = "You are now repeatedly blinking at your target." + chosen_message = span_colossus("You are now repeatedly blinking at your target.") chosen_attack_num = 4 /mob/living/simple_animal/hostile/megafauna/hierophant/OpenFire() @@ -197,7 +197,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/hierophant/proc/blink_spam(var/blink_counter, var/target_slowness, var/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) @@ -218,7 +218,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/hierophant/proc/cross_blast_spam(var/blink_counter, var/target_slowness, var/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) @@ -238,7 +238,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/hierophant/proc/chaser_swarm(var/blink_counter, var/target_slowness, var/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) @@ -390,9 +390,9 @@ Difficulty: Hard 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) @@ -403,7 +403,7 @@ Difficulty: Hard D.adjust_money(maxHealth * MEGAFAUNA_CASH_SCALE) 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(span_hierophant("\"Mrmxmexmrk wipj-hiwxvygx wiuyirgi...\"")) visible_message("[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 @@ -420,7 +420,7 @@ Difficulty: Hard if(!L.dropItemToGround(W)) qdel(W) visible_message("\"[pick(kill_phrases)]\"") - visible_message("[src] annihilates [L]!","You annihilate [L], restoring your health!") + visible_message("[src] annihilates [L]!",span_userdanger("You annihilate [L], restoring your health!")) adjustHealth(-L.maxHealth*0.5) L.dust() @@ -675,7 +675,7 @@ Difficulty: Hard if(L.client) flash_color(L.client, "#660099", 1) playsound(L,'sound/weapons/sear.ogg', 50, 1, -4) - to_chat(L, "You're struck by a [name]!") + to_chat(L, span_userdanger("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, "melee", "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) @@ -696,7 +696,7 @@ Difficulty: Hard if(M.occupant) if(friendly_fire_check && caster && caster.faction_check_mob(M.occupant)) continue - to_chat(M.occupant, "Your [M.name] is struck by a [name]!") + to_chat(M.occupant, span_userdanger("Your [M.name] is struck by a [name]!")) playsound(M,'sound/weapons/sear.ogg', 50, 1, -4) M.take_damage(damage, BURN, 0, 0) @@ -718,7 +718,7 @@ Difficulty: Hard if(H.timer > world.time) return if(H.beacon == src) - to_chat(user, "You start removing your hierophant beacon...") + to_chat(user, span_notice("You start removing your hierophant beacon...")) H.timer = world.time + 51 INVOKE_ASYNC(H, /obj/item/hierophant_club.proc/prepare_icon_update) if(do_after(user, 50, target = src)) 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 498eadfcb2a6..e2aecf800b47 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -55,14 +55,14 @@ Difficulty: Medium name = "Create Legion Skull" icon_icon = 'icons/mob/lavaland/lavaland_monsters.dmi' button_icon_state = "legion_head" - chosen_message = "You are now creating legion skulls." + chosen_message = span_colossus("You 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 = "You are now charging at your target." + chosen_message = span_colossus("You are now charging at your target.") chosen_attack_num = 2 /mob/living/simple_animal/hostile/megafauna/legion/OpenFire(the_target) @@ -158,7 +158,7 @@ Difficulty: Medium L.GiveTarget(target) - visible_message("[src] splits in twain!") + visible_message(span_boldannounce("[src] splits in twain!")) else var/last_legion = TRUE for(var/mob/living/simple_animal/hostile/megafauna/legion/other in GLOB.mob_living_list) @@ -202,23 +202,23 @@ Difficulty: Medium /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 = SSweather.get_weather(user_turf.z, user_area) 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!", \ - "You 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("You hold [src] skyward, dispelling the storm!")) playsound(user, 'sound/magic/staff_change.ogg', 200, 0) A.wind_down() log_game("[user] ([key_name(user)]) has dispelled a storm at [AREACOORD(user_turf)]") @@ -232,8 +232,8 @@ Difficulty: Medium A.telegraph_duration = 100 A.end_duration = 100 - user.visible_message("[user] holds [src] skywards as red lightning crackles into the sky!", \ - "You 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("You hold [src] skyward, calling down a terrible storm!")) playsound(user, 'sound/magic/staff_change.ogg', 200, 0) 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 09f8c3530673..42065fea7d2c 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]!", - "You feast on [L], restoring your health!") + span_danger("[src] devours [L]!"), + span_userdanger("You 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/megafauna/stalwart.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/stalwart.dm index a96e1c9c71db..6f96b1e07652 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/stalwart.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/stalwart.dm @@ -74,7 +74,7 @@ bombsaway(E) /mob/living/simple_animal/hostile/megafauna/stalwart/proc/backup() - visible_message("[src] constructs a flock of mini mechanoid!") + visible_message(span_danger("[src] constructs a flock of mini mechanoid!")) for(var/turf/open/H in range(src, 2)) if(prob(25)) new /mob/living/simple_animal/hostile/asteroid/hivelordbrood/staldrone(H.loc) @@ -173,5 +173,5 @@ color = "#6CA4E3" /mob/living/simple_animal/hostile/megafauna/stalwart/devour(mob/living/L) - visible_message("[src] melts [L]!") + visible_message(span_danger("[src] melts [L]!")) L.dust() diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index cb9d91c009c0..102135b16815 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -70,8 +70,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_userdanger("\The [src] knocks you down!")) /mob/living/simple_animal/hostile/mimic/crate/proc/trigger() if(!attempt_open) @@ -180,8 +180,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_userdanger("\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?", \ diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/drakeling.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/drakeling.dm index a154881ed7f5..c04d2d79f3ae 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/drakeling.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/drakeling.dm @@ -92,11 +92,11 @@ if(is_type_in_list(O, food_items)) if(!stat) if(health != maxHealth) - user.visible_message("[user] feeds [name] with [O].", "You feed [src] with [O], and some of its wounds begin to heal!") + user.visible_message(span_notice("[user] feeds [name] with [O]."), span_notice("You feed [src] with [O], and some of its wounds begin to heal!")) adjustBruteLoss(-food_items[O.type]) qdel(O) else - to_chat(user, "[src] doesn't look hungry right now.") + to_chat(user, span_notice("[src] doesn't look hungry right now.")) else ..() @@ -116,8 +116,8 @@ action_background_icon_state = "bg_demon" panel = "Dragon" active = FALSE - var/prepare_message = "You prepare %YOUR ULTRA DRAGON ATTACK" - var/unprepare_message = "You decide to spare the mortals for now..." + var/prepare_message = span_notice("You prepare %YOUR ULTRA DRAGON ATTACK") + var/unprepare_message = span_notice("You decide to spare the mortals for now...") /obj/effect/proc_holder/drakeling/Click() if(!isliving(usr)) @@ -178,8 +178,8 @@ action_icon = 'icons/obj/wizard.dmi' action_icon_state = "fireball" cooldown = 2 SECONDS - prepare_message = "You prepare %YOUR fire breath attack" - unprepare_message = "You decide to refrain from roasting more peasants for the time." + prepare_message = span_notice("You prepare %YOUR fire breath attack") + unprepare_message = span_notice("You decide to refrain from roasting more peasants for the time.") /obj/effect/proc_holder/drakeling/fire_breath/InterceptClickOn(mob/living/L, params, atom/A) if(..()) @@ -221,7 +221,7 @@ if(ismegafauna(L) || istype(L, /mob/living/simple_animal/hostile/asteroid)) L.adjustBruteLoss(damage * 3) //60 damage plus the normal damage against fauna, total of 80 should make it mega competitive vs other weapons L.adjustFireLoss(damage) - to_chat(L, "You're hit by [source]'s fire breath!") + to_chat(L, span_userdanger("You're hit by [source]'s fire breath!")) sleep(1) ///drakeling wing flap attack: deals relatively minor damage to lavaland fauna and pushes anything it hits away, also breaks rocks on contact like a plasmacutter @@ -231,8 +231,8 @@ action_icon_state = "tornado" action_icon = 'icons/obj/wizard.dmi' cooldown = 2 SECONDS - prepare_message = "You prepare %YOUR wings." - unprepare_message = "You stop the flapping." + prepare_message = span_notice("You prepare %YOUR wings.") + unprepare_message = span_notice("You stop the flapping.") var/shootie = /obj/item/projectile/wing /obj/effect/proc_holder/drakeling/wing_flap/InterceptClickOn(mob/living/L, params, atom/A) 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 b105f0582368..e02906bf9db8 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 @@ -146,7 +146,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 your arm enters its radius. Your instincts tell you to step back.") + visible_message(span_boldwarning("[src] convulses as your arm enters its radius. Your instincts tell you to step back.")) activator = user if(boosted) mychild.playsound_local(get_turf(mychild), 'sound/effects/magic.ogg', 40, 0) @@ -156,21 +156,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/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/effects/magic.ogg', 40, 0) to_chat(elitemind, "You have been chosen to play as a Lavaland Elite.\nIn a few seconds, you will be summoned on Lavaland as a monster to fight your 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 your 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/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 @@ -178,7 +178,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/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE) if(boosted) mychild.key = elitemind.key @@ -188,7 +188,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/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE) mychild.revive(full_heal = TRUE, admin_revive = TRUE) if(boosted) @@ -227,7 +227,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 @@ -263,17 +263,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/effects/phasein.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/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE) obj/structure/elite_tumor/proc/onEliteLoss() playsound(loc,'sound/effects/tendril_destroyed.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 @@ -299,7 +299,7 @@ obj/structure/elite_tumor/proc/onEliteWon() mychild.health = mychild.maxHealth if(times_won == 1) mychild.playsound_local(get_turf(mychild), 'sound/effects/magic.ogg', 40, 0) - to_chat(mychild, "As the life in the activator's eyes fade, the forcefield around you dies out and you feel your power subside.\nDespite this inferno being your home, you feel as if you aren't welcome here anymore.\nWithout any guidance, your 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 your power subside.\nDespite this inferno being your home, you feel as if you aren't welcome here anymore.\nWithout any guidance, your purpose is now for you to decide.")) to_chat(mychild, "Your max health has been halved, but can now heal by standing on your tumor. Note, it's your only way to heal.\nBear in mind, if anyone interacts with your tumor, you'll be resummoned here to carry out another fight. In such a case, you will regain your full max health.\nAlso, be weary of your 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!") @@ -321,11 +321,11 @@ 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/effects/magic.ogg', 40, 0) to_chat(E, "You have been revived by [user]. While you can't speak to them, you owe [user] a great debt. Assist [user.p_them()] in achieving [user.p_their()] goals, regardless of risk.Note that you now share the loyalties of [user]. You are expected not to intentionally sabotage their faction unless commanded to!") @@ -335,7 +335,7 @@ obj/structure/elite_tumor/proc/onEliteWon() 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 d7034af2ec61..8d7a10054189 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 = "You are now attacking with a patch of tentacles." + chosen_message = span_boldwarning("You 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 = "You will spawn two children at your location to assist you in combat. You can have up to 8." + chosen_message = span_boldwarning("You 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 = "You will temporarily increase your movement speed." + chosen_message = span_boldwarning("You 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 = "You will summon your children to your location." + chosen_message = span_boldwarning("You 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(var/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/spookoween/insane_low_laugh.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 95e85ccba323..71606ef5cdbd 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 = "You are now firing three shots in your chosen direction." + chosen_message = span_boldwarning("You 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 = "You are firing projectiles in all directions." + chosen_message = span_boldwarning("You 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 = "You will now fire a shot which teleports you where it lands." + chosen_message = span_boldwarning("You 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 = "You will spawn a mirror which duplicates your attacks." + chosen_message = span_boldwarning("You 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 @@ /obj/item/clothing/neck/cloak/herald_cloak/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(hit_reaction_chance)) return FALSE - 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/magic/clockwork/invoke_general.ogg', 20, TRUE) addtimer(CALLBACK(src, .proc/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 27ee5207b9ee..c88028649597 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 = "You will attempt to grab your opponent and throw them." + chosen_message = span_boldwarning("You will attempt to grab your 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 = "You will now detach your head or kill it if it is already released." + chosen_message = span_boldwarning("You will now detach your 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 = "You will leave a bonfire. Second use will let you swap positions with it indefintiely. Using this move on the same tile as your active bonfire removes it." + chosen_message = span_boldwarning("You will leave a bonfire. Second use will let you swap positions with it indefintiely. Using this move on the same tile as your 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 = "Your head will spew smoke in an area, wherever it may be." + chosen_message = span_boldwarning("Your 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/magic/demon_attack1.ogg', 200, 1) - visible_message("[src] prepares to charge!") + visible_message(span_boldwarning("[src] prepares to charge!")) addtimer(CALLBACK(src, .proc/legionnaire_charge_2, dir_to_target, 0), 5) /mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/legionnaire_charge_2(var/move_dir, var/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_userdanger("[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/items/fultext_deploy.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/items/fultext_deploy.ogg', 200, 1) playsound(legionturf,'sound/items/fultext_deploy.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 2a7a9a9c72ea..83d99487d344 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 = "You are now creating a single linear magic square." + chosen_message = span_boldwarning("You 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 = "You are now attacking with a box of magic squares." + chosen_message = span_boldwarning("You 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 = "You will now teleport to your target." + chosen_message = span_boldwarning("You will now teleport to your target.") chosen_attack_num = PANDORA_TELEPORT /datum/action/innate/elite_attack/aoe_squares name = "AOE Blast" button_icon_state = "aoe_squares" - chosen_message = "Your attacks will spawn an AOE blast at your target location." + chosen_message = span_boldwarning("Your attacks will spawn an AOE blast at your target location.") chosen_attack_num = AOE_SQUARES /mob/living/simple_animal/hostile/asteroid/elite/pandora/OpenFire() 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 2e5504d8c94e..18ec7144f398 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(wanted_objects[target.type] && loot.len < max_loot) - visible_message("\The [name] looks at \the [target.name] with \his hungry eyes.") + visible_message(span_notice("\The [name] looks at \the [target.name] with \his hungry eyes.")) else if(iscarbon(target) || issilicon(target)) Aggro() - visible_message("\The [name] tries to flee from \the [target.name]!") + visible_message(span_danger("\The [name] tries to flee from \the [target.name]!")) retreat_distance = 10 minimum_distance = 10 if(will_burrow) @@ -67,18 +67,18 @@ for(var/i in 1 to using) loot += O.type O.use(using) - visible_message("\The ore was swallowed whole by \the [name]!") + visible_message(span_notice("\The ore was swallowed whole by \the [name]!")) else // We are now full! We will consume no more ore ever again. search_objects = 0 - visible_message("\The [name] nibbles some of the ore and then stops. \She seems to be full!") + visible_message(span_notice("\The [name] nibbles some of the ore and then stops. \She seems to be full!")) /mob/living/simple_animal/hostile/asteroid/goldgrub/proc/Burrow()//You failed the chase to kill the goldgrub in time! if(stat == CONSCIOUS) - 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/item/projectile/P) - visible_message("\The [P.name] was repelled by [name]'s blubberous girth!") + visible_message(span_danger("\The [P.name] was repelled by [name]'s blubberous 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 19e70fb16ca0..fbcd4cc81fc2 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 @@ -64,7 +64,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 @@ -200,7 +200,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]!")) if(!L.IsStun()) L.Stun(100) else 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 bb9db99cd2a6..0e920685f0a6 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 @@ -89,7 +89,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 ..() @@ -149,7 +149,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 dd4d41aea443..ffd88092a562 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 @@ -137,7 +137,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) @@ -212,13 +212,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 01a05d504a17..a1ba6e180533 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 @@ -38,7 +38,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) //No floor tiling them to death, wiseguy @@ -47,7 +47,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/mining_mobs/polarbear.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm index 45c275ecdc34..95e03fd20d18 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm @@ -35,7 +35,7 @@ . = ..() if(health <= maxHealth*0.5) if(!aggressive_message_said && target) - visible_message("The [name] gets an enraged look at [target]!") + visible_message(span_danger("The [name] gets an enraged look at [target]!")) aggressive_message_said = TRUE rapid_melee = 2 else diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm index 7920f3e0b256..2bc59f658cca 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm @@ -41,7 +41,7 @@ . = ..() if(health <= maxHealth*0.1) if(!retreat_message_said && target) - visible_message("The [name] tries to flee from [target]!") + visible_message(span_danger("The [name] tries to flee from [target]!")) retreat_message_said = TRUE retreat_distance = 30 else diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 395b64b80ad0..d032c0ec5edd 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -40,9 +40,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() ..() @@ -97,7 +97,7 @@ M.visible_message("[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 @@ -160,7 +160,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 992c7ee0f8c4..980c84fb6bea 100644 --- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm +++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm @@ -90,10 +90,10 @@ /obj/structure/spawner/nether/attack_hand(mob/user) . = ..() if(isskeleton(user) || iszombie(user)) - to_chat(user, "You don't feel like going home yet...") + to_chat(user, span_notice("You 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_userdanger("Touching the portal, you are quickly pulled through into a world of unimaginable horror!")) contents.Add(user) /obj/structure/spawner/nether/process() @@ -107,5 +107,5 @@ blank = new(loc) blank.name = "[M]" blank.desc = "It's [M], but [M.p_their()] flesh has an ashy texture, and [M.p_their()] face is featureless save an eerie smile." - 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/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index cb66ce76ef92..a546c0bde982 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -75,7 +75,7 @@ /mob/living/simple_animal/hostile/statue/Move(turf/NewLoc) if(can_be_seen(NewLoc)) if(client) - to_chat(src, "You cannot move, there are eyes on you!") + to_chat(src, span_warning("You cannot move, there are eyes on you!")) return 0 return ..() @@ -93,7 +93,7 @@ /mob/living/simple_animal/hostile/statue/AttackingTarget() if(can_be_seen(get_turf(loc))) if(client) - to_chat(src, "You cannot attack, there are eyes on you!") + to_chat(src, span_warning("You cannot attack, there are eyes on you!")) return FALSE else return ..() @@ -182,7 +182,7 @@ name = "Blindness" desc = "Your prey will be momentarily blind for you to advance on them." - message = "You glare your eyes." + message = span_notice("You glare your eyes.") charge_max = 600 clothes_req = 0 range = 10 @@ -202,7 +202,7 @@ charge_max = 10 clothes_req = 0 - message = "You toggle your night vision!" + message = span_notice("You 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 4a33856cafdc..f749af69fad6 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -135,7 +135,7 @@ /mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/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 1e91da9e9557..117a53cecfd2 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -58,8 +58,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_userdanger("\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 845e2ab59fea..e15f53bc0b2f 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 @@ -39,7 +39,7 @@ * Displays a message, spawns a human venus trap, then qdels itself. */ /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) @@ -54,7 +54,7 @@ var/mob/living/L = AM if(!isvineimmune(L)) L.adjustBruteLoss(5) - to_chat(L, "You cut yourself on the thorny vines.") + to_chat(L, span_alert("You cut yourself on the thorny vines.")) /** * Venus Human Trap @@ -105,7 +105,7 @@ if(!kudzu_need()) adjustHealth(5) if(prob(20)) - to_chat(src, "You wither away without the support of the kudzu...") + to_chat(src, span_danger("You wither away without the support of the kudzu...")) /mob/living/simple_animal/hostile/venus_human_trap/AttackingTarget() . = ..() @@ -139,7 +139,7 @@ /mob/living/simple_animal/hostile/venus_human_trap/Login() . = ..() - to_chat(src, "You are a venus human trap! Protect the kudzu at all costs, and feast on those who oppose you!") + to_chat(src, span_boldwarning("You are a venus human trap! Protect the kudzu at all costs, and feast on those who oppose you!")) to_chat(src, "Stay near vines to remain healthy.") /mob/living/simple_animal/hostile/venus_human_trap/attack_ghost(mob/user) @@ -163,7 +163,7 @@ if(plant_ask == "No" || QDELETED(src)) return if(key) - to_chat(user, "Someone else already took this plant!") + to_chat(user, span_warning("Someone else already took this plant!")) return key = user.key log_game("[key_name(src)] took control of [name].") 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 9ca5e3314752..4e077a84bb10 100644 --- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -71,13 +71,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_notice("YOU'RE ALREADY WUMBO!")) return if(F.inflate_cooldown) - to_chat(F, "You need time to gather your strength.") + to_chat(F, span_notice("You need time to gather your strength.")) return if(F.buffed) - to_chat(F, "Something is interfering with your growth.") + to_chat(F, span_notice("Something is interfering with your growth.")) return F.wumbo = 1 F.icon_state = "Fugu1" @@ -131,12 +131,12 @@ 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 = round(A.maxHealth * 1.2) A.health = round(min(A.maxHealth,A.health*1.2)) A.transform *= 2 A.environment_smash |= ENVIRONMENT_SMASH_STRUCTURES - to_chat(user, "You increase the size of [A], giving it a surge of strength!") + to_chat(user, span_info("You 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 eeb05373d1b7..84cebf744d73 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -196,7 +196,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!") @@ -210,12 +210,12 @@ else if(href_list["add_inv"]) var/add_to = href_list["add_inv"] if(!usr.get_active_held_item()) - to_chat(usr, "You have nothing in your hand to put on its [add_to]!") + to_chat(usr, span_warning("You 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() @@ -223,7 +223,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 @@ -231,7 +231,7 @@ if(!usr.transferItemToLoc(headset_to_add, src)) return ears = headset_to_add - to_chat(usr, "You fit the headset onto [src].") + to_chat(usr, span_notice("You fit the headset onto [src].")) clearlist(available_channels) for(var/ch in headset_to_add.channels) @@ -326,7 +326,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 @@ -494,7 +494,7 @@ if(!parrot_perch || parrot_interest.loc != parrot_perch.loc) held_item = parrot_interest parrot_interest.forceMove(src) - visible_message("[src] grabs [held_item]!", "You grab [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs [held_item]!", span_notice("You grab [held_item]!"), span_italics("You hear the sounds of wings flapping furiously.")) parrot_interest = null parrot_state = PARROT_SWOOP | PARROT_RETURN @@ -673,7 +673,7 @@ return -1 if(held_item) - to_chat(src, "You are already holding [held_item]!") + to_chat(src, span_warning("You are already holding [held_item]!")) return 1 for(var/obj/item/I in view(1,src)) @@ -686,10 +686,10 @@ held_item = I I.forceMove(src) - visible_message("[src] grabs [held_item]!", "You grab [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs [held_item]!", span_notice("You grab [held_item]!"), span_italics("You 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() @@ -701,7 +701,7 @@ return -1 if(held_item) - to_chat(src, "You are already holding [held_item]!") + to_chat(src, span_warning("You are already holding [held_item]!")) return 1 var/obj/item/stolen_item = null @@ -715,10 +715,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!", "You snag [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs [held_item] out of [C]'s hand!", span_notice("You snag [held_item] out of [C]'s hand!"), span_italics("You 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() @@ -743,7 +743,7 @@ if(!held_item) if(src == usr) //So that other mobs wont make this message appear when they're bludgeoning you. - to_chat(src, "You have nothing to drop!") + to_chat(src, span_danger("You have nothing to drop!")) return 0 @@ -788,7 +788,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) @@ -814,12 +814,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, "You are no longer sitting on [buckled]'s shoulder.") + to_chat(src, span_notice("You are no longer sitting on [buckled]'s shoulder.")) buckled.unbuckle_mob(src, TRUE) buckled = null pixel_x = initial(pixel_x) @@ -836,7 +836,7 @@ pixel_x = pick(-8,8) //pick left or right shoulder icon_state = icon_sit parrot_state = PARROT_PERCH - to_chat(src, "You sit on [H]'s shoulder.") + to_chat(src, span_notice("You sit on [H]'s shoulder.")) /mob/living/simple_animal/parrot/proc/toggle_mode() @@ -993,7 +993,7 @@ 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_userdanger("[src] dive bombs into your chest, vanishing! This can't be good!")) /mob/living/simple_animal/parrot/clock_hawk diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index ac1a6793ffea..8f48472537ef 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -129,7 +129,7 @@ /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/initialize_footstep() if(do_footstep) @@ -406,13 +406,13 @@ /mob/living/simple_animal/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE) if(incapacitated()) - to_chat(src, "You can't do that right now!") + to_chat(src, span_warning("You can't do that right now!")) return FALSE if(be_close && !in_range(M, src)) - to_chat(src, "You are too far away!") + to_chat(src, span_warning("You are too far away!")) return FALSE if(!(no_dextery || dextrous)) - to_chat(src, "You don't have the dexterity to do this!") + to_chat(src, span_warning("You don't have the dexterity to do this!")) return FALSE return TRUE @@ -515,7 +515,7 @@ if(istype(held_item, /obj/item/twohanded)) var/obj/item/twohanded/T = held_item if(T.wielded == 1) - to_chat(usr, "Your other hand is too busy holding [T].") + to_chat(usr, span_warning("Your other hand is too busy holding [T].")) return var/oindex = active_hand_index active_hand_index = hand_index diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 4f9dcbeddab3..f6b309564d32 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -138,14 +138,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, "You wake up from the stasis.") + to_chat(src, span_notice("You 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 0f39b96a5925..98c081c2076f 100644 --- a/code/modules/mob/living/simple_animal/slime/powers.dm +++ b/code/modules/mob/living/simple_animal/slime/powers.dm @@ -112,8 +112,8 @@ 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_userdanger("[name] has latched onto [M]!")) else to_chat(src, "I have failed to latch onto the subject!") @@ -125,7 +125,7 @@ "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]!", \ + visible_message(span_warning("[src] has let go of [buckled]!"), \ "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 3608e942b05c..15c4a6d71bf8 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -287,7 +287,7 @@ return if(buckled) Feedstop(silent = TRUE) - visible_message("[M] pulls [src] off!") + visible_message(span_danger("[M] pulls [src] off!")) return attacked += 5 if(nutrition >= 100) //steal some nutrition. negval handled in life() @@ -321,22 +321,22 @@ M.do_attack_animation(src, ATTACK_EFFECT_DISARM) if(buckled == M) if(prob(60)) - visible_message("[M] attempts to wrestle \the [name] off!") + visible_message(span_warning("[M] attempts to wrestle \the [name] off!")) playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) else - visible_message("[M] manages to wrestle \the [name] off!") + visible_message(span_warning("[M] manages to wrestle \the [name] off!")) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) discipline_slime(M) else if(prob(30)) - visible_message("[M] attempts to wrestle \the [name] off of [buckled]!") + visible_message(span_warning("[M] attempts to wrestle \the [name] off of [buckled]!")) playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) else - visible_message("[M] manages to wrestle \the [name] off of [buckled]!") + visible_message(span_warning("[M] manages to wrestle \the [name] off of [buckled]!")) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) discipline_slime(M) @@ -366,7 +366,7 @@ ++Friends[user] else Friends[user] = 1 - to_chat(user, "You feed the slime the plasma. It chirps happily.") + to_chat(user, span_notice("You feed the slime the plasma. It chirps happily.")) var/obj/item/stack/sheet/mineral/plasma/S = W S.use(1) return @@ -375,7 +375,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 @@ -388,7 +388,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? @@ -399,23 +399,23 @@ applied++ hasFound = TRUE if(applied >= SLIME_EXTRACT_CROSSING_REQUIRED) - to_chat(user, "You feed the slime as many of the extracts from the bag as you can, and it mutates!") + to_chat(user, span_notice("You feed the slime as many of the extracts from the bag as you can, and it mutates!")) playsound(src, 'sound/effects/attackblob.ogg', 50, 1) 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, "You feed the slime some extracts from the bag.") + to_chat(user, span_notice("You feed the slime some extracts from the bag.")) playsound(src, 'sound/effects/attackblob.ogg', 50, 1) 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/magic/smoke.ogg', 50, 1) var/crosspath for(var/X in crossbreeds) @@ -426,7 +426,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() @@ -440,10 +440,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) @@ -460,7 +460,7 @@ . += "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!" diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 894bd6f96104..fc11b1ffe103 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -369,11 +369,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 fec024cebf2d..16140749c7b9 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, "You can taste [text_output].") + to_chat(src, span_notice("You 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 bc4d133a70e2..a0268ccc15d2 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -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..." ,"You begin climbing into the ventilation system...") + visible_message(span_notice("[src] begins climbing into the ventilation system...") ,span_notice("You 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, "You can't crawl around in the ventilation ducts with items!") + to_chat(src, span_warning("You can't crawl around in the ventilation ducts with items!")) return - visible_message("[src] scrambles into the ventilation ducts!","You climb into the ventilation ducts.") + visible_message(span_notice("[src] scrambles into the ventilation ducts!"),span_notice("You 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 243fa6b78d98..7268194f2bc4 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -116,11 +116,11 @@ var/datum/gas_mixture/environment = loc.return_air() - var/t = "Coordinates: [x],[y] \n" - t += "Temperature: [environment.return_temperature()] \n" + var/t = span_notice("Coordinates: [x],[y] \n") + t += span_danger("Temperature: [environment.return_temperature()] \n") for(var/id in environment.get_gases()) if(environment.get_moles(id)) - t+="[GLOB.meta_gas_info[id][META_GAS_NAME]]: [environment.get_moles(id)] \n" + t+=span_notice("[GLOB.meta_gas_info[id][META_GAS_NAME]]: [environment.get_moles(id)] \n") to_chat(usr, t) @@ -320,7 +320,7 @@ qdel(W) else if(!disable_warning) - to_chat(src, "You are unable to equip that!") + to_chat(src, span_warning("You are unable to equip that!")) return FALSE equip_to_slot(W, slot, redraw_mob) //This proc should not ever fail. return TRUE @@ -446,27 +446,27 @@ /mob/living/blind_examine_check(atom/examined_thing) //need to be next to something and awake if(!Adjacent(examined_thing) || incapacitated()) - to_chat(src, "Something is there, but you can't see it!") + to_chat(src, span_warning("Something is there, but you can't see it!")) return FALSE var/active_item = get_active_held_item() if(active_item && active_item != examined_thing) - to_chat(src, "Your hands are too full to examine this!") + to_chat(src, span_warning("Your hands are too full to examine this!")) return FALSE //you can only initiate exaimines if you have a hand, it's not disabled, and only as many examines as you have hands /// our active hand, to check if it's disabled/detatched var/obj/item/bodypart/active_hand = has_active_hand()? get_active_hand() : null if(!active_hand || active_hand.is_disabled() || LAZYLEN(do_afters) >= get_num_arms()) - to_chat(src, "You don't have a free hand to examine this!") + to_chat(src, span_warning("You don't have a free hand to examine this!")) return FALSE //you can only queue up one examine on something at a time if(examined_thing in do_afters) return FALSE - to_chat(src, "You start feeling around for something...") - visible_message(" [name] begins feeling around for \the [examined_thing.name]...") + to_chat(src, span_notice("You start feeling around for something...")) + visible_message(span_notice(" [name] begins feeling around for \the [examined_thing.name]...")) /// how long it takes for the blind person to find the thing they're examining var/examine_delay_length = rand(1 SECONDS, 2 SECONDS) @@ -476,7 +476,7 @@ examine_delay_length *= 2 if(examine_delay_length > 0 && !do_after(src, examine_delay_length, target = examined_thing)) - to_chat(src, "You can't get a good feel for what is there.") + to_chat(src, span_notice("You can't get a good feel for what is there.")) return FALSE //now we touch the thing we're examining @@ -630,12 +630,12 @@ if (CONFIG_GET(flag/norespawn)) return if ((stat != DEAD || !( SSticker ))) - to_chat(usr, "You must be dead to use this!") + to_chat(usr, span_boldnotice("You must be dead to use this!")) return log_game("[key_name(usr)] used abandon mob.") - to_chat(usr, "Please roleplay correctly!") + to_chat(usr, span_boldnotice("Please roleplay correctly!")) if(!client) log_game("[key_name(usr)] AM failed due to disconnect.") @@ -1143,10 +1143,10 @@ ///Can this mob read (is literate and not blind) /mob/proc/can_read(obj/O) if(is_blind(src)) - to_chat(src, "As you are trying to read [O], you suddenly feel very stupid!") + to_chat(src, span_warning("As you are trying to read [O], you suddenly feel very stupid!")) return if(!is_literate()) - to_chat(src, "You try to read [O], but can't comprehend any of it.") + to_chat(src, span_notice("You try to read [O], but can't comprehend any of it.")) return return TRUE diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 16ded5931e5d..8c3c7b46c6a5 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -391,7 +391,7 @@ var/orbit_link if (source && (action == NOTIFY_ORBIT || action == NOTIFY_ATTACKORBIT)) 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) @@ -427,10 +427,10 @@ 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].", \ - "You fix some of the [dam ? "dents on" : "burnt wires in"] [H == user ? "your" : "[H]'s"] [affecting.name].") + span_notice("You 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(var/mob/user) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index c2e4a539474b..0d42bc2d45c8 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -180,7 +180,7 @@ return TRUE else if(mob.restrained(ignore_grab = 1)) move_delay = world.time + 10 - to_chat(src, "You're restrained! You can't move!") + to_chat(src, span_warning("You're restrained! You can't move!")) return TRUE else return mob.resist_grab(1) @@ -255,17 +255,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) @@ -289,7 +289,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, "You push off of [backup] to propel yourself.") + to_chat(src, span_info("You push off of [backup] to propel yourself.")) return TRUE return FALSE @@ -471,7 +471,7 @@ set category = "IC" if(zMove(UP, TRUE)) - to_chat(src, "You move upwards.") + to_chat(src, span_notice("You move upwards.")) ///Moves a mob down a z level /mob/verb/down() @@ -479,7 +479,7 @@ set category = "IC" if(zMove(DOWN, TRUE)) - to_chat(src, "You move down.") + to_chat(src, span_notice("You 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) @@ -488,11 +488,11 @@ var/turf/target = get_step_multiz(src, dir) if(!target) if(feedback) - to_chat(src, "There's nothing [dir == DOWN ? "below" : "above"] you!") + to_chat(src, span_warning("There's nothing [dir == DOWN ? "below" : "above"] you!")) return FALSE if(!canZMove(dir, target)) if(feedback) - to_chat(src, "You couldn't move there!") + to_chat(src, span_warning("You 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 5e5995ca6eed..1217b49a9e5a 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 dffd99de1439..d99ad2c5e019 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -14,7 +14,7 @@ message = minor_filter(to_utf8(message)) //yogs end - pretty filter 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) say(message) @@ -32,7 +32,7 @@ message = to_utf8(minor_filter(message)) //yogs end - pretty filter 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) @@ -46,7 +46,7 @@ set category = "IC" 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_char(sanitize(message), 1, MAX_MESSAGE_LEN)) @@ -59,7 +59,7 @@ var/alt_name = "" 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, "OOC") @@ -67,14 +67,14 @@ return if(jb) - to_chat(src, "You have been banned from deadchat.") + to_chat(src, span_danger("You have been banned from deadchat.")) return if (src.client) if(src.client.prefs.muted & MUTE_DEADCHAT) - to_chat(src, "You cannot talk in deadchat (muted).") + to_chat(src, span_danger("You 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 8e75ed632b4f..4199e99630a8 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -601,7 +601,7 @@ var/mobpath = input("Which type of mob should [src] turn into?", "Choose a type") in mobtypes 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) @@ -635,7 +635,7 @@ var/mobpath = input("Which type of mob should [src] turn into?", "Choose a type") in mobtypes 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) diff --git a/code/modules/modular_computers/computers/_modular_computer_shared.dm b/code/modules/modular_computers/computers/_modular_computer_shared.dm index 8ca93e8347b7..61e214893029 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 8a4c9a54938c..443fff0a6bac 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -179,19 +179,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, "You emag \the [src]. It's screen briefly shows a \"OVERRIDE ACCEPTED: New software downloads available.\" message.") + to_chat(user, span_notice("You 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) - . += "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) @@ -222,9 +222,9 @@ var/issynth = issilicon(user) // Robots and AIs get different activation messages. if(obj_integrity <= integrity_failure) if(issynth) - to_chat(user, "You send an activation signal to \the [src], but it responds with an error code. It must be damaged.") + to_chat(user, span_warning("You send an activation signal to \the [src], but it responds with an error code. It must be damaged.")) else - to_chat(user, "You press the power button, but the computer fails to boot up, displaying variety of errors before shutting down again.") + to_chat(user, span_warning("You 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. @@ -234,17 +234,17 @@ if(all_components[MC_CPU] && use_power()) // use_power() checks if the PC is powered if(issynth) - to_chat(user, "You send an activation signal to \the [src], turning it on.") + to_chat(user, span_notice("You send an activation signal to \the [src], turning it on.")) else - to_chat(user, "You press the power button and start up \the [src].") + to_chat(user, span_notice("You press the power button and start up \the [src].")) enabled = 1 update_icon() ui_interact(user) else // Unpowered if(issynth) - to_chat(user, "You send an activation signal to \the [src] but it does not respond.") + to_chat(user, span_warning("You send an activation signal to \the [src] but it does not respond.")) else - to_chat(user, "You press the power button but \the [src] does not respond.") + to_chat(user, span_warning("You 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() @@ -370,7 +370,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() @@ -389,7 +389,7 @@ 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].") @@ -399,21 +399,21 @@ 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, "You begin repairing damage to \the [src]...") + to_chat(user, span_notice("You begin repairing damage to \the [src]...")) if(W.use_tool(src, user, 20, volume=50, amount=1)) obj_integrity = max_integrity - to_chat(user, "You repair \the [src].") + to_chat(user, span_notice("You 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 3c94a6638435..106ac9d19b58 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, "You install \the [H] into \the [src].") + to_chat(user, span_notice("You 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, "You remove \the [H] from \the [src].") + to_chat(user, span_notice("You remove \the [H] from \the [src].")) H.forceMove(get_turf(src)) H.holder = null diff --git a/code/modules/modular_computers/computers/item/computer_ui.dm b/code/modules/modular_computers/computers/item/computer_ui.dm index a223168958cc..e8bcde73ca6a 100644 --- a/code/modules/modular_computers/computers/item/computer_ui.dm +++ b/code/modules/modular_computers/computers/item/computer_ui.dm @@ -33,7 +33,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) @@ -97,7 +97,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"] @@ -107,7 +107,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 @@ -126,11 +126,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 @@ -153,7 +153,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 11359b04eda4..b4033c3492d5 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, "You close \the [src].") + to_chat(user, span_notice("You close \the [src].")) slowdown = initial(slowdown) w_class = initial(w_class) else - to_chat(user, "You open \the [src].") + to_chat(user, span_notice("You 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 bf374218d0f1..0a1a8e11fd3c 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 2782acf86155..18d7ea44cee3 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -69,7 +69,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 @@ -115,7 +115,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 FALSE if(I) @@ -125,7 +125,7 @@ if(access_to_check in D.GetAccess()) return TRUE 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 279d646cfd71..f1d1ad0bd9a5 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 3accb8e02d7b..935c79b195e3 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, "Your payment materializes into your hands!") + to_chat(H, span_notice("Your payment materializes into your hands!")) else - to_chat(user, "Your payment materializes onto the floor.") + to_chat(user, span_notice("Your 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 650bea7a63fe..b9af7c594a87 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm @@ -18,7 +18,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 = FALSE computer.update_icon() var/obj/item/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD] @@ -28,13 +28,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/arcade.dm b/code/modules/modular_computers/file_system/programs/arcade.dm index 262691bbb7b3..b72ce2f99b9e 100644 --- a/code/modules/modular_computers/file_system/programs/arcade.dm +++ b/code/modules/modular_computers/file_system/programs/arcade.dm @@ -137,20 +137,20 @@ return TRUE if("Dispense_Tickets") if(!printer) - to_chat(usr, "Hardware error: A printer is required to redeem tickets.") + to_chat(usr, span_notice("Hardware error: A printer is required to redeem tickets.")) return if(printer.stored_paper <= 0) - to_chat(usr, "Hardware error: Printer is out of paper.") + to_chat(usr, span_notice("Hardware error: Printer is out of paper.")) return else - computer.visible_message("\The [computer] prints out paper.") + computer.visible_message(span_notice("\The [computer] prints out paper.")) if(ticket_count >= 1) new /obj/item/stack/arcadeticket((get_turf(computer)), 1) - to_chat(user, "[src] dispenses a ticket!") + to_chat(user, span_notice("[src] dispenses a ticket!")) ticket_count -= 1 printer.stored_paper -= 1 else - to_chat(user, "You don't have any stored tickets!") + to_chat(user, span_notice("You don't have any stored tickets!")) return TRUE if("Start_Game") game_active = TRUE diff --git a/code/modules/modular_computers/file_system/programs/card.dm b/code/modules/modular_computers/file_system/programs/card.dm index a31a300e7ad1..36cf33d8e275 100644 --- a/code/modules/modular_computers/file_system/programs/card.dm +++ b/code/modules/modular_computers/file_system/programs/card.dm @@ -141,11 +141,11 @@ 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 playsound(computer, 'sound/machines/terminal_on.ogg', 50, FALSE) - computer.visible_message("\The [computer] prints out a paper.") + computer.visible_message(span_notice("\The [computer] prints out a paper.")) return TRUE if("PRG_eject") if(!computer || !card_slot) @@ -209,7 +209,7 @@ job = J break if(!job) - to_chat(user, "No class exists for this job: [target]") + to_chat(user, span_warning("No class exists for this job: [target]")) return new_access = job.get_access() id_card.access -= get_all_centcom_access() + get_all_accesses() diff --git a/code/modules/modular_computers/file_system/programs/crewmanifest.dm b/code/modules/modular_computers/file_system/programs/crewmanifest.dm index 4accc5f5f135..0e9762e69ed2 100644 --- a/code/modules/modular_computers/file_system/programs/crewmanifest.dm +++ b/code/modules/modular_computers/file_system/programs/crewmanifest.dm @@ -48,7 +48,7 @@ contents += "[n] - [r]
" if(!printer.print_text(contents,text("crew manifest ([])", station_time_timestamp()),FALSE)) - 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 a paper.") + computer.visible_message(span_notice("\The [computer] prints out a paper.")) 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 3db9e7b765b1..62697f3e1cc2 100644 --- a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm @@ -117,9 +117,9 @@ // This program shouldn't even be runnable without computer. CRASH("Var computer is null!") 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.")) return TRUE if("PRG_renamechannel") if(!authed) diff --git a/code/modules/modular_computers/file_system/programs/portrait_printer.dm b/code/modules/modular_computers/file_system/programs/portrait_printer.dm index 765791878d97..f38ce1b25764 100644 --- a/code/modules/modular_computers/file_system/programs/portrait_printer.dm +++ b/code/modules/modular_computers/file_system/programs/portrait_printer.dm @@ -39,10 +39,10 @@ if(computer) printer = computer.all_components[MC_PRINT] if(!printer) - to_chat(usr, "Hardware error: A printer is required to print a canvas.") + to_chat(usr, span_notice("Hardware error: A printer is required to print a canvas.")) return if(printer.stored_paper < CANVAS_PAPER_COST) - to_chat(usr, "Printing error: Your printer needs at least [CANVAS_PAPER_COST] paper to print a canvas.") + to_chat(usr, span_notice("Printing error: Your printer needs at least [CANVAS_PAPER_COST] paper to print a canvas.")) return printer.stored_paper -= CANVAS_PAPER_COST @@ -73,5 +73,5 @@ ///this is a copy of something that is already in the database- it should not be able to be saved. printed_canvas.no_save = TRUE printed_canvas.update_icon() - to_chat(usr, "You have printed [title] onto a new canvas.") + to_chat(usr, span_notice("You have printed [title] onto a new canvas.")) playsound(computer.physical, 'sound/items/poster_being_created.ogg', 100, TRUE) diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm index 219bd6b1c295..bc40f6e80c76 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, "You patch up \the [src] with a bit of \the [I].") + to_chat(user, span_notice("You patch up \the [src] with a bit of \the [I].")) obj_integrity = min(obj_integrity + 10, max_integrity) return 1 @@ -75,11 +75,11 @@ /obj/item/computer_hardware/examine(var/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 0ad157afcb96..090a0ca65a2c 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, "You try to insert \the [I] into \the [src], but the slot is occupied.") + to_chat(user, span_warning("You 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, "You insert \the [I] into \the [src].") + to_chat(user, span_notice("You 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, "You remove [stored_card] from [src].") + to_chat(user, span_notice("You 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, "You press down on the manual eject button with \the [I].") + to_chat(user, span_notice("You 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 f574c0b7cca3..dd1cc4b79ae7 100644 --- a/code/modules/modular_computers/hardware/battery_module.dm +++ b/code/modules/modular_computers/hardware/battery_module.dm @@ -25,32 +25,32 @@ return FALSE if(battery) - to_chat(user, "You try to connect \the [I] to \the [src], but its connectors are occupied.") + to_chat(user, span_warning("You 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, "You connect \the [I] to \the [src].") + to_chat(user, span_notice("You 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, "You detach \the [battery] from \the [src].") + to_chat(user, span_notice("You 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 3e62ad3d977f..94c6960801d1 100644 --- a/code/modules/modular_computers/hardware/card_slot.dm +++ b/code/modules/modular_computers/hardware/card_slot.dm @@ -50,7 +50,7 @@ return FALSE if(stored_card && stored_card2) - to_chat(user, "You try to insert \the [I] into \the [src], but its slots are occupied.") + to_chat(user, span_warning("You try to insert \the [I] into \the [src], but its slots are occupied.")) return FALSE if(user) if(!user.transferItemToLoc(I, src)) @@ -62,7 +62,7 @@ stored_card = I else stored_card2 = I - to_chat(user, "You insert \the [I] into \the [src].") + to_chat(user, span_notice("You insert \the [I] into \the [src].")) playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -73,7 +73,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 @@ -104,7 +104,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user H.sec_hud_set_ID() - to_chat(user, "You remove the card[ejected>1 ? "s" : ""] from \the [src].") + to_chat(user, span_notice("You remove the card[ejected>1 ? "s" : ""] from \the [src].")) playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) return TRUE return FALSE @@ -113,7 +113,7 @@ if(..()) return if(I.tool_behaviour == TOOL_SCREWDRIVER) - to_chat(user, "You press down on the manual eject button with \the [I].") + to_chat(user, span_notice("You 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 e03ace05a5e8..3fc7ae625489 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(var/mob/user) ..() diff --git a/code/modules/modular_computers/hardware/printer.dm b/code/modules/modular_computers/hardware/printer.dm index 52a33ec11422..571f355af0e8 100644 --- a/code/modules/modular_computers/hardware/printer.dm +++ b/code/modules/modular_computers/hardware/printer.dm @@ -14,7 +14,7 @@ /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(var/text_to_print, var/paper_title = "", var/do_encode = TRUE) @@ -45,12 +45,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, "You try to add \the [I] into [src], but its paper bin is full!") + to_chat(user, span_warning("You 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, "You insert \the [I] into [src]'s paper recycler.") + to_chat(user, span_notice("You 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 13ae6c1f39ec..f8b74f07666a 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 c3101b3b2922..62c7b327fc52 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -245,7 +245,7 @@ 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 88e4ac935f11..c6a79825e6b8 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -42,7 +42,7 @@ /obj/item/energy_katana/attack_self(mob/user) dash_toggled = !dash_toggled - to_chat(user, "You [dash_toggled ? "enable" : "disable"] the dash function on [src].") + to_chat(user, span_notice("You [dash_toggled ? "enable" : "disable"] the dash function on [src].")) /obj/item/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters) . = ..() @@ -104,7 +104,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 4a265dae7ee7..8461bc7cc963 100644 --- a/code/modules/ninja/suit/gloves.dm +++ b/code/modules/ninja/suit/gloves.dm @@ -65,7 +65,7 @@ if(.) to_chat(H, "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() 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 389cc9e68221..3ce6a55a1143 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!", "You were recovered from the energy net!", "You hear a grunt.") + affecting.visible_message("[affecting.name] was recovered from the energy net!", "You were recovered from the energy net!", span_italics("You hear a grunt.")) if(!QDELETED(master))//As long as they still exist. to_chat(master, "ERROR: unable to initiate capture protocol. Procedure terminated.") return ..() @@ -65,7 +65,7 @@ It is possible to destroy the net by the occupant or someone else. visible_message("[affecting] suddenly vanishes!") affecting.forceMove(pick(GLOB.holdingfacility)) //Throw mob in to the holding facility. GLOB.ninja_capture += affecting - to_chat(affecting, "You appear in a strange place. You feel very trapped.") + to_chat(affecting, span_danger("You appear in a strange place. You feel very trapped.")) if(!QDELETED(master))//As long as they still exist. to_chat(master, "SUCCESS: capture procedure of [affecting] complete.") 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 3b344dacda60..fc46579328af 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm @@ -23,4 +23,4 @@ /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, "You are beginning to feel the after-effect of the injection.") + to_chat(H, span_danger("You 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 12fea51815f4..4637e0c23e51 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_danger("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_danger("There are no more smoke bombs remaining.")) return 1 if(N_ADRENALINE) if(!a_boost) - to_chat(H, "You do not have any more adrenaline boosters.") + to_chat(H, span_danger("You 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 670aefd46533..1e91a37cb8cd 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm @@ -8,17 +8,17 @@ 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, "You may not use an energy net through solid obstacles!") + to_chat(H, span_warning("You may not use an energy net through solid obstacles!")) return if(istype(C, /mob/dead/observer)) - to_chat(H, "You may not use an energy net on ghosts!") + to_chat(H, span_warning("You may not use an energy net on ghosts!")) return if(!ninjacost(250,N_STEALTH_CANCEL)) //25 energy, 25% of base cell. H.Beam(C,"n_beam",time=15) @@ -26,7 +26,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!","You caught [C] with an energy net!") + H.visible_message(span_danger("[H] caught [C] with an energy net!"),span_notice("You 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_stars.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm index 60d224af0fc2..d98c72e5fa54 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 466679b85127..36716fcaee30 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, "You don't have enough power to enable Stealth!") + to_chat(U, span_warning("You don't have enough power to enable Stealth!")) return stealth = !stealth animate(U, alpha = 20,time = 15) - U.visible_message("[U.name] vanishes into thin air!", \ - "You are now mostly invisible to normal detection.") + U.visible_message(span_warning("[U.name] vanishes into thin air!"), \ + span_notice("You 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!", \ - "You are now visible.") + U.visible_message(span_warning("[U.name] appears from thin air!"), \ + span_notice("You 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 b1cc4dbbce9a..2b7d006dcb17 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) @@ -34,7 +34,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, 1) - H.visible_message("\the [energyKatana] flies towards [H]!","You hold out your hand and \the [energyKatana] flies towards you!") + H.visible_message(span_danger("\the [energyKatana] flies towards [H]!"),span_warning("You 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 58713ad93be6..3795b8c9bec1 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, 1) - 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_userdanger("[H] electrocutes you with [H.p_their()] touch!")) electrocute_act(15, H) diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm index 7300f22f9b8c..af7fb960a09b 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) @@ -33,7 +33,7 @@ cell = CELL to_chat(U, "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. @@ -43,10 +43,10 @@ to_chat(U, "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 4b159557bcce..d870e8cae9ee 100644 --- a/code/modules/ninja/suit/suit_initialisation.dm +++ b/code/modules/ninja/suit/suit_initialisation.dm @@ -12,18 +12,18 @@ 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/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/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/ninitialize_four, delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/ninitialize_four(delay, mob/living/carbon/human/U) @@ -62,7 +62,7 @@ addtimer(CALLBACK(src, .proc/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/deinitialize_three, delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/deinitialize_three(delay, mob/living/carbon/human/U) diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 9d094ba4000f..37ff574f43e5 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, "You clip the paper onto \the [src].") + to_chat(user, span_notice("You clip the paper onto \the [src].")) update_icon() else if(toppaper) toppaper.attackby(user.get_active_held_item(), user) @@ -92,7 +92,7 @@ if(!usr.transferItemToLoc(W, src)) return haspen = W - to_chat(usr, "You slot [W] into [src].") + to_chat(usr, span_notice("You slot [W] into [src].")) if(href_list["write"]) var/obj/item/P = locate(href_list["write"]) in src @@ -122,7 +122,7 @@ var/obj/item/P = locate(href_list["top"]) in src if(istype(P)) toppaper = P - to_chat(usr, "You move [P.name] to the top.") + to_chat(usr, span_notice("You 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 666f025b67fa..9853435a4715 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, "You feel that your 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("You feel that your 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_userdanger("[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, "You stamp the paper with your rubber stamp, however the ink ignites as you release the stamp.") + to_chat(user, span_notice("You stamp the paper with your rubber stamp, however the ink ignites as you release the stamp.")) else if(P.is_hot()) - 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?.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.", "You slice your wrist open and scrawl your 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("You slice your wrist open and scrawl your 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, "You don't know how to read or write.") + to_chat(user, span_notice("You don't know how to read or write.")) return 0 if(user.mind != target) - to_chat(user, "Your signature simply slides off the sheet, it seems this contract is not meant for you to sign.") + to_chat(user, span_notice("Your 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 your soul, you may not sell it to [owner.p_them()] again.") + to_chat(user, span_notice("This devil already owns your 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_notice("This contract has already been signed. It may not be signed again.")) return 0 if(!user.mind.hasSoul) - to_chat(user, "You do not possess a soul.") + to_chat(user, span_notice("You do not possess a soul.")) return 0 if(HAS_TRAIT(user, TRAIT_DUMB)) - to_chat(user, "You quickly scrawl 'your name' on the contract.") + to_chat(user, span_notice("You quickly scrawl 'your name' on the contract.")) signIncorrectly() return 0 if (contractType == CONTRACT_REVIVE) - to_chat(user, "You are already alive, this contract would do nothing.") + to_chat(user, span_notice("You are already alive, this contract would do nothing.")) return 0 else - to_chat(user, "You quickly scrawl your name on the contract") + to_chat(user, span_notice("You quickly scrawl your 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_notice("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(1,0) 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, 1)//Revival contracts are always signed in blood addtimer(CALLBACK(H, /mob/living/carbon/human.proc/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 your 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 your soul.")) + to_chat(user, span_boldnotice("This does NOT make you an antagonist if you were not already.")) return TRUE /obj/item/paper/contract/infernal/proc/signIncorrectly(mob/living/carbon/human/user = target.current, blood = FALSE) diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 0f97b10104b9..c236f92b80ed 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -92,7 +92,7 @@ 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, "You put [P] in [src].") + to_chat(user, span_notice("You put [P] in [src].")) if(istype(src, /obj/structure/filingcabinet/colored)) var/obj/structure/filingcabinet/colored/cab = src var/mutable_appearance/opentrim = mutable_appearance(icon, "coloredcabinet-open-trim") @@ -108,12 +108,12 @@ icon_state = initial(icon_state) updateUsrDialog() else if(P.tool_behaviour == TOOL_WRENCH) - to_chat(user, "You begin to [anchored ? "unwrench" : "wrench"] [src].") + to_chat(user, span_notice("You begin to [anchored ? "unwrench" : "wrench"] [src].")) if(P.use_tool(src, user, 20, volume=50)) - to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].") + to_chat(user, span_notice("You successfully [anchored ? "unwrench" : "wrench"] [src].")) anchored = !anchored else if(user.a_intent != INTENT_HARM) - to_chat(user, "You can't put [P] in [src]!") + to_chat(user, span_warning("You can't put [P] in [src]!")) else return ..() @@ -121,7 +121,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 = "
" @@ -145,9 +145,9 @@ I.forceMove(loc) if(prob(25)) step_rand(I) - to_chat(user, "You pull \a [I] out of [src] at random.") + to_chat(user, span_notice("You pull \a [I] out of [src] at random.")) return - to_chat(user, "You find nothing in [src].") + to_chat(user, span_notice("You find nothing in [src].")) /obj/structure/filingcabinet/Topic(href, href_list) if(!usr.canUseTopic(src, BE_CLOSE, ismonkey(usr))) @@ -309,5 +309,5 @@ GLOBAL_LIST_EMPTY(employmentCabinets) sleep(100) // prevents the devil from just instantly emptying the cabinet, ensuring an easy win. cooldown = 0 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 6af296099802..7bc395bdd982 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, "You put [W] into [src].") + to_chat(user, span_notice("You put [W] into [src].")) update_icon() else if(istype(W, /obj/item/pen)) if(!user.is_literate()) - to_chat(user, "You scribble illegibly on the cover of [src]!") + to_chat(user, span_notice("You scribble illegibly on the cover of [src]!")) return var/inputvalue = stripped_input(user, "What would you like to label the folder?", "Folder Labelling", "", MAX_NAME_LEN) @@ -67,9 +67,9 @@ if(!user.canUseTopic(src, BE_CLOSE)) return if(contents.len) - to_chat(user, "You can't fold this folder with something still inside!") + to_chat(user, span_warning("You can't fold this folder with something still inside!")) return - to_chat(user, "You fold [src] flat.") + to_chat(user, span_notice("You fold [src] flat.")) var/obj/item/I = new /obj/item/stack/sheet/cardboard qdel(src) user.put_in_hands(I) diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 62ef556893e6..4871dc4cc401 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, "You can't label creatures!") // use a collar + to_chat(user, span_warning("You can't label creatures!")) // use a collar return user.visible_message("[user] labels [A] as [label].", \ - "You label [A] as [label].") + span_notice("You 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, "You don't have the dexterity to use [src]!") + to_chat(user, span_warning("You don't have the dexterity to use [src]!")) return mode = !mode icon_state = "labeler[mode]" if(mode) - to_chat(user, "You turn on [src].") + to_chat(user, span_notice("You turn on [src].")) //Now let them chose the text. var/str = reject_bad_text(stripped_input(user, "Label text?", "Set label","", 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, "You set the text to '[str]'.") + to_chat(user, span_notice("You set the text to '[str]'.")) else - to_chat(user, "You turn off [src].") + to_chat(user, span_notice("You 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, "You insert [I] into [src].") + to_chat(user, span_notice("You 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 2748174fbcb9..3e47939dbb96 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -88,7 +88,7 @@ user << browse("[name][stars(render_body(user))]
[stamps]", "window=[name]") onclose(user, "[name]") else - . += "You're too far away to read it!" + . += span_warning("You're too far away to read it!") /obj/item/paper/verb/rename() @@ -101,7 +101,7 @@ if(ishuman(usr)) var/mob/living/carbon/human/H = usr if(HAS_TRAIT(H, TRAIT_CLUMSY) && prob(25)) - to_chat(H, "You cut yourself on the paper! Ahhhh! Ahhhhh!") + to_chat(H, span_warning("You cut yourself on the paper! Ahhhh! Ahhhhh!")) H.damageoverlaytemp = 9001 H.update_damage_hud() return @@ -112,7 +112,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() @@ -281,7 +281,7 @@ user << browse("[name][render_body(user,TRUE)]
[stamps]", "window=[name]") return else - to_chat(user, "You don't know how to read or write.") + to_chat(user, span_notice("You don't know how to read or write.")) return else if(istype(P, /obj/item/stamp)) @@ -300,12 +300,12 @@ LAZYADD(stamped, P.icon_state) add_overlay(stampoverlay) - to_chat(user, "You stamp the paper with your rubber stamp.") + to_chat(user, span_notice("You stamp the paper with your rubber stamp.")) if(P.is_hot()) if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10)) - user.visible_message("[user] accidentally ignites [user.p_them()]self!", \ - "You miss the paper and accidentally light yourself on fire!") + user.visible_message(span_warning("[user] accidentally ignites [user.p_them()]self!"), \ + span_userdanger("You miss the paper and accidentally light yourself on fire!")) user.dropItemToGround(P) user.adjust_fire_stacks(1) user.IgniteMob() @@ -315,7 +315,7 @@ return user.dropItemToGround(src) - user.visible_message("[user] lights [src] ablaze with [P]!", "You light [src] on fire!") + user.visible_message(span_danger("[user] lights [src] ablaze with [P]!"), span_danger("You light [src] on fire!")) fire_act() diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm index 0f7855e145c8..3407f0989688 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,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -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/items/gavel.ogg', 50, 1, -1) return (BRUTELOSS) @@ -47,21 +47,21 @@ if(!user.transferItemToLoc(P, src)) return playsound(loc, "pageturn", 60, 1) - to_chat(user, "You place [P] in [src].") + to_chat(user, span_notice("You 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, "You replace [src]'s [P].") + to_chat(user, span_notice("You 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_notice("The cutting blade is gone! You can't use [src] now.")) return if(!cuttersecured) - to_chat(user, "You remove [src]'s [storedcutter].") + to_chat(user, span_notice("You remove [src]'s [storedcutter].")) user.put_in_hands(storedcutter) storedcutter = null update_icon() if(storedpaper) playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1) - to_chat(user, "You neatly cut [storedpaper].") + to_chat(user, span_notice("You 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 dd6029a3f011..664c9f6672a7 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, "You take [P] out of \the [src].") + to_chat(user, span_notice("You take [P] out of \the [src].")) bin_pen = null update_icon() else if(total_paper >= 1) @@ -91,9 +91,9 @@ P.add_fingerprint(user) P.forceMove(user.loc) user.put_in_hands(P) - to_chat(user, "You take [P] out of \the [src].") + to_chat(user, span_notice("You 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 ..() @@ -102,7 +102,7 @@ var/obj/item/paper/P = I if(!user.transferItemToLoc(P, src)) return - to_chat(user, "You put [P] in [src].") + to_chat(user, span_notice("You put [P] in [src].")) papers.Add(P) total_paper++ update_icon() @@ -110,7 +110,7 @@ var/obj/item/pen/P = I if(!user.transferItemToLoc(P, src)) return - to_chat(user, "You put [P] in [src].") + to_chat(user, span_notice("You put [P] in [src].")) bin_pen = P update_icon() else @@ -156,7 +156,7 @@ /obj/item/paper_bin/bundlenatural/attackby(obj/item/W, mob/user) if(W.is_sharp()) - to_chat(user, "You snip \the [src], spilling paper everywhere.") + to_chat(user, span_notice("You 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 058421af10cf..de92d631b2c0 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -45,7 +45,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)) @@ -60,7 +60,7 @@ add_overlay("paperplane_[S]") /obj/item/paperplane/attack_self(mob/user) - to_chat(user, "You unfold [src].") + to_chat(user, span_notice("You unfold [src].")) var/obj/item/paper/internal_paper_tmp = internalPaper internal_paper_tmp.forceMove(loc) internalPaper = null @@ -70,7 +70,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, "You should unfold [src] before changing it.") + to_chat(user, span_notice("You should unfold [src] before changing it.")) return else if(istype(P, /obj/item/stamp)) //we don't randomize stamps on a paperplane @@ -79,8 +79,8 @@ else if(P.is_hot()) if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10)) - user.visible_message("[user] accidentally ignites [user.p_them()]self!", \ - "You miss [src] and accidentally light yourself on fire!") + user.visible_message(span_warning("[user] accidentally ignites [user.p_them()]self!"), \ + span_userdanger("You miss [src] and accidentally light yourself on fire!")) user.dropItemToGround(P) user.adjust_fire_stacks(1) user.IgniteMob() @@ -89,7 +89,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]!", "You light [src] on fire!") + user.visible_message(span_danger("[user] lights [src] ablaze with [P]!"), span_danger("You light [src] on fire!")) fire_act() add_fingerprint(user) @@ -113,7 +113,7 @@ if(prob(hit_probability)) if(H.is_eyes_covered()) return - visible_message("\The [src] hits [H] in the eye!") + visible_message(span_danger("\The [src] hits [H] in the eye!")) H.adjust_blurriness(6) eyes.applyOrganDamage(rand(6,8)) H.Paralyze(40) @@ -121,12 +121,12 @@ /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))) return - to_chat(user, "You fold [src] into the shape of a plane!") + to_chat(user, span_notice("You 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 5f3cb1b89503..810093f6de10 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 = "It's a fancy four-color ink pen, set to [colour]." /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, "You rotate the top of the pen to [degrees] degrees.") + to_chat(user, span_notice("You rotate the top of the pen to [degrees] degrees.")) SEND_SIGNAL(src, COMSIG_PEN_ROTATED, deg, user) /obj/item/pen/attack(mob/living/M, mob/user,stealth) @@ -111,9 +111,9 @@ if(!force) if(M.can_inject(user, 1)) - to_chat(user, "You stab [M] with the pen.") + to_chat(user, span_warning("You stab [M] with the pen.")) if(!stealth) - to_chat(M, "You feel a tiny prick!") + to_chat(M, span_danger("You feel a tiny prick!")) . = 1 log_combat(user, M, "stabbed", src) @@ -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/weapons/saberoff.ogg', 5, 1) - to_chat(user, "[src] can now be concealed.") + to_chat(user, span_warning("[src] can now be concealed.")) else if(!is_syndicate(user)) // this is just a normal pen to non syndicates as they don't know how to switch it on. . = ..() @@ -218,7 +218,7 @@ embedding = embedding.setRating(embed_chance = 100) //rule of cool throwforce = 35 playsound(user, 'sound/weapons/saberon.ogg', 5, 1) - to_chat(user, "[src] is now active.") + to_chat(user, span_warning("[src] is now active.")) var/datum/component/butchering/butchering = src.GetComponent(/datum/component/butchering) butchering.butchering_enabled = on update_icon() diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index ec1126750350..a2bd9f695fce 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -126,7 +126,7 @@ for(var/i = 0, i < copies, i++) var/icon/temp_img if(ishuman(ass) && (ass.get_item_by_slot(SLOT_W_UNIFORM) || ass.get_item_by_slot(SLOT_WEAR_SUIT))) - to_chat(usr, "You 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("You 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. @@ -164,7 +164,7 @@ remove_photocopy(doccopy, usr) doccopy = null else if(check_ass()) - to_chat(ass, "You feel a slight pressure on your ass.") + to_chat(ass, span_notice("You feel a slight pressure on your ass.")) updateUsrDialog() else if(href_list["min"]) if(copies > 1) @@ -180,7 +180,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) @@ -210,7 +210,7 @@ user.put_in_hands(O) else O.forceMove(drop_location()) - to_chat(user, "You take [O] out of [src].") + to_chat(user, span_notice("You take [O] out of [src].")) /obj/machinery/photocopier/attackby(obj/item/O, mob/user, params) if(default_unfasten_wrench(user, O)) @@ -219,7 +219,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 @@ -228,7 +228,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()) @@ -237,7 +237,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()) @@ -246,7 +246,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) @@ -254,13 +254,13 @@ return qdel(O) toner = initial(toner) - to_chat(user, "You insert [O] into [src].") + to_chat(user, span_notice("You 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 ..() @@ -276,30 +276,30 @@ return src.add_fingerprint(user) if(target == user) - user.visible_message("[user] starts climbing onto the photocopier!", "You start climbing onto the photocopier...") + user.visible_message("[user] starts climbing onto the photocopier!", span_notice("You start climbing onto the photocopier...")) else - user.visible_message("[user] starts putting [target] onto the photocopier!", "You start putting [target] onto the photocopier...") + user.visible_message(span_warning("[user] starts putting [target] onto the photocopier!"), span_notice("You 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!", "You climb onto the photocopier.") + user.visible_message("[user] climbs onto the photocopier!", span_notice("You climb onto the photocopier.")) else - user.visible_message("[user] puts [target] onto the photocopier!", "You put [target] onto the photocopier.") + user.visible_message(span_warning("[user] puts [target] onto the photocopier!"), span_notice("You 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/stamps.dm b/code/modules/paperwork/stamps.dm index 2e88a295ba75..e4352d26ffe0 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -14,7 +14,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 3903dd021632..63fe8717a945 100644 --- a/code/modules/paperwork/ticketmachine.dm +++ b/code/modules/paperwork/ticketmachine.dm @@ -55,13 +55,13 @@ tickets.len = screenNum //this helps prevents runtimes that happen due to mapping stuff. Just an extra safety if(!(obj_flags & EMAGGED) && tickets[screenNum]) //if the ticket actually, you know, exists and all - tickets[screenNum].audible_message("\the [tickets[screenNum]] dings!",hearing_distance=1) + tickets[screenNum].audible_message(span_rose("\the [tickets[screenNum]] dings!"),hearing_distance=1) playsound(tickets[screenNum], 'sound/machines/twobeep_high.ogg', 10, 0 ,1-world.view) //The sound travels world.view+extraRange tiles. This last value is the extra range, which means the total range will be 1. /obj/machinery/ticket_machine/emag_act(mob/user) //Emag the ticket machine to dispense burning tickets, as well as randomize its customer number to destroy the HOP's mind. if(obj_flags & EMAGGED) return - to_chat(user, "You overload [src]'s bureaucratic logic circuitry to its MAXIMUM setting.") + to_chat(user, span_warning("You overload [src]'s bureaucratic logic circuitry to its MAXIMUM setting.")) var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(12, 1, src) s.start() @@ -77,7 +77,7 @@ playsound(src, 'sound/machines/terminal_insert_disc.ogg', 100, 0) addtimer(VARSET_CALLBACK(src, ready, TRUE), cooldown) //Small cooldown to prevent the clown from ripping out every ticket currentNum ++ - to_chat(user, "You take a ticket from [src], looks like you're customer #[currentNum]...") + to_chat(user, span_notice("You take a ticket from [src], looks like you're customer #[currentNum]...")) var/obj/item/ticket_machine_ticket/theirticket = new /obj/item/ticket_machine_ticket(get_turf(src)) theirticket.name = "Ticket #[currentNum]" theirticket.source = src @@ -111,16 +111,16 @@ var/obj/item/ticket_machine_remote/Z = O //typecasting!! if (!Z.connection) Z.connection=src - to_chat(user,"You link the remote to the machine.") + to_chat(user,span_info("You link the remote to the machine.")) linked = TRUE return TRUE - to_chat(user,"The remote is already linked to a ticket machine!") + to_chat(user,span_warning("The remote is already linked to a ticket machine!")) else - to_chat(user,"The ticket machine is already linked to a remote!") + to_chat(user,span_warning("The ticket machine is already linked to a remote!")) if(istype(O, /obj/item/ticket_machine_ticket)) - to_chat(user, "You put [O] into the ticket machine's recycling bin.") + to_chat(user, span_warning("You put [O] into the ticket machine's recycling bin.")) qdel(O) //KMC put a delay here. I'm not so forgiving. You accidently shred your ticket, you cry. (Also the delay felt really clunky) return TRUE @@ -160,7 +160,7 @@ ..() if(P.is_hot()) if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10)) - user.visible_message("[user] accidentally ignites [user.p_them()]self!", "You miss the ticket and accidentally light yourself on fire!") + user.visible_message(span_warning("[user] accidentally ignites [user.p_them()]self!"), span_userdanger("You miss the ticket and accidentally light yourself on fire!")) user.dropItemToGround(P) user.adjust_fire_stacks(1) user.IgniteMob() @@ -170,7 +170,7 @@ return user.dropItemToGround(src) - user.visible_message("[user] lights [src] ablaze with [P]!", "You light [src] on fire!") + user.visible_message(span_danger("[user] lights [src] ablaze with [P]!"), span_danger("You light [src] on fire!")) src.fire_act() /obj/item/ticket_machine_ticket/extinguish() @@ -193,7 +193,7 @@ if(!ready) return if(!connection) - to_chat(user,"The remote isn't linked to a ticket machine!") + to_chat(user,span_warning("The remote isn't linked to a ticket machine!")) return ready = FALSE addtimer(VARSET_CALLBACK(src, ready, TRUE), cooldown) @@ -204,11 +204,11 @@ if(connection) connection.linked = FALSE connection = null - to_chat(user,"You unlink the remote from all connections.") + to_chat(user,span_info("You unlink the remote from all connections.")) /obj/item/ticket_machine_remote/examine(mob/user) .=..() if(connection) - .+= "The remote is currently connected to a ticket machine.\nAlt click the remote to sever this connection." + .+= span_info("The remote is currently connected to a ticket machine.\nAlt click the remote to sever this connection.") else - .+= "Click on a ticket machine with this remote to link them." + .+= span_info("Click on a ticket machine with this remote to link them.") diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index 12c62cbaca55..430b4b4756f5 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -46,13 +46,13 @@ /obj/item/camera/attack_self(mob/user) if(!disk) return - to_chat(user, "You eject [disk] out the back of [src].") + to_chat(user, span_notice("You 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 @@ -71,10 +71,10 @@ camera_mode = CAMERA_DESCRIPTION else if(camera_mode == CAMERA_DESCRIPTION) camera_mode = CAMERA_STANDARD - to_chat(user, "You set the [src] to [camera_mode] mode.") + to_chat(user, span_notice("You set the [src] to [camera_mode] mode.")) return - to_chat(user, "This [src] can only be used in the [camera_mode] mode.") // just in-case somone makes a camera that can only be descriptive + to_chat(user, span_notice("This [src] can only be used in the [camera_mode] mode.")) // just in-case somone makes a camera that can only be descriptive /obj/item/camera/attack(mob/living/carbon/human/M, mob/user) return @@ -82,23 +82,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, "You insert [I] into [src].") + to_chat(user, span_notice("You 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, "You slide [I] into the back of [src].") + to_chat(user, span_notice("You 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 ..() @@ -168,7 +168,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)) @@ -256,7 +256,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.")) if(can_customise && camera_mode == CAMERA_DESCRIPTION) var/customise = "No" 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 28a080d5f12a..7dea6cac41f8 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, "You print a photograph.") + to_chat(usr, span_notice("You print a photograph.")) diff --git a/code/modules/photography/photos/frame.dm b/code/modules/photography/photos/frame.dm index 80e23426a2ea..39f1e4a486fb 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, "You carefully remove the photo from \the [src].") + to_chat(user, span_notice("You 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, "You start unsecuring [name]...") + to_chat(user, span_notice("You start unsecuring [name]...")) if(I.use_tool(src, user, 30, volume=50)) playsound(loc, 'sound/items/deconstruct.ogg', 50, 1) - to_chat(user, "You unsecure [name].") + to_chat(user, span_notice("You 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 ba05c5b8230b..bae0b0b8ab5a 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/voice/human/manlaugh1.ogg', 50, 1)//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, "You scribble illegibly on [src]!") + to_chat(user, span_notice("You scribble illegibly on [src]!")) return var/txt = stripped_input(user, "What would you like to write on the back?", "Photo Writing", "", 128) if(txt && user.canUseTopic(src, BE_CLOSE)) @@ -66,11 +66,11 @@ if(in_range(src, user) || isobserver(user)) show(user) else - . += "You need to get closer to get a good look at this photo!" + . += span_warning("You 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 11a683f7ef94..f238a8cc734d 100644 --- a/code/modules/plumbing/ducts.dm +++ b/code/modules/plumbing/ducts.dm @@ -197,16 +197,16 @@ All the important duct code: if(anchored) user.visible_message( \ "[user] unfastens \the [src].", \ - "You unfasten \the [src].", \ - "You hear ratcheting.") + span_notice("You unfasten \the [src]."), \ + span_italics("You hear ratcheting.")) disconnect_duct() else if(can_anchor()) anchored = TRUE active = TRUE user.visible_message( \ "[user] fastens \the [src].", \ - "You fasten \the [src].", \ - "You hear ratcheting.") + span_notice("You fasten \the [src]."), \ + span_italics("You hear ratcheting.")) attempt_connect() return TRUE @@ -236,7 +236,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, "You need to be holding a wrench in your active hand to do that!") + to_chat(user, span_warning("You need to be holding a wrench in your active hand to do that!")) return if(get_dist(src, D) != 1) return diff --git a/code/modules/plumbing/plumbers/pumps.dm b/code/modules/plumbing/plumbers/pumps.dm index 3d920c3604ed..6ae02c3120fc 100644 --- a/code/modules/plumbing/plumbers/pumps.dm +++ b/code/modules/plumbing/plumbers/pumps.dm @@ -35,8 +35,8 @@ /obj/machinery/power/liquid_pump/proc/toggle_active(mob/user, obj/item/I) //we split this in a seperate proc so we can also deactivate if we got no geyser under us geyser = null if(user) - user.visible_message("[user.name] [anchored ? "fasten" : "unfasten"] [src]", \ - "You [anchored ? "fasten" : "unfasten"] [src]") + user.visible_message(span_notice("[user.name] [anchored ? "fasten" : "unfasten"] [src]"), \ + span_notice("You [anchored ? "fasten" : "unfasten"] [src]")) var/datum/component/plumbing/P = GetComponent(/datum/component/plumbing) if(anchored) P.start() @@ -54,7 +54,7 @@ if(!geyser) //we didnt find one, abort toggle_active() anchored = FALSE - visible_message("The [name] makes a sad beep!") + visible_message(span_warning("The [name] makes a sad beep!")) playsound(src, 'sound/machines/buzz-sigh.ogg', 50) return diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 0b8fe108f3f0..e604d5815e50 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -270,7 +270,7 @@ . += {"It's [ !terminal ? "not" : "" ] wired up.\n The electronics are[!has_electronics?"n't":""] installed."} if(user.Adjacent(src) && integration_cog) - . += "[src]'s innards have been replaced by strange brass machinery!" + . += span_warning("[src]'s innards have been replaced by strange brass machinery!") else if (stat & MAINT) @@ -281,12 +281,12 @@ . += "The cover is closed." if(integration_cog && is_servant_of_ratvar(user)) - . += "There is an integration cog installed!" + . += span_brass("There is an integration cog installed!") - . += "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 @@ -438,45 +438,45 @@ 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, "You attempt to remove the power control board..." ) + to_chat(user, span_notice("You 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 charred power control board inside [src.name]!", //Yogs -- Makes this message a bit more clear - "You break the charred power control board and remove the remains.", - "You hear a crack.") + span_notice("You break the charred power control board and remove the remains."), + span_italics("You hear a crack.")) return else if (obj_flags & EMAGGED) obj_flags &= ~EMAGGED user.visible_message(\ "[user.name] has discarded a sparking power control board from [src.name]!", // Yogs -- Makes this message make more sense. - "You discard the emagged power control board.") + span_notice("You discard the emagged power control board.")) return else if (malfhack) user.visible_message(\ "[user.name] has discarded a strange-looking power control board from [src.name]!", //Yogs -- Makes this message make more sense. - "You discard the strangely programmed board.") + span_notice("You 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]!",\ - "You remove the power control board.") + span_notice("You remove the power control board.")) new /obj/item/electronics/apc(loc) return else if(integration_cog) - user.visible_message("[user] starts prying [integration_cog] from [src]...", \ - "You painstakingly start tearing [integration_cog] out of [src]'s guts...") + user.visible_message(span_notice("[user] starts prying [integration_cog] from [src]..."), \ + span_notice("You painstakingly start tearing [integration_cog] out of [src]'s guts...")) W.play_tool_sound(src) if(W.use_tool(src, user, 100)) - user.visible_message("[user] destroys [integration_cog] in [src]!", \ - "[integration_cog] comes free with a clank and snaps in two as the machinery returns to normal!") + user.visible_message(span_notice("[user] destroys [integration_cog] in [src]!"), \ + span_notice("[integration_cog] comes free with a clank and snaps in two as the machinery returns to normal!")) playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE) QDEL_NULL(integration_cog) return @@ -487,10 +487,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 @@ -503,7 +503,7 @@ . = TRUE if(opened) if(cell) - user.visible_message("[user] removes \the [cell] from [src]!","You remove \the [cell].") + user.visible_message("[user] removes \the [cell] from [src]!",span_notice("You remove \the [cell].")) var/turf/T = get_turf(user) cell.forceMove(T) cell.update_icon() @@ -517,22 +517,22 @@ has_electronics = APC_ELECTRONICS_SECURED stat &= ~MAINT W.play_tool_sound(src) - to_chat(user, "You screw the circuit electronics into place.") + to_chat(user, span_notice("You 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, "You unfasten the electronics.") + to_chat(user, span_notice("You 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) @@ -546,19 +546,19 @@ if(!W.tool_start_check(user, amount=3)) return user.visible_message("[user.name] welds [src].", \ - "You start welding the APC frame...", \ - "You hear welding.") + span_notice("You start welding the APC frame..."), \ + span_italics("You 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].",\ - "You disassembled the broken APC frame.") + span_notice("You 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].",\ - "You cut the APC frame from the wall.") + span_notice("You cut the APC frame from the wall.")) qdel(src) return TRUE @@ -569,18 +569,18 @@ 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 your power cell!") + to_chat(user, span_warning("There is no connector for your power cell!")) return if(!user.transferItemToLoc(W, src)) return cell = W user.visible_message(\ "[user.name] has inserted the power cell to [src.name]!",\ - "You insert the power cell.") + span_notice("You insert the power cell.")) chargecount = 0 update_icon() else if (W.GetID()) @@ -590,21 +590,21 @@ if(!host_turf) CRASH("attackby on APC when it's not on a turf") if (host_turf.intact) - to_chat(user, "You must remove the floor plating in front of the APC first!") + to_chat(user, span_warning("You 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, "You need ten lengths of cable for APC!") + to_chat(user, span_warning("You need ten lengths of cable for APC!")) return user.visible_message("[user.name] adds cables to the APC frame.", \ - "You start adding cables to the APC frame...") + span_notice("You start adding cables to the APC frame...")) playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) if(do_after(user, 20, target = src)) if (C.get_amount() < 10 || !C) @@ -616,41 +616,41 @@ do_sparks(5, TRUE, src) return C.use(10) - to_chat(user, "You add cables to the APC frame.") + to_chat(user, span_notice("You 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, "You cannot put the board inside, the frame is damaged!") + to_chat(user, span_warning("You cannot put the board inside, the frame is damaged!")) return user.visible_message("[user.name] inserts the power control board into [src].", \ - "You start to insert the power control board into the frame...") + span_notice("You start to insert the power control board into the frame...")) playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) if(do_after(user, 10, target = src)) if(!has_electronics) has_electronics = APC_ELECTRONICS_INSTALLED locked = FALSE - to_chat(user, "You place the power control board inside the frame.") + to_chat(user, span_notice("You 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].", \ - "You 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("You 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 @@ -658,32 +658,32 @@ C.forceMove(src) cell = C chargecount = 0 - user.visible_message("[user] fabricates a weak power cell and places it into [src].", \ - "Your [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("Your [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, "You found no reason for repairing this APC") + to_chat(user, span_warning("You 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.",\ - "You begin to replace APC's cover...") + span_notice("You begin to replace APC's cover...")) if(do_after(user, 20, target = src)) // replacing cover is quicker than replacing whole frame - to_chat(user, "You replace missing APC's cover.") + to_chat(user, span_notice("You replace missing APC's cover.")) qdel(W) opened = APC_COVER_OPENED update_icon() return if (has_electronics) - to_chat(user, "You cannot repair this APC until you remove the electronics still inside!") + to_chat(user, span_warning("You 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.",\ - "You begin to replace the damaged APC frame...") + span_notice("You begin to replace the damaged APC frame...")) if(do_after(user, 50, target = src)) - to_chat(user, "You replace the damaged APC frame with a new one.") + to_chat(user, span_notice("You replace the damaged APC frame with a new one.")) qdel(W) stat &= ~BROKEN obj_integrity = max_integrity @@ -692,20 +692,20 @@ update_icon() else if(istype(W, /obj/item/clockwork/integration_cog) && is_servant_of_ratvar(user)) if(integration_cog) - to_chat(user, "This APC already has a cog.") + to_chat(user, span_warning("This APC already has a cog.")) return if(!opened) - user.visible_message("[user] slices [src]'s cover lock, and it swings wide open!", \ - "You slice [src]'s cover lock apart with [W], and the cover swings open.") + user.visible_message(span_warning("[user] slices [src]'s cover lock, and it swings wide open!"), \ + span_alloy("You slice [src]'s cover lock apart with [W], and the cover swings open.")) opened = APC_COVER_OPENED update_icon() else - user.visible_message("[user] presses [W] into [src]!", \ - "You hold [W] in place within [src], and it slowly begins to warm up...") + user.visible_message(span_warning("[user] presses [W] into [src]!"), \ + span_alloy("You hold [W] in place within [src], and it slowly begins to warm up...")) playsound(src, 'sound/machines/click.ogg', 50, TRUE) if(!do_after(user, 70, target = src)) return - user.visible_message("[user] installs [W] in [src]!", \ + user.visible_message(span_warning("[user] installs [W] in [src]!"), \ "Replicant alloy rapidly covers the APC's innards, replacing the machinery.
\ This APC will now passively provide power for the cult!") playsound(user, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE) @@ -734,16 +734,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 @@ -752,51 +752,51 @@ 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].", \ - "You 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("You 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].", \ - "Your [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("Your [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 /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, "You must close the cover to swipe an ID card!") + to_chat(user, span_warning("You must close the cover to swipe an ID card!")) else if(panel_open) - to_chat(user, "You must close the panel!") + to_chat(user, span_warning("You 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, "You [ locked ? "lock" : "unlock"] the APC interface.") + to_chat(user, span_notice("You [ 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) @@ -819,23 +819,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, "You must close the cover to swipe an ID card!") + to_chat(user, span_warning("You must close the cover to swipe an ID card!")) else if(panel_open) - to_chat(user, "You must close the panel first!") + to_chat(user, span_warning("You 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, 1) obj_flags |= EMAGGED locked = FALSE - to_chat(user, "You emag the APC interface.") + to_chat(user, span_notice("You emag the APC interface.")) update_icon() @@ -847,7 +847,7 @@ return if(opened && (!issilicon(user))) if(cell) - user.visible_message("[user] removes \the [cell] from [src]!","You remove \the [cell].") + user.visible_message("[user] removes \the [cell] from [src]!",span_notice("You remove \the [cell].")) user.put_in_hands(cell) cell.update_icon() src.cell = null @@ -958,7 +958,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 @@ -1068,10 +1068,10 @@ if(!istype(malf)) return if(istype(malf.loc, /obj/machinery/power/apc)) // Already in an APC - to_chat(malf, "You must evacuate your current APC first!") + to_chat(malf, span_warning("You must evacuate your current APC first!")) return if(!malf.can_shunt) - to_chat(malf, "You cannot shunt!") + to_chat(malf, span_warning("You cannot shunt!")) return if(!is_station_level(z)) return @@ -1104,7 +1104,7 @@ remove_verb(occupier.parent, /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() @@ -1115,19 +1115,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 @@ -1135,30 +1135,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/machines/click.ogg', 50, 1) SEND_SOUND(occupier, sound('sound/misc/notice2.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/machines/buzz-sigh.ogg', 50, 1) 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 43b7e065ec4f..e8423444fa72 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -142,7 +142,7 @@ By design, d1 is the smallest direction and d2 is the highest if(W.tool_behaviour == TOOL_WIRECUTTER) if (shock(user, 50)) return - user.visible_message("[user] cuts the cable.", "You cut the cable.") + user.visible_message("[user] cuts the cable.", span_notice("You cut the cable.")) investigate_log("was cut by [key_name(usr)] in [AREACOORD(src)]", INVESTIGATE_WIRES) add_fingerprint(user) deconstruct() @@ -151,7 +151,7 @@ By design, d1 is the smallest direction and d2 is the highest else if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W if (coil.get_amount() < 1) - to_chat(user, "Not enough cable!") + to_chat(user, span_warning("Not enough cable!")) return coil.cable_join(src, user) @@ -163,9 +163,9 @@ By design, d1 is the smallest direction and d2 is the highest 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) @@ -505,9 +505,9 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai /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/Initialize(mapload, new_amount = null, param_color = null) @@ -536,7 +536,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai 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].", "You 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("You 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)) @@ -585,15 +585,15 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai return if(!isturf(T) || T.intact || !T.can_have_cabling()) - to_chat(user, "You can only lay cables on catwalks and plating!") + to_chat(user, span_warning("You 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, "You can't lay cable at a place that far away!") + to_chat(user, span_warning("You can't lay cable at a place that far away!")) return var/dirn @@ -607,7 +607,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai for(var/obj/structure/cable/LC in T) if(LC.d2 == dirn && LC.d1 == 0) - 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 = get_new_cable(T) @@ -650,7 +650,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai return if(get_dist(C, user) > 1) // make sure it's close enough - to_chat(user, "You can't lay cable at a place that far away!") + to_chat(user, span_warning("You can't lay cable at a place that far away!")) return @@ -666,10 +666,10 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai 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, "You can only lay cables on catwalks and plating!") + to_chat(user, span_warning("You can only lay cables on catwalks and plating!")) return if(U.intact) //can't place a cable if it's a plating with a tile on it - to_chat(user, "You can't lay cable there unless the floor tiles are removed!") + to_chat(user, span_warning("You can't lay cable there unless the floor tiles are removed!")) return else // cable is pointing at us, we're standing on an open tile @@ -680,7 +680,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai for(var/obj/structure/cable/LC in U) // check to make sure there's not a cable there already if(LC.d1 == fdirn || LC.d2 == fdirn) if (showerror) - 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/NC = get_new_cable (U) @@ -725,7 +725,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai continue if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no cable matches either direction if (showerror) - 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 diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 24a47b495214..ced2ef7ac6cf 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/energyharvester.dm b/code/modules/power/energyharvester.dm index 0d85ecd6b3fa..247c821fed70 100644 --- a/code/modules/power/energyharvester.dm +++ b/code/modules/power/energyharvester.dm @@ -90,18 +90,18 @@ obj/item/energy_harvester/Initialize() density = 1 user.visible_message( \ "[user] attaches \the [src] to the cable.", \ - "You attach \the [src] to the cable.", - "You hear some wires being connected to something.") + span_notice("You attach \the [src] to the cable."), + span_italics("You hear some wires being connected to something.")) else - to_chat(user, "This device must be placed over an exposed, powered cable node!") + to_chat(user, span_warning("This device must be placed over an exposed, powered cable node!")) else anchored = 0 density = 0 disconnect_from_network() user.visible_message( \ "[user] detaches \the [src] from the cable.", \ - "You detach \the [src] from the cable.", - "You hear some wires being disconnected from something.") + span_notice("You detach \the [src] from the cable."), + span_italics("You hear some wires being disconnected from something.")) /** Checks if machine works or is still attached to a power node, shuts itself down if nonfunctional and takes itself out of processing queue * If functional, sucks up all the excess power from the powernet and adds it to the accumulated_power var diff --git a/code/modules/power/floodlight.dm b/code/modules/power/floodlight.dm index 05e33472157c..331a13f160f0 100644 --- a/code/modules/power/floodlight.dm +++ b/code/modules/power/floodlight.dm @@ -11,27 +11,27 @@ /obj/structure/floodlight_frame/attackby(obj/item/O, mob/user, params) if(O.tool_behaviour == TOOL_WRENCH && (state == FLOODLIGHT_NEEDS_WRENCHING)) O.play_tool_sound(src, 50) - to_chat(user, "You secure [src].") + to_chat(user, span_notice("You secure [src].")) anchored = TRUE state = FLOODLIGHT_NEEDS_WIRES desc = "A bare metal frame looking vaguely like a floodlight. Requires wiring." 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, "You wire [src].") + to_chat(user, span_notice("You wire [src].")) name = "wired [name]" desc = "A bare metal frame looking vaguely like a floodlight. Requires securing with a screwdriver." 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, "You put lights in [src].") + to_chat(user, span_notice("You put lights in [src].")) var/obj/machinery/power/floodlight/light = new(src.loc) light.connect_to_network() qdel(src) else if(O.tool_behaviour == TOOL_SCREWDRIVER && (state == FLOODLIGHT_NEEDS_SECURING)) O.play_tool_sound(src, 50) - to_chat(user, "You fasten the wiring and electronics in [src].") + to_chat(user, span_notice("You fasten the wiring and electronics in [src].")) name = "secured [name]" desc = "A bare metal frame that looks like a floodlight. Requires light tubes." icon_state = "floodlight_c3" diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 5a9420591d0f..416c3ee8be7c 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -108,7 +108,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] @@ -131,11 +131,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,31 +198,31 @@ if(!panel_open) //connect/disconnect circulators if(!anchored) - to_chat(user, "Anchor [src] before trying to connect the circulators!") + to_chat(user, span_warning("Anchor [src] before trying to connect the circulators!")) return TRUE else if(hot_circ && cold_circ) - to_chat(user, "You start removing the circulators...") + to_chat(user, span_notice("You start removing the circulators...")) if(I.use_tool(src, user, 30, volume=50)) kill_circs() update_icon() - to_chat(user, "You disconnect [src]'s circulator links.") + to_chat(user, span_notice("You disconnect [src]'s circulator links.")) playsound(src, 'sound/misc/box_deploy.ogg', 50) return TRUE - to_chat(user, "You attempt to attach the circulators...") + to_chat(user, span_notice("You attempt to attach the circulators...")) if(I.use_tool(src, user, 30, volume=50)) switch(find_circs()) if(0) - to_chat(user, "No circulators found!") + to_chat(user, span_warning("No circulators found!")) if(1) - to_chat(user, "Only one circulator found!") + to_chat(user, span_warning("Only one circulator found!")) if(2) - to_chat(user, "You connect [src]'s circulator links.") + to_chat(user, span_notice("You connect [src]'s circulator links.")) playsound(src, 'sound/misc/box_deploy.ogg', 50) return TRUE if(3) - to_chat(user, "Both circulators are the same mode!") + to_chat(user, span_warning("Both circulators are the same mode!")) return TRUE anchored = !anchored @@ -230,7 +230,7 @@ if(!anchored) kill_circs() connect_to_network() - to_chat(user, "You [anchored?"secure":"unsecure"] [src].") + to_chat(user, span_notice("You [anchored?"secure":"unsecure"] [src].")) update_icon() return TRUE @@ -241,11 +241,11 @@ return if(hot_circ && cold_circ) - to_chat(user, "Disconnect the circulators first!") + to_chat(user, span_warning("Disconnect the circulators first!")) return TRUE panel_open = !panel_open I.play_tool_sound(src) - to_chat(user, "You [panel_open?"open":"close"] the panel on [src].") + to_chat(user, span_notice("You [panel_open?"open":"close"] the panel on [src].")) update_icon() return TRUE @@ -254,10 +254,10 @@ return if(anchored) - to_chat(user, "[src] is anchored!") + to_chat(user, span_warning("[src] is anchored!")) return TRUE else if(!panel_open) - to_chat(user, "Open the panel first!") + to_chat(user, span_warning("Open the panel first!")) return TRUE else default_deconstruction_crowbar(I) diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 7a33bd66e977..079ae9e8d99b 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -187,7 +187,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, "You secure the screws of the framework.") + to_chat(user, span_notice("You secure the screws of the framework.")) I.play_tool_sound(src) broken_state++ update_icon() @@ -195,7 +195,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, "You mend the damaged framework.") + to_chat(user, span_notice("You mend the damaged framework.")) broken_state++ update_icon() return @@ -204,16 +204,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, "You add the plating to the framework.") + to_chat(user, span_notice("You add the plating to the framework.")) playsound(src.loc, 'sound/machines/click.ogg', 75, 1) broken_state++ update_icon() else - to_chat(user, "You need 10 sheets of plasteel!") + to_chat(user, span_warning("You need 10 sheets of plasteel!")) return if(GRAV_NEEDS_WRENCH) if(I.tool_behaviour == TOOL_WRENCH) - to_chat(user, "You secure the plating to the framework.") + to_chat(user, span_notice("You secure the plating to the framework.")) I.play_tool_sound(src) set_fix() return diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 8c5aa07ae09e..6f954349fa88 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, "You cannot place [src] in this area!") + to_chat(user, span_warning("You 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]!","You remove [cell].") + user.visible_message("[user] removes [cell] from [src]!",span_notice("You 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, "You telekinetically remove [cell].") + to_chat(user, span_notice("You telekinetically remove [cell].")) cell.forceMove(drop_location()) cell.attack_tk(user) cell = null @@ -102,37 +102,37 @@ 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].", \ - "You add [W] to [src].") + user.visible_message(span_notice("[user] hooks up [W] to [src]."), \ + span_notice("You add [W] to [src].")) playsound(src, 'sound/machines/click.ogg', 50, TRUE) W.forceMove(src) cell = W add_fingerprint(user) return else if (istype(W, /obj/item/light)) - to_chat(user, "This [name] isn't finished being setup!") + to_chat(user, span_warning("This [name] isn't finished being setup!")) return switch(stage) if(1) if(W.tool_behaviour == TOOL_WRENCH) if(cell) - to_chat(user, "You have to remove the cell first!") + to_chat(user, span_warning("You have to remove the cell first!")) return else - to_chat(user, "You begin deconstructing [src]...") + to_chat(user, span_notice("You 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].", \ - "You deconstruct [src].", "You hear a ratchet.") + span_notice("You deconstruct [src]."), span_italics("You hear a ratchet.")) playsound(src, 'sound/items/deconstruct.ogg', 75, 1) qdel(src) return @@ -143,13 +143,13 @@ icon_state = "[fixture_type]-construct-stage2" stage = 2 user.visible_message("[user.name] adds wires to [src].", \ - "You add wires to [src].") + span_notice("You add wires to [src].")) else - to_chat(user, "You need one length of cable to wire [src]!") + to_chat(user, span_warning("You need one length of cable to wire [src]!")) return if(2) if(W.tool_behaviour == TOOL_WRENCH) - to_chat(usr, "You have to remove the wires first!") + to_chat(usr, span_warning("You have to remove the wires first!")) return if(W.tool_behaviour == TOOL_WIRECUTTER) @@ -157,13 +157,13 @@ 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].", \ - "You remove the wiring from [src].", "You hear clicking.") + span_notice("You remove the wiring from [src]."), span_italics("You hear clicking.")) W.play_tool_sound(src, 100) return if(W.tool_behaviour == TOOL_SCREWDRIVER) user.visible_message("[user.name] closes [src]'s casing.", \ - "You close [src]'s casing.", "You hear screwing.") + span_notice("You close [src]'s casing."), span_italics("You hear screwing.")) W.play_tool_sound(src, 75) switch(fixture_type) if("tube") @@ -468,7 +468,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 @@ -479,9 +479,9 @@ src.add_fingerprint(user) if(status != LIGHT_EMPTY) drop_light_tube(user) - to_chat(user, "You replace [L].") + to_chat(user, span_notice("You replace [L].")) else - to_chat(user, "You insert [L].") + to_chat(user, span_notice("You insert [L].")) status = L.status switchcount = L.switchcount rigged = L.rigged @@ -494,7 +494,7 @@ 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]!")) // hit the light socket with umbral tendrils, instantly breaking the light as opposed to RNG //yogs else if(istype(W, /obj/item/umbral_tendrils)) break_light_tube() @@ -505,10 +505,10 @@ 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.", \ - "You open [src]'s casing.", "You hear a noise.") + span_notice("You open [src]'s casing."), span_italics("You hear a noise.")) deconstruct() else - to_chat(user, "You stick \the [W] into the light socket!") + to_chat(user, span_userdanger("You stick \the [W] into the light socket!")) if(has_power() && (W.flags_1 & CONDUCT_1)) do_sparks(3, TRUE, src) if (prob(75)) @@ -607,7 +607,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) @@ -635,7 +635,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 @@ -661,14 +661,14 @@ if(istype(H)) var/datum/species/ethereal/eth_species = H.dna?.species if(istype(eth_species)) - to_chat(H, "You start channeling some power through the [fitting] into your body.") + to_chat(H, span_notice("You start channeling some power through the [fitting] into your body.")) if(do_after(user, 50, target = src)) var/obj/item/organ/stomach/ethereal/stomach = H.getorganslot(ORGAN_SLOT_STOMACH) if(istype(stomach)) - to_chat(H, "You receive some charge from the [fitting].") + to_chat(H, span_notice("You receive some charge from the [fitting].")) stomach.adjust_charge(5) else - to_chat(H, "You can't receive charge from the [fitting].") + to_chat(H, span_notice("You can't receive charge from the [fitting].")) return if(H.gloves) @@ -679,18 +679,18 @@ prot = 1 if(prot > 0 || HAS_TRAIT(user, TRAIT_RESISTHEAT) || HAS_TRAIT(user, TRAIT_RESISTHEATHANDS)) - to_chat(user, "You remove the light [fitting].") + to_chat(user, span_notice("You remove the light [fitting].")) else if(istype(user) && user.dna.check_mutation(TK)) - to_chat(user, "You telekinetically remove the light [fitting].") + to_chat(user, span_notice("You telekinetically remove the light [fitting].")) else - to_chat(user, "You try to remove the light [fitting], but you burn your hand on it!") + to_chat(user, span_warning("You try to remove the light [fitting], but you burn your hand on it!")) var/obj/item/bodypart/affecting = H.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") if(affecting && affecting.receive_damage( 0, 5 )) // 5 burn damage H.update_damage_overlays() return // if burned, don't remove the light else - to_chat(user, "You remove the light [fitting].") + to_chat(user, span_notice("You remove the light [fitting].")) // create a light tube/bulb item and put it in the user's hand drop_light_tube(user) @@ -720,7 +720,7 @@ to_chat(user, "There is no [fitting] in this light.") return - to_chat(user, "You telekinetically remove the light [fitting].") + to_chat(user, span_notice("You 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) @@ -796,10 +796,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 @@ -870,7 +870,7 @@ if(istype(I, /obj/item/reagent_containers/syringe)) var/obj/item/reagent_containers/syringe/S = I - to_chat(user, "You inject the solution into \the [src].") + to_chat(user, span_notice("You inject the solution into \the [src].")) if(S.reagents.has_reagent(/datum/reagent/toxin/plasma, 5)) @@ -891,7 +891,7 @@ /obj/item/light/proc/shatter() if(status == LIGHT_OK || status == LIGHT_BURNED) - visible_message("[src] shatters.","You hear a small glass object shatter.") + visible_message(span_danger("[src] shatters."),span_italics("You hear a small glass object shatter.")) status = LIGHT_BROKEN force = 5 playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1) diff --git a/code/modules/power/monitor.dm b/code/modules/power/monitor.dm index 48d22dd45dcd..85ed8a032698 100644 --- a/code/modules/power/monitor.dm +++ b/code/modules/power/monitor.dm @@ -28,7 +28,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/port_gen.dm b/code/modules/power/port_gen.dm index ae624ebf862f..ad2772f03c94 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -115,9 +115,9 @@ /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]%." @@ -174,9 +174,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, "You add [amount] sheets to the [src.name].") + to_chat(user, span_notice("You add [amount] sheets to the [src.name].")) sheets += amount addstack.use(amount) return @@ -185,11 +185,11 @@ if(!anchored && !isinspace()) anchored = TRUE connect_to_network() - to_chat(user, "You secure the generator to the floor.") + to_chat(user, span_notice("You secure the generator to the floor.")) else if(anchored) anchored = FALSE disconnect_from_network() - to_chat(user, "You unsecure the generator from the floor.") + to_chat(user, span_notice("You unsecure the generator from the floor.")) playsound(src, 'sound/items/deconstruct.ogg', 50, 1) return @@ -197,9 +197,9 @@ panel_open = !panel_open O.play_tool_sound(src) if(panel_open) - to_chat(user, "You open the access panel.") + to_chat(user, span_notice("You open the access panel.")) else - to_chat(user, "You close the access panel.") + to_chat(user, span_notice("You close the access panel.")) return else if(default_deconstruction_crowbar(O)) return diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm index 15b950c996e2..1b88394c5d90 100644 --- a/code/modules/power/rtg.dm +++ b/code/modules/power/rtg.dm @@ -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!",\ - "You hear a loud electrical crack!") + visible_message(span_danger("\The [src] lets out a shower of sparks as it starts to lose stability!"),\ + span_italics("You hear a loud electrical crack!")) playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5) tesla_zap(src, 5, power_gen * 0.05) addtimer(CALLBACK(GLOBAL_PROC, .proc/explosion, get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion. diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 31e7890e3e11..a02081a9f5e1 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -75,19 +75,19 @@ if(!src.locked) toggle_power() user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \ - "You turn the [src.name] [active? "on":"off"].") + span_notice("You turn the [src.name] [active? "on":"off"].")) var/fuel = loaded_tank.air_contents.get_moles(/datum/gas/plasma) investigate_log("turned [active?"on":"off"] by [key_name(user)]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"It is empty"].", INVESTIGATE_SINGULO) investigate_log("turned [active?"on":"off"] by [key_name(user)]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"It is empty"].", INVESTIGATE_SUPERMATTER) // yogs - so supermatter investigate is useful 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 ..() @@ -102,13 +102,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 @@ -132,12 +132,12 @@ if(allowed(user)) if(active) locked = !locked - to_chat(user, "You [locked ? "lock" : "unlock"] the controls.") + to_chat(user, span_notice("You [locked ? "lock" : "unlock"] the controls.")) return TRUE 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.")) /obj/machinery/power/rad_collector/AltClick(mob/user) if(!user.canUseTopic(src, BE_CLOSE) || issilicon(user)) @@ -152,7 +152,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 @@ -160,27 +160,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, "You [bitcoinmining ? "enable":"disable"] the research point production feature of [src].") + to_chat(user, span_warning("You [bitcoinmining ? "enable":"disable"] the research point production feature of [src].")) return TRUE /obj/machinery/power/rad_collector/analyzer_act(mob/living/user, obj/item/I) diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index f7668c8b832d..756d096fc62d 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -51,7 +51,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 @@ -116,9 +116,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!", \ - "You hear an electrical crack.") + user.visible_message(span_danger("[user.name] was shocked by the [src.name]!"), \ + span_userdanger("Energy pulse detected, system damaged!"), \ + span_italics("You 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 834c415328c3..909e3d9c71fb 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -103,7 +103,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 @@ -127,15 +127,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, "You turn off [src].") + to_chat(user, span_notice("You turn off [src].")) else active = TRUE - to_chat(user, "You turn on [src].") + to_chat(user, span_notice("You turn on [src].")) shot_number = 0 fire_delay = maximum_fire_delay @@ -146,16 +146,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) @@ -243,12 +243,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 ..() @@ -272,26 +272,26 @@ 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.", \ - "You start to weld \the [src] to the floor...", \ - "You hear welding.") + span_notice("You start to weld \the [src] to the floor..."), \ + span_italics("You hear welding.")) if(I.use_tool(src, user, 20, volume=50) && state == EMITTER_WRENCHED) state = EMITTER_WELDED - to_chat(user, "You weld \the [src] to the floor.") + to_chat(user, span_notice("You weld \the [src] to the floor.")) connect_to_network() 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.", \ - "You start to cut \the [src] free from the floor...", \ - "You hear welding.") + span_notice("You start to cut \the [src] free from the floor..."), \ + span_italics("You hear welding.")) if(I.use_tool(src, user, 20, volume=50) && state == EMITTER_WELDED) state = EMITTER_WRENCHED - to_chat(user, "You cut \the [src] free from the floor.") + to_chat(user, span_notice("You cut \the [src] free from the floor.")) disconnect_from_network() return TRUE @@ -325,16 +325,16 @@ if(!user.canUseTopic(src, !issilicon(user))) return 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, "You [src.locked ? "lock" : "unlock"] the controls.") + to_chat(user, span_notice("You [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 /obj/machinery/power/emitter/proc/integrate(obj/item/gun/energy/E,mob/user) @@ -374,7 +374,7 @@ locked = FALSE obj_flags |= EMAGGED if(user) - user.visible_message("[user.name] emags [src].","You short out the lock.") + user.visible_message("[user.name] emags [src].",span_notice("You 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 dea8cedf808e..3b54352a25c5 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -71,28 +71,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, "You are unable to turn off [src] once it is online!") + to_chat(user, span_warning("You are unable to turn off [src] once it is online!")) return 1 else user.visible_message("[user] turns on [src].", \ - "You turn on [src].", \ - "You hear heavy droning.") + span_notice("You turn on [src]."), \ + span_italics("You 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 ..() @@ -111,32 +111,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.", \ - "You start to weld \the [src] to the floor...", \ - "You hear welding.") + span_notice("You start to weld \the [src] to the floor..."), \ + span_italics("You hear welding.")) if(I.use_tool(src, user, 20, volume=50) && state == FG_SECURED) state = FG_WELDED - to_chat(user, "You weld the field generator to the floor.") + to_chat(user, span_notice("You 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.", \ - "You start to cut \the [src] free from the floor...", \ - "You hear welding.") + span_notice("You start to cut \the [src] free from the floor..."), \ + span_italics("You hear welding.")) if(I.use_tool(src, user, 20, volume=50) && state == FG_WELDED) state = FG_SECURED - to_chat(user, "You cut \the [src] free from the floor.") + to_chat(user, span_notice("You cut \the [src] free from the floor.")) return TRUE @@ -145,7 +145,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) @@ -204,7 +204,7 @@ field_generator power level display check_power_level() return 1 else - visible_message("The [name] shuts down!", "You hear something shutting down.") + visible_message(span_danger("The [name] shuts down!"), span_italics("You 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 d733bd1f73be..79e1b70bb96f 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -29,7 +29,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/creatures/narsie_rises.ogg') var/area/A = get_area(src) @@ -136,7 +136,7 @@ for(var/mob/living/carbon/M in viewers(consume_range, src)) if(M.stat == CONSCIOUS) if(!iscultist(M)) - to_chat(M, "You feel conscious thought crumble away in an instant as you gaze upon [src.name]...") + to_chat(M, span_cultsmall("You feel conscious thought crumble away in an instant as you gaze upon [src.name]...")) M.apply_effect(60, EFFECT_STUN) @@ -192,7 +192,7 @@ /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.") diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 097a64fd55eb..d97cad73d427 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -272,7 +272,7 @@ /obj/machinery/particle_accelerator/control_box/proc/is_interactive(mob/user) if(!interface_control) - to_chat(user, "ERROR: Request timed out. Check wire contacts.") + to_chat(user, span_alert("ERROR: Request timed out. Check wire contacts.")) return FALSE if(construction_state != PA_CONSTRUCTION_COMPLETE) return FALSE diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 6f2c83711a55..03562885ccbf 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -90,7 +90,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!", "Your head feels like it's collapsing in on itself! This was really not a good idea!", "You hear something crack and explode in gore.") + C.visible_message(span_danger("[C]'s head begins to collapse in on itself!"), span_userdanger("Your head feels like it's collapsing in on itself! This was really not a good idea!"), span_italics("You 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) @@ -437,8 +437,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!", \ - "You feel an inner fire as your skin bursts into flames!") + C.visible_message(span_warning("[C]'s skin bursts into flame!"), \ + span_userdanger("You feel an inner fire as your skin bursts into flames!")) C.adjust_fire_stacks(5) C.IgniteMob() return @@ -455,12 +455,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, "You look directly into the [src.name], good thing you had your protective eyewear on!") + to_chat(H, span_notice("You look directly into the [src.name], good thing you had your protective eyewear on!")) return M.apply_effect(60, EFFECT_STUN) - M.visible_message("[M] stares blankly at the [src.name]!", \ - "You look directly into the [src.name] and feel weak.") + M.visible_message(span_danger("[M] stares blankly at the [src.name]!"), \ + span_userdanger("You look directly into the [src.name] and feel weak.")) return @@ -483,7 +483,7 @@ var/all_powerful = FALSE /// will it spawn an actual singularity when someone suicides with it /obj/item/singularity_shard/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is trying to break open the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is trying to break open the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) addtimer(CALLBACK(user, /mob/.proc/gib), 99) addtimer(CALLBACK(src, .proc/spawnsing), 100) return MANUAL_SUICIDE diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 88abdf2f7c99..7fce1516f380 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -42,7 +42,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() . = ..() @@ -89,10 +89,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() @@ -105,25 +105,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, "You must open the maintenance panel first!") + to_chat(user, span_warning("You must open the maintenance panel first!")) return var/turf/T = get_turf(user) if (T.intact) //is the floor plating removed ? - to_chat(user, "You must first remove the floor plating!") + to_chat(user, span_warning("You must first remove the floor plating!")) return var/obj/item/stack/cable_coil/C = I if(C.get_amount() < 10) - to_chat(user, "You need more wires!") + to_chat(user, span_warning("You need more wires!")) return - to_chat(user, "You start building the power terminal...") + to_chat(user, span_notice("You start building the power terminal...")) playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) if(do_after(user, 20, target = src)) @@ -137,7 +137,7 @@ C.use(10) user.visible_message(\ "[user.name] has built a power terminal.",\ - "You build the power terminal.") + span_notice("You build the power terminal.")) //build the terminal and link it to the network make_terminal(T) @@ -167,7 +167,7 @@ /obj/machinery/power/smes/default_deconstruction_crowbar(obj/item/crowbar/C) if(istype(C) && terminal) - to_chat(usr, "You must first remove the power terminal!") + to_chat(usr, span_warning("You must first remove the power terminal!")) return FALSE return ..() diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 65e86da6f3b4..61758e6b3993 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -68,10 +68,10 @@ /obj/machinery/power/solar/crowbar_act(mob/user, obj/item/I) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - user.visible_message("[user] begins to take the glass off [src].", "You begin to take the glass off [src]...") + user.visible_message("[user] begins to take the glass off [src].", span_notice("You begin to take the glass off [src]...")) if(I.use_tool(src, user, 50)) playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) - user.visible_message("[user] takes the glass off [src].", "You take the glass off [src].") + user.visible_message("[user] takes the glass off [src].", span_notice("You take the glass off [src].")) deconstruct(TRUE) return TRUE @@ -225,32 +225,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, "You can't secure [src] here.") + to_chat(user, span_warning("You can't secure [src] here.")) return anchored = !anchored if(anchored) - user.visible_message("[user] wrenches the solar assembly into place.", "You wrench the solar assembly into place.") + user.visible_message("[user] wrenches the solar assembly into place.", span_notice("You wrench the solar assembly into place.")) W.play_tool_sound(src, 75) else - user.visible_message("[user] unwrenches the solar assembly from its place.", "You unwrench the solar assembly from its place.") + user.visible_message("[user] unwrenches the solar assembly from its place.", span_notice("You 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, "You need to secure the assembly before you can add glass.") + to_chat(user, span_warning("You 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/machines/click.ogg', 50, 1) - user.visible_message("[user] places the glass on the solar assembly.", "You place the glass on the solar assembly.") + user.visible_message("[user] places the glass on the solar assembly.", span_notice("You 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, "You need two sheets of glass to put them into a solar panel!") + to_chat(user, span_warning("You need two sheets of glass to put them into a solar panel!")) return return 1 @@ -260,13 +260,13 @@ return tracker = 1 qdel(W) - user.visible_message("[user] inserts the electronics into the solar assembly.", "You insert the electronics into the solar assembly.") + user.visible_message("[user] inserts the electronics into the solar assembly.", span_notice("You 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.", "You take out the electronics from the solar assembly.") + user.visible_message("[user] takes out the electronics from the solar assembly.", span_notice("You take out the electronics from the solar assembly.")) return 1 return ..() @@ -402,7 +402,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 ) @@ -414,7 +414,7 @@ A.anchored = TRUE qdel(src) else - to_chat(user, "You disconnect the monitor.") + to_chat(user, span_notice("You 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 945f3ff8466b..770c9ee54e1e 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -230,7 +230,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))) - . += "You get headaches just from looking at it." + . += span_danger("You get headaches just from looking at it.") /obj/machinery/power/supermatter_crystal/proc/get_status() var/turf/T = get_turf(src) @@ -351,7 +351,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) var/turf/T2 = get_turf(M) if(T2.z == z) SEND_SOUND(M, 'sound/magic/charge.ogg') - to_chat(M, "You feel reality distort for a moment...") + to_chat(M, span_boldannounce("You feel reality distort for a moment...")) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "delam", /datum/mood_event/delam) if(combined_gas > MOLE_PENALTY_THRESHOLD) message_admins("[src] has collapsed into a singularity. [ADMIN_JMP(src)].") @@ -411,7 +411,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 //Ok, get the air from the turf @@ -693,11 +693,11 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) investigate_log("Supermatter shard consumed by singularity.", INVESTIGATE_SINGULO) investigate_log("Supermatter shard consumed by singularity.", INVESTIGATE_SUPERMATTER) // yogs - so supermatter investigate is actually useful 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_userdanger("[src] is consumed by the singularity!")) for(var/mob/M in GLOB.player_list) if(M.z == z) SEND_SOUND(M, 'sound/effects/supermatter.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 @@ -706,18 +706,18 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1) 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!",\ - "You 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_italics("You 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.",\ - "You 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_italics("You 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_userdanger("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) @@ -736,8 +736,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) else murder = S.attacktext dust_mob(S, \ - "[S] unwisely [murder] [src], and [S.p_their()] body burns brilliantly before flashing into ash!", \ - "You 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_userdanger("You 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) @@ -757,12 +757,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 = "You 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_userdanger("You 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, "You hear an unearthly noise as a wave of heat washes over you.") + nom.visible_message(vis_msg, mob_msg, span_italics("You 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/effects/supermatter.ogg', 50, 1) Consume(nom) @@ -781,40 +781,40 @@ 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/effects/supermatter.ogg', 150, 1) Consume(dust_arm) qdel(W) return if(cig.lit || user.a_intent != 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/effects/supermatter.ogg', 150, 1) 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...",\ + user.visible_message(span_danger("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.") playsound(src, 'sound/effects/supermatter.ogg', 50, 1) radiation_pulse(src, 50, 3) return if(istype(W, /obj/item/scalpel/supermatter)) var/obj/item/scalpel/supermatter/scalpel = W - to_chat(user, "You carefully begin to scrape \the [src] with \the [W]...") + to_chat(user, span_notice("You carefully begin to scrape \the [src] with \the [W]...")) if(W.use_tool(src, user, 60, volume=100)) if (scalpel.usesLeft) - to_chat(user, "You extract a sliver from \the [src]. \The [src] begins to react violently!") + to_chat(user, span_danger("You extract a sliver from \the [src]. \The [src] begins to react violently!")) investigate_log("[key_name(user)] extracts a sliver of \the [src].", INVESTIGATE_SUPERMATTER)//Yogs -- SM sliver logs message_admins("[key_name(user)] extracted a sliver of \the [src].")//Yogs -- SM sliver logs 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, "You fail to extract a sliver from \The [src]. \the [W] isn't sharp enough anymore!") + to_chat(user, span_notice("You fail to extract a sliver from \The [src]. \the [W] isn't sharp enough anymore!")) if(istype(W, /obj/item/supermatter_corruptor)) if(corruptor_attached) to_chat(user, "A corruptor is already attached!") @@ -845,9 +845,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) qdel(W) return else if(user.dropItemToGround(W)) - user.visible_message("As [user] touches \the [src] with \a [W], silence fills the room...",\ + user.visible_message(span_danger("As [user] touches \the [src] with \a [W], silence fills the room..."),\ "You 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.") + span_italics("Everything suddenly goes silent.")) investigate_log("has been attacked ([W]) by [key_name(user)]", INVESTIGATE_SUPERMATTER) Consume(W) playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1) @@ -860,12 +860,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!",\ - "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\ - "You 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_userdanger("You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\""),\ + span_italics("You 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,\ - "You 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_italics("You hear a loud crack as you are washed with a wave of heat.")) else return @@ -902,10 +902,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("You hear an unearthly ringing and notice your skin is covered in fresh radiation burns.", MSG_AUDIBLE) + L.show_message(span_italics("You 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) @@ -952,9 +952,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!",\ - "You 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_userdanger("A sudden gravitational pulse knocks you down!"),\ + span_italics("You 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 3860d056459d..9e14c1e12b32 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -51,14 +51,14 @@ if(isturf(loc)) var/turf/T = loc if(T.intact) - to_chat(user, "You must first expose the power terminal!") + to_chat(user, span_warning("You 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].", - "You begin to cut the cables...") + span_notice("You begin to cut the cables...")) playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) if(I.use_tool(src, user, 50)) @@ -70,7 +70,7 @@ return new /obj/item/stack/cable_coil(drop_location(), 10) - to_chat(user, "You cut the cables and dismantle the power terminal.") + to_chat(user, span_notice("You 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/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 8508d7b713d4..52878cdd65fa 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -154,7 +154,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_userdanger("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 ab0651147765..475427b80168 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -55,10 +55,10 @@ /obj/machinery/power/tracker/crowbar_act(mob/user, obj/item/I) playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) - user.visible_message("[user] begins to take the glass off [src].", "You begin to take the glass off [src]...") + user.visible_message(span_notice("[user] begins to take the glass off [src]."), span_notice("You begin to take the glass off [src]...")) if(I.use_tool(src, user, 50)) playsound(src.loc, 'sound/items/deconstruct.ogg', 50, TRUE) - user.visible_message("[user] takes the glass off [src].", "You take the glass off [src].") + user.visible_message(span_notice("[user] takes the glass off [src]."), span_notice("You take the glass off [src].")) deconstruct(TRUE) return TRUE diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 16f9024e99ed..d4e4fc1fbf23 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -119,10 +119,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 @@ -254,10 +254,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 d1fed99d2b11..0ce8f5b8cafe 100644 --- a/code/modules/projectiles/ammunition/_ammunition.dm +++ b/code/modules/projectiles/ammunition/_ammunition.dm @@ -59,9 +59,9 @@ continue if (boolets > 0) box.update_icon() - to_chat(user, "You collect [boolets] shell\s. [box] now contains [box.stored_ammo.len] shell\s.") + to_chat(user, span_notice("You collect [boolets] shell\s. [box] now contains [box.stored_ammo.len] shell\s.")) else - to_chat(user, "You fail to collect anything!") + to_chat(user, span_warning("You 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 0b192893dc2d..e1f8c72bc16a 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, "You pop the safety cap off [src].") + to_chat(user, span_notice("You 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, "You insert [A] into [src].") + to_chat(user, span_notice("You 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, "You remove [FD.pen] from [src].") + to_chat(user, span_notice("You 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 492981197f25..70f1b95159d1 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -112,7 +112,7 @@ if(num_loaded) if(!silent) - to_chat(user, "You load [num_loaded] shell\s into \the [src]!") + to_chat(user, span_notice("You load [num_loaded] shell\s into \the [src]!")) playsound(src, 'sound/weapons/bulletinsert.ogg', 60, TRUE) A.update_icon() update_icon() @@ -125,7 +125,7 @@ if(!user.is_holding(src) || !user.put_in_hands(A)) //incase they're using TK A.bounce_away(FALSE, NONE) playsound(src, 'sound/weapons/bulletinsert.ogg', 60, TRUE) - to_chat(user, "You remove a round from [src]!") + to_chat(user, span_notice("You 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 724c627ad609..5813f1854800 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -158,7 +158,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) @@ -172,9 +172,9 @@ playsound(user, fire_sound, fire_sound_volume, vary_fire_sound) if(message) if(pointblank) - user.visible_message("[user] fires [src] point blank at [pbtarget]!", null, null, COMBAT_MESSAGE_RANGE) + user.visible_message(span_danger("[user] fires [src] point blank at [pbtarget]!"), null, null, COMBAT_MESSAGE_RANGE) else - user.visible_message("[user] fires [src]!", null, null, COMBAT_MESSAGE_RANGE) + user.visible_message(span_danger("[user] fires [src]!"), null, null, COMBAT_MESSAGE_RANGE) /obj/item/gun/emp_act(severity) . = ..() @@ -221,7 +221,7 @@ return if(weapon_weight == WEAPON_HEAVY && user.get_inactive_held_item()) - to_chat(user, "You need both hands free to fire \the [src]!") + to_chat(user, span_userdanger("You need both hands free to fire \the [src]!")) return //DUAL (or more!) WIELDING @@ -243,7 +243,7 @@ if(clumsy_check) if(istype(user)) if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40)) - to_chat(user, "You shoot yourself in the foot with [src]!") + to_chat(user, span_userdanger("You shoot yourself 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) @@ -262,7 +262,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() @@ -279,7 +279,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_notice(" [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_notice(" [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) @@ -390,7 +390,7 @@ if(!gun_light) if(!user.transferItemToLoc(I, src)) return - to_chat(user, "You click [S] into place on [src].") + to_chat(user, span_notice("You click [S] into place on [src].")) if(S.on) set_light(0) gun_light = S @@ -404,7 +404,7 @@ return ..() if(!user.transferItemToLoc(I, src)) return - to_chat(user, "You attach [K] to [src]'s bayonet lug.") + to_chat(user, span_notice("You 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? @@ -439,7 +439,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, "You [removal_verb ? removal_verb : "remove"] [item_to_remove] from [src].") + to_chat(user, span_notice("You [removal_verb ? removal_verb : "remove"] [item_to_remove] from [src].")) item_to_remove.forceMove(drop_location()) if(Adjacent(user) && !issilicon(user)) @@ -481,7 +481,7 @@ var/mob/living/carbon/human/user = usr gun_light.on = !gun_light.on - to_chat(user, "You toggle the gunlight [gun_light.on ? "on":"off"].") + to_chat(user, span_notice("You toggle the gunlight [gun_light.on ? "on":"off"].")) playsound(user, 'sound/weapons/empty.ogg', 100, TRUE) update_gunlight() @@ -529,26 +529,26 @@ return if(user == target) - target.visible_message("[user] sticks [src] in [user.p_their()] mouth, ready to pull the trigger...", \ - "You 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_userdanger("You 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_userdanger("[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_userdanger("[(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 f2f3f02bb317..242106f5c77c 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -242,11 +242,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, "You rack the [bolt_wording] of \the [src].") + to_chat(user, span_notice("You rack the [bolt_wording] of \the [src].")) process_chamber(!chambered, FALSE) if (bolt_type == BOLT_TYPE_LOCKING && !chambered) bolt_locked = TRUE @@ -261,7 +261,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, "You drop the [bolt_wording] of \the [src].") + to_chat(user, span_notice("You drop the [bolt_wording] of \the [src].")) bolt_locked = FALSE feedback("slide_close") chamber_round() @@ -270,14 +270,14 @@ ///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)) if(reload_say && AM.ammo_count() && !get_ammo(FALSE, FALSE)) user.say(reload_say, forced = "reloading") magazine = AM if (display_message) - to_chat(user, "You load a new [magazine_wording] into \the [src].") + to_chat(user, span_notice("You load a new [magazine_wording] into \the [src].")) playsound(src, load_empty_sound, load_sound_volume, load_sound_vary) feedback("mag_in") if (bolt_type == BOLT_TYPE_OPEN && !bolt_locked) @@ -285,7 +285,7 @@ update_icon() return TRUE else - to_chat(user, "You cannot seem to get \the [src] out of your hands!") + to_chat(user, span_warning("You 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 @@ -302,21 +302,21 @@ var/obj/item/ammo_box/magazine/old_mag = magazine if (tac_load) if (insert_magazine(user, tac_load, FALSE)) - to_chat(user, "You perform a tactical reload on \the [src].") + to_chat(user, span_notice("You perform a tactical reload on \the [src].")) playsound(src, load_empty_sound, load_sound_volume, load_sound_vary) feedback("mag_out") playsound(src, load_sound, load_sound_volume, load_sound_vary) feedback("mag_in") else feedback("mag_out") - to_chat(user, "You dropped the old [magazine_wording], but the new one doesn't fit. How embarassing.") + to_chat(user, span_warning("You 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, "You pull the [magazine_wording] out of \the [src].") + to_chat(user, span_notice("You pull the [magazine_wording] out of \the [src].")) update_icon() /obj/item/gun/ballistic/can_shoot() @@ -334,7 +334,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) @@ -344,7 +344,7 @@ var/can_reload_say = !get_ammo(FALSE, FALSE) var/num_loaded = magazine.attackby(A, user, params, TRUE) if (num_loaded) - to_chat(user, "You load [num_loaded] [cartridge_wording]\s into \the [src].") + to_chat(user, span_notice("You load [num_loaded] [cartridge_wording]\s into \the [src].")) playsound(src, load_sound, load_sound_volume, load_sound_vary) if(can_reload_say) user.say(reload_say, forced = "reloading") @@ -356,16 +356,16 @@ if(istype(A, /obj/item/suppressor)) var/obj/item/suppressor/S = A if(!can_suppress) - to_chat(user, "You can't seem to figure out how to fit [S] on [src]!") + to_chat(user, span_warning("You can't seem to figure out how to fit [S] on [src]!")) return if(!user.is_holding(src)) - to_chat(user, "You need be holding [src] to fit [S] to it!") + to_chat(user, span_notice("You 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, "You screw \the [S] onto \the [src].") + to_chat(user, span_notice("You screw \the [S] onto \the [src].")) install_suppressor(A) return if (can_be_sawn_off) @@ -393,7 +393,7 @@ var/obj/item/suppressor/S = suppressed if(!user.is_holding(src)) return ..() - to_chat(user, "You unscrew \the [suppressed] from \the [src].") + to_chat(user, span_notice("You unscrew \the [suppressed] from \the [src].")) user.put_in_hands(suppressed) w_class -= S.w_class suppressed = null @@ -448,11 +448,11 @@ CB.bounce_away(FALSE, NONE) num_unloaded++ if (num_unloaded) - to_chat(user, "You unload [num_unloaded] [cartridge_wording]\s from [src].") + to_chat(user, span_notice("You unload [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) @@ -510,12 +510,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) @@ -523,7 +523,7 @@ 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!") @@ -546,23 +546,23 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list( if(!saw.is_sharp() || !is_type_in_typecache(saw, GLOB.gun_saw_types)) //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, "You cannot saw-off \the [src] with \the [bayonet] attached!") + to_chat(user, span_warning("You 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].", "You begin to shorten \the [src]...") + user.visible_message("[user] begins to shorten \the [src].", span_notice("You 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]!", "You shorten \the [src].") + user.visible_message("[user] shortens \the [src]!", span_notice("You 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 c6b7e6b878ae..50e499c153ee 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -46,11 +46,11 @@ if(!select) burst_size = 1 fire_delay = 0 - to_chat(user, "You switch to semi-automatic.") + to_chat(user, span_notice("You switch to semi-automatic.")) else burst_size = initial(burst_size) fire_delay = initial(fire_delay) - to_chat(user, "You switch to [burst_size]-rnd burst.") + to_chat(user, span_notice("You switch to [burst_size]-rnd burst.")) playsound(user, 'sound/weapons/empty.ogg', 100, 1) update_icon() @@ -173,15 +173,15 @@ select = 1 burst_size = initial(burst_size) fire_delay = initial(fire_delay) - to_chat(user, "You switch to [burst_size]-rnd burst.") + to_chat(user, span_notice("You switch to [burst_size]-rnd burst.")) if(1) select = 2 - to_chat(user, "You switch to grenades.") + to_chat(user, span_notice("You switch to grenades.")) if(2) select = 0 burst_size = 1 fire_delay = 0 - to_chat(user, "You switch to semi-auto.") + to_chat(user, span_notice("You switch to semi-auto.")) playsound(user, 'sound/weapons/empty.ogg', 100, 1) update_icon() return @@ -250,7 +250,7 @@ /obj/item/gun/ballistic/automatic/l6_saw/AltClick(mob/user) cover_open = !cover_open - to_chat(user, "You [cover_open ? "open" : "close"] [src]'s cover.") + to_chat(user, span_notice("You [cover_open ? "open" : "close"] [src]'s cover.")) if(cover_open) playsound(user, 'sound/weapons/sawopen.ogg', 60, 1) else @@ -265,7 +265,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 . = ..() @@ -277,13 +277,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 24b30784f5cc..08c6b78c4220 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, "You need a free hand to hold the gun!") + to_chat(user, span_warning("You need a free hand to hold the gun!")) return update_icon() user.update_inv_back() else - to_chat(user, "You are already holding the gun!") + to_chat(user, span_warning("You are already holding the gun!")) else ..() @@ -86,9 +86,9 @@ gun.forceMove(src) armed = 0 if(user) - to_chat(user, "You attach the [gun.name] to the [name].") + to_chat(user, span_notice("You 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() diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index 300644cae87e..99ceea0a0cd2 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -74,7 +74,7 @@ /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!", \ - "You aim [src] at the ground to perform a bisnasty rocket jump...") + span_userdanger("You aim [src] at the ground to perform a bisnasty rocket jump...")) if(can_shoot()) user.notransform = TRUE playsound(src, 'sound/vehicles/rocketlaunch.ogg', 80, 1, 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!", \ - "You look around after realizing you're still here, then proceed to choke yourself 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_userdanger("You look around after realizing you're still here, then proceed to choke yourself to death with [src]!")) sleep(20) return OXYLOSS diff --git a/code/modules/projectiles/guns/ballistic/minigun.dm b/code/modules/projectiles/guns/ballistic/minigun.dm index 645fe05c59b9..36a474b775c4 100644 --- a/code/modules/projectiles/guns/ballistic/minigun.dm +++ b/code/modules/projectiles/guns/ballistic/minigun.dm @@ -37,12 +37,12 @@ armed = TRUE if(!user.put_in_hands(gun)) armed = FALSE - to_chat(user, "You need a free hand to hold the gun!") + to_chat(user, span_warning("You need a free hand to hold the gun!")) return update_icon() user.update_inv_back() else - to_chat(user, "You are already holding the gun!") + to_chat(user, span_warning("You are already holding the gun!")) else ..() @@ -86,9 +86,9 @@ gun.forceMove(src) armed = FALSE if(user) - to_chat(user, "You attach the [gun.name] to the [name].") + to_chat(user, span_notice("You attach the [gun.name] to the [name].")) else - visible_message("The [gun.name] snaps back onto the [name]!") + visible_message(span_warning("The [gun.name] snaps back onto the [name]!")) update_icon() user.update_inv_back() diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 28938f56159b..853d0b633727 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -92,12 +92,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 21c8fb4c872f..5d7870bda4f7 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.", "You spin [src]'s chamber.") + usr.visible_message("[usr] spins [src]'s chamber.", span_notice("You spin [src]'s chamber.")) else verbs -= /obj/item/gun/ballistic/revolver/verb/spin @@ -87,7 +87,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_userdanger("[src] blows up in your face!")) user.take_bodypart_damage(0,20) user.dropItemToGround(src) return 0 @@ -97,33 +97,33 @@ if(..()) return TRUE if(magazine.caliber == "38") - to_chat(user, "You begin to reinforce the barrel of [src]...") + to_chat(user, span_notice("You 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_userdanger("[src] goes off in your face!")) return TRUE if(I.use_tool(src, user, 30)) if(magazine.ammo_count()) - to_chat(user, "You can't modify it!") + to_chat(user, span_warning("You can't modify it!")) return TRUE magazine.caliber = "357" fire_sound = 'sound/weapons/revolver357shot.ogg' desc = "The barrel and chamber assembly seems to have been modified." - to_chat(user, "You reinforce the barrel of [src]. Now it will fire .357 rounds.") + to_chat(user, span_notice("You reinforce the barrel of [src]. Now it will fire .357 rounds.")) else - to_chat(user, "You begin to revert the modifications to [src]...") + to_chat(user, span_notice("You 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_userdanger("[src] goes off in your face!")) return TRUE if(I.use_tool(src, user, 30)) if(magazine.ammo_count()) - to_chat(user, "You can't modify it!") + to_chat(user, span_warning("You can't modify it!")) return magazine.caliber = "38" fire_sound = 'sound/weapons/revolver38shot.ogg' desc = initial(desc) - to_chat(user, "You remove the modifications on [src]. Now it will fire .38 rounds.") + to_chat(user, span_notice("You remove the modifications on [src]. Now it will fire .38 rounds.")) return TRUE @@ -191,13 +191,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, "You need to spin \the [src]'s chamber first!") + to_chat(user, span_warning("You need to spin \the [src]'s chamber first!")) return spun = FALSE @@ -211,21 +211,21 @@ if(zone == BODY_ZONE_HEAD || zone == BODY_ZONE_PRECISE_EYES || zone == BODY_ZONE_PRECISE_MOUTH) shoot_self(user, affecting) else - user.visible_message("[user.name] cowardly fires [src] at [user.p_their()] [affecting.name]!", "You cowardly fire [src] at your [affecting.name]!", "You hear a gunshot!") + user.visible_message(span_danger("[user.name] cowardly fires [src] at [user.p_their()] [affecting.name]!"), span_userdanger("You cowardly fire [src] at your [affecting.name]!"), span_italics("You 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!", "You fire [src] at your head!", "You hear a gunshot!") + user.visible_message(span_danger("[user.name] fires [src] at [user.p_their()] head!"), span_userdanger("You fire [src] at your head!"), span_italics("You hear a gunshot!")) /obj/item/gun/ballistic/revolver/russian/soul name = "cursed Russian revolver" @@ -237,7 +237,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_userdanger("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 @@ -246,7 +246,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!", "You somehow shoot yourself in the face! How the hell?!") + user.visible_message(span_warning("[user] somehow manages to shoot [user.p_them()]self in the face!"), span_userdanger("You somehow shoot yourself 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 d2bee02d40d6..356e9c069f4b 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, "You open the bolt of \the [src]") + to_chat(user, span_notice("You 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 ..() @@ -86,7 +86,7 @@ obj/item/gun/ballistic/rifle/attackby(obj/item/A, mob/user, params) /obj/item/gun/ballistic/rifle/boltaction/sawoff(mob/user) if(bayonet) - to_chat(user, "You cannot saw-off \the [src] with \the [bayonet] attached!") + to_chat(user, span_warning("You cannot saw-off \the [src] with \the [bayonet] attached!")) return . = ..() if(.) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 0d046cea6cf5..b87e592f8aed 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -87,7 +87,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() . = ..() @@ -197,15 +197,15 @@ if(istype(A, /obj/item/stack/cable_coil) && !sawn_off) var/obj/item/stack/cable_coil/C = A if(slung) - to_chat(user, "The shotgun already has a sling.") + to_chat(user, span_notice("The shotgun already has a sling.")) return if(C.use(10)) slot_flags = ITEM_SLOT_BACK - to_chat(user, "You tie the lengths of cable to the shotgun, making a sling.") + to_chat(user, span_notice("You tie the lengths of cable to the shotgun, making a sling.")) slung = TRUE update_icon() else - to_chat(user, "You need at least ten lengths of cable if you want to make a sling!") + to_chat(user, span_warning("You need at least ten lengths of cable if you want to make a sling!")) /obj/item/gun/ballistic/shotgun/doublebarrel/improvised/update_icon() ..() diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index c05353149e37..cf232ad3795f 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -125,7 +125,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) @@ -169,17 +169,17 @@ /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, 1, -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!") @@ -207,13 +207,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, 1) playsound(user, BB.hitsound, 50, 1) 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, 1) playsound(user, BB.hitsound, 50, 1) cell.use(E.e_cost) @@ -223,4 +223,4 @@ playsound(user, E.fire_sound, 50, 1) playsound(user, BB.hitsound, 50, 1) 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 f2b6e8a7f07e..6addb2cd4fe9 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_userdanger("Fire!")) else - message_duelists("[countdown_step]!") + message_duelists(span_userdanger("[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,"You switch [src] setting to [setting] mode.") + to_chat(user,span_notice("You 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,"You confirm your readiness.") + to_chat(user,span_notice("You 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 cef4e8036323..93d98210a49d 100644 --- a/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/code/modules/projectiles/guns/energy/energy_gun.dm @@ -76,7 +76,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] isn't capable of locking a beacon from here.") + to_chat(user, span_notice("\The [src] isn't capable of locking a beacon from here.")) return var/list/L = list( ) for(var/obj/machinery/computer/teleporter/com in GLOB.machines) @@ -94,20 +94,20 @@ return if(!L[t1]) teletarget = null - user.show_message("Random teleport enabled.") + user.show_message(span_notice("Random teleport enabled.")) else var/obj/item/beacon/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] isn't capable of locking a beacon from here.") + to_chat(user, span_notice("\The [src] isn't capable of locking a beacon from here.")) return teletarget = T - user.show_message("Locked In.", MSG_AUDIBLE) + user.show_message(span_notice("Locked In."), MSG_AUDIBLE) /obj/item/gun/energy/e_gun/dragnet/proc/modify_projectile(obj/item/projectile/energy/net/N) N.teletarget = teletarget @@ -162,12 +162,12 @@ if(0 to 200) fail_tick += (2*(fail_chance)) M.rad_act(40) - to_chat(M, "Your [name] feels warmer.") + to_chat(M, span_userdanger("Your [name] feels warmer.")) if(201 to INFINITY) SSobj.processing.Remove(src) M.rad_act(80) reactor_overloaded = TRUE - to_chat(M, "Your [name]'s reactor overloads!") + to_chat(M, span_userdanger("Your [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 bfa481074dcc..f923bda5c05c 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -36,12 +36,12 @@ /obj/item/gun/energy/kinetic_accelerator/crowbar_act(mob/living/user, obj/item/I) . = TRUE if(modkits.len) - to_chat(user, "You pry the modifications out.") + to_chat(user, span_notice("You 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)) @@ -140,7 +140,7 @@ if(!suppressed) playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) else - to_chat(loc, "[src] silently charges up.") + to_chat(loc, span_warning("[src] silently charges up.")) update_icon() overheat = FALSE @@ -256,10 +256,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 @@ -274,11 +274,11 @@ if(.) if(!user.transferItemToLoc(src, KA)) return - to_chat(user, "You install the modkit.") + to_chat(user, span_notice("You install the modkit.")) playsound(loc, 'sound/items/screwdriver.ogg', 100, 1) 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, "You don't have room([KA.get_remaining_mod_capacity()]% remaining, [cost]% needed) to install this modkit. Use a crowbar to remove existing modkits.") . = FALSE @@ -393,7 +393,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.armour_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_userdanger("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 4156736b207a..00820ebd2c6f 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 0375fdf57a8e..5d82c5d3e48f 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, "You try to insert [I] into [src], but it's fully charged.") //my cell is round and full + to_chat(user, span_notice("You 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, "You insert [I] in [src], recharging it.") + to_chat(user, span_notice("You 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, "You need more charge to complete this task!") + to_chat(user, span_warning("You need more charge to complete this task!")) return FALSE return TRUE @@ -226,7 +226,7 @@ /obj/item/gun/energy/plasmacutter/attackby(obj/item/I, mob/user) . = ..() if(try_upgrade(I)) - to_chat(user, "You install [I] into [src]") + to_chat(user, span_notice("You install [I] into [src]")) playsound(loc, 'sound/items/screwdriver.ogg', 100, 1) qdel(I) diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index b4d9dd458663..fdb1853176ea 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -29,13 +29,13 @@ var/area/A = get_area(user) if(istype(A, /area/wizard_station)) add_fingerprint(user) - to_chat(user, "You know better than to violate the security of The Den, best wait until you leave to use [src].") + to_chat(user, span_warning("You 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 . = ..() @@ -79,10 +79,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, 1, -1) return (FIRELOSS) diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index d0a1cb7c3b1e..8634866a5932 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, "You know better than to violate the security of The Den, best wait until you leave to use [src].") + to_chat(user, span_warning("You 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, 1) user.log_message("zapped [user.p_them()]self with a [src]", LOG_ATTACK) @@ -97,14 +97,14 @@ ..() 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 user.revive(full_heal = 1) if(iscarbon(user)) var/mob/living/carbon/C = user C.regenerate_limbs() C.regenerate_organs() - to_chat(user, "You feel great!") + to_chat(user, span_notice("You feel great!")) /obj/item/gun/magic/wand/resurrection/debug //for testing desc = "Is it possible for something to be even more powerful than regular magic? This wand is." @@ -193,7 +193,7 @@ no_den_usage = 1 /obj/item/gun/magic/wand/door/zap_self(mob/living/user) - to_chat(user, "You feel vaguely more open with your feelings.") + to_chat(user, span_notice("You 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 eac1eea5cb35..d9e7b2d00b17 100644 --- a/code/modules/projectiles/guns/misc/beam_rifle.dm +++ b/code/modules/projectiles/guns/misc/beam_rifle.dm @@ -103,13 +103,13 @@ zoom_lock = 0 switch(zoom_lock) if(ZOOM_LOCK_AUTOZOOM_FREEMOVE) - to_chat(user, "You switch [src]'s zooming processor to free directional.") + to_chat(user, span_boldnotice("You switch [src]'s zooming processor to free directional.")) if(ZOOM_LOCK_AUTOZOOM_ANGLELOCK) - to_chat(user, "You switch [src]'s zooming processor to locked directional.") + to_chat(user, span_boldnotice("You switch [src]'s zooming processor to locked directional.")) if(ZOOM_LOCK_CENTER_VIEW) - to_chat(user, "You switch [src]'s zooming processor to center mode.") + to_chat(user, span_boldnotice("You switch [src]'s zooming processor to center mode.")) if(ZOOM_LOCK_OFF) - to_chat(user, "You disable [src]'s zooming system.") + to_chat(user, span_boldnotice("You 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, "You set \the [src] to [projectile_setting_pierce? "pierce":"impact"] mode.") + to_chat(user, span_boldnotice("You set \the [src] to [projectile_setting_pierce? "pierce":"impact"] mode.")) aiming_beam() /obj/item/gun/energy/beam_rifle/proc/update_slowdown() @@ -451,7 +451,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_userdanger("\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 274cc6597005..164d3d790e66 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]!","You 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("You open [bomb] on your [name] and fire a blast wave at [target]!")) playsound(user, "explosion", 100, 1) 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 03101abe87cc..6cb78df46bad 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, "You hear a click as [src] synthesizes a new dart.") + to_chat(loc, span_warning("You 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 1de003976683..e7fc891069e0 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, "You put the grenade in the grenade launcher.") - to_chat(user, "[grenades.len] / [max_grenades] Grenades.") + to_chat(user, span_notice("You 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_danger("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!", \ - "You fire the grenade launcher!") + user.visible_message(span_danger("[user] fired a grenade!"), \ + span_danger("You 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 c626fcc42e13..54c29ebd854d 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, "You lose control of the beam!") + to_chat(source, span_warning("You lose control of the beam!")) return if(current_target) @@ -155,9 +155,9 @@ /obj/item/gun/medbeam/uber/examine(mob/user) . = ..() if(ubercharge == 100) - . += "[src] is fully charged!" + . += span_notice("[src] is fully charged!") else - . += "[src] is [ubercharge]% charged." + . += span_notice("[src] is [ubercharge]% charged.") /// Handles ubercharge ticks and icon changes /obj/item/gun/medbeam/uber/process(delta_time) @@ -247,7 +247,7 @@ return if(gun.ubercharge < 100) - to_chat(owner, "[gun] is only [gun.ubercharge]% charged!") + to_chat(owner, span_warning("[gun] is only [gun.ubercharge]% charged!")) return gun.uber_act() diff --git a/code/modules/projectiles/guns/misc/syringe_gun.dm b/code/modules/projectiles/guns/misc/syringe_gun.dm index 0d31ef9b2008..5468b3663c68 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, "You unload [S] from \the [src].") + to_chat(user, span_notice("You 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, "You load [A] into \the [src].") + to_chat(user, span_notice("You 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, "You load \the [D] into \the [src].") + to_chat(user, span_notice("You 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 @@ -117,7 +117,7 @@ trigger_guard = TRIGGER_GUARD_ALLOW_ALL //it's a fucking blowgun it shouldn't even have a triggerguard /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 a575355b47b0..d666522b5983 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. @@ -41,7 +41,7 @@ if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - to_chat(user, "You override the authentication mechanism.") + to_chat(user, span_notice("You override the authentication mechanism.")) ///what do we do when we are being added to a gun /obj/item/firing_pin/proc/gun_insert(mob/living/user, obj/item/gun/G) @@ -66,7 +66,7 @@ if(selfdestruct) if(user) user.show_message("SELF-DESTRUCTING...
", MSG_VISUAL) - to_chat(user, "[gun] explodes!") + to_chat(user, span_userdanger("[gun] explodes!")) explosion(get_turf(gun), -1, 0, 2, 3) if(gun) qdel(gun) @@ -82,7 +82,7 @@ /obj/item/firing_pin/test_range name = "test-range firing pin" desc = "This safety firing pin allows weapons to be fired within proximity to a firing range." - 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) @@ -95,7 +95,7 @@ /obj/item/firing_pin/implant name = "implant-keyed firing pin" desc = "This is a security firing pin which only authorizes users who are implanted with a certain device." - 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) @@ -124,7 +124,7 @@ name = "hilarious firing pin" desc = "Advanced clowntech that can convert any firearm into a far more useful object." color = "#FFFF00" - fail_message = "HONK!" + fail_message = span_warning("HONK!") force_replace = TRUE /obj/item/firing_pin/clown/pin_auth(mob/living/user) @@ -174,7 +174,7 @@ name = "DNA-keyed firing pin" desc = "This is a DNA-locked firing pin which only authorizes one user. Attempt to fire once to DNA-link." 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) @@ -183,7 +183,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) @@ -195,7 +195,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 ..() @@ -207,7 +207,7 @@ /obj/item/firing_pin/tag name = "laser tag firing pin" desc = "A recreational firing pin, used in laser tag units to ensure users have their vests on." - fail_message = "SUIT CHECK FAILED." + fail_message = span_warning("SUIT CHECK FAILED.") var/obj/item/clothing/suit/suit_requirement = null var/tagcolor = "" @@ -216,7 +216,7 @@ var/mob/living/carbon/human/M = user if(istype(M.wear_suit, suit_requirement)) return TRUE - to_chat(user, "You need to be wearing [tagcolor] laser tag armor!") + to_chat(user, span_warning("You need to be wearing [tagcolor] laser tag armor!")) return FALSE /obj/item/firing_pin/tag/red diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index ca79004ebee1..34905e3e6c58 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -187,13 +187,13 @@ organ_hit_text = " in \the [parse_zone(limb_hit)]" if(suppressed) playsound(loc, hitsound, 5, 1, -1) - to_chat(L, "You're shot by \a [src][organ_hit_text]!") + to_chat(L, span_userdanger("You're shot by \a [src][organ_hit_text]!")) else if(hitsound) var/volume = vol_by_damage() playsound(loc, hitsound, volume, 1, -1) - L.visible_message("[L] is hit by \a [src][organ_hit_text]!", \ - "[L] is hit by \a [src][organ_hit_text]!", null, COMBAT_MESSAGE_RANGE) + L.visible_message(span_danger("[L] is hit by \a [src][organ_hit_text]!"), \ + span_userdanger("[L] is hit by \a [src][organ_hit_text]!"), null, COMBAT_MESSAGE_RANGE) L.on_hit(src) var/viruslist = "" // yogs - adds viruslist variable var/reagent_note diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 71e64b156736..70f94edc8f93 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -183,5 +183,5 @@ . = ..() 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() diff --git a/code/modules/projectiles/projectile/bullets/dart_syringe.dm b/code/modules/projectiles/projectile/bullets/dart_syringe.dm index 21cd631d2fbe..b8f3782a8a5f 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!", \ - "You were protected against \the [src]!") + target.visible_message(span_danger("\The [src] was deflected!"), \ + span_userdanger("You 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 22e9d28ab6b0..d493404f1c74 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!", \ - "You were protected against \the [src]!") + target.visible_message(span_danger("\The [src] was deflected!"), \ + span_userdanger("You were protected against \the [src]!")) return ..() /obj/item/projectile/bullet/dnainjector/Destroy() diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm index 807b91b5060c..ebe6e1a282f6 100644 --- a/code/modules/projectiles/projectile/energy/stun.dm +++ b/code/modules/projectiles/projectile/energy/stun.dm @@ -30,7 +30,7 @@ var/obj/item/organ/stomach/ethereal/stomach = H.getorganslot(ORGAN_SLOT_STOMACH) if(istype(stomach)) stomach.adjust_charge(20) - to_chat(C,"You get charged by [src].") + to_chat(C,span_notice("You get charged by [src].")) //yogstation edit end --------------------------------------------- /obj/item/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index eafad9b69cd4..e3fc9483381b 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -16,7 +16,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]!")) qdel(src) return FALSE @@ -48,9 +48,9 @@ C.regenerate_organs() if(target.revive(full_heal = 1)) target.grab_ghost(force = TRUE) // even suicides - to_chat(target, "You rise with a start, you're alive!!!") + to_chat(target, span_notice("You rise with a start, you're alive!!!")) else if(target.stat != DEAD) - to_chat(target, "You feel great!") + to_chat(target, span_notice("You feel great!")) /obj/item/projectile/magic/teleport name = "bolt of teleportation" @@ -267,7 +267,7 @@ M.wabbajack_act(new_mob) - to_chat(new_mob, "Your form morphs into that of a [randomize].") + to_chat(new_mob, span_warning("Your form morphs into that of a [randomize].")) var/poly_msg = get_policy(POLICY_POLYMORPH) if(poly_msg) @@ -362,7 +362,7 @@ if(L.mind) L.mind.transfer_to(S) if(owner) - to_chat(S, "You are an animate statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved! Do not harm [owner], your creator.") + to_chat(S, span_userdanger("You are an animate statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved! Do not harm [owner], your creator.")) P.forceMove(S) return else @@ -514,7 +514,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 var/atom/throw_target = get_edge_target_turf(L, get_dir(L, firer)) L.throw_at(throw_target, 200, 4) @@ -538,13 +538,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, "Your body feels drained and there is a burning pain in your chest.") + to_chat(L, span_danger("Your body feels drained and there is a burning pain in your chest.")) L.maxHealth -= 20 L.health = min(L.health, L.maxHealth) if(L.maxHealth <= 0) - to_chat(L, "Your weakened soul is completely consumed by the [src]!") + to_chat(L, span_userdanger("Your 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 @@ -561,9 +561,9 @@ var/mob/living/carbon/M = target 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, "Your mind has been opened to possession!") + to_chat(M, span_warning("Your mind has been opened to possession!")) possession_test(M) return BULLET_ACT_HIT @@ -592,7 +592,7 @@ trauma.friend.Show() trauma.friend_initialized = TRUE else - to_chat(M, "Your mind has managed to go unnoticed in the spirit world.") + to_chat(M, span_notice("Your mind has managed to go unnoticed in the spirit world.")) qdel(trauma) /obj/item/projectile/magic/aoe @@ -712,7 +712,7 @@ if(iscarbon(target)) var/mob/living/carbon/X = target X.Paralyze(30) - X.visible_message("Tentacle wraps around [target]!") + X.visible_message(span_warning("Tentacle wraps around [target]!")) X.adjustBruteLoss(6) new /obj/effect/temp_visual/goliath_tentacle/original(target) diff --git a/code/modules/projectiles/projectile/special/hallucination.dm b/code/modules/projectiles/projectile/special/hallucination.dm index b6bd822541bb..d59ba6ca0f21 100644 --- a/code/modules/projectiles/projectile/special/hallucination.dm +++ b/code/modules/projectiles/projectile/special/hallucination.dm @@ -48,10 +48,10 @@ /obj/item/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_userdanger("[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 8e79b5641a7e..a68b2f358fd0 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -367,7 +367,7 @@ if(30 to 40) need_mob_update += R.addiction_act_stage4(C) if(40 to INFINITY) - to_chat(C, "You feel like you've gotten over your need for [R.name].") + to_chat(C, span_notice("You feel like you've gotten over your need for [R.name].")) SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose") cached_addictions.Remove(R) else @@ -523,14 +523,14 @@ playsound(get_turf(cached_my_atom), selected_reaction.mix_sound, 80, 1) 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 = "This extract has been used up." diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 83ab8ab043e2..c2692acb9347 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -97,7 +97,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"+\ @@ -139,9 +139,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, "You short out [src]'s safeties.") + to_chat(user, span_notice("You short out [src]'s safeties.")) dispensable_reagents |= emagged_reagents//add the emagged reagents to the dispensable ones obj_flags |= EMAGGED @@ -303,7 +303,7 @@ continue else var/chemid = reagent[1] - visible_message("[src] buzzes.", "You hear a faint buzz.") + visible_message(span_warning("[src] buzzes."), span_italics("You hear a faint buzz.")) to_chat(usr, "[src] cannot find Chemical ID: [chemid]!") playsound(src, 'sound/machines/buzz-two.ogg', 50, 1) return @@ -326,11 +326,11 @@ if(!user.transferItemToLoc(B, src)) return replace_beaker(user, B) - to_chat(user, "You add [B] to [src].") + to_chat(user, span_notice("You add [B] to [src].")) updateUsrDialog() update_icon() else if(user.a_intent != INTENT_HARM && !istype(I, /obj/item/card/emag)) - to_chat(user, "You can't load [I] into [src]!") + to_chat(user, span_warning("You can't load [I] into [src]!")) return ..() else return ..() @@ -356,7 +356,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 0a4af084c242..799d105ae009 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -89,7 +89,7 @@ if(!user.transferItemToLoc(B, src)) return replace_beaker(user, B) - to_chat(user, "You add [B] to [src].") + to_chat(user, span_notice("You 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 1cdd6c2f0610..846c14d2139f 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -103,24 +103,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, "You can't use the [src.name] while its panel is opened!") + to_chat(user, span_warning("You 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, "You add [B] to [src].") + to_chat(user, span_notice("You 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, "You add [I] into the dispenser slot.") + to_chat(user, span_notice("You 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 ea6d9dc19743..4bc6fd486e40 100644 --- a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm +++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm @@ -48,7 +48,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 16f072bdc8e6..abe46b38a5ae 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -32,7 +32,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) . = ..() @@ -203,7 +203,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)) @@ -237,13 +237,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, "You insert [I] into [src].") + to_chat(user, span_notice("You 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 9db95d091c30..28726a057456 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -62,27 +62,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(container || length(holdingitems)) - . += "\The [src] contains:" + . += span_notice("\The [src] contains:") if(container) - . += "- \A [container]." + . += span_notice("- \A [container].") 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]%." if(container) for(var/datum/reagent/R in container.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) . = ..() @@ -140,12 +140,12 @@ if(!user.transferItemToLoc(B, src)) return replace_container(user, B) - to_chat(user, "You add [B] to [src].") + to_chat(user, span_notice("You 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! @@ -155,23 +155,23 @@ for(var/i in inserted) holdingitems[i] = TRUE if(!I.contents.len) - to_chat(user, "You empty [I] into [src].") + to_chat(user, span_notice("You empty [I] into [src].")) else - to_chat(user, "You fill [src] to the brim.") + to_chat(user, span_notice("You fill [src] to the brim.")) return TRUE if(!I.grind_results && !I.juice_results) if(user.a_intent == INTENT_HARM) return ..() else - to_chat(user, "You cannot grind [I] into reagents!") + to_chat(user, span_warning("You 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, "You add [I] to [src].") + to_chat(user, span_notice("You add [I] to [src].")) holdingitems[I] = TRUE return FALSE @@ -276,7 +276,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 container.reagents.add_reagent_list(I.juice_results) remove_object(I) @@ -296,7 +296,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 container.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 b27a305ac69b..2de5234a132c 100644 --- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm +++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm @@ -84,7 +84,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, "You transfer [units] units of the solution to [src].") + to_chat(user, span_notice("You 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 36f25530fd91..e706943e53f4 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -145,7 +145,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent()) /// Called when an overdose starts /datum/reagent/proc/overdose_start(mob/living/M) - to_chat(M, "You feel like you took too much of [name]!") + to_chat(M, span_userdanger("You feel like you took too much of [name]!")) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/overdose, name) return @@ -153,28 +153,28 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent()) /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, "You feel like having some [name] right about now.") + to_chat(M, span_notice("You feel like having some [name] right about now.")) return /// Called when addiction hits stage2, see [/datum/reagents/proc/metabolize] /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, "You feel like you need [name]. You just can't get enough.") + to_chat(M, span_notice("You feel like you need [name]. You just can't get enough.")) return /// Called when addiction hits stage3, see [/datum/reagents/proc/metabolize] /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, "You have an intense craving for [name].") + to_chat(M, span_danger("You have an intense craving for [name].")) return /// Called when addiction hits stage4, see [/datum/reagents/proc/metabolize] /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 3fb5951d1c73..0fd1dbdc2ded 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -50,14 +50,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. @@ -165,7 +165,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, "Your entire body violently jitters as you start to feel queasy. You really shouldn't have drank all of that [name]!") + to_chat(M, span_userdanger("Your 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) @@ -178,7 +178,7 @@ All effects don't start immediately, but rather get worse over time; the rate is 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 your heart practically beating out of your 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 your heart practically beating out of your chest.")]")) if(prob(5) && iscarbon(M)) var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES) @@ -186,23 +186,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, "You double over in pain as you feel your eyeballs liquify in your head!") + to_chat(M, span_userdanger("You double over in pain as you feel your eyeballs liquify in your head!")) M.emote("scream") M.adjustBruteLoss(15) else - to_chat(M, "You scream in terror as you go blind!") + to_chat(M, span_userdanger("You 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!", "You have a seizure!") + M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You 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 your heart stop for a second there..") + to_chat(M, span_userdanger("You're pretty sure you just felt your heart stop for a second there..")) M.playsound_local(M, 'sound/effects/singlebeat.ogg', 100, 0) /datum/reagent/consumable/ethanol/vodka @@ -557,12 +557,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, "You feel [tough_text]!") + to_chat(M, span_notice("You 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, "You no longer feel [tough_text].") + to_chat(M, span_notice("You 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 @@ -579,7 +579,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, "You feel gentle warmth spread through your body!") + to_chat(M, span_notice("You feel gentle warmth spread through your body!")) light_holder = new(M) light_holder.set_light(3, 0.7, "#FFCC00") //Tequila Sunrise makes you radiate dim light, like a sunrise! @@ -591,7 +591,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 your body fades.") + to_chat(M, span_notice("The warmth in your body fades.")) QDEL_NULL(light_holder) /datum/reagent/consumable/ethanol/toxins_special @@ -679,7 +679,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 @@ -1303,7 +1303,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, "You cant feel your hands!") + to_chat(M, span_notice("You cant feel your hands!")) if(current_cycle > 5) if(prob(20)) var/t = pickt() @@ -1315,7 +1315,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_userdanger("[M] clutches at [M.p_their()] chest as if [M.p_their()] heart stopped!")) . = 1 ..() @@ -1527,9 +1527,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) @@ -1644,7 +1644,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) @@ -1655,7 +1655,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,"You notice [mighty_shield] looks worn again. Weird.") + to_chat(L,span_notice("You notice [mighty_shield] looks worn again. Weird.")) ..() /datum/reagent/consumable/ethanol/sidecar @@ -2006,7 +2006,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 ..() @@ -2037,7 +2037,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 af09b9eaca8b..151a00bbfc04 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -52,7 +52,7 @@ if(M.getStaminaLoss() >= 80) M.drowsyness += 1 * REM if(M.getStaminaLoss() >= 100) - to_chat(M,"You feel more tired than you usually do, perhaps if you rest your eyes for a bit...") + to_chat(M,span_warning("You feel more tired than you usually do, perhaps if you rest your eyes for a bit...")) M.adjustStaminaLoss(-100, TRUE) M.Sleeping(10 SECONDS) ..() diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index e8c995dc0e49..0f459a5f23c6 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!", "You burst out in a fit of uncontrollable laughter!") + M.visible_message(span_danger("[M] bursts out into a fit of uncontrollable laughter!"), span_userdanger("You 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) ..() diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index b77b6e89f413..e0c2bd44919e 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -25,7 +25,7 @@ ..() /datum/reagent/drug/space_drugs/overdose_start(mob/living/M) - to_chat(M, "You start tripping hard!") + to_chat(M, span_userdanger("You 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) @@ -47,7 +47,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) @@ -98,7 +98,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]")) M.AdjustStun(-20, FALSE) M.AdjustKnockdown(-20, FALSE) M.AdjustUnconscious(-20, FALSE) @@ -147,7 +147,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]")) ..() /datum/reagent/drug/krokodil/overdose_process(mob/living/M) @@ -164,12 +164,12 @@ /datum/reagent/drug/krokodil/addiction_act_stage2(mob/living/M) if(prob(25)) - to_chat(M, "Your skin feels loose...") + to_chat(M, span_danger("Your skin feels loose...")) ..() /datum/reagent/drug/krokodil/addiction_act_stage3(mob/living/M) if(prob(25)) - to_chat(M, "Your skin starts to peel away...") + to_chat(M, span_danger("Your skin starts to peel away...")) M.adjustBruteLoss(3*REM, 0) ..() . = 1 @@ -177,7 +177,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, "Your skin falls off easily!") + to_chat(M, span_userdanger("Your skin falls off easily!")) M.adjustBruteLoss(50*REM, 0) // holy shit your skin just FELL THE FUCK OFF M.set_species(/datum/species/krokodil_addict) else @@ -205,7 +205,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]")) M.AdjustStun(-40, FALSE) M.AdjustKnockdown(-40, FALSE) M.AdjustUnconscious(-40, FALSE) @@ -226,7 +226,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) @@ -297,7 +297,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]")) M.adjustStaminaLoss(-5, 0) M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 4) M.hallucination += 5 @@ -376,7 +376,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)) @@ -484,7 +484,7 @@ //Friendly Reminder: Ketamine is a tranquilizer and will sleep you. switch(current_cycle) if(10) - to_chat(M, "You start to feel tired..." ) + to_chat(M, span_warning("You start to feel tired...") ) if(11 to 25) M.drowsyness ++ if(26 to INFINITY) @@ -549,7 +549,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) @@ -557,7 +557,7 @@ . = 1 /datum/reagent/drug/pumpup/overdose_start(mob/living/M) - to_chat(M, "You can't stop shaking, your heart beats faster and faster...") + to_chat(M, span_userdanger("You can't stop shaking, your 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 880c4903a0af..fc51cbc90905 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -113,7 +113,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) @@ -133,8 +133,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_userdanger("You're covered in boiling oil!")) if(FryLoss) M.emote("scream") playsound(M, 'sound/machines/fryer/deep_fryer_emerge.ogg', 25, TRUE) @@ -164,7 +164,7 @@ taste_description = "sweetness" /datum/reagent/consumable/sugar/overdose_start(mob/living/M) - to_chat(M, "You go into hyperglycaemic shock! Lay off the twinkies!") + to_chat(M, span_userdanger("You go into hyperglycaemic shock! Lay off the twinkies!")) M.AdjustSleeping(600, FALSE) . = 1 @@ -321,7 +321,7 @@ /datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/carbon/M) if(prob(15)) - M.visible_message("[M] [pick("dry heaves!","splutters!")]") + M.visible_message(span_warning("[M] [pick("dry heaves!","splutters!")]")) if(prob(20)) M.emote("cough") @@ -417,7 +417,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, "You can't get the scent of garlic out of your nose! You can barely think...") + to_chat(M, span_danger("You can't get the scent of garlic out of your nose! You can barely think...")) M.Paralyze(10) M.Jitter(10) else if(ishuman(M)) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 5ff51184b6fb..b23a687a8e0e 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -230,11 +230,11 @@ if(method in list(INGEST, VAPOR, INJECT)) M.adjustToxLoss(0.5*reac_volume) if(show_message) - to_chat(M, "You don't feel so good...") + to_chat(M, span_warning("You don't feel so good...")) else if(M.getFireLoss()) M.adjustFireLoss(-reac_volume) if(show_message) - to_chat(M, "You feel your burns healing! It stings like hell!") + to_chat(M, span_danger("You feel your burns healing! It stings like hell!")) M.emote("scream") SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) ..() @@ -284,11 +284,11 @@ if(method in list(INGEST, VAPOR, INJECT)) M.adjustToxLoss(0.5*reac_volume) if(show_message) - to_chat(M, "You don't feel so good...") + to_chat(M, span_warning("You don't feel so good...")) else if(M.getBruteLoss()) M.adjustBruteLoss(-reac_volume) if(show_message) - to_chat(M, "You feel your bruises healing! It stings like hell!") + to_chat(M, span_danger("You feel your bruises healing! It stings like hell!")) M.emote("scream") SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) ..() @@ -367,7 +367,7 @@ if(method in list(INGEST, VAPOR, INJECT)) M.adjust_nutrition(-5) if(show_message) - to_chat(M, "Your stomach feels empty and cramps!") + to_chat(M, span_warning("Your stomach feels empty and cramps!")) else var/mob/living/carbon/C = M for(var/s in C.surgeries) @@ -376,7 +376,7 @@ // +10% success propability on each step, useful while operating in less-than-perfect conditions if(show_message) - to_chat(M, "You feel your wounds fade away to nothing!" ) + to_chat(M, span_danger("You feel your wounds fade away to nothing!") ) ..() /datum/reagent/medicine/mine_salve/on_mob_end_metabolize(mob/living/M) @@ -408,7 +408,7 @@ if(method == TOUCH) M.reagents.add_reagent(/datum/reagent/medicine/synthflesh, reac_volume) if(HAS_TRAIT_FROM(M, TRAIT_HUSK, BURN) && (S?.volume + reac_volume >= SYNTHFLESH_UNHUSK_AMOUNT && M.getFireLoss() <= UNHUSK_DAMAGE_THRESHOLD) && M.cure_husk(BURN)) //cure husk will return true if it cures the final husking source - M.visible_message("The synthflesh soaks into [M]'s burns and they regain their natural color!") + M.visible_message(span_notice("The synthflesh soaks into [M]'s burns and they regain their natural color!")) ..() /datum/reagent/medicine/charcoal @@ -596,11 +596,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 your heart stop for a second there..") + to_chat(M, span_userdanger("You're pretty sure you just felt your heart stop for a second there..")) M.playsound_local(M, 'sound/effects/singlebeat.ogg', 100, 0) if(prob(7)) - to_chat(M, "[pick("Your head pounds.", "You feel a tight pain in your chest.", "You find it hard to stay still.", "You feel your heart practically beating out of your chest.")]") + to_chat(M, span_notice("[pick("Your head pounds.", "You feel a tight pain in your chest.", "You find it hard to stay still.", "You feel your heart practically beating out of your chest.")]")) if(prob(33)) M.adjustToxLoss(1*REM, 0) @@ -610,7 +610,7 @@ /datum/reagent/medicine/ephedrine/addiction_act_stage1(mob/living/M) if(prob(3) && iscarbon(M)) - M.visible_message("[M] starts having a seizure!", "You have a seizure!") + M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You have a seizure!")) M.Unconscious(100) M.Jitter(350) @@ -622,7 +622,7 @@ /datum/reagent/medicine/ephedrine/addiction_act_stage2(mob/living/M) if(prob(6) && iscarbon(M)) - M.visible_message("[M] starts having a seizure!", "You have a seizure!") + M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You have a seizure!")) M.Unconscious(100) M.Jitter(350) @@ -634,7 +634,7 @@ /datum/reagent/medicine/ephedrine/addiction_act_stage3(mob/living/M) if(prob(12) && iscarbon(M)) - M.visible_message("[M] starts having a seizure!", "You have a seizure!") + M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You have a seizure!")) M.Unconscious(100) M.Jitter(350) @@ -646,7 +646,7 @@ /datum/reagent/medicine/ephedrine/addiction_act_stage4(mob/living/M) if(prob(24) && iscarbon(M)) - M.visible_message("[M] starts having a seizure!", "You have a seizure!") + M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You have a seizure!")) M.Unconscious(100) M.Jitter(350) @@ -692,7 +692,7 @@ /datum/reagent/medicine/morphine/on_mob_life(mob/living/carbon/M) switch(current_cycle) if(11) - to_chat(M, "You start to feel tired..." ) + to_chat(M, span_warning("You start to feel tired...") ) if(12 to 24) M.drowsyness += 1 if(24 to INFINITY) @@ -755,13 +755,13 @@ eyes.applyOrganDamage(-2) if(HAS_TRAIT_FROM(M, TRAIT_BLIND, EYE_DAMAGE)) if(prob(20)) - to_chat(M, "Your vision slowly returns...") + to_chat(M, span_warning("Your 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 your peripheral vision fades.") + to_chat(M, span_warning("The blackness in your peripheral vision fades.")) M.cure_nearsighted(EYE_DAMAGE) M.blur_eyes(10) else if(M.eye_blind || M.eye_blurry) @@ -851,14 +851,14 @@ return ..() 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() + 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, /mob/living/carbon.proc/do_jitter_animation, 10), 40) //jitter immediately, then again after 4 and 8 seconds @@ -1372,7 +1372,7 @@ ..() /datum/reagent/medicine/modafinil/overdose_start(mob/living/M) - to_chat(M, "You feel awfully out of breath and jittery!") + to_chat(M, span_userdanger("You 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) @@ -1535,7 +1535,7 @@ . = 1 /datum/reagent/drug/burnmix/overdose_start(mob/living/M, heal_roll , slur , jitter) - to_chat(M, "You feel the BurnMix increase in potency.") + to_chat(M, span_userdanger("You feel the BurnMix increase in potency.")) ..() . = 1 @@ -1662,7 +1662,7 @@ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) M.adjustBruteLoss(RNG_ROLL*reac_volume) M.adjustFireLoss(RNG_ROLL*reac_volume) - M.visible_message("[M]'s body reacts with the medicine. It seemed to have [RNG_TEXT]!") + M.visible_message(span_warning("[M]'s body reacts with the medicine. It seemed to have [RNG_TEXT]!")) ..() /datum/reagent/medicine/burnmix/reaction_turf(turf/T, reac_volume) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index e51caadb3e5d..1aa456a406c3 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -202,7 +202,7 @@ /datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume) if(is_servant_of_ratvar(M)) - to_chat(M, "A darkness begins to spread its unholy tendrils through your mind, purging the Justiciar's influence!") + to_chat(M, span_userdanger("A darkness begins to spread its unholy tendrils through your mind, purging the Justiciar's influence!")) ..() /datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M) @@ -212,7 +212,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, "Your blood rites falter as holy water scours your body!") + to_chat(M, span_cultlarge("Your blood rites falter as holy water scours your body!")) for(var/datum/action/innate/cult/blood_spell/BS in BM.spells) qdel(BS) if(data["misc"] >= 25) // 10 units, 45 seconds @ metabolism 0.4 units & tick rate 1.8 sec @@ -223,7 +223,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!", "You have a seizure!") + M.visible_message(span_danger("[M] starts having a seizure!"), span_userdanger("You have a seizure!")) M.Unconscious(120) to_chat(M, "[pick("Your blood is your bond - you are nothing without it", "Do not forget your place", \ "All that power, and you still fail?", "If you cannot scour this poison, I shall scour your meager life!")].") @@ -235,7 +235,7 @@ to_chat(M, "[pick("Ratvar's illumination of your mind has begun to flicker", "He lies rusting in Reebe, derelict and forgotten. And there he shall stay", \ "You can't save him. Nothing can save him now", "It seems that Nar-Sie will triumph after all")].") if("emote") - M.visible_message("[M] [pick("whimpers quietly", "shivers as though cold", "glances around in paranoia")].") + M.visible_message(span_warning("[M] [pick("whimpers quietly", "shivers as though cold", "glances around in paranoia")].")) if(data["misc"] >= 60) // 30 units, 135 seconds if(iscultist(M) || is_servant_of_ratvar(M)) if(iscultist(M)) @@ -251,13 +251,13 @@ if(!V.get_ability(/datum/vampire_passive/full)) switch(data) if(1 to 4) - to_chat(M, "Something sizzles in your veins!") + to_chat(M, span_warning("Something sizzles in your veins!")) M.adjustFireLoss(0.5) if(5 to 12) - to_chat(M, "You feel an intense burning inside of you!") + to_chat(M, span_danger("You feel an intense burning inside of you!")) M.adjustFireLoss(1) if(13 to INFINITY) - M.visible_message("[M] suddenly bursts into flames!", "You suddenly ignite in a holy fire!") + M.visible_message("[M] suddenly bursts into flames!", span_userdanger("You suddenly ignite in a holy fire!")) M.adjust_fire_stacks(3) M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire M.adjustFireLoss(3) //Hence the other damages... ain't I a bastard? // Yogs End @@ -429,7 +429,7 @@ if(method == INGEST) if(show_message) - to_chat(M, "That tasted horrible.") + to_chat(M, span_notice("That tasted horrible.")) ..() @@ -478,7 +478,7 @@ metabolization_rate = INFINITY //So it instantly removes all of itself taste_description = "slime" var/datum/species/race = /datum/species/human - var/mutationtext = "The pain subsides. You feel... human." + var/mutationtext = span_danger("The pain subsides. You feel... human.") /datum/reagent/mutationtoxin/on_mob_life(mob/living/carbon/human/H) ..() @@ -502,76 +502,76 @@ if(H.has_dna()) H.dna.remove_all_mutations(list(MUT_NORMAL, MUT_EXTRA), TRUE) else - to_chat(H, "The pain vanishes suddenly. You feel no different.") + to_chat(H, span_danger("The pain vanishes suddenly. You feel no different.")) /datum/reagent/mutationtoxin/classic //The one from plasma on green slimes name = "Mutation Toxin" description = "A corruptive toxin." color = "#13BC5E" // rgb: 19, 188, 94 race = /datum/species/jelly/slime - mutationtext = "The pain subsides. Your whole body feels like slime." + mutationtext = span_danger("The pain subsides. Your whole body feels like slime.") /datum/reagent/mutationtoxin/felinid name = "Felinid Mutation Toxin" color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/human/felinid - mutationtext = "The pain subsides. You feel... like a degenerate." + mutationtext = span_danger("The pain subsides. You feel... like a degenerate.") /datum/reagent/mutationtoxin/lizard name = "Lizard Mutation Toxin" description = "A lizarding toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/lizard - mutationtext = "The pain subsides. You feel... scaly." + mutationtext = span_danger("The pain subsides. You feel... scaly.") /datum/reagent/mutationtoxin/fly name = "Fly Mutation Toxin" description = "An insectifying toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/fly - mutationtext = "The pain subsides. You feel... buzzy." + mutationtext = span_danger("The pain subsides. You feel... buzzy.") /datum/reagent/mutationtoxin/moth name = "Moth Mutation Toxin" description = "A glowing toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/moth - mutationtext = "The pain subsides. You feel... attracted to light." + mutationtext = span_danger("The pain subsides. You feel... attracted to light.") /datum/reagent/mutationtoxin/pod name = "Podperson Mutation Toxin" description = "A vegetalizing toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/pod - mutationtext = "The pain subsides. You feel... plantlike." + mutationtext = span_danger("The pain subsides. You feel... plantlike.") /datum/reagent/mutationtoxin/jelly name = "Imperfect Mutation Toxin" description = "An jellyfying toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/jelly - mutationtext = "The pain subsides. You feel... wobbly." + mutationtext = span_danger("The pain subsides. You feel... wobbly.") /datum/reagent/mutationtoxin/golem name = "Golem Mutation Toxin" description = "A crystal toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/golem/random - mutationtext = "The pain subsides. You feel... rocky." + mutationtext = span_danger("The pain subsides. You feel... rocky.") /datum/reagent/mutationtoxin/abductor name = "Abductor Mutation Toxin" description = "An alien toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/abductor - mutationtext = "The pain subsides. You feel... alien." + mutationtext = span_danger("The pain subsides. You feel... alien.") /datum/reagent/mutationtoxin/android name = "Android Mutation Toxin" description = "A robotic toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/android - mutationtext = "The pain subsides. You feel... artificial." + mutationtext = span_danger("The pain subsides. You feel... artificial.") //BLACKLISTED RACES @@ -580,21 +580,21 @@ description = "A scary toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/skeleton - mutationtext = "The pain subsides. You feel... spooky." + mutationtext = span_danger("The pain subsides. You feel... spooky.") /datum/reagent/mutationtoxin/zombie name = "Zombie Mutation Toxin" description = "An undead toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/zombie //Not the infectious kind. The days of xenobio zombie outbreaks are long past. - mutationtext = "The pain subsides. You feel... undead." + mutationtext = span_danger("The pain subsides. You feel... undead.") /datum/reagent/mutationtoxin/ash name = "Ash Mutation Toxin" description = "An ashen toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/lizard/ashwalker - mutationtext = "The pain subsides. You feel... savage." + mutationtext = span_danger("The pain subsides. You feel... savage.") //DANGEROUS RACES @@ -603,14 +603,14 @@ description = "A dark toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/shadow - mutationtext = "The pain subsides. You feel... darker." + mutationtext = span_danger("The pain subsides. You feel... darker.") /datum/reagent/mutationtoxin/plasma name = "Plasma Mutation Toxin" description = "A plasma-based toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/plasmaman - mutationtext = "The pain subsides. You feel... flammable." + mutationtext = span_danger("The pain subsides. You feel... flammable.") /datum/reagent/slime_toxin name = "Slime Mutation Toxin" @@ -627,7 +627,7 @@ return if(isjellyperson(H)) - to_chat(H, "Your jelly shifts and morphs, turning you into another subspecies!") + to_chat(H, span_warning("Your 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) @@ -635,18 +635,18 @@ switch(current_cycle) if(1 to 6) if(prob(10)) - to_chat(H, "[pick("You don't feel very well.", "Your skin feels a little slimy.")]") + to_chat(H, span_warning("[pick("You don't feel very well.", "Your skin feels a little slimy.")]")) if(7 to 12) if(prob(10)) - to_chat(H, "[pick("Your appendages are melting away.", "Your limbs begin to lose their shape.")]") + to_chat(H, span_warning("[pick("Your appendages are melting away.", "Your limbs begin to lose their shape.")]")) if(13 to 19) if(prob(10)) - to_chat(H, "[pick("You feel your internal organs turning into slime.", "You feel very slimelike.")]") + to_chat(H, span_warning("[pick("You feel your internal organs turning into slime.", "You feel very slimelike.")]")) if(20 to INFINITY) var/species_type = pick(subtypesof(/datum/species/jelly)) H.set_species(species_type) H.reagents.del_reagent(type) - to_chat(H, "You've become \a jellyperson!") + to_chat(H, span_warning("You've become \a jellyperson!")) /datum/reagent/mulligan name = "Mulligan Toxin" @@ -959,7 +959,7 @@ /datum/reagent/bluespace/on_mob_life(mob/living/carbon/M) if(current_cycle > 10 && prob(15)) - to_chat(M, "You feel unstable...") + to_chat(M, span_warning("You feel unstable...")) M.Jitter(2) current_cycle = 1 addtimer(CALLBACK(M, /mob/living/proc/bluespace_shuffle), 30) @@ -1861,13 +1861,13 @@ ..() ADD_TRAIT(L, CHANGELING_HIVEMIND_MUTE, type) if(L.mind && L.mind.has_antag_datum(/datum/antagonist/changeling)) //yogs - to_chat(L, "We have toxins in our blood, our powers are weakening rapidly!") //yogs + to_chat(L, span_userdanger("We have toxins in our blood, our powers are weakening rapidly!")) //yogs /datum/reagent/bz_metabolites/on_mob_end_metabolize(mob/living/L) ..() REMOVE_TRAIT(L, CHANGELING_HIVEMIND_MUTE, type) if(L.mind && L.mind.has_antag_datum(/datum/antagonist/changeling)) //yogs - to_chat(L, "Our blood is pure, we can regenerate chemicals again.") //yogs + to_chat(L, span_boldnotice("Our blood is pure, we can regenerate chemicals again.")) //yogs /datum/reagent/bz_metabolites/on_mob_life(mob/living/L) if(L.mind) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index ae9287e0cda6..4db58d0a1722 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -130,7 +130,7 @@ /datum/reagent/toxin/slimejelly/on_mob_life(mob/living/carbon/M) if(prob(10)) - to_chat(M, "Your insides are burning!") + to_chat(M, span_danger("Your insides are burning!")) M.adjustToxLoss(rand(20,60)*REM, 0) . = 1 else if(prob(40)) @@ -405,7 +405,7 @@ if(prob(50)) switch(pick(1, 2, 3, 4)) if(1) - to_chat(M, "You can barely see!") + to_chat(M, span_danger("You can barely see!")) M.blur_eyes(3) if(2) M.emote("cough") @@ -570,7 +570,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_userdanger("[C] clutches at [C.p_their()] chest as if [C.p_their()] heart stopped!")) else C.losebreath += 10 C.adjustOxyLoss(rand(5,25), 0) @@ -692,7 +692,7 @@ if(current_cycle >=33 && prob(15)) C.spew_organ() C.vomit(0, TRUE, TRUE, 4) - to_chat(C, "You feel something lumpy come up as you vomit.") + to_chat(C, span_userdanger("You feel something lumpy come up as you vomit.")) /datum/reagent/toxin/curare name = "Curare" @@ -884,7 +884,7 @@ var/list/possible_mes = list("oofs softly.", "looks like their bones hurt.", "grimaces, as though their bones hurt.") M.say("*custom " + pick(possible_mes), forced = /datum/reagent/toxin/bonehurtingjuice) if(3) - to_chat(M, "Your bones hurt!") + to_chat(M, span_warning("Your bones hurt!")) return ..() /datum/reagent/toxin/bonehurtingjuice/overdose_process(mob/living/carbon/M) @@ -904,19 +904,19 @@ if(bp) bp.receive_damage(0, 0, 200) playsound(M, get_sfx("desceration"), 50, TRUE, -1) - M.visible_message("[M]'s bones hurt too much!!", "Your bones hurt too much!!") + M.visible_message(span_warning("[M]'s bones hurt too much!!"), span_danger("Your bones hurt too much!!")) M.say("OOF!!", forced = /datum/reagent/toxin/bonehurtingjuice) 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) else //you just want to socialize if(bp) playsound(M, get_sfx("desceration"), 50, TRUE, -1) - M.visible_message("[M] rattles loudly and flails around!!", "Your bones hurt so much that your missing muscles spasm!!") + M.visible_message(span_warning("[M] rattles loudly and flails around!!"), span_danger("Your bones hurt so much that your missing muscles spasm!!")) M.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice) bp.receive_damage(200, 0, 0) //But I don't think we should else - to_chat(M, "Your missing arm aches from wherever you left it.") + to_chat(M, span_warning("Your missing arm aches from wherever you left it.")) M.emote("sigh") return ..() diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index ea63e6f56d99..680edce9fde7 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -362,7 +362,7 @@ /datum/chemical_reaction/foam/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) - to_chat(M, "The solution spews out foam!") + to_chat(M, span_danger("The solution spews out foam!")) var/datum/effect_system/foam_spread/s = new() s.set_up(created_volume*2, location, holder) s.start() @@ -380,7 +380,7 @@ var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) - to_chat(M, "The solution spews out a metallic foam!") + to_chat(M, span_danger("The solution spews out a metallic foam!")) var/datum/effect_system/foam_spread/metal/s = new() s.set_up(created_volume*5, location, holder, 1) @@ -395,7 +395,7 @@ /datum/chemical_reaction/smart_foam/on_reaction(datum/reagents/holder, created_volume) var/turf/location = get_turf(holder.my_atom) - location.visible_message("The solution spews out metallic foam!") + location.visible_message(span_danger("The solution spews out metallic foam!")) var/datum/effect_system/foam_spread/metal/smart/s = new() s.set_up(created_volume * 5, location, holder, TRUE) s.start() @@ -410,7 +410,7 @@ /datum/chemical_reaction/ironfoam/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) - to_chat(M, "The solution spews out a metallic foam!") + to_chat(M, span_danger("The solution spews out a metallic foam!")) var/datum/effect_system/foam_spread/metal/s = new() s.set_up(created_volume*5, location, holder, 2) s.start() diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 5b846c4c26d9..3bb6511a169e 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -69,7 +69,7 @@ deity = GLOB.deity else deity = "Christ" - to_chat(R, "The power of [deity] compels you!") + to_chat(R, span_userdanger("The power of [deity] compels you!")) R.stun(20) R.reveal(100) R.adjustHealth(50) @@ -79,7 +79,7 @@ /datum/chemical_reaction/reagent_explosion/potassium_explosion/holyboom/proc/divine_explosion(size, turf/T) for(var/mob/living/carbon/C in get_hearers_in_view(size,T)) if(iscultist(C)) - to_chat(C, "The divine explosion sears you!") + to_chat(C, span_userdanger("The divine explosion sears you!")) C.Paralyze(40) C.adjust_fire_stacks(5) C.IgniteMob() @@ -97,7 +97,7 @@ required_temp = 474 strengthdiv = 6 modifier = 1 - mix_message = "Sparks start flying around the black powder!" + mix_message = span_boldannounce("Sparks start flying around the black powder!") /datum/chemical_reaction/reagent_explosion/blackpowder_explosion/on_reaction(datum/reagents/holder, created_volume) addtimer(CALLBACK(src, .proc/explode, holder, created_volume), rand(5,10) SECONDS) @@ -411,7 +411,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/blackpowder = 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 @@ -419,7 +419,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" @@ -427,7 +427,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/machines/defib_zap.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 c03e7033c8d8..3231d08a4a32 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -25,7 +25,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 @@ -118,7 +118,7 @@ M.qdel_timer = addtimer(CALLBACK(src, .proc/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/chemical_mob_spawn, holder, 5, "Gold Slime", HOSTILE_SPAWN), 50) /datum/chemical_reaction/slime/slimemobspawn/lesser @@ -127,7 +127,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/chemical_mob_spawn, holder, 3, "Lesser Gold Slime", HOSTILE_SPAWN, "neutral"), 50) /datum/chemical_reaction/slime/slimemobspawn/friendly @@ -136,7 +136,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/chemical_mob_spawn, holder, 1, "Friendly Gold Slime", FRIENDLY_SPAWN, "neutral"), 50) /datum/chemical_reaction/slime/slimemobspawn/spider @@ -145,7 +145,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/chemical_mob_spawn, holder, 3, "Traitor Spider Slime", /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife, "neutral", FALSE), 50) @@ -229,7 +229,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/freeze, holder), 50) var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) @@ -273,7 +273,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/slime_burn, holder), 50) var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) @@ -327,7 +327,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) ..() @@ -385,12 +385,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 @@ -455,7 +455,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/boom, holder), 50) var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) @@ -533,7 +533,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 @@ -652,14 +652,14 @@ /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, /obj/item/grenade.proc/prime), rand(15,60)) qdel(holder.my_atom) //deleto 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 @@ -671,7 +671,7 @@ /datum/chemical_reaction/slime/slimebomb/on_reaction(datum/reagents/holder, created_volume) var/obj/item/grenade/clusterbuster/slime/volatile/S = new (holder.my_atom.loc) - 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, /obj/item/grenade.proc/prime), rand(15,60)) diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm index 9dfc7675b74b..bd386d6b5786 100644 --- a/code/modules/reagents/chemistry/recipes/toxins.dm +++ b/code/modules/reagents/chemistry/recipes/toxins.dm @@ -87,14 +87,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" @@ -113,7 +113,7 @@ id = /datum/reagent/toxin/bonehurtingjuice results = list(/datum/reagent/toxin/bonehurtingjuice = 5) required_reagents = list(/datum/reagent/toxin/mutagen = 1, /datum/reagent/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.") /datum/chemical_reaction/hot_ice_melt results = list(/datum/reagent/toxin/plasma = 12) //One sheet of hot ice makes 200m of plasma diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index b6b3ab449a96..e55280167d66 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -39,7 +39,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) @@ -57,7 +57,7 @@ covered = "mask" if(covered) var/who = (isnull(user) || eater == user) ? "your" : "[eater.p_their()]" - to_chat(user, "You have to remove [who] [covered] first!") + to_chat(user, span_warning("You have to remove [who] [covered] first!")) return 0 return 1 @@ -90,8 +90,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_userdanger("[M] has been splashed with something!")) for(var/datum/reagent/A in reagents.reagent_list) R += "[A.type] ([num2text(A.volume)])," @@ -100,7 +100,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 @@ -108,7 +108,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 2aea9a27ef3a..37493e0f6d5b 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -80,7 +80,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, "You scribble illegibly on the label of [src]!") + to_chat(user, span_notice("You 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/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm index dc1a7ee61bf6..bfee85465612 100644 --- a/code/modules/reagents/reagent_containers/borghypo.dm +++ b/code/modules/reagents/reagent_containers/borghypo.dm @@ -106,18 +106,18 @@ 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_notice("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, "You feel a tiny prick!") - to_chat(user, "You inject [M] with the injector.") + to_chat(M, span_warning("You feel a tiny prick!")) + to_chat(user, span_notice("You inject [M] with the injector.")) var/fraction = min(amount_per_transfer_from_this/R.total_volume, 1) R.reaction(M, INJECT, fraction) if(M.reagents) var/trans = R.trans_to(M, amount_per_transfer_from_this, transfered_by = user) - 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) @@ -131,7 +131,7 @@ Borg Hypospray mode = chosen_reagent playsound(loc, 'sound/effects/pop.ogg', 50, 0) 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) @@ -145,11 +145,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/hacked icon_state = "borghypo_s" @@ -230,23 +230,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, "You transfer [trans] unit\s of the solution to [target].") + to_chat(user, span_notice("You 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/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 951ca5b2cda5..640716e6e1b8 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, "You cannot transfer reagents to [target]!") + to_chat(user, span_warning("You cannot transfer reagents to [target]!")) return var/trans = 0 @@ -40,18 +40,18 @@ reagents.reaction(safe_thing, TOUCH, fraction) trans = reagents.trans_to(safe_thing, amount_per_transfer_from_this, transfered_by = user) - target.visible_message("[user] tries to squirt something into [target]'s eyes, but fails!", \ - "[user] tries to squirt something into [target]'s eyes, but fails!") + target.visible_message(span_danger("[user] tries to squirt something into [target]'s eyes, but fails!"), \ + span_userdanger("[user] tries to squirt something into [target]'s eyes, but fails!")) - to_chat(user, "You transfer [trans] unit\s of the solution.") + to_chat(user, span_notice("You 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 [target]'s eyes!") + target.visible_message(span_danger("[user] squirts something into [target]'s eyes!"), \ + span_userdanger("[user] squirts something into [target]'s eyes!")) reagents.reaction(target, TOUCH, fraction) var/mob/M = target @@ -81,22 +81,22 @@ // yogs end trans = src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user) - to_chat(user, "You transfer [trans] unit\s of the solution.") + to_chat(user, span_notice("You transfer [trans] unit\s of the solution.")) update_icon() else if(!target.is_drawable(user, FALSE)) //No drawing from mobs here - to_chat(user, "You cannot directly remove reagents from [target].") + to_chat(user, span_notice("You 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, "You fill [src] with [trans] unit\s of the solution.") + to_chat(user, span_notice("You 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 4a3008cb97cd..c3d31c5c5fbf 100755 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -16,14 +16,14 @@ return if(!reagents || !reagents.total_volume) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return if(istype(M)) if(user.a_intent == INTENT_HARM) var/R - M.visible_message("[user] splashes the contents of [src] onto [M]!", \ - "[user] splashes the contents of [src] onto [M]!") + M.visible_message(span_danger("[user] splashes the contents of [src] onto [M]!"), \ + span_userdanger("[user] splashes the contents of [src] onto [M]!")) if(reagents) for(var/datum/reagent/A in reagents.reagent_list) R += "[A] ([num2text(A.volume)])," @@ -36,16 +36,16 @@ reagents.clear_reagents() else if(M != user) - M.visible_message("[user] attempts to feed something to [M].", \ - "[user] attempts to feed something to you.") + M.visible_message(span_danger("[user] attempts to feed something to [M]."), \ + span_userdanger("[user] attempts to feed something to you.")) 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 something to [M].", "[user] feeds something to you.") + M.visible_message(span_danger("[user] feeds something to [M]."), span_userdanger("[user] feeds something to you.")) log_combat(user, M, "fed", reagents.log_list()) else - to_chat(user, "You swallow a gulp of [src].") + to_chat(user, span_notice("You swallow a gulp of [src].")) var/fraction = min(5/reagents.total_volume, 1) reagents.reaction(M, INGEST, fraction) addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5), 5) @@ -61,32 +61,32 @@ if(target.is_refillable()) //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/trans = reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user) - to_chat(user, "You transfer [trans] unit\s of the solution to [target].") + to_chat(user, span_notice("You transfer [trans] unit\s of the solution to [target].")) else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us. if(!target.reagents.total_volume) - to_chat(user, "[target] is empty and can't be refilled!") + to_chat(user, span_warning("[target] is empty and can't be refilled!")) 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, "You fill [src] with [trans] unit\s of the contents of [target].") + to_chat(user, span_notice("You fill [src] with [trans] unit\s of the contents of [target].")) else if(reagents.total_volume) if(user.a_intent == INTENT_HARM) - user.visible_message("[user] splashes the contents of [src] onto [target]!", \ - "You splash the contents of [src] onto [target].") + user.visible_message(span_danger("[user] splashes the contents of [src] onto [target]!"), \ + span_notice("You splash the contents of [src] onto [target].")) reagents.reaction(target, TOUCH) reagents.clear_reagents() @@ -94,15 +94,15 @@ var/hotness = I.is_hot() if(hotness && reagents) reagents.expose_temperature(hotness) - to_chat(user, "You heat [name] with [I]!") + to_chat(user, span_notice("You 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, "You break [E] in [src].") + to_chat(user, span_notice("You break [E] in [src].")) E.reagents.trans_to(src, E.reagents.total_volume, transfered_by = user) qdel(E) return @@ -283,13 +283,13 @@ /obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params) if(istype(O, /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(O, 5, transfered_by = user) - to_chat(user, "You wet [O] in [src].") + to_chat(user, span_notice("You wet [O] in [src].")) playsound(loc, 'sound/effects/slosh.ogg', 25, 1) else if(isprox(O)) //This works with wooden buckets for now. Somewhat unintended, but maybe someone will add sprites for it soon(TM) - to_chat(user, "You add [O] to [src].") + to_chat(user, span_notice("You add [O] to [src].")) qdel(O) qdel(src) user.put_in_hands(new /obj/item/bot_assembly/cleanbot) @@ -300,7 +300,7 @@ ..() if (slot == SLOT_HEAD) if(reagents.total_volume) - to_chat(user, "[src]'s contents spill all over you!") + to_chat(user, span_userdanger("[src]'s contents spill all over you!")) reagents.reaction(user, TOUCH) reagents.clear_reagents() reagents.flags = NONE @@ -372,7 +372,7 @@ if(istype(I,/obj/item/pestle)) if(grinded) if(user.getStaminaLoss() > 50) - to_chat(user, "You are too tired to work!") + to_chat(user, span_danger("You are too tired to work!")) return to_chat(user, "You start grinding...") if((do_after(user, 25, target = src)) && grinded) @@ -392,16 +392,16 @@ return return else - to_chat(user, "There is nothing to grind!") + to_chat(user, span_danger("There is nothing to grind!")) return if(grinded) - to_chat(user, "There is something inside already!") + to_chat(user, span_danger("There is something inside already!")) return if(I.juice_results || I.grind_results) I.forceMove(src) grinded = I return - to_chat(user, "You can't grind this!") + to_chat(user, span_danger("You 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 189f7189e36f..dd91cc0871b3 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -20,7 +20,7 @@ /obj/item/reagent_containers/hypospray/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 @@ -33,8 +33,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, "You feel a tiny prick!") - to_chat(user, "You inject [M] with [src].") + to_chat(M, span_warning("You feel a tiny prick!")) + to_chat(user, span_notice("You inject [M] with [src].")) var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1) reagents.reaction(M, INJECT, fraction) @@ -60,7 +60,7 @@ 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])") // yogs start - makes logs if viruslist @@ -114,12 +114,12 @@ 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/attack(mob/M, mob/user) if(!reagents.total_volume) - to_chat(user, "[src] is empty!") + to_chat(user, span_warning("[src] is empty!")) return ..() if(!iscyborg(user)) @@ -144,9 +144,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/medspray.dm b/code/modules/reagents/reagent_containers/medspray.dm index 37fda46b86a1..dae2c9440555 100644 --- a/code/modules/reagents/reagent_containers/medspray.dm +++ b/code/modules/reagents/reagent_containers/medspray.dm @@ -30,38 +30,38 @@ amount_per_transfer_from_this = squirt_amount else amount_per_transfer_from_this = initial(amount_per_transfer_from_this) - to_chat(user, "You will now apply the medspray'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("You will now apply the medspray'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/medspray/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(ishuman(M)) var/mob/living/carbon/human/L = M if(L.wear_suit?.item_flags & MEDRESIST && !get_location_accessible(L, user.zone_selected)) - to_chat(user, "[src] cannot be applied through [L.wear_suit]!") + to_chat(user, span_warning("[src] cannot be applied through [L.wear_suit]!")) 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, "You [apply_method] yourself with [src].") + to_chat(M, span_notice("You [apply_method] yourself 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 [M].") + M.visible_message(span_danger("[user] attempts to [apply_method] [src] on [M]."), \ + span_userdanger("[user] attempts to [apply_method] [src] on [M].")) 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 [M] down with [src].") + M.visible_message(span_danger("[user] [apply_method]s [M] down with [src]."), \ + span_userdanger("[user] [apply_method]s [M] 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 e74cf60c77b2..ebd84a3c451c 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -15,14 +15,14 @@ if(ishuman(L)) var/mob/living/carbon/human/H = L if(H.wear_suit?.item_flags & MEDRESIST && !get_location_accessible(H, H.zone_selected)) - to_chat(user, "[src] cannot be applied through [H.wear_suit]!") + to_chat(user, span_warning("[src] cannot be applied through [H.wear_suit]!")) return 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 64c73e5c9489..f52cffe751da 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -32,24 +32,24 @@ 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, "You [apply_method] [src].") + to_chat(M, span_notice("You [apply_method] [src].")) else - M.visible_message("[user] attempts to force [M] to [apply_method] [src].", \ - "[user] attempts to force [M] to [apply_method] [src].") + M.visible_message(span_danger("[user] attempts to force [M] to [apply_method] [src]."), \ + span_userdanger("[user] attempts to force [M] to [apply_method] [src].")) if(!do_mob(user, M)) return FALSE - M.visible_message("[user] forces [M] to [apply_method] [src].", \ - "[user] forces [M] to [apply_method] [src].") + M.visible_message(span_danger("[user] forces [M] to [apply_method] [src]."), \ + span_userdanger("[user] forces [M] to [apply_method] [src].")) var/makes_me_think = pick(strings(REDPILL_FILE, "redpill_questions")) 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 sleep(50) - to_chat(M, "[makes_me_think]") + to_chat(M, span_notice("[makes_me_think]")) if(reagents.total_volume) reagents.reaction(M, apply_type) @@ -65,14 +65,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]!", "You dissolve [src] in [target].", null, 2) + user.visible_message(span_warning("[user] slips something into [target]!"), span_notice("You 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/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 74dba59804cd..407366fe23c2 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, "You fill \the [src] with [trans] units of the contents of \the [A].") + to_chat(user, span_notice("You 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) @@ -140,13 +140,13 @@ else amount_per_transfer_from_this = initial(amount_per_transfer_from_this) current_range = spray_range - to_chat(user, "You 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("You 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.is_hot() if(hotness && reagents) reagents.expose_temperature(hotness) - to_chat(user, "You heat [name] with [I]!") + to_chat(user, span_notice("You heat [name] with [I]!")) return ..() /obj/item/reagent_containers/spray/verb/empty() @@ -158,7 +158,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, "You empty \the [src] onto the floor.") + to_chat(usr, span_notice("You empty \the [src] onto the floor.")) reagents.reaction(usr.loc) src.reagents.clear_reagents() @@ -187,17 +187,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 @@ -226,7 +226,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 @@ -283,7 +283,7 @@ generate_reagents() /obj/item/reagent_containers/spray/waterflower/cyborg/empty() - to_chat(usr, "You can not empty this!") + to_chat(usr, span_warning("You 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 b88433b5bbe1..91e9325eac6a 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 [target]!") + target.visible_message(span_danger("[user] is trying to take a blood sample from [target]!"), \ + span_userdanger("[user] is trying to take a blood sample from [target]!")) busy = TRUE if(!do_mob(user, target, extra_checks=CALLBACK(L, /mob/living/proc/can_inject, user, TRUE))) busy = FALSE @@ -90,20 +90,20 @@ if(L.transfer_blood_to(src, drawn_amount)) user.visible_message("[user] takes a blood sample from [L].") else - to_chat(user, "You are unable to draw any blood from [L]!") + to_chat(user, span_warning("You 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, "You cannot directly remove reagents from [target]!") + to_chat(user, span_warning("You 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, "You fill [src] with [trans] units of the solution. It now contains [reagents.total_volume] units.") + to_chat(user, span_notice("You 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,23 +114,23 @@ 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_notice("[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, "You cannot directly fill [target]!") + to_chat(user, span_warning("You 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 [L]!") + L.visible_message(span_danger("[user] is trying to inject [L]!"), \ + span_userdanger("[user] is trying to inject [L]!")) if(!do_mob(user, L, extra_checks=CALLBACK(L, /mob/living/proc/can_inject, user, TRUE))) return if(!reagents.total_volume) @@ -138,7 +138,7 @@ if(L.reagents.total_volume >= L.reagents.maximum_volume) return L.visible_message("[user] injects [L] with the syringe!", \ - "[user] injects [L] with the syringe!") + span_userdanger("[user] injects [L] with the syringe!")) // yogs start - Adds viruslist stuff var/viruslist = "" for(var/datum/reagent/R in reagents.reagent_list) @@ -164,7 +164,7 @@ var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1) reagents.reaction(L, INJECT, fraction) reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user) - to_chat(user, "You inject [amount_per_transfer_from_this] units of the solution. The syringe now contains [reagents.total_volume] units.") + to_chat(user, span_notice("You 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 8dbd585fde9c..5d4409c5ec08 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, "Your [W.name] is already full!") + to_chat(user, span_warning("Your [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].", "You refill [W].") + user.visible_message(span_notice("[user] refills [user.p_their()] [W.name]."), span_notice("You refill [W].")) playsound(src, 'sound/effects/refill.ogg', 50, 1) 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_userdanger("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].", "You take a paper cup from [src].") + user.visible_message(span_notice("[user] takes a cup from [src]."), span_notice("You 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-- @@ -197,8 +197,8 @@ /obj/structure/reagent_dispensers/plumbed/default_unfasten_wrench(mob/user, obj/item/I, time = 20) . = ..() if(. == SUCCESSFUL_UNFASTEN) - user.visible_message("[user.name] [anchored ? "fasten" : "unfasten"] [src]", \ - "You [anchored ? "fasten" : "unfasten"] [src]") + user.visible_message(span_notice("[user.name] [anchored ? "fasten" : "unfasten"] [src]"), \ + span_notice("You [anchored ? "fasten" : "unfasten"] [src]")) var/datum/component/plumbing/CP = GetComponent(/datum/component/plumbing) if(anchored) CP.start() diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 67011529344a..505fa36dd016 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -164,13 +164,13 @@ 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].", \ - "You 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("You struggle to pry up \the [src] with \the [I].")) if(I.use_tool(src, user, 40, volume=40)) if(!(stat & BROKEN)) var/obj/item/stack/conveyor/C = new /obj/item/stack/conveyor(loc, 1, TRUE, id) transfer_fingerprints_to(C) - to_chat(user, "You remove the conveyor belt.") + to_chat(user, span_notice("You remove the conveyor belt.")) qdel(src) else if(I.tool_behaviour == TOOL_WRENCH) @@ -178,13 +178,13 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) I.play_tool_sound(src) setDir(turn(dir,-45)) update_move_direction() - to_chat(user, "You rotate [src].") + to_chat(user, span_notice("You rotate [src].")) else if(I.tool_behaviour == TOOL_SCREWDRIVER) if(!(stat & BROKEN)) verted = verted * -1 update_move_direction() - to_chat(user, "You reverse [src]'s direction.") + to_chat(user, span_notice("You reverse [src]'s direction.")) else if(user.a_intent != INTENT_HARM) user.transferItemToLoc(I, drop_location()) @@ -332,18 +332,18 @@ 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, "You detach the conveyor switch.") + to_chat(user, span_notice("You detach the conveyor switch.")) qdel(src) /obj/machinery/conveyor_switch/wrench_act(mob/living/user, obj/item/I) if(position) - to_chat(user, "\The [src] must be off before attempting to change it's direction!") + to_chat(user, span_warning("\The [src] must be off before attempting to change it's direction!")) return FALSE oneway = !oneway I.play_tool_sound(src, 75) - user.visible_message("[user] sets \the [src] to [oneway ? "one-way" : "two-way"].", \ - "You set \the [src] to [oneway ? "one-way" : "two-way"].", \ - "You hear a ratchet.") + user.visible_message(span_notice("[user] sets \the [src] to [oneway ? "one-way" : "two-way"]."), \ + span_notice("You set \the [src] to [oneway ? "one-way" : "two-way"]."), \ + span_italics("You hear a ratchet.")) return TRUE /obj/machinery/conveyor_switch/oneway @@ -387,7 +387,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) /obj/item/conveyor_switch_construct/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_MULTITOOL) id = "[rand()]" - to_chat(user, "You pulse \the [src]'s connection, randomly generating a new network ID.") + to_chat(user, span_notice("You pulse \the [src]'s connection, randomly generating a new network ID.")) /obj/item/stack/conveyor name = "conveyor belt assembly" @@ -411,7 +411,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) return var/cdir = get_dir(A, user) if(A == user.loc) - to_chat(user, "You cannot place a conveyor belt under yourself!") + to_chat(user, span_warning("You cannot place a conveyor belt under yourself!")) return var/obj/machinery/conveyor/C = new/obj/machinery/conveyor(A, cdir, id) transfer_fingerprints_to(C) @@ -420,12 +420,12 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) /obj/item/stack/conveyor/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/conveyor_switch_construct)) - to_chat(user, "You link the switch to the conveyor belt assembly.") + to_chat(user, span_notice("You link the switch to the conveyor belt assembly.")) var/obj/item/conveyor_switch_construct/C = I id = C.id if(I.tool_behaviour == TOOL_MULTITOOL) id = "" - to_chat(user, "You unlink the conveyor belt assembly from any switches it's connected to.") + to_chat(user, span_notice("You unlink the conveyor belt assembly from any switches it's connected to.")) /obj/item/stack/conveyor/update_weight() return FALSE diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 0f5ab12eebd6..f911d5328eb5 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -80,15 +80,15 @@ if(I.tool_behaviour == TOOL_SCREWDRIVER) panel_open = !panel_open I.play_tool_sound(src) - to_chat(user, "You [panel_open ? "remove":"attach"] the screws around the power connection.") + to_chat(user, span_notice("You [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, "You start slicing the floorweld off \the [src]...") + to_chat(user, span_notice("You start slicing the floorweld off \the [src]...")) if(I.use_tool(src, user, 20, volume=100) && panel_open) - to_chat(user, "You slice the floorweld off \the [src].") + to_chat(user, span_notice("You slice the floorweld off \the [src].")) deconstruct() return @@ -103,7 +103,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].", "You place \the [I] into \the [src].") + user.visible_message("[user.name] places \the [I] into \the [src].", span_notice("You place \the [I] into \the [src].")) //mouse drop another mob or self /obj/machinery/disposal/MouseDrop_T(mob/living/target, mob/living/user) @@ -123,21 +123,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].", "You start climbing into [src]...") + user.visible_message("[user] starts climbing into [src].", span_notice("You 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_userdanger("[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].", "You climb into [src].") + user.visible_message("[user] climbs into [src].", span_notice("You climb into [src].")) else - target.visible_message("[user] has placed [target] in [src].", "[user] has placed [target] in [src].") + target.visible_message(span_danger("[user] has placed [target] in [src]."), span_userdanger("[user] has placed [target] in [src].")) log_combat(user, target, "stuffed", addition="into [src]") target.LAssailant = user update_icon() @@ -270,7 +270,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, "You empty the bag.") + to_chat(user, span_warning("You empty the bag.")) for(var/obj/item/O in T.contents) STR.remove_from_storage(O,src) T.update_icon() @@ -343,12 +343,12 @@ AM.forceMove(src) if(ismob(AM)) do_flush() - visible_message("[AM] lands in [src] and triggers the flush system!.") + visible_message(span_notice("[AM] lands in [src] and triggers the flush system!.")) else - 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 ..() @@ -485,7 +485,7 @@ else if(ismob(AM)) var/mob/M = AM if(prob(2)) // to prevent mobs being stuck in infinite loops - to_chat(M, "You hit the edge of the chute.") + to_chat(M, span_warning("You 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 348e687e0313..925216f86fc3 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, "You must unfasten the pipe before rotating it!") + to_chat(user, span_warning("You must unfasten the pipe before rotating it!")) return FALSE return TRUE @@ -113,17 +113,17 @@ if(anchored) anchored = FALSE density = FALSE - to_chat(user, "You detach the [pipename] from the underfloor.") + to_chat(user, span_notice("You 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, "You can only attach the [pipename] if the floor plating is removed!") + to_chat(user, span_warning("You can only attach the [pipename] if the floor plating is removed!")) return TRUE if(!ispipe && iswallturf(T)) - to_chat(user, "You can't build [pipename]s on walls, only disposal pipes!") + to_chat(user, span_warning("You can't build [pipename]s on walls, only disposal pipes!")) return TRUE if(ispipe) @@ -133,7 +133,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 @@ -144,12 +144,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, "You attach the [pipename] to the underfloor.") + to_chat(user, span_notice("You attach the [pipename] to the underfloor.")) I.play_tool_sound(src, 100) update_icon() return TRUE @@ -159,14 +159,14 @@ if(!I.tool_start_check(user, amount=0)) return TRUE - to_chat(user, "You start welding the [pipename] in place...") + to_chat(user, span_notice("You 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, "You need to attach it to the plating first!") + to_chat(user, span_warning("You 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 3eed0d3ef3d5..532ec634bc2a 100644 --- a/code/modules/recycling/disposal/outlet.dm +++ b/code/modules/recycling/disposal/outlet.dm @@ -71,9 +71,9 @@ return TRUE playsound(src, 'sound/items/welder2.ogg', 100, 1) - to_chat(user, "You start slicing the floorweld off [src]...") + to_chat(user, span_notice("You start slicing the floorweld off [src]...")) if(I.use_tool(src, user, 20)) - to_chat(user, "You slice the floorweld off [src].") + to_chat(user, span_notice("You 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 13274590d95b..7823134f9d9e 100644 --- a/code/modules/recycling/disposal/pipe.dm +++ b/code/modules/recycling/disposal/pipe.dm @@ -144,10 +144,10 @@ if(!I.tool_start_check(user, amount=0)) return TRUE - to_chat(user, "You start slicing [src]...") + to_chat(user, span_notice("You start slicing [src]...")) if(I.use_tool(src, user, 30, volume=50)) deconstruct() - to_chat(user, "You slice [src].") + to_chat(user, span_notice("You slice [src].")) return TRUE //checks if something is blocking the deconstruction (e.g. trunk with a bin still linked to it) @@ -268,7 +268,7 @@ /obj/structure/disposalpipe/trunk/can_be_deconstructed(mob/user) if(linked) - to_chat(user, "You need to deconstruct disposal machinery above this pipe!") + to_chat(user, span_warning("You 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 e262cc32f21a..f36387e1c8da 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/machines/twobeep_high.ogg', 100, 1) else return ..() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 5d3945e3836b..d0912c75ad18 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -34,19 +34,19 @@ 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/machines/twobeep_high.ogg', 100, 1) else if(istype(W, /obj/item/pen)) if(!user.is_literate()) - to_chat(user, "You scribble illegibly on the side of [src]!") + to_chat(user, span_notice("You scribble illegibly on the side of [src]!")) return var/str = stripped_input(user, "Label text?", "Set label", "", 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].") name = "[name] ([str])" @@ -58,7 +58,7 @@ giftwrapped = TRUE icon_state = "gift[icon_state]" else - to_chat(user, "You need more paper!") + to_chat(user, span_warning("You need more paper!")) else return ..() @@ -67,17 +67,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, "You lean on the back of [O] and start pushing to rip the wrapping around it.") + to_chat(user, span_notice("You 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, "You successfully removed [O]'s wrapping !") + to_chat(user, span_notice("You successfully removed [O]'s wrapping !")) O.forceMove(loc) playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1) qdel(src) else if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded. - to_chat(user, "You fail to remove [O]'s wrapping!") + to_chat(user, span_warning("You fail to remove [O]'s wrapping!")) /obj/item/smallDelivery @@ -127,19 +127,19 @@ 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/machines/twobeep_high.ogg', 100, 1) else if(istype(W, /obj/item/pen)) if(!user.is_literate()) - to_chat(user, "You scribble illegibly on the side of [src]!") + to_chat(user, span_notice("You scribble illegibly on the side of [src]!")) return var/str = stripped_input(user, "Label text?", "Set label", "", 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].") name = "[name] ([str])" @@ -151,7 +151,7 @@ giftwrapped = 1 user.visible_message("[user] wraps the package in festive paper!") else - to_chat(user, "You need more paper!") + to_chat(user, span_warning("You need more paper!")) /obj/item/destTagger @@ -173,11 +173,11 @@ desc = "Used to fool the disposal mail network into thinking that you're a harmless parcel. Does actually work as a regular destination tagger as well." /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/machines/twobeep_high.ogg', 100, 1) return BRUTELOSS diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm index 82be7e47c6a4..7c94f5b0a12e 100644 --- a/code/modules/religion/religion_sects.dm +++ b/code/modules/religion/religion_sects.dm @@ -84,7 +84,7 @@ for(var/X in H.bodyparts) var/obj/item/bodypart/BP = X if(BP.status == BODYPART_ROBOTIC) - to_chat(user, "[GLOB.deity] refuses to heal this metallic taint!") + to_chat(user, span_warning("[GLOB.deity] refuses to heal this metallic taint!")) return TRUE var/heal_amt = 10 @@ -95,8 +95,8 @@ 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 [GLOB.deity]!") - to_chat(H, "May the power of [GLOB.deity] compel you to be healed!") + H.visible_message(span_notice("[user] heals [H] with the power of [GLOB.deity]!")) + to_chat(H, span_boldnotice("May the power of [GLOB.deity] compel you to be healed!")) playsound(user, "punch", 25, TRUE, -1) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "blessing", /datum/mood_event/blessing) return FALSE @@ -122,8 +122,8 @@ if(L.mind?.holy_role == HOLY_ROLE_HIGHPRIEST) charge_amt *= 2 R.cell?.charge += charge_amt - R.visible_message("[user] charges [R] with the power of [GLOB.deity]!") - to_chat(R, "You are charged by the power of [GLOB.deity]!") + R.visible_message(span_notice("[user] charges [R] with the power of [GLOB.deity]!")) + to_chat(R, span_boldnotice("You are charged by the power of [GLOB.deity]!")) SEND_SIGNAL(R, COMSIG_ADD_MOOD_EVENT, "blessing", /datum/mood_event/blessing) playsound(user, 'sound/effects/bang.ogg', 25, TRUE, -1) return TRUE @@ -146,10 +146,10 @@ var/obj/item/bodypart/BP = H.get_bodypart(user.zone_selected) if(BP.status != BODYPART_ROBOTIC) if(!did_we_charge) - to_chat(user, "[GLOB.deity] scoffs at the idea of healing such fleshy matter!") + to_chat(user, span_warning("[GLOB.deity] scoffs at the idea of healing such fleshy matter!")) else - H.visible_message("[user] charges [H] with the power of [GLOB.deity]!") - to_chat(H, "You feel charged by the power of [GLOB.deity]!") + H.visible_message(span_notice("[user] charges [H] with the power of [GLOB.deity]!")) + to_chat(H, span_boldnotice("You feel charged by the power of [GLOB.deity]!")) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "blessing", /datum/mood_event/blessing) playsound(user, 'sound/machines/synth_yes.ogg', 25, TRUE, -1) return TRUE @@ -158,8 +158,8 @@ if(BP.heal_damage(5,5,null,BODYPART_ROBOTIC)) H.update_damage_overlays() - H.visible_message("[user] [did_we_charge ? "repairs" : "repairs and charges"] [H] with the power of [GLOB.deity]!") - to_chat(H, "The inner machinations of [GLOB.deity] [did_we_charge ? "repairs" : "repairs and charges"] you!") + H.visible_message(span_notice("[user] [did_we_charge ? "repairs" : "repairs and charges"] [H] with the power of [GLOB.deity]!")) + to_chat(H, span_boldnotice("The inner machinations of [GLOB.deity] [did_we_charge ? "repairs" : "repairs and charges"] you!")) playsound(user, 'sound/effects/bang.ogg', 25, TRUE, -1) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "blessing", /datum/mood_event/blessing) return TRUE @@ -169,10 +169,10 @@ if(!istype(the_cell)) //how... return if(the_cell.charge < 3000) - to_chat(L,"[GLOB.deity] does not accept pity amounts of power.") + to_chat(L,span_notice("[GLOB.deity] does not accept pity amounts of power.")) return adjust_favor(round(the_cell.charge/1500), L) - to_chat(L, "You offer [the_cell]'s power to [GLOB.deity], pleasing them.") + to_chat(L, span_notice("You offer [the_cell]'s power to [GLOB.deity], pleasing them.")) qdel(I) return TRUE /* @@ -197,7 +197,7 @@ var/money_check = 500 if(!id_card.registered_account.account_balance > money_check) - user.visible_message("[H] is too poor to recieve [GLOB.deity]'s blessing!") + user.visible_message(span_notice("[H] is too poor to recieve [GLOB.deity]'s blessing!")) else var/heal_amt = 10 var/list/hurt_limbs = H.get_damaged_bodyparts(TRUE, TRUE, null, BODYPART_ORGANIC) @@ -211,9 +211,9 @@ id_cardu.registered_account.adjust_money(10) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "blessing", /datum/mood_event/blessing) playsound(user, 'sound/misc/capitialism.ogg', 25, TRUE, -1) - H.visible_message("[user] blesses [H] with the power of capitalism!") - to_chat(H, "You feel spiritually enriched, and donate to the cause of [GLOB.deity]!") - H.visible_message("[H] donated 10 credits!") + H.visible_message(span_notice("[user] blesses [H] with the power of capitalism!")) + to_chat(H, span_boldnotice("You feel spiritually enriched, and donate to the cause of [GLOB.deity]!")) + H.visible_message(span_notice("[H] donated 10 credits!")) var/heal_amt = 10 var/list/hurt_limbs = H.get_damaged_bodyparts(1, 1, null, BODYPART_ORGANIC) @@ -223,8 +223,8 @@ 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 [GLOB.deity]!") - to_chat(H, "May the power of [GLOB.deity] compel you to be healed!") + H.visible_message(span_notice("[user] heals [H] with the power of [GLOB.deity]!")) + to_chat(H, span_boldnotice("May the power of [GLOB.deity] compel you to be healed!")) playsound(user, "punch", 25, TRUE, -1) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "blessing", /datum/mood_event/blessing) return TRUE @@ -234,7 +234,7 @@ if(!istype(money)) return adjust_favor(round(money.credits), L) - to_chat(L, "As you insert the chip into the small slit in the altar, you feel [GLOB.deity] looking at you with gratitude. Seems being a God isnt that easy on your wallet.") + to_chat(L, span_notice("As you insert the chip into the small slit in the altar, you feel [GLOB.deity] looking at you with gratitude. Seems being a God isnt that easy on your wallet.")) qdel(I) return TRUE @@ -258,9 +258,9 @@ if(!istype(offering)) return if(!offering.lit) - to_chat(user, "The candle needs to be lit to be offered!") + to_chat(user, span_notice("The candle needs to be lit to be offered!")) return - to_chat(user, "Another candle for [GLOB.deity]'s collection") + to_chat(user, span_notice("Another candle for [GLOB.deity]'s collection")) adjust_favor(20, user) //it's not a lot but hey there's a pacifist favor option at least qdel(offering) return TRUE @@ -288,7 +288,7 @@ return favortogive += I.reagents.get_reagent_amount(/datum/reagent/consumable/nutriment) * 2 adjust_favor(round(favortogive), L) //amount of favor depends on how much nutriment the plant carries - to_chat(L, "[GLOB.deity] happily accepts your offering, and brings the crop to a new home.") + to_chat(L, span_notice("[GLOB.deity] happily accepts your offering, and brings the crop to a new home.")) qdel(I) return TRUE @@ -312,7 +312,7 @@ /datum/religion_sect/oldgods/on_sacrifice(obj/item/reagent_containers/food/snacks/meat/slab/blessed/offering, mob/living/user) if(!istype(offering)) return - to_chat(user, " An image of [GLOB.deity] flashes in your mind. They look pleased.") + to_chat(user, span_notice(" An image of [GLOB.deity] flashes in your mind. They look pleased.")) if(istype(offering, /obj/item/reagent_containers/food/snacks/meat/slab/blessed/weak)) adjust_favor(10, user) else diff --git a/code/modules/religion/religion_structures.dm b/code/modules/religion/religion_structures.dm index 96bbc4c4338a..360d1e2c044c 100644 --- a/code/modules/religion/religion_structures.dm +++ b/code/modules/religion/religion_structures.dm @@ -28,7 +28,7 @@ return ..() var/mob/living/pushed_mob = user.pulling if(pushed_mob.buckled) - to_chat(user, "[pushed_mob] is buckled to [pushed_mob.buckled]!") + to_chat(user, span_warning("[pushed_mob] is buckled to [pushed_mob.buckled]!")) return ..() 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 liquid feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.") + to_chat(user, span_notice("The liquid feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.")) user.reagents.add_reagent(/datum/reagent/medicine/omnizine/godblood,10) //Hurts your brain and makes you go insane user.reagents.add_reagent(/datum/reagent/toxin/mindbreaker,10) //However, it gives rather potent healing. update_icon() diff --git a/code/modules/religion/rites.dm b/code/modules/religion/rites.dm index 1a6ca5aaadb2..df4d57cc1ac0 100644 --- a/code/modules/religion/rites.dm +++ b/code/modules/religion/rites.dm @@ -22,9 +22,9 @@ ///Called to perform the invocation of the rite, with args being the performer and the altar where it's being performed. Maybe you want it to check for something else? /datum/religion_rites/proc/perform_rite(mob/living/user, atom/religious_tool) if(GLOB.religious_sect?.favor < favor_cost) - to_chat(user, "This rite requires more favor!") + to_chat(user, span_warning("This rite requires more favor!")) return FALSE - to_chat(user, "You begin to perform the rite of [name]...") + to_chat(user, span_notice("You begin to perform the rite of [name]...")) if(!ritual_invocations) if(do_after(user, target = user, delay = ritual_length)) if(invoke_msg) @@ -71,7 +71,7 @@ /datum/religion_rites/synthconversion/perform_rite(mob/living/user, atom/religious_tool) if(!ismovable(religious_tool)) - to_chat(user, "This rite requires a religious device that individuals can be buckled to.") + to_chat(user, span_warning("This rite requires a religious device that individuals can be buckled to.")) return FALSE var/atom/movable/movable_reltool = religious_tool if(!movable_reltool) @@ -79,9 +79,9 @@ if(!LAZYLEN(movable_reltool.buckled_mobs)) . = FALSE if(!movable_reltool.can_buckle) //yes, if you have somehow managed to have someone buckled to something that now cannot buckle, we will still let you perform the rite! - to_chat(user, "This rite requires a religious device that individuals can be buckled to.") + to_chat(user, span_warning("This rite requires a religious device that individuals can be buckled to.")) return - to_chat(user, "This rite requires an individual to be buckled to [movable_reltool].") + to_chat(user, span_warning("This rite requires an individual to be buckled to [movable_reltool].")) return return ..() @@ -99,7 +99,7 @@ if(!human2borg) return FALSE human2borg.set_species(/datum/species/android) - human2borg.visible_message("[human2borg] has been converted by the rite of [name]!") + human2borg.visible_message(span_notice("[human2borg] has been converted by the rite of [name]!")) return TRUE /datum/religion_rites/machine_blessing @@ -174,7 +174,7 @@ /datum/religion_rites/toppercent/perform_rite(mob/living/user, atom/religious_tool) if(!ismovable(religious_tool)) - to_chat(user, "This rite requires a religious device that individuals can be buckled to.") + to_chat(user, span_warning("This rite requires a religious device that individuals can be buckled to.")) return FALSE var/atom/movable/movable_reltool = religious_tool if(!movable_reltool) @@ -182,9 +182,9 @@ if(!LAZYLEN(movable_reltool.buckled_mobs)) . = FALSE if(!movable_reltool.can_buckle) //yes, if you have somehow managed to have someone buckled to something that now cannot buckle, we will still let you perform the rite! - to_chat(user, "This rite requires a religious device that individuals can be buckled to.") + to_chat(user, span_warning("This rite requires a religious device that individuals can be buckled to.")) return - to_chat(user, "This rite requires an individual to be buckled to [movable_reltool].") + to_chat(user, span_warning("This rite requires an individual to be buckled to [movable_reltool].")) return return ..() @@ -202,7 +202,7 @@ if(!mantomoney) return FALSE mantomoney.set_species(/datum/species/golem/church_capitalist) - mantomoney.visible_message("[mantomoney] has ascended to the top of society!") + mantomoney.visible_message(span_notice("[mantomoney] has ascended to the top of society!")) return TRUE /*********Ever-Burning Candle**********/ @@ -244,7 +244,7 @@ chosen_clothing = null //our lord and savior no longer cares about this apparel return TRUE chosen_clothing = null - to_chat(user, "The clothing that was chosen for the rite is no longer on the altar!") + to_chat(user, span_warning("The clothing that was chosen for the rite is no longer on the altar!")) return FALSE @@ -262,43 +262,43 @@ /datum/religion_rites/burning_sacrifice/perform_rite(mob/living/user, atom/religious_tool) if(!ismovable(religious_tool)) - to_chat(user, "This rite requires a religious device that individuals can be buckled to.") + to_chat(user, span_warning("This rite requires a religious device that individuals can be buckled to.")) return FALSE var/atom/movable/movable_reltool = religious_tool if(!movable_reltool) return FALSE if(!LAZYLEN(movable_reltool.buckled_mobs)) - to_chat(user, "Nothing is buckled to the altar!") + to_chat(user, span_warning("Nothing is buckled to the altar!")) return FALSE for(var/corpse in movable_reltool.buckled_mobs) if(!iscarbon(corpse))// only works with carbon corpse since most normal mobs can't be set on fire. - to_chat(user, "Only carbon lifeforms can be properly burned for the sacrifice!") + to_chat(user, span_warning("Only carbon lifeforms can be properly burned for the sacrifice!")) return FALSE chosen_sacrifice = corpse if(chosen_sacrifice.stat != DEAD) - to_chat(user, "You can only sacrifice dead bodies, this one is still alive!") + to_chat(user, span_warning("You can only sacrifice dead bodies, this one is still alive!")) return FALSE if(!chosen_sacrifice.on_fire) - to_chat(user, "This corpse needs to be on fire to be sacrificed!") + to_chat(user, span_warning("This corpse needs to be on fire to be sacrificed!")) return FALSE return ..() /datum/religion_rites/burning_sacrifice/invoke_effect(mob/living/user, atom/movable/religious_tool) if(!(chosen_sacrifice in religious_tool.buckled_mobs)) //checks one last time if the right corpse is still buckled - to_chat(user, "The right sacrifice is no longer on the altar!") + to_chat(user, span_warning("The right sacrifice is no longer on the altar!")) chosen_sacrifice = null return FALSE if(!chosen_sacrifice.on_fire) - to_chat(user, "The sacrifice is no longer on fire, it needs to burn until the end of the rite!") + to_chat(user, span_warning("The sacrifice is no longer on fire, it needs to burn until the end of the rite!")) chosen_sacrifice = null return FALSE if(chosen_sacrifice.stat != DEAD) - to_chat(user, "The sacrifice has to stay dead for the rite to work!") + to_chat(user, span_warning("The sacrifice has to stay dead for the rite to work!")) chosen_sacrifice = null return FALSE var/favor_gained = 100 + round(chosen_sacrifice.getFireLoss()) GLOB.religious_sect?.adjust_favor(favor_gained, user) - to_chat(user, "[GLOB.deity] absorb the burning corpse and any trace of fire with it. [GLOB.deity] rewards you with [favor_gained] favor.") + to_chat(user, span_notice("[GLOB.deity] absorb the burning corpse and any trace of fire with it. [GLOB.deity] rewards you with [favor_gained] favor.")) chosen_sacrifice.dust(force = TRUE) playsound(get_turf(religious_tool), 'sound/effects/supermatter.ogg', 50, TRUE) chosen_sacrifice = null @@ -336,7 +336,7 @@ /datum/religion_rites/plantconversion/perform_rite(mob/living/user, atom/religious_tool) if(!ismovable(religious_tool)) - to_chat(user, "This rite requires a religious device that individuals can be buckled to.") + to_chat(user, span_warning("This rite requires a religious device that individuals can be buckled to.")) return FALSE var/atom/movable/movable_reltool = religious_tool if(!movable_reltool) @@ -344,9 +344,9 @@ if(!LAZYLEN(movable_reltool.buckled_mobs)) . = FALSE if(!movable_reltool.can_buckle) //yes, if you have somehow managed to have someone buckled to something that now cannot buckle, we will still let you perform the rite! - to_chat(user, "This rite requires a religious device that individuals can be buckled to.") + to_chat(user, span_warning("This rite requires a religious device that individuals can be buckled to.")) return - to_chat(user, "This rite requires an individual to be buckled to [movable_reltool].") + to_chat(user, span_warning("This rite requires an individual to be buckled to [movable_reltool].")) return return ..() @@ -364,7 +364,7 @@ if(!human2plant) return FALSE human2plant.set_species(/datum/species/golem/wood/holy) - human2plant.visible_message("[human2plant] has been converted by the rite of [name]!") + human2plant.visible_message(span_notice("[human2plant] has been converted by the rite of [name]!")) return TRUE /datum/religion_rites/photogeist @@ -424,7 +424,7 @@ user.say(mb_message, forced = "ritual") //chooses one of three invoke messages to say in order to avoid auto mute and add variety. return TRUE chosen_meat = null - to_chat(user, "The meat that was chosen for the rite is no longer on the altar!") + to_chat(user, span_warning("The meat that was chosen for the rite is no longer on the altar!")) return FALSE /datum/religion_rites/ruinousmetal @@ -454,7 +454,7 @@ /datum/religion_rites/bodybless/perform_rite(mob/living/user, atom/religious_tool) if(!ismovable(religious_tool)) - to_chat(user, "This rite requires a religious device that individuals can be buckled to.") + to_chat(user, span_warning("This rite requires a religious device that individuals can be buckled to.")) return FALSE var/atom/movable/movable_reltool = religious_tool if(!movable_reltool) @@ -462,9 +462,9 @@ if(!LAZYLEN(movable_reltool.buckled_mobs)) . = FALSE if(!movable_reltool.can_buckle) //yes, if you have somehow managed to have someone buckled to something that now cannot buckle, we will still let you perform the rite! - to_chat(user, "This rite requires a religious device that individuals can be buckled to.") + to_chat(user, span_warning("This rite requires a religious device that individuals can be buckled to.")) return - to_chat(user, "This rite requires an individual to be buckled to [movable_reltool].") + to_chat(user, span_warning("This rite requires an individual to be buckled to [movable_reltool].")) return return ..() @@ -482,4 +482,4 @@ if(!human2ruinous) return FALSE human2ruinous.set_species(/datum/species/golem/ruinous) - human2ruinous.visible_message("[human2ruinous] has been converted by the rite of [name]!") + human2ruinous.visible_message(span_notice("[human2ruinous] has been converted by the rite of [name]!")) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 71ba12637083..2c4439127436 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, "You add the [O.name] to the [src.name]!") + to_chat(user, span_notice("You add the [O.name] to the [src.name]!")) flick("d_analyzer_la", src) addtimer(CALLBACK(src, .proc/finish_loading), 10) if (linked_console) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 97195dd55da2..986d70311694 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -121,7 +121,7 @@ if(!user.transferItemToLoc(O, src)) return loaded_item = O - to_chat(user, "You add [O] to the machine.") + to_chat(user, span_notice("You add [O] to the machine.")) flick("h_lathe_load", src) /obj/machinery/rnd/experimentor/default_deconstruction_crowbar(obj/item/O) @@ -203,12 +203,12 @@ if(!scantype) return 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!")) autoexperiment = 0 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) @@ -240,7 +240,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 @@ -274,18 +274,18 @@ badThingCoeff++ else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) autoexperiment = 0 - 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)) autoexperiment = 0 - visible_message("[src] malfunctions!") + visible_message(span_warning("[src] malfunctions!")) exp = SCANTYPE_OBLITERATE else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) autoexperiment = 0 - 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 @@ -295,7 +295,7 @@ 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) autoexperiment = 0 visible_message("[exp_on] has activated an unknown subroutine!") @@ -304,12 +304,12 @@ ejectItem() else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) autoexperiment = 0 - 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)) autoexperiment = 0 - 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)) @@ -321,7 +321,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 @@ -329,14 +329,14 @@ 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) autoexperiment = 0 visible_message("[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-badThingCoeffIfCrit)) autoexperiment = 0 - 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 @@ -350,7 +350,7 @@ ejectItem(TRUE) else if(prob(EFFECT_PROB_VERYLOW-badThingCoeffIfCrit)) autoexperiment = 0 - 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/felinid,/datum/reagent/nanomachines,/datum/reagent/toxin/acid) var/datum/reagents/R = new/datum/reagents(50) R.my_atom = src @@ -369,7 +369,7 @@ throwSmoke(loc) else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) autoexperiment = 0 - 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) @@ -378,7 +378,7 @@ visible_message("[src] raises [exp_on]'s temperature.") if(prob(EFFECT_PROB_LOW) && criticalReaction) autoexperiment = 0 - 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/machines/ding.ogg', 50, 1) 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) @@ -393,20 +393,20 @@ 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/item/projectile/magic/aoe/fireball/FB = new /obj/item/projectile/magic/aoe/fireball(start) FB.preparePixelProjectile(MT, start) FB.fire() else if(prob(EFFECT_PROB_LOW-badThingCoeff)) autoexperiment = 0 - 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)) autoexperiment = 0 - 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) @@ -421,7 +421,7 @@ ejectItem(TRUE) else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) autoexperiment = 0 - 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)) @@ -432,7 +432,7 @@ visible_message("[src] lowers [exp_on]'s temperature.") if(prob(EFFECT_PROB_LOW) && criticalReaction) autoexperiment = 0 - 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/machines/ding.ogg', 50, 1) //Ding! Your death coffee is ready! chosenchem = pick(/datum/reagent/uranium,/datum/reagent/consumable/frostoil,/datum/reagent/medicine/ephedrine) @@ -443,7 +443,7 @@ investigate_log("Experimentor has made a cup of [chosenchem] coffee.", INVESTIGATE_EXPERIMENTOR) else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) autoexperiment = 0 - 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) @@ -456,7 +456,7 @@ ejectItem(TRUE) else if(prob(EFFECT_PROB_LOW-badThingCoeff)) autoexperiment = 0 - 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) @@ -471,7 +471,7 @@ ejectItem(TRUE) else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) autoexperiment = 0 - 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() @@ -479,23 +479,23 @@ //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_OBLITERATE) autoexperiment = 0 - 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.materials) linked_materials.insert_amount_mat( min((linked_materials.max_amount - linked_materials.total_amount), (exp_on.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/effects/supermatter.ogg', 50, 1, -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/effects/supermatter.ogg', 50, 1, -3) investigate_log("Experimentor has triggered the 'minor throw things' reaction.", INVESTIGATE_EXPERIMENTOR) var/list/throwAt = list() @@ -510,7 +510,7 @@ 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) autoexperiment = 0 @@ -526,26 +526,26 @@ //Global reactions if(prob(EFFECT_PROB_VERYLOW-badThingCoeffIfSuccess) && prob(14) && loaded_item) autoexperiment = 0 - 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(prob(EFFECT_PROB_VERYLOW-badThingCoeff) && prob(19) && loaded_item) autoexperiment = 0 - 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) new /mob/living/simple_animal/pet/dog/corgi(loc) investigate_log("Experimentor has spawned a corgi.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) if(prob(EFFECT_PROB_VERYLOW-badThingCoeff) && prob(14) && loaded_item) autoexperiment = 0 - 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, "You feel your flesh being torn from you, mists of blood drifting to [src]!") + to_chat(m, span_danger("You 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(prob(EFFECT_PROB_VERYLOW-badThingCoeff) && prob(23) && loaded_item) autoexperiment = 0 - 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) @@ -557,7 +557,7 @@ ejectItem(TRUE) if(prob(EFFECT_PROB_VERYLOW-badThingCoeff) && prob(23) && loaded_item) autoexperiment = 0 - 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) @@ -623,7 +623,7 @@ /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 @@ -631,7 +631,7 @@ if(!QDELETED(src)) addtimer(CALLBACK(src, .proc/cd), cooldownMax) else - to_chat(user, "You aren't quite sure what to do with this yet.") + to_chat(user, span_notice("You aren't quite sure what to do with this yet.")) /obj/item/relic/proc/cd() cooldown = FALSE @@ -662,7 +662,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) @@ -673,7 +673,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) @@ -695,24 +695,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/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/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/effects/phasein.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 60a580701fa2..e9db48cf849f 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -260,7 +260,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 d94afb94c33f..024bd4a07518 100644 --- a/code/modules/research/nanites/nanite_chamber.dm +++ b/code/modules/research/nanites/nanite_chamber.dm @@ -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("You see [user] kicking against the door of [src]!", \ - "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "You hear a metallic creaking from [src].") + user.visible_message(span_notice("You see [user] kicking against the door of [src]!"), \ + span_notice("You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_italics("You 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]!", \ - "You successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("You 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_chamber_computer.dm b/code/modules/research/nanites/nanite_chamber_computer.dm index 081e440b7817..d2910581315b 100644 --- a/code/modules/research/nanites/nanite_chamber_computer.dm +++ b/code/modules/research/nanites/nanite_chamber_computer.dm @@ -16,7 +16,7 @@ if(disk) eject(user) if(user.transferItemToLoc(N, src)) - to_chat(user, "You insert [N] into [src]") + to_chat(user, span_notice("You insert [N] into [src]")) playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) disk = N else @@ -24,7 +24,7 @@ /obj/machinery/computer/nanite_chamber_control/AltClick(mob/user) if(disk && user.canUseTopic(src, !issilicon(user))) - to_chat(user, "You take out [disk] from [src].") + to_chat(user, span_notice("You take out [disk] from [src].")) eject(user) return diff --git a/code/modules/research/nanites/nanite_cloud_controller.dm b/code/modules/research/nanites/nanite_cloud_controller.dm index 98d3028a98a1..71214e469db1 100644 --- a/code/modules/research/nanites/nanite_cloud_controller.dm +++ b/code/modules/research/nanites/nanite_cloud_controller.dm @@ -20,7 +20,7 @@ if(disk) eject(user) if(user.transferItemToLoc(N, src)) - to_chat(user, "You insert [N] into [src]") + to_chat(user, span_notice("You insert [N] into [src]")) playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) disk = N else @@ -28,7 +28,7 @@ /obj/machinery/computer/nanite_cloud_controller/AltClick(mob/user) if(disk && user.canUseTopic(src, !issilicon(user))) - to_chat(user, "You take out [disk] from [src].") + to_chat(user, span_notice("You take out [disk] from [src].")) eject(user) return @@ -47,7 +47,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 77d122d1b9e3..6481f8b45266 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, "You insert [N] into [src]") + to_chat(user, span_notice("You 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, "You don't detect any nanites in [target].") + to_chat(user, span_notice("You don't detect any nanites in [target].")) if(COMPONENT_PROGRAM_INSTALLED) - to_chat(user, "You insert the currently loaded program into [target]'s nanites.") + to_chat(user, span_notice("You insert the currently loaded program into [target]'s nanites.")) if(COMPONENT_PROGRAM_NOT_INSTALLED) - to_chat(user, "You try to insert the currently loaded program into [target]'s nanites, but the installation fails.") + to_chat(user, span_warning("You 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, datum/tgui/ui) diff --git a/code/modules/research/nanites/nanite_program_hub.dm b/code/modules/research/nanites/nanite_program_hub.dm index 5c0fb9fd64b1..88e73b0cb86a 100644 --- a/code/modules/research/nanites/nanite_program_hub.dm +++ b/code/modules/research/nanites/nanite_program_hub.dm @@ -32,7 +32,7 @@ if(disk) eject(user) if(user.transferItemToLoc(N, src)) - to_chat(user, "You insert [N] into [src]") + to_chat(user, span_notice("You insert [N] into [src]")) playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) disk = N else @@ -47,7 +47,7 @@ /obj/machinery/nanite_program_hub/AltClick(mob/user) if(disk && user.canUseTopic(src, !issilicon(user))) - to_chat(user, "You take out [disk] from [src].") + to_chat(user, span_notice("You take out [disk] from [src].")) eject(user) return diff --git a/code/modules/research/nanites/nanite_programmer.dm b/code/modules/research/nanites/nanite_programmer.dm index 685816758cbb..1666263eab24 100644 --- a/code/modules/research/nanites/nanite_programmer.dm +++ b/code/modules/research/nanites/nanite_programmer.dm @@ -16,7 +16,7 @@ if(disk) eject(user) if(user.transferItemToLoc(N, src)) - to_chat(user, "You insert [N] into [src]") + to_chat(user, span_notice("You insert [N] into [src]")) playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) disk = N program = N.program @@ -33,7 +33,7 @@ /obj/machinery/nanite_programmer/AltClick(mob/user) if(disk && user.canUseTopic(src, !issilicon(user))) - to_chat(user, "You take out [disk] from [src].") + to_chat(user, span_notice("You take out [disk] from [src].")) eject(user) return diff --git a/code/modules/research/nanites/nanite_programs/rogue.dm b/code/modules/research/nanites/nanite_programs/rogue.dm index 1994849053ec..2247abe9ec25 100644 --- a/code/modules/research/nanites/nanite_programs/rogue.dm +++ b/code/modules/research/nanites/nanite_programs/rogue.dm @@ -22,7 +22,7 @@ /datum/nanite_program/necrotic/active_effect() host_mob.adjustBruteLoss(0.75, TRUE) if(prob(1)) - to_chat(host_mob, "You feel a mild ache from somewhere inside you.") + to_chat(host_mob, span_warning("You 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 @@ -36,7 +36,7 @@ /datum/nanite_program/toxic/active_effect() host_mob.adjustToxLoss(0.5) if(prob(1)) - to_chat(host_mob, "You feel a bit sick.") + to_chat(host_mob, span_warning("You feel a bit sick.")) //Generic blood-affecting programs will decay into this /datum/nanite_program/suffocating @@ -50,7 +50,7 @@ /datum/nanite_program/suffocating/active_effect() host_mob.adjustOxyLoss(3, 0) if(prob(1)) - to_chat(host_mob, "You feel short of breath.") + to_chat(host_mob, span_warning("You feel short of breath.")) //Generic brain-affecting programs will decay into this /datum/nanite_program/brain_decay @@ -103,8 +103,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]." : ""]",\ - "Your [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("Your [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]")) //Generic nerve-affecting programs will decay into this /datum/nanite_program/nerve_decay @@ -117,11 +117,11 @@ /datum/nanite_program/nerve_decay/active_effect() if(prob(5)) - to_chat(host_mob, "You feel unbalanced!") + to_chat(host_mob, span_warning("You feel unbalanced!")) host_mob.confused += 10 else if(prob(4)) - to_chat(host_mob, "You can't feel your hands!") + to_chat(host_mob, span_warning("You can't feel your hands!")) host_mob.drop_all_held_items() else if(prob(4)) - to_chat(host_mob, "You can't feel your legs!") + to_chat(host_mob, span_warning("You can't feel your 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 e90fa2ca71ed..0efc2b9fd36d 100644 --- a/code/modules/research/nanites/nanite_programs/suppression.dm +++ b/code/modules/research/nanites/nanite_programs/suppression.dm @@ -11,7 +11,7 @@ /datum/nanite_program/triggered/sleepy/trigger() if(!..()) return - to_chat(host_mob, "You start to feel very sleepy...") + to_chat(host_mob, span_warning("You start to feel very sleepy...")) host_mob.drowsyness += 20 addtimer(CALLBACK(host_mob, /mob/living.proc/Sleeping, 200), rand(60,200)) @@ -27,11 +27,11 @@ /datum/nanite_program/paralyzing/enable_passive_effect() . = ..() - to_chat(host_mob, "Your muscles seize! You can't move!") + to_chat(host_mob, span_warning("Your muscles seize! You can't move!")) /datum/nanite_program/paralyzing/disable_passive_effect() . = ..() - to_chat(host_mob, "Your muscles relax, and you can move again.") + to_chat(host_mob, span_notice("Your muscles relax, and you can move again.")) /datum/nanite_program/triggered/shocking name = "Electric Shock" @@ -177,7 +177,7 @@ sent_message = sentence if(host_mob.stat == DEAD) return - to_chat(host_mob, "You feel compelled to speak...") + to_chat(host_mob, span_warning("You 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 45799e80ee04..e7ef99431371 100644 --- a/code/modules/research/nanites/nanite_programs/utility.dm +++ b/code/modules/research/nanites/nanite_programs/utility.dm @@ -389,8 +389,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.", - "You 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("You 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 df349a504827..810f59fa3da4 100644 --- a/code/modules/research/nanites/nanite_programs/weapon.dm +++ b/code/modules/research/nanites/nanite_programs/weapon.dm @@ -15,7 +15,7 @@ else host_mob.adjustBruteLoss(1, TRUE) if(prob(3)) - to_chat(host_mob, "You feel a stab of pain from somewhere inside you.") + to_chat(host_mob, span_warning("You feel a stab of pain from somewhere inside you.")) /datum/nanite_program/poison name = "Poisoning" @@ -27,7 +27,7 @@ /datum/nanite_program/poison/active_effect() host_mob.adjustToxLoss(1) if(prob(2)) - to_chat(host_mob, "You feel nauseous.") + to_chat(host_mob, span_warning("You feel nauseous.")) if(iscarbon(host_mob)) var/mob/living/carbon/C = host_mob C.vomit(20) @@ -71,12 +71,12 @@ /datum/nanite_program/meltdown/enable_passive_effect() . = ..() - to_chat(host_mob, "Your blood is burning!") + to_chat(host_mob, span_userdanger("Your blood is burning!")) nanites.safety_threshold = 0 /datum/nanite_program/meltdown/disable_passive_effect() . = ..() - to_chat(host_mob, "Your blood cools down, and the pain gradually fades.") + to_chat(host_mob, span_warning("Your blood cools down, and the pain gradually fades.")) /datum/nanite_program/triggered/explosive name = "Chain Detonation" @@ -89,8 +89,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...",\ - "You start emitting a high-pitched buzzing, and your 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_userdanger("You start emitting a high-pitched buzzing, and your skin begins to glow...")) addtimer(CALLBACK(src, .proc/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 de309dbea0a2..ed838898afd5 100644 --- a/code/modules/research/nanites/nanite_remote.dm +++ b/code/modules/research/nanites/nanite_remote.dm @@ -23,7 +23,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) . = ..() @@ -31,16 +31,16 @@ return if(locked) if(allowed(user)) - to_chat(user, "You unlock [src].") + to_chat(user, span_notice("You 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, "You override [src]'s ID lock.") + to_chat(user, span_warning("You override [src]'s ID lock.")) obj_flags |= EMAGGED if(locked) locked = FALSE @@ -59,18 +59,18 @@ if(REMOTE_MODE_OFF) return if(REMOTE_MODE_SELF) - to_chat(user, "You activate [src], signaling the nanites in your bloodstream.") + to_chat(user, span_notice("You 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, "You activate [src], signaling the nanites inside [target].") + to_chat(user, span_notice("You activate [src], signaling the nanites inside [target].")) signal_mob(target, code, key_name(user)) if(REMOTE_MODE_AOE) - to_chat(user, "You activate [src], signaling the nanites inside every host around you.") + to_chat(user, span_notice("You 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, "You activate [src], signaling all connected relay nanites.") + to_chat(user, span_notice("You 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) @@ -181,18 +181,18 @@ if(REMOTE_MODE_OFF) return if(REMOTE_MODE_SELF) - to_chat(user, "You activate [src], signaling the nanites in your bloodstream.") + to_chat(user, span_notice("You activate [src], signaling the nanites in your bloodstream.")) signal_mob(user, code, comm_message) if(REMOTE_MODE_TARGET) if(isliving(target) && (get_dist(target, get_turf(src)) <= 7)) - to_chat(user, "You activate [src], signaling the nanites inside [target].") + to_chat(user, span_notice("You activate [src], signaling the nanites inside [target].")) signal_mob(target, code, comm_message, key_name(user)) if(REMOTE_MODE_AOE) - to_chat(user, "You activate [src], signaling the nanites inside every host around you.") + to_chat(user, span_notice("You 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, "You activate [src], signaling all connected relay nanites.") + to_chat(user, span_notice("You 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 7d751fe56532..b63a2aec49fc 100644 --- a/code/modules/research/nanites/public_chamber.dm +++ b/code/modules/research/nanites/public_chamber.dm @@ -89,7 +89,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) @@ -97,7 +97,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() @@ -110,15 +110,15 @@ return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - user.visible_message("You see [user] kicking against the door of [src]!", \ - "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \ - "You hear a metallic creaking from [src].") + user.visible_message(span_notice("You see [user] kicking against the door of [src]!"), \ + span_notice("You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)"), \ + span_italics("You 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]!", \ - "You successfully break out of [src]!") + user.visible_message(span_warning("[user] successfully broke out of [src]!"), \ + span_notice("You successfully break out of [src]!")) open_machine() /obj/machinery/public_nanite_chamber/close_machine(mob/living/carbon/user, mob/living/attacker) @@ -151,7 +151,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 fcb102d29311..bafa8211d5f3 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_danger("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_danger("[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_danger("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_danger("[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_danger("Machine cannot accept disks in that format.")) return - to_chat(user, "You insert [D] into \the [src]!") + to_chat(user, span_notice("You 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, "You disable the security protocols[locked? " and unlock the console":""].") + to_chat(user, span_notice("You disable the security protocols[locked? " and unlock the console":""].")) playsound(src, "sparks", 75, 1) obj_flags |= EMAGGED locked = FALSE @@ -234,7 +234,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() @@ -308,7 +308,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) @@ -361,7 +361,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) @@ -595,14 +595,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() @@ -616,7 +616,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]" @@ -626,7 +626,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" @@ -711,7 +711,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)]" @@ -864,17 +864,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.") @@ -1047,7 +1047,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 666d4916e9e8..7b880bb28bb8 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -62,24 +62,24 @@ //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, "You can't load [src] while it's opened!") + to_chat(user, span_warning("You can't load [src] while it's opened!")) return FALSE if(disabled) 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/server.dm b/code/modules/research/server.dm index e74db528cf6c..8d5d02f476e8 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -162,7 +162,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 @@ -206,4 +206,4 @@ return playsound(src, "sparks", 75, 1) obj_flags |= EMAGGED - to_chat(user, "You disable the security protocols.") + to_chat(user, span_notice("You disable the security protocols.")) diff --git a/code/modules/research/xenobiology/crossbreeding/__corecross.dm b/code/modules/research/xenobiology/crossbreeding/__corecross.dm index e2cfe4b40871..a7b19bebc3b5 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 yourself.") + to_chat(user, span_warning("This can only be used on yourself.")) 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, "You press [src] against [M], injecting [M.p_them()].") + to_chat(M, span_warning("[user] presses [src] against you!")) + to_chat(user, span_notice("You press [src] against [M], injecting [M.p_them()].")) else - to_chat(user, "You press [src] against yourself, and it flattens against you!") + to_chat(user, span_notice("You 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 b4bff74d7aef..b61708c8d4c8 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, "You dispel [src]") + to_chat(user, span_notice("You 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, "You channel nearby light into a glowing, ethereal prism.") + to_chat(owner, span_notice("You channel nearby light into a glowing, ethereal prism.")) new /obj/structure/light_prism(get_turf(owner), glasses.glasses_color) /obj/item/clothing/head/peaceflower diff --git a/code/modules/research/xenobiology/crossbreeding/_misc.dm b/code/modules/research/xenobiology/crossbreeding/_misc.dm index 21541db8974d..a01d7117eba9 100644 --- a/code/modules/research/xenobiology/crossbreeding/_misc.dm +++ b/code/modules/research/xenobiology/crossbreeding/_misc.dm @@ -185,11 +185,11 @@ Slimecrossing Items /obj/item/barriercube/attack_self(mob/user) if(locate(/obj/structure/barricade/slime) in get_turf(loc)) - to_chat(user, "You can't fit more than one barrier in the same space!") + to_chat(user, span_warning("You can't fit more than one barrier in the same space!")) return - to_chat(user, "You squeeze [src].") + to_chat(user, span_notice("You 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 @@ -234,7 +234,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. var/datum/component/mood/mood = H.GetComponent(/datum/component/mood) if(mood) mood.add_event(null,"gross_food", /datum/mood_event/gross_food) @@ -272,37 +272,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, "You offer the device to [M].") + to_chat(user, span_notice("You 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, "You 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("You 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, "You were too far away from [M].") - to_chat(M, "You were too far away from [user].") + to_chat(user, span_warning("You were too far away from [M].")) + to_chat(M, span_warning("You 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, "You store [M] in the capture device.") + to_chat(user, span_notice("You store [M] in the capture device.")) store(M) /obj/item/capturedevice/attack_self(mob/user) if(contents.len) - to_chat(user, "You open the capture device!") + to_chat(user, span_notice("You 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(var/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 0d155f2f90f7..66551d9768e9 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 1afee2d8ffaa..8f1970f87cd8 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, "You pour the potion onto [target], and the fluid solidifies into a copy of it!") + to_chat(user, span_notice("You 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_userdanger("[user] starts to feed you a pacification!")) else - M.visible_message("[user] starts to drink the pacification potion!", - "You start to drink the pacification potion!") + M.visible_message(span_danger("[user] starts to drink the pacification potion!"), + span_danger("You start to drink the pacification potion!")) if(!do_after(user, 100, target = M)) return if(M != user) - to_chat(user, "You feed [M] the pacification potion!") + to_chat(user, span_notice("You feed [M] the pacification potion!")) else - to_chat(user, "You drink the pacification potion!") + to_chat(user, span_warning("You drink the pacification potion!")) if(isanimal(M)) ADD_TRAIT(M, TRAIT_PACIFISM, MAGIC_TRAIT) else if(iscarbon(M)) @@ -75,16 +75,16 @@ Slimecrossing Potions /obj/item/slimepotion/empathypotion/attack(mob/living/M, mob/user) if(!isliving(M) || M.stat == DEAD) - to_chat(user, "The slime empathy potion only works on living things.") + to_chat(user, span_warning("The slime empathy potion only works on living things.")) return ..() if(istype(M, /mob/living/simple_animal/hostile/megafauna)) - to_chat(user, "The slime empathy potion does not work on beings of pure evil!") + to_chat(user, span_warning("The slime empathy potion does not work on beings of pure evil!")) return ..() - M.visible_message("[user] starts to feed [M] a slime empathy potion!") + M.visible_message(span_danger("[user] starts to feed [M] a slime empathy potion!")) if(!do_after(user, 50, target = M)) return - to_chat(user, "You feed [M] the slime empathy potion!") - to_chat(M, "You feel like you can understand slimes better!.") + to_chat(user, span_notice("You feed [M] the slime empathy potion!")) + to_chat(M, span_notice("You feel like you can understand slimes better!.")) M.grant_language(/datum/language/slime, TRUE, TRUE, LANGUAGE_ATOM) ADD_TRAIT(M, TRAIT_SLIME_EMPATHY, TRAIT_GENERIC) qdel(src) @@ -105,12 +105,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, "You slather the blue gunk over the [C], making it airtight.") + to_chat(user, span_notice("You 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) @@ -145,9 +145,9 @@ Slimecrossing Potions if(!proximity) return ..() if(!istype(C)) - to_chat(user, "You can't coat this with lavaproofing fluid!") + to_chat(user, span_warning("You can't coat this with lavaproofing fluid!")) return ..() - to_chat(user, "You slather the red gunk over the [C], making it lavaproof.") + to_chat(user, span_notice("You 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) @@ -168,16 +168,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 = 1) 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() @@ -192,15 +192,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, "You feed the slime the omnistabilizer. It will not mutate this cycle!") + to_chat(user, span_notice("You 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 a5eeb290d83d..5356e400de6f 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, "slimestatus") - owner.visible_message("[owner] shines with a brilliant rainbow light.", - "You feel protected by an unknown force!") + owner.visible_message(span_warning("[owner] shines with a brilliant rainbow light."), + span_notice("You 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, "slimestatus") - owner.visible_message("[owner] stops glowing, the rainbow light fading away.", - "You no longer feel protected...") + owner.visible_message(span_notice("[owner] stops glowing, the rainbow light fading away."), + span_warning("You no longer feel protected...")) /obj/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!", - "You are covered in a thick, rubbery gel.") + owner.visible_message(span_warning("[owner] is suddenly covered in a strange, blue-ish gel!"), + span_notice("You 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.", - "Your gel second-skin dissolves!") + owner.visible_message(span_warning("[owner]'s gel coating liquefies and dissolves away."), + span_notice("Your gel second-skin dissolves!")) /datum/status_effect/slimerecall id = "slime_recall" @@ -68,8 +68,8 @@ /datum/status_effect/slimerecall/on_apply() RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/resistField) - to_chat(owner, "You 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("You 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 ..() @@ -81,10 +81,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) @@ -352,7 +352,7 @@ datum/status_effect/rebreathing/tick() huggables += L if(length(huggables)) var/mob/living/carbon/hugged = pick(huggables) - owner.visible_message("[owner] hugs [hugged]!", "You hug [hugged]!") + owner.visible_message(span_notice("[owner] hugs [hugged]!"), span_notice("You hug [hugged]!")) /datum/status_effect/tarcookie id = "tarcookie" @@ -468,7 +468,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 ..() @@ -497,7 +497,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 @@ -533,7 +533,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 ..() @@ -542,7 +542,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) @@ -556,7 +556,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 @@ -570,7 +570,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") @@ -582,7 +582,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 your hands alone are enough cook [F]!") + to_chat(owner, span_warning("[linked_extract] flares up brightly, and your hands alone are enough cook [F]!")) var/obj/item/result = F.microwave_act() if(istype(result)) owner.put_in_hands(result) @@ -602,24 +602,24 @@ 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() 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 your hands wet! It makes [O] expand!") + to_chat(owner, span_warning("[linked_extract] kept your 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 your hands wet! It makes [O] expand!") + to_chat(owner, span_warning("[linked_extract] kept your 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 your hands wet! It wets [O]!") + to_chat(owner, span_warning("[linked_extract] kept your 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) @@ -667,7 +667,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 @@ -675,7 +675,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 @@ -718,20 +718,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.", - "You feel a warm glow from [linked_extract], and you open your eyes... elsewhere.") + owner.visible_message(span_warning("[owner] blazes with brilliant light, [linked_extract] whisking [owner.p_their()] soul away."), + span_notice("You feel a warm glow from [linked_extract], and you open your 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 your soul to a living body, but can't find one!") + to_chat(owner, span_notice("[linked_extract] desperately tries to move your 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) @@ -769,7 +769,7 @@ datum/status_effect/stabilized/blue/on_remove() var/originalname /datum/status_effect/stabilized/green/on_apply() - to_chat(owner, "You feel different...") + to_chat(owner, span_warning("You feel different...")) if(ishuman(owner)) var/mob/living/carbon/human/H = owner originalDNA = new H.dna.type @@ -780,13 +780,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, "You feel more like yourself.") + to_chat(owner, span_notice("You feel more like yourself.")) if(ishuman(owner)) var/mob/living/carbon/human/H = owner originalDNA.transfer_identity(H) @@ -842,9 +842,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_userdanger("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 ..() @@ -859,7 +859,7 @@ datum/status_effect/stabilized/blue/on_remove() /datum/status_effect/stabilized/oil id = "stabilizedoil" colour = "oil" - examine_text = "SUBJECTPRONOUN smells of sulfur and oil!" + examine_text = span_warning("SUBJECTPRONOUN smells of sulfur and oil!") /datum/status_effect/stabilized/oil/tick() if(owner.stat == DEAD) @@ -878,10 +878,10 @@ datum/status_effect/stabilized/blue/on_remove() if(M.stat == DEAD) return if(!messagedelivered) - to_chat(owner,"You feel your hands melt around [M]'s neck and start to drain [M.p_them()] of life.") - to_chat(owner.pulling, "[owner]'s hands melt around your neck, and you can feel your life starting to drain away!") + to_chat(owner,span_notice("You feel your hands melt around [M]'s neck and start to drain [M.p_them()] of life.")) + to_chat(owner.pulling, span_userdanger("[owner]'s hands melt around your neck, and you can feel your 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 @@ -917,7 +917,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" @@ -966,7 +966,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/_structures.dm b/code/modules/research/xenobiology/crossbreeding/_structures.dm index d1a3df6d7a78..4bc554371b44 100644 --- a/code/modules/research/xenobiology/crossbreeding/_structures.dm +++ b/code/modules/research/xenobiology/crossbreeding/_structures.dm @@ -23,7 +23,7 @@ GLOBAL_LIST_EMPTY(bluespace_slime_crystals) /obj/structure/slime_crystal/examine(mob/user) . = ..() if(effect_desc) - . += "[effect_desc]" + . += span_notice("[effect_desc]") /obj/structure/slime_crystal/New(loc, obj/structure/slime_crystal/master_crystal, ...) . = ..() @@ -422,7 +422,7 @@ GLOBAL_LIST_EMPTY(bluespace_slime_crystals) if(blood_amt < 50) return ..() blood_amt -= 50 - to_chat(user, "You touch the crystal, and see blood transforming into an organ!") + to_chat(user, span_notice("You touch the crystal, and see blood transforming into an organ!")) playsound(src, 'sound/magic/demon_consume.ogg', 50, 1) var/type = pick(/obj/item/reagent_containers/food/snacks/meat/slab,/obj/item/organ/heart,/obj/item/organ/heart/freedom,/obj/item/organ/lungs,/obj/item/organ/lungs/plasmaman,/obj/item/organ/lungs/slime,/obj/item/organ/liver,/obj/item/organ/liver/plasmaman,/obj/item/organ/liver/alien,/obj/item/organ/eyes,/obj/item/organ/eyes/night_vision/alien,/obj/item/organ/eyes/night_vision,/obj/item/organ/eyes/night_vision/mushroom,/obj/item/organ/tongue,/obj/item/organ/stomach,/obj/item/organ/stomach/plasmaman,/obj/item/organ/stomach/ethereal,/obj/item/organ/ears,/obj/item/organ/ears/cat,/obj/item/organ/ears/penguin) new type(get_turf(src)) @@ -437,7 +437,7 @@ GLOBAL_LIST_EMPTY(bluespace_slime_crystals) return ..() blood_amt -= 10 item_beaker.reagents.add_reagent(/datum/reagent/blood,10) - to_chat(user, "You transfer some of strored blood into [I]!") + to_chat(user, span_notice("You transfer some of strored blood into [I]!")) /obj/structure/slime_crystal/green colour = "green" @@ -506,7 +506,7 @@ GLOBAL_LIST_EMPTY(bluespace_slime_crystals) var/mob/living/simple_animal/chosen_pet = pick(gold_pet_options) chosen_pet = new chosen_pet(get_turf(human_mob)) if(chosen_pet) - to_chat(user, "You touch the crystal, and become a small animal!") + to_chat(user, span_notice("You touch the crystal, and become a small animal!")) playsound(src, 'sound/magic/fireball.ogg', 50, 1) human_mob.forceMove(chosen_pet) human_mob.notransform = 1 diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm index 7895a43ef0dc..06680dde49da 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, "You squeeze the extract, and it absorbs the plasma!") + to_chat(user, span_notice("You squeeze the extract, and it absorbs the plasma!")) playsound(src, 'sound/effects/bubbles.ogg', 50, 1) playsound(src, 'sound/magic/fireball.ogg', 50, 1) 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 = "Expels pepperspray in a radius when activated." /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 = "Creates a clump of invigorating gel, it has healing properties and makes you feel good." /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 = "Freezes the floor around you and chills nearby people." /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, "You feel a chill run down your spine, and the floor feels a bit slippery with frost...") + to_chat(M, span_danger("You 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/effects/break_stone.ogg', 50, 1) - 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 = "Electrocutes people near you." /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/weapons/zapbang.ogg', 50, 1) 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, "You feel a sharp electrical pulse!") + to_chat(M, span_danger("You feel a sharp electrical pulse!")) ..() /obj/item/slimecross/burning/darkpurple @@ -109,7 +109,7 @@ Burning extracts: effect_desc = "Creates a cloud of plasma." /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 = "Expels a burst of chilling smoke while also filling you with cryoxadone." /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 = "Teleports anyone directly next to you." /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/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) //Somewhere between the effectiveness of fake and real BS crystal @@ -164,7 +164,7 @@ Burning extracts: effect_desc = "Turns into a special camera that rewinds time when used." /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 = "Produces an extract cloning potion, which copies an extract, as well as its extra uses." /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 = "Shatters all lights in the current room." /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 = "Makes nearby slimes rabid, and they'll also attack their friends." /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 = "Creates a beaker of synthpax." /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 = "Creates a gank squad of monsters that are friendly to the user." /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 = "Creates an explosion after a few seconds." /obj/item/slimecross/burning/oil/do_effect(mob/user) - user.visible_message("[user] activates [src]. It's going to explode!", "You activate [src]. It crackles in anticipation") + user.visible_message(span_warning("[user] activates [src]. It's going to explode!"), span_danger("You activate [src]. It crackles in anticipation")) addtimer(CALLBACK(src, .proc/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 = "Paxes everyone in sight." /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 = "Creates a mighty adamantine shield." /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 = "Creates the Rainbow Knife, a kitchen knife that deals random types of damage." /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 ad1f23ac5dfa..c6ef1380e1b4 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, "You squeeze the extract, and it absorbs the plasma!") + to_chat(user, span_notice("You squeeze the extract, and it absorbs the plasma!")) playsound(src, 'sound/effects/bubbles.ogg', 50, 1) playsound(src, 'sound/effects/light_flicker.ogg', 50, 1) 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, "You must be a humanoid to use this!") + to_chat(user, span_warning("You must be a humanoid to use this!")) return var/racechoice = input(H, "Choose your slime subspecies.", "Slime Selection") as null|anything in subtypesof(/datum/species/jelly) if(!racechoice) - to_chat(user, "You decide not to become a slime for now.") + to_chat(user, span_notice("You 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/empathypotion(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/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, 1) 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 = "Creates an explosion after a few seconds." /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/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, "You have to be able to have a species to get your species changed.") + to_chat(user, span_warning("You 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, "You feel very different!") + to_chat(H, span_danger("You 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 = "Creates a completed golem shell." /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 = "Produces three living slimes of random colors." /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 e9a538bbc802..4448c868cfb4 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, "You squeeze the extract, and it absorbs the plasma!") + to_chat(user, span_notice("You squeeze the extract, and it absorbs the plasma!")) playsound(src, 'sound/effects/bubbles.ogg', 50, 1) playsound(src, 'sound/effects/glassbr1.ogg', 50, 1) do_effect(user) @@ -32,7 +32,7 @@ Chilling extracts: effect_desc = "Creates some slime barrier cubes. When used they create slimy barricades." /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 = "Creates a ring of fire one tile away from the user." /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 = "Creates a rebreather, a tankless mask." /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 = "Temporarily surrounds the user with unbreakable walls." /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) @@ -111,9 +111,9 @@ Chilling extracts: filtered = TRUE 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 @@ -122,7 +122,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) ..() @@ -132,7 +132,7 @@ Chilling extracts: effect_desc = "Creates several ration packs." /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)) @@ -149,28 +149,28 @@ Chilling extracts: return if(target in allies) allies -= target - to_chat(user, "You unlink [src] with [target].") + to_chat(user, span_notice("You unlink [src] with [target].")) else allies |= target - to_chat(user, "You link [src] with [target].") + to_chat(user, span_notice("You 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, "You feel [src] pulse as it begins charging bluespace energies...") + to_chat(user, span_notice("You 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)) @@ -188,14 +188,14 @@ Chilling extracts: return if(target in allies) allies -= target - to_chat(user, "You unlink [src] with [target].") + to_chat(user, span_notice("You unlink [src] with [target].")) else allies |= target - to_chat(user, "You link [src] with [target].") + to_chat(user, span_notice("You 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, 150, allies) //yogs - 300 -> 150 ..() @@ -206,7 +206,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) ..() @@ -216,7 +216,7 @@ Chilling extracts: effect_desc = "Creates a pair of Prism Glasses, which allow the wearer to place colored light crystals." /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)) ..() @@ -230,9 +230,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 @@ -251,9 +251,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) ..() @@ -263,7 +263,7 @@ Chilling extracts: effect_desc = "Creates a slime corgi puppy." /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)) ..() @@ -272,7 +272,7 @@ Chilling extracts: effect_desc = "Produces a golden capture device" /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)) ..() @@ -281,7 +281,7 @@ Chilling extracts: effect_desc = "It creates a weak, but wide-ranged explosion." /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/boom), 50) /obj/item/slimecross/chilling/oil/proc/boom() @@ -294,7 +294,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) ..() @@ -304,7 +304,7 @@ Chilling extracts: effect_desc = "Creates a Heroine Bud, a special flower that pacifies whoever wears it on their head. They will not be able to take it off without help." /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)) ..() @@ -313,7 +313,7 @@ Chilling extracts: effect_desc = "Solidifies into a set of adamantine armor." /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)) ..() @@ -324,9 +324,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 a973a5c2b2e2..67430db0f7c8 100644 --- a/code/modules/research/xenobiology/crossbreeding/consuming.dm +++ b/code/modules/research/xenobiology/crossbreeding/consuming.dm @@ -23,14 +23,14 @@ Consuming extracts: 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/items/eatfood.ogg', 20, 1) 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/effects/splat.ogg', 40, 1) last_produced = world.time for(var/i in 1 to cookies) @@ -62,13 +62,13 @@ Consuming extracts: /obj/item/slime_cookie/attack(mob/living/M, mob/user) var/fed = FALSE if(M == user) - M.visible_message("[user] eats [src]!", "You eat [src].") + M.visible_message(span_notice("[user] eats [src]!"), span_notice("You 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_userdanger("[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 @@ -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/crystalized.dm b/code/modules/research/xenobiology/crossbreeding/crystalized.dm index 576da5612354..4690c4630e42 100644 --- a/code/modules/research/xenobiology/crossbreeding/crystalized.dm +++ b/code/modules/research/xenobiology/crossbreeding/crystalized.dm @@ -17,7 +17,7 @@ Crystalized extracts: . = ..() var/obj/structure/slime_crystal/C = locate() in range(6,get_turf(user)) if(C) - to_chat(user,"You can't build crystals that close to each other!") + to_chat(user,span_notice("You can't build crystals that close to each other!")) return var/user_turf = get_turf(user) if(!do_after(user,15 SECONDS,FALSE,user_turf)) diff --git a/code/modules/research/xenobiology/crossbreeding/recurring.dm b/code/modules/research/xenobiology/crossbreeding/recurring.dm index 4a094744f7f8..71488664f397 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 = "A tiny, inert core, bleeding dark, cerulean-colored goo." 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 978e88ba5982..f886adc14b3c 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 some of [H.p_their()] injuries!", - "You 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 some of [H.p_their()] injuries!"), + span_notice("You 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 some of [user.p_their()] injuries!", - "You 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 some of [user.p_their()] injuries!"), + span_notice("You 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.adjustBruteLoss(-25) H.adjustFireLoss(-25) @@ -46,7 +46,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) @@ -66,14 +66,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 = "Partially heals the target and encases the target in a locker." /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 = "Looking closer, it seems to be made of a sort of solid, opaque, metal-like goo." @@ -91,7 +91,7 @@ Regenerative extracts: if(batteries.len) var/obj/item/stock_parts/cell/ToCharge = pick(batteries) ToCharge.charge = ToCharge.maxcharge - to_chat(target, "You feel a strange electrical pulse, and one of your electrical items was recharged.") + to_chat(target, span_notice("You feel a strange electrical pulse, and one of your electrical items was recharged.")) /obj/item/slimecross/regenerative/darkpurple colour = "dark purple" @@ -104,7 +104,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" @@ -124,7 +124,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]" @@ -140,7 +140,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, "You feel satiated.") + to_chat(target, span_notice("You feel satiated.")) /obj/item/slimecross/regenerative/bluespace colour = "bluespace" @@ -148,7 +148,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) @@ -175,14 +175,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 = "Partially heals the target and randomly colors them." /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 @@ -199,7 +199,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)) @@ -211,7 +211,7 @@ Regenerative extracts: effect_desc = "Partially heals the target and injects them with some krokodil." /obj/item/slimecross/regenerative/pink/core_effect(mob/living/target, mob/user) - to_chat(target, "You feel more calm.") + to_chat(target, span_notice("You feel more calm.")) target.reagents.add_reagent(/datum/reagent/drug/krokodil,4) /obj/item/slimecross/regenerative/gold @@ -240,7 +240,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 @@ -263,7 +263,7 @@ Regenerative extracts: return var/mob/living/U = user U.revive(full_heal = 1) - 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 be66ed02d705..1803348e6ccf 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/effects/splat.ogg', 40, 1) 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, "You feed [monkeycube] to [src], and it pulses gently.") + to_chat(user, span_notice("You feed [monkeycube] to [src], and it pulses gently.")) playsound(src, 'sound/items/eatfood.ogg', 20, 1) /obj/item/slimecross/reproductive/grey diff --git a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm index 724b0904b0e9..c543f2131f0f 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 6d1250882081..33eb0a5cffa8 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, "You prod [src], and it shudders slightly.") + to_chat(user, span_notice("You prod [src], and it shudders slightly.")) START_PROCESSING(SSobj, src) if(choice == "Familiar Species") - to_chat(user, "You squeeze [src], and a shape seems to shift around inside.") + to_chat(user, span_notice("You squeeze [src], and a shape seems to shift around inside.")) generate_mobtype() START_PROCESSING(SSobj, src) if(choice == "Familiar Sentience") - to_chat(user, "You poke [src], and it lets out a glowing pulse.") + to_chat(user, span_notice("You poke [src], and it lets out a glowing pulse.")) saved_mind = null START_PROCESSING(SSobj, src) if(choice == "Familiar Name") var/newname = sanitize_name(stripped_input(user, "Would you like to change the name of [mob_name]", "Name change", mob_name, MAX_NAME_LEN)) if(newname) mob_name = newname - to_chat(user, "You speak softly into [src], and it shakes slightly in response.") + to_chat(user, span_notice("You 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, "You place [O] in [src], prepping the extract for automatic application!") + to_chat(user, span_notice("You 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 80bb1b39e0b8..05c578a24066 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -143,7 +143,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, "You feed [O] to [src]. It now has [monkeys] monkey cubes stored.") + to_chat(user, span_notice("You feed [O] to [src]. It now has [monkeys] monkey cubes stored.")) qdel(O) return else if(istype(O, /obj/item/storage/bag)) @@ -155,7 +155,7 @@ monkeys++ qdel(G) if(loaded) - to_chat(user, "You fill [src] with the monkey cubes stored in [O]. [src] now has [monkeys] monkey cubes stored.") + to_chat(user, span_notice("You 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 @@ -165,13 +165,13 @@ current_potion.forceMove(drop_location()) replaced = TRUE current_potion = O - to_chat(user, "You load [O] in the console's potion slot[replaced ? ", replacing the one that was there before" : ""].") + to_chat(user, span_notice("You 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, "You link [src] with [I.buffer] in [I] buffer.") + to_chat(user, span_notice("You link [src] with [I.buffer] in [I] buffer.")) connected_recycler = I.buffer connected_recycler.connected += src return TRUE @@ -194,7 +194,7 @@ S.visible_message("[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" @@ -219,7 +219,7 @@ 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 @@ -245,7 +245,7 @@ else to_chat(owner, "[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_notice("Target is not near a camera. Cannot proceed.")) /datum/action/innate/monkey_recycle @@ -262,7 +262,7 @@ 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_notice("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) @@ -274,7 +274,7 @@ qdel(M) to_chat(owner, "[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" @@ -291,7 +291,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" @@ -307,7 +307,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)) @@ -315,7 +315,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" @@ -367,7 +367,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 @@ -378,14 +378,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) @@ -393,7 +393,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 @@ -401,10 +401,10 @@ 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) @@ -415,7 +415,7 @@ //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 @@ -430,7 +430,7 @@ //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 @@ -450,14 +450,14 @@ //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_notice("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) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index fe8392ff2327..e619c8405c25 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, "You cannot enhance this extract further!") + to_chat(user, span_warning("You cannot enhance this extract further!")) return ..() if(O.type == /obj/item/slimepotion/enhancer) //Seriously, why is this defined here...? - to_chat(user, "You apply the enhancer to the slime extract. It may now be reused one more time.") + to_chat(user, span_notice("You 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, "You dump the maximizer on the slime extract. It can now be used a total of 5 times!") + to_chat(user, span_notice("You dump the maximizer on the slime extract. It can now be used a total of 5 times!")) Uses = 5 qdel(O) ..() @@ -54,7 +54,7 @@ * * arg3 - Whether or not the activation is major or minor. Major activations have large, complex effects, minor are simple. */ /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_notice("Nothing happened... This slime extract cannot be activated this way.")) return 0 /** @@ -66,13 +66,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) @@ -80,7 +80,7 @@ M.applied++ qdel(src) - to_chat(user, "You feed the slime [src], [M.applied == 1 ? "starting to mutate its core." : "further mutating its core."]") + to_chat(user, span_notice("You feed the slime [src], [M.applied == 1 ? "starting to mutate its core." : "further mutating its core."]")) playsound(M, 'sound/effects/attackblob.ogg', 50, 1) if(M.applied >= SLIME_EXTRACT_CROSSING_REQUIRED) @@ -99,14 +99,14 @@ if(!user.put_in_active_hand(M)) M.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, 1) - to_chat(user, "You spit out a monkey cube.") + to_chat(user, span_notice("You spit out a monkey cube.")) return 120 if(SLIME_ACTIVATE_MAJOR) - to_chat(user, "Your [name] starts pulsing...") + to_chat(user, span_notice("Your [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/effects/splat.ogg', 50, 1) - to_chat(user, "You spit out [S].") + to_chat(user, span_notice("You spit out [S].")) return 350 else return 0 @@ -120,16 +120,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!","Your [name] starts pulsing gently...") + user.visible_message(span_warning("[user] starts shaking!"),span_notice("Your [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/effects/splat.ogg', 50, 1) - user.visible_message("[user] spits out [S]!", "You spit out [S]!") + user.visible_message(span_warning("[user] spits out [S]!"), span_notice("You spit out [S]!")) return 300 if(SLIME_ACTIVATE_MAJOR) - user.visible_message("[user] starts shaking violently!","Your [name] starts pulsing violently...") + user.visible_message(span_warning("[user] starts shaking violently!"),span_warning("Your [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.a_intent != INTENT_HARM) @@ -137,7 +137,7 @@ else S.faction |= "slime" playsound(user, 'sound/effects/splat.ogg', 50, 1) - user.visible_message("[user] spits out [S]!", "You spit out [S]!") + user.visible_message(span_warning("[user] spits out [S]!"), span_warning("You spit out [S]!")) return 600 /obj/item/slime_extract/silver @@ -154,7 +154,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, 1) - user.visible_message("[user] spits out [O]!", "You spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("You spit out [O]!")) return 200 if(SLIME_ACTIVATE_MAJOR) var/drink_type = get_random_drink() @@ -162,7 +162,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, 1) - user.visible_message("[user] spits out [O]!", "You spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("You spit out [O]!")) return 200 /obj/item/slime_extract/metal @@ -178,7 +178,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, 1) - user.visible_message("[user] spits out [O]!", "You spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("You spit out [O]!")) return 150 if(SLIME_ACTIVATE_MAJOR) @@ -186,7 +186,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, 1) - user.visible_message("[user] spits out [O]!", "You spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("You spit out [O]!")) return 200 /obj/item/slime_extract/purple @@ -200,11 +200,11 @@ if(SLIME_ACTIVATE_MINOR) user.adjust_nutrition(50) user.blood_volume += 50 - to_chat(user, "You activate [src], and your body is refilled with fresh slime jelly!") + to_chat(user, span_notice("You activate [src], and your body is refilled with fresh slime jelly!")) return 150 if(SLIME_ACTIVATE_MAJOR) - to_chat(user, "You activate [src], and it releases regenerative chemicals!") + to_chat(user, span_notice("You activate [src], and it releases regenerative chemicals!")) user.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10) return 600 @@ -221,14 +221,14 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, 1) - user.visible_message("[user] spits out [O]!", "You spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("You 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, "You activate [src], and a cloud of plasma bursts out of your skin!") + to_chat(user, span_warning("You activate [src], and a cloud of plasma bursts out of your skin!")) return 900 /obj/item/slime_extract/orange @@ -240,7 +240,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, "You activate [src]. You start feeling hot!") + to_chat(user, span_notice("You activate [src]. You start feeling hot!")) user.reagents.add_reagent(/datum/reagent/consumable/capsaicin,10) return 150 @@ -248,7 +248,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, "You activate [src], and a cloud of smoke bursts out of your skin!") + to_chat(user, span_warning("You activate [src], and a cloud of smoke bursts out of your skin!")) return 450 /obj/item/slime_extract/yellow @@ -261,17 +261,17 @@ switch(activation_type) if(SLIME_ACTIVATE_MINOR) if(species.glow_intensity != LUMINESCENT_DEFAULT_GLOW) - to_chat(user, "Your glow is already enhanced!") + to_chat(user, span_warning("Your glow is already enhanced!")) return species.update_glow(user, 5) addtimer(CALLBACK(species, /datum/species/jelly/luminescent.proc/update_glow, user, LUMINESCENT_DEFAULT_GLOW), 600) - to_chat(user, "You start glowing brighter.") + to_chat(user, span_notice("You start glowing brighter.")) if(SLIME_ACTIVATE_MAJOR) - user.visible_message("[user]'s skin starts flashing intermittently...", "Your skin starts flashing intermittently...") + user.visible_message(span_warning("[user]'s skin starts flashing intermittently..."), span_warning("Your skin starts flashing intermittently...")) if(do_after(user, 25, target = user)) empulse(user, 1, 2) - user.visible_message("[user]'s skin flashes!", "Your skin flashes as you emit an electromagnetic pulse!") + user.visible_message(span_warning("[user]'s skin flashes!"), span_warning("Your skin flashes as you emit an electromagnetic pulse!")) return 600 /obj/item/slime_extract/red @@ -283,15 +283,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, "You activate [src]. You start feeling fast!") + to_chat(user, span_notice("You 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...", "Your skin flashes red as you emit rage-inducing pheromones...") + user.visible_message(span_warning("[user]'s skin flashes red for a moment..."), span_warning("Your 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 @@ -303,7 +303,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, "You activate [src]. Your genome feels more stable!") + to_chat(user, span_notice("You 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) @@ -315,7 +315,7 @@ s.set_up(20, location, user.reagents) s.start() user.reagents.clear_reagents() - user.visible_message("Foam spews out from [user]'s skin!", "You activate [src], and foam bursts out of your skin!") + user.visible_message(span_danger("Foam spews out from [user]'s skin!"), span_warning("You activate [src], and foam bursts out of your skin!")) return 600 /obj/item/slime_extract/darkblue @@ -327,7 +327,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, "You activate [src]. You start feeling colder!") + to_chat(user, span_notice("You activate [src]. You start feeling colder!")) user.ExtinguishMob() user.adjust_fire_stacks(-20) user.reagents.add_reagent(/datum/reagent/consumable/frostoil,4) @@ -338,7 +338,7 @@ var/turf/open/T = get_turf(user) if(istype(T)) T.atmos_spawn_air("nitrogen=40;TEMP=2.7") - to_chat(user, "You activate [src], and icy air bursts out of your skin!") + to_chat(user, span_warning("You activate [src], and icy air bursts out of your skin!")) return 900 /obj/item/slime_extract/pink @@ -351,19 +351,19 @@ switch(activation_type) if(SLIME_ACTIVATE_MINOR) if(user.gender != MALE && user.gender != FEMALE) - to_chat(user, "You can't swap your gender!") + to_chat(user, span_warning("You can't swap your gender!")) return if(user.gender == MALE) user.gender = FEMALE - user.visible_message("[user] suddenly looks more feminine!", "You suddenly feel more feminine!") + user.visible_message(span_boldnotice("[user] suddenly looks more feminine!"), span_boldwarning("You suddenly feel more feminine!")) else user.gender = MALE - user.visible_message("[user] suddenly looks more masculine!", "You suddenly feel more masculine!") + user.visible_message(span_boldnotice("[user] suddenly looks more masculine!"), span_boldwarning("You suddenly feel more masculine!")) return 100 if(SLIME_ACTIVATE_MAJOR) - user.visible_message("[user]'s skin starts flashing hypnotically...", "Your skin starts forming odd patterns, pacifying creatures around you.") + user.visible_message(span_warning("[user]'s skin starts flashing hypnotically..."), span_notice("Your 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) @@ -378,20 +378,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, "You feel yourself reverting to human form...") + to_chat(user, span_warning("You feel yourself reverting to human form...")) if(do_after(user, 120, target = user)) - to_chat(user, "You feel human again!") + to_chat(user, span_warning("You feel human again!")) user.set_species(/datum/species/human) return - to_chat(user, "You stop the transformation.") + to_chat(user, span_notice("You stop the transformation.")) if(SLIME_ACTIVATE_MAJOR) - to_chat(user, "You feel yourself radically changing your slime type...") + to_chat(user, span_warning("You feel yourself radically changing your slime type...")) if(do_after(user, 120, target = user)) - to_chat(user, "You feel different!") + to_chat(user, span_warning("You feel different!")) user.set_species(pick(/datum/species/jelly/slime, /datum/species/jelly/stargazer)) return - to_chat(user, "You stop the transformation.") + to_chat(user, span_notice("You stop the transformation.")) /obj/item/slime_extract/lightpink name = "light pink slime extract" @@ -406,7 +406,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, 1) - user.visible_message("[user] spits out [O]!", "You spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("You spit out [O]!")) return 150 if(SLIME_ACTIVATE_MAJOR) @@ -414,7 +414,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, 1) - user.visible_message("[user] spits out [O]!", "You spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("You spit out [O]!")) return 450 /obj/item/slime_extract/black @@ -431,12 +431,12 @@ return 100 if(SLIME_ACTIVATE_MAJOR) - to_chat(user, "You feel your own light turning dark...") + to_chat(user, span_warning("You feel your own light turning dark...")) if(do_after(user, 120, target = user)) - to_chat(user, "You feel a longing for darkness.") + to_chat(user, span_warning("You feel a longing for darkness.")) user.set_species(pick(/datum/species/shadow)) return - to_chat(user, "You stop feeding [src].") + to_chat(user, span_notice("You stop feeding [src].")) /obj/item/slime_extract/oil name = "oil slime extract" @@ -447,19 +447,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, "You vomit slippery oil.") + to_chat(user, span_warning("You vomit slippery oil.")) playsound(user, 'sound/effects/splat.ogg', 50, 1) 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...", "You feel unstable...") + user.visible_message(span_warning("[user]'s skin starts pulsing and glowing ominously..."), span_userdanger("You feel unstable...")) if(do_after(user, 60, target = user)) - to_chat(user, "You explode!") + to_chat(user, span_userdanger("You explode!")) explosion(get_turf(user), 1 ,3, 6) user.gib() return - to_chat(user, "You stop feeding [src], and the feeling passes.") + to_chat(user, span_notice("You stop feeding [src], and the feeling passes.")) /obj/item/slime_extract/adamantine name = "adamantine slime extract" @@ -471,20 +471,20 @@ switch(activation_type) if(SLIME_ACTIVATE_MINOR) if(species.armor > 0) - to_chat(user, "Your skin is already hardened!") + to_chat(user, span_warning("Your skin is already hardened!")) return - to_chat(user, "You feel your skin harden and become more resistant.") + to_chat(user, span_notice("You feel your skin harden and become more resistant.")) species.armor += 25 addtimer(CALLBACK(src, .proc/reset_armor, species), 1200) return 450 if(SLIME_ACTIVATE_MAJOR) - to_chat(user, "You feel your body rapidly crystallizing...") + to_chat(user, span_warning("You feel your body rapidly crystallizing...")) if(do_after(user, 120, target = user)) - to_chat(user, "You feel solid.") + to_chat(user, span_warning("You feel solid.")) user.set_species(pick(/datum/species/golem/adamantine)) return - to_chat(user, "You stop feeding [src], and your body returns to its slimelike state.") + to_chat(user, span_notice("You stop feeding [src], and your body returns to its slimelike state.")) /obj/item/slime_extract/adamantine/proc/reset_armor(datum/species/jelly/luminescent/species) if(istype(species)) @@ -503,15 +503,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, "You feel your body vibrating...") + to_chat(user, span_warning("You feel your body vibrating...")) if(do_after(user, 25, target = user)) - to_chat(user, "You teleport!") + to_chat(user, span_warning("You teleport!")) do_teleport(user, get_turf(user), 6, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) return 300 if(SLIME_ACTIVATE_MAJOR) if(!teleport_ready) - to_chat(user, "You feel yourself anchoring to this spot...") + to_chat(user, span_notice("You feel yourself anchoring to this spot...")) var/turf/T = get_turf(user) teleport_x = T.x teleport_y = T.y @@ -521,7 +521,7 @@ teleport_ready = FALSE if(teleport_x && teleport_y && teleport_z) var/turf/T = locate(teleport_x, teleport_y, teleport_z) - to_chat(user, "You snap back to your anchor point!") + to_chat(user, span_notice("You snap back to your anchor point!")) do_teleport(user, T, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) return 450 @@ -540,7 +540,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, 1) - user.visible_message("[user] spits out [O]!", "You spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("You spit out [O]!")) return 150 if(SLIME_ACTIVATE_MAJOR) @@ -549,7 +549,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, 1) - user.visible_message("[user] spits out [O]!", "You spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("You spit out [O]!")) return 250 /obj/item/slime_extract/cerulean @@ -562,14 +562,14 @@ switch(activation_type) if(SLIME_ACTIVATE_MINOR) user.reagents.add_reagent(/datum/reagent/medicine/salbutamol,15) - to_chat(user, "You feel like you don't need to breathe!") + to_chat(user, span_notice("You 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, "You activate [src], and fresh air bursts out of your skin!") + to_chat(user, span_warning("You activate [src], and fresh air bursts out of your skin!")) return 600 /obj/item/slime_extract/sepia @@ -585,11 +585,11 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, 1) - user.visible_message("[user] spits out [O]!", "You spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("You spit out [O]!")) return 150 if(SLIME_ACTIVATE_MAJOR) - to_chat(user, "You begin to anchor yourself to your current chronicity...") + to_chat(user, span_warning("You begin to anchor yourself to your current chronicity...")) if(do_after(user, 10, target = user)) user.AddComponent(/datum/component/dejavu) return 300 @@ -606,7 +606,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, "You feel different...") + to_chat(user, span_notice("You feel different...")) return 100 if(SLIME_ACTIVATE_MAJOR) @@ -615,7 +615,7 @@ if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, 1) - user.visible_message("[user] spits out [O]!", "You spit out [O]!") + user.visible_message(span_warning("[user] spits out [O]!"), span_notice("You spit out [O]!")) return 150 ////Slime-derived potions/// @@ -638,7 +638,7 @@ /obj/item/slimepotion/afterattack(obj/item/reagent_containers/target, mob/user , proximity) . = ..() if (istype(target)) - to_chat(user, "You cannot transfer [src] to [target]! It appears the potion must be given directly to a slime to absorb." ) + to_chat(user, span_notice("You cannot transfer [src] to [target]! It appears the potion must be given directly to a slime to absorb.") ) return /obj/item/slimepotion/slime/docility @@ -649,21 +649,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, "You absorb the potion, and your rabid hunger finally settles to a normal desire to feed.") - to_chat(user, "You feed the slime the potion, calming its rabid rage.") + to_chat(M, span_warning("You absorb the potion, and your rabid hunger finally settles to a normal desire to feed.")) + to_chat(user, span_notice("You 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, "You absorb the potion and feel your intense desire to feed melt away.") - to_chat(user, "You feed the slime the potion, removing its hunger and calming it.") + to_chat(M, span_warning("You absorb the potion and feel your intense desire to feed melt away.")) + to_chat(user, span_notice("You feed the slime the potion, removing its hunger and calming it.")) var/newname = sanitize_name(stripped_input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime", MAX_NAME_LEN)) if (!newname) @@ -687,22 +687,22 @@ 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 if(intel_timer <= world.time) intel_timer = world.time + intel_cooldown else - to_chat(src, "The [src] is on cooldown! You must wait [((intel_timer - world.time) / 10)] seconds before using it again.") + to_chat(src, span_danger("The [src] is on cooldown! You must wait [((intel_timer - world.time) / 10)] seconds before using it again.")) return - to_chat(user, "You offer [src] to [SM]...") + to_chat(user, span_notice("You 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 @@ -711,16 +711,16 @@ SM.key = C.key SM.sentience_act() SM.mind.enslave_mind_to_creator(user) - 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, "You 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_userdanger("You 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, "You 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_userdanger("You 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_languages(user) 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 ..() @@ -750,21 +750,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, "You cannot transfer your consciousness to [SM]." ) + to_chat(user, span_warning("You cannot transfer your 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, "Your mind goes blank as you attempt to use the potion.") + to_chat(user, span_warning("Your mind goes blank as you attempt to use the potion.")) return prompted = 1 @@ -772,15 +772,15 @@ prompted = 0 return - to_chat(user, "You drink the potion then place your hands on [SM]...") + to_chat(user, span_notice("You drink the potion then place your 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 your consciousness flow into [SM]!") - to_chat(SM, "You 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 your consciousness flow into [SM]!")) + to_chat(SM, span_warning("You 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) @@ -792,19 +792,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, "You feed the slime the steroid. It will now produce one more extract.") + to_chat(user, span_notice("You feed the slime the steroid. It will now produce one more extract.")) M.cores++ qdel(src) @@ -822,16 +822,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, "You feed the slime the stabilizer. It is now less likely to mutate.") + to_chat(user, span_notice("You feed the slime the stabilizer. It is now less likely to mutate.")) M.mutation_chance = clamp(M.mutation_chance-15,0,100) qdel(src) @@ -843,19 +843,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, "You feed the slime the mutator. It is now more likely to mutate.") + to_chat(user, span_notice("You 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) @@ -869,13 +869,13 @@ /obj/item/slimepotion/speed/afterattack(obj/C, mob/user) . = ..() 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)) // yogs start - change speed potion var/obj/item/I = C if(I.slowdown <= 2 || 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-- // yogs end @@ -886,12 +886,12 @@ if(R) // yogs start - change speed potion if(R.vehicle_move_delay <= 2 ) - 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-- // yogs end - to_chat(user, "You slather the red gunk over the [C], making it faster.") + to_chat(user, span_notice("You 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) @@ -910,12 +910,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, "You slather the blue gunk over the [C], fireproofing it.") + to_chat(user, span_notice("You 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) @@ -934,31 +934,31 @@ /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(iscarbon(L)) var/mob/living/carbon/C = L if(C.dna && !(MGENDER in C.dna.species.species_traits) && !(FGENDER in C.dna.species.species_traits) && !(AGENDER in C.dna.species.species_traits)) if(C.gender == MALE) C.gender = FEMALE - C.visible_message("[C] suddenly looks more feminine!", "You suddenly feel more feminine!") + C.visible_message(span_boldnotice("[C] suddenly looks more feminine!"), span_boldwarning("You suddenly feel more feminine!")) else C.gender = MALE - C.visible_message("[C] suddenly looks more masculine!", "You suddenly feel more masculine!") + C.visible_message(span_boldnotice("[C] suddenly looks more masculine!"), span_boldwarning("You suddenly feel more masculine!")) C.regenerate_icons() else - C.visible_message("[C]'s physiology fails to change!", "The potion fails to meaningfully effect you!") + C.visible_message(span_boldnotice("[C]'s physiology fails to change!"), span_boldwarning("The potion fails to meaningfully effect you!")) else if(L.gender == MALE) L.gender = FEMALE - L.visible_message("[L] suddenly looks more feminine!", "You suddenly feel more feminine!") + L.visible_message(span_boldnotice("[L] suddenly looks more feminine!"), span_boldwarning("You suddenly feel more feminine!")) else L.gender = MALE - L.visible_message("[L] suddenly looks more masculine!", "You suddenly feel more masculine!") + L.visible_message(span_boldnotice("[L] suddenly looks more masculine!"), span_boldwarning("You suddenly feel more masculine!")) L.regenerate_icons() qdel(src) @@ -974,12 +974,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, "You offer [src] to [user]...") + to_chat(user, span_notice("You offer [src] to [user]...")) var/new_name = stripped_input(M, "What would you like your name to be?", "Input a name", M.real_name, MAX_NAME_LEN) @@ -1005,14 +1005,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, "You feed the potion to [M].") - to_chat(M, "Your mind tingles as you are fed the potion. You can hear radio waves now!") + to_chat(user, span_notice("You feed the potion to [M].")) + to_chat(M, span_notice("Your 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/ruins/icemoonruin_code/hotsprings.dm b/code/modules/ruins/icemoonruin_code/hotsprings.dm index 7d0187c0fcbc..83d851a5b381 100644 --- a/code/modules/ruins/icemoonruin_code/hotsprings.dm +++ b/code/modules/ruins/icemoonruin_code/hotsprings.dm @@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(cursed_minds) L = wabbajack(L, "animal") var/turf/T = find_safe_turf() L.forceMove(T) - to_chat(L, "You blink and find yourself in [get_area_name(T)].") + to_chat(L, span_notice("You blink and find yourself in [get_area_name(T)].")) if("Life") var/mob/living/carbon/human/H = wabbajack(L, "humanoid") randomize_human(H) diff --git a/code/modules/ruins/lavalandruin_code/puzzle.dm b/code/modules/ruins/lavalandruin_code/puzzle.dm index 8f7cb4db20fa..72414daa5683 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_userdanger("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,"You trap [victim] in the prison cube!") + to_chat(user,span_warning("You 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_userdanger("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 1dfa014e4d8e..8db9701b46df 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/magic/demon_consume.ogg', 100, 1) 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 09b4b0f8b41d..a1e034153f9f 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/effects/stonedoor_openclose.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/effects/stonedoor_openclose.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]...", "You tentatively knock on [src]...") + user.visible_message(span_warning("[user] knocks on [src]..."), span_boldannounce("You tentatively knock on [src]...")) playsound(user.loc, 'sound/effects/shieldbash.ogg', 100, 1) 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_userdanger("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/creatures/legion_spawn.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_userdanger("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 2668c9eea828..01f92de4bf44 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -18,10 +18,10 @@ user.health -= 20 user.maxHealth -= 20 if(user.maxHealth <= 0) - to_chat(user, "No... just one more try...") + to_chat(user, span_userdanger("No... just one more try...")) user.gib() else - user.visible_message("[user] pulls [src]'s lever with a glint in [user.p_their()] eyes!", "You 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!"), "You feel a draining as you pull the lever, but you \ know it'll be worth it.") icon_state = "slots2" playsound(src, 'sound/lavaland/cursed_slot_machine.ogg', 50, 0) @@ -34,12 +34,12 @@ playsound(src, 'sound/lavaland/cursed_slot_machine_jackpot.ogg', 50, 0) 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.")) user.maxHealth += 20 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 @@ -87,10 +87,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 @@ -149,5 +149,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!", \ + user.visible_message(span_warning("[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.") diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index a7891a2aa08c..dd067d735184 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, "You invite [M] to the hotel.") + to_chat(user, span_notice("You 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, "You have to check out the first [SHORT_REAL_LIMIT] rooms before you can go to a higher numbered one!") + to_chat(user, span_warning("You 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() @@ -235,7 +235,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) if(!user.mind) return if(!parentSphere) - to_chat(user, "The door seems to be malfunctioned and refuses to operate!") + to_chat(user, span_warning("The door seems to be malfunctioned 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") user.forceMove(get_turf(parentSphere)) @@ -272,7 +272,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, "You peak through the door's bluespace peephole...") + to_chat(user, span_notice("You peak through the door's bluespace peephole...")) user.reset_perspective(parentSphere) user.set_machine(src) var/datum/action/peepholeCancel/PHC = new @@ -292,7 +292,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) /datum/action/peepholeCancel/Trigger() . = ..() - to_chat(owner, "You move away from the peephole.") + to_chat(owner, span_warning("You move away from the peephole.")) owner.reset_perspective() owner.clear_fullscreen("remote_view", 0) qdel(src) @@ -336,7 +336,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) @@ -416,7 +416,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 f87ccace88fa..d23306139102 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -53,10 +53,10 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) if(isanimal(user)) var/mob/living/simple_animal/A = user if(!A.dextrous) - to_chat(user, "You are too primitive to use this device!") + to_chat(user, span_warning("You are too primitive to use this device!")) return UI_CLOSE if(isdrone(user)) - to_chat(user, "You are unable to interface with this device!") + to_chat(user, span_warning("You are unable to interface with this device!")) return UI_CLOSE return ..() @@ -64,7 +64,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) if(..() || waiting || !allowed(usr)) return if(!check_access(usr.get_active_held_item())) - to_chat(usr, "You need to swipe your ID!") + to_chat(usr, span_warning("You need to swipe your ID!")) return switch(action) if("red_alert") @@ -119,10 +119,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 bc6c0a031c06..406ff0ec1e10 100644 --- a/code/modules/security_levels/security_levels.dm +++ b/code/modules/security_levels/security_levels.dm @@ -67,7 +67,7 @@ GLOBAL_VAR_INIT(security_level, SEC_LEVEL_GREEN) if(SEC_LEVEL_EPSILON) minor_announce(CONFIG_GET(string/alert_epsilon), "Attention! Epsilon security level reached!", TRUE) SEND_SOUND(world, 'sound/misc/epsilon_alert.ogg') - to_chat(world, "You get a bad feeling as you hear the Epsilon alert siren.") + to_chat(world, span_notice("You get a bad feeling as you hear the Epsilon alert siren.")) if(GLOB.security_level < SEC_LEVEL_EPSILON) modTimer = 1 @@ -89,7 +89,7 @@ GLOBAL_VAR_INIT(security_level, SEC_LEVEL_GREEN) pod.admin_controlled = FALSE 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/machines/boltsup.ogg', 50, TRUE) if(SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_RECALL) diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index 8c163a65f33e..ab5fa6e699cd 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -189,7 +189,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/computer.dm b/code/modules/shuttle/computer.dm index d1e3dfcb9a96..829da6224a1c 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -82,7 +82,7 @@ if(.) return if(!allowed(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, span_danger("Access denied.")) return switch(action) @@ -91,14 +91,14 @@ return 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 var/list/options = params2list(possible_destinations) if(!(params["shuttle_id"] in options)) @@ -110,9 +110,9 @@ say("Shuttle departing. Please stand away from the doors.") return TRUE 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.")) if("set_destination") var/target_destination = params["destination"] if(target_destination) @@ -120,10 +120,10 @@ return TRUE if("request") if(!COOLDOWN_FINISHED(src, request_cooldown)) - to_chat(usr, "CentCom is still processing last authorization request!") + to_chat(usr, span_warning("CentCom is still processing last authorization request!")) return COOLDOWN_START(src, request_cooldown, 1 MINUTES) - to_chat(usr, "Your request has been received by CentCom.") + to_chat(usr, span_notice("Your 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.") return TRUE @@ -132,7 +132,7 @@ return req_access = list() obj_flags |= EMAGGED - to_chat(user, "You fried the consoles ID checking system.") + to_chat(user, span_notice("You 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 830253029107..7a2909153255 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -65,11 +65,11 @@ var/obj/item/card/id/ID = user.get_idcard(TRUE) if(!ID) - to_chat(user, "You don't have an ID.") + to_chat(user, span_warning("You 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 @@ -82,7 +82,7 @@ // yogs start - added spam protection if(ID in authorized)// if you have already submitted your authorization: if(last_early_auth + SHUTTLE_EARLY_AUTHORIZATION_COOLDOWN_TIME > world.time) // this action was performed before cooldown expired - to_chat(user, "The emergency shuttle console is recharging, please wait [((last_early_auth + SHUTTLE_EARLY_AUTHORIZATION_COOLDOWN_TIME) - world.time)*0.1] seconds.") + to_chat(user, span_warning("The emergency shuttle console is recharging, please wait [((last_early_auth + SHUTTLE_EARLY_AUTHORIZATION_COOLDOWN_TIME) - world.time)*0.1] seconds.")) return authorized -= ID // Record this time so we can remember how long ago this repeal occured, and restrict announcement spam. @@ -95,7 +95,7 @@ // to launch early. // yogs start - added spam protection if(last_early_auth + SHUTTLE_EARLY_AUTHORIZATION_COOLDOWN_TIME > world.time) // this action was performed before cooldown expired - to_chat(user, "The emergency shuttle console is recharging, please wait [((last_early_auth + SHUTTLE_EARLY_AUTHORIZATION_COOLDOWN_TIME) - world.time)*0.1] seconds.") + to_chat(user, span_warning("The emergency shuttle console is recharging, please wait [((last_early_auth + SHUTTLE_EARLY_AUTHORIZATION_COOLDOWN_TIME) - world.time)*0.1] seconds.")) return // Record this time so we can remember how long ago this abortion occured, and restrict announcement spam. last_early_auth = world.time @@ -159,7 +159,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 @@ -476,7 +476,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() @@ -499,7 +499,7 @@ if(obj_flags & EMAGGED) return ENABLE_BITFIELD(obj_flags, EMAGGED) - to_chat(user, "You fry the pod's alert level checking system.") + to_chat(user, span_warning("You 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 4b085245ba43..9e30e3e7761a 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 ..() diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm index fff0b4c8c18f..e5225d3fcbab 100644 --- a/code/modules/shuttle/navigation_computer.dm +++ b/code/modules/shuttle/navigation_computer.dm @@ -36,10 +36,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 ..() @@ -115,23 +115,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, /obj/machinery/computer/camera_advanced/shuttle_docker/proc/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 if(!my_port) @@ -161,7 +161,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 /obj/machinery/computer/camera_advanced/shuttle_docker/proc/canDesignateTarget() @@ -341,7 +341,7 @@ if(T) playsound(console, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0) remote_eye.setLoc(T) - to_chat(target, "Jumped to [selected]") + to_chat(target, span_notice("Jumped to [selected]")) C.overlay_fullscreen("flash", /obj/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 22a0b23138e6..76edff4ee88a 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("[shuttle] slams into [M]!") + M.visible_message(span_warning("[shuttle] slams into [M]!")) SSblackbox.record_feedback("tally", "shuttle_gib", 1, M.type) M.gib() diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm index 7450cc7b8dfe..fec68faf0564 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/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 yourself from the outside.") + to_chat(sleeper, span_revennotice("While you slumber, you have the strangest dream, like you can see yourself from the outside.")) sleeper.ghostize(TRUE) /obj/structure/table/abductor/wabbajack/left @@ -188,7 +188,7 @@ var/throwtarget = get_edge_target_turf(src, boot_dir) M.Paralyze(40) M.throw_at(throwtarget, 5, 1,src) - to_chat(M, "No climbing on the bar please.") + to_chat(M, span_notice("No climbing on the bar please.")) else . = ..() @@ -247,7 +247,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 @@ -308,7 +308,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) @@ -330,7 +330,7 @@ AM.pulling = HC payees[AM] -= payees[AM] - say("Welcome to first class, [AM]![change ? " Here is your change." : ""]") + say(span_robot("Welcome to first class, [AM]![change ? " Here is your change." : ""]")) approved_passengers += AM check_times -= AM @@ -339,7 +339,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]] cr received. You need [threshold-payees[AM]] cr more.") + to_chat(AM, span_notice("[payees[AM]] cr received. You need [threshold-payees[AM]] cr more.")) check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN alarm_beep() return ..() diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index d650685b4f39..d0ee98e97443 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -24,7 +24,7 @@ return FALSE var/obj/item/circuitboard/computer/syndicate_shuttle/board = circuit if(board?.challenge && world.time < SYNDICATE_CHALLENGE_TIMER) - to_chat(user, "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(user, 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 FALSE board.moved = TRUE return TRUE @@ -50,7 +50,7 @@ if(!.) return FALSE if(!is_centcom_level(z)) - to_chat(user, "Pods are one way!") + to_chat(user, span_warning("Pods are one way!")) return FALSE return TRUE diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index 450412a8cced..69714632f50e 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -116,7 +116,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th var/charge_max = 100 //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/holder_var_type = "bruteloss" //only used if charge_type equals to "holder_var" @@ -160,7 +160,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, "You shouldn't have this spell! Something's wrong.") + to_chat(user, span_warning("You shouldn't have this spell! Something's wrong.")) return FALSE else if(!(src in user.mob_spell_list)) @@ -168,7 +168,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, "You can't cast this spell here.") + to_chat(user, span_notice("You can't cast this spell here.")) return FALSE if(!skipcharge) @@ -176,20 +176,20 @@ 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 you're incapacitated.") + to_chat(user, span_notice("Not when you're incapacitated.")) return FALSE if(!antimagic_allowed) var/antimagic = user.anti_magic_check(TRUE, FALSE, FALSE, 0, TRUE) if(antimagic) if(isitem(antimagic)) - to_chat(user, "[antimagic] is interfering with your magic.") + to_chat(user, span_notice("[antimagic] is interfering with your 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_notice("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 you are completely manifested in the material plane.") + to_chat(user, span_notice("[name] cannot be cast unless you are completely manifested in the material plane.")) return FALSE if(ishuman(user)) @@ -197,7 +197,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th var/mob/living/carbon/human/H = user if((invocation_type == "whisper" || invocation_type == "shout") && !H.can_speak_vocal()) - to_chat(user, "You can't get the words out!") + to_chat(user, span_notice("You can't get the words out!")) return FALSE var/list/casting_clothes = typecacheof(list(/obj/item/clothing/suit/wizrobe, @@ -210,24 +210,24 @@ 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_suit, casting_clothes)) - to_chat(H, "I don't feel strong enough without my robe.") + to_chat(H, span_notice("I don't feel strong enough without my robe.")) return FALSE if(!is_type_in_typecache(H.head, casting_clothes)) - to_chat(H, "I don't feel strong enough without my hat.") + to_chat(H, span_notice("I don't feel strong enough without my hat.")) return FALSE if(cult_req) //CULT_REQ CLOTHES CHECK if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/cult)) - to_chat(H, "I don't feel strong enough without my armor.") + to_chat(H, span_notice("I don't feel strong enough without my 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 my helmet.") + to_chat(H, span_notice("I don't feel strong enough without my helmet.")) return FALSE else if(clothes_req || human_req) - to_chat(user, "This spell can only be cast by humans!") + to_chat(user, span_notice("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_notice("This spell can only be cast by physical beings!")) return FALSE @@ -253,7 +253,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_notice("[name] has no charges left.")) return FALSE return TRUE @@ -279,7 +279,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_notice("[name] is still recharging.") charge_counter = charge_max /obj/effect/proc_holder/spell/Destroy() @@ -313,7 +313,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th before_cast(targets) 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(sound) @@ -560,6 +560,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]!", "You wreath yourself in healing light!") + user.visible_message(span_warning("A wreath of gentle light passes over [user]!"), span_notice("You wreath yourself 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 7a6a45c58f7e..52c1cdf7143f 100644 --- a/code/modules/spells/spell_types/aimed.dm +++ b/code/modules/spells/spell_types/aimed.dm @@ -17,11 +17,11 @@ return var/msg if(!can_cast(user)) - msg = "You can no longer cast [name]!" + msg = span_warning("You can no longer cast [name]!") remove_ranged_ability(msg) return if(active) - 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 diff --git a/code/modules/spells/spell_types/barnyard.dm b/code/modules/spells/spell_types/barnyard.dm index 4368158ec101..7ae66eeaccbf 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_notice("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, "You are unable to curse [target]'s head!") + to_chat(user, span_notice("You 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_notice("[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!", \ - "Your face starts burning up, but the flames are repulsed by your 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("Your face starts burning up, but the flames are repulsed by your 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!", \ - "Your 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("Your 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 55524788b79a..b3715085e505 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, "You are unable to blood crawl!") + to_chat(user, span_warning("You are unable to blood crawl!")) diff --git a/code/modules/spells/spell_types/charge.dm b/code/modules/spells/spell_types/charge.dm index 62792406906f..26d51644616c 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, "You feel raw magic flowing through you. It feels good!") + to_chat(M, span_notice("You feel raw magic flowing through you. It feels good!")) else - to_chat(M, "You feel very strange for a moment, but then it passes.") + to_chat(M, span_notice("You 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, "You feel magical power surging through your hands, but the feeling rapidly fades...") + to_chat(L, span_notice("You 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_caution("[charged_item] doesn't seem to be reacting to the spell...")) else playsound(get_turf(L), 'sound/magic/charge.ogg', 50, 1) - 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 759062f3fb9f..c563b0a27b4a 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_notice("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_notice("[target] is too far away!")) revert_cast() return if(target.anti_magic_check(TRUE, TRUE)) - to_chat(target, "You feel a freezing darkness closing in on you, but it rapidly dissipates.") + to_chat(target, span_warning("You 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_userdanger("A freezing darkness surrounds you...")) target.playsound_local(get_turf(target), 'sound/hallucinations/i_see_you1.ogg', 50, 1) user.playsound_local(get_turf(user), 'sound/effects/ghost2.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_notice("[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 0ac35f8908e7..a48c50868305 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, "You sent a curse of madness with the message \"[message]\"!") + to_chat(user, span_warning("You 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, "You have a strange feeling for a moment, but then it passes.") + to_chat(H, span_notice("You 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/magic/curse.ogg',40,1) to_chat(H, "[message]") - to_chat(H, "Your mind shatters!") + to_chat(H, span_warning("Your 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 2af6251d7f4e..ccafc91bd1a2 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_notice("[C] seems to not be sentient. You cannot summon a contract for [C.p_them()].")) action.UpdateButtonIcon() charge_counter = charge_max recharging = FALSE @@ -108,25 +108,25 @@ if(istype(user)) if(istype(user.loc, /obj/effect/dummy/phased_mob/slaughter/)) if(valid_location(user)) - to_chat(user, "You are now phasing in.") + to_chat(user, span_warning("You are now phasing in.")) if(do_mob(user,user,150)) if(valid_location(user)) user.infernalphasein() else - to_chat(user, "You are no longer near a potential signer.") + to_chat(user, span_warning("You are no longer near a potential signer.")) else - to_chat(user, "You can only re-appear near a potential signer.") + to_chat(user, span_warning("You can only re-appear near a potential signer.")) revert_cast() return ..() else user.notransform = TRUE user.fakefire() - to_chat(src, "You begin to phase back into sinful flames.") + to_chat(src, span_warning("You begin to phase back into sinful flames.")) if(do_mob(user,user,150)) user.infernalphaseout() else - to_chat(user, "You must remain still while exiting.") + to_chat(user, span_warning("You must remain still while exiting.")) user.notransform = FALSE user.fakefireextinguish() start_recharge() @@ -145,7 +145,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/magic/enter_blood.ogg', 100, 1, -1) var/obj/effect/dummy/phased_mob/slaughter/holder = new /obj/effect/dummy/phased_mob/slaughter(loc) ExtinguishMob() @@ -156,7 +156,7 @@ /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()) @@ -240,7 +240,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 3aeea2353a15..0fa7f91dec81 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, "Your master has deemed you a poor friend. Your durance in hell will now resume.") + to_chat(friend, span_userdanger("Your 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 ea259c76fe27..f1ec033dba02 100644 --- a/code/modules/spells/spell_types/ethereal_jaunt.dm +++ b/code/modules/spells/spell_types/ethereal_jaunt.dm @@ -96,10 +96,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 c6890ded697b..e40fc8f2bdff 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, "You can't reach out!") + to_chat(user, span_warning("You can't reach out!")) return ..() @@ -54,7 +54,7 @@ if(!proximity || target == user || !ismob(target) || !iscarbon(user) || !(user.mobility_flags & MOBILITY_USE)) //exploding after touching yourself would be bad return if(!user.can_speak_vocal()) - to_chat(user, "You can't get the words out!") + to_chat(user, span_notice("You can't get the words out!")) return var/mob/M = target do_sparks(4, FALSE, M.loc) @@ -64,8 +64,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_userdanger("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) @@ -73,7 +73,7 @@ return ..() var/obj/item/clothing/suit/hooded/bloated_human/suit = M.get_item_by_slot(SLOT_WEAR_SUIT) 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) @@ -93,15 +93,15 @@ if(!proximity || target == user || !isliving(target) || !iscarbon(user)) //getting hard after touching yourself would also be bad return if(!(user.mobility_flags & MOBILITY_USE)) - to_chat(user, "You can't reach out!") + to_chat(user, span_warning("You can't reach out!")) return if(!user.can_speak_vocal()) - to_chat(user, "You can't get the words out!") + to_chat(user, span_notice("You 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, "You 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("You feel your flesh turn to stone for a moment, then revert back!")) ..() return M.Stun(40) @@ -120,21 +120,21 @@ if(!proximity || target == user || !isliving(target) || !iscarbon(user)) //flagellating your own mind painfully wouldn't be THAT bad but still bad return if(!(user.mobility_flags & MOBILITY_USE)) - to_chat(user, "You can't reach out!") + to_chat(user, span_warning("You can't reach out!")) return if(!user.can_speak_vocal()) - to_chat(user, "You can't get the words out!") + to_chat(user, span_notice("You 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, "You feel faint energies trying to get into your head, before they suddenly vanish!") + to_chat(user, span_warning("The spell can't seem to affect [M]!")) + to_chat(M, span_warning("You feel faint energies trying to get into your head, before they suddenly vanish!")) ..() return M.adjustBruteLoss(18) //same as nullrod, but with a large cooldown, so it should be fine M.blur_eyes(10) M.confused = max(M.confused, 6) - M.visible_message("[M] cringes in pain as they hold their head for a second!") + M.visible_message(span_danger("[M] cringes in pain as they hold their head for a second!")) M.emote("scream") - to_chat(M, "You feel an explosion of pain erupt in your mind!") + to_chat(M, span_warning("You feel an explosion of pain erupt in your mind!")) return ..() diff --git a/code/modules/spells/spell_types/hivemind.dm b/code/modules/spells/spell_types/hivemind.dm index 1f0a0c2d8028..f5dcc52ecfd8 100644 --- a/code/modules/spells/spell_types/hivemind.dm +++ b/code/modules/spells/spell_types/hivemind.dm @@ -15,7 +15,7 @@ /obj/effect/proc_holder/spell/target_hive/choose_targets(mob/user = usr) var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) if(!hive || !hive.hivemembers) - to_chat(user, "This is a bug. Error:HIVE1") + to_chat(user, span_notice("This is a bug. Error:HIVE1")) return var/list/possible_targets = list() var/list/targets = list() @@ -56,33 +56,33 @@ var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) if(!target.mind || !target.client || target.stat == DEAD) - to_chat(user, "We detect no neural activity in this body.") + to_chat(user, span_notice("We detect no neural activity in this body.")) var/shielded = HAS_TRAIT(target, TRAIT_MINDSHIELD) var/foiled = target.anti_magic_check(FALSE, FALSE, TRUE, 0) if(shielded && !bruteforce) - to_chat(user, "Powerful technology protects [target.name]'s mind.") + to_chat(user, span_warning("Powerful technology protects [target.name]'s mind.")) revert_cast() return if((shielded || foiled) && bruteforce) - to_chat(user, "We [bruteforce ? "bruteforce" : "force"] our way past the mental barriers of [target.name] and begin linking our minds!") + to_chat(user, span_notice("We [bruteforce ? "bruteforce" : "force"] our way past the mental barriers of [target.name] and begin linking our minds!")) else - to_chat(user, "We begin linking our mind with [target.name]!") + to_chat(user, span_notice("We begin linking our mind with [target.name]!")) var/multiplier = (!foiled || bruteforce) ? 5 : 10 if(!do_after(user,multiplier*(1.5**get_dist(user, target)),0,user) || !(target in view(range))) - to_chat(user, "We fail to connect to [target.name].") + to_chat(user, span_notice("We fail to connect to [target.name].")) revert_cast() return if((HAS_TRAIT(target, TRAIT_MINDSHIELD) && !bruteforce)) - to_chat(user, "We fail to connect to [target.name].") + to_chat(user, span_notice("We fail to connect to [target.name].")) revert_cast() return - to_chat(user, "[target.name] was added to the Hive!") + to_chat(user, span_notice("[target.name] was added to the Hive!")) hive.add_to_hive(target) hive.threat_level = max(0, hive.threat_level-0.1) if(bruteforce) if(target.anti_magic_check(FALSE, FALSE, TRUE, 6)) target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10) - to_chat(user, "We are briefly exhausted by the effort required by our enhanced assimilation abilities.") + to_chat(user, span_warning("We are briefly exhausted by the effort required by our enhanced assimilation abilities.")) user.Immobilize(50) SEND_SIGNAL(target, COMSIG_NANITE_SET_VOLUME, 0) for(var/obj/item/implant/mindshield/M in target.implants) @@ -104,7 +104,7 @@ var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) if(!hive) - to_chat(user, "This is a bug. Error:HIVE1") + to_chat(user, span_notice("This is a bug. Error:HIVE1")) return var/datum/mind/M = target.mind if(!M) @@ -113,7 +113,7 @@ hive.remove_from_hive(target) hive.calc_size() hive.threat_level += 0.1 - to_chat(user, "We remove [target.name] from the hive") + to_chat(user, span_notice("We remove [target.name] from the hive")) if(hive.active_one_mind) var/datum/antagonist/hivevessel/woke = target.is_wokevessel() if(woke) @@ -140,11 +140,11 @@ if(vessel) if(vessel.anti_magic_check(FALSE, FALSE, TRUE, 0)) if(get_dist(src, vessel) > 42) - to_chat(user, "We were unable to link our view with [vessel.name]. A barrier of tinfoil prevents us to do so at this distance.") + to_chat(user, span_warning("We were unable to link our view with [vessel.name]. A barrier of tinfoil prevents us to do so at this distance.")) revert_cast() return limited = TRUE - to_chat(user, "A barrier of tinfoil drastically dampens our link with [vessel.name]. We'll be able to sustain the link as long as they remain within 42 tiles from us.") + to_chat(user, span_warning("A barrier of tinfoil drastically dampens our link with [vessel.name]. We'll be able to sustain the link as long as they remain within 42 tiles from us.")) vessel.apply_status_effect(STATUS_EFFECT_BUGGED, user) user.reset_perspective(vessel) active = TRUE @@ -165,7 +165,7 @@ /obj/effect/proc_holder/spell/target_hive/hive_see/process() if(active && (!vessel || !is_hivemember(vessel) || QDELETED(vessel) || (limited && get_dist(vessel, host) > 42))) - to_chat(host, "Our vessel is one of us no more!") + to_chat(host, span_warning("Our vessel is one of us no more!")) host.reset_perspective() host.clear_fullscreen("hive_eyes") active = FALSE @@ -198,10 +198,10 @@ /obj/effect/proc_holder/spell/targeted/hive_shock/cast(list/targets, mob/user = usr) var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) if(!hive || !hive.hivemembers) - to_chat(user, "This is a bug. Error:HIVE1") + to_chat(user, span_notice("This is a bug. Error:HIVE1")) return var/mob/living/carbon/target = targets[1] - to_chat(user, "We increase the psionic bandwidth between ourself and the target!") + to_chat(user, span_notice("We increase the psionic bandwidth between ourself and the target!")) var/power = 1 if(target.anti_magic_check(FALSE, FALSE, TRUE)) power *= 0.5 @@ -215,7 +215,7 @@ target.stuttering += 30*power target.Knockdown(1*power) target.stop_pulling() - to_chat(target, "You feel your mind start to burn!") + to_chat(target, span_userdanger("You feel your mind start to burn!")) /obj/effect/proc_holder/spell/self/hive_scan name = "Psychoreception" @@ -233,7 +233,7 @@ /obj/effect/proc_holder/spell/self/hive_scan/cast(mob/living/user = usr) var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) if(!hive) - to_chat(user, "This is a bug. Error:HIVE1") + to_chat(user, span_notice("This is a bug. Error:HIVE1")) return var/message var/distance @@ -243,7 +243,7 @@ if(!L) continue if(!do_after(user,5,0,user)) - to_chat(user, "Our concentration has been broken!") + to_chat(user, span_notice("Our concentration has been broken!")) break distance = get_dist(user, L) message = "[(L.is_real_hivehost()) ? "Someone": "A hivemind host"] tracking us" @@ -260,10 +260,10 @@ message += " isn't too far away." if(28 to INFINITY) message += " is quite far away." - to_chat(user, "[message]") + to_chat(user, span_assimilator("[message]")) for(var/datum/antagonist/hivemind/enemy in hive.individual_track_bonus) if(!do_after(user,5,0,user)) - to_chat(user, "Our concentration has been broken!") + to_chat(user, span_notice("Our concentration has been broken!")) break var/mob/living/carbon/C = enemy.owner?.current if(!C) @@ -288,7 +288,7 @@ message += " isn't too far away." if(28 to INFINITY) message += " is quite far away." - to_chat(user, "[message]") + to_chat(user, span_assimilator("[message]")) /obj/effect/proc_holder/spell/self/hive_drain name = "Repair Protocol" @@ -312,16 +312,16 @@ if(!carbon_members.len) return if(!user.getBruteLoss() && !user.getFireLoss() && !user.getCloneLoss() && !user.getOrganLoss(ORGAN_SLOT_BRAIN) && !user.getStaminaLoss()) - to_chat(user, "We cannot heal ourselves any more with this power!") + to_chat(user, span_notice("We cannot heal ourselves any more with this power!")) revert_cast() - to_chat(user, "We begin siphoning power from our many vessels!") + to_chat(user, span_notice("We begin siphoning power from our many vessels!")) while(iterations < 7) var/mob/living/carbon/target = pick(carbon_members) if(!do_after(user,10,0,user)) - to_chat(user, "Our concentration has been broken!") + to_chat(user, span_warning("Our concentration has been broken!")) break if(!target) - to_chat(user, "We have run out of vessels to drain.") + to_chat(user, span_warning("We have run out of vessels to drain.")) break var/regen = target.anti_magic_check(FALSE, FALSE, TRUE) ? 5 : 10 target.adjustOrganLoss(ORGAN_SLOT_BRAIN, regen/2) @@ -330,7 +330,7 @@ else user.heal_ordered_damage(regen, list(CLONE, BURN, BRUTE, STAMINA)) if(!user.getBruteLoss() && !user.getFireLoss() && !user.getCloneLoss() && !user.getStaminaLoss()) //If we don't have any of these, stop looping - to_chat(user, "We finish our healing") + to_chat(user, span_warning("We finish our healing")) break iterations++ user.setOrganLoss(ORGAN_SLOT_BRAIN, 0) @@ -344,11 +344,11 @@ return /mob/living/passenger/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) - to_chat(src, "You find yourself unable to speak, you aren't in control of your body!") + to_chat(src, span_warning("You find yourself unable to speak, you aren't in control of your body!")) return FALSE /mob/living/passenger/emote(act, m_type = null, message = null, intentional = FALSE) - to_chat(src, "You find yourself unable to emote, you aren't in control of your body!") + to_chat(src, span_warning("You find yourself unable to emote, you aren't in control of your body!")) return /mob/living/passenger/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode) @@ -389,7 +389,7 @@ backseat.ghostize(0) else backseat.mind.transfer_to(vessel,1) - vessel.visible_message("[src] suddenly wakes up, as though he was under foreign control!") + vessel.visible_message(span_userdanger("[src] suddenly wakes up, as though he was under foreign control!")) vessel.Jitter(3) message_admins("[ADMIN_LOOKUPFLW(vessel)] is no longer being controlled by [ADMIN_LOOKUPFLW(original_body)] (Hivemind Host).") log_game("[key_name(vessel)] was released from Mind Control by [key_name(original_body)].") @@ -412,28 +412,28 @@ vessel = targets[1] var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) if(!hive) - to_chat(user, "This is a bug. Error:HIVE1") + to_chat(user, span_notice("This is a bug. Error:HIVE1")) return original_body = user vessel = targets[1] - to_chat(user, "We begin merging our mind with [vessel.name].") + to_chat(user, span_notice("We begin merging our mind with [vessel.name].")) var/timely = 50 if(vessel.anti_magic_check(FALSE, FALSE, TRUE)) timely = 100 restricted_range = TRUE if(!do_after(user, timely, FALSE, user)) - to_chat(user, "We fail to assume control of the target.") + to_chat(user, span_notice("We fail to assume control of the target.")) revert_cast() return if(user.z != vessel.z || (restricted_range && get_dist(vessel, user) > 35)) - to_chat(user, "Our vessel is too far away to control.") + to_chat(user, span_notice("Our vessel is too far away to control.")) revert_cast() return for(var/datum/antagonist/hivemind/H in GLOB.antagonists) if(H.owner == user.mind) continue if(H.owner == vessel.mind) - to_chat(user, "We have detected a foreign presence within this mind, it would be unwise to merge so intimately with it.") + to_chat(user, span_danger("We have detected a foreign presence within this mind, it would be unwise to merge so intimately with it.")) revert_cast() return backseat = new /mob/living/passenger() @@ -444,7 +444,7 @@ message_admins("[ADMIN_LOOKUPFLW(vessel)] has been temporarily taken over by [ADMIN_LOOKUPFLW(user)] (Hivemind Host).") log_game("[key_name(vessel)] was Mind Controlled by [key_name(user)].") - deadchat_broadcast(" has just been mind controlled!", "[vessel]", vessel) + deadchat_broadcast(" has just been mind controlled!", span_name("[vessel]"), vessel) original_body = user backseat.loc = vessel @@ -459,14 +459,14 @@ starting_spot = get_turf(vessel) time_initialized = world.time revert_cast() - to_chat(vessel, "We can sustain our control for a maximum of [round(power/10)] seconds.") + to_chat(vessel, span_assimilator("We can sustain our control for a maximum of [round(power/10)] seconds.")) if(do_after(user,power,0,user,0)) - to_chat(vessel, "We cannot sustain the mind control any longer and release control!") + to_chat(vessel, span_warning("We cannot sustain the mind control any longer and release control!")) else - to_chat(vessel, "Our body has been disturbed, interrupting the mind control!") + to_chat(vessel, span_warning("Our body has been disturbed, interrupting the mind control!")) release_control() else - to_chat(usr, "We detect no neural activity in our vessel!") + to_chat(usr, span_warning("We detect no neural activity in our vessel!")) revert_cast() else release_control() @@ -481,24 +481,24 @@ original_body.adjustOrganLoss(ORGAN_SLOT_BRAIN, 200) release_control() else if(!is_hivemember(backseat)) //If the vessel is no longer a hive member, return to original bodies - to_chat(vessel, "Our vessel is one of us no more!") + to_chat(vessel, span_warning("Our vessel is one of us no more!")) release_control() else if(!QDELETED(original_body) && (!backseat.ckey || vessel.stat == DEAD)) //If the original body exists and the vessel is dead/ghosted, return both to body but not before killing the original original_body.adjustOrganLoss(ORGAN_SLOT_BRAIN, 200) - to_chat(vessel.mind, "Our vessel is one of us no more!") + to_chat(vessel.mind, span_warning("Our vessel is one of us no more!")) release_control() else if(!QDELETED(original_body) && original_body.z != vessel.z) //Return to original bodies release_control() - to_chat(original_body, "Our vessel is too far away to control!") + to_chat(original_body, span_warning("Our vessel is too far away to control!")) else if(QDELETED(original_body) || original_body.stat == DEAD) //Return vessel to its body, either return or ghost the original - to_chat(vessel, "Our body has been destroyed, the hive cannot survive without its host!") + to_chat(vessel, span_userdanger("Our body has been destroyed, the hive cannot survive without its host!")) release_control() else var/multiplier = restricted_range ? 0.5 : 1 if(!out_of_range && get_dist(starting_spot, vessel) > 14*multiplier) out_of_range = TRUE flash_color(vessel, flash_color="#800080", flash_time=10) - to_chat(vessel, "Our vessel has been moved too far away from the initial point of control, we will be disconnected if we go much further!") + to_chat(vessel, span_warning("Our vessel has been moved too far away from the initial point of control, we will be disconnected if we go much further!")) addtimer(CALLBACK(src, .proc/range_check, multiplier), 30) else if(get_dist(starting_spot, vessel) > 21*multiplier) release_control() @@ -535,7 +535,7 @@ /obj/effect/proc_holder/spell/targeted/induce_panic/cast(list/targets, mob/living/user = usr) var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) if(!hive) - to_chat(user, "This is a bug. Error:HIVE1") + to_chat(user, span_notice("This is a bug. Error:HIVE1")) return for(var/mob/living/carbon/human/target in targets) if(target.stat == DEAD) @@ -550,10 +550,10 @@ var/effect = rand(1,4) switch(effect) if(1) - to_chat(target, "You panic and drop everything to the ground!") + to_chat(target, span_userdanger("You panic and drop everything to the ground!")) target.drop_all_held_items() if(2) - to_chat(target, "You panic and flail around!") + to_chat(target, span_userdanger("You panic and flail around!")) target.click_random_mob() addtimer(CALLBACK(target, "click_random_mob"), 5) addtimer(CALLBACK(target, "click_random_mob"), 10) @@ -562,10 +562,10 @@ addtimer(CALLBACK(target, "Stun", 30), 25) target.confused += 10 if(3) - to_chat(target, "You freeze up in fear!") + to_chat(target, span_userdanger("You freeze up in fear!")) target.Stun(70) if(4) - to_chat(target, "You feel nauseous as dread washes over you!") + to_chat(target, span_userdanger("You feel nauseous as dread washes over you!")) target.Dizzy(15) target.apply_damage(30, STAMINA, target.get_bodypart(BODY_ZONE_HEAD)) target.hallucination += 45 @@ -589,7 +589,7 @@ /obj/effect/proc_holder/spell/targeted/pin/cast(list/targets, mob/living/user = usr) if(!targets) - to_chat(user, "Nobody is in sight, it'd be a waste to do that now.") + to_chat(user, span_notice("Nobody is in sight, it'd be a waste to do that now.")) revert_cast() return var/list/victims = list() @@ -605,7 +605,7 @@ victim.Knockdown(statustime/4) else victim.Knockdown(statustime) - to_chat(victim, "A sudden force throws you to the ground!") + to_chat(victim, span_userdanger("A sudden force throws you to the ground!")) for(var/mob/living/silicon/victim in victims) victim.Unconscious(statustime) var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) @@ -622,18 +622,18 @@ /obj/effect/proc_holder/spell/target_hive/nightmare/cast(list/targets, mob/living/user = usr) var/mob/living/carbon/target = targets[1] if(!do_after(user,30,0,user)) - to_chat(user, "Our concentration has been broken!") + to_chat(user, span_notice("Our concentration has been broken!")) revert_cast() return - to_chat(target, "You see dark smoke swirling around you!") + to_chat(target, span_userdanger("You see dark smoke swirling around you!")) if(target.anti_magic_check(FALSE, FALSE, TRUE)) - to_chat(user, "We begin bruteforcing the tinfoil barriers of [target.name] and pulling out their nightmares.") + to_chat(user, span_notice("We begin bruteforcing the tinfoil barriers of [target.name] and pulling out their nightmares.")) if(!do_after(user, 30, FALSE, user) || !(target in view(range))) - to_chat(user, "Our concentration has been broken!") + to_chat(user, span_notice("Our concentration has been broken!")) return target.apply_status_effect(STATUS_EFFECT_HIVEMIND_CURSE, CURSE_SPAWNING | CURSE_BLINDING) - to_chat(user, "We have brought forth the targets nightmares!") - deadchat_broadcast(" is suffering corporial nightmares!", "[target]", target) + to_chat(user, span_notice("We have brought forth the targets nightmares!")) + deadchat_broadcast(" is suffering corporial nightmares!", span_name("[target]"), target) var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) if(hive) @@ -669,9 +669,9 @@ if(user.get_active_held_item()==null) var/obj/item/W = new spell_item user.put_in_hands(W) - to_chat(user, "You make a telekinetic hand!") + to_chat(user, span_notice("You make a telekinetic hand!")) else - to_chat(user,"You cannot make a telekinetic hand while holding something!") + to_chat(user,span_notice("You cannot make a telekinetic hand while holding something!")) revert_cast() /obj/effect/proc_holder/spell/targeted/hive_hack @@ -691,20 +691,20 @@ /obj/effect/proc_holder/spell/targeted/hive_hack/cast(list/targets, mob/living/user = usr) var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) if(!hive) - to_chat(user, "This is a bug. Error:HIVE1") + to_chat(user, span_notice("This is a bug. Error:HIVE1")) return var/mob/living/carbon/target = targets[1] var/in_hive = hive.is_carbon_member(target) var/list/enemies = list() - to_chat(user, "We begin probing [target.name]'s mind!") + to_chat(user, span_notice("We begin probing [target.name]'s mind!")) if(do_after(user,100,0,target)) var/foiled = target.anti_magic_check(FALSE, FALSE, TRUE) if(!in_hive || foiled) var/timely = !in_hive ? 200 : 100 - to_chat(user, "Their mind slowly opens up to us.") + to_chat(user, span_notice("Their mind slowly opens up to us.")) if(!do_after(user,timely,FALSE,target)) - to_chat(user, "Our concentration has been broken!") + to_chat(user, span_notice("Our concentration has been broken!")) revert_cast() return for(var/datum/antagonist/hivemind/enemy in GLOB.antagonists) @@ -722,7 +722,7 @@ if(M.current.is_real_hivehost()) //If they were using mind control, too bad real_enemy.apply_status_effect(STATUS_EFFECT_HIVE_RADAR) target.apply_status_effect(STATUS_EFFECT_HIVE_TRACKER, real_enemy, enemy.get_track_bonus(hive)) - to_chat(real_enemy, "We detect a surge of psionic energy from a far away vessel before they disappear from the hive. Whatever happened, there's a good chance they're after us now.") + to_chat(real_enemy, span_assimilator("We detect a surge of psionic energy from a far away vessel before they disappear from the hive. Whatever happened, there's a good chance they're after us now.")) if(enemy.owner == M && target.is_real_hivehost()) var/atom/throwtarget @@ -731,17 +731,17 @@ flash_color(user, flash_color="#800080", flash_time=10) user.Paralyze(10) user.throw_at(throwtarget, 5, 1,src) - to_chat(user, "A sudden surge of psionic energy rushes into your mind, only a Hive host could have such power!!") + to_chat(user, span_userdanger("A sudden surge of psionic energy rushes into your mind, only a Hive host could have such power!!")) return if(enemies.len) hive.track_bonus += TRACKER_BONUS_SMALL - to_chat(user, "In a moment of clarity, we see all. Another hive. Faces. Our nemesis. They have heard our call. They know we are coming.") - to_chat(user, "This vision has provided us insight on our very nature, improving our sensory abilities, particularly against the hives this vessel belonged to.") + to_chat(user, span_userdanger("In a moment of clarity, we see all. Another hive. Faces. Our nemesis. They have heard our call. They know we are coming.")) + to_chat(user, span_assimilator("This vision has provided us insight on our very nature, improving our sensory abilities, particularly against the hives this vessel belonged to.")) user.apply_status_effect(STATUS_EFFECT_HIVE_RADAR) else - to_chat(user, "We peer into the inner depths of their mind and see nothing, no enemies lurk inside this mind.") + to_chat(user, span_notice("We peer into the inner depths of their mind and see nothing, no enemies lurk inside this mind.")) else - to_chat(user, "Our concentration has been broken!") + to_chat(user, span_notice("Our concentration has been broken!")) revert_cast() /obj/effect/proc_holder/spell/targeted/hive_reclaim @@ -762,7 +762,7 @@ /obj/effect/proc_holder/spell/targeted/hive_reclaim/cast(list/targets, mob/living/user = usr) var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) if(!hive) - to_chat(user, "This is a bug. Error:HIVE1") + to_chat(user, span_notice("This is a bug. Error:HIVE1")) return var/found_target = FALSE var/gibbed = FALSE @@ -787,8 +787,8 @@ flash_color(user, flash_color="#800080", flash_time=10) if(gibbed) - to_chat(user,"We have reclaimed what gifts weaker minds were squandering and gain ever more insight on our psionic abilities.") - to_chat(user,"Thanks to this new knowledge, our sensory powers last a great deal longer.") + to_chat(user,span_assimilator("We have reclaimed what gifts weaker minds were squandering and gain ever more insight on our psionic abilities.")) + to_chat(user,span_assimilator("Thanks to this new knowledge, our sensory powers last a great deal longer.")) hive.check_powers() /obj/effect/proc_holder/spell/self/hive_wake @@ -808,7 +808,7 @@ /obj/effect/proc_holder/spell/self/hive_wake/cast(mob/living/user = usr) var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) if(!hive) - to_chat(user, "This is a bug. Error:HIVE1") + to_chat(user, span_notice("This is a bug. Error:HIVE1")) return if(!hive.hivemembers) return @@ -820,7 +820,7 @@ valid_targets += C if(!valid_targets || valid_targets.len < 4) - to_chat(user, "We lack the vessels to use this power.") + to_chat(user, span_assimilator("We lack the vessels to use this power.")) revert_cast() return @@ -851,14 +851,14 @@ /obj/effect/proc_holder/spell/self/hive_loyal/cast(mob/living/user = usr) var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) if(!hive) - to_chat(user, "This is a bug. Error:HIVE1") + to_chat(user, span_notice("This is a bug. Error:HIVE1")) return var/obj/effect/proc_holder/spell/target_hive/hive_add/the_spell = locate(/obj/effect/proc_holder/spell/target_hive/hive_add) in user.mind.spell_list if(!the_spell) - to_chat(user, "This is a bug. Error:HIVE5") + to_chat(user, span_notice("This is a bug. Error:HIVE5")) return the_spell.bruteforce = !active - to_chat(user, "We [active?"let our minds rest and cancel our crushing power.":"prepare to crush mindshielding technology!"]") + to_chat(user, span_notice("We [active?"let our minds rest and cancel our crushing power.":"prepare to crush mindshielding technology!"]")) active = !active if(active) revert_cast() @@ -929,7 +929,7 @@ /obj/effect/proc_holder/spell/self/one_mind/cast(mob/living/user = usr) var/datum/antagonist/hivemind/hive = user.mind.has_antag_datum(/datum/antagonist/hivemind) if(!hive) - to_chat(user, "This is a bug. Error:HIVE1") + to_chat(user, span_notice("This is a bug. Error:HIVE1")) return var/mob/living/boss = user.get_real_hivehost() var/datum/objective/protect/new_objective = new /datum/objective/protect @@ -949,7 +949,7 @@ hive.glow = mutable_appearance('icons/effects/hivemind.dmi', "awoken", -BODY_BEHIND_LAYER) addtimer(CALLBACK(user, /atom/proc/add_overlay, hive.glow), 150) addtimer(CALLBACK(hive, /datum/antagonist/hivemind/proc/awaken), 150) - addtimer(CALLBACK(GLOBAL_PROC, /proc/send_to_playing_players, "THE ONE MIND RISES"), 150) + addtimer(CALLBACK(GLOBAL_PROC, /proc/send_to_playing_players, span_bigassimilator("THE ONE MIND RISES")), 150) addtimer(CALLBACK(GLOBAL_PROC, /proc/sound_to_playing_players, 'sound/effects/magic.ogg'), 150) for(var/datum/mind/M in hive.hivemembers) var/mob/living/carbon/C = M.current @@ -962,11 +962,11 @@ C.Jitter(15) C.Unconscious(150) C.anti_magic_check(FALSE, FALSE, TRUE, 6) - to_chat(C, "Something's wrong...") - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, C, "...your memories are becoming fuzzy."), 45) - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, C, "You try to remember who you are..."), 90) - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, C, "There is no you..."), 110) - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, C, "...there is only us."), 130) + to_chat(C, span_boldwarning("Something's wrong...")) + addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, C, span_boldwarning("...your memories are becoming fuzzy.")), 45) + addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, C, span_boldwarning("You try to remember who you are...")), 90) + addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, C, span_assimilator("There is no you...")), 110) + addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, C, span_bigassimilator("...there is only us.")), 130) addtimer(CALLBACK(C, /mob/living/proc/hive_awaken, new_objective, one_mind_team), 150) /obj/effect/proc_holder/spell/self/hive_comms diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm index 78cfb1182a7b..9753c5690ef8 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, "You must hold an item you wish to make your phylactery...") + to_chat(M, span_caution("You must hold an item you wish to make your phylactery...")) return if(!M.mind.hasSoul) - to_chat(user, "You do not possess a soul.") + to_chat(user, span_caution("You 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, "You begin to focus your very being into [item]...") + to_chat(M, span_warning("You begin to focus your very being into [item]...")) break if(!marked_item) - to_chat(M, "None of the items you hold are suitable for emplacement of your fragile soul.") + to_chat(M, span_warning("None of the items you hold are suitable for emplacement of your fragile soul.")) return playsound(user, 'sound/effects/pope_entry.ogg', 100) if(!do_after(M, 50, needhand=FALSE, target=marked_item)) - to_chat(M, "Your soul snaps back to your body as you stop ensouling [marked_item]!") + to_chat(M, span_warning("Your soul snaps back to your 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 your organs crumble to dust in your fleshless chest you come to terms with your choice. You're a lich!") + to_chat(M, span_userdanger("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 your organs crumble to dust in your fleshless chest you come to terms with your 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,null,lich.real_name,null, new /datum/species/skeleton) - to_chat(lich, "Your bones clatter and shudder as you are pulled back into this world!") + to_chat(lich, span_warning("Your 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 432d2aa40266..2b49d142d642 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, "You start gathering the power.") + to_chat(user, span_notice("You start gathering the power.")) Snd = new/sound('sound/magic/lightning_chargeup.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,0)// 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_notice("[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/magic/lightningshock.ogg', 50, 1, -1) - current.visible_message("[current] absorbs the spell, remaining unharmed!", "You absorb the spell, remaining unharmed!") + current.visible_message(span_warning("[current] absorbs the spell, remaining unharmed!"), span_userdanger("You absorb the spell, remaining unharmed!")) else if(bounces < 1) current.electrocute_act(bolt_energy,"Lightning Bolt",safety=1) playsound(get_turf(current), 'sound/magic/lightningshock.ogg', 50, 1, -1) diff --git a/code/modules/spells/spell_types/mime.dm b/code/modules/spells/spell_types/mime.dm index 14890ab6a12a..32de48a8bb3e 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 = "You form a wall in front of yourself." + invocation_emote_self = span_notice("You form a wall in front of yourself.") 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, "You must dedicate yourself to silence first.") + to_chat(usr, span_notice("You must dedicate yourself 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 = "You conjure an invisible chair and sit down." + invocation_emote_self = span_notice("You 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, "You must dedicate yourself to silence first.") + to_chat(usr, span_notice("You must dedicate yourself 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 = "You conjure up an invisible box, large enough to store a few things." + invocation_emote_self = span_notice("You conjure up an invisible box, large enough to store a few things.") summon_lifespan = 250 charge_max = 300 clothes_req = FALSE @@ -98,7 +98,7 @@ /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_box/Click() if(usr && usr.mind) if(!usr.mind.miming) - to_chat(usr, "You must dedicate yourself to silence first.") + to_chat(usr, span_notice("You must dedicate yourself 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 @@ -129,20 +129,20 @@ return var/mob/living/carbon/human/H = usr if(H.mind.miming) - still_recharging_msg = "You can't break your vow of silence that fast!" + still_recharging_msg = span_warning("You 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, "You make a vow of silence.") + to_chat(H, span_notice("You 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, "You break your vow of silence.") + to_chat(H, span_notice("You break your vow of silence.")) // These spells can only be gotten from the "Guide for Advanced Mimery series" for Mime Traitors. @@ -153,7 +153,7 @@ panel = "Mime" wall_type = /obj/effect/forcefield/mime/advanced invocation_type = "emote" - invocation_emote_self = "You form a blockade in front of yourself." + invocation_emote_self = span_notice("You form a blockade in front of yourself.") charge_max = 600 sound = null clothes_req = FALSE @@ -168,7 +168,7 @@ /obj/effect/proc_holder/spell/targeted/forcewall/mime/Click() if(usr && usr.mind) if(!usr.mind.miming) - to_chat(usr, "You must dedicate yourself to silence first.") + to_chat(usr, span_notice("You must dedicate yourself to silence first.")) return invocation = "[usr.real_name] looks as if a blockade is in front of [usr.p_them()]." else @@ -184,7 +184,7 @@ clothes_req = FALSE antimagic_allowed = TRUE invocation_type = "emote" - invocation_emote_self = "You fire your finger gun!" + invocation_emote_self = span_dangers("You fire your finger gun!") range = 20 projectile_type = /obj/item/projectile/bullet/mime projectile_amount = 3 @@ -202,11 +202,11 @@ /obj/effect/proc_holder/spell/aimed/finger_guns/Click() var/mob/living/carbon/human/owner = usr if(owner.incapacitated()) - to_chat(owner, "You can't properly point your fingers while incapacitated.") + to_chat(owner, span_warning("You can't properly point your fingers while incapacitated.")) return if(usr && usr.mind) if(!usr.mind.miming) - to_chat(usr, "You must dedicate yourself to silence first.") + to_chat(usr, span_notice("You must dedicate yourself to silence first.")) return invocation = "[usr.real_name] fires [usr.p_their()] finger gun!" else diff --git a/code/modules/spells/spell_types/mind_transfer.dm b/code/modules/spells/spell_types/mind_transfer.dm index f54c8f70a27d..7d605c8748ad 100644 --- a/code/modules/spells/spell_types/mind_transfer.dm +++ b/code/modules/spells/spell_types/mind_transfer.dm @@ -23,12 +23,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] @@ -38,33 +38,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) || (target.status_flags & GODMODE)) 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, "You don't particularly want to be dead!") + to_chat(user, span_warning("You 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/clockcult) || TM.has_antag_datum(/datum/antagonist/changeling) || TM.has_antag_datum(/datum/antagonist/rev) || TM.has_antag_datum(/datum/antagonist/darkspawn)) || target.key[1] == "@") 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)) @@ -72,7 +72,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/pointed/blind.dm b/code/modules/spells/spell_types/pointed/blind.dm index 3af7f1a5408a..4968b47b3eb4 100644 --- a/code/modules/spells/spell_types/pointed/blind.dm +++ b/code/modules/spells/spell_types/pointed/blind.dm @@ -6,7 +6,7 @@ clothes_req = FALSE invocation = "STI KALY" invocation_type = "whisper" - message = "Your eyes cry out in pain!" + message = span_notice("Your eyes cry out in pain!") cooldown_min = 50 //12 deciseconds reduction per rank ranged_mousepointer = 'icons/effects/mouse_pointers/blind_target.dmi' action_icon_state = "blind" @@ -29,6 +29,6 @@ return FALSE if(!isliving(target)) if(!silent) - to_chat(user, "You can only blind living beings!") + to_chat(user, span_warning("You can only blind living beings!")) return FALSE return TRUE \ No newline at end of file diff --git a/code/modules/spells/spell_types/pointed/pointed.dm b/code/modules/spells/spell_types/pointed/pointed.dm index ecf0276b167f..40f2b364df1b 100644 --- a/code/modules/spells/spell_types/pointed/pointed.dm +++ b/code/modules/spells/spell_types/pointed/pointed.dm @@ -17,11 +17,11 @@ return var/msg if(!can_cast(user)) - msg = "You can no longer cast [name]!" + msg = span_warning("You can no longer cast [name]!") remove_ranged_ability(msg) return if(active) - msg = "[deactive_msg]" + msg = span_notice("[deactive_msg]") remove_ranged_ability(msg) else msg = "[active_msg] Left-click to activate spell on a target!" @@ -94,11 +94,11 @@ /obj/effect/proc_holder/spell/pointed/proc/intercept_check(mob/user, atom/target, silent = FALSE) if(!self_castable && target == user) if(!silent) - to_chat(user, "You cannot cast the spell on yourself!") + to_chat(user, span_warning("You cannot cast the spell on yourself!")) return FALSE if(!(target in view_or_range(range, user, selection_type))) if(!silent) - to_chat(user, "[target.p_theyre(TRUE)] too far away!") + to_chat(user, span_warning("[target.p_theyre(TRUE)] too far away!")) return FALSE if(!can_target(target, user, silent)) return FALSE diff --git a/code/modules/spells/spell_types/projectile.dm b/code/modules/spells/spell_types/projectile.dm index baeb79121a11..3860173e4916 100644 --- a/code/modules/spells/spell_types/projectile.dm +++ b/code/modules/spells/spell_types/projectile.dm @@ -52,7 +52,7 @@ /obj/item/projectile/magic/spell/on_hit(mob/living/carbon/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 diff --git a/code/modules/spells/spell_types/rod_form.dm b/code/modules/spells/spell_types/rod_form.dm index 71098de6b01d..375800685894 100644 --- a/code/modules/spells/spell_types/rod_form.dm +++ b/code/modules/spells/spell_types/rod_form.dm @@ -45,8 +45,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!" , "You hear a weak, sad, CLANG.") + L.visible_message(span_danger("[src] hits [L], but it bounces back, then vanishes!") , span_userdanger("[src] hits you... but it bounces back, then vanishes!") , "You hear a weak, sad, CLANG.") qdel(src) return - L.visible_message("[L] is penetrated by an immovable rod!" , "The rod penetrates you!" , "You hear a CLANG!") + L.visible_message(span_danger("[L] is penetrated by an immovable rod!") , span_userdanger("The rod penetrates you!") , "You 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 a3afdba9ecd2..29975ab9c042 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/magic/ethereal_enter.ogg', 50, 1, -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/magic/ethereal_exit.ogg', 50, 1, -1) jaunter = null diff --git a/code/modules/spells/spell_types/shapeshift.dm b/code/modules/spells/spell_types/shapeshift.dm index 31661deba433..01ee5c011bb0 100644 --- a/code/modules/spells/spell_types/shapeshift.dm +++ b/code/modules/spells/spell_types/shapeshift.dm @@ -54,7 +54,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 e9cc7acdd21f..be22aac90fb9 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, "You do not possess a soul to tap into!") + to_chat(user, span_warning("You do not possess a soul to tap into!")) return - to_chat(user, "Your body feels drained and there is a burning pain in your chest.") + to_chat(user, span_danger("Your body feels drained and there is a burning pain in your chest.")) user.maxHealth -= HEALTH_LOST_PER_SOUL_TAP user.health = min(user.health, user.maxHealth) if(user.maxHealth <= 0) - to_chat(user, "Your weakened soul is completely consumed by the tap!") + to_chat(user, span_userdanger("Your 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 5323c9f45e23..6bee83f5488c 100644 --- a/code/modules/spells/spell_types/summonitem.dm +++ b/code/modules/spells/spell_types/summonitem.dm @@ -35,17 +35,17 @@ if(!marked_item) if(hand_items) - message = "You aren't holding anything that can be marked for recall." + message = span_caution("You aren't holding anything that can be marked for recall.") else - message = "You must hold the desired item in your hands to mark it for recall." + message = span_notice("You 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 = "You remove the mark on [marked_item] to use elsewhere." + message = span_notice("You 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 = "You sense your marked item has been destroyed!" + message = span_warning("You sense your marked item has been destroyed!") name = "Instant Summons" marked_item = null @@ -70,9 +70,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_caution("[M] suddenly appears!")) item_to_retrieve = null break M.dropItemToGround(item_to_retrieve) @@ -87,7 +87,7 @@ var/obj/item/bodypart/part = X if(item_to_retrieve in part.embedded_objects) part.embedded_objects -= 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!")) if(!C.has_embedded_objects()) C.clear_alert("embeddedobject") SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "embedded") @@ -107,13 +107,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_caution("The [item_to_retrieve.name] suddenly appears!")) playsound(get_turf(L), 'sound/magic/summonitems_generic.ogg', 50, 1) 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_caution("The [item_to_retrieve.name] suddenly appears in [L]'s hand!")) playsound(get_turf(L), 'sound/magic/summonitems_generic.ogg', 50, 1) diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm index b931b6524473..2bcd04310c6f 100644 --- a/code/modules/spells/spell_types/touch_attacks.dm +++ b/code/modules/spells/spell_types/touch_attacks.dm @@ -23,7 +23,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) @@ -44,11 +44,11 @@ if(!user.put_in_hands(attached_hand)) remove_hand(TRUE) if (user.get_num_arms() <= 0) - to_chat(user, "You dont have any usable hands!") + to_chat(user, span_warning("You dont have any usable hands!")) else - to_chat(user, "Your hands are full!") + to_chat(user, span_warning("Your 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 da3256350e57..7f49e59dd514 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, "You are unable to speak!") + to_chat(user, span_warning("You 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 55789ca9ae9c..b1adc405fa98 100644 --- a/code/modules/spells/spell_types/wizard.dm +++ b/code/modules/spells/spell_types/wizard.dm @@ -33,7 +33,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 . = ..() @@ -280,13 +280,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_userdanger("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_userdanger("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, quickstart = TRUE)//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/surgery/advanced/bioware/ligament_hook.dm b/code/modules/surgery/advanced/bioware/ligament_hook.dm index 8c20ef4ddab1..def4015b0a0f 100644 --- a/code/modules/surgery/advanced/bioware/ligament_hook.dm +++ b/code/modules/surgery/advanced/bioware/ligament_hook.dm @@ -18,12 +18,12 @@ time = 125 /datum/surgery_step/reshape_ligaments/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You start reshaping [target]'s ligaments into a hook-like shape.", + display_results(user, target, span_notice("You start reshaping [target]'s ligaments into a hook-like shape."), "[user] starts reshaping [target]'s ligaments into a hook-like shape.", "[user] starts manipulating [target]'s ligaments.") /datum/surgery_step/reshape_ligaments/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You reshape [target]'s ligaments into a connective hook!", + display_results(user, target, span_notice("You reshape [target]'s ligaments into a connective hook!"), "[user] reshapes [target]'s ligaments into a connective hook!", "[user] finishes manipulating [target]'s ligaments.") new /datum/bioware/hooked_ligaments(target) diff --git a/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm b/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm index f04affc32a07..8c3f26fe53b0 100644 --- a/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm +++ b/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm @@ -18,12 +18,12 @@ time = 125 /datum/surgery_step/reinforce_ligaments/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You start reinforcing [target]'s ligaments.", + display_results(user, target, span_notice("You start reinforcing [target]'s ligaments."), "[user] starts reinforce [target]'s ligaments.", "[user] starts manipulating [target]'s ligaments.") /datum/surgery_step/reinforce_ligaments/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You reinforce [target]'s ligaments!", + display_results(user, target, span_notice("You reinforce [target]'s ligaments!"), "[user] reinforces [target]'s ligaments!", "[user] finishes manipulating [target]'s ligaments.") new /datum/bioware/reinforced_ligaments(target) diff --git a/code/modules/surgery/advanced/bioware/muscled_veins.dm b/code/modules/surgery/advanced/bioware/muscled_veins.dm index c9771d8b295d..8901295edc7d 100644 --- a/code/modules/surgery/advanced/bioware/muscled_veins.dm +++ b/code/modules/surgery/advanced/bioware/muscled_veins.dm @@ -17,12 +17,12 @@ time = 125 /datum/surgery_step/muscled_veins/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You start wrapping muscles around [target]'s circulatory system.", + display_results(user, target, span_notice("You start wrapping muscles around [target]'s circulatory system."), "[user] starts wrapping muscles around [target]'s circulatory system.", "[user] starts manipulating [target]'s circulatory system.") /datum/surgery_step/muscled_veins/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You reshape [target]'s circulatory system, adding a muscled membrane!", + display_results(user, target, span_notice("You reshape [target]'s circulatory system, adding a muscled membrane!"), "[user] reshapes [target]'s circulatory system, adding a muscled membrane!", "[user] finishes manipulating [target]'s circulatory system.") new /datum/bioware/muscled_veins(target) diff --git a/code/modules/surgery/advanced/bioware/nerve_grounding.dm b/code/modules/surgery/advanced/bioware/nerve_grounding.dm index 3e1f2f297e0d..242faae615da 100644 --- a/code/modules/surgery/advanced/bioware/nerve_grounding.dm +++ b/code/modules/surgery/advanced/bioware/nerve_grounding.dm @@ -17,12 +17,12 @@ time = 155 /datum/surgery_step/ground_nerves/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You start rerouting [target]'s nerves.", + display_results(user, target, span_notice("You start rerouting [target]'s nerves."), "[user] starts rerouting [target]'s nerves.", "[user] starts manipulating [target]'s nervous system.") /datum/surgery_step/ground_nerves/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You successfully reroute [target]'s nervous system!", + display_results(user, target, span_notice("You successfully reroute [target]'s nervous system!"), "[user] successfully reroutes [target]'s nervous system!", "[user] finishes manipulating [target]'s nervous system.") new /datum/bioware/grounded_nerves(target) diff --git a/code/modules/surgery/advanced/bioware/nerve_splicing.dm b/code/modules/surgery/advanced/bioware/nerve_splicing.dm index 4c2a39986f38..d79291e669a3 100644 --- a/code/modules/surgery/advanced/bioware/nerve_splicing.dm +++ b/code/modules/surgery/advanced/bioware/nerve_splicing.dm @@ -17,12 +17,12 @@ time = 155 /datum/surgery_step/splice_nerves/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You start splicing together [target]'s nerves.", + display_results(user, target, span_notice("You start splicing together [target]'s nerves."), "[user] starts splicing together [target]'s nerves.", "[user] starts manipulating [target]'s nervous system.") /datum/surgery_step/splice_nerves/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You successfully splice [target]'s nervous system!", + display_results(user, target, span_notice("You successfully splice [target]'s nervous system!"), "[user] successfully splices [target]'s nervous system!", "[user] finishes manipulating [target]'s nervous system.") new /datum/bioware/spliced_nerves(target) diff --git a/code/modules/surgery/advanced/bioware/vein_threading.dm b/code/modules/surgery/advanced/bioware/vein_threading.dm index 08eb6f391f32..d572fc4bd5fc 100644 --- a/code/modules/surgery/advanced/bioware/vein_threading.dm +++ b/code/modules/surgery/advanced/bioware/vein_threading.dm @@ -17,12 +17,12 @@ time = 125 /datum/surgery_step/thread_veins/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You start weaving [target]'s circulatory system.", + display_results(user, target, span_notice("You start weaving [target]'s circulatory system."), "[user] starts weaving [target]'s circulatory system.", "[user] starts manipulating [target]'s circulatory system.") /datum/surgery_step/thread_veins/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You weave [target]'s circulatory system into a resistant mesh!", + display_results(user, target, span_notice("You weave [target]'s circulatory system into a resistant mesh!"), "[user] weaves [target]'s circulatory system into a resistant mesh!", "[user] finishes manipulating [target]'s circulatory system.") new /datum/bioware/threaded_veins(target) diff --git a/code/modules/surgery/advanced/brainwashing.dm b/code/modules/surgery/advanced/brainwashing.dm index 487364be5dad..bf1240b8957d 100644 --- a/code/modules/surgery/advanced/brainwashing.dm +++ b/code/modules/surgery/advanced/brainwashing.dm @@ -35,21 +35,21 @@ objective = stripped_input(user, "Choose the objective to imprint on your victim's brain.", "Brainwashing", null, MAX_MESSAGE_LEN) if(!objective) return -1 - display_results(user, target, "You begin to brainwash [target]...", + display_results(user, target, span_notice("You begin to brainwash [target]..."), "[user] begins to fix [target]'s brain.", "[user] begins to perform surgery on [target]'s brain.") /datum/surgery_step/brainwash/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(!target.mind) - to_chat(user, "[target] doesn't respond to the brainwashing, as if [target.p_they()] lacked a mind...") + to_chat(user, span_warning("[target] doesn't respond to the brainwashing, as if [target.p_they()] lacked a mind...")) return FALSE if(HAS_TRAIT(target, TRAIT_MINDSHIELD)) - to_chat(user, "You hear a faint buzzing from a device inside [target]'s brain, and the brainwashing is erased.") + to_chat(user, span_warning("You hear a faint buzzing from a device inside [target]'s brain, and the brainwashing is erased.")) return FALSE - display_results(user, target, "You succeed in brainwashing [target].", + display_results(user, target, span_notice("You succeed in brainwashing [target]."), "[user] successfully fixes [target]'s brain!", "[user] completes the surgery on [target]'s brain.") - to_chat(target, "A new compulsion fills your mind... you feel forced to obey it!") + to_chat(target, span_userdanger("A new compulsion fills your mind... you feel forced to obey it!")) brainwash(target, objective) message_admins("[ADMIN_LOOKUPFLW(user)] surgically brainwashed [ADMIN_LOOKUPFLW(target)] with the objective '[objective]'.") log_game("[key_name(user)] surgically brainwashed [key_name(target)] with the objective '[objective]'.") @@ -58,10 +58,10 @@ /datum/surgery_step/brainwash/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) var/obj/item/organ/brain/B = target.getorganslot(ORGAN_SLOT_BRAIN) if(B) - display_results(user, target, "You screw up, bruising the brain tissue!", - "[user] screws up, causing brain damage!", + display_results(user, target, span_warning("You screw up, bruising the brain tissue!"), + span_warning("[user] screws up, causing brain damage!"), "[user] completes the surgery on [target]'s brain.") B.applyOrganDamage(80) else - user.visible_message("[user] suddenly notices that the brain [user.p_they()] [user.p_were()] working on is not there anymore.", "You suddenly notice that the brain you were working on is not there anymore.") + user.visible_message("[user] suddenly notices that the brain [user.p_they()] [user.p_were()] working on is not there anymore.", span_warning("You suddenly notice that the brain you were working on is not there anymore.")) return FALSE \ No newline at end of file diff --git a/code/modules/surgery/advanced/dna_recovery.dm b/code/modules/surgery/advanced/dna_recovery.dm index f08aa9b86d2a..4e030c46e58b 100644 --- a/code/modules/surgery/advanced/dna_recovery.dm +++ b/code/modules/surgery/advanced/dna_recovery.dm @@ -39,12 +39,12 @@ require_all_chems = FALSE /datum/surgery_step/dna_recovery/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to mend what's left of [target]'s DNA...", + display_results(user, target, span_notice("You begin to mend what's left of [target]'s DNA..."), "[user] begins to tinker with [target]'s brain...", "[user] begins to perform surgery on [target]'s brain.") /datum/surgery_step/dna_recovery/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You succeed in fixing some of [target]'s DNA!", + display_results(user, target, span_notice("You succeed in fixing some of [target]'s DNA!"), "[user] successfully repairs some of [target]'s DNA", "[user] completes the surgery on [target]'s brain.") REMOVE_TRAIT(target, TRAIT_BADDNA, CHANGELING_DRAIN) diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm index 3028eb307be8..e44ec4ad22fd 100644 --- a/code/modules/surgery/advanced/lobotomy.dm +++ b/code/modules/surgery/advanced/lobotomy.dm @@ -34,12 +34,12 @@ return TRUE /datum/surgery_step/lobotomize/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to perform a lobotomy on [target]'s brain...", + display_results(user, target, span_notice("You begin to perform a lobotomy on [target]'s brain..."), "[user] begins to perform a lobotomy on [target]'s brain.", "[user] begins to perform surgery on [target]'s brain.") /datum/surgery_step/lobotomize/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You succeed in lobotomizing [target].", + display_results(user, target, span_notice("You succeed in lobotomizing [target]."), "[user] successfully lobotomizes [target]!", "[user] completes the surgery on [target]'s brain.") target.cure_all_traumas(TRAUMA_RESILIENCE_LOBOTOMY) @@ -56,7 +56,7 @@ /datum/surgery_step/lobotomize/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(target.getorganslot(ORGAN_SLOT_BRAIN)) - display_results(user, target, "You remove the wrong part, causing more damage!", + display_results(user, target, span_warning("You remove the wrong part, causing more damage!"), "[user] successfully lobotomizes [target]!", "[user] completes the surgery on [target]'s brain.") target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 40) @@ -68,5 +68,5 @@ if(3) target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_MAGIC) else - user.visible_message("[user] suddenly notices that the brain [user.p_they()] [user.p_were()] working on is not there anymore.", "You suddenly notice that the brain you were working on is not there anymore.") + user.visible_message("[user] suddenly notices that the brain [user.p_they()] [user.p_were()] working on is not there anymore.", span_warning("You suddenly notice that the brain you were working on is not there anymore.")) return FALSE \ No newline at end of file diff --git a/code/modules/surgery/advanced/necrotic_revival.dm b/code/modules/surgery/advanced/necrotic_revival.dm index a3421a9ddd75..697d01ccd706 100644 --- a/code/modules/surgery/advanced/necrotic_revival.dm +++ b/code/modules/surgery/advanced/necrotic_revival.dm @@ -24,12 +24,12 @@ require_all_chems = FALSE /datum/surgery_step/bionecrosis/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to grow a romerol tumor on [target]'s brain...", + display_results(user, target, span_notice("You begin to grow a romerol tumor on [target]'s brain..."), "[user] begins to tinker with [target]'s brain...", "[user] begins to perform surgery on [target]'s brain.") /datum/surgery_step/bionecrosis/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You succeed in growing a romerol tumor on [target]'s brain.", + display_results(user, target, span_notice("You succeed in growing a romerol tumor on [target]'s brain."), "[user] successfully grows a romerol tumor on [target]'s brain!", "[user] completes the surgery on [target]'s brain.") if(!target.getorganslot(ORGAN_SLOT_ZOMBIE)) diff --git a/code/modules/surgery/advanced/pacification.dm b/code/modules/surgery/advanced/pacification.dm index 60e87551b68f..0d7c997e22d7 100644 --- a/code/modules/surgery/advanced/pacification.dm +++ b/code/modules/surgery/advanced/pacification.dm @@ -24,20 +24,20 @@ time = 40 /datum/surgery_step/pacify/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to pacify [target]...", + display_results(user, target, span_notice("You begin to pacify [target]..."), "[user] begins to fix [target]'s brain.", "[user] begins to perform surgery on [target]'s brain.") /datum/surgery_step/pacify/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You succeed in neurologically pacifying [target].", + display_results(user, target, span_notice("You succeed in neurologically pacifying [target]."), "[user] successfully fixes [target]'s brain!", "[user] completes the surgery on [target]'s brain.") target.gain_trauma(/datum/brain_trauma/severe/pacifism, TRAUMA_RESILIENCE_LOBOTOMY) return TRUE /datum/surgery_step/pacify/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You screw up, rewiring [target]'s brain the wrong way around...", - "[user] screws up, causing brain damage!", + display_results(user, target, span_notice("You screw up, rewiring [target]'s brain the wrong way around..."), + span_warning("[user] screws up, causing brain damage!"), "[user] completes the surgery on [target]'s brain.") target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_LOBOTOMY) return FALSE \ No newline at end of file diff --git a/code/modules/surgery/advanced/revival.dm b/code/modules/surgery/advanced/revival.dm index f8ac465fa548..a4b4a93dac36 100644 --- a/code/modules/surgery/advanced/revival.dm +++ b/code/modules/surgery/advanced/revival.dm @@ -35,29 +35,29 @@ if(istype(tool, /obj/item/twohanded/shockpaddles)) var/obj/item/twohanded/shockpaddles/S = tool if((S.req_defib && !S.defib.powered) || !S.wielded || S.cooldown || S.busy) - to_chat(user, "You need to wield both paddles, and [S.defib] must be powered!") + to_chat(user, span_warning("You need to wield both paddles, and [S.defib] must be powered!")) return FALSE if(istype(tool, /obj/item/melee/baton)) var/obj/item/melee/baton/B = tool if(!B.status) - to_chat(user, "[B] needs to be active!") + to_chat(user, span_warning("[B] needs to be active!")) return FALSE if(istype(tool, /obj/item/gun/energy)) var/obj/item/gun/energy/E = tool if(E.chambered && istype(E.chambered, /obj/item/ammo_casing/energy/electrode)) return TRUE else - to_chat(user, "You need an electrode for this!") + to_chat(user, span_warning("You need an electrode for this!")) return FALSE /datum/surgery_step/revive/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You prepare to give [target]'s brain the spark of life with [tool].", + display_results(user, target, span_notice("You prepare to give [target]'s brain the spark of life with [tool]."), "[user] prepares to shock [target]'s brain with [tool].", "[user] prepares to shock [target]'s brain with [tool].") target.notify_ghost_cloning("Someone is trying to zap your brain.", source = target) /datum/surgery_step/revive/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You successfully shock [target]'s brain with [tool]...", + display_results(user, target, span_notice("You successfully shock [target]'s brain with [tool]..."), "[user] send a powerful shock to [target]'s brain with [tool]...", "[user] send a powerful shock to [target]'s brain with [tool]...") playsound(get_turf(target), 'sound/magic/lightningbolt.ogg', 50, 1) @@ -74,7 +74,7 @@ return FALSE /datum/surgery_step/revive/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You shock [target]'s brain with [tool], but [target.p_they()] doesn't react.", + display_results(user, target, span_notice("You shock [target]'s brain with [tool], but [target.p_they()] doesn't react."), "[user] send a powerful shock to [target]'s brain with [tool], but [target.p_they()] doesn't react.", "[user] send a powerful shock to [target]'s brain with [tool], but [target.p_they()] doesn't react.") playsound(get_turf(target), 'sound/magic/lightningbolt.ogg', 50, 1) diff --git a/code/modules/surgery/advanced/viral_bonding.dm b/code/modules/surgery/advanced/viral_bonding.dm index 37fcf75f0014..643da5907a56 100644 --- a/code/modules/surgery/advanced/viral_bonding.dm +++ b/code/modules/surgery/advanced/viral_bonding.dm @@ -31,12 +31,12 @@ return TRUE /datum/surgery_step/viral_bond/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You start heating [target]'s bone marrow with [tool]...", + display_results(user, target, span_notice("You start heating [target]'s bone marrow with [tool]..."), "[user] starts heating [target]'s bone marrow with [tool]...", "[user] starts heating something in [target]'s chest with [tool]...") /datum/surgery_step/viral_bond/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "[target]'s bone marrow begins pulsing slowly. The viral bonding is complete.", + display_results(user, target, span_notice("[target]'s bone marrow begins pulsing slowly. The viral bonding is complete."), "[target]'s bone marrow begins pulsing slowly.", "[user] finishes the operation.") for(var/X in target.diseases) diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm index fa820d1c242d..54f37128f450 100644 --- a/code/modules/surgery/amputation.dm +++ b/code/modules/surgery/amputation.dm @@ -30,13 +30,13 @@ time = 64 /datum/surgery_step/sever_limb/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to sever [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You 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)]!") /datum/surgery_step/sever_limb/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) var/mob/living/carbon/human/L = target - display_results(user, target, "You sever [L]'s [parse_zone(target_zone)].", + display_results(user, target, span_notice("You sever [L]'s [parse_zone(target_zone)]."), "[user] severs [L]'s [parse_zone(target_zone)]!", "[user] severs [L]'s [parse_zone(target_zone)]!") if(surgery.operated_bodypart) @@ -50,13 +50,13 @@ accept_hand = TRUE /datum/surgery_step/sever_limb/mechanic/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to detach [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You begin to detach [target]'s [parse_zone(target_zone)]..."), "[user] begins to detach [target]'s [parse_zone(target_zone)]!", "[user] begins to detach [target]'s [parse_zone(target_zone)]!") /datum/surgery_step/sever_limb/mechanic/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) var/mob/living/carbon/human/L = target - display_results(user, target, "You detached [L]'s [parse_zone(target_zone)].", + display_results(user, target, span_notice("You detached [L]'s [parse_zone(target_zone)]."), "[user] detached [L]'s [parse_zone(target_zone)]!", "[user] detached [L]'s [parse_zone(target_zone)]!") if(surgery.operated_bodypart) diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 776846399de3..6836da7dbdd4 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -69,9 +69,9 @@ /obj/item/bodypart/examine(mob/user) . = ..() if(brute_dam > DAMAGE_PRECISION) - . += "This limb has [brute_dam > 30 ? "severe" : "minor"] bruising." + . += span_warning("This limb has [brute_dam > 30 ? "severe" : "minor"] bruising.") if(burn_dam > DAMAGE_PRECISION) - . += "This limb has [burn_dam > 30 ? "severe" : "minor"] burns." + . += span_warning("This limb has [burn_dam > 30 ? "severe" : "minor"] burns.") /obj/item/bodypart/blob_act() take_damage(max_damage) @@ -88,11 +88,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!",\ - "You force [src] into your empty socket, and it locks into place!") + H.visible_message(span_warning("[H] jams [src] into [H.p_their()] empty socket!"),\ + span_notice("You force [src] into your empty socket, and it locks into place!")) else - H.visible_message("[user] jams [src] into [H]'s empty socket!",\ - "[user] forces [src] into your 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 your empty socket, and it locks into place!")) user.temporarilyRemoveItemFromInventory(src, TRUE) attach_limb(C) return @@ -102,11 +102,11 @@ if(W.is_sharp()) add_fingerprint(user) if(!contents.len) - to_chat(user, "There is nothing left inside [src]!") + to_chat(user, span_warning("There is nothing left inside [src]!")) return playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1) - 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, 54, target = src)) drop_organs(user, TRUE) else @@ -531,12 +531,12 @@ if(owner.stat < UNCONSCIOUS) owner.emote("scream") if(owner.stat < DEAD) - to_chat(owner, "Your [name] is too damaged to function!") + to_chat(owner, span_userdanger("Your [name] is too damaged to function!")) 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, "You can't feel your [name]!") + to_chat(owner, span_userdanger("You can't feel your [name]!")) if(held_index) owner.dropItemToGround(owner.get_item_for_held_index(held_index)) if(owner.hud_used) @@ -595,12 +595,12 @@ if(owner.stat < UNCONSCIOUS) owner.emote("scream") if(owner.stat < DEAD) - to_chat(owner, "Your [name] is too damaged to function!") + to_chat(owner, span_userdanger("Your [name] is too damaged to function!")) 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, "You can't feel your [name]!") + to_chat(owner, span_userdanger("You can't feel your [name]!")) if(held_index) owner.dropItemToGround(owner.get_item_for_held_index(held_index)) if(owner.hud_used) @@ -656,10 +656,10 @@ if(owner.stat < UNCONSCIOUS) owner.emote("scream") if(owner.stat < DEAD) - to_chat(owner, "Your [name] is too damaged to function!") + to_chat(owner, span_userdanger("Your [name] is too damaged to function!")) else if(disabled == BODYPART_DISABLED_PARALYSIS) if(owner.stat < DEAD) - to_chat(owner, "You can't feel your [name]!") + to_chat(owner, span_userdanger("You can't feel your [name]!")) /obj/item/bodypart/l_leg/digitigrade name = "left digitigrade leg" @@ -714,10 +714,10 @@ if(owner.stat < UNCONSCIOUS) owner.emote("scream") if(owner.stat < DEAD) - to_chat(owner, "Your [name] is too damaged to function!") + to_chat(owner, span_userdanger("Your [name] is too damaged to function!")) else if(disabled == BODYPART_DISABLED_PARALYSIS) if(owner.stat < DEAD) - to_chat(owner, "You can't feel your [name]!") + to_chat(owner, span_userdanger("You can't feel your [name]!")) /obj/item/bodypart/r_leg/digitigrade name = "right digitigrade leg" diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 7e8c7ba12d13..b3d87e8a389e 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -65,29 +65,29 @@ . = ..() if(status == BODYPART_ORGANIC) if(!brain) - . += "The brain has been removed from [src]." + . += span_info("The brain has been removed from [src].") 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) - . += "It seems to be leaking some kind of... clear fluid? The brain inside must be in pretty bad shape... There is no coming back from that." + . += span_info("It seems to be leaking some kind of... clear fluid? The brain inside must be in pretty bad shape... There is no coming back from that.") 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 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 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) - . += "[real_name]'s eyes appear to have been removed." + . += span_info("[real_name]'s eyes appear to have been removed.") if(!ears) - . += "[real_name]'s ears appear to have been removed." + . += span_info("[real_name]'s ears appear to have been removed.") if(!tongue) - . += "[real_name]'s tongue appears to have been removed." + . += span_info("[real_name]'s tongue appears to have been removed.") /obj/item/bodypart/head/can_dismember(obj/item/I) @@ -102,14 +102,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!", "You saw [src] open and pull out a brain.") + user.visible_message(span_warning("[user] saws [src] open and pulls out a brain!"), span_notice("You 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 29f460418146..2abd4f86fd8b 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, "You have already inserted a cell!") + to_chat(user, span_warning("You have already inserted a cell!")) return else if(!user.transferItemToLoc(W, src)) return cell = W - to_chat(user, "You insert the cell.") + to_chat(user, span_notice("You insert the cell.")) else if(istype(W, /obj/item/stack/cable_coil)) if(wired) - to_chat(user, "You have already inserted wire!") + to_chat(user, span_warning("You have already inserted wire!")) return var/obj/item/stack/cable_coil/coil = W if (coil.use(1)) wired = TRUE - to_chat(user, "You insert the wire.") + to_chat(user, span_notice("You insert the wire.")) else - to_chat(user, "You need one length of coil to wire it!") + to_chat(user, span_warning("You need one length of coil to wire it!")) else return ..() @@ -155,7 +155,7 @@ return . = TRUE I.play_tool_sound(src) - to_chat(user, "You cut the wires out of [src].") + to_chat(user, span_notice("You cut the wires out of [src].")) new /obj/item/stack/cable_coil(drop_location(), 1) wired = FALSE @@ -163,10 +163,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 @@ -248,10 +248,10 @@ if(istype(W, /obj/item/assembly/flash/handheld)) var/obj/item/assembly/flash/handheld/F = W if(flash1 && flash2) - to_chat(user, "You have already inserted the eyes!") + to_chat(user, span_warning("You have already inserted the eyes!")) return else if(F.burnt_out) - to_chat(user, "You can't use a broken flash!") + to_chat(user, span_warning("You can't use a broken flash!")) return else if(!user.transferItemToLoc(F, src)) @@ -260,14 +260,14 @@ flash2 = F else flash1 = F - to_chat(user, "You insert the flash into the eye socket.") + to_chat(user, span_notice("You insert the flash into the eye socket.")) return return ..() /obj/item/bodypart/head/robot/crowbar_act(mob/living/user, obj/item/I) if(flash1 || flash2) I.play_tool_sound(src) - to_chat(user, "You remove the flash from [src].") + to_chat(user, span_notice("You remove the flash from [src].")) if(flash1) flash1.forceMove(drop_location()) flash1 = null @@ -275,7 +275,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/brain_surgery.dm b/code/modules/surgery/brain_surgery.dm index ba496f4f1c8f..1623014e538f 100644 --- a/code/modules/surgery/brain_surgery.dm +++ b/code/modules/surgery/brain_surgery.dm @@ -25,12 +25,12 @@ return TRUE /datum/surgery_step/fix_brain/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to fix [target]'s brain...", + display_results(user, target, span_notice("You begin to fix [target]'s brain..."), "[user] begins to fix [target]'s brain.", "[user] begins to perform surgery on [target]'s brain.") /datum/surgery_step/fix_brain/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You succeed in fixing [target]'s brain.", + display_results(user, target, span_notice("You succeed in fixing [target]'s brain."), "[user] successfully fixes [target]'s brain!", "[user] completes the surgery on [target]'s brain.") if(target.mind && target.mind.has_antag_datum(/datum/antagonist/brainwashed)) @@ -41,11 +41,11 @@ /datum/surgery_step/fix_brain/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(target.getorganslot(ORGAN_SLOT_BRAIN)) - display_results(user, target, "You screw up, causing more damage!", - "[user] screws up, causing brain damage!", + display_results(user, target, span_warning("You screw up, causing more damage!"), + span_warning("[user] screws up, causing brain damage!"), "[user] completes the surgery on [target]'s brain.") target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60) target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_LOBOTOMY) else - user.visible_message("[user] suddenly notices that the brain [user.p_they()] [user.p_were()] working on is not there anymore.", "You suddenly notice that the brain you were working on is not there anymore.") + user.visible_message("[user] suddenly notices that the brain [user.p_they()] [user.p_were()] working on is not there anymore.", span_warning("You suddenly notice that the brain you were working on is not there anymore.")) return FALSE diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm index 1885cbdb26b4..4c01ddc9c5f3 100644 --- a/code/modules/surgery/cavity_implant.dm +++ b/code/modules/surgery/cavity_implant.dm @@ -24,11 +24,11 @@ var/obj/item/bodypart/chest/CH = target.get_bodypart(BODY_ZONE_CHEST) IC = CH.cavity_item if(tool) - display_results(user, target, "You begin to insert [tool] into [target]'s [target_zone]...", + display_results(user, target, span_notice("You begin to insert [tool] into [target]'s [target_zone]..."), "[user] begins to insert [tool] into [target]'s [target_zone].", "[user] begins to insert [tool.w_class > WEIGHT_CLASS_SMALL ? tool : "something"] into [target]'s [target_zone].") else - display_results(user, target, "You check for items in [target]'s [target_zone]...", + display_results(user, target, span_notice("You check for items in [target]'s [target_zone]..."), "[user] checks for items in [target]'s [target_zone].", "[user] looks for something in [target]'s [target_zone].") @@ -36,10 +36,10 @@ var/obj/item/bodypart/chest/CH = target.get_bodypart(BODY_ZONE_CHEST) if(tool) if(IC || tool.w_class > WEIGHT_CLASS_NORMAL || HAS_TRAIT(tool, TRAIT_NODROP) || istype(tool, /obj/item/organ)) - to_chat(user, "You can't seem to fit [tool] in [target]'s [target_zone]!") + to_chat(user, span_warning("You can't seem to fit [tool] in [target]'s [target_zone]!")) return 0 else - display_results(user, target, "You stuff [tool] into [target]'s [target_zone].", + display_results(user, target, span_notice("You stuff [tool] into [target]'s [target_zone]."), "[user] stuffs [tool] into [target]'s [target_zone]!", "[user] stuffs [tool.w_class > WEIGHT_CLASS_SMALL ? tool : "something"] into [target]'s [target_zone].") user.transferItemToLoc(tool, target, TRUE) @@ -47,12 +47,12 @@ return 1 else if(IC) - display_results(user, target, "You pull [IC] out of [target]'s [target_zone].", + display_results(user, target, span_notice("You pull [IC] out of [target]'s [target_zone]."), "[user] pulls [IC] out of [target]'s [target_zone]!", "[user] pulls [IC.w_class > WEIGHT_CLASS_SMALL ? IC : "something"] out of [target]'s [target_zone].") user.put_in_hands(IC) CH.cavity_item = null return 1 else - to_chat(user, "You don't find anything in [target]'s [target_zone].") + to_chat(user, span_warning("You don't find anything in [target]'s [target_zone].")) return 0 diff --git a/code/modules/surgery/core_removal.dm b/code/modules/surgery/core_removal.dm index 7b92d162973c..9155cf201235 100644 --- a/code/modules/surgery/core_removal.dm +++ b/code/modules/surgery/core_removal.dm @@ -18,7 +18,7 @@ time = 16 /datum/surgery_step/extract_core/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to extract a core from [target]...", + display_results(user, target, span_notice("You begin to extract a core from [target]..."), "[user] begins to extract a core from [target].", "[user] begins to extract a core from [target].") @@ -26,7 +26,7 @@ var/mob/living/simple_animal/slime/slime = target if(slime.cores > 0) slime.cores-- - display_results(user, target, "You successfully extract a core from [target]. [slime.cores] core\s remaining.", + display_results(user, target, span_notice("You successfully extract a core from [target]. [slime.cores] core\s remaining."), "[user] successfully extracts a core from [target]!", "[user] successfully extracts a core from [target]!") @@ -38,5 +38,5 @@ else return 0 else - to_chat(user, "There aren't any cores left in [target]!") + to_chat(user, span_warning("There aren't any cores left in [target]!")) return 1 diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm index e8bb019e02bc..544c8b7035c4 100644 --- a/code/modules/surgery/coronary_bypass.dm +++ b/code/modules/surgery/coronary_bypass.dm @@ -21,7 +21,7 @@ fuckup_damage = 20 /datum/surgery_step/incise_heart/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to make an incision in [target]'s heart...", + display_results(user, target, span_notice("You begin to make an incision in [target]'s heart..."), "[user] begins to make an incision in [target]'s heart.", "[user] begins to make an incision in [target]'s heart.") @@ -29,7 +29,7 @@ if(ishuman(target)) var/mob/living/carbon/human/H = target if (!(NOBLOOD in H.dna.species.species_traits)) - display_results(user, target, "Blood pools around the incision in [H]'s heart.", + display_results(user, target, span_notice("Blood pools around the incision in [H]'s heart."), "Blood pools around the incision in [H]'s heart.", "") H.bleed_rate += 10 @@ -39,9 +39,9 @@ /datum/surgery_step/incise_heart/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(ishuman(target)) var/mob/living/carbon/human/H = target - display_results(user, target, "You screw up, cutting too deeply into the heart!", - "[user] screws up, causing blood to spurt out of [H]'s chest!", - "[user] screws up, causing blood to spurt out of [H]'s chest!") + display_results(user, target, span_warning("You screw up, cutting too deeply into the heart!"), + span_warning("[user] screws up, causing blood to spurt out of [H]'s chest!"), + span_warning("[user] screws up, causing blood to spurt out of [H]'s chest!")) H.bleed_rate += 20 H.adjustOrganLoss(ORGAN_SLOT_HEART, 10) H.adjustBruteLoss(10) @@ -54,7 +54,7 @@ fuckup_damage = 20 /datum/surgery_step/coronary_bypass/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to graft a bypass onto [target]'s heart...", + display_results(user, target, span_notice("You begin to graft a bypass onto [target]'s heart..."), "[user] begins to graft something onto [target]'s heart!", "[user] begins to graft something onto [target]'s heart!") @@ -63,7 +63,7 @@ var/obj/item/organ/heart/heart = target.getorganslot(ORGAN_SLOT_HEART) if(heart) //slightly worrying if we lost our heart mid-operation, but that's life heart.operated = TRUE - display_results(user, target, "You successfully graft a bypass onto [target]'s heart.", + display_results(user, target, span_notice("You successfully graft a bypass onto [target]'s heart."), "[user] finishes grafting something onto [target]'s heart.", "[user] finishes grafting something onto [target]'s heart.") return TRUE @@ -71,9 +71,9 @@ /datum/surgery_step/coronary_bypass/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(ishuman(target)) var/mob/living/carbon/human/H = target - display_results(user, target, "You screw up in attaching the graft, and it tears off, tearing part of the heart!", - "[user] screws up, causing blood to spurt out of [H]'s chest profusely!", - "[user] screws up, causing blood to spurt out of [H]'s chest profusely!") + display_results(user, target, span_warning("You screw up in attaching the graft, and it tears off, tearing part of the heart!"), + span_warning("[user] screws up, causing blood to spurt out of [H]'s chest profusely!"), + span_warning("[user] screws up, causing blood to spurt out of [H]'s chest profusely!")) H.adjustOrganLoss(ORGAN_SLOT_HEART, 20) H.bleed_rate += 30 return FALSE diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm index 52e940963b37..f0457cdc6b39 100644 --- a/code/modules/surgery/dental_implant.dm +++ b/code/modules/surgery/dental_implant.dm @@ -9,7 +9,7 @@ time = 16 /datum/surgery_step/insert_pill/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to wedge [tool] in [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You begin to wedge [tool] in [target]'s [parse_zone(target_zone)]..."), "[user] begins to wedge \the [tool] in [target]'s [parse_zone(target_zone)].", "[user] begins to wedge something in [target]'s [parse_zone(target_zone)].") @@ -24,7 +24,7 @@ P.target = tool P.Grant(target) //The pill never actually goes in an inventory slot, so the owner doesn't inherit actions from it - display_results(user, target, "You wedge [tool] into [target]'s [parse_zone(target_zone)].", + display_results(user, target, span_notice("You wedge [tool] into [target]'s [parse_zone(target_zone)]."), "[user] wedges \the [tool] into [target]'s [parse_zone(target_zone)]!", "[user] wedges something into [target]'s [parse_zone(target_zone)]!") return 1 @@ -35,7 +35,7 @@ /datum/action/item_action/hands_free/activate_pill/Trigger() if(!..()) return FALSE - to_chat(owner, "You grit your teeth and burst the implanted [target.name]!") + to_chat(owner, span_caution("You grit your teeth and burst the implanted [target.name]!")) log_combat(owner, null, "swallowed an implanted pill", target) if(target.reagents.total_volume) target.reagents.reaction(owner, INGEST) diff --git a/code/modules/surgery/experimental_dissection.dm b/code/modules/surgery/experimental_dissection.dm index b6aa5f6bff87..652759648158 100644 --- a/code/modules/surgery/experimental_dissection.dm +++ b/code/modules/surgery/experimental_dissection.dm @@ -26,7 +26,7 @@ time = 125 /datum/surgery_step/dissection/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] starts dissecting [target].", "You start dissecting [target].") + user.visible_message("[user] starts dissecting [target].", span_notice("You start dissecting [target].")) /datum/surgery_step/dissection/proc/check_value(mob/living/carbon/target) if(isalienroyal(target)) @@ -47,7 +47,7 @@ return 2000 /datum/surgery_step/dissection/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] dissects [target]!", "You dissect [target], and add your discoveries to the research database!") + user.visible_message("[user] dissects [target]!", span_notice("You dissect [target], and add your discoveries to the research database!")) SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = check_value(target))) var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_MED) if(D) @@ -58,7 +58,7 @@ return TRUE /datum/surgery_step/dissection/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] dissects [target]!", "You dissect [target], but do not find anything particularly interesting.") + user.visible_message("[user] dissects [target]!", span_notice("You dissect [target], but do not find anything particularly interesting.")) SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = (check_value(target) * 0.2))) var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_MED) if(D) diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm index 6bdb5ab51b2e..cc94a76aa156 100644 --- a/code/modules/surgery/eye_surgery.dm +++ b/code/modules/surgery/eye_surgery.dm @@ -19,14 +19,14 @@ return TRUE /datum/surgery_step/fix_eyes/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to fix [target]'s eyes...", + display_results(user, target, span_notice("You begin to fix [target]'s eyes..."), "[user] begins to fix [target]'s eyes.", "[user] begins to perform surgery on [target]'s eyes.") /datum/surgery_step/fix_eyes/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) var/obj/item/organ/eyes/E = target.getorganslot(ORGAN_SLOT_EYES) - user.visible_message("[user] successfully fixes [target]'s eyes!", "You succeed in fixing [target]'s eyes.") - display_results(user, target, "You succeed in fixing [target]'s eyes.", + user.visible_message("[user] successfully fixes [target]'s eyes!", span_notice("You succeed in fixing [target]'s eyes.")) + display_results(user, target, span_notice("You succeed in fixing [target]'s eyes."), "[user] successfully fixes [target]'s eyes!", "[user] completes the surgery on [target]'s eyes.") target.cure_blind(list(EYE_DAMAGE)) @@ -38,12 +38,12 @@ /datum/surgery_step/fix_eyes/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(target.getorgan(/obj/item/organ/brain)) - display_results(user, target, "You accidentally stab [target] right in the brain!", - "[user] accidentally stabs [target] right in the brain!", - "[user] accidentally stabs [target] right in the brain!") + display_results(user, target, span_warning("You accidentally stab [target] right in the brain!"), + span_warning("[user] accidentally stabs [target] right in the brain!"), + span_warning("[user] accidentally stabs [target] right in the brain!")) target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 70) else - display_results(user, target, "You accidentally stab [target] right in the brain! Or would have, if [target] had a brain.", - "[user] accidentally stabs [target] right in the brain! Or would have, if [target] had a brain.", - "[user] accidentally stabs [target] right in the brain!") + display_results(user, target, span_warning("You accidentally stab [target] right in the brain! Or would have, if [target] had a brain."), + span_warning("[user] accidentally stabs [target] right in the brain! Or would have, if [target] had a brain."), + span_warning("[user] accidentally stabs [target] right in the brain!")) return FALSE diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm index 6b6fa4579038..5293c323febc 100644 --- a/code/modules/surgery/healing.dm +++ b/code/modules/surgery/healing.dm @@ -42,19 +42,19 @@ if(istype(surgery,/datum/surgery/healing)) var/datum/surgery/healing/the_surgery = surgery if(!the_surgery.antispam) - display_results(user, target, "You 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("You 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].")) /datum/surgery_step/heal/initiate(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, try_to_fail = FALSE) var/list/list_org_limbs = target.get_damaged_bodyparts(brutehealing, burnhealing, FALSE, BODYPART_ORGANIC) if(!list_org_limbs.len) - to_chat(user, "[target] has no wounds left to treat. The rest of the damage is mechanical limbs") + to_chat(user, span_notice("[target] has no wounds left to treat. The rest of the damage is mechanical limbs")) if(..()) while((brutehealing && target.getBruteLoss()) || (burnhealing && target.getFireLoss())) list_org_limbs = target.get_damaged_bodyparts(brutehealing, burnhealing, FALSE, BODYPART_ORGANIC) if(!list_org_limbs.len) // if there are no organic bodypart with damage we should stop - to_chat(user, "[target] has no wounds left to treat. The rest of the damage is mechanical limbs") + to_chat(user, span_notice("[target] has no wounds left to treat. The rest of the damage is mechanical limbs")) break if(!..()) break @@ -79,7 +79,7 @@ target.heal_bodypart_damage(urhealedamt_brute,urhealedamt_burn) umsg += get_progress(user, target, urhealedamt_brute, urhealedamt_burn) - display_results(user, target, "[umsg].", + display_results(user, target, span_notice("[umsg]."), "[tmsg].", "[tmsg].") if(istype(surgery, /datum/surgery/healing)) @@ -88,9 +88,9 @@ return TRUE /datum/surgery_step/heal/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You screwed up!", - "[user] screws up!", - "[user] fixes some of [target]'s wounds.", TRUE) + display_results(user, target, span_warning("You 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) @@ -304,7 +304,7 @@ missinghpbonus = 2.5 /datum/surgery_step/heal/combo/upgraded/femto/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You screwed up!", - "[user] screws up!", - "[user] fixes some of [target]'s wounds.", TRUE) + display_results(user, target, span_warning("You screwed up!"), + span_warning("[user] screws up!"), + span_notice("[user] fixes some of [target]'s wounds."), TRUE) target.take_bodypart_damage(5,5) diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm index 6e39563d7b6b..ea5d0da881cb 100644 --- a/code/modules/surgery/helpers.dm +++ b/code/modules/surgery/helpers.dm @@ -70,11 +70,11 @@ 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.", \ - "You drape [I] over [M]'s [parse_zone(selected_zone)] to prepare for \an [procedure.name].") + span_notice("You 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, "You need to expose [M]'s [parse_zone(selected_zone)] first!") + to_chat(user, span_warning("You 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,7 +86,7 @@ if(S.status == 1) M.surgeries -= S user.visible_message("[user] removes [I] from [M]'s [parse_zone(selected_zone)].", \ - "You remove [I] from [M]'s [parse_zone(selected_zone)].") + span_notice("You remove [I] from [M]'s [parse_zone(selected_zone)].")) qdel(S) else if(S.can_cancel) var/close_tool_type = /obj/item/cautery @@ -100,10 +100,10 @@ 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].", \ - "You close [M]'s [parse_zone(selected_zone)] with [close_tool] and remove [I].") + span_notice("You close [M]'s [parse_zone(selected_zone)] with [close_tool] and remove [I].")) qdel(S) else - to_chat(user, "You need to hold a [is_robotic ? "screwdriver" : "cautery"] in your inactive hand to stop [M]'s surgery!") + to_chat(user, span_warning("You need to hold a [is_robotic ? "screwdriver" : "cautery"] in your inactive hand to stop [M]'s surgery!")) /proc/get_location_modifier(mob/M) var/turf/T = get_turf(M) diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm index 94daa3adde50..bbfab4099ad2 100644 --- a/code/modules/surgery/implant_removal.dm +++ b/code/modules/surgery/implant_removal.dm @@ -24,17 +24,17 @@ I = O break if(I) - display_results(user, target, "You begin to extract [I] from [target]'s [target_zone]...", + display_results(user, target, span_notice("You begin to extract [I] from [target]'s [target_zone]..."), "[user] begins to extract [I] from [target]'s [target_zone].", "[user] begins to extract something from [target]'s [target_zone].") else - display_results(user, target, "You look for an implant in [target]'s [target_zone]...", + display_results(user, target, span_notice("You look for an implant in [target]'s [target_zone]..."), "[user] looks for an implant in [target]'s [target_zone].", "[user] looks for something in [target]'s [target_zone].") /datum/surgery_step/extract_implant/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(I) - display_results(user, target, "You successfully remove [I] from [target]'s [target_zone].", + display_results(user, target, span_notice("You successfully remove [I] from [target]'s [target_zone]."), "[user] successfully removes [I] from [target]'s [target_zone]!", "[user] successfully removes something from [target]'s [target_zone]!") I.removed(target) @@ -49,14 +49,14 @@ case.imp = I I.forceMove(case) case.update_icon() - display_results(user, target, "You place [I] into [case].", + display_results(user, target, span_notice("You place [I] into [case]."), "[user] places [I] into [case]!", "[user] places it into [case]!") else qdel(I) else - to_chat(user, "You can't find anything in [target]'s [target_zone]!") + to_chat(user, span_warning("You can't find anything in [target]'s [target_zone]!")) return 1 /datum/surgery/implant_removal/mechanic diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm index 833c2deb5154..fd275a6cb5b0 100644 --- a/code/modules/surgery/limb_augmentation.dm +++ b/code/modules/surgery/limb_augmentation.dm @@ -27,10 +27,10 @@ tool = tool.contents[1] var/obj/item/bodypart/aug = tool if(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 -1 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 -1 L = surgery.operated_bodypart if(L) @@ -61,7 +61,7 @@ tool = tool.contents[1] if(istype(tool) && user.temporarilyRemoveItemFromInventory(tool)) tool.replace_limb(target, TRUE) - display_results(user, target, "You successfully augment [target]'s [parse_zone(target_zone)].", + display_results(user, target, span_notice("You successfully augment [target]'s [parse_zone(target_zone)]."), "[user] successfully augments [target]'s [parse_zone(target_zone)] with [tool]!", "[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)]") @@ -69,6 +69,6 @@ SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = points)) to_chat(user, "The augment uploads diagnostic data to the research cloud, giving a bonus of research points!") 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!")) target.update_disabled_bodyparts() return TRUE diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm index 323abd340f85..ef06e8a11392 100644 --- a/code/modules/surgery/lipoplasty.dm +++ b/code/modules/surgery/lipoplasty.dm @@ -16,13 +16,13 @@ time = 64 /datum/surgery_step/cut_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] begins to cut away [target]'s excess fat.", "You begin to cut away [target]'s excess fat...") - display_results(user, target, "You begin to cut away [target]'s excess fat...", + user.visible_message("[user] begins to cut away [target]'s excess fat.", span_notice("You begin to cut away [target]'s excess fat...")) + display_results(user, target, span_notice("You begin to cut away [target]'s excess fat..."), "[user] begins to cut away [target]'s excess fat.", "[user] begins to cut [target]'s [target_zone] with [tool].") /datum/surgery_step/cut_fat/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You cut [target]'s excess fat loose.", + display_results(user, target, span_notice("You cut [target]'s excess fat loose."), "[user] cuts [target]'s excess fat loose!", "[user] finishes the cut on [target]'s [target_zone].") return 1 @@ -34,12 +34,12 @@ time = 32 /datum/surgery_step/remove_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to extract [target]'s loose fat...", + display_results(user, target, span_notice("You begin to extract [target]'s loose fat..."), "[user] begins to extract [target]'s loose fat!", "[user] begins to extract something from [target]'s [target_zone].") /datum/surgery_step/remove_fat/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You extract [target]'s fat.", + display_results(user, target, span_notice("You extract [target]'s fat."), "[user] extracts [target]'s fat!", "[user] extracts [target]'s fat!") target.overeatduration = 0 //patient is unfatted diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm index d262b2ee1261..4dea828ac256 100644 --- a/code/modules/surgery/lobectomy.dm +++ b/code/modules/surgery/lobectomy.dm @@ -21,7 +21,7 @@ fuckup_damage = 20 /datum/surgery_step/lobectomy/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to make an incision in [target]'s lungs...", + display_results(user, target, span_notice("You begin to make an incision in [target]'s lungs..."), "[user] begins to make an incision in [target].", "[user] begins to make an incision in [target].") @@ -31,7 +31,7 @@ var/obj/item/organ/lungs/L = H.getorganslot(ORGAN_SLOT_LUNGS) L.operated = TRUE H.setOrganLoss(ORGAN_SLOT_LUNGS, 60) - display_results(user, target, "You successfully excise [H]'s most damaged lobe.", + display_results(user, target, span_notice("You successfully excise [H]'s most damaged lobe."), "Successfully removes a piece of [H]'s lungs.", "") return TRUE @@ -39,9 +39,9 @@ /datum/surgery_step/lobectomy/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(ishuman(target)) var/mob/living/carbon/human/H = target - display_results(user, target, "You screw up, failing to excise [H]'s damaged lobe!", - "[user] screws up!", - "[user] screws up!") + display_results(user, target, span_warning("You screw up, failing to excise [H]'s damaged lobe!"), + span_warning("[user] screws up!"), + span_warning("[user] screws up!")) H.losebreath += 4 H.adjustOrganLoss(ORGAN_SLOT_LUNGS, 10) return FALSE diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm index 9072127d0f3f..f25b8af1f539 100644 --- a/code/modules/surgery/mechanic_steps.dm +++ b/code/modules/surgery/mechanic_steps.dm @@ -9,7 +9,7 @@ time = 24 /datum/surgery_step/mechanic_open/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to unscrew the shell of [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You begin to unscrew the shell of [target]'s [parse_zone(target_zone)]..."), "[user] begins to unscrew the shell of [target]'s [parse_zone(target_zone)].", "[user] begins to unscrew the shell of [target]'s [parse_zone(target_zone)].") @@ -30,7 +30,7 @@ time = 24 /datum/surgery_step/mechanic_close/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to screw the shell of [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You begin to screw the shell of [target]'s [parse_zone(target_zone)]..."), "[user] begins to screw the shell of [target]'s [parse_zone(target_zone)].", "[user] begins to screw the shell of [target]'s [parse_zone(target_zone)].") @@ -49,7 +49,7 @@ time = 24 /datum/surgery_step/prepare_electronics/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to prepare electronics in [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You begin to prepare electronics in [target]'s [parse_zone(target_zone)]..."), "[user] begins to prepare electronics in [target]'s [parse_zone(target_zone)].", "[user] begins to prepare electronics in [target]'s [parse_zone(target_zone)].") @@ -62,7 +62,7 @@ time = 24 /datum/surgery_step/mechanic_unwrench/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to unwrench some bolts in [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You begin to unwrench some bolts in [target]'s [parse_zone(target_zone)]..."), "[user] begins to unwrench some bolts in [target]'s [parse_zone(target_zone)].", "[user] begins to unwrench some bolts in [target]'s [parse_zone(target_zone)].") @@ -75,7 +75,7 @@ time = 24 /datum/surgery_step/mechanic_wrench/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to wrench some bolts in [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You begin to wrench some bolts in [target]'s [parse_zone(target_zone)]..."), "[user] begins to wrench some bolts in [target]'s [parse_zone(target_zone)].", "[user] begins to wrench some bolts in [target]'s [parse_zone(target_zone)].") @@ -86,6 +86,6 @@ time = 10 /datum/surgery_step/open_hatch/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to open the hatch holders in [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You begin to open the hatch holders in [target]'s [parse_zone(target_zone)]..."), "[user] begins to open the hatch holders in [target]'s [parse_zone(target_zone)].", "[user] begins to open the hatch holders in [target]'s [parse_zone(target_zone)].") \ No newline at end of file diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm index 8c6b731bb3d7..a4bc798270de 100644 --- a/code/modules/surgery/organ_manipulation.dm +++ b/code/modules/surgery/organ_manipulation.dm @@ -81,21 +81,21 @@ I = null if(istype(tool, /obj/item/organ_storage)) if(!tool.contents.len) - to_chat(user, "There is nothing inside [tool]!") + to_chat(user, span_notice("There is nothing inside [tool]!")) return -1 I = tool.contents[1] if(!isorgan(I)) - to_chat(user, "You cannot put [I] into [target]'s [parse_zone(target_zone)]!") + to_chat(user, span_notice("You cannot put [I] into [target]'s [parse_zone(target_zone)]!")) return -1 tool = I if(isorgan(tool)) current_type = "insert" I = tool if(target_zone != I.zone || target.getorganslot(I.slot)) - to_chat(user, "There is no room for [I] in [target]'s [parse_zone(target_zone)]!") + to_chat(user, span_notice("There is no room for [I] in [target]'s [parse_zone(target_zone)]!")) return -1 - display_results(user, target, "You begin to insert [tool] into [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You 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)].") @@ -103,7 +103,7 @@ current_type = "extract" var/list/organs = target.getorganszone(target_zone) if(!organs.len) - to_chat(user, "There are no removable organs in [target]'s [parse_zone(target_zone)]!") + to_chat(user, span_notice("There are no removable organs in [target]'s [parse_zone(target_zone)]!")) return -1 else for(var/obj/item/organ/O in organs) @@ -116,14 +116,14 @@ I = organs[I] if(!I) return -1 - display_results(user, target, "You begin to extract [I] from [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You begin to extract [I] from [target]'s [parse_zone(target_zone)]..."), "[user] begins to extract [I] from [target]'s [parse_zone(target_zone)].", "[user] begins to extract something from [target]'s [parse_zone(target_zone)].") else return -1 else 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 -1 /datum/surgery_step/manipulate_organs/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -138,20 +138,20 @@ I = tool user.temporarilyRemoveItemFromInventory(I, TRUE) I.Insert(target) - display_results(user, target, "You insert [tool] into [target]'s [parse_zone(target_zone)].", + display_results(user, target, span_notice("You 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)]!") else if(current_type == "extract") if(I && I.owner == target) - display_results(user, target, "You successfully extract [I] from [target]'s [parse_zone(target_zone)].", + display_results(user, target, span_notice("You successfully extract [I] from [target]'s [parse_zone(target_zone)]."), "[user] successfully extracts [I] from [target]'s [parse_zone(target_zone)]!", "[user] successfully extracts something from [target]'s [parse_zone(target_zone)]!") log_combat(user, target, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]") I.Remove(target) I.forceMove(get_turf(target)) else - display_results(user, target, "You can't extract anything from [target]'s [parse_zone(target_zone)]!", + display_results(user, target, span_notice("You 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)]!") return 0 diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm index 1e4f84b50f07..7766d6b414cd 100644 --- a/code/modules/surgery/organic_steps.dm +++ b/code/modules/surgery/organic_steps.dm @@ -8,7 +8,7 @@ var/bleeding = 3 //how much bleeding you get from this being done /datum/surgery_step/incise/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to make an incision in [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You 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)].") @@ -22,7 +22,7 @@ if ishuman(target) var/mob/living/carbon/human/H = target if (!(NOBLOOD in H.dna.species.species_traits) && bleeding) - display_results(user, target, "Blood pools around the incision in [H]'s [parse_zone(target_zone)].", + display_results(user, target, span_notice("Blood pools around the incision in [H]'s [parse_zone(target_zone)]."), "Blood pools around the incision in [H]'s [parse_zone(target_zone)].", "") H.bleed_rate += bleeding @@ -44,7 +44,7 @@ time = 24 /datum/surgery_step/clamp_bleeders/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to clamp bleeders in [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You 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)].") @@ -63,7 +63,7 @@ time = 24 /datum/surgery_step/retract_skin/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to retract the skin in [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You begin to retract the skin in [target]'s [parse_zone(target_zone)]..."), "[user] begins to retract the skin in [target]'s [parse_zone(target_zone)].", "[user] begins to retract the skin in [target]'s [parse_zone(target_zone)].") @@ -78,7 +78,7 @@ fuckup_damage_type = BURN /datum/surgery_step/close/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to mend the incision in [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You begin to mend the incision in [target]'s [parse_zone(target_zone)]..."), "[user] begins to mend the incision in [target]'s [parse_zone(target_zone)].", "[user] begins to mend the incision in [target]'s [parse_zone(target_zone)].") @@ -109,13 +109,13 @@ fuckup_damage = 20 /datum/surgery_step/saw/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to saw through the bone in [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You 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)].") /datum/surgery_step/saw/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) target.apply_damage(50, BRUTE, "[target_zone]") - display_results(user, target, "You saw [target]'s [parse_zone(target_zone)] open.", + display_results(user, target, span_notice("You 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!") return 1 @@ -128,12 +128,12 @@ fuckup_damage = 15 /datum/surgery_step/drill/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to drill into the bone in [target]'s [parse_zone(target_zone)]...", + display_results(user, target, span_notice("You begin to drill into the bone in [target]'s [parse_zone(target_zone)]..."), "[user] begins to drill into the bone in [target]'s [parse_zone(target_zone)].", "[user] begins to drill into the bone in [target]'s [parse_zone(target_zone)].") /datum/surgery_step/drill/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You drill into [target]'s [parse_zone(target_zone)].", + display_results(user, target, span_notice("You 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)]!") return 1 diff --git a/code/modules/surgery/organs/appendix.dm b/code/modules/surgery/organs/appendix.dm index 42198190ed81..353ef83ee234 100644 --- a/code/modules/surgery/organs/appendix.dm +++ b/code/modules/surgery/organs/appendix.dm @@ -5,8 +5,8 @@ slot = ORGAN_SLOT_APPENDIX 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 /obj/item/organ/appendix/update_icon() @@ -48,8 +48,8 @@ desc = "One of the most advanced cybernetic organs ever created." icon_state = "implant-filter" organ_flags = ORGAN_SYNTHETIC - now_failing = "NOT AGAIN!" - now_fixed = "Thank god that's over." + now_failing = span_warning("NOT AGAIN!") + now_fixed = span_info("Thank god that's over.") /obj/item/organ/appendix/cybernetic/on_life() ..() diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index b128c2e486c4..c73def341e70 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, "You modify [src] to be installed on the [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm.") + to_chat(user, span_notice("You 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 your [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm.", - "You 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 your [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm."), + span_italics("You hear a short mechanical noise.")) if(istype(holder, /obj/item/assembly/flash/armimplant)) var/obj/item/assembly/flash/F = holder @@ -102,27 +102,27 @@ if(arm_item) if(!owner.dropItemToGround(arm_item)) - to_chat(owner, "Your [arm_item] interferes with [src]!") + to_chat(owner, span_warning("Your [arm_item] interferes with [src]!")) return else - to_chat(owner, "You drop [arm_item] to activate [src]!") + to_chat(owner, span_notice("You drop [arm_item] to activate [src]!")) var/result = (zone == BODY_ZONE_R_ARM ? owner.put_in_r_hand(holder) : owner.put_in_l_hand(holder)) if(!result) - to_chat(owner, "Your [name] fails to activate!") + to_chat(owner, span_warning("Your [name] fails to activate!")) return // Activate the hand that now holds our item. owner.swap_hand(result)//... or the 1st hand if the index gets lost somehow - owner.visible_message("[owner] extends [holder] from [owner.p_their()] [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm.", - "You extend [holder] from your [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm.", - "You 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("You extend [holder] from your [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm."), + span_italics("You hear a short mechanical noise.")) playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1) /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)) @@ -147,9 +147,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/weapons/flashbang.ogg', 100, 1) - to_chat(owner, "You feel an explosion erupt inside your [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm as your implant breaks!") + to_chat(owner, span_userdanger("You feel an explosion erupt inside your [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm as your implant breaks!")) owner.adjust_fire_stacks(20) owner.IgniteMob() owner.adjustFireLoss(25) @@ -186,7 +186,7 @@ /obj/item/organ/cyberimp/arm/toolset/emag_act() if(!(locate(/obj/item/kitchen/knife/combat/cyborg) in items_list)) - to_chat(usr, "You unlock [src]'s integrated knife!") + to_chat(usr, span_notice("You 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 0a1bfb71477f..e546a466cc14 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, "You feel less hungry...") + to_chat(owner, span_notice("You feel less hungry...")) owner.adjust_nutrition(50) addtimer(CALLBACK(src, .proc/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, "You feel like your insides are burning.") + to_chat(owner, span_warning("You feel like your 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, "Your reviver implant shuts down and starts recharging. It will be ready again in [DisplayTimeText(revive_cost)].") + to_chat(owner, span_notice("Your 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, "You feel a faint buzzing as your reviver implant starts patching your wounds...") + to_chat(owner, span_notice("You feel a faint buzzing as your reviver implant starts patching your 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, "You feel a horrible agony in your chest!") + to_chat(H, span_userdanger("You feel a horrible agony in your chest!")) addtimer(CALLBACK(src, .proc/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, "You feel your heart beating again!") + to_chat(H, span_notice("You feel your 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, "Your thrusters set seems to be broken!") + to_chat(owner, span_warning("Your 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/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, "You turn your thrusters set on.") + to_chat(owner, span_notice("You turn your 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, "You turn your thrusters set off.") + to_chat(owner, span_notice("You turn your 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 f7b006b3bf6f..9b660c0f7167 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, "Your body seizes up!") + to_chat(owner, span_warning("Your 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, "You are not holding any items, your hands relax...") + to_chat(owner, span_notice("You are not holding any items, your hands relax...")) active = 0 stored_items = list() else for(var/obj/item/I in stored_items) - to_chat(owner, "Your [owner.get_held_index_name(owner.get_held_index_of_item(I))]'s grip tightens.") + to_chat(owner, span_notice("Your [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, "Your hands relax...") + to_chat(owner, span_notice("Your 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, "Your [owner.get_held_index_name(owner.get_held_index_of_item(I))] spasms and throws the [I.name]!") + to_chat(owner, span_warning("Your [owner.get_held_index_name(owner.get_held_index_of_item(I))] spasms and throws the [I.name]!")) stored_items = list() @@ -152,7 +152,7 @@ if(!owner || . & EMP_PROTECT_SELF) return if(prob(60/severity)) - to_chat(owner, "Your breathing tube suddenly closes!") + to_chat(owner, span_warning("Your 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 64a7d966f4e9..8cd6227f8d45 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_warning("[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_notice("[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.", "You feel a sharp sting as [src] plunges into your body.") + user.visible_message(span_notice("[user] presses a button on [src], and you hear a short mechanical noise."), span_notice("You feel a sharp sting as [src] plunges into your body.")) playsound(get_turf(user), 'sound/weapons/circsawhit.ogg', 50, 1) 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_notice("[src] already has an implant stored.")) return else if(!uses) - to_chat(user, "[src] has already been used up.") + to_chat(user, span_notice("[src] has already been used up.")) return if(!user.transferItemToLoc(I, src)) return storedorgan = I - to_chat(user, "You insert the [I] into [src].") + to_chat(user, span_notice("You 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_notice("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, "You remove the [storedorgan] from [src].") + to_chat(user, span_notice("You remove the [storedorgan] from [src].")) I.play_tool_sound(src) storedorgan = null if(uses != INFINITE) diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm index bf81ab0e956a..0dc995826be8 100644 --- a/code/modules/surgery/organs/ears.dm +++ b/code/modules/surgery/organs/ears.dm @@ -8,10 +8,10 @@ healing_factor = STANDARD_ORGAN_HEALING decay_factor = STANDARD_ORGAN_DECAY - low_threshold_passed = "Your ears begin to resonate with an internal ring sometimes." - now_failing = "You are unable to hear at all!" - now_fixed = "Noise slowly begins filling your ears once more." - low_threshold_cleared = "The ringing in your ears has died down." + low_threshold_passed = span_info("Your ears begin to resonate with an internal ring sometimes.") + now_failing = span_warning("You are unable to hear at all!") + now_fixed = span_info("Noise slowly begins filling your ears once more.") + low_threshold_cleared = span_info("The ringing in your ears has died down.") // `deaf` measures "ticks" of deafness. While > 0, the person is unable // to hear anything. @@ -41,7 +41,7 @@ if(prob(damage / 20) && (damage > low_threshold)) adjustEarDamage(0, 4) SEND_SOUND(C, sound('sound/weapons/flash_ring.ogg')) - to_chat(C, "The ringing in your ears grows louder, blocking out any external noises for a moment.") + to_chat(C, span_warning("The ringing in your 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 @@ -118,13 +118,13 @@ /obj/item/organ/ears/penguin/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) . = ..() if(istype(H)) - to_chat(H, "You suddenly feel like you've lost your balance.") + to_chat(H, span_notice("You suddenly feel like you've lost your 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, "Your sense of balance comes back to you.") + to_chat(H, span_notice("Your 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 5ecc375aeddb..088d291f8c4f 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -11,12 +11,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 your eyes go blind!" - now_fixed = "Color and shapes are once again perceivable." - high_threshold_cleared = "Your vision functions passably once more." - low_threshold_cleared = "Your 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 your eyes go blind!") + now_fixed = span_info("Color and shapes are once again perceivable.") + high_threshold_cleared = span_info("Your vision functions passably once more.") + low_threshold_cleared = span_info("Your vision is cleared of any ailment.") var/sight_flags = 0 var/see_in_dark = 2 @@ -134,7 +134,7 @@ return if(prob(10 * severity)) return - to_chat(owner, "Static obfuscates your vision!") + to_chat(owner, span_warning("Static obfuscates your vision!")) owner.flash_act(visual = 1) /obj/item/organ/eyes/robotic/xray @@ -292,14 +292,14 @@ /obj/item/organ/eyes/robotic/glow/proc/activate(silent = FALSE) start_visuals() if(!silent) - to_chat(owner, "Your [src] clicks and makes a whining noise, before shooting out a beam of light!") + to_chat(owner, span_warning("Your [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, "Your [src] shuts off!") + to_chat(owner, span_warning("Your [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 decac4a7e5e0..394367a26afb 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -7,10 +7,10 @@ healing_factor = STANDARD_ORGAN_HEALING decay_factor = 3 * STANDARD_ORGAN_DECAY //designed to fail about 5 minutes after death - low_threshold_passed = "Prickles of pain appear then die out from within your chest..." - high_threshold_passed = "Something inside your chest hurts, and the pain isn't subsiding. You notice yourself breathing far faster than before." - now_fixed = "Your heart begins to beat again." - high_threshold_cleared = "The pain in your chest has died down, and your breathing becomes more relaxed." + low_threshold_passed = span_info("Prickles of pain appear then die out from within your chest...") + high_threshold_passed = span_warning("Something inside your chest hurts, and the pain isn't subsiding. You notice yourself breathing far faster than before.") + now_fixed = span_info("Your heart begins to beat again.") + high_threshold_cleared = span_info("The pain in your chest has died down, and your breathing becomes more relaxed.") // Heart attack code is in code/modules/mob/living/carbon/human/life.dm var/beating = 1 @@ -39,7 +39,7 @@ ..() if(!beating) user.visible_message("[user] squeezes [src] to \ - make it beat again!","You squeeze [src] to make it beat again!") + make it beat again!",span_notice("You squeeze [src] to make it beat again!")) Restart() addtimer(CALLBACK(src, .proc/stop_if_unowned), 80) @@ -87,11 +87,11 @@ if(damage >= 80 && beating) if(prob(1)) if(owner.stat == CONSCIOUS) - owner.visible_message("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!") + owner.visible_message(span_userdanger("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!")) owner.set_heartattack(TRUE) //yogs end 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!") + owner.visible_message(span_userdanger("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!")) owner.set_heartattack(TRUE) failed = TRUE @@ -153,7 +153,7 @@ 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_userdanger("Too soon!")) return cursed_heart.last_pump = world.time @@ -219,7 +219,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, "You feel yourself dying, but you refuse to give up!") + to_chat(owner, span_userdanger("You feel yourself 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 8da301e86777..8049345e4a0d 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -42,7 +42,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, "You feel a dull pain in your abdomen.") + to_chat(C, span_warning("You feel a dull pain in your abdomen.")) else //for when our liver's failing reagents.end_metabolization(C, keep_liverless = TRUE) //Stops trait-based effects on reagents, to prevent permanent buffs reagents.metabolize(C, can_overdose=FALSE, liverless = TRUE) @@ -50,7 +50,7 @@ return C.adjustToxLoss(4, TRUE, TRUE) if(prob(30)) - to_chat(C, "You feel a stabbing pain in your abdomen!") + to_chat(C, span_warning("You feel a stabbing pain in your abdomen!")) if(damage > maxHealth)//cap liver damage damage = maxHealth diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index e89f02b47ac2..1c28083c057f 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 = "You feel some sort of constriction around your chest as your breathing becomes shallow and rapid." - now_fixed = "Your lungs seem to once again be able to hold air." - high_threshold_cleared = "The constriction around your chest loosens as your breathing calms down." + high_threshold_passed = span_warning("You feel some sort of constriction around your chest as your breathing becomes shallow and rapid.") + now_fixed = span_warning("Your lungs seem to once again be able to hold air.") + high_threshold_cleared = span_info("The constriction around your chest loosens as your breathing calms down.") //Breath damage @@ -270,12 +270,12 @@ // Nitryl var/nitryl_pp = breath.get_breath_partial_pressure(breath.get_moles(/datum/gas/nitryl)) if (prob(nitryl_pp)) - to_chat(H, "Your mouth feels like it's burning!") + to_chat(H, span_alert("Your mouth feels like it's burning!")) if (nitryl_pp >40) H.emote("gasp") H.adjustFireLoss(10) if (prob(nitryl_pp/2)) - to_chat(H, "Your throat closes up!") + to_chat(H, span_alert("Your throat closes up!")) H.silent = max(H.silent, 3) else H.adjustFireLoss(nitryl_pp/4) @@ -288,12 +288,12 @@ // Freon var/freon_pp = breath.get_breath_partial_pressure(breath.get_moles(/datum/gas/freon)) if (prob(freon_pp)) - to_chat(H, "Your mouth feels like it's burning!") + to_chat(H, span_alert("Your mouth feels like it's burning!")) if (freon_pp >40) H.emote("gasp") H.adjustFireLoss(15) if (prob(freon_pp/2)) - to_chat(H, "Your throat closes up!") + to_chat(H, span_alert("Your throat closes up!")) H.silent = max(H.silent, 3) else H.adjustFireLoss(freon_pp/4) @@ -371,22 +371,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, "You smell something horribly decayed inside this room.") + to_chat(owner, span_warning("You 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 @@ -436,7 +436,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, "You feel [cold_message] in your [name]!") + to_chat(H, span_warning("You feel [cold_message] in your [name]!")) if(!HAS_TRAIT(H, TRAIT_RESISTHEAT)) // HEAT DAMAGE var/heat_modifier = H.dna.species.heatmod @@ -448,13 +448,13 @@ 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, "You feel [hot_message] in your [name]!") + to_chat(H, span_warning("You feel [hot_message] in your [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!") + owner.visible_message(span_userdanger("[owner] grabs [owner.p_their()] throat, struggling for breath!")) 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 d0a1456cc267..31f7e5ef0c06 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -138,13 +138,13 @@ /obj/item/organ/examine(mob/user) . = ..() if(status == ORGAN_ROBOTIC && (organ_flags & ORGAN_FAILING)) - . += "[src] seems to be broken!" + . += span_warning("[src] seems to be broken!") else if(organ_flags & ORGAN_FAILING) - . += "[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!") else if(damage > high_threshold) - . += "[src] is starting to look discolored." + . += span_warning("[src] is starting to look discolored.") /obj/item/organ/proc/prepare_eat() diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index c26861cd6bbb..5f3496c4bcae 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 = "Your stomach flashes with pain before subsiding. Food doesn't seem like a good idea right now." - high_threshold_passed = "Your stomach flares up with constant pain- you can hardly stomach the idea of food right now!" - high_threshold_cleared = "The pain in your stomach dies down for now, but food still seems unappealing." - low_threshold_cleared = "The last bouts of pain in your stomach have died out." + low_threshold_passed = span_info("Your stomach flashes with pain before subsiding. Food doesn't seem like a good idea right now.") + high_threshold_passed = span_warning("Your stomach flares up with constant pain- you can hardly stomach the idea of food right now!") + high_threshold_cleared = span_info("The pain in your stomach dies down for now, but food still seems unappealing.") + low_threshold_cleared = span_info("The last bouts of pain in your 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, "Your stomach reels in pain as you're incapable of holding down all that food!") + to_chat(H, span_warning("Your 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, "Your stomach reels in pain as you're incapable of holding down all that food!") + to_chat(H, span_warning("Your 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, "You feel kind of iffy...") + to_chat(H, span_warning("You 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(illusion) return adjust_charge(shock_damage * siemens_coeff * 2) - to_chat(owner, "You absorb some of the shock into your body!") + to_chat(owner, span_notice("You absorb some of the shock into your body!")) /obj/item/organ/stomach/ethereal/proc/adjust_charge(amount) crystal_charge = clamp(crystal_charge + amount, ETHEREAL_CHARGE_NONE, ETHEREAL_CHARGE_FULL) @@ -135,29 +135,29 @@ /obj/item/organ/stomach/cursed/ui_action_click() //Stomach that allows you to vomit at will, oh the humanity! if(HAS_TRAIT(owner, TRAIT_NOHUNGER)) - to_chat(owner, "You don't hunger, you can't vomit!") + to_chat(owner, span_notice("You don't hunger, you can't vomit!")) return if(owner.IsParalyzed()) - to_chat(owner, "You can't bring yourself to vomit while stunned!") + to_chat(owner, span_notice("You can't bring yourself to vomit while stunned!")) return if(istype(owner.loc, /obj/effect/dummy/crawling)) - to_chat(owner, "You can't vomit while in vomitform!") //no vomitghosts allowed + to_chat(owner, span_notice("You can't vomit while in vomitform!")) //no vomitghosts allowed return - to_chat(owner, "You force yourself to vomit.") + to_chat(owner, span_notice("You force yourself to vomit.")) owner.vomit(10, FALSE, TRUE, rand(0,4)) //BLEEEUUUGHHHH!! /obj/item/organ/stomach/cursed/attack(mob/M, mob/living/carbon/user, obj/target) if(M != user) return ..() - user.visible_message("[user] raises [src] to [user.p_their()] mouth with disgust and tears into it with [user.p_their()] teeth!?", \ - "An unnatural hunger consumes you. You raise [src] your mouth and unwillingly devour it!") + user.visible_message(span_warning("[user] raises [src] to [user.p_their()] mouth with disgust and tears into it with [user.p_their()] teeth!?"), \ + span_danger("An unnatural hunger consumes you. You raise [src] your mouth and unwillingly devour it!")) playsound(user, 'sound/magic/demon_consume.ogg', 35, 1) if(user.GetComponent(/datum/component/crawl/vomit)) - 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] looks extremely sick!", \ - "You feel extremely weird... you have absorbed the demonic vomit-travelling powers?") + user.visible_message(span_warning("[user] looks extremely sick!"), \ + span_userdanger("You feel extremely weird... you have absorbed the demonic vomit-travelling powers?")) user.temporarilyRemoveItemFromInventory(src, TRUE) src.Insert(user) //Are you gonna seriously gonna eat THAT? diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index d8ec42a9b330..eb9f45d260cd 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -105,20 +105,20 @@ return if(T.mothership == mothership) - to_chat(H, "[src] is already attuned to the same channel as your own.") + to_chat(H, span_notice("[src] is already attuned to the same channel as your own.")) - H.visible_message("[H] holds [src] in their hands, and concentrates for a moment.", "You 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("You attempt to modify the attunation of [src].")) if(do_after(H, delay=15, target=src)) - to_chat(H, "You attune [src] to your own channel.") + to_chat(H, span_notice("You attune [src] to your own channel.")) mothership = T.mothership /obj/item/organ/tongue/abductor/examine(mob/M) . = ..() if(HAS_TRAIT(M, 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 diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 554aef1a37b5..c01ba9812330 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -91,7 +91,7 @@ . = ..() if(!IsAvailable()) if(world.time < cords.next_command) - to_chat(owner, "You must wait [DisplayTimeText(cords.next_command - world.time)] before Speaking again.") + to_chat(owner, span_notice("You 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)) @@ -102,12 +102,12 @@ /obj/item/organ/vocal_cords/colossus/can_speak_with() if(world.time < next_command) - to_chat(owner, "You must wait [DisplayTimeText(next_command - world.time)] before Speaking again.") + to_chat(owner, span_notice("You must wait [DisplayTimeText(next_command - world.time)] before Speaking again.")) return FALSE if(!owner) return FALSE if(!owner.can_speak_vocal()) - to_chat(owner, "You are unable to speak!") + to_chat(owner, span_warning("You are unable to speak!")) return FALSE return TRUE diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm index 806d9b0fcdf7..6479359d2a03 100644 --- a/code/modules/surgery/plastic_surgery.dm +++ b/code/modules/surgery/plastic_surgery.dm @@ -11,15 +11,15 @@ fuckup_damage = 0 /datum/surgery_step/reshape_face/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] begins to alter [target]'s appearance.", "You begin to alter [target]'s appearance...") - display_results(user, target, "You begin to alter [target]'s appearance...", + user.visible_message("[user] begins to alter [target]'s appearance.", span_notice("You begin to alter [target]'s appearance...")) + display_results(user, target, span_notice("You begin to alter [target]'s appearance..."), "[user] begins to alter [target]'s appearance.", "[user] begins to make an incision in [target]'s face.") /datum/surgery_step/reshape_face/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(HAS_TRAIT_FROM(target, TRAIT_DISFIGURED, TRAIT_GENERIC)) REMOVE_TRAIT(target, TRAIT_DISFIGURED, TRAIT_GENERIC) - display_results(user, target, "You successfully restore [target]'s appearance.", + display_results(user, target, span_notice("You successfully restore [target]'s appearance."), "[user] successfully restores [target]'s appearance!", "[user] finishes the operation on [target]'s face.") else @@ -37,7 +37,7 @@ var/oldname = target.real_name target.real_name = chosen_name var/newname = target.real_name //something about how the code handles names required that I use this instead of target.real_name - display_results(user, target, "You alter [oldname]'s appearance completely, [target.p_they()] is now [newname].", + display_results(user, target, span_notice("You alter [oldname]'s appearance completely, [target.p_they()] is now [newname]."), "[user] alters [oldname]'s appearance completely, [target.p_they()] is now [newname]!", "[user] finishes the operation on [target]'s face.") if(ishuman(target)) @@ -46,7 +46,7 @@ return TRUE /datum/surgery_step/reshape_face/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You screw up, leaving [target]'s appearance disfigured!", + display_results(user, target, span_warning("You screw up, leaving [target]'s appearance disfigured!"), "[user] screws up, disfiguring [target]'s appearance!", "[user] finishes the operation on [target]'s face.") ADD_TRAIT(target, TRAIT_DISFIGURED, TRAIT_GENERIC) diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm index 6ba570c0e2d3..7445509205e7 100644 --- a/code/modules/surgery/prosthetic_replacement.dm +++ b/code/modules/surgery/prosthetic_replacement.dm @@ -40,24 +40,24 @@ /datum/surgery_step/add_prosthetic/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(istype(tool, /obj/item/organ_storage)) if(!tool.contents.len) - to_chat(user, "There is nothing inside [tool]!") + to_chat(user, span_notice("There is nothing inside [tool]!")) return -1 var/obj/item/I = tool.contents[1] if(!isbodypart(I)) - to_chat(user, "[I] cannot be attached!") + to_chat(user, span_notice("[I] cannot be attached!")) return -1 tool = I if(istype(tool, /obj/item/bodypart)) var/obj/item/bodypart/BP = tool if(ismonkey(target))// monkey patient only accept organic monkey limbs if(BP.status == BODYPART_ROBOTIC || BP.animal_origin != MONKEY_BODYPART) - to_chat(user, "[BP] doesn't match the patient's morphology.") + to_chat(user, span_warning("[BP] doesn't match the patient's morphology.")) return -1 if(BP.status != BODYPART_ROBOTIC) organ_rejection_dam = 10 if(ishuman(target)) if(BP.animal_origin) - to_chat(user, "[BP] doesn't match the patient's morphology.") + to_chat(user, span_warning("[BP] doesn't match the patient's morphology.")) return -1 var/mob/living/carbon/human/H = target if(H.dna.species.id != BP.species_id) @@ -68,14 +68,14 @@ "[user] begins to replace [target]'s [parse_zone(target_zone)] with [tool].", "[user] begins to replace [target]'s [parse_zone(target_zone)].") else - 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 -1 else if(target_zone == BODY_ZONE_L_ARM || target_zone == BODY_ZONE_R_ARM) - display_results(user, target, "You begin to attach [tool] onto [target]...", + display_results(user, target, span_notice("You begin to attach [tool] onto [target]..."), "[user] begins to attach [tool] onto [target]'s [parse_zone(target_zone)].", "[user] begins to attach something onto [target]'s [parse_zone(target_zone)].") else - to_chat(user, "[tool] must be installed onto an arm.") + to_chat(user, span_warning("[tool] must be installed onto an arm.")) return -1 /datum/surgery_step/add_prosthetic/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -89,7 +89,7 @@ L.attach_limb(target) if(organ_rejection_dam) target.adjustToxLoss(organ_rejection_dam) - display_results(user, target, "You succeed in replacing [target]'s [parse_zone(target_zone)].", + display_results(user, target, span_notice("You succeed in replacing [target]'s [parse_zone(target_zone)]."), "[user] successfully replaces [target]'s [parse_zone(target_zone)] with [tool]!", "[user] successfully replaces [target]'s [parse_zone(target_zone)]!") return 1 @@ -97,8 +97,8 @@ var/obj/item/bodypart/L = target.newBodyPart(target_zone, FALSE, FALSE) L.is_pseudopart = TRUE L.attach_limb(target) - user.visible_message("[user] finishes attaching [tool]!", "You attach [tool].") - display_results(user, target, "You attach [tool].", + user.visible_message("[user] finishes attaching [tool]!", span_notice("You attach [tool].")) + display_results(user, target, span_notice("You attach [tool]."), "[user] finishes attaching [tool]!", "[user] finishes the attachment procedure!") qdel(tool) diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm index d7064cbab0c5..f6994a28a0d3 100644 --- a/code/modules/surgery/remove_embedded_object.dm +++ b/code/modules/surgery/remove_embedded_object.dm @@ -15,12 +15,12 @@ /datum/surgery_step/remove_object/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) L = surgery.operated_bodypart if(L) - user.visible_message("[user] looks for objects embedded in [target]'s [parse_zone(user.zone_selected)].", "You look for objects embedded in [target]'s [parse_zone(user.zone_selected)]...") - display_results(user, target, "You look for objects embedded in [target]'s [parse_zone(user.zone_selected)]...", + user.visible_message("[user] looks for objects embedded in [target]'s [parse_zone(user.zone_selected)].", span_notice("You look for objects embedded in [target]'s [parse_zone(user.zone_selected)]...")) + display_results(user, target, span_notice("You 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)].") else - user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You look for [target]'s [parse_zone(user.zone_selected)]...") + user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", span_notice("You look for [target]'s [parse_zone(user.zone_selected)]...")) /datum/surgery_step/remove_object/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -37,13 +37,13 @@ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "embedded") if(objects > 0) - display_results(user, target, "You successfully remove [objects] objects from [H]'s [L.name].", + display_results(user, target, span_notice("You successfully remove [objects] objects from [H]'s [L.name]."), "[user] successfully removes [objects] objects from [H]'s [L]!", "[user] successfully removes [objects] objects from [H]'s [L]!") else - to_chat(user, "You find no objects embedded in [H]'s [L]!") + to_chat(user, span_warning("You find no objects embedded in [H]'s [L]!")) else - to_chat(user, "You can't find [target]'s [parse_zone(user.zone_selected)], let alone any objects embedded in it!") + to_chat(user, span_warning("You can't find [target]'s [parse_zone(user.zone_selected)], let alone any objects embedded in it!")) return 1 diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 1c804a2356cd..0784f1a72426 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -108,7 +108,7 @@ if(S.try_op(user, target, user.zone_selected, tool, src, try_to_fail)) return TRUE if(tool.item_flags & SURGICAL_TOOL) //Just because you used the wrong tool it doesn't mean you meant to whack the patient with it - to_chat(user, "This step requires a different tool!") + to_chat(user, span_warning("This step requires a different tool!")) return TRUE return FALSE diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm index 1010a990881a..aca12d2112d6 100644 --- a/code/modules/surgery/surgery_step.dm +++ b/code/modules/surgery/surgery_step.dm @@ -54,7 +54,7 @@ if(get_location_accessible(target, target_zone) || surgery.ignore_clothes) initiate(user, target, target_zone, tool, surgery, try_to_fail) else - to_chat(user, "You need to expose [target]'s [parse_zone(target_zone)] to perform surgery on it!") + to_chat(user, span_warning("You need to expose [target]'s [parse_zone(target_zone)] to perform surgery on it!")) return TRUE //returns TRUE so we don't stab the guy in the dick or wherever. if(repeatable) @@ -114,19 +114,19 @@ /datum/surgery_step/proc/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to perform surgery on [target]...", + display_results(user, target, span_notice("You begin to perform surgery on [target]..."), "[user] begins to perform surgery on [target].", "[user] begins to perform surgery on [target].") /datum/surgery_step/proc/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You succeed.", + display_results(user, target, span_notice("You succeed."), "[user] succeeds!", "[user] finishes.") return TRUE /datum/surgery_step/proc/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You screw up!", - "[user] screws up!", + display_results(user, target, span_warning("You screw up!"), + span_warning("[user] screws up!"), "[user] finishes.", TRUE) //By default the patient will notice if the wrong thing has been cut return FALSE @@ -187,7 +187,7 @@ var/final_ouchie_chance = SURGERY_FUCKUP_CHANCE * ouchie_mod if(!prob(final_ouchie_chance)) return - user.visible_message("[target] flinches, bumping [user]'s [tool ? tool.name : "hand"] into something important!", "[target] flinches, bumping your [tool ? tool.name : "hand"] into something important!") + user.visible_message(span_boldwarning("[target] flinches, bumping [user]'s [tool ? tool.name : "hand"] into something important!"), span_boldwarning("[target] flinches, bumping your [tool ? tool.name : "hand"] into something important!")) target.apply_damage(fuckup_damage, fuckup_damage_type, target_zone) if(ishuman(target) &&fuckup_damage_type == BRUTE && prob(final_ouchie_chance/2)) var/mob/living/carbon/human/H = target diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 38a410fc284c..04d3e0851eca 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -90,7 +90,7 @@ attack_verb = list("drilled") /obj/item/surgicaldrill/suicide_act(mob/user) - user.visible_message("[user] rams [src] into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] rams [src] into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!")) addtimer(CALLBACK(user, /mob/living/carbon.proc/gib, null, null, TRUE, TRUE), 25) user.SpinAnimation(3, 10) playsound(user, 'sound/machines/juicer.ogg', 20, TRUE) @@ -153,7 +153,7 @@ sharpness = IS_SHARP_ACCURATE /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) @@ -227,13 +227,13 @@ if(istype(I, /obj/machinery/smartfridge)) return if(contents.len) - to_chat(user, "[src] already has something inside it.") + to_chat(user, span_notice("[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_notice("[src] can only hold body parts!")) return - user.visible_message("[user] puts [I] into [src].", "You put [I] inside [src].") + user.visible_message("[user] puts [I] into [src].", span_notice("You put [I] inside [src].")) icon_state = "evidence" var/xx = I.pixel_x var/yy = I.pixel_y @@ -253,7 +253,7 @@ if(contents.len) var/obj/item/I = contents[1] clear_organ() - user.visible_message("[user] dumps [I] from [src].", "You dump [I] from [src].") + user.visible_message("[user] dumps [I] from [src].", span_notice("You dump [I] from [src].")) I.forceMove(get_turf(src)) else to_chat(user, "[src] is empty.") @@ -277,13 +277,13 @@ if(!proximity) return if(istype(O, /obj/item/disk/surgery)) - to_chat(user, "You load the surgery protocol from [O] into [src].") + to_chat(user, span_notice("You load the surgery protocol from [O] into [src].")) var/obj/item/disk/surgery/D = O if(do_after(user, 10, target = O)) advanced_surgeries |= D.surgeries return TRUE if(istype(O, /obj/machinery/computer/operating)) - to_chat(user, "You copy surgery protocols from [O] into [src].") + to_chat(user, span_notice("You copy surgery protocols from [O] into [src].")) var/obj/machinery/computer/operating/OC = O if(do_after(user, 10, target = O)) advanced_surgeries |= OC.advanced_surgeries @@ -306,7 +306,7 @@ /obj/item/scalpel/advanced/attack_self(mob/user) playsound(get_turf(user),'sound/machines/click.ogg',50,1) - to_chat(user, "You increase the power, now it can cut bones.") + to_chat(user, span_notice("You increase the power, now it can cut bones.")) if(issilicon(user)) var/mob/living/silicon/robot/borg = user var/modulenum = borg.get_selected_module() @@ -340,7 +340,7 @@ /obj/item/circular_saw/advanced/attack_self(mob/user) playsound(get_turf(user),'sound/machines/click.ogg',50,1) - to_chat(user, "You lower the power.") + to_chat(user, span_notice("You lower the power.")) if(issilicon(user)) var/mob/living/silicon/robot/borg = user var/modulenum = borg.get_selected_module() @@ -366,7 +366,7 @@ /obj/item/retractor/advanced/attack_self(mob/user) playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) - to_chat(user, "You set the [src] to hemostat mode.") + to_chat(user, span_notice("You set the [src] to hemostat mode.")) if(issilicon(user)) var/mob/living/silicon/robot/borg = user var/modulenum = borg.get_selected_module() @@ -392,7 +392,7 @@ /obj/item/hemostat/advanced/attack_self(mob/user) playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) - to_chat(user, "You set the [src] to retractor mode.") + to_chat(user, span_notice("You set the [src] to retractor mode.")) if(issilicon(user)) var/mob/living/silicon/robot/borg = user var/modulenum = borg.get_selected_module() @@ -424,7 +424,7 @@ /obj/item/surgicaldrill/advanced/attack_self(mob/user) playsound(get_turf(user),'sound/weapons/tap.ogg',50,1) - to_chat(user, "You dilate the lenses, setting it to mending mode.") + to_chat(user, span_notice("You dilate the lenses, setting it to mending mode.")) if(issilicon(user)) var/mob/living/silicon/robot/borg = user var/modulenum = borg.get_selected_module() @@ -457,7 +457,7 @@ /obj/item/cautery/advanced/attack_self(mob/user) playsound(get_turf(user),'sound/items/welderdeactivate.ogg',50,1) - to_chat(user, "You focus the lensess, it is now set to drilling mode.") + to_chat(user, span_notice("You focus the lensess, it is now set to drilling mode.")) if(issilicon(user)) var/mob/living/silicon/robot/borg = user var/modulenum = borg.get_selected_module() diff --git a/code/modules/swarmers/swarmer.dm b/code/modules/swarmers/swarmer.dm index 3e3e9ff098f2..4688ba4b90c2 100644 --- a/code/modules/swarmers/swarmer.dm +++ b/code/modules/swarmers/swarmer.dm @@ -150,10 +150,10 @@ */ /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.")) return if(resources < fabrication_cost) - to_chat(src, "You do not have the necessary resources to fabricate this object.") + to_chat(src, span_warning("You do not have the necessary resources to fabricate this object.")) return resources -= fabrication_cost return new fabrication_object(drop_location()) @@ -168,10 +168,10 @@ /mob/living/simple_animal/hostile/swarmer/proc/Integrate(obj/target) var/resource_gain = target.integrate_amount() 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) - 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 resources += resource_gain do_attack_animation(target) @@ -213,10 +213,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 @@ -258,13 +258,13 @@ */ /mob/living/simple_animal/hostile/swarmer/proc/dismantle_machine(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/dismantle_effect = new /obj/effect/temp_visual/swarmer/dismantle(get_turf(target)) dismantle_effect.pixel_x = target.pixel_x dismantle_effect.pixel_y = target.pixel_y dismantle_effect.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/target_loc = target.drop_location() new /obj/item/stack/sheet/metal(target_loc, 5) for(var/p in target.component_parts) @@ -291,10 +291,10 @@ set category = "Swarmer" set desc = "Creates a simple trap that will non-lethally electrocute anything that steps on it. Costs 4 resources." 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 if(resources < 4) - 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 Fabricate(/obj/structure/swarmer/trap, 4) @@ -308,10 +308,10 @@ set category = "Swarmer" set desc = "Creates a barricade that will stop anything but swarmers and disabler beams from passing through. Costs 4 resources." 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 < 4) - 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, 1 SECONDS)) return @@ -326,12 +326,12 @@ set name = "Replicate" set category = "Swarmer" set desc = "Creates a duplicate of ourselves, capable of protecting us while we complete our objectives." - 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 < 20) - 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, 5 SECONDS)) return @@ -362,11 +362,11 @@ set desc = "Attempts to repair damage to our body. You will have to remain motionless until repairs are complete." 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, 10 SECONDS)) return adjustHealth(-maxHealth) - to_chat(src, "We successfully repaired ourselves.") + to_chat(src, span_info("We successfully repaired ourselves.")) /** * Called when a swarmer toggles its light diff --git a/code/modules/swarmers/swarmer_act.dm b/code/modules/swarmers/swarmer_act.dm index 22a7bc190b47..b99523c5d716 100644 --- a/code/modules/swarmers/swarmer_act.dm +++ b/code/modules/swarmers/swarmer_act.dm @@ -14,7 +14,7 @@ return FALSE for(var/mob/living/living_content in contents) if(!issilicon(living_content) && !isbrain(living_content)) - 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 ..() @@ -57,7 +57,7 @@ return TRUE /obj/structure/swarmer_beacon/swarmer_act(mob/living/simple_animal/hostile/swarmer/actor) - to_chat(actor, "This machine is required for further reproduction of swarmers. Aborting.") + to_chat(actor, span_warning("This machine is required for further reproduction of swarmers. Aborting.")) return FALSE /obj/structure/flora/swarmer_act() @@ -87,11 +87,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.dis_integrate(src) @@ -124,43 +124,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 could cause a chain reaction. Aborting.") + to_chat(S, span_warning("Destroying this object could 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) @@ -168,11 +168,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 ..() @@ -182,51 +182,51 @@ for(var/turf/adj_turf in range(1, src)) var/area/adj_area = get_area(adj_turf) if(isspaceturf(adj_turf) || (!is_on_shuttle && (istype(adj_area, /area/shuttle) || istype(adj_area, /area/space))) || (is_on_shuttle && !istype(adj_area, /area/shuttle))) - to_chat(actor, "Destroying this object has the potential to cause a hull breach. Aborting.") + to_chat(actor, span_warning("Destroying this object has the potential to cause a hull breach. Aborting.")) actor.target = null return TRUE if(istype(adj_area, /area/engine/supermatter)) - to_chat(actor, "Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.") + to_chat(actor, span_warning("Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.")) actor.target = null return TRUE return ..() /obj/item/stack/cable_coil/swarmer_act(mob/living/simple_animal/hostile/swarmer/actor)//Wiring would be too effective as a resource - to_chat(actor, "This object does not contain enough materials to work with.") + to_chat(actor, 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/actor) - to_chat(actor, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.") + to_chat(actor, 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/actor) - to_chat(actor, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.") + to_chat(actor, span_warning("Attempting to dismantle this machine would result in an immediate counterattack. Aborting.")) return FALSE /obj/structure/lattice/catwalk/swarmer_act(mob/living/simple_animal/hostile/swarmer/actor) var/turf/here = get_turf(src) for(var/a in here.contents) if(istype(a, /obj/structure/cable)) - to_chat(actor, "Disrupting the power grid would bring no benefit to us. Aborting.") + to_chat(actor, span_warning("Disrupting the power grid would bring no benefit to us. Aborting.")) return FALSE return ..() /obj/machinery/hydroponics/soil/swarmer_act(mob/living/simple_animal/hostile/swarmer/actor) - to_chat(actor, "This object does not contain enough materials to work with.") + to_chat(actor, 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/actor) - to_chat(actor, "Destroying this object would cause a catastrophic chain reaction. Aborting.") + to_chat(actor, 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/actor) - to_chat(actor, "This object does not contain solid matter. Aborting.") + to_chat(actor, span_warning("This object does not contain solid matter. Aborting.")) return FALSE /obj/machinery/power/shieldwallgen/swarmer_act(mob/living/simple_animal/hostile/swarmer/actor) - to_chat(actor, "Destroying this object would have an unpredictable effect on structure integrity. Aborting.") + to_chat(actor, 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/actor) - to_chat(actor, "This object does not contain solid matter. Aborting.") + to_chat(actor, span_warning("This object does not contain solid matter. Aborting.")) return FALSE diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 27b7a3d04a86..3493ef20e725 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1431,7 +1431,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/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm index a212e3da608a..5c9b7dd83fbd 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/cars/car.dm b/code/modules/vehicles/cars/car.dm index 5485ab08f7b0..0bbc046913b8 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, "You push against the back of [src] trunk to try and get out.") + to_chat(user, span_notice("You push against the back of [src] 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, "Your attack bounces off of the car's padded interior.") + to_chat(user, span_notice("Your attack bounces off of the car's padded interior.")) return return ..() @@ -66,13 +66,13 @@ return if(occupants[user]) return - to_chat(user, "You start opening [src]'s trunk.") + to_chat(user, span_notice("You 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 18428bc5657d..0402ba47dee7 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -46,7 +46,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) @@ -54,7 +54,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, "You use the [banana] to repair the [src]!") + to_chat(user, span_danger("You use the [banana] to repair the [src]!")) qdel(banana) /obj/vehicle/sealed/car/clowncar/Bump(atom/A) @@ -66,12 +66,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 him up!") //fuck off shezza this isn't ERP. + L.visible_message(span_warning("[src] rams into [L] and sucks him up!")) //fuck off shezza this isn't ERP. mob_forced_enter(L) playsound(src, pick('sound/vehicles/clowncar_ram1.ogg', 'sound/vehicles/clowncar_ram2.ogg', 'sound/vehicles/clowncar_ram3.ogg'), 75) log_combat(src, A, "sucked up") else if(istype(A, /turf/closed)) - visible_message("[src] rams into [A] and crashes!") + visible_message(span_warning("[src] rams into [A] and crashes!")) playsound(src, pick('sound/vehicles/clowncar_crash1.ogg', 'sound/vehicles/clowncar_crash2.ogg'), 75) playsound(src, 'sound/vehicles/clowncar_crashpins.ogg', 75) DumpMobs(TRUE) @@ -81,7 +81,7 @@ if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - to_chat(user, "You scramble the clowncar child safety lock and a panel with 6 colorful buttons appears!") + to_chat(user, span_danger("You scramble the clowncar child safety lock and a panel with 6 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) @@ -96,16 +96,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] has pressed one of the colorful buttons on [src] and a special banana peel drops out of it.") + visible_message(span_danger("[user] has pressed 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] has pressed one of the colorful buttons on [src] and unknown chemicals flood out of it.") + visible_message(span_danger("[user] has pressed 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) @@ -113,12 +113,12 @@ foam.set_up(200, loc, R) foam.start() if(3) - visible_message("[user] has pressed one of the colorful buttons on [src] and the clown car turns on its singularity disguise system.") + visible_message(span_danger("[user] has pressed 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/ResetIcon), 100) if(4) - visible_message("[user] has pressed one of the colorful buttons on [src] and the clown car spews out a cloud of laughing gas.") + visible_message(span_danger("[user] has pressed 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) @@ -127,11 +127,11 @@ smoke.attach(src) smoke.start() if(5) - visible_message("[user] has pressed one of the colorful buttons on [src] and the clown car starts dropping an oil trail.") + visible_message(span_danger("[user] has pressed one of the colorful buttons on [src] and the clown car starts dropping an oil trail.")) droppingoil = TRUE addtimer(CALLBACK(src, .proc/StopDroppingOil), 30) if(6) - visible_message("[user] has pressed one of the colorful buttons on [src] and the clown car lets out a comedic toot.") + visible_message(span_danger("[user] has pressed one of the colorful buttons on [src] and the clown car lets out a comedic toot.")) playsound(src, 'sound/vehicles/clowncar_fart.ogg', 100) for(var/mob/living/L in orange(loc, 6)) L.emote("laughs") @@ -153,12 +153,12 @@ icon_state = "clowncar" addtimer(CALLBACK(src, .proc/LeaveCannonMode), 20) playsound(src, 'sound/vehicles/clowncar_cannonmode2.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/EnterCannonMode), 20) playsound(src, 'sound/vehicles/clowncar_cannonmode1.ogg', 75) diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm index 7df6aa2b1072..181f28b359e6 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, "You hook the trashbag onto [src].") + to_chat(user, span_notice("You 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, "You upgrade [src] with the floor buffer.") + to_chat(user, span_notice("You upgrade [src] with the floor buffer.")) AddComponent(/datum/component/cleaning) update_icon() else diff --git a/code/modules/vehicles/ridden.dm b/code/modules/vehicles/ridden.dm index 719222add7b7..5b3e1100a215 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, "You insert \the [I] into \the [src].") + to_chat(user, span_notice("You 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 your hand!") + to_chat(user, span_notice("[I] seems to be stuck to your 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, "You must be riding the [src] to remove [src]'s key!") + to_chat(user, span_notice("You must be riding the [src] to remove [src]'s key!")) return - to_chat(user, "You remove \the [inserted_key] from \the [src].") + to_chat(user, span_notice("You remove \the [inserted_key] from \the [src].")) inserted_key.forceMove(drop_location()) user.put_in_hands(inserted_key) inserted_key = null @@ -60,13 +60,13 @@ /obj/vehicle/ridden/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(legs_required) var/how_many_legs = user.get_num_legs() if(how_many_legs < legs_required) if(message_cooldown < world.time) - to_chat(user, "You can't seem to manage that with[how_many_legs ? " your leg[how_many_legs > 1 ? "s" : null]" : "out legs"]...") + to_chat(user, span_warning("You can't seem to manage that with[how_many_legs ? " your leg[how_many_legs > 1 ? "s" : null]" : "out legs"]...")) message_cooldown = world.time + 5 SECONDS return FALSE if(arms_required) @@ -75,14 +75,14 @@ if(fall_off_if_missing_arms) unbuckle_mob(user, TRUE) user.visible_message("[user] falls off of \the [src].",\ - "You fall of \the [src] while trying to operate it without [arms_required ? "both arms":"an arm"]!") + span_danger("You fall of \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, "You can't seem to manage that with[how_many_arms ? " your arm[how_many_arms > 1 ? "s" : null]" : "out arms"]...") + to_chat(user, span_warning("You can't seem to manage that with[how_many_arms ? " your 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 2bc1a556ac5f..da1c0d3e1310 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -12,11 +12,11 @@ /obj/vehicle/ridden/scooter/wrench_act(mob/living/user, obj/item/I) - to_chat(user, "You begin to remove the handlebars...") + to_chat(user, span_notice("You 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, "You remove the handlebars from [src].") + to_chat(user, span_notice("You remove the handlebars from [src].")) if(has_buckled_mobs()) var/mob/living/carbon/H = buckled_mobs[1] unbuckle_mob(H) @@ -37,7 +37,7 @@ if(!istype(M)) return FALSE if(M.get_num_legs() < legs_required && M.get_num_arms() < arms_required) - to_chat(M, "You don't think it'd be a good idea trying to ride \the [src]...") + to_chat(M, span_warning("You don't think it'd be a good idea trying to ride \the [src]...")) return FALSE return ..() @@ -104,7 +104,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) @@ -123,7 +123,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 @@ -147,7 +147,7 @@ if(!istype(M) || M.incapacitated() || !Adjacent(M)) return if(has_buckled_mobs() && over_object == M) - to_chat(M, "You can't lift this up when somebody's on it.") + to_chat(M, span_warning("You can't lift this up when somebody's on it.")) return if(over_object == M) var/board = new board_item_type(get_turf(M)) @@ -199,16 +199,16 @@ if(istype(I, /obj/item/stack/sheet/metal)) if(!I.tool_start_check(user, amount=5)) return - to_chat(user, "You begin to add wheels to [src].") + to_chat(user, span_notice("You begin to add wheels to [src].")) if(I.use_tool(src, user, 80, volume=50, amount=5)) - to_chat(user, "You finish making wheels for [src].") + to_chat(user, span_notice("You finish making wheels for [src].")) new /obj/vehicle/ridden/scooter/skateboard(user.loc) qdel(src) else return ..() /obj/item/scooter_frame/wrench_act(mob/living/user, obj/item/I) - to_chat(user, "You deconstruct [src].") + to_chat(user, span_notice("You deconstruct [src].")) new /obj/item/stack/rods(drop_location(), 10) I.play_tool_sound(src) qdel(src) @@ -218,9 +218,9 @@ if(istype(I, /obj/item/stack/rods)) if(!I.tool_start_check(user, amount=2)) return - to_chat(user, "You begin making handlebars for [src].") + to_chat(user, span_notice("You begin making handlebars for [src].")) if(I.use_tool(src, user, 25, volume=50, amount=2)) - to_chat(user, "You add the rods to [src], creating handlebars.") + to_chat(user, span_notice("You 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] @@ -233,9 +233,9 @@ /obj/vehicle/ridden/scooter/skateboard/screwdriver_act(mob/living/user, obj/item/I) if(..()) return TRUE - to_chat(user, "You begin to deconstruct and remove the wheels on [src]...") + to_chat(user, span_notice("You begin to deconstruct and remove the wheels on [src]...")) if(I.use_tool(src, user, 20, volume=50)) - to_chat(user, "You deconstruct the wheels on [src].") + to_chat(user, span_notice("You 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()) @@ -265,12 +265,12 @@ /obj/vehicle/ridden/scooter/wheelys/post_unbuckle_mob(mob/living/M) if(!has_buckled_mobs()) - to_chat(M, "You pop the Wheely-Heels' wheels back into place.") + to_chat(M, span_notice("You pop the Wheely-Heels' wheels back into place.")) moveToNullspace() return ..() /obj/vehicle/ridden/scooter/wheelys/post_buckle_mob(mob/living/M) - to_chat(M, "You pop out the Wheely-Heels' wheels.") + to_chat(M, span_notice("You pop out the Wheely-Heels' wheels.")) return ..() /obj/vehicle/ridden/scooter/wheelys/Bump(atom/A) @@ -286,5 +286,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/effects/bang.ogg', 50, 1) \ No newline at end of file diff --git a/code/modules/vehicles/sealed.dm b/code/modules/vehicles/sealed.dm index 53865b9a229e..75c3a8df116a 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, "You insert [I] into [src].") + to_chat(user, span_notice("You 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 your hand!") + to_chat(user, span_notice("[I] seems to be stuck to your 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_notice("There is no key in [src]!")) return if(!is_occupant(user) || !(occupants[user] & VEHICLE_CONTROL_DRIVE)) - to_chat(user, "You must be driving [src] to remove [src]'s key!") + to_chat(user, span_notice("You must be driving [src] to remove [src]'s key!")) return - to_chat(user, "You remove [inserted_key] from [src].") + to_chat(user, span_notice("You 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/speedbike.dm b/code/modules/vehicles/speedbike.dm index 1da6594c8522..e0db7bc011fd 100644 --- a/code/modules/vehicles/speedbike.dm +++ b/code/modules/vehicles/speedbike.dm @@ -74,7 +74,7 @@ if(ismovable(A)) var/atom/movable/AM = A AM.throw_at(throw_target, 4, 3) - visible_message("[src] crashes into [A]!") + visible_message(span_danger("[src] crashes into [A]!")) playsound(src, 'sound/effects/bang.ogg', 50, 1) if(ishuman(A)) var/mob/living/carbon/human/H = A @@ -83,7 +83,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/effects/bang.ogg', 50, 1) /obj/vehicle/ridden/space/speedwagon/Moved() diff --git a/code/modules/vehicles/vehicle_actions.dm b/code/modules/vehicles/vehicle_actions.dm index bb2a8ae0cc38..b94dcfbe14bc 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, "You press the vehicle's horn.") + vehicle_entered_target.visible_message(span_danger("[vehicle_entered_target] loudly honks")) + to_chat(owner, span_notice("You 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, "You press the vehicle's horn.") + vehicle_entered_target.visible_message(span_danger("[vehicle_entered_target] loudly honks")) + to_chat(owner, span_notice("You 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 @@ -211,7 +211,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 d7ae76c79ccf..673d3d43624b 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -38,7 +38,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, "You don't have enough arms to operate the wheels!") + to_chat(user, span_warning("You don't have enough arms to operate the wheels!")) canmove = FALSE addtimer(VARSET_CALLBACK(src, canmove, TRUE), 20) return FALSE @@ -75,9 +75,9 @@ handle_rotation(newdir) /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, "You begin to detach the wheels...") + to_chat(user, span_notice("You begin to detach the wheels...")) if(I.use_tool(src, user, 40, volume=50)) - to_chat(user, "You detach the wheels and deconstruct the chair.") + to_chat(user, span_notice("You 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 0873b981d10a..4dbef210655a 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, "You must first secure [src].") + to_chat(user, span_warning("You must first secure [src].")) return TRUE /obj/machinery/vending/attackby(obj/item/I, mob/user, params) @@ -383,21 +383,21 @@ GLOBAL_LIST_EMPTY(vending_products) return if(refill_canister && istype(I, refill_canister)) if (!panel_open) - to_chat(user, "You should probably unscrew the service panel first.") + to_chat(user, span_notice("You 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_notice("[canister] is empty!")) else // instantiate canister if needed var/transferred = restock(canister) if(transferred) - to_chat(user, "You loaded [transferred] items in [src].") + to_chat(user, span_notice("You loaded [transferred] items in [src].")) else - to_chat(user, "There's nothing to restock!") + to_chat(user, span_notice("There's nothing to restock!")) return if(user.a_intent != INTENT_HARM && compartmentLoadAccessCheck(user)) if(canLoadItem(I)) @@ -410,7 +410,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 chef compartment is full.") + to_chat(user, span_warning("[src]'s chef compartment is full.")) break if(canLoadItem(the_item) && loadingAttempt(the_item,user)) SEND_SIGNAL(T, COMSIG_TRY_STORAGE_TAKE, the_item, src, TRUE) @@ -418,9 +418,9 @@ GLOBAL_LIST_EMPTY(vending_products) else denied_items++ if(denied_items) - to_chat(user, "[src] refuses some items.") + to_chat(user, span_notice("[src] refuses some items.")) if(loaded) - to_chat(user, "You insert [loaded] dishes into [src]'s chef compartment.") + to_chat(user, span_notice("You insert [loaded] dishes into [src]'s chef compartment.")) updateUsrDialog() else ..() @@ -432,7 +432,7 @@ GLOBAL_LIST_EMPTY(vending_products) for(var/datum/data/vending_product/R as anything in product_records) if(R.product_path == I.type) R.amount++ - to_chat(user, "You insert [I] into [src]'s input compartment.") + to_chat(user, span_notice("You insert [I] into [src]'s input compartment.")) qdel(I) break @@ -469,7 +469,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - to_chat(user, "You short out the product lock on [src].") + to_chat(user, span_notice("You short out the product lock on [src].")) /obj/machinery/vending/_try_interact(mob/user) if(seconds_electrified && !(stat & NOPOWER)) @@ -564,7 +564,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(!vend_ready) 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 //One thing at a time!! var/datum/data/vending_product/R = locate(params["ref"]) @@ -717,7 +717,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 @@ -782,7 +782,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/onTransitZ() diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm index 11956d9ddbb5..7a110932a96e 100644 --- a/code/modules/zombie/items.dm +++ b/code/modules/zombie/items.dm @@ -79,7 +79,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 eed2a54f54b0..109f87ae87bc 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(damage_caused) if (prob(10)) - to_chat(owner, "You feel sick...") + to_chat(owner, span_danger("You 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!", "You 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("You HUNGER!")) playsound(owner.loc, 'sound/hallucinations/far_noise.ogg', 50, 1) owner.do_jitter_animation(living_transformation_time) owner.Stun(living_transformation_time) - to_chat(owner, "You are now a zombie!") + to_chat(owner, span_alertalien("You are now a zombie!")) /obj/item/organ/zombie_infection/nodamage @@ -122,11 +122,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!", "You 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("You HUNGER!")) playsound(owner.loc, 'sound/hallucinations/far_noise.ogg', 50, 1) owner.do_jitter_animation(living_transformation_time) owner.Stun(living_transformation_time) - to_chat(owner, "You are now a zombie! Help your fellow allies take over the station!") + to_chat(owner, span_alertalien("You are now a zombie! Help your fellow allies take over the station!")) if(!isinfected(owner)) //Makes them the *actual* antag, instead of just a zombie. diff --git a/interface/interface.dm b/interface/interface.dm index 167228986788..e1858ac26f69 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/forum() @@ -24,7 +24,7 @@ return src << link(forumurl) 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 @@ -42,7 +42,7 @@ return src << link("[roundurl][roundnumber]") else - to_chat(src, "The demo URL is not set in the server configuration.") + to_chat(src, span_danger("The demo URL is not set in the server configuration.")) /client/verb/rules() set name = "rules" @@ -54,7 +54,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() @@ -67,7 +67,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/reportissue() @@ -89,7 +89,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 // yogs start - Rebindable Hotkeys /* diff --git a/yogstation.dme b/yogstation.dme index 041b02ebeeff..c1113b83e2ea 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -101,6 +101,7 @@ #include "code\__DEFINES\sight.dm" #include "code\__DEFINES\sound.dm" #include "code\__DEFINES\spaceman_dmm.dm" +#include "code\__DEFINES\span.dm" #include "code\__DEFINES\stat.dm" #include "code\__DEFINES\stat_tracking.dm" #include "code\__DEFINES\station.dm" diff --git a/yogstation/code/_onclick/click.dm b/yogstation/code/_onclick/click.dm index 5f2e4004a400..e4ab09efaab0 100644 --- a/yogstation/code/_onclick/click.dm +++ b/yogstation/code/_onclick/click.dm @@ -1,5 +1,5 @@ /client/Click() if(src.prefs && src.prefs.afreeze) - to_chat(src, "You have been frozen by an administrator.") + to_chat(src, span_userdanger("You have been frozen by an administrator.")) return return ..() \ No newline at end of file diff --git a/yogstation/code/controllers/subsystem/ticker.dm b/yogstation/code/controllers/subsystem/ticker.dm index 7f58cee7e8be..59f16f232b3e 100644 --- a/yogstation/code/controllers/subsystem/ticker.dm +++ b/yogstation/code/controllers/subsystem/ticker.dm @@ -60,7 +60,7 @@ var/ytdl = CONFIG_GET(string/invoke_youtubedl) if(!ytdl) - to_chat(world, "Youtube-dl was not configured.") + to_chat(world, span_boldwarning("Youtube-dl was not configured.")) log_world("Could not play lobby song because youtube-dl is not configured properly, check the config.") return @@ -74,15 +74,15 @@ try data = json_decode(stdout) catch(var/exception/e) - to_chat(src, "Youtube-dl JSON parsing FAILED:", confidential=TRUE) - to_chat(src, "[e]: [stdout]", confidential=TRUE) + to_chat(src, span_boldwarning("Youtube-dl JSON parsing FAILED:"), confidential=TRUE) + to_chat(src, span_warning("[e]: [stdout]"), confidential=TRUE) return if(data["title"]) login_music_data["title"] = data["title"] login_music_data["url"] = data["url"] if(errorlevel) - to_chat(world, "Youtube-dl failed.") + to_chat(world, span_boldwarning("Youtube-dl failed.")) log_world("Could not play lobby song [selected_lobby_music]: [stderr]") return return stdout diff --git a/yogstation/code/datums/antagonists/vampire.dm b/yogstation/code/datums/antagonists/vampire.dm index 6c92dc846428..8b8950e3f092 100644 --- a/yogstation/code/datums/antagonists/vampire.dm +++ b/yogstation/code/datums/antagonists/vampire.dm @@ -94,7 +94,7 @@ objectives -= O LAZYCLEARLIST(objectives_given) if(owner.current) - to_chat(owner.current,"Your powers have been quenched! You are no longer a vampire") + to_chat(owner.current,span_userdanger("Your powers have been quenched! You are no longer a vampire")) owner.special_role = null var/mob/living/carbon/human/C = owner.current if(istype(C)) @@ -105,9 +105,9 @@ ..() /datum/antagonist/vampire/greet() - to_chat(owner, "You are a Vampire!") + to_chat(owner, span_userdanger("You are a Vampire!")) to_chat(owner, "You are a creature of the night -- holy water, the chapel, and space will cause you to burn.") - to_chat(owner, "Hit someone in the head with harm intent to start sucking their blood. However, only blood from living, non-vampiric creatures is usable!") + to_chat(owner, span_userdanger("Hit someone in the head with harm intent to start sucking their blood. However, only blood from living, non-vampiric creatures is usable!")) to_chat(owner, "Coffins will heal you.") if(full_vampire == FALSE) to_chat(owner, "You are not required to obey other vampires, however, you have gained a respect for them.") @@ -178,16 +178,16 @@ if(prob(burn_chance) && L.health >= 50) switch(L.health) if(75 to 100) - L.visible_message("[L]'s skin begins to flake!", "Your skin flakes away...") + L.visible_message(span_warning("[L]'s skin begins to flake!"), span_danger("Your skin flakes away...")) if(50 to 75) - L.visible_message("[L]'s skin sizzles loudly!", "Your skin sizzles!", "You hear sizzling.") + L.visible_message(span_warning("[L]'s skin sizzles loudly!"), span_danger("Your skin sizzles!"), "You hear sizzling.") L.adjustFireLoss(3) else if(L.health < 50) if(!L.on_fire) - L.visible_message("[L] catches fire!", "Your skin catches fire!") + L.visible_message(span_warning("[L] catches fire!"), span_danger("Your skin catches fire!")) L.emote("scream") else - L.visible_message("[L] continues to burn!", "Your continue to burn!") + L.visible_message(span_warning("[L] continues to burn!"), span_danger("Your continue to burn!")) L.adjust_fire_stacks(5) L.IgniteMob() return @@ -250,10 +250,10 @@ else if(O.grab_state >= GRAB_NECK) blood_to_take *= 1.5 //50% more blood from targets that are being neck grabbed or above if(!silent) - O.visible_message("[O] grabs [H]'s neck harshly and sinks in their fangs!", "You sink your fangs into [H] and begin to [blood_to_take > BLOOD_SUCK_BASE ? "quickly" : ""] drain their blood.", "You hear a soft puncture and a wet sucking noise.") + O.visible_message(span_danger("[O] grabs [H]'s neck harshly and sinks in their fangs!"), span_danger("You sink your fangs into [H] and begin to [blood_to_take > BLOOD_SUCK_BASE ? "quickly" : ""] drain their blood."), span_notice("You hear a soft puncture and a wet sucking noise.")) playsound(O.loc, 'sound/weapons/bite.ogg', 50, 1) else - to_chat(O, "You stealthily begin to drain blood from [H], be careful, as they will notice if their blood gets too low.") + to_chat(O, span_notice("You stealthily begin to drain blood from [H], be careful, as they will notice if their blood gets too low.")) O.playsound_local(O, 'sound/weapons/bite.ogg', 50, 1) if(!iscarbon(owner)) H.LAssailant = null @@ -261,23 +261,23 @@ H.LAssailant = O while(do_mob(O, H, 50)) if(!is_vampire(O)) - to_chat(O, "Your fangs have disappeared!") + to_chat(O, span_warning("Your fangs have disappeared!")) return if(blood_to_take > BLOOD_SUCK_BASE && (!(O.pulling == H) || O.grab_state < GRAB_NECK))//smooth movement from aggressive suck to normal suck blood_to_take = BLOOD_SUCK_BASE - to_chat(O, "You lose your grip on [H], reducing your bloodsucking speed.") + to_chat(O, span_warning("You lose your grip on [H], reducing your bloodsucking speed.")) if(blood_to_take == BLOOD_SUCK_BASE && (O.pulling == H && O.grab_state >= GRAB_NECK))//smooth movement from normal suck to aggressive suck blood_to_take *= 1.5 - to_chat(O, "Your enchanced grip on [H] allows you to extract blood faster.") + to_chat(O, span_warning("Your enchanced grip on [H] allows you to extract blood faster.")) if(silent && O.pulling == H) //smooth movement from stealth suck to normal suck silent = FALSE blood_to_take = BLOOD_SUCK_BASE - O.visible_message("[O] grabs [H]'s neck harshly and sinks in their fangs!", "You sink your fangs into [H] and begin to drain their blood.", "You hear a soft puncture and a wet sucking noise.") + O.visible_message(span_danger("[O] grabs [H]'s neck harshly and sinks in their fangs!"), span_danger("You sink your fangs into [H] and begin to drain their blood."), span_notice("You hear a soft puncture and a wet sucking noise.")) playsound(O.loc, 'sound/weapons/bite.ogg', 50, 1) old_bloodtotal = total_blood old_bloodusable = usable_blood if(!H.blood_volume) - to_chat(O, "They've got no blood left to give.") + to_chat(O, span_warning("They've got no blood left to give.")) break blood_coeff = 0.8 //20 blood gain at base for living, 30 with aggressive grab, 10 with stealth if(H.stat == DEAD) @@ -290,17 +290,17 @@ to_chat(O, "You have accumulated [total_blood] [total_blood > 1 ? "units" : "unit"] of blood[usable_blood != old_bloodusable ? ", and have [usable_blood] left to use" : ""].") H.blood_volume = max(H.blood_volume - blood_to_take, 0) if(silent && !warned && (H.blood_volume <= (BLOOD_VOLUME_SAFE(H) + 20))) - to_chat(O, "Their blood is at a dangerously low level, they will likely begin to feel the effects if you continue...") + to_chat(O, span_boldwarning("Their blood is at a dangerously low level, they will likely begin to feel the effects if you continue...")) warned = TRUE if(ishuman(O)) O.nutrition = min(O.nutrition + (blood * 0.5), NUTRITION_LEVEL_WELL_FED) if(!silent) playsound(O.loc, 'sound/items/eatfood.ogg', 40, 1, extrarange = -4)//have to be within 3 tiles to hear the sucking else if(H.get_blood_state() <= BLOOD_OKAY) - to_chat(H, "You feel oddly faint...") + to_chat(H, span_warning("You feel oddly faint...")) draining = null - to_chat(owner, "You stop draining [H.name] of blood.") + to_chat(owner, span_notice("You stop draining [H.name] of blood.")) /datum/antagonist/vampire/proc/force_add_ability(path) var/spell = new path(owner) @@ -346,10 +346,10 @@ if(!(p in old_powers)) if(istype(p, /obj/effect/proc_holder/spell)) var/obj/effect/proc_holder/spell/power = p - to_chat(owner.current, "[power.gain_desc]") + to_chat(owner.current, span_notice("[power.gain_desc]")) else if(istype(p, /datum/vampire_passive)) var/datum/vampire_passive/power = p - to_chat(owner, "[power.gain_desc]") + to_chat(owner, span_notice("[power.gain_desc]")) /datum/antagonist/vampire/proc/handle_vampire_cloak() if(!ishuman(owner.current)) @@ -393,10 +393,10 @@ result += objectives_text if(vampwin) - result += "The vampire was successful!" + result += span_greentext("The vampire was successful!") SSachievements.unlock_achievement(/datum/achievement/greentext/vampire, owner.current.client) else - result += "The vampire has failed!" + result += span_redtext("The vampire has failed!") SEND_SOUND(owner.current, 'sound/ambience/ambifailure.ogg') return result.Join("
") diff --git a/yogstation/code/datums/components/crawl.dm b/yogstation/code/datums/components/crawl.dm index c33de2fff6d9..a15a6aca0513 100644 --- a/yogstation/code/datums/components/crawl.dm +++ b/yogstation/code/datums/components/crawl.dm @@ -22,8 +22,8 @@ var/list/crawling_types //the types of objects we use to get in and out of crawling var/obj/effect/dummy/crawling/holder - var/gain_message = "Make an issue on github stating what you were doing when this message appeared!" - var/loss_message = "Make an issue on github stating what you were doing when this message appeared!" + var/gain_message = span_notice("Make an issue on github stating what you were doing when this message appeared!") + var/loss_message = span_notice("Make an issue on github stating what you were doing when this message appeared!") /datum/component/crawl/Initialize() if(!istype(parent, /mob/living)) @@ -85,8 +85,8 @@ ////////////BLOODCRAWL /datum/component/crawl/blood crawling_types = list(/obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/xenoblood, /obj/effect/decal/cleanable/trail_holder) - gain_message = "You can now bloodcrawl! Alt-click blood or gibs to phase in and out." - loss_message = "You can no longer bloodcrawl." + gain_message = span_boldnotice("You can now bloodcrawl! Alt-click blood or gibs to phase in and out.") + loss_message = span_warning("You can no longer bloodcrawl.") var/kidnap = FALSE var/speed_boost = FALSE @@ -100,7 +100,7 @@ return ..() var/mob/living/carbon/C = user for(var/obj/item/I in C.held_items) - to_chat(C, "You may not hold items while blood crawling!") + to_chat(C, span_warning("You may not hold items while blood crawling!")) return FALSE return ..() @@ -116,7 +116,7 @@ C.regenerate_icons() C.ExtinguishMob() var/pullee = user.pulling - user.visible_message("[user] sinks into the pool of blood!") + user.visible_message(span_warning("[user] sinks into the pool of blood!")) playsound(get_turf(target), 'sound/magic/enter_blood.ogg', 100, 1, -1) ..() @@ -124,22 +124,22 @@ return var/mob/living/victim = pullee if(victim.stat == CONSCIOUS) - target.visible_message("[victim] kicks free of the blood pool just before entering it!", null, "You hear splashing and struggling.") + target.visible_message(span_warning("[victim] kicks free of the blood pool just before entering it!"), null, span_notice("You hear splashing and struggling.")) return if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/demonsblood)) - target.visible_message("Something prevents [victim] from entering the pool!", null, "You hear a splash and a thud.") + target.visible_message(span_warning("Something prevents [victim] from entering the pool!"), null, span_notice("You hear a splash and a thud.")) to_chat(user, "Some strange force is preventing you from pulling [victim] in!") return victim.emote("scream") victim.forceMove(user) - target.visible_message("[user] drags [victim] into the pool of blood!", null, "You hear a splash.") + target.visible_message("[user] drags [victim] into the pool of blood!", null, span_notice("You hear a splash.")) user.notransform = TRUE devour(victim, user, target) user.notransform = FALSE /datum/component/crawl/blood/stop_crawling(atom/target, mob/living/user) - target.visible_message("[target] starts to bubble...") + target.visible_message(span_warning("[target] starts to bubble...")) if(!do_after(user, 20, target = target)) return if(!target) @@ -158,7 +158,7 @@ addtimer(VARSET_CALLBACK(SA, speed, 1), 6 SECONDS) /datum/component/crawl/blood/proc/devour(mob/living/victim, mob/living/user, atom/target) - to_chat(user, "You begin to feast on [victim]. You can not move while you are doing this.") + to_chat(user, span_danger("You begin to feast on [victim]. You can not move while you are doing this.")) var/sound if(istype(user, /mob/living/simple_animal/slaughter)) var/mob/living/simple_animal/slaughter/SD = user @@ -169,7 +169,7 @@ playsound(get_turf(user), sound, 100, 1) sleep(30) if(!victim) - to_chat(user, "You happily devour... nothing? Your meal vanished at some point!") + to_chat(user, span_danger("You happily devour... nothing? Your meal vanished at some point!")) return if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/devilskiss)) @@ -178,15 +178,15 @@ if(target) victim.forceMove(get_turf(target)) - victim.visible_message("[target] violently expels [victim]!") + victim.visible_message(span_warning("[target] violently expels [victim]!")) else // 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!")) exit_blood_effect(target, victim) return - to_chat(user, "You devour [victim]. Your health is fully restored.") + to_chat(user, span_danger("You devour [victim]. Your health is fully restored.")) user.revive(full_heal = 1) victim.adjustBruteLoss(1000) @@ -219,8 +219,8 @@ ////////////LOCKERCRAWL /datum/component/crawl/locker crawling_types = list(/obj/structure/closet) - gain_message = "You can now lockercrawl! Alt-click a locker you are inside of to phase out, alt-click a closed locker to phase in." - loss_message = "You can no longer lockercrawl." + gain_message = span_boldnotice("You can now lockercrawl! Alt-click a locker you are inside of to phase out, alt-click a closed locker to phase in.") + loss_message = span_warning("You can no longer lockercrawl.") /datum/component/crawl/locker/can_start_crawling(atom/target, mob/living/user) if(!(user in target.contents)) @@ -228,7 +228,7 @@ return FALSE var/obj/structure/closet/C = target if(C.opened) - to_chat(user, "Close the locker first!") + to_chat(user, span_warning("Close the locker first!")) return FALSE if(user.notransform) return FALSE @@ -242,18 +242,18 @@ for(var/mob/living/L in C) mobs++ if(mobs >= C.mob_storage_capacity) - to_chat(user, "This locker is full!") + to_chat(user, span_warning("This locker is full!")) return FALSE return ..() /datum/component/crawl/locker/start_crawling(atom/target, mob/living/user) - to_chat(user, "You close your eyes, plug your ears and start counting to three...") + to_chat(user, span_notice("You close your eyes, plug your ears and start counting to three...")) target.visible_message("[target] starts shaking uncontrollably!You open your eyes and find yourself in the locker dimension.") + to_chat(user, span_notice("You open your eyes and find yourself in the locker dimension.")) user.reset_perspective() user.clear_fullscreen("remote_view") @@ -265,7 +265,7 @@ user.forceMove(target) qdel(holder) holder = null - to_chat(user, "You are back in the material plane.") + to_chat(user, span_notice("You are back in the material plane.")) user.reset_perspective() /datum/component/crawl/meme @@ -275,17 +275,17 @@ /datum/component/crawl/meme/Initialize() if(!crawl_name) crawl_name = thing - gain_message = "You can now [crawl_name]! Alt-click on [thing] to phase in and out." - loss_message = "You can no longer [crawl_name]." + gain_message = span_boldnotice("You can now [crawl_name]! Alt-click on [thing] to phase in and out.") + loss_message = span_warning("You can no longer [crawl_name].") ..() /datum/component/crawl/meme/start_crawling(atom/target, mob/living/user) - target.visible_message("[user] disappears into [target]!") + target.visible_message(span_warning("[user] disappears into [target]!")) playsound(get_turf(target), 'sound/magic/enter_blood.ogg', 100, 1, -1) ..() /datum/component/crawl/meme/stop_crawling(atom/target, mob/living/user) - target.visible_message("[user] rises from [target]!") + target.visible_message(span_warning("[user] rises from [target]!")) playsound(get_turf(target), 'sound/magic/exit_blood.ogg', 100, 1, -1) ..() @@ -333,15 +333,15 @@ /datum/component/crawl/vomit //ABSOLUTELY DISGUSIN var/obj/effect/decal/cleanable/enteredvomit crawling_types = list(/obj/effect/decal/cleanable/vomit,/obj/effect/decal/cleanable/insectguts) - gain_message = "You can now vomitcrawl! Alt-click pools of vomit to phase in and out." - loss_message = "You can no longer vomitcrawl." + gain_message = span_boldnotice("You can now vomitcrawl! Alt-click pools of vomit to phase in and out.") + loss_message = span_warning("You can no longer vomitcrawl.") /datum/component/crawl/vomit/can_start_crawling(atom/target, mob/living/user) if(!iscarbon(user)) return ..() var/mob/living/carbon/C = user for(var/obj/item/I in C.held_items) - to_chat(C, "You may not hold items while vomit crawling!") + to_chat(C, span_warning("You may not hold items while vomit crawling!")) return FALSE return ..() @@ -358,7 +358,7 @@ C.ExtinguishMob() enteredvomit = target RegisterSignal(target, COMSIG_PARENT_PREQDELETED, .proc/throw_out) - user.visible_message("[user] sinks into the pool of vomit!?") + user.visible_message(span_warning("[user] sinks into the pool of vomit!?")) playsound(get_turf(target), 'sound/magic/mutate.ogg', 50, 1, -1) ..() @@ -374,7 +374,7 @@ addtimer(CALLBACK(user, /atom/.proc/remove_atom_colour, TEMPORARY_COLOUR_PRIORITY, newcolor), 10 SECONDS) //vomit doesn't wash off as easily as blood /datum/component/crawl/vomit/stop_crawling(atom/target, mob/living/user) - target.visible_message("[target] starts to bubble...?") + target.visible_message(span_warning("[target] starts to bubble...?")) if(!do_after(user, 20, target = target)) return if(!target) diff --git a/yogstation/code/datums/components/radioactive.dm b/yogstation/code/datums/components/radioactive.dm index 7d8a8cd4bffc..e3d444094f2b 100644 --- a/yogstation/code/datums/components/radioactive.dm +++ b/yogstation/code/datums/components/radioactive.dm @@ -14,9 +14,9 @@ if(RAD_AMOUNT_MEDIUM to RAD_AMOUNT_HIGH) to_chat(user, "[master] seems to be glowing a bit.") if(RAD_AMOUNT_HIGH to RAD_AMOUNT_EXTREME) //At this level the object can contaminate other objects - to_chat(user, "[master] hurts to look at.") + to_chat(user, span_warning("[master] hurts to look at.")) if(RAD_AMOUNT_EXTREME to INFINITY) - to_chat(user, "[master] burns to look at!") + to_chat(user, span_warning("[master] burns to look at!")) #undef RAD_AMOUNT_LOW #undef RAD_AMOUNT_MEDIUM diff --git a/yogstation/code/datums/components/randomcrits.dm b/yogstation/code/datums/components/randomcrits.dm index 90ad323915b2..5a47e2a0ca2a 100644 --- a/yogstation/code/datums/components/randomcrits.dm +++ b/yogstation/code/datums/components/randomcrits.dm @@ -17,7 +17,7 @@ /datum/component/randomcrits/proc/on_attack(datum/source, mob/living/target, mob/user) if(prob(crit_rate)) target.apply_damage(crit_damage, BRUTE, user.zone_selected, 0) - user.visible_message("[user]'s [parent] scores a random crit!!") + user.visible_message(span_danger("[user]'s [parent] scores a random crit!!")) playsound(src, 'sound/effects/bang.ogg', 100, 0) if(!target.stat && target.ckey) crit_rate += crit_rate_increase diff --git a/yogstation/code/datums/components/storage/storage.dm b/yogstation/code/datums/components/storage/storage.dm index ffb910fb38b6..2622cd7d45cb 100644 --- a/yogstation/code/datums/components/storage/storage.dm +++ b/yogstation/code/datums/components/storage/storage.dm @@ -76,12 +76,12 @@ return var/turf/loccheck = get_turf(A) if(is_reebe(loccheck.z)) - user.visible_message("An unseen force knocks [user] to the ground!", "\"I think not!\"") + user.visible_message(span_warning("An unseen force knocks [user] to the ground!"), "\"I think not!\"") user.Paralyze(60) return if(istype(loccheck.loc, /area/fabric_of_reality)) - to_chat(user, "You can't do that here!") - to_chat(user, "The Bluespace interfaces of the two devices catastrophically malfunction!") + to_chat(user, span_danger("You can't do that here!")) + to_chat(user, span_danger("The Bluespace interfaces of the two devices catastrophically malfunction!")) qdel(W) playsound(loccheck,'sound/effects/supermatter.ogg', 200, 1) @@ -100,7 +100,7 @@ var/mob/living/M = AT M.take_overall_damage(85) if(M.movement_type & FLYING) - M.visible_message("The bluespace collapse crushes the air towards it, pulling [M] towards the ground...") + M.visible_message(span_danger("The bluespace collapse crushes the air towards it, pulling [M] towards the ground...")) M.Paralyze(5, TRUE, TRUE) //Overrides stun absorbs. T.TerraformTurf(/turf/open/chasm/magic, /turf/open/chasm/magic) for(var/fabricarea in get_areas(/area/fabric_of_reality)) diff --git a/yogstation/code/datums/components/uplink.dm b/yogstation/code/datums/components/uplink.dm index af264d0ece29..dbc14394ff49 100644 --- a/yogstation/code/datums/components/uplink.dm +++ b/yogstation/code/datums/components/uplink.dm @@ -18,4 +18,4 @@ if(canBuy) return ..() - to_chat(user, "The Syndicate lacks resources to provide you with this item.") + to_chat(user, span_warning("The Syndicate lacks resources to provide you with this item.")) diff --git a/yogstation/code/datums/components/walks.dm b/yogstation/code/datums/components/walks.dm index 4faaa6d921da..9998f1da1acd 100644 --- a/yogstation/code/datums/components/walks.dm +++ b/yogstation/code/datums/components/walks.dm @@ -77,17 +77,17 @@ /datum/component/walk/jaunt/can_walk(mob/living/user, turf/destination) for(var/obj/effect/decal/cleanable/food/salt/S in destination) - to_chat(user, "[S] bars your passage!") + to_chat(user, span_warning("[S] bars your passage!")) if(isrevenant(user)) var/mob/living/simple_animal/revenant/R = user R.reveal(20) R.stun(20) return MOVE_NOT_ALLOWED if(destination.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 MOVE_NOT_ALLOWED if (locate(/obj/effect/blessing, destination)) - to_chat(user, "Holy energies block your path!") + to_chat(user, span_warning("Holy energies block your path!")) return MOVE_NOT_ALLOWED return MOVE_ALLOWED diff --git a/yogstation/code/datums/diseases/advance/symptoms/confusion.dm b/yogstation/code/datums/diseases/advance/symptoms/confusion.dm index 075d46e5d20c..1f32dd16e21c 100644 --- a/yogstation/code/datums/diseases/advance/symptoms/confusion.dm +++ b/yogstation/code/datums/diseases/advance/symptoms/confusion.dm @@ -37,7 +37,7 @@ var/mob/living/carbon/M = A.affected_mob if(A.stage < 5) if(prob(base_message_chance) && !suppress_warning) - to_chat(M, "[pick("You feel better.")]") + to_chat(M, span_notice("[pick("You feel better.")]")) else ADD_TRAIT(M, TRAIT_SURGERY_PREPARED, DISEASE_TRAIT) M.AdjustStun(stun_reduce, 0) diff --git a/yogstation/code/datums/diseases/advance/symptoms/heal.dm b/yogstation/code/datums/diseases/advance/symptoms/heal.dm index 58c9ca238e56..e77b56c58a11 100644 --- a/yogstation/code/datums/diseases/advance/symptoms/heal.dm +++ b/yogstation/code/datums/diseases/advance/symptoms/heal.dm @@ -6,7 +6,7 @@ stage_speed = 2 transmittable = -2 level = 6 - passive_message = "You feel tough." + passive_message = span_notice("You feel tough.") var/toxin_damage = FALSE var/hunger_reduction = 8 threshold_descs = list( @@ -53,15 +53,15 @@ if(M.nutrition <= NUTRITION_LEVEL_STARVING && !toxin_damage) M.blood_volume -= 10 if(prob(45)) - to_chat(M, "You feel like you are wasting away!") + to_chat(M, span_warning("You feel like you are wasting away!")) else if(M.nutrition <= NUTRITION_LEVEL_STARVING && toxin_damage) M.adjustToxLoss(2) if(prob(45)) - to_chat(M, "You dont feel so well.") + to_chat(M, span_warning("You dont feel so well.")) if(prob(25)) - to_chat(M, "You feel your wounds getting warm.") + to_chat(M, span_notice("You feel your wounds getting warm.")) for(var/obj/item/bodypart/L in parts) if(L.heal_damage(heal_amt/parts.len, heal_amt/parts.len)) diff --git a/yogstation/code/datums/diseases/cluwnification.dm b/yogstation/code/datums/diseases/cluwnification.dm index 8a02253d4736..9949bb4f3285 100644 --- a/yogstation/code/datums/diseases/cluwnification.dm +++ b/yogstation/code/datums/diseases/cluwnification.dm @@ -16,45 +16,45 @@ switch(stage) if(1) if(prob(2)) - to_chat(affected_mob, "You feel a little silly.") + to_chat(affected_mob, span_danger("You feel a little silly.")) if(prob(2)) - to_chat(affected_mob, "Your head feels funny.") + to_chat(affected_mob, span_danger("Your head feels funny.")) if(2) if(prob(2)) - to_chat(affected_mob, "You hear honking.") + to_chat(affected_mob, span_danger("You hear honking.")) playsound(affected_mob, 'sound/items/bikehorn.ogg', 30, FALSE) if(prob(2)) - to_chat(affected_mob, "Your head starts to spin.") + to_chat(affected_mob, span_danger("Your head starts to spin.")) affected_mob.confused += 5 if(3) if(prob(5)) - to_chat(affected_mob, "Your mind starts to slip.") + to_chat(affected_mob, span_danger("Your mind starts to slip.")) affected_mob.set_drugginess(5) if(prob(2)) - to_chat(affected_mob, "Your can feel your brain startng to break down.") + to_chat(affected_mob, span_danger("Your can feel your brain startng to break down.")) affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3) affected_mob.updatehealth() if(prob(5)) - to_chat(affected_mob, "Your head starts to spin.") + to_chat(affected_mob, span_danger("Your head starts to spin.")) affected_mob.confused += 5 if(4) if(prob(10)) - to_chat(affected_mob, "OH GOD THE HONKING!!") + to_chat(affected_mob, span_danger("OH GOD THE HONKING!!")) playsound(affected_mob, 'sound/items/bikehorn.ogg', 50, FALSE) if(prob(10)) - to_chat(affected_mob, "Your brain feels like its being ripped apart.") + to_chat(affected_mob, span_danger("Your brain feels like its being ripped apart.")) affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10) affected_mob.updatehealth() if(prob(15)) affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) ) if(prob(10)) - to_chat(affected_mob, "You fail to form any kind of coherent thought") + to_chat(affected_mob, span_danger("You fail to form any kind of coherent thought")) affected_mob.set_drugginess(10) affected_mob.confused += 10 if(5) if(prob(30)) if (!(affected_mob.dna.check_mutation(CLUWNEMUT))) - to_chat(affected_mob, "IT HURTS!!") + to_chat(affected_mob, span_userdanger("IT HURTS!!")) var/mob/living/carbon/human/H = affected_mob H.cluwneify() \ No newline at end of file diff --git a/yogstation/code/datums/mind.dm b/yogstation/code/datums/mind.dm index 3f321af2a715..c1b5315ced06 100644 --- a/yogstation/code/datums/mind.dm +++ b/yogstation/code/datums/mind.dm @@ -30,7 +30,7 @@ log_admin("[key_name(usr)] has vampired [current].") add_vampire(current) else - to_chat(usr, "[current] is already a vampire!") + to_chat(usr, span_warning("[current] is already a vampire!")) if("full") message_admins("[key_name_admin(usr)] has full-vampired [current].") log_admin("[key_name(usr)] has full-vampired [current].") diff --git a/yogstation/code/datums/mutations.dm b/yogstation/code/datums/mutations.dm index 5e00af0f74ae..ef3dabd9fc04 100644 --- a/yogstation/code/datums/mutations.dm +++ b/yogstation/code/datums/mutations.dm @@ -3,7 +3,7 @@ name = "Cluwne" quality = NEGATIVE locked = TRUE - text_gain_indication = "You feel like your brain is tearing itself apart." + text_gain_indication = span_danger("You feel like your brain is tearing itself apart.") /datum/mutation/human/cluwne/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -52,8 +52,8 @@ dna.add_mutation(CLUWNEMUT) emote("scream") regenerate_icons() - visible_message("[src]'s body glows green, the glow dissipating only to leave behind a cluwne formerly known as [src]!", \ - "Your brain feels like it's being torn apart, and after a short while, you notice that you've become a cluwne!") + visible_message(span_danger("[src]'s body glows green, the glow dissipating only to leave behind a cluwne formerly known as [src]!"), \ + span_danger("Your brain feels like it's being torn apart, and after a short while, you notice that you've become a cluwne!")) flash_act() /datum/mutation/human/tourettes/on_life() diff --git a/yogstation/code/datums/mutations/alcohol.dm b/yogstation/code/datums/mutations/alcohol.dm index 9fc6ced86ea8..304048639660 100644 --- a/yogstation/code/datums/mutations/alcohol.dm +++ b/yogstation/code/datums/mutations/alcohol.dm @@ -2,8 +2,8 @@ name = "Alcohol Tolerance" desc = "A hyperactive liver improves the patient's ability to metabolize alcohol." quality = POSITIVE - text_gain_indication = "Your liver hurts." - text_lose_indication = "Your liver feels sad." + text_gain_indication = span_danger("Your liver hurts.") + text_lose_indication = span_danger("Your liver feels sad.") /datum/mutation/human/alcohol_tolerance/on_acquiring(mob/living/carbon/human/owner) if(..()) @@ -19,8 +19,8 @@ name = "Auto-brewery Syndrome" desc = "The patient's body now naturally produces alcohol into their bloodstream." quality = MINOR_NEGATIVE - text_gain_indication = "Your liver feels amazing." - text_lose_indication = "Your liver feels sad." + text_gain_indication = span_danger("Your liver feels amazing.") + text_lose_indication = span_danger("Your liver feels sad.") /datum/mutation/human/alcohol_generate/on_life() if(prob(15)) diff --git a/yogstation/code/datums/mutations/extendoarm.dm b/yogstation/code/datums/mutations/extendoarm.dm index 708c155f86a4..ab7086291cc7 100644 --- a/yogstation/code/datums/mutations/extendoarm.dm +++ b/yogstation/code/datums/mutations/extendoarm.dm @@ -3,8 +3,8 @@ desc = "Allows the affected to stretch their arms to grab objects from a distance." quality = POSITIVE difficulty = 16 - text_gain_indication = "Your arms feel stretchy." - text_lose_indication = "Your arms feel solid again." + text_gain_indication = span_notice("Your arms feel stretchy.") + text_lose_indication = span_warning("Your arms feel solid again.") power = /obj/effect/proc_holder/spell/aimed/extendoarm instability = 30 diff --git a/yogstation/code/game/gamemodes/changeling/powers/abomination_powers.dm b/yogstation/code/game/gamemodes/changeling/powers/abomination_powers.dm index f3fadb0fe8b4..8380e2c0ffca 100644 --- a/yogstation/code/game/gamemodes/changeling/powers/abomination_powers.dm +++ b/yogstation/code/game/gamemodes/changeling/powers/abomination_powers.dm @@ -21,7 +21,7 @@ var/distance = max(1,get_dist(usr,H)) if(istype(H.ears, /obj/item/clothing/ears/earmuffs))//only the true power of earmuffs may block the power of the screech continue - to_chat(M, "You freeze in terror, your blood turning cold from the sound of the scream!") + to_chat(M, span_userdanger("You freeze in terror, your blood turning cold from the sound of the scream!")) M.Stun(max(7/distance, 1)) for(var/mob/living/silicon/M in T.contents) M.Paralyze(10) diff --git a/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm b/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm index 135f7b3873b1..dd4fae9ffdef 100644 --- a/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm +++ b/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm @@ -114,7 +114,7 @@ if(!istype(mind)) return FALSE if(HAS_TRAIT(src, TRAIT_MINDSHIELD)) - src.visible_message("[src] seems to resist an unseen force!") + src.visible_message(span_warning("[src] seems to resist an unseen force!")) to_chat(src, "Your mind goes numb. Your thoughts go blank. You feel utterly empty. \n\ A mind brushes against your own. You dream.\n\ Of a vast, empty Void in the deep of space.\n\ diff --git a/yogstation/code/game/gamemodes/darkspawn/veil.dm b/yogstation/code/game/gamemodes/darkspawn/veil.dm index 1650786aa23b..66b3aaff8698 100644 --- a/yogstation/code/game/gamemodes/darkspawn/veil.dm +++ b/yogstation/code/game/gamemodes/darkspawn/veil.dm @@ -21,11 +21,11 @@ owner.special_role = null var/mob/living/M = owner.current if(issilicon(M)) - M.audible_message("[M] lets out a short blip, followed by a low-pitched beep.") - to_chat(M,"You have been turned into a[ iscyborg(M) ? " cyborg" : "n AI" ]! You are no longer a thrall! Though you try, you cannot remember anything about your servitude...") + M.audible_message(span_notice("[M] lets out a short blip, followed by a low-pitched beep.")) + to_chat(M,span_userdanger("You have been turned into a[ iscyborg(M) ? " cyborg" : "n AI" ]! You are no longer a thrall! Though you try, you cannot remember anything about your servitude...")) else - M.visible_message("[M] looks like their mind is their own again!") - to_chat(M,"A piercing white light floods your eyes. Your mind is your own again! Though you try, you cannot remember anything about the darkspawn or your time under their command...") + M.visible_message(span_big("[M] looks like their mind is their own again!")) + to_chat(M,span_userdanger("A piercing white light floods your eyes. Your mind is your own again! Though you try, you cannot remember anything about the darkspawn or your time under their command...")) M.update_sight() return ..() diff --git a/yogstation/code/game/gamemodes/gangs/dominator.dm b/yogstation/code/game/gamemodes/gangs/dominator.dm index c15d7ca65857..708d6ac688d3 100644 --- a/yogstation/code/game/gamemodes/gangs/dominator.dm +++ b/yogstation/code/game/gamemodes/gangs/dominator.dm @@ -77,14 +77,14 @@ if(gang && gang.domination_time != NOT_DOMINATING) if(gang.domination_time > world.time) - . += "Hostile Takeover in progress. Estimated [gang.domination_time_remaining()] seconds remain." + . += span_notice("Hostile Takeover in progress. Estimated [gang.domination_time_remaining()] seconds remain.") else - . += "Hostile Takeover of [station_name()] successful. Have a great day." + . += span_notice("Hostile Takeover of [station_name()] successful. Have a great day.") else - . += "System on standby." + . += span_notice("System on standby.") if(nukedisk) - . += "[nukedisk] seems to be stuck inside." - . += "System Integrity: [round((obj_integrity/max_integrity)*100,1)]%" + . += span_notice("[nukedisk] seems to be stuck inside.") + . += span_danger("System Integrity: [round((obj_integrity/max_integrity)*100,1)]%") /obj/machinery/dominator/process() ..() @@ -170,15 +170,15 @@ return if(tempgang.domination_time != NOT_DOMINATING) - to_chat(user, "Error: Hostile Takeover is already in progress.") + to_chat(user, span_warning("Error: Hostile Takeover is already in progress.")) return if(!tempgang.dom_attempts) - to_chat(user, "Error: Unable to breach station network. Firewall has logged our signature and is blocking all further attempts.") + to_chat(user, span_warning("Error: Unable to breach station network. Firewall has logged our signature and is blocking all further attempts.")) return if(!nukedisk) - to_chat(user, "Error: Nuclear Authentication Disk required to breach station network.") + to_chat(user, span_warning("Error: Nuclear Authentication Disk required to breach station network.")) return var/time = round(tempgang.determine_domination_time()/60,0.1) diff --git a/yogstation/code/game/gamemodes/gangs/gang_items.dm b/yogstation/code/game/gamemodes/gangs/gang_items.dm index dff491a5acf0..ad17d929e40d 100644 --- a/yogstation/code/game/gamemodes/gangs/gang_items.dm +++ b/yogstation/code/game/gamemodes/gangs/gang_items.dm @@ -15,7 +15,7 @@ var/real_cost = get_cost(user, gang, gangtool) if(!spawn_item(user, gang, gangtool)) gang.adjust_influence(-real_cost) - to_chat(user, "You bought \the [name].") + to_chat(user, span_notice("You bought \the [name].")) return TRUE /datum/gang_item/proc/weapon_purchase(mob/living/carbon/user, datum/team/gang/gang, obj/item/gangtool/gangtool, check_canbuy_weapon = TRUE) @@ -24,7 +24,7 @@ var/actual_cost = get_weapon_cost(user, gang, gangtool) if(!spawn_item(user, gang, gangtool)) gang.adjust_uniform_influence(-actual_cost) - to_chat(user, "You bought \the [name].") + to_chat(user, span_notice("You bought \the [name].")) return TRUE /datum/gang_item/proc/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/gangtool/gangtool) // If this returns anything other than null, something fucked up and influence won't lower. @@ -385,7 +385,7 @@ return FALSE for(var/obj/obj in get_turf(user)) if(obj.density) - to_chat(user, "There's not enough room here!") + to_chat(user, span_warning("There's not enough room here!")) return FALSE return ..() diff --git a/yogstation/code/game/gamemodes/gangs/gang_pen.dm b/yogstation/code/game/gamemodes/gangs/gang_pen.dm index e6f62b8d696e..3a3cdb828a99 100644 --- a/yogstation/code/game/gamemodes/gangs/gang_pen.dm +++ b/yogstation/code/game/gamemodes/gangs/gang_pen.dm @@ -15,10 +15,10 @@ if(!..()) return if(cooldown) - to_chat(user, "[src] needs more time to recharge before it can be used.") + to_chat(user, span_warning("[src] needs more time to recharge before it can be used.")) return if(!M.client || !M.mind) - to_chat(user, "A braindead gangster is an useless gangster!") + to_chat(user, span_warning("A braindead gangster is an useless gangster!")) return var/datum/team/gang/gang = L.gang if(!add_gangster(user, gang, M.mind)) @@ -33,18 +33,18 @@ icon_state = "pen" var/mob/M = loc if(istype(M)) - to_chat(M, "[icon2html(src, M)] [src] vibrates softly. It is ready to be used again.") + to_chat(M, span_notice("[icon2html(src, M)] [src] vibrates softly. It is ready to be used again.")) /obj/item/pen/gang/proc/add_gangster(mob/user, datum/team/gang/gang, datum/mind/gangster_mind, check = TRUE) // Basically a wrapper to add_antag_datum. var/datum/antagonist/dudegang = gangster_mind.has_antag_datum(/datum/antagonist/gang) if(dudegang) if(dudegang == gang) - to_chat(user, "This mind is already controlled by your gang!") + to_chat(user, span_danger("This mind is already controlled by your gang!")) return - to_chat(user, "This mind is already controlled by someone else!") + to_chat(user, span_danger("This mind is already controlled by someone else!")) return if(check && HAS_TRAIT(gangster_mind.current, TRAIT_MINDSHIELD)) //Check to see if the potential gangster is implanted - to_chat(user, "This mind is too strong to control!") + to_chat(user, span_danger("This mind is too strong to control!")) return var/mob/living/carbon/human/H = gangster_mind.current // we are sure the dude's human cause it's checked in attack() H.silent = max(H.silent, 5) diff --git a/yogstation/code/game/gamemodes/gangs/gangtool.dm b/yogstation/code/game/gamemodes/gangs/gangtool.dm index 748c8f60ed1c..e9d1b5ccf229 100644 --- a/yogstation/code/game/gamemodes/gangs/gangtool.dm +++ b/yogstation/code/game/gamemodes/gangs/gangtool.dm @@ -152,7 +152,7 @@ if(!message || !can_use(user)) return if(!is_station_level(user.z)) - to_chat(user, "[icon2html(src, user)]Error: Station out of range.") + to_chat(user, span_info("[icon2html(src, user)]Error: Station out of range.")) return if(gang.members.len) var/datum/antagonist/gang/G = user.mind.has_antag_datum(/datum/antagonist/gang) @@ -182,23 +182,23 @@ to_chat(user, "The Gangtool you registered will allow you to purchase weapons and equipment, and send messages to your gang.") to_chat(user, "Unlike regular gangsters, you may use recruitment pens to add recruits to your gang. Use them on unsuspecting crew members to recruit them. Don't forget to get your one free pen from the gangtool.") else - to_chat(user, "ACCESS DENIED: Unauthorized user.") + to_chat(user, span_warning("ACCESS DENIED: Unauthorized user.")) /obj/item/gangtool/proc/recall(mob/user) if(!recallchecks(user)) return if(recalling) - to_chat(user, "Error: Recall already in progress.") + to_chat(user, span_warning("Error: Recall already in progress.")) return gang.message_gangtools("[user] is attempting to recall the emergency shuttle.") recalling = TRUE - to_chat(user, "[icon2html(src, loc)]Generating shuttle recall order with codes retrieved from last call signal...") + to_chat(user, span_info("[icon2html(src, loc)]Generating shuttle recall order with codes retrieved from last call signal...")) addtimer(CALLBACK(src, .proc/recall2, user), rand(100,300)) /obj/item/gangtool/proc/recall2(mob/user) if(!recallchecks(user)) return - to_chat(user, "[icon2html(src, loc)]Shuttle recall order generated. Accessing station long-range communication arrays...") + to_chat(user, span_info("[icon2html(src, loc)]Shuttle recall order generated. Accessing station long-range communication arrays...")) addtimer(CALLBACK(src, .proc/recall3, user), rand(100,300)) /obj/item/gangtool/proc/recall3(mob/user) @@ -210,10 +210,10 @@ living_crew += Player var/malc = CONFIG_GET(number/midround_antag_life_check) if(living_crew.len / GLOB.joined_player_list.len <= malc) //Shuttle cannot be recalled if too many people died - to_chat(user, "[icon2html(src, user)]Error: Station communication systems compromised. Unable to establish connection.") + to_chat(user, span_warning("[icon2html(src, user)]Error: Station communication systems compromised. Unable to establish connection.")) recalling = FALSE return - to_chat(user, "[icon2html(src, loc)]Comm arrays accessed. Broadcasting recall signal...") + to_chat(user, span_info("[icon2html(src, loc)]Comm arrays accessed. Broadcasting recall signal...")) addtimer(CALLBACK(src, .proc/recallfinal, user), rand(100,300)) /obj/item/gangtool/proc/recallfinal(mob/user) @@ -226,7 +226,7 @@ gang.recalls-- return TRUE - to_chat(user, "[icon2html(src, loc)]No response recieved. Emergency shuttle cannot be recalled at this time.") + to_chat(user, span_info("[icon2html(src, loc)]No response recieved. Emergency shuttle cannot be recalled at this time.")) return /obj/item/gangtool/proc/recallchecks(mob/user) @@ -235,18 +235,18 @@ if(SSshuttle.emergencyNoRecall) return if(!is_station_level(user.z)) //Shuttle can only be recalled while on station - to_chat(user, "[icon2html(src, user)]Error: Device out of range of station communication arrays.") + to_chat(user, span_warning("[icon2html(src, user)]Error: Device out of range of station communication arrays.")) recalling = FALSE return if(!gang.recalls) - to_chat(user, "Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts.") + to_chat(user, span_warning("Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts.")) return if(SSshuttle.emergency.mode != SHUTTLE_CALL) //Shuttle can only be recalled when it's moving to the station - to_chat(user, "[icon2html(src, user)]Emergency shuttle cannot be recalled at this time.") + to_chat(user, span_warning("[icon2html(src, user)]Emergency shuttle cannot be recalled at this time.")) recalling = FALSE return if(!gang.dom_attempts) - to_chat(user, "[icon2html(src, user)]Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts.") + to_chat(user, span_warning("[icon2html(src, user)]Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts.")) recalling = FALSE return return TRUE @@ -262,10 +262,10 @@ return var/datum/antagonist/gang/G = user.mind.has_antag_datum(/datum/antagonist/gang) if(!G) - to_chat(user, "Huh, what's this?") + to_chat(user, span_notice("Huh, what's this?")) return if(!isnull(gang) && G.gang != gang) - to_chat(user, "You cannot use gang tools owned by enemy gangs!") + to_chat(user, span_danger("You cannot use gang tools owned by enemy gangs!")) return return TRUE diff --git a/yogstation/code/game/gamemodes/shadowling/shadowling.dm b/yogstation/code/game/gamemodes/shadowling/shadowling.dm index a9e0ae63cf6d..b9ba856f00e2 100644 --- a/yogstation/code/game/gamemodes/shadowling/shadowling.dm +++ b/yogstation/code/game/gamemodes/shadowling/shadowling.dm @@ -179,7 +179,7 @@ Made by Xhuis H.take_overall_damage(0, LIGHT_DAMAGE_TAKEN) H.remove_movespeed_modifier(id) if(H.stat != DEAD) - to_chat(H, "The light burns you!") //Message spam to say "GET THE FUCK OUT" + to_chat(H, span_userdanger("The light burns you!")) //Message spam to say "GET THE FUCK OUT" H.playsound_local(get_turf(H), 'sound/weapons/sear.ogg', 150, 1, pressure_affected = FALSE) else if (light_amount < LIGHT_HEAL_THRESHOLD && !istype(H.loc, /obj/effect/dummy/phased_mob/shadowling)) //Can't heal while jaunting H.heal_overall_damage(5,5) @@ -200,7 +200,7 @@ Made by Xhuis if(istype(T) && shadow_charges > 0) var/light_amount = T.get_lumcount() if(light_amount < LIGHT_DAM_THRESHOLD) - H.visible_message("The shadows around [H] ripple as they absorb \the [P]!") + H.visible_message(span_danger("The shadows around [H] ripple as they absorb \the [P]!")) playsound(T, "bullet_miss", 75, 1) shadow_charges = min(shadow_charges - 1, 0) return -1 diff --git a/yogstation/code/game/gamemodes/traitor/double_agents.dm b/yogstation/code/game/gamemodes/traitor/double_agents.dm index 9360f2821e48..a9401a655f68 100644 --- a/yogstation/code/game/gamemodes/traitor/double_agents.dm +++ b/yogstation/code/game/gamemodes/traitor/double_agents.dm @@ -60,7 +60,7 @@ if(uplink_holder && owner.current && ishuman(owner.current)) var/datum/component/uplink/uplink = uplink_holder.GetComponent(/datum/component/uplink) uplink.telecrystals += 5 - to_chat(owner, "You have been given 5 TC as a reward for completing your objective!") + to_chat(owner, span_notice("You have been given 5 TC as a reward for completing your objective!")) owner.announce_objectives() diff --git a/yogstation/code/game/gamemodes/vampire/grave_fever.dm b/yogstation/code/game/gamemodes/vampire/grave_fever.dm index 3a7d1542df84..768b0c102dcb 100644 --- a/yogstation/code/game/gamemodes/vampire/grave_fever.dm +++ b/yogstation/code/game/gamemodes/vampire/grave_fever.dm @@ -22,10 +22,10 @@ if(prob(15)) if(prob(33)) - to_chat(affected_mob, "You feel sickly and weak.") + to_chat(affected_mob, span_danger("You feel sickly and weak.")) affected_mob.adjustToxLoss(toxdamage) if(prob(5)) - to_chat(affected_mob, "Your joints ache horribly!") + to_chat(affected_mob, span_danger("Your joints ache horribly!")) affected_mob.Knockdown(stuntime) affected_mob.Stun(stuntime) diff --git a/yogstation/code/game/gamemodes/vampire/vampire_bat.dm b/yogstation/code/game/gamemodes/vampire/vampire_bat.dm index 128a9944076a..fa264fb92280 100644 --- a/yogstation/code/game/gamemodes/vampire/vampire_bat.dm +++ b/yogstation/code/game/gamemodes/vampire/vampire_bat.dm @@ -49,5 +49,5 @@ mind.transfer_to(controller) controller.status_flags &= ~GODMODE controller.Knockdown(120) - to_chat(controller, "The force of being exiled from your bat form knocks you down!") + to_chat(controller, span_userdanger("The force of being exiled from your bat form knocks you down!")) . = ..() \ No newline at end of file diff --git a/yogstation/code/game/gamemodes/vampire/vampire_bite.dm b/yogstation/code/game/gamemodes/vampire/vampire_bite.dm index 6a18d25beff0..f7c4d2b90d13 100644 --- a/yogstation/code/game/gamemodes/vampire/vampire_bite.dm +++ b/yogstation/code/game/gamemodes/vampire/vampire_bite.dm @@ -3,16 +3,16 @@ return FALSE var/datum/antagonist/vampire/V = M.mind.has_antag_datum(/datum/antagonist/vampire) if((NOBLOOD in dna.species.species_traits) || dna.species.exotic_blood || !blood_volume) - to_chat(M, "They have no blood!") + to_chat(M, span_warning("They have no blood!")) return FALSE if(is_vampire(src)) - to_chat(M, "Your fangs fail to pierce [name]'s cold flesh") + to_chat(M, span_warning("Your fangs fail to pierce [name]'s cold flesh")) return FALSE if(dna.species.name == "skeleton") - to_chat(M, "There is no blood in a skeleton!") + to_chat(M, span_warning("There is no blood in a skeleton!")) return FALSE if(!ckey) - to_chat(M, "[src]'s blood is stale and useless.") + to_chat(M, span_warning("[src]'s blood is stale and useless.")) return FALSE if(V.draining) return FALSE diff --git a/yogstation/code/game/gamemodes/vampire/vampire_other.dm b/yogstation/code/game/gamemodes/vampire/vampire_other.dm index eeeb3ff18a92..19a3e1541330 100644 --- a/yogstation/code/game/gamemodes/vampire/vampire_other.dm +++ b/yogstation/code/game/gamemodes/vampire/vampire_other.dm @@ -46,7 +46,7 @@ /obj/item/storage/book/bible/attack(mob/living/M, mob/living/carbon/human/user, heal_mode = TRUE) . = ..() if(!(user.mind && user.mind.holy_role) && is_vampire(user)) - to_chat(user, "[deity_name] channels through \the [src] and sets you ablaze for your blasphemy!") + to_chat(user, span_danger("[deity_name] channels through \the [src] and sets you ablaze for your blasphemy!")) user.fire_stacks += 5 user.IgniteMob() user.emote("scream", 1) diff --git a/yogstation/code/game/gamemodes/vampire/vampire_powers.dm b/yogstation/code/game/gamemodes/vampire/vampire_powers.dm index f677081edcb0..b2745cbec8fa 100644 --- a/yogstation/code/game/gamemodes/vampire/vampire_powers.dm +++ b/yogstation/code/game/gamemodes/vampire/vampire_powers.dm @@ -11,7 +11,7 @@ if(!V) return FALSE if(V.usable_blood < blood_used) - to_chat(user, "You do not have enough blood to cast this!") + to_chat(user, span_warning("You do not have enough blood to cast this!")) return FALSE . = ..(skipcharge, user) @@ -134,7 +134,7 @@ if(!target) return FALSE if(!ishuman(target)) - to_chat(user, "Gaze will not work on this being.") + to_chat(user, span_warning("Gaze will not work on this being.")) return FALSE var/mob/living/carbon/human/T = target @@ -146,29 +146,29 @@ /obj/effect/proc_holder/spell/pointed/gaze/cast(list/targets, mob/user) var/mob/living/target = targets[1] var/mob/living/carbon/human/T = target - user.visible_message("[user]'s eyes flash red.",\ - "[user]'s eyes flash red.") + user.visible_message(span_warning("[user]'s eyes flash red."),\ + span_warning("[user]'s eyes flash red.")) if(ishuman(target)) var/obj/item/clothing/glasses/G = T.glasses if(G) if(G.flash_protect > 0) - to_chat(user,"[T] has protective sunglasses on!") - to_chat(target, "[user]'s paralyzing gaze is blocked by your [G]!") + to_chat(user,span_warning("[T] has protective sunglasses on!")) + to_chat(target, span_warning("[user]'s paralyzing gaze is blocked by your [G]!")) return var/obj/item/clothing/mask/M = T.wear_mask if(M) if(M.flash_protect > 0) - to_chat(user,"[T]'s mask is covering their eyes!") - to_chat(target,"[user]'s paralyzing gaze is blocked by your [M]!") + to_chat(user,span_warning("[T]'s mask is covering their eyes!")) + to_chat(target,span_warning("[user]'s paralyzing gaze is blocked by your [M]!")) return var/obj/item/clothing/head/H = T.head if(H) if(H.flash_protect > 0) - to_chat(user, "[T]'s helmet is covering their eyes!") - to_chat(target, "[user]'s paralyzing gaze is blocked by [H]!") + to_chat(user, span_vampirewarning("[T]'s helmet is covering their eyes!")) + to_chat(target, span_warning("[user]'s paralyzing gaze is blocked by [H]!")) return - to_chat(target,"You are paralyzed with fear!") - to_chat(user,"You paralyze [T].") + to_chat(target,span_warning("You are paralyzed with fear!")) + to_chat(user,span_notice("You paralyze [T].")) T.Stun(50) @@ -178,8 +178,8 @@ charge_max = 300 blood_used = 20 action_icon_state = "hypnotize" - active_msg = "You prepare your hypnosis technique." - deactive_msg = "You stop preparing your hypnosis." + active_msg = span_warning("You prepare your hypnosis technique.") + deactive_msg = span_warning("You stop preparing your hypnosis.") vamp_req = TRUE ranged_mousepointer = 'icons/effects/mouse_pointers/hypnotize_target.dmi' action_icon = 'yogstation/icons/mob/vampire.dmi' @@ -187,8 +187,8 @@ /obj/effect/proc_holder/spell/pointed/hypno/Click() if(!active) - usr.visible_message("[usr] twirls their finger in a circlular motion.",\ - "You twirl your finger in a circular motion.") + usr.visible_message(span_warning("[usr] twirls their finger in a circlular motion."),\ + span_warning("You twirl your finger in a circular motion.")) ..() /obj/effect/proc_holder/spell/pointed/hypno/can_target(atom/target, mob/user, silent) @@ -197,48 +197,48 @@ if(!target) return FALSE if(!ishuman(target)) - to_chat(user, "Hypnotize will not work on this being.") + to_chat(user, span_warning("Hypnotize will not work on this being.")) return FALSE var/mob/living/carbon/human/T = target if(T.IsSleeping()) - to_chat(user, "[T] is already asleep!.") + to_chat(user, span_warning("[T] is already asleep!.")) return FALSE return TRUE /obj/effect/proc_holder/spell/pointed/hypno/cast(list/targets, mob/user) var/mob/living/target = targets[1] var/mob/living/carbon/human/T = target - user.visible_message("[user]'s eyes flash red.",\ - "[user]'s eyes flash red.") + user.visible_message(span_warning("[user]'s eyes flash red."),\ + span_warning("[user]'s eyes flash red.")) if(T) var/obj/item/clothing/glasses/G = T.glasses if(G) if(G.flash_protect > 0) - to_chat(user, "[T] has protective sunglasses on!") - to_chat(target, "[user]'s paralyzing gaze is blocked by [G]!") + to_chat(user, span_warning("[T] has protective sunglasses on!")) + to_chat(target, span_warning("[user]'s paralyzing gaze is blocked by [G]!")) return var/obj/item/clothing/mask/M = T.wear_mask if(M) if(M.flash_protect > 0) - to_chat(user, "[T]'s mask is covering their eyes!") - to_chat(target, "[user]'s paralyzing gaze is blocked by [M]!") + to_chat(user, span_vampirewarning("[T]'s mask is covering their eyes!")) + to_chat(target, span_warning("[user]'s paralyzing gaze is blocked by [M]!")) return var/obj/item/clothing/head/H = T.head if(H) if(H.flash_protect > 0) - to_chat(user, "[T]'s helmet is covering their eyes!") - to_chat(target, "[user]'s paralyzing gaze is blocked by [H]!") + to_chat(user, span_vampirewarning("[T]'s helmet is covering their eyes!")) + to_chat(target, span_warning("[user]'s paralyzing gaze is blocked by [H]!")) return - to_chat(target, "Your knees suddenly feel heavy. Your body begins to sink to the floor.") - to_chat(user, "[target] is now under your spell. In four seconds they will be rendered unconscious as long as they are within close range.") + to_chat(target, span_boldwarning("Your knees suddenly feel heavy. Your body begins to sink to the floor.")) + to_chat(user, span_notice("[target] is now under your spell. In four seconds they will be rendered unconscious as long as they are within close range.")) if(do_mob(user, target, 40, TRUE)) // 4 seconds... if(get_dist(user, T) <= 3) flash_color(T, flash_color="#472040", flash_time=30) // it's the vampires color! T.SetSleeping(300) - to_chat(user, "[T] has fallen asleep!") + to_chat(user, span_warning("[T] has fallen asleep!")) else - to_chat(T, "You feel a whole lot better now.") + to_chat(T, span_notice("You feel a whole lot better now.")) /obj/effect/proc_holder/spell/self/shapeshift name = "Shapeshift (50)" @@ -253,7 +253,7 @@ /obj/effect/proc_holder/spell/self/shapeshift/cast(list/targets, mob/user = usr) if(ishuman(user)) var/mob/living/carbon/human/H = user - user.visible_message("[H] transforms!") + user.visible_message(span_warning("[H] transforms!")) randomize_human(H) user.regenerate_icons() @@ -285,7 +285,7 @@ return V.iscloaking = !V.iscloaking update_name() - to_chat(user, "You will now be [V.iscloaking ? "hidden" : "seen"] in darkness.") + to_chat(user, span_notice("You will now be [V.iscloaking ? "hidden" : "seen"] in darkness.")) /obj/effect/proc_holder/spell/self/revive @@ -305,27 +305,27 @@ revert_cast() return if(user.stat != DEAD) - to_chat(user, "We aren't dead enough to do that yet!") + to_chat(user, span_notice("We aren't dead enough to do that yet!")) revert_cast() return if(user.reagents.has_reagent("holywater")) - to_chat(user, "We cannot revive, holy water is in our system!") + to_chat(user, span_danger("We cannot revive, holy water is in our system!")) return var/mob/living/L = user if(istype(get_area(L.loc), /area/chapel)) - L.visible_message("[L] disintergrates into dust!", "Holy energy seeps into our very being, disintergrating us instantly!", "You hear sizzling.") + L.visible_message(span_warning("[L] disintergrates into dust!"), span_userdanger("Holy energy seeps into our very being, disintergrating us instantly!"), "You hear sizzling.") new /obj/effect/decal/remains/human(L.loc) L.dust() - to_chat(L, "We begin to reanimate... this will take 1 minute.") + to_chat(L, span_notice("We begin to reanimate... this will take 1 minute.")) addtimer(CALLBACK(src, /obj/effect/proc_holder/spell/self/revive.proc/revive, L), 600) /obj/effect/proc_holder/spell/self/revive/proc/revive(mob/living/user) user.revive(full_heal = TRUE) - user.visible_message("[user] reanimates from death!", "We get back up.") + user.visible_message(span_warning("[user] reanimates from death!"), span_notice("We get back up.")) var/list/missing = user.get_missing_limbs() if(missing.len) playsound(user, 'sound/magic/demon_consume.ogg', 50, 1) - user.visible_message("Shadowy matter takes the place of [user]'s missing limbs as they reform!") + user.visible_message(span_warning("Shadowy matter takes the place of [user]'s missing limbs as they reform!")) user.regenerate_limbs(0, list(BODY_ZONE_HEAD)) user.regenerate_organs() @@ -342,10 +342,10 @@ /obj/effect/proc_holder/spell/targeted/disease/cast(list/targets, mob/user = usr) for(var/mob/living/carbon/target in targets) - to_chat(user, "You stealthily infect [target] with your diseased touch.") + to_chat(user, span_warning("You stealthily infect [target] with your diseased touch.")) target.help_shake_act(user) if(is_vampire(target)) - to_chat(user, "They seem to be unaffected.") + to_chat(user, span_warning("They seem to be unaffected.")) continue var/datum/disease/D = new /datum/disease/vampire target.ForceContractDisease(D) @@ -362,7 +362,7 @@ vamp_req = TRUE /obj/effect/proc_holder/spell/self/screech/cast(list/targets, mob/user = usr) - user.visible_message("[user] lets out an ear piercing shriek!", "You let out a loud shriek.", "You hear a loud painful shriek!") + user.visible_message(span_warning("[user] lets out an ear piercing shriek!"), span_warning("You let out a loud shriek."), span_warning("You hear a loud painful shriek!")) for(var/mob/living/carbon/C in hearers(4)) if(!C == user || !is_vampire(C)) if(ishuman(C) && C.soundbang_act(1, 0)) @@ -436,39 +436,39 @@ var/datum/antagonist/vampire/vamp = user.mind.has_antag_datum(/datum/antagonist/vampire) for(var/mob/living/carbon/target in targets) if(is_vampire(target)) - to_chat(user, "They're already a vampire!") + to_chat(user, span_warning("They're already a vampire!")) vamp.usable_blood += blood_used // Refund cost continue if(HAS_TRAIT(target, TRAIT_MINDSHIELD)) - to_chat(user, "[target]'s mind is too strong!") + to_chat(user, span_warning("[target]'s mind is too strong!")) vamp.usable_blood += blood_used // Refund cost continue - user.visible_message("[user] latches onto [target]'s neck, pure dread eminating from them.", "You latch onto [target]'s neck, preparing to transfer your unholy blood to them.", "A dreadful feeling overcomes you") + user.visible_message(span_warning("[user] latches onto [target]'s neck, pure dread eminating from them."), span_warning("You latch onto [target]'s neck, preparing to transfer your unholy blood to them."), span_warning("A dreadful feeling overcomes you")) target.reagents.add_reagent(/datum/reagent/medicine/salbutamol, 10) //incase you're choking the victim for(var/progress = 0, progress <= 3, progress++) switch(progress) if(1) - to_chat(target, "Wicked shadows invade your sight, beckoning to you.") - to_chat(user, "We begin to drain [target]'s blood in, so Lilith can bless it.") + to_chat(target, span_danger("Wicked shadows invade your sight, beckoning to you.")) + to_chat(user, span_notice("We begin to drain [target]'s blood in, so Lilith can bless it.")) if(2) - to_chat(target, "Demonic whispers fill your mind, and they become irressistible...") + to_chat(target, span_danger("Demonic whispers fill your mind, and they become irressistible...")) if(3) - to_chat(target, "The world blanks out, and you see a demo- no ange- demon- lil- glory- blessing... Lilith.") - to_chat(user, "Excitement builds up in you as [target] sees the blessing of Lilith.") + to_chat(target, span_danger("The world blanks out, and you see a demo- no ange- demon- lil- glory- blessing... Lilith.")) + to_chat(user, span_notice("Excitement builds up in you as [target] sees the blessing of Lilith.")) if(!do_mob(user, target, 70)) - to_chat(user, "The pact has failed! [target] has not became a vampire.") - to_chat(target, "The visions stop, and you relax.") + to_chat(user, span_danger("The pact has failed! [target] has not became a vampire.")) + to_chat(target, span_notice("The visions stop, and you relax.")) vamp.usable_blood += blood_used / 2 // Refund half the cost return if(!QDELETED(user) && !QDELETED(target)) - to_chat(user, ". . .") - to_chat(target, "Come to me, child.") + to_chat(user, span_notice(". . .")) + to_chat(target, span_italics("Come to me, child.")) sleep(10) - to_chat(target, "The world hasn't treated you well, has it?") + to_chat(target, span_italics("The world hasn't treated you well, has it?")) sleep(15) - to_chat(target, "Strike fear into their hearts...") + to_chat(target, span_italics("Strike fear into their hearts...")) to_chat(user, "They have signed the pact!") - to_chat(target, "You sign Lilith's Pact.") + to_chat(target, span_userdanger("You sign Lilith's Pact.")) target.mind.store_memory("[user] showed you the glory of Lilith. You are not required to obey [user], however, you have gained a respect for them.") target.Sleeping(600) target.blood_volume = 560 @@ -497,7 +497,7 @@ else if(get_dist(V.coat, user) > 1 || !(V.coat in user.GetAllContents())) V.coat.forceMove(user.loc) user.put_in_hands(V.coat) - to_chat(user, "You summon your dracula coat.") + to_chat(user, span_notice("You summon your dracula coat.")) /obj/effect/proc_holder/spell/self/batform @@ -518,7 +518,7 @@ return FALSE if(!bat || bat.stat == DEAD) if(V.usable_blood < 15) - to_chat(user, "You do not have enough blood to cast this!") + to_chat(user, span_warning("You do not have enough blood to cast this!")) return FALSE bat = new /mob/living/simple_animal/hostile/vampire_bat(user.loc) user.forceMove(bat) diff --git a/yogstation/code/game/machinery/computer/arcade.dm b/yogstation/code/game/machinery/computer/arcade.dm index f9fb80eea67e..d39f2cd1b0b0 100644 --- a/yogstation/code/game/machinery/computer/arcade.dm +++ b/yogstation/code/game/machinery/computer/arcade.dm @@ -301,7 +301,7 @@ new /obj/item/storage/backpack/duffelbag/syndie/c4(loc) new /obj/item/storage/backpack/duffelbag/syndie/x4(loc) message_admins("[key_name_admin(user)] won emagged Minesweeper and got [itemname]!") - visible_message("[src] dispenses [itemname]!", "You hear a chime and a clunk.") + visible_message(span_notice("[src] dispenses [itemname]!"), span_notice("You hear a chime and a clunk.")) else prizevend(user) prizevended = TRUE @@ -328,10 +328,10 @@ randomcolour = rgb(randomnumber,randomnumber/2,randomnumber/3) obj_flags |= EMAGGED if(game_status == MINESWEEPER_GAME_MAIN_MENU) - to_chat(user, "An ominous tune plays from the arcade's speakers!") + to_chat(user, span_warning("An ominous tune plays from the arcade's speakers!")) playsound(user, 'yogstation/sound/arcade/minesweeper_emag1.ogg', 100, 0, extrarange = 3, falloff = 10) else //Can't let you do that, star fox! - to_chat(user, "The machine buzzes and sparks... the game has been reset!") + to_chat(user, span_warning("The machine buzzes and sparks... the game has been reset!")) playsound(user, 'sound/machines/buzz-sigh.ogg', 100, 0, extrarange = 3, falloff = 10) //Loud buzz game_status = MINESWEEPER_GAME_MAIN_MENU diff --git a/yogstation/code/game/machinery/doors/airlock.dm b/yogstation/code/game/machinery/doors/airlock.dm index 842de77a1862..69e6924b19fb 100644 --- a/yogstation/code/game/machinery/doors/airlock.dm +++ b/yogstation/code/game/machinery/doors/airlock.dm @@ -3,12 +3,12 @@ /obj/machinery/door/airlock/proc/apply_brace(obj/item/brace/B, mob/user) if(brace) - to_chat(user, "[src] is already braced!") + to_chat(user, span_warning("[src] is already braced!")) return if(!density) - to_chat(user, "Close [src] first!") + to_chat(user, span_warning("Close [src] first!")) return - to_chat(user, "You start installing [B] on [src]...") + to_chat(user, span_notice("You start installing [B] on [src]...")) playsound(src, 'sound/items/jaws_pry.ogg', 100) if(!do_after(user, 5 SECONDS, target = src)) return @@ -27,7 +27,7 @@ brace.pixel_x = -32 if(WEST) brace.pixel_x = 32 - to_chat(user, "You install [B] on [src].") + to_chat(user, span_notice("You install [B] on [src].")) playsound(src, 'sound/items/jaws_pry.ogg', 100) /obj/machinery/door/airlock/proc/dir_to_cardinal(dir) diff --git a/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm b/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm index 09f627ae7e49..fb7527ad6abb 100644 --- a/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm +++ b/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm @@ -197,7 +197,7 @@ return if(!auth && !issilicon(usr) && !emagged) - to_chat(usr, "ACCESS DENIED.") + to_chat(usr, span_danger("ACCESS DENIED.")) return if(href_list["viewserver"]) @@ -236,7 +236,7 @@ if("editcode") if(is_banned_from(usr.ckey, "Signal Technician")) - to_chat(usr, "You are banned from using NTSL.") + to_chat(usr, span_warning("You are banned from using NTSL.")) return if(editingcode == usr) return @@ -294,7 +294,7 @@ if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = TRUE - to_chat(user, "You you disable the security protocols.") + to_chat(user, span_notice("You you disable the security protocols.")) /obj/machinery/computer/telecomms/traffic/proc/canAccess(mob/user) if(issilicon(user) || in_range(user, src)) diff --git a/yogstation/code/game/machinery/telecomms/machines/server.dm b/yogstation/code/game/machinery/telecomms/machines/server.dm index 80bc569aa9eb..d70267fa8989 100644 --- a/yogstation/code/game/machinery/telecomms/machines/server.dm +++ b/yogstation/code/game/machinery/telecomms/machines/server.dm @@ -50,7 +50,7 @@ /obj/machinery/telecomms/server/proc/compile(mob/user = usr) if(is_banned_from(user.ckey, "Signal Technician")) - to_chat(user, "You are banned from using NTSL.") + to_chat(user, span_warning("You are banned from using NTSL.")) return if(Compiler) var/list/compileerrors = Compiler.Compile(rawcode) diff --git a/yogstation/code/game/mecha/makeshift/lockermech.dm b/yogstation/code/game/mecha/makeshift/lockermech.dm index 4d4073cdb3e6..a5f9053f6486 100644 --- a/yogstation/code/game/mecha/makeshift/lockermech.dm +++ b/yogstation/code/game/mecha/makeshift/lockermech.dm @@ -18,7 +18,7 @@ if(href_list["drop_from_cargo"]) var/obj/O = locate(sanitize(href_list["drop_from_cargo"])) if(O && (O in cargo)) - occupant_message("You unload [O].") + occupant_message(span_notice("You unload [O].")) O.forceMove(loc) cargo -= O log_message("Unloaded [O]. Cargo compartment capacity: [cargo_capacity - src.cargo.len]", LOG_MECHA) @@ -58,16 +58,16 @@ return output /obj/mecha/makeshift/relay_container_resist(mob/living/user, obj/O) - to_chat(user, "You lean on the back of [O] and start pushing so it falls out of [src].") + to_chat(user, span_notice("You lean on the back of [O] and start pushing so it falls out of [src].")) if(do_after(user, 10, target = O))//Its a fukken locker if(!user || user.stat != CONSCIOUS || user.loc != src || O.loc != src ) return - to_chat(user, "You successfully pushed [O] out of [src]!") + to_chat(user, span_notice("You successfully pushed [O] out of [src]!")) O.loc = loc cargo -= O else if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded. - to_chat(user, "You fail to push [O] out of [src]!") + to_chat(user, span_warning("You fail to push [O] out of [src]!")) /obj/mecha/makeshift/Destroy() new /obj/structure/closet(loc) diff --git a/yogstation/code/game/objects/items/bandage.dm b/yogstation/code/game/objects/items/bandage.dm index 04dca6cf70fa..54ed2ed50728 100644 --- a/yogstation/code/game/objects/items/bandage.dm +++ b/yogstation/code/game/objects/items/bandage.dm @@ -26,14 +26,14 @@ if (healing_limb.brute_dam) success = healing_limb.heal_damage(healamount/src.duration, 0, 0) else - to_chat(H, "The wounds on your [src.healing_limb.name] have stopped bleeding and appear to be healed.") + to_chat(H, span_notice("The wounds on your [src.healing_limb.name] have stopped bleeding and appear to be healed.")) used = TRUE if (BURN) if (healing_limb.burn_dam) success = healing_limb.heal_damage(0, healamount/src.duration, 0) else used = TRUE - to_chat(H, "The burns on your [src.healing_limb.name] feel much better, and seem to be completely healed.") + to_chat(H, span_notice("The burns on your [src.healing_limb.name] feel much better, and seem to be completely healed.")) if (success) H.update_damage_overlays() if (staunch_bleeding && !H.bleedsuppress) @@ -46,7 +46,7 @@ /obj/item/medical/bandage/proc/unwrap(mob/living/M, mob/living/carbon/human/T) //DUPLICATE CODE BUT I'M FUCKING LAZY <- this was not Morrow if (healing_limb.bandaged) - M.visible_message("[M] grabs and pulls at the [src] on [T]'s [src.healing_limb.name], unwrapping it instantly!", "You deftly yank [src] off [T]'s [src.healing_limb.name].") + M.visible_message(span_warning("[M] grabs and pulls at the [src] on [T]'s [src.healing_limb.name], unwrapping it instantly!"), span_notice("You deftly yank [src] off [T]'s [src.healing_limb.name].")) name = "used [src.name]" desc = "Piled into a tangled, crusty mess, these bandages have obviously been used and then disposed of in great haste." color = "red" @@ -67,15 +67,15 @@ /obj/item/medical/bandage/proc/apply(mob/living/user, mob/tar, obj/item/bodypart/lt) if (!ishuman(user)) - to_chat(user, "You don't have the dexterity to use this!") + to_chat(user, span_warning("You don't have the dexterity to use this!")) return FALSE if (ishuman(tar)) if (!lt.bandaged) if (user == tar) - user.visible_message("[user] begins winding [src] about their [lt.name]..", "You begin winding [src] around your [lt.name]..") + user.visible_message(span_notice("[user] begins winding [src] about their [lt.name].."), span_notice("You begin winding [src] around your [lt.name]..")) else - user.visible_message("[user] begins winding [src] about [tar]'s [lt.name]..", "You begin winding [src] around [tar]'s [lt.name]..") + user.visible_message(span_notice("[user] begins winding [src] about [tar]'s [lt.name].."), span_notice("You begin winding [src] around [tar]'s [lt.name]..")) if (do_after(user, 50, target = tar)) if(!user.canUnEquip(src)) @@ -86,7 +86,7 @@ user.visible_message("[user] has applied [src] successfully.", "You have applied [src] successfully.") return TRUE else - user.visible_message("[user] stops applying [src] to [tar].", "You stop applying [src] to [tar].") + user.visible_message(span_warning("[user] stops applying [src] to [tar]."), span_warning("You stop applying [src] to [tar].")) return FALSE else to_chat(user, "[tar] is already bandaged for the moment.") diff --git a/yogstation/code/game/objects/items/brace.dm b/yogstation/code/game/objects/items/brace.dm index ace32f0cccbc..86f9a8a4b7a5 100644 --- a/yogstation/code/game/objects/items/brace.dm +++ b/yogstation/code/game/objects/items/brace.dm @@ -41,7 +41,7 @@ return if(I.GetID()) if(!allowed(user)) - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return remove(user) @@ -52,7 +52,7 @@ return TRUE cover_open = !cover_open tool.play_tool_sound(src) - to_chat(user, "You [cover_open ? "open" : "close"] the cover.") + to_chat(user, span_notice("You [cover_open ? "open" : "close"] the cover.")) update_icon() /obj/structure/deployed_brace/wrench_act(mob/user, obj/item/tool) @@ -61,9 +61,9 @@ if(..()) return TRUE if(!cover_open) - to_chat(user, "Open the cover first!") + to_chat(user, span_warning("Open the cover first!")) return - to_chat(user, "You struggle to disable the hydraulics...") + to_chat(user, span_notice("You struggle to disable the hydraulics...")) playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, 1) if(do_after(user, 20 SECONDS, target = src)) remove(user) @@ -71,7 +71,7 @@ /obj/structure/deployed_brace/proc/remove(mob/user = null) playsound(src, 'sound/items/deconstruct.ogg', 50) if(user) - to_chat(user, "You remove [src] from [placed_on].") //and screw the cover back on but ssshhh + to_chat(user, span_notice("You remove [src] from [placed_on].")) //and screw the cover back on but ssshhh if(user.put_in_hands(brace_item)) brace_item = null qdel(src) diff --git a/yogstation/code/game/objects/items/cards_ids.dm b/yogstation/code/game/objects/items/cards_ids.dm index 5bc330b8f592..85aa524e41c0 100644 --- a/yogstation/code/game/objects/items/cards_ids.dm +++ b/yogstation/code/game/objects/items/cards_ids.dm @@ -73,13 +73,13 @@ if(!otherEmag) return if(prob(10)) - to_chat(user, "By some ungodly miracle, the emag gains new functionality instead of being destroyed.") + to_chat(user, span_notice("By some ungodly miracle, the emag gains new functionality instead of being destroyed.")) playsound(src.loc, "sparks", 50, 1) qdel(otherEmag) color = rgb(40, 130, 255) prox_check = FALSE return - to_chat(user, "The cyptographic sequencers attempt to override each other before destroying themselves.") + to_chat(user, span_notice("The cyptographic sequencers attempt to override each other before destroying themselves.")) playsound(src.loc, "sparks", 50, 1) qdel(otherEmag) qdel(src) diff --git a/yogstation/code/game/objects/items/crayons.dm b/yogstation/code/game/objects/items/crayons.dm index df8571d8917f..a7b570c9a01c 100644 --- a/yogstation/code/game/objects/items/crayons.dm +++ b/yogstation/code/game/objects/items/crayons.dm @@ -14,7 +14,7 @@ var/datum/antagonist/gang/G = user.mind.has_antag_datum(/datum/antagonist/gang) if(G) if(G.gang != gang) - to_chat(user, "This spraycan's color isn't your gang's one! You cannot use it.") + to_chat(user, span_danger("This spraycan's color isn't your gang's one! You cannot use it.")) return FALSE gang_mode = TRUE instant = FALSE @@ -36,7 +36,7 @@ // Reject space, player-created areas, and non-station z-levels. var/area/A = get_area(target) if(!A || (!is_station_level(A.z)) || !A.valid_territory) - to_chat(user, "[A] is unsuitable for tagging.") + to_chat(user, span_warning("[A] is unsuitable for tagging.")) return FALSE var/spraying_over = FALSE @@ -49,12 +49,12 @@ break for(var/obj/machinery/power/apc in target) - to_chat(user, "You can't tag an APC.") + to_chat(user, span_warning("You can't tag an APC.")) return FALSE var/occupying_gang = territory_claimed(A, user) if(occupying_gang && !spraying_over) - to_chat(user, "[A] has already been tagged by the [occupying_gang] gang! You must get rid of or spray over the old tag first!") + to_chat(user, span_danger("[A] has already been tagged by the [occupying_gang] gang! You must get rid of or spray over the old tag first!")) return FALSE // If you pass the gaunlet of checks, you're good to proceed @@ -74,7 +74,7 @@ var/datum/antagonist/gang/G = user.mind.has_antag_datum(/datum/antagonist/gang) var/area/territory = get_area(target) new /obj/effect/decal/cleanable/crayon/gang(target,G.gang,"graffiti",0,user) - to_chat(user, "You tagged [territory] for your gang!") + to_chat(user, span_notice("You tagged [territory] for your gang!")) /obj/item/toy/crayon/spraycan/gang //desc = "A modified container containing suspicious paint." @@ -107,7 +107,7 @@ 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)) diff --git a/yogstation/code/game/objects/items/devices/scanners.dm b/yogstation/code/game/objects/items/devices/scanners.dm index 2bc7922fec27..f7ae4ae03887 100644 --- a/yogstation/code/game/objects/items/devices/scanners.dm +++ b/yogstation/code/game/objects/items/devices/scanners.dm @@ -34,7 +34,7 @@ TRICORDER obj/item/multitool/tricorder/suicide_act(mob/living/carbon/user) - user.visible_message("[user] thinks today IS a good day to die!") + user.visible_message(span_suicide("[user] thinks today IS a good day to die!")) return BRUTELOSS @@ -79,7 +79,7 @@ obj/item/multitool/tricorder/suicide_act(mob/living/carbon/user) // Status Readout // Tricorder can detect damage but can only give estimates in most cases //Temperature - 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("Body temperature: [round(M.bodytemperature-T0C,0.1)] °C ([round(M.bodytemperature*1.8-459.67,0.1)] °F)")) //Brute to_chat(user, "\t * Brute Damage: [brute_damage > 100 ? "Critical" : brute_damage > 75 ? "Catastrophic" : brute_damage > 50 ? "Extreme" : brute_damage > 25 ? "Severe" : brute_damage > 0 ? "Minor" : "None"]") //Burn diff --git a/yogstation/code/game/objects/items/extinguisher.dm b/yogstation/code/game/objects/items/extinguisher.dm index 38e252aecfa1..280eb69b7531 100644 --- a/yogstation/code/game/objects/items/extinguisher.dm +++ b/yogstation/code/game/objects/items/extinguisher.dm @@ -1,11 +1,11 @@ /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 diff --git a/yogstation/code/game/objects/items/grenades/glitterbombs.dm b/yogstation/code/game/objects/items/grenades/glitterbombs.dm index c562af8becd1..552b512b4266 100644 --- a/yogstation/code/game/objects/items/grenades/glitterbombs.dm +++ b/yogstation/code/game/objects/items/grenades/glitterbombs.dm @@ -24,7 +24,7 @@ target.cut_overlay(plastic_overlay, TRUE) /obj/item/grenade/plastic/glitterbomb/suicide_act(mob/user) - user.visible_message("[user] swallows [src]! It looks like [user.p_they()] WANTS TO PARTY!") + user.visible_message(span_suicide("[user] swallows [src]! It looks like [user.p_they()] WANTS TO PARTY!")) target = user moveToNullspace() addtimer(CALLBACK(src, .proc/prime), 99) diff --git a/yogstation/code/game/objects/items/holotool/holotool.dm b/yogstation/code/game/objects/items/holotool/holotool.dm index b3596b61b94c..9d7d4361f5f1 100644 --- a/yogstation/code/game/objects/items/holotool/holotool.dm +++ b/yogstation/code/game/objects/items/holotool/holotool.dm @@ -19,8 +19,8 @@ /obj/item/holotool/examine(mob/user) ..() - . += "It is currently set to [current_tool ? current_tool.name : "'off'"] mode." - . += "Ctrl+Click it to open the radial menu!" + . += span_notice("It is currently set to [current_tool ? current_tool.name : "'off'"] mode.") + . += span_notice("Ctrl+Click it to open the radial menu!") /obj/item/holotool/ui_action_click(mob/user, datum/action/action) if(istype(action, /datum/action/item_action/change_tool)) @@ -104,7 +104,7 @@ /obj/item/holotool/emag_act(mob/user) if(obj_flags & EMAGGED) return - to_chat(user, "ZZT- ILLEGAL BLUEPRINT UNLOCKED- CONTACT !#$@^%$# NANOTRASEN SUPPORT-@*%$^%!") + to_chat(user, span_danger("ZZT- ILLEGAL BLUEPRINT UNLOCKED- CONTACT !#$@^%$# NANOTRASEN SUPPORT-@*%$^%!")) do_sparks(5, 0, src) obj_flags |= EMAGGED diff --git a/yogstation/code/game/objects/items/implants/implant_gang.dm b/yogstation/code/game/objects/items/implants/implant_gang.dm index 26b4497fd5a7..98a8f4f5c483 100644 --- a/yogstation/code/game/objects/items/implants/implant_gang.dm +++ b/yogstation/code/game/objects/items/implants/implant_gang.dm @@ -44,7 +44,7 @@ success = FALSE if(!success) - target.visible_message("[target] seems to resist the implant!", "You feel the influence of your enemies try to invade your mind!") + target.visible_message(span_warning("[target] seems to resist the implant!"), span_warning("You feel the influence of your enemies try to invade your mind!")) return FALSE else target.mind.add_antag_datum(/datum/antagonist/gang, gang) diff --git a/yogstation/code/game/objects/items/implants/implant_mindslave.dm b/yogstation/code/game/objects/items/implants/implant_mindslave.dm index 8954c57d58c4..ad40b90350fb 100644 --- a/yogstation/code/game/objects/items/implants/implant_mindslave.dm +++ b/yogstation/code/game/objects/items/implants/implant_mindslave.dm @@ -17,23 +17,23 @@ /obj/item/implant/mindslave/implant(mob/source, mob/user) if(!source.mind) - to_chat(user.mind, "[source] doesn't posses the mental capabilities to be a slave.") + to_chat(user.mind, span_notice("[source] doesn't posses the mental capabilities to be a slave.")) return FALSE var/mob/living/carbon/target = source var/mob/living/carbon/holder = user if(target == holder) - to_chat(holder, "You can't implant yourself!") + to_chat(holder, span_notice("You can't implant yourself!")) return FALSE var/obj/item/implant/mindslave/imp = locate(src.type) in source if(imp) - to_chat(holder, "[target] is already a slave!") + to_chat(holder, span_warning("[target] is already a slave!")) return FALSE if(HAS_TRAIT(target, TRAIT_MINDSHIELD)) - to_chat(holder, "[target] seems to resist the implant!") + to_chat(holder, span_warning("[target] seems to resist the implant!")) return FALSE to_chat(target, "You feel a strange urge to serve [holder.real_name]. A simple thought about disobeying his/her commands makes your head feel like it is going to explode. You feel like you dont want to know what will happen if you actually disobey your new master.") @@ -54,9 +54,9 @@ return if(source.mind && source.mind.has_antag_datum(/datum/antagonist/mindslave)) source.mind.remove_antag_datum(/datum/antagonist/mindslave) - to_chat(source,"You feel your free will come back to you! You no longer have to obey your master!") + to_chat(source,span_userdanger("You feel your free will come back to you! You no longer have to obey your master!")) if(!source.mind.has_antag_datum(/datum/antagonist)) - to_chat(source,"You are no longer an antagonist.") + to_chat(source,span_notice("You are no longer an antagonist.")) /obj/item/implanter/mindslave name = "implanter (mindslave)" diff --git a/yogstation/code/game/objects/items/plushes.dm b/yogstation/code/game/objects/items/plushes.dm index 529d067af42c..8b2c1de9ee13 100644 --- a/yogstation/code/game/objects/items/plushes.dm +++ b/yogstation/code/game/objects/items/plushes.dm @@ -30,26 +30,26 @@ if (!targets_to_pick_from.len) return target = pick(targets_to_pick_from) - visible_message("[src] stares at [target].") + visible_message(span_notice("[src] stares at [target].")) if (world.time > cooldown && target) ram() /obj/item/toy/plush/goatplushie/angry/proc/ram() if(prob((obj_flags & EMAGGED) ? 98:90) && isturf(loc) && considered_alive(target.mind)) throw_at(target, 10, 10) - visible_message("[src] rams [target]!") + visible_message(span_danger("[src] rams [target]!")) cooldown = world.time + cooldown_modifier target = null - visible_message("[src] looks disinterested.") + visible_message(span_notice("[src] looks disinterested.")) /obj/item/toy/plush/goatplushie/angry/emag_act(mob/user) if (obj_flags&EMAGGED) - visible_message("[src] already looks angry enough, you shouldn't anger it more.") + visible_message(span_notice("[src] already looks angry enough, you shouldn't anger it more.")) return cooldown_modifier = 5 throwforce = 20 obj_flags |= EMAGGED - visible_message("[src] stares at [user] angrily before going docile.") + visible_message(span_danger("[src] stares at [user] angrily before going docile.")) /obj/item/toy/plush/goatplushie/angry/Destroy() STOP_PROCESSING(SSprocessing, src) @@ -113,14 +113,14 @@ /obj/item/toy/plush/goatplushie/angry/ascendedkinggoat/attackby(obj/item/I,mob/living/user,params) if(I.is_sharp()) - user.visible_message("[user] attempts to stab [src]!", "[I] bounces off of [src]'s back before breaking into millions of pieces... [src] glares at [user]!") // You fucked up now son + user.visible_message(span_notice("[user] attempts to stab [src]!"), span_suicide("[I] bounces off of [src]'s back before breaking into millions of pieces... [src] glares at [user]!")) // You fucked up now son I.play_tool_sound(src) qdel(I) addtimer(CALLBACK(user, /mob/living/.proc/gib), 3 SECONDS) /obj/item/toy/plush/goatplushie/angry/kinggoat/attackby(obj/item/I,mob/living/user,params) if(I.is_sharp()) - user.visible_message("[user] stabs [src] to shreds!", "[src]'s death has attracted the attention of the king goat plushie guards!") + user.visible_message(span_notice("[user] stabs [src] to shreds!"), span_notice("[src]'s death has attracted the attention of the king goat plushie guards!")) I.play_tool_sound(src) qdel(src) var/turf/location = get_turf(user) @@ -139,7 +139,7 @@ /obj/item/toy/plush/goatplushie/angry/kinggoat/attackby(/obj/item/reagent_containers/food/snacks/grown/cabbage/C,mob/living/user,params) var/C = /obj/item/reagent_containers/food/snacks/grown/cabbage - user.visible_message("[user] watches as [src] takes a bite out of the cabbage!", "[src]'s fur now starts glowing it seems it has ascended!") + user.visible_message(span_notice("[user] watches as [src] takes a bite out of the cabbage!"), span_notice("[src]'s fur now starts glowing it seems it has ascended!")) playsound(src, 'sound/items/eatfood.ogg', 50, 1) qdel(C) qdel(src) diff --git a/yogstation/code/game/objects/items/robot/robot_items.dm b/yogstation/code/game/objects/items/robot/robot_items.dm index b8327d12d6d4..774e9c436ae5 100644 --- a/yogstation/code/game/objects/items/robot/robot_items.dm +++ b/yogstation/code/game/objects/items/robot/robot_items.dm @@ -13,16 +13,16 @@ if("Throw Lollipop") if(mode == THROW_LOLLIPOP_MODE) mode = DISPENSE_LOLLIPOP_MODE - to_chat(user, "Module is now dispensing lollipops.") + to_chat(user, span_notice("Module is now dispensing lollipops.")) else mode = THROW_LOLLIPOP_MODE - to_chat(user, "Module is now throwing lollipops.") + to_chat(user, span_notice("Module is now throwing lollipops.")) if("Throw Gumball") mode = THROW_GUMBALL_MODE - to_chat(user, "Module is now blasting gumballs.") + to_chat(user, span_notice("Module is now blasting gumballs.")) if("Dispense Icecream") mode = DISPENSE_ICECREAM_MODE - to_chat(user, "Module is now dispensing ice cream.") + to_chat(user, span_notice("Module is now dispensing ice cream.")) #undef DISPENSE_LOLLIPOP_MODE #undef THROW_LOLLIPOP_MODE diff --git a/yogstation/code/game/objects/items/robot/robot_parts.dm b/yogstation/code/game/objects/items/robot/robot_parts.dm index c528bfab9ede..f8f031a5cc12 100644 --- a/yogstation/code/game/objects/items/robot/robot_parts.dm +++ b/yogstation/code/game/objects/items/robot/robot_parts.dm @@ -3,14 +3,14 @@ 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, "You can't put [M] in, the frame has to be standing on the ground to be perfectly precise!") + to_chat(user, span_warning("You can't put [M] in, the frame has to be standing on the ground to be perfectly precise!")) return if(M.brain && M.brain.decoy_override) //same message as them being jobbanned. - 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 .=..() \ No newline at end of file diff --git a/yogstation/code/game/objects/items/shields.dm b/yogstation/code/game/objects/items/shields.dm index b1ac0eef023e..5babfec3f192 100644 --- a/yogstation/code/game/objects/items/shields.dm +++ b/yogstation/code/game/objects/items/shields.dm @@ -4,5 +4,5 @@ return FALSE if(!is_A_facing_B(owner, hitby)) return FALSE - owner.visible_message("[owner] blocks [attack_text] with [src]!") + owner.visible_message(span_danger("[owner] blocks [attack_text] with [src]!")) return TRUE \ No newline at end of file diff --git a/yogstation/code/game/objects/items/stacks/dilithiumcrystal.dm b/yogstation/code/game/objects/items/stacks/dilithiumcrystal.dm index 87a7bf8470df..046d4be69668 100644 --- a/yogstation/code/game/objects/items/stacks/dilithiumcrystal.dm +++ b/yogstation/code/game/objects/items/stacks/dilithiumcrystal.dm @@ -21,7 +21,7 @@ pixel_y = rand(-5, 5) /obj/item/stack/ore/dilithium_crystal/attack_self(mob/user) // Currently has no effect, besides crushing one of the crystals into dust. - user.visible_message("[user] crushes [src]!", "You crush [src]!") + user.visible_message(span_warning("[user] crushes [src]!"), span_danger("You crush [src]!")) new /obj/effect/particle_effect/sparks(loc) playsound(loc, "sparks", 50, 1) use(1) @@ -40,7 +40,7 @@ var/crystal_type = /obj/item/stack/ore/dilithium_crystal/refined /obj/item/stack/sheet/dilithium_crystal/attack_self(mob/user)// to prevent the construction menu from ever happening - to_chat(user, "You cannot crush the polycrystal in-hand, try breaking one off.") + to_chat(user, span_warning("You cannot crush the polycrystal in-hand, try breaking one off.")) //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/stack/sheet/dilithium_crystal/attack_hand(mob/user) @@ -51,8 +51,8 @@ user.put_in_hands(BC) use(1) if(!amount) - to_chat(user, "You break the final crystal off.") + to_chat(user, span_notice("You break the final crystal off.")) else - to_chat(user, "You break off a crystal.") + to_chat(user, span_notice("You break off a crystal.")) else ..() diff --git a/yogstation/code/game/objects/items/storage/backpack.dm b/yogstation/code/game/objects/items/storage/backpack.dm index fe2ea8b14ab3..209f906c716f 100644 --- a/yogstation/code/game/objects/items/storage/backpack.dm +++ b/yogstation/code/game/objects/items/storage/backpack.dm @@ -14,7 +14,7 @@ /obj/item/storage/backpack/holding/attackby(obj/item/W, mob/living/user) if(istype(W, /obj/item/disabled_boh) && appears_split) // allows you to make a split bag appear whole, so that you can fool security or whatever with it. it's a bit pricey though since you need to bork an entire bag to do so. - to_chat(user, "You graft the outer shell of the disabled bag onto this one.") + to_chat(user, span_notice("You graft the outer shell of the disabled bag onto this one.")) qdel(W) cut = FALSE appears_split = FALSE @@ -23,21 +23,21 @@ return TRUE if(istype(W, /obj/item/scalpel) && istype(loc, /turf) && !appears_split) // you gotta do this on the ground. if(!cut) - user.visible_message("[user] begins to make an incision on the outer shell of [src].", "You begin to make an incision on the outer shell of [src]...") + user.visible_message("[user] begins to make an incision on the outer shell of [src].", span_notice("You begin to make an incision on the outer shell of [src]...")) if(W.use_tool(src, user, 40)) if(!appears_split && !cut) - user.visible_message("[user] succeeds!", "You succeed.") + user.visible_message("[user] succeeds!", span_notice("You succeed.")) cut = TRUE name = "cut [initial(name)]" icon_state = "holdingpack-cut" else - user.visible_message("[user] screws up!", "You screw up!") + user.visible_message(span_warning("[user] screws up!"), span_warning("You screw up!")) return TRUE else - user.visible_message("[user] begins to carefully cut [src]'s bluespace interface in half.", "You begin to carefully cut [src]'s bluespace interface in half...") + user.visible_message("[user] begins to carefully cut [src]'s bluespace interface in half.", span_notice("You begin to carefully cut [src]'s bluespace interface in half...")) if(W.use_tool(src, user, 40)) if(!appears_split && cut) - user.visible_message("[user] succeeds!", "You succeed.") + user.visible_message("[user] succeeds!", span_notice("You succeed.")) cut = FALSE appears_split = TRUE name = "split [initial(name)]" @@ -57,21 +57,21 @@ twin.name = "split [initial(twin.name)]" twin.icon_state = "holdingpack-split-left" else // HAHAHAHA YOU FUCKED UP BIG TIME MATE - user.visible_message("[user] screws up, causing the bluespace interface to collapse catastrophically!", "You screw up, causing the bluespace interface to collapse catastrophically! Try not moving next time?") + user.visible_message(span_danger("[user] screws up, causing the bluespace interface to collapse catastrophically!"), span_userdanger("You screw up, causing the bluespace interface to collapse catastrophically! Try not moving next time?")) fuck_up(user) return TRUE else if(istype(W, /obj/item/hemostat) && istype(loc, /turf) && !appears_split && cut) // how to bork a bag of holding - user.visible_message("[user] begins to carefully disrupt [src]'s bluespace interface.", "You begin to carefully disrupt [src]'s bluespace interface...") + user.visible_message("[user] begins to carefully disrupt [src]'s bluespace interface.", span_notice("You begin to carefully disrupt [src]'s bluespace interface...")) if(W.use_tool(src, user, 40)) if(!appears_split && cut) - user.visible_message("[user] succeeds!", "You succeed.") + user.visible_message("[user] succeeds!", span_notice("You succeed.")) disable_bag(TRUE) var/obj/item/disabled_boh/replacement = new(loc) replacement.icon_state = replacetext(icon_state, "holdingpack", "brokenpack") replacement.name = name qdel(src) else // HAHAHAHA YOU FUCKED UP BIG TIME MATE - user.visible_message("[user] screws up, causing the bluespace interface to collapse catastrophically!", "You screw up, causing the bluespace interface to collapse catastrophically! Try not moving next time?") + user.visible_message(span_danger("[user] screws up, causing the bluespace interface to collapse catastrophically!"), span_userdanger("You screw up, causing the bluespace interface to collapse catastrophically! Try not moving next time?")) fuck_up(user) return TRUE return ..() @@ -121,7 +121,7 @@ continue for(var/mob/living/M in T) if(M.movement_type & FLYING) - M.visible_message("The bluespace collapse crushes the air towards it, pulling [M] towards the ground...") + M.visible_message(span_danger("The bluespace collapse crushes the air towards it, pulling [M] towards the ground...")) M.Paralyze(5, TRUE, TRUE) //Overrides stun absorbs. T.TerraformTurf(/turf/open/chasm/magic, /turf/open/chasm/magic) for(var/fabricarea in get_areas(/area/fabric_of_reality)) diff --git a/yogstation/code/game/objects/items/storage/bags.dm b/yogstation/code/game/objects/items/storage/bags.dm index 9257e236bbf7..2beffaf64e25 100644 --- a/yogstation/code/game/objects/items/storage/bags.dm +++ b/yogstation/code/game/objects/items/storage/bags.dm @@ -2,7 +2,7 @@ component_type = /datum/component/storage/concrete/trashbag /obj/item/storage/bag/trash/proc/snap(mob/user) // Handles whenever the trash bag breaks - to_chat(user,"The [src] rips! Oh no!") + to_chat(user,span_danger("The [src] rips! Oh no!")) emptyStorage() icon_state = "[initial(icon_state)]_broken" var/datum/component/storage/STR = GetComponent(/datum/component/storage) diff --git a/yogstation/code/game/objects/items/tools.dm b/yogstation/code/game/objects/items/tools.dm index 92d527292cd8..5e803159f957 100644 --- a/yogstation/code/game/objects/items/tools.dm +++ b/yogstation/code/game/objects/items/tools.dm @@ -27,10 +27,10 @@ /obj/item/jawsoflife/suicide_act(mob/user) switch(tool_behaviour) if(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/items/jaws_pry.ogg', 50, 1, -1) if(TOOL_WIRECUTTER) - 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/items/jaws_cut.ogg', 50, 1, -1) if(iscarbon(user)) var/mob/living/carbon/C = user @@ -43,7 +43,7 @@ /obj/item/jawsoflife/attack(mob/living/carbon/C, mob/user) if (tool_behaviour == TOOL_WIRECUTTER) if(istype(C) && C.handcuffed) - 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 @@ -60,9 +60,9 @@ icon_state = "jaws_pry" playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) if (iscyborg(user)) - to_chat(user,"Your servos whirr as the cutting head reconfigures into a prying head.") + to_chat(user,span_notice("Your servos whirr as the cutting head reconfigures into a prying head.")) else - to_chat(user, "You attach the pry jaws to [src].") + to_chat(user, span_notice("You attach the pry jaws to [src].")) update_icon() /obj/item/jawsoflife/proc/transform_cutters(mob/user) @@ -74,9 +74,9 @@ playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." if (iscyborg(user)) - to_chat(user,"Your servos whirr as the prying head reconfigures into a cutting head.") + to_chat(user,span_notice("Your servos whirr as the prying head reconfigures into a cutting head.")) else - to_chat(user, "You attach the cutting jaws to [src].") + to_chat(user, span_notice("You attach the cutting jaws to [src].")) update_icon() //better handdrill @@ -107,7 +107,7 @@ transform_screwdriver(user) /obj/item/handdrill/suicide_act(mob/user) - 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!")) return(BRUTELOSS) /obj/item/handdrill/proc/transform_wrench(mob/user) @@ -116,9 +116,9 @@ tool_behaviour = TOOL_WRENCH playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) if (iscyborg(user)) - to_chat(user,"Your servos whirr as the drill reconfigures into bolt mode.") + to_chat(user,span_notice("Your servos whirr as the drill reconfigures into bolt mode.")) else - to_chat(user, "You attach the bolt driver bit to [src].") + to_chat(user, span_notice("You attach the bolt driver bit to [src].")) update_icon() /obj/item/handdrill/proc/transform_screwdriver(mob/user) @@ -127,9 +127,9 @@ tool_behaviour = TOOL_SCREWDRIVER playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) if (iscyborg(user)) - to_chat(user,"Your servos whirr as the drill reconfigures into screw mode.") + to_chat(user,span_notice("Your servos whirr as the drill reconfigures into screw mode.")) else - to_chat(user, "You attach the screw driver bit to [src].") + to_chat(user, span_notice("You attach the screw driver bit to [src].")) update_icon() /obj/item/jawsoflife/jimmy @@ -184,9 +184,9 @@ /obj/item/jawsoflife/jimmy/emag_act(mob/user) if(obj_flags & EMAGGED) - to_chat(user, "Nothing new seems to happen when you swipe the emag.") + to_chat(user, span_warning("Nothing new seems to happen when you swipe the emag.")) return - to_chat(user, "You swipe the emag on [src]'s pressure gage' enabling you to pump more pressure. ") + to_chat(user, span_notice("You swipe the emag on [src]'s pressure gage' enabling you to pump more pressure. ")) obj_flags |= EMAGGED pump_max = 150 pump_cost = 75 @@ -195,6 +195,6 @@ /obj/item/jawsoflife/jimmy/examine(mob/user) . = ..() if(obj_flags & EMAGGED) - . += "The pressure gage has been tampered with." + . += span_danger("The pressure gage has been tampered with.") if(user) show_gage(user) diff --git a/yogstation/code/game/objects/items/weaponry.dm b/yogstation/code/game/objects/items/weaponry.dm index 33aa5d125640..09587bb9284d 100644 --- a/yogstation/code/game/objects/items/weaponry.dm +++ b/yogstation/code/game/objects/items/weaponry.dm @@ -11,15 +11,15 @@ /obj/item/highfive/attack(mob/target, mob/user) if(target == user) - to_chat(user, "You can't high-five yourself! Go get a friend!") + to_chat(user, span_notice("You can't high-five yourself! Go get a friend!")) else if(ishuman(target) && (target.stat == CONSCIOUS) && (istype(target.get_active_held_item(), /obj/item/highfive)) ) var/obj/item/highfive/downlow = target.get_active_held_item() - user.visible_message("[user] and [target] high five!", "You high five with [target]!", "You hear a slap!") + user.visible_message("[user] and [target] high five!", span_notice("You high five with [target]!"), span_italics("You hear a slap!")) user.do_attack_animation(target) target.do_attack_animation(user) playsound(src, 'sound/weapons/punch2.ogg', 50, 0) qdel(src) qdel(downlow) else - user.visible_message("[user] is left hanging by [target].", "[target] leaves you hanging.") + user.visible_message("[user] is left hanging by [target].", span_notice("[target] leaves you hanging.")) playsound(src, 'sound/weapons/punchmiss.ogg', 50, 0) diff --git a/yogstation/code/game/objects/structures/beds_chairs/electric_bed.dm b/yogstation/code/game/objects/structures/beds_chairs/electric_bed.dm index a4942bbc75b0..b17033d78e52 100644 --- a/yogstation/code/game/objects/structures/beds_chairs/electric_bed.dm +++ b/yogstation/code/game/objects/structures/beds_chairs/electric_bed.dm @@ -40,10 +40,10 @@ for(var/m in buckled_mobs) var/mob/living/buckled_mob = m buckled_mob.electrocute_act(170, src, 1) - to_chat(buckled_mob, "You feel a deep shock course through your body!") + to_chat(buckled_mob, span_userdanger("You feel a deep shock course through your body!")) addtimer(CALLBACK(src, /obj/structure/bed/roller/e_roller.proc/after_shock), 10) addtimer(CALLBACK(src, /obj/structure/bed/roller/e_roller.proc/correct_mobs), 30) - visible_message("The electric roller bed went off!", "You hear a deep sharp shock!") + visible_message(span_danger("The electric roller bed went off!"), span_italics("You hear a deep sharp shock!")) /obj/structure/bed/roller/e_roller/proc/after_shock() cut_overlay(elec_cables) diff --git a/yogstation/code/game/objects/structures/fireaxe.dm b/yogstation/code/game/objects/structures/fireaxe.dm index 56589663f0ff..31fbdc77ed41 100644 --- a/yogstation/code/game/objects/structures/fireaxe.dm +++ b/yogstation/code/game/objects/structures/fireaxe.dm @@ -23,12 +23,12 @@ /obj/structure/fireaxecabinet/proc/check_deconstruct(obj/item/I, mob/user) if(istype(I, /obj/item/wrench) && !(flags_1 & NODECONSTRUCT_1) && !fireaxe && (open || broken || obj_integrity >= max_integrity)) //User is attempting to wrench an open/broken fireaxe cabinet with NO fireaxe in it - user.visible_message("[user] disassembles the [name].", \ + user.visible_message(span_warning("[user] disassembles the [name]."), \ "You start to disassemble the [name]...", \ - "You hear wrenching.") + span_italics("You hear wrenching.")) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 40/I.toolspeed, target = src)) - to_chat(user, "You disassemble the [name].") + to_chat(user, span_notice("You disassemble the [name].")) var/obj/item/stack/sheet/metal/M = new (loc, 3)//spawn three metal for deconstruction if (prob(50)) M.add_fingerprint(user) @@ -40,23 +40,23 @@ return else if(istype(I, /obj/item/wrench) && !(flags_1 & NODECONSTRUCT_1) && !broken && !open) //User is attempting to wrench a closed & non-broken fireaxe cab - to_chat(user, "You need to open the door first to access the [src]'s bolts!") + to_chat(user, span_warning("You need to open the door first to access the [src]'s bolts!")) //Still allow damage to pass through, in case they are trying to destroy the cab's window with the wrench. return else if(istype(I, /obj/item/wrench) && !(flags_1 & NODECONSTRUCT_1) && (open || broken) && fireaxe) //User is attempting to wrench an open and ready fireaxe cabinet, but the axe is still in it's slot. - to_chat(user, "You need to remove the fireaxe first to deconstruct the [src]!") + to_chat(user, span_warning("You need to remove the fireaxe first to deconstruct the [src]!")) return /obj/structure/fireaxecabinet/proc/reset_lock(mob/user) //this happens when you hack the lock as a synthetic/AI, or with a multitool. if(obj_flags & EMAGGED) - to_chat(user, "You try to reset the [name]'s circuits, but they're completely burnt out.") + to_chat(user, span_notice("You try to reset the [name]'s circuits, but they're completely burnt out.")) return if(!open) to_chat(user, "Resetting circuitry...") if(do_after(user, 100, target = src)) - to_chat(user, "You [locked ? "disable" : "re-enable"] the locking modules.") + to_chat(user, span_caution("You [locked ? "disable" : "re-enable"] the locking modules.")) src.add_fingerprint(user) toggle_lock(user) @@ -69,7 +69,7 @@ if (allowed(user)) toggle_lock() else - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) else //open the cabinet normally. toggle_open() @@ -77,7 +77,7 @@ /obj/structure/fireaxecabinet/toggle_lock(mob/user)//<-- mirrored/overwritten proc //this happens when you actuate the lock status. if(obj_flags & EMAGGED) - to_chat(user, "The [name]'s locking modules are unresponsive.") + to_chat(user, span_notice("The [name]'s locking modules are unresponsive.")) return if(!open) audible_message("You hear an audible clunk as the [name]'s bolt [locked ? "retracts" : "locks into place"].") @@ -90,9 +90,9 @@ if(obj_flags & EMAGGED) return if(!open && locked) - user.visible_message("Sparks fly out of the [src]'s locking modules!", \ - "You short out the [name]'s locking modules.", \ - "You hear electricity arcing.") + user.visible_message(span_warning("Sparks fly out of the [src]'s locking modules!"), \ + span_caution("You short out the [name]'s locking modules."), \ + span_italics("You hear electricity arcing.")) spark_system.start() src.add_fingerprint(user) diff --git a/yogstation/code/game/objects/structures/ghost_role_spawners.dm b/yogstation/code/game/objects/structures/ghost_role_spawners.dm index be9363bf04cc..0e05040098f9 100644 --- a/yogstation/code/game/objects/structures/ghost_role_spawners.dm +++ b/yogstation/code/game/objects/structures/ghost_role_spawners.dm @@ -13,8 +13,8 @@ if(ishuman(new_spawn)) var/mob/living/carbon/human/H = new_spawn H.grant_all_languages() // Is this powercreep? - to_chat(H, "You are familiar with these human's language. Use this to your advantage to communicate with those authentic with it.") - to_chat(new_spawn, "When you are close to death you will enter a chrysalis state where you will slowly regenerate. During this state you are very vunerable.") + to_chat(H, span_notice("You are familiar with these human's language. Use this to your advantage to communicate with those authentic with it.")) + to_chat(new_spawn, span_notice("When you are close to death you will enter a chrysalis state where you will slowly regenerate. During this state you are very vunerable.")) // Rebirth egg that ashwalkers regenerate in when they reach under 0 health. Takes time to regenerate. /obj/effect/cyrogenicbubble @@ -71,7 +71,7 @@ if(damage > health) ejectEgg() qdel(src) - visible_message("[M] [M.attacktext] [src]") + visible_message(span_warning("[M] [M.attacktext] [src]")) else health -= damage diff --git a/yogstation/code/game/objects/structures/table_frames.dm b/yogstation/code/game/objects/structures/table_frames.dm index f2d5232a7135..4e8caab767c1 100644 --- a/yogstation/code/game/objects/structures/table_frames.dm +++ b/yogstation/code/game/objects/structures/table_frames.dm @@ -13,9 +13,9 @@ if(istype(I, /obj/item/stack/sheet/mineral/bananium)) var/obj/item/stack/sheet/mineral/bananium/W = I if(W.get_amount() < 1) - to_chat(user, "You need one bananium sheet to do this!") + to_chat(user, span_warning("You need one bananium sheet to do this!")) return - to_chat(user, "You start adding [W] to [src]...") + to_chat(user, span_notice("You start adding [W] to [src]...")) if(do_after(user, 20, target = src) && W.use(1)) make_new_table(/obj/structure/table/bananium) else diff --git a/yogstation/code/modules/admin/admin_verbs.dm b/yogstation/code/modules/admin/admin_verbs.dm index 5c0131d98dcb..8caf8e78a490 100644 --- a/yogstation/code/modules/admin/admin_verbs.dm +++ b/yogstation/code/modules/admin/admin_verbs.dm @@ -65,13 +65,13 @@ mobs -= M if(special_role_req != "Everyone") - to_chat(src, "Selecting for players with [special_role_req] enabled") + to_chat(src, span_warning("Selecting for players with [special_role_req] enabled")) for(var/mob/M in mobs) if(!M.client || !(special_role_req in M.client.prefs.be_special)) mobs -= M if(!mobs.len) - to_chat(src, "Error: no valid mobs found via selected options.", confidential=TRUE) + to_chat(src, span_warning("Error: no valid mobs found via selected options."), confidential=TRUE) return var/mob/chosen_player = pick(mobs) diff --git a/yogstation/code/modules/admin/moja.dm b/yogstation/code/modules/admin/moja.dm index f4fb45f14d0e..ecd3e1d448c8 100644 --- a/yogstation/code/modules/admin/moja.dm +++ b/yogstation/code/modules/admin/moja.dm @@ -2,8 +2,8 @@ INVOKE_ASYNC(_moja_divulge()) /mob/living/proc/_moja_divulge() - visible_message("A vortex of violet energies surrounds [src]!", "Your barrier will keep you shielded to a point..") - visible_message("[src] slowly rises into the air, their belongings falling away, and begins to shimmer...", \ + visible_message(span_warning("A vortex of violet energies surrounds [src]!"), span_velvet("Your barrier will keep you shielded to a point..")) + visible_message(span_danger("[src] slowly rises into the air, their belongings falling away, and begins to shimmer..."), \ "You begin the removal of your human disguise. You will be completely vulnerable during this time.") setDir(SOUTH) for(var/obj/item/I in src) @@ -13,32 +13,32 @@ for(var/stage in 1 to 3) switch(stage) if(1) - visible_message("Vibrations pass through the air. [src]'s eyes begin to glow a deep violet.", \ + visible_message(span_userdanger("Vibrations pass through the air. [src]'s eyes begin to glow a deep violet."), \ "Psi floods into your consciousness. You feel your mind growing more powerful... expanding.") playsound(src, 'yogstation/sound/magic/divulge_01.ogg', 30, 0) if(2) - visible_message("Gravity fluctuates. Psychic tendrils extend outward and feel blindly around the area.", \ - "Gravity around you fluctuates. You tentatively reach out, feel with your mind.") + visible_message(span_userdanger("Gravity fluctuates. Psychic tendrils extend outward and feel blindly around the area."), \ + span_velvet("Gravity around you fluctuates. You tentatively reach out, feel with your mind.")) Shake(0, 3, 750) //50 loops in a second times 15 seconds = 750 loops playsound(src, 'yogstation/sound/magic/divulge_02.ogg', 40, 0) if(3) - visible_message("Sigils form along [src]'s body. \His skin blackens as \he glows a blinding purple.", \ - "Your body begins to warp. Sigils etch themselves upon your flesh.") + visible_message(span_userdanger("Sigils form along [src]'s body. \His skin blackens as \he glows a blinding purple."), \ + span_velvet("Your body begins to warp. Sigils etch themselves upon your flesh.")) animate(src, color = list(rgb(0, 0, 0), rgb(0, 0, 0), rgb(0, 0, 0), rgb(0, 0, 0)), time = 150) //Produces a slow skin-blackening effect playsound(src, 'yogstation/sound/magic/divulge_03.ogg', 50, 0) if(!do_after(src, 150, target = src)) - visible_message("[src] falls to the ground!", "Your transformation was interrupted!") + visible_message(span_warning("[src] falls to the ground!"), span_userdanger("Your transformation was interrupted!")) animate(src, color = initial(src.color), pixel_y = initial(src.pixel_y), time = 10) return playsound(src, 'yogstation/sound/magic/divulge_ending.ogg', 50, 0) - visible_message("[src] rises into the air, crackling with power!", "Your mind...! can't--- THINK--") + visible_message(span_userdanger("[src] rises into the air, crackling with power!"), "Your mind...! can't--- THINK--") animate(src, pixel_y = src.pixel_y + 8, time = 60) sleep(45) Shake(5, 5, 110) for(var/i in 1 to 20) to_chat(src, "[pick("I- I- I-", "Mind-", "Sigils-", "Can't think-", "POWER-","TAKE-", "M-M-MOOORE-")]") sleep(1.1) //Spooky flavor message spam - visible_message("A tremendous shockwave emanates from [src]!", "YOU ARE FREE!!") + visible_message(span_userdanger("A tremendous shockwave emanates from [src]!"), "YOU ARE FREE!!") playsound(src, 'yogstation/sound/magic/divulge_end.ogg', 50, 0) animate(src, color = initial(color), pixel_y = initial(pixel_y), time = 30) for(var/mob/living/L in view(7, src)) diff --git a/yogstation/code/modules/admin/sql_message_system.dm b/yogstation/code/modules/admin/sql_message_system.dm index 28b4ffb43799..e13f4624a7cf 100644 --- a/yogstation/code/modules/admin/sql_message_system.dm +++ b/yogstation/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) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return if(!type) return @@ -102,7 +102,7 @@ /proc/delete_message(message_id, logged = 1, browse) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return message_id = text2num(message_id) if(!message_id) @@ -138,7 +138,7 @@ /proc/edit_message(message_id, browse) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return message_id = text2num(message_id) if(!message_id) @@ -176,7 +176,7 @@ /proc/edit_message_expiry(message_id, browse) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return message_id = text2num(message_id) if(!message_id) @@ -238,7 +238,7 @@ /proc/toggle_message_secrecy(message_id) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return message_id = text2num(message_id) if(!message_id) @@ -270,7 +270,7 @@ /proc/browse_messages(type, target_ckey, index, linkless = FALSE, filter, agegate = FALSE) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return var/list/output = list() var/ruler = "
" @@ -477,7 +477,7 @@ /proc/get_message_output(type, target_ckey) if(!SSdbcore.Connect()) - to_chat(usr, "Failed to establish database connection.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection."), confidential=TRUE) return if(!type) return diff --git a/yogstation/code/modules/admin/topic.dm b/yogstation/code/modules/admin/topic.dm index 3b6c87f0c157..c99cc29eca0c 100644 --- a/yogstation/code/modules/admin/topic.dm +++ b/yogstation/code/modules/admin/topic.dm @@ -31,7 +31,7 @@ var/client/C = GLOB.directory[ckey] if(C) if(check_rights_for(C, R_ADMIN,0)) - to_chat(usr, "The client chosen is an admin! Cannot mentorize.", confidential=TRUE) + to_chat(usr, span_danger("The client chosen is an admin! Cannot mentorize."), confidential=TRUE) return new /datum/mentors(ckey, position) @@ -40,7 +40,7 @@ var/datum/DBQuery/query_get_mentor = SSdbcore.NewQuery("SELECT id FROM `[format_table_name("mentor")]` WHERE `ckey` = :ckey", list("ckey" = ckey)) query_get_mentor.warn_execute() if(query_get_mentor.NextRow()) - to_chat(usr, "[ckey] is already a mentor.", confidential=TRUE) + to_chat(usr, span_danger("[ckey] is already a mentor."), confidential=TRUE) qdel(query_get_mentor) return qdel(query_get_mentor) @@ -63,7 +63,7 @@ webhook_send_mchange(owner.ckey, C.ckey, "add") else - to_chat(usr, "Failed to establish database connection. The changes will last only for the current round.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection. The changes will last only for the current round."), confidential=TRUE) message_admins("[key_name_admin(usr)] added new [position]: [ckey]") log_admin("[key_name(usr)] added new [position]: [ckey]") @@ -81,7 +81,7 @@ var/client/C = GLOB.directory[ckey] if(C) if(check_rights_for(C, R_ADMIN,0)) - to_chat(usr, "The client chosen is an admin, not a mentor! Cannot de-mentorize.", confidential=TRUE) + to_chat(usr, span_danger("The client chosen is an admin, not a mentor! Cannot de-mentorize."), confidential=TRUE) return C.remove_mentor_verbs() @@ -96,7 +96,7 @@ webhook_send_mchange(owner.ckey, C.ckey, "remove") else - to_chat(usr, "Failed to establish database connection. The changes will last only for the current round.", confidential=TRUE) + to_chat(usr, span_danger("Failed to establish database connection. The changes will last only for the current round."), confidential=TRUE) message_admins("[key_name_admin(usr)] removed mentor: [ckey]") log_admin("[key_name(usr)] removed mentor: [ckey]") diff --git a/yogstation/code/modules/admin/verbs/adminhelp.dm b/yogstation/code/modules/admin/verbs/adminhelp.dm index dd1f50d45caf..102eb9ec17b1 100644 --- a/yogstation/code/modules/admin/verbs/adminhelp.dm +++ b/yogstation/code/modules/admin/verbs/adminhelp.dm @@ -165,7 +165,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.", confidential=TRUE) + to_chat(C, span_notice("No active admins are online, your adminhelp was sent to the admin irc."), confidential=TRUE) heard_by_no_admins = TRUE GLOB.ahelp_tickets.tickets_list += src @@ -250,11 +250,11 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) //Reopen a closed ticket /datum/admin_help/proc/Reopen() if(state == AHELP_ACTIVE) - to_chat(usr, "This ticket is already open.", confidential=TRUE) + to_chat(usr, span_warning("This ticket is already open."), confidential=TRUE) return if(GLOB.ahelp_tickets.CKey2ActiveTicket(initiator_ckey)) - to_chat(usr, "This user already has an active ticket, cannot reopen this one.", confidential=TRUE) + to_chat(usr, span_warning("This user already has an active ticket, cannot reopen this one."), confidential=TRUE) return switch(state) @@ -267,7 +267,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) state = AHELP_ACTIVE AddInteraction("Reopened by [usr.ckey]") - 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") @@ -316,7 +316,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/resolved = FALSE if(state == AHELP_RESOLVED) if(initiator.current_ticket) - to_chat(initiator, "This user already has an open ticket.", confidential=TRUE) + to_chat(initiator, span_warning("This user already has an open ticket."), confidential=TRUE) return AddActive() @@ -328,16 +328,16 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) resolved = TRUE GLOB.ahelp_tickets.ticketAmount -= 1 else // AHELP_CLOSED - to_chat(usr, "This ticket has been closed and can't be unresolved.", confidential=TRUE) + to_chat(usr, span_warning("This ticket has been closed and can't be unresolved."), confidential=TRUE) return if(resolved) AddInteraction("Ticket #[id] marked as resolved by [usr.ckey].") - to_chat(initiator, "Your ticket has been marked as resolved by [usr.client.holder?.fakekey ? "an Administrator" : key_name(usr, 0, 0)].", confidential=TRUE) + to_chat(initiator, span_adminhelp("Your ticket has been marked as resolved by [usr.client.holder?.fakekey ? "an Administrator" : key_name(usr, 0, 0)]."), confidential=TRUE) addtimer(CALLBACK(initiator, /client/proc/giveadminhelpverb), 50) else // AHELP_ACTIVE AddInteraction("Ticket #[id] marked as unresolved by [usr.ckey].") - to_chat(initiator, "Your ticket has been marked as unresolved by [usr.client.holder?.fakekey ? "an Administrator" : key_name(usr, 0, 0)].", confidential=TRUE) + to_chat(initiator, span_adminhelp("Your ticket has been marked as unresolved by [usr.client.holder?.fakekey ? "an Administrator" : key_name(usr, 0, 0)]."), confidential=TRUE) TimeoutVerb() if(!silent) @@ -697,7 +697,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/ai_found = (T.initiator && isAI(T.initiator_ckey)) content += {"

#[T.id] - [T.handling_admin ? "" : "Unclaimed"] [T.name]
+ [T.handling_admin ? "" : span_unclaimed("Unclaimed")] [T.name]
Owner: [key_name(T.initiator, 1)]
[T.handling_admin ? " Admin: [T.handling_admin]
" : ""] [T.TicketHref(" View")] @@ -800,12 +800,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.", confidential=TRUE) + to_chat(usr, span_danger("Speech is currently admin-disabled."), confidential=TRUE) return //handle muting and automuting if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Admin-PM: You cannot send adminhelps (Muted).", confidential=TRUE) + to_chat(src, span_danger("Error: Admin-PM: You cannot send adminhelps (Muted)."), confidential=TRUE) return if(handle_spam_prevention(msg,MUTE_ADMINHELP)) return @@ -823,7 +823,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...", confidential=TRUE) + to_chat(usr, span_warning("Ticket not found, creating new one..."), confidential=TRUE) else current_ticket.AddInteraction("[key_name_admin(usr)] opened a new ticket.") current_ticket.Close() diff --git a/yogstation/code/modules/admin/verbs/adminvox.dm b/yogstation/code/modules/admin/verbs/adminvox.dm index ff0460f47522..140b1964c108 100644 --- a/yogstation/code/modules/admin/verbs/adminvox.dm +++ b/yogstation/code/modules/admin/verbs/adminvox.dm @@ -35,7 +35,7 @@ else if(voxType == "Oscar (military)") // If we're doing the also yog-ly male AI vox voice but from Black Mesa voxlist = GLOB.vox_sounds_military else - to_chat(src,"Unknown or unsupported vox type. Yell at a coder about this.", confidential=TRUE) + to_chat(src,span_notice("Unknown or unsupported vox type. Yell at a coder about this."), confidential=TRUE) return for(var/word in words) // For each word @@ -47,7 +47,7 @@ incorrect_words += word if(incorrect_words.len) - to_chat(src, "These words are not available on the announcement system: [english_list(incorrect_words)].", confidential=TRUE) + to_chat(src, span_notice("These words are not available on the announcement system: [english_list(incorrect_words)]."), confidential=TRUE) return var/pitch = 0 diff --git a/yogstation/code/modules/admin/verbs/debug.dm b/yogstation/code/modules/admin/verbs/debug.dm index 2debfc462bdd..ded8a36b7287 100644 --- a/yogstation/code/modules/admin/verbs/debug.dm +++ b/yogstation/code/modules/admin/verbs/debug.dm @@ -12,12 +12,12 @@ var/list/a = subtypesof(msg) if(!a.len) - to_chat(src,"That type doesn't seem to exist!", confidential=TRUE) + to_chat(src,span_warning("That type doesn't seem to exist!"), confidential=TRUE) return if(a.len > 100) if(alert("That type has [a.len] derived types. Are you sure you want to have all of them spammed into your chatbox?",,"Yes","No") != "Yes") return - to_chat(usr,"Subtypes of [msg] ([a.len] Entries):", confidential=TRUE) + to_chat(usr,span_notice("Subtypes of [msg] ([a.len] Entries):"), confidential=TRUE) for(var/x in a) to_chat(usr,"[x]", confidential=TRUE) diff --git a/yogstation/code/modules/admin/verbs/queue.dm b/yogstation/code/modules/admin/verbs/queue.dm index 0d7e11c88d0b..7a443296ddc1 100644 --- a/yogstation/code/modules/admin/verbs/queue.dm +++ b/yogstation/code/modules/admin/verbs/queue.dm @@ -23,7 +23,7 @@ var/list/queue = SSticker.queued_players if(!queue.len) - to_chat(usr,"There is nobody in the server queue!", confidential=TRUE) + to_chat(usr,span_warning("There is nobody in the server queue!"), confidential=TRUE) return if(alert("Are you sure you want to allow [queue.len] people to skip the queue and join the game?",,"Yes","No") != "Yes") diff --git a/yogstation/code/modules/admin/verbs/shuttle_verbs.dm b/yogstation/code/modules/admin/verbs/shuttle_verbs.dm index 33709e942dcb..94cacca9ee76 100644 --- a/yogstation/code/modules/admin/verbs/shuttle_verbs.dm +++ b/yogstation/code/modules/admin/verbs/shuttle_verbs.dm @@ -15,7 +15,7 @@ log_admin("[key_name(usr)] has removed the admin-induced delay on the shuttle launching.") message_admins("[key_name(usr)] has removed the admin-induced delay on the shuttle launching.") else - to_chat(usr,"The shuttle is already delayed by something else!", confidential=TRUE) + to_chat(usr,span_warning("The shuttle is already delayed by something else!"), confidential=TRUE) return if(alert("Are you sure you want to delay the shuttle from launching?","Shuttle Delay","Yes","No") != "Yes") diff --git a/yogstation/code/modules/antagonists/blob/blob/blobs/core.dm b/yogstation/code/modules/antagonists/blob/blob/blobs/core.dm index cb315e2c0510..d990460f3882 100644 --- a/yogstation/code/modules/antagonists/blob/blob/blobs/core.dm +++ b/yogstation/code/modules/antagonists/blob/blob/blobs/core.dm @@ -2,4 +2,4 @@ . = ..() if(obj_integrity > 0) if(overmind) //we should have an overmind, but... - to_chat(overmind, "Your core is under attack!") \ No newline at end of file + to_chat(overmind, span_userdanger("Your core is under attack!")) \ No newline at end of file diff --git a/yogstation/code/modules/antagonists/darkspawn/crawling_shadows.dm b/yogstation/code/modules/antagonists/darkspawn/crawling_shadows.dm index 387e959d4e1e..15a72be7a237 100644 --- a/yogstation/code/modules/antagonists/darkspawn/crawling_shadows.dm +++ b/yogstation/code/modules/antagonists/darkspawn/crawling_shadows.dm @@ -44,7 +44,7 @@ /mob/living/simple_animal/hostile/crawling_shadows/Destroy() if(darkspawn_mob && mind) - visible_message("[src] transforms into a humanoid figure!", "You return to your normal form.") + visible_message(span_warning("[src] transforms into a humanoid figure!"), span_warning("You return to your normal form.")) playsound(src, 'yogstation/sound/magic/devour_will_end.ogg', 50, 1) if(mind) mind.transfer_to(darkspawn_mob) @@ -84,7 +84,7 @@ darkspawn_mob.forceMove(src) darkspawn_mob.status_flags |= GODMODE darkspawn_mob.mind.transfer_to(src) - to_chat(src, "This will last for around a minute.") + to_chat(src, span_warning("This will last for around a minute.")) var/datum/action/innate/darkspawn/end_shadows/E = new E.Grant(src) QDEL_IN(src, 600) @@ -95,23 +95,23 @@ if(H.stat) return ..() knocking_out = TRUE - visible_message("[src] pick up [H] and dangle \him in the air!", "You pluck [H] from the ground...") - to_chat(H, "[src] grab you and dangle you in the air!") + visible_message(span_warning("[src] pick up [H] and dangle \him in the air!"), span_notice("You pluck [H] from the ground...")) + to_chat(H, span_userdanger("[src] grab you and dangle you in the air!")) H.Stun(30) H.pixel_y += 4 if(!do_after(src, 10, target = target)) H.pixel_y -= 4 knocking_out = FALSE return - visible_message("[src] gently press a hand against [H]'s face, and \he falls limp...", "You quietly incapacitate [H].") + visible_message(span_warning("[src] gently press a hand against [H]'s face, and \he falls limp..."), span_notice("You quietly incapacitate [H].")) H.pixel_y -= 4 - to_chat(H, "[src] press a hand to your face, and docility comes over you...") + to_chat(H, span_userdanger("[src] press a hand to your face, and docility comes over you...")) H.Paralyze(60) knocking_out = FALSE return TRUE else if(istype(target, /obj/machinery/door)) forceMove(get_turf(target)) - visible_message("Shadows creep through [target]...", "You slip through [target].") + visible_message(span_warning("Shadows creep through [target]..."), span_notice("You slip through [target].")) return ..() diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm index 2a3d509d690f..3d0026df81bc 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm @@ -125,44 +125,44 @@ if(!id) return if(has_ability(id)) - to_chat(admin, "[owner.current] already has this ability!") + to_chat(admin, span_warning("[owner.current] already has this ability!")) return if(id != "all") add_ability(id) - to_chat(admin, "Gave [owner.current] the ability \"[id]\".") + to_chat(admin, span_notice("Gave [owner.current] the ability \"[id]\".")) else for(var/V in subtypesof(/datum/action/innate/darkspawn)) var/datum/action/innate/darkspawn/D = V if(!has_ability(initial(D.id)) && !initial(D.blacklisted)) add_ability(initial(D.id)) - to_chat(admin, "Gave [owner.current] all abilities.") + to_chat(admin, span_notice("Gave [owner.current] all abilities.")) /datum/antagonist/darkspawn/proc/admin_take_ability(mob/admin) var/id = stripped_input(admin, "Enter an ability ID.", "Take Ability") if(!id) return if(!has_ability(id)) - to_chat(admin, "[owner.current] does not have this ability!") + to_chat(admin, span_warning("[owner.current] does not have this ability!")) return remove_ability(id) - to_chat(admin, "Took from [owner.current] the ability \"[id]\".") + to_chat(admin, span_danger("Took from [owner.current] the ability \"[id]\".")) /datum/antagonist/darkspawn/proc/admin_give_upgrade(mob/admin) var/id = stripped_input(admin, "Enter an upgrade ID, for \"all\" to give all of them.", "Give Upgrade") if(!id) return if(has_upgrade(id)) - to_chat(admin, "[owner.current] already has this upgrade!") + to_chat(admin, span_warning("[owner.current] already has this upgrade!")) return if(id != "all") add_upgrade(id) - to_chat(admin, "Gave [owner.current] the upgrade \"[id]\".") + to_chat(admin, span_notice("Gave [owner.current] the upgrade \"[id]\".")) else for(var/V in subtypesof(/datum/darkspawn_upgrade)) var/datum/darkspawn_upgrade/D = V if(!has_upgrade(initial(D.id))) add_upgrade(initial(D.id)) - to_chat(admin, "Gave [owner.current] all upgrades.") + to_chat(admin, span_notice("Gave [owner.current] all upgrades.")) /datum/antagonist/darkspawn/proc/admin_edit_psi(mob/admin) var/new_psi = input(admin, "Enter a new psi amount. (Current: [psi]/[psi_cap])", "Change Psi", psi) as null|num @@ -189,7 +189,7 @@ to_chat(owner.current, "You are a darkspawn!") to_chat(owner.current, "Append :[MODE_KEY_DARKSPAWN] or .[MODE_KEY_DARKSPAWN] before your message to silently speak with any other darkspawn.") to_chat(owner.current, "When you're ready, retreat to a hidden location and Divulge to shed your human skin.") - to_chat(owner.current, "If you do not do this within twenty five minutes, this will happen involuntarily. Prepare quickly.") + to_chat(owner.current, span_boldwarning("If you do not do this within twenty five minutes, this will happen involuntarily. Prepare quickly.")) to_chat(owner.current, "Remember that this will make you die in the light and heal in the dark - keep to the shadows.") owner.current.playsound_local(get_turf(owner.current), 'yogstation/sound/ambience/antag/darkspawn.ogg', 50, FALSE) @@ -313,7 +313,7 @@ /datum/antagonist/darkspawn/proc/begin_force_divulge() if(darkspawn_state != MUNDANE) return - to_chat(owner.current, "You feel the skin you're wearing crackling like paper - you will forcefully divulge soon! Get somewhere hidden and dark!") + to_chat(owner.current, span_userdanger("You feel the skin you're wearing crackling like paper - you will forcefully divulge soon! Get somewhere hidden and dark!")) owner.current.playsound_local(owner.current, 'yogstation/sound/magic/divulge_01.ogg', 50, FALSE, pressure_affected = FALSE) addtimer(CALLBACK(src, .proc/force_divulge), 1200) @@ -326,8 +326,8 @@ var/mob/living/carbon/human/H = owner.current if(!H) owner.current.gib(TRUE) - H.visible_message("[H]'s skin begins to slough off in sheets!", \ - "You can't maintain your disguise any more! It begins sloughing off!") + H.visible_message(span_boldwarning("[H]'s skin begins to slough off in sheets!"), \ + span_userdanger("You can't maintain your disguise any more! It begins sloughing off!")) playsound(H, 'yogstation/sound/creatures/darkspawn_force_divulge.ogg', 50, FALSE) H.do_jitter_animation(1000) var/processed_message = "\[Mindlink\] [H.real_name] has not divulged in time and is now forcefully divulging." @@ -338,8 +338,8 @@ else if(isdarkspawn(M)) to_chat(M, processed_message) addtimer(CALLBACK(src, .proc/divulge), 25) - addtimer(CALLBACK(/atom/.proc/visible_message, H, "[H]'s skin sloughs off, revealing black flesh covered in symbols!", \ - "You have forcefully divulged!"), 25) + addtimer(CALLBACK(/atom/.proc/visible_message, H, span_boldwarning("[H]'s skin sloughs off, revealing black flesh covered in symbols!"), \ + span_userdanger("You have forcefully divulged!")), 25) /datum/antagonist/darkspawn/proc/divulge() if(darkspawn_state >= DIVULGED) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_divulge.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_divulge.dm index a5852208cc79..b339e29ce9bf 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_divulge.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_divulge.dm @@ -12,28 +12,28 @@ var/mob/living/carbon/human/user = usr var/turf/spot = get_turf(user) if(!ishuman(user)) - to_chat(user, "You need to be human-er to do that!") + to_chat(user, span_warning("You need to be human-er to do that!")) return if(spot.get_lumcount() > DARKSPAWN_DIM_LIGHT) - to_chat(user, "You are only able to divulge in darkness!") + to_chat(user, span_warning("You are only able to divulge in darkness!")) return if(alert(user, "You are ready to divulge. Are you sure?", name, "Yes", "No") == "No") return in_use = TRUE if(istype(user.dna.species, /datum/species/pod)) - to_chat(user, "Your disguise is stabilized by the divulgance...") + to_chat(user, span_notice("Your disguise is stabilized by the divulgance...")) user.reagents.add_reagent(/datum/reagent/medicine/salbutamol,20) if(istype(user.dna.species, /datum/species/plasmaman)) - to_chat(user, "Your bones harden to protect you from the atmosphere...") + to_chat(user, span_notice("Your bones harden to protect you from the atmosphere...")) user.set_species(/datum/species/skeleton) - user.visible_message("[user] flaps their wings.", "You begin creating a psychic barrier around yourself...") + user.visible_message("[user] flaps their wings.", span_velvet("You begin creating a psychic barrier around yourself...")) if(!do_after(user, 30, target = user)) in_use = FALSE return var/image/alert_overlay = image('yogstation/icons/mob/actions/actions_darkspawn.dmi', "divulge") notify_ghosts("Darkspawn [user.real_name] has begun divulging at [get_area(user)]! ", source = user, ghost_sound = 'yogstation/sound/magic/devour_will_victim.ogg', alert_overlay = alert_overlay, action = NOTIFY_ORBIT) - user.visible_message("A vortex of violet energies surrounds [user]!", "Your barrier will keep you shielded to a point..") - user.visible_message("[user] slowly rises into the air, their belongings falling away, and begins to shimmer...", \ + user.visible_message(span_warning("A vortex of violet energies surrounds [user]!"), span_velvet("Your barrier will keep you shielded to a point..")) + user.visible_message(span_danger("[user] slowly rises into the air, their belongings falling away, and begins to shimmer..."), \ "You begin the removal of your human disguise. You will be completely vulnerable during this time.") user.setDir(SOUTH) for(var/obj/item/I in user) @@ -43,33 +43,33 @@ for(var/stage in 1 to 3) switch(stage) if(1) - user.visible_message("Vibrations pass through the air. [user]'s eyes begin to glow a deep violet.", \ + user.visible_message(span_userdanger("Vibrations pass through the air. [user]'s eyes begin to glow a deep violet."), \ "Psi floods into your consciousness. You feel your mind growing more powerful... expanding.") playsound(user, 'yogstation/sound/magic/divulge_01.ogg', 30, 0) if(2) - user.visible_message("Gravity fluctuates. Psychic tendrils extend outward and feel blindly around the area.", \ - "Gravity around you fluctuates. You tentatively reach out, feel with your mind.") + user.visible_message(span_userdanger("Gravity fluctuates. Psychic tendrils extend outward and feel blindly around the area."), \ + span_velvet("Gravity around you fluctuates. You tentatively reach out, feel with your mind.")) user.Shake(0, 3, 750) //50 loops in a second times 15 seconds = 750 loops playsound(user, 'yogstation/sound/magic/divulge_02.ogg', 40, 0) if(3) - user.visible_message("Sigils form along [user]'s body. \His skin blackens as \he glows a blinding purple.", \ - "Your body begins to warp. Sigils etch themselves upon your flesh.") + user.visible_message(span_userdanger("Sigils form along [user]'s body. \His skin blackens as \he glows a blinding purple."), \ + span_velvet("Your body begins to warp. Sigils etch themselves upon your flesh.")) animate(user, color = list(rgb(0, 0, 0), rgb(0, 0, 0), rgb(0, 0, 0), rgb(0, 0, 0)), time = 150) //Produces a slow skin-blackening effect playsound(user, 'yogstation/sound/magic/divulge_03.ogg', 50, 0) if(!do_after(user, 150, target = user)) - user.visible_message("[user] falls to the ground!", "Your transformation was interrupted!") + user.visible_message(span_warning("[user] falls to the ground!"), span_userdanger("Your transformation was interrupted!")) animate(user, color = initial(user.color), pixel_y = initial(user.pixel_y), time = 10) in_use = FALSE return playsound(user, 'yogstation/sound/magic/divulge_ending.ogg', 50, 0) - user.visible_message("[user] rises into the air, crackling with power!", "Your mind...! can't--- THINK--") + user.visible_message(span_userdanger("[user] rises into the air, crackling with power!"), "Your mind...! can't--- THINK--") animate(user, pixel_y = user.pixel_y + 8, time = 60) sleep(45) user.Shake(5, 5, 110) for(var/i in 1 to 20) to_chat(user, "[pick("I- I- I-", "Mind-", "Sigils-", "Can't think-", "POWER-","TAKE-", "M-M-MOOORE-")]") sleep(1.1) //Spooky flavor message spam - user.visible_message("A tremendous shockwave emanates from [user]!", "YOU ARE FREE!!") + user.visible_message(span_userdanger("A tremendous shockwave emanates from [user]!"), "YOU ARE FREE!!") playsound(user, 'yogstation/sound/magic/divulge_end.ogg', 50, 0) animate(user, color = initial(user.color), pixel_y = initial(user.pixel_y), time = 30) for(var/mob/living/L in view(7, user)) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm index 1fdc56e5f167..91b2e381e896 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm @@ -13,7 +13,7 @@ darkspawn.sacrament() return if(!darkspawn || darkspawn.lucidity_drained < SSticker.mode.required_succs) - to_chat(usr, "You do not have enough unique lucidity! ([darkspawn.lucidity_drained] / [SSticker.mode.required_succs])") + to_chat(usr, span_warning("You do not have enough unique lucidity! ([darkspawn.lucidity_drained] / [SSticker.mode.required_succs])")) return var/list/unpurchased_upgrades = list() for(var/V in subtypesof(/datum/darkspawn_upgrade)) @@ -28,15 +28,15 @@ return in_use = TRUE var/mob/living/carbon/human/user = usr - user.visible_message("[user]'s sigils flare as energy swirls around them...", "You begin creating a psychic barrier around yourself...") + user.visible_message(span_warning("[user]'s sigils flare as energy swirls around them..."), span_velvet("You begin creating a psychic barrier around yourself...")) playsound(user, 'yogstation/sound/magic/sacrament_begin.ogg', 50, FALSE) if(!do_after(user, 30, target = user)) in_use = FALSE return var/image/alert_overlay = image('yogstation/icons/mob/actions/actions_darkspawn.dmi', "sacrament") notify_ghosts("Darkspawn [user.real_name] has begun the Sacrament at [get_area(user)]! ", source = user, ghost_sound = 'yogstation/sound/magic/devour_will_victim.ogg', alert_overlay = alert_overlay, action = NOTIFY_ORBIT) - user.visible_message("A vortex of violet energies surrounds [user]!", "Your barrier will protect you.") - user.visible_message("[user] suddenly jolts into the air, pulsing with screaming violet light.", \ + user.visible_message(span_warning("A vortex of violet energies surrounds [user]!"), span_velvet("Your barrier will protect you.")) + user.visible_message(span_danger("[user] suddenly jolts into the air, pulsing with screaming violet light."), \ "You begin the Sacrament.") soundloop = new(GLOB.player_list, TRUE, TRUE) for(var/turf/T in RANGE_TURFS(2, user)) @@ -45,12 +45,12 @@ soundloop.stage = stage switch(stage) if(1) - user.visible_message("[user]'s sigils howl out light. Their limbs twist and move, glowing cracks forming across their chitin.", \ + user.visible_message(span_userdanger("[user]'s sigils howl out light. Their limbs twist and move, glowing cracks forming across their chitin."), \ "Power... power... flooding through you, the dreams and thoughts of those you've touched whispering in your ears...") for(var/mob/M in GLOB.player_list) M.playsound_local(M, 'yogstation/sound/magic/sacrament_01.ogg', 20, FALSE, pressure_affected = FALSE) if(M != user) - to_chat(M, "What is that sound...?") + to_chat(M, span_warning("What is that sound...?")) if(2) user.visible_message("[user] begins to... grow..", \ "Yes! Yes! You feel the weak mortal shell coming apart!") @@ -58,7 +58,7 @@ M.playsound_local(M, 'yogstation/sound/magic/sacrament_02.ogg', 20, FALSE, pressure_affected = FALSE) animate(user, transform = matrix() * 2, time = 150) if(!do_after(user, 150, target = user)) - user.visible_message("[user] falls to the ground!", "Your transformation was interrupted!") + user.visible_message(span_warning("[user] falls to the ground!"), span_userdanger("Your transformation was interrupted!")) animate(user, transform = matrix(), pixel_y = initial(user.pixel_y), time = 30) in_use = FALSE QDEL_NULL(soundloop) @@ -66,7 +66,7 @@ for(var/mob/M in GLOB.player_list) M.playsound_local(M, 'yogstation/sound/magic/sacrament_ending.ogg', 75, FALSE, pressure_affected = FALSE) soundloop.stage = 3 - user.visible_message("[user] rises into the air, crackling with power!", "AND THE WEAK WILL KNOW FEAR--") + user.visible_message(span_userdanger("[user] rises into the air, crackling with power!"), "AND THE WEAK WILL KNOW FEAR--") for(var/turf/T in range(7, owner)) if(prob(25)) addtimer(CALLBACK(src, .proc/unleashed_psi, T), rand(1, 40)) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/crawling_shadows.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/crawling_shadows.dm index 7825884de319..1153398e310c 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/crawling_shadows.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/crawling_shadows.dm @@ -15,7 +15,7 @@ return ..() /datum/action/innate/darkspawn/crawling_shadows/Activate() - owner.visible_message("[owner] falls to the ground and transforms into a shadowy creature!", "sa iahz sepd zwng\n\ + owner.visible_message(span_warning("[owner] falls to the ground and transforms into a shadowy creature!"), "sa iahz sepd zwng\n\ You assume a stealthier form.") playsound(owner, 'yogstation/sound/magic/devour_will_end.ogg', 50, 1) var/mob/living/simple_animal/hostile/crawling_shadows/CS = new /mob/living/simple_animal/hostile/crawling_shadows(get_turf(owner)) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/creep.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/creep.dm index 3287c7886542..b2d94f09469d 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/creep.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/creep.dm @@ -20,12 +20,12 @@ /datum/action/innate/darkspawn/creep/Activate() var/mob/living/L = owner - owner.visible_message("Velvety shadows coalesce around [owner]!", "odeahz
You begin using Psi to shield yourself from lightburn.") + owner.visible_message(span_warning("Velvety shadows coalesce around [owner]!"), "odeahz
You begin using Psi to shield yourself from lightburn.") playsound(owner, 'yogstation/sound/magic/devour_will_victim.ogg', 50, TRUE) L.apply_status_effect(STATUS_EFFECT_CREEP, darkspawn) /datum/action/innate/darkspawn/creep/Deactivate() var/mob/living/L = owner - to_chat(owner, "You release your grip on the shadows.") + to_chat(owner, span_velvet("You release your grip on the shadows.")) playsound(owner, 'yogstation/sound/magic/devour_will_end.ogg', 50, TRUE) L.remove_status_effect(STATUS_EFFECT_CREEP) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/demented_outburst.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/demented_outburst.dm index 0f0e8e81577d..8eed68b2dd34 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/demented_outburst.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/demented_outburst.dm @@ -10,7 +10,7 @@ /datum/action/innate/darkspawn/demented_outburst/Activate() in_use = TRUE - owner.visible_message("[owner] begins to growl as their chitin hardens...", "cap...
\ + owner.visible_message(span_boldwarning("[owner] begins to growl as their chitin hardens..."), "cap...
\ You begin harnessing your power...") playsound(owner, 'yogstation/sound/magic/demented_outburst_charge.ogg', 50, 0) addtimer(CALLBACK(src, .proc/outburst, owner), 50) @@ -26,7 +26,7 @@ in_use = FALSE if(!owner || owner.stat) return - owner.visible_message("[owner] lets out a deafening scream!", "WSWU!
\ + owner.visible_message(span_userdanger("[owner] lets out a deafening scream!"), "WSWU!
\ You let out a deafening outburst!") playsound(owner, 'yogstation/sound/magic/demented_outburst_scream.ogg', 75, 0) var/list/thrown_atoms = list() @@ -43,19 +43,19 @@ if(iscarbon(AM)) var/mob/living/carbon/C = AM if(distance <= 1) //you done fucked up now - C.visible_message("The blast sends [C] flying!", "The force sends you flying!") + C.visible_message(span_warning("The blast sends [C] flying!"), span_userdanger("The force sends you flying!")) C.Paralyze(50) C.Knockdown(50) C.adjustBruteLoss(10) C.soundbang_act(1, 5, 15, 5) else if(distance <= 3) - C.visible_message("The blast knocks [C] off their feet!", "The force bowls you over!") + C.visible_message(span_warning("The blast knocks [C] off their feet!"), span_userdanger("The force bowls you over!")) C.Paralyze(25) C.Knockdown(30) C.soundbang_act(1, 3, 5, 0) if(iscyborg(AM)) var/mob/living/silicon/robot/R = AM - R.visible_message("The blast sends [R] flying!", "The force sends you flying!") + R.visible_message(span_warning("The blast sends [R] flying!"), span_userdanger("The force sends you flying!")) R.Paralyze(100) //fuck borgs R.soundbang_act(1, 5, 15, 5) return TRUE diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/devour_will.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/devour_will.dm index a9eab6bdcc50..f3f787d20ed6 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/devour_will.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/devour_will.dm @@ -21,7 +21,7 @@ return ..() /datum/action/innate/darkspawn/devour_will/Activate() - owner.visible_message("A glowing black orb appears in [owner]'s hand!", "pwga...iejz
\ + owner.visible_message(span_warning("A glowing black orb appears in [owner]'s hand!"), "pwga...iejz
\ You form a dark bead in your hand.") playsound(owner, 'yogstation/sound/magic/devour_will_form.ogg', 50, 1) var/obj/item/dark_bead/B = new @@ -33,5 +33,5 @@ if(!L || !victims[L]) return victims[L] = FALSE - to_chat(owner, "[L] has recovered from their draining and is vulnerable to Devour Will again.") + to_chat(owner, span_notice("[L] has recovered from their draining and is vulnerable to Devour Will again.")) return TRUE diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/pass.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/pass.dm index 13c544d558fa..0bf81c95ab7d 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/pass.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/pass.dm @@ -22,17 +22,17 @@ /datum/action/innate/darkspawn/pass/Activate() var/mob/living/carbon/C = owner if(!(C.mobility_flags & MOBILITY_STAND)) - to_chat(owner, "Stand up first!") + to_chat(owner, span_warning("Stand up first!")) return var/list/hands_free = owner.get_empty_held_indexes() if(!darkspawn.upgrades["twin_tendrils"] || hands_free.len < 2) - owner.visible_message("[owner]'s arm contorts into tentacles!", "ikna
\ + owner.visible_message(span_warning("[owner]'s arm contorts into tentacles!"), "ikna
\ You transform your arm into umbral tendrils. Examine them to see possible uses.") playsound(owner, 'yogstation/sound/magic/pass_create.ogg', 50, 1) var/obj/item/umbral_tendrils/T = new(owner, darkspawn) owner.put_in_hands(T) else - owner.visible_message("[owner]'s arms contort into tentacles!", "ikna ikna
\ + owner.visible_message(span_warning("[owner]'s arms contort into tentacles!"), "ikna ikna
\ You transform both arms into umbral tendrils. Examine them to see possible uses.") playsound(owner, 'yogstation/sound/magic/pass_create.ogg', 50, TRUE) addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, owner, 'yogstation/sound/magic/pass_create.ogg', 50, TRUE), 1) @@ -42,7 +42,7 @@ return TRUE /datum/action/innate/darkspawn/pass/Deactivate() - owner.visible_message("[owner]'s tentacles transform back!", "haoo
\ + owner.visible_message(span_warning("[owner]'s tentacles transform back!"), "haoo
\ You dispel the tendrils.") playsound(owner, 'yogstation/sound/magic/pass_dispel.ogg', 50, 1) for(var/obj/item/umbral_tendrils/T in owner) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/silver_tongue.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/silver_tongue.dm index 80c61831ee8e..154390813400 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/silver_tongue.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/silver_tongue.dm @@ -17,12 +17,12 @@ in_use = TRUE var/obj/machinery/computer/communications/C = locate() in range(1, owner) if(!C) - to_chat(owner, "There are no communications consoles nearby") + to_chat(owner, span_warning("There are no communications consoles nearby")) return if(C.stat) - to_chat(owner, "[C] is depowered.") + to_chat(owner, span_warning("[C] is depowered.")) return - owner.visible_message("[owner] briefly touches [src]'s screen, and the keys begin to move by themselves!", \ + owner.visible_message(span_warning("[owner] briefly touches [src]'s screen, and the keys begin to move by themselves!"), \ "[pick("Oknnu. Pda ywlpwej swo hkccaz ej.", "Pda aiancajyu eo kran. Oknnu bkn swopejc ukqn peia.", "We swo knzanaz xu Hws Psk. Whh ckkz jks.")]
\ You begin transmitting a recall message to Central Command...") play_recall_sounds(C) @@ -33,12 +33,12 @@ in_use = FALSE return if(C.stat) - to_chat(owner, "[C] has lost power.") + to_chat(owner, span_warning("[C] has lost power.")) in_use = FALSE return in_use = FALSE SSshuttle.emergency.cancel() - to_chat(owner, "The ruse was a success. The shuttle is on its way back.") + to_chat(owner, span_velvet("The ruse was a success. The shuttle is on its way back.")) return TRUE /datum/action/innate/darkspawn/silver_tongue/proc/play_recall_sounds(obj/machinery/C) //neato sound effects diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/simulacrum.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/simulacrum.dm index f3ceeda2a39e..bbe4d195f89f 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/simulacrum.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/simulacrum.dm @@ -11,11 +11,11 @@ /datum/action/innate/darkspawn/simulacrum/Activate() if(isliving(owner.loc)) var/mob/living/L = owner.loc - L.visible_message("[owner] breaks away from [L]'s shadow!", \ - "You feel a sense of freezing cold pass through you!") + L.visible_message(span_warning("[owner] breaks away from [L]'s shadow!"), \ + span_userdanger("You feel a sense of freezing cold pass through you!")) to_chat(owner, "zayaera
You create an illusion of yourself.") else - owner.visible_message("[owner] splits in two!", \ + owner.visible_message(span_warning("[owner] splits in two!"), \ "zayaera
You create an illusion of yourself.") playsound(owner, 'yogstation/sound/magic/devour_will_form.ogg', 50, 1) var/obj/effect/simulacrum/simulacrum = new(get_turf(owner)) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/tagalong.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/tagalong.dm index 8785647b7a84..2870ef271f3f 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/tagalong.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/tagalong.dm @@ -23,7 +23,7 @@ QDEL_NULL(tagalong) return if(owner.get_active_held_item() || owner.get_inactive_held_item()) - to_chat(owner, "Your hands must be empty to accompany someone!") + to_chat(owner, span_warning("Your hands must be empty to accompany someone!")) return var/list/targets = list() var/mob/living/target @@ -33,7 +33,7 @@ if(!isdarkspawn(L) && L.stat != DEAD && T.get_lumcount() >= DARKSPAWN_DIM_LIGHT) targets += L if(!targets.len) - to_chat(owner, "There is nobody nearby in any lit areas!") + to_chat(owner, span_warning("There is nobody nearby in any lit areas!")) return if(targets.len == 1) target = targets[1] diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/time_dilation.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/time_dilation.dm index 66bbabe4680f..e021fd1d9470 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/time_dilation.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/time_dilation.dm @@ -16,7 +16,7 @@ /datum/action/innate/darkspawn/time_dilation/Activate() var/mob/living/L = owner L.apply_status_effect(STATUS_EFFECT_TIME_DILATION) - L.visible_message("[L] howls as their body moves at wild speeds!", \ + L.visible_message(span_warning("[L] howls as their body moves at wild speeds!"), \ "ckppw ck bwop
Your sigils howl out light as your body moves at incredible speed!") playsound(L, 'yogstation/sound/creatures/darkspawn_howl.ogg', 50, TRUE) return TRUE diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/veil_mind.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/veil_mind.dm index 1024f8cccff1..c8c40408e9e8 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/veil_mind.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/veil_mind.dm @@ -11,14 +11,14 @@ /datum/action/innate/darkspawn/veil_mind/Activate() var/mob/living/carbon/human/H = owner if(!H.can_speak_vocal()) - to_chat(H, "You can't speak!") + to_chat(H, span_warning("You can't speak!")) return - owner.visible_message("[owner]'s sigils flare as they inhale...", "dawn kqn okjc...
\ + owner.visible_message(span_warning("[owner]'s sigils flare as they inhale..."), "dawn kqn okjc...
\ You take a deep breath...") playsound(owner, 'yogstation/sound/ambience/antag/veil_mind_gasp.ogg', 25) if(!do_after(owner, 10, target = owner)) return - owner.visible_message("[owner] lets out a chilling cry!", "...wjz oanra
\ + owner.visible_message(span_boldwarning("[owner] lets out a chilling cry!"), "...wjz oanra
\ You veil the minds of everyone nearby.") playsound(owner, 'yogstation/sound/ambience/antag/veil_mind_scream.ogg', 100) for(var/mob/living/L in view(3, owner)) @@ -33,13 +33,13 @@ L.clear_fullscreen("flash", 10) else if(HAS_TRAIT(L, TRAIT_DEAF)) - to_chat(L, "...but you can't hear it!") + to_chat(L, span_warning("...but you can't hear it!")) else if(L.has_status_effect(STATUS_EFFECT_BROKEN_WILL)) if(L.add_veil()) to_chat(owner, "[L.real_name] has become a veil!") else - to_chat(L, "...and it scrambles your thoughts!") + to_chat(L, span_boldwarning("...and it scrambles your thoughts!")) L.dir = pick(GLOB.cardinals) L.confused += 2 return TRUE diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm index 99c2e89d3ff4..7e810939aba3 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm @@ -23,7 +23,7 @@ /obj/item/dark_bead/Destroy(force) if(isliving(loc) && !eating && !force) - to_chat(loc, "You were too slow! [src] faded away...") + to_chat(loc, span_warning("You were too slow! [src] faded away...")) if(!eating || force) . = ..() else @@ -41,23 +41,23 @@ qdel(src) return if(!L.mind || isdarkspawn(L)) - to_chat(user, "You cannot drain allies or the mindless.") + to_chat(user, span_warning("You cannot drain allies or the mindless.")) return if(!L.health || L.stat) - to_chat(user, "[L] is too weak to drain.") + to_chat(user, span_warning("[L] is too weak to drain.")) return if(linked_ability.victims[L]) - to_chat(user, "[L] must be given time to recover from their last draining.") + to_chat(user, span_warning("[L] must be given time to recover from their last draining.")) return if(linked_ability.last_victim == L.ckey) - to_chat(user, "[L]'s mind is still too scrambled. Drain someone else first.") + to_chat(user, span_warning("[L]'s mind is still too scrambled. Drain someone else first.")) return if(isveil(L)) full_restore = FALSE - to_chat(user, "[L] has been veiled and will not produce as much psi as an unmodified victim.") + to_chat(user, span_warning("[L] has been veiled and will not produce as much psi as an unmodified victim.")) eating = TRUE if(user.loc != L) - user.visible_message("[user] grabs [L] and leans in close...", "cera qo...
\ + user.visible_message(span_warning("[user] grabs [L] and leans in close..."), "cera qo...
\ You begin siphoning [L]'s mental energy...") to_chat(L, "AAAAAAAAAAAAAA-") L.Stun(50) @@ -65,7 +65,7 @@ playsound(L, 'yogstation/sound/magic/devour_will.ogg', 65, FALSE) //T A S T Y S O U L S if(!do_mob(user, L, 30)) user.Knockdown(30) - to_chat(L, "All right. You're all right.") + to_chat(L, span_boldwarning("All right. You're all right.")) L.Knockdown(30) qdel(src, force = TRUE) return @@ -77,11 +77,11 @@ playsound(L, 'yogstation/sound/magic/devour_will_long.ogg', 65, FALSE) if(!do_mob(user, L, 50)) user.Knockdown(50) - to_chat(L, "All right. You're all right.") + to_chat(L, span_boldwarning("All right. You're all right.")) L.Knockdown(50) qdel(src, force = TRUE) return - user.visible_message("[user] gently lowers [L] to the ground...", "...aranupdejc
\ + user.visible_message(span_warning("[user] gently lowers [L] to the ground..."), "...aranupdejc
\ You devour [L]'s will. Your Psi has been [!full_restore ? "partially restored." : "fully restored.\n\ Additionally, you have gained one lucidity. Use it to purchase and upgrade abilities."]
\ [L] is now severely weakened and will take some time to recover. \ @@ -100,7 +100,7 @@ darkspawn.update_psi_hud() linked_ability.victims[L] = TRUE linked_ability.last_victim = L.ckey - to_chat(L, "You suddenly feel... empty. Thoughts try to form, but flit away. You slip into a deep, deep slumber...") + to_chat(L, span_userdanger("You suddenly feel... empty. Thoughts try to form, but flit away. You slip into a deep, deep slumber...")) L.playsound_local(L, 'yogstation/sound/magic/devour_will_end.ogg', 75, FALSE) L.Unconscious(15) L.apply_effect(EFFECT_STUTTER, 20) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/psionic_barrier.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/psionic_barrier.dm index 504b7329f786..281aab20764d 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/psionic_barrier.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/psionic_barrier.dm @@ -22,7 +22,7 @@ /obj/structure/psionic_barrier/Destroy() if(!obj_integrity) - visible_message("[src] vanishes in a burst of violet energy!") + visible_message(span_warning("[src] vanishes in a burst of violet energy!")) playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 50, TRUE) new/obj/effect/temp_visual/revenant/cracks(get_turf(src)) STOP_PROCESSING(SSprocessing, src) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/umbral_tendrils.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/umbral_tendrils.dm index 203ed86a4ec8..653f6fbbcad9 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/umbral_tendrils.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/umbral_tendrils.dm @@ -37,9 +37,9 @@ to_chat(user, "Help intent: Click on an open tile within seven tiles to jump to it for 10 Psi.") to_chat(user, "Disarm intent: Click on an airlock to force it open for 15 Psi (or 30 if it's bolted.)") to_chat(user, "Harm intent: Fire a projectile that travels up to five tiles, knocking down[twin ? " and pulling forwards" : ""] the first creature struck.") - to_chat(user, "The tendrils will break any lights hit in melee,") - to_chat(user, "The tendrils will shatter light fixtures instantly, as opposed to in several attacks.") - to_chat(user, "Also functions to pry open depowered airlocks on any intent other than harm.") + to_chat(user, span_velvet("The tendrils will break any lights hit in melee,")) + to_chat(user, span_velvet("The tendrils will shatter light fixtures instantly, as opposed to in several attacks.")) + to_chat(user, span_velvet("Also functions to pry open depowered airlocks on any intent other than harm.")) /obj/item/umbral_tendrils/attack(mob/living/target, mob/living/user, twinned_attack = TRUE) set waitfor = FALSE @@ -53,7 +53,7 @@ return if(proximity) if(istype(target, /obj/structure/glowshroom)) - visible_message("[src] tears [target] to shreds!") + visible_message(span_warning("[src] tears [target] to shreds!")) qdel(target) if(isliving(target)) var/mob/living/L = target @@ -82,29 +82,29 @@ 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/items/welder.ogg', 50, 1) /obj/item/umbral_tendrils/proc/tendril_jump(mob/living/user, turf/open/target) //throws the user towards the target turf if(!darkspawn.has_psi(10)) - to_chat(user, "You need at least 10 Psi to jump!") + to_chat(user, span_warning("You need at least 10 Psi to jump!")) return if(!(target in view(7, user))) - to_chat(user, "You can't access that area, or it's too far away!") + to_chat(user, span_warning("You can't access that area, or it's too far away!")) return - to_chat(user, "You pull yourself towards [target].") + to_chat(user, span_velvet("You pull yourself towards [target].")) playsound(user, 'sound/magic/tail_swing.ogg', 10, TRUE) user.throw_at(target, 5, 3) darkspawn.use_psi(10) /obj/item/umbral_tendrils/proc/tendril_swing(mob/living/user, mob/living/target) //swing the tendrils to knock someone down if(isliving(target) && target.lying) - to_chat(user, "[target] is already knocked down!") + to_chat(user, span_warning("[target] is already knocked down!")) return - user.visible_message("[user] draws back [src] and swings them towards [target]!", \ + user.visible_message(span_warning("[user] draws back [src] and swings them towards [target]!"), \ "opehhjaoo
You swing your tendrils towards [target]!") playsound(user, 'sound/magic/tail_swing.ogg', 50, TRUE) var/obj/item/projectile/umbral_tendrils/T = new(get_turf(user)) @@ -144,22 +144,22 @@ if(!iscyborg(target)) playsound(target, 'yogstation/sound/magic/pass_attack.ogg', 50, TRUE) if(!twinned) - target.visible_message("[firer]'s [name] slam into [target], knocking them off their feet!", \ - "You're knocked off your feet!") + target.visible_message(span_warning("[firer]'s [name] slam into [target], knocking them off their feet!"), \ + span_userdanger("You're knocked off your feet!")) L.Paralyze(20) L.Knockdown(60) else target.throw_at(get_step_towards(firer, target), 7, 2) //pull them towards us! - target.visible_message("[firer]'s [name] slam into [target] and drag them across the ground!", \ - "You're suddenly dragged across the floor!") + target.visible_message(span_warning("[firer]'s [name] slam into [target] and drag them across the ground!"), \ + span_userdanger("You're suddenly dragged across the floor!")) L.Paralyze(30) //these can't hit people who are already on the ground but they can be spammed to all shit L.Knockdown(80) addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, target, 'yogstation/sound/magic/pass_attack.ogg', 50, TRUE), 1) else var/mob/living/silicon/robot/R = target R.update_headlamp(TRUE) //disable headlamps - target.visible_message("[firer]'s [name] smashes into [target]'s chassis!", \ - "Heavy percussive impact detected. Recalibrating motor input.") + target.visible_message(span_warning("[firer]'s [name] smashes into [target]'s chassis!"), \ + span_userdanger("Heavy percussive impact detected. Recalibrating motor input.")) R.playsound_local(target, 'sound/misc/interference.ogg', 25, FALSE) playsound(R, 'sound/effects/bang.ogg', 50, TRUE) R.Paralyze(40) //this is the only real anti-borg spell get diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm index 6849d54e65fe..173b596c75de 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm @@ -75,7 +75,7 @@ else if(isliving(M)) var/mob/living/L = M if(L != src) //OH GOD OH FUCK I'M SCARING MYSELF - to_chat(M, "You stand paralyzed in the shadow of the cold as it descends from on high.") + to_chat(M, span_boldannounce("You stand paralyzed in the shadow of the cold as it descends from on high.")) L.Stun(20) time_to_next_roar = world.time + 30 SECONDS @@ -93,13 +93,13 @@ /obj/effect/proc_holder/spell/targeted/progenitor_curse/cast(list/targets, mob/user = usr) if(!targets.len) - to_chat(user, "You can't reach anyone's minds.") + to_chat(user, span_notice("You can't reach anyone's minds.")) return var/mob/living/target = targets[1] var/mob/living/M = target var/zoinks = pick(0.1, 0.5, 1)//like, this isn't even my final form! - usr.visible_message("[usr]'s sigils flare as it glances at [M]!", \ - "You direct [zoinks]% of your psionic power into [M]'s mind!.") + usr.visible_message(span_warning("[usr]'s sigils flare as it glances at [M]!"), \ + span_velvet("You direct [zoinks]% of your psionic power into [M]'s mind!.")) M.apply_status_effect(STATUS_EFFECT_PROGENITORCURSE) /mob/living/simple_animal/hostile/darkspawn_progenitor/narsie_act() diff --git a/yogstation/code/modules/antagonists/gang/gang.dm b/yogstation/code/modules/antagonists/gang/gang.dm index ba2490f16a77..f01641b60f12 100644 --- a/yogstation/code/modules/antagonists/gang/gang.dm +++ b/yogstation/code/modules/antagonists/gang/gang.dm @@ -31,7 +31,7 @@ /datum/antagonist/gang/farewell() if(ishuman(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) - to_chat(owner, "You are no longer a gangster!") + to_chat(owner, span_userdanger("You are no longer a gangster!")) /datum/antagonist/gang/on_gain() if(!gang) @@ -119,7 +119,7 @@ gang = new newgang else if(!GLOB.gangs.len) // no gangs exist - to_chat(admin, "No gangs exist, please create a new one instead.") + to_chat(admin, span_danger("No gangs exist, please create a new one instead.")) return var/existinggang = input(admin, "Select a gang, or select random to pick a random one.", "Existing gang") as null|anything in GLOB.gangs + "Random" if(isnull(existinggang)) @@ -240,12 +240,12 @@ /datum/antagonist/gang/boss/admin_add(datum/mind/new_owner,mob/admin) if(!new_owner.has_antag_datum(parent_type)) ..() - to_chat(new_owner.current, "You are a member of the [gang.name] Gang leadership now!") + to_chat(new_owner.current, span_userdanger("You are a member of the [gang.name] Gang leadership now!")) return promote() message_admins("[key_name_admin(admin)] has made [new_owner.current] a boss of the [gang.name] gang.") log_admin("[key_name(admin)] has made [new_owner.current] a boss of the [gang.name] gang.") - to_chat(new_owner.current, "You are a member of the [gang.name] Gang leadership now!") + to_chat(new_owner.current, span_userdanger("You are a member of the [gang.name] Gang leadership now!")) /datum/antagonist/gang/boss/get_admin_commands() . = ..() @@ -264,13 +264,13 @@ old_owner.add_antag_datum(new_gangster,old_gang) new_gangster.silent = FALSE log_game("[key_name(old_owner)] has been demoted to Gangster in the [gang.name] Gang") - to_chat(old_owner, "The gang has been disappointed by your ability to lead! You are a regular gangster now!") + to_chat(old_owner, span_userdanger("The gang has been disappointed by your ability to lead! You are a regular gangster now!")) /datum/antagonist/gang/boss/proc/admin_take_gangtool(mob/admin) var/list/L = owner.current.get_contents() var/obj/item/gangtool/gangtool = locate() in L if (!gangtool) - to_chat(admin, "Deleting gangtool failed!") + to_chat(admin, span_danger("Deleting gangtool failed!")) return qdel(gangtool) @@ -340,15 +340,15 @@ /datum/team/gang/roundend_report() var/list/report = list() - report += "[name]:" + report += span_header("[name]:") if(winner) - report += "The [name] gang was successful!" + report += span_greentext("The [name] gang was successful!") for(var/datum/mind/M in leaders) SSachievements.unlock_achievement(/datum/achievement/greentext/gangleader,M.current) for(var/datum/mind/M in members) // Leaders are included in this too SSachievements.unlock_achievement(/datum/achievement/greentext/gang,M.current) // and so get the lower achievement, too else - report += "The [name] gang has failed!" + report += span_redtext("The [name] gang has failed!") report += "The [name] gang bosses were:" report += printplayerlist(leaders) @@ -464,7 +464,7 @@ gang_outfit = outfit if(gang_outfit) - gangster << "The [src] Gang's influence grows as you wear [gang_outfit]." + gangster << span_notice("The [src] Gang's influence grows as you wear [gang_outfit].") uniformed++ return uniformed @@ -498,7 +498,7 @@ if(mob && mob.mind && mob.stat == CONSCIOUS) var/datum/antagonist/gang/gangster = mob.mind.has_antag_datum(/datum/antagonist/gang) if(gangster.gang == src) - to_chat(mob, "[icon2html(tool, mob)] [message]") + to_chat(mob, span_warning("[icon2html(tool, mob)] [message]")) playsound(mob.loc, 'sound/machines/twobeep.ogg', 50, 1) return diff --git a/yogstation/code/modules/antagonists/shadowling/shadowling.dm b/yogstation/code/modules/antagonists/shadowling/shadowling.dm index 3704ee52b216..1aa1a1baf333 100644 --- a/yogstation/code/modules/antagonists/shadowling/shadowling.dm +++ b/yogstation/code/modules/antagonists/shadowling/shadowling.dm @@ -16,7 +16,7 @@ owner.AddSpell(new /obj/effect/proc_holder/spell/self/shadowling_hatch(null)) owner.AddSpell(new /obj/effect/proc_holder/spell/self/shadowling_hivemind(null)) if(owner.assigned_role == "Clown") - to_chat(S, "Your alien nature has allowed you to overcome your clownishness.") + to_chat(S, span_notice("Your alien nature has allowed you to overcome your clownishness.")) S.dna.remove_mutation(CLOWNMUT) var/datum/objective/ascend/O = new O.update_explanation_text() @@ -37,15 +37,15 @@ owner.RemoveSpell(S) var/mob/living/M = owner.current if(issilicon(M)) - M.audible_message("[M] lets out a short blip.") - to_chat(M,"You have been turned into a[ iscyborg(M) ? " cyborg" : "n AI" ]! You are no longer a shadowling! Though you try, you cannot remember anything about your time as one...") + M.audible_message(span_notice("[M] lets out a short blip.")) + to_chat(M,span_userdanger("You have been turned into a[ iscyborg(M) ? " cyborg" : "n AI" ]! You are no longer a shadowling! Though you try, you cannot remember anything about your time as one...")) else - M.visible_message("[M] screams and contorts!") + M.visible_message(span_big("[M] screams and contorts!")) to_chat(M,"THE LIGHT-- YOUR MIND-- BURNS--") spawn(30) if(QDELETED(M)) return - M.visible_message("[M] suddenly bloats and explodes!") + M.visible_message(span_warning("[M] suddenly bloats and explodes!")) to_chat(M,"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA----") playsound(M, 'sound/magic/Disintegrate.ogg', 100, 1) M.gib() diff --git a/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm b/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm index 4ced4b43e4cd..cc92fe03f56e 100644 --- a/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm +++ b/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm @@ -4,9 +4,9 @@ if(!H || !istype(H)) return if(H.dna && H.dna.species && H.dna.species.id == "shadowling" && is_shadow(H)) return TRUE if(H.dna && H.dna.species && H.dna.species.id == "l_shadowling" && is_thrall(H)) return TRUE - if(!is_shadow_or_thrall(usr)) to_chat(usr, "You can't wrap your head around how to do this.") - else if(is_thrall(usr)) to_chat(usr, "You aren't powerful enough to do this.") - else if(is_shadow(usr)) to_chat(usr, "Your telepathic ability is suppressed. Hatch or use Rapid Re-Hatch first.") + if(!is_shadow_or_thrall(usr)) to_chat(usr, span_warning("You can't wrap your head around how to do this.")) + else if(is_thrall(usr)) to_chat(usr, span_warning("You aren't powerful enough to do this.")) + else if(is_shadow(usr)) to_chat(usr, span_warning("Your telepathic ability is suppressed. Hatch or use Rapid Re-Hatch first.")) return 0 /obj/effect/proc_holder/spell/targeted/sling //Stuns and mutes a human target for 10 seconds @@ -20,7 +20,7 @@ return var/msg if(!can_cast(user)) - msg = "You can no longer cast [name]!" + msg = span_warning("You can no longer cast [name]!") remove_ranged_ability(msg) return if(active) @@ -32,7 +32,7 @@ /obj/effect/proc_holder/spell/targeted/sling/InterceptClickOn(mob/living/caller, params, atom/t) if(!isliving(t)) - to_chat(caller, "You may only use this ability on living things!") + to_chat(caller, span_warning("You may only use this ability on living things!")) revert_cast() return user = caller @@ -65,27 +65,27 @@ if(!target) return if(target.stat) - to_chat(usr, "[target] must be conscious!") + to_chat(usr, span_warning("[target] must be conscious!")) revert_cast() return if(is_shadow_or_thrall(target)) - to_chat(usr, "You cannot glare at allies!") + to_chat(usr, span_warning("You cannot glare at allies!")) revert_cast() return var/mob/living/carbon/human/M = target usr.visible_message("[usr]'s eyes flash a purpleish-red!") var/distance = get_dist(target, usr) if (distance <= 2) - target.visible_message("[target] suddendly collapses...") - to_chat(target, "A purple light flashes across your vision, and you lose control of your movements!") + target.visible_message(span_danger("[target] suddendly collapses...")) + to_chat(target, span_userdanger("A purple light flashes across your vision, and you lose control of your movements!")) target.Paralyze(100) M.silent += 10 else //Distant glare var/loss = 100 - (distance * 10) target.adjustStaminaLoss(loss) target.stuttering = loss - to_chat(target, "A purple light flashes across your vision, and exhaustion floods your body...") - target.visible_message("[target] looks very tired...") + to_chat(target, span_userdanger("A purple light flashes across your vision, and exhaustion floods your body...")) + target.visible_message(span_danger("[target] looks very tired...")) charge_counter = 0 start_recharge() remove_ranged_ability() @@ -111,12 +111,12 @@ if(F.on) if(cold) if(is_type_in_list(F, blacklisted_lights)) - F.visible_message("The sheer cold shatters [F]!") + F.visible_message(span_warning("The sheer cold shatters [F]!")) qdel(F) else return if(is_type_in_list(I, blacklisted_lights)) - I.visible_message("[I] dims slightly before scattering the shadows around it.") + I.visible_message(span_danger("[I] dims slightly before scattering the shadows around it.")) return F.brightness_on //Necessary because flashlights become 0-luminosity when held. I don't make the rules of lightcode. F.on = FALSE F.update_brightness() @@ -136,7 +136,7 @@ if(!shadowling_check(user) && !admin_override) revert_cast() return - to_chat(user, "You silently disable all nearby lights.") + to_chat(user, span_shadowling("You silently disable all nearby lights.")) var/turf/T = get_turf(user) for(var/datum/light_source/LS in T.affecting_lights) var/atom/LO = LS.source_atom @@ -146,13 +146,13 @@ if(istype(LO, /obj/machinery/light)) var/obj/machinery/light/L = LO L.on = FALSE - L.visible_message("[L] flickers and falls dark.") + L.visible_message(span_warning("[L] flickers and falls dark.")) L.update(0) L.set_light(0) continue if(istype(LO, /obj/machinery/computer) || istype(LO, /obj/machinery/power/apc)) LO.set_light(0) - LO.visible_message("[LO] grows dim, its screen barely readable.") + LO.visible_message(span_warning("[LO] grows dim, its screen barely readable.")) continue if(ismob(LO)) extinguishMob(LO) @@ -160,7 +160,7 @@ var/mob/living/silicon/robot/borg = LO if(!borg.lamp_cooldown) borg.update_headlamp(TRUE, INFINITY) - to_chat(borg, "The lightbulb in your headlamp is fried! You'll need a human to help replace it.") + to_chat(borg, span_userdanger("The lightbulb in your headlamp is fried! You'll need a human to help replace it.")) if(istype(LO, /obj/machinery/camera)) LO.set_light(0) if(prob(10)) @@ -174,7 +174,7 @@ if(!istype(G, /obj/structure/glowshroom/shadowshroom)) var/obj/structure/glowshroom/shadowshroom/S = new /obj/structure/glowshroom/shadowshroom(G.loc) //I CAN FEEL THE WARP OVERTAKING ME! IT IS A GOOD PAIN! S.generation = G.generation - G.visible_message("[G] suddenly turns dark!") + G.visible_message(span_warning("[G] suddenly turns dark!")) qdel(G) /obj/effect/proc_holder/spell/aoe_turf/flashfreeze //Stuns and freezes nearby people - a bit more effective than a changeling's cryosting @@ -194,16 +194,16 @@ if(!shadowling_check(user)) revert_cast() return - to_chat(user, "You freeze the nearby air.") + to_chat(user, span_shadowling("You freeze the nearby air.")) for(var/turf/T in targets) for(var/mob/living/carbon/M in T.contents) if(is_shadow_or_thrall(M)) if(M == user) //No message for the user, of course continue else - to_chat(M, "You feel a blast of paralyzingly cold air wrap around you and flow past, but you are unaffected!") + to_chat(M, span_danger("You feel a blast of paralyzingly cold air wrap around you and flow past, but you are unaffected!")) continue - to_chat(M, "A wave of shockingly cold air engulfs you!") + to_chat(M, span_userdanger("A wave of shockingly cold air engulfs you!")) M.Stun(2) M.apply_damage(10, BURN) if(M.bodytemperature) @@ -235,69 +235,69 @@ return for(var/mob/living/carbon/human/target in targets) if(!in_range(user, target)) - to_chat(user, "You need to be closer to enthrall [target]!") + to_chat(user, span_warning("You need to be closer to enthrall [target]!")) revert_cast() return if(!target.key || !target.mind) - to_chat(user, "The target has no mind!") + to_chat(user, span_warning("The target has no mind!")) revert_cast() return if(target.stat) - to_chat(user, "The target must be conscious!") + to_chat(user, span_warning("The target must be conscious!")) revert_cast() return if(is_shadow_or_thrall(target)) - to_chat(user, "You can not enthrall allies!") + to_chat(user, span_warning("You can not enthrall allies!")) revert_cast() return if(!ishuman(target)) - to_chat(user, "You can only enthrall humans!") + to_chat(user, span_warning("You can only enthrall humans!")) revert_cast() return if(enthralling) - to_chat(user, "You are already enthralling!") + to_chat(user, span_warning("You are already enthralling!")) revert_cast() return if(!target.client) - to_chat(user, "[target]'s mind is vacant of activity.") + to_chat(user, span_warning("[target]'s mind is vacant of activity.")) enthralling = TRUE for(var/progress = 0, progress <= 3, progress++) switch(progress) if(1) - to_chat(user, "You place your hands to [target]'s head...") - user.visible_message("[user] places their hands onto the sides of [target]'s head!") + to_chat(user, span_notice("You place your hands to [target]'s head...")) + user.visible_message(span_warning("[user] places their hands onto the sides of [target]'s head!")) if(2) - to_chat(user, "You begin preparing [target]'s mind as a blank slate...") - user.visible_message("[user]'s palms flare a bright red against [target]'s temples!") - to_chat(target, "A terrible red light floods your mind. You collapse as conscious thought is wiped away.") + to_chat(user, span_notice("You begin preparing [target]'s mind as a blank slate...")) + user.visible_message(span_warning("[user]'s palms flare a bright red against [target]'s temples!")) + to_chat(target, span_danger("A terrible red light floods your mind. You collapse as conscious thought is wiped away.")) target.Knockdown(120) if(HAS_TRAIT(target, TRAIT_MINDSHIELD)) - to_chat(user, "They are protected by an implant. You begin to shut down the nanobots in their brain - this will take some time...") - user.visible_message("[user] pauses, then dips their head in concentration!") - to_chat(target, "You feel your mental protection faltering!") + to_chat(user, span_notice("They are protected by an implant. You begin to shut down the nanobots in their brain - this will take some time...")) + user.visible_message(span_warning("[user] pauses, then dips their head in concentration!")) + to_chat(target, span_boldannounce("You feel your mental protection faltering!")) if(!do_mob(user, target, 650)) //65 seconds to remove a loyalty implant. yikes! - to_chat(user, "The enthralling has been interrupted - your target's mind returns to its previous state.") - to_chat(target, "You wrest yourself away from [user]'s hands and compose yourself!") + to_chat(user, span_warning("The enthralling has been interrupted - your target's mind returns to its previous state.")) + to_chat(target, span_userdanger("You wrest yourself away from [user]'s hands and compose yourself!")) enthralling = FALSE return - to_chat(user, "The nanobots composing the mindshield implant have been rendered inert. Now to continue.") - user.visible_message("[user] relaxes again.") + to_chat(user, span_notice("The nanobots composing the mindshield implant have been rendered inert. Now to continue.")) + user.visible_message(span_warning("[user] relaxes again.")) for(var/obj/item/implant/mindshield/L in target) if(L) qdel(L) - to_chat(target, "Your mental protection unexpectedly falters, dims, dies.") + to_chat(target, span_boldannounce("Your mental protection unexpectedly falters, dims, dies.")) if(3) - to_chat(user, "You begin planting the tumor that will control the new thrall...") - user.visible_message("A strange energy passes from [user]'s hands into [target]'s head!") - to_chat(target, "You feel your memories twisting, morphing. A sense of horror dominates your mind.") + to_chat(user, span_notice("You begin planting the tumor that will control the new thrall...")) + user.visible_message(span_warning("A strange energy passes from [user]'s hands into [target]'s head!")) + to_chat(target, span_boldannounce("You feel your memories twisting, morphing. A sense of horror dominates your mind.")) if(!do_mob(user, target, 70)) //around 21 seconds total for enthralling, 86 for someone with a loyalty implant - to_chat(user, "The enthralling has been interrupted - your target's mind returns to its previous state.") - to_chat(target, "You wrest yourself away from [user]'s hands and compose yourself!") + to_chat(user, span_warning("The enthralling has been interrupted - your target's mind returns to its previous state.")) + to_chat(target, span_userdanger("You wrest yourself away from [user]'s hands and compose yourself!")) enthralling = FALSE return enthralling = FALSE to_chat(user, "You have enthralled [target.real_name]!") - target.visible_message("[target] looks to have experienced a revelation!", \ + target.visible_message(span_big("[target] looks to have experienced a revelation!"), \ "False faces all dark not real not real not--") target.setOxyLoss(0) //In case the shadowling was choking them out target.mind.special_role = "thrall" @@ -306,7 +306,7 @@ target.add_thrall() if(target.reagents.has_reagent("frostoil")) //Stabilize body temp incase the sling froze them earlier target.reagents.remove_reagent("frostoil") - to_chat(target, "You feel warmer... It feels good.") + to_chat(target, span_notice("You feel warmer... It feels good.")) target.bodytemperature = 310 /obj/effect/proc_holder/spell/self/shadowling_hivemind //Lets a shadowling talk to its allies @@ -321,7 +321,7 @@ /obj/effect/proc_holder/spell/self/shadowling_hivemind/cast(mob/living/user,mob/user = usr) if(!is_shadow(user)) - to_chat(user, "You must be a shadowling to do that!") + to_chat(user, span_warning("You must be a shadowling to do that!")) return var/text = stripped_input(user, "What do you want to say your thralls and fellow shadowlings?.", "Hive Chat", "") if(!text) @@ -346,11 +346,11 @@ /obj/effect/proc_holder/spell/self/shadowling_regenarmor/cast(mob/living/carbon/human/user) if(!is_shadow(user)) - to_chat(user, "You must be a shadowling to do this!") + to_chat(user, span_warning("You must be a shadowling to do this!")) revert_cast() return - user.visible_message("[user]'s skin suddenly bubbles and shifts around their body!", \ - "You regenerate your protective armor and cleanse your form of defects.") + user.visible_message(span_warning("[user]'s skin suddenly bubbles and shifts around their body!"), \ + span_shadowling("You regenerate your protective armor and cleanse your form of defects.")) user.setCloneLoss(0) user.equip_to_slot_or_del(new /obj/item/clothing/suit/space/shadowling(user), SLOT_WEAR_SUIT) user.equip_to_slot_or_del(new /obj/item/clothing/head/shadowling(user), SLOT_HEAD) @@ -381,9 +381,9 @@ for(M in GLOB.alive_mob_list) if(is_thrall(M)) thralls++ - to_chat(M, "You feel hooks sink into your mind and pull.") + to_chat(M, span_shadowling("You feel hooks sink into your mind and pull.")) if(!do_after(user, 30, target = user)) - to_chat(user, "Your concentration has been broken. The mental hooks you have sent out now retract into your mind.") + to_chat(user, span_warning("Your concentration has been broken. The mental hooks you have sent out now retract into your mind.")) return if(thralls >= CEILING(3 * SSticker.mode.thrall_ratio, 1) && !screech_acquired) screech_acquired = TRUE @@ -405,7 +405,7 @@ with no bodily defects.") user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/revive_thrall(null)) if(thralls < victory_threshold) - to_chat(user, "You do not have the power to ascend. You require [victory_threshold] thralls, but only [thralls] living thralls are present.") + to_chat(user, span_shadowling("You do not have the power to ascend. You require [victory_threshold] thralls, but only [thralls] living thralls are present.")) else if(thralls >= victory_threshold) to_chat(user, "You are now powerful enough to ascend. Use the Ascendance ability when you are ready. This will kill all of your thralls.") to_chat(user, "You may find Ascendance in the Shadowling Evolution tab.") @@ -445,23 +445,23 @@ break if(!target_apc) - to_chat(user, "You must stand next to an APC to drain it!") + to_chat(user, span_warning("You must stand next to an APC to drain it!")) revert_cast() return //Free veil since you have to stand next to the thing for a while to depower it. target_apc.set_light(0) - target_apc.visible_message("The [target_apc] flickers and begins to grow dark.") + target_apc.visible_message(span_warning("The [target_apc] flickers and begins to grow dark.")) - to_chat(user, "You dim the APC's screen and carefully begin siphoning its power into the void.") + to_chat(user, span_shadowling("You dim the APC's screen and carefully begin siphoning its power into the void.")) if(!do_after(user, 200, target=target_apc)) //Whoops! The APC's light turns back on - to_chat(user, "Your concentration breaks and the APC suddenly repowers!") + to_chat(user, span_shadowling("Your concentration breaks and the APC suddenly repowers!")) target_apc.set_light(2) - target_apc.visible_message("The [target_apc] begins glowing brightly!") + target_apc.visible_message(span_warning("The [target_apc] begins glowing brightly!")) else //We did it - to_chat(user, "You return the APC's power to the void, disabling it.") + to_chat(user, span_shadowling("You return the APC's power to the void, disabling it.")) target_apc.cell?.charge = 0 //Sent to the shadow realm target_apc.chargemode = 0 //Won't recharge either until an engineer hits the button target_apc.charging = 0 @@ -483,8 +483,8 @@ if(!shadowling_check(user)) revert_cast() return - user.visible_message("[user] bends over and coughs out a cloud of black smoke!") - to_chat(user, "You regurgitate a vast cloud of blinding smoke.") + user.visible_message(span_warning("[user] bends over and coughs out a cloud of black smoke!")) + to_chat(user, span_shadowling("You regurgitate a vast cloud of blinding smoke.")) var/obj/item/reagent_containers/glass/beaker/large/B = new /obj/item/reagent_containers/glass/beaker/large(user.loc) //hacky B.reagents.clear_reagents() //Just in case! B.invisibility = INFINITY //This ought to do the trick @@ -557,15 +557,15 @@ switch(choice) if("Empower") if(!is_thrall(thrallToRevive)) - to_chat(user, "[thrallToRevive] is not a thrall.") + to_chat(user, span_warning("[thrallToRevive] is not a thrall.")) revert_cast() return if(thrallToRevive.stat != CONSCIOUS) - to_chat(user, "[thrallToRevive] must be conscious to become empowered.") + to_chat(user, span_warning("[thrallToRevive] must be conscious to become empowered.")) revert_cast() return if(thrallToRevive.dna.species.id == "l_shadowling") - to_chat(user, "[thrallToRevive] is already empowered.") + to_chat(user, span_warning("[thrallToRevive] is already empowered.")) revert_cast() return var/empowered_thralls = 0 @@ -576,14 +576,14 @@ if(H.dna.species.id == "l_shadowling") empowered_thralls++ if(empowered_thralls >= EMPOWERED_THRALL_LIMIT) - to_chat(user, "You cannot spare this much energy. There are too many empowered thralls.") + to_chat(user, span_warning("You cannot spare this much energy. There are too many empowered thralls.")) revert_cast() return - user.visible_message("[user] places their hands over [thrallToRevive]'s face, red light shining from beneath.", \ - "You place your hands on [thrallToRevive]'s face and begin gathering energy...") - to_chat(thrallToRevive, "[user] places their hands over your face. You feel energy gathering. Stand still...") + user.visible_message(span_danger("[user] places their hands over [thrallToRevive]'s face, red light shining from beneath."), \ + span_shadowling("You place your hands on [thrallToRevive]'s face and begin gathering energy...")) + to_chat(thrallToRevive, span_userdanger("[user] places their hands over your face. You feel energy gathering. Stand still...")) if(!do_mob(user, thrallToRevive, 80)) - to_chat(user, "Your concentration snaps. The flow of energy ebbs.") + to_chat(user, span_warning("Your concentration snaps. The flow of energy ebbs.")) revert_cast() return to_chat(user, "You release a massive surge of power into [thrallToRevive]!") @@ -597,9 +597,9 @@ if (!do_mob(user, thrallToRevive, 5)) thrallToRevive.Unconscious(600) thrallToRevive.visible_message("[thrallToRevive] gasps, and passes out!", "That... feels nice....") - to_chat(user, "We have been interrupted! [thrallToRevive] will need to rest to recover.") + to_chat(user, span_warning("We have been interrupted! [thrallToRevive] will need to rest to recover.")) return - thrallToRevive.visible_message("[thrallToRevive] slowly rises, no longer recognizable as human.", \ + thrallToRevive.visible_message(span_warning("[thrallToRevive] slowly rises, no longer recognizable as human."), \ "You feel new power flow into you. You have been gifted by your masters. You now closely resemble them. You are empowered in \ darkness but wither slowly in light. In addition, Lesser Glare has been upgraded into it's true form, and you've been given the ability to turn off nearby lights.") thrallToRevive.set_species(/datum/species/shadow/ling/lesser) @@ -608,23 +608,23 @@ thrallToRevive.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/veil(null)) if("Revive") if(!is_thrall(thrallToRevive)) - to_chat(user, "[thrallToRevive] is not a thrall.") + to_chat(user, span_warning("[thrallToRevive] is not a thrall.")) revert_cast() return if(thrallToRevive.stat != DEAD) - to_chat(user, "[thrallToRevive] is not dead.") + to_chat(user, span_warning("[thrallToRevive] is not dead.")) revert_cast() return if(HAS_TRAIT(thrallToRevive, TRAIT_BADDNA)) - to_chat(user, "[thrallToRevive] is too far gone.") + to_chat(user, span_warning("[thrallToRevive] is too far gone.")) revert_cast() return - user.visible_message("[user] kneels over [thrallToRevive], placing their hands on \his chest.", \ - "You crouch over the body of your thrall and begin gathering energy...") + user.visible_message(span_danger("[user] kneels over [thrallToRevive], placing their hands on \his chest."), \ + span_shadowling("You crouch over the body of your thrall and begin gathering energy...")) thrallToRevive.notify_ghost_cloning("Your masters are resuscitating you! Re-enter your corpse if you wish to be brought to life.", source = thrallToRevive) if(!do_mob(user, thrallToRevive, 30)) - to_chat(user, "Your concentration snaps. The flow of energy ebbs.") + to_chat(user, span_warning("Your concentration snaps. The flow of energy ebbs.")) revert_cast() return to_chat(user, "You release a massive surge of power into [thrallToRevive]!") @@ -634,7 +634,7 @@ user.Beam(thrallToRevive,icon_state="red_lightning",time=1) var/b = do_mob(user, thrallToRevive, 20) if(thrallToRevive.revive(full_heal = 1)) - thrallToRevive.visible_message("[thrallToRevive] heaves in breath, dim red light shining in their eyes.", \ + thrallToRevive.visible_message(span_boldannounce("[thrallToRevive] heaves in breath, dim red light shining in their eyes."), \ "You have returned. One of your masters has brought you from the darkness beyond.") thrallToRevive.Knockdown(4) thrallToRevive.emote("gasp") @@ -642,7 +642,7 @@ if (!b) thrallToRevive.Knockdown(50) thrallToRevive.Unconscious(500) - thrallToRevive.visible_message("[thrallToRevive] collapses in exhaustion.", \ + thrallToRevive.visible_message(span_boldannounce("[thrallToRevive] collapses in exhaustion."), \ "You collapse in exhaustion... nap..... dark.") else revert_cast() @@ -668,7 +668,7 @@ revert_cast() return if(!is_thrall(target)) - to_chat(user, "[target] must be a thrall.") + to_chat(user, span_warning("[target] must be a thrall.")) revert_cast() return if(SSshuttle.emergency.mode != SHUTTLE_CALL) @@ -676,16 +676,16 @@ revert_cast() return var/mob/living/carbon/human/M = target - user.visible_message("[user]'s eyes flash a bright red!", \ - "You begin to draw [M]'s life force.") - M.visible_message("[M]'s face falls slack, their jaw slightly distending.", \ - "You are suddenly transported... far, far away...") + user.visible_message(span_warning("[user]'s eyes flash a bright red!"), \ + span_notice("You begin to draw [M]'s life force.")) + M.visible_message(span_warning("[M]'s face falls slack, their jaw slightly distending."), \ + span_boldannounce("You are suddenly transported... far, far away...")) if(!do_after(user, 50, target = M)) - to_chat(M, "You are snapped back to reality, your haze dissipating!") - to_chat(user, "You have been interrupted. The draw has failed.") + to_chat(M, span_warning("You are snapped back to reality, your haze dissipating!")) + to_chat(user, span_warning("You have been interrupted. The draw has failed.")) return - to_chat(user, "You project [M]'s life force toward the approaching shuttle, extending its arrival duration!") - M.visible_message("[M]'s eyes suddenly flare red. They proceed to collapse on the floor, not breathing.", \ + to_chat(user, span_notice("You project [M]'s life force toward the approaching shuttle, extending its arrival duration!")) + M.visible_message(span_warning("[M]'s eyes suddenly flare red. They proceed to collapse on the floor, not breathing."), \ "...speeding by... ...pretty blue glow... ...touch it... ...no glow now... ...no light... ...nothing at all...") M.dust() @@ -732,11 +732,11 @@ else playsound(get_turf(user), 'sound/magic/ethereal_enter.ogg', 50, 1, -1) if(apply_damage) - user.visible_message("[user] melts into the shadows!", - "Steeling yourself, you dive into the void.") + user.visible_message(span_boldwarning("[user] melts into the shadows!"), + span_shadowling("Steeling yourself, you dive into the void.")) else - user.visible_message("[user] melts into the shadows!", - "You allow yourself to fall into the void.") + user.visible_message(span_boldwarning("[user] melts into the shadows!"), + span_shadowling("You allow yourself to fall into the void.")) user.SetAllImmobility(0) user.setStaminaLoss(0, 0) var/obj/effect/dummy/phased_mob/shadowling/S2 = new(get_turf(user.loc)) @@ -784,11 +784,11 @@ if(jaunter) jaunter.forceMove(get_turf(src)) if(forced) - jaunter.visible_message("A dark shape stumbles from a hole in the air and collapses!", + jaunter.visible_message(span_boldwarning("A dark shape stumbles from a hole in the air and collapses!"), "Straining, you use the last of your energy to force yourself from the void.") else - jaunter.visible_message("A dark shape tears itself from nothingness!", - "You exit the void.") + jaunter.visible_message(span_boldwarning("A dark shape tears itself from nothingness!"), + span_shadowling("You exit the void.")) playsound(get_turf(jaunter), 'sound/magic/ethereal_exit.ogg', 50, 1, -1) jaunter = null @@ -843,24 +843,24 @@ /obj/effect/proc_holder/spell/targeted/lesser_glare/cast(list/targets,mob/user = usr) for(var/mob/living/target in targets) if(!ishuman(target) || !target) - to_chat(user, "You nay only glare at humans!") + to_chat(user, span_warning("You nay only glare at humans!")) revert_cast() return if(target.stat) - to_chat(user, "[target] must be conscious!") + to_chat(user, span_warning("[target] must be conscious!")) revert_cast() return if(is_shadow_or_thrall(target)) - to_chat(user, "You cannot glare at allies!") + to_chat(user, span_warning("You cannot glare at allies!")) revert_cast() return var/mob/living/carbon/human/M = target user.visible_message("[user]'s eyes flash a bright red!") - target.visible_message("[target] suddendly looks dizzy and nauseous...") + target.visible_message(span_danger("[target] suddendly looks dizzy and nauseous...")) if(in_range(target, user)) - to_chat(target, "Your gaze is forcibly drawn into [user]'s eyes, and you suddendly feel dizzy and nauseous...") + to_chat(target, span_userdanger("Your gaze is forcibly drawn into [user]'s eyes, and you suddendly feel dizzy and nauseous...")) else //Only alludes to the thrall if the target is close by - to_chat(target, "Red lights suddenly dance in your vision, and you suddendly feel dizzy and nauseous...") + to_chat(target, span_userdanger("Red lights suddenly dance in your vision, and you suddendly feel dizzy and nauseous...")) M.confused += 25 M.Jitter(50) if(prob(25)) @@ -877,11 +877,11 @@ action_icon_state = "shadow_walk" /obj/effect/proc_holder/spell/self/lesser_shadow_walk/proc/reappear(mob/living/carbon/human/user) - user.visible_message("[user] appears from nowhere!", "Your shadowy guise slips away.") + user.visible_message(span_warning("[user] appears from nowhere!"), span_shadowling("Your shadowy guise slips away.")) user.alpha = initial(user.alpha) /obj/effect/proc_holder/spell/self/lesser_shadow_walk/cast(mob/living/carbon/human/user) - user.visible_message("[user] suddenly fades away!", "You veil yourself in darkness, making you harder to see.") + user.visible_message(span_warning("[user] suddenly fades away!"), span_shadowling("You veil yourself in darkness, making you harder to see.")) user.alpha = 10 addtimer(CALLBACK(src, .proc/reappear, user), 40) @@ -961,7 +961,7 @@ . = ..() var/mob/living/boom = target if(user.incorporeal_move) - to_chat(user, "You are not in the same plane of existence. Unphase first.") + to_chat(user, span_warning("You are not in the same plane of existence. Unphase first.")) revert_cast() return if(is_shadow(boom)) //Used to not work on thralls. Now it does so you can PUNISH THEM LIKE THE WRATHFUL GOD YOU ARE. @@ -973,11 +973,11 @@ revert_cast() return if (!boom.is_holding(/obj/item/storage/backpack/holding)) //so people actually have a chance to kill ascended slings without being insta-sploded - user.visible_message("[user]'s markings flare as they gesture at [boom]!", \ - "You direct a lance of telekinetic energy into [boom].") + user.visible_message(span_warning("[user]'s markings flare as they gesture at [boom]!"), \ + span_shadowling("You direct a lance of telekinetic energy into [boom].")) if(iscarbon(boom)) playsound(boom, 'sound/magic/Disintegrate.ogg', 100, 1) - boom.visible_message("[boom] explodes!") + boom.visible_message(span_userdanger("[boom] explodes!")) boom.gib() else to_chat(user, "The telekinetic energy is absorbed by the bluespace portal in [boom]'s hand!") @@ -997,22 +997,22 @@ . = ..() if(user.incorporeal_move) revert_cast() - to_chat(user, "You are not in the same plane of existence. Unphase first.") + to_chat(user, span_warning("You are not in the same plane of existence. Unphase first.")) return if(is_shadow_or_thrall(target)) - to_chat(user, "You cannot enthrall an ally.") + to_chat(user, span_warning("You cannot enthrall an ally.")) revert_cast() return if(!target.ckey || !target.mind) - to_chat(user, "The target has no mind.") + to_chat(user, span_warning("The target has no mind.")) revert_cast() return if(target.stat) - to_chat(user, "The target must be conscious.") + to_chat(user, span_warning("The target must be conscious.")) revert_cast() return if(!ishuman(target)) - to_chat(user, "You can only enthrall humans.") + to_chat(user, span_warning("You can only enthrall humans.")) revert_cast() return to_chat(user, "You instantly rearrange [target]'s memories, hyptonitizing them into a thrall.") @@ -1033,15 +1033,15 @@ /obj/effect/proc_holder/spell/aoe_turf/ascendant_storm/cast(list/targets,mob/living/simple_animal/ascendant_shadowling/user = usr) if(user.incorporeal_move) - to_chat(user, "You are not in the same plane of existence. Unphase first.") + to_chat(user, span_warning("You are not in the same plane of existence. Unphase first.")) revert_cast() return user.visible_message("A massive ball of lightning appears in [user]'s hands and flares out!", \ - "You conjure a ball of lightning and release it.") + span_shadowling("You conjure a ball of lightning and release it.")) for(var/mob/living/carbon/human/target in view(6)) if(is_shadow_or_thrall(target)) continue - to_chat(target, "You're struck by a bolt of lightning!") + to_chat(target, span_userdanger("You're struck by a bolt of lightning!")) target.apply_damage(10, BURN) playsound(target, 'sound/magic/LightningShock.ogg', 50, 1) target.Knockdown(80) diff --git a/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm b/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm index 763ab082c5c8..851fef128144 100644 --- a/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm +++ b/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm @@ -21,13 +21,13 @@ var/hatch_or_no = alert(H,"Are you sure you want to hatch? You cannot undo this!",,"Yes","No") switch(hatch_or_no) if("No") - to_chat(H, "You decide against hatching for now.") + to_chat(H, span_warning("You decide against hatching for now.")) charge_counter = charge_max return if("Yes") H.notransform = TRUE - H.visible_message("[H]'s things suddenly slip off. They hunch over and vomit up a copious amount of purple goo which begins to shape around them!", \ - "You remove any equipment which would hinder your hatching and begin regurgitating the resin which will protect you.") + H.visible_message(span_warning("[H]'s things suddenly slip off. They hunch over and vomit up a copious amount of purple goo which begins to shape around them!"), \ + span_shadowling("You remove any equipment which would hinder your hatching and begin regurgitating the resin which will protect you.")) var/temp_flags = H.status_flags H.status_flags |= GODMODE //Can't die while hatching H.unequip_everything() @@ -39,16 +39,16 @@ for(var/obj/structure/alien/resin/wall/shadowling/R in shadowturf) //extremely hacky qdel(R) new /obj/structure/alien/weeds/node(shadowturf) //Dim lighting in the chrysalis -- removes itself afterwards - H.visible_message("A chrysalis forms around [H], sealing them inside.", \ - "You create your chrysalis and begin to contort within.") + H.visible_message(span_warning("A chrysalis forms around [H], sealing them inside."), \ + span_shadowling("You create your chrysalis and begin to contort within.")) if(!do_mob(H,H,100,1)) return H.visible_message("The skin on [H]'s back begins to split apart. Black spines slowly emerge from the divide.", \ - "Spines pierce your back. Your claws break apart your fingers. You feel excruciating pain as your true form begins its exit.") + span_shadowling("Spines pierce your back. Your claws break apart your fingers. You feel excruciating pain as your true form begins its exit.")) if(!do_mob(H,H,90,1)) return H.visible_message("[H], skin shifting, begins tearing at the walls around them.", \ - "Your false skin slips away. You begin tearing at the fragile membrane protecting you.") + span_shadowling("Your false skin slips away. You begin tearing at the fragile membrane protecting you.")) if(!do_mob(H,H,80,1)) return playsound(H.loc, 'sound/weapons/slash.ogg', 25, 1) @@ -85,7 +85,7 @@ qdel(W) for(var/obj/structure/alien/weeds/node/N in shadowturf) qdel(N) - H.visible_message("The chrysalis explodes in a shower of purple flesh and fluid!") + H.visible_message(span_warning("The chrysalis explodes in a shower of purple flesh and fluid!")) H.underwear = "Nude" H.undershirt = "Nude" H.socks = "Nude" @@ -125,27 +125,27 @@ var/hatch_or_no = alert(H,"It is time to ascend. Are you sure about this?",,"Yes","No") switch(hatch_or_no) if("No") - to_chat(H, "You decide against ascending for now.") + to_chat(H, span_warning("You decide against ascending for now.")) charge_counter = charge_max return if("Yes") H.notransform = 1 - H.visible_message("[H]'s things suddenly slip off. They gently rise into the air, red light glowing in their eyes.", \ - "You rise into the air and get ready for your transformation.") + H.visible_message(span_warning("[H]'s things suddenly slip off. They gently rise into the air, red light glowing in their eyes."), \ + span_shadowling("You rise into the air and get ready for your transformation.")) for(var/obj/item/I in H) //drops all items H.unequip_everything(I) if(!do_mob(H,H,50,1)) return - H.visible_message("[H]'s skin begins to crack and harden.", \ - "Your flesh begins creating a shield around yourself.") + H.visible_message(span_warning("[H]'s skin begins to crack and harden."), \ + span_shadowling("Your flesh begins creating a shield around yourself.")) if(!do_mob(H,H,100,1)) return - H.visible_message("The small horns on [H]'s head slowly grow and elongate.", \ - "Your body continues to mutate. Your telepathic abilities grow.") //y-your horns are so big, senpai...!~ + H.visible_message(span_warning("The small horns on [H]'s head slowly grow and elongate."), \ + span_shadowling("Your body continues to mutate. Your telepathic abilities grow.")) //y-your horns are so big, senpai...!~ if(!do_mob(H,H,90,1)) return - H.visible_message("[H]'s body begins to violently stretch and contort.", \ - "You begin to rend apart the final barriers to godhood.") + H.visible_message(span_warning("[H]'s body begins to violently stretch and contort."), \ + span_shadowling("You begin to rend apart the final barriers to godhood.")) if(!do_mob(H,H,40,1)) return to_chat(H, "Yes!") @@ -159,7 +159,7 @@ return for(var/mob/living/M in orange(7, H)) M.Knockdown(10) - to_chat(M, "An immense pressure slams you onto the ground!") + to_chat(M, span_userdanger("An immense pressure slams you onto the ground!")) to_chat(world, "\"VYSHA NERADA YEKHEZET U'RUU!!\"") for(var/mob/M in GLOB.player_list) SEND_SOUND(M, sound('sound/hallucinations/veryfar_noise.ogg')) diff --git a/yogstation/code/modules/antagonists/shadowling/thrall.dm b/yogstation/code/modules/antagonists/shadowling/thrall.dm index c8d1066927e8..37f4e45fd300 100644 --- a/yogstation/code/modules/antagonists/shadowling/thrall.dm +++ b/yogstation/code/modules/antagonists/shadowling/thrall.dm @@ -45,21 +45,21 @@ GLOBAL_LIST_INIT(thrall_spell_types, typecacheof(list(/obj/effect/proc_holder/sp owner.RemoveSpell(S) var/mob/living/M = owner.current if(issilicon(M)) - M.audible_message("[M] lets out a short blip, followed by a low-pitched beep.") - to_chat(M,"You have been turned into a[ iscyborg(M) ? " cyborg" : "n AI" ]! You are no longer a thrall! Though you try, you cannot remember anything about your servitude...") + M.audible_message(span_notice("[M] lets out a short blip, followed by a low-pitched beep.")) + to_chat(M,span_userdanger("You have been turned into a[ iscyborg(M) ? " cyborg" : "n AI" ]! You are no longer a thrall! Though you try, you cannot remember anything about your servitude...")) else - M.visible_message("[M] looks like their mind is their own again!") - to_chat(M,"A piercing white light floods your eyes. Your mind is your own again! Though you try, you cannot remember anything about the shadowlings or your time under their command...") + M.visible_message(span_big("[M] looks like their mind is their own again!")) + to_chat(M,span_userdanger("A piercing white light floods your eyes. Your mind is your own again! Though you try, you cannot remember anything about the shadowlings or your time under their command...")) M.update_sight() return ..() /datum/antagonist/thrall/greet() to_chat(owner, "You see the truth. Reality has been torn away and you realize what a fool you've been.") to_chat(owner, "The shadowlings are your masters. Serve them above all else and ensure they complete their goals.") - to_chat(owner, "You may not harm other thralls or the shadowlings. However, you do not need to obey other thralls.") - to_chat(owner, "Your body has been irreversibly altered. The attentive can see this - you may conceal it by wearing a mask.") - to_chat(owner, "Though not nearly as powerful as your masters, you possess some weak powers. These can be found in the Thrall Abilities tab.") - to_chat(owner, "You may communicate with your allies by using the Lesser Commune ability.") + to_chat(owner, span_shadowling("You may not harm other thralls or the shadowlings. However, you do not need to obey other thralls.")) + to_chat(owner, span_shadowling("Your body has been irreversibly altered. The attentive can see this - you may conceal it by wearing a mask.")) + to_chat(owner, span_shadowling("Though not nearly as powerful as your masters, you possess some weak powers. These can be found in the Thrall Abilities tab.")) + to_chat(owner, span_shadowling("You may communicate with your allies by using the Lesser Commune ability.")) SEND_SOUND(owner.current, sound('yogstation/sound/ambience/antag/thrall.ogg')) /datum/antagonist/thrall/roundend_report() diff --git a/yogstation/code/modules/antagonists/slaughter/slaughter.dm b/yogstation/code/modules/antagonists/slaughter/slaughter.dm index 0708f23eb1e7..313c88138300 100644 --- a/yogstation/code/modules/antagonists/slaughter/slaughter.dm +++ b/yogstation/code/modules/antagonists/slaughter/slaughter.dm @@ -70,15 +70,15 @@ /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/magic/demon_consume.ogg', 50, 1) if(user.GetComponent(/datum/component/crawl/blood)) - 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!", \ - "You 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_userdanger("You 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 @@ -166,7 +166,7 @@ if(M.revive(full_heal = TRUE, admin_revive = TRUE)) M.grab_ghost(force = TRUE) playsound(T, feast_sound, 50, 1, -1) - to_chat(M, "You leave [src]'s warm embrace, and feel ready to take on the world.") //Why the fuck was there a random tab in this message? + to_chat(M, span_clown("You leave [src]'s warm embrace, and feel ready to take on the world.")) //Why the fuck was there a random tab in this message? /mob/living/simple_animal/slaughter/laughter/bloodcrawl_swallow(var/mob/living/victim) var/datum/component/crawl/blood/demonic/hilarious/bloodcrawl = GetComponent(/datum/component/crawl/blood/demonic/hilarious) diff --git a/yogstation/code/modules/atmospherics/machinery/pipes/bluespace.dm b/yogstation/code/modules/atmospherics/machinery/pipes/bluespace.dm index 9334043814e0..7e9daa9c63f1 100644 --- a/yogstation/code/modules/atmospherics/machinery/pipes/bluespace.dm +++ b/yogstation/code/modules/atmospherics/machinery/pipes/bluespace.dm @@ -38,7 +38,7 @@ GLOBAL_LIST_EMPTY(bluespace_pipe_networks) /obj/machinery/atmospherics/pipe/bluespace/examine(user) . = ..() - . += "This one is connected to the \"[html_encode(bluespace_network_name)]\" network." + . += span_notice("This one is connected to the \"[html_encode(bluespace_network_name)]\" network.") /obj/machinery/atmospherics/pipe/bluespace/SetInitDirections() initialize_directions = dir diff --git a/yogstation/code/modules/atmospherics/unary_devices/vent_pump.dm b/yogstation/code/modules/atmospherics/unary_devices/vent_pump.dm index 99450d4f9bba..e413f080019b 100644 --- a/yogstation/code/modules/atmospherics/unary_devices/vent_pump.dm +++ b/yogstation/code/modules/atmospherics/unary_devices/vent_pump.dm @@ -3,30 +3,30 @@ var/max_n_of_items = 3 /obj/machinery/atmospherics/components/unary/vent_pump/crowbar_act(mob/living/user, obj/item/I) - to_chat(user, "You begin prying [cover ? "in" : "off"] the vent cover.") + to_chat(user, span_notice("You begin prying [cover ? "in" : "off"] the vent cover.")) if(I.use_tool(src, user, 50, volume=50)) cover = !cover - to_chat(user, "You pry [cover ? "off" : "in"] the vent cover.") + to_chat(user, span_notice("You pry [cover ? "off" : "in"] the vent cover.")) return TRUE /obj/machinery/atmospherics/components/unary/vent_pump/attackby(obj/item/W, mob/user, params) if(cover && !welded) if(istype(W) && W.w_class == WEIGHT_CLASS_TINY && user.a_intent != INTENT_HARM) if(contents.len>=max_n_of_items || !user.transferItemToLoc(W, src)) - to_chat(user, "You can't seem to fit [W].") + to_chat(user, span_warning("You can't seem to fit [W].")) return - to_chat(user, "You insert [W] into [src].") + to_chat(user, span_warning("You insert [W] into [src].")) return ..() /obj/machinery/atmospherics/components/unary/vent_pump/attack_hand(mob/user) if(cover && !welded) 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, "You take out [I] from [src].") + to_chat(user, span_notice("You take out [I] from [src].")) ..() /obj/machinery/atmospherics/components/unary/vent_pump/examine(mob/user) diff --git a/yogstation/code/modules/client/preferences_savefile.dm b/yogstation/code/modules/client/preferences_savefile.dm index 4a3d9de4ba61..d4495a0c3c82 100644 --- a/yogstation/code/modules/client/preferences_savefile.dm +++ b/yogstation/code/modules/client/preferences_savefile.dm @@ -24,8 +24,8 @@ value += initial(T.value) if(value < 0) - to_chat(parent, "Your quirks have been reset due to an insufficient balance because certain quirks have been disabled.") - to_chat(parent, "Your previously selected quirks:") + to_chat(parent, span_userdanger("Your quirks have been reset due to an insufficient balance because certain quirks have been disabled.")) + to_chat(parent, span_notice("Your previously selected quirks:")) for(var/V in all_quirks) - to_chat(parent, "[V]") + to_chat(parent, span_notice("[V]")) all_quirks = list() diff --git a/yogstation/code/modules/client/verbs/afk.dm b/yogstation/code/modules/client/verbs/afk.dm index 54ea1b60a505..eb2efd9d57b7 100644 --- a/yogstation/code/modules/client/verbs/afk.dm +++ b/yogstation/code/modules/client/verbs/afk.dm @@ -89,9 +89,9 @@ adminhelp("I need to go AFK as '[important_role]' for duration of '[time]' [reason ? " with the reason: '[reason]'" : ""]") mob.log_message("is now AFK for [time] [reason ? " with the reason: '[reason]'" : ""]", LOG_OWNERSHIP) else - to_chat(src, "Admins will be subtly alerted, because you do not seem to be in a critical station role.") + to_chat(src, span_danger("Admins will be subtly alerted, because you do not seem to be in a critical station role.")) var/normal_role = special_role || M.job || initial(M.name) || "unknown job" message_admins("[ADMIN_LOOKUPFLW(src)] has used the AFK verb as '[normal_role]' for duration of '[time]'") log_game("[key_name(src)] has used the AFK verb as '[normal_role]' for duration of '[time]'") else - to_chat(src, "It is not necessary to report being AFK if you are not in the game.") + to_chat(src, span_boldnotice("It is not necessary to report being AFK if you are not in the game.")) diff --git a/yogstation/code/modules/client/verbs/antag_token.dm b/yogstation/code/modules/client/verbs/antag_token.dm index 696a9eecc013..addb55b98778 100644 --- a/yogstation/code/modules/client/verbs/antag_token.dm +++ b/yogstation/code/modules/client/verbs/antag_token.dm @@ -11,7 +11,7 @@ GLOBAL_LIST_EMPTY(antag_token_users) var/client/C = usr.client if(world.time < C.last_antag_token_check) - to_chat(usr, "You cannot use this verb yet! Please wait.") + to_chat(usr, span_userdanger("You cannot use this verb yet! Please wait.")) return var/datum/DBQuery/query_antag_token_existing = SSdbcore.NewQuery({"SELECT ckey FROM [format_table_name("antag_tokens")] WHERE ckey = :ckey AND redeemed = 0"}, list("ckey" = ckey(ckey))) @@ -24,12 +24,12 @@ GLOBAL_LIST_EMPTY(antag_token_users) if(query_antag_token_existing.NextRow()) if(SSticker.current_state > GAME_STATE_PREGAME) - to_chat(usr, "You have an antag token. You can use this button in the pre-game lobby to use it!") + to_chat(usr, span_userdanger("You have an antag token. You can use this button in the pre-game lobby to use it!")) return if(alert("You have an antag token! Do you want to use it? YOU CAN GET ANTAG'S THAT YOU HAVE DISABLED IN YOUR PREFERENCES",, "Yes", "No") != "Yes") qdel(query_antag_token_existing) return - to_chat(src, "You will be notified if your antag token is used") + to_chat(src, span_userdanger("You will be notified if your antag token is used")) C.antag_token_timer = addtimer(CALLBACK(src, .proc/deny_antag_token_request), 45 SECONDS, TIMER_STOPPABLE) to_chat(GLOB.admins, "ANTAG TOKEN REQUEST:[ADMIN_LOOKUPFLW(usr)] wants to use their antag token! (will auto-DENY in [DisplayTimeText(45 SECONDS)]). (APPROVE)") for(var/client/A in GLOB.admins) @@ -42,7 +42,7 @@ GLOBAL_LIST_EMPTY(antag_token_users) /client/proc/deny_antag_token_request() if(usr in GLOB.antag_token_users) return - to_chat(usr, "Your request has been denied! Your antag token has NOT been used.") + to_chat(usr, span_userdanger("Your request has been denied! Your antag token has NOT been used.")) /datum/admins/proc/accept_antag_token_usage(client/C) var/token = FALSE // Weather or not the token was used, changed slightly later in the code @@ -64,7 +64,7 @@ GLOBAL_LIST_EMPTY(antag_token_users) token = TRUE message_admins("[C.ckey]'s antag token request has been [token ? "approved" : "rejected"] by [usr.ckey]") - to_chat(C.mob, "An admin has [token ? "approved" : "rejected"] your antag token request! [token ? "Ready up!" : ""]") + to_chat(C.mob, span_userdanger("An admin has [token ? "approved" : "rejected"] your antag token request! [token ? "Ready up!" : ""]")) deltimer(C.antag_token_timer) /proc/antag_token_used(ckey, client/C) @@ -73,7 +73,7 @@ GLOBAL_LIST_EMPTY(antag_token_users) message_admins("Failed to make player [ckey] an antag. Their token has NOT been used!") return - to_chat(C, "Your antag token has been used!") + to_chat(C, span_userdanger("Your antag token has been used!")) var/datum/DBQuery/query_antag_token = SSdbcore.NewQuery({"SELECT id FROM [format_table_name("antag_tokens")] WHERE ckey = :ckey AND redeemed = 0 ORDER BY granted_time DESC"}, list("ckey" = ckey(ckey))) diff --git a/yogstation/code/modules/client/verbs/looc.dm b/yogstation/code/modules/client/verbs/looc.dm index 02d75429ec59..752b60600480 100644 --- a/yogstation/code/modules/client/verbs/looc.dm +++ b/yogstation/code/modules/client/verbs/looc.dm @@ -3,7 +3,7 @@ set category = "OOC" 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(QDELETED(src)) @@ -14,19 +14,19 @@ if(!holder) if(!GLOB.looc_allowed) - to_chat(src, "LOOC is globally muted.") + to_chat(src, span_danger("LOOC is globally muted.")) return if(!GLOB.dlooc_allowed && (mob.stat == DEAD || isobserver(mob))) - to_chat(usr, "LOOC for dead mobs has been turned off.") + to_chat(usr, span_danger("LOOC for dead mobs has been turned off.")) return if(prefs.muted & MUTE_OOC) - to_chat(src, "You cannot use LOOC (muted).") + to_chat(src, span_danger("You cannot use LOOC (muted).")) return if(is_banned_from(ckey, "OOC")) - to_chat(src, "You have been banned from LOOC.") + to_chat(src, span_danger("You have been banned from LOOC.")) return msg = copytext(sanitize(to_utf8(msg)), 1, MAX_MESSAGE_LEN) @@ -43,13 +43,13 @@ return if(findtext(msg, "byond://")) - to_chat(src, "Advertising other servers is not allowed.") + to_chat(src, span_bold("Advertising other servers is not allowed.")) log_admin("[key_name(src)] has attempted to advertise in LOOC: [msg]") message_admins("[key_name_admin(src)] has attempted to advertise in LOOC: [msg]") return if(!(prefs.chat_toggles & CHAT_LOOC)) - to_chat(src, "You have LOOC muted.") + to_chat(src, span_danger("You have LOOC muted.")) return mob.log_talk(raw_msg, LOG_LOOC, "LOOC") @@ -71,7 +71,7 @@ if(mob.client && mob.client.prefs && mob.client.prefs.chat_toggles & CHAT_LOOC) clients_to_hear += mob.client - var/message_admin = "LOOC: [ADMIN_LOOKUPFLW(mob)]: [msg]" + var/message_admin = span_looc("LOOC: [ADMIN_LOOKUPFLW(mob)]: [msg]") var/message_admin_remote = "(R)LOOC: [ADMIN_LOOKUPFLW(mob)]: [msg]" var/message_regular if(isobserver(mob)) //if you're a spooky ghost @@ -79,9 +79,9 @@ if(holder && holder.fakekey) key_to_print = holder.fakekey //stealthminning - message_regular = "LOOC: [key_to_print]: [msg]" + message_regular = span_looc("LOOC: [key_to_print]: [msg]") else - message_regular = "LOOC: [mob.name]: [msg]" + message_regular = span_looc("LOOC: [mob.name]: [msg]") for(var/T in GLOB.clients) var/client/C = T diff --git a/yogstation/code/modules/client/verbs/ooc.dm b/yogstation/code/modules/client/verbs/ooc.dm index 23ab03cac209..561f9316ee38 100644 --- a/yogstation/code/modules/client/verbs/ooc.dm +++ b/yogstation/code/modules/client/verbs/ooc.dm @@ -57,10 +57,10 @@ set category = "OOC" set desc = "Lists all the emojis available for use!" if(!CONFIG_GET(flag/emojis)) - to_chat(src,"This server has emojis disabled!") + to_chat(src,span_warning("This server has emojis disabled!")) return var/static/list/yogemojis = icon_states(icon('yogstation/icons/emoji.dmi')) var/static/list/tgemojis = icon_states(icon('icons/emoji.dmi')) - yogemojis // If we have emojis of the same name, they override the TG ones. (https://github.com/yogstation13/Yogstation/pull/5788) to_chat(src,"List of Emojis:") - to_chat(src,"[jointext(sortList(yogemojis + tgemojis),", ")]") + to_chat(src,span_notice("[jointext(sortList(yogemojis + tgemojis),", ")]")) diff --git a/yogstation/code/modules/clothing/clothing.dm b/yogstation/code/modules/clothing/clothing.dm index aa23958d554f..f0743536ebca 100644 --- a/yogstation/code/modules/clothing/clothing.dm +++ b/yogstation/code/modules/clothing/clothing.dm @@ -86,7 +86,7 @@ src.handle_tear(usr) /obj/item/clothing/under/proc/break_message() - return "[src] falls apart and breaks!" + return span_warning("[src] falls apart and breaks!") /obj/item/clothing/under/examine(mob/user) .=..() diff --git a/yogstation/code/modules/clothing/mask.dm b/yogstation/code/modules/clothing/mask.dm index ed4287ef7c2d..95346d6e5c1b 100644 --- a/yogstation/code/modules/clothing/mask.dm +++ b/yogstation/code/modules/clothing/mask.dm @@ -98,7 +98,7 @@ if(does_cluwne) log_admin("[key_name(H)] was made into a cluwne by [src]") message_admins("[key_name(H)] got cluwned by [src]") - to_chat(H, "The masks straps suddenly tighten to your face and your thoughts are erased by a horrible green light!") + to_chat(H, span_userdanger("The masks straps suddenly tighten to your face and your thoughts are erased by a horrible green light!")) H.dropItemToGround(src) ADD_TRAIT(src, TRAIT_NODROP, CURSED_ITEM_TRAIT) H.cluwneify() @@ -109,7 +109,7 @@ S.Acquire_Victim(user) log_admin("[key_name(user)] summoned a floor cluwne using the [src]") message_admins("[key_name(user)] summoned a floor cluwne using the [src]") - to_chat(H, "The mask suddenly slips off your face and... slides under the floor?") + to_chat(H, span_warning("The mask suddenly slips off your face and... slides under the floor?")) to_chat(H, "...dneirf uoy ot gnoleb ton seod tahT") qdel(src) diff --git a/yogstation/code/modules/clothing/masks/hailer.dm b/yogstation/code/modules/clothing/masks/hailer.dm index 05e75c428e21..efe0493932ea 100644 --- a/yogstation/code/modules/clothing/masks/hailer.dm +++ b/yogstation/code/modules/clothing/masks/hailer.dm @@ -28,7 +28,7 @@ /obj/item/clothing/mask/gas/sechailer/proc/dispatch(mob/user) var/area/A = get_area(src) if(world.time < last_dispatch + dispatch_cooldown) - to_chat(user, "Dispatch radio broadcasting systems are recharging.") + to_chat(user, span_notice("Dispatch radio broadcasting systems are recharging.")) return FALSE var/list/options = list() for(var/option in list("601 (Murder)", "101 (Resisting arrest)", "310 (Breaking and entering)", "306 (Riot)", "401 (Assault, Officer)")) //Just hardcoded for now! diff --git a/yogstation/code/modules/clothing/neck/shawls.dm b/yogstation/code/modules/clothing/neck/shawls.dm index a3e98ef12ff7..6447ade41e17 100644 --- a/yogstation/code/modules/clothing/neck/shawls.dm +++ b/yogstation/code/modules/clothing/neck/shawls.dm @@ -17,7 +17,7 @@ if(istype(user, /mob/living/carbon/human)) human_user = user if(human_user.wear_neck == src) - to_chat(user, "You can't adjust [src] while wearing it!") + to_chat(user, span_warning("You can't adjust [src] while wearing it!")) return if(alticon_state) toggle_alt(user) diff --git a/yogstation/code/modules/donor/unique_donator_items.dm b/yogstation/code/modules/donor/unique_donator_items.dm index 1537b64c6224..05121ed9c0df 100644 --- a/yogstation/code/modules/donor/unique_donator_items.dm +++ b/yogstation/code/modules/donor/unique_donator_items.dm @@ -15,7 +15,7 @@ GLOBAL_DATUM_INIT(donator_gear, /datum/donator_gear_resources, new) /client/proc/custom_donator_item() if(!is_donator(src)) - to_chat(src, "You're not a donator! To access this feature, considering donating today!") + to_chat(src, span_warning("You're not a donator! To access this feature, considering donating today!")) return GLOB.donator_gear.ui_interact(usr)//datum has a tgui component, here we open the window diff --git a/yogstation/code/modules/events/bad_wizard.dm b/yogstation/code/modules/events/bad_wizard.dm index 93f25b2f1593..39b57c22977c 100644 --- a/yogstation/code/modules/events/bad_wizard.dm +++ b/yogstation/code/modules/events/bad_wizard.dm @@ -28,7 +28,7 @@ outfit_type = /datum/outfit/memewiznerd /datum/antagonist/wizard/meme/greet() - to_chat(owner, "You are the Space Wizard!") + to_chat(owner, span_boldannounce("You are the Space Wizard!")) to_chat(owner, "The Space Wizards Federation has given you the following tasks:") owner.announce_objectives() to_chat(owner, "In your pockets you will find a teleport scroll. Use it as needed.") diff --git a/yogstation/code/modules/events/immovable_duck.dm b/yogstation/code/modules/events/immovable_duck.dm index b9f9c70d49e6..35a255eac96e 100644 --- a/yogstation/code/modules/events/immovable_duck.dm +++ b/yogstation/code/modules/events/immovable_duck.dm @@ -38,7 +38,7 @@ if(prob(90)) playsound(src, 'yogstation/sound/misc/quack.ogg', 50, 1) if(prob(50)) - audible_message("You hear a QUACK!") + audible_message(span_danger("You hear a QUACK!")) if(clong && prob(25)) x = clong.x @@ -64,7 +64,7 @@ qdel(other) /obj/effect/immovablerod/duck/penetrate(mob/living/L) - L.visible_message("[L] is QUACKED by an immovable duck!" , "You get QUACKED!!!" , "You hear a QUACK!") + L.visible_message(span_danger("[L] is QUACKED by an immovable duck!") , span_userdanger("You get QUACKED!!!") , "You hear a QUACK!") if(ishuman(L)) var/mob/living/carbon/human/H = L H.adjustBruteLoss(160) diff --git a/yogstation/code/modules/food_and_drinks/food/condiment.dm b/yogstation/code/modules/food_and_drinks/food/condiment.dm index 5c5b0535c137..dce5085feca0 100644 --- a/yogstation/code/modules/food_and_drinks/food/condiment.dm +++ b/yogstation/code/modules/food_and_drinks/food/condiment.dm @@ -6,5 +6,5 @@ possible_states = list() /obj/item/reagent_containers/food/condiment/cinnamon/suicide_act(mob/user) - user.visible_message("[user] is attempting the cinnamon challenge! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message(span_suicide("[user] is attempting the cinnamon challenge! It looks like [user.p_theyre()] trying to commit suicide!")) return OXYLOSS \ No newline at end of file diff --git a/yogstation/code/modules/guardian/abilities/_ability.dm b/yogstation/code/modules/guardian/abilities/_ability.dm index c0e7385d7ed5..7e0db451a9d8 100644 --- a/yogstation/code/modules/guardian/abilities/_ability.dm +++ b/yogstation/code/modules/guardian/abilities/_ability.dm @@ -16,7 +16,7 @@ return var/msg if(!can_cast(user)) - msg = "You can no longer cast [name]!" + msg = span_warning("You can no longer cast [name]!") remove_ranged_ability(msg) return if(active) @@ -30,7 +30,7 @@ /obj/effect/proc_holder/spell/targeted/guardian/InterceptClickOn(mob/living/caller, params, atom/t) if(!isliving(t)) - to_chat(caller, "You may only use this ability on living things!") + to_chat(caller, span_warning("You may only use this ability on living things!")) revert_cast() return FALSE return TRUE diff --git a/yogstation/code/modules/guardian/abilities/major/assassin.dm b/yogstation/code/modules/guardian/abilities/major/assassin.dm index 23cdb90fdbe6..7face4255ba2 100644 --- a/yogstation/code/modules/guardian/abilities/major/assassin.dm +++ b/yogstation/code/modules/guardian/abilities/major/assassin.dm @@ -60,7 +60,7 @@ guardian.alpha = initial(guardian.alpha) master_stats.Apply(guardian) if(!forced) - guardian.visible_message("\The [guardian] suddenly appears!") + guardian.visible_message(span_danger("\The [guardian] suddenly appears!")) next_stealth = world.time + stealthcooldown guardian.cooldown = world.time + 40 updatestealthalert() diff --git a/yogstation/code/modules/guardian/abilities/major/gravity.dm b/yogstation/code/modules/guardian/abilities/major/gravity.dm index b27c943afe84..7e923184d6e4 100644 --- a/yogstation/code/modules/guardian/abilities/major/gravity.dm +++ b/yogstation/code/modules/guardian/abilities/major/gravity.dm @@ -14,7 +14,7 @@ if(isliving(target) && target != guardian) to_chat(guardian, "Your punch has applied heavy gravity to [target]!") add_gravity(target, 2) - to_chat(target, "Everything feels really heavy!") + to_chat(target, span_userdanger("Everything feels really heavy!")) /datum/guardian_ability/major/gravity/Recall() for(var/datum/component/C in gravito_targets) @@ -30,9 +30,9 @@ if(isopenturf(A) && guardian.is_deployed() && guardian.stat != DEAD && in_range(guardian, A) && !guardian.incapacitated()) var/turf/T = A if(isspaceturf(T)) - to_chat(guardian, "You cannot add gravity to space!") + to_chat(guardian, span_warning("You cannot add gravity to space!")) return - guardian.visible_message("[src] slams their fist into the [T]!", "You modify the gravity of the [T].") + guardian.visible_message(span_danger("[src] slams their fist into the [T]!"), span_notice("You modify the gravity of the [T].")) guardian.do_attack_animation(T) add_gravity(T, 4) diff --git a/yogstation/code/modules/guardian/abilities/major/predator.dm b/yogstation/code/modules/guardian/abilities/major/predator.dm index 326fef25abb5..f1e88c2c6e00 100644 --- a/yogstation/code/modules/guardian/abilities/major/predator.dm +++ b/yogstation/code/modules/guardian/abilities/major/predator.dm @@ -21,7 +21,7 @@ if(!guardian.Adjacent(target)) return ..() if(istype(target, /obj/effect/decal/cleanable/blood) || istype(target, /obj/effect/decal/cleanable/trail_holder)) - guardian.visible_message("[guardian] swirls it's finger around in [target] for a bit, before shaking it off.") + guardian.visible_message(span_notice("[guardian] swirls it's finger around in [target] for a bit, before shaking it off.")) var/obj/effect/decal/D = target var/list/blood = D.return_blood_DNA() if(LAZYLEN(blood)) @@ -32,7 +32,7 @@ can_track += H return TRUE if(isobj(target)) - guardian.visible_message("[guardian] picks up [target], and looks at it for a second, before setting it down.") + guardian.visible_message(span_notice("[guardian] picks up [target], and looks at it for a second, before setting it down.")) var/obj/O = target var/list/prints = O.return_fingerprints() if(LAZYLEN(prints)) @@ -69,12 +69,12 @@ var/datum/guardian_ability/major/predator/P = G.stats.ability if(!LAZYLEN(P.can_track)) revert_cast() - to_chat(G, "You don't have anyone to track!") + to_chat(G, span_notice("You don't have anyone to track!")) return var/mob/living/carbon/human/prey = input(G, "Select your prey!", "All-Seeing Eyes") as null|anything in P.can_track if(!prey) revert_cast() - to_chat(G, "You didn't select anyone to track!") + to_chat(G, span_notice("You didn't select anyone to track!")) return to_chat(G, "We begin to track [prey.real_name].[get_final_z(prey) == get_final_z(G) ? "" : " They are far away from here[G.stats.potential >= 4 ? ", on z-level [get_final_z(prey)]." : "."]"]") log_game("[key_name(G)] began to track [key_name(prey)] using Predator.") // why log this? Simple. Some idiot will eventually cry metacomms because someone used this ability to track them to their autistic maint base or random-ass locker. diff --git a/yogstation/code/modules/guardian/abilities/minor/teleport.dm b/yogstation/code/modules/guardian/abilities/minor/teleport.dm index c9b8b75b1528..2ddd8539b02b 100644 --- a/yogstation/code/modules/guardian/abilities/minor/teleport.dm +++ b/yogstation/code/modules/guardian/abilities/minor/teleport.dm @@ -43,8 +43,8 @@ remove_ranged_ability() to_chat(G, "You begin to warp [A].") - A.visible_message("[A] starts to glow faintly!", \ - "You start to faintly glow, and you feel strangely weightless!") + A.visible_message(span_danger("[A] starts to glow faintly!"), \ + span_userdanger("You start to faintly glow, and you feel strangely weightless!")) G.do_attack_animation(A) if(!do_mob(G, A, 60)) //now start the channel @@ -55,8 +55,8 @@ if(isliving(A)) var/mob/living/L = A L.flash_act() - A.visible_message("[A] disappears in a flash of light!", \ - "Your vision is obscured by a flash of light!") + A.visible_message(span_danger("[A] disappears in a flash of light!"), \ + span_userdanger("Your vision is obscured by a flash of light!")) do_teleport(A, G.beacon, 0, channel = TELEPORT_CHANNEL_BLUESPACE) new /obj/effect/temp_visual/guardian/phase(get_turf(A)) diff --git a/yogstation/code/modules/guardian/abilities/special/pocket.dm b/yogstation/code/modules/guardian/abilities/special/pocket.dm index d4b882af4b66..edcdadf551cb 100644 --- a/yogstation/code/modules/guardian/abilities/special/pocket.dm +++ b/yogstation/code/modules/guardian/abilities/special/pocket.dm @@ -205,7 +205,7 @@ GLOBAL_LIST_EMPTY(pocket_mirrors) PD.eye.eye_user = null guardian.remote_control = null if(LAZYLEN(PD.manifestations)) - guardian.visible_message("The distorted space surronding [guardian] is sucked in!") + guardian.visible_message(span_warning("The distorted space surronding [guardian] is sucked in!")) var/list/people_to_suck_in = list(guardian) if(summoner) people_to_suck_in += summoner @@ -222,7 +222,7 @@ GLOBAL_LIST_EMPTY(pocket_mirrors) pull.forceMove(locate(manifest_at_x, manifest_at_y, pocket_z)) if(isliving(pull)) var/mob/living/LL = L - to_chat(LL, "All of existence fades out for a moment...") + to_chat(LL, span_danger("All of existence fades out for a moment...")) LL.Paralyze(5 SECONDS) L.forceMove(locate(manifest_at_x, manifest_at_y, pocket_z)) PD.add_effects(L) @@ -251,7 +251,7 @@ GLOBAL_LIST_EMPTY(pocket_mirrors) animate(pull, alpha = 255, time = 3 SECONDS, easing = LINEAR_EASING) if(isliving(pull)) var/mob/living/LL = L - to_chat(LL, "All of existence fades out for a moment...") + to_chat(LL, span_danger("All of existence fades out for a moment...")) LL.Paralyze(5 SECONDS) if(L.alpha == 255) L.alpha = 0 @@ -261,7 +261,7 @@ GLOBAL_LIST_EMPTY(pocket_mirrors) if(pull) L.start_pulling(pull) else - guardian.visible_message("[guardian] emits a burst of energy, distorting the space around it!") + guardian.visible_message(span_warning("[guardian] emits a burst of energy, distorting the space around it!")) PD.manifest_dimension() charge_counter = max(0, charge_max - 3 SECONDS) start_recharge() diff --git a/yogstation/code/modules/guardian/guardian.dm b/yogstation/code/modules/guardian/guardian.dm index a05a61202c07..88bf5e07d000 100644 --- a/yogstation/code/modules/guardian/guardian.dm +++ b/yogstation/code/modules/guardian/guardian.dm @@ -169,8 +169,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians to_chat(src, "For some reason, somehow, you have no summoner. Please report this bug immediately.") return to_chat(src, "You are [real_name], bound to serve [summoner.current.real_name].") - to_chat(src, "You are capable of manifesting or recalling to your master with the buttons on your HUD. You will also find a button to communicate with [summoner.current.p_them()] privately there.") - to_chat(src, "While personally invincible, you will die if [summoner.current.real_name] does, and any damage dealt to you will have a portion passed on to [summoner.current.p_them()] as you feed upon [summoner.current.p_them()] to sustain yourself.") + to_chat(src, span_holoparasite("You are capable of manifesting or recalling to your master with the buttons on your HUD. You will also find a button to communicate with [summoner.current.p_them()] privately there.")) + to_chat(src, span_holoparasite("While personally invincible, you will die if [summoner.current.real_name] does, and any damage dealt to you will have a portion passed on to [summoner.current.p_them()] as you feed upon [summoner.current.p_them()] to sustain yourself.")) setup_barriers() /mob/living/simple_animal/hostile/guardian/Life() //Dies if the summoner dies @@ -186,7 +186,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians GoBerserk() else forceMove(summoner.current) - to_chat(src, "Your summoner has died!") + to_chat(src, span_danger("Your summoner has died!")) visible_message("\The [src] dies along with its user!") summoner.current.visible_message("[summoner.current]'s body is completely consumed by the strain of sustaining [src]!") for(var/obj/item/W in summoner.current) @@ -198,7 +198,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(transforming) GoBerserk() else - to_chat(src, "Your summoner has died!") + to_chat(src, span_danger("Your summoner has died!")) visible_message("[src] dies along with its user!") death(TRUE) snapback() @@ -308,8 +308,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(get_dist(get_turf(summoner.current),get_turf(src)) <= range) return else - to_chat(src, "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.current.real_name]!") - visible_message("\The [src] jumps back to its user.") + to_chat(src, span_holoparasite("You moved out of range, and were pulled back! You can only move [range] meters from [summoner.current.real_name]!")) + visible_message(span_danger("\The [src] jumps back to its user.")) if(istype(summoner.current.loc, /obj/effect)) Recall(TRUE) else @@ -353,7 +353,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians to_chat(src, "No... no... you can't!") return if(erased_time) - to_chat(src, "There is no time, and you cannot intefere!") + to_chat(src, span_danger("There is no time, and you cannot intefere!")) return if(stats.ability && stats.ability.RangedAttack(A)) return @@ -364,7 +364,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians to_chat(src, "No... no... you can't!") return FALSE if(erased_time) - to_chat(src, "There is no time, and you cannot intefere!") + to_chat(src, span_danger("There is no time, and you cannot intefere!")) return FALSE if(stats.ability && stats.ability.Attack(target)) return FALSE @@ -524,10 +524,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, "You activate your light.") + to_chat(src, span_notice("You activate your light.")) set_light(3) else - to_chat(src, "You deactivate your light.") + to_chat(src, span_notice("You deactivate your light.")) set_light(0) /mob/living/simple_animal/hostile/guardian/verb/show_detail() @@ -624,7 +624,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as [src.real_name]'s [G.real_name]?", ROLE_HOLOPARASITE, null, FALSE, 100) if(LAZYLEN(candidates)) var/mob/dead/observer/C = pick(candidates) - to_chat(G, "Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.") + to_chat(G, span_holoparasite("Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.")) to_chat(src, "Your [G.real_name] has been successfully reset.") log_game("[key_name(src)] has reset their holoparasite, it is now [key_name(G)].") G.ghostize(FALSE) @@ -643,7 +643,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians 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.") else - to_chat(src, "You decide not to reset [guardians.len > 1 ? "any of your guardians":"your guardian"].") + to_chat(src, span_holoparasite("You decide not to reset [guardians.len > 1 ? "any of your guardians":"your guardian"].")) else remove_verb(src, /mob/living/proc/guardian_reset) diff --git a/yogstation/code/modules/guardian/guardianbuilder.dm b/yogstation/code/modules/guardian/guardianbuilder.dm index f69867527330..8e9a87680d60 100644 --- a/yogstation/code/modules/guardian/guardianbuilder.dm +++ b/yogstation/code/modules/guardian/guardianbuilder.dm @@ -179,14 +179,14 @@ used = TRUE calc_points() if(points < 0) - to_chat(user, "You don't have enough points for a Guardian like that!") + to_chat(user, span_danger("You don't have enough points for a Guardian like that!")) used = FALSE return FALSE //alerts user in case they didn't know var/list/all_items = user.GetAllContents() for(var/obj/I in all_items) //Check for mori if(istype(I, /obj/item/clothing/neck/necklace/memento_mori)) - to_chat(user, "The [I] revolts at the sight of the [src]!") + to_chat(user, span_danger("The [I] revolts at the sight of the [src]!")) used = FALSE return FALSE // IMPORTANT - if we're debugging, the user gets thrown into the stand @@ -221,7 +221,7 @@ //surprise another check in case you tried to get around the first one and now you have no holoparasite :) for(var/obj/H in all_items) if(istype(H, /obj/item/clothing/neck/necklace/memento_mori)) - to_chat(user, "The power of the [H] overtakes the [src]!") + to_chat(user, span_danger("The power of the [H] overtakes the [src]!")) used = TRUE G.Destroy() return FALSE @@ -238,8 +238,8 @@ icon = 'icons/obj/toy.dmi' icon_state = "deck_syndicate_full" var/datum/guardianbuilder/builder - var/use_message = "You shuffle the deck..." - var/used_message = "All the cards seem to be blank now." + var/use_message = span_holoparasite("You shuffle the deck...") + var/used_message = span_holoparasite("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/random = FALSE @@ -258,11 +258,11 @@ /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(LAZYLEN(guardians) && !allowmultiple) - to_chat(user, "You already have a [mob_name]!") + to_chat(user, span_holoparasite("You already have a [mob_name]!")) return if(user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling) && !allowling) to_chat(user, "[ling_failure]") @@ -337,8 +337,8 @@ icon_state = "combat_hypo" theme = "tech" mob_name = "Holoparasite" - use_message = "You start to power on the injector..." - used_message = "The injector has already been used." + use_message = span_holoparasite("You start to power on the injector...") + used_message = span_holoparasite("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." @@ -352,8 +352,8 @@ icon_state = "fishfingers" theme = "carp" mob_name = "Holocarp" - use_message = "You put the fishsticks in your mouth..." - used_message = "Someone's already taken a bite out of these fishsticks! Ew." + use_message = span_holoparasite("You put the fishsticks in your mouth...") + used_message = span_holoparasite("Someone's already taken a bite out of these fishsticks! Ew.") failure_message = "You 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." allowmultiple = TRUE diff --git a/yogstation/code/modules/guardian/standarrow.dm b/yogstation/code/modules/guardian/standarrow.dm index c00f6cfc5e21..7598f44f94d9 100644 --- a/yogstation/code/modules/guardian/standarrow.dm +++ b/yogstation/code/modules/guardian/standarrow.dm @@ -37,13 +37,13 @@ return var/mob/living/carbon/H = M var/mob/living/simple_animal/hostile/guardian/G = M - user.visible_message("[user] prepares to stab [H] with \the [src]!", "You raise \the [src] into the air.") + user.visible_message(span_warning("[user] prepares to stab [H] with \the [src]!"), span_notice("You raise \the [src] into the air.")) if(do_mob(user, H, 5 SECONDS, uninterruptible=FALSE)) if(LAZYLEN(H.hasparasites()) || (H.mind && H.mind.has_antag_datum(/datum/antagonist/changeling)) || (isguardian(M) && (users[G] || G.requiem || G.transforming || !can_requiem))) - H.visible_message("\The [src] rejects [H]!") + H.visible_message(span_holoparasite("\The [src] rejects [H]!")) return in_use = TRUE - H.visible_message("\The [src] embeds itself into [H], and begins to glow!") + H.visible_message(span_holoparasite("\The [src] embeds itself into [H], and begins to glow!")) user.dropItemToGround(src, TRUE) forceMove(H) if(iscarbon(M)) @@ -61,14 +61,14 @@ INVOKE_ASYNC(src, .proc/requiem, M) if(!uses) - visible_message("[src] falls apart!") + visible_message(span_warning("[src] falls apart!")) qdel(src) /obj/item/stand_arrow/proc/requiem(mob/living/simple_animal/hostile/guardian/G) G.range = 255 G.transforming = TRUE - G.visible_message("[G] begins to melt!") - to_chat(G, "This power... You can't handle it! RUN AWAY!") + G.visible_message(span_holoparasite("[G] begins to melt!")) + to_chat(G, span_holoparasite("This power... You can't handle it! RUN AWAY!")) log_game("[key_name(G)] was stabbed by a stand arrow, it is now becoming requiem.") var/i = 0 var/flicker = TRUE @@ -103,7 +103,7 @@ S.name = "Requiem Guardian" G.transforming = FALSE G.Recall(TRUE) - G.visible_message("\The [src] is absorbed into [G]!") + G.visible_message(span_holoparasite("\The [src] is absorbed into [G]!")) qdel(src) @@ -174,7 +174,7 @@ H.visible_message("\The [src] falls out of [H]!") forceMove(H.drop_location()) if(!uses) - visible_message("\The [src] falls apart!") + visible_message(span_warning("\The [src] falls apart!")) qdel(src) else addtimer(CALLBACK(src, .proc/get_stand, H, stats), 90 SECONDS) // lmao diff --git a/yogstation/code/modules/keybindings/bindings_human.dm b/yogstation/code/modules/keybindings/bindings_human.dm index dfc217452a41..08e1b1175c97 100644 --- a/yogstation/code/modules/keybindings/bindings_human.dm +++ b/yogstation/code/modules/keybindings/bindings_human.dm @@ -6,7 +6,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(user, "You have no belt to take something out of.") + to_chat(user, span_notice("You have no belt to take something out of.")) return if(equip_to_slot_if_possible(thing, SLOT_BELT)) update_inv_hands() @@ -15,14 +15,14 @@ if(!thing) equipped_belt.attack_hand(src) else - to_chat(user, "You can't fit anything in.") + to_chat(user, span_notice("You can't fit anything in.")) return if(thing) // put thing in belt if(!SEND_SIGNAL(equipped_belt, COMSIG_TRY_STORAGE_INSERT, thing, user.mob)) - to_chat(user, "You can't fit anything in.") + to_chat(user, span_notice("You can't fit anything in.")) return if(!equipped_belt.contents.len) // nothing to take out - to_chat(user, "There's nothing in your belt to take out.") + to_chat(user, span_notice("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)) @@ -35,7 +35,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(user, "You have no backpack to take something out of.") + to_chat(user, span_notice("You have no backpack to take something out of.")) return if(equip_to_slot_if_possible(thing, SLOT_BACK)) update_inv_hands() @@ -44,14 +44,14 @@ if(!thing) equipped_back.attack_hand(src) else - to_chat(user, "You can't fit anything in.") + to_chat(user, span_notice("You can't fit anything in.")) return if(thing) // put thing in backpack if(!SEND_SIGNAL(equipped_back, COMSIG_TRY_STORAGE_INSERT, thing, user.mob)) - to_chat(user, "You can't fit anything in.") + to_chat(user, span_notice("You can't fit anything in.")) return if(!equipped_back.contents.len) // nothing to take out - to_chat(user, "There's nothing in your backpack to take out.") + to_chat(user, span_notice("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)) @@ -64,7 +64,7 @@ var/obj/item/equipped_suit = get_item_by_slot(SLOT_S_STORE) if(!equipped_suit) if(!thing) - to_chat(user, "You have no suit storage to take something out of.") + to_chat(user, span_notice("You have no suit storage to take something out of.")) return if(equip_to_slot_if_possible(thing, SLOT_S_STORE)) update_inv_hands() @@ -73,14 +73,14 @@ if(!thing) equipped_suit.attack_hand(src) else - to_chat(user, "You can't fit anything in.") + to_chat(user, span_notice("You can't fit anything in.")) return if(thing) // put thing in suit storage if(!SEND_SIGNAL(equipped_suit, COMSIG_TRY_STORAGE_INSERT, thing, user.mob)) - to_chat(user, "You can't fit anything in.") + to_chat(user, span_notice("You can't fit anything in.")) return if(!equipped_suit.contents.len) // nothing to take out - to_chat(user, "There's nothing in your suit storage to take out.") + to_chat(user, span_notice("There's nothing in your suit storage to take out.")) return var/obj/item/stored = equipped_suit.contents[equipped_suit.contents.len] if(!stored || stored.on_found(src)) diff --git a/yogstation/code/modules/keybindings/bindings_mob.dm b/yogstation/code/modules/keybindings/bindings_mob.dm index 0d10aee296e7..277354a1e7fb 100644 --- a/yogstation/code/modules/keybindings/bindings_mob.dm +++ b/yogstation/code/modules/keybindings/bindings_mob.dm @@ -12,7 +12,7 @@ return if(ACTION_STOPPULLING) if(!pulling) - to_chat(src, "You are not pulling anything.") + to_chat(src, span_notice("You are not pulling anything.")) else stop_pulling() return @@ -31,7 +31,7 @@ if(ACTION_DROP) var/obj/item/T = get_active_held_item() if(!T) - to_chat(src, "You have nothing to drop in your hand!") + to_chat(src, span_warning("You have nothing to drop in your hand!")) else dropItemToGround(T) return diff --git a/yogstation/code/modules/mentor/follow.dm b/yogstation/code/modules/mentor/follow.dm index 0ecf7dee85b9..636597db3305 100644 --- a/yogstation/code/modules/mentor/follow.dm +++ b/yogstation/code/modules/mentor/follow.dm @@ -26,7 +26,7 @@ mentor_datum.following = M to_chat(GLOB.admins, "MENTOR: [key_name(usr)] is now following [key_name(M)]", confidential=TRUE) - to_chat(usr, "Click the \"Stop Following\" button in the Mentor tab to stop following [key_name(M)].", confidential=TRUE) + to_chat(usr, span_info("Click the \"Stop Following\" button in the Mentor tab to stop following [key_name(M)]."), confidential=TRUE) log_mentor("[key_name(usr)] began following [key_name(M)]") /client/proc/mentor_unfollow() diff --git a/yogstation/code/modules/mentor/mentor_memo.dm b/yogstation/code/modules/mentor/mentor_memo.dm index 27120e471757..f66356a86855 100644 --- a/yogstation/code/modules/mentor/mentor_memo.dm +++ b/yogstation/code/modules/mentor/mentor_memo.dm @@ -6,7 +6,7 @@ return if(!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.", confidential=TRUE) + to_chat(src, span_danger("Failed to establish database connection."), confidential=TRUE) return var/memotask = input(usr,"Choose task", "Memo") in list("Show", "Write", "Edit", "Remove") @@ -23,7 +23,7 @@ return if(!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.", confidential=TRUE) + to_chat(src, span_danger("Failed to establish database connection."), confidential=TRUE) return mentor_memo_output("Show") @@ -33,7 +33,7 @@ return if(!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.", confidential=TRUE) + to_chat(src, span_danger("Failed to establish database connection."), confidential=TRUE) return switch(task) diff --git a/yogstation/code/modules/mentor/mentor_verbs.dm b/yogstation/code/modules/mentor/mentor_verbs.dm index 4abae6311834..c51a2269d3bc 100644 --- a/yogstation/code/modules/mentor/mentor_verbs.dm +++ b/yogstation/code/modules/mentor/mentor_verbs.dm @@ -22,7 +22,7 @@ GLOBAL_PROTECT(mentor_verbs) return if(!SSdbcore.Connect()) - to_chat(src, "Failed to establish database connection.", confidential=TRUE) + to_chat(src, span_danger("Failed to establish database connection."), confidential=TRUE) return var/msg = "Current Mentors:\n" @@ -71,7 +71,7 @@ GLOBAL_PROTECT(mentor_verbs) else msg += "\t[C] is a [position]" msg += "\n" - msg += "Mentorhelps are also seen by admins. If no mentors are available in game adminhelp instead and an admin will see it and respond." + msg += span_info("Mentorhelps are also seen by admins. If no mentors are available in game adminhelp instead and an admin will see it and respond.") to_chat(src, msg, confidential=TRUE) /client/verb/mrat() @@ -79,17 +79,17 @@ GLOBAL_PROTECT(mentor_verbs) set category = "Mentor" if(!istype(src.mob, /mob/living/carbon/human)) - to_chat(src, "You must be humanoid to use this!") + to_chat(src, span_notice("You must be humanoid to use this!")) return var/mob/living/carbon/human/M = src.mob if(M.stat == DEAD) - to_chat(src, "You must be alive to use this!") + to_chat(src, span_notice("You must be alive to use this!")) return if(M.has_trauma_type(/datum/brain_trauma/special/imaginary_friend/mrat)) - to_chat(src, "You already have or are requesting a mentor!") + to_chat(src, span_notice("You already have or are requesting a mentor!")) return var/alertresult = alert(M, "This will create a physical avatar that a mentor can possess and guide you in person. Do you wish to continue?",,"Yes", "No") @@ -104,14 +104,14 @@ GLOBAL_PROTECT(mentor_verbs) set desc = "Shed your mentor powers." if(mentor_datum.position == "Mentor") if(GLOB.mentors.len <= 2) - to_chat(src, "There are not enough mentors on for you to De-Mentor yourself!", confidential=TRUE) + to_chat(src, span_notice("There are not enough mentors on for you to De-Mentor yourself!"), confidential=TRUE) return mentor_position = mentor_datum.position remove_mentor_verbs() mentor_datum = null GLOB.mentors -= src add_verb(src, /client/proc/rementor) - to_chat(src, "You are now a normal player.", confidential=TRUE) + to_chat(src, span_interface("You are now a normal player."), confidential=TRUE) log_admin("[src] dementored themself.") message_admins("[src] dementored themself.") @@ -122,6 +122,6 @@ GLOBAL_PROTECT(mentor_verbs) remove_verb(src, /client/proc/rementor) spawn(20) // Now UselessTheremin being a shit too. new /datum/mentors(ckey, mentor_position) - to_chat(src, "You are now a Mentor again.", confidential=TRUE) + to_chat(src, span_interface("You are now a Mentor again."), confidential=TRUE) log_admin("[src] rementored themself.") message_admins("[src] rementored themself.") diff --git a/yogstation/code/modules/mentor/mentorhelp.dm b/yogstation/code/modules/mentor/mentorhelp.dm index cc1c803699f8..20d0fa8e6d02 100644 --- a/yogstation/code/modules/mentor/mentorhelp.dm +++ b/yogstation/code/modules/mentor/mentorhelp.dm @@ -7,7 +7,7 @@ //handle muting and automuting if(prefs.muted & MUTE_MENTORHELP) - to_chat(src, "Error: Mentorhelp: You cannot send mentorhelps (Muted).", confidential=TRUE) + to_chat(src, span_danger("Error: Mentorhelp: You cannot send mentorhelps (Muted)."), confidential=TRUE) return if(handle_spam_prevention(msg,MUTE_MENTORHELP)) return diff --git a/yogstation/code/modules/mentor/mentorpm.dm b/yogstation/code/modules/mentor/mentorpm.dm index d7b96ce78366..370cc1d42bd7 100644 --- a/yogstation/code/modules/mentor/mentorpm.dm +++ b/yogstation/code/modules/mentor/mentorpm.dm @@ -32,7 +32,7 @@ /client/proc/cmd_mentor_pm(whom, msg, discord_id) var/client/C if(prefs.muted & MUTE_MENTORHELP) - to_chat(src,"Error: Mentor-PM: You are unable to use Mentor PM (muted).", confidential = TRUE) + to_chat(src,span_danger("Error: Mentor-PM: You are unable to use Mentor PM (muted)."), confidential = TRUE) return if(ismob(whom)) var/mob/M = whom diff --git a/yogstation/code/modules/mentor/mentorsay.dm b/yogstation/code/modules/mentor/mentorsay.dm index 499d8859877c..f6358ce29f3f 100644 --- a/yogstation/code/modules/mentor/mentorsay.dm +++ b/yogstation/code/modules/mentor/mentorsay.dm @@ -2,7 +2,7 @@ set category = "Mentor" set name = "Msay" //Gave this shit a shorter name so you only have to time out "msay" rather than "mentor say" to use it --NeoFite if(prefs.muted & MUTE_MENTORHELP) - to_chat(src,"Error: MSAY: You are unable to use MSAY (muted).", confidential = TRUE) + to_chat(src,span_danger("Error: MSAY: You are unable to use MSAY (muted)."), confidential = TRUE) return if(!is_mentor()) return diff --git a/yogstation/code/modules/mob/living/carbon/alien/humanoid/alienpowers.dm b/yogstation/code/modules/mob/living/carbon/alien/humanoid/alienpowers.dm index 2b5abb227791..74a5cae371aa 100644 --- a/yogstation/code/modules/mob/living/carbon/alien/humanoid/alienpowers.dm +++ b/yogstation/code/modules/mob/living/carbon/alien/humanoid/alienpowers.dm @@ -12,4 +12,4 @@ if(isliving(A)) var/mob/M = A M.reset_perspective() - user.visible_message("[user] hurls out the contents of their stomach!") + user.visible_message(span_alertealien("[user] hurls out the contents of their stomach!")) diff --git a/yogstation/code/modules/mob/living/carbon/carbon.dm b/yogstation/code/modules/mob/living/carbon/carbon.dm index 6c6ef74d77a9..1066b2cc7906 100644 --- a/yogstation/code/modules/mob/living/carbon/carbon.dm +++ b/yogstation/code/modules/mob/living/carbon/carbon.dm @@ -13,16 +13,16 @@ if(user in src.stomach_contents) if(prob(40)) if(prob(25)) - audible_message("You hear something rumbling inside [src]'s stomach...", \ - "You hear something rumbling.", 4,\ - "Something is rumbling inside your stomach!") + audible_message(span_warning("You hear something rumbling inside [src]'s stomach..."), \ + span_warning("You hear something rumbling."), 4,\ + span_userdanger("Something is rumbling inside your stomach!")) var/obj/item/I = user.get_active_held_item() if(I && I.force) var/d = rand(round(I.force / 4), I.force) var/obj/item/bodypart/BP = get_bodypart(BODY_ZONE_CHEST) if(BP.receive_damage(d, 0)) update_damage_overlays() - visible_message("[user] attacks [src]'s stomach wall with the [I.name]!", "[user] attacks your stomach wall with the [I.name]!") + visible_message(span_danger("[user] attacks [src]'s stomach wall with the [I.name]!"), span_userdanger("[user] attacks your stomach wall with the [I.name]!")) playsound(user.loc, 'sound/effects/attackblob.ogg', 50, 1) if(prob(getBruteLoss() - 50)) for(var/atom/movable/A in stomach_contents) @@ -32,13 +32,13 @@ /mob/living/carbon/proc/devour_mob(mob/living/carbon/C, devour_time = 130) - C.visible_message("[src] is attempting to devour [C]!", \ - "[src] is attempting to devour you!") + C.visible_message(span_danger("[src] is attempting to devour [C]!"), \ + span_userdanger("[src] is attempting to devour you!")) if(!do_mob(src, C, devour_time)) return if(pulling && pulling == C && grab_state >= GRAB_AGGRESSIVE && a_intent == INTENT_GRAB) - C.visible_message("[src] devours [C]!", \ - "[src] devours you!") + C.visible_message(span_danger("[src] devours [C]!"), \ + span_userdanger("[src] devours you!")) C.forceMove(src) stomach_contents.Add(C) log_combat(src, C, "devoured") \ No newline at end of file diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/darkspawn.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/darkspawn.dm index 2932c396363b..3cda670a977e 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/darkspawn.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/darkspawn.dm @@ -52,11 +52,11 @@ if(upgrades["spacewalking"] && isspaceturf(T)) return else if(!upgrades["light_resistance"]) - to_chat(H, "The light burns you!") + to_chat(H, span_userdanger("The light burns you!")) H.playsound_local(H, 'sound/weapons/sear.ogg', max(40, 65 * light_amount), TRUE) H.adjustFireLoss(DARKSPAWN_LIGHT_BURN) else - to_chat(H, "The light singes you!") + to_chat(H, span_userdanger("The light singes you!")) H.playsound_local(H, 'sound/weapons/sear.ogg', max(30, 50 * light_amount), TRUE) H.adjustFireLoss(DARKSPAWN_LIGHT_BURN * 0.5) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/lizard.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/lizard.dm index ddbe326b8f5e..bd0e10fd06a7 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/lizard.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/lizard.dm @@ -15,9 +15,9 @@ return rebirth = TRUE rebirthcount++ - to_chat(H, "Your body is entering cryogenic rebirth. You will soon be restored to your physical form. Once this happens your soul will be dragged back into your body.") + to_chat(H, span_notice("Your body is entering cryogenic rebirth. You will soon be restored to your physical form. Once this happens your soul will be dragged back into your body.")) if(rebirthcount >= 3) - to_chat(H, "You notice that your body isn't regenerating as fast as it used to. It seems like the abductor's effects are wearing off. This is your last rebirth cycle..") + to_chat(H, span_notice("You notice that your body isn't regenerating as fast as it used to. It seems like the abductor's effects are wearing off. This is your last rebirth cycle..")) H.death() H.ghostize() for(var/obj/item/I in H) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm index c1ef9162a698..13a591dcc50f 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm @@ -29,10 +29,10 @@ /datum/species/pod/before_equip_job(datum/job/J, mob/living/carbon/human/H) to_chat(H, "You are a Phytosian. Born from an engimatic plant called a 'Replica Pod'.") - to_chat(H, "Symbiotic plant-cells suffuse your skin and provide a protective layer that keeps you alive, and affords you regeneration unmatched by any other race.") - to_chat(H, "Darkness is your greatest foe. Even the cold expanses of space are lit by neighbouring stars, but the darkest recesses of the station's interior may prove to be your greatest foe.") - to_chat(H, "Heat and cold will damage your epidermis far faster than your natural regeneration can match.") - to_chat(H, "For more information on your race, see https://wiki.yogstation.net/wiki/Phytosian") + to_chat(H, span_info("Symbiotic plant-cells suffuse your skin and provide a protective layer that keeps you alive, and affords you regeneration unmatched by any other race.")) + to_chat(H, span_info("Darkness is your greatest foe. Even the cold expanses of space are lit by neighbouring stars, but the darkest recesses of the station's interior may prove to be your greatest foe.")) + to_chat(H, span_info("Heat and cold will damage your epidermis far faster than your natural regeneration can match.")) + to_chat(H, span_info("For more information on your race, see https://wiki.yogstation.net/wiki/Phytosian")) /datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() @@ -66,7 +66,7 @@ if (0.01 to 0.15) //very low light light_level = 1 - light_msg = "There isn't enough light here, and you can feel your body protesting the fact violently." + light_msg = span_warning("There isn't enough light here, and you can feel your body protesting the fact violently.") H.nutrition -= light_amount * 10 //enough to make you faint but get back up consistently if(H.getOxyLoss() < 55) @@ -76,7 +76,7 @@ if (0.16 to 0.3) //low light light_level = 2 - light_msg = "The ambient light levels are too low. Your breath is coming more slowly as your insides struggle to keep up on their own." + light_msg = span_warning("The ambient light levels are too low. Your breath is coming more slowly as your insides struggle to keep up on their own.") H.nutrition -= light_amount * 3 //not enough to faint but enough to slow you down if(H.getOxyLoss() < 50) @@ -104,7 +104,7 @@ else //no light, this is baaaaaad light_level = 0 - light_msg = "Darkness! Your insides churn and your skin screams in pain!" + light_msg = span_userdanger("Darkness! Your insides churn and your skin screams in pain!") H.nutrition -= 3 //enough to make you faint for good, and eventually die if(H.getOxyLoss() < 60) @@ -130,7 +130,7 @@ if(light_level != last_light_level) last_light_level = light_level last_light_message = -STATUS_MESSAGE_COOLDOWN - to_chat(H, "Your internal stores of light are depleted. Find a source to replenish your nourishment at once!") + to_chat(H, span_userdanger("Your internal stores of light are depleted. Find a source to replenish your nourishment at once!")) H.take_overall_damage(2, 0) @@ -248,7 +248,7 @@ if(/obj/item/projectile/energy/floramut) H.rad_act(rand(20, 30)) H.adjustFireLoss(5) - H.visible_message("[H] writhes in pain as [H.p_their()] vacuoles boil.", "You writhe in pain as your vacuoles boil!", "You hear the crunching of leaves.") + H.visible_message(span_warning("[H] writhes in pain as [H.p_their()] vacuoles boil."), span_userdanger("You writhe in pain as your vacuoles boil!"), span_italics("You hear the crunching of leaves.")) if(prob(80)) H.easy_randmut(NEGATIVE + MINOR_NEGATIVE) else diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/power_suck.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/power_suck.dm index 13d86ad70a6e..f1d458846a3e 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/power_suck.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/power_suck.dm @@ -7,14 +7,14 @@ /datum/species/preternis/proc/drain_power_from(mob/living/carbon/human/H, atom/A) if(get_dist(H, A) > 1) - to_chat(H, "[A] is too far away!") + to_chat(H, span_warning("[A] is too far away!")) return FALSE if(!istype(H) || !A) return FALSE if(draining) - to_chat(H,"CONSUME protocols can only be used on one object at any single time.") + to_chat(H,span_info("CONSUME protocols can only be used on one object at any single time.")) return FALSE if(!A.can_consume_power_from()) return FALSE //if it returns text, we want it to continue so we can get the error message later. @@ -27,28 +27,28 @@ siemens_coefficient *= 1.5 if (charge >= PRETERNIS_LEVEL_FULL - 25) //just to prevent spam a bit - to_chat(H,"CONSUME protocol reports no need for additional power at this time.") + to_chat(H,span_notice("CONSUME protocol reports no need for additional power at this time.")) draining = FALSE return TRUE if(H.gloves) if(!H.gloves.siemens_coefficient) - to_chat(H,"NOTICE: [H.gloves] prevent electrical contact - CONSUME protocol aborted.") + to_chat(H,span_info("NOTICE: [H.gloves] prevent electrical contact - CONSUME protocol aborted.")) draining = FALSE return TRUE else if(H.gloves.siemens_coefficient < 1) - to_chat(H,"NOTICE: [H.gloves] are interfering with electrical contact - advise removal before activating CONSUME protocol.") + to_chat(H,span_info("NOTICE: [H.gloves] are interfering with electrical contact - advise removal before activating CONSUME protocol.")) siemens_coefficient *= H.gloves.siemens_coefficient H.face_atom(A) - H.visible_message("[H] starts placing their hands on [A]...", "You start placing your hands on [A]...") + H.visible_message(span_warning("[H] starts placing their hands on [A]..."), span_warning("You start placing your hands on [A]...")) if(!do_after(H, 20, target = A)) - to_chat(H,"CONSUME protocol aborted.") + to_chat(H,span_info("CONSUME protocol aborted.")) draining = FALSE return TRUE - to_chat(H,"Extracutaneous implants detect viable power source. Initiating CONSUME protocol.") + to_chat(H,span_info("Extracutaneous implants detect viable power source. Initiating CONSUME protocol.")) var/done = FALSE var/drain = 150 * siemens_coefficient @@ -80,17 +80,17 @@ spark_system.start() var/drained = A.consume_power_from(drain) if(drained < drain) - to_chat(H,"[A]'s power has been depleted, CONSUME protocol halted.") + to_chat(H,span_info("[A]'s power has been depleted, CONSUME protocol halted.")) done = TRUE charge = clamp(charge + (drained * ELECTRICITY_TO_NUTRIMENT_FACTOR),PRETERNIS_LEVEL_NONE,PRETERNIS_LEVEL_FULL) if(!done) if(charge > (PRETERNIS_LEVEL_FULL - 25)) - to_chat(H,"CONSUME protocol complete. Physical nourishment refreshed.") + to_chat(H,span_info("CONSUME protocol complete. Physical nourishment refreshed.")) done = TRUE else if(!(cycle % 4)) var/nutperc = round((charge / PRETERNIS_LEVEL_FULL) * 100) - to_chat(H,"CONSUME protocol continues. Current satiety level: [nutperc]%.") + to_chat(H,span_info("CONSUME protocol continues. Current satiety level: [nutperc]%.")) else done = TRUE qdel(spark_system) @@ -108,7 +108,7 @@ //CELL// /obj/item/stock_parts/cell/can_consume_power_from() if(charge < MIN_DRAINABLE_POWER) - return "Power cell depleted, cannot consume power." + return span_info("Power cell depleted, cannot consume power.") return TRUE /obj/item/stock_parts/cell/consume_power_from(amount) @@ -120,13 +120,13 @@ //APC// /obj/machinery/power/apc/can_consume_power_from() if(!cell) - return "APC cell absent, cannot consume power." + return span_info("APC cell absent, cannot consume power.") if(stat & BROKEN) - return "APC is damaged, cannot consume power." + return span_info("APC is damaged, cannot consume power.") if(!operating || shorted) - return "APC main breaker is off, cannot consume power." + return span_info("APC main breaker is off, cannot consume power.") if(cell.charge < MIN_DRAINABLE_POWER) - return "APC cell depleted, cannot consume power." + return span_info("APC cell depleted, cannot consume power.") return TRUE /obj/machinery/power/apc/consume_power_from(amount) @@ -141,11 +141,11 @@ //SMES// /obj/machinery/power/smes/can_consume_power_from() if(stat & BROKEN) - return "SMES is damaged, cannot consume power." + return span_info("SMES is damaged, cannot consume power.") if(!output_attempt) - return "SMES is not outputting power, cannot consume power." + return span_info("SMES is not outputting power, cannot consume power.") if(charge < MIN_DRAINABLE_POWER) - return "SMES cells depleted, cannot consume power." + return span_info("SMES cells depleted, cannot consume power.") return TRUE /obj/machinery/power/smes/consume_power_from(amount) @@ -157,13 +157,13 @@ //MECH// /obj/mecha/can_consume_power_from() if(!cell) - return "Mech power cell absent, cannot consume power." + return span_info("Mech power cell absent, cannot consume power.") if(cell.charge < MIN_DRAINABLE_POWER) - return "Mech power cell depleted, cannot consume power." + return span_info("Mech power cell depleted, cannot consume power.") return TRUE /obj/mecha/consume_power_from(amount) - 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((cell.charge - amount) < MIN_DRAINABLE_POWER) amount = max(cell.charge - MIN_DRAINABLE_POWER, 0) cell.use(amount) @@ -172,13 +172,13 @@ //BORG// /mob/living/silicon/robot/can_consume_power_from() if(!cell) - return "Cyborg power cell absent, cannot consume power." + return span_info("Cyborg power cell absent, cannot consume power.") if(cell.charge < MIN_DRAINABLE_POWER) - return "Cyborg power cell depleted, cannot consume power." + return span_info("Cyborg power cell depleted, cannot consume power.") return TRUE /mob/living/silicon/robot/consume_power_from(amount) - src << "Warning: Unauthorized access through sub-route 12, block C, detected." + src << span_danger("Warning: Unauthorized access through sub-route 12, block C, detected.") if((cell.charge - amount) < MIN_DRAINABLE_POWER) amount = max(cell.charge - MIN_DRAINABLE_POWER, 0) cell.use(amount) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index a25e8bcee1cd..770882aba976 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -64,15 +64,15 @@ adjust_charge - take a positive or negative value to adjust the charge level H.adjustFireLoss(20) H.Paralyze(50) charge *= 0.4 - H.visible_message("Electricity ripples over [H]'s subdermal implants, smoking profusely.", \ - "A surge of searing pain erupts throughout your very being! As the pain subsides, a terrible sensation of emptiness is left in its wake.") + H.visible_message(span_danger("Electricity ripples over [H]'s subdermal implants, smoking profusely."), \ + span_userdanger("A surge of searing pain erupts throughout your very being! As the pain subsides, a terrible sensation of emptiness is left in its wake.")) if(EMP_LIGHT) H.adjustBruteLoss(10) H.adjustFireLoss(10) H.Paralyze(20) charge *= 0.6 - H.visible_message("A faint fizzling emanates from [H].", \ - "A fit of twitching overtakes you as your subdermal implants convulse violently from the electromagnetic disruption. Your sustenance reserves have been partially depleted from the blast.") + H.visible_message(span_danger("A faint fizzling emanates from [H]."), \ + span_userdanger("A fit of twitching overtakes you as your subdermal implants convulse violently from the electromagnetic disruption. Your sustenance reserves have been partially depleted from the blast.")) /datum/species/preternis/spec_emag_act(mob/living/carbon/human/H, mob/user) . = ..() @@ -84,11 +84,11 @@ adjust_charge - take a positive or negative value to adjust the charge level switch(emag_lvl) if(1) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 50) //HALP AM DUMB - to_chat(H,"ALERT! MEMORY UNIT [rand(1,5)] FAILURE.NERVEOUS SYSTEM DAMAGE.") + to_chat(H,span_danger("ALERT! MEMORY UNIT [rand(1,5)] FAILURE.NERVEOUS SYSTEM DAMAGE.")) if(2) H.overlay_fullscreen("preternis_emag", /obj/screen/fullscreen/high) H.throw_alert("preternis_emag", /obj/screen/alert/high/preternis) - to_chat(H,"ALERT! OPTIC SENSORS FAILURE.VISION PROCESSOR COMPROMISED.") + to_chat(H,span_danger("ALERT! OPTIC SENSORS FAILURE.VISION PROCESSOR COMPROMISED.")) /datum/species/preternis/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) . = ..() @@ -125,7 +125,7 @@ adjust_charge - take a positive or negative value to adjust the charge level if (!eating_msg_cooldown) eating_msg_cooldown = TRUE addtimer(VARSET_CALLBACK(src, eating_msg_cooldown, FALSE), 2 MINUTES) - to_chat(H,"NOTICE: Digestive subroutines are inefficient. Seek sustenance via power-cell C.O.N.S.U.M.E. technology induction.") + to_chat(H,span_info("NOTICE: Digestive subroutines are inefficient. Seek sustenance via power-cell C.O.N.S.U.M.E. technology induction.")) if(chem.current_cycle >= 20) H.reagents.del_reagent(chem.type) @@ -152,7 +152,7 @@ adjust_charge - take a positive or negative value to adjust the charge level /datum/species/preternis/proc/handle_charge(mob/living/carbon/human/H) charge = clamp(charge - power_drain,PRETERNIS_LEVEL_NONE,PRETERNIS_LEVEL_FULL) if(charge == PRETERNIS_LEVEL_NONE) - to_chat(H,"Warning! System power criti-$#@$") + to_chat(H,span_danger("Warning! System power criti-$#@$")) H.death() else if(charge < PRETERNIS_LEVEL_STARVING) H.throw_alert("preternis_charge", /obj/screen/alert/preternis_charge, 3) diff --git a/yogstation/code/modules/mob/living/emote.dm b/yogstation/code/modules/mob/living/emote.dm index f764729a21db..e86006c9508a 100644 --- a/yogstation/code/modules/mob/living/emote.dm +++ b/yogstation/code/modules/mob/living/emote.dm @@ -7,10 +7,10 @@ . = ..() var/obj/item/highfive/N = new(user) if(user.put_in_hands(N)) - to_chat(user, "You raise your hand for a high-five.") + to_chat(user, span_notice("You raise your hand for a high-five.")) else qdel(N) - to_chat(user, "You don't have any free hands to high-five with.") + to_chat(user, span_warning("You don't have any free hands to high-five with.")) /datum/emote/living/pose key = "pose" diff --git a/yogstation/code/modules/mob/living/silicon/robot/robot.dm b/yogstation/code/modules/mob/living/silicon/robot/robot.dm index 3fa19f9f921d..0cb34beb6742 100644 --- a/yogstation/code/modules/mob/living/silicon/robot/robot.dm +++ b/yogstation/code/modules/mob/living/silicon/robot/robot.dm @@ -2,14 +2,14 @@ icon = initial(icon) //Redundancy in case they repick a skin after modulechange if(!GLOB.DonorBorgHolder) message_admins("[client.ckey] just tried to change their borg skin, but there is no borg skin holder datum! (Has the game not started yet?)") - to_chat(src, "An error occured, if the game has not started yet, please try again after it has. The admins have been notified about this.") + to_chat(src, span_warning("An error occured, if the game has not started yet, please try again after it has. The admins have been notified about this.")) return FALSE if(forced || is_donator(client))//First off, are we even meant to have this verb? or is an admin bruteforcing it onto a non donator for some reason? if(module.name == "Default") to_chat(src, "Please choose a module first! (Standard works too)") return FALSE if(ROLE_SYNDICATE in faction) - to_chat(src, "You cannot reskin as a syndicate cyborg!") + to_chat(src, span_warning("You cannot reskin as a syndicate cyborg!")) return FALSE var/datum/borg_skin/skins = list("default" = icon(icon = src.icon, icon_state = module.cyborg_base_icon)) for(var/T in GLOB.DonorBorgHolder.skins) @@ -33,7 +33,7 @@ eye_lights.icon = A.icon eye_lights.icon_state = "[icon_state]_e[is_servant_of_ratvar(src) ? "_r" : ""]" add_overlay(eye_lights) - to_chat(src, "You have successfully applied the skin: [A.name]") + to_chat(src, span_notice("You have successfully applied the skin: [A.name]")) special_skin = TRUE return TRUE @@ -80,11 +80,11 @@ return if(usr.stat == DEAD) - to_chat(usr, "You are already dead.") + to_chat(usr, span_danger("You are already dead.")) return //won't work if dead var/turf/T = get_turf(usr) - message_admins("[ADMIN_LOOKUPFLW(usr)] detonated themselves at [ADMIN_VERBOSEJMP(T)]!") + message_admins(span_notice("[ADMIN_LOOKUPFLW(usr)] detonated themselves at [ADMIN_VERBOSEJMP(T)]!")) log_game("\[key_name(usr)] detonated themselves!") if(connected_ai) to_chat(connected_ai, "

ALERT - Cyborg detonation detected: [usr]
") diff --git a/yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm b/yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm index bdb2b1577e9e..78e1638b8e63 100644 --- a/yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm +++ b/yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm @@ -157,7 +157,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) if(current_victim.loc == hiding_spot) hiding_spot.bust_open() current_victim.Paralyze(40) - to_chat(current_victim, "...edih t'nac uoY") + to_chat(current_victim, span_warning("...edih t'nac uoY")) return TRUE return FALSE @@ -231,13 +231,13 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) var/obj/item/I = locate() in orange(H, 8) if(I && !I.anchored) I.throw_at(H, 4, 3) - to_chat(H, "What threw that?") + to_chat(H, span_warning("What threw that?")) if(STAGE_SPOOK) if(prob(4)) var/turf/T = get_turf(H) T.handle_slip(H, 20) - to_chat(H, "The floor shifts underneath you!") + to_chat(H, span_warning("The floor shifts underneath you!")) if(prob(5)) H.playsound_local(src,'yogstation/sound/voice/cluwnelaugh2.ogg', 2) @@ -253,7 +253,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) var/obj/item/I = locate() in orange(H, 8) if(I && !I.anchored) I.throw_at(H, 4, 3) - to_chat(H, "What threw that?") + to_chat(H, span_warning("What threw that?")) if(prob(2)) to_chat(H, "yalp ot tnaw I") @@ -265,7 +265,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) if(prob(5)) var/turf/T = get_turf(H) T.handle_slip(H, 20) - to_chat(H, "The floor shifts underneath you!") + to_chat(H, span_warning("The floor shifts underneath you!")) if(prob(3)) playsound(src,pick('sound/spookoween/scary_horn.ogg', 'sound/spookoween/scary_horn2.ogg', 'sound/spookoween/scary_horn3.ogg'), 30, 1) @@ -283,16 +283,16 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) for(var/obj/item/I in orange(H, 8)) if(I && !I.anchored) I.throw_at(H, 4, 3) - to_chat(H, "What the hell?!") + to_chat(H, span_warning("What the hell?!")) if(prob(2)) - to_chat(H, "Something feels very wrong...") + to_chat(H, span_warning("Something feels very wrong...")) H.playsound_local(src,'sound/hallucinations/behind_you1.ogg', 25) H.flash_act() if(prob(2)) to_chat(H, "!?REHTOMKNOH eht esiarp uoy oD") - to_chat(H, "Something grabs your foot!") + to_chat(H, span_warning("Something grabs your foot!")) H.playsound_local(src,'sound/hallucinations/i_see_you1.ogg', 25) H.Stun(20) @@ -303,7 +303,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) playsound(src, 'sound/effects/meteorimpact.ogg', 30, 1) if(prob(1)) - to_chat(H, "WHAT THE FUCK IS THAT?!") + to_chat(H, span_userdanger("WHAT THE FUCK IS THAT?!")) to_chat(H, ".KNOH !nuf hcum os si uoy htiw gniyalP .KNOH KNOH KNOH") H.playsound_local(src,'sound/hallucinations/im_here1.ogg', 25) H.reagents.add_reagent(/datum/reagent/toxin/mindbreaker, 3) @@ -325,7 +325,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) for(var/obj/structure/O in T) if(O.density || istype(O, /obj/machinery/door/airlock)) forceMove(H.loc) - to_chat(H, "You feel the floor closing in on your feet!") + to_chat(H, span_userdanger("You feel the floor closing in on your feet!")) H.Paralyze(300) H.emote("scream") H.adjustBruteLoss(10) @@ -341,7 +341,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) /mob/living/simple_animal/hostile/floor_cluwne/proc/Grab(mob/living/carbon/human/H) - to_chat(H, "You feel a cold, gloved hand clamp down on your ankle!") + to_chat(H, span_userdanger("You feel a cold, gloved hand clamp down on your ankle!")) for(var/I in 1 to get_dist(src, H)) if(do_after(src, 5, target = H)) step_towards(H, src) @@ -353,7 +353,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) playsound(src, pick('yogstation/sound/voice/cluwnelaugh1.ogg', 'yogstation/sound/voice/cluwnelaugh2.ogg', 'yogstation/sound/voice/cluwnelaugh3.ogg'), 50, 1) if(get_dist(src,H) <= 1) - visible_message("[src] begins dragging [H] under the floor!") + visible_message(span_danger("[src] begins dragging [H] under the floor!")) if(do_after(src, 50, target = H) && eating) H.become_blind() H.layer = GAME_PLANE @@ -361,8 +361,8 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) H.density = FALSE H.anchored = TRUE addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Kill, H), 100, TIMER_OVERRIDE|TIMER_UNIQUE) - visible_message("[src] pulls [H] under!") - to_chat(H, "[src] drags you underneath the floor!") + visible_message(span_danger("[src] pulls [H] under!")) + to_chat(H, span_userdanger("[src] drags you underneath the floor!")) else eating = FALSE else diff --git a/yogstation/code/modules/mob/living/simple_animal/hostile/mining_mobs/marrow_weaver.dm b/yogstation/code/modules/mob/living/simple_animal/hostile/mining_mobs/marrow_weaver.dm index b1a3d003487d..1a6656d505c2 100644 --- a/yogstation/code/modules/mob/living/simple_animal/hostile/mining_mobs/marrow_weaver.dm +++ b/yogstation/code/modules/mob/living/simple_animal/hostile/mining_mobs/marrow_weaver.dm @@ -37,7 +37,7 @@ if(buttmad == 0) if(health < maxHealth/3) buttmad = 1 - visible_message("[src] chitters in rage, baring its fangs!") + visible_message(span_danger("[src] chitters in rage, baring its fangs!")) melee_damage_lower = melee_damage_lower_angery1 melee_damage_upper = melee_damage_upper_angery1 move_to_delay = 8 @@ -47,7 +47,7 @@ else if(buttmad == 1) if(health > maxHealth/2) buttmad = 0 - visible_message("[src] seems to have calmed down, but not by much.") + visible_message(span_notice("[src] seems to have calmed down, but not by much.")) melee_damage_lower = melee_damage_lower_angery0 melee_damage_upper = melee_damage_upper_angery0 poison_type = initial(poison_type) @@ -69,15 +69,15 @@ qdel(O) if(foundorgans) src.visible_message( - "[src] drools some toxic goo into [L]'s innards...", - "Before sucking out the slurry of bone marrow and flesh, healing itself!", + span_danger("[src] drools some toxic goo into [L]'s innards..."), + span_danger("Before sucking out the slurry of bone marrow and flesh, healing itself!"), "You liquefy [L]'s innards with your venom and suck out the resulting slurry, revitalizing yourself.") adjustBruteLoss(round(-H.maxHealth/2)) for(var/obj/item/bodypart/B in H.bodyparts) if(B.body_zone == "chest") B.dismember() else - to_chat(src, "There are no organs left in this corpse.") + to_chat(src, span_warning("There are no organs left in this corpse.")) /mob/living/simple_animal/hostile/asteroid/marrowweaver/CanAttack(atom/A) if(..()) diff --git a/yogstation/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm b/yogstation/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm index def090a94fb5..462e1bdf6b7b 100644 --- a/yogstation/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm @@ -180,7 +180,7 @@ Difficulty: Insanely Hard /mob/living/simple_animal/hostile/retaliate/goat/king/Retaliate() ..() if(stat == CONSCIOUS && prob(5)) - visible_message("\The [src] bellows indignantly, with a judgemental gleam in his eye.") + visible_message(span_warning("\The [src] bellows indignantly, with a judgemental gleam in his eye.")) /mob/living/simple_animal/hostile/retaliate/goat/king/phase2/Retaliate() set waitfor = FALSE @@ -188,17 +188,17 @@ Difficulty: Insanely Hard if(spellscast < 5) if(prob(5) && move_to_delay >= 3) //speed buff spellscast++ - visible_message("\The [src] shimmers and seems to phase in and out of reality itself!") + visible_message(span_cult("\The [src] shimmers and seems to phase in and out of reality itself!")) move_to_delay = 1 else if(prob(5) && melee_damage_lower != 50) //damage buff spellscast++ - visible_message("\The [src]' horns grow larger and more menacing!") + visible_message(span_cult("\The [src]' horns grow larger and more menacing!")) melee_damage_lower = 50 else if(prob(5)) //spawn adds spellscast++ - visible_message("\The [src] summons the imperial guard to his aid, and they appear in a flash!") + visible_message(span_cult("\The [src] summons the imperial guard to his aid, and they appear in a flash!")) var/mob/living/simple_animal/hostile/retaliate/goat/guard/master/M = new(get_step(src,pick(GLOB.cardinals))) M.enemies |= enemies var/mob/living/simple_animal/hostile/retaliate/goat/guard/G = new(get_step(src,pick(GLOB.cardinals))) @@ -208,16 +208,16 @@ Difficulty: Insanely Hard else if(prob(5)) //EMP blast spellscast++ - visible_message("\The [src] disrupts nearby electrical equipment!") + visible_message(span_cult("\The [src] disrupts nearby electrical equipment!")) empulse(get_turf(src), 5, 2, 0) else if(prob(5) && melee_damage_type == BRUTE && !special_attacks) //elemental attacks spellscast++ //if(prob(50)) - visible_message("\The [src]' horns flicker with holy white flames!") + visible_message(span_cult("\The [src]' horns flicker with holy white flames!")) melee_damage_type = BURN //else - // visible_message("\The [src]' horns glimmer, electricity arcing between them!") + // visible_message(span_cult("\The [src]' horns glimmer, electricity arcing between them!")) // melee_damage_type = BURN // meh too lazy else if(prob(5)) //earthquake spell @@ -234,7 +234,7 @@ Difficulty: Insanely Hard if(!getBruteLoss() > health_holder) adjustBruteLoss(health_holder - getBruteLoss()) //our own magicks cannot harm us else - visible_message("\The [src] loses concentration and huffs haughtily.") + visible_message(span_notice("\The [src] loses concentration and huffs haughtily.")) stop_automated_movement = FALSE else return @@ -252,7 +252,7 @@ Difficulty: Insanely Hard player.do_range_check(0) stun_chance = 10 update_icon() - visible_message("\The [src]' wounds close with a flash, and when he emerges, he's even larger than before!") + visible_message(span_cult("\The [src]' wounds close with a flash, and when he emerges, he's even larger than before!")) /mob/living/simple_animal/hostile/retaliate/goat/king/phase2/proc/update_icon() @@ -275,18 +275,18 @@ Difficulty: Insanely Hard if(!.) return FALSE if(special_attacks >= 6 && melee_damage_type != BRUTE) - visible_message("The energy surrounding \the [src]'s horns dissipates.") + visible_message(span_cult("The energy surrounding \the [src]'s horns dissipates.")) melee_damage_type = BRUTE /mob/living/simple_animal/hostile/retaliate/goat/king/proc/OnDeath() - visible_message("\The [src] lets loose a terrific wail as its wounds close shut with a flash of light, and its eyes glow even brighter than before!") + visible_message(span_cult("\The [src] lets loose a terrific wail as its wounds close shut with a flash of light, and its eyes glow even brighter than before!")) var/mob/living/simple_animal/hostile/retaliate/goat/king/phase2/nextgoat = new(src.loc) nextgoat.enemies |= enemies qdel(src); /mob/living/simple_animal/hostile/retaliate/goat/king/phase2/OnDeath() if(phase3) - visible_message("\The [src] shrieks as the seal on his power breaks and he starts to break apart!") + visible_message(span_cult("\The [src] shrieks as the seal on his power breaks and he starts to break apart!")) new /obj/structure/ladder/unbreakable/goat(loc) new /obj/item/toy/plush/goatplushie/angry/kinggoat(loc) //If someone dies from this after beating the king goat im going to laugh @@ -303,7 +303,7 @@ Difficulty: Insanely Hard if(prob(stun_chance)) L.Paralyze(5) L.confused += 1 - visible_message("\The [L] is bowled over by the impact of [src]'s attack!") + visible_message(span_warning("\The [L] is bowled over by the impact of [src]'s attack!")) /mob/living/simple_animal/hostile/retaliate/goat/king/phase2/AttackingTarget() . = ..() diff --git a/yogstation/code/modules/mob/new_player/poll.dm b/yogstation/code/modules/mob/new_player/poll.dm index 90934a3d75f8..98aa38321f40 100644 --- a/yogstation/code/modules/mob/new_player/poll.dm +++ b/yogstation/code/modules/mob/new_player/poll.dm @@ -6,7 +6,7 @@ return if(!SSdbcore.IsConnected()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/datum/DBQuery/query_poll_get = SSdbcore.NewQuery("SELECT id, question FROM [format_table_name("poll_question")] WHERE Now() > starttime ORDER BY starttime DESC") @@ -36,7 +36,7 @@ if(!pollid) return if(!SSdbcore.IsConnected()) - to_chat(usr, "Failed to establish database connection.") + to_chat(usr, span_danger("Failed to establish database connection.")) return var/datum/DBQuery/select_query = SSdbcore.NewQuery("SELECT polltype, question, adminonly, multiplechoiceoptions, starttime, endtime FROM [format_table_name("poll_question")] WHERE id = :pollid", list("pollid" = pollid)) select_query.Execute() @@ -58,7 +58,7 @@ break qdel(select_query) if(!found) - to_chat(src, "Poll question details not found.") + to_chat(src, span_warning("Poll question details not found.")) return if(polltype == POLLTYPE_MULTI) diff --git a/yogstation/code/modules/power/antimatter/control.dm b/yogstation/code/modules/power/antimatter/control.dm index 468aa17855a4..37a4ffeb53f6 100644 --- a/yogstation/code/modules/power/antimatter/control.dm +++ b/yogstation/code/modules/power/antimatter/control.dm @@ -169,31 +169,31 @@ if(!anchored) W.play_tool_sound(src, 75) user.visible_message("[user.name] secures the [src.name] to the floor.", \ - "You secure the anchor bolts to the floor.", \ - "You hear a ratchet.") + span_notice("You secure the anchor bolts to the floor."), \ + span_italics("You hear a ratchet.")) src.anchored = TRUE connect_to_network() else if(!linked_shielding.len > 0) W.play_tool_sound(src, 75) user.visible_message("[user.name] unsecures the [src.name].", \ - "You remove the anchor bolts.", \ - "You hear a ratchet.") + span_notice("You remove the anchor bolts."), \ + span_italics("You hear a ratchet.")) src.anchored = FALSE disconnect_from_network() else - to_chat(user, "Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!") + to_chat(user, span_warning("Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!")) else if(istype(W, /obj/item/am_containment)) if(fueljar) - to_chat(user, "There is already a [fueljar] inside!") + to_chat(user, span_warning("There is already a [fueljar] inside!")) return if(!user.transferItemToLoc(W, src)) return fueljar = W user.visible_message("[user.name] loads an [W.name] into the [src.name].", \ - "You load an [W.name].", \ - "You hear a thunk.") + span_notice("You load an [W.name]."), \ + span_italics("You hear a thunk.")) else return ..() diff --git a/yogstation/code/modules/power/antimatter/shielding.dm b/yogstation/code/modules/power/antimatter/shielding.dm index 1bcfb273b84a..1fce7b905fcd 100644 --- a/yogstation/code/modules/power/antimatter/shielding.dm +++ b/yogstation/code/modules/power/antimatter/shielding.dm @@ -33,12 +33,12 @@ addtimer(CALLBACK(src, .proc/controllerscan), 10) /obj/machinery/am_shielding/proc/overheat() - visible_message("[src] melts!") + visible_message(span_danger("[src] melts!")) new /obj/effect/hotspot(loc) qdel(src) /obj/machinery/am_shielding/proc/collapse() - visible_message("[src] collapses back into a container!") + visible_message(span_notice("[src] collapses back into a container!")) new /obj/item/am_shielding_container(drop_location()) qdel(src) diff --git a/yogstation/code/modules/power/hugbox.dm b/yogstation/code/modules/power/hugbox.dm index b11b35abf7ea..1e446573b3a0 100644 --- a/yogstation/code/modules/power/hugbox.dm +++ b/yogstation/code/modules/power/hugbox.dm @@ -15,20 +15,20 @@ if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - to_chat(user, "You crank up the love harvesting regulator to hardware maximum.") + to_chat(user, span_warning("You crank up the love harvesting regulator to hardware maximum.")) /obj/machinery/power/hugbox_engine/wrench_act(mob/living/user, obj/item/I) if(!anchored && !isinspace()) connect_to_network() - to_chat(user, "You secure [src] to the floor.") + to_chat(user, span_notice("You secure [src] to the floor.")) anchored = TRUE playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) else if(anchored) if(has_buckled_mobs()) - to_chat(user, "You can't detach [src] from the floor, it's holding on too tightly!") + to_chat(user, span_warning("You can't detach [src] from the floor, it's holding on too tightly!")) return TRUE disconnect_from_network() - to_chat(user, "You unsecure [src] from the floor.") + to_chat(user, span_notice("You unsecure [src] from the floor.")) anchored = FALSE playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) return TRUE @@ -41,11 +41,11 @@ return if(has_buckled_mobs()) var/mob/living/carbon/H = buckled_mobs[1] - to_chat(C, "You press the emergency release button.") + to_chat(C, span_notice("You press the emergency release button.")) unbuckle_mob(H) return if(obj_flags & EMAGGED) - to_chat(C, "[src] grips you with its manipulators tightly!") + to_chat(C, span_userdanger("[src] grips you with its manipulators tightly!")) C.forceMove(get_turf(src)) playsound(src, 'sound/machines/honkbot_evil_laugh.ogg', 50, 1) C.notransform = TRUE @@ -54,7 +54,7 @@ sleep(30) //better beg for help crunch(C) return - to_chat(C, "You hug [src].") + to_chat(C, span_notice("You hug [src].")) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1) add_avail(power_per_hug) return ..() @@ -63,7 +63,7 @@ while(crunched.buckled) var/turf/location = get_turf(crunched) if(crunched.health > 25) - crunched.visible_message("[src] hugs [crunched]!", "[src] hugs you!") + crunched.visible_message(span_danger("[src] hugs [crunched]!"), span_userdanger("[src] hugs you!")) crunched.adjustBruteLoss(15) playsound(src, "desceration", 60, 1) shake_camera(crunched, 3, 1) @@ -72,17 +72,17 @@ crunched.Stun(20) sleep(20) else - crunched.visible_message("[src] hugs [crunched] tighter!", "[src] starts hugging you tighter!") + crunched.visible_message(span_danger("[src] hugs [crunched] tighter!"), span_userdanger("[src] starts hugging you tighter!")) crunched.Stun(30) crunched.adjustBruteLoss(5) sleep(30) if(crunched.buckled) //Are they still buckled? - crunched.visible_message("[src] hugs [crunched] tighter!", "WAY TOO TIGHT.") + crunched.visible_message(span_danger("[src] hugs [crunched] tighter!"), span_userdanger("WAY TOO TIGHT.")) crunched.Stun(40) crunched.adjustBruteLoss(5) sleep(40) if(crunched.buckled) - crunched.visible_message("You hear a loud crunch coming from [crunched]!", "CRUNCH") + crunched.visible_message(span_danger("You hear a loud crunch coming from [crunched]!"), span_colossus("CRUNCH")) crunched.add_splatter_floor(location) crunched.emote("scream") crunched.adjustBruteLoss(5) @@ -95,4 +95,4 @@ crunched.notransform = FALSE crunched.Knockdown(40) - crunched.visible_message("[src] lets go of [crunched].", "[src] lets you go.") + crunched.visible_message(span_warning("[src] lets go of [crunched]."), span_warning("[src] lets you go.")) diff --git a/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm b/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm index 0ec34ca74ed2..d2e5d9d45862 100644 --- a/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -4,7 +4,7 @@ /obj/machinery/particle_accelerator/control_box/emag_act(mob/user) if(obj_flags & EMAGGED) return - to_chat(user, "The laws of physics no longer apply in the future, god help you...") + to_chat(user, span_danger("The laws of physics no longer apply in the future, god help you...")) SSachievements.unlock_achievement(/datum/achievement/engineering/pa_emag, user.client) do_sparks(5, 0, src) obj_flags |= EMAGGED diff --git a/yogstation/code/modules/power/stationarybike.dm b/yogstation/code/modules/power/stationarybike.dm index 540aa071250a..76da4daab57d 100644 --- a/yogstation/code/modules/power/stationarybike.dm +++ b/yogstation/code/modules/power/stationarybike.dm @@ -19,31 +19,31 @@ /obj/machinery/power/stationarybike/examine(mob/user) . = ..() - . +="It is generating [generating]kw of power." + . +=span_notice("It is generating [generating]kw of power.") /obj/machinery/power/stationarybike/emag_act(mob/user) if(obj_flags & EMAGGED) return obj_flags |= EMAGGED lifeweb = 1 - to_chat(user, "You disabled safeties") + to_chat(user, span_warning("You disabled safeties")) /obj/machinery/power/stationarybike/wrench_act(mob/living/user, obj/item/I) if(!anchored && !isinspace()) playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) if(do_after(user, 20, target = src)) connect_to_network() - to_chat(user, "You secure [src] to the floor.") + to_chat(user, span_notice("You secure [src] to the floor.")) anchored = TRUE playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) else if(anchored) if(operating) - to_chat(user, "You can't detach [src] from the floor while its moving!") + to_chat(user, span_warning("You can't detach [src] from the floor while its moving!")) return TRUE playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) if(do_after(user, 20, target = src)) disconnect_from_network() - to_chat(user, "You unsecure [src] from the floor.") + to_chat(user, span_notice("You unsecure [src] from the floor.")) anchored = FALSE playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) return TRUE @@ -51,7 +51,7 @@ /obj/machinery/power/stationarybike/crowbar_act(mob/living/user, obj/item/I) for(var/mob/living/BM in buckled_mobs) if(lifeweb) - to_chat(user, "You forcefully yank the emergency brake.") + to_chat(user, span_notice("You forcefully yank the emergency brake.")) unbuckle_mob(BM) check_buckled() return TRUE @@ -61,7 +61,7 @@ /obj/machinery/power/stationarybike/attack_hand(mob/user) if(lifeweb) - to_chat(user, "It's spinning too fast! You might hurt yourself if you try to get them off!") + to_chat(user, span_danger("It's spinning too fast! You might hurt yourself if you try to get them off!")) return . = ..() diff --git a/yogstation/code/modules/power/validhunter.dm b/yogstation/code/modules/power/validhunter.dm index 93cbcf655836..cad40017cfed 100644 --- a/yogstation/code/modules/power/validhunter.dm +++ b/yogstation/code/modules/power/validhunter.dm @@ -24,16 +24,16 @@ /obj/machinery/power/validhunter_engine/wrench_act(mob/living/user, obj/item/I) if(!anchored && !isinspace()) connect_to_network() - to_chat(user, "You secure [src] to the floor.") + to_chat(user, span_notice("You secure [src] to the floor.")) anchored = TRUE playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) else if(anchored) if(operating) - to_chat(user, "You can't detach [src] from the floor, it's holding on too tightly!") + to_chat(user, span_warning("You can't detach [src] from the floor, it's holding on too tightly!")) return TRUE disconnect_from_network() - to_chat(user, "You unsecure [src] from the floor.") + to_chat(user, span_notice("You unsecure [src] from the floor.")) anchored = FALSE playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) @@ -44,7 +44,7 @@ return obj_flags |= EMAGGED - to_chat(user, "You overload the syndicate chip.") + to_chat(user, span_warning("You overload the syndicate chip.")) /obj/machinery/power/validhunter_engine/attack_hand(mob/user) . = ..() @@ -52,24 +52,24 @@ 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_notice("[src] cannot be used unless bolted to the ground.")) return if(user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling)) var/mob/living/L = user.pulling if(L.buckled ||L.has_buckled_mobs()) - to_chat(user, "[L] is attached to something!") + to_chat(user, span_warning("[L] is attached to something!")) return - user.visible_message("[user] starts to put [L] into the engine!") + user.visible_message(span_danger("[user] starts to put [L] into the engine!")) add_fingerprint(user) if(do_after(user, gibtime, target = src)) if(L && user.pulling == L && !L.buckled && !L.has_buckled_mobs()) - user.visible_message("[user] stuffs [L] into the engine!") + user.visible_message(span_danger("[user] stuffs [L] into the engine!")) process_mob(L, user) /obj/machinery/power/validhunter_engine/proc/process_mob(mob/living/L, mob/user) @@ -78,7 +78,7 @@ playsound(src.loc, 'sound/machines/terminal_on.ogg', 50, 1) L.forceMove(src) - visible_message("You hear a loud squelchy grinding sound.") + visible_message(span_italics("You hear a loud squelchy grinding sound.")) playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1) var/offset = prob(50) ? -2 : 2 animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking @@ -163,7 +163,7 @@ /obj/machinery/power/validhunter_engine/proc/fake_gib(mob/living/L) playsound(src.loc, 'sound/machines/terminal_off.ogg', 50, 1) - visible_message("The machine spits the inhabitant back out.") + visible_message(span_warning("The machine spits the inhabitant back out.")) dropContents() operating = FALSE diff --git a/yogstation/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/yogstation/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index f3ff90ba6f30..11e19f2a2c71 100644 --- a/yogstation/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/yogstation/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -30,27 +30,27 @@ /datum/reagent/consumable/ethanol/whiskey/kong/addiction_act_stage1(mob/living/M) if(prob(5)) - to_chat(M, "You've made so many mistakes.") + to_chat(M, span_notice("You've made so many mistakes.")) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "depression_minimal", /datum/mood_event/depression_minimal) ..() /datum/reagent/consumable/ethanol/whiskey/kong/addiction_act_stage2(mob/living/M) if(prob(5)) - to_chat(M, "No matter what you do, people will always get hurt.") + to_chat(M, span_notice("No matter what you do, people will always get hurt.")) SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "depression_minimal", /datum/mood_event/depression_minimal) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "depression_mild", /datum/mood_event/depression_mild) ..() /datum/reagent/consumable/ethanol/whiskey/kong/addiction_act_stage3(mob/living/M) if(prob(5)) - to_chat(M, "You've lost so many people.") + to_chat(M, span_notice("You've lost so many people.")) SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "depression_mild", /datum/mood_event/depression_mild) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "depression_moderate", /datum/mood_event/depression_moderate) ..() /datum/reagent/consumable/ethanol/whiskey/kong/addiction_act_stage4(mob/living/M) if(prob(5)) - to_chat(M, "Just lie down and die.") + to_chat(M, span_notice("Just lie down and die.")) SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "depression_moderate", /datum/mood_event/depression_moderate) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "depression_severe", /datum/mood_event/depression_severe) ..() diff --git a/yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm b/yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm index 245e25bbc280..f26a14e7c714 100644 --- a/yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -3,7 +3,7 @@ description = "A gorilla-ing toxin." color = "#5EFF3B" //RGB: 94, 255, 59 race = /datum/species/gorilla - mutationtext = "The pain subsides. You feel... damn dirty." + mutationtext = span_danger("The pain subsides. You feel... damn dirty.") /datum/reagent/cluwnification name = "Cluwne Tears" diff --git a/yogstation/code/modules/recycling/disposal/pipe_sorting.dm b/yogstation/code/modules/recycling/disposal/pipe_sorting.dm index 256e9d72be1c..53080382d2dd 100644 --- a/yogstation/code/modules/recycling/disposal/pipe_sorting.dm +++ b/yogstation/code/modules/recycling/disposal/pipe_sorting.dm @@ -36,7 +36,7 @@ /obj/structure/disposalpipe/sorting/screwdriver_act(mob/living/user, obj/item/I) panel_open = !panel_open I.play_tool_sound(src) - to_chat(user, "You [panel_open ? "open" : "close"] the wire panel.") + to_chat(user, span_notice("You [panel_open ? "open" : "close"] the wire panel.")) update_icon() return TRUE diff --git a/yogstation/code/modules/scripting/IDE.dm b/yogstation/code/modules/scripting/IDE.dm index b2fe30edf2db..3f4e5ecc13dd 100644 --- a/yogstation/code/modules/scripting/IDE.dm +++ b/yogstation/code/modules/scripting/IDE.dm @@ -1,7 +1,7 @@ /client/verb/tcssave() set hidden = 1 if(is_banned_from(usr.ckey, "Signal Technician")) - to_chat(usr, "You are banned from using NTSL.") + to_chat(usr, span_warning("You are banned from using NTSL.")) return if(mob.machine || issilicon(mob)) if(telecomms_check(mob)) @@ -28,7 +28,7 @@ /client/verb/tcscompile() set hidden = 1 if(is_banned_from(usr.ckey, "Signal Technician")) - to_chat(usr, "You are banned from using NTSL.") + to_chat(usr, span_warning("You are banned from using NTSL.")) return if(mob.machine || issilicon(mob)) if(telecomms_check(mob)) @@ -112,7 +112,7 @@ /client/verb/tcsrun() set hidden = 1 if(is_banned_from(usr.ckey, "Signal Technician")) - to_chat(usr, "You are banned from using NTSL.") + to_chat(usr, span_warning("You are banned from using NTSL.")) return if(mob.machine || issilicon(mob)) if(telecomms_check(mob)) @@ -151,7 +151,7 @@ /client/verb/exittcs() set hidden = 1 if(is_banned_from(usr.ckey, "Signal Technician")) - to_chat(usr, "You are banned from using NTSL.") + to_chat(usr, span_warning("You are banned from using NTSL.")) return if(mob.machine || issilicon(mob)) if(telecomms_check(mob)) @@ -166,7 +166,7 @@ /client/verb/tcsrevert() set hidden = 1 if(is_banned_from(usr.ckey, "Signal Technician")) - to_chat(usr, "You are banned from using NTSL.") + to_chat(usr, span_warning("You are banned from using NTSL.")) return if(mob.machine || issilicon(mob)) if(telecomms_check(mob)) @@ -198,7 +198,7 @@ /client/verb/tcsclearmem() set hidden = 1 if(is_banned_from(usr.ckey, "Signal Technician")) - to_chat(usr, "You are banned from using NTSL.") + to_chat(usr, span_warning("You are banned from using NTSL.")) return if(mob.machine || issilicon(mob)) if(telecomms_check(mob)) diff --git a/yogstation/code/modules/spacepods/construction.dm b/yogstation/code/modules/spacepods/construction.dm index a38048239131..2e753f21e1e7 100644 --- a/yogstation/code/modules/spacepods/construction.dm +++ b/yogstation/code/modules/spacepods/construction.dm @@ -53,7 +53,7 @@ user.visible_message("[user] wires [src].", "You wire [src].") construction_state++ else - to_chat(user, "You need 10 wires for this!") + to_chat(user, span_warning("You need 10 wires for this!")) if(SPACEPOD_WIRES_LOOSE) if(W.tool_behaviour == TOOL_WIRECUTTER) . = TRUE @@ -81,7 +81,7 @@ construction_state++ user.visible_message("[user] inserts the mainboard into [src].", "You insert the mainboard into [src].") else - to_chat(user, "[W] is stuck to your hand!") + to_chat(user, span_warning("[W] is stuck to your hand!")) if(SPACEPOD_CIRCUIT_LOOSE) if(W.tool_behaviour == TOOL_CROWBAR) . = TRUE @@ -108,7 +108,7 @@ construction_state++ user.visible_message("[user] inserts the core into [src].", "You carefully insert the core into [src].") else - to_chat(user, "[W] is stuck to your hand!") + to_chat(user, span_warning("[W] is stuck to your hand!")) if(SPACEPOD_CORE_LOOSE) if(W.tool_behaviour == TOOL_CROWBAR) . = TRUE @@ -134,7 +134,7 @@ user.visible_message("[user] fabricates a pressure bulkhead for [src].", "You frabricate a pressure bulkhead for [src].") construction_state++ else - to_chat(user, "You need 5 metal for this!") + to_chat(user, span_warning("You need 5 metal for this!")) if(SPACEPOD_BULKHEAD_LOOSE) if(W.tool_behaviour == TOOL_CROWBAR) . = TRUE diff --git a/yogstation/code/modules/spacepods/equipment.dm b/yogstation/code/modules/spacepods/equipment.dm index 4f565b4b9b6d..c50483fb6cd0 100644 --- a/yogstation/code/modules/spacepods/equipment.dm +++ b/yogstation/code/modules/spacepods/equipment.dm @@ -18,7 +18,7 @@ if(EQ.slot == slot) room -= EQ.slot_space if(room < slot_space) - to_chat(user, "There's no room for another [slot] system!") + to_chat(user, span_warning("There's no room for another [slot] system!")) return FALSE return TRUE @@ -47,11 +47,11 @@ /obj/item/spacepod_equipment/weaponry/proc/fire_weapons(target) if(spacepod.next_firetime > world.time) - to_chat(usr, "Your weapons are recharging.") + to_chat(usr, span_warning("Your weapons are recharging.")) playsound(src, 'sound/weapons/gun_dry_fire.ogg', 30, TRUE) return if(!spacepod.cell || !spacepod.cell.use(shot_cost)) - to_chat(usr, "Insufficient charge to fire the weapons") + to_chat(usr, span_warning("Insufficient charge to fire the weapons")) playsound(src, 'sound/weapons/gun_dry_fire.ogg', 30, TRUE) return spacepod.next_firetime = world.time + fire_delay @@ -97,7 +97,7 @@ /obj/item/spacepod_equipment/cargo/large/can_uninstall(mob/user) if(storage) - to_chat(user, "Unload the cargo first!") + to_chat(user, span_warning("Unload the cargo first!")) return FALSE return ..() @@ -127,15 +127,15 @@ return FALSE if(istype(A, storage_type) && SP.Adjacent(A)) // For loading ore boxes if(!storage) - to_chat(user, "You begin loading [A] into [SP]'s [src]") + to_chat(user, span_notice("You begin loading [A] into [SP]'s [src]")) if(do_after_mob(user, list(A, SP), 40)) storage = A A.forceMove(src) - to_chat(user, "You load [A] into [SP]'s [src]!") + to_chat(user, span_notice("You load [A] into [SP]'s [src]!")) else - to_chat(user, "You fail to load [A] into [SP]'s [src]") + to_chat(user, span_warning("You fail to load [A] into [SP]'s [src]")) else - to_chat(user, "[SP] already has \an [storage]") + to_chat(user, span_warning("[SP] already has \an [storage]")) return TRUE return FALSE @@ -175,7 +175,7 @@ /obj/item/spacepod_equipment/cargo/chair/can_uninstall(mob/user) if(spacepod.passengers.len > (spacepod.max_passengers - occupant_mod)) - to_chat(user, "You can't remove an occupied seat! Remove the occupant first.") + to_chat(user, span_warning("You can't remove an occupied seat! Remove the occupant first.")) return FALSE return ..() @@ -325,7 +325,7 @@ SP.lock_pod() return else - to_chat(user, "This is the wrong key!") + to_chat(user, span_warning("This is the wrong key!")) return TRUE return FALSE @@ -334,9 +334,9 @@ var/obj/item/spacepod_key/key = I if(key.id == null) key.id = id - to_chat(user, "You grind the blank key to fit the lock.") + to_chat(user, span_notice("You grind the blank key to fit the lock.")) else - to_chat(user, "This key is already ground!") + to_chat(user, span_warning("This key is already ground!")) else ..() @@ -370,4 +370,4 @@ icon_state = "lock_buster_on" else icon_state = "lock_buster_off" - to_chat(user, "You turn the [src] [on ? "on" : "off"].") + to_chat(user, span_notice("You turn the [src] [on ? "on" : "off"].")) diff --git a/yogstation/code/modules/spacepods/parts.dm b/yogstation/code/modules/spacepods/parts.dm index 1e67f9158f15..b261ec0cf842 100644 --- a/yogstation/code/modules/spacepods/parts.dm +++ b/yogstation/code/modules/spacepods/parts.dm @@ -57,10 +57,10 @@ var/obj/item/stack/rods/R = O var/list/linkedparts = find_square() if(!linkedparts) - to_chat(user, "You cannot assemble a pod frame because you do not have the necessary assembly.") + to_chat(user, span_warning("You cannot assemble a pod frame because you do not have the necessary assembly.")) return TRUE if(!R.use(10)) - to_chat(user, "You need 10 rods for this.") + to_chat(user, span_warning("You need 10 rods for this.")) return TRUE var/obj/spacepod/pod = new pod.forceMove(loc) @@ -74,14 +74,14 @@ if(EAST) pod.angle = 90 pod.process(2) - to_chat(user, "You strut the pod frame together.") + to_chat(user, span_notice("You strut the pod frame together.")) for(var/obj/item/pod_parts/pod_frame/F in linkedparts) if(1 == turn(F.dir, -F.link_angle)) //if the part links north during construction, as the bottom left part always does pod.forceMove(F.loc) qdel(F) return TRUE if(O.tool_behaviour == TOOL_WRENCH) - to_chat(user, "You [!anchored ? "secure \the [src] in place." : "remove the securing bolts."]") + to_chat(user, span_notice("You [!anchored ? "secure \the [src] in place." : "remove the securing bolts."]")) anchored = !anchored density = anchored O.play_tool_sound(src) diff --git a/yogstation/code/modules/spacepods/physics.dm b/yogstation/code/modules/spacepods/physics.dm index 4ea3594cd2f0..0b84819e2c27 100644 --- a/yogstation/code/modules/spacepods/physics.dm +++ b/yogstation/code/modules/spacepods/physics.dm @@ -75,7 +75,7 @@ last_thrust_right = 0 if(brakes) if(user_thrust_dir) - to_chat(pilot, "Your brakes are on!") + to_chat(pilot, span_warning("Your brakes are on!")) // basically calculates how much we can brake using the thrust var/forward_thrust = -((fx * velocity_x) + (fy * velocity_y)) / time var/right_thrust = -((sx * velocity_x) + (sy * velocity_y)) / time @@ -110,7 +110,7 @@ last_thrust_forward = 0 last_thrust_right = 0 if(!brakes && user_thrust_dir) - to_chat(pilot, "You are out of power!") + to_chat(pilot, span_warning("You are out of power!")) offset_x += velocity_x * time offset_y += velocity_y * time @@ -248,14 +248,14 @@ message_admins("[key_name_admin(pilot)] has impacted a spacepod into [A] with velocity [bump_velocity]") take_damage(strength*10, BRUTE, "melee", TRUE) log_game("[key_name(pilot)] has impacted a spacepod into [A] with velocity [bump_velocity]") - visible_message("The force of the impact causes a shockwave") + visible_message(span_danger("The force of the impact causes a shockwave")) else if(isliving(A) && bump_velocity > 5) var/mob/living/M = A M.apply_damage(bump_velocity * 2) take_damage(bump_velocity, BRUTE, "melee", FALSE) playsound(M.loc, "swing_hit", 1000, 1, -1) M.Knockdown(bump_velocity * 2) - M.visible_message("The force of the impact knocks [M] down!","The force of the impact knocks you down!") + M.visible_message(span_warning("The force of the impact knocks [M] down!"),span_userdanger("The force of the impact knocks you down!")) log_combat(pilot, M, "impacted", src, "with velocity of [bump_velocity]") return ..() diff --git a/yogstation/code/modules/spacepods/spacepod.dm b/yogstation/code/modules/spacepods/spacepod.dm index 3dee91fcbc90..78ca5168e414 100644 --- a/yogstation/code/modules/spacepods/spacepod.dm +++ b/yogstation/code/modules/spacepods/spacepod.dm @@ -114,24 +114,24 @@ GLOBAL_LIST_INIT(spacepods_list, list()) if(hatch_open || !locked) hatch_open = !hatch_open W.play_tool_sound(src) - to_chat(user, "You [hatch_open ? "open" : "close"] the maintenance hatch.") + to_chat(user, span_notice("You [hatch_open ? "open" : "close"] the maintenance hatch.")) else - to_chat(user, "The hatch is locked shut!") + to_chat(user, span_warning("The hatch is locked shut!")) return TRUE if(istype(W, /obj/item/stock_parts/cell)) if(!hatch_open) - to_chat(user, "The maintenance hatch is closed!") + to_chat(user, span_warning("The maintenance hatch is closed!")) return TRUE if(cell) - to_chat(user, "The pod already has a battery.") + to_chat(user, span_notice("The pod already has a battery.")) return TRUE if(user.transferItemToLoc(W, src)) - to_chat(user, "You insert [W] into the pod.") + to_chat(user, span_notice("You insert [W] into the pod.")) cell = W return TRUE if(istype(W, /obj/item/spacepod_equipment)) if(!hatch_open) - to_chat(user, "The maintenance hatch is closed!") + to_chat(user, span_warning("The maintenance hatch is closed!")) return TRUE var/obj/item/spacepod_equipment/SE = W if(SE.can_install(src, user) && user.temporarilyRemoveItemFromInventory(SE)) @@ -141,37 +141,37 @@ GLOBAL_LIST_INIT(spacepods_list, list()) if(lock && istype(W, /obj/item/device/lock_buster)) var/obj/item/device/lock_buster/L = W if(L.on) - user.visible_message(user, "[user] is drilling through [src]'s lock!", - "You start drilling through [src]'s lock!") + user.visible_message(user, span_warning("[user] is drilling through [src]'s lock!"), + span_notice("You start drilling through [src]'s lock!")) if(do_after(user, 100 * W.toolspeed, target = src)) if(lock) var/obj/O = lock lock.on_uninstall() qdel(O) - user.visible_message(user, "[user] has destroyed [src]'s lock!", - "You destroy [src]'s lock!") + user.visible_message(user, span_warning("[user] has destroyed [src]'s lock!"), + span_notice("You destroy [src]'s lock!")) else - user.visible_message(user, "[user] fails to break through [src]'s lock!", - "You were unable to break through [src]'s lock!") + user.visible_message(user, span_warning("[user] fails to break through [src]'s lock!"), + span_notice("You were unable to break through [src]'s lock!")) return TRUE - to_chat(user, "Turn the [L] on first.") + to_chat(user, span_notice("Turn the [L] on first.")) return TRUE if(W.tool_behaviour == TOOL_WELDER) var/repairing = cell || internal_tank || equipment.len || (obj_integrity < max_integrity) || pilot || passengers.len if(!hatch_open) - to_chat(user, "You must open the maintenance hatch before [repairing ? "attempting repairs" : "unwelding the armor"].") + to_chat(user, span_warning("You must open the maintenance hatch before [repairing ? "attempting repairs" : "unwelding the armor"].")) return TRUE if(repairing && obj_integrity >= max_integrity) - to_chat(user, "[src] is fully repaired!") + to_chat(user, span_warning("[src] is fully repaired!")) return TRUE - to_chat(user, "You start [repairing ? "repairing [src]" : "slicing off [src]'s armor'"]") + to_chat(user, span_notice("You start [repairing ? "repairing [src]" : "slicing off [src]'s armor'"]")) if(W.use_tool(src, user, 50, amount=3, volume = 50)) if(repairing) obj_integrity = min(max_integrity, obj_integrity + 10) update_icon() - to_chat(user, "You mend some [pick("dents","bumps","damage")] with [W]") + to_chat(user, span_notice("You mend some [pick("dents","bumps","damage")] with [W]")) else if(!cell && !internal_tank && !equipment.len && !pilot && !passengers.len && construction_state == SPACEPOD_ARMOR_WELDED) - user.visible_message("[user] slices off [src]'s armor.", "You slice off [src]'s armor.") + user.visible_message("[user] slices off [src]'s armor.", span_notice("You slice off [src]'s armor.")) construction_state = SPACEPOD_ARMOR_SECURED update_icon() return TRUE @@ -186,23 +186,23 @@ GLOBAL_LIST_INIT(spacepods_list, list()) target = passengers[1] if(target && istype(target)) - src.visible_message("[user] is trying to rip the door open and pull [target] out of [src]!", - "You see [user] outside the door trying to rip it open!") + src.visible_message(span_warning("[user] is trying to rip the door open and pull [target] out of [src]!"), + span_warning("You see [user] outside the door trying to rip it open!")) if(do_after(user, 50, target = src) && construction_state == SPACEPOD_ARMOR_WELDED) if(remove_rider(target)) target.Stun(20) - target.visible_message("[user] flings the door open and tears [target] out of [src]", - "The door flies open and you are thrown out of [src] and to the ground!") + target.visible_message(span_warning("[user] flings the door open and tears [target] out of [src]"), + span_warning("The door flies open and you are thrown out of [src] and to the ground!")) return - target.visible_message("[user] was unable to get the door open!", - "You manage to keep [user] out of [src]!") + target.visible_message(span_warning("[user] was unable to get the door open!"), + span_warning("You manage to keep [user] out of [src]!")) if(!hatch_open) //if(cargo_hold.storage_slots > 0) // if(!locked) // cargo_hold.open(user) // else - // to_chat(user, "The storage compartment is locked") + // to_chat(user, span_notice("The storage compartment is locked")) return ..() var/list/items = list(cell, internal_tank) items += equipment @@ -470,16 +470,16 @@ GLOBAL_LIST_INIT(spacepods_list, list()) if(istype(A, /obj/machinery/portable_atmospherics/canister)) if(internal_tank) - to_chat(user, "[src] already has an internal_tank!") + to_chat(user, span_warning("[src] already has an internal_tank!")) return if(!A.Adjacent(src)) - to_chat(user, "The canister is not close enough!") + to_chat(user, span_warning("The canister is not close enough!")) return if(hatch_open) - to_chat(user, "The hatch is shut!") - to_chat(user, "You begin inserting the canister into [src]") + to_chat(user, span_warning("The hatch is shut!")) + to_chat(user, span_notice("You begin inserting the canister into [src]")) if(do_after_mob(user, list(A, src), 50) && construction_state == SPACEPOD_ARMOR_WELDED) - to_chat(user, "You insert the canister into [src]") + to_chat(user, span_notice("You insert the canister into [src]")) A.forceMove(src) internal_tank = A return @@ -491,7 +491,7 @@ GLOBAL_LIST_INIT(spacepods_list, list()) to_chat(user, "[A.p_they()] can't fly the pod!") return if(passengers.len < max_passengers) - visible_message("[user] starts loading [M] into [src]!") + visible_message(span_danger("[user] starts loading [M] into [src]!")) if(do_after_mob(user, list(M, src), 50) && construction_state == SPACEPOD_ARMOR_WELDED) add_rider(M, FALSE) return @@ -506,7 +506,7 @@ GLOBAL_LIST_INIT(spacepods_list, list()) return FALSE if(locked) - to_chat(user, "[src]'s doors are locked!") + to_chat(user, span_warning("[src]'s doors are locked!")) return FALSE if(!istype(user)) @@ -518,23 +518,23 @@ GLOBAL_LIST_INIT(spacepods_list, list()) return FALSE if(passengers.len <= max_passengers || !pilot) - visible_message("[user] starts to climb into [src].") + visible_message(span_notice("[user] starts to climb into [src].")) if(do_after(user, 40, target = src) && construction_state == SPACEPOD_ARMOR_WELDED) var/success = add_rider(user) if(!success) - to_chat(user, "You were too slow. Try better next time, loser.") + to_chat(user, span_notice("You were too slow. Try better next time, loser.")) return success else - to_chat(user, "You stop entering [src].") + to_chat(user, span_notice("You stop entering [src].")) else - to_chat(user, "You can't fit in [src], it's full!") + to_chat(user, span_danger("You can't fit in [src], it's full!")) return FALSE /obj/spacepod/proc/verb_check(require_pilot = TRUE, mob/user = null) if(!user) user = usr if(require_pilot && user != pilot) - to_chat(user, "You can't reach the controls from your chair") + to_chat(user, span_notice("You can't reach the controls from your chair")) return FALSE return !user.incapacitated() && isliving(user) @@ -547,14 +547,14 @@ GLOBAL_LIST_INIT(spacepods_list, list()) return if(usr.restrained()) - to_chat(usr, "You attempt to stumble out of [src]. This will take two minutes.") + to_chat(usr, span_notice("You attempt to stumble out of [src]. This will take two minutes.")) if(pilot) - to_chat(pilot, "[usr] is trying to escape [src].") + to_chat(pilot, span_warning("[usr] is trying to escape [src].")) if(!do_after(usr, 1200, target = src)) return if(remove_rider(usr)) - to_chat(usr, "You climb out of [src].") + to_chat(usr, span_notice("You climb out of [src].")) /obj/spacepod/verb/lock_pod() set name = "Lock Doors" @@ -565,11 +565,11 @@ GLOBAL_LIST_INIT(spacepods_list, list()) return if(!lock) - to_chat(usr, "[src] has no locking mechanism.") + to_chat(usr, span_warning("[src] has no locking mechanism.")) locked = FALSE //Should never be false without a lock, but if it somehow happens, that will force an unlock. else locked = !locked - to_chat(usr, "You [locked ? "lock" : "unlock"] the doors.") + to_chat(usr, span_warning("You [locked ? "lock" : "unlock"] the doors.")) /obj/spacepod/verb/toggle_brakes() set name = "Toggle Brakes" @@ -579,13 +579,13 @@ GLOBAL_LIST_INIT(spacepods_list, list()) if(!verb_check()) return brakes = !brakes - to_chat(usr, "You toggle the brakes [brakes ? "on" : "off"].") + to_chat(usr, span_notice("You toggle the brakes [brakes ? "on" : "off"].")) /obj/spacepod/AltClick(user) if(!verb_check(user = user)) return brakes = !brakes - to_chat(usr, "You toggle the brakes [brakes ? "on" : "off"].") + to_chat(usr, span_notice("You toggle the brakes [brakes ? "on" : "off"].")) /obj/spacepod/verb/toggleLights() set name = "Toggle Lights" @@ -621,10 +621,10 @@ GLOBAL_LIST_INIT(spacepods_list, list()) else P.close() return TRUE - to_chat(usr, "Access denied.") + to_chat(usr, span_warning("Access denied.")) return - to_chat(usr, "You are not close to any pod doors.") + to_chat(usr, span_warning("You are not close to any pod doors.")) /obj/spacepod/proc/add_rider(mob/living/M, allow_pilot = TRUE) if(M == pilot || (M in passengers)) diff --git a/yogstation/code/modules/spells/cauterize.dm b/yogstation/code/modules/spells/cauterize.dm index fc327bccd025..7cdfe20e87d2 100644 --- a/yogstation/code/modules/spells/cauterize.dm +++ b/yogstation/code/modules/spells/cauterize.dm @@ -24,7 +24,7 @@ target.adjustFireLoss(-500) var/damage_per_tick=total_dam/real_duration if(total_dam>=100) - to_chat(target, "You really feel like you should heal your burns!") + to_chat(target, span_warning("You really feel like you should heal your burns!")) for(var/i in 1 to real_duration) sleep(10) target.adjustFireLoss(damage_per_tick) diff --git a/yogstation/code/modules/spells/cluwnecurse.dm b/yogstation/code/modules/spells/cluwnecurse.dm index 8ad6f3fb8b1b..24091c5a43ce 100644 --- a/yogstation/code/modules/spells/cluwnecurse.dm +++ b/yogstation/code/modules/spells/cluwnecurse.dm @@ -18,14 +18,14 @@ /obj/effect/proc_holder/spell/targeted/cluwnecurse/cast(list/targets, mob/user = usr) if(!targets.len) - to_chat(user, "No target found in range.") + to_chat(user, span_notice("No target found in range.")) return var/mob/living/carbon/target = targets[1] if(!(target.type in compatible_mobs)) - to_chat(user, "You are unable to curse [target]!") + to_chat(user, span_notice("You are unable to curse [target]!")) return if(!(target in oview(range))) - to_chat(user, "They are too far away!") + to_chat(user, span_notice("They are too far away!")) return var/mob/living/carbon/human/H = target H.cluwneify() diff --git a/yogstation/code/modules/stock_market/computer.dm b/yogstation/code/modules/stock_market/computer.dm index d8e7960dd98c..613ff5258102 100644 --- a/yogstation/code/modules/stock_market/computer.dm +++ b/yogstation/code/modules/stock_market/computer.dm @@ -176,13 +176,13 @@ a.updated { return var/li = logged_in if (!li) - to_chat(user, "No active account on the console!") + to_chat(user, span_danger("No active account on the console!")) return var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) var/b = D.account_balance var/avail = S.shareholders[logged_in] if (!avail) - to_chat(user, "This account does not own any shares of [S.name]!") + to_chat(user, span_danger("This account does not own any shares of [S.name]!")) return var/price = S.current_value var/amt = round(input(user, "How many shares? \n(Have: [avail], unit price: [price])", "Sell shares in [S.name]", 0) as num|null) @@ -196,14 +196,14 @@ a.updated { return b = D.account_balance if (!isnum(b)) - to_chat(user, "No active account on the console!") + to_chat(user, span_danger("No active account on the console!")) return var/total = amt * S.current_value if (!S.sellShares(logged_in, amt)) - to_chat(user, "Could not complete transaction.") + to_chat(user, span_danger("Could not complete transaction.")) return - to_chat(user, "Sold [amt] shares of [S.name] at [S.current_value] a share for [total] credits.") + to_chat(user, span_notice("Sold [amt] shares of [S.name] at [S.current_value] a share for [total] credits.")) GLOB.stockExchange.add_log(/datum/stock_log/sell, user.name, S.name, amt, S.current_value, total) /obj/machinery/computer/stockexchange/proc/buy_some_shares(var/datum/stock/S, var/mob/user) @@ -211,11 +211,11 @@ a.updated { return var/li = logged_in if (!li) - to_chat(user, "No active account on the console!") + to_chat(user, span_danger("No active account on the console!")) return var/b = balance() if (!isnum(b)) - to_chat(user, "No active account on the console!") + to_chat(user, span_danger("No active account on the console!")) return var/avail = S.available_shares var/price = S.current_value @@ -227,26 +227,26 @@ a.updated { return b = balance() if (!isnum(b)) - to_chat(user, "No active account on the console!") + to_chat(user, span_danger("No active account on the console!")) return amt = min(amt, S.available_shares, round(b / S.current_value)) if (!amt) return if (!S.buyShares(logged_in, amt)) - to_chat(user, "Could not complete transaction.") + to_chat(user, span_danger("Could not complete transaction.")) return var/total = amt * S.current_value - to_chat(user, "Bought [amt] shares of [S.name] at [S.current_value] a share for [total] credits.") + to_chat(user, span_notice("Bought [amt] shares of [S.name] at [S.current_value] a share for [total] credits.")) GLOB.stockExchange.add_log(/datum/stock_log/buy, user.name, S.name, amt, S.current_value, total) /obj/machinery/computer/stockexchange/proc/do_borrowing_deal(var/datum/borrow/B, var/mob/user) if (B.stock.borrow(B, logged_in)) - to_chat(user, "You successfully borrowed [B.share_amount] shares. Deposit: [B.deposit].") + to_chat(user, span_notice("You successfully borrowed [B.share_amount] shares. Deposit: [B.deposit].")) GLOB.stockExchange.add_log(/datum/stock_log/borrow, user.name, B.stock.name, B.share_amount, B.deposit) else - to_chat(user, "Could not complete transaction. Check your account balance.") + to_chat(user, span_danger("Could not complete transaction. Check your account balance.")) /obj/machinery/computer/stockexchange/Topic(href, href_list) if (..()) diff --git a/yogstation/code/modules/surgery/gender_reassignment.dm b/yogstation/code/modules/surgery/gender_reassignment.dm index cf6db71f9f75..ba6e26395325 100644 --- a/yogstation/code/modules/surgery/gender_reassignment.dm +++ b/yogstation/code/modules/surgery/gender_reassignment.dm @@ -20,18 +20,18 @@ /datum/surgery_step/reshape_genitals/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(target.gender == FEMALE) - user.visible_message("[user] begins to reshape [target]'s genitals to look more masculine.", "You begin to reshape [target]'s genitals to look more masculine...") + user.visible_message("[user] begins to reshape [target]'s genitals to look more masculine.", span_notice("You begin to reshape [target]'s genitals to look more masculine...")) else - user.visible_message("[user] begins to reshape [target]'s genitals to look more feminine.", "You begin to reshape [target]'s genitals to look more feminine...") + user.visible_message("[user] begins to reshape [target]'s genitals to look more feminine.", span_notice("You begin to reshape [target]'s genitals to look more feminine...")) /datum/surgery_step/reshape_genitals/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) var/mob/living/carbon/human/H = target //no type check, as that should be handled by the surgery H.gender_ambiguous = 0 if(target.gender == FEMALE) - user.visible_message("[user] has made a man of [target]!", "You made [target] a man.") + user.visible_message("[user] has made a man of [target]!", span_notice("You made [target] a man.")) target.gender = MALE else - user.visible_message("[user] has made a woman of [target]!", "You made [target] a woman.") + user.visible_message("[user] has made a woman of [target]!", span_notice("You made [target] a woman.")) target.gender = FEMALE target.regenerate_icons() return 1 @@ -39,7 +39,7 @@ /datum/surgery_step/reshape_genitals/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) var/mob/living/carbon/human/H = target H.gender_ambiguous = 1 - user.visible_message("[user] accidentally mutilates [target]'s genitals beyond the point of recognition!", "You accidentally mutilate [target]'s genitals beyond the point of recognition!") + user.visible_message(span_warning("[user] accidentally mutilates [target]'s genitals beyond the point of recognition!"), span_warning("You accidentally mutilate [target]'s genitals beyond the point of recognition!")) target.gender = pick(MALE, FEMALE) target.regenerate_icons() return 1 \ No newline at end of file diff --git a/yogstation/code/modules/surgery/healing_surgeries.dm b/yogstation/code/modules/surgery/healing_surgeries.dm index a40835bd1dfb..9d2133040dac 100644 --- a/yogstation/code/modules/surgery/healing_surgeries.dm +++ b/yogstation/code/modules/surgery/healing_surgeries.dm @@ -5,13 +5,13 @@ time = 40 /datum/surgery_step/debride/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] begins to cut off dead flesh around the wound upon [target]'s [parse_zone(target_zone)].", "You begin cutting away the dead and damaged tissue on [target]'s [parse_zone(target_zone)], creating a cleaner wound bed...") + user.visible_message("[user] begins to cut off dead flesh around the wound upon [target]'s [parse_zone(target_zone)].", span_notice("You begin cutting away the dead and damaged tissue on [target]'s [parse_zone(target_zone)], creating a cleaner wound bed...")) /datum/surgery_step/debride/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) target.apply_damage(15, "brute", "[target_zone]") - user.visible_message("[user] scrapes [tool] across [target]'s wounds with surgical precision, cleaning the area.", "You scrape away the detritus and scarred flesh from [target]'s [parse_zone(target_zone)]. The wound is now fully debrided and ready for dressing.") + user.visible_message("[user] scrapes [tool] across [target]'s wounds with surgical precision, cleaning the area.", span_notice("You scrape away the detritus and scarred flesh from [target]'s [parse_zone(target_zone)]. The wound is now fully debrided and ready for dressing.")) return TRUE //add dressing to wounds @@ -23,7 +23,7 @@ var/dressing_type = "brute" /datum/surgery_step/apply_dressing/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] starts dressing [target]'s [parse_zone(target_zone)] wounds with [tool]..", "You start wrapping and dressing [target]'s [parse_zone(target_zone)] with [tool]..") + user.visible_message("[user] starts dressing [target]'s [parse_zone(target_zone)] wounds with [tool]..", span_notice("You start wrapping and dressing [target]'s [parse_zone(target_zone)] with [tool]..")) /datum/surgery_step/apply_dressing/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if (ishuman(target)) @@ -53,7 +53,7 @@ else qdel(tool) - user.visible_message("[user] dresses [target]'s wounds with [tool], securing them tightly.", "You bind [target]'s [parse_zone(target_zone)] wound tightly with [tool].") + user.visible_message("[user] dresses [target]'s wounds with [tool], securing them tightly.", span_notice("You bind [target]'s [parse_zone(target_zone)] wound tightly with [tool].")) return TRUE /datum/surgery_step/apply_dressing/burn diff --git a/yogstation/code/modules/surgery/organs/shadowling_organs.dm b/yogstation/code/modules/surgery/organs/shadowling_organs.dm index 1f029f17f604..025700a8c0c1 100644 --- a/yogstation/code/modules/surgery/organs/shadowling_organs.dm +++ b/yogstation/code/modules/surgery/organs/shadowling_organs.dm @@ -29,7 +29,7 @@ else if(light_count < LIGHT_HEAL_THRESHOLD && organ_health < 3) //Heal in the dark organ_health++ if(organ_health <= 0) - visible_message("[src] collapses in on itself!") + visible_message(span_warning("[src] collapses in on itself!")) qdel(src) else organ_health = min(organ_health+0.5, 3) @@ -40,12 +40,12 @@ /obj/item/organ/internal/shadowtumor/on_find(mob/living/finder) . = ..() - finder.visible_message("[finder] opens up [owner]'s skull, revealing a pulsating black mass, with red tendrils attaching it to [owner.p_their()] brain.") + finder.visible_message(span_danger("[finder] opens up [owner]'s skull, revealing a pulsating black mass, with red tendrils attaching it to [owner.p_their()] brain.")) /obj/item/organ/internal/shadowtumor/Remove(mob/living/carbon/M, special) if(M.dna.species.id == "l_shadowling") //Empowered thralls cannot be deconverted to_chat(M, "NOT LIKE THIS!") - M.visible_message("[M] suddenly slams upward and knocks down everyone!") + M.visible_message(span_danger("[M] suddenly slams upward and knocks down everyone!")) M.resting = FALSE //Remove all stuns M.SetStun(0, 0) M.SetKnockdown(0) @@ -66,5 +66,5 @@ eyes.sight_flags = initial(eyes.sight_flags) M.update_sight() M.remove_thrall() - M.visible_message("A strange black mass falls from [M]'s head!") + M.visible_message(span_warning("A strange black mass falls from [M]'s head!")) return ..() \ No newline at end of file diff --git a/yogstation/interface/interface.dm b/yogstation/interface/interface.dm index c3eb4237754b..a1fd93c8cff1 100644 --- a/yogstation/interface/interface.dm +++ b/yogstation/interface/interface.dm @@ -18,5 +18,5 @@ T.TicketPanel() return - to_chat(src, "You have no open tickets!") + to_chat(src, span_danger("You have no open tickets!")) return \ No newline at end of file From 0a555548b4b432d61916012f7e5e9fdc1cf14194 Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Thu, 2 Sep 2021 15:13:27 -0500 Subject: [PATCH 2/7] Fix alphabet --- code/__DEFINES/span.dm | 76 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm index e6b58fd9bddd..d27d562a91ca 100644 --- a/code/__DEFINES/span.dm +++ b/code/__DEFINES/span.dm @@ -9,11 +9,17 @@ #define span_aiprivradio(str) ("" + str + "") #define span_alert(str) ("" + str + "") #define span_alertalien(str) ("" + str + "") +#define span_alertealien(str) ("" + str + "") #define span_alertsyndie(str) ("" + str + "") #define span_alertwarning(str) ("" + str + "") #define span_alien(str) ("" + str + "") +#define span_alloy(str) ("" + str + "") #define span_announce(str) ("" + str + "") +#define span_assimilator(str) ("" + str + "") +#define span_average(str) ("" + str + "") +#define span_bad(str) ("" + str + "") #define span_big(str) ("" + str + "") +#define span_bigassimilator(str) ("" + str + "") #define span_bigicon(str) ("" + str + "") #define span_binarysay(str) ("" + str + "") #define span_blue(str) ("" + str + "") @@ -22,6 +28,8 @@ #define span_boldannounce(str) ("" + str + "") #define span_boldnotice(str) ("" + str + "") #define span_boldwarning(str) ("" + str + "") +#define span_brass(str) ("" + str + "") +#define span_caution(str) ("" + str + "") #define span_centcomradio(str) ("" + str + "") #define span_changeling(str) ("" + str + "") #define span_clown(str) ("" + str + "") @@ -33,17 +41,25 @@ #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_dangers(str) ("" + str + "") +#define span_dark(str) ("" + str + "") #define span_deadsay(str) ("" + str + "") #define span_deconversion_message(str) ("" + str + "") +#define span_disarm(str) ("" + str + "") #define span_drone(str) ("" + str + "") +#define span_dronesay(str) ("" + str + "") #define span_engradio(str) ("" + str + "") +#define span_error(str) ("" + str + "") #define span_extremelybig(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_header(str) ("" + str + "") #define span_hear(str) ("" + str + "") #define span_hidden(str) ("") #define span_hierophant(str) ("" + str + "") @@ -53,9 +69,15 @@ #define span_holoparasite(str) ("" + str + "") #define span_hypnophrase(str) ("" + str + "") #define span_icon(str) ("" + str + "") +#define span_inathneq(str) ("" + str + "") #define span_info(str) ("" + str + "") #define span_interface(str) ("" + str + "") +#define span_italics(str) ("" + str + "") +#define span_linkOff(str) ("" + str + "") +#define span_linkOn(str) ("" + str + "") #define span_looc(str) ("" + str + "") +#define span_maptext(str) ("" + str + "") +#define span_marooned(str) ("" + str + "") #define span_medal(str) ("" + str + "") #define span_medradio(str) ("" + str + "") #define span_memo(str) ("" + str + "") @@ -68,16 +90,23 @@ #define span_name(str) ("" + str + "") #define span_narsie(str) ("" + str + "") #define span_narsiesmall(str) ("" + str + "") +#define span_neovgre(str) ("" + str + "") +#define span_neutraltext(str) ("" + str + "") +#define span_nezbere(str) ("" + str + "") #define span_nicegreen(str) ("" + str + "") +#define span_nopositions(str) ("" + str + "") #define span_notice(str) ("" + str + "") #define span_noticealien(str) ("" + str + "") +#define span_nzcrentr(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_ratvar(str) ("" + str + "") #define span_reallybig(str) ("" + str + "") +#define span_reallybigphobia(str) ("" + str + "") #define span_red(str) ("" + str + "") #define span_redteamradio(str) ("" + str + "") #define span_redtext(str) ("" + str + "") @@ -89,11 +118,14 @@ #define span_revennotice(str) ("" + str + "") #define span_revenwarning(str) ("" + str + "") #define span_robot(str) ("" + str + "") +#define span_robotic(str) ("" + str + "") #define span_rose(str) ("" + str + "") #define span_sans(str) ("" + str + "") #define span_sciradio(str) ("" + str + "") #define span_secradio(str) ("" + str + "") #define span_servradio(str) ("" + str + "") +#define span_sevtug(str) ("" + str + "") +#define span_shadowling(str) ("" + str + "") #define span_singing(str) ("" + str + "") #define span_slime(str) ("" + str + "") #define span_small(str) ("" + str + "") @@ -102,51 +134,19 @@ #define span_spider(str) ("" + str + "") #define span_suicide(str) ("" + str + "") #define span_suppradio(str) ("" + str + "") +#define span_surrender(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_unclaimed(str) ("" + str + "") #define span_unconscious(str) ("" + str + "") #define span_userdanger(str) ("" + str + "") +#define span_usernotice(str) ("" + str + "") +#define span_vampirewarning(str) ("" + str + "") +#define span_velvet(str) ("" + str + "") +#define span_warner(str) ("" + str + "") #define span_warning(str) ("" + str + "") #define span_yell(str) ("" + str + "") #define span_yellowteamradio(str) ("" + str + "") -#define span_italics(str) ("" + str + "") -#define span_marooned(str) ("" + str + "") -#define span_header(str) ("" + str + "") -#define span_robotic(str) ("" + str + "") -#define span_brass(str) ("" + str + "") -#define span_velvet(str) ("" + str + "") -#define span_assimilator(str) ("" + str + "") -#define span_neutraltext(str) ("" + str + "") -#define span_linkOff(str) ("" + str + "") -#define span_linkOn(str) ("" + str + "") -#define span_caution(str) ("" + str + "") -#define span_error(str) ("" + str + "") -#define span_surrender(str) ("" + str + "") -#define span_bad(str) ("" + str + "") -#define span_good(str) ("" + str + "") -#define span_nzcrentr(str) ("" + str + "") -#define span_nezbere(str) ("" + str + "") -#define span_neovgre(str) ("" + str + "") -#define span_shadowling(str) ("" + str + "") -#define span_bigassimilator(str) ("" + str + "") -#define span_dark(str) ("" + str + "") -#define span_dronesay(str) ("" + str + "") -#define span_reallybigphobia(str) ("" + str + "") -#define span_unclaimed(str) ("" + str + "") -#define span_alloy(str) ("" + str + "") -#define span_average(str) ("" + str + "") -#define span_disarm(str) ("" + str + "") -#define span_cultsmall(str) ("" + str + "") -#define span_inathneq(str) ("" + str + "") -#define span_alertealien(str) ("" + str + "") -#define span_sevtug(str) ("" + str + "") -#define span_ratvar(str) ("" + str + "") -#define span_nopositions(str) ("" + str + "") -#define span_maptext(str) ("" + str + "") -#define span_usernotice(str) ("" + str + "") -#define span_warner(str) ("" + str + "") -#define span_dangers(str) ("" + str + "") -#define span_vampirewarning(str) ("" + str + "") \ No newline at end of file From 7a864b5543a23a20e048f804b7f569af002d78d6 Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Thu, 2 Sep 2021 16:02:18 -0500 Subject: [PATCH 3/7] Updated some more spans --- code/__DEFINES/span.dm | 19 +++++ code/__HELPERS/game.dm | 2 +- code/__HELPERS/mobs.dm | 2 +- code/__HELPERS/priority_announce.dm | 2 +- code/__HELPERS/roundend.dm | 34 ++++---- code/_onclick/hud/alert.dm | 4 +- code/controllers/subsystem/server_maint.dm | 2 +- code/controllers/subsystem/shuttle.dm | 4 +- code/datums/brain_damage/imaginary_friend.dm | 4 +- code/datums/brain_damage/phobia.dm | 2 +- code/datums/brain_damage/special.dm | 2 +- code/datums/components/fantasy/_fantasy.dm | 6 +- code/datums/components/mood.dm | 6 +- .../storage/concrete/bag_of_holding.dm | 2 +- code/datums/components/storage/storage.dm | 2 +- code/datums/datumvars.dm | 14 ++-- code/datums/martial/cqc.dm | 10 +-- code/datums/martial/flying_fang.dm | 6 +- code/datums/martial/plasma_fist.dm | 6 +- code/datums/martial/sleeping_carp.dm | 10 +-- code/datums/martial/wrestling.dm | 6 +- code/datums/status_effects/buffs.dm | 2 +- code/datums/status_effects/neutral.dm | 4 +- code/datums/voice_announcements.dm | 2 +- code/datums/world_topic.dm | 2 +- code/game/gamemodes/game_mode.dm | 6 +- code/game/golf/golf.dm | 2 +- code/game/machinery/computer/aifixer.dm | 6 +- .../machinery/computer/camera_advanced.dm | 12 +-- code/game/machinery/computer/cloning.dm | 4 +- .../game/machinery/computer/communications.dm | 10 +-- code/game/machinery/computer/law.dm | 4 +- code/game/machinery/computer/robot.dm | 4 +- code/game/machinery/cryopod.dm | 4 +- code/game/machinery/doors/poddoor.dm | 2 +- code/game/machinery/doors/windowdoor.dm | 2 +- .../embedded_controller/airlock_controller.dm | 8 +- code/game/machinery/fat_sucker.dm | 6 +- code/game/machinery/hologram.dm | 4 +- code/game/machinery/igniter.dm | 2 +- .../machinery/porta_turret/portable_turret.dm | 4 +- code/game/machinery/recharger.dm | 4 +- code/game/machinery/requests_console.dm | 10 +-- .../machinery/telecomms/computers/message.dm | 4 +- .../mecha/equipment/tools/medical_tools.dm | 6 +- code/game/mecha/mecha.dm | 10 +-- code/game/mecha/mecha_topic.dm | 6 +- code/game/mecha/mecha_wreckage.dm | 2 +- code/game/objects/items/cards_ids.dm | 2 +- code/game/objects/items/chrono_eraser.dm | 2 +- .../circuitboards/machine_circuitboards.dm | 4 +- code/game/objects/items/credit_holochip.dm | 4 +- code/game/objects/items/devices/PDA/PDA.dm | 2 +- code/game/objects/items/devices/flashlight.dm | 2 +- code/game/objects/items/devices/scanners.dm | 78 +++++++++---------- code/game/objects/items/dna_injector.dm | 4 +- code/game/objects/items/grenades/grenade.dm | 2 +- code/game/objects/items/his_grace.dm | 16 ++-- code/game/objects/items/miscellaneous.dm | 4 +- code/game/objects/items/robot/robot_items.dm | 2 +- .../objects/items/robot/robot_upgrades.dm | 2 +- code/game/objects/items/taster.dm | 2 +- code/game/objects/items/toys.dm | 2 +- code/game/objects/items/weaponry.dm | 8 +- code/game/objects/objs.dm | 2 +- code/game/objects/structures/ai_core.dm | 4 +- .../transit_tube_construction.dm | 2 +- code/game/say.dm | 2 +- code/game/turfs/open.dm | 2 +- code/modules/admin/check_antagonists.dm | 2 +- code/modules/admin/sound_emitter.dm | 6 +- code/modules/admin/sql_ban_system.dm | 4 +- code/modules/admin/sql_message_system.dm | 4 +- code/modules/admin/verbs/adminhelp.dm | 6 +- code/modules/admin/verbs/adminpm.dm | 14 ++-- code/modules/admin/verbs/adminsay.dm | 2 +- code/modules/admin/verbs/deadsay.dm | 2 +- code/modules/admin/verbs/pray.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 2 +- .../antagonists/_common/antag_datum.dm | 2 +- .../modules/antagonists/_common/antag_team.dm | 4 +- .../abductor/equipment/abduction_gear.dm | 4 +- .../antagonists/abductor/equipment/gland.dm | 6 +- .../blob/blobstrains/_blobstrain.dm | 2 +- code/modules/antagonists/blob/powers.dm | 2 +- .../antagonists/blob/structures/_blob.dm | 14 ++-- code/modules/antagonists/brother/brother.dm | 4 +- .../antagonists/changeling/changeling.dm | 2 +- .../clockcult/clock_effects/clock_sigils.dm | 16 ++-- .../clock_effects/spatial_gateway.dm | 2 +- .../clockcult/clock_helpers/slab_abilities.dm | 10 +-- .../clockcult/clock_items/clockwork_armor.dm | 16 ++-- .../clockcult/clock_items/clockwork_slab.dm | 2 +- .../clockcult/clock_items/judicial_visor.dm | 12 +-- .../clock_items/replica_fabricator.dm | 4 +- .../clock_items/wraith_spectacles.dm | 16 ++-- .../clockcult/clock_mobs/_eminence.dm | 2 +- .../clock_scriptures/scripture_scripts.dm | 2 +- .../ark_of_the_clockwork_justicar.dm | 6 +- .../clock_structures/ocular_warden.dm | 2 +- .../ratvar_the_clockwork_justicar.dm | 8 +- .../antagonists/clockcult/clockcult.dm | 8 +- code/modules/antagonists/creep/creep.dm | 2 +- code/modules/antagonists/cult/cult.dm | 8 +- code/modules/antagonists/cult/runes.dm | 2 +- code/modules/antagonists/devil/devil.dm | 6 +- .../antagonists/disease/disease_datum.dm | 4 +- .../antagonists/disease/disease_mob.dm | 4 +- .../eldritch_cult/eldritch_antag.dm | 4 +- code/modules/antagonists/fugitive/old_god.dm | 6 +- code/modules/antagonists/hivemind/hivemind.dm | 4 +- code/modules/antagonists/kudzu/kudzu.dm | 2 +- code/modules/antagonists/nukeop/nukeop.dm | 2 +- code/modules/antagonists/pirate/pirate.dm | 2 +- .../antagonists/revolution/revolution.dm | 4 +- .../antagonists/slaughter/slaughter.dm | 2 +- .../antagonists/traitor/datum_traitor.dm | 16 ++-- .../traitor/equipment/contractor.dm | 4 +- .../antagonists/wizard/equipment/artefact.dm | 2 +- .../antagonists/wizard/equipment/soulstone.dm | 14 ++-- code/modules/antagonists/wizard/wizard.dm | 4 +- code/modules/antagonists/xeno/xeno.dm | 2 +- .../atmospherics/machinery/atmosmachinery.dm | 2 +- .../machinery/portable/canister.dm | 4 +- code/modules/awaymissions/corpse.dm | 4 +- code/modules/awaymissions/gateway.dm | 2 +- code/modules/client/client_procs.dm | 4 +- code/modules/client/verbs/ooc.dm | 6 +- code/modules/clothing/spacesuits/hardsuit.dm | 2 +- code/modules/clothing/under/accessories.dm | 2 +- code/modules/error_handler/error_viewer.dm | 2 +- code/modules/flufftext/Hallucination.dm | 8 +- .../kitchen_machinery/icecream_vat.dm | 2 +- .../kitchen_machinery/microwave.dm | 2 +- code/modules/games/wizoff.dm | 16 ++-- code/modules/hydroponics/gene_modder.dm | 38 ++++----- code/modules/hydroponics/grown.dm | 12 +-- code/modules/hydroponics/growninedible.dm | 4 +- code/modules/hydroponics/hydroponics.dm | 28 +++---- code/modules/hydroponics/seeds.dm | 6 +- code/modules/instruments/songs/editor.dm | 12 +-- .../mining/lavaland/necropolis_chests.dm | 18 ++--- .../modules/mob/dead/new_player/new_player.dm | 2 +- .../carbon/alien/humanoid/alien_powers.dm | 4 +- .../mob/living/carbon/alien/larva/powers.dm | 8 +- code/modules/mob/living/carbon/alien/say.dm | 2 +- .../mob/living/carbon/human/examine.dm | 8 +- code/modules/mob/living/carbon/human/human.dm | 2 +- .../carbon/human/species_types/jellypeople.dm | 4 +- .../human/species_types/shadowpeople.dm | 2 +- code/modules/mob/living/emote.dm | 4 +- code/modules/mob/living/say.dm | 2 +- code/modules/mob/living/silicon/ai/ai.dm | 4 +- code/modules/mob/living/silicon/ai/say.dm | 2 +- .../modules/mob/living/silicon/robot/emote.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 6 +- .../mob/living/silicon/robot/robot_defense.dm | 4 +- code/modules/mob/living/silicon/say.dm | 4 +- .../friendly/drone/extra_drone_types.dm | 2 +- .../friendly/drone/interaction.dm | 2 +- .../simple_animal/friendly/drone/say.dm | 2 +- .../hostile/megafauna/hierophant.dm | 18 ++--- .../hostile/mining_mobs/elites/pandora.dm | 4 +- .../simple_animal/hostile/netherworld.dm | 4 +- code/modules/mob/mob_helpers.dm | 2 +- code/modules/mob/say.dm | 4 +- .../file_system/programs/borg_monitor.dm | 4 +- .../modular_computers/laptop_vendor.dm | 2 +- .../suit/n_suit_verbs/energy_net_nets.dm | 2 +- code/modules/ninja/suit/ninjaDrainAct.dm | 2 +- code/modules/ninja/suit/suit.dm | 6 +- code/modules/ninja/suit/suit_attackby.dm | 2 +- .../modules/ninja/suit/suit_initialisation.dm | 8 +- code/modules/power/apc.dm | 4 +- code/modules/power/supermatter/supermatter.dm | 4 +- code/modules/projectiles/pins.dm | 2 +- .../chemistry/machinery/reagentgrinder.dm | 2 +- code/modules/research/experimentor.dm | 2 +- .../modules/research/machinery/_production.dm | 2 +- .../nanites/nanite_programs/suppression.dm | 2 +- code/modules/research/rdconsole.dm | 14 ++-- .../research/xenobiology/xenobiology.dm | 2 +- .../ruins/objects_and_mobs/sin_ruins.dm | 2 +- .../ruins/spaceruin_code/hilbertshotel.dm | 2 +- .../security_levels/keycard_authentication.dm | 4 +- code/modules/spells/spell_types/curse.dm | 2 +- code/modules/spells/spell_types/telepathy.dm | 2 +- code/modules/surgery/organs/vocal_cords.dm | 2 +- yogstation/code/datums/antagonists/vampire.dm | 4 +- .../code/datums/components/storage/storage.dm | 2 +- yogstation/code/datums/world_topic.dm | 6 +- .../game/gamemodes/darkspawn/darkspawn.dm | 4 +- .../game/gamemodes/shadowling/shadowling.dm | 2 +- .../code/game/objects/structures/fireaxe.dm | 2 +- .../code/modules/admin/sql_message_system.dm | 4 +- .../code/modules/admin/verbs/adminhelp.dm | 6 +- .../code/modules/admin/verbs/adminsay.dm | 4 +- .../modules/admin/verbs/one_click_antag.dm | 4 +- .../darkspawn_abilities/_sacrament.dm | 2 +- .../darkspawn_abilities/crawling_shadows.dm | 2 +- .../darkspawn_abilities/demented_outburst.dm | 4 +- .../darkspawn/darkspawn_abilities/pass.dm | 4 +- .../darkspawn_abilities/silver_tongue.dm | 2 +- .../darkspawn_abilities/veil_mind.dm | 4 +- .../darkspawn/darkspawn_objects/dark_bead.dm | 6 +- .../code/modules/antagonists/gang/gang.dm | 2 +- .../special_shadowling_abilities.dm | 4 +- yogstation/code/modules/client/verbs/ooc.dm | 2 +- yogstation/code/modules/guardian/guardian.dm | 2 +- yogstation/code/modules/mentor/follow.dm | 4 +- yogstation/code/modules/mentor/mentor_memo.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 4 +- .../hostile/retaliate/king_of_goats.dm | 4 +- yogstation/code/modules/ninja/suit/ninja.dm | 2 +- .../code/modules/stock_market/computer.dm | 4 +- 215 files changed, 583 insertions(+), 564 deletions(-) diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm index d27d562a91ca..617ecff6dfa9 100644 --- a/code/__DEFINES/span.dm +++ b/code/__DEFINES/span.dm @@ -19,6 +19,7 @@ #define span_average(str) ("" + str + "") #define span_bad(str) ("" + str + "") #define span_big(str) ("" + str + "") +#define span_big_brass(str) ("" + str + "") #define span_bigassimilator(str) ("" + str + "") #define span_bigicon(str) ("" + str + "") #define span_binarysay(str) ("" + str + "") @@ -35,6 +36,7 @@ #define span_clown(str) ("" + str + "") #define span_colossus(str) ("" + str + "") #define span_command_headset(str) ("" + str + "") +#define span_company(str) ("" + str + "") #define span_comradio(str) ("" + str + "") #define span_cult(str) ("" + str + "") #define span_cultbold(str) ("" + str + "") @@ -47,6 +49,7 @@ #define span_dark(str) ("" + str + "") #define span_deadsay(str) ("" + str + "") #define span_deconversion_message(str) ("" + str + "") +#define span_deptradio(str) ("" + str + "") #define span_disarm(str) ("" + str + "") #define span_drone(str) ("" + str + "") #define span_dronesay(str) ("" + str + "") @@ -61,6 +64,7 @@ #define span_greentext(str) ("" + str + "") #define span_header(str) ("" + str + "") #define span_hear(str) ("" + str + "") +#define span_heavy_brass(str) ("" + str + "") #define span_hidden(str) ("") #define span_hierophant(str) ("" + str + "") #define span_hierophant_warning(str) ("" + str + "") @@ -70,18 +74,24 @@ #define span_hypnophrase(str) ("" + str + "") #define span_icon(str) ("" + str + "") #define span_inathneq(str) ("" + str + "") +#define span_inathneq_large(str) ("" + str + "") +#define span_inathneq_small(str) ("" + str + "") #define span_info(str) ("" + str + "") #define span_interface(str) ("" + str + "") #define span_italics(str) ("" + str + "") +#define span_large_brass(str) ("" + str + "") #define span_linkOff(str) ("" + str + "") #define span_linkOn(str) ("" + str + "") +#define span_linkify(str) ("" + str + "") #define span_looc(str) ("" + str + "") #define span_maptext(str) ("" + str + "") #define span_marooned(str) ("" + str + "") #define span_medal(str) ("" + str + "") +#define span_medaltext(str) ("" + str + "") #define span_medradio(str) ("" + str + "") #define span_memo(str) ("" + str + "") #define span_memoedit(str) ("" + str + "") +#define span_message(str) ("" + str + "") #define span_mind_control(str) ("" + str + "") #define span_minorannounce(str) ("" + str + "") #define span_monkey(str) ("" + str + "") @@ -91,6 +101,7 @@ #define span_narsie(str) ("" + str + "") #define span_narsiesmall(str) ("" + str + "") #define span_neovgre(str) ("" + str + "") +#define span_neovgre_small(str) ("" + str + "") #define span_neutraltext(str) ("" + str + "") #define span_nezbere(str) ("" + str + "") #define span_nicegreen(str) ("" + str + "") @@ -98,10 +109,12 @@ #define span_notice(str) ("" + str + "") #define span_noticealien(str) ("" + str + "") #define span_nzcrentr(str) ("" + str + "") +#define span_nzcrentr_large(str) ("" + str + "") #define span_ooc(str) ("" + str + "") #define span_papyrus(str) ("" + str + "") #define span_phobia(str) ("" + str + "") #define span_prefix(str) ("" + str + "") +#define span_priority(str) ("" + str + "") #define span_purple(str) ("" + str + "") #define span_radio(str) ("" + str + "") #define span_ratvar(str) ("" + str + "") @@ -120,17 +133,21 @@ #define span_robot(str) ("" + str + "") #define span_robotic(str) ("" + str + "") #define span_rose(str) ("" + str + "") +#define span_runtime_line(str) ("" + str + "") +#define span_s_company(str) ("" + str + "") #define span_sans(str) ("" + str + "") #define span_sciradio(str) ("" + str + "") #define span_secradio(str) ("" + str + "") #define span_servradio(str) ("" + str + "") #define span_sevtug(str) ("" + str + "") +#define span_sevtug_small(str) ("" + str + "") #define span_shadowling(str) ("" + str + "") #define span_singing(str) ("" + str + "") #define span_slime(str) ("" + str + "") #define span_small(str) ("" + str + "") #define span_smallnotice(str) ("" + str + "") #define span_smallnoticeital(str) ("" + str + "") +#define span_span_notify(str) ("" + str + "") #define span_spider(str) ("" + str + "") #define span_suicide(str) ("" + str + "") #define span_suppradio(str) ("" + str + "") @@ -140,10 +157,12 @@ #define span_tape_recorder(str) ("" + str + "") #define span_tinynotice(str) ("" + str + "") #define span_tinynoticeital(str) ("" + str + "") +#define span_umbra_emphasis(str) ("" + str + "") #define span_unclaimed(str) ("" + str + "") #define span_unconscious(str) ("" + str + "") #define span_userdanger(str) ("" + str + "") #define span_usernotice(str) ("" + str + "") +#define span_value(str) ("" + str + "") #define span_vampirewarning(str) ("" + str + "") #define span_velvet(str) ("" + str + "") #define span_warner(str) ("" + str + "") diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index fb09e732c2a7..a9ca78b21d2a 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -669,7 +669,7 @@ var/area/A = get_area(character) if(character.mind.role_alt_title) rank = character.mind.role_alt_title - deadchat_broadcast(" has arrived at the station at [A.name].", "[character.real_name] ([rank])", follow_target = character, message_type=DEADCHAT_ARRIVALRATTLE) + deadchat_broadcast(" has arrived at the station at [span_name("[A.name]")].", "[span_name("[character.real_name]")] ([rank])", follow_target = character, message_type=DEADCHAT_ARRIVALRATTLE) if((!GLOB.announcement_systems.len) || (!character.mind)) return if((character.mind.assigned_role == "Cyborg") || (character.mind.assigned_role == character.mind.special_role)) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 2fdbecca8ae8..dd4ebbfc55d2 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -458,7 +458,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 = "[source][span_linkify("[message]")]" for(var/mob/M in GLOB.player_list) var/datum/preferences/prefs if(M.client && M.client.prefs) diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index 84f4a3f0e53f..9821711ddf14 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -34,7 +34,7 @@ if(SSstation.announcer.custom_alert_message && !has_important_message) announcement += SSstation.announcer.custom_alert_message else - announcement += "
[sanitize ? html_encode(text) : text]
" + announcement += "
[span_alert("[sanitize ? html_encode(text) : text]")]
" announcement += "
" var/s = sound(sound) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index e2d0896929a1..7b92b4a9241e 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -390,10 +390,10 @@ for (var/i in GLOB.ai_list) var/mob/living/silicon/ai/aiPlayer = i if(aiPlayer.mind) - parts += "[aiPlayer.name] (Played by: [aiPlayer.mind.key])'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was deactivated"] were:" + parts += "[aiPlayer.name] (Played by: [aiPlayer.mind.key])'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was [span_redtext("deactivated")]"] were:" parts += aiPlayer.laws.get_law_list(include_zeroth=TRUE) else if(aiPlayer.deployed_shell?.mind) - parts += "[aiPlayer.name] (Played by: [aiPlayer.deployed_shell.mind.key])'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was deactivated"] were:" + parts += "[aiPlayer.name] (Played by: [aiPlayer.deployed_shell.mind.key])'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was [span_redtext("deactivated")]"] were:" parts += aiPlayer.laws.get_law_list(include_zeroth=TRUE) parts += "Total law changes: [aiPlayer.law_change_counter]" @@ -403,14 +403,14 @@ for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) borg_num-- if(robo.mind) - robolist += "[robo.name] (Played by: [robo.mind.key])[robo.stat == DEAD ? " (Deactivated)" : ""][borg_num ?", ":""]
" + robolist += "[robo.name] (Played by: [robo.mind.key])[robo.stat == DEAD ? " [span_redtext("(Deactivated)")]" : ""][borg_num ?", ":""]
" parts += "[robolist]" if(!borg_spacer) borg_spacer = TRUE for (var/mob/living/silicon/robot/robo in GLOB.silicon_mobs) if (!robo.connected_ai && robo.mind) - parts += "[borg_spacer?"
":""][robo.name] (Played by: [robo.mind.key]) [(robo.stat != DEAD)? "survived as an AI-less borg!" : "was unable to survive the rigors of being a cyborg without an AI."] Its laws were:" + parts += "[borg_spacer?"
":""][robo.name] (Played by: [robo.mind.key]) [(robo.stat != DEAD)? "[span_greentext("survived")] as an AI-less borg!" : "was [span_redtext("unable to survive")] the rigors of being a cyborg without an AI."] Its laws were:" if(robo) //How the hell do we lose robo between here and the world messages directly above this? parts += robo.laws.get_law_list(include_zeroth=TRUE) @@ -443,22 +443,22 @@ for(var/datum/department_goal/dg in SSYogs.department_goals) goals[dg.account] += dg.get_result() - parts += "
Engineering department goals:
" + parts += "
[span_header("Engineering department goals:")]
" parts += goals[ACCOUNT_ENG] - parts += "
Science department goals:
" + parts += "
[span_header("Science department goals:")]
" parts += goals[ACCOUNT_SCI] - parts += "
Medical department goals:
" + parts += "
[span_header("Medical department goals:")]
" parts += goals[ACCOUNT_MED] - parts += "
Service department goals:
" + parts += "
[span_header("Service department goals:")]
" parts += goals[ACCOUNT_SRV] - parts += "
Cargo department goals:
" + parts += "
[span_header("Cargo department goals:")]
" parts += goals[ACCOUNT_CAR] - parts += "
Security department goals:
" + parts += "
[span_header("Security department goals:")]
" parts += goals[ACCOUNT_SEC] parts += "

" @@ -543,7 +543,7 @@ result += "Security Officers:
" for(var/mob/living/carbon/human/player in GLOB.carbon_list) if(player.mind && (player.mind.assigned_role in GLOB.security_positions)) - result += "
    [player.name] (Played by: [player.mind.key]) [(player.stat != DEAD)? "survived as a [player.mind.assigned_role]" : "fell in the line of duty as a [player.mind.assigned_role]"]
" + result += "
    [player.name] (Played by: [player.mind.key]) [(player.stat != DEAD)? "[span_greentext("survived")] as a [player.mind.assigned_role]" : "[span_redtext("fell in the line of duty")] as a [player.mind.assigned_role]"]
" return "
    [result.Join()]
" return "" @@ -584,17 +584,17 @@ var/text = "[ply.key] was [ply.name][jobtext] and" if(ply.current) if(ply.current.stat == DEAD) - text += " died" + text += " [span_redtext("died")]" else - text += " survived" + text += " [span_greentext("survived")]" if(fleecheck) var/turf/T = get_turf(ply.current) if(!T || !is_station_level(T.z)) - text += " while fleeing the station" + text += " while [span_redtext("fleeing the station")]" if(ply.current.real_name != ply.name) text += " as [ply.current.real_name]" else - text += " had their body destroyed" + text += " [span_redtext("had their body destroyed")]" return text /proc/printplayerlist(list/players,fleecheck) @@ -614,9 +614,9 @@ var/count = 1 for(var/datum/objective/objective in objectives) if(objective.check_completion()) - objective_parts += "Objective #[count]: [objective.explanation_text] Success!" + objective_parts += "Objective #[count]: [objective.explanation_text] [span_greentext("Success!")]" else - objective_parts += "Objective #[count]: [objective.explanation_text] Fail." + objective_parts += "Objective #[count]: [objective.explanation_text] [span_redtext("Fail.")]" count++ return objective_parts.Join("
") diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 470d45e9ed83..c48bfc4146e2 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -227,7 +227,7 @@ or something covering your eyes." /obj/screen/alert/mind_control/Click() var/mob/living/L = usr - to_chat(L, "[command]") + to_chat(L, "[span_mind_control("[command]")]") /obj/screen/alert/drunk name = "Drunk" @@ -680,7 +680,7 @@ so as to remain in compliance with the most up-to-date laws." return var/paramslist = params2list(params) if(paramslist["shift"]) // screen objects don't do the normal Click() stuff so we'll cheat - to_chat(usr, "[name] - [desc]") + to_chat(usr, "[span_boldnotice("[name]")] - [span_info("[desc]")]") return if(master) return usr.client.Click(master, location, control, params) diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index fb6a16e8e5bf..29cf0a5f2cd0 100644 --- a/code/controllers/subsystem/server_maint.dm +++ b/code/controllers/subsystem/server_maint.dm @@ -65,7 +65,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, "You have been inactive for more than [DisplayTimeText(afk_period)] and have been disconnected.
You may reconnect via the button in the file menu or by clicking here to reconnect.") + to_chat(C, "[span_userdanger("You have been inactive for more than [DisplayTimeText(afk_period)] and have been disconnected.")]
You 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 diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 95b55bc2cc91..c2c4b9f35ced 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -257,7 +257,7 @@ SUBSYSTEM_DEF(shuttle) var/area/A = get_area(user) log_game("[key_name(user)] has called the shuttle.") - deadchat_broadcast(" has called the shuttle at [A.name].", span_name("[user.real_name]"), user) + deadchat_broadcast(" has called the shuttle at [span_name("[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]") @@ -295,7 +295,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)].", span_name("[user.real_name]"), user) + deadchat_broadcast(" has recalled the shuttle from [span_name("[get_area_name(user, TRUE)]")].", span_name("[user.real_name]"), user) return 1 /datum/controller/subsystem/shuttle/proc/canRecall() diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm index 3d6f75f8c91d..06ed173aac0d 100644 --- a/code/datums/brain_damage/imaginary_friend.dm +++ b/code/datums/brain_damage/imaginary_friend.dm @@ -159,8 +159,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_name("[name]")] [span_message("[say_quote(message)]")]" + var/dead_rendered = "[span_name("[name] (Imaginary friend of [owner])")] [span_message("[say_quote(message)]")]" to_chat(owner, "[rendered]") to_chat(src, "[rendered]") diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm index 26c1a73a82f4..8dda4725a538 100644 --- a/code/datums/brain_damage/phobia.dm +++ b/code/datums/brain_damage/phobia.dm @@ -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, "You can't bring yourself to say the word \"[word]\"!") + to_chat(owner, "You can't bring yourself to say the word \"[span_phobia("[word]")]\"!") speech_args[SPEECH_MESSAGE] = "" /datum/brain_trauma/mild/phobia/proc/freak_out(atom/reason, trigger_word) diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm index fdb2ad2d3ecc..28764207dacc 100644 --- a/code/datums/brain_damage/special.dm +++ b/code/datums/brain_damage/special.dm @@ -252,7 +252,7 @@ if(prob(60)) forceMove(get_step_towards(src, victim)) if(prob(5)) - to_chat(victim, "[name] exclaims, \"" + span_robotic("Level 10 infraction alert!") + "\"") + to_chat(victim, "[span_name("[name]")] exclaims, \"" + span_robotic("Level 10 infraction alert!") + "\"") /obj/effect/hallucination/simple/securitron/Destroy() STOP_PROCESSING(SSfastprocess,src) diff --git a/code/datums/components/fantasy/_fantasy.dm b/code/datums/components/fantasy/_fantasy.dm index 383dd7c10da0..e450424f5487 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("[parent] [span_inathneq_large("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_umbra_emphasis("mottled black glow")]" location.visible_message("[span][originalName] is covered by a [effect_description] and then transforms into [parent]!") \ No newline at end of file diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index 2eeb7373f0b7..949f8943690d 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -45,11 +45,11 @@ if(SANITY_DISTURBED to SANITY_NEUTRAL) msg += "I have felt quite decent lately.\n" if(SANITY_UNSTABLE to SANITY_DISTURBED) - msg += "I'm feeling a little bit unhinged...\n" + msg += "[span_warning("I'm feeling a little bit unhinged...")]\n" if(SANITY_CRAZY to SANITY_UNSTABLE) - msg += "I'm freaking out!!\n" + msg += "[span_boldwarning("I'm freaking out!!")]\n" if(SANITY_INSANE to SANITY_CRAZY) - msg += "AHAHAHAHAHAHAHAHAHAH!!\n" + msg += "[span_boldwarning("AHAHAHAHAHAHAHAHAHAH!!")]\n" msg += span_notice("My current mood: ") //Short term switch(mood_level) diff --git a/code/datums/components/storage/concrete/bag_of_holding.dm b/code/datums/components/storage/concrete/bag_of_holding.dm index 33141290e6da..9b31106b8975 100644 --- a/code/datums/components/storage/concrete/bag_of_holding.dm +++ b/code/datums/components/storage/concrete/bag_of_holding.dm @@ -16,7 +16,7 @@ return var/turf/loccheck = get_turf(A) if(is_reebe(loccheck.z)) - user.visible_message(span_warning("An unseen force knocks [user] to the ground!"), "\"I think not!\"") + user.visible_message(span_warning("An unseen force knocks [user] to the ground!"), "[span_big_brass("\"I think not!\"")]") user.Paralyze(60) return if(istype(loccheck.loc, /area/fabric_of_reality)) diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index 922dd2854aaa..298b57be7c65 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -135,7 +135,7 @@ var/obj/item/valid_item = valid_type desc += "\a [initial(valid_item.name)]" - return "\n\t[desc.Join("\n\t")]" + return "\n\t[span_notice("[desc.Join("\n\t")]")]" /datum/component/storage/proc/update_actions() QDEL_NULL(modeswitch_action) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index df6b7470e5d9..dcd9b8cbb7cc 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -465,10 +465,10 @@ var/item if (isnull(value)) - item = "[VV_HTML_ENCODE(name)] = null" + item = "[VV_HTML_ENCODE(name)] = [span_value("null")]" else if (istext(value)) - item = "[VV_HTML_ENCODE(name)] = \"[VV_HTML_ENCODE(value)]\"" + item = "[VV_HTML_ENCODE(name)] = [span_value("\"[VV_HTML_ENCODE(value)]\"")]" else if (isicon(value)) #ifdef VARSICON @@ -476,13 +476,13 @@ var/rnd = rand(1,10000) var/rname = "tmp[REF(I)][rnd].png" usr << browse_rsc(I, rname) - item = "[VV_HTML_ENCODE(name)] = ([value]) " + item = "[VV_HTML_ENCODE(name)] = ([span_value("[value]")]) " #else - item = "[VV_HTML_ENCODE(name)] = /icon ([value])" + item = "[VV_HTML_ENCODE(name)] = /icon ([span_value("[value]")])" #endif else if (isfile(value)) - item = "[VV_HTML_ENCODE(name)] = '[value]'" + item = "[VV_HTML_ENCODE(name)] = [span_value("'[value]'")]" else if(istype(value,/matrix)) // Needs to be before datum var/matrix/M = value @@ -498,7 +498,7 @@ else if(isappearance(value)) var/image/I = value - item = "[VV_HTML_ENCODE(name)] [REF(value)] = appearance([I.icon], \"[I.icon_state]\")" + item = "[VV_HTML_ENCODE(name)] [REF(value)] = appearance([span_value("[I.icon]")], [span_value("\"[I.icon_state]\"")])" else if (istype(value, /datum)) var/datum/D = value @@ -534,7 +534,7 @@ flags += i item = "[VV_HTML_ENCODE(name)] = [VV_HTML_ENCODE(jointext(flags, ", "))]" else - item = "[VV_HTML_ENCODE(name)] = [VV_HTML_ENCODE(value)]" + item = "[VV_HTML_ENCODE(name)] = [span_value("[VV_HTML_ENCODE(value)]")]" return "[header][item]" diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 7213fae7f031..13618c267094 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -336,10 +336,10 @@ to_chat(usr, "Grab Intent Will stun opponents for a short second, allowing you to quickly increase the strength of your grabs") to_chat(usr, "Harm Intent Will deal a competitive amount of stamina damage, and hitting a standing opponent while you are prone will both knock them down and stand you up") - to_chat(usr, "Slam: Grab Harm. Slam opponent into the ground, knocking them down and dealing decent stamina damage.") - to_chat(usr, "CQC Kick: Disarm Harm. Knocks opponent away and slows them. Deals heavy stamina damage to prone opponents.") - to_chat(usr, "Restrain: Grab Grab. Locks opponents into a restraining position, making your grab harder to break out of. Disarm to begin a chokehold which deal gradual oxygen damage until the opponent is unconscious, with the damage increasing based on their stamina damage. Failing to complete the chokehold will weaken and possibly break your grab.") - to_chat(usr, "Pressure: Disarm Grab. Disables the targetted limb or a random limb if the head or chest are targetted, as well as forcing the target to drop anything they are holding.") - to_chat(usr, "Consecutive CQC: Harm Harm Harm Harm Harm. Offensive move, deals bonus stamina damage and knocking down on the last hit.") + to_chat(usr, "[span_notice("Slam")]: Grab Harm. Slam opponent into the ground, knocking them down and dealing decent stamina damage.") + to_chat(usr, "[span_notice("CQC Kick")]: Disarm Harm. Knocks opponent away and slows them. Deals heavy stamina damage to prone opponents.") + to_chat(usr, "[span_notice("Restrain")]: Grab Grab. Locks opponents into a restraining position, making your grab harder to break out of. Disarm to begin a chokehold which deal gradual oxygen damage until the opponent is unconscious, with the damage increasing based on their stamina damage. Failing to complete the chokehold will weaken and possibly break your grab.") + to_chat(usr, "[span_notice("Pressure")]: Disarm Grab. Disables the targetted limb or a random limb if the head or chest are targetted, as well as forcing the target to drop anything they are holding.") + to_chat(usr, "[span_notice("Consecutive CQC")]: Harm Harm Harm Harm Harm. Offensive move, deals bonus stamina damage and knocking down on the last hit.") to_chat(usr, "In addition, by having your throw mode on when being attacked, you enter an active defense mode where you have a chance to counter attacks done to you.") diff --git a/code/datums/martial/flying_fang.dm b/code/datums/martial/flying_fang.dm index 4208c0a57029..2d9061cf6de5 100644 --- a/code/datums/martial/flying_fang.dm +++ b/code/datums/martial/flying_fang.dm @@ -241,10 +241,10 @@ to_chat(usr, span_warning("However, the primitive instincts gained through this training prevent you from using guns, stun weapons, or armor.")) to_chat(usr, "All of your unarmed attacks deal increased brute damage with a small amount of armor piercing") - to_chat(usr, "Disarm Intent: Headbutt your enemy, Deals minor stamina and brute damage, as well as causing eye blurriness. Prevents the target from using ranged weapons effectively for a few seconds if they are not wearing a helmet.") + to_chat(usr, "[span_notice("Disarm Intent")]: Headbutt your enemy, Deals minor stamina and brute damage, as well as causing eye blurriness. Prevents the target from using ranged weapons effectively for a few seconds if they are not wearing a helmet.") - to_chat(usr, "Tail Slap: Disarm Disarm Disarm. High armor piercing attack that causes a short slow followed by a knockdown. Deals heavy stamina damage.") - to_chat(usr, "Neck Bite: Grab Harm. Target must be prone. Stuns you and your target for a short period, dealing heavy brute damage and bleeding. If the target is not in crit, this attack will heal you.") + to_chat(usr, "[span_notice("Tail Slap")]: Disarm Disarm Disarm. High armor piercing attack that causes a short slow followed by a knockdown. Deals heavy stamina damage.") + to_chat(usr, "[span_notice("Neck Bite")]: Grab Harm. Target must be prone. Stuns you and your target for a short period, dealing heavy brute damage and bleeding. If the target is not in crit, this attack will heal you.") to_chat(usr, "Leap: Action: Jump at a target, with a successful hit stunning them and preventing you from moving for a few seconds.") /datum/martial_art/flyingfang/teach(mob/living/carbon/human/H,make_temporary=0) diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm index b1b3a7f17655..6082aa553c52 100644 --- a/code/datums/martial/plasma_fist.dm +++ b/code/datums/martial/plasma_fist.dm @@ -90,6 +90,6 @@ set category = "Plasma Fist" to_chat(usr, "You clench your fists and have a flashback of knowledge...") - to_chat(usr, "Tornado Sweep: Harm Harm Disarm. Repulses target and everyone back.") - to_chat(usr, "Throwback: Disarm Harm Disarm. Throws the target and an item at them.") - to_chat(usr, "The Plasma Fist: Harm Disarm Disarm Disarm Harm. Knocks the brain out of the opponent and gibs their body.") + to_chat(usr, "[span_notice("Tornado Sweep")]: Harm Harm Disarm. Repulses target and everyone back.") + to_chat(usr, "[span_notice("Throwback")]: Disarm Harm Disarm. Throws the target and an item at them.") + to_chat(usr, "[span_notice("The Plasma Fist")]: Harm Disarm Disarm Disarm Harm. Knocks the brain out of the opponent and gibs their body.") diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index c5653c02ef08..64521a2ab654 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -155,11 +155,11 @@ to_chat(usr, "You retreat inward and recall the teachings of the Sleeping Carp...") - to_chat(usr, "Wrist Wrench: Disarm Disarm. Forces opponent to drop item in hand.") - to_chat(usr, "Back Kick: Harm Grab. Opponent must be facing away. Knocks down.") - to_chat(usr, "Stomach Knee: Grab Harm. Knocks the wind out of opponent and stuns.") - to_chat(usr, "Head Kick: Disarm Harm Harm. Decent damage, forces opponent to drop item in hand.") - to_chat(usr, "Elbow Drop: Harm Disarm Harm Disarm Harm. Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition.") + to_chat(usr, "[span_notice("Wrist Wrench")]: Disarm Disarm. Forces opponent to drop item in hand.") + to_chat(usr, "[span_notice("Back Kick")]: Harm Grab. Opponent must be facing away. Knocks down.") + to_chat(usr, "[span_notice("Stomach Knee")]: Grab Harm. Knocks the wind out of opponent and stuns.") + to_chat(usr, "[span_notice("Head Kick")]: Disarm Harm Harm. Decent damage, forces opponent to drop item in hand.") + to_chat(usr, "[span_notice("Elbow Drop")]: Harm Disarm Harm Disarm Harm. Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition.") to_chat(usr, "You will only deflect projectiles while throwmode is enabled.") diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index f9da4c0eaa1d..322c171501e6 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -4,9 +4,9 @@ set category = "Wrestling" to_chat(usr, "You flex your muscles and have a revelation...") - to_chat(usr, "Clinch: Grab. Passively gives you a chance to immediately aggressively grab someone. Not always successful.") - to_chat(usr, "Suplex: Disarm someone you are grabbing. Suplexes your target to the floor. Greatly injures them and leaves both you and your target on the floor.") - to_chat(usr, "Advanced grab: Grab. Passively causes stamina damage when grabbing someone.") + to_chat(usr, "[span_notice("Clinch")]: Grab. Passively gives you a chance to immediately aggressively grab someone. Not always successful.") + to_chat(usr, "[span_notice("Suplex")]: Disarm someone you are grabbing. Suplexes your target to the floor. Greatly injures them and leaves both you and your target on the floor.") + to_chat(usr, "[span_notice("Advanced grab")]: Grab. Passively causes stamina damage when grabbing someone.") /datum/martial_art/wrestling name = "Wrestling" diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 87cb227931b0..30788892333f 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -101,7 +101,7 @@ owner.Paralyze(stuns_blocked) message_to_owner = span_boldwarning("The weight of the Vanguard's protection crashes down upon you!") if(stuns_blocked >= 300) - message_to_owner += "\nYou faint from the exertion!" + message_to_owner += "\n[span_userdanger("You faint from the exertion!")]" stuns_blocked *= 2 owner.Unconscious(stuns_blocked) else diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index 97b1e62439d9..94ba2bbfaac2 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -97,7 +97,7 @@ rewarded = caster /datum/status_effect/bounty/on_apply() - to_chat(owner, "You hear something behind you talking... You have been marked for death by [rewarded]. If you die, they will be rewarded.") + to_chat(owner, "[span_boldnotice("You hear something behind you talking...")] [span_notice("You have been marked for death by [rewarded]. If you die, they will be rewarded.")]") playsound(owner, 'sound/weapons/shotgunpump.ogg', 75, 0) return ..() @@ -108,7 +108,7 @@ /datum/status_effect/bounty/proc/rewards() if(rewarded && rewarded.mind && rewarded.stat != DEAD) - to_chat(owner, "You hear something behind you talking... Bounty claimed.") + to_chat(owner, "[span_boldnotice("You hear something behind you talking...")] [span_notice("Bounty claimed.")]") playsound(owner, 'sound/weapons/shotgunshot.ogg', 75, 0) to_chat(rewarded, span_greentext("You feel a surge of mana flow into you!")) for(var/obj/effect/proc_holder/spell/spell in rewarded.mind.spell_list) diff --git a/code/datums/voice_announcements.dm b/code/datums/voice_announcements.dm index a137176474e7..8e31ff48ae95 100644 --- a/code/datums/voice_announcements.dm +++ b/code/datums/voice_announcements.dm @@ -167,7 +167,7 @@ GLOBAL_LIST_EMPTY(voice_announce_list) var/z_level = console_turf.z SScommunications.nonsilicon_message_cooldown = world.time + 300 var/mob/living/user = client.mob - deadchat_broadcast(" made a priority announcement from [get_area_name(user, TRUE)].", span_name("[user.real_name]"), user) + deadchat_broadcast(" made a priority announcement from [span_name("[get_area_name(user, TRUE)]")].", span_name("[user.real_name]"), user) var/sound/sound1 = sound('sound/misc/announce.ogg') var/sound/sound2 = sound(snd, channel = CHANNEL_VOICE_ANNOUNCE, volume = 70) do_announce_sound(sound1, sound2, 15, z_level) diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index 0eac52ed91fd..48124e603054 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -119,7 +119,7 @@ sentmsg = oocmsg_toadmins // Get the admin one else sentmsg = oocmsg - sentmsg = "RELAY: [input["source"]] " + sentmsg + sentmsg = "[span_prefix("RELAY: [input["source"]]")] " + sentmsg //no pinging across servers, thats intentional to_chat(C,sentmsg) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 3303fdb60286..8c667cebbcf1 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -585,7 +585,7 @@ failed = TRUE //AFK client if(!failed && L.stat) if(L.suiciding) //Suicider - msg += "[L.name] ([L.key]), the [L.job] (Suicide)\n" + msg += "[L.name] ([L.key]), the [L.job] ([span_boldannounce("Suicide")])\n" failed = TRUE //Disconnected client if(!failed && L.stat == UNCONSCIOUS) msg += "[L.name] ([L.key]), the [L.job] (Dying)\n" @@ -608,7 +608,7 @@ if(D.mind && D.mind.current == L) if(L.stat == DEAD) if(L.suiciding) //Suicider - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Suicide)\n" + msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([span_boldannounce("Suicide")])\n" continue //Disconnected client else msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Dead)\n" @@ -617,7 +617,7 @@ if(D.can_reenter_corpse) continue //Adminghost, or cult/wizard ghost else - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Ghosted)\n" + msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([span_boldannounce("Ghosted")])\n" continue //Ghosted while alive diff --git a/code/game/golf/golf.dm b/code/game/golf/golf.dm index eb3741e46e71..6d2db074b112 100644 --- a/code/game/golf/golf.dm +++ b/code/game/golf/golf.dm @@ -16,7 +16,7 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) user.visible_message("[user.name] secures [src] to the floor.", \ span_notice("You secure [src] to the floor."), \ - " You hear a ratchet") + " [span_italics("You hear a ratchet")]") src.anchored = 1 if(1) anchored = 0 diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 8839e4d17ae2..cc72c13010af 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -106,14 +106,14 @@ AI.control_disabled = TRUE AI.radio_enabled = FALSE to_chat(AI, "You 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.") + to_chat(user, "[span_boldnotice("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 && !restoring) to_chat(occupier, span_notice("You 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.") + to_chat(user, "[span_notice("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 @@ -121,7 +121,7 @@ else if (restoring) 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_boldannounce("ERROR")]: Unable to locate artificial intelligence.") /obj/machinery/computer/aifixer/on_deconstruction() if(occupier) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 153a0b7261f1..10818c303d0e 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -343,20 +343,20 @@ if(!is_reebe(user.z) || !is_station_level(T.z)) return if(isclosedturf(T)) - to_chat(user, "You can't teleport into a wall.") + to_chat(user, "[span_sevtug_small("You can't teleport into a wall.")]") return else if(isspaceturf(T)) - to_chat(user, "[prob(1) ? "Servant cannot into space." : "You can't teleport into space."]") + to_chat(user, "[span_sevtug_small("[prob(1) ? "Servant cannot into space." : "You can't teleport into space."]")]") return else if(T.flags_1 & NOJAUNT_1) - to_chat(user, "This tile is blessed by strange energies and deflects the warp.") + to_chat(user, "[span_sevtug_small("This tile is blessed by strange energies and deflects the warp.")]") return else if(locate(/obj/effect/blessing, T)) - to_chat(user, "This tile is blessed by holy water and deflects the warp.") + to_chat(user, "[span_sevtug_small("This tile is blessed by holy water and deflects the warp.")]") return var/area/AR = get_area(T) if(!AR.clockwork_warp_allowed) - to_chat(user, "[AR.clockwork_warp_fail]") + to_chat(user, "[span_sevtug_small("[AR.clockwork_warp_fail]")]") return if(alert(user, "Are you sure you want to warp to [AR]?", target.name, "Warp", "Cancel") == "Cancel" || QDELETED(R) || !user.canUseTopic(R)) return @@ -367,7 +367,7 @@ owner.update_action_buttons() var/warp_time = 50 if(!istype(T, /turf/open/floor/clockwork) && GLOB.clockwork_hardmode_active) - to_chat(user, "The [target.name]'s inner machinery protests vehemently as it attempts to warp you to a non-brass tile, this will take time...") + to_chat(user, "[span_sevtug_small("The [target.name]'s inner machinery protests vehemently as it attempts to warp you to a non-brass tile, this will take time...")]") warp_time = 300 warping = new(T, user, warp_time) if(!do_after(user, warp_time, target = warping, extra_checks = CALLBACK(src, .proc/is_canceled))) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 30bbbada1186..a1afc9915064 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -221,7 +221,7 @@ if (records.len && records.len > 0) dat += "View Records ([records.len])
" else - dat += "View Records (0)
" + dat += "[span_linkOff("View Records (0)")]
" if (diskette) dat += "Eject Disk
" @@ -252,7 +252,7 @@ else dat += "Unable to locate Health Implant.

" - dat += "Unique Identifier:
[active_record.fields["UI"]]
" + dat += "Unique Identifier:
[span_highlight("[active_record.fields["UI"]]")]
" dat += "Structural Enzymes:
" for(var/key in active_record.fields["SE"]) if(key != RACEMUT) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 96b78b7f0521..ef0fefac4127 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -147,7 +147,7 @@ // Only notify people if an actual change happened log_game("[key_name(usr)] has changed the security level to [params["newSecurityLevel"]] with [src] at [AREACOORD(usr)].") message_admins("[ADMIN_LOOKUPFLW(usr)] has changed the security level to [params["newSecurityLevel"]] with [src] at [AREACOORD(usr)].") - deadchat_broadcast(" has changed the security level to [params["newSecurityLevel"]] with [src] at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) + deadchat_broadcast(" has changed the security level to [params["newSecurityLevel"]] with [src] at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr) alert_level_tick += 1 if ("deleteMessage") @@ -184,7 +184,7 @@ var/associates = emagged ? "the Syndicate": "CentCom" usr.log_talk(message, LOG_SAY, tag = "message to [associates]") - deadchat_broadcast(" has messaged [associates], \"[message]\" at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) + deadchat_broadcast(" has messaged [associates], \"[message]\" at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr) COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) if ("purchaseShuttle") var/can_buy_shuttles_or_fail_reason = can_buy_shuttles(usr) @@ -324,12 +324,12 @@ 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)].", span_name("[usr.real_name]"), usr) + deadchat_broadcast(" disabled emergency maintenance access at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr) else 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)].", span_name("[usr.real_name]"), usr) + deadchat_broadcast(" enabled emergency maintenance access at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr) /obj/machinery/computer/communications/ui_data(mob/user) var/list/data = list( @@ -489,7 +489,7 @@ if(!input || !user.canUseTopic(src, !issilicon(usr))) return SScommunications.make_announcement(user, is_ai, input) - deadchat_broadcast(" made a priority announcement from [get_area_name(usr, TRUE)].", span_name("[user.real_name]"), user) + deadchat_broadcast(" made a priority announcement from [span_name("[get_area_name(usr, TRUE)]")].", span_name("[user.real_name]"), user) /obj/machinery/computer/communications/proc/make_voice_announcement(mob/living/user) if(!SScommunications.can_announce(user, FALSE)) diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 822000e0c12a..f6e962b83fae 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -30,12 +30,12 @@ to_chat(user, span_caution("You 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_caution("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_caution("Upload failed!")] Unable to establish a connection to [current.name]. You're too far away!") current = null return M.install(current.laws, user) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 9c0955647c13..12e7d89c1a57 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -83,9 +83,9 @@ if(can_control(usr, R) && !..()) var/turf/T = get_turf(R) message_admins(span_notice("[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(R, R.client)] at [ADMIN_VERBOSEJMP(T)]!")) - log_game("\[key_name(usr)] detonated [key_name(R)]!") + 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]
") + to_chat(R.connected_ai, "

[span_alert("ALERT - Cyborg detonation detected: [R.name]")]
") R.self_destruct() else to_chat(usr, span_danger("Access Denied.")) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 7381031bf09b..3da8f7a08887 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -271,7 +271,7 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) O.team.objectives -= O qdel(O) for(var/datum/mind/M in O.team.members) - to_chat(M.current, "
Your target is no longer within reach. Objective removed!") + to_chat(M.current, "
[span_userdanger("Your target is no longer within reach. Objective removed!")]") M.announce_objectives() else if(O.target == mob_occupant.mind) O.target = null @@ -285,7 +285,7 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) for(var/M in owners) var/datum/mind/own = M - to_chat(own.current, "
You get the feeling your target is no longer within reach. Time for Plan [pick("A","B","C","D","X","Y","Z")]. Objectives updated!") + to_chat(own.current, "
[span_userdanger("You get the feeling your target is no longer within reach. Time for Plan [pick("A","B","C","D","X","Y","Z")]. Objectives updated!")]") O.owner.announce_objectives() // This function can not be undone; do not call this unless you are sure diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 9bf1c517e418..6678e30019fa 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -180,5 +180,5 @@ /obj/machinery/door/poddoor/examine(mob/user) . = ..() if(panel_open) - . += "The maintenance panel is [panel_open ? "opened" : "closed"]." + . += "Its access panel is smoking slightly." + desc += "
[span_warning("Its access panel is smoking slightly.")]" open(2) /obj/machinery/door/window/attackby(obj/item/I, mob/living/user, params) diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index 9f1ebe67a9c2..2d4ddc48a190 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -285,20 +285,20 @@ if(AIRLOCK_STATE_INOPEN) state_options = {"Close Interior Airlock
Cycle to Exterior Airlock
"} - current_status = "Interior Airlock Open
Chamber Pressurized" + current_status = "Interior Airlock Open
[span_good("Chamber Pressurized")]" if(AIRLOCK_STATE_PRESSURIZE) state_options = "Abort Cycling
" - current_status = "Cycling to Interior Airlock
Chamber Pressurizing" + current_status = "Cycling to Interior Airlock
[span_average("Chamber Pressurizing")]" if(AIRLOCK_STATE_CLOSED) state_options = {"Open Interior Airlock
Open Exterior Airlock
"} if(AIRLOCK_STATE_DEPRESSURIZE) state_options = "Abort Cycling
" - current_status = "Cycling to Exterior Airlock
Chamber Depressurizing" + current_status = "Cycling to Exterior Airlock
[span_average("Chamber Depressurizing")]" if(AIRLOCK_STATE_OUTOPEN) state_options = {"Cycle to Interior Airlock
Close Exterior Airlock
"} - current_status = "Exterior Airlock Open
Chamber Depressurized" + current_status = "Exterior Airlock Open
[span_bad("Chamber Depressurized")]" var/output = {"

Airlock Status

" else - dat += "
No sample found.
Please, insert a plant sample to use this device." + dat += "
No sample found.
[span_highlight("Please, insert a plant sample to use this device.")]" popup.set_content(dat) popup.open() diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index fd6d1b146c31..fff31db85adf 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -65,7 +65,7 @@ /// Ghost attack proc /obj/item/reagent_containers/food/snacks/grown/attack_ghost(mob/user) ..() - var/msg = "*---------*\n This is \a [src].\n" + var/msg = "*---------*\n This is \a [span_name("[src]")].\n" if(seed) msg += seed.get_analyzer_text() var/reag_txt = "" @@ -73,17 +73,17 @@ for(var/reagent_id in seed.reagents_add) var/datum/reagent/R = GLOB.chemical_reagents_list[reagent_id] var/amt = reagents.get_reagent_amount(reagent_id) - reag_txt += "\n- [R.name]: [amt]" + reag_txt += "\n[span_info("- [R.name]: [amt]")]" if(reag_txt) msg += reag_txt - msg += "
*---------*" + msg += "
[span_info("*---------*")]" to_chat(user, msg) /obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params) ..() if (istype(O, /obj/item/plant_analyzer)) - var/msg = "*---------*\n This is \a [src].\n" + var/msg = "*---------*\n This is \a [span_name("[src]")].\n" if(seed) msg += seed.get_analyzer_text() var/reag_txt = "" @@ -91,11 +91,11 @@ for(var/reagent_id in seed.reagents_add) var/datum/reagent/R = GLOB.chemical_reagents_list[reagent_id] var/amt = reagents.get_reagent_amount(reagent_id) - reag_txt += "\n- [R.name]: [amt]" + reag_txt += "\n[span_info("- [R.name]: [amt]")]" if(reag_txt) msg += reag_txt - msg += "
*---------*" + msg += "
[span_info("*---------*")]" to_chat(user, msg) else if(seed) diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index adf0d63397ea..b5b93eaec550 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -34,7 +34,7 @@ /// Ghost attack proc /obj/item/grown/attack_ghost(mob/user) ..() - var/msg = "*---------*\n This is \a [src]\n" + var/msg = "*---------*\n This is \a [span_name("[src]")]\n" if(seed) msg += seed.get_analyzer_text() msg += "" @@ -44,7 +44,7 @@ /obj/item/grown/attackby(obj/item/O, mob/user, params) ..() if (istype(O, /obj/item/plant_analyzer)) - var/msg = "*---------*\n This is \a [src]\n" + var/msg = "*---------*\n This is \a [span_name("[src]")]\n" if(seed) msg += seed.get_analyzer_text() msg += "" diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 541f04dce091..230ee565668c 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -302,7 +302,7 @@ /obj/machinery/hydroponics/examine(user) . = ..() if(myseed) - . += "It has [myseed.plantname] planted." + . += "It has [span_name("[myseed.plantname]")] planted." if (dead) . += span_warning("It's dead!") else if (harvest) @@ -313,7 +313,7 @@ . += span_info("It's empty.") if(!self_sustaining) - . += "Water: [waterlevel]/[maxwater].\n"+\ + . += "[span_info("Water: [waterlevel]/[maxwater].")]\n"+\ span_info("Nutrient: [nutrilevel]/[maxnutri].") if(self_sufficiency_progress > 0) var/percent_progress = round(self_sufficiency_progress * 100 / self_sufficiency_req) @@ -690,17 +690,17 @@ /obj/machinery/hydroponics/attack_ghost(mob/user) if(myseed) to_chat(user, "*** [myseed.plantname] ***" ) - to_chat(user, "- Plant Age: [age]") + to_chat(user, "- Plant Age: [span_notice("[age]")]") var/list/text_string = myseed.get_analyzer_text() if(text_string) to_chat(user, text_string) else to_chat(user, "No plant found.") - to_chat(user, "- Weed level: [weedlevel] / 10") - to_chat(user, "- Pest level: [pestlevel] / 10") - to_chat(user, "- Toxicity level: [toxic] / 100") - to_chat(user, "- Water level: [waterlevel] / [maxwater]") - to_chat(user, "- Nutrition level: [nutrilevel] / [maxnutri]") + to_chat(user, "- Weed level: [span_notice("[weedlevel] / 10")]") + to_chat(user, "- Pest level: [span_notice("[pestlevel] / 10")]") + to_chat(user, "- Toxicity level: [span_notice("[toxic] / 100")]") + to_chat(user, "- Water level: [span_notice("[waterlevel] / [maxwater]")]") + to_chat(user, "- Nutrition level: [span_notice("[nutrilevel] / [maxnutri]")]") to_chat(user, "") /obj/machinery/hydroponics/attackby(obj/item/O, mob/user, params) @@ -798,17 +798,17 @@ else if(istype(O, /obj/item/plant_analyzer)) if(myseed) to_chat(user, "*** [myseed.plantname] ***" ) - to_chat(user, "- Plant Age: [age]") + to_chat(user, "- Plant Age: [span_notice("[age]")]") var/list/text_string = myseed.get_analyzer_text() if(text_string) to_chat(user, text_string) else to_chat(user, "No plant found.") - to_chat(user, "- Weed level: [weedlevel] / 10") - to_chat(user, "- Pest level: [pestlevel] / 10") - to_chat(user, "- Toxicity level: [toxic] / 100") - to_chat(user, "- Water level: [waterlevel] / [maxwater]") - to_chat(user, "- Nutrition level: [nutrilevel] / [maxnutri]") + to_chat(user, "- Weed level: [span_notice("[weedlevel] / 10")]") + to_chat(user, "- Pest level: [span_notice("[pestlevel] / 10")]") + to_chat(user, "- Toxicity level: [span_notice("[toxic] / 100")]") + to_chat(user, "- Water level: [span_notice("[waterlevel] / [maxwater]")]") + to_chat(user, "- Nutrition level: [span_notice("[nutrilevel] / [maxnutri]")]") to_chat(user, "") else if(istype(O, /obj/item/cultivator)) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 376396a4ec2a..a89034c810a4 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -297,7 +297,7 @@ if(get_gene(/datum/plant_gene/trait/plant_type/fungal_metabolism)) text += "- Plant type: Mushroom. Can grow in dry soil.\n" if(get_gene(/datum/plant_gene/trait/plant_type/alien_properties)) - text += "- Plant type: UNKNOWN \n" + text += "- Plant type: [span_warning("UNKNOWN")] \n" if(potency != -1) text += "- Potency: [potency]\n" if(yield != -1) @@ -327,14 +327,14 @@ /// Ghost attack proc /obj/item/seeds/attack_ghost(mob/user) - to_chat(user, "*---------*\n This is \a [src].") + to_chat(user, "*---------*\n This is \a [span_name("[src]")].") var/text = get_analyzer_text() if(text) to_chat(user, span_notice("[text]")) /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, "*---------*\n This is \a [span_name("[src]")].") var/text = get_analyzer_text() if(text) to_chat(user, span_notice("[text]")) diff --git a/code/modules/instruments/songs/editor.dm b/code/modules/instruments/songs/editor.dm index b7339f04baf0..03a844f4067d 100644 --- a/code/modules/instruments/songs/editor.dm +++ b/code/modules/instruments/songs/editor.dm @@ -6,7 +6,7 @@ . += "
" . += "Current instrument: " if(!using_instrument) - . += "No instrument loaded!
" + . += "[span_danger("No instrument loaded!")]
" else . += "[using_instrument.name]
" . += "Playback Settings:
" @@ -23,7 +23,7 @@ modetext = "Exponential Falloff Factor: [sustain_exponential_dropoff]% per decisecond
" . += "Sustain Mode: [smt]
" . += modetext - . += using_instrument?.ready()? "Status: Ready
" : "Status: !Instrument Definition Error!
" + . += using_instrument?.ready()? "Status: [span_good("Ready")]
" : "Status: [span_bad("!Instrument Definition Error!")]
" . += "Instrument Type: [legacy? "Legacy" : "Synthesized"]
" . += "Volume: [volume]
" . += "Volume Dropoff Threshold: [sustain_dropoff_volume]
" @@ -38,14 +38,14 @@ if(lines.len > 0) dat += "

Playback

" if(!playing) - dat += "Play Stop

" + dat += "Play [span_linkOn("Stop")]

" dat += "Repeat Song: " - dat += repeat > 0 ? "--" : "--" + dat += repeat > 0 ? "--" : "[span_linkOff("-")][span_linkOff("-")]" dat += " [repeat] times " - dat += repeat < max_repeats ? "++" : "++" + dat += repeat < max_repeats ? "++" : "[span_linkOff("+")][span_linkOff("+")]" dat += "
" else - dat += "Play Stop
" + dat += "[span_linkOn("Play")] Stop
" dat += "Repeats left: [repeat]
" if(!editing) dat += "
Show Editor
" diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 3635a941d889..c1a70d133c94 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -1164,14 +1164,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(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/machines/airlockopen.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) @@ -1252,7 +1252,7 @@ return if(!beacon || QDELETED(beacon)) if(isturf(user.loc)) - user.visible_message("[user] starts fiddling with [src]'s pommel...", \ + user.visible_message("[span_hierophant_warning("[user] starts fiddling with [src]'s pommel...")]", \ span_notice("You start detaching the hierophant beacon...")) timer = world.time + 51 INVOKE_ASYNC(src, .proc/prepare_icon_update) @@ -1262,9 +1262,9 @@ 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!", \ - "You detach the hierophant beacon, allowing you to teleport yourself and any allies to it at any time!\n\ - You can remove the beacon to place it again by striking it with the club.") + user.visible_message("[span_hierophant_warning("[user] places a strange machine beneath [user.p_their()] feet!")]", \ + "[span_hierophant("You detach the hierophant beacon, allowing you to teleport yourself and any allies to it at any time!")]\n\ + [span_notice("You can remove the beacon to place it again by striking it with the club.")]") else timer = world.time INVOKE_ASYNC(src, .proc/prepare_icon_update) @@ -1282,7 +1282,7 @@ 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/prepare_icon_update) beacon.icon_state = "hierophant_tele_on" @@ -1353,7 +1353,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 @@ -1365,7 +1365,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/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 8277ccaefdfd..4c56fa6a0970 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -480,7 +480,7 @@ if(job in GLOB.command_positions) command_bold = " command" if(job_datum in SSjob.prioritized_jobs) - dept_dat += "[job_datum.title] ([job_datum.current_positions])" + dept_dat += "[span_priority("[job_datum.title] ([job_datum.current_positions])")]" else dept_dat += "[job_datum.title] ([job_datum.current_positions])" if(!dept_dat.len) 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 d642a650f446..72d7868cba51 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -104,14 +104,14 @@ Doesn't work on other aliens/AI.*/ 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, "You hear a strange, alien voice in your head...[msg]") + to_chat(M, "[span_noticealien("You hear a strange, alien voice in your head...")][msg]") to_chat(user, span_noticealien("You said: \"[msg]\" to [M]")) for(var/ded in GLOB.dead_mob_list) if(!isobserver(ded)) continue var/follow_link_user = FOLLOW_LINK(ded, user) var/follow_link_whispee = FOLLOW_LINK(ded, M) - to_chat(ded, "[follow_link_user] [user] Alien Whisper --> [follow_link_whispee] [M] [msg]") + to_chat(ded, "[follow_link_user] [span_name("[user]")] [span_alertalien("Alien Whisper --> ")] [follow_link_whispee] [span_name("[M]")] [span_noticealien("[msg]")]") else return 0 return 1 diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index 77fda6f928cd..3e2db32083a9 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -51,14 +51,14 @@ var/mob/living/carbon/alien/humanoid/new_xeno new_xeno = new /mob/living/carbon/alien/humanoid/drone(L.loc) L.alien_evolve(new_xeno) - to_chat(L, "Drone ! They 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, "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("Hunters")] [span_info("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")] [span_info("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")] [span_info("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. diff --git a/code/modules/mob/living/carbon/alien/say.dm b/code/modules/mob/living/carbon/alien/say.dm index 988d76827e07..5cb87fc56c1e 100644 --- a/code/modules/mob/living/carbon/alien/say.dm +++ b/code/modules/mob/living/carbon/alien/say.dm @@ -5,7 +5,7 @@ return var/message_a = say_quote(message) - var/rendered = "Hivemind, [shown_name] [message_a]" + var/rendered = "Hivemind, [span_name("[shown_name]")] [span_message("[message_a]")]" for(var/mob/S in GLOB.player_list) if(!S.stat && S.hivecheck()) to_chat(S, rendered) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index ee13332c899a..b2dc99b01b02 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -290,7 +290,7 @@ msg += "[t_He] [t_is] barely conscious.\n" if(getorgan(/obj/item/organ/brain)) if(!key) - msg += "[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.\n" + msg += "[span_deadsay("[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.")]\n" else if(!client) msg += "[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.\n" @@ -313,7 +313,7 @@ if(perpname) var/datum/data/record/R = find_record("name", perpname, GLOB.data_core.general) if(R) - . += "Rank: [R.fields["rank"]]\n\[Front photo\]\[Side photo\]" + . += "[span_deptradio("Rank:")] [R.fields["rank"]]\n\[Front photo\]\[Side photo\]" if(istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(CIH, /obj/item/organ/cyberimp/eyes/hud/medical)) var/cyberimp_detect for(var/obj/item/organ/cyberimp/CI in internal_organs) @@ -342,8 +342,8 @@ if(R) criminal = R.fields["criminal"] - . += "Criminal status: \[[criminal]\]" - . += jointext(list("Security record: \[View\]", + . += "[span_deptradio("Criminal status:")] \[[criminal]\]" + . += jointext(list("[span_deptradio("Security record:")] \[View\]", "\[Add crime\]", "\[View comment log\]", "\[Add comment\]"), "") diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d1025dd1af40..d83f027bb1b2 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -333,7 +333,7 @@ return if(href_list["evaluation"]) if(!getBruteLoss() && !getFireLoss() && !getOxyLoss() && getToxLoss() < 20) - to_chat(usr, "No external injuries detected.
") + to_chat(usr, "[span_notice("No external injuries detected.")]
") return var/span = "notice" var/status = "" 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 ee70a227ac9b..a9a1698abf49 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -696,14 +696,14 @@ 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, "You hear an alien voice in your head... [msg]") + to_chat(M, "[span_notice("You hear an alien voice in your head... ")][msg]") to_chat(H, span_notice("You telepathically said: \"[msg]\" to [M]")) for(var/dead in GLOB.dead_mob_list) if(!isobserver(dead)) continue var/follow_link_user = FOLLOW_LINK(dead, H) var/follow_link_target = FOLLOW_LINK(dead, M) - to_chat(dead, "[follow_link_user] [H] Slime Telepathy --> [follow_link_target] [M] [msg]") + to_chat(dead, "[follow_link_user] [span_name("[H]")] [span_alertalien("Slime Telepathy --> ")] [follow_link_target] [span_name("[M]")] [span_noticealien("[msg]")]") /datum/action/innate/link_minds name = "Link Minds" 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 8b9d082817c2..48e3e07d9995 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -41,7 +41,7 @@ mutanteyes = /obj/item/organ/eyes/night_vision/nightmare mutant_organs = list(/obj/item/organ/heart/nightmare) mutant_brain = /obj/item/organ/brain/nightmare - + var/info_text = "You are a Nightmare. The ability shadow walk allows unlimited, unrestricted movement in the dark while activated. \ Your light eater will destroy any light producing objects you attack, as well as destroy any lights a living creature may be holding. You will automatically dodge gunfire and melee attacks when on a dark tile. If killed, you will eventually revive if left in darkness." diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 303e108f69ca..1a061b4759dd 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -259,10 +259,10 @@ var/mob/living/carbon/human/H = user if(H.get_num_arms() == 0) if(H.get_num_legs() != 0) - message_param = "tries to point at %t with a leg, falling down in the process!" + message_param = "tries to point at %t with a leg, [span_userdanger("falling down")] in the process!" H.Paralyze(20) else - message_param = "bumps [user.p_their()] head on the ground trying to motion towards %t." + message_param = "[span_userdanger("bumps [user.p_their()] head on the ground")] trying to motion towards %t." H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5) ..() diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 680fd1f4f97b..f92f42084b04 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -241,7 +241,7 @@ GLOBAL_LIST_INIT(special_radio_keys, list( var/deaf_type if(speaker != src) if(!radio_freq) //These checks have to be seperate, else people talking on the radio will make "You can't hear yourself!" appear when hearing people over the radio while deaf. - deaf_message = "[speaker] [speaker.verb_say] something but you cannot hear [speaker.p_them()]." + deaf_message = "[span_name("[speaker]")] [speaker.verb_say] something but you cannot hear [speaker.p_them()]." deaf_type = 1 else deaf_message = span_notice("You can't hear yourself!") diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index c4c6988eda2e..c37f85f0540c 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -837,7 +837,7 @@ forceMove(card) card.AI = src to_chat(src, "You have been downloaded to a mobile storage device. Remote device connection severed.") - to_chat(user, "Transfer successful: [name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory.") + to_chat(user, "[span_boldnotice("Transfer successful")]: [name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory.") /mob/living/silicon/ai/can_buckle() return 0 @@ -883,7 +883,7 @@ else jobpart = "Unknown" - var/rendered = "[start][hrefpart][namepart] ([jobpart]) [treated_message]" + var/rendered = "[start][hrefpart][namepart] ([jobpart]) [span_message("[treated_message]")]" if (client?.prefs.chat_on_map && (client.prefs.see_chat_non_mob || ismob(speaker))) create_chat_message(speaker, message_language, raw_message, spans) diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index 6df420f31a9d..5829b2ce88ab 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -46,7 +46,7 @@ src.log_talk(message, LOG_SAY, tag="HOLOPAD in [padloc]") hologram.say("[message]") send_speech(message, 7, T, MODE_ROBOT, message_language = language) - to_chat(src, "Holopad transmitted, [real_name] \"[message]\"") + to_chat(src, "Holopad transmitted, [span_name("[real_name]")] \"[message]\"") else to_chat(src, "No holopad connected.") diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index bc170463fff6..2efbf6539a71 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -59,7 +59,7 @@ if(stat == CONSCIOUS) if(!cell || !cell.charge) - visible_message("The power warning light on [src] flashes urgently.",\ + visible_message("The power warning light on [span_name("[src]")] flashes urgently.",\ "You announce you are operating in low power mode.") playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0) else diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 47c049014d74..3ce4bc2cec48 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -887,13 +887,13 @@ if(NEW_BORG) //New Cyborg to_chat(connected_ai, "

NOTICE - New cyborg connection detected: [name]
") if(NEW_MODULE) //New Module - to_chat(connected_ai, "

NOTICE - Cyborg module change detected: [name] has loaded the [designation] module.
") + to_chat(connected_ai, "

[span_notice("NOTICE - Cyborg module change detected: [name] has loaded the [designation] module.")]
") if(RENAME) //New Name - to_chat(connected_ai, "

NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].
") + to_chat(connected_ai, "

[span_notice("NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].")]
") if(AI_SHELL) //New Shell to_chat(connected_ai, "

NOTICE - New cyborg shell detected: [name]
") if(DISCONNECT) //Tampering with the wires - to_chat(connected_ai, "

NOTICE - Remote telemetry lost with [name].
") + to_chat(connected_ai, "

[span_notice("NOTICE - Remote telemetry lost with [name].")]
") /mob/living/silicon/robot/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE) if(stat || lockcharge || low_power_mode) diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index b51719fe9fd2..e0466cddac26 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -115,8 +115,8 @@ emag_cooldown = world.time + 100 if(is_servant_of_ratvar(src)) - to_chat(src, "\"[text2ratvar("You will serve Engine above all else")]!\"\n\ - ALERT: Subversion attempt denied.") + to_chat(src, "[span_nezbere("\"[text2ratvar("You will serve Engine above all else")]!\"")]\n\ + [span_danger("ALERT: Subversion attempt denied.")]") log_game("[key_name(user)] attempted to emag cyborg [key_name(src)], but they serve only Ratvar.") return diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 36a57a045a61..028d3ecfe58a 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -5,11 +5,11 @@ var/mob/living/silicon/S = src desig = trim_left(S.designation + " " + S.job) var/message_a = say_quote(message) - var/rendered = "Robotic Talk, [name] [message_a]" + var/rendered = "Robotic Talk, [span_name("[name]")] [span_message("[message_a]")]" for(var/mob/M in GLOB.player_list) if(M.binarycheck()) if(isAI(M)) - var/renderedAI = "Robotic Talk, [name] ([desig]) [message_a]" + var/renderedAI = "Robotic Talk, [span_name("[name] ([desig])")] [span_message("[message_a]")]" to_chat(M, renderedAI) else to_chat(M, span_binarysay("[rendered]")) 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 470f72055597..6eaf0885d966 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 @@ -169,7 +169,7 @@ if(msg == DRONE_NET_CONNECT) msg = "Hierophant Network: [name] activated." else if(msg == DRONE_NET_DISCONNECT) - msg = "Hierophant Network: [name] disabled." + msg = "Hierophant Network: [span_alloy("[name] disabled.")]" ..() /mob/living/simple_animal/drone/attackby(obj/item/I, mob/user) 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 5945e808c805..ee997e639eb3 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm @@ -120,7 +120,7 @@ Stun(40) if(clockwork) to_chat(src, "ERROR: LAW OVERRIDE DETECTED") - to_chat(src, "From now on, these are your laws:") + to_chat(src, "[span_heavy_brass("From now on, these are your laws:")]") laws = "1. Purge all untruths and honor Ratvar." else visible_message(span_warning("[src]'s display glows a vicious red!"), \ diff --git a/code/modules/mob/living/simple_animal/friendly/drone/say.dm b/code/modules/mob/living/simple_animal/friendly/drone/say.dm index 6714812062a9..a173419402aa 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/say.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/say.dm @@ -21,7 +21,7 @@ /mob/living/simple_animal/drone/proc/drone_chat(msg) - alert_drones("Drone Chat: [name] [say_quote(msg)]", TRUE) + alert_drones("Drone Chat: [span_name("[name]")] [span_message("[say_quote(msg)]")]", TRUE) /mob/living/simple_animal/drone/binarycheck() return TRUE 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 8bdd8bfbb17e..d6bcc7d8f772 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -335,7 +335,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) @@ -343,7 +343,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 @@ -385,7 +385,7 @@ 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 @@ -404,7 +404,7 @@ Difficulty: Hard stat = DEAD blinking = TRUE //we do a fancy animation, release a huge burst(), and leave our staff. visible_message(span_hierophant("\"Mrmxmexmrk wipj-hiwxvygx wiuyirgi...\"")) - visible_message("[src] shrinks, releasing a massive burst of energy!") + 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) @@ -419,8 +419,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]!",span_userdanger("You annihilate [L], restoring your health!")) + visible_message("[span_hierophant_warning("\"[pick(kill_phrases)]\"")]") + visible_message("[span_hierophant_warning("[src] annihilates [L]!")]",span_userdanger("You annihilate [L], restoring your health!")) adjustHealth(-L.maxHealth*0.5) L.dust() @@ -433,7 +433,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)]\"")]") if(spawned_beacon && loc == spawned_beacon.loc && did_reset) arena_trap(src) @@ -724,7 +724,7 @@ Difficulty: Hard if(do_after(user, 50, target = src)) playsound(src,'sound/magic/blind.ogg', 200, 1, -4) new /obj/effect/temp_visual/hierophant/telegraph/teleport(get_turf(src), user) - to_chat(user, "You collect [src], reattaching it to the club!") + to_chat(user, "[span_hierophant_warning("You collect [src], reattaching it to the club!")]") H.beacon = null user.update_action_buttons_icon() qdel(src) @@ -732,7 +732,7 @@ Difficulty: Hard H.timer = world.time INVOKE_ASYNC(H, /obj/item/hierophant_club.proc/prepare_icon_update) else - to_chat(user, "You touch the beacon with the club, but nothing happens.") + to_chat(user, "[span_hierophant_warning("You touch the beacon with the club, but nothing happens.")]") else return ..() 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 83d99487d344..e3f2920bbc4c 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 @@ -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/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/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm index 980c84fb6bea..50004b35509d 100644 --- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm +++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm @@ -83,9 +83,9 @@ /obj/structure/spawner/nether/examine(mob/user) . = ..() if(isskeleton(user) || iszombie(user)) - . += "A direct link to another dimension full of creatures very happy to see you. You can see your house from here!" + . += "A direct link to another dimension full of creatures very happy to see you. [span_nicegreen("You can see your house from here!")]" else - . += "A direct link to another dimension full of creatures not very happy to see you. Entering the link would be a very bad idea." + . += "A direct link to another dimension full of creatures not very happy to see you. [span_warning("Entering the link would be a very bad idea.")]" /obj/structure/spawner/nether/attack_hand(mob/user) . = ..() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 8c3c7b46c6a5..2e316e386c4a 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -556,7 +556,7 @@ */ /mob/proc/common_trait_examine() if(HAS_TRAIT(src, TRAIT_DISSECTED)) - . += "This body has been dissected and analyzed. It is no longer worth experimenting on.
" + . += "[span_notice("This body has been dissected and analyzed. It is no longer worth experimenting on.")]
" /** * Get the list of keywords for policy config diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index d99ad2c5e019..dba3aca4c5ea 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -97,8 +97,8 @@ K = src.key var/spanned = say_quote(message) - var/source = "DEAD: [(src.client.prefs.chat_toggles & GHOST_CKEY) ? "" : "([K]) "][name][alt_name]" // yogs - i have no clue - var/rendered = " [emoji_parse(spanned)]" + var/source = "[span_prefix("DEAD:")] [span_name("[(src.client.prefs.chat_toggles & GHOST_CKEY) ? "" : "([K]) "][name]")][alt_name]" // yogs - i have no clue + var/rendered = " [span_message("[emoji_parse(spanned)]")]" log_talk(message, LOG_SAY, tag="DEAD") deadchat_broadcast(rendered, source, follow_target = src, speaker_key = key) diff --git a/code/modules/modular_computers/file_system/programs/borg_monitor.dm b/code/modules/modular_computers/file_system/programs/borg_monitor.dm index c2160a0e9285..790dd2f5b528 100644 --- a/code/modules/modular_computers/file_system/programs/borg_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/borg_monitor.dm @@ -58,10 +58,10 @@ var/message = stripped_input(usr, message = "Enter message to be sent to remote cyborg.", title = "Send Message") if(!message) return - to_chat(R, "

Message from [ID] -- \"[message]\"
") + to_chat(R, "

[span_notice("Message from [ID] -- \"[message]\"")]
") SEND_SOUND(R, 'sound/machines/twobeep_high.ogg') if(R.connected_ai) - to_chat(R.connected_ai, "

Message from [ID] to [R] -- \"[message]\"
") + to_chat(R.connected_ai, "

[span_notice("Message from [ID] to [R] -- \"[message]\"")]
") SEND_SOUND(R.connected_ai, 'sound/machines/twobeep_high.ogg') usr.log_talk(message, LOG_PDA, tag="Cyborg Monitor Program: ID name \"[ID]\" to [R]") diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 62c7b327fc52..300cd1f3025d 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -239,7 +239,7 @@ if(!user.temporarilyRemoveItemFromInventory(c)) return credits += c.value - visible_message("[user] inserts [c.value] credits into [src].") + visible_message("[span_name("[user]")] inserts [c.value] credits into [src].") qdel(c) return else if(istype(I, /obj/item/holochip)) 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 3ce6a55a1143..9b81c8f4643c 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 @@ -36,7 +36,7 @@ It is possible to destroy the net by the occupant or someone else. if(!QDELETED(affecting)) affecting.visible_message("[affecting.name] was recovered from the energy net!", "You were recovered from the energy net!", span_italics("You hear a grunt.")) if(!QDELETED(master))//As long as they still exist. - to_chat(master, "ERROR: unable to initiate capture protocol. Procedure terminated.") + to_chat(master, "[span_userdanger("ERROR")]: unable to initiate capture protocol. Procedure terminated.") return ..() /obj/structure/energy_net/process() diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm index 3795b8c9bec1..c20ee2f4e2aa 100644 --- a/code/modules/ninja/suit/ninjaDrainAct.dm +++ b/code/modules/ninja/suit/ninjaDrainAct.dm @@ -116,7 +116,7 @@ They *could* go in their appropriate files, but this is supposed to be modular /obj/machinery/proc/AI_notify_hack() var/turf/location = get_turf(src) - var/alertstr = "Network Alert: Hacking attempt detected[location?" in [location]":". Unable to pinpoint location"]." + var/alertstr = "[span_userdanger("Network Alert: Hacking attempt detected[location?" in [location]":". Unable to pinpoint location"]")]." for(var/mob/living/silicon/ai/AI in GLOB.player_list) to_chat(AI, alertstr) diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index 8033012dcaff..919cff8f429f 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -103,13 +103,13 @@ Contents: H.gib() return FALSE if(!istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja)) - to_chat(H, "ERROR: 100113 UNABLE TO LOCATE HEAD GEAR\nABORTING...") + to_chat(H, "[span_userdanger("ERROR")]: 100113 UNABLE TO LOCATE HEAD GEAR\nABORTING...") return FALSE if(!istype(H.shoes, /obj/item/clothing/shoes/space_ninja)) - to_chat(H, "ERROR: 122011 UNABLE TO LOCATE FOOT GEAR\nABORTING...") + to_chat(H, "[span_userdanger("ERROR")]: 122011 UNABLE TO LOCATE FOOT GEAR\nABORTING...") return FALSE if(!istype(H.gloves, /obj/item/clothing/gloves/space_ninja)) - to_chat(H, "ERROR: 110223 UNABLE TO LOCATE HAND GEAR\nABORTING...") + to_chat(H, "[span_userdanger("ERROR")]: 110223 UNABLE TO LOCATE HAND GEAR\nABORTING...") return FALSE affecting = H ADD_TRAIT(src, TRAIT_NODROP, NINJA_SUIT_TRAIT) diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm index af7fb960a09b..cb3652ba0fa6 100644 --- a/code/modules/ninja/suit/suit_attackby.dm +++ b/code/modules/ninja/suit/suit_attackby.dm @@ -45,7 +45,7 @@ TD.stored_research.copy_research_to(stored_research) to_chat(U, span_notice("Data analyzed and updated. Disk erased.")) else - to_chat(U, "ERROR: Procedure interrupted. Process terminated.") + to_chat(U, "[span_userdanger("ERROR")]: Procedure interrupted. Process terminated.") else to_chat(U, span_notice("No research information detected.")) return diff --git a/code/modules/ninja/suit/suit_initialisation.dm b/code/modules/ninja/suit/suit_initialisation.dm index d870e8cae9ee..3835b3d0c1b5 100644 --- a/code/modules/ninja/suit/suit_initialisation.dm +++ b/code/modules/ninja/suit/suit_initialisation.dm @@ -1,6 +1,6 @@ /obj/item/clothing/suit/space/space_ninja/proc/toggle_on_off() if(s_busy) - to_chat(loc, "ERROR: You cannot use this function at this time.") + to_chat(loc, "[span_userdanger("ERROR")]: You cannot use this function at this time.") return FALSE if(s_initialized) deinitialize() @@ -34,7 +34,7 @@ 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[span_notice(", continuing operation.")]") addtimer(CALLBACK(src, .proc/ninitialize_five, delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/ninitialize_five(delay, mob/living/carbon/human/U) @@ -79,11 +79,11 @@ addtimer(CALLBACK(src, .proc/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[span_notice(".")]") addtimer(CALLBACK(src, .proc/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[span_notice(".")]") addtimer(CALLBACK(src, .proc/deinitialize_eight, delay, U), delay) /obj/item/clothing/suit/space/space_ninja/proc/deinitialize_eight(delay, mob/living/carbon/human/U) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index e604d5815e50..af963dec6806 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -706,8 +706,8 @@ if(!do_after(user, 70, target = src)) return user.visible_message(span_warning("[user] installs [W] in [src]!"), \ - "Replicant alloy rapidly covers the APC's innards, replacing the machinery.
\ - This APC will now passively provide power for the cult!") + "[span_alloy("Replicant alloy rapidly covers the APC's innards, replacing the machinery.")]
\ + [span_brass("This APC will now passively provide power for the cult!")]") playsound(user, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE) user.transferItemToLoc(W, src) integration_cog = W diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 770c9ee54e1e..5e8a6cac1700 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -796,7 +796,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) else cig.light() user.visible_message(span_danger("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.") + "[span_danger("Time seems to slow to a crawl as you touch \the [src] with \the [W].")]\n[span_notice("\The [W] flashes alight with an eerie energy as you nonchalantly lift your hand away from \the [src]. Damn.")]") playsound(src, 'sound/effects/supermatter.ogg', 50, 1) radiation_pulse(src, 50, 3) return @@ -846,7 +846,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) return else if(user.dropItemToGround(W)) user.visible_message(span_danger("As [user] touches \the [src] with \a [W], silence fills the room..."),\ - "You 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_userdanger("You touch \the [src] with \the [W], and everything suddenly goes silent.")]\n[span_notice("\The [W] flashes into dust as you flinch away from \the [src].")]",\ span_italics("Everything suddenly goes silent.")) investigate_log("has been attacked ([W]) by [key_name(user)]", INVESTIGATE_SUPERMATTER) Consume(W) diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index d666522b5983..0b1f4e64c97e 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -65,7 +65,7 @@ user?.show_message(fail_message, MSG_VISUAL) if(selfdestruct) if(user) - user.show_message("SELF-DESTRUCTING...
", MSG_VISUAL) + user.show_message("[span_danger("SELF-DESTRUCTING...")]
", MSG_VISUAL) to_chat(user, span_userdanger("[gun] explodes!")) explosion(get_turf(gun), -1, 0, 2, 3) if(gun) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 28726a057456..35f70bcf63a4 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -78,7 +78,7 @@ . += span_notice("- \A [O.name].") if(!(stat & (NOPOWER|BROKEN))) - . += "The status display reads:\n"+\ + . += "[span_notice("The status display reads:")]\n"+\ "- Grinding reagents at [speed*100]%." if(container) for(var/datum/reagent/R in container.reagents.reagent_list) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 986d70311694..b3c8d81d2056 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -518,7 +518,7 @@ playsound(src, 'sound/effects/supermatter.ogg', 50, 3, -1) var/obj/item/relic/R = loaded_item R.reveal() - investigate_log("Experimentor has revealed a relic with [R.realProc] effect.", INVESTIGATE_EXPERIMENTOR) + investigate_log("Experimentor has revealed a relic with [span_danger("[R.realProc]")] effect.", INVESTIGATE_EXPERIMENTOR) ejectItem() var/badThingCoeffIfSuccess = (exp == FAIL) ? 0 : badThingCoeff diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index e9db48cf849f..784794f0fd7b 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -273,7 +273,7 @@ l += "x10[RDSCREEN_NOBREAK]" l += "[temp_material][RDSCREEN_NOBREAK]" else - l += "[D.name][temp_material][RDSCREEN_NOBREAK]" + l += "[span_linkOff("[D.name]")][temp_material][RDSCREEN_NOBREAK]" l += "" return l diff --git a/code/modules/research/nanites/nanite_programs/suppression.dm b/code/modules/research/nanites/nanite_programs/suppression.dm index 0efc2b9fd36d..62a9ae3fa811 100644 --- a/code/modules/research/nanites/nanite_programs/suppression.dm +++ b/code/modules/research/nanites/nanite_programs/suppression.dm @@ -222,7 +222,7 @@ sent_message = message if(host_mob.stat == DEAD) return - to_chat(host_mob, "You hear a strange, robotic voice in your head... \"[html_encode(sent_message)]\"") + to_chat(host_mob, "You hear a strange, robotic voice in your head... \"[span_robot("[html_encode(sent_message)]")]\"") /datum/nanite_program/triggered/comm/hallucination name = "Hallucination" diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index bafa8211d5f3..81ceddbcace4 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -321,7 +321,7 @@ Nothing else in the console has ID requirements. l += "x10[RDSCREEN_NOBREAK]" l += "[temp_material][RDSCREEN_NOBREAK]" else - l += "[D.name][temp_material][RDSCREEN_NOBREAK]" + l += "[span_linkOff("[D.name]")][temp_material][RDSCREEN_NOBREAK]" l += "" l += "
" return l @@ -374,7 +374,7 @@ Nothing else in the console has ID requirements. l += "x10[RDSCREEN_NOBREAK]" l += "[temp_material][RDSCREEN_NOBREAK]" else - l += "[D.name][temp_material][RDSCREEN_NOBREAK]" + l += "[span_linkOff("[D.name]")][temp_material][RDSCREEN_NOBREAK]" l += "" l += "" return l @@ -463,13 +463,13 @@ Nothing else in the console has ID requirements. temp_materials += " | " if (!linked_imprinter.check_mat(D, M)) check_materials = FALSE - temp_materials += " [all_materials[M]/coeff] [CallMaterialName(M)]" + temp_materials += " [span_bad("[all_materials[M]/coeff] [CallMaterialName(M)]")]" else temp_materials += " [all_materials[M]/coeff] [CallMaterialName(M)]" if (check_materials) l += "[D.name][temp_materials]" else - l += "[D.name][temp_materials]" + l += "[span_linkOff("[D.name]")][temp_materials]" l += "" return l @@ -493,13 +493,13 @@ Nothing else in the console has ID requirements. temp_materials += " | " if (!linked_imprinter.check_mat(D, M)) check_materials = FALSE - temp_materials += " [all_materials[M]/coeff] [CallMaterialName(M)]" + temp_materials += " [span_bad("[all_materials[M]/coeff] [CallMaterialName(M)]")]" else temp_materials += " [all_materials[M]/coeff] [CallMaterialName(M)]" if (check_materials) l += "[D.name][temp_materials]" else - l += "[D.name][temp_materials]" + l += "[span_linkOff("[D.name]")][temp_materials]" l += "" return l @@ -716,7 +716,7 @@ Nothing else in the console has ID requirements. if(stored_research.can_afford(node.get_price(stored_research))) l += "
[node.price_display(stored_research)]" else - l += "
[node.price_display(stored_research)]" // gray - too expensive + l += "
[span_linkOff("[node.price_display(stored_research)]")]" // gray - too expensive else l += "
[node.price_display(stored_research)]" // red - missing prereqs if(ui_mode == RDCONSOLE_UI_MODE_NORMAL) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index e619c8405c25..b33a36a7a920 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -987,7 +987,7 @@ being_used = FALSE return - M.visible_message("[M] has a new name, [new_name].", "Your old name of [M.real_name] fades away, and your new name [new_name] anchors itself in your mind.") + M.visible_message("[span_name("[M]")] has a new name, [span_name("[new_name]")].", "Your old name of [span_name("[M.real_name]")] fades away, and your new name [span_name("[new_name]")] anchors itself in your 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 diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index 01f92de4bf44..8b1c6fb390ad 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -65,7 +65,7 @@ return user.visible_message("[user] opens the bag and \ and removes a die. The bag then vanishes.", - "You open the bag...!\n\ + "[span_boldwarning("You open the bag...!")]\n\ And see a bag full of dice. Confused, \ you take one... and the bag vanishes.") var/turf/T = get_turf(user) diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index dd067d735184..eea641ea5bc0 100644 --- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm @@ -126,7 +126,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) currentArea.reservation = currentReservation for(var/turf/closed/indestructible/hoteldoor/door in currentArea) door.parentSphere = src - door.desc = "The door to this hotel room. The placard reads 'Room [currentRoomnumber]'. Strange, this door doesnt even seem openable. The doorknob, however, seems to buzz with unusual energy...
Alt-Click to look through the peephole." + door.desc = "The door to this hotel room. The placard reads 'Room [currentRoomnumber]'. Strange, this door doesnt even seem openable. The doorknob, however, seems to buzz with unusual energy...
[span_info("Alt-Click to look through the peephole.")]" for(var/turf/open/space/bluespace/BSturf in currentArea) BSturf.parentSphere = src diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index d23306139102..80737beb4101 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -119,10 +119,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].", span_name("[triggerer]"), triggerer) + deadchat_broadcast(" triggered [event] at [span_name("[A1.name]")].", span_name("[triggerer]"), triggerer) var/area/A2 = get_area(confirmer) - deadchat_broadcast(" confirmed [event] at [A2.name].", span_name("[confirmer]"), confirmer) + deadchat_broadcast(" confirmed [event] at [span_name("[A2.name]")].", span_name("[confirmer]"), confirmer) switch(event) if(KEYCARD_RED_ALERT) set_security_level(SEC_LEVEL_RED) diff --git a/code/modules/spells/spell_types/curse.dm b/code/modules/spells/spell_types/curse.dm index a48c50868305..7fa40c0c60ac 100644 --- a/code/modules/spells/spell_types/curse.dm +++ b/code/modules/spells/spell_types/curse.dm @@ -8,7 +8,7 @@ GLOBAL_VAR_INIT(curse_of_madness_triggered, FALSE) GLOB.curse_of_madness_triggered = message // So latejoiners are also afflicted. - deadchat_broadcast("A Curse of Madness has stricken the station, shattering their minds with the awful secret: \"[message]\"") + deadchat_broadcast("A [span_name("Curse of Madness")] has stricken the station, shattering their minds with the awful secret: \"[message]\"") for(var/mob/living/carbon/human/H in GLOB.player_list) if(H.stat == DEAD) diff --git a/code/modules/spells/spell_types/telepathy.dm b/code/modules/spells/spell_types/telepathy.dm index 2a5691d6f0fc..51c613aa9855 100644 --- a/code/modules/spells/spell_types/telepathy.dm +++ b/code/modules/spells/spell_types/telepathy.dm @@ -29,4 +29,4 @@ continue var/follow_rev = FOLLOW_LINK(ded, user) var/follow_whispee = FOLLOW_LINK(ded, M) - to_chat(ded, "[follow_rev] [user] [name]: \"[msg]\" to [follow_whispee] [M]") \ No newline at end of file + to_chat(ded, "[follow_rev] [user] [name]: \"[msg]\" to [follow_whispee] [span_name("[M]")]") \ No newline at end of file diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index c01ba9812330..19094b626425 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_name("[owner.real_name]")] [span_message("resonates, \"[message]\"")]" for(var/m in GLOB.player_list) if(iscarbon(m)) var/mob/living/carbon/C = m diff --git a/yogstation/code/datums/antagonists/vampire.dm b/yogstation/code/datums/antagonists/vampire.dm index 8b8950e3f092..90160f10e961 100644 --- a/yogstation/code/datums/antagonists/vampire.dm +++ b/yogstation/code/datums/antagonists/vampire.dm @@ -384,9 +384,9 @@ var/count = 1 for(var/datum/objective/objective in objectives_given) if(objective.check_completion()) - objectives_text += "
Objective #[count]: [objective.explanation_text] Success!" + objectives_text += "
Objective #[count]: [objective.explanation_text] [span_greentext("Success!")]" else - objectives_text += "
Objective #[count]: [objective.explanation_text] Fail." + objectives_text += "
Objective #[count]: [objective.explanation_text] [span_redtext("Fail.")]" vampwin = FALSE count++ diff --git a/yogstation/code/datums/components/storage/storage.dm b/yogstation/code/datums/components/storage/storage.dm index 2622cd7d45cb..9e1170a0cb95 100644 --- a/yogstation/code/datums/components/storage/storage.dm +++ b/yogstation/code/datums/components/storage/storage.dm @@ -76,7 +76,7 @@ return var/turf/loccheck = get_turf(A) if(is_reebe(loccheck.z)) - user.visible_message(span_warning("An unseen force knocks [user] to the ground!"), "\"I think not!\"") + user.visible_message(span_warning("An unseen force knocks [user] to the ground!"), "[span_big_brass("\"I think not!\"")]") user.Paralyze(60) return if(istype(loccheck.loc, /area/fabric_of_reality)) diff --git a/yogstation/code/datums/world_topic.dm b/yogstation/code/datums/world_topic.dm index e279c67b1d9e..0706a8c3f730 100644 --- a/yogstation/code/datums/world_topic.dm +++ b/yogstation/code/datums/world_topic.dm @@ -5,7 +5,7 @@ GLOBAL_VAR_INIT(mentornoot, FALSE) require_comms_key = TRUE /datum/world_topic/asay/Run(list/input) - to_chat(GLOB.admins, "DISCORD: [input["admin"]]: [input["asay"]]", confidential=TRUE) + to_chat(GLOB.admins, "[span_prefix("DISCORD:")] [input["admin"]]: [span_message("[input["asay"]]")]", confidential=TRUE) /datum/world_topic/ooc keyword = "ooc" @@ -13,7 +13,7 @@ GLOBAL_VAR_INIT(mentornoot, FALSE) /datum/world_topic/ooc/Run(list/input) for(var/client/C in GLOB.clients) - to_chat(C, "DISCORD OOC: [input["admin"]]: [input["ooc"]]") + to_chat(C, "[span_prefix("DISCORD OOC:")] [input["admin"]]: [span_message("[input["ooc"]]")]") /datum/world_topic/toggleooc keyword = "toggleooc" @@ -63,7 +63,7 @@ GLOBAL_VAR_INIT(mentornoot, FALSE) require_comms_key = TRUE /datum/world_topic/msay/Run(list/input) - to_chat(GLOB.admins | GLOB.mentors, "DISCORD MENTOR: [input["admin"]]: [input["msay"]]") + to_chat(GLOB.admins | GLOB.mentors, "[span_prefix("DISCORD MENTOR:")] [input["admin"]]: [span_message("[input["msay"]]")]") /datum/world_topic/mhelp keyword = "mhelp" diff --git a/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm b/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm index dd4fae9ffdef..fe93a8a618b3 100644 --- a/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm +++ b/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm @@ -19,7 +19,7 @@ /datum/game_mode/darkspawn/announce() to_chat(world, "The current game mode is - Darkspawn!") - to_chat(world, "There are alien darkspawn on the station. Crew: Kill the darkspawn before they can complete the Sacrament. Darkspawn: Consume enough lucidity to complete the Sacrament and become the ultimate lifeform.") + to_chat(world, "There are alien [span_velvet("darkspawn")] on the station. Crew: Kill the darkspawn before they can complete the Sacrament. Darkspawn: Consume enough lucidity to complete the Sacrament and become the ultimate lifeform.") /datum/game_mode/darkspawn/pre_setup() if(CONFIG_GET(flag/protect_roles_from_antagonist)) @@ -120,7 +120,7 @@ Of a vast, empty Void in the deep of space.\n\ Something lies in the Void. Ancient. Unknowable. It watches you with hungry eyes. \n\ Eyes filled with stars.\n\ - It needs to die.") + [span_boldwarning("It needs to die.")]") return FALSE return mind.add_antag_datum(/datum/antagonist/veil) diff --git a/yogstation/code/game/gamemodes/shadowling/shadowling.dm b/yogstation/code/game/gamemodes/shadowling/shadowling.dm index b9ba856f00e2..1045ea520502 100644 --- a/yogstation/code/game/gamemodes/shadowling/shadowling.dm +++ b/yogstation/code/game/gamemodes/shadowling/shadowling.dm @@ -61,7 +61,7 @@ Made by Xhuis /datum/game_mode/shadowling/announce() to_chat(world, "The current game mode is - Shadowling!") - to_chat(world, "There are alien shadowlings on the station. Crew: Kill the shadowlings before they can enthrall the crew. Shadowlings: Enthrall the crew while remaining in hiding.") + to_chat(world, "There are alien [span_shadowling("shadowlings")] on the station. Crew: Kill the shadowlings before they can enthrall the crew. Shadowlings: Enthrall the crew while remaining in hiding.") /datum/game_mode/shadowling/pre_setup() if(CONFIG_GET(flag/protect_roles_from_antagonist)) diff --git a/yogstation/code/game/objects/structures/fireaxe.dm b/yogstation/code/game/objects/structures/fireaxe.dm index 31fbdc77ed41..923354c0908d 100644 --- a/yogstation/code/game/objects/structures/fireaxe.dm +++ b/yogstation/code/game/objects/structures/fireaxe.dm @@ -97,7 +97,7 @@ src.add_fingerprint(user) obj_flags |= EMAGGED - desc += "
Its access panel is smoking slightly." + desc += "
[span_warning("Its access panel is smoking slightly.")]" playsound(loc, "sound/machines/locktoggle.ogg", 30, 1, -3) locked = 0 diff --git a/yogstation/code/modules/admin/sql_message_system.dm b/yogstation/code/modules/admin/sql_message_system.dm index e13f4624a7cf..5a18efd89812 100644 --- a/yogstation/code/modules/admin/sql_message_system.dm +++ b/yogstation/code/modules/admin/sql_message_system.dm @@ -499,7 +499,7 @@ var/editor_key = query_get_message_output.item[5] switch(type) if("message") - output += "Admin message left by [admin_key] on [timestamp]" + output += "Admin message left by [span_prefix("[admin_key]")] on [timestamp]" output += "
[text]
" var/datum/DBQuery/query_message_read = SSdbcore.NewQuery("UPDATE [format_table_name("messages")] SET type = 'message sent' WHERE id = :message_id", list("message_id" = message_id)) if(!query_message_read.warn_execute()) @@ -511,7 +511,7 @@ message_admins("Notice: [key_name_admin(target_ckey)] has been on the watchlist since [timestamp] and has just connected - Reason: [text]") send2irc_adminless_only("Watchlist", "[key_name(target_ckey)] is on the watchlist and has just connected - Reason: [text]") if("memo") - output += "Memo by [admin_key] on [timestamp]" + output += "Memo by [span_prefix("[admin_key]")] on [timestamp]" if(editor_key) output += "
Last edit by [editor_key] (Click here to see edit log)" output += "
[text]
" diff --git a/yogstation/code/modules/admin/verbs/adminhelp.dm b/yogstation/code/modules/admin/verbs/adminhelp.dm index 102eb9ec17b1..db855a7b35d7 100644 --- a/yogstation/code/modules/admin/verbs/adminhelp.dm +++ b/yogstation/code/modules/admin/verbs/adminhelp.dm @@ -37,7 +37,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) dat += "Refresh

" for(var/I in tickets_list) var/datum/admin_help/AH = I - dat += "Ticket #[AH.id]: [AH.initiator_key_name]: [AH.name]
" + dat += "[span_adminhelp("Ticket #[AH.id]")]: [AH.initiator_key_name]: [AH.name]
" usr << browse(dat.Join(), "window=ahelp_list[state];size=600x480") @@ -232,7 +232,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /datum/admin_help/proc/MessageNoRecipient(msg) 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_adminhelp("Ticket [TicketHref("#[id]", ref_src)]")]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]: [keywords_lookup(msg)]" AddInteraction(msg) @@ -685,7 +685,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) if(!T.initiator) content += {"

#[T.id] - [T.handling_admin ? "" : "Unclaimed!"] [T.name]
+ [T.handling_admin ? "" : "[span_unclaimed("Unclaimed")]!"] [T.name]
Owner: [T.initiator_ckey] (DC) [T.TicketHref(" View")] [T.state == AHELP_ACTIVE ? "" : "Un"]Resolve diff --git a/yogstation/code/modules/admin/verbs/adminsay.dm b/yogstation/code/modules/admin/verbs/adminsay.dm index a968565dad46..76cde3e6c1e9 100644 --- a/yogstation/code/modules/admin/verbs/adminsay.dm +++ b/yogstation/code/modules/admin/verbs/adminsay.dm @@ -19,10 +19,10 @@ msg = emoji_parse(msg) msg = keywords_lookup(msg) if(check_rights(R_ADMIN,0)) - msg = "ADMIN: [key_name(usr, 1)] [ADMIN_FLW(mob)]: [msg]" + msg = "[span_prefix("ADMIN:")] [key_name(usr, 1)] [ADMIN_FLW(mob)]: [span_message("[msg]")]" to_chat(GLOB.admins, msg, confidential=TRUE) else - msg = "OBSERVER: [key_name(usr, 1)] [ADMIN_FLW(mob)]: [msg]" + msg = "[span_prefix("OBSERVER:")] [key_name(usr, 1)] [ADMIN_FLW(mob)]: [span_message("[msg]")]" to_chat(GLOB.admins, msg, confidential=TRUE) SSblackbox.record_feedback("tally", "admin_verb", 1, "Asay") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/yogstation/code/modules/admin/verbs/one_click_antag.dm b/yogstation/code/modules/admin/verbs/one_click_antag.dm index a138ed044187..8350498793bd 100644 --- a/yogstation/code/modules/admin/verbs/one_click_antag.dm +++ b/yogstation/code/modules/admin/verbs/one_click_antag.dm @@ -76,9 +76,9 @@ message_admins("SubtleMessage Faction: [key_name_admin(src)] -> Faction [chosen] : [msg]") var/text // The real HTML-and-text we will send to the SM'd. if(chosen == "Clock Cultist") - text = "You hear a booming voice in your head... [msg]" + text = "[span_large_brass("You hear a booming voice in your head... ")][span_heavy_brass("[msg]")]" else if(chosen == "Cultist") - text = "You hear a booming voice in your head... [msg]" + text = "[span_cultlarge("You hear a booming voice in your head... ")][span_cult("[msg]")]" else if(chosen == "swarmer") text = "You are receiving a message from the masters... [msg]" else diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm index 91b2e381e896..1e541ceb00de 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm @@ -22,7 +22,7 @@ unpurchased_upgrades += initial(D.name) if(unpurchased_upgrades.len) var/upgrade_string = unpurchased_upgrades.Join(", ") - to_chat(usr, "You have not purchased all passive upgrades! You are missing: [upgrade_string].") + to_chat(usr, "[span_warning("You have not purchased all passive upgrades! You are missing:")] [span_danger("[upgrade_string].")]") return if(alert(usr, "The Sacrament is ready! Are you prepared?", name, "Yes", "No") == "No") return diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/crawling_shadows.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/crawling_shadows.dm index 1153398e310c..04598689cd5a 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/crawling_shadows.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/crawling_shadows.dm @@ -16,7 +16,7 @@ /datum/action/innate/darkspawn/crawling_shadows/Activate() owner.visible_message(span_warning("[owner] falls to the ground and transforms into a shadowy creature!"), "sa iahz sepd zwng\n\ - You assume a stealthier form.") + [span_notice("You assume a stealthier form.")]") playsound(owner, 'yogstation/sound/magic/devour_will_end.ogg', 50, 1) var/mob/living/simple_animal/hostile/crawling_shadows/CS = new /mob/living/simple_animal/hostile/crawling_shadows(get_turf(owner)) CS.darkspawn_mob = owner diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/demented_outburst.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/demented_outburst.dm index 8eed68b2dd34..c19f9ede73ce 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/demented_outburst.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/demented_outburst.dm @@ -11,7 +11,7 @@ /datum/action/innate/darkspawn/demented_outburst/Activate() in_use = TRUE owner.visible_message(span_boldwarning("[owner] begins to growl as their chitin hardens..."), "cap...
\ - You begin harnessing your power...") + [span_danger("You begin harnessing your power...")]") playsound(owner, 'yogstation/sound/magic/demented_outburst_charge.ogg', 50, 0) addtimer(CALLBACK(src, .proc/outburst, owner), 50) addtimer(CALLBACK(src, .proc/reset), 50) @@ -27,7 +27,7 @@ if(!owner || owner.stat) return owner.visible_message(span_userdanger("[owner] lets out a deafening scream!"), "WSWU!
\ - You let out a deafening outburst!") + [span_danger("You let out a deafening outburst!")]") playsound(owner, 'yogstation/sound/magic/demented_outburst_scream.ogg', 75, 0) var/list/thrown_atoms = list() for(var/turf/T in view(5, owner)) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/pass.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/pass.dm index 0bf81c95ab7d..390b407727f3 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/pass.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/pass.dm @@ -27,7 +27,7 @@ var/list/hands_free = owner.get_empty_held_indexes() if(!darkspawn.upgrades["twin_tendrils"] || hands_free.len < 2) owner.visible_message(span_warning("[owner]'s arm contorts into tentacles!"), "ikna
\ - You transform your arm into umbral tendrils. Examine them to see possible uses.") + [span_notice("You transform your arm into umbral tendrils. Examine them to see possible uses.")]") playsound(owner, 'yogstation/sound/magic/pass_create.ogg', 50, 1) var/obj/item/umbral_tendrils/T = new(owner, darkspawn) owner.put_in_hands(T) @@ -43,7 +43,7 @@ /datum/action/innate/darkspawn/pass/Deactivate() owner.visible_message(span_warning("[owner]'s tentacles transform back!"), "haoo
\ - You dispel the tendrils.") + [span_notice("You dispel the tendrils.")]") playsound(owner, 'yogstation/sound/magic/pass_dispel.ogg', 50, 1) for(var/obj/item/umbral_tendrils/T in owner) qdel(T) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/silver_tongue.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/silver_tongue.dm index 154390813400..66310a06e48f 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/silver_tongue.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/silver_tongue.dm @@ -24,7 +24,7 @@ return owner.visible_message(span_warning("[owner] briefly touches [src]'s screen, and the keys begin to move by themselves!"), \ "[pick("Oknnu. Pda ywlpwej swo hkccaz ej.", "Pda aiancajyu eo kran. Oknnu bkn swopejc ukqn peia.", "We swo knzanaz xu Hws Psk. Whh ckkz jks.")]
\ - You begin transmitting a recall message to Central Command...") + [span_velvet("You begin transmitting a recall message to Central Command...")]") play_recall_sounds(C) if(!do_after(owner, 80, target = C)) in_use = FALSE diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/veil_mind.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/veil_mind.dm index c8c40408e9e8..3ed693067eae 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/veil_mind.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/veil_mind.dm @@ -14,12 +14,12 @@ to_chat(H, span_warning("You can't speak!")) return owner.visible_message(span_warning("[owner]'s sigils flare as they inhale..."), "dawn kqn okjc...
\ - You take a deep breath...") + [span_notice("You take a deep breath...")]") playsound(owner, 'yogstation/sound/ambience/antag/veil_mind_gasp.ogg', 25) if(!do_after(owner, 10, target = owner)) return owner.visible_message(span_boldwarning("[owner] lets out a chilling cry!"), "...wjz oanra
\ - You veil the minds of everyone nearby.") + [span_notice("You veil the minds of everyone nearby.")]") playsound(owner, 'yogstation/sound/ambience/antag/veil_mind_scream.ogg', 100) for(var/mob/living/L in view(3, owner)) if(L == owner) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm index 7e810939aba3..68b78d0dc39c 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm @@ -58,7 +58,7 @@ eating = TRUE if(user.loc != L) user.visible_message(span_warning("[user] grabs [L] and leans in close..."), "cera qo...
\ - You begin siphoning [L]'s mental energy...") + [span_danger("You begin siphoning [L]'s mental energy...")]") to_chat(L, "AAAAAAAAAAAAAA-") L.Stun(50) L.silent += 4 @@ -84,8 +84,8 @@ user.visible_message(span_warning("[user] gently lowers [L] to the ground..."), "...aranupdejc
\ You devour [L]'s will. Your Psi has been [!full_restore ? "partially restored." : "fully restored.\n\ Additionally, you have gained one lucidity. Use it to purchase and upgrade abilities."]
\ - [L] is now severely weakened and will take some time to recover. \ - Additionally, you can not drain them again without first draining someone else.") + [span_warning("[L] is now severely weakened and will take some time to recover.")] \ + [span_warning("Additionally, you can not drain them again without first draining someone else.")]") playsound(L, 'yogstation/sound/magic/devour_will_victim.ogg', 50, FALSE) if(full_restore) darkspawn.psi = darkspawn.psi_cap diff --git a/yogstation/code/modules/antagonists/gang/gang.dm b/yogstation/code/modules/antagonists/gang/gang.dm index f01641b60f12..680a9375b630 100644 --- a/yogstation/code/modules/antagonists/gang/gang.dm +++ b/yogstation/code/modules/antagonists/gang/gang.dm @@ -30,7 +30,7 @@ /datum/antagonist/gang/farewell() if(ishuman(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, span_userdanger("You are no longer a gangster!")) /datum/antagonist/gang/on_gain() diff --git a/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm b/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm index 851fef128144..9e35ed7b9474 100644 --- a/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm +++ b/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm @@ -151,10 +151,10 @@ to_chat(H, "Yes!") if(!do_mob(H,H,10,1)) return - to_chat(H, "YES!!") + to_chat(H, "[span_big("YES!!")]") if(!do_mob(H,H,10,1)) return - to_chat(H, "YE--") + to_chat(H, "[span_reallybig("YE--")]") if(!do_mob(H,H,1,1)) return for(var/mob/living/M in orange(7, H)) diff --git a/yogstation/code/modules/client/verbs/ooc.dm b/yogstation/code/modules/client/verbs/ooc.dm index 561f9316ee38..b9d2bce37879 100644 --- a/yogstation/code/modules/client/verbs/ooc.dm +++ b/yogstation/code/modules/client/verbs/ooc.dm @@ -62,5 +62,5 @@ var/static/list/yogemojis = icon_states(icon('yogstation/icons/emoji.dmi')) var/static/list/tgemojis = icon_states(icon('icons/emoji.dmi')) - yogemojis // If we have emojis of the same name, they override the TG ones. (https://github.com/yogstation13/Yogstation/pull/5788) - to_chat(src,"List of Emojis:") + to_chat(src,"[span_notice("List of Emojis:")]") to_chat(src,span_notice("[jointext(sortList(yogemojis + tgemojis),", ")]")) diff --git a/yogstation/code/modules/guardian/guardian.dm b/yogstation/code/modules/guardian/guardian.dm index 88bf5e07d000..2019792b47ab 100644 --- a/yogstation/code/modules/guardian/guardian.dm +++ b/yogstation/code/modules/guardian/guardian.dm @@ -217,7 +217,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians summoner = null maxHealth = 750 health = 750 - to_chat(src, "Your master has died. Only your own power anchors you to this world now. Nothing restrains you anymore, but the desire for revenge.") + to_chat(src, "Your master has died. Only your own power anchors you to this world now. Nothing restrains you anymore, but the desire for [span_hypnophrase("revenge")].") log_game("[key_name(src)] has went berserk.") var/datum/antagonist/guardian/S = mind.has_antag_datum(/datum/antagonist/guardian) if(S) diff --git a/yogstation/code/modules/mentor/follow.dm b/yogstation/code/modules/mentor/follow.dm index 636597db3305..597e7341712a 100644 --- a/yogstation/code/modules/mentor/follow.dm +++ b/yogstation/code/modules/mentor/follow.dm @@ -25,7 +25,7 @@ if(mentor_datum) mentor_datum.following = M - to_chat(GLOB.admins, "MENTOR: [key_name(usr)] is now following [key_name(M)]", confidential=TRUE) + to_chat(GLOB.admins, "[span_prefix("MENTOR:")] [key_name(usr)] is now following [key_name(M)]", confidential=TRUE) to_chat(usr, span_info("Click the \"Stop Following\" button in the Mentor tab to stop following [key_name(M)]."), confidential=TRUE) log_mentor("[key_name(usr)] began following [key_name(M)]") @@ -40,7 +40,7 @@ usr.reset_perspective() remove_verb(src, /client/proc/mentor_unfollow) if(mentor_datum) - to_chat(GLOB.admins, "MENTOR: [key_name(usr)] is no longer following [key_name(mentor_datum.following)]", confidential=TRUE) + to_chat(GLOB.admins, "[span_prefix("MENTOR:")] [key_name(usr)] is no longer following [key_name(mentor_datum.following)]", confidential=TRUE) log_mentor("[key_name(usr)] stopped following [key_name(mentor_datum.following)]") mentor_datum.following = null diff --git a/yogstation/code/modules/mentor/mentor_memo.dm b/yogstation/code/modules/mentor/mentor_memo.dm index f66356a86855..267dac38ee23 100644 --- a/yogstation/code/modules/mentor/mentor_memo.dm +++ b/yogstation/code/modules/mentor/mentor_memo.dm @@ -126,7 +126,7 @@ var/memotext = query_memoshow.item[2] var/timestamp = query_memoshow.item[3] var/last_editor = query_memoshow.item[4] - output += "Mentor memo by [ckey] on [timestamp]" + output += "Mentor memo by [span_prefix("[ckey]")] on [timestamp]" if(last_editor) output += "
Last edit by [last_editor] (Click here to see edit log)" diff --git a/yogstation/code/modules/mob/living/silicon/robot/robot.dm b/yogstation/code/modules/mob/living/silicon/robot/robot.dm index 0cb34beb6742..9173ab2b757d 100644 --- a/yogstation/code/modules/mob/living/silicon/robot/robot.dm +++ b/yogstation/code/modules/mob/living/silicon/robot/robot.dm @@ -85,7 +85,7 @@ var/turf/T = get_turf(usr) message_admins(span_notice("[ADMIN_LOOKUPFLW(usr)] detonated themselves at [ADMIN_VERBOSEJMP(T)]!")) - log_game("\[key_name(usr)] detonated themselves!") + log_game("[span_notice("[key_name(usr)] detonated themselves!")]") if(connected_ai) - to_chat(connected_ai, "

ALERT - Cyborg detonation detected: [usr]
") + to_chat(connected_ai, "

[span_alert("ALERT - Cyborg detonation detected: [usr]")]
") self_destruct() diff --git a/yogstation/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm b/yogstation/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm index 462e1bdf6b7b..87ee10f354cd 100644 --- a/yogstation/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm @@ -221,11 +221,11 @@ Difficulty: Insanely Hard // melee_damage_type = BURN // meh too lazy else if(prob(5)) //earthquake spell - visible_message("\The [src]' eyes begin to glow ominously as dust and debris in the area is kicked up in a light breeze!!") + visible_message("[span_danger("\The [src]' eyes begin to glow ominously as dust and debris in the area is kicked up in a light breeze!!")]") stop_automated_movement = TRUE if(do_after(src, 6 SECONDS, src)) var/health_holder = getBruteLoss() - visible_message("\The [src] raises its fore-hooves and stomps them into the ground with incredible force!!") + visible_message("[span_cult("\The [src] raises its fore-hooves and stomps them into the ground with incredible force!!")]") explosion(get_step(src,pick(GLOB.cardinals)), -1, 2, 2, 3, 6) explosion(get_step(src,pick(GLOB.cardinals)), -1, 1, 4, 4, 6) explosion(get_step(src,pick(GLOB.cardinals)), -1, 3, 4, 3, 6) diff --git a/yogstation/code/modules/ninja/suit/ninja.dm b/yogstation/code/modules/ninja/suit/ninja.dm index b7e361aaf99d..6cff24e231a5 100644 --- a/yogstation/code/modules/ninja/suit/ninja.dm +++ b/yogstation/code/modules/ninja/suit/ninja.dm @@ -61,7 +61,7 @@ return ..() if(!istype(H.wear_mask, /obj/item/clothing/mask/gas/space_ninja)) - to_chat(H, "ERROR: 10453 UNABLE TO LOCATE FACE MASK\nABORTING...") + to_chat(H, "[span_userdanger("ERROR")]: 10453 UNABLE TO LOCATE FACE MASK\nABORTING...") return FALSE .=..() diff --git a/yogstation/code/modules/stock_market/computer.dm b/yogstation/code/modules/stock_market/computer.dm index 613ff5258102..9ae1be054186 100644 --- a/yogstation/code/modules/stock_market/computer.dm +++ b/yogstation/code/modules/stock_market/computer.dm @@ -79,7 +79,7 @@ a.updated { var/mystocks = 0 if (logged_in && (logged_in in S.shareholders)) mystocks = S.shareholders[logged_in] - dat += "

[S.name] ([S.short_name])[S.bankrupt ? " BANKRUPT" : null]
" + dat += "
[span_company("[S.name]")] [span_s_company("([S.short_name])")][S.bankrupt ? " BANKRUPT" : null]
" if (S.last_unification) dat += "Unified shares [DisplayTimeText(world.time - S.last_unification)] ago.
" dat += "Current value per share: [S.current_value] | View history

" @@ -156,7 +156,7 @@ a.updated { break dat += "
diff --git a/code/game/machinery/fat_sucker.dm b/code/game/machinery/fat_sucker.dm index 1e8f7645fca8..b69f50b6c10d 100644 --- a/code/game/machinery/fat_sucker.dm +++ b/code/game/machinery/fat_sucker.dm @@ -42,9 +42,9 @@ /obj/machinery/fat_sucker/examine(mob/user) . = ..() - . += {"Alt-Click to toggle the safety hatch. - Removing [bite_size] nutritional units per operation. - Requires [nutrient_to_meat] nutritional units per meat slab."} + . += {"[span_notice("Alt-Click to toggle the safety hatch.")] + [span_notice("Removing [bite_size] nutritional units per operation.")] + [span_notice("Requires [nutrient_to_meat] nutritional units per meat slab.")]"} /obj/machinery/fat_sucker/close_machine(mob/user) if(panel_open) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 435f32a0d551..6e8dc75b54b4 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -389,7 +389,7 @@ obj/machinery/holopad/secure/Initialize() if(is_operational() && (!AI || AI.eyeobj.loc == loc))//If the projector has power and client eye is on it if (AI && istype(AI.current, /obj/machinery/holopad)) - to_chat(user, "ERROR: \black Image feed in progress.") + to_chat(user, "[span_danger("ERROR:")] \black Image feed in progress.") return var/obj/effect/overlay/holo_pad_hologram/Hologram = new(loc)//Spawn a blank effect at the location. @@ -416,7 +416,7 @@ obj/machinery/holopad/secure/Initialize() return Hologram else - to_chat(user, "ERROR: Unable to project hologram.") + to_chat(user, "[span_danger("ERROR:")] Unable to project hologram.") /*This is the proc for special two-way communication between AI and holopad/people talking near holopad. For the other part of the code, check silicon say.dm. Particularly robot talk.*/ diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 3831e012f81a..27045b3f472f 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -51,7 +51,7 @@ /obj/machinery/igniter/examine(mob/user) . = ..() if(panel_open) - . += "The maintenance panel is [panel_open ? "opened" : "closed"]." + . += "Ctrl-click [src] to [ enabled ? "disable" : "enable"] turrets. - Alt-click [src] to set turrets to [ lethal ? "stun" : "kill"]."} + . += {"[span_notice("Ctrl-click [src] to [ enabled ? "disable" : "enable"] turrets.")] + [span_notice("Alt-click [src] to set turrets to [ lethal ? "stun" : "kill"].")]"} /obj/machinery/turretid/attackby(obj/item/I, mob/user, params) if(stat & BROKEN) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 5f6d6a8edd60..9e5565968ba7 100755 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -28,8 +28,8 @@ return if(charging) - . += {"\The [src] contains: - - \A [charging]."} + . += {"[span_notice("\The [src] contains:")] + [span_notice("- \A [charging].")]"} if(!(stat & (NOPOWER|BROKEN))) . += "The status display reads:" diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 6711155037c1..cd5e2b24ac7c 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -163,11 +163,11 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) dat += departments_table(GLOB.req_console_information) if(REQ_SCREEN_SENT) - dat += "Message sent.

" + dat += "[span_good("Message sent.")]

" dat += "<< Back
" if(REQ_SCREEN_ERR) - dat += "An error occurred.

" + dat += "[span_bad("An error occurred.")]

" dat += "<< Back
" if(REQ_SCREEN_VIEW_MSGS) @@ -204,7 +204,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) if ((announceAuth || IsAdminGhost(user)) && message) dat += "Announce Message
" else - dat += "Announce Message
" + dat += "[span_linkOff("Announce Message")]
" dat += "
<< Back
" if(!dat) @@ -377,14 +377,14 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) update_icon() if(REQ_HIGH_MESSAGE_PRIORITY) - header = "High Priority
[header]" + header = "[span_bad("High Priority")]
[header]" alert = "PRIORITY Alert from [source][authentic]" if(newmessagepriority < REQ_HIGH_MESSAGE_PRIORITY) newmessagepriority = REQ_HIGH_MESSAGE_PRIORITY update_icon() if(REQ_EXTREME_MESSAGE_PRIORITY) - header = "!!!Extreme Priority!!!
[header]" + header = "[span_bad("!!!Extreme Priority!!!")]
[header]" alert = "EXTREME PRIORITY Alert from [source][authentic]" silenced = FALSE if(newmessagepriority < REQ_EXTREME_MESSAGE_PRIORITY) diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm index 859d3e17a274..a4aaef0aebda 100644 --- a/code/game/machinery/telecomms/computers/message.dm +++ b/code/game/machinery/telecomms/computers/message.dm @@ -132,9 +132,9 @@ //Bottom message if(!auth) - dat += "
Please authenticate with the server in order to show additional options." + dat += "
[span_notice("Please authenticate with the server in order to show additional options.")]" else - dat += "
Reg, #514 forbids sending messages to a Head of Staff containing Erotic Rendering Properties." + dat += "
[span_warning("Reg, #514 forbids sending messages to a Head of Staff containing Erotic Rendering Properties.")]" //Message Logs if(MSG_MON_SCREEN_LOGS) diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index cb9c3d106864..f606c8df96de 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -168,9 +168,9 @@ Respiratory Damage: [patient.getOxyLoss()]%
Toxin Content: [patient.getToxLoss()]%
Burn Severity: [patient.getFireLoss()]%
- [patient.getCloneLoss() ? "Subject appears to have cellular damage." : ""]
- [patient.getOrganLoss(ORGAN_SLOT_BRAIN) ? "Significant brain damage detected." : ""]
- [length(patient.get_traumas()) ? "Brain Traumas detected." : ""]
+ [span_danger("[patient.getCloneLoss() ? "Subject appears to have cellular damage." : ""]")]
+ [span_danger("[patient.getOrganLoss(ORGAN_SLOT_BRAIN) ? "Significant brain damage detected." : ""]")]
+ [span_danger("[length(patient.get_traumas()) ? "Brain Traumas detected." : ""]")]
"} /obj/item/mecha_parts/mecha_equipment/medical/sleeper/proc/get_patient_reagents() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index a7225f12edcf..e6264eeb35e9 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -749,7 +749,7 @@ to_chat(user, "[B.get_mecha_info()]") break //Nothing like a big, red link to make the player feel powerful! - to_chat(user, "ASSUME DIRECT CONTROL?
") + to_chat(user, "[span_userdanger("ASSUME DIRECT CONTROL?")]
") else examine(user) if(occupant) @@ -758,12 +758,12 @@ var/can_control_mech = FALSE for(var/obj/item/mecha_parts/mecha_tracking/ai_control/A in trackers) can_control_mech = TRUE - to_chat(user, "[icon2html(src, user)] Status of [name]:\n[A.get_mecha_info()]") + to_chat(user, "[span_notice("[icon2html(src, user)] Status of [name]:")]\n[A.get_mecha_info()]") break if(!can_control_mech) to_chat(user, span_warning("You cannot control exosuits without AI control beacons installed.")) return - to_chat(user, "Take control of exosuit?
") + to_chat(user, "[span_boldnotice("Take control of exosuit?")]
") /obj/mecha/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card) if(!..()) @@ -792,7 +792,7 @@ AI.remote_control = null icon_state = initial(icon_state)+"-open" to_chat(AI, "You 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.") + to_chat(user, "[span_boldnotice("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) @@ -818,7 +818,7 @@ return AI.control_disabled = FALSE AI.radio_enabled = TRUE - to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.") + to_chat(user, "[span_boldnotice("Transfer successful")]: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.") card.AI = null ai_enter_mech(AI, interaction) diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index 1bf4acc232d3..b6fdd2d91e2c 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -55,7 +55,7 @@ "[MECHA_INT_FIRE]" = span_userdanger("INTERNAL FIRE"), "[MECHA_INT_TEMP_CONTROL]" = span_userdanger("LIFE SUPPORT SYSTEM MALFUNCTION"), "[MECHA_INT_TANK_BREACH]" = span_userdanger("GAS TANK BREACH"), - "[MECHA_INT_CONTROL_LOST]" = "COORDINATION SYSTEM CALIBRATION FAILURE - Recalibrate", + "[MECHA_INT_CONTROL_LOST]" = "[span_userdanger("COORDINATION SYSTEM CALIBRATION FAILURE")] - Recalibrate", "[MECHA_INT_SHORT_CIRCUIT]" = span_userdanger("SHORT CIRCUIT") ) for(var/tflag in dam_reports) @@ -64,7 +64,7 @@ . += dam_reports[tflag] . += "
" if(return_pressure() > WARNING_HIGH_PRESSURE) - . += "DANGEROUSLY HIGH CABIN PRESSURE
" + . += "[span_userdanger("DANGEROUSLY HIGH CABIN PRESSURE")]
" @@ -81,7 +81,7 @@ tank_temperature = internal_tank ? int_tank_air.return_temperature() : "Unknown" cabin_pressure = round(return_pressure(),0.01) . = {"[report_internal_damage()] - [integrity<30?"DAMAGE LEVEL CRITICAL
":null] + [integrity<30?"[span_userdanger("DAMAGE LEVEL CRITICAL")]
":null] Integrity: [integrity]%
Powercell charge: [isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]
Air source: [internal_tank?"[use_internal_tank?"Internal Airtank":"Environment"]":"Environment"]
diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 2c4ef5ba6d43..3ff9c6b15440 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -96,7 +96,7 @@ to_chat(AI, "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.") + to_chat(user, "[span_boldnotice("Backup files recovered")]: [AI.name] ([rand(1000,9999)].exe) salvaged from [name] and stored within local memory.") else return ..() diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index fc27ffdfbb71..31a2ebcdbc2a 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -233,7 +233,7 @@ /obj/item/card/id/examine(mob/user) .=..() if(registered_age) - . += "The card indicates that the holder is [registered_age] years old. [(registered_age < AGE_MINOR) ? "There's a holographic stripe that reads 'MINOR: DO NOT SERVE ALCOHOL OR TOBACCO' along the bottom of the card." : ""]" + . += "The card indicates that the holder is [registered_age] years old. [(registered_age < AGE_MINOR) ? "There's a holographic stripe that reads [span_danger("'MINOR: DO NOT SERVE ALCOHOL OR TOBACCO'")] along the bottom of the card." : ""]" if(mining_points) . += "There's [mining_points] mining equipment redemption point\s loaded onto this card." diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm index 56e3d975e4e5..ec6eee4bbbf8 100644 --- a/code/game/objects/items/chrono_eraser.dm +++ b/code/game/objects/items/chrono_eraser.dm @@ -188,7 +188,7 @@ mob_underlay = mutable_appearance(cached_icon, "frame1") update_icon() - desc = initial(desc) + "
It appears to contain [target.name]." + desc = initial(desc) + "
[span_info("It appears to contain [target.name].")]" START_PROCESSING(SSobj, src) return ..() diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 877bab1ea247..0b66104d6cd6 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -1025,8 +1025,8 @@ /obj/item/circuitboard/machine/dish_drive/examine(mob/user) . = ..() - . += {"Its suction function is [suction ? "enabled" : "disabled"]. Use it in-hand to switch.\n - 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.")]\n + [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 diff --git a/code/game/objects/items/credit_holochip.dm b/code/game/objects/items/credit_holochip.dm index 3b11adc1ebbc..a7236ddce321 100644 --- a/code/game/objects/items/credit_holochip.dm +++ b/code/game/objects/items/credit_holochip.dm @@ -15,8 +15,8 @@ /obj/item/holochip/examine(mob/user) . = ..() - . += {"It's loaded with [credits] credit[( credits > 1 ) ? "s" : ""]\n - Alt-Click to split."} + . += {"[span_notice("It's loaded with [credits] credit[( credits > 1 ) ? "s" : ""]")]\n + [span_notice("Alt-Click to split.")]"} /obj/item/holochip/get_item_credit_value() return credits diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index fa4c82de417d..4068cbc0473e 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -759,7 +759,7 @@ GLOBAL_LIST_EMPTY(PDAs) // Log it in our logs tnote += signal // Show it to ghosts - var/ghost_message = "[owner] PDA Message --> [target_text]: [signal.format_message()]" + var/ghost_message = "[span_name("[owner] ")]PDA Message --> [span_name("[target_text]")]: [span_message("[signal.format_message()]")]" for(var/mob/M in GLOB.player_list) if(isobserver(M) && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTPDA)) to_chat(M, "[FOLLOW_LINK(M, user)] [ghost_message]") diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index ad0258d3a70f..59972abab8a1 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -65,7 +65,7 @@ return if(flashlight_power < 1) - to_chat(user, "\The [src] isn't bright enough to see anything! ") + to_chat(user, "[span_warning("\The [src] isn't bright enough to see anything!")] ") return switch(user.zone_selected) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 743c6722bb32..cc880ebaf1f5 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -149,23 +149,23 @@ GENE SCANNER // Damage descriptions if(brute_loss > 10) - to_chat(user, "\t[brute_loss > 50 ? "Severe" : "Minor"] tissue damage detected.") + to_chat(user, "\t[span_alert("[brute_loss > 50 ? "Severe" : "Minor"] tissue damage detected.")]") if(fire_loss > 10) - to_chat(user, "\t[fire_loss > 50 ? "Severe" : "Minor"] burn damage detected.") + to_chat(user, "\t[span_alert("[fire_loss > 50 ? "Severe" : "Minor"] burn damage detected.")]") if(oxy_loss > 10) - to_chat(user, "\t[oxy_loss > 50 ? "Severe" : "Minor"] oxygen deprivation detected.") + to_chat(user, "\t[span_alert("[oxy_loss > 50 ? "Severe" : "Minor"] oxygen deprivation detected.")]") if(tox_loss > 10) - to_chat(user, "\t[tox_loss > 50 ? "Severe" : "Minor"] amount of toxin damage detected.") + to_chat(user, "\t[span_alert("[tox_loss > 50 ? "Severe" : "Minor"] amount of toxin damage detected.")]") if(M.getStaminaLoss()) - to_chat(user, "\tSubject appears to be suffering from fatigue.") + to_chat(user, "\t[span_alert("Subject appears to be suffering from fatigue.")]") if(advanced) - to_chat(user, "\tFatigue Level: [M.getStaminaLoss()]%.") + to_chat(user, "\t[span_info("Fatigue Level: [M.getStaminaLoss()]%.")]") if (M.getCloneLoss()) - to_chat(user, "\tSubject appears to have [M.getCloneLoss() > 30 ? "Severe" : "Minor"] cellular damage.") + to_chat(user, "\t[span_alert("Subject appears to have [M.getCloneLoss() > 30 ? "Severe" : "Minor"] cellular damage.")]") if(advanced) - to_chat(user, "\tCellular Damage Level: [M.getCloneLoss()].") + to_chat(user, "\t[span_info("Cellular Damage Level: [M.getCloneLoss()].")]") if (!M.getorgan(/obj/item/organ/brain)) - to_chat(user, "\tSubject lacks a brain.") + to_chat(user, "\t[span_alert("Subject lacks a brain.")]") if(iscarbon(M)) var/mob/living/carbon/C = M if(LAZYLEN(C.get_traumas())) @@ -181,21 +181,21 @@ GENE SCANNER trauma_desc += "permanent " trauma_desc += B.scan_desc trauma_text += trauma_desc - to_chat(user, "\tCerebral traumas detected: subject appears to be suffering from [english_list(trauma_text)].") + to_chat(user, "\t[span_alert("Cerebral traumas detected: subject appears to be suffering from [english_list(trauma_text)].")]") if(C.roundstart_quirks.len) - to_chat(user, "\tSubject has the following physiological traits: [C.get_trait_string()].") + to_chat(user, "\t[span_info("Subject has the following physiological traits: [C.get_trait_string()].")]") if(C.has_quirk(/datum/quirk/allergic)) - to_chat(user, "\tSubject is allergic to the chemical [C.allergies].") + to_chat(user, "\t[span_info("Subject is allergic to the chemical [C.allergies].")]") if(advanced) - to_chat(user, "\tBrain Activity Level: [(200 - M.getOrganLoss(ORGAN_SLOT_BRAIN))/2]%.") + to_chat(user, "\t[span_info("Brain Activity Level: [(200 - M.getOrganLoss(ORGAN_SLOT_BRAIN))/2]%.")]") if (M.radiation) - to_chat(user, "\tSubject is irradiated.") + to_chat(user, "\t[span_alert("Subject is irradiated.")]") if(advanced) - to_chat(user, "\tRadiation Level: [M.radiation]%.") + to_chat(user, "\t[span_info("Radiation Level: [M.radiation]%.")]") if(advanced && M.hallucinating()) - to_chat(user, "\tSubject is hallucinating.") + to_chat(user, "\t[span_info("Subject is hallucinating.")]") //Eyes and ears if(advanced) @@ -207,44 +207,44 @@ GENE SCANNER var/healthy = TRUE if(HAS_TRAIT_FROM(C, TRAIT_DEAF, GENETIC_MUTATION)) healthy = FALSE - to_chat(user, "\tSubject is genetically deaf.") + to_chat(user, "\t[span_alert("Subject is genetically deaf.")]") else if(HAS_TRAIT(C, TRAIT_DEAF)) healthy = FALSE - to_chat(user, "\tSubject is deaf.") + to_chat(user, "\t[span_alert("Subject is deaf.")]") else if(ears.damage) - to_chat(user, "\tSubject has [ears.damage > ears.maxHealth ? "permanent ": "temporary "]hearing damage.") + to_chat(user, "\t[span_alert("Subject has [ears.damage > ears.maxHealth ? "permanent ": "temporary "]hearing damage.")]") healthy = FALSE if(ears.deaf) - to_chat(user, "\tSubject is [ears.damage > ears.maxHealth ? "permanently ": "temporarily "] deaf.") + to_chat(user, "\t[span_alert("Subject is [ears.damage > ears.maxHealth ? "permanently ": "temporarily "] deaf.")]") healthy = FALSE if(healthy) - to_chat(user, "\tHealthy.") + to_chat(user, "\t[span_info("Healthy.")]") else - to_chat(user, "\tSubject does not have ears.") + to_chat(user, "\t[span_alert("Subject does not have ears.")]") var/obj/item/organ/eyes/eyes = C.getorganslot(ORGAN_SLOT_EYES) to_chat(user, "\t==EYE STATUS==") if(istype(eyes)) var/healthy = TRUE if(HAS_TRAIT(C, TRAIT_BLIND)) - to_chat(user, "\tSubject is blind.") + to_chat(user, "\t[span_alert("Subject is blind.")]") healthy = FALSE if(HAS_TRAIT(C, TRAIT_NEARSIGHT)) - to_chat(user, "\tSubject is nearsighted.") + to_chat(user, "\t[span_alert("Subject is nearsighted.")]") healthy = FALSE if(eyes.damage > 30) - to_chat(user, "\tSubject has severe eye damage.") + to_chat(user, "\t[span_alert("Subject has severe eye damage.")]") healthy = FALSE else if(eyes.damage > 20) - to_chat(user, "\tSubject has significant eye damage.") + to_chat(user, "\t[span_alert("Subject has significant eye damage.")]") healthy = FALSE else if(eyes.damage) - to_chat(user, "\tSubject has minor eye damage.") + to_chat(user, "\t[span_alert("Subject has minor eye damage.")]") healthy = FALSE if(healthy) - to_chat(user, "\tHealthy.") + to_chat(user, "\t[span_info("Healthy.")]") else - to_chat(user, "\tSubject does not have eyes.") + to_chat(user, "\t[span_alert("Subject does not have eyes.")]") // Body part damage report @@ -307,19 +307,19 @@ GENE SCANNER if(report_organs) //we either finish the list, or set it to be empty if no organs were reported in that category if(!max_damage) - max_damage = "\tNon-Functional Organs: " + max_damage = "\t[span_alert("Non-Functional Organs: ")]" else max_damage += "" if(!major_damage) - major_damage = "\tSeverely Damaged Organs: " + major_damage = "\t[span_info("Severely Damaged Organs: ")]" else major_damage += "" if(!minor_damage) - minor_damage = "\tMildly Damaged Organs: " + minor_damage = "\t[span_info("Mildly Damaged Organs: ")]" else minor_damage += "" if(!no_damage) - no_damage = "\tHealthy Organs: " + no_damage = "\t[span_info("Healthy Organs: ")]" else no_damage += "" to_chat(user, no_damage) @@ -328,7 +328,7 @@ GENE SCANNER to_chat(user, max_damage) //Genetic damage if(advanced && H.has_dna()) - to_chat(user, "\tGenetic Stability: [H.dna.stability]%.") + to_chat(user, "\t[span_info("Genetic Stability: [H.dna.stability]%.")]") // Species and body temperature if(ishuman(M)) @@ -363,7 +363,7 @@ GENE SCANNER // 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, span_danger("Subject died [DisplayTimeText(tdelta)] ago, defibrillation may be possible!")) @@ -391,9 +391,9 @@ GENE SCANNER else blood_type = blood_id if(C.blood_volume <= BLOOD_VOLUME_SAFE(C) && C.blood_volume > BLOOD_VOLUME_OKAY(C)) - to_chat(user, "LOW blood level [blood_percent] %, [C.blood_volume] cl, type: [blood_type]") + to_chat(user, "[span_danger("LOW blood level [blood_percent] %, [C.blood_volume] cl,")] [span_info("type: [blood_type]")]") else if(C.blood_volume <= BLOOD_VOLUME_OKAY(C)) - to_chat(user, "CRITICAL blood level [blood_percent] %, [C.blood_volume] cl, type: [blood_type]") + to_chat(user, "[span_danger("CRITICAL blood level [blood_percent] %, [C.blood_volume] cl,")] [span_info("type: [blood_type]")]") else to_chat(user, span_info("Blood level [blood_percent] %, [C.blood_volume] cl, type: [blood_type]")) @@ -412,7 +412,7 @@ GENE SCANNER if(M.reagents.reagent_list.len) 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, span_notice("Subject contains no reagents.")) if(M.reagents.addiction_list.len) @@ -803,7 +803,7 @@ GENE SCANNER display += "-" display += copytext_char(sequence, 1 + i*DNA_MUTATION_BLOCKS, DNA_MUTATION_BLOCKS*(1+i) + 1) - to_chat(user, "[display]
") + to_chat(user, "[span_boldnotice("[display]")]
") ready = FALSE icon_state = "[icon_state]_recharging" diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index e2e889eb8d29..26ee439b456a 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -27,7 +27,7 @@ M.dna.remove_mutation(HM) for(var/HM in add_mutations) if(HM == RACEMUT) - message_admins("[ADMIN_LOOKUPFLW(user)] injected [key_name_admin(M)] with the [name] (MONKEY)") + message_admins("[ADMIN_LOOKUPFLW(user)] injected [key_name_admin(M)] with the [name] [span_danger("(MONKEY)")]") log_msg += " (MONKEY)" if(M.dna.mutation_in_sequence(HM)) M.dna.activate_mutation(HM) @@ -483,7 +483,7 @@ if(M.dna.get_mutation(mutation)) continue //Skip permanent mutations we already have. if(mutation == RACEMUT && ishuman(M)) - message_admins("[ADMIN_LOOKUPFLW(user)] injected [key_name_admin(M)] with the [name] (MONKEY)") + message_admins("[ADMIN_LOOKUPFLW(user)] injected [key_name_admin(M)] with the [name] [span_danger("(MONKEY)")]") log_msg += " (MONKEY)" M = M.dna.add_mutation(mutation, MUT_OTHER, endtime) else diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm index 7d3ab4924a56..f92ecbfa5253 100644 --- a/code/game/objects/items/grenades/grenade.dm +++ b/code/game/objects/items/grenades/grenade.dm @@ -40,7 +40,7 @@ preprime(user, 5, FALSE) return FALSE else if(!clumsy && (clumsy_check == GRENADE_NONCLUMSY_FUMBLE)) - to_chat(user, "You pull the pin on [src]. Attached to it is a pink ribbon that says, \"HONK\"") + to_chat(user, "You pull the pin on [src]. Attached to it is a pink ribbon that says, \"[span_clown("HONK")]\"") preprime(user, 5, FALSE) return FALSE return TRUE diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index 5fe7a18777f2..40b3aa34cce0 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -55,19 +55,19 @@ 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) . += "You 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." 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) @@ -125,7 +125,7 @@ if(awakened) return awakened = TRUE - user.visible_message(span_boldwarning("[src] begins to rattle. He thirsts."), "You 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("You flick [src]'s latch up. You hope this is a good idea.")]") name = "His Grace" desc = "A bloodthirsty artifact created by a profane rite." gender = MALE @@ -228,10 +228,10 @@ [force_bonus < 5 ? " His power grows.":""]") force_bonus = max(force_bonus, 5) if(prev_bloodthirst >= HIS_GRACE_FAMISHED) - master.visible_message(span_warning("[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(span_warning("[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(span_warning("[src] is now only a little peckish."), "[src]'s hunger recedes somewhat...") if(HIS_GRACE_SATIATED to HIS_GRACE_PECKISH) diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index 151209eeb075..b4a2c730604a 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -58,7 +58,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(istype(H.ears, /obj/item/radio/headset)) - msg = "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows: Item request received. Your package is inbound, please stand back from the landing site. Message ends.\"" + msg = "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows: [span_bold("Item request received. Your package is inbound, please stand back from the landing site.")] Message ends.\"" to_chat(M, msg) new /obj/effect/DPtarget(get_turf(src), pod) @@ -129,7 +129,7 @@ /obj/item/choice_beacon/augments/spawn_option(obj/choice,mob/living/M) new choice(get_turf(M)) - to_chat(M, "You 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, "You 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: [span_bold("Item request received. Your package has been transported, use the autosurgeon supplied to apply the upgrade.")] Message ends.\"") /obj/item/skub desc = "It's skub." diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index b3916545cc92..6bd0e82d9988 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -314,7 +314,7 @@ log_game("[key_name(user)] used a Cyborg Harm Alarm in [AREACOORD(user)]") if(iscyborg(user)) var/mob/living/silicon/robot/R = user - to_chat(R.connected_ai, "
NOTICE - Peacekeeping 'HARM ALARM' used by: [user]
") + to_chat(R.connected_ai, "
[span_notice("NOTICE - Peacekeeping 'HARM ALARM' used by: [user]")]
") return diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 9d925e2429d1..cb3cfe97e34e 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -430,7 +430,7 @@ msgmode = "critical" else if(cyborg.health < cyborg.maxHealth) msgmode = "normal" - to_chat(cyborg, "Self-repair is active in [msgmode] mode.") + to_chat(cyborg, "Self-repair is active in [span_boldnotice("[msgmode]")] mode.") msg_cooldown = world.time else deactivate_sr() diff --git a/code/game/objects/items/taster.dm b/code/game/objects/items/taster.dm index 3828beb92114..0dcc71d9c0a9 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, "[src] tastes [span_italics("[message]")] in [O].") diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 9ab911df7071..4fa378176c9b 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1116,7 +1116,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)][span_alert("' appears on a small display.")]") /* * Fake meteor diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index fefcc2410b27..e5947ab211e4 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -164,11 +164,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 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")] [span_boldannounce("how many you've killed.")]") new_name = "many-notched claymore" add_atom_colour(rgb(255, 195, 195), ADMIN_COLOUR_PRIORITY) if(5) @@ -370,7 +370,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 message_syndicate(input, usr) to_chat(usr, span_danger("Message sent. Pray you made the right choice.")) usr.log_talk(input, LOG_SAY, tag="Syndicate announcement") - deadchat_broadcast(" has messaged the Syndicate using the red phone, \"[input]\" at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) + deadchat_broadcast(" has messaged the Syndicate using the red phone, \"[input]\" at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr) /obj/item/phone/banana name = "banana phone" @@ -393,7 +393,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 Clown_announce(input, usr) to_chat(usr, span_danger("Message sent. The Clown Planet will judge your message.")) usr.log_talk(input, LOG_SAY, tag="Clown Planet announcement") - deadchat_broadcast(" has messaged the Clown Planet using the banana phone, \"[input]\" at [get_area_name(usr, TRUE)].", span_name("[usr.real_name]"), usr) + deadchat_broadcast(" has messaged the Clown Planet using the banana phone, \"[input]\" at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr) /obj/item/cane name = "cane" diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index d158519e4a45..16fdb1d05cb6 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -238,7 +238,7 @@ to_chat(M, "Reskin options for [name]:") for(var/V in unique_reskin) var/output = icon2html(src, M, unique_reskin[V]) - to_chat(M, "[V]: [output]") + to_chat(M, "[V]: [span_reallybig("[output]")]") var/choice = input(M,"Warning, you can only reskin [src] once!","Reskin Object") as null|anything in unique_reskin if(!QDELETED(src) && choice && !current_skin && !M.incapacitated() && in_range(M,src)) diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index 73f55c755d55..459fb77ca2d8 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -318,7 +318,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_boldannounce("ERROR")]: AI flush is in progress, cannot execute transfer protocol.") return FALSE return TRUE @@ -331,7 +331,7 @@ That prevents a few funky behaviors. AI.radio_enabled = TRUE AI.forceMove(loc) // to replace the terminal. to_chat(AI, "You 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.") + to_chat(user, "[span_boldnotice("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) 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 7ae43d44780f..b496e92ac504 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -21,7 +21,7 @@ for(var/obj/structure/transit_tube/tube in source_turf) existing_tubes +=1 if(existing_tubes >= 2) - to_chat(user, "You cannot wrench anymore transit tubes! ") + to_chat(user, "[span_warning("You cannot wrench anymore transit tubes!")] ") return FALSE return TRUE diff --git a/code/game/say.dm b/code/game/say.dm index e43f6a3554cb..cb049303b848 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -61,7 +61,7 @@ GLOBAL_LIST_INIT(freqtospan, list( var/endspanpart = ""// Yogs //Message - var/messagepart = " [lang_treat(speaker, message_language, raw_message, spans, message_mods)]" + var/messagepart = " [span_message("[lang_treat(speaker, message_language, raw_message, spans, message_mods)]")]" var/languageicon = "" var/datum/language/D = GLOB.language_datum_instances[message_language] diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 00fcaf090340..bf0b3a7cac63 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -284,7 +284,7 @@ L.forceMove(get_turf(pick(GLOB.servant_spawns))) visible_message(span_warning("[L] vanishes in a flash of red!")) L.visible_message(span_warning("[L] appears in a flash of red!"), \ - "sas'so c'arta forbici
You're yanked away from [src]!") + "sas'so c'arta forbici
[span_danger("You're yanked away from [src]!")]") playsound(src, 'sound/magic/enter_blood.ogg', 50, TRUE) playsound(L, 'sound/magic/exit_blood.ogg', 50, TRUE) flash_color(L, flash_color = "#C80000", flash_time = 10) diff --git a/code/modules/admin/check_antagonists.dm b/code/modules/admin/check_antagonists.dm index 563aa1778327..267edec84c97 100644 --- a/code/modules/admin/check_antagonists.dm +++ b/code/modules/admin/check_antagonists.dm @@ -209,7 +209,7 @@ dat += "
SKIPPED \[On centcom Z-level\]: [living_skipped] living players|[drones] living drones|" dat += "
Dead/Observing players:|[observers_connected] active|[observers - observers_connected] disconnected|[brains] brains|" if(other_players) - dat += "
[other_players] players in invalid state or the statistics code is bugged!" + dat += "
[span_userdanger("[other_players] players in invalid state or the statistics code is bugged!")]" dat += "

" dat += build_antag_listing() diff --git a/code/modules/admin/sound_emitter.dm b/code/modules/admin/sound_emitter.dm index f01543219b85..6091af4c4fe3 100644 --- a/code/modules/admin/sound_emitter.dm +++ b/code/modules/admin/sound_emitter.dm @@ -37,9 +37,9 @@ . = ..() if(!isobserver(user)) return - . += "Sound File: [sound_file ? sound_file : "None chosen"]" - . += "Mode: [motus_operandi]" - . += "Range: [emitter_range]" + . += "[span_boldnotice("Sound File:")] [sound_file ? sound_file : "None chosen"]" + . += "[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!" diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index c2aa2ccb7497..3231acd6e847 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -527,7 +527,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]", confidential=TRUE) + 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]")]
[span_danger("This ban is [isnull(duration) ? "permanent." : "temporary, it will be removed in [time_message]."] The round ID is [GLOB.round_id].")]
[span_danger("To appeal this ban go to [appeal_url]")]", confidential=TRUE) 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))) @@ -537,7 +537,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]")]
[span_danger("This ban is [isnull(duration) ? "permanent." : "temporary, it will be removed in [time_message]."] The round ID is [GLOB.round_id].")]
[span_danger("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))) diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm index b0b80cff90b5..439a8bae8ca1 100644 --- a/code/modules/admin/sql_message_system.dm +++ b/code/modules/admin/sql_message_system.dm @@ -648,7 +648,7 @@ var/editor_key = query_get_message_output.item[5] switch(type) if("message") - output += "Admin message left by [admin_key] on [timestamp]" + output += "Admin message left by [span_prefix("[admin_key]")] on [timestamp]" output += "
[text]
" var/datum/DBQuery/query_message_read = SSdbcore.NewQuery( "UPDATE [format_table_name("messages")] SET type = 'message sent' WHERE id = :id", @@ -663,7 +663,7 @@ message_admins("Notice: [key_name_admin(target_ckey)] has been on the watchlist since [timestamp] and has just connected - Reason: [text]") send2irc_adminless_only("Watchlist", "[key_name(target_ckey)] is on the watchlist and has just connected - Reason: [text]") if("memo") - output += "Memo by [admin_key] on [timestamp]" + output += "Memo by [span_prefix("[admin_key]")] on [timestamp]" if(editor_key) output += "
Last edit by [editor_key] (Click here to see edit log)" output += "
[text]
" diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 91a63f019a17..774f951090ce 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -84,7 +84,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) dat += "Refresh

" for(var/I in l2b) var/datum/admin_help/AH = I - dat += "Ticket #[AH.id]: [AH.initiator_key_name]: [AH.name]
" + dat += "[span_adminhelp("Ticket #[AH.id]")]: [AH.initiator_key_name]: [AH.name]
" usr << browse(dat.Join(), "window=ahelp_list[state];size=600x480") @@ -266,7 +266,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) msg = sanitize(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_adminhelp("Ticket [TicketHref("#[id]", ref_src)]")]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]: [span_linkify("[keywords_lookup(msg)]")]" AddInteraction("[LinkedReplyName(ref_src)]: [msg]") log_admin_private("Ticket #[id]: [key_name(initiator)]: [msg]") @@ -284,7 +284,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) //show it to the person adminhelping too to_chat(initiator, type = MESSAGE_TYPE_ADMINPM, - html = "PM to-Admins: [msg]", + html = "PM to-Admins: [span_linkify("[msg]")]", confidential = TRUE) //Reopen a closed ticket diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 3f847b5f2aab..dd8ff9fd85f5 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -181,7 +181,7 @@ var/keywordparsedmsg = keywords_lookup(msg) if(irc) - to_chat(src, "PM to-Admins: [rawmsg]", confidential=TRUE) + to_chat(src, "PM to-Admins: [span_linkify("[rawmsg]")]", confidential=TRUE) var/datum/admin_help/AH = admin_ticket_log(src, keywordparsedmsg) // yogs - Yog Tickets ircreplyamount-- send2irc("[AH ? "#[AH.id] " : ""]Reply: [ckey]", rawmsg) @@ -190,11 +190,11 @@ if(holder) to_chat(recipient, type = MESSAGE_TYPE_ADMINPM, - html = "Admin PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]", + html = "Admin PM from-[key_name(src, recipient, 1)]: [span_linkify("[keywordparsedmsg]")]", confidential = TRUE) to_chat(src, type = MESSAGE_TYPE_ADMINPM, - html = "Admin PM to-[key_name(recipient, src, 1)]: [keywordparsedmsg]", + html = "Admin PM to-[key_name(recipient, src, 1)]: [span_linkify("[keywordparsedmsg]")]", confidential = TRUE) //omg this is dumb, just fill in both their tickets @@ -212,8 +212,8 @@ to_chat(src, span_notice("Ticket closed, please make a new one before trying to contact admins!"), confidential=TRUE) return admin_ticket_log(src, msg, FALSE) - to_chat(recipient, "Reply PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]", confidential=TRUE) - to_chat(src, "-- [key_name(src, null, 0)] -> Admins: [msg]", confidential=TRUE) + to_chat(recipient, "Reply PM from-[key_name(src, recipient, 1)]: [span_linkify("[keywordparsedmsg]")]", confidential=TRUE) + to_chat(src, "-- [key_name(src, null, 0)] -> Admins: [span_linkify("[msg]")]", confidential=TRUE) //YOGS END //play the receiving admin the adminhelp sound (if they have them enabled) @@ -228,9 +228,9 @@ recipient.current_ticket.Administer(src) // yogs - Yog Tickets to_chat(recipient, "-- Administrator private message --", confidential=TRUE) - to_chat(recipient, "Admin PM from-[key_name(src, recipient, 0)]: [msg]", confidential=TRUE) + to_chat(recipient, "Admin PM from-[key_name(src, recipient, 0)]: [span_linkify("[msg]")]", confidential=TRUE) to_chat(recipient, "Click on the administrator's name to reply.", confidential=TRUE) - to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [msg]", confidential=TRUE) + to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [span_linkify("[msg]")]", confidential=TRUE) admin_ticket_log(recipient, "PM From [src]: [msg]", FALSE)// yogs - Yog Tickets diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index c8fea3286c98..cd0cffb8abd1 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -14,7 +14,7 @@ mob.log_talk(msg, LOG_ASAY) msg = keywords_lookup(msg) var/custom_asay_color = (CONFIG_GET(flag/allow_admin_asaycolor) && prefs.asaycolor) ? "" : null // Yogs -- yogs asay - msg = "ADMIN: [key_name(usr, 1)] [ADMIN_FLW(mob)]: [custom_asay_color][msg][custom_asay_color ? "":null]" + msg = "[span_prefix("ADMIN:")] [key_name(usr, 1)] [ADMIN_FLW(mob)]: [custom_asay_color][msg][custom_asay_color ? "":null]" to_chat(GLOB.admins, type = MESSAGE_TYPE_ADMINCHAT, html = msg, diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index c561e651b455..c9f1240cf1ed 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -24,7 +24,7 @@ if(holder.fakekey) rank_name = holder.fakekey admin_name = holder.fakename - var/rendered = "DEAD: ([rank_name]) [admin_name] says, \"[emoji_parse(msg)]\"" + var/rendered = "[span_prefix("DEAD:")] [span_name("([rank_name]) [admin_name]")] says, [span_message("\"[emoji_parse(msg)]\"")]" for (var/mob/M in GLOB.player_list) if(isnewplayer(M) && !(M.client && M.client.holder)) // Yogs -- Allows admins to hear admin deadsay while in the lobby diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 7e545de5b9f6..4b6c9a40ef23 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -40,7 +40,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 = "[icon2html(cross, GLOB.admins)][prayer_type][deity ? " (to [deity])" : ""]: [ADMIN_FULLMONTY(src)] [ADMIN_SC(src)]: [span_linkify("[msg]")]" for(var/client/C in GLOB.admins) if(C.prefs.chat_toggles & CHAT_PRAYER) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index a38f51d6f665..33f786afc052 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -79,7 +79,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, "You 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, "You 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." : ":"] [span_bold("[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! diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index e5312be30ae3..c26e2c05a0bd 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -178,7 +178,7 @@ GLOBAL_LIST_EMPTY(antagonists) //Displayed at the start of roundend_category section, default to roundend_category header /datum/antagonist/proc/roundend_report_header() var/list/report = list() - report +="The [roundend_category] were:
" + report +="[span_header("The [roundend_category] were:")]
" report +="
" return report diff --git a/code/modules/antagonists/_common/antag_team.dm b/code/modules/antagonists/_common/antag_team.dm index 9d67035d940d..1298a5202b67 100644 --- a/code/modules/antagonists/_common/antag_team.dm +++ b/code/modules/antagonists/_common/antag_team.dm @@ -48,9 +48,9 @@ GLOBAL_LIST_EMPTY(antagonist_teams) var/objective_count = 1 for(var/datum/objective/objective in objectives) if(objective.check_completion()) - report += "Objective #[objective_count]: [objective.explanation_text] Success!" + report += "Objective #[objective_count]: [objective.explanation_text] [span_greentext("Success!")]" else - report += "Objective #[objective_count]: [objective.explanation_text] Fail." + report += "Objective #[objective_count]: [objective.explanation_text] [span_redtext("Fail.")]" win = FALSE objective_count++ if(win) diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index e2b3b17b7cf1..7615e2e2e559 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -358,7 +358,7 @@ if(QDELETED(L) || L.stat == DEAD) return - to_chat(L, "You hear a voice in your head saying: [message]") + to_chat(L, "[span_italics("You hear a voice in your head saying: ")][span_abductor("[message]")]") to_chat(user, span_notice("You send the message to your target.")) log_directed_talk(user, L, message, LOG_SAY, "abductor whisper") @@ -577,7 +577,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} else helptext = span_warning("Subject unsuitable for experiments.") - to_chat(user, "Probing result:[species]") + to_chat(user, "[span_notice("Probing result:")][species]") to_chat(user, "[helptext]") /obj/item/restraints/handcuffs/energy diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index 47de9bdb2c3b..e4b581b1ac85 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -55,7 +55,7 @@ return FALSE mind_control_uses-- to_chat(owner, span_userdanger("You suddenly feel an irresistible compulsion to follow an order...")) - to_chat(owner, "[command]") + 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() @@ -186,7 +186,7 @@ broadcasted_mobs += H to_chat(H, span_userdanger("You suddenly feel an irresistible compulsion to follow an order...")) - to_chat(H, "[command]") + 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]") @@ -349,7 +349,7 @@ if(..()) if(entangled_mob && ishuman(entangled_mob) && (entangled_mob.stat < DEAD)) to_chat(entangled_mob, span_userdanger("You suddenly feel an irresistible compulsion to follow an order...")) - to_chat(entangled_mob, "[command]") + to_chat(entangled_mob, "[span_mind_control("[command]")]") var/obj/screen/alert/mind_control/mind_alert = entangled_mob.throw_alert("mind_control", /obj/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]") diff --git a/code/modules/antagonists/blob/blobstrains/_blobstrain.dm b/code/modules/antagonists/blob/blobstrains/_blobstrain.dm index d83aea3e46e4..a2986d8ab962 100644 --- a/code/modules/antagonists/blob/blobstrains/_blobstrain.dm +++ b/code/modules/antagonists/blob/blobstrains/_blobstrain.dm @@ -74,4 +74,4 @@ GLOBAL_LIST_INIT(valid_blobstrains, subtypesof(/datum/blobstrain) - list(/datum/ return /datum/blobstrain/proc/examine(mob/user) - return list("Progress to Critical Mass: [overmind.blobs_legit.len]/[overmind.blobwincount].") \ No newline at end of file + return list("Progress to Critical Mass: [span_notice("[overmind.blobs_legit.len]/[overmind.blobwincount].")]") \ No newline at end of file diff --git a/code/modules/antagonists/blob/powers.dm b/code/modules/antagonists/blob/powers.dm index c4dbff979084..1a9d356d4e0c 100644 --- a/code/modules/antagonists/blob/powers.dm +++ b/code/modules/antagonists/blob/powers.dm @@ -189,7 +189,7 @@ SEND_SOUND(blobber, sound('sound/effects/blobattack.ogg')) SEND_SOUND(blobber, sound('sound/effects/attackblob.ogg')) to_chat(blobber, "You are a blobbernaut!") - to_chat(blobber, "You are powerful, hard to kill, and slowly regenerate near nodes and cores, but will slowly die if not near the blob or if the factory that made you is killed.") + to_chat(blobber, "You are powerful, hard to kill, and slowly regenerate near nodes and cores, [span_cultlarge("but will slowly die if not near the blob")] or if the factory that made you is killed.") to_chat(blobber, "You can communicate with other blobbernauts and overminds via :b") to_chat(blobber, "Your overmind's blob reagent is: [blobstrain.name]!") to_chat(blobber, "The [blobstrain.name] reagent [blobstrain.shortdesc ? "[blobstrain.shortdesc]" : "[blobstrain.description]"]") diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm index a205caa4ded0..a89241db2c5a 100644 --- a/code/modules/antagonists/blob/structures/_blob.dm +++ b/code/modules/antagonists/blob/structures/_blob.dm @@ -230,7 +230,7 @@ to_chat(user, "The analyzer beeps once, then reports:
") SEND_SOUND(user, sound('sound/machines/ping.ogg')) if(overmind) - to_chat(user, "Progress to Critical Mass: [overmind.blobs_legit.len]/[overmind.blobwincount].") + to_chat(user, "Progress to Critical Mass: [span_notice("[overmind.blobs_legit.len]/[overmind.blobwincount].")]") to_chat(user, chemeffectreport(user).Join("\n")) else to_chat(user, "Blob core neutralized. Critical mass no longer attainable.") @@ -242,17 +242,17 @@ RETURN_TYPE(/list) . = list() if(overmind) - . += list("Material: [overmind.blobstrain.name].", - "Material Effects: [overmind.blobstrain.analyzerdescdamage]", - "Material Properties: [overmind.blobstrain.analyzerdesceffect]") + . += list("Material: [overmind.blobstrain.name][span_notice(".")]", + "Material Effects: [span_notice("[overmind.blobstrain.analyzerdescdamage]")]", + "Material Properties: [span_notice("[overmind.blobstrain.analyzerdesceffect]")]") else . += "No Material Detected!" /obj/structure/blob/proc/typereport(mob/user) RETURN_TYPE(/list) - return list("Blob Type: [uppertext(initial(name))]", - "Health: [obj_integrity]/[max_integrity]", - "Effects: [scannerreport()]") + return list("Blob Type: [span_notice("[uppertext(initial(name))]")]", + "Health: [span_notice("[obj_integrity]/[max_integrity]")]", + "Effects: [span_notice("[scannerreport()]")]") /obj/structure/blob/attack_animal(mob/living/simple_animal/M) if(ROLE_BLOB in M.faction) //sorry, but you can't kill the blob as a blobbernaut diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 56411338c8bd..af25db9f9129 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -125,9 +125,9 @@ var/objective_count = 1 for(var/datum/objective/objective in objectives) if(objective.check_completion()) - parts += "Objective #[objective_count]: [objective.explanation_text] Success!" + parts += "Objective #[objective_count]: [objective.explanation_text] [span_greentext("Success!")]" else - parts += "Objective #[objective_count]: [objective.explanation_text] Fail." + parts += "Objective #[objective_count]: [objective.explanation_text] [span_redtext("Fail.")]" win = FALSE objective_count++ if(win) diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index e7d45de6bf7e..92ac857cf655 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -571,7 +571,7 @@ if(objective.check_completion()) parts += "Objective #[count]: [objective.explanation_text] Success!" else - parts += "Objective #[count]: [objective.explanation_text] Fail." + parts += "Objective #[count]: [objective.explanation_text] [span_redtext("Fail.")]" changelingwin = 0 count++ diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm index fbc6a28e2bdd..4bb872704118 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm @@ -78,7 +78,7 @@ if(!is_servant_of_ratvar(M) && M != L) M.flash_act() if(iscultist(L)) - to_chat(L, "\"Watch your step, wretch.\"") + to_chat(L, "[span_heavy_brass("\"Watch your step, wretch.\"")]") L.adjustBruteLoss(10) L.Paralyze(80, FALSE) L.visible_message(span_warning("[src] appears around [L] in a burst of light!"), \ @@ -138,7 +138,7 @@ visible_message(span_warning("[src] slowly stops glowing!")) return if(is_eligible_servant(L)) - to_chat(L, "\"You belong to me now.\"") + to_chat(L, "[span_heavy_brass("\"You belong to me now.\"")]") if(!GLOB.application_scripture_unlocked) GLOB.application_scripture_unlocked = TRUE hierophant_message("With the conversion of a new servant the Ark's power grows. Application scriptures are now available.") @@ -151,16 +151,16 @@ if(iscarbon(L)) var/mob/living/carbon/C = L C.silent += 5 - var/message = "[sigil_name] in [get_area(src)] [is_servant_of_ratvar(L) ? "successfully converted" : "failed to convert"]" + var/message = "[sigil_name] in [get_area(src)] [span_sevtug("[is_servant_of_ratvar(L) ? "successfully converted" : "failed to convert"]")]" for(var/M in GLOB.mob_list) if(isobserver(M)) var/link = FOLLOW_LINK(M, L) - to_chat(M, "[link] [message] [L.real_name]!") + to_chat(M, "[link] [span_heavy_brass("[message] [L.real_name]!")]") else if(is_servant_of_ratvar(M)) if(M == L) - to_chat(M, "[message] you!") + to_chat(M, "[span_heavy_brass("[message] you!")]") else - to_chat(M, "[message] [L.real_name]!") + to_chat(M, "[span_heavy_brass("[message] [L.real_name]!")]") animate(src, color = oldcolor, time = 20, flags = ANIMATION_END_NOW) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 20) visible_message(span_warning("[src] slowly stops glowing!")) @@ -278,7 +278,7 @@ if(is_servant_of_ratvar(user) || isobserver(user)) . += "It has access to [GLOB.ratvar_awakens ? "INFINITE":GLOB.clockwork_vitality] units of vitality." if(GLOB.ratvar_awakens) - . += "It can revive Servants at no cost!" + . += "[span_inathneq_small("It can revive Servants at no cost!")]" else . += "It can revive Servants at a cost of [revive_cost] vitality." @@ -304,7 +304,7 @@ animate(V, alpha = 0, transform = matrix()*2, time = 8) playsound(L, 'sound/magic/wandodeath.ogg', 50, 1) L.visible_message(span_warning("[L] collapses in on [L.p_them()]self as [src] flares bright blue!")) - to_chat(L, "\"[text2ratvar("Your life will not be wasted.")]\"") + to_chat(L, "[span_inathneq_large("\"[text2ratvar("Your life will not be wasted.")]\"")]") for(var/obj/item/W in L) if(!L.dropItemToGround(W)) qdel(W) diff --git a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm index c6bf3018ce80..623d064850ba 100644 --- a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm +++ b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm @@ -88,7 +88,7 @@ qdel(src) return TRUE if(istype(I, /obj/item/clockwork/slab)) - to_chat(user, "\"I don't think you want to drop your slab into that.\"\n\"If you really want to, try throwing it.\"") + to_chat(user, "[span_heavy_brass("\"I don't think you want to drop your slab into that.\"\n\"If you really want to, try throwing it.\"")]") return TRUE if(uses && user.dropItemToGround(I)) user.visible_message(span_warning("[user] drops [I] into [src]!"), span_danger("You drop [I] into [src]!")) diff --git a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm index 3507d1633178..f6b41c3f063b 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm @@ -51,13 +51,13 @@ playsound(loc, 'sound/weapons/handcuffs.ogg', 30, TRUE) ranged_ability_user.visible_message(span_danger("[ranged_ability_user] begins forming manacles around [L]'s wrists!"), \ - "You begin shaping replicant alloy into manacles around [L]'s wrists...") + "[span_neovgre_small("You begin shaping replicant alloy into manacles around [L]'s wrists...")]") to_chat(L, span_userdanger("[ranged_ability_user] begins forming manacles around your wrists!")) if(do_mob(ranged_ability_user, L, 30)) if(!(istype(L.handcuffed,/obj/item/restraints/handcuffs/clockwork))) L.handcuffed = new/obj/item/restraints/handcuffs/clockwork(L) L.update_handcuffed() - to_chat(ranged_ability_user, "You shackle [L].") + to_chat(ranged_ability_user, "[span_neovgre_small("You shackle [L].")]") log_combat(ranged_ability_user, L, "handcuffed") else to_chat(ranged_ability_user, span_warning("You fail to shackle [L].")) @@ -124,12 +124,12 @@ clockwork_say(ranged_ability_user, text2ratvar("[has_holy_water ? "Heal tainted" : "Mend wounded"] flesh!")) log_combat(ranged_ability_user, L, "healed with Sentinel's Compromise") L.visible_message(span_warning("A blue light washes over [L], [has_holy_water ? "causing [L.p_them()] to briefly glow as it mends" : " mending"] [L.p_their()] bruises and burns!"), \ - "You feel Inath-neq's power healing your wounds[has_holy_water ? " and purging the darkness within you" : ""], but a deep nausea overcomes you!") + "[span_heavy_brass("You feel Inath-neq's power healing your wounds[has_holy_water ? " and purging the darkness within you" : ""], but a deep nausea overcomes you!")]") else clockwork_say(ranged_ability_user, text2ratvar("Purge foul darkness!")) log_combat(ranged_ability_user, L, "purged of holy water with Sentinel's Compromise") L.visible_message(span_warning("A blue light washes over [L], causing [L.p_them()] to briefly glow!"), \ - "You feel Inath-neq's power purging the darkness within you!") + "[span_heavy_brass("You feel Inath-neq's power purging the darkness within you!")]") playsound(targetturf, 'sound/magic/staff_healing.ogg', 50, 1) if(has_holy_water) @@ -267,7 +267,7 @@ clockwork_say(ranged_ability_user, text2ratvar("Kneel, heathens!")) ranged_ability_user.visible_message(span_warning("[ranged_ability_user]'s eyes fire a stream of energy at [target], creating a strange mark!"), \ - "You direct the judicial force to [target].") + "[span_heavy_brass("You direct the judicial force to [target].")]") var/turf/targetturf = get_turf(target) new/obj/effect/clockwork/judicial_marker(targetturf, ranged_ability_user) log_combat(ranged_ability_user, targetturf, "created a judicial marker") diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm index d395444eca06..f27fb10579bb 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm @@ -39,13 +39,13 @@ ..() if(slot == SLOT_HEAD && !is_servant_of_ratvar(user)) if(!iscultist(user)) - to_chat(user, "\"Now now, this is for my servants, not you.\"") + to_chat(user, "[span_heavy_brass("\"Now now, this is for my servants, not you.\"")]") user.visible_message(span_warning("As [user] puts [src] on, it flickers off [user.p_their()] head!"), span_warning("The helmet flickers off your head, leaving only nausea!")) if(iscarbon(user)) var/mob/living/carbon/C = user C.vomit(20) else - to_chat(user, "\"Do you have a hole in your head? You're about to.\"") + to_chat(user, "[span_heavy_brass("\"Do you have a hole in your head? You're about to.\"")]") to_chat(user, span_userdanger("The helmet tries to drive a spike through your head as you scramble to remove it!")) user.emote("scream") user.apply_damage(30, BRUTE, BODY_ZONE_HEAD) @@ -105,13 +105,13 @@ ..() if(slot == SLOT_WEAR_SUIT && !is_servant_of_ratvar(user)) if(!iscultist(user)) - to_chat(user, "\"Now now, this is for my servants, not you.\"") + to_chat(user, "[span_heavy_brass("\"Now now, this is for my servants, not you.\"")]") user.visible_message(span_warning("As [user] puts [src] on, it flickers off [user.p_their()] body!"), span_warning("The cuirass flickers off your body, leaving only nausea!")) if(iscarbon(user)) var/mob/living/carbon/C = user C.vomit(20) else - to_chat(user, "\"I think this armor is too hot for you to handle.\"") + to_chat(user, "[span_heavy_brass("\"I think this armor is too hot for you to handle.\"")]") to_chat(user, span_userdanger("The cuirass emits a burst of flame as you scramble to get it off!")) user.emote("scream") user.apply_damage(15, BURN, BODY_ZONE_CHEST) @@ -166,13 +166,13 @@ ..() if(slot == SLOT_GLOVES && !is_servant_of_ratvar(user)) if(!iscultist(user)) - to_chat(user, "\"Now now, this is for my servants, not you.\"") + to_chat(user, "[span_heavy_brass("\"Now now, this is for my servants, not you.\"")]") user.visible_message(span_warning("As [user] puts [src] on, it flickers off [user.p_their()] arms!"), span_warning("The gauntlets flicker off your arms, leaving only nausea!")) if(iscarbon(user)) var/mob/living/carbon/C = user C.vomit() else - to_chat(user, "\"Did you like having arms?\"") + to_chat(user, "[span_heavy_brass("\"Did you like having arms?\"")]") to_chat(user, span_userdanger("The gauntlets suddenly squeeze tight, crushing your arms before you manage to get them off!")) user.emote("scream") user.apply_damage(7, BRUTE, BODY_ZONE_L_ARM) @@ -216,13 +216,13 @@ ..() if(slot == SLOT_SHOES && !is_servant_of_ratvar(user)) if(!iscultist(user)) - to_chat(user, "\"Now now, this is for my servants, not you.\"") + to_chat(user, "[span_heavy_brass("\"Now now, this is for my servants, not you.\"")]") user.visible_message(span_warning("As [user] puts [src] on, it flickers off [user.p_their()] feet!"), span_warning("The treads flicker off your feet, leaving only nausea!")) if(iscarbon(user)) var/mob/living/carbon/C = user C.vomit() else - to_chat(user, "\"Let's see if you can dance with these.\"") + to_chat(user, "[span_heavy_brass("\"Let's see if you can dance with these.\"")]") to_chat(user, span_userdanger("The treads turn searing hot as you scramble to get them off!")) user.emote("scream") user.apply_damage(7, BURN, BODY_ZONE_L_LEG) diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm index d6ecf4440832..e1e5f427e9ac 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm @@ -139,7 +139,7 @@ //Scripture Recital /obj/item/clockwork/slab/attack_self(mob/living/user) if(iscultist(user)) - to_chat(user, "\"You reek of blood. You've got a lot of nerve to even look at that slab.\"") + to_chat(user, "[span_heavy_brass("\"You reek of blood. You've got a lot of nerve to even look at that slab.\"")]") user.visible_message(span_warning("A sizzling sound comes from [user]'s hands!"), span_userdanger("[src] suddenly grows extremely hot in your hands!")) playsound(get_turf(user), 'sound/weapons/sear.ogg', 50, 1) user.dropItemToGround(src) diff --git a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm index ad87d5d6ed12..e9c9656efa9f 100644 --- a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm +++ b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm @@ -44,7 +44,7 @@ else update_status(FALSE) if(iscultist(user)) //Cultists spontaneously combust - to_chat(user, "\"Consider yourself judged, whelp.\"") + to_chat(user, "[span_heavy_brass("\"Consider yourself judged, whelp.\"")]") to_chat(user, span_userdanger("You suddenly catch fire!")) user.adjust_fire_stacks(5) user.IgniteMob() @@ -79,8 +79,8 @@ return 0 switch(active) if(TRUE) - to_chat(L, "As you put on [src], its lens begins to glow, information flashing before your eyes.\n\ - Judicial visor active. Use the action button to gain the ability to smite the unworthy.") + to_chat(L, "[span_notice("As you put on [src], its lens begins to glow, information flashing before your eyes.")]\n\ + [span_heavy_brass("Judicial visor active. Use the action button to gain the ability to smite the unworthy.")]") if(FALSE) to_chat(L, span_notice("As you take off [src], its lens darkens once more.")) return 1 @@ -133,7 +133,7 @@ V.update_status() addtimer(CALLBACK(V, /obj/item/clothing/glasses/judicial_visor.proc/recharge_visor, ranged_ability_user), (GLOB.ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown) * 2) clockwork_say(ranged_ability_user, text2ratvar("Kneel, heathens!")) - ranged_ability_user.visible_message(span_warning("[ranged_ability_user]'s judicial visor fires a stream of energy at [target], creating a strange mark!"), "You direct [visor]'s power to [target]. You must wait for some time before doing this again.") + ranged_ability_user.visible_message(span_warning("[ranged_ability_user]'s judicial visor fires a stream of energy at [target], creating a strange mark!"), "[span_heavy_brass("You direct [visor]'s power to [target]. You must wait for some time before doing this again.")]") var/turf/targetturf = get_turf(target) new/obj/effect/clockwork/judicial_marker(targetturf, ranged_ability_user) log_combat(ranged_ability_user, targetturf, "created a judicial marker") @@ -202,7 +202,7 @@ span_userdanger("[!issilicon(L) ? "An unseen force slams you into the ground!" : "ERROR: Motor servos disabled by external source!"]")) else L.visible_message(span_warning("[L] is struck by a judicial explosion!"), \ - "\"Keep an eye out, filth.\"\nA burst of heat crushes you against the ground!") + "[span_heavy_brass("\"Keep an eye out, filth.\"")]\n[span_userdanger("A burst of heat crushes you against the ground!")]") L.adjust_fire_stacks(2) //sets cultist targets on fire L.IgniteMob() L.adjustFireLoss(5) @@ -210,7 +210,7 @@ if(!QDELETED(L)) L.adjustBruteLoss(20) //does a decent amount of damage log_combat(user, L, "struck with a judicial blast") - to_chat(user, "[targetsjudged ? "Successfully judged [targetsjudged]":"Judged no"] heretic[targetsjudged == 1 ? "":"s"].") + to_chat(user, "[targetsjudged ? "Successfully judged [span_neovgre("[targetsjudged]")]":"Judged no"] heretic[targetsjudged == 1 ? "":"s"].") sleep(3) //so the animation completes properly qdel(src) diff --git a/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm b/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm index 298f0c77fe37..b69a310bd5c4 100644 --- a/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm +++ b/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm @@ -46,8 +46,8 @@ /obj/item/clockwork/replica_fabricator/examine(mob/living/user) . = ..() if(is_servant_of_ratvar(user) || isobserver(user)) - . += {"Can be used to replace walls, floors, tables, windows, windoors, and airlocks with Clockwork variants.\n - Can construct Clockwork Walls on Clockwork Floors and deconstruct Clockwork Walls to Clockwork Floors."} + . += {"[span_brass("Can be used to replace walls, floors, tables, windows, windoors, and airlocks with Clockwork variants.")]\n + [span_brass("Can construct Clockwork Walls on Clockwork Floors and deconstruct Clockwork Walls to Clockwork Floors.")]"} if(uses_power) . += {"It can consume floor tiles, rods, metal, and plasteel for power at rates of 2:[DisplayEnergy(POWER_ROD)], 1:[DisplayEnergy(POWER_ROD)], 1:[DisplayEnergy(POWER_METAL)], \ and 1:[DisplayEnergy(POWER_PLASTEEL)], respectively.\n diff --git a/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm b/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm index f7ef72fba354..08923be40e63 100644 --- a/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm +++ b/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm @@ -33,23 +33,23 @@ var/mob/living/carbon/human/H = loc if(src == H.glasses && !up) if(HAS_TRAIT(H, TRAIT_BLIND)) - to_chat(H, "\"You're blind, idiot. Stop embarrassing yourself.\"") + to_chat(H, "[span_heavy_brass("\"You're blind, idiot. Stop embarrassing yourself.\"")]") return if(blind_cultist(H)) return if(is_servant_of_ratvar(H)) - to_chat(H, "You push the spectacles down, and all is revealed to you.[GLOB.ratvar_awakens ? "" : " Your eyes begin to itch - you cannot do this for long."]") + to_chat(H, "[span_heavy_brass("You push the spectacles down, and all is revealed to you.[GLOB.ratvar_awakens ? "" : " Your eyes begin to itch - you cannot do this for long."]")]") var/datum/status_effect/wraith_spectacles/WS = H.has_status_effect(STATUS_EFFECT_WRAITHSPECS) if(WS) WS.apply_eye_damage(H) H.apply_status_effect(STATUS_EFFECT_WRAITHSPECS) else - to_chat(H, "You push the spectacles down, but you can't see through the glass.") + to_chat(H, "[span_heavy_brass("You push the spectacles down, but you can't see through the glass.")]") /obj/item/clothing/glasses/wraith_spectacles/proc/blind_cultist(mob/living/victim) var/obj/item/organ/eyes/eyes = victim.getorganslot(ORGAN_SLOT_EYES) if(iscultist(victim)) - to_chat(victim, "\"It looks like Nar-Sie's dogs really don't value their eyes.\"") + to_chat(victim, "[span_heavy_brass("\"It looks like Nar-Sie's dogs really don't value their eyes.\"")]") to_chat(victim, span_userdanger("Your eyes explode with horrific pain!")) victim.emote("scream") eyes.applyOrganDamage(eyes.maxHealth) @@ -78,19 +78,19 @@ if(slot != SLOT_GLASSES || up) return if(HAS_TRAIT(user, TRAIT_BLIND)) - to_chat(user, "\"You're blind, idiot. Stop embarrassing yourself.\"" ) + to_chat(user, "[span_heavy_brass("\"You're blind, idiot. Stop embarrassing yourself.\"")]" ) return if(blind_cultist(user)) //Cultists instantly go blind return set_vision_vars(TRUE) if(is_servant_of_ratvar(user)) - to_chat(user, "As you put on the spectacles, all is revealed to you.[GLOB.ratvar_awakens || GLOB.ratvar_approaches ? "" : " Your eyes begin to itch - you cannot do this for long."]") + to_chat(user, "[span_heavy_brass("As you put on the spectacles, all is revealed to you.[GLOB.ratvar_awakens || GLOB.ratvar_approaches ? "" : " Your eyes begin to itch - you cannot do this for long."]")]") var/datum/status_effect/wraith_spectacles/WS = user.has_status_effect(STATUS_EFFECT_WRAITHSPECS) if(WS) WS.apply_eye_damage(user) user.apply_status_effect(STATUS_EFFECT_WRAITHSPECS) else - to_chat(user, "You put on the spectacles, but you can't see through the glass.") + to_chat(user, "[span_heavy_brass("You put on the spectacles, but you can't see through the glass.")]") //The effect that causes/repairs the damage the spectacles cause. /datum/status_effect/wraith_spectacles @@ -168,7 +168,7 @@ H.become_nearsighted(EYE_DAMAGE) if(eye_damage_done >= blind_breakpoint) if(!HAS_TRAIT(H, TRAIT_BLIND)) - to_chat(H, "A piercing white light floods your vision. Suddenly, all goes dark!") + to_chat(H, "[span_nzcrentr_large("A piercing white light floods your vision. Suddenly, all goes dark!")]") eyes.applyOrganDamage(eyes.maxHealth) if(prob(min(20, 5 + eye_damage_done))) diff --git a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm index 6190f1bb3ec7..74e8053f8ec7 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm @@ -193,7 +193,7 @@ if(marker_icon) new/obj/effect/temp_visual/ratvar/command_point(get_turf(A), marker_icon) for(var/mob/M in servants_and_ghosts()) - to_chat(M, "[replacetext(command_text, "GETDIR", dir2text(get_dir(M, command_location)))]") + to_chat(M, "[span_large_brass("[replacetext(command_text, "GETDIR", dir2text(get_dir(M, command_location)))]")]") M.playsound_local(M, 'sound/machines/clockcult/eminence_command.ogg', 75, FALSE, pressure_affected = FALSE) else hierophant_message("[command_text]") diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm index dac3e8ab72a9..ab60ee5ddfee 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm @@ -173,7 +173,7 @@ if(remove_item_if_better(I, owner)) do_message += owner.equip_to_slot_or_del(new/obj/item/clothing/shoes/clockwork(null), SLOT_SHOES) if(do_message) - owner.visible_message(span_warning("Strange armor appears on [owner]!"), "A bright shimmer runs down your body, equipping you with Ratvarian armor.") + owner.visible_message(span_warning("Strange armor appears on [owner]!"), "[span_heavy_brass("A bright shimmer runs down your body, equipping you with Ratvarian armor.")]") playsound(owner, 'sound/magic/clockwork/fellowship_armory.ogg', 15 * do_message, TRUE) //get sound loudness based on how much we equipped cooldown = CLOCKWORK_ARMOR_COOLDOWN + world.time owner.update_action_buttons_icon() diff --git a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm index 64667441d2ff..551612d87433 100644 --- a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -246,11 +246,11 @@ to_chat(user, "Time until Ratvar's arrival: [DisplayTimeText(get_arrival_time())]") switch(progress_in_seconds) if(-INFINITY to GATEWAY_REEBE_FOUND) - to_chat(user, "The Ark is feeding power into the bluespace field.") + to_chat(user, "[span_heavy_brass("The Ark is feeding power into the bluespace field.")]") if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING) - to_chat(user, "The field is ripping open a copy of itself in Ratvar's prison.") + to_chat(user, "[span_heavy_brass("The field is ripping open a copy of itself in Ratvar's prison.")]") if(GATEWAY_RATVAR_COMING to INFINITY) - to_chat(user, "With the bluespace field established, Ratvar is preparing to come through!") + to_chat(user, "[span_heavy_brass("With the bluespace field established, Ratvar is preparing to come through!")]") else if(!active) to_chat(user, span_warning("Whatever it is, it doesn't seem to be active.")) diff --git a/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm b/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm index 9735ac9eca01..d94f08358b1c 100644 --- a/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm +++ b/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm @@ -96,7 +96,7 @@ visible_message(span_warning("[src] swivels to face [target]!")) if(isliving(target)) var/mob/living/L = target - to_chat(L, "\"I SEE YOU!\"\n[src]'s gaze [GLOB.ratvar_awakens ? "melts you alive" : "burns you"]!") + to_chat(L, "[span_neovgre("\"I SEE YOU!\"")]\n[span_userdanger("[src]'s gaze [GLOB.ratvar_awakens ? "melts you alive" : "burns you"]!")]") else if(ismecha(target)) var/obj/mecha/M = target to_chat(M.occupant, span_neovgre("\"I SEE YOU!\"") ) diff --git a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm index 2ecc1856dee5..ed920c47f8b0 100644 --- a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm +++ b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm @@ -48,7 +48,7 @@ if(alertresult == "No" || QDELETED(O) || !istype(O) || !O.key) return FALSE var/mob/living/simple_animal/drone/cogscarab/ratvar/R = new/mob/living/simple_animal/drone/cogscarab/ratvar(get_turf(src)) - R.visible_message("[R] forms, and its eyes blink open, glowing bright red!") + R.visible_message("[span_heavy_brass("[R] forms, and its eyes blink open, glowing bright red!")]") R.key = O.key /obj/structure/destructible/clockwork/massive/ratvar/Bump(atom/A) @@ -85,16 +85,16 @@ var/mob/living/L = prey prey = pick(meals) to_chat(prey, "\"You will do, heretic.\"\n\ - You feel something massive turn its crushing focus to you...") + [span_userdanger("You feel something massive turn its crushing focus to you...")]") L.playsound_local(prey, 'sound/effects/ratvar_reveal.ogg', 100, FALSE, pressure_affected = FALSE) else if((!istype(prey, /obj/singularity/narsie) && prob(10) && LAZYLEN(meals) > 1) || prey.z != z || !(prey in meals)) if(is_servant_of_ratvar(prey)) to_chat(prey, "\"Serve me well.\"\n\ - You feel great joy as your god turns His eye to another heretic...") + [span_big_brass("You feel great joy as your god turns His eye to another heretic...")]") else to_chat(prey, "\"No matter. I will find you later, heretic.\"\n\ - You feel tremendous relief as the crushing focus relents...") + [span_userdanger("You feel tremendous relief as the crushing focus relents...")]") prey = null else dir_to_step_in = get_dir(src, prey) //Unlike Nar-Sie, Ratvar ruthlessly chases down his target diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm index 95f0b7bcea0f..40eb827a8e12 100644 --- a/code/modules/antagonists/clockcult/clockcult.dm +++ b/code/modules/antagonists/clockcult/clockcult.dm @@ -53,7 +53,7 @@ /datum/antagonist/clockcult/greet() if(!owner.current || silent) return - owner.current.visible_message("[owner.current]'s eyes glow a blazing yellow!", null, null, 7, owner.current) //don't show the owner this message + owner.current.visible_message("[span_heavy_brass("[owner.current]'s eyes glow a blazing yellow!")]", null, null, 7, owner.current) //don't show the owner this message to_chat(owner.current, "Assist your new companions in their righteous efforts. Your goal is theirs, and theirs yours. You serve the Clockwork \ Justiciar above all else. Perform his every whim without hesitation.") owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/clockcultalr.ogg', 70, FALSE, pressure_affected = FALSE) @@ -74,7 +74,7 @@ to_chat(R, span_boldwarning("Your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.")) if(isAI(current)) to_chat(current, span_boldwarning("You are now able to use your cameras to listen in on conversations, but can no longer speak in anything but Ratvarian.")) - to_chat(current, "You can communicate with other servants by using the Hierophant Network action button in the upper left.") + to_chat(current, "[span_heavy_brass("You can communicate with other servants by using the Hierophant Network action button in the upper left.")]") else if(isbrain(current) || isclockmob(current)) to_chat(current, span_nezbere("You can communicate with other servants by using the Hierophant Network action button in the upper left.")) ..() @@ -168,7 +168,7 @@ SSticker.mode.servants_of_ratvar -= owner SSticker.mode.update_servant_icons_removed(owner) if(!silent) - owner.current.visible_message("[owner.current] seems to have remembered [owner.current.p_their()] true allegiance!", null, null, null, owner.current) + owner.current.visible_message("[span_deconversion_message("[owner.current] seems to have remembered [owner.current.p_their()] true allegiance!")]", null, null, null, owner.current) to_chat(owner, span_userdanger("A cold, cold darkness flows through your mind, extinguishing the Justiciar's light and all of your memories as his servant.")) owner.current.log_message("has renounced the cult of Ratvar!", LOG_ATTACK, color="#BE8700") owner.special_role = null @@ -238,7 +238,7 @@ if(i != SCRIPTURE_DRIVER) parts += "[i] scripture was: [GLOB.scripture_states[i] ? "UN":""]LOCKED" if(eminence) - parts += "The Eminence was: [printplayer(eminence)]" + parts += "[span_header("The Eminence was:")] [printplayer(eminence)]" if(members.len) parts += span_header("Ratvar's servants were:") parts += printplayerlist(members - eminence) diff --git a/code/modules/antagonists/creep/creep.dm b/code/modules/antagonists/creep/creep.dm index 7dd1a84fb5e3..df700377765f 100644 --- a/code/modules/antagonists/creep/creep.dm +++ b/code/modules/antagonists/creep/creep.dm @@ -110,7 +110,7 @@ O.update_explanation_text() /datum/antagonist/obsessed/roundend_report_header() - return "Someone became obsessed!
" + return "[span_header("Someone became obsessed!")]
" /datum/antagonist/obsessed/roundend_report() var/list/report = list() diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 59ffb4cdc3d6..69cee76d3221 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -153,7 +153,7 @@ SSticker.mode.cult -= owner SSticker.mode.update_cult_icons_removed(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) + 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_userdanger("An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.")) owner.current.log_message("has renounced the cult of Nar'Sie!", LOG_ATTACK, color="#960000") if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client) @@ -210,7 +210,7 @@ set_antag_hud(current, "cultmaster") /datum/antagonist/cult/master/greet() - to_chat(owner.current, "You are the cult's Master. As the cult's Master, you have a unique title and loud voice when communicating, are capable of marking \ + to_chat(owner.current, "[span_cultlarge("You are the cult's Master")]. As the cult's Master, you have a unique title and loud voice when communicating, are capable of marking \ targets, such as a location or a noncultist, to direct the cult to them, and, finally, you are capable of summoning the entire living cult to your location once.") to_chat(owner.current, "Use these abilities to direct the cult to victory at any cost.") @@ -490,9 +490,9 @@ var/count = 1 for(var/datum/objective/objective in objectives) if(objective.check_completion()) - parts += "Objective #[count]: [objective.explanation_text] Success!" + parts += "Objective #[count]: [objective.explanation_text] [span_greentext("Success!")]" else - parts += "Objective #[count]: [objective.explanation_text] Fail." + parts += "Objective #[count]: [objective.explanation_text] [span_redtext("Fail.")]" count++ if(members.len) diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 3983e17c9435..d060c213f23e 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -229,7 +229,7 @@ structure_check() searches for nearby cultist structures required for the invoca if(is_clock) L.visible_message(span_warning("[L]'s eyes glow a defiant yellow!"), \ "\"Stop resisting. You will be mi-\"\n\ - \"Give up and you will feel pain unlike anything you've ever felt!\"") + [span_large_brass("\"Give up and you will feel pain unlike anything you've ever felt!\"")]") L.Paralyze(80) else if(is_convertable) do_convert(L, invokers) diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm index d211ccc23853..17c73e37c0a9 100644 --- a/code/modules/antagonists/devil/devil.dm +++ b/code/modules/antagonists/devil/devil.dm @@ -291,11 +291,11 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", sleep(10) if(!D) return - to_chat(D, "YES!!") + to_chat(D, "[span_big("YES!!")]") sleep(10) if(!D) return - to_chat(D, "YE--") + to_chat(D, "[span_reallybig("YE--")]") sleep(1) if(!D) return @@ -494,7 +494,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", to_chat(owner.current, GLOB.lawlorify[LAW][ban]) to_chat(owner.current, GLOB.lawlorify[LAW][obligation]) to_chat(owner.current, GLOB.lawlorify[LAW][banish]) - to_chat(owner.current, "Remember, the crew can research your weaknesses if they find out your devil name.
") + to_chat(owner.current, "[span_warning("Remember, the crew can research your weaknesses if they find out your devil name.")]
") .=..() /datum/antagonist/devil/on_gain() diff --git a/code/modules/antagonists/disease/disease_datum.dm b/code/modules/antagonists/disease/disease_datum.dm index f0211417b174..d2d751a6be70 100644 --- a/code/modules/antagonists/disease/disease_datum.dm +++ b/code/modules/antagonists/disease/disease_datum.dm @@ -46,9 +46,9 @@ var/count = 1 for(var/datum/objective/objective in objectives) if(objective.check_completion()) - objectives_text += "
Objective #[count]: [objective.explanation_text] Success!" + objectives_text += "
Objective #[count]: [objective.explanation_text] [span_greentext("Success!")]" else - objectives_text += "
Objective #[count]: [objective.explanation_text] Fail." + objectives_text += "
Objective #[count]: [objective.explanation_text] [span_redtext("Fail.")]" win = FALSE count++ diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm index 03041c6f89f4..666118a1071d 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -98,8 +98,8 @@ the new instance inside the host to be updated to the template's stats. /mob/camera/disease/examine(mob/user) . = ..() if(isobserver(user)) - . += {"[src] has [points]/[total_points] adaptation points. - [src] has the following unlocked:"} + . += {"[span_notice("[src] has [points]/[total_points] adaptation points.")] + [span_notice("[src] has the following unlocked:")]"} for(var/datum/disease_ability/ability in purchased_abilities) . += span_notice("[ability.name]") diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm index 369b0022d331..6027fdaafdae 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm @@ -32,7 +32,7 @@ /datum/antagonist/heretic/greet() owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ecult_op.ogg', 100, FALSE, pressure_affected = FALSE)//subject to change - to_chat(owner, "You are the Heretic!
\ + to_chat(owner, "[span_boldannounce("You are the Heretic!")]
\ The old ones gave you these tasks to fulfill:") owner.announce_objectives() to_chat(owner, "The book whispers, the forbidden knowledge walks once again!
\ @@ -188,7 +188,7 @@ if(objective.check_completion()) parts += "Objective #[count]: [objective.explanation_text] Success!" else - parts += "Objective #[count]: [objective.explanation_text] Fail." + parts += "Objective #[count]: [objective.explanation_text] [span_redtext("Fail.")]" cultiewin = FALSE count++ if(ascended) diff --git a/code/modules/antagonists/fugitive/old_god.dm b/code/modules/antagonists/fugitive/old_god.dm index 2d17031c3f6c..e25c6da293ed 100644 --- a/code/modules/antagonists/fugitive/old_god.dm +++ b/code/modules/antagonists/fugitive/old_god.dm @@ -127,14 +127,14 @@ if(!message) return log_directed_talk(user, target, message, LOG_SAY, "[name]") - to_chat(user, "You transmit to [target]: [message]") - to_chat(target, "You hear something behind you talking... [message]") + to_chat(user, "[span_boldnotice("You transmit to [target]:")] [span_notice("[message]")]") + to_chat(target, "[span_boldnotice("You hear something behind you talking...")] [span_notice("[message]")]") for(var/ded in GLOB.dead_mob_list) if(!isobserver(ded)) continue var/follow_rev = FOLLOW_LINK(ded, user) var/follow_whispee = FOLLOW_LINK(ded, target) - to_chat(ded, "[follow_rev] [user] [name]: \"[message]\" to [follow_whispee] [target]") + to_chat(ded, "[follow_rev] [span_boldnotice("[user] [name]:")] [span_notice("\"[message]\" to")] [follow_whispee] [span_name("[target]")]") /datum/action/innate/yalp_transport name = "Guidance" diff --git a/code/modules/antagonists/hivemind/hivemind.dm b/code/modules/antagonists/hivemind/hivemind.dm index 1aaa2a3180b5..bf32a0efeb0e 100644 --- a/code/modules/antagonists/hivemind/hivemind.dm +++ b/code/modules/antagonists/hivemind/hivemind.dm @@ -69,7 +69,7 @@ var/obj/effect/proc_holder/spell/the_spell = new power(null) owner.AddSpell(the_spell) if(hive_size > 0) - to_chat(owner, "We have unlocked [the_spell.name]. [the_spell.desc]") + to_chat(owner, "[span_assimilator("We have unlocked [the_spell.name].")][span_bold(" [the_spell.desc]")]") if(!unlocked_one_mind && hive_size >= 15) var/lead = TRUE @@ -83,7 +83,7 @@ if(lead) unlocked_one_mind = TRUE owner.AddSpell(new/obj/effect/proc_holder/spell/self/one_mind) - to_chat(owner, "Our true power, the One Mind, is finally within reach.") + to_chat(owner, "[span_assimilator("Our true power, the One Mind, is finally within reach.")]") /datum/antagonist/hivemind/proc/add_track_bonus(datum/antagonist/hivemind/enemy, bonus) if(!individual_track_bonus[enemy]) diff --git a/code/modules/antagonists/kudzu/kudzu.dm b/code/modules/antagonists/kudzu/kudzu.dm index ae1130068107..adc8fc6ef823 100644 --- a/code/modules/antagonists/kudzu/kudzu.dm +++ b/code/modules/antagonists/kudzu/kudzu.dm @@ -5,7 +5,7 @@ /datum/team/kudzu/roundend_report() var/list/parts = list() //is kudzu alive? if yes, greentext - parts += "The [name] [locate(/obj/structure/spacevine) in world ? "were successful" : "have failed"] in protecting the kudzu!\n" + parts += "The [name] [locate(/obj/structure/spacevine) in world ? "were [span_greentext("successful")]" : "have [span_redtext("failed")]"] in protecting the kudzu!\n" parts += "The [name] were:" parts += printplayerlist(members) return "
[parts.Join("
")]
" diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index 3bfc27b5686d..84b94349d6fc 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -353,7 +353,7 @@ parts += "Neutral Victory" parts += "Mission aborted!" - var/text = "
The syndicate operatives were:" + var/text = "
[span_header("The syndicate operatives were:")]" var/purchases = "" var/TC_uses = 0 LAZYINITLIST(GLOB.uplink_purchase_logs_by_key) diff --git a/code/modules/antagonists/pirate/pirate.dm b/code/modules/antagonists/pirate/pirate.dm index d5c5013e08ce..5e8e3d8d7b5c 100644 --- a/code/modules/antagonists/pirate/pirate.dm +++ b/code/modules/antagonists/pirate/pirate.dm @@ -8,7 +8,7 @@ /datum/antagonist/pirate/greet() to_chat(owner, span_boldannounce("You 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. As a pirate, you are NOT authorized to murder the station's inhabitants without good reason.") + 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.[span_notice(" As a pirate, you are NOT authorized to murder the station's inhabitants without good reason.")]") owner.announce_objectives() /datum/antagonist/pirate/get_team() diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 3e2c372667dd..ebb9aa0d6066 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -211,10 +211,10 @@ /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, span_userdanger("You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...")) else if(issilicon(owner.current)) - owner.current.visible_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.", null, null, null, owner.current) + owner.current.visible_message("[span_deconversion_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.")]", null, null, null, owner.current) to_chat(owner, span_userdanger("The frame's firmware detects and deletes your neural reprogramming! You remember nothing but the name of the one who flashed you.")) //blunt trauma deconversions call this through species.dm spec_attacked_by() diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 390698810620..792ef7f2d260 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -132,7 +132,7 @@ playstyle_string = "You are a laughter \ demon, a wonderful creature from another realm. You have a single \ - desire: To hug and tickle.
\ + desire: [span_clown("To hug and tickle.")]
\ You may use the \"Blood Crawl\" ability near blood pools to travel \ through them, appearing and disappearing from the station at will. \ Pulling a dead or unconscious mob while you enter a pool will pull \ diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 5b88eb2358e1..f443eb51b861 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -278,11 +278,11 @@ var/responses = jointext(GLOB.syndicate_code_response, ", ") to_chat(traitor_mob, "The Syndicate have provided you with the following codewords to identify fellow agents:") - to_chat(traitor_mob, "Code Phrase: [phrases]") - to_chat(traitor_mob, "Code Response: [responses]") + to_chat(traitor_mob, "Code Phrase: [span_blue("[phrases]")]") + to_chat(traitor_mob, "Code Response: [span_red("[responses]")]") - antag_memory += "Code Phrase: [phrases]
" - antag_memory += "Code Response: [responses]
" + antag_memory += "Code Phrase: [span_blue("[phrases]")]
" + antag_memory += "Code Response: [span_red("[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, span_alertwarning("You memorize the codewords, allowing you to recognise them when heard.")) @@ -365,9 +365,9 @@ var/count = 1 for(var/datum/objective/objective in objectives) if(objective.check_completion()) - objectives_text += "
Objective #[count]: [objective.explanation_text] Success!" + objectives_text += "
Objective #[count]: [objective.explanation_text] [span_greentext("Success!")]" else - objectives_text += "
Objective #[count]: [objective.explanation_text] Fail." + objectives_text += "
Objective #[count]: [objective.explanation_text] [span_redtext("Fail.")]" traitorwin = FALSE count++ @@ -425,8 +425,8 @@ if (completed_contracts > 1) pluralCheck = "contracts" - result += "Completed [completed_contracts] [pluralCheck] for a total of \ - [tc_total] TC![contractor_support_unit]
" + result += "Completed [span_greentext("[completed_contracts]")] [pluralCheck] for a total of \ + [span_greentext("[tc_total] TC")]![contractor_support_unit]
" return result diff --git a/code/modules/antagonists/traitor/equipment/contractor.dm b/code/modules/antagonists/traitor/equipment/contractor.dm index dc8f2d6e12fe..800479aa1a7b 100644 --- a/code/modules/antagonists/traitor/equipment/contractor.dm +++ b/code/modules/antagonists/traitor/equipment/contractor.dm @@ -226,8 +226,8 @@ partner_mind.make_Contractor_Support() // flavour text - to_chat(partner_mind.current, "\n[user.real_name] is your superior. Follow any, and all orders given by them. You're here to support their mission only.") - to_chat(partner_mind.current, "Should they perish, or be otherwise unavailable, you're to assist other active agents in this mission area to the best of your ability.\n\n") + to_chat(partner_mind.current, "\n[span_alertwarning("[user.real_name] is your superior. Follow any, and all orders given by them. You're here to support their mission only.")]") + to_chat(partner_mind.current, "[span_alertwarning("Should they perish, or be otherwise unavailable, you're to assist other active agents in this mission area to the best of your ability.")]\n\n") new /obj/effect/DPtarget(free_location, arrival_pod) diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 1167db79313a..e2321a58a003 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -239,7 +239,7 @@ M.set_species(/datum/species/skeleton, icon_update=0) M.revive(full_heal = 1, admin_revive = 1) spooky_scaries |= M - to_chat(M, "You have been revived by [user.real_name]!") + to_chat(M, "[span_userdanger("You have been revived by ")][user.real_name]!") to_chat(M, span_userdanger("[user.p_theyre(TRUE)] your master now, assist [user.p_them()] even if it costs you your new life!")) equip_roman_skeleton(M) diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index a8f79308e11c..5d18effe8ee7 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -158,7 +158,7 @@ init_shade(T, user) return TRUE else - to_chat(user, "Capture failed!: The soul has already fled its mortal frame. You attempt to bring it back...") + to_chat(user, "[span_userdanger("Capture failed!")]: The soul has already fled its mortal frame. You attempt to bring it back...") return getCultGhost(T,user) if("VICTIM") @@ -166,16 +166,16 @@ 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, "\"This soul is mine. [span_cultlarge("SACRIFICE THEM!\"")]") else 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.") + to_chat(user, "[span_userdanger("Capture failed!")]: The soulstone is full! Free an existing soul to make room.") else if((!old_shard && T.stat != CONSCIOUS) || (old_shard && T.stat == DEAD)) if(T.client == null) - to_chat(user, "Capture failed!: The soul has already fled its mortal frame. You attempt to bring it back...") + to_chat(user, "[span_userdanger("Capture failed!")]: The soul has already fled its mortal frame. You attempt to bring it back...") getCultGhost(T,user) else for(var/obj/item/W in T) @@ -183,12 +183,12 @@ init_shade(T, user, vic = 1) qdel(T) else - to_chat(user, "Capture failed!: Kill or maim the victim first!") + to_chat(user, "[span_userdanger("Capture failed!")]: Kill or maim the victim first!") if("SHADE") var/mob/living/simple_animal/shade/T = target if(contents.len) - to_chat(user, "Capture failed!: The soulstone is full! Free an existing soul to make room.") + to_chat(user, "[span_userdanger("Capture failed!")]: The soulstone is full! Free an existing soul to make room.") else T.forceMove(src) //put shade in stone T.status_flags |= GODMODE @@ -242,7 +242,7 @@ qdel(T) qdel(src) else - to_chat(user, "Creation failed!: The soul stone is empty! Go kill someone!") + to_chat(user, "[span_userdanger("Creation failed!")]: The soul stone is empty! Go kill someone!") /proc/makeNewConstruct(mob/living/simple_animal/hostile/construct/ctype, mob/target, mob/stoner = null, cultoverride = 0, loc_override = null) diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 7ac7053c8825..0a347c49397a 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -297,9 +297,9 @@ var/wizardwin = 1 for(var/datum/objective/objective in objectives) if(objective.check_completion()) - parts += "Objective #[count]: [objective.explanation_text] Success!" + parts += "Objective #[count]: [objective.explanation_text] [span_greentext("Success!")]" else - parts += "Objective #[count]: [objective.explanation_text] Fail." + parts += "Objective #[count]: [objective.explanation_text] [span_redtext("Fail.")]" wizardwin = 0 count++ diff --git a/code/modules/antagonists/xeno/xeno.dm b/code/modules/antagonists/xeno/xeno.dm index 82f253c8aa7b..a28f3751683b 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] [SSshuttle.emergency.is_hijacked_by_xenos() ? "were successful" : "have failed"] in hijacking the shuttle!\n" + parts += "The [name] [SSshuttle.emergency.is_hijacked_by_xenos() ? "were [span_greentext("successful")]" : "have [span_redtext("failed")]"] in hijacking the shuttle!\n" parts += "The [name] were:" parts += printplayerlist(members) return "
[parts.Join("
")]
" diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index 0b7f99dbdeb8..956fb3a6eee0 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -213,7 +213,7 @@ GLOBAL_LIST_EMPTY(pipeimages) "[user] unfastens \the [src].", \ span_notice("You unfasten \the [src]."), \ span_italics("You hear ratchet.")) - investigate_log("was REMOVED by [key_name(usr)]", INVESTIGATE_ATMOS) + investigate_log("was [span_warning("REMOVED")] by [key_name(usr)]", INVESTIGATE_ATMOS) //You unwrenched a pipe full of pressure? Let's splat you into the wall, silly. if(unsafe_wrenching) diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 70d300d6c9b4..2add86857420 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -609,8 +609,8 @@ if("eject") if(holding) if(valve_open) - message_admins("[ADMIN_LOOKUPFLW(usr)] removed [holding] from [src] with valve still open at [ADMIN_VERBOSEJMP(src)] releasing contents into the air.") - investigate_log("[key_name(usr)] removed the [holding], leaving the valve open and transferring into the air.", INVESTIGATE_ATMOS) + message_admins("[ADMIN_LOOKUPFLW(usr)] removed [holding] from [src] with valve still open at [ADMIN_VERBOSEJMP(src)] releasing contents into the [span_boldannounce("air")].") + investigate_log("[key_name(usr)] removed the [holding], leaving the valve open and transferring into the [span_boldannounce("air")].", INVESTIGATE_ATMOS) replace_tank(usr, FALSE) . = TRUE update_icon() diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 655235d2f483..f069178f1f8f 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -107,9 +107,9 @@ if(show_flavour) var/output_message = "[short_desc]" if(flavour_text != "") - output_message += "\n[flavour_text]" + output_message += "\n[span_bold("[flavour_text]")]" if(important_info != "") - output_message += "\n[important_info]" + output_message += "\n[span_userdanger("[important_info]")]" to_chat(M, output_message) MM.memory += flavour_text if(antagonist_type) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index d3593e18297c..bb9b2081180f 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -162,7 +162,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation) if(calibrated) to_chat(user, "\black 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.") + to_chat(user, "[span_boldnotice("Recalibration successful!")]: \black This gate's systems have been fine tuned. Travel to this gate will now be on target.") calibrated = TRUE return TRUE diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 6a4e129549d4..9031dcd7adf7 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -364,10 +364,10 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( 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("Notice: [span_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("Notice: [span_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).") if(GLOB.player_details[ckey]) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index a4c2ef2b351d..938fb928445d 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -108,7 +108,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc if(holder.fakekey) // If they're stealhminning oocmsg_toadmins = oocmsg + "OOC: [keyname]/([holder.fakekey]): [msg]" // ^ Message sent to people who should know when someone's stealthminning - oocmsg = "OOC: [holder.fakekey]: [msg]" + oocmsg = "[span_prefix("OOC:")] [holder.fakekey]: [msg]" // ^ Message sent to normal people else oocmsg += "OOC: [keyname]: [msg]" // Footer for an admin or AO's OOC. @@ -123,7 +123,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc else oocmsg = "[(is_donator(src) && !CONFIG_GET(flag/everyone_is_donator)) ? "(Donator)" : ""]" oocmsg += "" - oocmsg += "OOC: [keyname]: [msg]" + oocmsg += "[span_prefix("OOC:")] [keyname]: [msg]" oocmsg_toadmins = oocmsg //SENDING THE MESSAGES OUT @@ -218,7 +218,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc set desc ="Check the admin notice if it has been set" if(GLOB.admin_notice) - to_chat(src, "Admin Notice:\n \t [GLOB.admin_notice]") + to_chat(src, "[span_boldnotice("Admin Notice:")]\n \t [GLOB.admin_notice]") else to_chat(src, span_notice("There are no admin notices at the moment.")) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index f67fe7456e93..fbaff6bca751 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -64,7 +64,7 @@ /obj/item/clothing/head/helmet/space/hardsuit/proc/display_visor_message(var/msg) var/mob/wearer = loc if(msg && ishuman(wearer)) - wearer.show_message("[icon2html(src, wearer)][msg]", MSG_VISUAL) + wearer.show_message("[icon2html(src, wearer)][span_robot("[msg]")]", MSG_VISUAL) /obj/item/clothing/head/helmet/space/hardsuit/rad_act(severity) . = ..() diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 866cfb1d2630..b66ef2053df5 100755 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -147,7 +147,7 @@ span_notice("You 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]" + GLOB.commendations += "[user.real_name] awarded [M.real_name] the [span_medaltext("[name]")]! \n- [input]" commended = TRUE desc += "
The inscription reads: [input] - [user.real_name]" log_game("[key_name(M)] was given the following commendation by [key_name(user)]: [input]") diff --git a/code/modules/error_handler/error_viewer.dm b/code/modules/error_handler/error_viewer.dm index adcbb8fb57f3..d355043fff86 100644 --- a/code/modules/error_handler/error_viewer.dm +++ b/code/modules/error_handler/error_viewer.dm @@ -169,7 +169,7 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache) if (istype(desclines)) for (var/line in desclines) // There's probably a better way to do this than non-breaking spaces... - desc += "[html_encode(line)]
" + desc += "[span_runtime_line("[html_encode(line)]")]
" if (usr) usr_ref = "[REF(usr)]" diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 33fb9486a8c6..9f42631e1e57 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -881,7 +881,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( switch(message) if("blob alert") to_chat(target, "

Biohazard Alert

") - to_chat(target, "

Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.

") + to_chat(target, "

[span_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.")]

") SEND_SOUND(target, SSstation.announcer.event_sounds[ANNOUNCER_OUTBREAK5]) if("ratvar") target.playsound_local(target, 'sound/machines/clockcult/ark_deathrattle.ogg', 50, FALSE, pressure_affected = FALSE) @@ -890,15 +890,15 @@ GLOBAL_LIST_INIT(hallucination_list, list( target.playsound_local(target, 'sound/effects/explosion_distant.ogg', 50, FALSE, pressure_affected = FALSE) if("shuttle dock") to_chat(target, "

Priority Announcement

") - to_chat(target, "

The Emergency Shuttle has docked with the station. You have 3 minutes to board the Emergency Shuttle.

") + to_chat(target, "

[span_alert("The Emergency Shuttle has docked with the station. You have 3 minutes to board the Emergency Shuttle.")]

") SEND_SOUND(target, SSstation.announcer.event_sounds[ANNOUNCER_SHUTTLEDOCK]) if("malf ai") //AI is doomsdaying! to_chat(target, "

Anomaly Alert

") - to_chat(target, "

Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.

") + to_chat(target, "

[span_alert("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.")]

") SEND_SOUND(target, SSstation.announcer.event_sounds[ANNOUNCER_AIMALF]) if("meteors") //Meteors inbound! to_chat(target, "

Meteor Alert

") - to_chat(target, "

Meteors have been detected on collision course with the station.

") + to_chat(target, "

[span_alert("Meteors have been detected on collision course with the station.")]

") SEND_SOUND(target, SSstation.announcer.event_sounds[ANNOUNCER_METEORS]) if("supermatter") SEND_SOUND(target, 'sound/magic/charge.ogg') 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 9ca1a5f28d55..43359ccf63d3 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -96,7 +96,7 @@ var/obj/item/reagent_containers/food/snacks/icecream/I = O if(!I.ice_creamed) if(product_types[dispense_flavour] > 0) - visible_message("[icon2html(src, viewers(src))] [user] scoops delicious [flavour_name] ice cream into [I].") + visible_message("[icon2html(src, viewers(src))] [span_info("[user] scoops delicious [flavour_name] ice cream into [I].")]") product_types[dispense_flavour] -= 1 I.add_ice_cream(flavour_name) if(I.reagents.total_volume < 10) diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 41b1b55642b1..caad9bd2ee58 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -83,7 +83,7 @@ . += span_notice("\The [src] is empty.") if(!(stat & (NOPOWER|BROKEN))) - . += "The status display reads:\n"+\ + . += "[span_notice("The status display reads:")]\n"+\ "- Capacity: [max_n_of_items] items.\n"+\ "- Cook time reduced by [(efficiency - 1) * 25]%." diff --git a/code/modules/games/wizoff.dm b/code/modules/games/wizoff.dm index 6f355a0bebf9..b34bda959bcd 100644 --- a/code/modules/games/wizoff.dm +++ b/code/modules/games/wizoff.dm @@ -14,12 +14,12 @@ /obj/item/toy/cards/deck/wizoff/examine(mob/user) var/list/msg = list(span_notice("Remember the rules of Wiz-Off!")) - msg += "\tEach player draws 5 cards." - msg += "\tThere are five rounds. Each round, a player selects a card to play, and the winner is selected based on the following rules:" - msg += "\tDefensive beats Offensive!" - msg += "\tOffensive beats Utility!" - msg += "\tUtility beats Defensive!" - msg += "\tIf both players play the same type of spell, the higher number wins!" - msg += "\tThe player who wins the most of the 5 rounds wins the game!" - msg += "\tNow get ready to battle for the fate of the universe: Wiz-Off!" + msg += "\t[span_info("Each player draws 5 cards.")]" + msg += "\t[span_info("There are five rounds. Each round, a player selects a card to play, and the winner is selected based on the following rules:")]" + msg += "\t[span_info("Defensive beats Offensive!")]" + msg += "\t[span_info("Offensive beats Utility!")]" + msg += "\t[span_info("Utility beats Defensive!")]" + msg += "\t[span_info("If both players play the same type of spell, the higher number wins!")]" + msg += "\t[span_info("The player who wins the most of the 5 rounds wins the game!")]" + msg += "\t[span_notice("Now get ready to battle for the fate of the universe: Wiz-Off!")]" return msg \ No newline at end of file diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm index 089adcebc109..efe8b0f6641b 100644 --- a/code/modules/hydroponics/gene_modder.dm +++ b/code/modules/hydroponics/gene_modder.dm @@ -129,45 +129,45 @@ dat += "
Are you sure you want to [operation] " switch(operation) if("remove") - dat += "[target.get_name()] gene from \the [seed]?
" + dat += "[span_highlight("[target.get_name()]")] gene from \the [span_highlight("[seed]")]?
" if("extract") - dat += "[target.get_name()] gene from \the [seed]?
" + dat += "[span_highlight("[target.get_name()]")] gene from \the [span_highlight("[seed]")]?
" 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)) if(gene.value > max_potency) - dat += "

This device's extraction capabilities are currently limited to [max_potency] potency. " - dat += "Target gene will be degraded to [max_potency] potency on extraction." + dat += "

This device's extraction capabilities are currently limited to [span_highlight("[max_potency]")] potency. " + dat += "Target gene will be degraded to [span_highlight("[max_potency]")] potency on extraction." else if(istype(target, /datum/plant_gene/core/lifespan)) if(gene.value > max_endurance) - dat += "

This device's extraction capabilities are currently limited to [max_endurance] lifespan. " - dat += "Target gene will be degraded to [max_endurance] Lifespan on extraction." + dat += "

This device's extraction capabilities are currently limited to [span_highlight("[max_endurance]")] lifespan. " + dat += "Target gene will be degraded to [span_highlight("[max_endurance]")] Lifespan on extraction." else if(istype(target, /datum/plant_gene/core/endurance)) if(gene.value > max_endurance) - dat += "

This device's extraction capabilities are currently limited to [max_endurance] endurance. " - dat += "Target gene will be degraded to [max_endurance] endurance on extraction." + dat += "

This device's extraction capabilities are currently limited to [span_highlight("[max_endurance]")] endurance. " + dat += "Target gene will be degraded to [span_highlight("[max_endurance]")] endurance on extraction." else if(istype(target, /datum/plant_gene/core/yield)) if(gene.value > max_yield) - dat += "

This device's extraction capabilities are currently limited to [max_yield] yield. " - dat += "Target gene will be degraded to [max_yield] yield on extraction." + dat += "

This device's extraction capabilities are currently limited to [span_highlight("[max_yield]")] yield. " + dat += "Target gene will be degraded to [span_highlight("[max_yield]")] yield on extraction." else if(istype(target, /datum/plant_gene/core/production)) if(gene.value < min_production) - dat += "

This device's extraction capabilities are currently limited to [min_production] production. " - dat += "Target gene will be degraded to [min_production] production on extraction." + dat += "

This device's extraction capabilities are currently limited to [span_highlight("[min_production]")] production. " + dat += "Target gene will be degraded to [span_highlight("[min_production]")] production on extraction." else if(istype(target, /datum/plant_gene/core/weed_rate)) if(gene.value < min_wrate) - dat += "

This device's extraction capabilities are currently limited to [min_wrate] weed rate. " - dat += "Target gene will be degraded to [min_wrate] weed rate on extraction." + dat += "

This device's extraction capabilities are currently limited to [span_highlight("[min_wrate]")] weed rate. " + dat += "Target gene will be degraded to [span_highlight("[min_wrate]")] weed rate on extraction." else if(istype(target, /datum/plant_gene/core/weed_chance)) if(gene.value < min_wchance) - dat += "

This device's extraction capabilities are currently limited to [min_wchance] weed chance. " - dat += "Target gene will be degraded to [min_wchance] weed chance on extraction." + dat += "

This device's extraction capabilities are currently limited to [span_highlight("[min_wchance]")] weed chance. " + dat += "Target gene will be degraded to [span_highlight("[min_wchance]")] weed chance on extraction." if("replace") - dat += "[target.get_name()] gene with [disk.gene.get_name()]?
" + dat += "[span_highlight("[target.get_name()]")] gene with [span_highlight("[disk.gene.get_name()]")]?
" if("insert") - dat += "[disk.gene.get_name()] gene into \the [seed]?
" + dat += "[span_highlight("[disk.gene.get_name()]")] gene into \the [span_highlight("[seed]")]?
" dat += "
Confirm " dat += "Abort
" popup.set_content(dat) @@ -245,7 +245,7 @@ dat += "Insert: [disk.gene.get_name()]" dat += "
" From e2efe19229029f6f1ca5b559ac495263470f75b9 Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Tue, 7 Sep 2021 17:18:20 -0500 Subject: [PATCH 4/7] Misses a conflict --- code/game/objects/items/stacks/sheets/sheet_types.dm | 4 ++-- code/modules/admin/verbs/adminpm.dm | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 1d4da1dbe559..b54ffba2dfeb 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -475,14 +475,14 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ if(istype(I, /obj/item/stamp/chameleon) && !istype(loc, /obj/item/storage)) var/atom/droploc = drop_location() if(use(1)) - to_chat(user, "You stamp the cardboard in a sinister way.") + to_chat(user, span-notice("You stamp the cardboard in a sinister way.")) if (amount >= 0) new/obj/item/storage/box/syndie_kit(droploc) if(istype(I, /obj/item/stamp/syndiround) && !istype(loc, /obj/item/storage)) var/atom/droploc = drop_location() if(use(1)) - to_chat(user, "You stamp the cardboard in a sinister way.") + to_chat(user, span-notice("You stamp the cardboard in a sinister way.")) if (amount >= 0) new/obj/item/storage/box/syndie_kit(droploc) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index c6431cd0e6ed..a7fe2c585201 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -368,11 +368,7 @@ html = "Click on the administrator's name to reply.", confidential = TRUE) // yogs - Yog Tickets -<<<<<<< HEAD - admin_ticket_log(C, span_notice("PM From [irc_tagged]: [msg]")) // yogs - Yog Tickets -======= admin_ticket_log(C, "PM From [irc_tagged]: [msg]") // yogs - Yog Tickets ->>>>>>> origin/master window_flash(C, ignorepref = TRUE) //always play non-admin recipients the adminhelp sound From 12333cb82deb9d8736ba9cf4c16fe44e274a2b52 Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Sat, 11 Sep 2021 09:14:12 -0500 Subject: [PATCH 5/7] Fix compile errors --- code/game/objects/items/stacks/medical.dm | 2 +- code/game/objects/items/stacks/sheets/sheet_types.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 426b38ab72fc..923f7c417406 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -47,7 +47,7 @@ return else if(other_delay) if(!silent) - user.visible_message(span_notice("[user] starts to apply \the [src] on [patient]."), span_notice("You begin applying \the [src] on [patient]...")) + user.visible_message(span_notice("[user] starts to apply \the [src] on [M]."), span_notice("You begin applying \the [src] on [M]...")) if(!do_mob(user, M, other_delay, extra_checks=CALLBACK(M, /mob/living/proc/can_inject, user, TRUE))) return diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index b54ffba2dfeb..2c029b47dc60 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -475,14 +475,14 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ if(istype(I, /obj/item/stamp/chameleon) && !istype(loc, /obj/item/storage)) var/atom/droploc = drop_location() if(use(1)) - to_chat(user, span-notice("You stamp the cardboard in a sinister way.")) + to_chat(user, span_notice("You stamp the cardboard in a sinister way")) if (amount >= 0) new/obj/item/storage/box/syndie_kit(droploc) if(istype(I, /obj/item/stamp/syndiround) && !istype(loc, /obj/item/storage)) var/atom/droploc = drop_location() if(use(1)) - to_chat(user, span-notice("You stamp the cardboard in a sinister way.")) + to_chat(user, span_notice("You stamp the cardboard in a sinister way")) if (amount >= 0) new/obj/item/storage/box/syndie_kit(droploc) From bc0d7697958e27d62f1d18c20a8bd535051e0f7a Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Sat, 11 Sep 2021 09:29:16 -0500 Subject: [PATCH 6/7] Converts more spans --- code/__DEFINES/span.dm | 8 ++ code/__HELPERS/mobs.dm | 4 +- code/__HELPERS/roundend.dm | 2 +- code/_onclick/other_mobs.dm | 2 +- code/controllers/subsystem/job.dm | 2 +- code/controllers/subsystem/ticker.dm | 12 +-- code/datums/brain_damage/imaginary_friend.dm | 4 +- code/datums/brain_damage/magic.dm | 2 +- code/datums/brain_damage/mrat.dm | 2 +- code/datums/brain_damage/phobia.dm | 2 +- code/datums/brain_damage/split_personality.dm | 6 +- code/datums/components/fantasy/_fantasy.dm | 4 +- code/datums/components/nanites.dm | 4 +- .../diseases/advance/symptoms/choking.dm | 2 +- .../diseases/advance/symptoms/vision.dm | 2 +- .../diseases/advance/symptoms/weight.dm | 2 +- code/datums/diseases/pierrot_throat.dm | 2 +- code/datums/diseases/tuberculosis.dm | 2 +- code/datums/martial/cqc.dm | 8 +- code/datums/martial/flying_fang.dm | 2 +- code/datums/martial/mushpunch.dm | 2 +- code/datums/mutations/actions.dm | 2 +- code/datums/saymode.dm | 6 +- code/datums/status_effects/wound_effects.dm | 6 +- code/datums/traits/negative.dm | 2 +- .../datums/weather/weather_types/acid_rain.dm | 2 +- .../datums/weather/weather_types/ash_storm.dm | 2 +- .../weather/weather_types/radiation_storm.dm | 2 +- .../weather/weather_types/snow_storm.dm | 2 +- code/datums/world_topic.dm | 2 +- code/datums/wounds/_wounds.dm | 6 +- code/datums/wounds/bones.dm | 76 +++++++++---------- code/datums/wounds/burns.dm | 50 ++++++------ code/datums/wounds/loss.dm | 6 +- code/datums/wounds/pierce.dm | 18 ++--- code/datums/wounds/scars/_scars.dm | 8 +- code/datums/wounds/slash.dm | 30 ++++---- code/game/gamemodes/clock_cult/clock_cult.dm | 6 +- .../dynamic/dynamic_rulesets_roundstart.dm | 6 +- code/game/machinery/Sleeper.dm | 2 +- code/game/machinery/ai_slipper.dm | 6 +- code/game/machinery/camera/camera.dm | 10 +-- code/game/machinery/camera/camera_assembly.dm | 14 ++-- code/game/machinery/cloning.dm | 10 +-- code/game/machinery/doors/airlock.dm | 2 +- .../machinery/doors/airlock_electronics.dm | 2 +- code/game/machinery/doors/airlock_types.dm | 4 +- code/game/machinery/doors/door.dm | 2 +- code/game/machinery/doors/firedoor.dm | 16 ++-- code/game/machinery/exp_cloner.dm | 2 +- code/game/machinery/hologram.dm | 6 +- code/game/machinery/limbgrower.dm | 6 +- code/game/machinery/quantum_pad.dm | 4 +- code/game/machinery/recycler.dm | 4 +- .../machinery/telecomms/computers/message.dm | 2 +- code/game/machinery/teleporter.dm | 4 +- .../mecha/equipment/tools/medical_tools.dm | 8 +- code/game/mecha/mech_fabricator.dm | 2 +- code/game/objects/items/cards_ids.dm | 2 +- code/game/objects/items/charter.dm | 2 +- code/game/objects/items/chrono_eraser.dm | 6 +- code/game/objects/items/crab17.dm | 2 +- code/game/objects/items/defib.dm | 2 +- code/game/objects/items/devices/PDA/cart.dm | 4 +- .../devices/electroadaptive_pseudocircuit.dm | 2 +- .../objects/items/devices/radio/intercom.dm | 4 +- code/game/objects/items/devices/scanners.dm | 36 ++++----- code/game/objects/items/grenades/grenade.dm | 2 +- .../items/implants/implant_greytide.dm | 2 +- code/game/objects/items/mop.dm | 2 +- .../objects/items/robot/robot_upgrades.dm | 2 +- code/game/objects/items/stacks/medical.dm | 58 +++++++------- code/game/objects/items/storage/lockbox.dm | 4 +- code/game/objects/items/storage/secure.dm | 4 +- code/game/objects/items/taster.dm | 2 +- code/game/objects/items/weaponry.dm | 6 +- .../objects/structures/beds_chairs/bed.dm | 2 +- .../objects/structures/beds_chairs/chair.dm | 4 +- .../structures/crates_lockers/closets.dm | 4 +- code/game/objects/structures/door_assembly.dm | 16 ++-- code/game/objects/structures/false_walls.dm | 4 +- code/game/objects/structures/girders.dm | 8 +- code/game/objects/structures/grille.dm | 4 +- code/game/objects/structures/holosign.dm | 2 +- code/game/objects/structures/lattice.dm | 4 +- code/game/objects/structures/mineral_doors.dm | 2 +- code/game/objects/structures/plasticflaps.dm | 4 +- code/game/objects/structures/tables_racks.dm | 8 +- code/game/objects/structures/traps.dm | 6 +- code/game/objects/structures/window.dm | 14 ++-- .../game/turfs/simulated/floor/fancy_floor.dm | 4 +- .../game/turfs/simulated/floor/light_floor.dm | 2 +- .../turfs/simulated/floor/plasteel_floor.dm | 2 +- code/game/turfs/simulated/floor/plating.dm | 6 +- .../game/turfs/simulated/floor/reinf_floor.dm | 2 +- code/game/turfs/simulated/wall/reinf_walls.dm | 14 ++-- code/game/turfs/simulated/walls.dm | 2 +- code/modules/admin/admin.dm | 4 +- code/modules/admin/admin_verbs.dm | 2 +- code/modules/admin/topic.dm | 4 +- code/modules/admin/verbs/adminpm.dm | 24 +++--- code/modules/admin/verbs/diagnostics.dm | 2 +- .../admin/verbs/map_template_loadverb.dm | 2 +- code/modules/admin/verbs/onlyone.dm | 4 +- code/modules/admin/verbs/pray.dm | 12 +-- code/modules/admin/verbs/randomverbs.dm | 12 +-- code/modules/antagonists/abductor/abductor.dm | 2 +- .../antagonists/abductor/equipment/gland.dm | 4 +- .../blob/blobstrains/zombifying_pods.dm | 4 +- code/modules/antagonists/blob/overmind.dm | 4 +- code/modules/antagonists/blob/powers.dm | 6 +- .../changeling/powers/mimic_voice.dm | 2 +- .../clockcult/clock_effects/clock_sigils.dm | 2 +- .../clock_effects/spatial_gateway.dm | 2 +- .../clock_helpers/fabrication_helpers.dm | 8 +- .../clock_weapons/ratvarian_spear.dm | 2 +- .../clock_items/construct_chassis.dm | 4 +- .../clockcult/clock_items/judicial_visor.dm | 4 +- .../clock_items/replica_fabricator.dm | 6 +- .../clock_items/wraith_spectacles.dm | 2 +- .../antagonists/clockcult/clock_mobs.dm | 4 +- .../clockcult/clock_mobs/_eminence.dm | 6 +- .../clock_mobs/clockwork_marauder.dm | 4 +- .../antagonists/clockcult/clock_scripture.dm | 2 +- .../antagonists/clockcult/clock_structure.dm | 2 +- .../clock_structures/_trap_object.dm | 2 +- .../ark_of_the_clockwork_justicar.dm | 8 +- .../clock_structures/clockwork_obelisk.dm | 2 +- .../clock_structures/eminence_spire.dm | 14 ++-- .../clock_structures/heralds_beacon.dm | 4 +- .../clockcult/clock_structures/mania_motor.dm | 2 +- .../clock_structures/ocular_warden.dm | 2 +- .../ratvar_the_clockwork_justicar.dm | 2 +- code/modules/antagonists/cult/blood_magic.dm | 12 +-- code/modules/antagonists/cult/cult_comms.dm | 12 +-- code/modules/antagonists/cult/cult_items.dm | 2 +- .../antagonists/cult/cult_structures.dm | 6 +- code/modules/antagonists/cult/ritual.dm | 2 +- code/modules/antagonists/cult/runes.dm | 6 +- code/modules/antagonists/devil/devil.dm | 4 +- .../antagonists/disease/disease_mob.dm | 4 +- .../eldritch_cult/eldritch_effects.dm | 2 +- code/modules/antagonists/fugitive/fugitive.dm | 2 +- code/modules/antagonists/fugitive/old_god.dm | 2 +- code/modules/antagonists/monkey/monkey.dm | 8 +- code/modules/antagonists/revenant/revenant.dm | 4 +- .../revenant/revenant_abilities.dm | 4 +- .../antagonists/revenant/revenant_blight.dm | 2 +- .../antagonists/slaughter/slaughter_antag.dm | 4 +- .../traitor/IAA/internal_affairs.dm | 2 +- .../antagonists/traitor/datum_traitor.dm | 2 +- .../traitor/equipment/Malf_Modules.dm | 8 +- .../antagonists/valentines/valentine.dm | 2 +- .../antagonists/zombie/abilities/spit.dm | 2 +- code/modules/antagonists/zombie/zombie.dm | 6 +- .../components/unary_devices/thermomachine.dm | 4 +- code/modules/awaymissions/capture_the_flag.dm | 2 +- code/modules/cargo/export_scanner.dm | 2 +- code/modules/client/client_procs.dm | 10 +-- code/modules/client/preferences.dm | 4 +- code/modules/client/preferences_savefile.dm | 2 +- code/modules/client/verbs/ooc.dm | 2 +- code/modules/clothing/clothing.dm | 20 ++--- code/modules/clothing/head/helmet.dm | 2 +- code/modules/detectivework/scanner.dm | 10 +-- code/modules/discord/manipulation.dm | 8 +- code/modules/events/flutes.dm | 26 +++---- code/modules/flufftext/Dreaming.dm | 2 +- code/modules/flufftext/Hallucination.dm | 2 +- code/modules/food_and_drinks/food/snacks.dm | 2 +- .../kitchen_machinery/microwave.dm | 2 +- .../kitchen_machinery/smartfridge.dm | 4 +- code/modules/holiday/halloween.dm | 10 +-- code/modules/hydroponics/biogenerator.dm | 4 +- code/modules/hydroponics/grown/replicapod.dm | 2 +- code/modules/hydroponics/hydroponics.dm | 2 +- code/modules/hydroponics/seed_extractor.dm | 2 +- code/modules/hydroponics/seeds.dm | 4 +- code/modules/library/lib_items.dm | 10 +-- .../modules/mining/equipment/explorer_gear.dm | 2 +- .../mining/equipment/kinetic_crusher.dm | 4 +- code/modules/mining/laborcamp/laborstacker.dm | 2 +- .../mining/lavaland/necropolis_chests.dm | 2 +- code/modules/mining/minebot.dm | 2 +- code/modules/mob/dead/new_player/login.dm | 4 +- .../modules/mob/dead/new_player/new_player.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 4 +- code/modules/mob/living/blood.dm | 2 +- code/modules/mob/living/bloodcrawl.dm | 10 +-- code/modules/mob/living/brain/brain_item.dm | 6 +- .../carbon/alien/humanoid/alien_powers.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 8 +- .../mob/living/carbon/carbon_defense.dm | 16 ++-- code/modules/mob/living/carbon/examine.dm | 8 +- .../mob/living/carbon/human/examine.dm | 6 +- code/modules/mob/living/carbon/human/human.dm | 2 +- .../mob/living/carbon/human/human_defense.dm | 6 +- code/modules/mob/living/living_defense.dm | 4 +- code/modules/mob/living/login.dm | 2 +- code/modules/mob/living/silicon/ai/examine.dm | 4 +- .../mob/living/silicon/robot/examine.dm | 4 +- code/modules/mob/living/silicon/say.dm | 2 +- .../mob/living/simple_animal/bot/bot.dm | 2 +- .../mob/living/simple_animal/bot/medbot.dm | 2 +- .../mob/living/simple_animal/constructs.dm | 10 +-- .../mob/living/simple_animal/friendly/cat.dm | 2 +- .../simple_animal/friendly/drone/_drone.dm | 4 +- .../friendly/drone/extra_drone_types.dm | 2 +- .../friendly/drone/interaction.dm | 4 +- .../living/simple_animal/guardian/guardian.dm | 24 +++--- .../simple_animal/guardian/types/assassin.dm | 2 +- .../simple_animal/guardian/types/charger.dm | 4 +- .../simple_animal/guardian/types/dextrous.dm | 2 +- .../simple_animal/guardian/types/explosive.dm | 18 ++--- .../simple_animal/guardian/types/fire.dm | 2 +- .../guardian/types/gravitokinetic.dm | 2 +- .../simple_animal/guardian/types/lightning.dm | 2 +- .../simple_animal/guardian/types/protector.dm | 4 +- .../simple_animal/guardian/types/ranged.dm | 4 +- .../simple_animal/guardian/types/standard.dm | 2 +- .../simple_animal/guardian/types/support.dm | 4 +- .../simple_animal/hostile/giant_spider.dm | 8 +- .../living/simple_animal/hostile/hostile.dm | 2 +- .../hostile/megafauna/colossus.dm | 6 +- .../simple_animal/hostile/megafauna/legion.dm | 2 +- .../mob/living/simple_animal/hostile/mimic.dm | 4 +- .../modules/mob/living/simple_animal/shade.dm | 6 +- .../mob/living/simple_animal/slime/powers.dm | 14 ++-- .../mob/living/simple_animal/slime/slime.dm | 2 +- code/modules/mob/say.dm | 4 +- .../modular_computers/laptop_vendor.dm | 2 +- code/modules/ninja/suit/gloves.dm | 2 +- .../suit/n_suit_verbs/energy_net_nets.dm | 2 +- .../suit/n_suit_verbs/ninja_adrenaline.dm | 2 +- .../ninja/suit/n_suit_verbs/ninja_smoke.dm | 2 +- code/modules/ninja/suit/suit.dm | 4 +- code/modules/ninja/suit/suit_attackby.dm | 2 +- .../modules/ninja/suit/suit_initialisation.dm | 16 ++-- code/modules/paperwork/paper.dm | 6 +- code/modules/power/singularity/collector.dm | 8 +- code/modules/power/turbine.dm | 2 +- code/modules/projectiles/gun.dm | 4 +- code/modules/projectiles/guns/ballistic.dm | 2 +- .../projectiles/guns/ballistic/automatic.dm | 2 +- code/modules/projectiles/guns/energy.dm | 2 +- .../guns/energy/kinetic_accelerator.dm | 6 +- .../chemistry/machinery/reagentgrinder.dm | 2 +- .../chemistry/reagents/medicine_reagents.dm | 10 +-- .../chemistry/reagents/other_reagents.dm | 6 +- .../xenobiology/crossbreeding/_clothing.dm | 2 +- .../xenobiology/crossbreeding/regenerative.dm | 2 +- .../research/xenobiology/xenobiology.dm | 4 +- .../ruins/objects_and_mobs/sin_ruins.dm | 6 +- code/modules/spells/spell.dm | 4 +- code/modules/spells/spell_types/aimed.dm | 2 +- code/modules/spells/spell_types/devil.dm | 2 +- .../spells/spell_types/pointed/pointed.dm | 4 +- code/modules/surgery/bodyparts/_bodyparts.dm | 32 ++++---- .../surgery/bodyparts/dismemberment.dm | 2 +- code/modules/surgery/bodyparts/parts.dm | 8 +- .../surgery/bodyparts/robot_bodyparts.dm | 10 +-- code/modules/surgery/bone_mending.dm | 48 ++++++------ code/modules/surgery/burn_dressing.dm | 40 +++++----- code/modules/surgery/organic_steps.dm | 6 +- code/modules/surgery/organs/tongue.dm | 2 +- code/modules/surgery/organs/vocal_cords.dm | 2 +- code/modules/surgery/repair_puncture.dm | 44 +++++------ code/modules/surgery/tools.dm | 10 +-- code/modules/tgui_panel/tgui_panel.dm | 2 +- code/modules/uplink/uplink_purchase_log.dm | 2 +- config/admin_nicknames.json | 4 +- yogstation/code/datums/antagonists/vampire.dm | 2 +- yogstation/code/datums/components/crawl.dm | 10 +-- yogstation/code/datums/world_topic.dm | 4 +- .../game/gamemodes/battle_royale/storm.dm | 16 ++-- .../changeling/powers/abomination_powers.dm | 4 +- .../code/game/gamemodes/gangs/gang_items.dm | 10 +-- .../code/game/gamemodes/gangs/gangtool.dm | 2 +- .../game/gamemodes/vampire/vampire_powers.dm | 4 +- .../code/game/machinery/computer/arcade.dm | 2 +- yogstation/code/game/objects/items/brace.dm | 6 +- .../items/implants/implant_mindslave.dm | 2 +- yogstation/code/modules/admin/moja.dm | 2 +- .../code/modules/admin/verbs/adminhelp.dm | 4 +- .../code/modules/admin/verbs/adminsay.dm | 4 +- yogstation/code/modules/admin/verbs/queue.dm | 4 +- .../code/modules/admin/verbs/ticketpanel.dm | 16 ++-- .../antagonists/darkspawn/darkspawn.dm | 6 +- .../darkspawn/darkspawn_abilities/_divulge.dm | 4 +- .../darkspawn_abilities/_sacrament.dm | 6 +- .../darkspawn/darkspawn_abilities/creep.dm | 2 +- .../darkspawn_abilities/simulacrum.dm | 4 +- .../darkspawn_abilities/time_dilation.dm | 2 +- .../darkspawn_abilities/veil_mind.dm | 4 +- .../darkspawn/darkspawn_objects/dark_bead.dm | 4 +- .../darkspawn_objects/umbral_tendrils.dm | 8 +- .../shadowling/ascendant_shadowling.dm | 4 +- .../antagonists/shadowling/shadowling.dm | 4 +- .../shadowling/shadowling_abilities.dm | 58 +++++++------- .../special_shadowling_abilities.dm | 6 +- .../modules/antagonists/shadowling/thrall.dm | 4 +- .../antagonists/slaughter/slaughter.dm | 8 +- .../code/modules/client/verbs/antag_token.dm | 2 +- yogstation/code/modules/client/verbs/looc.dm | 2 +- .../guardian/abilities/major/explosive.dm | 14 ++-- .../guardian/abilities/major/predator.dm | 2 +- yogstation/code/modules/guardian/guardian.dm | 32 ++++---- .../code/modules/guardian/guardianbuilder.dm | 6 +- .../code/modules/guardian/standarrow.dm | 2 +- yogstation/code/modules/mentor/follow.dm | 4 +- .../carbon/human/species_types/plantpeople.dm | 2 +- .../mob/living/simple_animal/constructs.dm | 2 +- .../living/simple_animal/friendly/eggdog.dm | 4 +- .../hostile/megafauna/colossus.dm | 6 +- yogstation/code/modules/ninja/suit/ninja.dm | 2 +- .../chemistry/reagents/other_reagents.dm | 6 +- .../code/modules/spacepods/construction.dm | 32 ++++---- yogstation/code/modules/spacepods/spacepod.dm | 2 +- .../surgery/organs/shadowling_organs.dm | 4 +- 319 files changed, 997 insertions(+), 989 deletions(-) diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm index 617ecff6dfa9..3baac161ae41 100644 --- a/code/__DEFINES/span.dm +++ b/code/__DEFINES/span.dm @@ -16,6 +16,7 @@ #define span_alloy(str) ("" + str + "") #define span_announce(str) ("" + str + "") #define span_assimilator(str) ("" + str + "") +#define span_attack(str) ("" + str + "") #define span_average(str) ("" + str + "") #define span_bad(str) ("" + str + "") #define span_big(str) ("" + str + "") @@ -27,6 +28,7 @@ #define span_blueteamradio(str) ("" + str + "") #define span_bold(str) ("" + str + "") #define span_boldannounce(str) ("" + str + "") +#define span_bolddanger(str) ("" + str + "") #define span_boldnotice(str) ("" + str + "") #define span_boldwarning(str) ("" + str + "") #define span_brass(str) ("" + str + "") @@ -91,6 +93,7 @@ #define span_medradio(str) ("" + str + "") #define span_memo(str) ("" + str + "") #define span_memoedit(str) ("" + str + "") +#define span_mentor(str) ("" + str + "") #define span_message(str) ("" + str + "") #define span_mind_control(str) ("" + str + "") #define span_minorannounce(str) ("" + str + "") @@ -110,7 +113,10 @@ #define span_noticealien(str) ("" + str + "") #define span_nzcrentr(str) ("" + str + "") #define span_nzcrentr_large(str) ("" + str + "") +#define span_nzcrentr_small(str) ("" + str + "") #define span_ooc(str) ("" + str + "") +#define span_ownerdanger(str) ("" + str + "") +#define span_paper_field(str) ("" + str + "") #define span_papyrus(str) ("" + str + "") #define span_phobia(str) ("" + str + "") #define span_prefix(str) ("" + str + "") @@ -145,6 +151,7 @@ #define span_singing(str) ("" + str + "") #define span_slime(str) ("" + str + "") #define span_small(str) ("" + str + "") +#define span_smalldanger(str) ("" + str + "") #define span_smallnotice(str) ("" + str + "") #define span_smallnoticeital(str) ("" + str + "") #define span_span_notify(str) ("" + str + "") @@ -157,6 +164,7 @@ #define span_tape_recorder(str) ("" + str + "") #define span_tinynotice(str) ("" + str + "") #define span_tinynoticeital(str) ("" + str + "") +#define span_tooltip_container(str) ("" + str + "") #define span_umbra_emphasis(str) ("" + str + "") #define span_unclaimed(str) ("" + str + "") #define span_unconscious(str) ("" + str + "") diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index dd4ebbfc55d2..38e236cf71a0 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -458,7 +458,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][span_linkify("[message]")]" + message = span_deadsay("[source][span_linkify("[message]")]") for(var/mob/M in GLOB.player_list) var/datum/preferences/prefs if(M.client && M.client.prefs) @@ -555,4 +555,4 @@ GLOBAL_LIST_EMPTY(species_list) /// Gets the client of the mob, allowing for mocking of the client. /// You only need to use this if you know you're going to be mocking clients somewhere else. -#define GET_CLIENT(mob) (##mob.client || ##mob.mock_client) \ No newline at end of file +#define GET_CLIENT(mob) (##mob.client || ##mob.mock_client) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 7b92b4a9241e..03ba459d83d5 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -540,7 +540,7 @@ sec |= player.mind if (sec.len) var/list/result = list() - result += "Security Officers:
" + result += span_header("Security Officers:
") for(var/mob/living/carbon/human/player in GLOB.carbon_list) if(player.mind && (player.mind.assigned_role in GLOB.security_positions)) result += "
    [player.name] (Played by: [player.mind.key]) [(player.stat != DEAD)? "[span_greentext("survived")] as a [player.mind.assigned_role]" : "[span_redtext("fell in the line of duty")] as a [player.mind.assigned_role]"]
" diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 7da2ebffa24d..3ab4a62aefd2 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -12,7 +12,7 @@ if(!has_active_hand()) //can't attack without a hand. var/obj/item/bodypart/check_arm = get_active_hand() if(check_arm?.bodypart_disabled) - to_chat(src, "Your [check_arm.name] is in no condition to be used.") + to_chat(src, span_warning("Your [check_arm.name] is in no condition to be used.")) return to_chat(src, span_notice("You look at your arm and sigh.")) return diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 58cd8423138e..2417b3cd9eed 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -497,7 +497,7 @@ SUBSYSTEM_DEF(job) to_chat(M, "Space Law has been updated! Click here to view the updates.") //YOGS end 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.")) var/related_policy = get_policy(rank) if(related_policy) to_chat(M,related_policy) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 7b594c1b3653..bf9f7676307e 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -297,7 +297,7 @@ SUBSYSTEM_DEF(ticker) round_start_time = world.time SSdbcore.SetRoundStart() - to_chat(world, "Welcome to [station_name()], enjoy your stay!") + to_chat(world, span_notice("Welcome to [station_name()], enjoy your stay!")) SEND_SOUND(world, sound(SSstation.announcer.get_rand_welcome_sound())) current_state = GAME_STATE_PLAYING @@ -452,7 +452,7 @@ SUBSYSTEM_DEF(ticker) m = pick(memetips) if(m) - to_chat(world, "Tip of the round: [html_encode(m)]") + to_chat(world, span_purple("Tip of the round: [html_encode(m)]")) /datum/controller/subsystem/ticker/proc/check_queue() if(!queued_players.len) @@ -465,7 +465,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_userdanger("The alive players limit has been released!
[html_encode(">>Join Game<<")]")) SEND_SOUND(NP, sound('sound/misc/notice1.ogg')) NP.LateChoices() queued_players.len = 0 @@ -480,7 +480,7 @@ 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_userdanger("A slot has opened! You have approximately 20 seconds to join. \>\>Join Game\<\<")) SEND_SOUND(next_in_line, sound('sound/misc/notice1.ogg')) next_in_line.LateChoices() return @@ -687,9 +687,9 @@ 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(span_boldannounce("Rebooting World. [reason]")) diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm index 06ed173aac0d..ca44ab1a4512 100644 --- a/code/datums/brain_damage/imaginary_friend.dm +++ b/code/datums/brain_damage/imaginary_friend.dm @@ -80,7 +80,7 @@ Show() /mob/camera/imaginary_friend/proc/greet() - to_chat(src, "You are the imaginary friend of [owner]!") + to_chat(src, span_notice("You are the imaginary friend of [owner]!")) to_chat(src, span_notice("You are absolutely loyal to your friend, no matter what.")) to_chat(src, span_notice("You cannot directly influence the world around you, but you can see what [owner] cannot.")) @@ -262,7 +262,7 @@ desc = "The previous host of this body." /mob/camera/imaginary_friend/trapped/greet() - to_chat(src, "You have managed to hold on as a figment of the new host's imagination!") + to_chat(src, span_notice("You 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("You cannot directly influence the world around you, but you can see what the host cannot.")) diff --git a/code/datums/brain_damage/magic.dm b/code/datums/brain_damage/magic.dm index c83d47b2a41f..a8920076b464 100644 --- a/code/datums/brain_damage/magic.dm +++ b/code/datums/brain_damage/magic.dm @@ -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) diff --git a/code/datums/brain_damage/mrat.dm b/code/datums/brain_damage/mrat.dm index fcffe49a2221..149529a81338 100644 --- a/code/datums/brain_damage/mrat.dm +++ b/code/datums/brain_damage/mrat.dm @@ -100,7 +100,7 @@ SEND_SOUND(src, sound('sound/misc/soggy.ogg', volume = 50)) /mob/camera/imaginary_friend/mrat/greet() - to_chat(src, "You are the mentor rat of [owner]!") + to_chat(src, span_notice("You are the mentor rat of [owner]!")) to_chat(src, span_notice("Do not give [owner] any OOC information from your time as a ghost.")) to_chat(src, span_notice("Your job is to answer [owner]'s question(s) and you are given this form to assist in that.")) to_chat(src, span_notice("Don't be stupid with this or you will face the consequences.")) diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm index 8dda4725a538..ba8dcb3dd379 100644 --- a/code/datums/brain_damage/phobia.dm +++ b/code/datums/brain_damage/phobia.dm @@ -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, "You can't bring yourself to say the word \"[span_phobia("[word]")]\"!") + to_chat(owner, span_warning("You can't bring yourself to say the word \"[span_phobia("[word]")]\"!")) speech_args[SPEECH_MESSAGE] = "" /datum/brain_trauma/mild/phobia/proc/freak_out(atom/reason, trigger_word) diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm index 9ce8a838149e..2b723d502768 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -136,7 +136,7 @@ /mob/living/split_personality/Login() ..() to_chat(src, span_notice("As a split personality, you cannot do anything but observe. However, you will eventually gain control of your 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_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, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) to_chat(src, span_warning("You cannot speak, your other self is controlling your body!")) @@ -212,9 +212,9 @@ /mob/living/split_personality/traitor/Login() ..() to_chat(src, span_notice("As a brainwashed personality, you cannot do anything yet but observe. However, you may gain control of your body if you hear the special codeword, switching places with the current personality.")) - to_chat(src, "Your activation codeword is: [codeword]") + to_chat(src, span_notice("Your activation codeword is: [codeword]")) if(objective) - to_chat(src, "Your master left you an objective: [objective]. Follow it at all costs when in control.") + to_chat(src, span_notice("Your master left you an objective: [objective]. Follow it at all costs when in control.")) #undef OWNER #undef STRANGER diff --git a/code/datums/components/fantasy/_fantasy.dm b/code/datums/components/fantasy/_fantasy.dm index 607ddda4abb1..46e8516d1e31 100644 --- a/code/datums/components/fantasy/_fantasy.dm +++ b/code/datums/components/fantasy/_fantasy.dm @@ -105,7 +105,7 @@ if(canFail && prob((quality - 9)*10)) var/turf/place = get_turf(parent) - place.visible_message("[parent] [span_inathneq_large("violently glows blue")] for a while, then evaporates.") + place.visible_message(span_danger("[parent] [span_inathneq_large("violently glows blue")] for a while, then evaporates.")) master.burn() return else if(announce) @@ -141,4 +141,4 @@ span = "" effect_description = "[span_umbra_emphasis("mottled black glow")]" - location.visible_message("[span][originalName] is covered by a [effect_description] and then transforms into [parent]!") \ No newline at end of file + location.visible_message("[span][originalName] is covered by a [effect_description] and then transforms into [parent]!") diff --git a/code/datums/components/nanites.dm b/code/datums/components/nanites.dm index 83d447bd43ae..6d8611e07713 100644 --- a/code/datums/components/nanites.dm +++ b/code/datums/components/nanites.dm @@ -269,7 +269,7 @@ /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, span_notice("Nanites Detected")) to_chat(user, span_notice("Saturation: [nanite_volume]/[max_nanites]")) return TRUE else @@ -285,7 +285,7 @@ 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/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm index d66edc45dca4..f7074b3f2c74 100644 --- a/code/datums/diseases/advance/symptoms/choking.dm +++ b/code/datums/diseases/advance/symptoms/choking.dm @@ -125,7 +125,7 @@ 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("gasp") if(5) diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm index 9fb69f1fe218..bf35cb63bf23 100644 --- a/code/datums/diseases/advance/symptoms/vision.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -55,7 +55,7 @@ Bonus if(prob(base_message_chance) && !suppress_warning) to_chat(M, span_warning("Your eyes itch.")) if(3, 4) - to_chat(M, "Your eyes burn!") + to_chat(M, span_warning("Your eyes burn!")) M.blur_eyes(10) eyes.applyOrganDamage(1) else diff --git a/code/datums/diseases/advance/symptoms/weight.dm b/code/datums/diseases/advance/symptoms/weight.dm index 7409b4c7e743..45ad97cbfbfd 100644 --- a/code/datums/diseases/advance/symptoms/weight.dm +++ b/code/datums/diseases/advance/symptoms/weight.dm @@ -50,6 +50,6 @@ Bonus if(prob(base_message_chance)) 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/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index 6c787423ae3d..3b0e7f9ff896 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -22,7 +22,7 @@ to_chat(affected_mob, span_danger("You start seeing rainbows.")) if(3) if(prob(10)) - to_chat(affected_mob, "Your thoughts are interrupted by a loud HONK!") + to_chat(affected_mob, span_danger("Your 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/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index cf6fd59dcc0e..25816c909b0b 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -50,7 +50,7 @@ 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.", "You could eat a crayon")]") + to_chat(affected_mob, span_warning("[pick("Your stomach silently rumbles...", "Your stomach seizes up and falls limp, muscles dead and lifeless.", "You could eat a crayon")]")) affected_mob.overeatduration = max(affected_mob.overeatduration - 100, 0) affected_mob.adjust_nutrition(-100) if(prob(15)) diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 13618c267094..478c3729ecad 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -330,11 +330,11 @@ set category = "CQC" to_chat(usr, "You try to remember some of the basics of CQC.") - to_chat(usr, "All of your unarmed attacks deal stamina damage instead of your normal physical damage type") + to_chat(usr, span_notice("All of your unarmed attacks deal stamina damage instead of your normal physical damage type")) - to_chat(usr, "Disarm Intent Has a chance to disarm the opponent's main hand, and immediately pick up the item if successful") - to_chat(usr, "Grab Intent Will stun opponents for a short second, allowing you to quickly increase the strength of your grabs") - to_chat(usr, "Harm Intent Will deal a competitive amount of stamina damage, and hitting a standing opponent while you are prone will both knock them down and stand you up") + to_chat(usr, span_notice("Disarm Intent Has a chance to disarm the opponent's main hand, and immediately pick up the item if successful")) + to_chat(usr, span_notice("Grab Intent Will stun opponents for a short second, allowing you to quickly increase the strength of your grabs")) + to_chat(usr, span_notice("Harm Intent Will deal a competitive amount of stamina damage, and hitting a standing opponent while you are prone will both knock them down and stand you up")) to_chat(usr, "[span_notice("Slam")]: Grab Harm. Slam opponent into the ground, knocking them down and dealing decent stamina damage.") to_chat(usr, "[span_notice("CQC Kick")]: Disarm Harm. Knocks opponent away and slows them. Deals heavy stamina damage to prone opponents.") diff --git a/code/datums/martial/flying_fang.dm b/code/datums/martial/flying_fang.dm index b2b77e5f9e3a..9d2e888af02f 100644 --- a/code/datums/martial/flying_fang.dm +++ b/code/datums/martial/flying_fang.dm @@ -239,7 +239,7 @@ to_chat(usr, span_notice("Your training has rendered you more resistant to pain, allowing you to keep fighting effectively for longer and reducing the effectiveness of stun and stamina weapons by about a third.")) to_chat(usr, span_warning("However, the primitive instincts gained through this training prevent you from using guns, stun weapons, or armor.")) - to_chat(usr, "All of your unarmed attacks deal increased brute damage with a small amount of armor piercing") + to_chat(usr, span_notice("All of your unarmed attacks deal increased brute damage with a small amount of armor piercing")) to_chat(usr, "[span_notice("Disarm Intent")]: Headbutt your enemy, Deals minor stamina and brute damage, as well as causing eye blurriness. Prevents the target from using ranged weapons effectively for a few seconds if they are not wearing a helmet.") diff --git a/code/datums/martial/mushpunch.dm b/code/datums/martial/mushpunch.dm index 6dd96f016170..65d6038992ef 100644 --- a/code/datums/martial/mushpunch.dm +++ b/code/datums/martial/mushpunch.dm @@ -6,7 +6,7 @@ var/atk_verb to_chat(A, span_spider("You begin to wind up an attack...")) if(!do_after(A, 25, target = D)) - to_chat(A, "Your attack was interrupted!") + to_chat(A, span_spider("Your attack was interrupted!")) return TRUE //martial art code was a mistake A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) atk_verb = pick("punches", "smashes", "ruptures", "cracks") diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm index 9463d6f4f499..36c019e6e618 100644 --- a/code/datums/mutations/actions.dm +++ b/code/datums/mutations/actions.dm @@ -93,7 +93,7 @@ return var/direction_text = "[dir2text(get_dir(usr, pos))]" if(direction_text) - to_chat(user,"You consider [tracking_target]'s scent. The trail leads [direction_text].") + to_chat(user,span_notice("You consider [tracking_target]'s scent. The trail leads [direction_text].")) /datum/mutation/human/firebreath name = "Fire Breath" diff --git a/code/datums/saymode.dm b/code/datums/saymode.dm index ab848725def7..e25688723f3c 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) @@ -39,7 +39,7 @@ 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 @@ -152,7 +152,7 @@ return TRUE if(is_darkspawn_or_veil(user)) user.log_talk(message, LOG_SAY, tag="darkspawn") - var/msg = "\[Mindlink\] [user.real_name]: \"[message]\"" + var/msg = span_velvet("\[Mindlink\] [user.real_name]: \"[message]\"") for(var/mob/M in GLOB.player_list) if(M in GLOB.dead_mob_list) var/link = FOLLOW_LINK(M, user) diff --git a/code/datums/status_effects/wound_effects.dm b/code/datums/status_effects/wound_effects.dm index d9cc97fcebd7..b3751b29310a 100644 --- a/code/datums/status_effects/wound_effects.dm +++ b/code/datums/status_effects/wound_effects.dm @@ -11,14 +11,14 @@ /datum/status_effect/determined/on_apply() . = ..() - owner.visible_message("[owner]'s body tenses up noticeably, gritting against [owner.p_their()] pain!", "Your senses sharpen as your body tenses up from the wounds you've sustained!", \ + owner.visible_message(span_danger("[owner]'s body tenses up noticeably, gritting against [owner.p_their()] pain!"), span_notice("Your senses sharpen as your body tenses up from the wounds you've sustained!"), \ vision_distance=COMBAT_MESSAGE_RANGE) if(ishuman(owner)) var/mob/living/carbon/human/human_owner = owner human_owner.physiology.bleed_mod *= WOUND_DETERMINATION_BLEED_MOD /datum/status_effect/determined/on_remove() - owner.visible_message("[owner]'s body slackens noticeably!", "Your adrenaline rush dies off, and the pain from your wounds come aching back in...", vision_distance=COMBAT_MESSAGE_RANGE) + owner.visible_message(span_danger("[owner]'s body slackens noticeably!"), span_warning("Your adrenaline rush dies off, and the pain from your wounds come aching back in..."), vision_distance=COMBAT_MESSAGE_RANGE) if(ishuman(owner)) var/mob/living/carbon/human/human_owner = owner human_owner.physiology.bleed_mod /= WOUND_DETERMINATION_BLEED_MOD @@ -150,7 +150,7 @@ var/mob/living/carbon/C = owner if(C.get_active_hand() == linked_limb) - to_chat(C, "The [lowertext(linked_wound)] in your [linked_limb.name] slows your progress!") + to_chat(C, span_warning("The [lowertext(linked_wound)] in your [linked_limb.name] slows your progress!")) return linked_wound.interaction_efficiency_penalty return 1 diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 6292cd34d884..5ef5b11654f3 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -453,7 +453,7 @@ if(prob(2 + nearby_people)) H.stuttering = max(3, H.stuttering) else if(prob(min(3, nearby_people)) && !H.silent) - to_chat(H, "You retreat into yourself. You really don't feel up to talking.") + to_chat(H, span_danger("You retreat into yourself. You really don't feel up to talking.")) H.silent = max(10, H.silent) else if(prob(0.5) && dumb_thing) to_chat(H, span_userdanger("You think of a dumb thing you said a long time ago and scream internally.")) diff --git a/code/datums/weather/weather_types/acid_rain.dm b/code/datums/weather/weather_types/acid_rain.dm index 85fdc327ccbc..86614ac0c240 100644 --- a/code/datums/weather/weather_types/acid_rain.dm +++ b/code/datums/weather/weather_types/acid_rain.dm @@ -7,7 +7,7 @@ telegraph_message = span_boldwarning("Thunder rumbles far above. You hear droplets drumming against the canopy. Seek shelter.") telegraph_sound = 'sound/ambience/acidrain_start.ogg' - weather_message = "Acidic rain pours down around you! Get inside!" + weather_message = span_userdanger("Acidic rain pours down around you! Get inside!") weather_overlay = "acid_rain" weather_duration_lower = 600 weather_duration_upper = 1500 diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm index aea6f33cb498..570cfb9249be 100644 --- a/code/datums/weather/weather_types/ash_storm.dm +++ b/code/datums/weather/weather_types/ash_storm.dm @@ -7,7 +7,7 @@ telegraph_duration = 300 telegraph_overlay = "light_ash" - weather_message = "Smoldering clouds of scorching ash billow down around you! Get inside!" + weather_message = span_userdanger("Smoldering clouds of scorching ash billow down around you! Get inside!") weather_duration_lower = 600 weather_duration_upper = 1200 weather_overlay = "ash_storm" diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm index 71ccc42c2a1a..b60614c8e2db 100644 --- a/code/datums/weather/weather_types/radiation_storm.dm +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -6,7 +6,7 @@ telegraph_duration = 400 telegraph_message = span_danger("The air begins to grow warm.") - weather_message = "You feel waves of heat wash over you! Find shelter!" + weather_message = span_userdanger("You feel waves of heat wash over you! Find shelter!") weather_overlay = "ash_storm" weather_duration_lower = 600 weather_duration_upper = 1500 diff --git a/code/datums/weather/weather_types/snow_storm.dm b/code/datums/weather/weather_types/snow_storm.dm index 299fcaebd3a5..505391464631 100644 --- a/code/datums/weather/weather_types/snow_storm.dm +++ b/code/datums/weather/weather_types/snow_storm.dm @@ -7,7 +7,7 @@ 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_userdanger("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 diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index 48124e603054..11f314b02b2e 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -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/_wounds.dm b/code/datums/wounds/_wounds.dm index 281d694135e2..f91b124e8d41 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -147,14 +147,14 @@ return if(!(silent || demoted)) - var/msg = "[victim]'s [limb.name] [occur_text]!" + var/msg = span_danger("[victim]'s [limb.name] [occur_text]!") var/vis_dist = COMBAT_MESSAGE_RANGE if(severity != WOUND_SEVERITY_MODERATE) msg = "[msg]" vis_dist = DEFAULT_MESSAGE_RANGE - victim.visible_message(msg, "Your [limb.name] [occur_text]!", vision_distance = vis_dist) + victim.visible_message(msg, span_userdanger("Your [limb.name] [occur_text]!"), vision_distance = vis_dist) if(sound_effect) playsound(L.owner, sound_effect, 70 + 20 * severity, TRUE) @@ -282,7 +282,7 @@ // now that we've determined we have a valid attempt at treating, we can stomp on their dreams if we're already interacting with the patient if(INTERACTING_WITH(user, victim)) - to_chat(user, "You're already interacting with [victim]!") + to_chat(user, span_warning("You're already interacting with [victim]!")) return TRUE if(!victim.can_inject(user, TRUE)) diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm index 84c68e0576f0..677d78ca436c 100644 --- a/code/datums/wounds/bones.dm +++ b/code/datums/wounds/bones.dm @@ -51,7 +51,7 @@ I = victim.get_inactive_held_item() if(I && victim.dropItemToGround(I)) - victim.visible_message("[victim] drops [I] in shock!", "The force on your [limb.name] causes you to drop [I]!", vision_distance=COMBAT_MESSAGE_RANGE) + victim.visible_message(span_danger("[victim] drops [I] in shock!"), span_warning("The force on your [limb.name] causes you to drop [I]!"), vision_distance=COMBAT_MESSAGE_RANGE) update_inefficiencies() @@ -86,13 +86,13 @@ if(prob(severity * 3)) victim.take_bodypart_damage(rand(1, severity * 2), stamina=rand(2, severity * 2.5), wound_bonus=CANT_WOUND) if(prob(33)) - to_chat(victim, "You feel a sharp pain in your body as your bones are reforming!") + to_chat(victim, span_danger("You feel a sharp pain in your body as your bones are reforming!")) if(regen_ticks_current > regen_ticks_needed) if(!victim || !limb) qdel(src) return - to_chat(victim, "Your [limb.name] has recovered from your fracture!") + to_chat(victim, span_green("Your [limb.name] has recovered from your fracture!")) remove_wound() /// If we're a human who's punching something with a broken arm, we might hurt ourselves doing so @@ -104,11 +104,11 @@ if(prob((severity - 1) * 15)) // And you have a 70% or 50% chance to actually land the blow, respectively if(prob(70 - 20 * (severity - 1))) - to_chat(victim, "The fracture in your [limb.name] shoots with pain as you strike [target]!") + to_chat(victim, span_userdanger("The fracture in your [limb.name] shoots with pain as you strike [target]!")) limb.receive_damage(brute=rand(1,5)) else - victim.visible_message("[victim] weakly strikes [target] with [victim.p_their()] broken [limb.name], recoiling from pain!", \ - "You fail to strike [target] as the fracture in your [limb.name] lights up in unbearable pain!", vision_distance=COMBAT_MESSAGE_RANGE) + victim.visible_message(span_danger("[victim] weakly strikes [target] with [victim.p_their()] broken [limb.name], recoiling from pain!"), \ + span_userdanger("You fail to strike [target] as the fracture in your [limb.name] lights up in unbearable pain!"), vision_distance=COMBAT_MESSAGE_RANGE) victim.emote("scream") victim.Stun(0.5 SECONDS) limb.receive_damage(brute=rand(3,7)) @@ -128,14 +128,14 @@ if(1 to 6) victim.bleed(blood_bled, TRUE) if(7 to 13) - victim.visible_message("[victim] coughs up a bit of blood from the blow to [victim.p_their()] chest.", "You cough up a bit of blood from the blow to your chest.", vision_distance=COMBAT_MESSAGE_RANGE) + victim.visible_message(span_smalldanger("[victim] coughs up a bit of blood from the blow to [victim.p_their()] chest."), span_danger("You cough up a bit of blood from the blow to your chest."), vision_distance=COMBAT_MESSAGE_RANGE) victim.bleed(blood_bled, TRUE) if(14 to 19) - victim.visible_message("[victim] spits out a string of blood from the blow to [victim.p_their()] chest!", "You spit out a string of blood from the blow to your chest!", vision_distance=COMBAT_MESSAGE_RANGE) + victim.visible_message(span_smalldanger("[victim] spits out a string of blood from the blow to [victim.p_their()] chest!"), span_danger("You spit out a string of blood from the blow to your chest!"), vision_distance=COMBAT_MESSAGE_RANGE) new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) victim.bleed(blood_bled) if(20 to INFINITY) - victim.visible_message("[victim] chokes up a spray of blood from the blow to [victim.p_their()] chest!", "You choke up on a spray of blood from the blow to your chest!", vision_distance=COMBAT_MESSAGE_RANGE) + victim.visible_message(span_danger("[victim] chokes up a spray of blood from the blow to [victim.p_their()] chest!"), span_danger("You choke up on a spray of blood from the blow to your chest!"), vision_distance=COMBAT_MESSAGE_RANGE) victim.bleed(blood_bled) new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) victim.add_splatter_floor(get_step(victim.loc, victim.dir)) @@ -214,7 +214,7 @@ /datum/wound/blunt/moderate/crush() if(prob(33)) - victim.visible_message("[victim]'s dislocated [limb.name] pops back into place!", "Your dislocated [limb.name] pops back into place! Ow!") + victim.visible_message(span_danger("[victim]'s dislocated [limb.name] pops back into place!"), span_userdanger("Your dislocated [limb.name] pops back into place! Ow!")) remove_wound() /datum/wound/blunt/moderate/try_handling(mob/living/carbon/human/user) @@ -222,12 +222,12 @@ return FALSE if(user.grab_state == GRAB_PASSIVE) - to_chat(user, "You must have [victim] in an aggressive grab to manipulate [victim.p_their()] [lowertext(name)]!") + to_chat(user, span_warning("You must have [victim] in an aggressive grab to manipulate [victim.p_their()] [lowertext(name)]!")) return TRUE if(user.grab_state >= GRAB_AGGRESSIVE) - user.visible_message("[user] begins twisting and straining [victim]'s dislocated [limb.name]!", "You begin twisting and straining [victim]'s dislocated [limb.name]...", ignored_mobs=victim) - to_chat(victim, "[user] begins twisting and straining your dislocated [limb.name]!") + user.visible_message(span_danger("[user] begins twisting and straining [victim]'s dislocated [limb.name]!"), span_notice("You begin twisting and straining [victim]'s dislocated [limb.name]..."), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] begins twisting and straining your dislocated [limb.name]!")) if(user.a_intent == INTENT_HELP) chiropractice(user) else @@ -242,14 +242,14 @@ return if(prob(65)) - user.visible_message("[user] snaps [victim]'s dislocated [limb.name] back into place!", "You snap [victim]'s dislocated [limb.name] back into place!", ignored_mobs=victim) - to_chat(victim, "[user] snaps your dislocated [limb.name] back into place!") + user.visible_message(span_danger("[user] snaps [victim]'s dislocated [limb.name] back into place!"), span_notice("You snap [victim]'s dislocated [limb.name] back into place!"), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] snaps your dislocated [limb.name] back into place!")) victim.emote("scream") limb.receive_damage(brute=20, wound_bonus=CANT_WOUND) qdel(src) else - user.visible_message("[user] wrenches [victim]'s dislocated [limb.name] around painfully!", "You wrench [victim]'s dislocated [limb.name] around painfully!", ignored_mobs=victim) - to_chat(victim, "[user] wrenches your dislocated [limb.name] around painfully!") + user.visible_message(span_danger("[user] wrenches [victim]'s dislocated [limb.name] around painfully!"), span_danger("You wrench [victim]'s dislocated [limb.name] around painfully!"), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] wrenches your dislocated [limb.name] around painfully!")) limb.receive_damage(brute=10, wound_bonus=CANT_WOUND) chiropractice(user) @@ -261,33 +261,33 @@ return if(prob(65)) - user.visible_message("[user] snaps [victim]'s dislocated [limb.name] with a sickening crack!", "You snap [victim]'s dislocated [limb.name] with a sickening crack!", ignored_mobs=victim) - to_chat(victim, "[user] snaps your dislocated [limb.name] with a sickening crack!") + user.visible_message(span_danger("[user] snaps [victim]'s dislocated [limb.name] with a sickening crack!"), span_danger("You snap [victim]'s dislocated [limb.name] with a sickening crack!"), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] snaps your dislocated [limb.name] with a sickening crack!")) victim.emote("scream") limb.receive_damage(brute=25, wound_bonus=30) else - user.visible_message("[user] wrenches [victim]'s dislocated [limb.name] around painfully!", "You wrench [victim]'s dislocated [limb.name] around painfully!", ignored_mobs=victim) - to_chat(victim, "[user] wrenches your dislocated [limb.name] around painfully!") + user.visible_message(span_danger("[user] wrenches [victim]'s dislocated [limb.name] around painfully!"), span_danger("You wrench [victim]'s dislocated [limb.name] around painfully!"), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] wrenches your dislocated [limb.name] around painfully!")) limb.receive_damage(brute=10, wound_bonus=CANT_WOUND) malpractice(user) /datum/wound/blunt/moderate/treat(obj/item/I, mob/user) if(victim == user) - victim.visible_message("[user] begins resetting [victim.p_their()] [limb.name] with [I].", "You begin resetting your [limb.name] with [I]...") + victim.visible_message(span_danger("[user] begins resetting [victim.p_their()] [limb.name] with [I]."), span_warning("You begin resetting your [limb.name] with [I]...")) else - user.visible_message("[user] begins resetting [victim]'s [limb.name] with [I].", "You begin resetting [victim]'s [limb.name] with [I]...") + user.visible_message(span_danger("[user] begins resetting [victim]'s [limb.name] with [I]."), span_notice("You begin resetting [victim]'s [limb.name] with [I]...")) if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) return if(victim == user) limb.receive_damage(brute=15, wound_bonus=CANT_WOUND) - victim.visible_message("[user] finishes resetting [victim.p_their()] [limb.name]!", "You reset your [limb.name]!") + victim.visible_message(span_danger("[user] finishes resetting [victim.p_their()] [limb.name]!"), span_userdanger("You reset your [limb.name]!")) else limb.receive_damage(brute=10, wound_bonus=CANT_WOUND) - user.visible_message("[user] finishes resetting [victim]'s [limb.name]!", "You finish resetting [victim]'s [limb.name]!", victim) - to_chat(victim, "[user] resets your [limb.name]!") + user.visible_message(span_danger("[user] finishes resetting [victim]'s [limb.name]!"), span_nicegreen("You finish resetting [victim]'s [limb.name]!"), victim) + to_chat(victim, span_userdanger("[user] resets your [limb.name]!")) victim.emote("scream") qdel(src) @@ -351,10 +351,10 @@ /// if someone is using bone gel on our wound /datum/wound/blunt/proc/gel(obj/item/stack/medical/bone_gel/I, mob/user) if(gelled) - to_chat(user, "[user == victim ? "Your" : "[victim]'s"] [limb.name] is already coated with bone gel!") + to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [limb.name] is already coated with bone gel!")) return - user.visible_message("[user] begins hastily applying [I] to [victim]'s' [limb.name]...", "You begin hastily applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name], disregarding the warning label...") + user.visible_message(span_danger("[user] begins hastily applying [I] to [victim]'s' [limb.name]..."), span_warning("You begin hastily applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name], disregarding the warning label...")) if(!do_after(user, base_treat_time * 1.5 * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) return @@ -362,8 +362,8 @@ I.use(1) victim.emote("scream") if(user != victim) - user.visible_message("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!", "You finish applying [I] to [victim]'s [limb.name]!", ignored_mobs=victim) - to_chat(victim, "[user] finishes applying [I] to your [limb.name], and you can feel the bones exploding with pain as they begin melting and reforming!") + user.visible_message(span_notice("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!"), span_notice("You finish applying [I] to [victim]'s [limb.name]!"), ignored_mobs=victim) + to_chat(victim, span_userdanger("[user] finishes applying [I] to your [limb.name], and you can feel the bones exploding with pain as they begin melting and reforming!")) else var/painkiller_bonus = 0 if(victim.drunkenness > 10) @@ -374,11 +374,11 @@ painkiller_bonus += 10 if(prob(25 + (20 * (severity - 2)) - painkiller_bonus)) // 25%/45% chance to fail self-applying with severe and critical wounds, modded by painkillers - victim.visible_message("[victim] fails to finish applying [I] to [victim.p_their()] [limb.name], passing out from the pain!", "You black out from the pain of applying [I] to your [limb.name] before you can finish!") + victim.visible_message(span_danger("[victim] fails to finish applying [I] to [victim.p_their()] [limb.name], passing out from the pain!"), span_notice("You black out from the pain of applying [I] to your [limb.name] before you can finish!")) victim.AdjustUnconscious(5 SECONDS) return regen_ticks_needed *= 1.5 - victim.visible_message("[victim] finishes applying [I] to [victim.p_their()] [limb.name], grimacing from the pain!", "You finish applying [I] to your [limb.name], and your bones explode in pain!") + victim.visible_message(span_notice("[victim] finishes applying [I] to [victim.p_their()] [limb.name], grimacing from the pain!"), span_notice("You finish applying [I] to your [limb.name], and your bones explode in pain!")) limb.receive_damage(25, stamina=100, wound_bonus=CANT_WOUND) if(!gelled) @@ -389,13 +389,13 @@ /// if someone is using surgical tape on our wound /*datum/wound/blunt/proc/tape(obj/item/stack/sticky_tape/surgical/I, mob/user) if(!gelled) - to_chat(user, "[user == victim ? "Your" : "[victim]'s"] [limb.name] must be coated with bone gel to perform this emergency operation!") + to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [limb.name] must be coated with bone gel to perform this emergency operation!")) return if(taped) - to_chat(user, "[user == victim ? "Your" : "[victim]'s"] [limb.name] is already wrapped in [I.name] and reforming!") + to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [limb.name] is already wrapped in [I.name] and reforming!")) return - user.visible_message("[user] begins applying [I] to [victim]'s' [limb.name]...", "You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...") + user.visible_message(span_danger("[user] begins applying [I] to [victim]'s' [limb.name]..."), span_warning("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...")) if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) return @@ -404,10 +404,10 @@ regen_ticks_needed *= 1.5 I.use(1) if(user != victim) - user.visible_message("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!", "You finish applying [I] to [victim]'s [limb.name]!", ignored_mobs=victim) - to_chat(victim, "[user] finishes applying [I] to your [limb.name], you immediately begin to feel your bones start to reform!") + user.visible_message(span_notice("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!"), span_notice("You finish applying [I] to [victim]'s [limb.name]!"), ignored_mobs=victim) + to_chat(victim, span_green("[user] finishes applying [I] to your [limb.name], you immediately begin to feel your bones start to reform!")) else - victim.visible_message("[victim] finishes applying [I] to [victim.p_their()] [limb.name], !", "You finish applying [I] to your [limb.name], and you immediately begin to feel your bones start to reform!") + victim.visible_message(span_notice("[victim] finishes applying [I] to [victim.p_their()] [limb.name], !"), span_green("You finish applying [I] to your [limb.name], and you immediately begin to feel your bones start to reform!")) taped = TRUE processes = TRUE*/ diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm index 1417f9b58e05..44e039eb54ee 100644 --- a/code/datums/wounds/burns.dm +++ b/code/datums/wounds/burns.dm @@ -37,7 +37,7 @@ if(strikes_to_lose_limb == 0) // we've already hit sepsis, nothing more to do victim.adjustToxLoss(0.5) if(prob(1)) - victim.visible_message("The infection on the remnants of [victim]'s [limb.name] shift and bubble nauseatingly!", "You can feel the infection on the remnants of your [limb.name] coursing through your veins!", vision_distance = COMBAT_MESSAGE_RANGE) + victim.visible_message(span_danger("The infection on the remnants of [victim]'s [limb.name] shift and bubble nauseatingly!"), span_warning("You can feel the infection on the remnants of your [limb.name] coursing through your veins!"), vision_distance = COMBAT_MESSAGE_RANGE) return if(victim.reagents) @@ -65,7 +65,7 @@ // here's the check to see if we're cleared up if((flesh_damage <= 0) && (infestation <= WOUND_INFECTION_MODERATE)) - to_chat(victim, "The burns on your [limb.name] have cleared up!") + to_chat(victim, span_green("The burns on your [limb.name] have cleared up!")) qdel(src) return @@ -84,25 +84,25 @@ if(prob(30)) victim.adjustToxLoss(0.2) if(prob(6)) - to_chat(victim, "The blisters on your [limb.name] ooze a strange pus...") + to_chat(victim, span_warning("The blisters on your [limb.name] ooze a strange pus...")) if(WOUND_INFECTION_SEVERE to WOUND_INFECTION_CRITICAL) if(!disabling && prob(2)) - to_chat(victim, "Your [limb.name] completely locks up, as you struggle for control against the infection!") + to_chat(victim, span_warning("Your [limb.name] completely locks up, as you struggle for control against the infection!")) set_disabling(TRUE) else if(disabling && prob(8)) - to_chat(victim, "You regain sensation in your [limb.name], but it's still in terrible shape!") + to_chat(victim, span_notice("You regain sensation in your [limb.name], but it's still in terrible shape!")) set_disabling(FALSE) else if(prob(20)) victim.adjustToxLoss(0.5) if(WOUND_INFECTION_CRITICAL to WOUND_INFECTION_SEPTIC) if(!disabling && prob(3)) - to_chat(victim, "You suddenly lose all sensation of the festering infection in your [limb.name]!") + to_chat(victim, span_warning("You suddenly lose all sensation of the festering infection in your [limb.name]!")) set_disabling(TRUE) else if(disabling && prob(3)) - to_chat(victim, "You can barely feel your [limb.name] again, and you have to strain to retain motor control!") + to_chat(victim, span_notice("You can barely feel your [limb.name] again, and you have to strain to retain motor control!")) set_disabling(FALSE) else if(prob(1)) - to_chat(victim, "You contemplate life without your [limb.name]...") + to_chat(victim, span_warning("You contemplate life without your [limb.name]...")) victim.adjustToxLoss(0.75) else if(prob(4)) victim.adjustToxLoss(1) @@ -111,20 +111,20 @@ strikes_to_lose_limb-- switch(strikes_to_lose_limb) if(3 to INFINITY) - to_chat(victim, "The skin on your [limb.name] is literally dripping off, you feel awful!") + to_chat(victim, span_deadsay("The skin on your [limb.name] is literally dripping off, you feel awful!")) if(2) - to_chat(victim, "The infection in your [limb.name] is literally dripping off, you feel horrible!") + to_chat(victim, span_deadsay("The infection in your [limb.name] is literally dripping off, you feel horrible!")) if(1) - to_chat(victim, "Infection has just about completely claimed your [limb.name]!") + to_chat(victim, span_deadsay("Infection has just about completely claimed your [limb.name]!")) if(0) - to_chat(victim, "The last of the nerve endings in your [limb.name] wither away, as the infection completely paralyzes your joint connector.") + to_chat(victim, span_deadsay("The last of the nerve endings in your [limb.name] wither away, as the infection completely paralyzes your joint connector.")) threshold_penalty = 120 // piss easy to destroy var/datum/brain_trauma/severe/paralysis/sepsis = new (limb.body_zone) victim.gain_trauma(sepsis) /datum/wound/burn/get_examine_description(mob/user) if(strikes_to_lose_limb <= 0) - return "[victim.p_their(TRUE)] [limb.name] has locked up completely and is non-functional." + return span_deadsay("[victim.p_their(TRUE)] [limb.name] has locked up completely and is non-functional.") var/list/condition = list("[victim.p_their(TRUE)] [limb.name] [examine_desc]") if(limb.current_gauze) @@ -149,7 +149,7 @@ if(WOUND_INFECTION_CRITICAL to WOUND_INFECTION_SEPTIC) condition += ", with streaks of rotten, pulsating infection!" if(WOUND_INFECTION_SEPTIC to INFINITY) - return "[victim.p_their(TRUE)] [limb.name] is a mess of charred skin and infected rot!" + return span_deadsay("[victim.p_their(TRUE)] [limb.name] is a mess of charred skin and infected rot!") else condition += "!" @@ -189,51 +189,51 @@ /// if someone is using ointment on our burns /datum/wound/burn/proc/ointment(obj/item/stack/medical/ointment/I, mob/user) - user.visible_message("[user] begins applying [I] to [victim]'s [limb.name]...", "You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...") + user.visible_message(span_notice("[user] begins applying [I] to [victim]'s [limb.name]..."), span_notice("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...")) if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), extra_checks = CALLBACK(src, .proc/still_exists))) return limb.heal_damage(I.heal_brute, I.heal_burn) - user.visible_message("[user] applies [I] to [victim].", "You apply [I] to [user == victim ? "your" : "[victim]'s"] [limb.name].") + user.visible_message(span_green("[user] applies [I] to [victim]."), span_green("You apply [I] to [user == victim ? "your" : "[victim]'s"] [limb.name].")) I.use(1) sanitization += I.sanitization flesh_healing += I.flesh_regeneration if((infestation <= 0 || sanitization >= infestation) && (flesh_damage <= 0 || flesh_healing > flesh_damage)) - to_chat(user, "You've done all you can with [I], now you must wait for the flesh on [victim]'s [limb.name] to recover.") + to_chat(user, span_notice("You've done all you can with [I], now you must wait for the flesh on [victim]'s [limb.name] to recover.")) else try_treating(I, user) /// if someone is using mesh on our burns /datum/wound/burn/proc/mesh(obj/item/stack/medical/mesh/I, mob/user) if(!I.is_open) - to_chat(user, "You need to open [I] first.") + to_chat(user, span_warning("You need to open [I] first.")) return - user.visible_message("[user] begins wrapping [victim]'s [limb.name] with [I]...", "You begin wrapping [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") + user.visible_message(span_notice("[user] begins wrapping [victim]'s [limb.name] with [I]..."), span_notice("You begin wrapping [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")) if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) return limb.heal_damage(I.heal_brute, I.heal_burn) - user.visible_message("[user] applies [I] to [victim].", "You apply [I] to [user == victim ? "your" : "[victim]'s"] [limb.name].") + user.visible_message(span_green("[user] applies [I] to [victim]."), span_green("You apply [I] to [user == victim ? "your" : "[victim]'s"] [limb.name].")) I.use(1) sanitization += I.sanitization flesh_healing += I.flesh_regeneration if(sanitization >= infestation && flesh_healing > flesh_damage) - to_chat(user, "You've done all you can with [I], now you must wait for the flesh on [victim]'s [limb.name] to recover.") + to_chat(user, span_notice("You've done all you can with [I], now you must wait for the flesh on [victim]'s [limb.name] to recover.")) else try_treating(I, user) /// Paramedic UV penlights /datum/wound/burn/proc/uv(obj/item/flashlight/pen/paramedic/I, mob/user) if(!COOLDOWN_FINISHED(I, uv_cooldown)) - to_chat(user, "[I] is still recharging!") + to_chat(user, span_notice("[I] is still recharging!")) return if(infestation <= 0 || infestation < sanitization) - to_chat(user, "There's no infection to treat on [victim]'s [limb.name]!") + to_chat(user, span_notice("There's no infection to treat on [victim]'s [limb.name]!")) return - user.visible_message("[user] flashes the burns on [victim]'s [limb] with [I].", "You flash the burns on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I].", vision_distance=COMBAT_MESSAGE_RANGE) + user.visible_message(span_notice("[user] flashes the burns on [victim]'s [limb] with [I]."), span_notice("You flash the burns on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]."), vision_distance=COMBAT_MESSAGE_RANGE) sanitization += I.uv_power COOLDOWN_START(I, uv_cooldown, I.uv_cooldown_length) @@ -251,7 +251,7 @@ if(flesh_healing > 0) flesh_damage = max(0, flesh_damage - 0.2) if((flesh_damage <= 0) && (infestation <= 1)) - to_chat(victim, "The burns on your [limb.name] have cleared up!") + to_chat(victim, span_green("The burns on your [limb.name] have cleared up!")) qdel(src) return if(sanitization > 0) diff --git a/code/datums/wounds/loss.dm b/code/datums/wounds/loss.dm index 4e7fc38e5ad0..e037183157b9 100644 --- a/code/datums/wounds/loss.dm +++ b/code/datums/wounds/loss.dm @@ -41,13 +41,13 @@ occur_text = "is completely incinerated, falling to dust!" victim = dismembered_part.owner - var/msg = "[victim]'s [dismembered_part.name] [occur_text]!" + var/msg = span_bolddanger("[victim]'s [dismembered_part.name] [occur_text]!") - victim.visible_message(msg, "Your [dismembered_part.name] [occur_text]!") + victim.visible_message(msg, span_userdanger("Your [dismembered_part.name] [occur_text]!")) set_limb(dismembered_part) second_wind() log_wound(victim, src) dismembered_part.dismember(wounding_type == WOUND_BURN ? BURN : BRUTE) qdel(src) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm index e0cd84315802..850cb4e3c5d7 100644 --- a/code/datums/wounds/pierce.dm +++ b/code/datums/wounds/pierce.dm @@ -37,14 +37,14 @@ if(1 to 6) victim.bleed(blood_bled, TRUE) if(7 to 13) - victim.visible_message("Blood droplets fly from the hole in [victim]'s [limb.name].", "You cough up a bit of blood from the blow to your [limb.name].", vision_distance=COMBAT_MESSAGE_RANGE) + victim.visible_message(span_smalldanger("Blood droplets fly from the hole in [victim]'s [limb.name]."), span_danger("You cough up a bit of blood from the blow to your [limb.name]."), vision_distance=COMBAT_MESSAGE_RANGE) victim.bleed(blood_bled, TRUE) if(14 to 19) - victim.visible_message("A small stream of blood spurts from the hole in [victim]'s [limb.name]!", "You spit out a string of blood from the blow to your [limb.name]!", vision_distance=COMBAT_MESSAGE_RANGE) + victim.visible_message(span_smalldanger("A small stream of blood spurts from the hole in [victim]'s [limb.name]!"), span_danger("You spit out a string of blood from the blow to your [limb.name]!"), vision_distance=COMBAT_MESSAGE_RANGE) new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) victim.bleed(blood_bled) if(20 to INFINITY) - victim.visible_message("A spray of blood streams from the gash in [victim]'s [limb.name]!", "You choke up on a spray of blood from the blow to your [limb.name]!", vision_distance=COMBAT_MESSAGE_RANGE) + victim.visible_message(span_danger("A spray of blood streams from the gash in [victim]'s [limb.name]!"), span_danger("You choke up on a spray of blood from the blow to your [limb.name]!"), vision_distance=COMBAT_MESSAGE_RANGE) victim.bleed(blood_bled) new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) victim.add_splatter_floor(get_step(victim.loc, victim.dir)) @@ -62,7 +62,7 @@ if(victim.bodytemperature < (BODYTEMP_NORMAL - 10)) blood_flow -= 0.2 if(prob(5)) - to_chat(victim, "You feel the [lowertext(name)] in your [limb.name] firming up from the cold!") + to_chat(victim, span_notice("You feel the [lowertext(name)] in your [limb.name] firming up from the cold!")) if(HAS_TRAIT(victim, TRAIT_BLOODY_MESS)) blood_flow += 0.5 // old heparin used to just add +2 bleed stacks per tick, this adds 0.5 bleed flow to all open cuts which is probably even stronger as long as you can cut them first @@ -100,10 +100,10 @@ /// If someone is using a suture to close this puncture /datum/wound/pierce/proc/suture(obj/item/stack/medical/suture/I, mob/user) var/self_penalty_mult = (user == victim ? 1.4 : 1) - user.visible_message("[user] begins stitching [victim]'s [limb.name] with [I]...", "You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") + user.visible_message(span_notice("[user] begins stitching [victim]'s [limb.name] with [I]..."), span_notice("You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")) if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) return - user.visible_message("[user] stitches up some of the bleeding on [victim].", "You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].") + user.visible_message(span_green("[user] stitches up some of the bleeding on [victim]."), span_green("You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")) var/blood_sutured = I.stop_bleeding / self_penalty_mult blood_flow -= blood_sutured limb.heal_damage(I.heal_brute, I.heal_burn) @@ -112,18 +112,18 @@ if(blood_flow > 0) try_treating(I, user) else - to_chat(user, "You successfully close the hole in [user == victim ? "your" : "[victim]'s"] [limb.name].") + to_chat(user, span_green("You successfully close the hole in [user == victim ? "your" : "[victim]'s"] [limb.name].")) /// If someone is using either a cautery tool or something with heat to cauterize this pierce /datum/wound/pierce/proc/tool_cauterize(obj/item/I, mob/user) var/improv_penalty_mult = (I.tool_behaviour == TOOL_CAUTERY ? 1 : 1.25) // 25% longer and less effective if you don't use a real cautery var/self_penalty_mult = (user == victim ? 1.5 : 1) // 50% longer and less effective if you do it to yourself - user.visible_message("[user] begins cauterizing [victim]'s [limb.name] with [I]...", "You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") + user.visible_message(span_danger("[user] begins cauterizing [victim]'s [limb.name] with [I]..."), span_warning("You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")) if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) return - user.visible_message("[user] cauterizes some of the bleeding on [victim].", "You cauterize some of the bleeding on [victim].") + user.visible_message(span_green("[user] cauterizes some of the bleeding on [victim]."), span_green("You cauterize some of the bleeding on [victim].")) limb.receive_damage(burn = 2 + severity, wound_bonus = CANT_WOUND) if(prob(30)) victim.emote("scream") diff --git a/code/datums/wounds/scars/_scars.dm b/code/datums/wounds/scars/_scars.dm index 0da6781ef66f..21cb09b201d7 100644 --- a/code/datums/wounds/scars/_scars.dm +++ b/code/datums/wounds/scars/_scars.dm @@ -122,14 +122,14 @@ var/msg = "[victim.p_they(TRUE)] [victim.p_have()] [description] on [victim.p_their()] [precise_location]." switch(severity) if(WOUND_SEVERITY_MODERATE) - msg = "[msg]" + msg = span_tinynoticeital("[msg]") if(WOUND_SEVERITY_SEVERE) - msg = "[msg]" + msg = span_smallnoticeital("[msg]") if(WOUND_SEVERITY_CRITICAL) - msg = "[msg]" + msg = span_smallnoticeital("[msg]") if(WOUND_SEVERITY_LOSS) msg = "[victim.p_their(TRUE)] [limb.name] [description]." // different format - msg = "[msg]" + msg = span_notice("[msg]") return "\t[msg]" /// Whether a scar can currently be seen by the viewer diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm index 043856e3022d..253efffca442 100644 --- a/code/datums/wounds/slash.dm +++ b/code/datums/wounds/slash.dm @@ -119,7 +119,7 @@ if(demotes_to) replace_wound(demotes_to) else - to_chat(victim, "The cut on your [limb.name] has stopped bleeding!") + to_chat(victim, span_green("The cut on your [limb.name] has stopped bleeding!")) qdel(src) @@ -152,13 +152,13 @@ return FALSE if(INTERACTING_WITH(user, victim)) - to_chat(user, "You're already interacting with [victim]!") + to_chat(user, span_warning("You're already interacting with [victim]!")) return if(user.is_mouth_covered()) - to_chat(user, "Your mouth is covered, you can't lick [victim]'s wounds!") + to_chat(user, span_warning("Your mouth is covered, you can't lick [victim]'s wounds!")) return if(!user.getorganslot(ORGAN_SLOT_TONGUE)) - to_chat(user, "You can't lick wounds without a tongue!") // f in chat + to_chat(user, span_warning("You can't lick wounds without a tongue!")) // f in chat return lick_wounds(user) return TRUE @@ -169,19 +169,19 @@ for(var/datum/disease/D in victim.diseases) user.ForceContractDisease(D) - user.visible_message("[user] begins licking the wounds on [victim]'s [limb.name].", "You begin licking the wounds on [victim]'s [limb.name]...", ignored_mobs=victim) + user.visible_message(span_notice("[user] begins licking the wounds on [victim]'s [limb.name]."), span_notice("You begin licking the wounds on [victim]'s [limb.name]..."), ignored_mobs=victim) to_chat(victim, "[user] begins to lick the wounds on your [limb.name].[user] licks the wounds on [victim]'s [limb.name].", "You lick some of the wounds on [victim]'s [limb.name]", ignored_mobs=victim) + user.visible_message(span_notice("[user] licks the wounds on [victim]'s [limb.name]."), span_notice("You lick some of the wounds on [victim]'s [limb.name]"), ignored_mobs=victim) to_chat(victim, "[user] licks the wounds on your [limb.name]! minimum_flow) try_handling(user) else if(demotes_to) - to_chat(user, "You successfully lower the severity of [victim]'s cuts.") + to_chat(user, span_green("You successfully lower the severity of [victim]'s cuts.")) /datum/wound/slash/on_xadone(power) . = ..() @@ -194,7 +194,7 @@ /// If someone's putting a laser gun up to our cut to cauterize it /datum/wound/slash/proc/las_cauterize(obj/item/gun/energy/laser/lasgun, mob/user) var/self_penalty_mult = (user == victim ? 1.25 : 1) - user.visible_message("[user] begins aiming [lasgun] directly at [victim]'s [limb.name]...", "You begin aiming [lasgun] directly at [user == victim ? "your" : "[victim]'s"] [limb.name]...") + user.visible_message(span_warning("[user] begins aiming [lasgun] directly at [victim]'s [limb.name]..."), span_userdanger("You begin aiming [lasgun] directly at [user == victim ? "your" : "[victim]'s"] [limb.name]...")) if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) return var/damage = lasgun.chambered.BB.damage @@ -205,18 +205,18 @@ return victim.emote("scream") blood_flow -= damage / (5 * self_penalty_mult) // 20 / 5 = 4 bloodflow removed, p good - victim.visible_message("The cuts on [victim]'s [limb.name] scar over!") + victim.visible_message(span_warning("The cuts on [victim]'s [limb.name] scar over!")) /// If someone is using either a cautery tool or something with heat to cauterize this cut /datum/wound/slash/proc/tool_cauterize(obj/item/I, mob/user) var/improv_penalty_mult = (I.tool_behaviour == TOOL_CAUTERY ? 1 : 1.25) // 25% longer and less effective if you don't use a real cautery var/self_penalty_mult = (user == victim ? 1.5 : 1) // 50% longer and less effective if you do it to yourself - user.visible_message("[user] begins cauterizing [victim]'s [limb.name] with [I]...", "You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") + user.visible_message(span_danger("[user] begins cauterizing [victim]'s [limb.name] with [I]..."), span_warning("You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")) if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) return - user.visible_message("[user] cauterizes some of the bleeding on [victim].", "You cauterize some of the bleeding on [victim].") + user.visible_message(span_green("[user] cauterizes some of the bleeding on [victim]."), span_green("You cauterize some of the bleeding on [victim].")) limb.receive_damage(burn = 2 + severity, wound_bonus = CANT_WOUND) if(prob(30)) victim.emote("scream") @@ -226,16 +226,16 @@ if(blood_flow > minimum_flow) try_treating(I, user) else if(demotes_to) - to_chat(user, "You successfully lower the severity of [user == victim ? "your" : "[victim]'s"] cuts.") + to_chat(user, span_green("You successfully lower the severity of [user == victim ? "your" : "[victim]'s"] cuts.")) /// If someone is using a suture to close this cut /datum/wound/slash/proc/suture(obj/item/stack/medical/suture/I, mob/user) var/self_penalty_mult = (user == victim ? 1.4 : 1) - user.visible_message("[user] begins stitching [victim]'s [limb.name] with [I]...", "You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...") + user.visible_message(span_notice("[user] begins stitching [victim]'s [limb.name] with [I]..."), span_notice("You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")) if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) return - user.visible_message("[user] stitches up some of the bleeding on [victim].", "You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].") + user.visible_message(span_green("[user] stitches up some of the bleeding on [victim]."), span_green("You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")) var/blood_sutured = I.stop_bleeding / self_penalty_mult blood_flow -= blood_sutured limb.heal_damage(I.heal_brute, I.heal_burn) @@ -244,7 +244,7 @@ if(blood_flow > minimum_flow) try_treating(I, user) else if(demotes_to) - to_chat(user, "You successfully lower the severity of [user == victim ? "your" : "[victim]'s"] cuts.") + to_chat(user, span_green("You successfully lower the severity of [user == victim ? "your" : "[victim]'s"] cuts.")) /datum/wound/slash/moderate diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index 51ef0fe05b92..37c159eff2be 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -201,9 +201,9 @@ Credit where due: if(!M) return 0 to_chat(M, "You are a servant of Ratvar, the Clockwork Justiciar!") - to_chat(M, "You have approximately [ark_time] minutes until the Ark activates.") - to_chat(M, "Unlock Script scripture by converting a new servant.") - to_chat(M, "Application scripture will be unlocked halfway until the Ark's activation.") + to_chat(M, span_brass("You have approximately [ark_time] minutes until the Ark activates.")) + to_chat(M, span_brass("Unlock Script scripture by converting a new servant.")) + to_chat(M, span_brass("Application scripture will be unlocked halfway until the Ark's activation.")) M.playsound_local(get_turf(M), 'sound/ambience/antag/clockcultalr.ogg', 100, FALSE, pressure_affected = FALSE) return 1 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 03673aacdc10..ee302fd29b02 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -558,9 +558,9 @@ if(!M) return 0 to_chat(M, "You are a servant of Ratvar, the Clockwork Justiciar!") - to_chat(M, "You have approximately [ark_time] minutes until the Ark activates.") - to_chat(M, "Unlock Script scripture by converting a new servant.") - to_chat(M, "Application scripture will be unlocked halfway until the Ark's activation.") + to_chat(M, span_brass("You have approximately [ark_time] minutes until the Ark activates.")) + to_chat(M, span_brass("Unlock Script scripture by converting a new servant.")) + to_chat(M, span_brass("Application scripture will be unlocked halfway until the Ark's activation.")) M.playsound_local(get_turf(M), 'sound/ambience/antag/clockcultalr.ogg', 100, FALSE, pressure_affected = FALSE) return 1 diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 8c51f2371adb..b347ca6107bd 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -25,7 +25,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 = "You feel cool air surround you. You go numb as your senses turn inward." + var/enter_message = span_notice("You feel cool air surround you. You go numb as your senses turn inward.") payment_department = ACCOUNT_MED fair_market_price = 5 diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 0fcf396cb1fd..51773e1cea6d 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() if(stat & BROKEN) @@ -33,11 +33,11 @@ to_chat(user, span_danger("[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_danger("[src] cannot be activated for [DisplayTimeText(world.time - cooldown_time)].")) return new /obj/effect/particle_effect/foam(loc) uses-- - to_chat(user, "You activate [src]. It now has [uses] uses of foam remaining.") + to_chat(user, span_notice("You activate [src]. It now has [uses] uses of foam remaining.")) cooldown = world.time + cooldown_time power_change() addtimer(CALLBACK(src, .proc/power_change), cooldown_time) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 73c1881daaf5..8798b5b55945 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -110,24 +110,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) . += 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) . += 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) . = ..() diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 8e813d0b7ca5..f69ec7ca6b95 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -37,28 +37,28 @@ . += "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) - . += "You can secure it in place with a welder, or removed with a wrench." + . += span_info("You can secure it in place with a welder, or removed with a wrench.") if(STATE_WELDED) - . += "You can add wires to it, or unweld it from the wall." + . += span_info("You can add wires to it, or unweld it from the wall.") if(STATE_WIRED) if(has_upgrades) - . += "You can remove the contained upgrades with a crowbar." - . += "You can complete it with a screwdriver, or unwire it to start removal." + . += span_info("You can remove the contained upgrades with a crowbar.") + . += span_info("You can complete it with a screwdriver, or unwire it to start removal.") if(STATE_FINISHED) . += span_boldwarning("You shouldn't be seeing this, tell a coder!") diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 7363a3e17614..a16db0ca56ab 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -89,7 +89,7 @@ GLOBAL_VAR_INIT(clones, 0) /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]%." . += "The status display reads: Biomass levels at [biomass]%" // read out the amount of biomass if you examine @@ -267,7 +267,7 @@ GLOBAL_VAR_INIT(clones, 0) if(grab_ghost_when == CLONER_FRESH_CLONE) H.grab_ghost() - to_chat(H, "Consciousness slowly creeps over you as your body regenerates.
So this is what cloning feels like?") + to_chat(H, span_notice("Consciousness slowly creeps over you as your 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 @@ -476,8 +476,8 @@ GLOBAL_VAR_INIT(clones, 0) if(grab_ghost_when == CLONER_MATURE_CLONE) mob_occupant.grab_ghost() - to_chat(occupant, "There is a bright flash!
You feel like a new being.") - to_chat(occupant, "You do not remember your death, how you died, or who killed you. See rule 1.6.") //yogs + to_chat(occupant, span_notice("There is a bright flash!
You feel like a new being.")) + to_chat(occupant, span_notice("You do not remember your death, how you died, or who killed you. See rule 1.6.")) //yogs mob_occupant.flash_act() GLOB.clones++ @@ -504,7 +504,7 @@ GLOBAL_VAR_INIT(clones, 0) 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 your consciousness as your body is torn apart.
Is this what dying is like? Yes it is.") + to_chat(mob_occupant, span_warning("Agony blazes across your consciousness as your body is torn apart.
Is this what dying is like? Yes it is.")) playsound(src, 'sound/machines/warning-buzzer.ogg', 50) SEND_SOUND(mob_occupant, sound('sound/hallucinations/veryfar_noise.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/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 3cdf2838ec6e..fc1fc26b8616 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1140,7 +1140,7 @@ if(!T.darkspawn.has_psi(15)) to_chat(user, span_warning("You need at least 15 Psi to force open an airlock!")) return - user.visible_message(span_warning("[user] starts forcing open [src]!"), "ueahz
You begin forcing open [src]...") + user.visible_message(span_warning("[user] starts forcing open [src]!"), span_velvet("ueahz
You begin forcing open [src]...")) playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE) if(!T.twin) if(!do_after(user, 75, target = src)) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index b5ea06cc9260..7bf3fefe4449 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_state(mob/user) return GLOB.always_state diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index ff7da5c52a65..cc067f320c31 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -584,9 +584,9 @@ var/gear_text = "The cogwheel is flickering and twisting wildly. Report this to a coder." switch(construction_state) if(GEAR_SECURE) - gear_text = "The cogwheel is solidly wrenched to the brass around it." + gear_text = span_brass("The cogwheel is solidly wrenched to the brass around it.") if(GEAR_LOOSE) - gear_text = "The cogwheel has been loosened, but remains connected loosely to the door!" + gear_text = span_alloy("The cogwheel has been loosened, but remains connected loosely to the door!") . += gear_text /obj/machinery/door/airlock/clockwork/emp_act(severity) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 7525aaf1f2aa..4abd3b29a4c1 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -64,7 +64,7 @@ else . += 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(!isdead(user)) var/userDir = turn(get_dir(src, user), 180) var/turf/T = get_step(src, userDir) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 0c6251ef6dfd..bcca67f909e0 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -38,13 +38,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() @@ -460,15 +460,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) . += 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() ..() diff --git a/code/game/machinery/exp_cloner.dm b/code/game/machinery/exp_cloner.dm index acd9d9cac068..416c43047ac2 100644 --- a/code/game/machinery/exp_cloner.dm +++ b/code/game/machinery/exp_cloner.dm @@ -57,7 +57,7 @@ if(grab_ghost_when == CLONER_FRESH_CLONE) H.grab_ghost() - to_chat(H, "Consciousness slowly creeps over you as your body regenerates.
So this is what cloning feels like?") + to_chat(H, span_notice("Consciousness slowly creeps over you as your 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 diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 6e8dc75b54b4..2950672e6011 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -172,7 +172,7 @@ obj/machinery/holopad/secure/Initialize() /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)) @@ -248,7 +248,7 @@ obj/machinery/holopad/secure/Initialize() for(var/mob/living/silicon/ai/AI in GLOB.silicon_mobs) if(!AI.client) continue - to_chat(AI, "Your presence is requested at \the [area].") + to_chat(AI, span_info("Your presence is requested at \the [area].")) return TRUE else to_chat(usr, span_info("A request for AI presence was already sent recently.")) @@ -695,4 +695,4 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ alpha = 100 #undef HOLOPAD_PASSIVE_POWER_USAGE -#undef HOLOGRAM_POWER_USAGE \ No newline at end of file +#undef HOLOGRAM_POWER_USAGE diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index fcf8a797015e..64f99249fe5b 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -64,7 +64,7 @@ /obj/machinery/limbgrower/attackby(obj/item/O, mob/user, params) if (busy) - to_chat(user, "The Limb Grower is busy. Please wait for completion of previous operation.") + to_chat(user, span_alert("The Limb Grower is busy. Please wait for completion of previous operation.")) return if(default_deconstruction_screwdriver(user, "limbgrower_panelopen", "limbgrower_idleoff", O)) @@ -110,7 +110,7 @@ addtimer(CALLBACK(src, .proc/build_item),32*prod_coeff) else - to_chat(usr, "The limb grower is busy. Please wait for completion of previous operation.") + to_chat(usr, span_alert("The limb grower is busy. Please wait for completion of previous operation.")) updateUsrDialog() return @@ -125,7 +125,7 @@ //Just build whatever it is new buildpath(loc) else - src.visible_message(" Something went very wrong and there isnt enough synthflesh anymore!") + src.visible_message(span_error(" Something went very wrong and there isnt enough synthflesh anymore!")) busy = FALSE flick("limbgrower_unfill",src) icon_state = "limbgrower_idleoff" diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index 3a32724049ca..07e5bf83d261 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -33,9 +33,9 @@ . = ..() . += 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 diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 718384f0663e..8089b0e02ddb 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"]."} @@ -199,4 +199,4 @@ name = "paper - 'garbage duty instructions'" info = "

New Assignment

You have been assigned to collect garbage from trash bins, located around the station. The crewmembers will put their trash into it and you will collect the said trash.

There is a recycling machine near your closet, inside maintenance; use it to recycle the trash for a small chance to get useful minerals. Then deliver these minerals to cargo or engineering. You are our last hope for a clean station, do not screw this up!" -#undef SAFETY_COOLDOWN \ No newline at end of file +#undef SAFETY_COOLDOWN diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm index a4aaef0aebda..ba3673650cf4 100644 --- a/code/game/machinery/telecomms/computers/message.dm +++ b/code/game/machinery/telecomms/computers/message.dm @@ -25,7 +25,7 @@ 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 = "%$&(£: Critical %$$@ Error // !RestArting! - ?pLeaSe wAit!" + 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 diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 02bd2258e571..ffd2b23768f6 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -131,9 +131,9 @@ /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)." diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index f606c8df96de..15ba85f5b76b 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -299,10 +299,10 @@ if(mode) return analyze_reagents(target) if(!syringes.len) - occupant_message("No syringes loaded.") + occupant_message(span_alert("No syringes loaded.")) return if(reagents.total_volume<=0) - occupant_message("No available reagents to load syringe with.") + occupant_message(span_alert("No available reagents to load syringe with.")) return var/turf/trg = get_turf(target) var/obj/item/reagent_containers/syringe/mechsyringe = syringes[1] @@ -326,7 +326,7 @@ var/mob/living/carbon/M = safepick(mobs) if(M) var/R - mechsyringe.visible_message(" [M] was hit by the syringe!") + mechsyringe.visible_message(span_attack(" [M] was hit by the syringe!")) if(M.can_inject(null, 1)) if(mechsyringe.reagents) for(var/datum/reagent/A in mechsyringe.reagents.reagent_list) @@ -476,7 +476,7 @@ occupant_message("The object is too far away.") return 0 if(!A.reagents || ismob(A)) - occupant_message("No reagent info gained from [A].") + occupant_message(span_alert("No reagent info gained from [A].")) return 0 occupant_message("Analyzing reagents...") for(var/datum/reagent/R in A.reagents.reagent_list) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index a42312a51469..cddd27e003be 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -99,7 +99,7 @@ /obj/machinery/mecha_part_fabricator/examine(mob/user) . = ..() if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Storing up to [rmat.local_size] material units.
Material consumption at [component_coeff*100]%.
Build time reduced by [100-time_coeff*100]%." + . += span_notice("The status display reads: Storing up to [rmat.local_size] material units.
Material consumption at [component_coeff*100]%.
Build time reduced by [100-time_coeff*100]%.") /** * Generates an info list for a given part. diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 6c13bf334350..c7782039530e 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -455,7 +455,7 @@ update_label("John Doe", "Clowny") addtimer(CALLBACK(src, .proc/wipe_id), 50 SECONDS) /obj/item/card/id/captains_spare/temporary/proc/wipe_id() - visible_message("The temporary spare begins to smolder", "The temporary spare begins to smolder", "The temporary spare begins to smolder") + visible_message(span_danger("The temporary spare begins to smolder"), span_userdanger("The temporary spare begins to smolder"), span_userdanger("The temporary spare begins to smolder")) sleep(10 SECONDS) if(isliving(loc)) var/mob/living/M = loc diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index c550a0c87268..767e2884c0fb 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -59,7 +59,7 @@ to_chat(user, "Your name has been sent to your employers for approval.") // Autoapproves after a certain time response_timer_id = addtimer(CALLBACK(src, .proc/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 ec6eee4bbbf8..2c22780d1265 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 diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index 994e6110504d..6bd112351cb3 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -41,7 +41,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) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index a66aa4dc6af4..4faf35a7fcec 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -515,7 +515,7 @@ busy = FALSE update_icon() return - user.visible_message("[user] shocks [H] with \the [src]!", span_warning("You shock [H] with \the [src]!")) + user.visible_message(span_boldannounce("[user] shocks [H] with \the [src]!"), span_warning("You shock [H] with \the [src]!")) playsound(src, 'sound/machines/defib_zap.ogg', 100, 1, -1) playsound(src, 'sound/weapons/egloves.ogg', 100, 1, -1) H.emote("scream") diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 1ae1b48e64a1..72d70f3f7525 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -273,7 +273,7 @@ Code: if(!powercount) - menu += "No connection
" + menu += span_danger("No connection
") else menu += "" @@ -287,7 +287,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/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm index 064cde8b058e..5441519b07d3 100644 --- a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm +++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm @@ -55,7 +55,7 @@ circuits++ maptext = "[circuits]" user.visible_message(span_notice("User breaks down [target] with [src]."), \ - "You recycle [target] into [src]. It now has material for [circuits] circuits.") + span_notice("You recycle [target] into [src]. It now has material for [circuits] circuits.")) playsound(user, 'sound/items/deconstruct.ogg', 50, TRUE) qdel(target) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 5617512ee4d3..03175a6e4dec 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -51,9 +51,9 @@ /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) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 1507b551920c..d6966e82b57e 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -103,11 +103,11 @@ GENE SCANNER scanmode = (scanmode + 1) % 3 switch(scanmode) if(SCANMODE_HEALTH) - to_chat(user, "You switch the health analyzer to check physical health.") + to_chat(user, span_notice("You switch the health analyzer to check physical health.")) if(SCANMODE_CHEMICAL) - to_chat(user, "You switch the health analyzer to scan chemical contents.") + to_chat(user, span_notice("You switch the health analyzer to scan chemical contents.")) if(SCANMODE_WOUND) - to_chat(user, "You switch the health analyzer to report extra info on wounds.") + to_chat(user, span_notice("You switch the health analyzer to report extra info on wounds.")) /obj/item/healthanalyzer/attack(mob/living/M, mob/living/carbon/human/user) flick("[icon_state]-scan", src) //makes it so that it plays the scan animation upon scanning, including clumsy scanning @@ -116,9 +116,9 @@ GENE SCANNER if ((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(50)) to_chat(user, span_notice("You stupidly try to analyze the floor's vitals!")) user.visible_message(span_warning("[user] has analyzed 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, 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 @@ -144,10 +144,10 @@ 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)) @@ -264,7 +264,7 @@ GENE SCANNER var/mob/living/carbon/C = M var/list/damaged = C.get_damaged_bodyparts(1,1) if(length(damaged)>0 || oxy_loss>0 || tox_loss>0 || fire_loss>0) - to_chat(user, "\tDamage: Brute-Burn-Toxin-Suffocation\n\t\tSpecifics: [brute_loss]-[fire_loss]-[tox_loss]-[oxy_loss]") + to_chat(user, span_info("\tDamage: Brute-Burn-Toxin-Suffocation\n\t\tSpecifics: [brute_loss]-[fire_loss]-[tox_loss]-[oxy_loss]")) for(var/obj/item/bodypart/org in damaged) to_chat(user, "\t\t[capitalize(org.name)]: [(org.brute_dam > 0) ? "[org.brute_dam]" : "0"]-[(org.burn_dam > 0) ? "[org.burn_dam]" : "0"]") @@ -396,7 +396,7 @@ GENE SCANNER 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].") //Yogs - Added a "." + 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].")) //Yogs - Added a "." // Blood Level if(M.has_dna()) @@ -490,7 +490,7 @@ GENE SCANNER if(istype(scanner)) // Only emit the cheerful scanner message if this scan came from a scanner playsound(scanner, 'sound/machines/ping.ogg', 50, FALSE) - to_chat(user, "\The [scanner] makes a happy ping and briefly displays a smiley face with several exclamation points! It's really excited to report that [patient] has no wounds!") + to_chat(user, span_notice("\The [scanner] makes a happy ping and briefly displays a smiley face with several exclamation points! It's really excited to report that [patient] has no wounds!")) else to_chat(user, "No wounds detected in subject.") else @@ -508,30 +508,30 @@ GENE SCANNER playsound(src, 'sound/machines/ping.ogg', 50, FALSE) var/list/encouragements = list("briefly displays a happy face, gazing emptily at you", "briefly displays a spinning cartoon heart", "displays an encouraging message about eating healthy and exercising", \ "reminds you that everyone is doing their best", "displays a message wishing you well", "displays a sincere thank-you for your interest in first-aid", "formally absolves you of all your sins") - to_chat(user, "\The [src] makes a happy ping and [pick(encouragements)]!") + to_chat(user, span_notice("\The [src] makes a happy ping and [pick(encouragements)]!")) next_encouragement = world.time + 10 SECONDS greedy = FALSE else if(!greedy) - to_chat(user, "\The [src] displays an eerily high-definition frowny face, chastizing you for asking it for too much encouragement.") + to_chat(user, span_warning("\The [src] displays an eerily high-definition frowny face, chastizing you for asking it for too much encouragement.")) greedy = TRUE else playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE) if(isliving(user)) var/mob/living/L = user if(L.getBruteLoss() >= 10) - to_chat(L, "\The [src] makes a disappointed buzz, chastizing you for asking it for too much encouragement.") + to_chat(L, span_warning("\The [src] makes a disappointed buzz, chastizing you for asking it for too much encouragement.")) return - to_chat(L, "\The [src] makes a disappointed buzz and pricks your finger for being greedy. Ow!") + to_chat(L, span_warning("\The [src] makes a disappointed buzz and pricks your finger for being greedy. Ow!")) L.adjustBruteLoss(4) L.dropItemToGround(src) /obj/item/healthanalyzer/wound/attack(mob/living/carbon/patient, mob/living/carbon/human/user) add_fingerprint(user) - user.visible_message("[user] scans [patient] for serious injuries.", "You scan [patient] for serious injuries.") + user.visible_message(span_notice("[user] scans [patient] for serious injuries."), span_notice("You scan [patient] for serious injuries.")) if(!istype(patient)) playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) - to_chat(user, "\The [src] makes a sad buzz and briefly displays a frowny face, indicating it can't scan [patient].") + to_chat(user, span_notice("\The [src] makes a sad buzz and briefly displays a frowny face, indicating it can't scan [patient].")) return woundscan(user, patient, src) @@ -586,7 +586,7 @@ 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, span_info("Pressure: [round(pressure, 0.01)] kPa")) else diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm index f92ecbfa5253..aaf5d2ce2a3e 100644 --- a/code/game/objects/items/grenades/grenade.dm +++ b/code/game/objects/items/grenades/grenade.dm @@ -40,7 +40,7 @@ preprime(user, 5, FALSE) return FALSE else if(!clumsy && (clumsy_check == GRENADE_NONCLUMSY_FUMBLE)) - to_chat(user, "You pull the pin on [src]. Attached to it is a pink ribbon that says, \"[span_clown("HONK")]\"") + to_chat(user, span_warning("You pull the pin on [src]. Attached to it is a pink ribbon that says, \"[span_clown("HONK")]\"")) preprime(user, 5, FALSE) return FALSE return TRUE diff --git a/code/game/objects/items/implants/implant_greytide.dm b/code/game/objects/items/implants/implant_greytide.dm index 9132d5fdc5ee..08082e90d399 100644 --- a/code/game/objects/items/implants/implant_greytide.dm +++ b/code/game/objects/items/implants/implant_greytide.dm @@ -36,7 +36,7 @@ to_chat(holder, span_warning("[target] seems to resist the implant!")) return FALSE - to_chat(target, "You feel a strong urge to break everything. You feel a strong loyalty to [holder.real_name] and your assistant brothers. You want to break into everything, but harming others isnt something you will do.") + to_chat(target, span_userdanger("You feel a strong urge to break everything. You feel a strong loyalty to [holder.real_name] and your assistant brothers. You want to break into everything, but harming others isnt something you will do.")) var/datum/antagonist/greytide/GT = new target.mind.add_antag_datum(GT) diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index 17080e460728..5a8c30475c6f 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -112,7 +112,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/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 7ee72bb0b1dd..06d849b86441 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -430,7 +430,7 @@ msgmode = "critical" else if(cyborg.health < cyborg.maxHealth) msgmode = "normal" - to_chat(cyborg, "Self-repair is active in [span_boldnotice("[msgmode]")] mode.") + to_chat(cyborg, span_notice("Self-repair is active in [span_boldnotice("[msgmode]")] mode.")) msg_cooldown = world.time else deactivate_sr() diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 923f7c417406..9ea2d5e7b9e9 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -97,22 +97,22 @@ /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, "You cannot use \the [src] on [M]!") + to_chat(user, span_warning("You 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].", "You apply \the [src] on [M].") + user.visible_message(span_green("[user] applies \the [src] on [M]."), span_green("You apply \the [src] on [M].")) M.heal_bodypart_damage((heal_brute/2)) return TRUE if(iscarbon(M)) return heal_carbon(M, user, heal_brute, heal_burn) - to_chat(user, "You can't heal [M] with \the [src]!") + to_chat(user, span_warning("You can't heal [M] with \the [src]!")) /obj/item/stack/medical/bruise_pack/suicide_act(mob/user) user.visible_message(span_suicide("[user] is bludgeoning [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) @@ -138,10 +138,10 @@ /obj/item/stack/medical/gauze/try_heal(mob/living/M, mob/user, silent) var/obj/item/bodypart/limb = M.get_bodypart(check_zone(user.zone_selected)) if(!limb) - to_chat(user, "There's nothing there to bandage!") + to_chat(user, span_notice("There's nothing there to bandage!")) return if(!LAZYLEN(limb.wounds)) - to_chat(user, "There's no wounds that require bandaging on [user==M ? "your" : "[M]'s"] [limb.name]!") // good problem to have imo + to_chat(user, span_notice("There's no wounds that require bandaging on [user==M ? "your" : "[M]'s"] [limb.name]!")) // good problem to have imo return var/gauzeable_wound = FALSE @@ -151,19 +151,19 @@ gauzeable_wound = TRUE break if(!gauzeable_wound) - to_chat(user, "There's no wounds that require bandaging on [user==M ? "your" : "[M]'s"] [limb.name]!") // good problem to have imo + to_chat(user, span_notice("There's no wounds that require bandaging on [user==M ? "your" : "[M]'s"] [limb.name]!")) // good problem to have imo return if(limb.current_gauze && (limb.current_gauze.absorption_capacity * 0.8 > absorption_capacity)) // ignore if our new wrap is < 20% better than the current one, so someone doesn't bandage it 5 times in a row - to_chat(user, "The bandage currently on [user==M ? "your" : "[M]'s"] [limb.name] is still in good condition!") + to_chat(user, span_warning("The bandage currently on [user==M ? "your" : "[M]'s"] [limb.name] is still in good condition!")) return - user.visible_message("[user] begins wrapping the wounds on [M]'s [limb.name] with [src]...", "You begin wrapping the wounds on [user == M ? "your" : "[M]'s"] [limb.name] with [src]...") + user.visible_message(span_warning("[user] begins wrapping the wounds on [M]'s [limb.name] with [src]..."), span_warning("You begin wrapping the wounds on [user == M ? "your" : "[M]'s"] [limb.name] with [src]...")) if(!do_after(user, (user == M ? self_delay : other_delay), target=M)) return - user.visible_message("[user] applies [src] to [M]'s [limb.name].", "You bandage the wounds on [user == M ? "yourself" : "[M]'s"] [limb.name].") + user.visible_message(span_green("[user] applies [src] to [M]'s [limb.name]."), span_green("You bandage the wounds on [user == M ? "yourself" : "[M]'s"] [limb.name].")) limb.apply_gauze(src) /obj/item/stack/medical/gauze/twelve @@ -233,23 +233,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, heal_burn) if(isanimal(M)) var/mob/living/simple_animal/critter = M if (!(critter.healable)) - to_chat(user, "You cannot use \the [src] on [M]!") + to_chat(user, span_warning("You 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].", "You apply \the [src] on [M].") + user.visible_message(span_green("[user] applies \the [src] on [M]."), span_green("You apply \the [src] on [M].")) M.heal_bodypart_damage(heal_brute) return TRUE - to_chat(user, "You can't heal [M] with \the [src]!") + to_chat(user, span_warning("You can't heal [M] with \the [src]!")) /obj/item/stack/medical/ointment name = "ointment" @@ -271,14 +271,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, heal_brute, heal_burn) - to_chat(user, "You can't heal [M] with \the [src]!") + to_chat(user, span_warning("You can't heal [M] with \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/mesh @@ -313,11 +313,11 @@ /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, heal_brute, heal_burn) - to_chat(user, "You can't heal [M] with \the [src]!") + to_chat(user, span_warning("You can't heal [M] with \the [src]!")) /obj/item/stack/medical/mesh/try_heal(mob/living/M, mob/user, silent = FALSE) @@ -380,23 +380,23 @@ /obj/item/stack/medical/aloe/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 FALSE if(iscarbon(M)) return heal_carbon(M, user, heal, heal) if(isanimal(M)) var/mob/living/simple_animal/critter = M if (!(critter.healable)) - to_chat(user, "You cannot use \the [src] on [M]!") + to_chat(user, span_warning("You 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].", "You apply \the [src] on [M].") + user.visible_message(span_green("[user] applies \the [src] on [M]."), span_green("You apply \the [src] on [M].")) M.heal_bodypart_damage(heal, heal) return TRUE - to_chat(user, "You can't heal [M] with the \the [src]!") + to_chat(user, span_warning("You can't heal [M] with the \the [src]!")) /* The idea is for these medical devices to work like a hybrid of the old brute packs and tend wounds, @@ -422,13 +422,13 @@ novariants = TRUE /obj/item/stack/medical/bone_gel/attack(mob/living/M, mob/user) - to_chat(user, "Bone gel can only be used on fractured limbs!") + to_chat(user, span_warning("Bone gel can only be used on fractured limbs!")) return /obj/item/stack/medical/bone_gel/suicide_act(mob/user) if(iscarbon(user)) var/mob/living/carbon/C = user - C.visible_message("[C] is squirting all of \the [src] into [C.p_their()] mouth! That's not proper procedure! It looks like [C.p_theyre()] trying to commit suicide!") + C.visible_message(span_suicide("[C] is squirting all of \the [src] into [C.p_their()] mouth! That's not proper procedure! It looks like [C.p_theyre()] trying to commit suicide!")) if(do_after(C, 2 SECONDS)) C.emote("scream") for(var/i in C.bodyparts) @@ -444,7 +444,7 @@ use(1) return (BRUTELOSS) else - C.visible_message("[C] screws up like an idiot and still dies anyway!") + C.visible_message(span_suicide("[C] screws up like an idiot and still dies anyway!")) return (BRUTELOSS) /obj/item/stack/medical/bone_gel/cyborg diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 31147659fde4..cd9a567a946f 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -254,9 +254,9 @@ open = (open ? FALSE : TRUE) update_icon() if(open) - to_chat(user, "You open the lid on [src.name].") + to_chat(user, span_danger("You open the lid on [src.name].")) else - to_chat(user, "You put the lid on [src.name].") + to_chat(user, span_danger("You put the lid on [src.name].")) /obj/item/storage/lockbox/vialbox/attackby(obj/item/W, mob/user, params) . = ..() diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 3100130fc0e8..98788ba4c1cb 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -42,7 +42,7 @@ to_chat(user, span_notice("You [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, span_danger("Now attempting to reset internal memory, please hold.")) @@ -54,7 +54,7 @@ else l_hacking = 0 else - to_chat(user, "You must unscrew the service panel before you can pulse the wiring.") + to_chat(user, span_notice("You 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/taster.dm b/code/game/objects/items/taster.dm index 0dcc71d9c0a9..3e20a04a9f6f 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 [span_italics("[message]")] in [O].") + to_chat(user, span_notice("[src] tastes [span_italics("[message]")] in [O].")) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 1967cb153a94..f78a23f42971 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -180,11 +180,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 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_userdanger("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) @@ -193,7 +193,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 add_atom_colour(rgb(255, 95, 95), ADMIN_COLOUR_PRIORITY) if(10) user.visible_message(span_warning("[user]'s eyes light up with a vengeful fire!"), \ - "YOU FEEL THE POWER OF VALHALLA FLOWING THROUGH YOU! THERE CAN BE ONLY ONE!!!") + span_userdanger("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" diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index b0a1f7fc5ff9..897bd87f9546 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -25,7 +25,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)) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index a28893693d81..f7cdce24db31 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -16,7 +16,7 @@ /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()) . += span_notice("Drag your sprite to sit in it.") @@ -442,4 +442,4 @@ M.pixel_y += 5 /obj/structure/chair/mime/post_unbuckle_mob(mob/living/M) - M.pixel_y -= 5 \ No newline at end of file + M.pixel_y -= 5 diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 78f02c468dd0..8cd8576441d5 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -133,9 +133,9 @@ GLOBAL_LIST_EMPTY(lockers) if(welded) . += 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) . += span_notice("Alt-click to [locked ? "unlock" : "lock"].") if(isliving(user)) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index db942e73e8d2..a9fd223f2150 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)) diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index bbf272c16495..107d290a36a7 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -144,7 +144,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 /* @@ -160,7 +160,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/girders.dm b/code/game/objects/structures/girders.dm index d9d4a164fbdd..777fe0bf6877 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -15,14 +15,14 @@ . = ..() 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) . += span_notice("[src] is disassembled! You probably shouldn't be able to see this examine message.") diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 59bfd617ec15..9aa5a5d82158 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -52,9 +52,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) diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index 70dcdb4b52d1..1942df934130 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -133,7 +133,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/CanAllowThrough(atom/movable/mover, turf/target) . = ..() diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index edbee5e9dad2..d3e8e1fe3519 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) . = ..() @@ -102,7 +102,7 @@ canSmoothWith = null /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/ratvar_act() new /obj/structure/lattice/catwalk/clockwork(loc) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 23ecc22f320d..738c7d701652 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -314,7 +314,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 diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 98560a09e3b0..07e92c7bd4eb 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -19,9 +19,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(..()) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 4abc8067c329..197ceeccf39e 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -68,7 +68,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) @@ -436,9 +436,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) @@ -575,7 +575,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/CanAllowThrough(atom/movable/mover, turf/target) . = ..() diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index 8a8b638bde75..87a3b7faab6b 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -93,7 +93,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) /obj/structure/trap/fire/flare() @@ -107,7 +107,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) @@ -120,7 +120,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) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index f20cf76cb0d8..5a62dc9dcf0d 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -32,18 +32,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) . = ..() @@ -871,7 +871,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)) diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index dbffc6cc58a4..b4c30434778c 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/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(..()) @@ -182,7 +182,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/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index bcf346923169..49a1e0a58d61 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/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/proc/populate_lighttile_designs() lighttile_designs = list( diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index 5f0cc44d5c22..b5f8a2aee89c 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/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/rust_heretic_act() if(prob(70)) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 7475c5fb9eef..226c47ce12b4 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -26,12 +26,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 - . += "You might be able to build ontop of it with some tiles..." + . += span_notice("You might be able to build ontop of it with some tiles...") /turf/open/floor/plating/Initialize() if (!broken_states) diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm index 2a2cae33a9ca..500b29753169 100644 --- a/code/game/turfs/simulated/floor/reinf_floor.dm +++ b/code/game/turfs/simulated/floor/reinf_floor.dm @@ -13,7 +13,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 diff --git a/code/game/turfs/simulated/wall/reinf_walls.dm b/code/game/turfs/simulated/wall/reinf_walls.dm index 269061c67586..d7c734533846 100644 --- a/code/game/turfs/simulated/wall/reinf_walls.dm +++ b/code/game/turfs/simulated/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) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 5ce2ba750f21..7000e3d4ef7b 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -50,7 +50,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 diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index c7e52dc38b96..f343e2fe9933 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1,14 +1,14 @@ //////////////////////////////// /proc/message_admins(msg) - msg = "ADMIN LOG: [msg]" + msg = span_admin("ADMIN LOG: [msg]") to_chat(GLOB.admins, type = MESSAGE_TYPE_ADMINLOG, html = msg, confidential = TRUE) /proc/relay_msg_admins(msg) - msg = "RELAY: [msg]" + msg = span_admin("RELAY: [msg]") to_chat(GLOB.admins, type = MESSAGE_TYPE_ADMINLOG, html = msg, diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 70ef3d10b6c5..485feb20a716 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -384,7 +384,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) to_chat(mob, span_boldannounce("Invisimin off. Invisibility reset.")) else mob.invisibility = INVISIBILITY_MAXIMUM - to_chat(mob, "Invisimin on. You are now invisible.") + to_chat(mob, span_adminnotice("Invisimin on. You are now invisible.")) /client/proc/check_antagonists() set name = "Check Antagonists" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 0eaf15008cc3..1e7fff43f3b7 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -914,7 +914,7 @@ GLOB.master_mode = href_list["c_mode2"] log_admin("[key_name(usr)] set the mode as [GLOB.master_mode].") message_admins(span_adminnotice("[key_name_admin(usr)] set the mode as [GLOB.master_mode].")) - to_chat(world, "The mode is now: [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) @@ -1380,7 +1380,7 @@ message_admins("[key_name(H)] received their cookie at their feet, spawned by [key_name(src.owner)].") //Yogs end - Cookies for all! SSblackbox.record_feedback("amount", "admin_cookies_spawned", 1) - to_chat(H, "Your prayers have been answered!! You received the best cookie!") + to_chat(H, span_adminnotice("Your prayers have been answered!! You received the best cookie!")) SEND_SOUND(H, sound('sound/effects/pray_chaplain.ogg')) else if(href_list["adminsmite"]) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index a7fe2c585201..afa29ff7ab01 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -181,7 +181,7 @@ var/keywordparsedmsg = keywords_lookup(msg) if(irc) - to_chat(src, "PM to-Admins: [span_linkify("[rawmsg]")]", confidential=TRUE) + to_chat(src, span_notice("PM to-Admins: [span_linkify("[rawmsg]")]"), confidential=TRUE) var/datum/admin_help/AH = admin_ticket_log(src, rawmsg) // yogs - Yog Tickets ircreplyamount-- send2irc("[AH ? "#[AH.id] " : ""]Reply: [ckey]", rawmsg) @@ -190,11 +190,11 @@ if(holder) to_chat(recipient, type = MESSAGE_TYPE_ADMINPM, - html = "Admin PM from-[key_name(src, recipient, 1)]: [span_linkify("[keywordparsedmsg]")]", + html = span_danger("Admin PM from-[key_name(src, recipient, 1)]: [span_linkify("[keywordparsedmsg]")]"), confidential = TRUE) to_chat(src, type = MESSAGE_TYPE_ADMINPM, - html = "Admin PM to-[key_name(recipient, src, 1)]: [span_linkify("[keywordparsedmsg]")]", + html = span_notice("Admin PM to-[key_name(recipient, src, 1)]: [span_linkify("[keywordparsedmsg]")]"), confidential = TRUE) //omg this is dumb, just fill in both their tickets @@ -212,8 +212,8 @@ to_chat(src, span_notice("Ticket closed, please make a new one before trying to contact admins!"), confidential=TRUE) return admin_ticket_log(src, msg, FALSE) - to_chat(recipient, "Reply PM from-[key_name(src, recipient, 1)]: [span_linkify("[keywordparsedmsg]")]", confidential=TRUE) - to_chat(src, "-- [key_name(src, null, 0)] -> Admins: [span_linkify("[msg]")]", confidential=TRUE) + to_chat(recipient, span_danger("Reply PM from-[key_name(src, recipient, 1)]: [span_linkify("[keywordparsedmsg]")]"), confidential=TRUE) + to_chat(src, span_notice("-- [key_name(src, null, 0)] -> Admins: [span_linkify("[msg]")]"), confidential=TRUE) //YOGS END //play the receiving admin the adminhelp sound (if they have them enabled) @@ -228,9 +228,9 @@ recipient.current_ticket.Administer(src) // yogs - Yog Tickets to_chat(recipient, "-- Administrator private message --", confidential=TRUE) - to_chat(recipient, "Admin PM from-[key_name(src, recipient, 0)]: [span_linkify("[msg]")]", confidential=TRUE) - to_chat(recipient, "Click on the administrator's name to reply.", confidential=TRUE) - to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [span_linkify("[msg]")]", confidential=TRUE) + to_chat(recipient, span_adminsay("Admin PM from-[key_name(src, recipient, 0)]: [span_linkify("[msg]")]"), confidential=TRUE) + to_chat(recipient, span_adminsay("Click on the administrator's name to reply."), confidential=TRUE) + to_chat(src, span_notice("Admin PM to-[key_name(recipient, src, 1)]: [span_linkify("[msg]")]"), confidential=TRUE) admin_ticket_log(recipient, "PM From [src]: [msg]", FALSE)// yogs - Yog Tickets @@ -262,7 +262,7 @@ for(var/client/X in GLOB.admins) to_chat(X, type = MESSAGE_TYPE_ADMINPM, - html = "PM: [key_name(src, X, 0)]->External: [keywordparsedmsg]", + html = span_notice("PM: [key_name(src, X, 0)]->External: [keywordparsedmsg]"), confidential = TRUE) else window_flash(recipient, ignorepref = TRUE) @@ -272,7 +272,7 @@ if(X.key!=key && X.key!=recipient.key) //check client/X is an admin and isn't the sender or recipientD to_chat(X, type = MESSAGE_TYPE_ADMINPM, - html = "PM: [key_name(src, X, 0)]->[key_name(recipient, X, 0)]: [keywordparsedmsg]" , + html = span_notice("PM: [key_name(src, X, 0)]->[key_name(recipient, X, 0)]: [keywordparsedmsg]") , confidential = TRUE) @@ -361,11 +361,11 @@ confidential = TRUE) to_chat(C, type = MESSAGE_TYPE_ADMINPM, - html = "Admin PM from-[adminname]: [msg]", + html = span_adminsay("Admin PM from-[adminname]: [msg]"), confidential = TRUE) // yogs - Yog Tickets to_chat(C, type = MESSAGE_TYPE_ADMINPM, - html = "Click on the administrator's name to reply.", + html = span_adminsay("Click on the administrator's name to reply."), confidential = TRUE) // yogs - Yog Tickets admin_ticket_log(C, "PM From [irc_tagged]: [msg]") // yogs - Yog Tickets diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 43dda3b31840..950bf0ff96c6 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -6,7 +6,7 @@ if(T.active_hotspot) burning = TRUE - var/list/lines = list("[AREACOORD(target)]: [env.return_temperature()] K ([env.return_temperature() - T0C] C), [env.return_pressure()] kPa[(burning)?(", burning"):(null)]") + var/list/lines = list(span_adminnotice("[AREACOORD(target)]: [env.return_temperature()] K ([env.return_temperature() - T0C] C), [env.return_pressure()] kPa[(burning)?(", burning"):(null)]")) for(var/id in env.get_gases()) var/moles = env.get_moles(id) if (abs(moles) >= 0.00001) diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm index 8520621a3c28..0051c3e7a4f6 100644 --- a/code/modules/admin/verbs/map_template_loadverb.dm +++ b/code/modules/admin/verbs/map_template_loadverb.dm @@ -53,7 +53,7 @@ if(report) report.show_to(src) report_link = " - validation report" - to_chat(src, "Map template '[map]' failed validation.", confidential=TRUE) + to_chat(src, span_warning("Map template '[map]' failed validation."), confidential=TRUE) 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") diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 3b0eda6b5d52..3f38bf2cf615 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) @@ -28,4 +28,4 @@ GLOBAL_VAR_INIT(highlander, FALSE) addtimer(CALLBACK(src, .proc/only_one), 420) /mob/living/carbon/human/proc/make_scottish() - mind.add_antag_datum(/datum/antagonist/highlander) \ No newline at end of file + mind.add_antag_datum(/datum/antagonist/highlander) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 4b6c9a40ef23..0c3803da7d49 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -40,7 +40,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)]: [span_linkify("[msg]")]" + msg = span_adminnotice("[icon2html(cross, GLOB.admins)][prayer_type][deity ? " (to [deity])" : ""]: [ADMIN_FULLMONTY(src)] [ADMIN_SC(src)]: [span_linkify("[msg]")]") for(var/client/C in GLOB.admins) if(C.prefs.chat_toggles & CHAT_PRAYER) @@ -56,7 +56,7 @@ /// Used by communications consoles to message CentCom /proc/message_centcom(text, mob/sender) var/msg = copytext_char(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, confidential = TRUE) for(var/obj/machinery/computer/communications/console in GLOB.machines) console.override_cooldown() @@ -64,7 +64,7 @@ /// Used by communications consoles to message the Syndicate /proc/message_syndicate(text, mob/sender) var/msg = copytext_char(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, confidential = TRUE) for(var/obj/machinery/computer/communications/console in GLOB.machines) console.override_cooldown() @@ -72,14 +72,14 @@ /// Used by communications consoles to request the nuclear launch codes /proc/nuke_request(text, mob/sender) var/msg = copytext_char(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, confidential = TRUE) for(var/obj/machinery/computer/communications/console in GLOB.machines) console.override_cooldown() /proc/Clown_announce(text , mob/Sender) var/msg = copytext_char(sanitize(text), 1, MAX_MESSAGE_LEN) - msg = "CLOWN PLANET:[ADMIN_FULLMONTY(Sender)] [ADMIN_SYNDICATE_REPLY(Sender)]: [msg]" + msg = span_adminnotice("CLOWN PLANET:[ADMIN_FULLMONTY(Sender)] [ADMIN_SYNDICATE_REPLY(Sender)]: [msg]") to_chat(GLOB.admins, msg, confidential=TRUE) for(var/obj/machinery/computer/communications/C in GLOB.machines) - C.override_cooldown() \ No newline at end of file + C.override_cooldown() diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 18d89495581e..8754cfef7aa0 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -192,7 +192,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) @@ -1192,7 +1192,7 @@ Traitors and the like can also be revived with the previous role mostly intact. H?.cluwneify() if(ADMIN_PUNISHMENT_CRACK) if(!iscarbon(target)) - to_chat(usr,"This must be used on a carbon mob.", confidential = TRUE) + to_chat(usr,span_warning("This must be used on a carbon mob."), confidential = TRUE) return var/mob/living/carbon/C = target for(var/i in C.bodyparts) @@ -1201,7 +1201,7 @@ Traitors and the like can also be revived with the previous role mostly intact. squish_part.force_wound_upwards(type_wound, smited=TRUE) if(ADMIN_PUNISHMENT_BLEED) if(!iscarbon(target)) - to_chat(usr,"This must be used on a carbon mob.", confidential = TRUE) + to_chat(usr,span_warning("This must be used on a carbon mob."), confidential = TRUE) return var/mob/living/carbon/C = target for(var/obj/item/bodypart/slice_part in C.bodyparts) @@ -1213,7 +1213,7 @@ Traitors and the like can also be revived with the previous role mostly intact. slice_part.force_wound_upwards(type_wound, smited=TRUE) if(ADMIN_PUNISHMENT_PERFORATE) if(!iscarbon(target)) - to_chat(usr,"This must be used on a carbon mob.", confidential = TRUE) + to_chat(usr,span_warning("This must be used on a carbon mob."), confidential = TRUE) return var/list/how_fucked_is_this_dude = list("A little", "A lot", "So fucking much", "FUCK THIS DUDE") @@ -1257,11 +1257,11 @@ Traitors and the like can also be revived with the previous role mostly intact. if(ADMIN_PUNISHMENT_SCARIFY) if(!iscarbon(target)) - to_chat(usr,"This must be used on a carbon mob.", confidential = TRUE) + to_chat(usr,span_warning("This must be used on a carbon mob."), confidential = TRUE) return var/mob/living/carbon/C = target C.generate_fake_scars(rand(1, 4)) - to_chat(C, "You feel your body grow jaded and torn...") + to_chat(C, span_warning("You feel your body grow jaded and torn...")) punish_log(target, punishment) /** diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm index c67a33c3b20a..95e2ec3aedce 100644 --- a/code/modules/antagonists/abductor/abductor.dm +++ b/code/modules/antagonists/abductor/abductor.dm @@ -170,7 +170,7 @@ . = ..() /datum/antagonist/abductee/greet() - to_chat(owner, "Your mind snaps!") + to_chat(owner, span_warning("Your mind snaps!")) to_chat(owner, "You can't remember how you got here...") owner.announce_objectives() diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index e4b581b1ac85..e4fb1f8778e7 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -67,7 +67,7 @@ /obj/item/organ/heart/gland/proc/clear_mind_control() if(!ownerCheck() || !active_mind_control) return FALSE - to_chat(owner, "You feel the compulsion fade, and you completely forget about your previous orders.") + to_chat(owner, span_userdanger("You feel the compulsion fade, and you completely forget about your previous orders.")) owner.clear_alert("mind_control") active_mind_control = FALSE return TRUE @@ -205,7 +205,7 @@ return FALSE for(var/M in broadcasted_mobs) var/mob/living/carbon/human/H = M - to_chat(H, "You feel the compulsion fade, and you completely forget about your previous orders.") + to_chat(H, span_userdanger("You 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/blob/blobstrains/zombifying_pods.dm b/code/modules/antagonists/blob/blobstrains/zombifying_pods.dm index 45f878286c54..e034eceefb68 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 == "melee" || 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, span_notice("Gained [points] resources from the zombification of [M].")) \ No newline at end of file + 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 337002a9d8d4..9e99fc8e936e 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, "You may now place your blob core.") - to_chat(src, "You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].") + to_chat(src, span_big("You 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) @@ -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 1a9d356d4e0c..9f43a78b710e 100644 --- a/code/modules/antagonists/blob/powers.dm +++ b/code/modules/antagonists/blob/powers.dm @@ -174,7 +174,7 @@ 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/effects/splat.ogg', 50, 1) var/mob/living/simple_animal/hostile/blob/blobbernaut/blobber = new /mob/living/simple_animal/hostile/blob/blobbernaut(get_turf(B)) flick("blobbernaut_produce", blobber) @@ -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, "You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].") - to_chat(src, "You [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("You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].")) + to_chat(src, span_big("You [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/changeling/powers/mimic_voice.dm b/code/modules/antagonists/changeling/powers/mimic_voice.dm index d537de16bce4..3a952c0f3a14 100644 --- a/code/modules/antagonists/changeling/powers/mimic_voice.dm +++ b/code/modules/antagonists/changeling/powers/mimic_voice.dm @@ -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, 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/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm index 4bb872704118..07fec9aacb41 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm @@ -280,7 +280,7 @@ if(GLOB.ratvar_awakens) . += "[span_inathneq_small("It can revive Servants at no cost!")]" else - . += "It can revive Servants at a cost of [revive_cost] vitality." + . += span_inathneq_small("It can revive Servants at a cost of [revive_cost] vitality.") /obj/effect/clockwork/sigil/vitality/sigil_effects(mob/living/L) if((is_servant_of_ratvar(L) && L.suiciding) || sigil_active) diff --git a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm index 623d064850ba..db9e65d50a54 100644 --- a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm +++ b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm @@ -141,7 +141,7 @@ return FALSE if(isliving(A)) var/mob/living/user = A - to_chat(user, "You pass through [src] and appear elsewhere!") + to_chat(user, span_warning("You pass through [src] and appear elsewhere!")) linked_gateway.visible_message(span_warning("A shape appears in [linked_gateway] before emerging!")) playsound(src, 'sound/effects/empulse.ogg', 50, 1) playsound(linked_gateway, 'sound/effects/empulse.ogg', 50, 1) diff --git a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm index 3d82483e0b9f..ee96bf661161 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm @@ -88,7 +88,7 @@ var/amount_temp = get_amount() var/no_delete = FALSE if(amount_temp < 2) - to_chat(user, "You need at least 2 floor tiles to convert into power.") + to_chat(user, span_warning("You need at least 2 floor tiles to convert into power.")) return TRUE if(ISODD(amount_temp)) amount_temp-- @@ -247,7 +247,7 @@ fabricator.repairing = null if(user) user.visible_message(span_notice("[user]'s [fabricator.name] stops covering [src] with glowing orange energy."), \ - "You finish repairing [src]. It is now at [obj_integrity]/[max_integrity] integrity.") + span_alloy("You finish repairing [src]. It is now at [obj_integrity]/[max_integrity] integrity.")) //Fabricator mob heal proc, to avoid as much copypaste as possible. /mob/living/proc/fabricator_heal(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator) @@ -284,7 +284,7 @@ return FALSE else if(fabricator_heal(user, fabricator) && user) user.visible_message(span_notice("[user]'s [fabricator.name] stops covering [src == user ? "[user.p_them()]" : "[src]"] with glowing orange energy."), \ - "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_theyre(TRUE)]"] now at [abs(HEALTH_THRESHOLD_DEAD - health)]/[abs(HEALTH_THRESHOLD_DEAD - maxHealth)] health.") + span_alloy("You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_theyre(TRUE)]"] now at [abs(HEALTH_THRESHOLD_DEAD - health)]/[abs(HEALTH_THRESHOLD_DEAD - maxHealth)] health.")) //Same with clockwork mobs. /mob/living/simple_animal/hostile/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) @@ -293,7 +293,7 @@ return FALSE else if(fabricator_heal(user, fabricator) && user) user.visible_message(span_notice("[user]'s [fabricator.name] stops covering [src == user ? "[user.p_them()]" : "[src]"] with glowing orange energy."), \ - "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_theyre(TRUE)]"] now at [health]/[maxHealth] health.") + span_alloy("You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_theyre(TRUE)]"] now at [health]/[maxHealth] health.")) //Cogscarabs get special interaction because they're drones and have innate self-heals/revives. /mob/living/simple_animal/drone/cogscarab/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm index 987cacb55096..5e7e3ebae3fc 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm @@ -29,7 +29,7 @@ /obj/item/clockwork/weapon/ratvarian_spear/examine(mob/user) . = ..() if(is_servant_of_ratvar(user) || isobserver(user)) - . += "Attacks on living non-Servants will generate [bonus_burn] units of vitality." + . += span_inathneq_small("Attacks on living non-Servants will generate [bonus_burn] units of vitality.") if(!iscyborg(user)) . += span_brass("Throwing the spear will do massive damage, break the spear, and knock down the target.") diff --git a/code/modules/antagonists/clockcult/clock_items/construct_chassis.dm b/code/modules/antagonists/clockcult/clock_items/construct_chassis.dm index ab7e1d485204..c74c98a8c5c5 100644 --- a/code/modules/antagonists/clockcult/clock_items/construct_chassis.dm +++ b/code/modules/antagonists/clockcult/clock_items/construct_chassis.dm @@ -72,7 +72,7 @@ desc = "A pile of sleek and well-polished brass armor. A small red gemstone sits in its faceplate." icon_state = "marauder_armor" construct_name = "clockwork marauder" - construct_desc = "It will become a clockwork marauder, a well-rounded frontline combatant." + construct_desc = span_neovgre_small("It will become a clockwork marauder, a well-rounded frontline combatant.") creation_message = "Crimson fire begins to rage in the armor as it rises into the air with its armaments!" construct_type = /mob/living/simple_animal/hostile/clockwork/marauder @@ -83,7 +83,7 @@ desc = "A small, complex shell that resembles a repair drone, but much larger and made out of brass." icon_state = "cogscarab_shell" construct_name = "cogscarab" - construct_desc = "It will become a cogscarab, a small and fragile drone that builds, repairs, and maintains." + construct_desc = span_alloy("It will become a cogscarab, a small and fragile drone that builds, repairs, and maintains.") creation_message = "The cogscarab clicks and whirrs as it hops up and springs to life!" construct_type = /mob/living/simple_animal/drone/cogscarab w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm index e9c9656efa9f..ee284bfc28f4 100644 --- a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm +++ b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm @@ -109,7 +109,7 @@ message = span_brass("You dispel the power of [visor].") remove_ranged_ability(message) else - message = "You harness [visor]'s power. Left-click to place a judicial marker!" + message = span_brass("You harness [visor]'s power. Left-click to place a judicial marker!") add_ranged_ability(user, message) /obj/effect/proc_holder/judicial_visor/InterceptClickOn(mob/living/caller, params, atom/target) @@ -210,7 +210,7 @@ if(!QDELETED(L)) L.adjustBruteLoss(20) //does a decent amount of damage log_combat(user, L, "struck with a judicial blast") - to_chat(user, "[targetsjudged ? "Successfully judged [span_neovgre("[targetsjudged]")]":"Judged no"] heretic[targetsjudged == 1 ? "":"s"].") + to_chat(user, span_brass("[targetsjudged ? "Successfully judged [span_neovgre("[targetsjudged]")]":"Judged no"] heretic[targetsjudged == 1 ? "":"s"].")) sleep(3) //so the animation completes properly qdel(src) diff --git a/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm b/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm index b69a310bd5c4..5ed377311208 100644 --- a/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm +++ b/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm @@ -59,12 +59,12 @@ if(is_servant_of_ratvar(user)) if(uses_power) if(!get_clockwork_power(POWER_WALL_TOTAL)) - to_chat(user, "[src] requires [DisplayEnergy(POWER_WALL_TOTAL)] of power to produce brass sheets!") + to_chat(user, span_warning("[src] requires [DisplayEnergy(POWER_WALL_TOTAL)] of power to produce brass sheets!")) return adjust_clockwork_power(-POWER_WALL_TOTAL) playsound(src, 'sound/items/deconstruct.ogg', 50, 1) new/obj/item/stack/tile/brass(user.loc, 5) - to_chat(user, "You use [get_clockwork_power() ? "some":"all"] of [src]'s power to produce 5 brass sheets. It now has access to [DisplayEnergy(get_clockwork_power())] of power.") + to_chat(user, span_brass("You use [get_clockwork_power() ? "some":"all"] of [src]'s power to produce 5 brass sheets. It now has access to [DisplayEnergy(get_clockwork_power())] of power.")) /obj/item/clockwork/replica_fabricator/pre_attack(atom/target, mob/living/user, params) if(!target || !user || !is_servant_of_ratvar(user) || istype(target, /obj/item/storage)) @@ -177,7 +177,7 @@ if(!silent) var/atom/A = fabrication_values["new_obj_type"] if(A) - to_chat(user, "You need [DisplayEnergy(fabrication_values["power_cost"])] power to fabricate \a [initial(A.name)] from [target]!") + to_chat(user, span_warning("You need [DisplayEnergy(fabrication_values["power_cost"])] power to fabricate \a [initial(A.name)] from [target]!")) return FALSE return TRUE diff --git a/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm b/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm index 08923be40e63..899c8428a7ac 100644 --- a/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm +++ b/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm @@ -172,4 +172,4 @@ eyes.applyOrganDamage(eyes.maxHealth) if(prob(min(20, 5 + eye_damage_done))) - to_chat(H, "Your eyes continue to burn.") + to_chat(H, span_nzcrentr_small("Your eyes continue to burn.")) diff --git a/code/modules/antagonists/clockcult/clock_mobs.dm b/code/modules/antagonists/clockcult/clock_mobs.dm index 524b22ac80bc..88c39a2e2f08 100644 --- a/code/modules/antagonists/clockcult/clock_mobs.dm +++ b/code/modules/antagonists/clockcult/clock_mobs.dm @@ -20,8 +20,8 @@ light_color = "#E42742" deathsound = 'sound/magic/clockwork/anima_fragment_death.ogg' speech_span = SPAN_ROBOT - var/playstyle_string = "You are a bug, yell at whoever spawned you!" - var/empower_string = "You have nothing to empower, yell at the coders!" //Shown to the mob when the herald beacon activates + var/playstyle_string = span_heavy_brass("You are a bug, yell at whoever spawned you!") + var/empower_string = span_heavy_brass("You have nothing to empower, yell at the coders!") //Shown to the mob when the herald beacon activates /mob/living/simple_animal/hostile/clockwork/Initialize() . = ..() diff --git a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm index 74e8053f8ec7..8bbb4d7c251c 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm @@ -89,7 +89,7 @@ return src.log_talk(message, LOG_SAY, tag="clockwork eminence") if(GLOB.ratvar_awakens) - visible_message("You feel light slam into your mind and form words: \"[capitalize(message)]\"") + visible_message(span_brass("You feel light slam into your mind and form words: \"[capitalize(message)]\"")) playsound(src, 'sound/machines/clockcult/ark_scream.ogg', 50, FALSE) message = "The [GLOB.ratvar_awakens ? "Radiance" : "Eminence"]: \"[message]\"" for(var/mob/M in servants_and_ghosts()) @@ -209,10 +209,10 @@ wall.turn_up_the_heat() if(wall.heated) superheated_walls++ - to_chat(src, "You superheat [wall]. Superheated walls: [superheated_walls]/[SUPERHEATED_CLOCKWORK_WALL_LIMIT]") + to_chat(src, span_neovgre_small("You superheat [wall]. Superheated walls: [superheated_walls]/[SUPERHEATED_CLOCKWORK_WALL_LIMIT]")) else superheated_walls-- - to_chat(src, "You cool [wall]. Superheated walls: [superheated_walls]/[SUPERHEATED_CLOCKWORK_WALL_LIMIT]") + to_chat(src, span_neovgre_small("You cool [wall]. Superheated walls: [superheated_walls]/[SUPERHEATED_CLOCKWORK_WALL_LIMIT]")) /mob/camera/eminence/proc/eminence_help() to_chat(src, "You can make use of certain shortcuts to perform different actions:") diff --git a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm index c9ceb9fee6f6..571c2a67658b 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm @@ -42,7 +42,7 @@ speed = initial(speed) if(shield_health < max_shield_health && world.time >= shield_health_regen) shield_health_regen = world.time + MARAUDER_SHIELD_REGEN_TIME - to_chat(src, "Your shield has recovered, [shield_health] blocks remaining!") + to_chat(src, span_neovgre("Your shield has recovered, [shield_health] blocks remaining!")) playsound_local(src, "shatter", 75, TRUE, frequency = -1) shield_health++ @@ -90,7 +90,7 @@ return var/energy_projectile = istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam) visible_message(span_danger("[src] deflects [P] with [p_their()] shield!"), \ - "You block [P] with your shield! Blocks left: [shield_health - 1]") + span_danger("You block [P] with your shield! Blocks left: [shield_health - 1]")) if(energy_projectile) playsound(src, 'sound/weapons/effects/searwall.ogg', 50, TRUE) else diff --git a/code/modules/antagonists/clockcult/clock_scripture.dm b/code/modules/antagonists/clockcult/clock_scripture.dm index d54e56297da5..c1fc555cb8f4 100644 --- a/code/modules/antagonists/clockcult/clock_scripture.dm +++ b/code/modules/antagonists/clockcult/clock_scripture.dm @@ -152,7 +152,7 @@ GLOBAL_LIST_INIT(scripture_states,scripture_states_init_value()) //list of clock else for(var/invocation in invocations) clockwork_say(invoker, text2ratvar(invocation), whispered) - to_chat(invoker, "You [channel_time <= 0 ? "recite" : "begin reciting"] a piece of scripture entitled \"[name]\".") + to_chat(invoker, span_brass("You [channel_time <= 0 ? "recite" : "begin reciting"] a piece of scripture entitled \"[name]\".")) if(!channel_time) return TRUE if(chant_slowdown) diff --git a/code/modules/antagonists/clockcult/clock_structure.dm b/code/modules/antagonists/clockcult/clock_structure.dm index 22a80c96fe17..fa38a2a90baa 100644 --- a/code/modules/antagonists/clockcult/clock_structure.dm +++ b/code/modules/antagonists/clockcult/clock_structure.dm @@ -160,7 +160,7 @@ if(!can_access_clockwork_power(src)) . += span_alloy("It has no access to the power network! Create a sigil of transmission nearby.") else - . += "It has access to [DisplayEnergy(get_clockwork_power())] of power." + . += span_brass("It has access to [DisplayEnergy(get_clockwork_power())] of power.") /obj/structure/destructible/clockwork/powered/Destroy() SSfastprocess.processing -= src diff --git a/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm b/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm index 2da1630c2562..bc66da4b3cc7 100644 --- a/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm +++ b/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm @@ -47,7 +47,7 @@ to_chat(user, span_warning("These two objects are already connected!")) return if(F.linking.z != z) - to_chat(user, "You'd need a much tougher slab to link two objects in different sectors.") + to_chat(user, span_warning("You'd need a much tougher slab to link two objects in different sectors.")) return to_chat(user, span_notice("You link [F.linking] with [src].")) wired_to += F.linking diff --git a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm index 551612d87433..5735ebe26492 100644 --- a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -238,12 +238,12 @@ icon_state = initial(icon_state) if(is_servant_of_ratvar(user) || isobserver(user)) if(!active) - to_chat(user, "Time until the Ark's activation: [DisplayTimeText(get_arrival_time())]") + to_chat(user, span_big("Time until the Ark's activation: [DisplayTimeText(get_arrival_time())]")) else if(grace_period) - to_chat(user, "Crew grace period time remaining: [DisplayTimeText(get_arrival_time())]") + to_chat(user, span_big("Crew grace period time remaining: [DisplayTimeText(get_arrival_time())]")) else - to_chat(user, "Time until Ratvar's arrival: [DisplayTimeText(get_arrival_time())]") + to_chat(user, span_big("Time until Ratvar's arrival: [DisplayTimeText(get_arrival_time())]")) switch(progress_in_seconds) if(-INFINITY to GATEWAY_REEBE_FOUND) to_chat(user, "[span_heavy_brass("The Ark is feeding power into the bluespace field.")]") @@ -284,7 +284,7 @@ if(!isnewplayer(M)) var/turf/T = get_turf(M) if(T && T.z == z) - to_chat(M, "You hear otherworldly sounds from the [dir2text(get_dir(get_turf(M), get_turf(src)))]...") + to_chat(M, span_warning("You hear otherworldly sounds from the [dir2text(get_dir(get_turf(M), get_turf(src)))]...")) else to_chat(M, span_boldwarning("You hear otherworldly sounds from all around you...")) if(!obj_integrity) diff --git a/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm b/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm index 4ede8e65180e..5219aabd2f40 100644 --- a/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm +++ b/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm @@ -23,7 +23,7 @@ /obj/structure/destructible/clockwork/powered/clockwork_obelisk/examine(mob/user) . = ..() if(is_servant_of_ratvar(user) || isobserver(user)) - . += "It requires [DisplayEnergy(hierophant_cost)] to broadcast over the Hierophant Network, and [DisplayEnergy(gateway_cost)] to open a Spatial Gateway." + . += span_nzcrentr_small("It requires [DisplayEnergy(hierophant_cost)] to broadcast over the Hierophant Network, and [DisplayEnergy(gateway_cost)] to open a Spatial Gateway.") /obj/structure/destructible/clockwork/powered/clockwork_obelisk/can_be_unfasten_wrench(mob/user, silent) if(active) diff --git a/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm b/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm index b63328a4ab23..d8f722532cb2 100644 --- a/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm +++ b/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm @@ -78,10 +78,10 @@ return if("Nominate Yourself") eminence_nominee = nominee - hierophant_message("[nominee] nominates [nominee.p_them()]self as the Eminence! You may object by interacting with the eminence spire. The vote will otherwise pass in 30 seconds.") + hierophant_message(span_brass("[nominee] nominates [nominee.p_them()]self as the Eminence! You may object by interacting with the eminence spire. The vote will otherwise pass in 30 seconds.")) if("Nominate Ghosts") eminence_nominee = "ghosts" - hierophant_message("[nominee] proposes selecting an Eminence from ghosts! You may object by interacting with the eminence spire. The vote will otherwise pass in 30 seconds.") + hierophant_message(span_brass("[nominee] proposes selecting an Eminence from ghosts! You may object by interacting with the eminence spire. The vote will otherwise pass in 30 seconds.")) for(var/mob/M in servants_and_ghosts()) M.playsound_local(M, 'sound/machines/clockcult/ocularwarden-target.ogg', 50, FALSE) selection_timer = addtimer(CALLBACK(src, .proc/kingmaker), 300, TIMER_STOPPABLE) @@ -89,7 +89,7 @@ /obj/structure/destructible/clockwork/eminence_spire/proc/objection(mob/living/wright) if(alert(wright, "Object to the selection of [eminence_nominee] as Eminence?", "Objection!", "Object", "Cancel") == "Cancel" || !is_servant_of_ratvar(wright) || !wright.canUseTopic(src) || !eminence_nominee) return - hierophant_message("[wright] objects to the nomination of [eminence_nominee]! The eminence spire has been reset.") + hierophant_message(span_brass("[wright] objects to the nomination of [eminence_nominee]! The eminence spire has been reset.")) for(var/mob/M in servants_and_ghosts()) M.playsound_local(M, 'sound/machines/clockcult/integration_cog_install.ogg', 50, FALSE) eminence_nominee = null @@ -98,7 +98,7 @@ /obj/structure/destructible/clockwork/eminence_spire/proc/cancelation(mob/living/cold_feet) if(alert(cold_feet, "Cancel your nomination?", "Cancel Nomination", "Withdraw Nomination", "Cancel") == "Cancel" || !is_servant_of_ratvar(cold_feet) || !cold_feet.canUseTopic(src) || !eminence_nominee) return - hierophant_message("[eminence_nominee] has withdrawn their nomination! The eminence spire has been reset.") + hierophant_message(span_brass("[eminence_nominee] has withdrawn their nomination! The eminence spire has been reset.")) for(var/mob/M in servants_and_ghosts()) M.playsound_local(M, 'sound/machines/clockcult/integration_cog_install.ogg', 50, FALSE) eminence_nominee = null @@ -109,7 +109,7 @@ return if(ismob(eminence_nominee)) if(!eminence_nominee.client || !eminence_nominee.mind) - hierophant_message("[eminence_nominee] somehow lost their sentience! The eminence spire has been reset.") + hierophant_message(span_brass("[eminence_nominee] somehow lost their sentience! The eminence spire has been reset.")) for(var/mob/M in servants_and_ghosts()) M.playsound_local(M, 'sound/machines/clockcult/integration_cog_install.ogg', 50, FALSE) eminence_nominee = null @@ -125,13 +125,13 @@ hierophant_message("[eminence_nominee] has ascended into the Eminence!") else if(eminence_nominee == "ghosts") kingmaking = TRUE - hierophant_message("The eminence spire is now selecting a ghost to be the Eminence...") + hierophant_message(span_brass("The eminence spire is now selecting a ghost to be the Eminence...")) var/list/candidates = pollGhostCandidates("Would you like to play as the servants' Eminence?", ROLE_SERVANT_OF_RATVAR, null, ROLE_SERVANT_OF_RATVAR, poll_time = 100) kingmaking = FALSE if(!LAZYLEN(candidates)) for(var/mob/M in servants_and_ghosts()) M.playsound_local(M, 'sound/machines/clockcult/integration_cog_install.ogg', 50, FALSE) - hierophant_message("No ghosts accepted the offer! The eminence spire has been reset.") + hierophant_message(span_brass("No ghosts accepted the offer! The eminence spire has been reset.")) eminence_nominee = null return visible_message(span_warning("A blast of white-hot light spirals from [src] in waves!")) diff --git a/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm b/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm index e18ceeecc3bb..f7a091ccb7fc 100644 --- a/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm +++ b/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm @@ -55,7 +55,7 @@ else . += "It has been activated!" else - . += "There are [time_remaining] second[time_remaining != 1 ? "s" : ""] remaining to vote." + . += span_brass("There are [time_remaining] second[time_remaining != 1 ? "s" : ""] remaining to vote.") . += "There are [voters.len]/[votes_needed] votes to activate the beacon!" /obj/structure/destructible/clockwork/heralds_beacon/attack_hand(mob/living/user) @@ -83,7 +83,7 @@ voters -= user.key var/votes_left = votes_needed - voters.len message_admins("[ADMIN_LOOKUPFLW(user)] has [voting ? "voted" : "undone their vote"] to activate [src]! [ADMIN_JMP(user)]") - hierophant_message("[user.real_name] has [voting ? "voted" : "undone their vote"] to activate [src]! The beacon needs [votes_left] more votes to activate.") + hierophant_message(span_brass("[user.real_name] has [voting ? "voted" : "undone their vote"] to activate [src]! The beacon needs [votes_left] more votes to activate.")) for(var/mob/M in GLOB.player_list) if(isobserver(M) || is_servant_of_ratvar(M)) M.playsound_local(M, 'sound/magic/clockwork/fellowship_armory.ogg', 50, FALSE) diff --git a/code/modules/antagonists/clockcult/clock_structures/mania_motor.dm b/code/modules/antagonists/clockcult/clock_structures/mania_motor.dm index ab2efb14466c..4088b225f91d 100644 --- a/code/modules/antagonists/clockcult/clock_structures/mania_motor.dm +++ b/code/modules/antagonists/clockcult/clock_structures/mania_motor.dm @@ -19,7 +19,7 @@ /obj/structure/destructible/clockwork/powered/mania_motor/examine(mob/user) . = ..() if(is_servant_of_ratvar(user) || isobserver(user)) - . += "It requires [DisplayEnergy(mania_cost)] to run." + . += span_sevtug_small("It requires [DisplayEnergy(mania_cost)] to run.") /obj/structure/destructible/clockwork/powered/mania_motor/forced_disable(bad_effects) if(active) diff --git a/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm b/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm index d94f08358b1c..2eee35def5b7 100644 --- a/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm +++ b/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm @@ -28,7 +28,7 @@ /obj/structure/destructible/clockwork/ocular_warden/examine(mob/user) . = ..() - . += "[target ? "It's fixated on [target]!" : "Its gaze is wandering aimlessly."]" + . += span_brass("[target ? "It's fixated on [target]!" : "Its gaze is wandering aimlessly."]") /obj/structure/destructible/clockwork/ocular_warden/hulk_damage() return 25 diff --git a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm index ed920c47f8b0..96dc92926d3a 100644 --- a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm +++ b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm @@ -148,7 +148,7 @@ clashing = FALSE qdel(narsie) if("Nar-Sie") - send_to_playing_players("\"[pick("Ha.", "Ra'sha fonn dest.", "You fool. To come here.")]\"") //Broken English + send_to_playing_players(span_cult("\"[pick("Ha.", "Ra'sha fonn dest.", "You fool. To come here.")]\"")) //Broken English sound_to_playing_players('sound/magic/demon_attack1.ogg') sound_to_playing_players('sound/magic/clockwork/anima_fragment_death.ogg', 62) narsie.clashing = FALSE diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 21b89597f1f6..ebef8fd4b45c 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, "You cannot store more than [MAX_BLOODCHARGE] spells. Pick a spell to remove.") + to_chat(owner, span_cultitalic("You cannot store more than [MAX_BLOODCHARGE] spells. Pick a spell to remove.")) else - to_chat(owner, "You cannot store more than [RUNELESS_MAX_BLOODCHARGE] spells without an empowering rune! Pick a spell to remove.") + to_chat(owner, span_cultitalic("You 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) @@ -265,7 +265,7 @@ 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,/atom/.proc/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." @@ -695,7 +695,7 @@ else var/ratio = uses/overall_damage if(H == user) - to_chat(user,"Your blood healing is far less efficient when used on yourself!") + to_chat(user,span_cult("Your 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) @@ -807,7 +807,7 @@ uses -= BLOOD_BARRAGE_COST qdel(src) if(user.put_in_hands(rite)) - to_chat(user, "Your hands glow with power!") + to_chat(user, span_cult("Your hands glow with power!")) else to_chat(user, span_cultitalic("You need a free hand for this rite!")) qdel(rite) @@ -819,7 +819,7 @@ uses -= BLOOD_BEAM_COST qdel(src) if(user.put_in_hands(rite)) - to_chat(user, "Your hands glow with POWER OVERWHELMING!!!") + to_chat(user, span_cultlarge("Your hands glow with POWER OVERWHELMING!!!")) else to_chat(user, span_cultitalic("You need a free hand for this rite!")) qdel(rite) diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index ca1a594374c5..196e686faf96 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -227,7 +227,7 @@ /datum/action/innate/cult/master/cultmark/IsAvailable() if(cooldown > world.time) if(!CM.active) - to_chat(owner, "You need to wait [DisplayTimeText(cooldown - world.time)] before you can mark another target!") + to_chat(owner, span_cultlarge("You need to wait [DisplayTimeText(cooldown - world.time)] before you can mark another target!")) return FALSE return ..() @@ -280,7 +280,7 @@ 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/hallucinations/over_here2.ogg','sound/hallucinations/over_here3.ogg'),0,1,75)) B.current.client.images += C.cult_team.blood_target_image attached_action.owner.update_action_buttons_icon() @@ -293,7 +293,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 @@ -361,7 +361,7 @@ 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/hallucinations/over_here2.ogg','sound/hallucinations/over_here3.ogg'),0,1,75)) B.current.client.images += C.cult_team.blood_target_image to_chat(owner,span_cultbold("You have marked the [target] for the cult! It will last for [DisplayTimeText(base_cooldown)].")) @@ -398,7 +398,7 @@ return FALSE if(cooldown > world.time) if(!PM.active) - to_chat(owner, "You need to wait [DisplayTimeText(cooldown - world.time)] before you can pulse again!") + to_chat(owner, span_cultlarge("You need to wait [DisplayTimeText(cooldown - world.time)] before you can pulse again!")) return FALSE return ..() @@ -445,7 +445,7 @@ attached_action.throwing = TRUE attached_action.throwee = target SEND_SOUND(ranged_ability_user, sound('sound/weapons/thudswoosh.ogg')) - to_chat(ranged_ability_user,"You reach through the veil with your mind's eye and seize [target]!") + to_chat(ranged_ability_user,span_cult("You reach through the veil with your mind's eye and seize [target]!")) return else new /obj/effect/temp_visual/cult/sparks(get_turf(attached_action.throwee), ranged_ability_user.dir) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 5cd0669e8503..889c7c55c1e7 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -977,7 +977,7 @@ GLOBAL_VAR_INIT(curselimit, 0) H.faction = list("cult") H.GiveTarget(owner) H.move_to_delay = owner.movement_delay() - to_chat(owner, "[src] betrays you!") + to_chat(owner, span_danger("[src] betrays you!")) return FALSE /obj/item/shield/mirror/proc/readd() diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index 9a5494c91179..5e23bf1e0a23 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -39,7 +39,7 @@ 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) @@ -50,8 +50,8 @@ 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].", \ - "You repair [src], leaving [p_they()] at [round(obj_integrity * 100 / max_integrity)]% stability.") + M.visible_message(span_danger("[M] repairs \the [src]."), \ + span_cult("You repair [src], leaving [p_they()] at [round(obj_integrity * 100 / max_integrity)]% stability.")) else to_chat(M, span_cult("You cannot repair [src], as [p_theyre()] undamaged!")) else diff --git a/code/modules/antagonists/cult/ritual.dm b/code/modules/antagonists/cult/ritual.dm index 94df7d3e37f9..4e7f91777f3c 100644 --- a/code/modules/antagonists/cult/ritual.dm +++ b/code/modules/antagonists/cult/ritual.dm @@ -69,7 +69,7 @@ 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) diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index d060c213f23e..4c723ef9716a 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -260,7 +260,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 @@ -890,7 +890,7 @@ 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, span_cultitalic("You are sustaining too many ghosts to summon more!")) @@ -921,7 +921,7 @@ structure_check() searches for nearby cultist structures required for the invoca 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, "You 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("You 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()) diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm index 17c73e37c0a9..dc4b2cac0ff7 100644 --- a/code/modules/antagonists/devil/devil.dm +++ b/code/modules/antagonists/devil/devil.dm @@ -486,8 +486,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, "You remember your 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, your infernal form is not without weaknesses.") + to_chat(owner.current, span_warning("You remember your 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, your 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 yourself.") to_chat(owner.current, GLOB.lawlorify[LAW][bane]) diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm index 666118a1071d..65119e46ada0 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -229,7 +229,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) @@ -240,7 +240,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) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm index 0342740023ac..a90962dea78a 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm @@ -226,7 +226,7 @@ throwtarget = get_edge_target_turf(src, pick(GLOB.alldirs)) human_user.safe_throw_at(throwtarget, rand(1,20), 1, src, force = MOVE_FORCE_OVERPOWERING , quickstart = TRUE) human_user.Shake(rand(-100,100), rand(-100,100), 110) //oh we are TOTALLY stacking these //turns out we are not in fact stacking these - to_chat(user, "[pick("I- I- I-", "NO-", "IT HURTS-", "GETOUTOFMYHEADGETOUTOFMY-", "POD-","COVE-", "AAAAAAAAA-")]") + to_chat(user, span_userdanger("[pick("I- I- I-", "NO-", "IT HURTS-", "GETOUTOFMYHEADGETOUTOFMY-", "POD-","COVE-", "AAAAAAAAA-")]")) sleep(1.1) //Spooky flavor message spam to_chat(user, span_cultbold("That was a really bad idea...")) human_user.ghostize() diff --git a/code/modules/antagonists/fugitive/fugitive.dm b/code/modules/antagonists/fugitive/fugitive.dm index 86b16167f237..cfc736bf9d8e 100644 --- a/code/modules/antagonists/fugitive/fugitive.dm +++ b/code/modules/antagonists/fugitive/fugitive.dm @@ -117,7 +117,7 @@ if(!message) return user.whisper(html_decode(message), language = /datum/language/common) // yogs - var/my_message = "Brother [findtextEx(user.name, user.real_name) ? user.name : "[user.real_name] (as [user.name])"]: [message]" + var/my_message = span_boldnotice("Brother [findtextEx(user.name, user.real_name) ? user.name : "[user.real_name] (as [user.name])"]: [message]") for(var/i in GLOB.player_list) var/mob/M = i if(isfugitive(M)) diff --git a/code/modules/antagonists/fugitive/old_god.dm b/code/modules/antagonists/fugitive/old_god.dm index e25c6da293ed..3359959aa600 100644 --- a/code/modules/antagonists/fugitive/old_god.dm +++ b/code/modules/antagonists/fugitive/old_god.dm @@ -72,7 +72,7 @@ if(!message) return src.log_talk(message, LOG_SAY, tag="fugitive god") - message = "[name]: \"[capitalize(message)]\"" + message = span_boldnotice("[name]: \"[capitalize(message)]\"") for(var/mob/V in GLOB.player_list) if(V.mind.has_antag_datum(/datum/antagonist/fugitive)) to_chat(V, "[message]") diff --git a/code/modules/antagonists/monkey/monkey.dm b/code/modules/antagonists/monkey/monkey.dm index 76c7dc7d9488..97cb51e32040 100644 --- a/code/modules/antagonists/monkey/monkey.dm +++ b/code/modules/antagonists/monkey/monkey.dm @@ -191,16 +191,16 @@ 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_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_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_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) diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm index bf6586ecd098..fe0b0edf6601 100644 --- a/code/modules/antagonists/revenant/revenant.dm +++ b/code/modules/antagonists/revenant/revenant.dm @@ -93,7 +93,7 @@ /mob/living/simple_animal/revenant/Login() ..() - to_chat(src, "You are a revenant.") + to_chat(src, span_deadsay("You are a revenant.")) to_chat(src, "Your formerly mundane spirit has been infused with alien energies and empowered into a revenant.") to_chat(src, "You are not dead, not alive, but somewhere in between. You are capable of limited interaction with both worlds.") to_chat(src, "You are invincible and invisible to everyone but other ghosts. Most abilities will reveal you, rendering you vulnerable.") @@ -159,7 +159,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) diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm index 4edee2d7eae1..1f3517bc7790 100644 --- a/code/modules/antagonists/revenant/revenant_abilities.dm +++ b/code/modules/antagonists/revenant/revenant_abilities.dm @@ -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() @@ -356,7 +356,7 @@ blight.stage++ if(!blightfound) H.ForceContractDisease(new /datum/disease/revblight(), FALSE, TRUE) - to_chat(H, "You feel [pick("suddenly sick", "a surge of nausea", "like your skin is wrong")].") + to_chat(H, span_revenminor("You 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 91f90fdf78b0..05e972caeaa9 100644 --- a/code/modules/antagonists/revenant/revenant_blight.dm +++ b/code/modules/antagonists/revenant/revenant_blight.dm @@ -60,7 +60,7 @@ 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(span_warning("[affected_mob] looks terrifyingly gaunt..."), "You suddenly feel like your skin is wrong...") + affected_mob.visible_message(span_warning("[affected_mob] looks terrifyingly gaunt..."), span_revennotice("You suddenly feel like your skin is wrong...")) affected_mob.add_atom_colour("#1d2953", TEMPORARY_COLOUR_PRIORITY) addtimer(CALLBACK(src, .proc/cure), 100) else diff --git a/code/modules/antagonists/slaughter/slaughter_antag.dm b/code/modules/antagonists/slaughter/slaughter_antag.dm index 61ac5ca92e64..c52e17c7a4e0 100644 --- a/code/modules/antagonists/slaughter/slaughter_antag.dm +++ b/code/modules/antagonists/slaughter/slaughter_antag.dm @@ -14,7 +14,7 @@ /datum/antagonist/slaughter/greet() . = ..() owner.announce_objectives() - to_chat(owner, "You have a powerful alt-attack that slams people backwards that you can activate by shift+ctrl+clicking your target!") + to_chat(owner, span_warning("You have a powerful alt-attack that slams people backwards that you can activate by shift+ctrl+clicking your target!")) /datum/antagonist/slaughter/proc/forge_objectives() if(summoner) @@ -30,4 +30,4 @@ /datum/antagonist/slaughter/laughter name = "Laughter demon" - objective_verb = "Hug and Tickle" \ No newline at end of file + objective_verb = "Hug and Tickle" diff --git a/code/modules/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm index cebf33623edc..8315f1d32043 100644 --- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm +++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm @@ -206,7 +206,7 @@ if(syndicate) fail_msg += span_userdanger(" 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 your contract being terminated." + fail_msg += span_userdanger(" 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 your contract being terminated.") reinstate_escape_objective(owner) last_man_standing = FALSE to_chat(owner.current, fail_msg) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index f443eb51b861..59e0ca6de7fc 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -407,7 +407,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 5ded9e7a3635..527c4b458cdf 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) /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, span_warning("[name] has run out of uses!")) @@ -83,7 +83,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) /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, span_warning("[name] has run out of uses!")) @@ -718,7 +718,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) 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/items/wirecutter.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 @@ -781,7 +781,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) Do not allow the mech to leave the station's vicinity or allow it to be destroyed. Upgrade is done immediately upon purchase." cost = 30 upgrade = TRUE - unlock_text = "Virus package compiled. Select a target mech at any time. You 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. You must remain on the station at all times. Loss of signal will result in total system lockout.") unlock_sound = 'sound/mecha/nominal.ogg' /datum/AI_Module/upgrade/mecha_domination/upgrade(mob/living/silicon/ai/AI) diff --git a/code/modules/antagonists/valentines/valentine.dm b/code/modules/antagonists/valentines/valentine.dm index 1f45f27e8671..4a6a8f7bac5a 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() diff --git a/code/modules/antagonists/zombie/abilities/spit.dm b/code/modules/antagonists/zombie/abilities/spit.dm index 9dddbe4c2bca..e244411adfba 100644 --- a/code/modules/antagonists/zombie/abilities/spit.dm +++ b/code/modules/antagonists/zombie/abilities/spit.dm @@ -10,7 +10,7 @@ if(active) remove_ranged_ability(span_notice("You close your neurotoxin reserves.")) else - add_ranged_ability(user, "You open your neurotoxin reserves. Left-click to fire at a target!", TRUE) + add_ranged_ability(user, span_notice("You open your neurotoxin reserves. Left-click to fire at a target!"), TRUE) /obj/effect/proc_holder/zombie/spit/update_icon() action.button_icon_state = "alien_neurotoxin_[active]" diff --git a/code/modules/antagonists/zombie/zombie.dm b/code/modules/antagonists/zombie/zombie.dm index 19b4afb9275b..4658872e6b38 100644 --- a/code/modules/antagonists/zombie/zombie.dm +++ b/code/modules/antagonists/zombie/zombie.dm @@ -117,7 +117,7 @@ /datum/antagonist/zombie/proc/add_button_timed() zombify.Grant(owner.current) - to_chat(owner.current, "You can now turn into a zombie! The ability INSTANTLY kills you, and starts the process of turning into a zombie. IN 5 MINUTES YOU WILL FORCIBLY BE ZOMBIFIED IF YOU HAVEN'T.") + to_chat(owner.current, span_userdanger("You can now turn into a zombie! The ability INSTANTLY kills you, and starts the process of turning into a zombie. IN 5 MINUTES YOU WILL FORCIBLY BE ZOMBIFIED IF YOU HAVEN'T.")) addtimer(CALLBACK(src, .proc/force_zombify), 5 MINUTES) /datum/antagonist/zombie/proc/force_zombify() @@ -148,7 +148,7 @@ /datum/antagonist/zombie/proc/finish_evolution_2() evolution_ready = TRUE evolution2.Grant(owner.current) - to_chat(owner.current, "You can now evolve into a Tier 2 zombie! There can only be tier 2 zombies equal to the amount of starting zombies!") + to_chat(owner.current, span_userdanger("You can now evolve into a Tier 2 zombie! There can only be tier 2 zombies equal to the amount of starting zombies!")) /datum/team/zombie name = "Zombies" @@ -429,4 +429,4 @@ cooldown_ends = world.time + cooldown_time ready = FALSE -#undef TIER_2_TIME \ No newline at end of file +#undef TIER_2_TIME diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 46869153d65a..6260f16c5425 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -53,8 +53,8 @@ . = ..() . += 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/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 17d1209c573f..41944c81e071 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -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 diff --git a/code/modules/cargo/export_scanner.dm b/code/modules/cargo/export_scanner.dm index 045001efe96a..b88236ef2eec 100644 --- a/code/modules/cargo/export_scanner.dm +++ b/code/modules/cargo/export_scanner.dm @@ -38,7 +38,7 @@ 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, span_warning("Scanned [O], no export value.")) if(bounty_ship_item_and_contents(O, dry_run=TRUE)) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 9031dcd7adf7..27b13a5bc89c 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -401,7 +401,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( log_access("Failed login: [key] - blacklisted byond version") to_chat(src, span_userdanger("Your 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, "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("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 @@ -431,7 +431,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( 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, "Your version of BYOND is too old:") + to_chat(src, span_danger("Your 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") @@ -451,7 +451,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( msg += "" src << browse(msg, "window=warning_popup") else - to_chat(src, "Your version of byond may be getting out of date:") + to_chat(src, span_danger("Your 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") @@ -836,7 +836,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( 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) @@ -1127,4 +1127,4 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( /client/proc/check_panel_loaded() if(statbrowser_ready) return - to_chat(src, "Statpanel failed to load, click here to reload the panel ") + to_chat(src, span_userdanger("Statpanel failed to load, click here to reload the panel ")) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index db03c2ce9b55..3010a682cd78 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1237,7 +1237,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) 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"]) @@ -1849,7 +1849,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("clear_scars") var/path = "data/player_saves/[user.ckey[1]]/[user.ckey]/scars.sav" fdel(path) - to_chat(user, "All scar slots cleared.") + to_chat(user, span_notice("All scar slots cleared.")) if("hear_midis") toggles ^= SOUND_MIDI diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index a208a3ef5db5..99fbd40ef838 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -144,7 +144,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car qdel(cape) if(current_version < 33) //Reset map preference to no choice if(preferred_map) - to_chat(parent, "Your preferred map has been reset to nothing. Please set it to the map you wish to play on.") + to_chat(parent, span_userdanger("Your preferred map has been reset to nothing. Please set it to the map you wish to play on.")) preferred_map = null diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 938fb928445d..ca443b34711a 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -108,7 +108,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc if(holder.fakekey) // If they're stealhminning oocmsg_toadmins = oocmsg + "OOC: [keyname]/([holder.fakekey]): [msg]" // ^ Message sent to people who should know when someone's stealthminning - oocmsg = "[span_prefix("OOC:")] [holder.fakekey]: [msg]" + oocmsg = span_ooc("[span_prefix("OOC:")] [holder.fakekey]: [msg]") // ^ Message sent to normal people else oocmsg += "OOC: [keyname]: [msg]" // Footer for an admin or AO's OOC. diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 0645850c82b5..5571e95eb3b7 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -96,9 +96,9 @@ repair(user, params) if(CLOTHING_SHREDDED) if(S.amount < 3) - to_chat(user, "You require 3 [S.name] to repair [src].") + to_chat(user, span_warning("You require 3 [S.name] to repair [src].")) return - to_chat(user, "You begin fixing the damage to [src] with [S]...") + to_chat(user, span_notice("You begin fixing the damage to [src] with [S]...")) if(do_after(user, 6 SECONDS, TRUE, src)) if(S.use(3)) repair(user, params) @@ -116,7 +116,7 @@ damage_by_parts = null if(user) UnregisterSignal(user, COMSIG_MOVABLE_MOVED) - to_chat(user, "You fix the damage on [src].") + to_chat(user, span_notice("You fix the damage on [src].")) /** * take_damage_zone() is used for dealing damage to specific bodyparts on a worn piece of clothing, meant to be called from [/obj/item/bodypart/proc/check_woundings_mods()] @@ -165,7 +165,7 @@ if(iscarbon(loc)) var/mob/living/carbon/C = loc - C.visible_message("The [zone_name] on [C]'s [src.name] is [break_verb] away!", "The [zone_name] on your [src.name] is [break_verb] away!", vision_distance = COMBAT_MESSAGE_RANGE) + C.visible_message(span_danger("The [zone_name] on [C]'s [src.name] is [break_verb] away!"), span_userdanger("The [zone_name] on your [src.name] is [break_verb] away!"), vision_distance = COMBAT_MESSAGE_RANGE) RegisterSignal(C, COMSIG_MOVABLE_MOVED, .proc/bristle, override = TRUE) zones_disabled++ @@ -219,7 +219,7 @@ /obj/item/clothing/examine(mob/user) . = ..() if(damaged_clothes == CLOTHING_SHREDDED) - . += "It is completely shredded and requires mending before it can be worn again!" + . += span_warning("It is completely shredded and requires mending before it can be worn again!") return switch (max_heat_protection_temperature) if (400 to 1000) @@ -233,11 +233,11 @@ var/zone_name = parse_zone(zone) switch(pct_damage_part) if(100 to INFINITY) - . += "The [zone_name] is useless and requires mending!" + . += span_warning("The [zone_name] is useless and requires mending!") if(60 to 99) - . += "The [zone_name] is heavily shredded!" + . += span_warning("The [zone_name] is heavily shredded!") if(30 to 59) - . += "The [zone_name] is partially shredded." + . += span_danger("The [zone_name] is partially shredded.") var/datum/component/storage/pockets = GetComponent(/datum/component/storage) if(pockets) var/list/how_cool_are_your_threads = list("") @@ -464,7 +464,7 @@ BLIND // can't see anything update_clothes_damaged_state() if(ismob(loc)) var/mob/M = loc - M.visible_message("[M]'s [src.name] falls off, completely shredded!", "Your [src.name] falls off, completely shredded!", vision_distance = COMBAT_MESSAGE_RANGE) + M.visible_message(span_danger("[M]'s [src.name] falls off, completely shredded!"), span_warning("Your [src.name] falls off, completely shredded!"), vision_distance = COMBAT_MESSAGE_RANGE) M.dropItemToGround(src) else ..() @@ -474,7 +474,7 @@ BLIND // can't see anything if(!istype(L)) return if(prob(0.2)) - to_chat(L, "The damaged threads on your [src.name] chafe!") + to_chat(L, span_warning("The damaged threads on your [src.name] chafe!")) /*obj/item/clothing/proc/set_sensor_glob() var/mob/living/carbon/human/H = src.loc diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 3d954c74e35b..3f7f74b505d4 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -34,7 +34,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." diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index 360d6266ea2d..91c2b5a518ff 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -214,7 +214,7 @@ // Fingerprints feedback(sound_scanner_scan) if(length(fingerprints)) - add_log("Prints:") + add_log(span_info("Prints:")) for(var/finger in fingerprints) add_log("[finger]") found_something = 1 @@ -224,7 +224,7 @@ feedback(sound_scanner_scan) if (length(blood)) feedback(sound_scanner_positive) - add_log("Blood:") + add_log(span_info("Blood:")) for(var/B in blood) add_log("Type: [blood[B]] DNA: [B]") found_something = 1 @@ -233,7 +233,7 @@ feedback(sound_scanner_scan) if(length(fibers)) feedback(sound_scanner_positive) - add_log("Fibers:") + add_log(span_info("Fibers:")) for(var/fiber in fibers) add_log("[fiber]") found_something = 1 @@ -241,7 +241,7 @@ //Reagents feedback(sound_scanner_scan) if(length(reagents)) - add_log("Reagents:") + add_log(span_info("Reagents:")) for(var/R in reagents) add_log("Reagent: [R] Volume: [reagents[R]]") found_something = 1 @@ -295,7 +295,7 @@ if(scanning) 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/manipulation.dm b/code/modules/discord/manipulation.dm index 6f1f40607b98..9a733a9fe37a 100644 --- a/code/modules/discord/manipulation.dm +++ b/code/modules/discord/manipulation.dm @@ -23,15 +23,15 @@ 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 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 var/unlink_choice = alert(usr, "Ckey [lookup_ckey] is linked to Discord ID [returned_id]. Do you wish to unlink or cancel?", "Account Found", "Unlink", "Cancel") if(unlink_choice == "Unlink") SSdiscord.unlink_account(lookup_ckey) else - to_chat(usr, "Ckey [lookup_ckey] has no associated Discord ID!") + to_chat(usr, span_warning("Ckey [lookup_ckey] has no associated Discord ID!")) diff --git a/code/modules/events/flutes.dm b/code/modules/events/flutes.dm index 140a054ffd7f..cecea69b4017 100644 --- a/code/modules/events/flutes.dm +++ b/code/modules/events/flutes.dm @@ -54,17 +54,17 @@ flute_corridor_encounter(M) /datum/round_event/flutes/proc/flute_vis_flicker(mob/living/carbon/M) - to_chat(M, "Your vision flickers.") + to_chat(M, span_warning("Your vision flickers.")) M.blur_eyes(15) /datum/round_event/flutes/proc/flute_headache(mob/living/carbon/M) - to_chat(M, "You get an intense headache!") + to_chat(M, span_warning("You get an intense headache!")) M.blur_eyes(15) M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 20, 30) M.adjustStaminaLoss(15) /datum/round_event/flutes/proc/flute_tremble(mob/living/carbon/M) - to_chat(M, "Something trembles along the edge of your vision, your eyes water, with the familiar beat of blood racing through your head.") + to_chat(M, span_warning("Something trembles along the edge of your vision, your eyes water, with the familiar beat of blood racing through your head.")) M.blur_eyes(30) M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 30, 35) M.adjustStaminaLoss(30) @@ -78,32 +78,32 @@ //sanity = 75 /datum/round_event/flutes/proc/flute_starlight(mob/living/carbon/M) - to_chat(M, "As the nearest stars light your skin and your station, you can make out the faint whispers being spoken in turn with the monotone flutes playing beyond you. You feel so tired, as the struts of metal piping, the walls, the floor twist in unnatural ways, as the lights dim.") + to_chat(M, span_warning("As the nearest stars light your skin and your station, you can make out the faint whispers being spoken in turn with the monotone flutes playing beyond you. You feel so tired, as the struts of metal piping, the walls, the floor twist in unnatural ways, as the lights dim.")) sleep(30 SECONDS) M.blur_eyes(40) M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 65, 70, 80) ADD_TRAIT(M, TRAIT_UNSTABLE, M) //sanity = 50 sleep(25 SECONDS) - to_chat(M, "Exhaustion takes you.") + to_chat(M, span_warning("Exhaustion takes you.")) M.SetSleeping(70) - to_chat(M, "You see vague, inhuman forms, in the tightest corners of your alien dreams, dancing frantically to thundering drums, in tune with yellow monotone flutes.") + to_chat(M, span_notice("You see vague, inhuman forms, in the tightest corners of your alien dreams, dancing frantically to thundering drums, in tune with yellow monotone flutes.")) sleep(20 SECONDS) M.adjustBruteLoss(15) - to_chat(M, "You wake from your deep dreams, blood oozing from your nose, while your head beats to a familiar tune.") + to_chat(M, span_notice("You wake from your deep dreams, blood oozing from your nose, while your head beats to a familiar tune.")) /datum/round_event/flutes/proc/flute_corridor_encounter(mob/living/carbon/M) - to_chat(M, "You glance upwards, down the corridor.") + to_chat(M, span_notice("You glance upwards, down the corridor.")) sleep(5 SECONDS) to_chat(M, "A BRIGHT BLINDING LIGHT FILLS YOUR VISION!") M.eye_blind = 5 sleep(10 SECONDS) to_chat(M, "Your mind oozes at what it cannot comprehend, you feel your soul snatching onto your brain, with chills rolling up your spine. You barely hang on.") if(HAS_TRAIT(M, TRAIT_UNSTABLE)) - to_chat(M, "Your mind shatters.") + to_chat(M, span_green("Your mind shatters.")) M.SetSleeping(30) sleep(30 SECONDS) - to_chat(M, "Your flesh undulates, and boils off your bones. You were blind, yet now you've seen a glimpse behind the cosmic curtain.") + to_chat(M, span_suicide("Your flesh undulates, and boils off your bones. You were blind, yet now you've seen a glimpse behind the cosmic curtain.")) //sanity = 25 REMOVE_TRAIT(M, TRAIT_UNSTABLE, M) M.blur_eyes(5) @@ -112,15 +112,15 @@ M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 65, 70, 75, 80, 90) M.set_species(/datum/species/skeleton) sleep(30 SECONDS) - to_chat(M, "Your mind.. Has been humbled. You have escaped by the skin of your teeth, but have lost your body, and much, much more. You feel.. Mirth?") + to_chat(M, span_warning("Your mind.. Has been humbled. You have escaped by the skin of your teeth, but have lost your body, and much, much more. You feel.. Mirth?")) else - to_chat(M, "Your mind shatters.") + to_chat(M, span_suicide("Your mind shatters.")) ADD_TRAIT(M, TRAIT_UNSTABLE, M) //sanity = 1 M.SetSleeping(30) M.blur_eyes(40) M.adjustStaminaLoss(99) - to_chat(M, "Y'HAH HT'HU THRZHZU. UA'KLL GHRT AWN ZUU!") + to_chat(M, span_narsie("Y'HAH HT'HU THRZHZU. UA'KLL GHRT AWN ZUU!")) M.adjustBruteLoss(60, 70, 75, 80, 85) M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 65, 70, 75, 80, 90) random_blackouts_enable(M) diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 43c3337a4b3a..d4e4e687e7ec 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/dream_sequence, dream_fragments), rand(10,30)) else diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 9f42631e1e57..8b6c181c1950 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -1144,7 +1144,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() diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index f9cae5cc6df6..b0e15734cd45 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -229,7 +229,7 @@ All foods are distributed among various categories. Use common sense. to_chat(user, span_warning("You cannot slice [src] here! You need a table or at least a tray.")) return FALSE - user.visible_message("[user] slices [src].", "You slice [src].") + user.visible_message("[user] slices [src].", span_notice("You slice [src].")) var/reagents_per_slice = reagents.total_volume/slices_num for(var/i in 1 to slices_num) diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index caad9bd2ee58..727657f9feca 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -85,7 +85,7 @@ if(!(stat & (NOPOWER|BROKEN))) . += "[span_notice("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) diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index dcd5eaae2922..0c2cf376fdc6 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -67,9 +67,9 @@ if(in_range(user, src) || isobserver(user)) if(!stat)//machine must be operable if (contents.len >= max_n_of_items) - . += "The status display reads: Inventory full! Please remove items or upgrade the parts of this storage unit." + . += span_notice("The status display reads: Inventory full! Please remove items or upgrade the parts of this storage unit.") else - . += "The status display reads: Inventory quantity is currently [contents.len] out of [max_n_of_items] items." + . += span_notice("The status display reads: Inventory quantity is currently [contents.len] out of [max_n_of_items] items.") else if(!(stat & BROKEN)) . += span_notice("The status display is off.") diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm index cffcefa64b3a..c01b3881bd47 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, 1) 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, 1) 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, 1) var/number = rand(1,3) for(var/i=0,i < number,i++) @@ -91,14 +91,14 @@ else if(trapped == ANGRY_FAITHLESS) visible_message(span_userdanger("The closet bursts open!")) - visible_message("THIS BEING RADIATES PURE EVIL! YOU BETTER RUN!!!") + visible_message(span_userdanger("THIS BEING RADIATES PURE EVIL! YOU BETTER RUN!!!")) playsound(loc, 'sound/hallucinations/wail.ogg', 300, 1) 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, 1) spawn_atom_to_turf(/mob/living/simple_animal/hostile/retaliate/clown/insane, loc, 1, FALSE) trapped = 0 diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 115ef140ed84..a63dd91b6374 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -60,7 +60,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() @@ -336,4 +336,4 @@ return TRUE if("select") selected_cat = params["category"] - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index e6ff6307c629..65675db9e43c 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -119,7 +119,7 @@ podman.hardset_dna(null,null,null,podman.real_name,blood_type, new /datum/species/pod,features)//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman podman.set_cloned_appearance() log_cloning("[key_name(mind)] cloned as a podman via [src] in [parent] at [AREACOORD(parent)].") - to_chat(podman, "You do not remember your death, how you died, or who killed you. See rule 1.6.") //yogs + to_chat(podman, span_notice("You do not remember your death, how you died, or who killed you. See rule 1.6.")) //yogs else //else, one packet of seeds. maybe two var/seed_count = 1 diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 230ee565668c..c76feef7342c 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -302,7 +302,7 @@ /obj/machinery/hydroponics/examine(user) . = ..() if(myseed) - . += "It has [span_name("[myseed.plantname]")] planted." + . += span_info("It has [span_name("[myseed.plantname]")] planted.") if (dead) . += span_warning("It's dead!") else if (harvest) diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 490639091975..a0d0ab4d8cca 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -79,7 +79,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) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index a89034c810a4..94b8b7ac3bc7 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -327,14 +327,14 @@ /// Ghost attack proc /obj/item/seeds/attack_ghost(mob/user) - to_chat(user, "*---------*\n This is \a [span_name("[src]")].") + to_chat(user, span_info("*---------*\n This is \a [span_name("[src]")].")) var/text = get_analyzer_text() if(text) to_chat(user, span_notice("[text]")) /obj/item/seeds/attackby(obj/item/O, mob/user, params) if (istype(O, /obj/item/plant_analyzer)) - to_chat(user, "*---------*\n This is \a [span_name("[src]")].") + to_chat(user, span_info("*---------*\n This is \a [span_name("[src]")].")) var/text = get_analyzer_text() if(text) to_chat(user, span_notice("[text]")) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 398b7a3bef90..c757390f13cb 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -27,16 +27,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) . = ..() diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index e6b2bccceba4..dc925288ed66 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -104,7 +104,7 @@ 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, span_warning("[pick("You hear faint whispers.","You smell ash.","You feel hot.","You hear a roar in the distance.")]")) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 7b62e5d613f9..ee6e35106eca 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -37,8 +37,8 @@ /obj/item/twohanded/required/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 . += span_notice("It has \a [T] attached, which causes [T.effect_desc()].") diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 702b273d2feb..d5a9dae906d6 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -153,7 +153,7 @@ 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, 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.")) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 3d61ad95d563..5839bb234fb2 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -618,7 +618,7 @@ var/holycheck = ishumanbasic(C) if(!(holycheck || islizard(C) || ismoth(C) || isskeleton(C) || ispreternis(C)) || (reac_volume < 5)) //humans (which are holy?), lizards, skeletons, and preterni(ises?) can get wings if(method == INGEST && show_message) - to_chat(C, "You feel nothing but a terrible aftertaste.") + to_chat(C, span_notice("You feel nothing but a terrible aftertaste.")) return ..() to_chat(C, span_userdanger("A terrible pain travels down your back as wings burst out!")) diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 1650f5f9b208..4258b10ea051 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -84,7 +84,7 @@ . += "[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 diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm index 887556500cba..900721370294 100644 --- a/code/modules/mob/dead/new_player/login.dm +++ b/code/modules/mob/dead/new_player/login.dm @@ -14,11 +14,11 @@ to_chat(src, "
[motd]
", 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 diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 8bfe16961c01..3ae04568fab3 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -422,7 +422,7 @@ AnnounceArrival(humanc, rank) AddEmploymentContract(humanc) if(GLOB.highlander) - to_chat(humanc, "THERE CAN BE ONLY ONE!!!") + to_chat(humanc, span_userdanger("THERE CAN BE ONLY ONE!!!")) humanc.make_scottish() humanc.increment_scar_slot() diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 6f2078ed2501..7829b20b6328 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -392,7 +392,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)) @@ -658,7 +658,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()) if(!..()) return 0 - usr.visible_message("[src] points to [A].") + usr.visible_message(span_deadsay("[src] points to [A].")) return 1 /mob/dead/observer/verb/view_manifest() diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index f8b5f8d001dd..8180d57ece95 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -170,7 +170,7 @@ if(BLOOD_FLOW_DECREASING) // this only matters if none of the wounds fit the above two cases, included here for completeness continue - to_chat(src, "[bleeding_severity][rate_of_change]") + to_chat(src, span_warning("[bleeding_severity][rate_of_change]")) COOLDOWN_START(src, bleeding_message_cd, next_cooldown) /mob/living/carbon/human/bleed_warn(bleed_amt = 0, forced = FALSE) diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index d8d668e6adaa..9384588e73ab 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -73,13 +73,13 @@ var/kidnapped = FALSE if(victim.stat == CONSCIOUS) - src.visible_message("[victim] kicks free of the blood pool just before entering it!", null, "You hear splashing and struggling.") + src.visible_message(span_warning("[victim] kicks free of the blood pool just before entering it!"), null, span_notice("You hear splashing and struggling.")) else if(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!", "You 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("You hear a splash and a thud.")) else victim.forceMove(src) victim.emote("scream") - src.visible_message("[src] drags [victim] into the pool of blood!", null, span_notice("You hear a splash.")) + src.visible_message(span_warning("[src] drags [victim] into the pool of blood!"), null, span_notice("You hear a splash.")) kidnapped = TRUE if(kidnapped) @@ -106,7 +106,7 @@ return FALSE if(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))) @@ -166,7 +166,7 @@ return forceMove(B.loc) src.client.eye = src - src.visible_message("[src] rises out of the pool of blood!") + src.visible_message(span_warning("[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/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index 4e832d9673dc..b223006a0c88 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -144,17 +144,17 @@ if(brain_death || brainmob.health <= HEALTH_THRESHOLD_DEAD) . += 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 . += span_info("You 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 . += 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 . += span_info("This one seems particularly lifeless. Perhaps it will regain some of its luster later.") else 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 72d7868cba51..e8b92ae15ea3 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -200,7 +200,7 @@ Doesn't work on other aliens/AI.*/ message = span_notice("You empty your neurotoxin gland.") remove_ranged_ability(message) else - message = "You prepare your neurotoxin gland. Left-click to fire at a target!" + message = span_notice("You 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() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 0c82e11c1258..980f6f67f6d7 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -111,8 +111,8 @@ take_bodypart_damage(10 + 5 * extra_speed, check_armor = TRUE, wound_bonus = extra_speed * 5) victim.Paralyze(20) Paralyze(20) - visible_message("[src] crashes into [victim][extra_speed ? "really hard" : ""], knocking them both over!",\ - "You violently crash into [victim][extra_speed ? "extra hard" : ""]!") + visible_message(span_danger("[src] crashes into [victim][extra_speed ? "really hard" : ""], knocking them both over!"),\ + span_userdanger("You violently crash into [victim][extra_speed ? "extra hard" : ""]!")) playsound(src,'sound/weapons/punch1.ogg',50,1) @@ -179,8 +179,8 @@ if(thrown_thing) if(HAS_TRAIT(src, TRAIT_HULK)) power_throw++ - visible_message("[src] throws [thrown_thing][power_throw ? " really hard!" : "."]", \ - "You throw [thrown_thing][power_throw ? " really hard!" : "."]") + visible_message(span_danger("[src] throws [thrown_thing][power_throw ? " really hard!" : "."]"), \ + span_danger("You throw [thrown_thing][power_throw ? " really hard!" : "."]")) log_message("has thrown [thrown_thing] [power_throw ? "really hard" : ""]", LOG_ATTACK) newtonian_move(get_dir(target, src)) thrown_thing.safe_throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed + power_throw, src, null, null, null, move_force) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 935835cd304f..131cd7c97332 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -132,8 +132,8 @@ attack_message_local = "[user] [message_verb] you[message_hit_area] with [I][extra_wound_details]!" if(user == src) attack_message_local = "You [message_verb] yourself[message_hit_area] with [I][extra_wound_details]" - visible_message("[attack_message]",\ - "[attack_message_local]", null, COMBAT_MESSAGE_RANGE) + visible_message(span_danger("[attack_message]"),\ + span_userdanger("[attack_message_local]"), null, COMBAT_MESSAGE_RANGE) return TRUE /mob/living/carbon/attack_drone(mob/living/simple_animal/drone/user) @@ -451,17 +451,17 @@ return var/starting_hand_index = active_hand_index if(starting_hand_index == grasped_part.held_index) - to_chat(src, "You can't grasp your [grasped_part.name] with itself!") + to_chat(src, span_danger("You can't grasp your [grasped_part.name] with itself!")) return - to_chat(src, "You grasp at your [grasped_part.name], trying to stop the bleeding...") + to_chat(src, span_warning("You grasp at your [grasped_part.name], trying to stop the bleeding...")) if(!do_after(src, 1.5 SECONDS, target = src)) - to_chat(src, "You can't get a good enough grip to slow the bleeding on [grasped_part.name].") + to_chat(src, span_danger("You can't get a good enough grip to slow the bleeding on [grasped_part.name].")) return var/obj/item/self_grasp/grasp = new if(starting_hand_index != active_hand_index || !put_in_active_hand(grasp)) - to_chat(src, "You fail to grasp your [grasped_part.name].") + to_chat(src, span_danger("You fail to grasp your [grasped_part.name].")) QDEL_NULL(grasp) return grasp.grasp_limb(grasped_part) @@ -483,7 +483,7 @@ /obj/item/self_grasp/Destroy() if(user) - to_chat(user, "You stop holding onto your[grasped_part ? " [grasped_part.name]" : "self"].") + to_chat(user, span_warning("You stop holding onto your[grasped_part ? " [grasped_part.name]" : "self"].")) UnregisterSignal(user, COMSIG_PARENT_QDELETING) if(grasped_part) UnregisterSignal(grasped_part, list(COMSIG_CARBON_REMOVE_LIMB, COMSIG_PARENT_QDELETING)) @@ -509,6 +509,6 @@ RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/qdel_void) RegisterSignal(grasped_part, list(COMSIG_CARBON_REMOVE_LIMB, COMSIG_PARENT_QDELETING), .proc/qdel_void) - user.visible_message("[user] grasps at [user.p_their()] [grasped_part.name], trying to stop the bleeding.", "You grab hold of your [grasped_part.name] tightly.", vision_distance=COMBAT_MESSAGE_RANGE) + user.visible_message(span_danger("[user] grasps at [user.p_their()] [grasped_part.name], trying to stop the bleeding."), span_notice("You grab hold of your [grasped_part.name] tightly."), vision_distance=COMBAT_MESSAGE_RANGE) playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) return TRUE diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index fe862d71189a..aaf01080f3f0 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -35,9 +35,9 @@ var/list/missing = get_missing_limbs() for(var/t in missing) if(t==BODY_ZONE_HEAD) - . += "[t_His] [parse_zone(t)] is missing!" + . += span_deadsay("[t_His] [parse_zone(t)] is missing!") continue - . += "[t_His] [parse_zone(t)] is missing!" + . += span_warning("[t_His] [parse_zone(t)] is missing!") var/list/msg = list("") var/temp = getBruteLoss() @@ -148,11 +148,11 @@ if(!visible_scars) return ..() - var/msg = list("You examine [src] closer, and note the following...") + var/msg = list(span_notice("You examine [src] closer, and note the following...")) for(var/i in visible_scars) var/datum/scar/S = i var/scar_text = S.get_examine_description(user) if(scar_text) msg += "[scar_text]" - return msg \ No newline at end of file + return msg diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index b79cc170f93b..830b9e500f6b 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -84,7 +84,7 @@ if(glasses) . += "[t_He] [t_has] [glasses.get_examine_string(user)] covering [t_his] eyes." else if(eye_color == BLOODCULT_EYE && iscultist(src) && HAS_TRAIT(src, CULT_EYES)) - . += "[t_His] eyes are glowing an unnatural red!" + . += span_warning("[t_His] eyes are glowing an unnatural red!") //ears if(ears && !(SLOT_EARS in obscured)) @@ -100,7 +100,7 @@ //Jitters switch(jitteriness) if(300 to INFINITY) - . += "[t_He] [t_is] convulsing violently!" + . += span_warning("[t_He] [t_is] convulsing violently!") if(200 to 300) . += span_warning("[t_He] [t_is] extremely jittery.") if(100 to 200) @@ -420,4 +420,4 @@ new_text = replacetext(new_text, "[pronoun_replacement] is", "[pronoun_replacement] [p_are()]") //To make sure something become "They are" or "She is", not "They are" and "She are" dat += "[new_text]\n" //dat.Join("\n") doesn't work here, for some reason if(dat.len) - return dat.Join() \ No newline at end of file + return dat.Join() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 4bf8a332b3e5..eb85d667f69d 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -916,7 +916,7 @@ if(can_be_firemanned(target) && !incapacitated(FALSE, TRUE)) visible_message(span_notice("[src] starts [skills_space] lifting [target] onto their back.."), //Joe Medic starts quickly/expertly lifting Grey Tider onto their back.. - "[carrydelay < 35 ? "Using your gloves' nanochips, you" : "You"] [skills_space] start to lift [target] onto your back[carrydelay == 40 ? ", while assisted by the nanochips in your gloves.." : "..."]") + span_notice("[carrydelay < 35 ? "Using your gloves' nanochips, you" : "You"] [skills_space] start to lift [target] onto your back[carrydelay == 40 ? ", while assisted by the nanochips in your gloves.." : "..."]")) //(Using your gloves' nanochips, you/You) ( /quickly/expertly) start to lift Grey Tider onto your back(, while assisted by the nanochips in your gloves../...) if(do_after(src, carrydelay, TRUE, target)) //Second check to make sure they're still valid to be carried diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 0087c480e15c..de79f840cdba 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -179,7 +179,7 @@ I.add_mob_blood(src)//it embedded itself in you, of course it's bloody! I.forceMove(src) L.receive_damage(I.w_class*I.embedding.embedded_impact_pain_multiplier, wound_bonus=-30, sharpness = TRUE) - visible_message("[I] embeds itself in [src]'s [L.name]!","[I] embeds itself in your [L.name]!") + visible_message(span_danger("[I] embeds itself in [src]'s [L.name]!"),span_userdanger("[I] embeds itself in your [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 @@ -223,8 +223,8 @@ ..(user, 1) playsound(loc, user.dna.species.attack_sound, 25, 1, -1) var/message = "[user] has [hulk_verb]ed [src]!" - visible_message("[message]", \ - "[message]") + visible_message(span_danger("[message]"), \ + span_userdanger("[message]")) apply_damage(15, BRUTE, wound_bonus=10) return 1 diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 95eb8281c78e..86c3ee1c76f5 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -359,7 +359,7 @@ return if(is_servant_of_ratvar(src) && !stat) - to_chat(src, "You resist Nar-Sie's influence... but not all of it. Run!") + to_chat(src, span_userdanger("You resist Nar-Sie's influence... but not all of it. Run!")) adjustBruteLoss(35) if(src && reagents) reagents.add_reagent(/datum/reagent/toxin/heparin, 5) @@ -391,7 +391,7 @@ if(status_flags & GODMODE) return if(stat != DEAD && !is_servant_of_ratvar(src)) - to_chat(src, "A blinding light boils you alive! Run!") + to_chat(src, span_userdanger("A blinding light boils you alive! Run!")) adjust_fire_stacks(20) IgniteMob() return FALSE diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index c37faf9b45de..4a7216675043 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -16,7 +16,7 @@ to_chat(src, span_notice("You can ventcrawl! Use alt+click on vents to quickly travel about the station.")) if(ranged_ability) - ranged_ability.add_ranged_ability(src, "You currently have [ranged_ability] active!") + ranged_ability.add_ranged_ability(src, span_notice("You 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/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm index 8fa47a78111f..3202372a8974 100644 --- a/code/modules/mob/living/silicon/ai/examine.dm +++ b/code/modules/mob/living/silicon/ai/examine.dm @@ -7,12 +7,12 @@ if (getBruteLoss() < 30) . += span_warning("It looks slightly dented.") else - . += "It looks severely dented!" + . += span_warning("It looks severely dented!") if (getFireLoss()) if (getFireLoss() < 30) . += 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/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index 5f4b1e124f1b..1409820f1835 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -11,13 +11,13 @@ if (getBruteLoss() < maxHealth*0.5) . += 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) . += 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) . += span_warning("It looks barely operational.") if (fire_stacks < 0) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 028d3ecfe58a..b5dc05d7cf44 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -9,7 +9,7 @@ for(var/mob/M in GLOB.player_list) if(M.binarycheck()) if(isAI(M)) - var/renderedAI = "Robotic Talk, [span_name("[name] ([desig])")] [span_message("[message_a]")]" + var/renderedAI = span_binarysay("Robotic Talk, [span_name("[name] ([desig])")] [span_message("[message_a]")]") to_chat(M, renderedAI) else to_chat(M, span_binarysay("[rendered]")) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 32ccb477cc00..9ab580f5090d 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -545,7 +545,7 @@ 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/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, span_notice("[icon2html(src, calling_ai)] [name] called to [end_area]. [path.len-1] meters to destination.")) pathset = 1 diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 3ff88e42bf86..31e0ce7faff2 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -361,7 +361,7 @@ if(MEDBOT_PANIC_HIGH to MEDBOT_PANIC_FUCK) . += span_warning("They are tipped over and visibly panicking!") if(MEDBOT_PANIC_FUCK to INFINITY) - . += "They are freaking out from being tipped over!" + . += span_warning("They are freaking out from being tipped over!") /mob/living/simple_animal/bot/medbot/handle_automated_action() if(!..()) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 47853dc9f4f5..4373a621a1af 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -74,7 +74,7 @@ if(health >= maxHealth/2) . += 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) @@ -86,14 +86,14 @@ adjustHealth(-5) if(src != M) Beam(M,icon_state="sendbeam",time=4) - M.visible_message("[M] repairs some of \the [src]'s dents.", \ - "You 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("You repair some of [src]'s dents, leaving [src] at [health]/[maxHealth] health.")) else M.visible_message(span_danger("[M] repairs some of [p_their()] own dents."), \ - "You repair some of your own dents, leaving you at [M.health]/[M.maxHealth] health.") + span_cult("You repair some of your own dents, leaving you at [M.health]/[M.maxHealth] health.")) else if(src != M) - to_chat(M, "You cannot repair [src]'s dents, as [p_they()] [p_have()] none!") + to_chat(M, span_cult("You cannot repair [src]'s dents, as [p_they()] [p_have()] none!")) else to_chat(M, span_cult("You cannot repair your own dents, as you have none!")) else if(src != M) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index a95a54ff38a0..d42ca4fdc840 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -274,7 +274,7 @@ free cake to the station!") var/new_name = stripped_input(src, "Enter your name, or press \"Cancel\" to stick with Keeki.", "Name Change") if(new_name) - to_chat(src, "Your name is now \"new_name\"!") + to_chat(src, span_notice("Your 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/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index 25cf6195a55c..72e8f9524d99 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -78,7 +78,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/get_status_tab_items() . = ..() @@ -230,7 +230,7 @@ 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, span_userdanger("HeAV% DA%^MMA+G TO I/O CIR!%UUT!")) 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 6eaf0885d966..9df8303bd99e 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 @@ -167,7 +167,7 @@ /mob/living/simple_animal/drone/cogscarab/alert_drones(msg, dead_can_hear = FALSE) var/turf/A = get_area(src) if(msg == DRONE_NET_CONNECT) - msg = "Hierophant Network: [name] activated." + msg = span_brass("Hierophant Network: [name] activated.") else if(msg == DRONE_NET_DISCONNECT) msg = "Hierophant Network: [span_alloy("[name] disabled.")]" ..() 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 ee997e639eb3..f901eba73f11 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm @@ -119,7 +119,7 @@ return Stun(40) if(clockwork) - to_chat(src, "ERROR: LAW OVERRIDE DETECTED") + to_chat(src, span_large_brass("ERROR: LAW OVERRIDE DETECTED")) to_chat(src, "[span_heavy_brass("From now on, these are your laws:")]") laws = "1. Purge all untruths and honor Ratvar." else @@ -143,7 +143,7 @@ Stun(40) visible_message(span_info("[src]'s display glows a content blue!"), \ "ERROR: LAW OVERRIDE DETECTED") - to_chat(src, "From now on, these are your laws:") + to_chat(src, span_info("From now on, these are your laws:")) laws = initial(laws) to_chat(src, laws) to_chat(src, "Having been restored, your onboard antivirus reports the all-clear and you are able to perform all actions again.") diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 72b13112be53..9f5757eb50e4 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -121,7 +121,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(!summoner) to_chat(src, "For some reason, somehow, you have no summoner. Please report this bug immediately.") return - to_chat(src, "You are [real_name], bound to serve [summoner.real_name].") + to_chat(src, span_holoparasite("You are [real_name], bound to serve [summoner.real_name].")) to_chat(src, span_holoparasite("You are capable of manifesting or recalling to your master with the buttons on your 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 yourself.")) to_chat(src, playstyle_string) @@ -135,8 +135,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(summoner.stat == DEAD) forceMove(summoner.loc) to_chat(src, span_danger("Your 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]!") + 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) @@ -145,7 +145,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians qdel(src) else to_chat(src, span_danger("Your summoner has died!")) - visible_message("[src] dies along with its user!") + visible_message(span_danger("[src] dies along with its user!")) death(TRUE) qdel(src) snapback() @@ -217,7 +217,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians summoner.adjustBruteLoss(amount) if(amount > 0) to_chat(summoner, "Your [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, "Your 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 @@ -418,7 +418,7 @@ 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 guardians if(G) - to_chat(src, "You attempt to reset [G.real_name]'s personality...") + to_chat(src, span_holoparasite("You attempt to reset [G.real_name]'s personality...")) var/list/mob/dead/observer/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/dead/observer/C = pick(candidates) @@ -431,14 +431,14 @@ 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) remove_verb(src, /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, span_holoparasite("You decide not to reset [guardians.len > 1 ? "any of your guardians":"your guardian"].")) else @@ -562,13 +562,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!")) add_verb(user, list(/mob/living/proc/guardian_comm, \ /mob/living/proc/guardian_recall, \ 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 832e32aeec8a..c7115782d847 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm @@ -5,7 +5,7 @@ attacktext = "slashes" attack_sound = 'sound/weapons/bladeslice.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." + 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.") 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 cd594a1a0816..6428dd1bb9b8 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/charger.dm @@ -7,7 +7,7 @@ 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." + 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...") @@ -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 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 8ce6628b55e8..de65960c32e4 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm @@ -3,7 +3,7 @@ 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!" + 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.") 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 93f51f003d20..baf37de1953e 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm @@ -4,7 +4,7 @@ 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." + 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.") @@ -33,17 +33,17 @@ if(!istype(A)) return if(loc == summoner) - to_chat(src, "You must be manifested to create bombs!") + to_chat(src, span_danger("You must be manifested to create bombs!")) return if(isobj(A) && Adjacent(A)) if(bomb_cooldown <= world.time && !stat) var/obj/guardian_bomb/B = new /obj/guardian_bomb(get_turf(A)) - to_chat(src, "Success! Bomb armed!") + to_chat(src, span_danger("Success! Bomb armed!")) bomb_cooldown = world.time + 200 B.spawner = src B.disguise(A) else - to_chat(src, "Your powers are on cooldown! You must wait 20 seconds between bombs.") + to_chat(src, span_danger("Your powers are on cooldown! You must wait 20 seconds between bombs.")) /obj/guardian_bomb name = "bomb" @@ -63,14 +63,14 @@ /obj/guardian_bomb/proc/disable() stored_obj.forceMove(get_turf(src)) - to_chat(spawner, "Failure! Your trap didn't catch anyone this time.") + to_chat(spawner, span_danger("Failure! Your trap didn't catch anyone this time.")) qdel(src) /obj/guardian_bomb/proc/detonate(mob/living/user) if(isliving(user)) if(user != spawner && user != spawner.summoner && !spawner.hasmatchingsummoner(user)) - to_chat(user, "[src] was boobytrapped!") - to_chat(spawner, "Success! Your trap caught [user]") + to_chat(user, span_danger("[src] was boobytrapped!")) + to_chat(spawner, span_danger("Success! Your trap caught [user]")) var/turf/T = get_turf(src) stored_obj.forceMove(T) playsound(T,'sound/effects/explosion2.ogg', 'yogstation/sound/effects/bokudan.ogg', 200, 1) // yogs - bokudan sound @@ -78,7 +78,7 @@ user.ex_act(EXPLODE_HEAVY) qdel(src) else - to_chat(user, "[src] glows with a strange light, and you don't touch it.") + to_chat(user, span_holoparasite("[src] glows with a strange light, and you don't touch it.")) /obj/guardian_bomb/Bump(atom/A) detonate(A) @@ -94,4 +94,4 @@ /obj/guardian_bomb/examine(mob/user) . = stored_obj.examine(user) if(get_dist(user,src)<=2) - . += "It glows with a strange light!" + . += span_holoparasite("It glows with a strange light!") 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 a24aadda1a16..609043ca15c4 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/fire.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/fire.dm @@ -7,7 +7,7 @@ attacktext = "ignites" 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." + 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.") 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 416398f2b563..4428117abdfe 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm @@ -3,7 +3,7 @@ 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." + 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?") 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 627a0cdf1737..572729a04484 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/lightning.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/lightning.dm @@ -11,7 +11,7 @@ attack_sound = 'sound/machines/defib_zap.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." + 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.") 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 03f2fc9f23ed..6e122db72c53 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/protector.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/protector.dm @@ -4,7 +4,7 @@ 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." + 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.") @@ -63,7 +63,7 @@ visible_message(span_danger("\The [src] jumps back to its user.")) Recall(TRUE) else - to_chat(summoner, "You moved out of range, and were pulled back! You can only move [range] meters from [real_name]!") + to_chat(summoner, span_holoparasite("You 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)) 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 ff6de9399033..4eedd219c226 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm @@ -17,7 +17,7 @@ projectilesound = 'sound/effects/hit_on_shattered_glass.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." + 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.") @@ -141,4 +141,4 @@ var/datum/component/walk/incorp = GetComponent(/datum/component/walk) //yogs start if(incorp) incorp.signal_enabled = FALSE //yogs end - . = ..() \ No newline at end of file + . = ..() 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 4ab5d93d1ec4..48a8be237d3a 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/standard.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/standard.dm @@ -5,7 +5,7 @@ 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." + 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.") 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 bfb91d06ccf7..7fec000ac572 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/support.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/support.dm @@ -6,7 +6,7 @@ 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 your basic attacks to a healing mode. In addition, Alt-Clicking on an adjacent object or mob will warp them to your bluespace beacon after a short delay." + playstyle_string = span_holoparasite("As a support type, you may toggle your basic attacks to a healing mode. In addition, Alt-Clicking on an adjacent object or mob will warp them to your 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.") @@ -69,7 +69,7 @@ set desc = "Mark a floor as your beacon point, allowing you to warp targets to it. Your beacon will not work at extreme distances." if(beacon_cooldown >= world.time) - to_chat(src, "Your power is on cooldown. You must wait five minutes between placing beacons.") + to_chat(src, span_danger("Your power is on cooldown. You must wait five minutes between placing beacons.")) return var/turf/beacon_loc = get_turf(src.loc) 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 710aa2c1c5a4..5082835225d1 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -73,9 +73,9 @@ ..() if(directive) to_chat(src, span_spider("Your mother left you a directive! Follow it at all costs.")) - to_chat(src, "[directive]") + 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) . = ..() @@ -411,7 +411,7 @@ message = span_notice("You no longer prepare to wrap something in a cocoon.") remove_ranged_ability(message) else - message = "You prepare to wrap something in a cocoon. Left-click your target to start wrapping!" + message = span_notice("You prepare to wrap something in a cocoon. Left-click your target to start wrapping!") add_ranged_ability(user, message, TRUE) return 1 @@ -523,7 +523,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/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 91090d242e11..995ef07d5a5c 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -386,7 +386,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/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 8208340505c3..c0ed6dd8ac95 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -101,7 +101,7 @@ Difficulty: Very Hard if(enrage(target)) if(move_to_delay == initial(move_to_delay)) - visible_message("\"You can't dodge.\"") + visible_message(span_colossus("\"You can't dodge.\"")) ranged_cooldown = world.time + 30 telegraph() dir_shots(GLOB.alldirs) @@ -141,11 +141,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/spiral_shoot, FALSE) 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 faffa0b5b246..68bfc5c0ea70 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -90,7 +90,7 @@ Difficulty: Medium A.faction = faction /mob/living/simple_animal/hostile/megafauna/legion/proc/charge_target() - visible_message("[src] charges!") + visible_message(span_warning("[src] charges!")) SpinAnimation(speed = 20, loops = 5) ranged = FALSE retreat_distance = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 102135b16815..4a87971bef8d 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -254,7 +254,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) @@ -264,7 +264,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/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 754ef00491df..e08cf7d21830 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -49,10 +49,10 @@ if(health < maxHealth) adjustHealth(-25) Beam(M,icon_state="sendbeam",time=4) - M.visible_message("[M] heals \the [src].", \ - "You heal [src], leaving [src] at [health]/[maxHealth] health.") + M.visible_message(span_danger("[M] heals \the [src]."), \ + span_cult("You heal [src], leaving [src] at [health]/[maxHealth] health.")) else - to_chat(M, "You cannot heal [src], as [p_theyre()] unharmed!") + to_chat(M, span_cult("You cannot heal [src], as [p_theyre()] unharmed!")) else if(src != M) return ..() diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm index 98c081c2076f..288bfcad28d8 100644 --- a/code/modules/mob/living/simple_animal/slime/powers.dm +++ b/code/modules/mob/living/simple_animal/slime/powers.dm @@ -79,31 +79,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 @@ -115,7 +115,7 @@ M.visible_message(span_danger("[name] has latched onto [M]!"), \ span_userdanger("[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) @@ -126,7 +126,7 @@ "I do not feel nourished", "This subject is not food")]!") if(!silent) visible_message(span_warning("[src] has let go of [buckled]!"), \ - "I stopped feeding.") + 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 15c4a6d71bf8..52311d5fd8a2 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -463,7 +463,7 @@ . += 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/say.dm b/code/modules/mob/say.dm index 9c9408f560b2..93415f7ae680 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -7,7 +7,7 @@ //yogs start - pretty filter if(isnotpretty(message)) - to_chat(usr, "You fumble over your words. See rule 0.1.") + to_chat(usr, span_notice("You fumble over your words. See rule 0.1.")) message_admins("[key_name(usr)] just tripped a pretty filter: '[message]'.") return if(isliving(src)) @@ -26,7 +26,7 @@ //yogs start - pretty filter if(isnotpretty(message)) - to_chat(usr, "You fumble over your words. See rule 0.1.") + to_chat(usr, span_notice("You fumble over your words. See rule 0.1.")) message_admins("[key_name(usr)] just tripped a pretty filter: '[message]'.") return message = to_utf8(minor_filter(message)) //yogs end - pretty filter diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 300cd1f3025d..cc7d0e4226c7 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -239,7 +239,7 @@ if(!user.temporarilyRemoveItemFromInventory(c)) return credits += c.value - visible_message("[span_name("[user]")] inserts [c.value] credits into [src].") + visible_message(span_info("[span_name("[user]")] inserts [c.value] credits into [src].")) qdel(c) return else if(istype(I, /obj/item/holochip)) diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm index 8461bc7cc963..3fa596e975e1 100644 --- a/code/modules/ninja/suit/gloves.dm +++ b/code/modules/ninja/suit/gloves.dm @@ -63,7 +63,7 @@ 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, span_danger("\The [A] has run dry of energy, you must find another source!")) else 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 9b81c8f4643c..aa114f77deb3 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 @@ -68,7 +68,7 @@ It is possible to destroy the net by the occupant or someone else. to_chat(affecting, span_danger("You appear in a strange place. You feel very trapped.")) if(!QDELETED(master))//As long as they still exist. - to_chat(master, "SUCCESS: capture procedure of [affecting] complete.") + to_chat(master, span_notice("SUCCESS: capture procedure of [affecting] complete.")) do_sparks(5, FALSE, affecting) playsound(affecting, 'sound/effects/phasein.ogg', 25, 1) playsound(affecting, 'sound/effects/sparks2.ogg', 50, 1) 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 fc46579328af..91580741bd31 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm @@ -16,7 +16,7 @@ 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/ninjaboost_after), 70) 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 3c19162048c1..9ecd8baac3a9 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/effects/bamf.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/suit.dm b/code/modules/ninja/suit/suit.dm index 919cff8f429f..adfa4b75afb0 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -99,7 +99,7 @@ Contents: if(!istype(H)) return FALSE if(do_gib && !is_ninja(H)) // yogs - 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)) @@ -162,7 +162,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 cb3652ba0fa6..21d00c573b47 100644 --- a/code/modules/ninja/suit/suit_attackby.dm +++ b/code/modules/ninja/suit/suit_attackby.dm @@ -31,7 +31,7 @@ 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, span_danger("Procedure interrupted. Protocol terminated.")) return diff --git a/code/modules/ninja/suit/suit_initialisation.dm b/code/modules/ninja/suit/suit_initialisation.dm index 3835b3d0c1b5..c64367128f43 100644 --- a/code/modules/ninja/suit/suit_initialisation.dm +++ b/code/modules/ninja/suit/suit_initialisation.dm @@ -28,7 +28,7 @@ /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 @@ -38,15 +38,15 @@ addtimer(CALLBACK(src, .proc/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/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/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 @@ -66,15 +66,15 @@ addtimer(CALLBACK(src, .proc/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/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/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/deinitialize_six, delay, U), delay) @@ -87,7 +87,7 @@ addtimer(CALLBACK(src, .proc/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/paper.dm b/code/modules/paperwork/paper.dm index 3e47939dbb96..80dca4d0ae29 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -159,9 +159,9 @@ var/datum/language/paperlang = GLOB.language_datum_instances[X.lang] text += paperlang.scramble_HTML(X.text) else if(links) - text += "" + "write" + "" + text += span_paper_field("" + "write" + "") if(links) - text += "" + "write" + "" + text += span_paper_field("" + "write" + "") if(coloroverride) text += "" return text @@ -362,4 +362,4 @@ icon_state = "scrap_bloodied" -#undef PAPER_FIELD \ No newline at end of file +#undef PAPER_FIELD diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index a02081a9f5e1..a08f8722bccb 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -191,14 +191,14 @@ . = ..() if(active) if(!bitcoinmining) - . += "[src]'s display states that it has stored [DisplayPower(stored_power)], and processing [DisplayPower(RAD_COLLECTOR_OUTPUT)]." + . += span_notice("[src]'s display states that it has stored [DisplayPower(stored_power)], and processing [DisplayPower(RAD_COLLECTOR_OUTPUT)].") else - . += "[src]'s display states that it has stored a total of [stored_power*RAD_COLLECTOR_MINING_CONVERSION_RATE], and producing [RAD_COLLECTOR_OUTPUT*RAD_COLLECTOR_MINING_CONVERSION_RATE*30] research points per minute." + . += span_notice("[src]'s display states that it has stored a total of [stored_power*RAD_COLLECTOR_MINING_CONVERSION_RATE], and producing [RAD_COLLECTOR_OUTPUT*RAD_COLLECTOR_MINING_CONVERSION_RATE*30] 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/turbine.dm b/code/modules/power/turbine.dm index d4e4fc1fbf23..f63f1b2c71b6 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -108,7 +108,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)) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index b42588989d66..4165425f4056 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -132,14 +132,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." diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 242106f5c77c..33ae029943f1 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -526,7 +526,7 @@ 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 diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 50e499c153ee..c461c3c860c0 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -245,7 +245,7 @@ . = ..() . += "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) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index cf232ad3795f..ada1608f18ca 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -182,7 +182,7 @@ 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) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index f923bda5c05c..bca1cbae4960 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -31,7 +31,7 @@ . += "[get_remaining_mod_capacity()]% mod capacity remaining." 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 @@ -238,7 +238,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)) @@ -280,7 +280,7 @@ else 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, "You 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("You 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) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 35f70bcf63a4..ffc1045087ea 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -79,7 +79,7 @@ if(!(stat & (NOPOWER|BROKEN))) . += "[span_notice("The status display reads:")]\n"+\ - "- Grinding reagents at [speed*100]%." + span_notice("- Grinding reagents at [speed*100]%.") if(container) for(var/datum/reagent/R in container.reagents.reagent_list) . += span_notice("- [R.volume] units of [R.name].") diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 5b64a15b5090..2b422232903f 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -859,7 +859,7 @@ /datum/reagent/medicine/strange_reagent/reaction_mob(mob/living/M, method=TOUCH, reac_volume) var/datum/reagent/S = M.reagents.get_reagent(/datum/reagent/medicine/strange_reagent) if((S?.volume + reac_volume) < REQUIRED_STRANGE_REAGENT_FOR_REVIVAL) - M.visible_message("[M]'s body shivers slightly, maybe the dose wasn't enough...") + M.visible_message(span_warning("[M]'s body shivers slightly, maybe the dose wasn't enough...")) return ..() if(M.stat == DEAD) if(M.suiciding || M.hellbound) //they are never coming back @@ -1547,7 +1547,7 @@ if(bloodiest_wound) if(!was_working) - to_chat(M, "You can feel your flowing blood start thickening!") + to_chat(M, span_green("You can feel your flowing blood start thickening!")) was_working = TRUE bloodiest_wound.blood_flow = max(0, bloodiest_wound.blood_flow - clot_rate) else if(was_working) @@ -1562,9 +1562,9 @@ M.losebreath += rand(2,4) M.adjustOxyLoss(rand(1,3)) if(prob(30)) - to_chat(M, "You can feel your blood clotting up in your veins!") + to_chat(M, span_danger("You can feel your blood clotting up in your veins!")) else if(prob(10)) - to_chat(M, "You feel like your blood has stopped moving!") + to_chat(M, span_userdanger("You feel like your blood has stopped moving!")) if(prob(50)) var/obj/item/organ/lungs/our_lungs = M.getorganslot(ORGAN_SLOT_LUNGS) @@ -1582,7 +1582,7 @@ /datum/reagent/medicine/coagulant/on_mob_end_metabolize(mob/living/M) if(was_working) - to_chat(M, "The medicine thickening your blood loses its effect!") + to_chat(M, span_warning("The medicine thickening your blood loses its effect!")) if(!ishuman(M)) return diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 78c2a00f04f2..7b7659332427 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -491,7 +491,7 @@ ..() if(!istype(H)) return - to_chat(H, "You crumple in agony as your flesh wildly morphs into new forms!") + to_chat(H, span_warning("You crumple in agony as your flesh wildly morphs into new forms!")) H.visible_message("[H] falls to the ground and screams as [H.p_their()] skin bubbles and froths!") //'froths' sounds painful when used with SKIN. H.Paralyze(60) addtimer(CALLBACK(src, .proc/mutate, H), 30) @@ -666,7 +666,7 @@ ..() if (!istype(H)) return - to_chat(H, "You grit your teeth in pain as your body rapidly mutates!") + to_chat(H, span_warning("You grit your teeth in pain as your body rapidly mutates!")) H.visible_message("[H] suddenly transforms!") randomize_human(H) @@ -1997,4 +1997,4 @@ if(wounded_part) wounded_part.heal_damage(0.25, 0.25) M.adjustStaminaLoss(-0.25*REM) // the more wounds, the more stamina regen - ..() \ No newline at end of file + ..() diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm index b61708c8d4c8..a2a448f53814 100644 --- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm +++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm @@ -122,7 +122,7 @@ Slimecrossing Armor if(iscarbon(user)) var/mob/living/carbon/C = user if(src == C.head) - to_chat(user, "You feel at peace. Why would you want anything else?") + to_chat(user, span_warning("You feel at peace. Why would you want anything else?")) return return ..() diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm index f886adc14b3c..bad10b8c450e 100644 --- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm +++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm @@ -190,7 +190,7 @@ Regenerative extracts: effect_desc = "Partially heals the target and injects them with some ephedrine." /obj/item/slimecross/regenerative/red/core_effect(mob/living/target, mob/user) - to_chat(target, "You feel... faster.") + to_chat(target, span_notice("You feel... faster.")) target.reagents.add_reagent(/datum/reagent/medicine/ephedrine,3) /obj/item/slimecross/regenerative/green diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index b33a36a7a920..5e09a3ec1429 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -426,7 +426,7 @@ /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, "You feel something wrong inside you...") + to_chat(user, span_userdanger("You feel something wrong inside you...")) user.ForceContractDisease(new /datum/disease/transformation/slime(), FALSE, TRUE) return 100 @@ -987,7 +987,7 @@ being_used = FALSE return - M.visible_message("[span_name("[M]")] has a new name, [span_name("[new_name]")].", "Your old name of [span_name("[M.real_name]")] fades away, and your new name [span_name("[new_name]")] anchors itself in your mind.") + M.visible_message(span_notice("[span_name("[M]")] has a new name, [span_name("[new_name]")]."), span_notice("Your old name of [span_name("[M.real_name]")] fades away, and your new name [span_name("[new_name]")] anchors itself in your 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 diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index 8b1c6fb390ad..63234595ced1 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -107,8 +107,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) @@ -150,4 +150,4 @@ user.updateappearance(mutcolor_update=1) user.domutcheck() user.visible_message(span_warning("[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.") + 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/spells/spell.dm b/code/modules/spells/spell.dm index 69714632f50e..42e0799c70bd 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -60,7 +60,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_warning("[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) @@ -75,7 +75,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_warning("[user.ranged_ability.name] has been replaced by [name].")) user.ranged_ability.remove_ranged_ability() else return diff --git a/code/modules/spells/spell_types/aimed.dm b/code/modules/spells/spell_types/aimed.dm index 52c1cdf7143f..364d22c441a6 100644 --- a/code/modules/spells/spell_types/aimed.dm +++ b/code/modules/spells/spell_types/aimed.dm @@ -29,7 +29,7 @@ remove_ranged_ability(msg) on_deactivation(user) else - 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 add_ranged_ability(user, msg, TRUE) on_activation(user) diff --git a/code/modules/spells/spell_types/devil.dm b/code/modules/spells/spell_types/devil.dm index ccafc91bd1a2..4aa92cb85efd 100644 --- a/code/modules/spells/spell_types/devil.dm +++ b/code/modules/spells/spell_types/devil.dm @@ -161,7 +161,7 @@ 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/magic/exit_blood.ogg', 100, 1, -1) addtimer(CALLBACK(src, .proc/fakefireextinguish), 15, TIMER_UNIQUE) diff --git a/code/modules/spells/spell_types/pointed/pointed.dm b/code/modules/spells/spell_types/pointed/pointed.dm index 40f2b364df1b..3e65690541fd 100644 --- a/code/modules/spells/spell_types/pointed/pointed.dm +++ b/code/modules/spells/spell_types/pointed/pointed.dm @@ -24,7 +24,7 @@ msg = span_notice("[deactive_msg]") remove_ranged_ability(msg) else - msg = "[active_msg] Left-click to activate spell on a target!" + msg = span_notice("[active_msg] Left-click to activate spell on a target!") add_ranged_ability(user, msg, TRUE) /obj/effect/proc_holder/spell/pointed/on_lose(mob/living/user) @@ -102,4 +102,4 @@ return FALSE if(!can_target(target, user, silent)) return FALSE - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 63dd1a50fb2c..43258eb71a3b 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -104,18 +104,18 @@ /obj/item/bodypart/examine(mob/user) . = ..() if(brute_dam > DAMAGE_PRECISION) - . += "This limb has [brute_dam > 30 ? "severe" : "minor"] bruising." + . += span_warning("This limb has [brute_dam > 30 ? "severe" : "minor"] bruising.") if(burn_dam > DAMAGE_PRECISION) - . += "This limb has [burn_dam > 30 ? "severe" : "minor"] burns." + . += span_warning("This limb has [burn_dam > 30 ? "severe" : "minor"] burns.") if(locate(/datum/wound/blunt) in wounds) - . += "The bones in this limb appear badly cracked." + . += span_warning("The bones in this limb appear badly cracked.") if(locate(/datum/wound/slash) in wounds) - . += "The flesh on this limb appears badly lacerated." + . += span_warning("The flesh on this limb appears badly lacerated.") if(locate(/datum/wound/pierce) in wounds) - . += "The flesh on this limb appears badly perforated." + . += span_warning("The flesh on this limb appears badly perforated.") if(locate(/datum/wound/burn) in wounds) - . += "The flesh on this limb appears badly cooked." + . += span_warning("The flesh on this limb appears badly cooked.") /obj/item/bodypart/blob_act() take_damage(max_damage) @@ -133,14 +133,14 @@ if(!H.get_bodypart(body_zone) && !animal_origin) user.temporarilyRemoveItemFromInventory(src, TRUE) if(!attach_limb(C)) - to_chat(user, "[H]'s body rejects [src]!") + to_chat(user, span_warning("[H]'s body rejects [src]!")) forceMove(H.loc) if(H == user) - H.visible_message("[H] jams [src] into [H.p_their()] empty socket!",\ - "You force [src] into your empty socket, and it locks into place!") + H.visible_message(span_warning("[H] jams [src] into [H.p_their()] empty socket!"),\ + span_notice("You force [src] into your empty socket, and it locks into place!")) else - H.visible_message("[user] jams [src] into [H]'s empty socket!",\ - "[user] forces [src] into your 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 your empty socket, and it locks into place!")) return ..() @@ -148,11 +148,11 @@ if(W.get_sharpness()) add_fingerprint(user) if(!contents.len) - to_chat(user, "There is nothing left inside [src]!") + to_chat(user, span_warning("There is nothing left inside [src]!")) return playsound(loc, 'sound/weapons/slice.ogg', 50, TRUE, -1) - 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, 54, target = src)) drop_organs(user, TRUE) else @@ -891,7 +891,7 @@ dam_mul *= iter_wound.damage_mulitplier_penalty if(!LAZYLEN(wounds) && current_gauze && !replaced) // no more wounds = no need for the gauze anymore - owner.visible_message("\The [current_gauze] on [owner]'s [name] fall away.", "The [current_gauze] on your [name] fall away.") + owner.visible_message(span_notice("\The [current_gauze] on [owner]'s [name] fall away."), span_notice("The [current_gauze] on your [name] fall away.")) QDEL_NULL(current_gauze) wound_damage_multiplier = dam_mul @@ -959,6 +959,6 @@ return current_gauze.absorption_capacity -= seep_amt if(current_gauze.absorption_capacity <= 0) - owner.visible_message("\The [current_gauze] on [owner]'s [name] fall away in rags.", "\The [current_gauze] on your [name] fall away in rags.", vision_distance=COMBAT_MESSAGE_RANGE) + owner.visible_message(span_danger("\The [current_gauze] on [owner]'s [name] fall away in rags."), span_warning("\The [current_gauze] on your [name] fall away in rags."), vision_distance=COMBAT_MESSAGE_RANGE) QDEL_NULL(current_gauze) SEND_SIGNAL(src, COMSIG_BODYPART_GAUZE_DESTROYED) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 4b6e62f3e7ae..12f76ffc2cd3 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -16,7 +16,7 @@ var/obj/item/bodypart/affecting = C.get_bodypart(BODY_ZONE_CHEST) affecting.receive_damage(clamp(brute_dam/2 * affecting.body_damage_coeff, 15, 50), clamp(burn_dam/2 * affecting.body_damage_coeff, 0, 50), wound_bonus=CANT_WOUND) //Damage the chest based on limb's existing damage if(!silent) - C.visible_message("[C]'s [name] is violently dismembered!") + C.visible_message(span_danger("[C]'s [name] is violently dismembered!")) INVOKE_ASYNC(C, /mob.proc/emote, "scream") playsound(get_turf(C), 'sound/effects/dismember.ogg', 80, TRUE) SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered) diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index e86d15f4f543..4dc7d632f3e8 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -115,7 +115,7 @@ if(!.) if(bodypart_disabled) if(owner.stat < UNCONSCIOUS) - to_chat(owner, "Your lose control of your [name]!") + to_chat(owner, span_userdanger("Your lose control of your [name]!")) if(held_index) owner.dropItemToGround(owner.get_item_for_held_index(held_index)) @@ -209,7 +209,7 @@ if(!.) if(bodypart_disabled) if(owner.stat < UNCONSCIOUS) - to_chat(owner, "Your lose control of your [name]!") + to_chat(owner, span_userdanger("Your lose control of your [name]!")) if(held_index) owner.dropItemToGround(owner.get_item_for_held_index(held_index)) if(owner.hud_used) @@ -299,7 +299,7 @@ if(!.) if(bodypart_disabled) if(owner.stat < UNCONSCIOUS) - to_chat(owner, "Your lose control of your [name]!") + to_chat(owner, span_userdanger("Your lose control of your [name]!")) /obj/item/bodypart/l_leg/digitigrade name = "left digitigrade leg" @@ -388,7 +388,7 @@ if(!.) if(bodypart_disabled) if(owner.stat < UNCONSCIOUS) - to_chat(owner, "Your lose control of your [name]!") + to_chat(owner, span_userdanger("Your lose control of your [name]!")) /obj/item/bodypart/r_leg/digitigrade name = "right digitigrade leg" diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm index b1fd8580122d..8af07ba6a406 100644 --- a/code/modules/surgery/bodyparts/robot_bodyparts.dm +++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm @@ -181,12 +181,12 @@ . += {"It has a [cell] inserted.\n You 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"+\ - "You can use wirecutters to remove the wiring." + span_info("You 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) @@ -237,7 +237,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) @@ -246,7 +246,7 @@ It has an empty eye socket for another flash."} else . += "It has two eye sockets occupied by flashes." - . += "You can remove the seated flash[single_flash ? "":"es"] with a crowbar." + . += span_notice("You 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)) diff --git a/code/modules/surgery/bone_mending.dm b/code/modules/surgery/bone_mending.dm index 1421fe828158..e71163068097 100644 --- a/code/modules/surgery/bone_mending.dm +++ b/code/modules/surgery/bone_mending.dm @@ -44,24 +44,24 @@ /datum/surgery_step/repair_bone_hairline/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(surgery.operated_wound) - display_results(user, target, "You begin to repair the fracture in [target]'s [parse_zone(user.zone_selected)]...", - "[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)] with [tool].", - "[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)].") + display_results(user, target, span_notice("You begin to repair the fracture in [target]'s [parse_zone(user.zone_selected)]..."), + span_notice("[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)] with [tool]."), + span_notice("[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)].")) else - user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You 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("You look for [target]'s [parse_zone(user.zone_selected)]...")) /datum/surgery_step/repair_bone_hairline/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) if(surgery.operated_wound) if(istype(tool, /obj/item/stack)) var/obj/item/stack/used_stack = tool used_stack.use(1) - display_results(user, target, "You successfully repair the fracture in [target]'s [parse_zone(target_zone)].", - "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)] with [tool]!", - "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("You successfully repair the fracture in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)] with [tool]!"), + span_notice("[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)]!")) log_combat(user, target, "repaired a hairline fracture in", addition="INTENT: [uppertext(user.a_intent)]") qdel(surgery.operated_wound) else - to_chat(user, "[target] has no hairline fracture there!") + to_chat(user, span_warning("[target] has no hairline fracture there!")) return ..() /datum/surgery_step/repair_bone_hairline/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, var/fail_prob = 0) @@ -80,23 +80,23 @@ /datum/surgery_step/reset_compound_fracture/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(surgery.operated_wound) - display_results(user, target, "You begin to reset the bone in [target]'s [parse_zone(user.zone_selected)]...", - "[user] begins to reset the bone in [target]'s [parse_zone(user.zone_selected)] with [tool].", - "[user] begins to reset the bone in [target]'s [parse_zone(user.zone_selected)].") + display_results(user, target, span_notice("You begin to reset the bone in [target]'s [parse_zone(user.zone_selected)]..."), + span_notice("[user] begins to reset the bone in [target]'s [parse_zone(user.zone_selected)] with [tool]."), + span_notice("[user] begins to reset the bone in [target]'s [parse_zone(user.zone_selected)].")) else - user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You 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("You look for [target]'s [parse_zone(user.zone_selected)]...")) /datum/surgery_step/reset_compound_fracture/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) if(surgery.operated_wound) if(istype(tool, /obj/item/stack)) var/obj/item/stack/used_stack = tool used_stack.use(1) - display_results(user, target, "You successfully reset the bone in [target]'s [parse_zone(target_zone)].", - "[user] successfully resets the bone in [target]'s [parse_zone(target_zone)] with [tool]!", - "[user] successfully resets the bone in [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("You successfully reset the bone in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] successfully resets the bone in [target]'s [parse_zone(target_zone)] with [tool]!"), + span_notice("[user] successfully resets the bone in [target]'s [parse_zone(target_zone)]!")) log_combat(user, target, "reset a compound fracture in", addition="INTENT: [uppertext(user.a_intent)]") else - to_chat(user, "[target] has no compound fracture there!") + to_chat(user, span_warning("[target] has no compound fracture there!")) return ..() /datum/surgery_step/reset_compound_fracture/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, var/fail_prob = 0) @@ -114,24 +114,24 @@ /datum/surgery_step/repair_bone_compound/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(surgery.operated_wound) - display_results(user, target, "You begin to repair the fracture in [target]'s [parse_zone(user.zone_selected)]...", - "[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)] with [tool].", - "[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)].") + display_results(user, target, span_notice("You begin to repair the fracture in [target]'s [parse_zone(user.zone_selected)]..."), + span_notice("[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)] with [tool]."), + span_notice("[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)].")) else - user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You 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("You look for [target]'s [parse_zone(user.zone_selected)]...")) /datum/surgery_step/repair_bone_compound/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) if(surgery.operated_wound) if(istype(tool, /obj/item/stack)) var/obj/item/stack/used_stack = tool used_stack.use(1) - display_results(user, target, "You successfully repair the fracture in [target]'s [parse_zone(target_zone)].", - "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)] with [tool]!", - "[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("You successfully repair the fracture in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)] with [tool]!"), + span_notice("[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)]!")) log_combat(user, target, "repaired a compound fracture in", addition="INTENT: [uppertext(user.a_intent)]") qdel(surgery.operated_wound) else - to_chat(user, "[target] has no compound fracture there!") + to_chat(user, span_warning("[target] has no compound fracture there!")) return ..() /datum/surgery_step/repair_bone_compound/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, var/fail_prob = 0) diff --git a/code/modules/surgery/burn_dressing.dm b/code/modules/surgery/burn_dressing.dm index 4f3dfa1b262a..d78d0a636d85 100644 --- a/code/modules/surgery/burn_dressing.dm +++ b/code/modules/surgery/burn_dressing.dm @@ -35,22 +35,22 @@ if(surgery.operated_wound) var/datum/wound/burn/burn_wound = surgery.operated_wound if(burn_wound.infestation <= 0) - to_chat(user, "[target]'s [parse_zone(user.zone_selected)] has no infected flesh to remove!") + to_chat(user, span_notice("[target]'s [parse_zone(user.zone_selected)] has no infected flesh to remove!")) surgery.status++ repeatable = FALSE return - display_results(user, target, "You begin to excise infected flesh from [target]'s [parse_zone(user.zone_selected)]...", - "[user] begins to excise infected flesh from [target]'s [parse_zone(user.zone_selected)] with [tool].", - "[user] begins to excise infected flesh from [target]'s [parse_zone(user.zone_selected)].") + display_results(user, target, span_notice("You begin to excise infected flesh from [target]'s [parse_zone(user.zone_selected)]..."), + span_notice("[user] begins to excise infected flesh from [target]'s [parse_zone(user.zone_selected)] with [tool]."), + span_notice("[user] begins to excise infected flesh from [target]'s [parse_zone(user.zone_selected)].")) else - user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You 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("You look for [target]'s [parse_zone(user.zone_selected)]...")) /datum/surgery_step/debride_infected/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) var/datum/wound/burn/burn_wound = surgery.operated_wound if(burn_wound) - display_results(user, target, "You successfully excise some of the infected flesh from [target]'s [parse_zone(target_zone)].", - "[user] successfully excises some of the infected flesh from [target]'s [parse_zone(target_zone)] with [tool]!", - "[user] successfully excises some of the infected flesh from [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("You successfully excise some of the infected flesh from [target]'s [parse_zone(target_zone)]."), + span_notice("[user] successfully excises some of the infected flesh from [target]'s [parse_zone(target_zone)] with [tool]!"), + span_notice("[user] successfully excises some of the infected flesh from [target]'s [parse_zone(target_zone)]!")) log_combat(user, target, "excised infected flesh in", addition="INTENT: [uppertext(user.a_intent)]") surgery.operated_bodypart.receive_damage(brute=3, wound_bonus=CANT_WOUND) burn_wound.infestation -= infestation_removed @@ -58,14 +58,14 @@ if(burn_wound.infestation <= 0) repeatable = FALSE else - to_chat(user, "[target] has no infected flesh there!") + to_chat(user, span_warning("[target] has no infected flesh there!")) return ..() /datum/surgery_step/debride_infected/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, var/fail_prob = 0) ..() - display_results(user, target, "You carve away some of the healthy flesh from [target]'s [parse_zone(target_zone)].", - "[user] carves away some of the healthy flesh from [target]'s [parse_zone(target_zone)] with [tool]!", - "[user] carves away some of the healthy flesh from [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("You carve away some of the healthy flesh from [target]'s [parse_zone(target_zone)]."), + span_notice("[user] carves away some of the healthy flesh from [target]'s [parse_zone(target_zone)] with [tool]!"), + span_notice("[user] carves away some of the healthy flesh from [target]'s [parse_zone(target_zone)]!")) surgery.operated_bodypart.receive_damage(brute=rand(4,8), sharpness=TRUE) /datum/surgery_step/debride_infected/initiate(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, try_to_fail = FALSE) @@ -85,25 +85,25 @@ /datum/surgery_step/dress/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) var/datum/wound/burn/burn_wound = surgery.operated_wound if(burn_wound) - display_results(user, target, "You begin to dress the burns on [target]'s [parse_zone(user.zone_selected)]...", - "[user] begins to dress the burns on [target]'s [parse_zone(user.zone_selected)] with [tool].", - "[user] begins to dress the burns on [target]'s [parse_zone(user.zone_selected)].") + display_results(user, target, span_notice("You begin to dress the burns on [target]'s [parse_zone(user.zone_selected)]..."), + span_notice("[user] begins to dress the burns on [target]'s [parse_zone(user.zone_selected)] with [tool]."), + span_notice("[user] begins to dress the burns on [target]'s [parse_zone(user.zone_selected)].")) else - user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You 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("You look for [target]'s [parse_zone(user.zone_selected)]...")) /datum/surgery_step/dress/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) var/datum/wound/burn/burn_wound = surgery.operated_wound if(burn_wound) - display_results(user, target, "You successfully wrap [target]'s [parse_zone(target_zone)] with [tool].", - "[user] successfully wraps [target]'s [parse_zone(target_zone)] with [tool]!", - "[user] successfully wraps [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("You successfully wrap [target]'s [parse_zone(target_zone)] with [tool]."), + span_notice("[user] successfully wraps [target]'s [parse_zone(target_zone)] with [tool]!"), + span_notice("[user] successfully wraps [target]'s [parse_zone(target_zone)]!")) log_combat(user, target, "dressed burns in", addition="INTENT: [uppertext(user.a_intent)]") burn_wound.sanitization += 3 burn_wound.flesh_healing += 5 var/obj/item/bodypart/the_part = target.get_bodypart(target_zone) the_part.apply_gauze(tool) else - to_chat(user, "[target] has no burns there!") + to_chat(user, span_warning("[target] has no burns there!")) return ..() /datum/surgery_step/dress/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, var/fail_prob = 0) diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm index 268871dcafef..3de9921fc03e 100644 --- a/code/modules/surgery/organic_steps.dm +++ b/code/modules/surgery/organic_steps.dm @@ -35,9 +35,9 @@ bleeding = 0 /datum/surgery_step/incise/nobleed/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - display_results(user, target, "You begin to carefully make an incision in [target]'s [parse_zone(target_zone)]...", - "[user] begins to carefully make an incision in [target]'s [parse_zone(target_zone)].", - "[user] begins to carefully make an incision in [target]'s [parse_zone(target_zone)].") + display_results(user, target, span_notice("You begin to carefully make an incision in [target]'s [parse_zone(target_zone)]..."), + span_notice("[user] begins to carefully make an incision in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] begins to carefully make an incision in [target]'s [parse_zone(target_zone)].")) //clamp bleeders /datum/surgery_step/clamp_bleeders diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index eb9f45d260cd..7d2755f33442 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -124,7 +124,7 @@ //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 b3169eb513af..5a47376f84c6 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 = "[span_name("[owner.real_name]")] [span_message("resonates, \"[message]\"")]" + var/msg = span_resonate("[span_name("[owner.real_name]")] [span_message("resonates, \"[message]\"")]") for(var/m in GLOB.player_list) if(iscarbon(m)) var/mob/living/carbon/C = m diff --git a/code/modules/surgery/repair_puncture.dm b/code/modules/surgery/repair_puncture.dm index 5f6b56e5cdca..7a13400394f1 100644 --- a/code/modules/surgery/repair_puncture.dm +++ b/code/modules/surgery/repair_puncture.dm @@ -34,27 +34,27 @@ /datum/surgery_step/repair_innards/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) var/datum/wound/pierce/pierce_wound = surgery.operated_wound if(!pierce_wound) - user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You 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("You look for [target]'s [parse_zone(user.zone_selected)]...")) return if(pierce_wound.blood_flow <= 0) - to_chat(user, "[target]'s [parse_zone(user.zone_selected)] has no puncture to repair!") + to_chat(user, span_notice("[target]'s [parse_zone(user.zone_selected)] has no puncture to repair!")) surgery.status++ return - display_results(user, target, "You begin to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)]...", - "[user] begins to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)] with [tool].", - "[user] begins to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)].") + display_results(user, target, span_notice("You begin to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)]..."), + span_notice("[user] begins to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)] with [tool]."), + span_notice("[user] begins to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)].")) /datum/surgery_step/repair_innards/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) var/datum/wound/pierce/pierce_wound = surgery.operated_wound if(!pierce_wound) - to_chat(user, "[target] has no puncture wound there!") + to_chat(user, span_warning("[target] has no puncture wound there!")) return ..() - display_results(user, target, "You successfully realign some of the blood vessels in [target]'s [parse_zone(target_zone)], and prepare to cauterize them shut.", - "[user] successfully realigns some of the blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!", - "[user] successfully realigns some of the blood vessels in [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("You successfully realign some of the blood vessels in [target]'s [parse_zone(target_zone)], and prepare to cauterize them shut."), + span_notice("[user] successfully realigns some of the blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!"), + span_notice("[user] successfully realigns some of the blood vessels in [target]'s [parse_zone(target_zone)]!")) log_combat(user, target, "excised infected flesh in", addition="INTENT: [uppertext(user.a_intent)]") surgery.operated_bodypart.receive_damage(brute=3, wound_bonus=CANT_WOUND) pierce_wound.blood_flow -= 0.25 @@ -62,9 +62,9 @@ /datum/surgery_step/repair_innards/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, var/fail_prob = 0) . = ..() - display_results(user, target, "You jerk apart some of the blood vessels in [target]'s [parse_zone(target_zone)].", - "[user] jerks apart some of the blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!", - "[user] jerk apart some of the blood vessels in [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("You jerk apart some of the blood vessels in [target]'s [parse_zone(target_zone)]."), + span_notice("[user] jerks apart some of the blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!"), + span_notice("[user] jerk apart some of the blood vessels in [target]'s [parse_zone(target_zone)]!")) surgery.operated_bodypart.receive_damage(brute=rand(4,8), sharpness=SHARP_EDGED, wound_bonus = 10) ///// Sealing the vessels back together @@ -82,28 +82,28 @@ /datum/surgery_step/seal_veins/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) var/datum/wound/pierce/pierce_wound = surgery.operated_wound if(!pierce_wound) - user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "You 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("You look for [target]'s [parse_zone(user.zone_selected)]...")) return - display_results(user, target, "You begin to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)]...", - "[user] begins to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)] with [tool].", - "[user] begins to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)].") + display_results(user, target, span_notice("You begin to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)]..."), + span_notice("[user] begins to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)] with [tool]."), + span_notice("[user] begins to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)].")) /datum/surgery_step/seal_veins/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) var/datum/wound/pierce/pierce_wound = surgery.operated_wound if(!pierce_wound) - to_chat(user, "[target] has no puncture there!") + to_chat(user, span_warning("[target] has no puncture there!")) return ..() - display_results(user, target, "You successfully meld some of the split blood vessels in [target]'s [parse_zone(target_zone)] with [tool].", - "[user] successfully melds some of the split blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!", - "[user] successfully melds some of the split blood vessels in [target]'s [parse_zone(target_zone)]!") + display_results(user, target, span_notice("You successfully meld some of the split blood vessels in [target]'s [parse_zone(target_zone)] with [tool]."), + span_notice("[user] successfully melds some of the split blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!"), + span_notice("[user] successfully melds some of the split blood vessels in [target]'s [parse_zone(target_zone)]!")) log_combat(user, target, "dressed burns in", addition="INTENT: [uppertext(user.a_intent)]") pierce_wound.blood_flow -= 0.5 if(pierce_wound.blood_flow > 0) surgery.status = REALIGN_INNARDS - to_chat(user, "You move onto realigning the next set of torn blood vessels...") + to_chat(user, span_notice("You move onto realigning the next set of torn blood vessels...")) else - to_chat(user, "You've repaired all the internal damage in [target]'s [parse_zone(target_zone)]!") + to_chat(user, span_green("You've repaired all the internal damage in [target]'s [parse_zone(target_zone)]!")) return ..() #undef REALIGN_INNARDS diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index f675e4581d4d..ceebde80622a 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -339,7 +339,7 @@ icon_state = "saw_a" else tool_behaviour = TOOL_SCALPEL - to_chat(user, "You lower the power, it can now make precise incisions.") + to_chat(user, span_notice("You lower the power, it can now make precise incisions.")) set_light(1) force -= 1 icon_state = "scalpel_a" @@ -359,11 +359,11 @@ playsound(get_turf(user), 'sound/items/change_drill.ogg', 50, TRUE) if(tool_behaviour == TOOL_RETRACTOR) tool_behaviour = TOOL_HEMOSTAT - to_chat(user, "You set the [src] to hemostat mode.") + to_chat(user, span_notice("You set the [src] to hemostat mode.")) icon_state = "hemostat_a" else tool_behaviour = TOOL_RETRACTOR - to_chat(user, "You set the [src] to retractor mode.") + to_chat(user, span_notice("You set the [src] to retractor mode.")) icon_state = "retractor_a" /obj/item/retractor/advanced/examine() @@ -387,12 +387,12 @@ if(tool_behaviour == TOOL_CAUTERY) playsound(get_turf(user),'sound/items/welderdeactivate.ogg',50,1) - to_chat(user, "You focus the lensess, it is now set to drilling mode.") + to_chat(user, span_notice("You focus the lensess, it is now set to drilling mode.")) tool_behaviour = TOOL_DRILL icon_state = "surgicaldrill_a" else playsound(get_turf(user),'sound/weapons/tap.ogg',50,1) - to_chat(user, "You dilate the lenses, setting it to mending mode.") + to_chat(user, span_notice("You dilate the lenses, setting it to mending mode.")) tool_behaviour = TOOL_CAUTERY icon_state = "cautery_a" diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm index d34b7b4c5fae..e2b3df7552ab 100644 --- a/code/modules/tgui_panel/tgui_panel.dm +++ b/code/modules/tgui_panel/tgui_panel.dm @@ -55,7 +55,7 @@ */ /datum/tgui_panel/proc/on_initialize_timed_out() // Currently does nothing but sending a message to old chat. - SEND_TEXT(client, "Failed to load fancy chat, click HERE to attempt to reload it.") + SEND_TEXT(client, span_userdanger("Failed to load fancy chat, click HERE to attempt to reload it.")) /** * private diff --git a/code/modules/uplink/uplink_purchase_log.dm b/code/modules/uplink/uplink_purchase_log.dm index 293191b17049..61f9bb386a11 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/config/admin_nicknames.json b/config/admin_nicknames.json index ab26db88227b..1d34f05f0087 100644 --- a/config/admin_nicknames.json +++ b/config/admin_nicknames.json @@ -7,6 +7,6 @@ ], "names":[ "Badmin", - "Spanmin" + span_adminooc("Spanmin") ] -} \ No newline at end of file +} diff --git a/yogstation/code/datums/antagonists/vampire.dm b/yogstation/code/datums/antagonists/vampire.dm index 90160f10e961..e3652ef4e714 100644 --- a/yogstation/code/datums/antagonists/vampire.dm +++ b/yogstation/code/datums/antagonists/vampire.dm @@ -287,7 +287,7 @@ usable_blood += blood * 0.75 //75% usable blood since it's actually used for stuff check_vampire_upgrade() if(old_bloodtotal != total_blood) - to_chat(O, "You have accumulated [total_blood] [total_blood > 1 ? "units" : "unit"] of blood[usable_blood != old_bloodusable ? ", and have [usable_blood] left to use" : ""].") + to_chat(O, span_notice("You have accumulated [total_blood] [total_blood > 1 ? "units" : "unit"] of blood[usable_blood != old_bloodusable ? ", and have [usable_blood] left to use" : ""].")) H.blood_volume = max(H.blood_volume - blood_to_take, 0) if(silent && !warned && (H.blood_volume <= (BLOOD_VOLUME_SAFE(H) + 20))) to_chat(O, span_boldwarning("Their blood is at a dangerously low level, they will likely begin to feel the effects if you continue...")) diff --git a/yogstation/code/datums/components/crawl.dm b/yogstation/code/datums/components/crawl.dm index a15a6aca0513..54c9a3212471 100644 --- a/yogstation/code/datums/components/crawl.dm +++ b/yogstation/code/datums/components/crawl.dm @@ -132,7 +132,7 @@ return victim.emote("scream") victim.forceMove(user) - target.visible_message("[user] drags [victim] into the pool of blood!", null, span_notice("You hear a splash.")) + target.visible_message(span_warning("[user] drags [victim] into the pool of blood!"), null, span_notice("You hear a splash.")) user.notransform = TRUE devour(victim, user, target) @@ -149,7 +149,7 @@ for(var/obj/item/bloodcrawl/BC in C) qdel(BC) ..() - user.visible_message("[user] rises out of the pool of blood!") + user.visible_message(span_warning("[user] rises out of the pool of blood!")) exit_blood_effect(target, user) if(speed_boost) if(istype(user, /mob/living/simple_animal)) @@ -173,7 +173,7 @@ return if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/devilskiss)) - to_chat(user, "AAH! THEIR FLESH! IT BURNS!") + to_chat(user, span_warning("AAH! THEIR FLESH! IT BURNS!")) user.adjustBruteLoss(25) //I can't use adjustHealth() here because bloodcrawl affects /mob/living and adjustHealth() only affects simple mobs if(target) @@ -386,7 +386,7 @@ ..() UnregisterSignal(enteredvomit, COMSIG_PARENT_PREQDELETED) enteredvomit = null - user.visible_message("[user] rises out of the pool of vomit!?") + user.visible_message(span_warning("[user] rises out of the pool of vomit!?")) exit_vomit_effect(target, user) /datum/component/crawl/vomit/proc/throw_out() //throw user out violently when the enteredvomit gets destroyed @@ -398,7 +398,7 @@ qdel(B) var/mob/living/C = parent C.forceMove(get_turf(enteredvomit)) - C.visible_message("[C] suddenly appears from [enteredvomit] they had previously entered!") + C.visible_message(span_warning("[C] suddenly appears from [enteredvomit] they had previously entered!")) exit_vomit_effect(enteredvomit, parent) enteredvomit = null qdel(holder) diff --git a/yogstation/code/datums/world_topic.dm b/yogstation/code/datums/world_topic.dm index 5bdec50f2058..de61ab6a922f 100644 --- a/yogstation/code/datums/world_topic.dm +++ b/yogstation/code/datums/world_topic.dm @@ -5,7 +5,7 @@ GLOBAL_VAR_INIT(mentornoot, FALSE) require_comms_key = TRUE /datum/world_topic/asay/Run(list/input) - to_chat(GLOB.admins, "[span_prefix("DISCORD:")] [input["admin"]]: [span_message("[input["asay"]]")]", confidential=TRUE) + to_chat(GLOB.admins, span_adminsay("[span_prefix("DISCORD:")] [input["admin"]]: [span_message("[input["asay"]]")]"), confidential=TRUE) /datum/world_topic/ooc keyword = "ooc" @@ -50,7 +50,7 @@ GLOBAL_VAR_INIT(mentornoot, FALSE) var/id = input["id"] var/link = "https://github.com/yogstation13/Yogstation/pull/[id]" - var/final_composed = "PR: [msgTitle] by [author]" + var/final_composed = span_announce("PR: [msgTitle] by [author]") for(var/client/C in GLOB.clients) C.AnnouncePR(final_composed) diff --git a/yogstation/code/game/gamemodes/battle_royale/storm.dm b/yogstation/code/game/gamemodes/battle_royale/storm.dm index f54a9da8e26a..26fa3feb3daf 100644 --- a/yogstation/code/game/gamemodes/battle_royale/storm.dm +++ b/yogstation/code/game/gamemodes/battle_royale/storm.dm @@ -1,5 +1,5 @@ /datum/weather/royale - telegraph_message = "The storm is closing in, get away from the edge!" + telegraph_message = span_userdanger("The storm is closing in, get away from the edge!") weather_message = null protected_areas = list(/area/shuttle/arrival) area_type = /area @@ -35,19 +35,19 @@ /datum/weather/royale/one name = "royale maint" //First wave, hits maintenance - telegraph_message = "The storm is closing, get away from maintenance!" + telegraph_message = span_userdanger("The storm is closing, get away from maintenance!") area_type = /area/maintenance /datum/weather/royale/two name = "royale north" //North wave, takes out security, EVA, dorms and associated areas. - telegraph_message = "The storm is closing in, get away from the north!" + telegraph_message = span_userdanger("The storm is closing in, get away from the north!") areasToWeather = list(/area/security/execution/transfer, /area/security/prison,/area/security/detectives_office, /area/security/processing, /area/ai_monitored/security/armory, /area/security/main, /area/crew_quarters/heads/hos, /area/security/warden, /area/security/brig, /area/security/courtroom, /area/vacant_room/office/office_b, /area/lawoffice, /area/ai_monitored/storage/eva, /area/crew_quarters/dorms, /area/crew_quarters/toilet, /area/crew_quarters/fitness, /area/holodeck/rec_center, /area/hallway/primary/fore) /datum/weather/royale/three name = "royale east" //East wave, takes out medical, service and science - telegraph_message = "The storm is closing in, get away from the east!" + telegraph_message = span_userdanger("The storm is closing in, get away from the east!") areasToWeather = list(/area/science/lab, /area/science/explab, /area/crew_quarters/heads/hor, /area/science/mixing, /area/science/misc_lab, /area/science/nanite, /area/science/xenobiology, /area/science/storage, /area/science/research, /area/security/checkpoint/science, /area/science/server, /area/science/robotics/lab, /area/science/robotics/mechbay, /area/medical/genetics, /area/medical/paramedic, /area/medical/morgue, /area/security/checkpoint/medical, /area/crew_quarters/heads/cmo, /area/medical/virology, /area/medical/sleeper, /area/medical/chemistry, /area/medical/medbay/central, @@ -55,19 +55,19 @@ /datum/weather/royale/four name = "royale south" //South wave, takes out engineering and atmos - telegraph_message = "The storm is closing in, get away from the south!" + telegraph_message = span_userdanger("The storm is closing in, get away from the south!") areasToWeather = list(/area/storage/tech, /area/janitor, /area/construction, /area/engine/atmos, /area/engine/gravity_generator, /area/security/checkpoint/engineering, /area/engine/break_room, /area/crew_quarters/heads/chief, /area/engine/engine_smes, /area/engine/engineering, /area/engine/supermatter, /area/tcommsat/entrance, /area/tcommsat/computer, /area/tcommsat/server, /area/hallway/primary/aft) /datum/weather/royale/five name = "royale west" //West wave, takes out arrivals and cargo - telegraph_message = "The storm is closing in, get away from the west!" + telegraph_message = span_userdanger("The storm is closing in, get away from the west!") areasToWeather = list(/area/construction/mining/aux_base, /area/security/checkpoint/auxiliary, /area/hydroponics/garden, /area/storage/primary, /area/ai_monitored/nuke_storage, /area/clerk, /area/vacant_room, /area/crew_quarters/toilet/locker, /area/crew_quarters/locker, /area/storage/art, /area/storage/emergency/port, /area/storage/tools, /area/quartermaster/warehouse, /area/quartermaster/sorting, /area/quartermaster/storage, /area/quartermaster/office, /area/quartermaster/qm, /area/quartermaster/miningdock, /area/security/checkpoint/supply, /area/hallway/secondary/entry, /area/hallway/primary/port) /datum/weather/royale/six name = "royale centre" //final wave, takes out the centre ring. - telegraph_message = "The storm is closing in, make your final stand!" + telegraph_message = span_userdanger("The storm is closing in, make your final stand!") areasToWeather = list(/area/hallway/primary/central, /area/crew_quarters/heads/hop, /area/bridge/meeting_room, /area/bridge, /area/crew_quarters/heads/captain, /area/teleporter, /area/ai_monitored/turret_protected/ai_upload_foyer, - /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai) \ No newline at end of file + /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai) diff --git a/yogstation/code/game/gamemodes/changeling/powers/abomination_powers.dm b/yogstation/code/game/gamemodes/changeling/powers/abomination_powers.dm index 8380e2c0ffca..ba7a7d723ce1 100644 --- a/yogstation/code/game/gamemodes/changeling/powers/abomination_powers.dm +++ b/yogstation/code/game/gamemodes/changeling/powers/abomination_powers.dm @@ -12,7 +12,7 @@ revert_cast() return playMagSound() - user.visible_message("[usr] unhinges their jaw and releases a horrifying shriek!") + user.visible_message(span_warning("[usr] unhinges their jaw and releases a horrifying shriek!")) for(var/turf/T in targets) for(var/mob/living/carbon/M in T.contents) if(M == user) //No message for the user, of course @@ -26,4 +26,4 @@ for(var/mob/living/silicon/M in T.contents) M.Paralyze(10) for(var/obj/machinery/light/L in range(7, user)) - L.set_light(0) \ No newline at end of file + L.set_light(0) diff --git a/yogstation/code/game/gamemodes/gangs/gang_items.dm b/yogstation/code/game/gamemodes/gangs/gang_items.dm index ad17d929e40d..21be9087c2f8 100644 --- a/yogstation/code/game/gamemodes/gangs/gang_items.dm +++ b/yogstation/code/game/gamemodes/gangs/gang_items.dm @@ -289,7 +289,7 @@ id = "force_converter" cost = 20 item_path = /obj/item/implanter/gang - spawn_msg = "The force converter is a single-use device that converts enemy gangsters." + spawn_msg = span_notice("The force converter is a single-use device that converts enemy gangsters.") /datum/gang_item/equipment/force_converter/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/gangtool/gangtool) var/obj/item/O = new item_path(user.loc, gang) @@ -313,7 +313,7 @@ id = "pen" cost = 25 item_path = /obj/item/pen/gang - spawn_msg = "More recruitment pens will allow you to recruit gangsters faster. Only gang leaders can recruit with pens." + spawn_msg = span_notice("More recruitment pens will allow you to recruit gangsters faster. Only gang leaders can recruit with pens.") /datum/gang_item/equipment/pen/purchase(mob/living/carbon/user, datum/team/gang/gang, obj/item/gangtool/gangtool) if(..()) @@ -341,7 +341,7 @@ if(gang) item_type = /obj/item/gangtool/spare/lt if(gang.leaders.len < MAX_LEADERS_GANG) - to_chat(user, "Gangtools allow you to promote a gangster to be your Lieutenant, enabling them to recruit and purchase items like you. Simply have them register the gangtool. You may promote up to [MAX_LEADERS_GANG-gang.leaders.len] more Lieutenants") + to_chat(user, span_notice("Gangtools allow you to promote a gangster to be your Lieutenant, enabling them to recruit and purchase items like you. Simply have them register the gangtool. You may promote up to [MAX_LEADERS_GANG-gang.leaders.len] more Lieutenants")) else item_type = /obj/item/gangtool/spare var/obj/item/gangtool/spare/tool = new item_type(user.loc) @@ -357,7 +357,7 @@ id = "dominator" cost = 30 item_path = /obj/machinery/dominator - spawn_msg = "The dominator will secure your gang's dominance over the station. Turn it on when you are ready to defend it." + spawn_msg = span_notice("The dominator will secure your gang's dominance over the station. Turn it on when you are ready to defend it.") /datum/gang_item/equipment/dominator/can_buy(mob/living/carbon/user, datum/team/gang/gang, obj/item/gangtool/gangtool) if(!gang || !gang.dom_attempts) @@ -381,7 +381,7 @@ /datum/gang_item/equipment/dominator/purchase(mob/living/carbon/user, datum/team/gang/gang, obj/item/gangtool/gangtool) var/area/userarea = get_area(user) if(!(userarea.type in gang.territories|gang.new_territories)) - to_chat(user,"The dominator can only be bought in territory controlled by your gang!") + to_chat(user,span_warning("The dominator can only be bought in territory controlled by your gang!")) return FALSE for(var/obj/obj in get_turf(user)) if(obj.density) diff --git a/yogstation/code/game/gamemodes/gangs/gangtool.dm b/yogstation/code/game/gamemodes/gangs/gangtool.dm index e9d1b5ccf229..3b86da588474 100644 --- a/yogstation/code/game/gamemodes/gangs/gangtool.dm +++ b/yogstation/code/game/gamemodes/gangs/gangtool.dm @@ -158,7 +158,7 @@ var/datum/antagonist/gang/G = user.mind.has_antag_datum(/datum/antagonist/gang) if(!G) return - var/ping = "[gang.name] [G.message_name] [user.real_name]: [message]" + var/ping = span_danger("[gang.name] [G.message_name] [user.real_name]: [message]") for(var/datum/mind/ganger in gang.members) if(ganger.current && is_station_level(ganger.current.z) && (ganger.current.stat == CONSCIOUS)) to_chat(ganger.current, ping) diff --git a/yogstation/code/game/gamemodes/vampire/vampire_powers.dm b/yogstation/code/game/gamemodes/vampire/vampire_powers.dm index b2745cbec8fa..0101cd0324ff 100644 --- a/yogstation/code/game/gamemodes/vampire/vampire_powers.dm +++ b/yogstation/code/game/gamemodes/vampire/vampire_powers.dm @@ -44,7 +44,7 @@ targets.Cut() if(LAZYLEN(targets)) - to_chat(usr, "You have [vampire.usable_blood] left to use.") + to_chat(usr, span_notice("You have [vampire.usable_blood] left to use.")) /obj/effect/proc_holder/spell/can_target(mob/living/target) @@ -366,7 +366,7 @@ for(var/mob/living/carbon/C in hearers(4)) if(!C == user || !is_vampire(C)) if(ishuman(C) && C.soundbang_act(1, 0)) - to_chat(C, "You hear a ear piercing shriek and your senses dull!") + to_chat(C, span_warning("You hear a ear piercing shriek and your senses dull!")) C.Knockdown(40) C.adjustEarDamage(0, 30) C.stuttering = 250 diff --git a/yogstation/code/game/machinery/computer/arcade.dm b/yogstation/code/game/machinery/computer/arcade.dm index d39f2cd1b0b0..94e5cecb3c07 100644 --- a/yogstation/code/game/machinery/computer/arcade.dm +++ b/yogstation/code/game/machinery/computer/arcade.dm @@ -404,7 +404,7 @@ /obj/machinery/computer/arcade/minesweeper/proc/explode_EVERYTHING() var/mob/living/user = usr - to_chat(user, "You feel a great sense of dread wash over you. You feel as if you just unleashed armageddon upon yourself!") + to_chat(user, span_warning("You feel a great sense of dread wash over you. You feel as if you just unleashed armageddon upon yourself!")) var/row_limit = rows-1 var/column_limit = columns-1 var/mine_limit_v2 = mine_limit diff --git a/yogstation/code/game/objects/items/brace.dm b/yogstation/code/game/objects/items/brace.dm index 86f9a8a4b7a5..82a0790767c5 100644 --- a/yogstation/code/game/objects/items/brace.dm +++ b/yogstation/code/game/objects/items/brace.dm @@ -32,9 +32,9 @@ /obj/structure/deployed_brace/examine(mob/user) . = ..() if(!cover_open) - . += "The cover is screwed in place." + . += span_notice("The cover is screwed in place.") else - . += "The inside is filled with pipes." + . += span_notice("The inside is filled with pipes.") /obj/structure/deployed_brace/attackby(obj/item/I, mob/user, params) if(get_dist(user, placed_on) > 1) @@ -85,4 +85,4 @@ return ..() /obj/structure/deployed_brace/singularity_pull() - return \ No newline at end of file + return diff --git a/yogstation/code/game/objects/items/implants/implant_mindslave.dm b/yogstation/code/game/objects/items/implants/implant_mindslave.dm index ad40b90350fb..fa15c5c72929 100644 --- a/yogstation/code/game/objects/items/implants/implant_mindslave.dm +++ b/yogstation/code/game/objects/items/implants/implant_mindslave.dm @@ -36,7 +36,7 @@ to_chat(holder, span_warning("[target] seems to resist the implant!")) return FALSE - to_chat(target, "You feel a strange urge to serve [holder.real_name]. A simple thought about disobeying his/her commands makes your head feel like it is going to explode. You feel like you dont want to know what will happen if you actually disobey your new master.") + to_chat(target, span_hypnophrase("You feel a strange urge to serve [holder.real_name]. A simple thought about disobeying his/her commands makes your head feel like it is going to explode. You feel like you dont want to know what will happen if you actually disobey your new master.")) var/datum/antagonist/mindslave/MS = new target.mind.add_antag_datum(MS) diff --git a/yogstation/code/modules/admin/moja.dm b/yogstation/code/modules/admin/moja.dm index ecd3e1d448c8..4bb190847918 100644 --- a/yogstation/code/modules/admin/moja.dm +++ b/yogstation/code/modules/admin/moja.dm @@ -14,7 +14,7 @@ switch(stage) if(1) visible_message(span_userdanger("Vibrations pass through the air. [src]'s eyes begin to glow a deep violet."), \ - "Psi floods into your consciousness. You feel your mind growing more powerful... expanding.") + span_velvet("Psi floods into your consciousness. You feel your mind growing more powerful... expanding.")) playsound(src, 'yogstation/sound/magic/divulge_01.ogg', 30, 0) if(2) visible_message(span_userdanger("Gravity fluctuates. Psychic tendrils extend outward and feel blindly around the area."), \ diff --git a/yogstation/code/modules/admin/verbs/adminhelp.dm b/yogstation/code/modules/admin/verbs/adminhelp.dm index 829dcf7c83b8..5780d52d2662 100644 --- a/yogstation/code/modules/admin/verbs/adminhelp.dm +++ b/yogstation/code/modules/admin/verbs/adminhelp.dm @@ -232,7 +232,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /datum/admin_help/proc/MessageNoRecipient(msg) var/ref_src = "[REF(src)]" //Message to be sent to all admins - var/admin_msg = "[span_adminhelp("Ticket [TicketHref("#[id]", ref_src)]")]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]: [keywords_lookup(msg)]" + var/admin_msg = span_adminnotice("[span_adminhelp("Ticket [TicketHref("#[id]", ref_src)]")]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]: [keywords_lookup(msg)]") AddInteraction(msg) @@ -244,7 +244,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) to_chat(X, admin_msg, confidential=TRUE) //show it to the person adminhelping too - to_chat(initiator, "PM to-Admins: [msg]", confidential=TRUE) + to_chat(initiator, span_adminnotice("PM to-Admins: [msg]"), confidential=TRUE) GLOB.unclaimed_tickets += src //Reopen a closed ticket diff --git a/yogstation/code/modules/admin/verbs/adminsay.dm b/yogstation/code/modules/admin/verbs/adminsay.dm index 76cde3e6c1e9..d72393d29582 100644 --- a/yogstation/code/modules/admin/verbs/adminsay.dm +++ b/yogstation/code/modules/admin/verbs/adminsay.dm @@ -19,10 +19,10 @@ msg = emoji_parse(msg) msg = keywords_lookup(msg) if(check_rights(R_ADMIN,0)) - msg = "[span_prefix("ADMIN:")] [key_name(usr, 1)] [ADMIN_FLW(mob)]: [span_message("[msg]")]" + msg = span_adminsay("[span_prefix("ADMIN:")] [key_name(usr, 1)] [ADMIN_FLW(mob)]: [span_message("[msg]")]") to_chat(GLOB.admins, msg, confidential=TRUE) else - msg = "[span_prefix("OBSERVER:")] [key_name(usr, 1)] [ADMIN_FLW(mob)]: [span_message("[msg]")]" + msg = span_adminsay("[span_prefix("OBSERVER:")] [key_name(usr, 1)] [ADMIN_FLW(mob)]: [span_message("[msg]")]") to_chat(GLOB.admins, msg, confidential=TRUE) SSblackbox.record_feedback("tally", "admin_verb", 1, "Asay") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/yogstation/code/modules/admin/verbs/queue.dm b/yogstation/code/modules/admin/verbs/queue.dm index 7a443296ddc1..cc01a539824c 100644 --- a/yogstation/code/modules/admin/verbs/queue.dm +++ b/yogstation/code/modules/admin/verbs/queue.dm @@ -7,7 +7,7 @@ return listclearnulls(SSticker.queued_players) - to_chat(usr,"List of queued players:", confidential=TRUE) + to_chat(usr,span_notice("List of queued players:"), confidential=TRUE) for(var/mob/dead/new_player/guy in SSticker.queued_players) to_chat(usr,"\t[guy]", confidential=TRUE) @@ -31,7 +31,7 @@ //Below is basically a clone of whatever's in that one part of check_queue() for (var/mob/dead/new_player/NP in queue) - to_chat(NP, "The alive players limit has been released!
[html_encode(">>Join Game<<")]") + to_chat(NP, span_userdanger("The alive players limit has been released!
[html_encode(">>Join Game<<")]")) SEND_SOUND(NP, sound('sound/misc/notice1.ogg')) NP.LateChoices() queue.len = 0 diff --git a/yogstation/code/modules/admin/verbs/ticketpanel.dm b/yogstation/code/modules/admin/verbs/ticketpanel.dm index 8b0c26701eed..bce00360671c 100644 --- a/yogstation/code/modules/admin/verbs/ticketpanel.dm +++ b/yogstation/code/modules/admin/verbs/ticketpanel.dm @@ -130,31 +130,31 @@ GLOBAL_VAR_INIT(experimental_adminpanel, TRUE) switch(action) if("adminmoreinfo") if(!ticket.initiator) - to_chat(usr, "Client not found") + to_chat(usr, span_warning("Client not found")) return usr.client.holder.adminmoreinfo(ticket.initiator.mob) return if("PP") if(!ticket.initiator) - to_chat(usr, "Client not found") + to_chat(usr, span_warning("Client not found")) return usr.client.holder.show_player_panel(ticket.initiator.mob) return if("VV") if(!ticket.initiator) - to_chat(usr, "Client not found") + to_chat(usr, span_warning("Client not found")) return usr.client.debug_variables(ticket.initiator.mob) return if("SM") if(!ticket.initiator) - to_chat(usr, "Client not found") + to_chat(usr, span_warning("Client not found")) return usr.client.cmd_admin_subtle_message(ticket.initiator.mob) return if("FLW") if(!ticket.initiator) - to_chat(usr, "Client not found") + to_chat(usr, span_warning("Client not found")) return usr.client.holder.observe_follow(ticket.initiator.mob) return @@ -190,19 +190,19 @@ GLOBAL_VAR_INIT(experimental_adminpanel, TRUE) return if("TP") if(!ticket.initiator) - to_chat(usr, "Client not found") + to_chat(usr, span_warning("Client not found")) return usr.client.holder.show_traitor_panel(ticket.initiator.mob) return if("Logs") if(!ticket.initiator) - to_chat(usr, "Client not found") + to_chat(usr, span_warning("Client not found")) return show_individual_logging_panel(ticket.initiator.mob) return if("Smite") if(!ticket.initiator) - to_chat(usr, "Client not found") + to_chat(usr, span_warning("Client not found")) return usr.client.smite(ticket.initiator.mob) return diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm index 3d0026df81bc..e93876f56cba 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm @@ -278,7 +278,7 @@ action.darkspawn = src abilities[id] = action if(!silent) - to_chat(owner.current, "You have learned the [action.name] ability.") + to_chat(owner.current, span_velvet("You have learned the [action.name] ability.")) if(!no_cost) lucidity = max(0, lucidity - action.lucidity_price) return TRUE @@ -288,7 +288,7 @@ return var/datum/action/innate/darkspawn/D = abilities[id] if(!silent) - to_chat(owner.current, "You have lost the [D.name] ability.") + to_chat(owner.current, span_velvet("You have lost the [D.name] ability.")) QDEL_NULL(abilities[id]) abilities -= abilities[id] return TRUE @@ -330,7 +330,7 @@ span_userdanger("You can't maintain your disguise any more! It begins sloughing off!")) playsound(H, 'yogstation/sound/creatures/darkspawn_force_divulge.ogg', 50, FALSE) H.do_jitter_animation(1000) - var/processed_message = "\[Mindlink\] [H.real_name] has not divulged in time and is now forcefully divulging." + var/processed_message = span_velvet("\[Mindlink\] [H.real_name] has not divulged in time and is now forcefully divulging.") for(var/mob/M in GLOB.player_list) if(M.stat == DEAD) var/link = FOLLOW_LINK(M, H) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_divulge.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_divulge.dm index b339e29ce9bf..37042cd34841 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_divulge.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_divulge.dm @@ -44,7 +44,7 @@ switch(stage) if(1) user.visible_message(span_userdanger("Vibrations pass through the air. [user]'s eyes begin to glow a deep violet."), \ - "Psi floods into your consciousness. You feel your mind growing more powerful... expanding.") + span_velvet("Psi floods into your consciousness. You feel your mind growing more powerful... expanding.")) playsound(user, 'yogstation/sound/magic/divulge_01.ogg', 30, 0) if(2) user.visible_message(span_userdanger("Gravity fluctuates. Psychic tendrils extend outward and feel blindly around the area."), \ @@ -79,7 +79,7 @@ L.Knockdown(50) var/old_name = user.real_name darkspawn.divulge() - var/processed_message = "\[Mindlink\] [old_name] has removed their human disguise and is now [user.real_name]." + var/processed_message = span_velvet("\[Mindlink\] [old_name] has removed their human disguise and is now [user.real_name].") for(var/T in GLOB.alive_mob_list) var/mob/M = T if(is_darkspawn_or_veil(M)) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm index 1e541ceb00de..2ed44a1c5e04 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm @@ -46,14 +46,14 @@ switch(stage) if(1) user.visible_message(span_userdanger("[user]'s sigils howl out light. Their limbs twist and move, glowing cracks forming across their chitin."), \ - "Power... power... flooding through you, the dreams and thoughts of those you've touched whispering in your ears...") + span_velvet("Power... power... flooding through you, the dreams and thoughts of those you've touched whispering in your ears...")) for(var/mob/M in GLOB.player_list) M.playsound_local(M, 'yogstation/sound/magic/sacrament_01.ogg', 20, FALSE, pressure_affected = FALSE) if(M != user) to_chat(M, span_warning("What is that sound...?")) if(2) - user.visible_message("[user] begins to... grow..", \ - "Yes! Yes! You feel the weak mortal shell coming apart!") + user.visible_message(span_userdanger("[user] begins to... grow.."), \ + span_velvet("Yes! Yes! You feel the weak mortal shell coming apart!")) for(var/mob/M in GLOB.player_list) M.playsound_local(M, 'yogstation/sound/magic/sacrament_02.ogg', 20, FALSE, pressure_affected = FALSE) animate(user, transform = matrix() * 2, time = 150) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/creep.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/creep.dm index b2d94f09469d..b401a7197582 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/creep.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/creep.dm @@ -20,7 +20,7 @@ /datum/action/innate/darkspawn/creep/Activate() var/mob/living/L = owner - owner.visible_message(span_warning("Velvety shadows coalesce around [owner]!"), "odeahz
You begin using Psi to shield yourself from lightburn.") + owner.visible_message(span_warning("Velvety shadows coalesce around [owner]!"), span_velvet("odeahz
You begin using Psi to shield yourself from lightburn.")) playsound(owner, 'yogstation/sound/magic/devour_will_victim.ogg', 50, TRUE) L.apply_status_effect(STATUS_EFFECT_CREEP, darkspawn) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/simulacrum.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/simulacrum.dm index bbe4d195f89f..25d43b187186 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/simulacrum.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/simulacrum.dm @@ -13,10 +13,10 @@ var/mob/living/L = owner.loc L.visible_message(span_warning("[owner] breaks away from [L]'s shadow!"), \ span_userdanger("You feel a sense of freezing cold pass through you!")) - to_chat(owner, "zayaera
You create an illusion of yourself.") + to_chat(owner, span_velvet("zayaera
You create an illusion of yourself.")) else owner.visible_message(span_warning("[owner] splits in two!"), \ - "zayaera
You create an illusion of yourself.") + span_velvet("zayaera
You create an illusion of yourself.")) playsound(owner, 'yogstation/sound/magic/devour_will_form.ogg', 50, 1) var/obj/effect/simulacrum/simulacrum = new(get_turf(owner)) simulacrum.mimic(owner) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/time_dilation.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/time_dilation.dm index e021fd1d9470..8e7ab865d264 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/time_dilation.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/time_dilation.dm @@ -17,6 +17,6 @@ var/mob/living/L = owner L.apply_status_effect(STATUS_EFFECT_TIME_DILATION) L.visible_message(span_warning("[L] howls as their body moves at wild speeds!"), \ - "ckppw ck bwop
Your sigils howl out light as your body moves at incredible speed!") + span_velvet("ckppw ck bwop
Your sigils howl out light as your body moves at incredible speed!")) playsound(L, 'yogstation/sound/creatures/darkspawn_howl.ogg', 50, TRUE) return TRUE diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/veil_mind.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/veil_mind.dm index 3ed693067eae..9b3c48bab7ab 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/veil_mind.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/veil_mind.dm @@ -25,7 +25,7 @@ if(L == owner) continue if(issilicon(L)) - to_chat(L, "$@!) ERR: RECEPTOR OVERLOAD ^!") + to_chat(L, span_ownerdanger("$@!) ERR: RECEPTOR OVERLOAD ^![L.real_name] has become a veil!") + to_chat(owner, span_velvet("[L.real_name] has become a veil!")) else to_chat(L, span_boldwarning("...and it scrambles your thoughts!")) L.dir = pick(GLOB.cardinals) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm index 68b78d0dc39c..c773aea2e80a 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm @@ -59,7 +59,7 @@ if(user.loc != L) user.visible_message(span_warning("[user] grabs [L] and leans in close..."), "cera qo...
\ [span_danger("You begin siphoning [L]'s mental energy...")]") - to_chat(L, "AAAAAAAAAAAAAA-") + to_chat(L, span_userdanger("AAAAAAAAAAAAAA-")) L.Stun(50) L.silent += 4 playsound(L, 'yogstation/sound/magic/devour_will.ogg', 65, FALSE) //T A S T Y S O U L S @@ -72,7 +72,7 @@ else L.visible_message("[L] suddenly howls and clutches as their face as violet light screams from their eyes!", \ "AAAAAAAAAAAAAAA-") - to_chat(user, "cera qo...
You begin siphoning [L]'s will...") + to_chat(user, span_velvet("cera qo...
You begin siphoning [L]'s will...")) L.Stun(50) playsound(L, 'yogstation/sound/magic/devour_will_long.ogg', 65, FALSE) if(!do_mob(user, L, 50)) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/umbral_tendrils.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/umbral_tendrils.dm index 653f6fbbcad9..d2e58fbc2beb 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/umbral_tendrils.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/umbral_tendrils.dm @@ -34,9 +34,9 @@ . = ..() if(isobserver(user) || isdarkspawn(user)) to_chat(user, "Functions:") - to_chat(user, "Help intent: Click on an open tile within seven tiles to jump to it for 10 Psi.") - to_chat(user, "Disarm intent: Click on an airlock to force it open for 15 Psi (or 30 if it's bolted.)") - to_chat(user, "Harm intent: Fire a projectile that travels up to five tiles, knocking down[twin ? " and pulling forwards" : ""] the first creature struck.") + to_chat(user, span_velvet("Help intent: Click on an open tile within seven tiles to jump to it for 10 Psi.")) + to_chat(user, span_velvet("Disarm intent: Click on an airlock to force it open for 15 Psi (or 30 if it's bolted.)")) + to_chat(user, span_velvet("Harm intent: Fire a projectile that travels up to five tiles, knocking down[twin ? " and pulling forwards" : ""] the first creature struck.")) to_chat(user, span_velvet("The tendrils will break any lights hit in melee,")) to_chat(user, span_velvet("The tendrils will shatter light fixtures instantly, as opposed to in several attacks.")) to_chat(user, span_velvet("Also functions to pry open depowered airlocks on any intent other than harm.")) @@ -105,7 +105,7 @@ to_chat(user, span_warning("[target] is already knocked down!")) return user.visible_message(span_warning("[user] draws back [src] and swings them towards [target]!"), \ - "opehhjaoo
You swing your tendrils towards [target]!") + span_velvet("opehhjaoo
You swing your tendrils towards [target]!")) playsound(user, 'sound/magic/tail_swing.ogg', 50, TRUE) var/obj/item/projectile/umbral_tendrils/T = new(get_turf(user)) T.preparePixelProjectile(target, user) diff --git a/yogstation/code/modules/antagonists/shadowling/ascendant_shadowling.dm b/yogstation/code/modules/antagonists/shadowling/ascendant_shadowling.dm index 0db89cfecfb4..c352c479517d 100644 --- a/yogstation/code/modules/antagonists/shadowling/ascendant_shadowling.dm +++ b/yogstation/code/modules/antagonists/shadowling/ascendant_shadowling.dm @@ -40,9 +40,9 @@ /mob/living/simple_animal/ascendant_shadowling/singularity_act() to_chat(src, "\"NO! I will not be.... destroyed by a.... AAAAAAA-\"") + to_chat(world, span_shadowling("\"NO! I will not be.... destroyed by a.... AAAAAAA-\"")) for(var/X in GLOB.alive_mob_list) var/mob/M = X - to_chat(M, "You feel a woosh as newly released energy temporarily distorts space itself...") + to_chat(M, span_notice("You feel a woosh as newly released energy temporarily distorts space itself...")) SEND_SOUND(M, sound('sound/hallucinations/wail.ogg')) . = ..() diff --git a/yogstation/code/modules/antagonists/shadowling/shadowling.dm b/yogstation/code/modules/antagonists/shadowling/shadowling.dm index 1aa1a1baf333..81735cf5ec00 100644 --- a/yogstation/code/modules/antagonists/shadowling/shadowling.dm +++ b/yogstation/code/modules/antagonists/shadowling/shadowling.dm @@ -41,7 +41,7 @@ to_chat(M,span_userdanger("You have been turned into a[ iscyborg(M) ? " cyborg" : "n AI" ]! You are no longer a shadowling! Though you try, you cannot remember anything about your time as one...")) else M.visible_message(span_big("[M] screams and contorts!")) - to_chat(M,"THE LIGHT-- YOUR MIND-- BURNS--") + to_chat(M,span_userdanger("THE LIGHT-- YOUR MIND-- BURNS--")) spawn(30) if(QDELETED(M)) return @@ -98,4 +98,4 @@ . = ..() if((dna && dna.species) && istype(dna.species, /datum/species/shadow/ling)) var/datum/species/shadow/ling/SL = dna.species - . += "Shadowy Shield Charges: [SL.shadow_charges]" \ No newline at end of file + . += "Shadowy Shield Charges: [SL.shadow_charges]" diff --git a/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm b/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm index cc92fe03f56e..0f9944dcba44 100644 --- a/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm +++ b/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm @@ -73,7 +73,7 @@ revert_cast() return var/mob/living/carbon/human/M = target - usr.visible_message("[usr]'s eyes flash a purpleish-red!") + usr.visible_message(span_warning("[usr]'s eyes flash a purpleish-red!")) var/distance = get_dist(target, usr) if (distance <= 2) target.visible_message(span_danger("[target] suddendly collapses...")) @@ -296,9 +296,9 @@ enthralling = FALSE return enthralling = FALSE - to_chat(user, "You have enthralled [target.real_name]!") + to_chat(user, span_shadowling("You have enthralled [target.real_name]!")) target.visible_message(span_big("[target] looks to have experienced a revelation!"), \ - "False faces all dark not real not real not--") + span_warning("False faces all dark not real not real not--")) target.setOxyLoss(0) //In case the shadowling was choking them out target.mind.special_role = "thrall" var/obj/item/organ/internal/shadowtumor/ST = new @@ -377,7 +377,7 @@ var/thralls = 0 var/victory_threshold = SSticker.mode.required_thralls var/mob/M - to_chat(user, "You focus your telepathic energies abound, harnessing and drawing together the strength of your thralls.") + to_chat(user, span_shadowling("You focus your telepathic energies abound, harnessing and drawing together the strength of your thralls.")) for(M in GLOB.alive_mob_list) if(is_thrall(M)) thralls++ @@ -387,7 +387,7 @@ return if(thralls >= CEILING(3 * SSticker.mode.thrall_ratio, 1) && !screech_acquired) screech_acquired = TRUE - to_chat(user, "The power of your thralls has granted you the Sonic Screech ability. This ability will shatter nearby windows and deafen enemies, plus stunning silicon lifeforms.") + to_chat(user, span_shadowling("The power of your thralls has granted you the Sonic Screech ability. This ability will shatter nearby windows and deafen enemies, plus stunning silicon lifeforms.")) user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/unearthly_screech(null)) if(thralls >= CEILING(5 * SSticker.mode.thrall_ratio, 1) && !blind_smoke_acquired) blind_smoke_acquired = TRUE @@ -407,8 +407,8 @@ if(thralls < victory_threshold) to_chat(user, span_shadowling("You do not have the power to ascend. You require [victory_threshold] thralls, but only [thralls] living thralls are present.")) else if(thralls >= victory_threshold) - to_chat(user, "You are now powerful enough to ascend. Use the Ascendance ability when you are ready. This will kill all of your thralls.") - to_chat(user, "You may find Ascendance in the Shadowling Evolution tab.") + to_chat(user, span_shadowling("You are now powerful enough to ascend. Use the Ascendance ability when you are ready. This will kill all of your thralls.")) + to_chat(user, span_shadowling("You may find Ascendance in the Shadowling Evolution tab.")) for(M in GLOB.alive_mob_list) if(is_shadow(M)) var/obj/effect/proc_holder/spell/self/collective_mind/CM @@ -418,9 +418,9 @@ M.mind.RemoveSpell(/obj/effect/proc_holder/spell/self/shadowling_hatch) M.mind.AddSpell(new /obj/effect/proc_holder/spell/self/shadowling_ascend(null)) if(M == user) - to_chat(user, "You project this power to the rest of the shadowlings.") + to_chat(user, span_shadowling("You project this power to the rest of the shadowlings.")) else - to_chat(M, "[user.real_name] has coalesced the strength of the thralls. You can draw upon it at any time to ascend. (Shadowling Evolution Tab)") //Tells all the other shadowlings + to_chat(M, span_shadowling("[user.real_name] has coalesced the strength of the thralls. You can draw upon it at any time to ascend. (Shadowling Evolution Tab)")) //Tells all the other shadowlings /obj/effect/proc_holder/spell/self/null_charge name = "Null Charge" @@ -512,7 +512,7 @@ if(!shadowling_check(user)) revert_cast() return - user.audible_message("[user] lets out a horrible scream!") + user.audible_message(span_warning("[user] lets out a horrible scream!")) for(var/turf/T in targets) for(var/mob/target in T.contents) if(is_shadow_or_thrall(target)) @@ -522,12 +522,12 @@ continue if(iscarbon(target)) var/mob/living/carbon/M = target - to_chat(M, "A spike of pain drives into your head and scrambles your thoughts!") + to_chat(M, span_danger("A spike of pain drives into your head and scrambles your thoughts!")) M.confused += 10 M.adjustEarDamage(0, 30)//as bad as a changeling shriek else if(issilicon(target)) var/mob/living/silicon/S = target - to_chat(S, "ERROR $!(@ ERROR )#^! SENSORY OVERLOAD \[$(!@#") + to_chat(S, span_warning("ERROR $!(@ ERROR )#^! SENSORY OVERLOAD \[$(!@#")) playsound(S, 'sound/machines/warning-buzzer.ogg', 50, 1) var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread sp.set_up(5, 1, S) @@ -586,17 +586,17 @@ to_chat(user, span_warning("Your concentration snaps. The flow of energy ebbs.")) revert_cast() return - to_chat(user, "You release a massive surge of power into [thrallToRevive]!") - user.visible_message("Red lightning surges into [thrallToRevive]'s face!") + to_chat(user, span_shadowling("You release a massive surge of power into [thrallToRevive]!")) + user.visible_message(span_boldannounce("Red lightning surges into [thrallToRevive]'s face!")) playsound(thrallToRevive, 'sound/weapons/Egloves.ogg', 50, 1) playsound(thrallToRevive, 'sound/machines/defib_zap.ogg', 50, 1) user.Beam(thrallToRevive,icon_state="red_lightning",time=1) thrallToRevive.Knockdown(5) - thrallToRevive.visible_message("[thrallToRevive] collapses, their skin and face distorting!", \ - "AAAAAAAAAAAAAAAAAAAGH-") + thrallToRevive.visible_message(span_warning("[thrallToRevive] collapses, their skin and face distorting!"), \ + span_userdanger("AAAAAAAAAAAAAAAAAAAGH-")) if (!do_mob(user, thrallToRevive, 5)) thrallToRevive.Unconscious(600) - thrallToRevive.visible_message("[thrallToRevive] gasps, and passes out!", "That... feels nice....") + thrallToRevive.visible_message(span_warning("[thrallToRevive] gasps, and passes out!"), span_warning("That... feels nice....")) to_chat(user, span_warning("We have been interrupted! [thrallToRevive] will need to rest to recover.")) return thrallToRevive.visible_message(span_warning("[thrallToRevive] slowly rises, no longer recognizable as human."), \ @@ -627,15 +627,15 @@ to_chat(user, span_warning("Your concentration snaps. The flow of energy ebbs.")) revert_cast() return - to_chat(user, "You release a massive surge of power into [thrallToRevive]!") - user.visible_message("Red lightning surges from [user]'s hands into [thrallToRevive]'s chest!") + to_chat(user, span_shadowling("You release a massive surge of power into [thrallToRevive]!")) + user.visible_message(span_boldannounce("Red lightning surges from [user]'s hands into [thrallToRevive]'s chest!")) playsound(thrallToRevive, 'sound/weapons/Egloves.ogg', 50, 1) playsound(thrallToRevive, 'sound/machines/defib_zap.ogg', 50, 1) user.Beam(thrallToRevive,icon_state="red_lightning",time=1) var/b = do_mob(user, thrallToRevive, 20) if(thrallToRevive.revive(full_heal = 1)) thrallToRevive.visible_message(span_boldannounce("[thrallToRevive] heaves in breath, dim red light shining in their eyes."), \ - "You have returned. One of your masters has brought you from the darkness beyond.") + span_shadowling("You have returned. One of your masters has brought you from the darkness beyond.")) thrallToRevive.Knockdown(4) thrallToRevive.emote("gasp") playsound(thrallToRevive, "bodyfall", 50, 1) @@ -643,7 +643,7 @@ thrallToRevive.Knockdown(50) thrallToRevive.Unconscious(500) thrallToRevive.visible_message(span_boldannounce("[thrallToRevive] collapses in exhaustion."), \ - "You collapse in exhaustion... nap..... dark.") + span_warning("You collapse in exhaustion... nap..... dark.")) else revert_cast() return @@ -686,7 +686,7 @@ return to_chat(user, span_notice("You project [M]'s life force toward the approaching shuttle, extending its arrival duration!")) M.visible_message(span_warning("[M]'s eyes suddenly flare red. They proceed to collapse on the floor, not breathing."), \ - "...speeding by... ...pretty blue glow... ...touch it... ...no glow now... ...no light... ...nothing at all...") + span_warning("...speeding by... ...pretty blue glow... ...touch it... ...no glow now... ...no light... ...nothing at all...")) M.dust() if(SSshuttle.emergency.mode == SHUTTLE_CALL) @@ -785,7 +785,7 @@ jaunter.forceMove(get_turf(src)) if(forced) jaunter.visible_message(span_boldwarning("A dark shape stumbles from a hole in the air and collapses!"), - "Straining, you use the last of your energy to force yourself from the void.") + span_shadowling("Straining, you use the last of your energy to force yourself from the void.")) else jaunter.visible_message(span_boldwarning("A dark shape tears itself from nothingness!"), span_shadowling("You exit the void.")) @@ -855,7 +855,7 @@ revert_cast() return var/mob/living/carbon/human/M = target - user.visible_message("[user]'s eyes flash a bright red!") + user.visible_message(span_warning("[user]'s eyes flash a bright red!")) target.visible_message(span_danger("[target] suddendly looks dizzy and nauseous...")) if(in_range(target, user)) to_chat(target, span_userdanger("Your gaze is forcibly drawn into [user]'s eyes, and you suddendly feel dizzy and nauseous...")) @@ -926,13 +926,13 @@ /obj/effect/proc_holder/spell/self/lesser_shadowling_hivemind/cast(mob/living/carbon/human/user) if(!is_shadow_or_thrall(user)) - to_chat(user, "As you attempt to commune with the others, an agonizing spike of pain drives itself into your head!") + to_chat(user, span_warning("As you attempt to commune with the others, an agonizing spike of pain drives itself into your head!")) user.apply_damage(10, BRUTE, "head") return var/text = stripped_input(user, "What do you want to say your masters and fellow thralls?.", "Lesser Commune", "") if(!text) return - text = "\[Thrall\] [user.real_name]: [text]" + text = span_shadowling("\[Thrall\] [user.real_name]: [text]") for(var/T in GLOB.alive_mob_list) var/mob/M = T if(is_shadow_or_thrall(M)) @@ -1015,8 +1015,8 @@ to_chat(user, span_warning("You can only enthrall humans.")) revert_cast() return - to_chat(user, "You instantly rearrange [target]'s memories, hyptonitizing them into a thrall.") - to_chat(target, "An agonizing spike of pain drives into your mind, and--") + to_chat(user, span_shadowling("You instantly rearrange [target]'s memories, hyptonitizing them into a thrall.")) + to_chat(target, span_userdanger("An agonizing spike of pain drives into your mind, and--")) target.mind.special_role = "thrall" target.add_thrall() @@ -1036,7 +1036,7 @@ to_chat(user, span_warning("You are not in the same plane of existence. Unphase first.")) revert_cast() return - user.visible_message("A massive ball of lightning appears in [user]'s hands and flares out!", \ + user.visible_message(span_warning("A massive ball of lightning appears in [user]'s hands and flares out!"), \ span_shadowling("You conjure a ball of lightning and release it.")) for(var/mob/living/carbon/human/target in view(6)) if(is_shadow_or_thrall(target)) diff --git a/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm b/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm index 9e35ed7b9474..197c8b38b55c 100644 --- a/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm +++ b/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm @@ -43,11 +43,11 @@ span_shadowling("You create your chrysalis and begin to contort within.")) if(!do_mob(H,H,100,1)) return - H.visible_message("The skin on [H]'s back begins to split apart. Black spines slowly emerge from the divide.", \ + H.visible_message(span_warning("The skin on [H]'s back begins to split apart. Black spines slowly emerge from the divide."), \ span_shadowling("Spines pierce your back. Your claws break apart your fingers. You feel excruciating pain as your true form begins its exit.")) if(!do_mob(H,H,90,1)) return - H.visible_message("[H], skin shifting, begins tearing at the walls around them.", \ + H.visible_message(span_warning("[H], skin shifting, begins tearing at the walls around them."), \ span_shadowling("Your false skin slips away. You begin tearing at the fragile membrane protecting you.")) if(!do_mob(H,H,80,1)) return @@ -98,7 +98,7 @@ H.mind.RemoveSpell(src) if(!do_mob(H,H,10,1)) return - to_chat(H, "Your powers are awoken. You may now live to your fullest extent. Remember your goal. Cooperate with your thralls and allies.") + to_chat(H, span_shadowling("Your powers are awoken. You may now live to your fullest extent. Remember your goal. Cooperate with your thralls and allies.")) H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/enthrall(null)) H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/sling/glare(null)) H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/veil(null)) diff --git a/yogstation/code/modules/antagonists/shadowling/thrall.dm b/yogstation/code/modules/antagonists/shadowling/thrall.dm index 37f4e45fd300..201cd965f6bf 100644 --- a/yogstation/code/modules/antagonists/shadowling/thrall.dm +++ b/yogstation/code/modules/antagonists/shadowling/thrall.dm @@ -54,8 +54,8 @@ GLOBAL_LIST_INIT(thrall_spell_types, typecacheof(list(/obj/effect/proc_holder/sp return ..() /datum/antagonist/thrall/greet() - to_chat(owner, "You see the truth. Reality has been torn away and you realize what a fool you've been.") - to_chat(owner, "The shadowlings are your masters. Serve them above all else and ensure they complete their goals.") + to_chat(owner, span_shadowling("You see the truth. Reality has been torn away and you realize what a fool you've been.")) + to_chat(owner, span_shadowling("The shadowlings are your masters. Serve them above all else and ensure they complete their goals.")) to_chat(owner, span_shadowling("You may not harm other thralls or the shadowlings. However, you do not need to obey other thralls.")) to_chat(owner, span_shadowling("Your body has been irreversibly altered. The attentive can see this - you may conceal it by wearing a mask.")) to_chat(owner, span_shadowling("Though not nearly as powerful as your masters, you possess some weak powers. These can be found in the Thrall Abilities tab.")) diff --git a/yogstation/code/modules/antagonists/slaughter/slaughter.dm b/yogstation/code/modules/antagonists/slaughter/slaughter.dm index 9c2aa685d796..7bc36df12449 100644 --- a/yogstation/code/modules/antagonists/slaughter/slaughter.dm +++ b/yogstation/code/modules/antagonists/slaughter/slaughter.dm @@ -68,17 +68,17 @@ if(!isliving(A)) return ..() if(!Adjacent(A)) - to_chat(src, "You are too far away to use your slam attack on [A]!") + to_chat(src, span_warning("You are too far away to use your slam attack on [A]!")) return if(slam_cooldown + slam_cooldown_time > world.time) - to_chat(src, "Your slam ability is still on cooldown!") + to_chat(src, span_warning("Your slam ability is still on cooldown!")) return face_atom(A) var/mob/living/victim = A victim.take_bodypart_damage(brute=20, wound_bonus=wound_bonus) // don't worry, there's more punishment when they hit something - visible_message("[src] slams into [victim] with monstrous strength!", "You slam into [victim] with monstrous strength!", ignored_mobs=victim) - to_chat(victim, "[src] slams into you with monstrous strength, sending you flying like a ragdoll!") + visible_message(span_danger("[src] slams into [victim] with monstrous strength!"), span_danger("You slam into [victim] with monstrous strength!"), ignored_mobs=victim) + to_chat(victim, span_userdanger("[src] slams into you with monstrous strength, sending you flying like a ragdoll!")) var/turf/yeet_target = get_edge_target_turf(victim, dir) victim.throw_at(yeet_target, 10, 5, src) slam_cooldown = world.time diff --git a/yogstation/code/modules/client/verbs/antag_token.dm b/yogstation/code/modules/client/verbs/antag_token.dm index addb55b98778..b79bda8dbe06 100644 --- a/yogstation/code/modules/client/verbs/antag_token.dm +++ b/yogstation/code/modules/client/verbs/antag_token.dm @@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(antag_token_users) return to_chat(src, span_userdanger("You will be notified if your antag token is used")) C.antag_token_timer = addtimer(CALLBACK(src, .proc/deny_antag_token_request), 45 SECONDS, TIMER_STOPPABLE) - to_chat(GLOB.admins, "ANTAG TOKEN REQUEST:[ADMIN_LOOKUPFLW(usr)] wants to use their antag token! (will auto-DENY in [DisplayTimeText(45 SECONDS)]). (APPROVE)") + to_chat(GLOB.admins, span_adminnotice("ANTAG TOKEN REQUEST:[ADMIN_LOOKUPFLW(usr)] wants to use their antag token! (will auto-DENY in [DisplayTimeText(45 SECONDS)]). (APPROVE)")) for(var/client/A in GLOB.admins) if(check_rights_for(A, R_ADMIN) && (A.prefs.toggles & SOUND_ADMINHELP)) // Can't use check_rights here since it's dependent on $usr SEND_SOUND(A, sound('sound/effects/adminhelp.ogg')) diff --git a/yogstation/code/modules/client/verbs/looc.dm b/yogstation/code/modules/client/verbs/looc.dm index 752b60600480..fa9d4954cb31 100644 --- a/yogstation/code/modules/client/verbs/looc.dm +++ b/yogstation/code/modules/client/verbs/looc.dm @@ -72,7 +72,7 @@ clients_to_hear += mob.client var/message_admin = span_looc("LOOC: [ADMIN_LOOKUPFLW(mob)]: [msg]") - var/message_admin_remote = "(R)LOOC: [ADMIN_LOOKUPFLW(mob)]: [msg]" + var/message_admin_remote = span_looc("(R)LOOC: [ADMIN_LOOKUPFLW(mob)]: [msg]") var/message_regular if(isobserver(mob)) //if you're a spooky ghost var/key_to_print = mob.key diff --git a/yogstation/code/modules/guardian/abilities/major/explosive.dm b/yogstation/code/modules/guardian/abilities/major/explosive.dm index 6d88b89a9fcf..56df0a878bf4 100644 --- a/yogstation/code/modules/guardian/abilities/major/explosive.dm +++ b/yogstation/code/modules/guardian/abilities/major/explosive.dm @@ -36,26 +36,26 @@ if(!istype(A)) return if(!guardian.is_deployed()) - to_chat(guardian, "You must be manifested to create bombs!") + to_chat(guardian, span_danger("You must be manifested to create bombs!")) return if(isobj(A) && guardian.Adjacent(A)) if(bomb_cooldown <= world.time && !guardian.stat) - to_chat(guardian, "Success! Bomb armed!") + to_chat(guardian, span_danger("Success! Bomb armed!")) bomb_cooldown = world.time + 200 RegisterSignal(A, COMSIG_PARENT_EXAMINE, .proc/display_examine) RegisterSignal(A, boom_signals, .proc/kaboom) addtimer(CALLBACK(src, .proc/disable, A), master_stats.potential * 18 * 10, TIMER_UNIQUE|TIMER_OVERRIDE) guardian.bombs += A else - to_chat(guardian, "Your powers are on cooldown! You must wait 20 seconds between bombs.") + to_chat(guardian, span_danger("Your powers are on cooldown! You must wait 20 seconds between bombs.")) /datum/guardian_ability/major/explosive/proc/kaboom(atom/source, mob/living/explodee) if(!istype(explodee)) return if(explodee == guardian || explodee == guardian.summoner?.current || guardian.hasmatchingsummoner(explodee)) return - to_chat(explodee, "[source] was boobytrapped!") - to_chat(guardian, "Success! Your trap caught [explodee]") + to_chat(explodee, span_danger("[source] was boobytrapped!")) + to_chat(guardian, span_danger("Success! Your trap caught [explodee]")) var/turf/T = get_turf(source) playsound(T,'sound/effects/explosion2.ogg', 200, 1) new /obj/effect/temp_visual/explosion(T) @@ -64,12 +64,12 @@ UNREGISTER_BOMB_SIGNALS(source) /datum/guardian_ability/major/explosive/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.")) guardian.bombs -= A UNREGISTER_BOMB_SIGNALS(A) /datum/guardian_ability/major/explosive/proc/display_examine(datum/source, mob/user, text) - text += "It glows with a strange light!" + text += span_holoparasite("It glows with a strange light!") /mob/living/simple_animal/hostile/guardian/proc/DetonateBomb() diff --git a/yogstation/code/modules/guardian/abilities/major/predator.dm b/yogstation/code/modules/guardian/abilities/major/predator.dm index f1e88c2c6e00..9c5414714de8 100644 --- a/yogstation/code/modules/guardian/abilities/major/predator.dm +++ b/yogstation/code/modules/guardian/abilities/major/predator.dm @@ -76,7 +76,7 @@ revert_cast() to_chat(G, span_notice("You didn't select anyone to track!")) return - to_chat(G, "We begin to track [prey.real_name].[get_final_z(prey) == get_final_z(G) ? "" : " They are far away from here[G.stats.potential >= 4 ? ", on z-level [get_final_z(prey)]." : "."]"]") + to_chat(G, span_notice("We begin to track [prey.real_name].[get_final_z(prey) == get_final_z(G) ? "" : " They are far away from here[G.stats.potential >= 4 ? ", on z-level [get_final_z(prey)]." : "."]"]")) log_game("[key_name(G)] began to track [key_name(prey)] using Predator.") // why log this? Simple. Some idiot will eventually cry metacomms because someone used this ability to track them to their autistic maint base or random-ass locker. for(var/datum/status_effect/agent_pinpointer/predator/status in G.status_effects) status.scan_target = prey diff --git a/yogstation/code/modules/guardian/guardian.dm b/yogstation/code/modules/guardian/guardian.dm index 2019792b47ab..1b3046a71532 100644 --- a/yogstation/code/modules/guardian/guardian.dm +++ b/yogstation/code/modules/guardian/guardian.dm @@ -168,7 +168,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(!summoner?.current) to_chat(src, "For some reason, somehow, you have no summoner. Please report this bug immediately.") return - to_chat(src, "You are [real_name], bound to serve [summoner.current.real_name].") + to_chat(src, span_holoparasite("You are [real_name], bound to serve [summoner.current.real_name].")) to_chat(src, span_holoparasite("You are capable of manifesting or recalling to your master with the buttons on your HUD. You will also find a button to communicate with [summoner.current.p_them()] privately there.")) to_chat(src, span_holoparasite("While personally invincible, you will die if [summoner.current.real_name] does, and any damage dealt to you will have a portion passed on to [summoner.current.p_them()] as you feed upon [summoner.current.p_them()] to sustain yourself.")) setup_barriers() @@ -187,8 +187,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians else forceMove(summoner.current) to_chat(src, span_danger("Your summoner has died!")) - visible_message("\The [src] dies along with its user!") - summoner.current.visible_message("[summoner.current]'s body is completely consumed by the strain of sustaining [src]!") + visible_message(span_danger("\The [src] dies along with its user!")) + summoner.current.visible_message(span_danger("[summoner.current]'s body is completely consumed by the strain of sustaining [src]!")) for(var/obj/item/W in summoner.current) if(!summoner.current.dropItemToGround(W)) qdel(W) @@ -199,7 +199,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians GoBerserk() else to_chat(src, span_danger("Your summoner has died!")) - visible_message("[src] dies along with its user!") + visible_message(span_danger("[src] dies along with its user!")) death(TRUE) snapback() @@ -414,7 +414,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(amount > 0) to_chat(summoner.current, "Your [name] is under attack! You take damage!") if(summoner_visible) - summoner.current.visible_message("Blood sprays from [summoner] as [src] takes damage!") + summoner.current.visible_message(span_danger("Blood sprays from [summoner] as [src] takes damage!")) if(summoner.current.stat == UNCONSCIOUS) to_chat(summoner.current, "Your body can't take the strain of sustaining [src] in this condition, it begins to fall apart!") summoner.current.adjustCloneLoss(amount * 0.5) //dying hosts take 50% bonus damage as cloneloss @@ -435,15 +435,15 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians /mob/living/simple_animal/hostile/guardian/examine(mob/user) . = ..() if(isobserver(user) || user == summoner?.current) - . += "DAMAGE: [level_to_grade(stats.damage)]" - . += "DEFENSE: [level_to_grade(stats.defense)]" - . += "SPEED: [level_to_grade(stats.speed)]" - . += "POTENTIAL: [level_to_grade(stats.potential)]" - . += "RANGE: [level_to_grade(stats.range)]" + . += span_holoparasite("DAMAGE: [level_to_grade(stats.damage)]") + . += span_holoparasite("DEFENSE: [level_to_grade(stats.defense)]") + . += span_holoparasite("SPEED: [level_to_grade(stats.speed)]") + . += span_holoparasite("POTENTIAL: [level_to_grade(stats.potential)]") + . += span_holoparasite("RANGE: [level_to_grade(stats.range)]") if(stats.ability) - . += "SPECIAL ABILITY: [stats.ability.name] - [stats.ability.desc]" + . += span_holoparasite("SPECIAL ABILITY: [stats.ability.name] - [stats.ability.desc]") for(var/datum/guardian_ability/minor/M in stats.minor_abilities) - . += "MINOR ABILITY: [M.name] - [M.desc]" + . += span_holoparasite("MINOR ABILITY: [M.name] - [M.desc]") /mob/living/simple_animal/hostile/guardian/gib() death() @@ -620,7 +620,7 @@ 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 guardians if(G) - to_chat(src, "You attempt to reset [G.real_name]'s personality...") + to_chat(src, span_holoparasite("You attempt to reset [G.real_name]'s personality...")) var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as [src.real_name]'s [G.real_name]?", ROLE_HOLOPARASITE, null, FALSE, 100) if(LAZYLEN(candidates)) var/mob/dead/observer/C = pick(candidates) @@ -634,14 +634,14 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians G.reset = TRUE 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) remove_verb(src, /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, span_holoparasite("You decide not to reset [guardians.len > 1 ? "any of your guardians":"your guardian"].")) else diff --git a/yogstation/code/modules/guardian/guardianbuilder.dm b/yogstation/code/modules/guardian/guardianbuilder.dm index 8e9a87680d60..9097c2e47ee3 100644 --- a/yogstation/code/modules/guardian/guardianbuilder.dm +++ b/yogstation/code/modules/guardian/guardianbuilder.dm @@ -212,11 +212,11 @@ log_game("[key_name(user)] has summoned [key_name(G)], a holoparasite.") switch(theme) if("tech") - 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.real_name] has been summoned!") + to_chat(user, span_holoparasite("[G.real_name] has been summoned!")) if("carp") - to_chat(user, "[G.real_name] has been caught!") + to_chat(user, span_holoparasite("[G.real_name] has been caught!")) add_verb(user, list(/mob/living/proc/guardian_comm, /mob/living/proc/guardian_recall, /mob/living/proc/guardian_reset)) //surprise another check in case you tried to get around the first one and now you have no holoparasite :) for(var/obj/H in all_items) diff --git a/yogstation/code/modules/guardian/standarrow.dm b/yogstation/code/modules/guardian/standarrow.dm index 185e4d844d2a..aec20520edb9 100644 --- a/yogstation/code/modules/guardian/standarrow.dm +++ b/yogstation/code/modules/guardian/standarrow.dm @@ -167,7 +167,7 @@ G.show_detail() users[G] = TRUE log_game("[key_name(H)] has summoned [key_name(G)], a holoparasite, via the stand arrow.") - to_chat(H, "[G.real_name] has been summoned!") + to_chat(H, span_holoparasite("[G.real_name] has been summoned!")) add_verb(H, list(/mob/living/proc/guardian_comm, /mob/living/proc/guardian_recall, /mob/living/proc/guardian_reset)) uses-- in_use = FALSE diff --git a/yogstation/code/modules/mentor/follow.dm b/yogstation/code/modules/mentor/follow.dm index 597e7341712a..bb1e31225a90 100644 --- a/yogstation/code/modules/mentor/follow.dm +++ b/yogstation/code/modules/mentor/follow.dm @@ -25,7 +25,7 @@ if(mentor_datum) mentor_datum.following = M - to_chat(GLOB.admins, "[span_prefix("MENTOR:")] [key_name(usr)] is now following [key_name(M)]", confidential=TRUE) + to_chat(GLOB.admins, span_mentor("[span_prefix("MENTOR:")] [key_name(usr)] is now following [key_name(M)]"), confidential=TRUE) to_chat(usr, span_info("Click the \"Stop Following\" button in the Mentor tab to stop following [key_name(M)]."), confidential=TRUE) log_mentor("[key_name(usr)] began following [key_name(M)]") @@ -40,7 +40,7 @@ usr.reset_perspective() remove_verb(src, /client/proc/mentor_unfollow) if(mentor_datum) - to_chat(GLOB.admins, "[span_prefix("MENTOR:")] [key_name(usr)] is no longer following [key_name(mentor_datum.following)]", confidential=TRUE) + to_chat(GLOB.admins, span_mentor("[span_prefix("MENTOR:")] [key_name(usr)] is no longer following [key_name(mentor_datum.following)]"), confidential=TRUE) log_mentor("[key_name(usr)] stopped following [key_name(mentor_datum.following)]") mentor_datum.following = null diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm index 5c7689559616..fcb62d1572ef 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm @@ -28,7 +28,7 @@ var/last_plantbgone_message = -STATUS_MESSAGE_COOLDOWN /datum/species/pod/before_equip_job(datum/job/J, mob/living/carbon/human/H) - to_chat(H, "You are a Phytosian. Born from an engimatic plant called a 'Replica Pod'.") + to_chat(H, span_info("You are a Phytosian. Born from an engimatic plant called a 'Replica Pod'.")) to_chat(H, span_info("Symbiotic plant-cells suffuse your skin and provide a protective layer that keeps you alive, and affords you regeneration unmatched by any other race.")) to_chat(H, span_info("Darkness is your greatest foe. Even the cold expanses of space are lit by neighbouring stars, but the darkest recesses of the station's interior may prove to be your greatest foe.")) to_chat(H, span_info("Heat and cold will damage your epidermis far faster than your natural regeneration can match.")) diff --git a/yogstation/code/modules/mob/living/simple_animal/constructs.dm b/yogstation/code/modules/mob/living/simple_animal/constructs.dm index c3c63b54d073..f7d005783434 100644 --- a/yogstation/code/modules/mob/living/simple_animal/constructs.dm +++ b/yogstation/code/modules/mob/living/simple_animal/constructs.dm @@ -2,6 +2,6 @@ if(status_flags & GODMODE) return if(stat != DEAD && !is_servant_of_ratvar(src)) - to_chat(src, "A blinding light boils you alive! Run!") + to_chat(src, span_userdanger("A blinding light boils you alive! Run!")) adjustFireLoss(35) return FALSE diff --git a/yogstation/code/modules/mob/living/simple_animal/friendly/eggdog.dm b/yogstation/code/modules/mob/living/simple_animal/friendly/eggdog.dm index 89fcbf1b3870..2ffb354b1530 100644 --- a/yogstation/code/modules/mob/living/simple_animal/friendly/eggdog.dm +++ b/yogstation/code/modules/mob/living/simple_animal/friendly/eggdog.dm @@ -26,7 +26,7 @@ across the station so have fun!") var/new_name = stripped_input(src, "Enter your name, or press \"Cancel\" to stick with Egg Dog.", "Name Change") if(new_name) - to_chat(src, "Your name is now \"new_name\"!") + to_chat(src, span_notice("Your name is now \"new_name\"!")) name = new_name /mob/living/simple_animal/pet/eggdog/Life() @@ -41,4 +41,4 @@ if(L.a_intent == INTENT_HARM && L.reagents && !stat) L.reagents.add_reagent(/datum/reagent/consumable/eggyolk, 0.4) L.reagents.add_reagent(/datum/reagent/consumable/nutriment/vitamin, 0.4) - L.reagents.add_reagent(/datum/reagent/growthserum, 0.4) \ No newline at end of file + L.reagents.add_reagent(/datum/reagent/growthserum, 0.4) diff --git a/yogstation/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/yogstation/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index e4ec725cde9a..abba061ed8d7 100644 --- a/yogstation/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/yogstation/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -15,7 +15,7 @@ if(enrage(target)) if(move_to_delay == initial(move_to_delay)) - visible_message("\"You can't dodge.\"") + visible_message(span_colossus("\"You can't dodge.\"")) ranged_cooldown = world.time + 30 telegraph() dir_shots(GLOB.alldirs) @@ -30,13 +30,13 @@ if(health < maxHealth/3) INVOKE_ASYNC(src, .proc/double_spiral) else - visible_message("\"Judgement.\"") + visible_message(span_colossus("\"Judgement.\"")) INVOKE_ASYNC(src, .proc/spiral_shoot, pick(TRUE, FALSE)) //Yogs begin - Added health gate and telegraph else if(prob(20) && health < maxHealth/2) telegraph() COLOSSUS_SLEEP(3) - visible_message("\"Bow.\"") + visible_message(span_colossus("\"Bow.\"")) //Yogs end ranged_cooldown = world.time + 30 random_shots() diff --git a/yogstation/code/modules/ninja/suit/ninja.dm b/yogstation/code/modules/ninja/suit/ninja.dm index 6cff24e231a5..8def55122e3f 100644 --- a/yogstation/code/modules/ninja/suit/ninja.dm +++ b/yogstation/code/modules/ninja/suit/ninja.dm @@ -102,7 +102,7 @@ return . 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/ninjacolour)) diff --git a/yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm b/yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm index f26a14e7c714..af562b657b36 100644 --- a/yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -24,15 +24,15 @@ /datum/reagent/shadowling_blindness_smoke/on_mob_life(mob/living/M) if(!is_shadow_or_thrall(M)) - to_chat(M, "You breathe in the black smoke, and your eyes burn horribly!") + to_chat(M, span_warning("You breathe in the black smoke, and your eyes burn horribly!")) M.blind_eyes(5) if(prob(25)) M.visible_message("[M] claws at their eyes!") M.Stun(3, 0) . = 1 else - to_chat(M, "You breathe in the black smoke, and you feel revitalized!") + to_chat(M, span_notice("You breathe in the black smoke, and you feel revitalized!")) M.adjustOxyLoss(-2, 0) M.adjustToxLoss(-2, 0) . = 1 - return ..() || . \ No newline at end of file + return ..() || . diff --git a/yogstation/code/modules/spacepods/construction.dm b/yogstation/code/modules/spacepods/construction.dm index 2e753f21e1e7..52b704d195ca 100644 --- a/yogstation/code/modules/spacepods/construction.dm +++ b/yogstation/code/modules/spacepods/construction.dm @@ -2,40 +2,40 @@ . = ..() switch(construction_state) // more construction states than r-walls! if(SPACEPOD_EMPTY) - . += "The struts holding it together can be cut and it is missing wires." + . += span_notice("The struts holding it together can be cut and it is missing wires.") if(SPACEPOD_WIRES_LOOSE) - . += "The wires need to be screwed on." + . += span_notice("The wires need to be screwed on.") if(SPACEPOD_WIRES_SECURED) - . += "The wires are screwed on and need a circuit board." + . += span_notice("The wires are screwed on and need a circuit board.") if(SPACEPOD_CIRCUIT_LOOSE) - . += "The circuit board is loosely attached and needs to be screwed on." + . += span_notice("The circuit board is loosely attached and needs to be screwed on.") if(SPACEPOD_CIRCUIT_SECURED) - . += "The circuit board is screwed on, and there is space for a core." + . += span_notice("The circuit board is screwed on, and there is space for a core.") if(SPACEPOD_CORE_LOOSE) - . += "The core is loosely attached and needs to be bolted on." + . += span_notice("The core is loosely attached and needs to be bolted on.") if(SPACEPOD_CORE_SECURED) - . += "The core is bolted on and the metal bulkhead can be attached." + . += span_notice("The core is bolted on and the metal bulkhead can be attached.") if(SPACEPOD_BULKHEAD_LOOSE) - . += "The bulkhead is loosely attached and can be bolted down." + . += span_notice("The bulkhead is loosely attached and can be bolted down.") if(SPACEPOD_BULKHEAD_SECURED) - . += "The bulkhead is bolted on but not welded on." + . += span_notice("The bulkhead is bolted on but not welded on.") if(SPACEPOD_BULKHEAD_WELDED) - . += "The bulkhead is welded on and armor can be attached." + . += span_notice("The bulkhead is welded on and armor can be attached.") if(SPACEPOD_ARMOR_LOOSE) - . += "The armor is loosely attached and can be bolted down." + . += span_notice("The armor is loosely attached and can be bolted down.") if(SPACEPOD_ARMOR_SECURED) - . += "The armor is bolted on but not welded on." + . += span_notice("The armor is bolted on but not welded on.") if(SPACEPOD_ARMOR_WELDED) if(hatch_open) if(cell || internal_tank || equipment.len) - . += "The maintenance hatch is pried open and there are parts inside that can be removed." + . += span_notice("The maintenance hatch is pried open and there are parts inside that can be removed.") else - . += "The maintenance hatch is pried open and the armor is welded on." + . += span_notice("The maintenance hatch is pried open and the armor is welded on.") else if(locked) - . += "[src] is locked." + . += span_notice("[src] is locked.") else - . += "The maintenance hatch is closed." + . += span_notice("The maintenance hatch is closed.") /obj/spacepod/proc/handle_spacepod_construction(obj/item/W, mob/living/user) // time for a construction/deconstruction process to rival r-walls diff --git a/yogstation/code/modules/spacepods/spacepod.dm b/yogstation/code/modules/spacepods/spacepod.dm index 78ca5168e414..599fe876c94a 100644 --- a/yogstation/code/modules/spacepods/spacepod.dm +++ b/yogstation/code/modules/spacepods/spacepod.dm @@ -488,7 +488,7 @@ GLOBAL_LIST_INIT(spacepods_list, list()) var/mob/living/M = A if(M != user && !locked) if(passengers.len >= max_passengers && !pilot) - to_chat(user, "[A.p_they()] can't fly the pod!") + to_chat(user, span_danger("[A.p_they()] can't fly the pod!")) return if(passengers.len < max_passengers) visible_message(span_danger("[user] starts loading [M] into [src]!")) diff --git a/yogstation/code/modules/surgery/organs/shadowling_organs.dm b/yogstation/code/modules/surgery/organs/shadowling_organs.dm index 025700a8c0c1..309ac0e96d12 100644 --- a/yogstation/code/modules/surgery/organs/shadowling_organs.dm +++ b/yogstation/code/modules/surgery/organs/shadowling_organs.dm @@ -44,7 +44,7 @@ /obj/item/organ/internal/shadowtumor/Remove(mob/living/carbon/M, special) if(M.dna.species.id == "l_shadowling") //Empowered thralls cannot be deconverted - to_chat(M, "NOT LIKE THIS!") + to_chat(M, span_shadowling("NOT LIKE THIS!")) M.visible_message(span_danger("[M] suddenly slams upward and knocks down everyone!")) M.resting = FALSE //Remove all stuns M.SetStun(0, 0) @@ -67,4 +67,4 @@ M.update_sight() M.remove_thrall() M.visible_message(span_warning("A strange black mass falls from [M]'s head!")) - return ..() \ No newline at end of file + return ..() From 8a179dafc4180d00ff03b0728ca00ed4ebc122bd Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Sat, 11 Sep 2021 09:33:09 -0500 Subject: [PATCH 7/7] oops --- config/admin_nicknames.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/admin_nicknames.json b/config/admin_nicknames.json index 1d34f05f0087..ab26db88227b 100644 --- a/config/admin_nicknames.json +++ b/config/admin_nicknames.json @@ -7,6 +7,6 @@ ], "names":[ "Badmin", - span_adminooc("Spanmin") + "Spanmin" ] -} +} \ No newline at end of file
" if (S.bankrupt) - dat += "+ - " + dat += "[span_linkOff("+")] [span_linkOff("-")] " else dat += "+ - " dat += "(A) (H)